From a3254343cc171e3fe3c610af766806f33110227d Mon Sep 17 00:00:00 2001 From: Benjamyn Love Date: Mon, 17 Feb 2020 18:59:22 +1100 Subject: [PATCH] Made the session handle the active list --- __pycache__/shop.cpython-38.pyc | Bin 0 -> 7109 bytes shop.py | 36 ++++++++++++++++++++++---------- templates/index.html | 8 +++---- 3 files changed, 29 insertions(+), 15 deletions(-) create mode 100644 __pycache__/shop.cpython-38.pyc diff --git a/__pycache__/shop.cpython-38.pyc b/__pycache__/shop.cpython-38.pyc new file mode 100644 index 0000000000000000000000000000000000000000..af39d7974f36a971e3a6df6552ee041e698c90fe GIT binary patch literal 7109 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 BfC&Hq literal 0 HcmV?d00001 diff --git a/shop.py b/shop.py index 98ba8c1..a59e694 100644 --- a/shop.py +++ b/shop.py @@ -120,28 +120,38 @@ app.secret_key = b'*$#@U9423jr92jioJKL_)_;dasfj()12' @app.route('/') def index(): + print(f"ID in session is: {session['active_id']}") if session.get('id') is None: data = {"title":"Login"} return render_template("auth.html", data=data) - try: - if request.args["list"]: - 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 + + if session["active_id"] == "0": + print("Heres") res = get_items(session["id"]) - data = {"title": "Shopping List", "results": res, "username": session["username"], "list_ids": session["list_ids"]} + else: + res = get_items(session["id"], session["active_id"]) + data = {"title": "Shopping List", "results": res, "session": session, "list_ids": session["list_ids"]} + #Store active list in the session + # try: + # if request.args["list"]: + # 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: if device in request.user_agent.platform: return render_template('mobile.html', data=data) + print(session["list_ids"]) return render_template('index.html', data=data) @app.route('/post', methods=['POST']) def handle_data(): - + print(request.form) if "addValue" in request.form: for x in request.form: if request.form[x] == '': @@ -166,6 +176,7 @@ def handle_data(): session["username"] = res[0][1] session["isAdmin"] = res[0][2] session["list_ids"] = list_ids + session["active_id"] = "0" if "newuser" in request.form: #first check if the user exists @@ -188,6 +199,9 @@ def handle_data(): if "changeList" in request.form: 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')) diff --git a/templates/index.html b/templates/index.html index 7f57c8f..bc060cd 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,14 +1,14 @@ {% include "header.html" %} -

{{ data["title"] }}, {{data["username"].title()}} +

{{ data["title"] }}, {{data["session"]["username"].title()}}
-
+
- + {% for id, name in data["list_ids"] %} {% endfor %}