From 19fbecda5672511d36cc5ec2793a3fd53c09d39a Mon Sep 17 00:00:00 2001 From: lubiana Date: Wed, 21 Feb 2024 22:02:07 +0100 Subject: [PATCH 1/2] =?UTF-8?q?k=C3=B6nnte=20so=20klappen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +- Website/templates/addtag.html | 51 ++++++++--------- Website/templates/adduser.html | 18 +++--- Website/templates/base.html | 35 +++++++----- Website/templates/change.html | 7 +-- Website/templates/confirmation.html | 33 ++++++----- Website/templates/documentation.html | 25 +++----- Website/templates/error.html | 14 ++--- Website/templates/index.html | 17 +++--- Website/templates/list.html | 64 +++++++++++---------- Website/templates/redirect.html | 20 ++++--- Website/templates/removetag.html | 9 ++- Website/templates/removeuser.html | 11 ++-- Website/templates/user.html | 85 +++++++++++++++------------- 14 files changed, 205 insertions(+), 187 deletions(-) diff --git a/.gitignore b/.gitignore index 4a73e55..89bbf08 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,5 @@ flask_session/ /test/.pytest_cache/ /test/flask_session/ /Website/__pycache__/ -/Website/.pytest_cache/ \ No newline at end of file +/Website/.pytest_cache/ +/.idea \ No newline at end of file diff --git a/Website/templates/addtag.html b/Website/templates/addtag.html index 98b5c17..4d564ae 100644 --- a/Website/templates/addtag.html +++ b/Website/templates/addtag.html @@ -1,26 +1,25 @@ - - - - - \ No newline at end of file +{% extends "base.html" %} +{% block customscript %} + +{% endblock %} diff --git a/Website/templates/adduser.html b/Website/templates/adduser.html index a1a74e0..1d2c97a 100644 --- a/Website/templates/adduser.html +++ b/Website/templates/adduser.html @@ -1,8 +1,10 @@ - - - add user -

user and tag list | Documentation

-

-

-

- +{% extends "base.html" %} +{% block title %} +add user +{% endblock %} +{% block content %} +
+ +
+

+{% endblock %} diff --git a/Website/templates/base.html b/Website/templates/base.html index 0925b8d..07f8b40 100644 --- a/Website/templates/base.html +++ b/Website/templates/base.html @@ -1,17 +1,24 @@ - - - {% block title %} {% endblock %} - FlaskApp - - - - -
-
- {% block content %} {% endblock %} -
- + + {% block title %}{% endblock %} + + + {% block customscript %}{% endblock %} + + + +
+
+ {% block content %} {% endblock %} +
+ \ No newline at end of file diff --git a/Website/templates/change.html b/Website/templates/change.html index c2d9635..e2d4a92 100644 --- a/Website/templates/change.html +++ b/Website/templates/change.html @@ -1,6 +1,5 @@ - - - +{% extends "base.html" %} +{% block customscript %} - \ No newline at end of file +{% endblock %} \ No newline at end of file diff --git a/Website/templates/confirmation.html b/Website/templates/confirmation.html index b6b96e4..0c676e2 100644 --- a/Website/templates/confirmation.html +++ b/Website/templates/confirmation.html @@ -1,17 +1,16 @@ - - - - +{% extends "base.html" %} +{% block customscript %} + +{% endblock %} diff --git a/Website/templates/documentation.html b/Website/templates/documentation.html index d290e17..16c3c95 100644 --- a/Website/templates/documentation.html +++ b/Website/templates/documentation.html @@ -1,16 +1,11 @@ - - - - Documentation - - - - - -
-

index page | user and tag list

-

https://hannover.ccc.de/gitlab/anton/matekasse

-
+{% extends "base.html" %} +{% block title %} +Documentation +{% endblock %} +{% block customscript %} + +{% endblock %} +{% block content %}

Documentation

 

@@ -46,6 +41,4 @@

638: Wrong Input

418: I'm a teapot

- - - +{% endblock %} diff --git a/Website/templates/error.html b/Website/templates/error.html index 00fb406..08b73df 100644 --- a/Website/templates/error.html +++ b/Website/templates/error.html @@ -1,8 +1,8 @@ - - - Error -

user and tag list | Documentation

-

+{% extends "base.html" %} +{% block title %}Error{% endblock %} +{% block customscript %} +

user and tag list | Documentation

+

Error: {{error_code}} -

- \ No newline at end of file +

+{% endblock %} \ No newline at end of file diff --git a/Website/templates/index.html b/Website/templates/index.html index 75f4c32..68e5bbc 100644 --- a/Website/templates/index.html +++ b/Website/templates/index.html @@ -1,11 +1,12 @@ - - user and tag list +{% extends "base.html" %} +{% block customscript %} + +{% endblock %} +{% block content %} +user and tag list

The creator of this website accepts no liability for any linguistic or technical errors!



Doumentation - - - +{% endblock %} diff --git a/Website/templates/list.html b/Website/templates/list.html index e03038e..6196ea5 100644 --- a/Website/templates/list.html +++ b/Website/templates/list.html @@ -1,29 +1,35 @@ - - - - - Strichliste -

user and tag list | Documentation

-
-
-

- {% for i in users %} -
-

- {{i[1]|safe}}: {{i[2]/100}}€ -

- - -
-
- - -
-

- {% endfor %} - +{% extends "base.html" %} +{% block title %} +Strichliste +{% endblock %} +{% block customscript %} + +{% endblock %} +{% block content %} +
+ +
+
+ +
+

+{% for i in users %} +
+

+ {{i[1]|safe}}: {{i[2]/100}}€ +

+ + +
+
+ + +
+

+{% endfor %} +{% endblock %} diff --git a/Website/templates/redirect.html b/Website/templates/redirect.html index 9848c78..089634e 100644 --- a/Website/templates/redirect.html +++ b/Website/templates/redirect.html @@ -1,8 +1,12 @@ - - - -

redirekting

- destination - +{% extends "base.html" %} +{% block title %} +{% endblock %} +{% block content %} +

redirekting

+destination +{% endblock %} +{% block customscript %} + +{% endblock %} diff --git a/Website/templates/removetag.html b/Website/templates/removetag.html index f84d34d..42b87d7 100644 --- a/Website/templates/removetag.html +++ b/Website/templates/removetag.html @@ -1,7 +1,6 @@ - - - - - \ No newline at end of file +{% endblock %} diff --git a/Website/templates/removeuser.html b/Website/templates/removeuser.html index b6c9ea6..1e2031d 100644 --- a/Website/templates/removeuser.html +++ b/Website/templates/removeuser.html @@ -1,9 +1,10 @@ - - remove user +{% extends "base.html" %} +{% block title %} + remove user +{% endblock %} +{% block content %}

-

- user and tag list | Documentation -

Deleted user {{user_name|safe}}

return to the tags and user list

+{% endblock %} diff --git a/Website/templates/user.html b/Website/templates/user.html index 4bafdf4..7bdb05a 100644 --- a/Website/templates/user.html +++ b/Website/templates/user.html @@ -1,39 +1,46 @@ - - - - - {{user[1]|safe}} -

user and tag list | Documentation

-

{{user[1]|safe}} : {{user[2]/100}}€

-

- - -
-
- - -
-

-
- - -
-

-

-

Tags:

- {% for tag in tags %} -

-

- - - - -
-

- {% endfor %} -

-
- +{% extends "base.html" %} +{% block customscript %} + +{% endblock %} +{% block title %} + {{user[1]|safe}} +{% endblock %} +{% block content %} +

user and tag list | Documentation

+

{{user[1]|safe}} : {{user[2]/100}}€

+

+ + +
+
+ + +
+

+
+ + +
+

+

+

Tags:

+{% for tag in tags %} +

+

+ + + + +
+

+{% endfor %} +

+
+ +
+{% endblock %} -- 2.39.5 From 1f227df35892cd4acb7aa597615c75e55a7684fc Mon Sep 17 00:00:00 2001 From: lubiana Date: Wed, 21 Feb 2024 22:13:24 +0100 Subject: [PATCH 2/2] hupsala noch was vergessen --- Website/templates/user.html | 1 - 1 file changed, 1 deletion(-) diff --git a/Website/templates/user.html b/Website/templates/user.html index 7bdb05a..eca6f5f 100644 --- a/Website/templates/user.html +++ b/Website/templates/user.html @@ -11,7 +11,6 @@ {{user[1]|safe}} {% endblock %} {% block content %} -

user and tag list | Documentation

{{user[1]|safe}} : {{user[2]/100}}€

-- 2.39.5