From 0e9103108dc1af315481961defd6ffb28a37b1a2 Mon Sep 17 00:00:00 2001
From: "Ethan Clay (UWE)" <ethan2.clay@live.uwe.ac.uk>
Date: Fri, 13 Dec 2024 11:41:48 +0000
Subject: [PATCH] Remove testing debug comment, begin to add manage bookings
and begin to build out profile functionality
---
app/profile/routes.py | 10 ++++++++--
app/templates/base.html | 8 ++++----
app/templates/profile/index.html | 1 -
app/templates/profile/login.html | 1 -
app/templates/profile/manage_bookings.html | 7 +++++++
5 files changed, 19 insertions(+), 8 deletions(-)
create mode 100644 app/templates/profile/manage_bookings.html
diff --git a/app/profile/routes.py b/app/profile/routes.py
index a22e49b..353072a 100644
--- a/app/profile/routes.py
+++ b/app/profile/routes.py
@@ -5,7 +5,6 @@ from werkzeug.security import generate_password_hash, check_password_hash
from app.models import User
from app import db
from flask_login import login_user, logout_user, login_required, current_user
-from app.logger import app_logger
@bp.route('/signup')
def signup():
@@ -57,8 +56,15 @@ def login():
@login_required
@bp.route('/home')
def index():
- app_logger.error("Logger accessed on profile page")
if current_user.is_authenticated:
return render_template('profile/index.html', username=current_user.username)
+ return redirect(url_for('profile.login'))
+
+@login_required
+@bp.route('/manage_bookings')
+def manage_bookings():
+ if current_user.is_authenticated:
+ return render_template('profile/manage_bookings.html', username=current_user.username)
+
return redirect(url_for('profile.login'))
\ No newline at end of file
diff --git a/app/templates/base.html b/app/templates/base.html
index 8918486..0864006 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -17,7 +17,7 @@
<div class="navigation">
<nav class="navbar navbar-expand-lg navbar-dark nav_background p-3">
<div class="container-fluid">
- <a class="navbar-brand" href="#">Horizon Travels</a>
+ <a class="navbar-brand" href="{{ url_for('bookings.index') }}">Horizon Travels</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
@@ -25,7 +25,7 @@
<div class=" collapse navbar-collapse" id="navbarNavDropdown">
<ul class="navbar-nav ms-auto ">
<li class="nav-item">
- <a class="nav-link mx-2 active" aria-current="page" href="#">Home</a>
+ <a class="nav-link mx-2 active" aria-current="page" href="{{ url_for('main.index') }}">Home</a>
</li>
<li class="nav-item">
<a class="nav-link mx-2" href="{{ url_for('bookings.index') }}">Find a booking</a>
@@ -36,8 +36,8 @@
</a>
<ul class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
{% if user_in_session %}
- <li><a class="dropdown-item" href="#">Account Details</a></li>
- <li><a class="dropdown-item" href="#">My Bookings</a></li>
+ <li><a class="dropdown-item" href="{{ url_for('profile.index') }}">Account Details</a></li>
+ <li><a class="dropdown-item" href="{{ url_for('profile.manage_bookings')}}">My Bookings</a></li>
<li><a class="dropdown-item" href="{{ url_for('profile.logout') }}">Log Out</a></li>
{% else %}
<li><a class="dropdown-item" href="{{ url_for('profile.login') }}">Log In</a></li>
diff --git a/app/templates/profile/index.html b/app/templates/profile/index.html
index f899369..b59772c 100644
--- a/app/templates/profile/index.html
+++ b/app/templates/profile/index.html
@@ -1,5 +1,4 @@
{% extends 'base.html' %}
-# Implements CSS Slider from https://swiffyslider.com/docs/
{% block content %}
<div>
<p>Welcome {{username}}!</p>
diff --git a/app/templates/profile/login.html b/app/templates/profile/login.html
index ddb577c..2fb3775 100644
--- a/app/templates/profile/login.html
+++ b/app/templates/profile/login.html
@@ -1,5 +1,4 @@
{% extends 'base.html' %}
-# Implements CSS Slider from https://swiffyslider.com/docs/
{% block content %}
<div class="column is-4 is-offset-4">
<h3 class="title">Login</h3>
diff --git a/app/templates/profile/manage_bookings.html b/app/templates/profile/manage_bookings.html
new file mode 100644
index 0000000..e094c38
--- /dev/null
+++ b/app/templates/profile/manage_bookings.html
@@ -0,0 +1,7 @@
+{% extends 'base.html' %}
+{% block content %}
+<div>
+ <p>Welcome {{username}}, manage bookings here!</p>
+
+</div>
+{% endblock %}
\ No newline at end of file
--
GitLab