From f52ff4287cb2456888161440b6a342fd3dd068c5 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Fri, 18 Feb 2022 16:23:14 +0200 Subject: [PATCH] xcv --- Dockerfile | 8 ++------ files/templates/authforms.html | 4 ++-- files/templates/award_modal.html | 2 +- files/templates/default.html | 4 ++-- files/templates/log.html | 4 ++-- files/templates/login.html | 2 +- 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, 18 insertions(+), 22 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0de37149e..19d3917ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,13 +6,9 @@ RUN apt update && apt install -y python3.8 python3-pip supervisor curl COPY imei.sh /etc/imei.sh -RUN /etc/imei.sh +COPY requirements.txt /etc/requirements.txt -RUN mkdir -p ./service - -COPY requirements.txt ./service/requirements.txt - -RUN pip3 install -r requirements.txt +RUN /etc/imei.sh && pip3 install -r /etc/requirements.txt RUN mkdir /images && mkdir /songs diff --git a/files/templates/authforms.html b/files/templates/authforms.html index d5d0a8d36..634dcf64d 100644 --- a/files/templates/authforms.html +++ b/files/templates/authforms.html @@ -15,7 +15,7 @@ {% if v %} - + {% if v.agendaposter %} - + {% endif %} diff --git a/files/templates/award_modal.html b/files/templates/award_modal.html index 6d002712e..7abdfa5dd 100644 --- a/files/templates/award_modal.html +++ b/files/templates/award_modal.html @@ -13,7 +13,7 @@
{% for award in v.user_awards %} - +
{{award.title}}
{{award.owned}} owned
diff --git a/files/templates/default.html b/files/templates/default.html index 111bd5a4f..0083e363f 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -7,7 +7,7 @@ {% if v %} - + {% if v.agendaposter %} - + {% endif %} {% if sub and sub.css and not request.path.endswith('settings') %} diff --git a/files/templates/log.html b/files/templates/log.html index 3184895ac..50f366f50 100644 --- a/files/templates/log.html +++ b/files/templates/log.html @@ -6,7 +6,7 @@ {% block content %} {% if v %} - + {% if v.agendaposter %} - + {% endif %}
diff --git a/files/templates/login.html b/files/templates/login.html index 5854fb80f..e02f5ba50 100644 --- a/files/templates/login.html +++ b/files/templates/login.html @@ -18,7 +18,7 @@ {% endblock %} - + diff --git a/files/templates/login_2fa.html b/files/templates/login_2fa.html index 69a30f88c..38039f30d 100644 --- a/files/templates/login_2fa.html +++ b/files/templates/login_2fa.html @@ -14,7 +14,7 @@ 2-Step Login - {{SITE_NAME}} - + diff --git a/files/templates/settings.html b/files/templates/settings.html index 700114312..f71357a9e 100644 --- a/files/templates/settings.html +++ b/files/templates/settings.html @@ -34,7 +34,7 @@ - + {% if v.agendaposter %} - + {% else %} - + {% endif %} diff --git a/files/templates/sign_up.html b/files/templates/sign_up.html index 528e06842..1555f5bbe 100644 --- a/files/templates/sign_up.html +++ b/files/templates/sign_up.html @@ -31,7 +31,7 @@ {% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}Sign up - {{SITE_NAME}}{% endif %} - + diff --git a/files/templates/sign_up_failed_ref.html b/files/templates/sign_up_failed_ref.html index 66a21839d..852d87c1c 100644 --- a/files/templates/sign_up_failed_ref.html +++ b/files/templates/sign_up_failed_ref.html @@ -32,7 +32,7 @@ {% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}{{SITE_NAME}}{% endif %} - + diff --git a/files/templates/submit.html b/files/templates/submit.html index 03c34d163..fd35e2cda 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -26,7 +26,7 @@ {% block stylesheets %} {% if v %} - + {% if v.agendaposter %} - + {% endif %} {% endblock %}