From 717aa0b3f71d3f96171025357c66009177640ef6 Mon Sep 17 00:00:00 2001
From: Miguel Barão <miguel.barao@gmail.com>
Date: Wed, 28 Feb 2018 17:06:36 +0000
Subject: [PATCH] - cleanup if/elif/else in serve.py - removed uid from navbar, name is enough - fixed navbar menu alignment

---
 learnapp.py               |  2 +-
 serve.py                  | 40 ++++++++++++++++++----------------------
 templates/maintopics.html | 35 ++++++++++++++++++-----------------
 templates/topic.html      |  3 +--
 4 files changed, 38 insertions(+), 42 deletions(-)

diff --git a/learnapp.py b/learnapp.py
index ddc711d..695ccdf 100644
--- a/learnapp.py
+++ b/learnapp.py
@@ -184,7 +184,7 @@ class LearnApp(object):
                 n = s.query(Student).count()
                 m = s.query(Topic).count()
                 q = s.query(Answer).count()
-        except Exception as e:
+        except Exception:
             logger.critical(f'Database "{db}" not usable!')
             sys.exit(1)
         else:
diff --git a/serve.py b/serve.py
index 97aa379..7bb3eba 100755
--- a/serve.py
+++ b/serve.py
@@ -15,7 +15,6 @@ import tornado.ioloop
 import tornado.web
 import tornado.httpserver
 from tornado import template, iostream, gen
-
 from tornado.concurrent import run_on_executor
 from tornado.platform.asyncio import to_tornado_future
 
@@ -267,26 +266,24 @@ class QuestionHandler(BaseHandler):
                     'comments': tornado.escape.to_unicode(comments_html), # FIXME
                     }
                 })
-        else:                   # answer is correct
-            if question is None:        # finished topic
-                finished_topic_html = self.render_string('finished_topic.html')
-                self.write({
-                    'method': 'finished_topic',
-                    'params': {
-                        'question': tornado.escape.to_unicode(finished_topic_html)
-                        }
-                    })
-
-            else:                       # continue with a new question
-                template = self.templates[question['type']]
-                question_html = self.render_string(template, question=question, md=md_to_html)
-                self.write({
-                    'method': 'new_question',
-                    'params': {
-                        'question': tornado.escape.to_unicode(question_html),
-                        'progress': self.learn.get_student_progress(user),
-                        }
-                    })
+        elif question is None:  # right answer, finished topic
+            finished_topic_html = self.render_string('finished_topic.html')
+            self.write({
+                'method': 'finished_topic',
+                'params': {
+                    'question': tornado.escape.to_unicode(finished_topic_html)
+                    }
+                })
+        else:                  # right answer, get next question in the topic
+            template = self.templates[question['type']]
+            question_html = self.render_string(template, question=question, md=md_to_html)
+            self.write({
+                'method': 'new_question',
+                'params': {
+                    'question': tornado.escape.to_unicode(question_html),
+                    'progress': self.learn.get_student_progress(user),
+                    }
+                })
 
 # -------------------------------------------------------------------------
 # Tornado web server
@@ -343,7 +340,6 @@ def main():
 
     # --- run webserver
     logging.info('Webserver running...')
-
     try:
         tornado.ioloop.IOLoop.current().start()  # running...
     except KeyboardInterrupt:
diff --git a/templates/maintopics.html b/templates/maintopics.html
index 3bd93d8..ed17d6a 100644
--- a/templates/maintopics.html
+++ b/templates/maintopics.html
@@ -43,10 +43,9 @@
         <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
           <i class="fas fa-user" aria-hidden="true"></i>
           <span id="name">{{ escape(name) }}</span>
-          (<span id="number">{{ escape(uid) }}</span>)
           <span class="caret"></span>
         </a>
-        <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+        <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
           <button class="dropdown-item" data-toggle="modal" data-target="#password_modal">Mudar Password</button>
           <div class="dropdown-divider"></div>
           <a class="dropdown-item" href="/logout">Sair</a>
@@ -68,7 +67,7 @@
         <a class="list-group-item list-group-item-action bg-light disabled">
           <div class="d-flex justify-content-start">
             <div class="p-2 font-italic text-muted">
-              {{ t['name'] }}
+              ({{ t['name'] }})
             </div>
             <div class="ml-auto p-2">
               <i class="fas fa-lock text-danger"></i>
@@ -78,22 +77,24 @@
       {% else %}
         <a class="list-group-item list-group-item-action" href="/topic/{{t['ref']}}">
           <div class="d-flex justify-content-start">
-            <div class="p-2">
-              {{ t['name'] }}
-            </div>
-            <div class="ml-auto p-2">
-              {% if t['level'] < 0.01 %}
+            {% if t['level'] < 0.01 %}
+              <div class="p-2">{{ t['name'] }}</div>
+              <div class="ml-auto p-2">
                 <i class="fas fa-lock-open text-success"></i>
-              {% else %}
-                {% if t['type']=='chapter' %}
-                  <i class="fas fa-trophy fa-lg text-warning"></i>
-                {% else %}
-                  <span class="text-nowrap">
+              </div>
+            {% elif t['type']=='chapter' %}
+              <div class="p-2 font-weight-light">{{ t['name'] }}</div>
+              <div class="ml-auto p-2">
+                <i class="fas fa-trophy fa-lg text-warning"></i>
+              </div>
+            {% else %}
+              <div class="p-2">{{ t['name'] }}</div>
+              <div class="ml-auto p-2">
+                <span class="text-nowrap">
                   {{ round(t['level']*5)*'<i class="fas fa-star text-warning"></i>' + (5-round(t['level']*5))*'<i class="far fa-star text-warning"></i>' }}
-                  </span>
-                {% end %}
-              {% end %}
-            </div>
+                </span>
+              </div>
+            {% end %}
           </div>
         </a>
       {% end %}
diff --git a/templates/topic.html b/templates/topic.html
index c92aea2..4eff694 100644
--- a/templates/topic.html
+++ b/templates/topic.html
@@ -55,10 +55,9 @@
                 <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                     <i class="fas fa-user" aria-hidden="true"></i>
                     <span id="name">{{ escape(name) }}</span>
-                    (<span id="number">{{ escape(uid) }}</span>)
                     <span class="caret"></span>
                 </a>
-                <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
                     <!-- <div class="dropdown-divider"></div> -->
                     <a class="dropdown-item" href="/">Voltar aos tópicos</a>
                 </div>
--
libgit2 0.21.2