From 7ebeb10cda142273b7598541aaf50724d02c4984 Mon Sep 17 00:00:00 2001
From: Luke Else <mail@luke-else.co.uk>
Date: Tue, 6 Feb 2024 19:30:08 +0000
Subject: [PATCH] Changed urls to all use 'url_for' syntax

---
 controllers/web/stats.py   |  8 ++------
 templates/header.html      | 18 +++++++++---------
 templates/login.html       |  2 +-
 templates/new_product.html |  2 +-
 templates/signup.html      |  2 +-
 templates/stats.html       |  9 ---------
 6 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/controllers/web/stats.py b/controllers/web/stats.py
index 6fa9771..9d12f0c 100644
--- a/controllers/web/stats.py
+++ b/controllers/web/stats.py
@@ -1,21 +1,17 @@
 """ The user controller to manage all of the stats related endpoints
     in the web app
 """
-import json
-import random
 from flask import Blueprint
 
-from flask import render_template, redirect, request, session, flash
+from flask import render_template, request
 from controllers.database.stats import StatsController
-from models.stats import Stats
-from models.users.user import User
 
 # Blueprint to append user endpoints to
 blueprint = Blueprint("stats", __name__, url_prefix='/stats')
 
 
 @blueprint.route('/')
-def stats_index():
+def index():
     """ Main page to view all of the statistics for the site """
     db = StatsController()
     data = db.read()
diff --git a/templates/header.html b/templates/header.html
index 21d686c..9f52b79 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -1,16 +1,16 @@
 <div class="navbar">
     <nav>
-        <a href="/"><img src="{{url_for('static', filename='assets/img/wmgzon.bmp')}}" id="logo" class="not-required" alt="WMGZON Logo"></a>
+        <a href="{{url_for('main.index')}}"><img src="{{url_for('static', filename='assets/img/wmgzon.bmp')}}" id="logo" class="not-required" alt="WMGZON Logo"></a>
         <form action="" method="get">
             <input type="text" name="search" placeholder="Find your favourite products" class="search-bar">
             <input type="submit" class="search-button">
         </form>
         <div class="vert-align">
-            <a href="/"><img src="{{url_for('static', filename='assets/img/cart.bmp')}}" id="cart" alt="Shopping Cart"></a>
+            <a href="{{url_for('main.index')}}"><img src="{{url_for('static', filename='assets/img/cart.bmp')}}" id="cart" alt="Shopping Cart"></a>
             {% if user != None: %}
-                <a href="/logout">Welcome, {{ user.username }}</a>
+                <a href="{{url_for('main.users.logout')}}">Welcome, {{ user.username }}</a>
             {% else %}
-                <a href="/login">Login/Signup</a>
+                <a href="{{url_for('main.users.display_login')}}">Login/Signup</a>
             {% endif %}
         </div>
     </nav>
@@ -19,9 +19,9 @@
         {% if user != None and user.role == "Seller" %}
             <div class="categories">
                 {# List all available seller tools #}
-                <a href="/products/add" class="category">Create Products</a>
-                <a href="/products/ownproducts" class="category">View My Products</a>
-                <a href="/products/stats" class="category">View Seller Stats</a>
+                <a href="{{url_for('main.products.display_add_product')}}" class="category">Create Products</a>
+                <a href="{{url_for('main.products.display_own_products')}}" class="category">View My Products</a>
+                <a href="{{url_for('main.stats.index')}}" class="category">View Seller Stats</a>
             </div>
         {% endif %}
     
@@ -29,9 +29,9 @@
             {# List all categories and ensure the selected one is highlighted #}
             {% for c in categories %}
                 {% if category == c.name %}
-                    <a style="color: cyan" href="/products/{{c.name}}" class="category">{{c.name}}</a>
+                    <a style="color: cyan" href="{{url_for('main.products.category', category=c.name)}}" class="category">{{c.name}}</a>
                 {% else %}
-                    <a href="/products/{{c.name}}" class="category">{{c.name}}</a>
+                    <a href="{{url_for('main.products.category', category=c.name)}}" class="category">{{c.name}}</a>
                 {% endif %}
             {% endfor %}
         </div>
diff --git a/templates/login.html b/templates/login.html
index 81f5c55..fdb5b57 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -17,6 +17,6 @@
     </form>
     
     <div id="create-account-wrap">
-        <p>Not a member? <a href="signup">Create Account</a><p>
+        <p>Not a member? <a href="{{url_for('main.users.display_signup')}}">Create Account</a><p>
     </div>
 </div>
diff --git a/templates/new_product.html b/templates/new_product.html
index 29349e0..70b7e44 100644
--- a/templates/new_product.html
+++ b/templates/new_product.html
@@ -31,6 +31,6 @@
     </form>
     
     <div id="create-account-wrap">
-        <p>Want to view all of your products? <a href="">Click Here</a><p>
+        <p>Want to view all of your products? <a href="{{url_for('main.products.display_own_products')}}">Click Here</a><p>
     </div>
 </div>
diff --git a/templates/signup.html b/templates/signup.html
index c687685..312c008 100644
--- a/templates/signup.html
+++ b/templates/signup.html
@@ -28,6 +28,6 @@
     </form>
     
     <div id="create-account-wrap">
-        <p>Already have an account? <a href="login">Login</a><p>
+        <p>Already have an account? <a href="{{url_for('main.users.login')}}">Login</a><p>
     </div>
 </div>
diff --git a/templates/stats.html b/templates/stats.html
index cbb0886..5e79016 100644
--- a/templates/stats.html
+++ b/templates/stats.html
@@ -43,15 +43,6 @@
 <div class="product-container">
     {% if data != None %}
         {% for stat in data %}
-            <a href="/stats/product/{{stat.productID}}" class="product product-link">
-                <div class="product-title">{{stat.userID}}</div>
-                <div class="product-content-container">
-                    <div class="product-details">
-                        <div class="product-price">£{{stat.productID}}</div>
-                        <div class="product-description hide-overflow ">{{stat.viewDate}}</div>
-                    </div>
-                </div>
-            </a>
         {% endfor %}
     {% endif %}
 </div>