diff --git a/Notes.docx b/Notes.docx index 1704163..1d3ba75 100644 Binary files a/Notes.docx and b/Notes.docx differ diff --git a/blog-app/blogapp/routes.py b/blog-app/blogapp/routes.py index 3789918..93eae17 100644 --- a/blog-app/blogapp/routes.py +++ b/blog-app/blogapp/routes.py @@ -4,19 +4,16 @@ from blogapp.forms import RegistrationForm, LoginForm from blogapp.models import User, Post -navbaritems = [ +pagetitle = [ { - 'name': 'Home', - 'url': '/home' + 'title': 'home' }, { - 'name': 'Login', - 'url': '/login' + 'title': 'login' }, { - 'name': 'Register', - 'url': '/register' + 'title': 'register' } ] @@ -24,7 +21,7 @@ navbaritems = [ @app.route("/") @app.route("/home") def home(): - return render_template('home.html', title='Home', navbaritems=navbaritems) + return render_template('home.html', title='home', pagetitle=pagetitle) @app.route("/register", methods=['GET', 'POST']) @@ -33,7 +30,7 @@ def register(): if form.validate_on_submit(): flash(f'Account created for {form.username.data}!') return redirect(url_for('home')) - return render_template('register.html', title='Register', form=form, navbaritems=navbaritems) + return render_template('register.html', title='register', form=form, pagetitle=pagetitle) @app.route("/login", methods=['GET', 'POST']) @@ -45,4 +42,4 @@ def login(): return redirect(url_for('home')) else: flash('Login Unsuccessful') - return render_template('login.html', title='Login', form=form, navbaritems=navbaritems) + return render_template('login.html', title='login', form=form, pagetitle=pagetitle) diff --git a/blog-app/blogapp/templates/layout.html b/blog-app/blogapp/templates/layout.html index 94f05be..61a302b 100644 --- a/blog-app/blogapp/templates/layout.html +++ b/blog-app/blogapp/templates/layout.html @@ -15,9 +15,11 @@ {% block navbar %} - {% for post in navbaritems %} -
  • {{ post.name }}
  • - {% endfor %} + {% endblock %} {% with messages = get_flashed_messages(with_categories=true) %} @@ -30,9 +32,9 @@ {% endif %} {% endwith %} - {% for post in navbaritems %} - {% if title == post.name %} -

    {{ post.name }}

    + {% for head in pagetitle %} + {% if title == head.title %} +

    {{ head.title }}

    {% endif %} {% endfor %}