From a49732b54352c411881769940013e4aa89713c92 Mon Sep 17 00:00:00 2001
From: Richard Hitier <hitier.richard@gmail.com>
Date: Mon, 8 Mar 2021 16:11:57 +0100
Subject: [PATCH] Add current user to base page

---
 app/auth/routes.py                |  1 +
 app/auth/templates/login.html     | 13 +++++++------
 app/cli/__init__.py               | 17 ++++++-----------
 app/templates/base_page.html      | 24 +++++++++++-------------
 app/templates/flash-messages.html |  9 +++++++++
 5 files changed, 34 insertions(+), 30 deletions(-)
 create mode 100644 app/templates/flash-messages.html
diff --git a/app/auth/routes.py b/app/auth/routes.py
index c50c89d..c9c63e5 100644
--- a/app/auth/routes.py
+++ b/app/auth/routes.py
@@ -16,6 +16,7 @@ def login_post():
     user_password = request.form.get('password')
     user_remember = request.form.get('remember')
     user = User.query.filter_by(login=user_login).one_or_none()
+    print("user login: {}, user password: {}".format(user.login, user.password))
     if user and user.password == user_password:
         # login code goes here
         login_user(user)
diff --git a/app/auth/templates/login.html b/app/auth/templates/login.html
index f9a9976..9975e8e 100644
--- a/app/auth/templates/login.html
+++ b/app/auth/templates/login.html
@@ -5,18 +5,19 @@
   <link href="{{ url_for('auth.static', filename='signin.css') }}" rel="stylesheet" type="text/css"/>
 </head>
 <body class="text-center">
-  <form class="form-signin" method="POST" action="{{ url_for('auth.login')}}">
+  <form action="{{ url_for('auth.login')}}" class="form-signin" method="POST">
+    {% include 'flash-messages.html' %}
 
     <img class="mb-4" height="72" src="{{ url_for('static', filename='img/pdc.png') }}" width="72">
     <h1 class="h3 font-weight-normal mb-3">Connectez vous</h1>
     <label class="sr-only" for="login">Email Adress</label>
-    <input autofocus class="form-control" name="login" id="login" placeholder="identifiant" required >
+    <input autofocus class="form-control" id="login" name="login" placeholder="identifiant" required>
     <label class="sr-only" for="password">Password</label>
-    <input class="form-control" name="password" id="password" placeholder="mot de passe" required type="password">
+    <input class="form-control" id="password" name="password" placeholder="mot de passe" required type="password">
 
     <div class="checkbox my-3">
-      <label class="text-muted" data-toggle="tooltip" data-placement="top" title="désactivé">
-        <input type="checkbox" id="remember" name="remember" value="true" disabled > Se souvenir de moi
+      <label class="text-muted" data-placement="top" data-toggle="tooltip" title="désactivé">
+        <input disabled id="remember" name="remember" type="checkbox" value="true"> Se souvenir de moi
       </label>
     </div>
 
@@ -26,6 +27,6 @@
       {% include 'copy.html' %}
     </div>
   </form>
-{% include 'bs4-scripts.html' %}
+  {% include 'bs4-scripts.html' %}
 </body>
 </html>
diff --git a/app/cli/__init__.py b/app/cli/__init__.py
index d19791d..cee95a9 100644
--- a/app/cli/__init__.py
+++ b/app/cli/__init__.py
@@ -16,7 +16,7 @@ def delete(user_id):
 @bp.cli.command('create_db')
 def create():
     db.create_all()
-    admin = User(email='groz@free.fr', name='richard', password='1champ1')
+    admin = User(email='groz@free.fr', name='richard', login='richard', password='1champ1')
     db.session.add(admin)
     db.session.commit()
 
@@ -34,20 +34,15 @@ def add(email, name, password):
 
 @bp.cli.command('show_all')
 def show_all():
-    print("{:<5} {:<15} {:<15} {:<15}".format('id', 'name', 'passwd', 'email'))
-    print("{:<5} {:<15} {:<15} {:<15}".format('-' * 5, '-' * 15, '-' * 15, '-' * 15))
+    print("{:<5} {:<15} {:<15} {:<15} {:<15}".format('id', 'name', 'login', 'passwd', 'email'))
+    print("{:<5} {:<15} {:<15} {:<15} {:<15}".format('-' * 5, '-' * 15, '-' * 15, '-' * 15, '-' * 15))
     for user in User.query.all():
-        print("{:<5} {:<15} {:<15} {:<15}".format(
+        print(user.login)
+        print("{:<5} {:<15} {:<15} {:<15} {:<15}".format(
             user.id,
             user.name,
+            user.login,
             user.password,
             user.email
         ))
 
-
-@bp.cli.command('create')
-def create():
-    db.create_all()
-    admin = User(email='groz@free.fr', name='richard', password='1champ1')
-    db.session.add(admin)
-    db.session.commit()
diff --git a/app/templates/base_page.html b/app/templates/base_page.html
index 64e55ef..af3c330 100644
--- a/app/templates/base_page.html
+++ b/app/templates/base_page.html
@@ -8,9 +8,16 @@
 
   <nav class="navbar navbar-dark sticky-top bg-dark flex-md-nowrap p-0">
     <a class="navbar-brand col-sm-3 col-md-2 mr-0" href="#">Plan de Charges</a>
+    {% if not current_user.is_anonymous %}
     <ul class="navbar-nav px-3">
       <li class="nav-item text-nowrap">
-        <a class="nav-link" href="{{ url_for('auth.login') }}">Sign out</a>
+        <a class="nav-link" >Bienvenue {{current_user.name}}</a>
+      </li>
+    </ul>
+    {% endif %}
+    <ul class="navbar-nav px-3">
+      <li class="nav-item text-nowrap">
+        <a class="nav-link" href="{{ url_for('auth.login') }}">Déconnecter</a>
       </li>
     </ul>
   </nav>
@@ -105,18 +112,9 @@
       </nav>
 
       <main class="container" role="main">
-        {% with messages = get_flashed_messages(with_categories=true) %}
-        {% if messages %}
-        <div id="messages">
-          {% for level, message in messages %}
-          <div class="alert alert-{{level}}" role="alert">{{ message }}</div>
-          {% endfor %}
-        </div>
-        {% endif %}
-        {% endwith %}
-
-        {%block content%}
-        {%endblock%}
+        {% include 'flash-messages.html' %}
+        {% block content %}
+        {% endblock %}
       </main>
 
     </div>
diff --git a/app/templates/flash-messages.html b/app/templates/flash-messages.html
new file mode 100644
index 0000000..ceae420
--- /dev/null
+++ b/app/templates/flash-messages.html
@@ -0,0 +1,9 @@
+  {% with messages = get_flashed_messages(with_categories=true) %}
+  {% if messages %}
+  <div id="messages">
+    {% for level, message in messages %}
+    <div class="alert alert-{{level}}" role="alert">{{ message }}</div>
+    {% endfor %}
+  </div>
+  {% endif %}
+  {% endwith %}
--
libgit2 0.21.2

