diff --git a/shop/static/styles.css b/shop/static/styles.css index 46bd6dbb88783162be796fb6041ab30cb4358465..6b0344a2c70a63839828990a68307c9812464ef4 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 beedb8852be6118205396b31c390dc8f05881828..49f2cff7da53a79f733f031f5c341a961ec48124 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 38a08275f7cf37c7d3ae97554eaa41318f64a8b5..d0e2402f7254076ee663da80120859668e1d00e6 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>