From 6c9c94b7331f2435cc136cf46b4de1dba0d3b71c Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Tue, 14 Dec 2021 22:48:49 +0200 Subject: [PATCH] fdsfd --- files/assets/css/main.css | 4 ++++ files/helpers/const.py | 14 +++++++++++--- files/routes/awards.py | 17 +++++++++++++++++ files/templates/authforms.html | 4 ++-- files/templates/default.html | 4 ++-- files/templates/log.html | 4 ++-- files/templates/login_2fa.html | 2 +- files/templates/settings.html | 2 +- files/templates/settings2.html | 4 ++-- files/templates/sign_up.html | 2 +- files/templates/sign_up_failed_ref.html | 2 +- files/templates/submit.html | 4 ++-- 12 files changed, 46 insertions(+), 17 deletions(-) diff --git a/files/assets/css/main.css b/files/assets/css/main.css index 5c9c972a8..1590016f7 100644 --- a/files/assets/css/main.css +++ b/files/assets/css/main.css @@ -5633,6 +5633,10 @@ blockquote p { color: #1D9BF0 !important; } +.text-red { + color: #C30F16 !important; +} + .timeline-Widget { max-height: 500px !important; overflow-y: scroll !important; diff --git a/files/helpers/const.py b/files/helpers/const.py index 747035040..15cfd1e5d 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -512,10 +512,10 @@ AWARDS = { }, "lootbox": { "kind": "lootbox", - "title": "Homoween Lootbox", + "title": "Lootstocking", "description": "???", - "icon": "fas fa-treasure-chest", - "color": "text-orange", + "icon": "fas fa-stocking", + "color": "text-red", "price": 1000 }, "shit": { @@ -674,6 +674,14 @@ AWARDS = { } AWARDS2 = { + "lootbox": { + "kind": "lootbox", + "title": "Lootstocking", + "description": "???", + "icon": "fas fa-stocking", + "color": "text-red", + "price": 1000 + }, "shit": { "kind": "shit", "title": "Shit", diff --git a/files/routes/awards.py b/files/routes/awards.py index efec4cd3a..424f69e55 100644 --- a/files/routes/awards.py +++ b/files/routes/awards.py @@ -48,6 +48,15 @@ AWARDS3 = { @auth_required def shop(v): AWARDS = { + "lootbox": { + "kind": "lootbox", + "title": "Lootstocking", + "description": "???", + "icon": "fas fa-stocking", + "color": "text-red", + "owned": 0, + "price": 1000 + }, "shit": { "kind": "shit", "title": "Shit", @@ -246,6 +255,14 @@ def shop(v): @validate_formkey def buy(v, award): AWARDS = { + "lootbox": { + "kind": "lootbox", + "title": "Lootstocking", + "description": "???", + "icon": "fas fa-stocking", + "color": "text-red", + "price": 1000 + }, "shit": { "kind": "shit", "title": "Shit", diff --git a/files/templates/authforms.html b/files/templates/authforms.html index 85219c78b..7f71a5cc6 100644 --- a/files/templates/authforms.html +++ b/files/templates/authforms.html @@ -14,11 +14,11 @@ {% if v %} - + {% if v.agendaposter %}{% elif v.css %}{% endif %} {% else %} - + {% endif %} diff --git a/files/templates/default.html b/files/templates/default.html index 034542f97..052f39a94 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -6,12 +6,12 @@ {% if v %} - + {% if v.agendaposter %}{% elif v.css %}{% endif %} {% else %} - + {% endif %} diff --git a/files/templates/log.html b/files/templates/log.html index 46cf16fc6..902b6e3d3 100644 --- a/files/templates/log.html +++ b/files/templates/log.html @@ -6,11 +6,11 @@ {% block content %} {% if v %} - + {% if v.agendaposter %}{% elif v.css %}{% endif %} {% else %} - + {% endif %}
diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html index 4f1d8d053..e889b3d38 100644 --- a/files/templates/login_2fa.html +++ b/files/templates/login_2fa.html @@ -13,7 +13,7 @@ 2-Step Login - {{'SITE_NAME' | app_config}} - + diff --git a/files/templates/settings.html b/files/templates/settings.html index 884fe91e8..38f5b54c0 100644 --- a/files/templates/settings.html +++ b/files/templates/settings.html @@ -33,7 +33,7 @@ - + {% if v.agendaposter %}{% elif v.css %}{% endif %} diff --git a/files/templates/settings2.html b/files/templates/settings2.html index 6f9900759..c5ce75dff 100644 --- a/files/templates/settings2.html +++ b/files/templates/settings2.html @@ -38,10 +38,10 @@ {% if v %} - + {% else %} - + {% endif %} diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html index d0c52476d..071de33ce 100644 --- a/files/templates/sign_up.html +++ b/files/templates/sign_up.html @@ -30,7 +30,7 @@ {% if ref_user %}{{ref_user.username}} invites you to {{'SITE_NAME' | app_config}}{% else %}Sign up - {{'SITE_NAME' | app_config}}{% endif %} - + diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html index 338b64bb4..60e9c0235 100644 --- a/files/templates/sign_up_failed_ref.html +++ b/files/templates/sign_up_failed_ref.html @@ -31,7 +31,7 @@ {% if ref_user %}{{ref_user.username}} invites you to {{'SITE_NAME' | app_config}}{% else %}{{'SITE_NAME' | app_config}}{% endif %} - + diff --git a/files/templates/submit.html b/files/templates/submit.html index 409fbce6c..c7643231b 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -25,11 +25,11 @@ {% block stylesheets %} {% if v %} - + {% if v.agendaposter %}{% elif v.css %}{% endif %} {% else %} - + {% endif %} {% endblock %}