From 5826f1d5dcc7e76e19bd881db9afaefa9778b24f Mon Sep 17 00:00:00 2001 From: Imipenem Date: Sat, 7 Nov 2020 20:21:18 +0100 Subject: [PATCH] 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 --- cookietemple_website/app.py | 2 +- cookietemple_website/basic/__init__.py | 5 -- cookietemple_website/routes/__init__.py | 5 ++ .../{basic => routes}/routes.py | 2 +- .../templates/code_of_conduct.html | 31 +----------- cookietemple_website/templates/head.html | 46 ++++++++++++++++++ cookietemple_website/templates/header.html | 3 ++ cookietemple_website/templates/index.html | 34 ++------------ cookietemple_website/templates/join.html | 38 +-------------- cookietemple_website/templates/ourstory.html | 36 +------------- cookietemple_website/templates/showoff.html | 30 +----------- cookietemple_website/templates/stats.html | 47 +------------------ cookietemple_website/templates/templates.html | 31 +----------- tests/test_cookietemple_website.py | 5 +- 14 files changed, 73 insertions(+), 242 deletions(-) delete mode 100644 cookietemple_website/basic/__init__.py create mode 100644 cookietemple_website/routes/__init__.py rename cookietemple_website/{basic => routes}/routes.py (97%) create mode 100644 cookietemple_website/templates/head.html diff --git a/cookietemple_website/app.py b/cookietemple_website/app.py index 85b0933..eeb2c36 100755 --- 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 deleted file mode 100644 index 35bfe83..0000000 --- a/cookietemple_website/basic/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -from flask import Blueprint - -bp = Blueprint('basic', __name__) - -from cookietemple_website.basic import routes # noqa: E402, F401 diff --git a/cookietemple_website/routes/__init__.py b/cookietemple_website/routes/__init__.py new file mode 100644 index 0000000..1e165ac --- /dev/null +++ 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 b/cookietemple_website/routes/routes.py similarity index 97% rename from cookietemple_website/basic/routes.py rename to cookietemple_website/routes/routes.py index a46558c..24f84f8 100644 --- a/cookietemple_website/basic/routes.py +++ b/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 index 62e4061..86cb64c 100644 --- a/cookietemple_website/templates/code_of_conduct.html +++ b/cookietemple_website/templates/code_of_conduct.html @@ -1,37 +1,10 @@ - - - CoC Cookietemple - - - - - - - - - - - - - - - - - - + Cookietemple CoC + {% include 'head.html' %} - diff --git a/cookietemple_website/templates/head.html b/cookietemple_website/templates/head.html new file mode 100644 index 0000000..b7978ea --- /dev/null +++ b/cookietemple_website/templates/head.html @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cookietemple_website/templates/header.html b/cookietemple_website/templates/header.html index 34550d7..b219335 100644 --- a/cookietemple_website/templates/header.html +++ b/cookietemple_website/templates/header.html @@ -17,6 +17,9 @@
  • Templates
    • +
  • + Code +
  • Documentation
    • diff --git a/cookietemple_website/templates/index.html b/cookietemple_website/templates/index.html index e0fa4fc..cef3992 100644 --- a/cookietemple_website/templates/index.html +++ b/cookietemple_website/templates/index.html @@ -1,37 +1,11 @@  - + - - - cookietemple - - - - - - - - - - - - - - - - - - - + Cookietemple + {% include 'head.html' %} +