From 9ed5edf3ff5d5718d48ee5ef681fb93d55c87f2c Mon Sep 17 00:00:00 2001
From: XD-DENG <haha@test.com>
Date: Mon, 3 Jul 2017 15:22:00 +0800
Subject: [PATCH] [1]Minor UI Change;[2]Refine logic adding new ID

---
 app.py                | 10 ++++++++--
 templates/admin.html  |  6 ++++++
 templates/layout.html |  6 ++++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/app.py b/app.py
index 7e49184..c331b10 100644
--- a/app.py
+++ b/app.py
@@ -80,13 +80,19 @@ def FUN_delete_user(id):
 def FUN_add_user():
     if session.get("current_user", None) == "ADMIN":
 
-        # before we add the user, we need to ensure this is doesn't exsit in database.
+        # before we add the user, we need to ensure this is doesn't exsit in database. We also need to ensure the id is valid.
         if request.form.get('id').upper() in list_users():
             user_list = list_users()
             user_table = zip(range(1, len(user_list)+1),\
                             user_list,\
                             [x + y for x,y in zip(["/delete_user/"] * len(user_list), user_list)])
             return(render_template("admin.html", id_is_duplicated = True, users = user_table))
+        if " " in request.form.get('id'):
+            user_list = list_users()
+            user_table = zip(range(1, len(user_list)+1),\
+                            user_list,\
+                            [x + y for x,y in zip(["/delete_user/"] * len(user_list), user_list)])
+            return(render_template("admin.html", id_is_invalid = True, users = user_table))
         else:
             add_user(request.form.get('id'), request.form.get('pw'))
             return(redirect(url_for("FUN_admin")))
@@ -98,4 +104,4 @@ def FUN_add_user():
 
 
 if __name__ == "__main__":
-    app.run(debug=True)
+    app.run(debug=True, host="0.0.0.0")
diff --git a/templates/admin.html b/templates/admin.html
index e60ca98..c045e35 100644
--- a/templates/admin.html
+++ b/templates/admin.html
@@ -9,6 +9,12 @@
       </div>
     {% endif %}
 
+    {% if id_is_invalid %}
+      <div class="text-danger">
+        <strong>Warning!</strong> The account name is invalid.
+      </div>
+    {% endif %}
+
     <div class = "container">
       <div class="row">
 
diff --git a/templates/layout.html b/templates/layout.html
index 476978f..af0f79c 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -37,8 +37,10 @@
                     <button type="submit" class="btn btn-success">Log In</button>
                 </form>
         {% else %}
-              <a><b>{{ session.get("current_user") }}</b></a>
-              <a href="/logout"><b> Logout </b></a>
+        <li>
+              <a><b>{{ session.get("current_user") }}</b></a></li>
+              <li><a href="/logout"><b><u>Logout</u></b></a>
+          </li>
         {% endif %}
         </ul>
         </div>