From e7df511aa7c8bccba035a3121226dfb7c17d618c Mon Sep 17 00:00:00 2001
From: "Ethan Clay (Student)"
<ethan2.clay@live.uwe.ac.uk@csctcloud.prxhn32zsyjupl12zde3wlfkch.cwx.internal.cloudapp.net>
Date: Fri, 25 Oct 2024 11:38:07 +0100
Subject: [PATCH] Hook up bookings and home items on nav bar
---
app/__init__.py | 9 +++++++--
app/__pycache__/__init__.cpython-38.pyc | Bin 757 -> 845 bytes
app/bookings/routes.py | 8 ++++++--
app/main/__pycache__/routes.cpython-38.pyc | Bin 514 -> 514 bytes
app/static/base.css | 4 ++++
app/templates/base.html | 10 ++++++----
6 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/app/__init__.py b/app/__init__.py
index 8b60638..d6526d6 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -4,10 +4,15 @@ from flask import Flask
from config import Config
+from flask_cookies import Cookies
+
+
def create_app(config_class=Config):
app = Flask(__name__)
app.config.from_object(config_class)
-
+ #Cookies, can add optional Google Tag Manager ID below
+ cookies = Cookies()
+ cookies.init_app(app)
# Initialize Flask extensions here
# Register blueprints here
@@ -17,7 +22,7 @@ def create_app(config_class=Config):
from app.bookings import bp as bookings_bp
app.register_blueprint(bookings_bp, url_prefix='/bookings')
- @app.route('/test/')
+ @app.route('/test')
def test_page():
return '<h1>Testing the Flask Application Factory Pattern</h1>'
diff --git a/app/__pycache__/__init__.cpython-38.pyc b/app/__pycache__/__init__.cpython-38.pyc
index ba6e4f839384b94fe5e798434c441f1f5eda512f..a442c802f1d5525948c0f498ae48da9b052c7402 100644
GIT binary patch
delta 516
zcmey$dX|kZl$V!_fq{YHWr1{h9P>mz8Ag+d+S2tY3@OYxEV-;vtc(n)%xR1%EGeul
zj8SYUY{3kg>@Pt&G#PKPy5%GmXKOOvVsp;VOUq2xWW2@hoS&banOdC82vP&ZYzzzx
zEDQ_`&I}9;#aRpt3?&RDjLnR-j5Ul|ObeK67#1=zGL*11Gt@HGFfCxMVRQotq%fv1
z<*?<l*D^CQ)G#jKs9}bSa^|wvvVcUhIBHl@m{VAKnLxY+Tq&#z8B^F&*jpHy8EaW5
zKG9)g)h|gcE}1OOn83}>z`#%hAtpC5nlnmH-o>cJ$UXTfql$D9$bC^9nR%Hd@reZm
zQ5=Z{1$w!OnR!L5lSP?y>)CGcB!m4JpPZ9eTzrc;v7q1<doskcQS2a<@ks?y+({sj
zy!7Juq=F(&gnb|u2Ll7cEw1FE)WnihkR70KFBSs@5hDj94-*?B7Yh#~7ZVR79}@>7
z7juyi0|SGfCi^Ycw4B87;_M<OkRjY4f|-GVA&NH*6!`H_CxG1#)&lh*NFCU(U~4&S
Xa`RJ4b5iX<T8lyP!NbJE#KQ~#HEePe
delta 429
zcmX@h_LY?{l$V!_fq{WxqBURod8UbcGK?A%wWaG*nbR0km{V9<7^7HHSc4ff*<ONF
zX)@kob<0UC&emkS#pax!mzJ5H%m|WzVpawQ1{MYe24@BahT<p&28I%b62@l6TE-g2
zET#p_H4F<G85vR-Q<!pCa#?Gc7#V697qHbZ!A03~S!<aY8EWJiv)F2wK@RAJDB?(A
zUC5Zimcrh`(9BrNGMSrEhn-EoB(=Cif3huO0yi52149vnn7o3~oKa-*14b=I&dJ<N
zDm+mfi3J6Exrv#1MJ$uOm~`t|Z}B99-5#HulUQ7Qi#f5NAc`HNAU>%eiaRMkKRYuo
zy*NIppojxuE{Mg>z`$^eE4e5&u_QG<v7i9NFBSrMo{@u*hn0tsi;0JkkBNhki@8XE
zfq}tKll2yB8YsYum_YhLL0x3R3}S+$p)Lk-!EOf`cZ<U&H$SB`C)Ez5tQZuUJWM=H
E006#NX#fBK
diff --git a/app/bookings/routes.py b/app/bookings/routes.py
index e68d45f..20bb997 100644
--- a/app/bookings/routes.py
+++ b/app/bookings/routes.py
@@ -1,6 +1,10 @@
-from flask import render_template
+from flask import render_template, redirect, url_for
from app.bookings import bp
-@bp.route('/')
+@bp.route('/home')
def index():
return render_template('bookings/index.html')
+
+@bp.route('/')
+def redirect_index():
+ return redirect(url_for('bookings.index'), code=301)
\ No newline at end of file
diff --git a/app/main/__pycache__/routes.cpython-38.pyc b/app/main/__pycache__/routes.cpython-38.pyc
index 0c13488dc05aa40a79b2d12379a20a916b702b7b..9b36710729d79139face7d8615b7d382d8d65b88 100644
GIT binary patch
delta 20
bcmZo-X=33H<>lpKU|?Xd%97s5{hbj2B;N!C
delta 20
bcmZo-X=33H<>lpKU|?Xl<H)y>`#U25C>8{8
diff --git a/app/static/base.css b/app/static/base.css
index 5d8707b..dfa6489 100644
--- a/app/static/base.css
+++ b/app/static/base.css
@@ -79,6 +79,10 @@
flex: 1; /* Allows content to expand */
}
+.wrapper {
+ flex: 1;
+}
+
/*
Remove default padding which occurs around the nav bar on some browsers such as Edge and setup default font.
This should be changed where required on inherited elements
diff --git a/app/templates/base.html b/app/templates/base.html
index 015645e..f2ea15d 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -1,5 +1,4 @@
<!-- Core HTML page which includes navigation bar and footer and determines the order in which items are loaded, all other templates should extend this base template -->
-
<!DOCTYPE html>
<html>
<head>
@@ -16,8 +15,8 @@
<img src="{{ url_for('static', filename='images/nav_icon.jpeg')}}">
<nav class="navbar">
<ul>
- <li class="nav_list_item"><a href="#">Home</a></li>
- <li class="nav_list_item"><a href="#">About</a></li>
+ <li class="nav_list_item"><a href="{{ url_for('main.index') }}">Home</a></li>
+ <li class="nav_list_item"><a href="{{ url_for('bookings.index') }}">Bookings</a></li>
<li class="nav_list_item"><a href="#">Pricing</a></li>
<li class="nav_list_item"><a href="#">Terms of use</a></li>
<li class="nav_list_item"><a href="#">Contact</a></li>
@@ -34,7 +33,10 @@
<footer>
<div class="footer">
<div class="row">
- <div class="footer_column">About Us</div>
+ <div class="footer_column">
+ <div><a >About Us</div>
+ <div>About Us</div>
+ </div>
<div class="footer_column">Contact</div>
<div class="footer_column">Login</div>
</div>
--
GitLab