Hook up bookings and home items on nav bar

e7df511a · Ethan Clay (Student) · 266bea70 · e7df511a · e7df511a · e7df511a
Commit e7df511a authored 6 months ago by Ethan Clay (Student)
--- 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>'


--- a/app/__pycache__/__init__.cpython-38.pyc
+++ b/app/__pycache__/__init__.cpython-38.pyc
--- a/app/bookings/routes.py
+++ b/app/bookings/routes.py
-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
--- a/app/main/__pycache__/routes.cpython-38.pyc
+++ b/app/main/__pycache__/routes.cpython-38.pyc
--- 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 

--- a/app/templates/base.html
+++ b/app/templates/base.html
 <!-- 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>