benjamyn/shoplist2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Made the session handle the active list

Browse Source
This commit is contained in:
Benjamyn Love 2020-02-17 18:59:22 +11:00
parent 7082dc86fe
commit a3254343cc
3 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
__pycache__/shop.cpython-38.pyc Normal file
View File

Binary file not shown.

36
shop.py
View File

@ -120,28 +120,38 @@ app.secret_key = b'*$#@U9423jr92jioJKL_)_;dasfj()12'
@app.route('/') @app.route('/')
def index(): def index():
print(f"ID in session is: {session['active_id']}")
if session.get('id') is None: if session.get('id') is None:
data = {"title":"Login"} data = {"title":"Login"}
return render_template("auth.html", data=data) return render_template("auth.html", data=data)
try:
if request.args["list"]: if session["active_id"] == "0":
print(request.args["list"]) print("Heres")
res = get_items(session["id"], request.args["list"]) res = get_items(session["id"])
else: else:
res = get_items(session["id"]) res = get_items(session["id"], session["active_id"])
data = {"title": "Shopping List", "results": res, "username": session["username"], "list_ids": session["list_ids"]} data = {"title": "Shopping List", "results": res, "session": session, "list_ids": session["list_ids"]}
except KeyError: #Store active list in the session
#Get initial data, contains all lists the user is apart of unless list is defined # try:
res = get_items(session["id"]) # if request.args["list"]:
data = {"title": "Shopping List", "results": res, "username": session["username"], "list_ids": session["list_ids"]} # print(request.args["list"])
# res = get_items(session["id"], request.args["list"])
# else:
# res = get_items(session["id"])
# data = {"title": "Shopping List", "results": res, "username": session["username"], "list_ids": session["list_ids"]}
# except KeyError:
# #Get initial data, contains all lists the user is apart of unless list is defined
# res = get_items(session["id"])
# data = {"title": "Shopping List", "results": res, "username": session["username"], "list_ids": session["list_ids"]}
for device in MOBILES: for device in MOBILES:
if device in request.user_agent.platform: if device in request.user_agent.platform:
return render_template('mobile.html', data=data) return render_template('mobile.html', data=data)
print(session["list_ids"])
return render_template('index.html', data=data) return render_template('index.html', data=data)
@app.route('/post', methods=['POST']) @app.route('/post', methods=['POST'])
def handle_data(): def handle_data():
print(request.form)
if "addValue" in request.form: if "addValue" in request.form:
for x in request.form: for x in request.form:
if request.form[x] == '': if request.form[x] == '':
@ -166,6 +176,7 @@ def handle_data():
session["username"] = res[0][1] session["username"] = res[0][1]
session["isAdmin"] = res[0][2] session["isAdmin"] = res[0][2]
session["list_ids"] = list_ids session["list_ids"] = list_ids
session["active_id"] = "0"
if "newuser" in request.form: if "newuser" in request.form:
#first check if the user exists #first check if the user exists
@ -188,6 +199,9 @@ def handle_data():
if "changeList" in request.form: if "changeList" in request.form:
pprint(request.form["changeList"]) pprint(request.form["changeList"])
if "list" in request.form:
print(f"Change session to {request.form['list']}")
session["active_id"] = request.form['list']
return redirect(url_for('index')) return redirect(url_for('index'))

8
templates/index.html
View File

@ -1,14 +1,14 @@
{% include "header.html" %} {% include "header.html" %}
<body> <body>
<h1 class="container" style="text-align: center">{{ data["title"] }}, {{data["username"].title()}} <h1 class="container" style="text-align: center">{{ data["title"] }}, {{data["session"]["username"].title()}}
<div class="dropdown"> <div class="dropdown">
<form action="/" method="get" id="test"> <form action="/post" method="post" id="test">
<button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Lists {{data["session"]["active_id"]}}
</button> </button>
<div class="dropdown-menu" aria-labelledby="dropdownMenu2"> <div class="dropdown-menu" aria-labelledby="dropdownMenu2">
<button class="dropdown-item" type="submit" value="" id="" name="list">All</button> <button class="dropdown-item" type="submit" value="0" id="" name="list">All</button>
{% for id, name in data["list_ids"] %} {% for id, name in data["list_ids"] %}
<button class="dropdown-item" type="submit" value="{{id}}" id="{{id}}" name="list">{{name}}</button> <button class="dropdown-item" type="submit" value="{{id}}" id="{{id}}" name="list">{{name}}</button>
{% endfor %} {% endfor %}