diff --git a/app.py b/app.py index 205bc89..618d196 100644 --- a/app.py +++ b/app.py @@ -84,7 +84,7 @@ def checkout(): if not helpers.isCustomer(): return render_template("checkout.html", login = True) return render_template("checkout.html", login = False) -@app.route('/orderhistory') +@app.route('/dashboard/orderhistory') def orderhistory(): return render_template("orderhistory.html", currentUrl = "/orderhistory", nav = helpers.getNav()) @app.route('/orders/') diff --git a/build/layout.html b/build/layout.html index ae2941d..079600b 100644 --- a/build/layout.html +++ b/build/layout.html @@ -3,14 +3,14 @@ Denisse's Cafe Homepage - - + + {% block styles %}{% endblock %}
- +
{%for navItem in nav%} diff --git a/build/orderhistory.html b/build/orderhistory.html index a6614a2..7cd2362 100644 --- a/build/orderhistory.html +++ b/build/orderhistory.html @@ -1,11 +1,11 @@ {% extends 'layout.html' %} {% block styles %} - - - + + + - + {% endblock %} {% block body %} diff --git a/database/database.db b/database/database.db index 6f342e5..6deefd0 100644 Binary files a/database/database.db and b/database/database.db differ diff --git a/helpers.py b/helpers.py index 07ce993..b03966a 100644 --- a/helpers.py +++ b/helpers.py @@ -109,6 +109,7 @@ def getSidebarNav(): {'url': '/', 'name': 'Home'}, {'url': '/dashboard', 'name': 'Dashboard'}, {'url': '/dashboard/wallet', 'name' : 'Wallet'}, + {'url': '/dashboard/orderhistory', 'name' : 'Order History'}, {'url': '/dashboard/settings', 'name' : 'Settings'}, {'url': '/logout', 'name':'Logout'}, ]