diff --git a/instance/app.db b/instance/app.db index daa0cc1a7bd4ab7fc7735ff015c0e1881f1dcead..d771342ac6b6e07297493465b5bb529af221d1d2 100644 Binary files a/instance/app.db and b/instance/app.db differ diff --git a/shop/routes.py b/shop/routes.py index e5ecb733226ff4d90d29dc41ad1dbcf44bb2d743..e8358de97b314a2c223075fcede31e51ba34cc27 100644 --- a/shop/routes.py +++ b/shop/routes.py @@ -287,11 +287,15 @@ def get_total_cart_price(): return total_price # just takes you to the thank you page -@app.route('/thank_you', methods=['GET', 'POST']) +@app.route('/thank_you') @login_required def thank_you(): return render_template('thank_you.html') +@app.route('/user_page') +@login_required +def user_page(): + return render_template('user_page.html') @lm.user_loader def load_user(id): diff --git a/shop/static/images/fox36.jpg b/shop/static/images/fox36.jpg index 905a4c3d8ba8fee880ba7a1dcaf7a0a4f01ed144..27ae7b58c74b085e301040058183e0972f58e649 100644 Binary files a/shop/static/images/fox36.jpg and b/shop/static/images/fox36.jpg differ diff --git a/shop/static/styles.css b/shop/static/styles.css index 1d83833e1252e617c1953411e233ebbd7a217173..46bd6dbb88783162be796fb6041ab30cb4358465 100644 --- a/shop/static/styles.css +++ b/shop/static/styles.css @@ -184,11 +184,9 @@ li { display: block; font-family: Andale Mono, monospace; color: grey; - font-size: 2vw; + font-size: 150%; text-align: center; padding: 10% 10%; - float: right - text-align: center; } .cart_box { @@ -548,3 +546,18 @@ li { color: red; margin: 0px; } + +.avatar_img { + height: 100%; + margin-left: 10%; + padding: 0%; +} + +.navbar_username { + font-size: 400%; + padding-left: 20%; + font-family: Andale Mono, monospace; + color: grey; + margin-top: -10%; + +} \ No newline at end of file diff --git a/shop/templates/layout.html b/shop/templates/layout.html index 20b744593a2e5f44c3bddeff72e33bb2c379622a..beedb8852be6118205396b31c390dc8f05881828 100644 --- a/shop/templates/layout.html +++ b/shop/templates/layout.html @@ -44,7 +44,9 @@ <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> + {% 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_right"><div class = "navbar_box"><a class="navbar_item" href="{{ url_for('signup') }}">Sign up</a></div></li> diff --git a/shop/templates/user_page.html b/shop/templates/user_page.html new file mode 100644 index 0000000000000000000000000000000000000000..38a08275f7cf37c7d3ae97554eaa41318f64a8b5 --- /dev/null +++ b/shop/templates/user_page.html @@ -0,0 +1,27 @@ +{% extends "layout.html" %} + +{% block title %}Login Example{% endblock %} + +{% block page_content %} + +<div id="content-wrap"> + + +</div> + +<!--repeated footer in page as dont want every page to have it--> +<footer id="footer"> + <div class = "footer_logo_left_div"> + <img class = "footer_logo_left" src = "{{ url_for('static', filename='images/dark_logo.png') }}" alt="logo image"/> + </div> + <div class = "footer_contact"> + <p>Contact us:</p> + <p>e-mail: mpdrury15@gmail.com</p> + <p>telephone: 07874810762</p> + </div> + <div class = "footer_logo_right_div"> + <img class = "footer_logo_right" src = "{{ url_for('static', filename='images/footer_mtb.png') }}" alt="mtb image"/> + </div> +</footer> + +{% endblock %}