diff --git a/store/routes.py b/store/routes.py
index 900bece74c88a772785fe8c9b7b4ab461c96eb8c..7d0bfc98b70cf35c4e73fa8b8834082bc445b4b8 100644
--- a/store/routes.py
+++ b/store/routes.py
@@ -300,14 +300,6 @@ def account():
return redirect(url_for("index"))
-@app.route("/accountDetails")
-@login_required
-def accountDetails():
- a = get_user_id()
- user = User.query.filter_by(user_id=a).first()
- return render_template("userContent/accountDetails.html", user=user)
-
-
@app.route("/standardUser")
@login_required
def standardUser():
@@ -315,7 +307,9 @@ def standardUser():
flash("Unauthorized access no admins allowed please create a standard account")
return redirect(url_for("home"))
else:
- return render_template("userContent/user.html")
+ return render_template(
+ "userContent/user.html", user=current_user, userType=current_user.userType
+ )
@app.route("/admin")
@@ -325,7 +319,9 @@ def admin():
flash("Unauthorized access")
return redirect(url_for("home"))
else:
- return render_template("userContent/admin.html")
+ return render_template(
+ "userContent/user.html", user=current_user, userType=current_user.userType
+ )
@app.route("/database_management", methods=["GET", "POST"])
diff --git a/store/templates/index.html b/store/templates/index.html
index 363ac45108facae11e82f0628f73e86753df6084..7efed29089b0b362383d079488a3bddf3383284d 100644
--- a/store/templates/index.html
+++ b/store/templates/index.html
@@ -2,7 +2,7 @@
{% block title %} Welcome! {% endblock %}
{% block content %}
<div class="container">
- <p class="my-4">
+ <p class="my-2">
Antique's Online maintains a large collection of antiques and collectables stored in various repositories around
the
world. Our business sells these items through its online store and also through a variety of online auction
diff --git a/store/templates/userContent/account.html b/store/templates/userContent/account.html
deleted file mode 100644
index b97dd74b67fc08c52978d95a9b399f38fe9eabbe..0000000000000000000000000000000000000000
--- a/store/templates/userContent/account.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{%extends 'base.html' %}
-
-{% block content %}
-{% block title %} Account{% endblock %}
-<h1>account Information</h1>
-<ul>
- <li><a href="{{ url_for('accountDetails', user_id=current_user.id)}}">View my Account details</a></li>
- <li><a href="{{ url_for('orders', user_id=current_user.id)}}">View Orders</a></li>
- <li><a href="{{ url_for('addresses', user_id=current_user.id)}}">View shipping address</a></li>
- <li><a href="{{ url_for('Payment', user_id=current_user.id)}}">View your payment method</a></li>
-</ul>
-{% endblock %}
\ No newline at end of file
diff --git a/store/templates/userContent/accountDetails.html b/store/templates/userContent/accountDetails.html
deleted file mode 100644
index b1645cb90da97e758bc3a200eb0eabf695d8df49..0000000000000000000000000000000000000000
--- a/store/templates/userContent/accountDetails.html
+++ /dev/null
@@ -1,34 +0,0 @@
-{%extends 'base.html' %}
-
-{% block content %}
-<h1>Account Details</h1>
-<h1>Welcome, {{ user.username }}</h1>
-<table style="width:100%">
- <tr>
- <th>Your username is:</th>
- <th>{{ user.username }}</th>
- <th><a href="{{ url_for('ChangeUsername')}}">change your username</a></th>
-
- </tr>
- <tr>
- <td>Your email address is:</td>
- <td>{{ user.email }}</td>
- <td><a href="{{ url_for('ChangeEmail')}}">Change email address</a></td>
- </tr>
- <tr>
- <th>Your Phone Number is:</th>
- <td>{{ user.phone_number }}</td>
- <td><a href="{{ url_for('ChangePhNumber')}}">change phone number</a></td>
- </tr>
-</table>
-{% endblock %}
-
-<!--
- {% block title %} Account{% endblock %}
- <h1>Account Details</h1>
- <h1>Welcome, {{ user.username }}</h1>
- <p>Your email address is: {{ user.email }}</p>
- <p>Your Phone Number is: {{ user.phone_number }}</p>
-
-
- -->
\ No newline at end of file
diff --git a/store/templates/userContent/admin.html b/store/templates/userContent/admin.html
deleted file mode 100644
index 35187f877c03846f0c9a72b16db649f42845f9aa..0000000000000000000000000000000000000000
--- a/store/templates/userContent/admin.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{%extends 'base.html' %}
-
-{% block content %}
-{% block title %} Account{% endblock %}
-<h1>Admin usertype account Information</h1>
-<ul>
- <li><a href="{{ url_for('accountDetails')}}">View my Account details</a></li>
- <li><a href="{{ url_for('view_address')}}">View my shipping address</a></li>
- <li><a href="{{ url_for('database_management')}}">Edit existing entries</a></li>
- <li><a href="{{ url_for('database_management_add')}}">Add new entries</a></li>
-
-</ul>
-{% endblock %}
\ No newline at end of file
diff --git a/store/templates/userContent/user.html b/store/templates/userContent/user.html
index eb4a4c7d2de7c1339c6df657806125dd1e3a672c..0ac2d7f886a4e28469200df75edb5f263ec739a2 100644
--- a/store/templates/userContent/user.html
+++ b/store/templates/userContent/user.html
@@ -1,10 +1,32 @@
{%extends 'base.html' %}
-{% block content %}
{% block title %} Account{% endblock %}
-<h1>Standard usertype account Information</h1>
-<ul>
- <li><a href="{{ url_for('accountDetails', user_id=current_user.id)}}">View my Account details</a></li>
- <li><a href="{{ url_for('addAdress', user_id=current_user.id)}}">Add shipping address</a></li>
- <li><a href="{{ url_for('view_address', user_id=current_user.id)}}">View your shipping address</a></li>
-</ul>
+{% block content %}
+<div class="container text-center">
+ <h1>Account Information</h1>
+ <div class="p-1">
+ Username: {{ user.username }}
+ <a class="btn btn-primary" href="{{ url_for('ChangeUsername')}}">Change your username</a>
+ </div>
+ <div class="p-1">
+ Email: {{ user.email }}
+ <a class="btn btn-primary" href="{{ url_for('ChangeEmail')}}">Change email address</a>
+ </div>
+ <div class="p-1">
+ Phone Number: {{ user.phone_number }}
+ <a class="btn btn-primary" href="{{ url_for('ChangePhNumber')}}">Change phone number</a>
+ </div>
+ {% if userType == "standard" %}
+ <div class="p-1">
+ <a class="mx-auto btn btn-primary" href="{{ url_for('addAdress', user_id=current_user.id)}}">Add shipping
+ address</a>
+ <a class="mx-auto btn btn-primary" href="{{ url_for('view_address', user_id=current_user.id)}}">View shipping
+ address</a>
+ </div>
+ {% else %}
+ <div class="p-1">
+ <a class="mx-auto btn btn-primary" href="{{ url_for('database_management')}}">Edit database entries</a>
+ <a class="mx-auto btn btn-primary" href="{{ url_for('database_management_add')}}">Add database entries</a>
+ </div>
+ {% endif %}
+</div>
{% endblock %}
\ No newline at end of file