From d068d24bb9b27f45189d42c94b5bd3fe008dbb30 Mon Sep 17 00:00:00 2001 From: MikaelKrats <mikael.krats@gmail.com> Date: Thu, 16 Feb 2023 16:12:50 +0200 Subject: [PATCH] Changed the brand name and added a simple navigation bar --- src/tjts5901/app.py | 2 +- src/tjts5901/templates/base.html | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/src/tjts5901/app.py b/src/tjts5901/app.py index 09bcb2ff..718e27ee 100644 --- a/src/tjts5901/app.py +++ b/src/tjts5901/app.py @@ -36,7 +36,7 @@ def create_app(config: Optional[Dict] = None) -> Flask: flask_app.config.from_mapping( SECRET_KEY='dev', - BRAND="Frozen auction page", + BRAND="The Frozen Auction", ) init_logging(flask_app) diff --git a/src/tjts5901/templates/base.html b/src/tjts5901/templates/base.html index a6315a9d..90620a4f 100644 --- a/src/tjts5901/templates/base.html +++ b/src/tjts5901/templates/base.html @@ -11,6 +11,37 @@ <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.6.2/dist/css/bootstrap.min.css" integrity="sha384-xOolHFLEh07PJGoPkLv1IbcEPTNtaed2xpHsD9ESMhqIYd0nLMwNLD69Npy4HI+N" crossorigin="anonymous"> <link rel="stylesheet" href="{{ url_for('static', filename='styles.css') }}"> + <nav class="navbar navbar-expand-lg navbar-dark bg-dark"> + <a class="navbar-brand" href="{{url_for('views.index')}}">{{config['BRAND']}}</a> + <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarColor01" + aria-controls="navbarColor01" aria-expanded="false" aria-label="Toggle navigation"> + <span class="navbar-toggler-icon"></span> + </button> + + <div class="collapse navbar-collapse" id="navbarTogglerDemo03"> + """ + <ul class="navbar-nav mr-auto"> + <li class="nav-item active"> + <a class="nav-link" href="{{ url_for('views.list_bid') }}">Buy</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="{{ url_for('views.add_item') }}">Sell</a> + </li> + </ul> + """ + <ul class="navbar-nav"> + {% if g.user %} + <li class="nav-item"><span>{{ g.user['username'] }}</span></li> + <li class="nav-item"><a href="{{ url_for('auth.profile', email='me') }}" class="nav-link">My pro</a></li> + <li class="nav-item"><a href="{{ url_for('auth.logout') }}" class="nav-link">Log Out</a></li> + {% else %} + <li class="nav-item"><a href="{{ url_for('auth.register') }}" class="nav-link">Register</a> + <li class="nav-item"><a href="{{ url_for('auth.login') }}" class="nav-link">Log In</a> + {% endif %} + </ul> + </div> + </nav> + </head> <body class="bg-secondary"> -- GitLab