From ae377312db10301d67e9589d0b3f8d2e0bf12313 Mon Sep 17 00:00:00 2001
From: Michael Drury <mpdrury15@gmail.com>
Date: Thu, 4 May 2023 12:42:24 +0100
Subject: [PATCH] adding a user page and styled the navbar a bit differently
---
shop/static/styles.css | 8 +++++++-
shop/templates/layout.html | 6 +++---
shop/templates/user_page.html | 2 ++
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/shop/static/styles.css b/shop/static/styles.css
index 46bd6db..6b0344a 100644
--- a/shop/static/styles.css
+++ b/shop/static/styles.css
@@ -170,7 +170,7 @@ li {
float: right;
}
-.navbar_right_logoutin {
+.navbar_far_right {
float: right;
margin-right: 10px;
}
@@ -560,4 +560,10 @@ li {
color: grey;
margin-top: -10%;
+}
+
+.user_page_username {
+ text-align: center;
+ font-family: Andale Mono, monospace;
+ font-size: 400%;
}
\ No newline at end of file
diff --git a/shop/templates/layout.html b/shop/templates/layout.html
index beedb88..49f2cff 100644
--- a/shop/templates/layout.html
+++ b/shop/templates/layout.html
@@ -44,11 +44,11 @@
<li><div class = "navbar_box"><a class = "navbar_item" href="{{ url_for('cart') }}">Cart</a></div></li>
<li><div class = "navbar_box"><a class = "navbar_item" href="{{ url_for('wishlist') }}">Wishlist</a></div></li>
{% if current_user.is_authenticated %}
- <li class = "navbar_right_logoutin"><div class = "navbar_box"><img class = "avatar_img" src = "{{ url_for('static', filename='images/Logged_in.png') }}" alt="logged_in_avatar"><a class = "navbar_username" href="{{ url_for('user_page') }}">{{current_user.username[0].upper()}}</a></div></li>
- <li class = "navbar_right_logoutin"><div class = "navbar_box"><a class="navbar_item" href="{{ url_for('logout') }}">Logout</a></div></li>
+ <li class = "navbar_far_right"><div class = "navbar_box"><a class="navbar_item" href="{{ url_for('user_page') }}">{{current_user.username.upper()}} <img class = "avatar_img" src = "{{ url_for('static', filename='images/Logged_in.png') }}" alt="logged_in_avatar"></a></div></li>
+ <li class = "navbar_right"><div class = "navbar_box"><a class="navbar_item" href="{{ url_for('logout') }}">Logout</a></div></li>
{% else %}
- <li class = "navbar_right_logoutin"><div class = "navbar_box"><a class="navbar_item" href="{{ url_for('login') }}">Login</a></div></li>
+ <li class = "navbar_far_right"><div class = "navbar_box"><a class="navbar_item" href="{{ url_for('login') }}">Login</a></div></li>
<li class = "navbar_right"><div class = "navbar_box"><a class="navbar_item" href="{{ url_for('signup') }}">Sign up</a></div></li>
{% endif %}
</ul>
diff --git a/shop/templates/user_page.html b/shop/templates/user_page.html
index 38a0827..d0e2402 100644
--- a/shop/templates/user_page.html
+++ b/shop/templates/user_page.html
@@ -6,6 +6,8 @@
<div id="content-wrap">
+ <h1 class = "home_title" >User Page</h1>
+ <h1 class = "user_page_username"> Current User: {{current_user.username}}</h1>
</div>
--
GitLab