Refactored HTML head

- common HTML head now in head.html - fixed #30 and #17 (renamed basic dir -> routes dir), (added Code navbar element, that links to CT Github repo) - .json files to .gitignore
cookiejar · Nov 7, 2020 · 5826f1d · 5826f1d
1 parent 8e2c2e5
commit 5826f1d
Show file tree

Hide file tree

Showing 14 changed files with 73 additions and 242 deletions.
diff --git a/cookietemple_website/app.py b/cookietemple_website/app.py
@@ -11,6 +11,6 @@
 
 app.register_blueprint(errors_bp)
 
-from cookietemple_website.basic import bp as basic_bp  # noqa: E402
+from cookietemple_website.routes import bp as basic_bp  # noqa: E402
 
 app.register_blueprint(basic_bp)
diff --git a/cookietemple_website/basic/__init__.py b/cookietemple_website/basic/__init__.py
diff --git a/cookietemple_website/routes/__init__.py b/cookietemple_website/routes/__init__.py
@@ -0,0 +1,5 @@
+from flask import Blueprint
+
+bp = Blueprint('basic', __name__)
+
+from cookietemple_website.routes import routes  # noqa: E402, F401
diff --git a/cookietemple_website/basic/routes.py → cookietemple_website/routes/routes.py b/cookietemple_website/basic/routes.py → cookietemple_website/routes/routes.py
@@ -1,7 +1,7 @@
 from flask import render_template, redirect, url_for
 import json
 
-from cookietemple_website.basic import bp
+from cookietemple_website.routes import bp
 
 
 @bp.route('/')

diff --git a/cookietemple_website/templates/code_of_conduct.html b/cookietemple_website/templates/code_of_conduct.html
@@ -1,37 +1,10 @@
 <!doctype html>
 <html lang="en">
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <title>CoC Cookietemple</title>
-    <meta name="description" content="The cookietemple Website">
-    <meta name="author" content="Philipp Ehmele">
-
-    <link href="../static/assets/css/bootstrap.min.css" rel="stylesheet">
-    <link href="../static/assets/css/code_highlighting/github.css" rel="stylesheet">
-    <!-- Other JS -->
-    <script src="../static/assets/js/jquery-3.4.1.min.js"></script>
-    <script src="../static/assets/js/popper.min.js"></script>
-    <script src="../static/assets/js/bootstrap.min.js"></script>
-    <script src="../static/assets/js/highlight.pack.js"></script>
-
-    <link href="../static/assets/css/jquery-ui.min.css" rel="stylesheet">
-    <script src="../static/assets/js/jquery-ui.min.js"></script>
-
-    <link href="../static/assets/css/cookietemple.css" rel="stylesheet">
-    <link href="../static/assets/css/cookietemple-dark.css" rel="stylesheet" id="theme-stylesheet">
-    <script src="../static/assets/js/cookietemple.js"></script>
-    <script>window.dataLayer = window.dataLayer || [];
-
-    function gtag() {
-        dataLayer.push(arguments);
-    }
-
-    gtag('js', new Date());
-    gtag('config', 'UA-68098153-2'); </script>
+    <title>Cookietemple CoC</title>
+    {% include 'head.html' %}
 </head>
 <body>
-
 <nav class="navbar fixed-top navbar-expand-md navbar-light site-nav">
 {% include 'header.html' %}
 </nav>

diff --git a/cookietemple_website/templates/head.html b/cookietemple_website/templates/head.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta name="description" content="The cookietemple Website">
+    <meta name="author" content="Philipp Ehmele">
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"
+          integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+    <link href="../static/assets/css/bootstrap.min.css" rel="stylesheet">
+    <link href="../static/assets/css/code_highlighting/github.css" rel="stylesheet">
+    <link href="../static/assets/css/leaflet.css" rel="stylesheet">
+    <link href="../static/assets/css/Chart.min.css" rel="stylesheet">
+    <!-- FontAwesome -->
+    <script src="https://kit.fontawesome.com/471b59d3f8.js"></script>
+    <!-- Other JS -->
+    <script src="../static/assets/js/jquery-3.4.1.min.js"></script>
+    <script src="../static/assets/js/popper.min.js"></script>
+    <script src="../static/assets/js/bootstrap.min.js"></script>
+    <script src="../static/assets/js/highlight.pack.js"></script>
+    <script src="../static/assets/js/leaflet.js"></script>
+    <!-- Page-specific CSS and JS -->
+    <script src="../static/assets/js/moment.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.9.4/Chart.min.js"></script>
+    <script src="../static/assets/js/hammer.min.js"></script>
+    <script src="../static/assets/js/chartjs-plugin-zoom.min.js"></script>
+    <script src="../static/assets/js/canvas2svg.js"></script>
+    <script src="../static/assets/js/FileSaver.js"></script>
+    <link href="../static/assets/css/jquery-ui.min.css" rel="stylesheet">
+    <script src="../static/assets/js/jquery-ui.min.js"></script>
+    <script src="../static/assets/js/moment.js"></script>
+    <script src="../static/assets/js/showdown.min.js"></script>
+    <script src="../static/assets/js/jquery.tablesorter.min.js"></script>
+
+    <!-- Custom cookietemple CSS and JS -->
+    <link href="../static/assets/css/cookietemple.css" rel="stylesheet">
+    <link href="../static/assets/css/cookietemple-dark.css" rel="stylesheet" id="theme-stylesheet">
+    <script src="../static/assets/js/cookietemple.js"></script>
+    <script>window.dataLayer = window.dataLayer || [];
+
+    function gtag() {
+        dataLayer.push(arguments);
+    }
+
+    gtag('js', new Date());
+    gtag('config', 'UA-68098153-2'); </script>
+</html>
diff --git a/cookietemple_website/templates/header.html b/cookietemple_website/templates/header.html
@@ -17,6 +17,9 @@
             <li class="nav-item p-1">
                 <a class="nav-link" href="/templates">Templates</a>
             </li>
+            <li class="nav-item p-1">
+                <a class="nav-link" href="https://github.com/cookiejar/cookietemple">Code</a>
+            </li>
             <li class="nav-item p-1">
                 <a class="nav-link" href="https://cookietemple.readthedocs.io">Documentation</a>
             </li>

diff --git a/cookietemple_website/templates/index.html b/cookietemple_website/templates/index.html
@@ -1,37 +1,11 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <title>cookietemple</title>
-    <meta name="description" content="The cookietemple Website">
-    <meta name="author" content="Philipp Ehmele">
-
-    <link href="../static/assets/css/bootstrap.min.css" rel="stylesheet">
-    <link href="../static/assets/css/code_highlighting/github.css" rel="stylesheet">
-
-    <!-- Other JS -->
-    <script src="../static/assets/js/jquery-3.4.1.min.js"></script>
-    <script src="../static/assets/js/popper.min.js"></script>
-    <script src="../static/assets/js/bootstrap.min.js"></script>
-    <script src="../static/assets/js/highlight.pack.js"></script>
-    <!-- Page-specific CSS and JS -->
-    <link href="../static/assets/css/jquery-ui.min.css" rel="stylesheet">
-    <script src="../static/assets/js/jquery-ui.min.js"></script>
-
-    <link href="../static/assets/css/cookietemple.css" rel="stylesheet">
-    <link href="../static/assets/css/cookietemple-dark.css" rel="stylesheet" id="theme-stylesheet">
-    <script src="../static/assets/js/cookietemple.js"></script>
-    <script>window.dataLayer = window.dataLayer || [];
-
-    function gtag() {
-        dataLayer.push(arguments);
-    }
-
-    gtag('js', new Date());
-    gtag('config', 'UA-68098153-2'); </script>
+    <title>Cookietemple</title>
+    {% include 'head.html' %}
 </head>
 
+
 <body>
 <nav class="navbar fixed-top navbar-expand-md navbar-light site-nav">
 {% include 'header.html' %}

diff --git a/cookietemple_website/templates/join.html b/cookietemple_website/templates/join.html
@@ -1,42 +1,8 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <title>Join cookietemple</title>
-    <meta name="description" content="The cookietemple Website">
-    <meta name="author" content="Philipp Ehmele">
-
-    <link href="../static/assets/css/bootstrap.min.css" rel="stylesheet">
-    <link href="../static/assets/css/code_highlighting/github.css" rel="stylesheet">
-    <link href="../static/assets/css/leaflet.css" rel="stylesheet">
-    <link href="../static/assets/css/Chart.min.css" rel="stylesheet">
-    <!-- FontAwesome -->
-    <script src="https://kit.fontawesome.com/471b59d3f8.js"></script>
-    <!-- Other JS -->
-    <script src="../static/assets/js/jquery-3.4.1.min.js"></script>
-    <script src="../static/assets/js/popper.min.js"></script>
-    <script src="../static/assets/js/bootstrap.min.js"></script>
-    <script src="../static/assets/js/highlight.pack.js"></script>
-    <script src="../static/assets/js/leaflet.js"></script>
-    <!-- Page-specific CSS and JS -->
-    <script src="../static/assets/js/moment.js"></script>
-    <link href="../static/assets/css/jquery-ui.min.css" rel="stylesheet">
-    <script src="../static/assets/js/jquery-ui.min.js"></script>
-
-
-    <link href="../static/assets/css/cookietemple.css" rel="stylesheet">
-    <link href="../static/assets/css/cookietemple-dark.css" rel="stylesheet" id="theme-stylesheet">
-    <script src="../static/assets/js/cookietemple.js"></script>
-
-    <script>window.dataLayer = window.dataLayer || [];
-
-    function gtag() {
-        dataLayer.push(arguments);
-    }
-
-    gtag('js', new Date());
-    gtag('config', 'UA-68098153-2'); </script>
+    {% include 'head.html' %}
 </head>
 <body>
 <nav class="navbar fixed-top navbar-expand-md navbar-light site-nav">

diff --git a/cookietemple_website/templates/ourstory.html b/cookietemple_website/templates/ourstory.html
@@ -1,27 +1,8 @@
 <!doctype html>
 <html lang="en">
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <title>About cookietemple</title>
-    <meta name="description" content="The cookietemple Website">
-    <meta name="author" content="Philipp Ehmele">
-
-    <link href="../static/assets/css/bootstrap.min.css" rel="stylesheet">
-    <link href="../static/assets/css/code_highlighting/github.css" rel="stylesheet">
-    <!-- Other JS -->
-    <script src="../static/assets/js/jquery-3.4.1.min.js"></script>
-    <script src="../static/assets/js/popper.min.js"></script>
-    <script src="../static/assets/js/bootstrap.min.js"></script>
-    <script src="../static/assets/js/highlight.pack.js"></script>
-
-    <link href="../static/assets/css/jquery-ui.min.css" rel="stylesheet">
-    <script src="../static/assets/js/jquery-ui.min.js"></script>
-
-    <link href="../static/assets/css/cookietemple.css" rel="stylesheet">
-    <link href="../static/assets/css/cookietemple-dark.css" rel="stylesheet" id="theme-stylesheet">
-    <script src="../static/assets/js/cookietemple.js"></script>
-
+    <title>Cookietemple Our Story</title>
+    {% include 'head.html' %}
     <style type="text/css">
         .zoomin img {
             height: 200px;
@@ -164,20 +145,7 @@
             -ms-filter: blur(0px);
             filter: blur(0px);
         }
-
-
     </style>
-
-    <script>window.dataLayer = window.dataLayer || [];
-
-    function gtag() {
-        dataLayer.push(arguments);
-    }
-
-    gtag('js', new Date());
-    gtag('config', 'UA-68098153-2'); </script>
-
-
 </head>
 <body>
 <nav class="navbar fixed-top navbar-expand-md navbar-light site-nav">

diff --git a/cookietemple_website/templates/showoff.html b/cookietemple_website/templates/showoff.html
@@ -1,34 +1,8 @@
 <!doctype html>
 <html lang="en">
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <title>Showoff cookietemple</title>
-    <meta name="description" content="The cookietemple Website">
-    <meta name="author" content="Philipp Ehmele">
-
-    <link href="../static/assets/css/bootstrap.min.css" rel="stylesheet">
-    <link href="../static/assets/css/code_highlighting/github.css" rel="stylesheet">
-    <!-- Other JS -->
-    <script src="../static/assets/js/jquery-3.4.1.min.js"></script>
-    <script src="../static/assets/js/popper.min.js"></script>
-    <script src="../static/assets/js/bootstrap.min.js"></script>
-    <script src="../static/assets/js/highlight.pack.js"></script>
-
-    <link href="../static/assets/css/jquery-ui.min.css" rel="stylesheet">
-    <script src="../static/assets/js/jquery-ui.min.js"></script>
-
-    <link href="../static/assets/css/cookietemple.css" rel="stylesheet">
-    <link href="../static/assets/css/cookietemple-dark.css" rel="stylesheet" id="theme-stylesheet">
-    <script src="../static/assets/js/cookietemple.js"></script>
-    <script>window.dataLayer = window.dataLayer || [];
-
-    function gtag() {
-        dataLayer.push(arguments);
-    }
-
-    gtag('js', new Date());
-    gtag('config', 'UA-68098153-2'); </script>
+    <title>Cookietemple showoff</title>
+    {% include 'head.html' %}
 </head>
 <body>
 

diff --git a/cookietemple_website/templates/stats.html b/cookietemple_website/templates/stats.html
@@ -1,53 +1,10 @@
 <!doctype html>
 <html lang="en">
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <title>Cookietemple</title>
-    <meta name="description" content="The cookietemple Website">
-    <meta name="author" content="Philipp Ehmele">
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"
-          integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
-    <link href="../static/assets/css/bootstrap.min.css" rel="stylesheet">
-    <link href="../static/assets/css/code_highlighting/github.css" rel="stylesheet">
-    <link href="../static/assets/css/leaflet.css" rel="stylesheet">
-    <link href="../static/assets/css/Chart.min.css" rel="stylesheet">
-    <!-- FontAwesome -->
-    <script src="https://kit.fontawesome.com/471b59d3f8.js"></script>
-    <!-- Other JS -->
-    <script src="../static/assets/js/jquery-3.4.1.min.js"></script>
-    <script src="../static/assets/js/popper.min.js"></script>
-    <script src="../static/assets/js/bootstrap.min.js"></script>
-    <script src="../static/assets/js/highlight.pack.js"></script>
-    <script src="../static/assets/js/leaflet.js"></script>
-    <!-- Page-specific CSS and JS -->
-    <script src="../static/assets/js/moment.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.9.4/Chart.min.js"></script>
-    <script src="../static/assets/js/hammer.min.js"></script>
-    <script src="../static/assets/js/chartjs-plugin-zoom.min.js"></script>
-    <script src="../static/assets/js/canvas2svg.js"></script>
-    <script src="../static/assets/js/FileSaver.js"></script>
-    <link href="../static/assets/css/jquery-ui.min.css" rel="stylesheet">
-    <script src="../static/assets/js/jquery-ui.min.js"></script>
-    <script src="../static/assets/js/moment.js"></script>
-    <script src="../static/assets/js/showdown.min.js"></script>
-    <script src="../static/assets/js/jquery.tablesorter.min.js"></script>
-
-    <!-- Custom cookietemple CSS and JS -->
-    <link href="../static/assets/css/cookietemple.css" rel="stylesheet">
-    <link href="../static/assets/css/cookietemple-dark.css" rel="stylesheet" id="theme-stylesheet">
-    <script src="../static/assets/js/cookietemple.js"></script>
-    <script>window.dataLayer = window.dataLayer || [];
-
-    function gtag() {
-        dataLayer.push(arguments);
-    }
-
-    gtag('js', new Date());
-    gtag('config', 'UA-68098153-2'); </script>
+    <title>Cookietemple statistics</title>
+    {% include 'head.html' %}
 </head>
 <body>
-
 <nav class="navbar fixed-top navbar-expand-md navbar-light site-nav">
     {% include 'header.html' %}
 </nav>

diff --git a/cookietemple_website/templates/templates.html b/cookietemple_website/templates/templates.html
@@ -1,35 +1,8 @@
 <!doctype html>
 <html lang="en">
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <title>Templates of cookietemple</title>
-    <meta name="description" content="The cookietemple Website">
-    <meta name="author" content="Philipp Ehmele">
-
-    <link href="../static/assets/css/bootstrap.min.css" rel="stylesheet">
-    <link href="../static/assets/css/code_highlighting/github.css" rel="stylesheet">
-    <!-- Other JS -->
-    <script src="../static/assets/js/jquery-3.4.1.min.js"></script>
-    <script src="../static/assets/js/popper.min.js"></script>
-    <script src="../static/assets/js/bootstrap.min.js"></script>
-    <script src="../static/assets/js/highlight.pack.js"></script>
-    <!-- Page-specific CSS and JS -->
-    <script src="../static/assets/js/moment.js"></script>
-    <link href="../static/assets/css/jquery-ui.min.css" rel="stylesheet">
-    <script src="../static/assets/js/jquery-ui.min.js"></script>
-
-    <link href="../static/assets/css/cookietemple.css" rel="stylesheet">
-    <link href="../static/assets/css/cookietemple-dark.css" rel="stylesheet" id="theme-stylesheet">
-    <script src="../static/assets/js/cookietemple.js"></script>
-    <script>window.dataLayer = window.dataLayer || [];
-
-    function gtag() {
-        dataLayer.push(arguments);
-    }
-
-    gtag('js', new Date());
-    gtag('config', 'UA-68098153-2'); </script>
+    <title>Cookietemple Templates</title>
+    {% include 'head.html' %}
 </head>
 <body>
 <nav class="navbar fixed-top navbar-expand-md navbar-light site-nav">