diff --git a/store/routes.py b/store/routes.py
index a7e6463be4ffbbb2d608a600e99521f94e123804..401c70195b64740e6e97d6cb3a392054d4782eb5 100644
--- a/store/routes.py
+++ b/store/routes.py
@@ -81,14 +81,14 @@ def items():
return render_template("items.html", title="Items", items=unsold_items)
-@app.route("/itemSets")
-def itemSets():
+@app.route("/item_sets")
+def item_sets():
items = get_item_sets()
- return render_template("itemSets.html", title="Item Sets", items=items)
+ return render_template("item_sets.html", title="Item Sets", items=items)
-@app.route("/ItemSetPage/<int:item_id>")
-def ItemSetPage(item_id):
+@app.route("/item_set_page/<int:item_id>")
+def item_set_page(item_id):
item = get_item_set_by_id(item_id)
if not item:
return "Item set not found", 404
@@ -98,7 +98,7 @@ def ItemSetPage(item_id):
contained_items = item.items
return render_template(
- "ItemSetPage.html",
+ "item_set_page.html",
item_price=item_price,
item_description=item_description,
item_id=item_id,
@@ -405,7 +405,7 @@ def add_to_basket():
session["basket"][item_id] = item_dict
flash("Item added to basket: " + item_obj.description)
print(session["basket"])
- return redirect(url_for("ItemPage", item_id=item_id))
+ return redirect(url_for("item_page", item_id=item_id))
@app.route("/add_to_basket_set", methods=["POST"])
@@ -424,11 +424,12 @@ def add_to_basket_set():
if item_id in session["basket"]:
flash("Item already in basket")
+
else:
session["basket"][item_id] = item_dict
flash("Item added to basket: " + item_obj.description)
print(session["basket"])
- return redirect(url_for("ItemSetPage", item_id=item_id))
+ return redirect(url_for("item_set_page", item_id=item_id))
@app.route("/remove_item", methods=["POST"])
@@ -444,15 +445,15 @@ def remove_item():
return redirect(url_for("basket"))
-@app.route("/ItemPage/<int:item_id>")
-def ItemPage(item_id):
+@app.route("/item_page/<int:item_id>")
+def item_page(item_id):
item = get_item_by_id(item_id)
if not item:
return "Item not found", 404
item_price = item.price
item_description = item.description
return render_template(
- "ItemPage.html",
+ "item_page.html",
item_price=item_price,
item_description=item_description,
item_id=item_id,
diff --git a/store/templates/Items.html b/store/templates/Items.html
index 15b866e14a6ff699f7bbfb9b080ade43ecdc9eee..0ed6553440a79b887412c8bf2fdae32de4c15686 100644
--- a/store/templates/Items.html
+++ b/store/templates/Items.html
@@ -43,7 +43,7 @@
<img src="static\image_placeholder.png" alt="{{ item.description }}">
<h2>{{ item.description }}</h2>
<p>£{{ item.price }}</p>
- <a href="{{url_for('ItemPage', item_id = item.id)}}">View
+ <a href="{{url_for('item_page', item_id = item.id)}}">View
Details</a>
</div>
diff --git a/store/templates/base.html b/store/templates/base.html
index e91b02e822abc86e5e0841fe898ad17850c0bf9b..e8491ed4b14d7f3d80507a934d106412218daedd 100644
--- a/store/templates/base.html
+++ b/store/templates/base.html
@@ -8,15 +8,15 @@
</head>
<body>
- <header class="header">
- <a href="{{ url_for('index')}}">ANTIQUES ONLINE</a>
- </header>
+ <header class="header">
+ <a href="{{ url_for('index')}}">ANTIQUES ONLINE</a>
+ </header>
<nav class="navbar">
<ul class="navbar-list">
<li><a href="{{ url_for('basket')}}">Basket</a></li>
<li><a href="{{ url_for('items')}}">Items</a></li>
- <li><a href="{{ url_for('itemSets')}}">Item Sets</a></li>
+ <li><a href="{{ url_for('item_sets')}}">Item Sets</a></li>
{% if current_user.is_authenticated %}
<li><a href="{{ url_for('account')}}">Account</a></li>
@@ -48,12 +48,12 @@
{% endblock %} <!-- Where HTML will go when extended. -->
- <footer class="footer">
- <br>
- <p>Contact Info: mail@mail.com</p>
- <p>Phone Number 0000 000 0000</p>
- <br>
- </footer>
+ <footer class="footer">
+ <br>
+ <p>Contact Info: mail@mail.com</p>
+ <p>Phone Number 0000 000 0000</p>
+ <br>
+ </footer>
</body>
</html>
\ No newline at end of file
diff --git a/store/templates/ItemPage.html b/store/templates/item_page.html
similarity index 100%
rename from store/templates/ItemPage.html
rename to store/templates/item_page.html
diff --git a/store/templates/ItemSetPage.html b/store/templates/item_set_page.html
similarity index 100%
rename from store/templates/ItemSetPage.html
rename to store/templates/item_set_page.html
diff --git a/store/templates/itemSets.html b/store/templates/item_sets.html
similarity index 93%
rename from store/templates/itemSets.html
rename to store/templates/item_sets.html
index a98b764c13d54a984849ebc356f782278f2827ec..27bae077dd6b90b93e0b67dac8fd13e4ec478f16 100644
--- a/store/templates/itemSets.html
+++ b/store/templates/item_sets.html
@@ -43,7 +43,7 @@
<img src="static\image_placeholder.png" alt="{{ item.description }}">
<h2>{{ item.description }}</h2>
<p>£{{ item.price }}</p>
- <a href="{{url_for('ItemSetPage', item_id = item.id)}}">View
+ <a href="{{url_for('item_set_page', item_id = item.id)}}">View
Details</a>
</div>