From b693bcdabcdb7b5b31efa9dd684ed93cfc3e3a74 Mon Sep 17 00:00:00 2001
From: tiyn <tiyn@mail-mk.eu>
Date: Mon, 1 Aug 2022 00:54:00 +0200
Subject: [PATCH] src: cleanup

---
 src/app.py                    | 14 +++++++++-----
 src/content.py                |  7 ++++---
 src/database.py               | 14 +++++---------
 src/static/css/style.css      | 20 +++++++++++++++-----
 src/templates/archive.html    |  1 +
 src/templates/error.html      |  1 +
 src/templates/index.html      |  1 +
 src/templates/standalone.html |  1 +
 src/templates/template.html   | 10 ++++++++--
 9 files changed, 45 insertions(+), 24 deletions(-)

diff --git a/src/app.py b/src/app.py
index 24901fc..89838c9 100644
--- a/src/app.py
+++ b/src/app.py
@@ -32,34 +32,38 @@ REGISTER = config.REGISTER
 
 @app.errorhandler(404)
 def page_not_found(e):
-    return render_template("error.html", title=TITLE, errorcode="404", style=STYLE), 404
+    return render_template("error.html", title=TITLE, errorcode="404",
+                           style=STYLE), 404
 
 
 @app.route("/")
 @app.route("/index.html")
 def index():
     content = con_gen.gen_index_string()
-    return render_template("index.html", title=TITLE, content_string=content, style=STYLE)
+    return render_template("index.html", title=TITLE, content_string=content,
+                           style=STYLE)
 
 
 @app.route("/archive")
 @app.route("/archive.html")
 def archive():
     content = con_gen.gen_arch_string()
-    return render_template("archive.html", title=TITLE, content_string=content, style=STYLE)
+    return render_template("archive.html", title=TITLE, content_string=content,
+                           style=STYLE)
 
 
 @app.route("/entry/<ident>")
 def entry(ident):
     content = con_gen.gen_stand_string(ident)
     if content != "":
-        return render_template("standalone.html", title=TITLE, content_string=content, style=STYLE)
+        return render_template("standalone.html", title=TITLE,
+                               content_string=content, style=STYLE)
     abort(404)
 
 
 @app.route("/feed")
-@app.route("/rss")
 @app.route("/feed.xml")
+@app.route("/rss")
 @app.route("/rss.xml")
 def feed():
     content = con_gen.get_rss_string()
diff --git a/src/content.py b/src/content.py
index 6adef1a..b4949d1 100644
--- a/src/content.py
+++ b/src/content.py
@@ -35,6 +35,7 @@ def gen_arch_string():
     if entries is None:
         return ""
     entries.sort(key=lambda y: y[2])
+    entries.reverse()
     for entry in entries:
         ident = entry[0]
         title = entry[1]
@@ -47,9 +48,9 @@ def gen_arch_string():
             content_string += "<ul>\n"
             last_year = year
         content_string += "<li>"
-        content_string += "[<a href=\"" + url_for("index", _anchor=str(ident)) + \
-            "\">link</a> - <a href=\"" + url_for("entry", ident=str(ident)) + \
-            "\">standalone</a>] "
+        content_string += "[<a href=\"" + \
+            url_for("index", _anchor=str(ident)) + "\">link</a> - <a href=\"" \
+            + url_for("entry", ident=str(ident)) + "\">standalone</a>] "
         content_string += title + " " + rating_to_star(rating)
         content_string += "<br></li>\n"
 
diff --git a/src/database.py b/src/database.py
index ef7295e..05cbcf9 100644
--- a/src/database.py
+++ b/src/database.py
@@ -69,7 +69,8 @@ class Database:
         if self.check_user_name(user.name) and user.pass_hash is not None:
             db = self.connect()
             crs = db.cursor()
-            query = "INSERT INTO " + self.USER_TABLE_FILE + "(`name`,`password`)" + \
+            query = "INSERT INTO " + self.USER_TABLE_FILE + \
+                    "(`name`,`password`)" + \
                     "VALUES (?, ?) ON CONFLICT DO NOTHING"
             crs.execute(query, (user.name, user.pass_hash))
             db.commit()
@@ -82,8 +83,9 @@ class Database:
         db = self.connect()
         crs = db.cursor()
         reviewed = dt.today().strftime('%Y-%m-%d')
-        query = "INSERT INTO " + self.ENTRY_TABLE_FILE + "(`name`,`date`, `text`, `rating`, `user_id`, `reviewed`)" + \
-                "VALUES (?, ?, ?, ?, ?, ?)"
+        query = "INSERT INTO " + self.ENTRY_TABLE_FILE + \
+            "(`name`,`date`, `text`, `rating`, `user_id`, `reviewed`)" + \
+            "VALUES (?, ?, ?, ?, ?, ?)"
         crs.execute(query, (name, date, text, rating, user_id, reviewed))
         db.commit()
         return crs.lastrowid
@@ -125,9 +127,3 @@ class Database:
         user = User(name, pass_hash)
         user.set_id(ident)
         return user
-
-
-#db = Database()
-#db.insert_entry("name", "2020", "text", 50, 1)
-#res = db.get_entries()
-# print(res)
diff --git a/src/static/css/style.css b/src/static/css/style.css
index 1d1a16d..305b4ef 100644
--- a/src/static/css/style.css
+++ b/src/static/css/style.css
@@ -38,6 +38,21 @@ footer .center {
     text-align: center;
 }
 
+li:not(:last-child) {
+    margin-bottom: 5px;
+}
+
+ol {
+    margin: 10px 0;
+    padding-left: 20;
+}
+
+ul {
+    margin: 10px 0;
+    padding-left: 20;
+}
+
+
 .container {
     min-height: 100%;
     padding-bottom: 50px;
@@ -162,8 +177,3 @@ footer .center {
 .entry h2 {
     margin: 5px auto 2px auto;
 }
-
-.entry ul {
-    padding-left: 20;
-}
-
diff --git a/src/templates/archive.html b/src/templates/archive.html
index bd3f2ae..caf0806 100644
--- a/src/templates/archive.html
+++ b/src/templates/archive.html
@@ -1,4 +1,5 @@
 {% extends "template.html" %}
+
 {% block content %}
 <div class="container">
     <div class="blogarchive">
diff --git a/src/templates/error.html b/src/templates/error.html
index 84571ce..f64f168 100644
--- a/src/templates/error.html
+++ b/src/templates/error.html
@@ -1,4 +1,5 @@
 {% extends "template.html" %}
+
 {% block content %}
 <div class="container">
     <div class="important">
diff --git a/src/templates/index.html b/src/templates/index.html
index db050ab..3587204 100644
--- a/src/templates/index.html
+++ b/src/templates/index.html
@@ -1,4 +1,5 @@
 {% extends "template.html" %}
+
 {% block content %}
 <div class="container">
     <div class="blog">
diff --git a/src/templates/standalone.html b/src/templates/standalone.html
index 0eebc6d..81944bc 100644
--- a/src/templates/standalone.html
+++ b/src/templates/standalone.html
@@ -1,4 +1,5 @@
 {% extends "template.html" %}
+
 {% block content %}
 <div class="container">
     <div class="standalone">
diff --git a/src/templates/template.html b/src/templates/template.html
index d170056..f9b11bb 100644
--- a/src/templates/template.html
+++ b/src/templates/template.html
@@ -1,3 +1,8 @@
+{% set navigation_bar = [
+    (url_for("index"), 'index', 'Blog'),
+    (url_for("archive"), 'archive', 'Archive')
+] -%}
+
 <html>
 <head>
     <title>{{ title }}</title>
@@ -13,8 +18,9 @@
         <input type="checkbox" id="main-menu-check">
         <label for="main-menu-check" class="show-menu">&#9776;</label>
         <div class="main-menu">
-            <a href="{{ url_for('index') }}">Blog</a>
-            <a href="{{ url_for('archive') }}">Archive</a>
+            {% for href, id, caption in navigation_bar %}
+            <a href="{{ href|e }}">{{ caption|e }}</a>
+            {% endfor %}
             <label for="main-menu-check" class="hide-menu">X</label>
         </div>
     </div>