fix: hotfix 3.13.8 serve static files (#241)

Co-authored-by: hicham <hicham.taroq-ext@aphp.fr>
aphp · Aug 3, 2023 · 2e14048 · 2e14048
1 parent 2e82e7a
commit 2e14048
Show file tree

Hide file tree

Showing 9 changed files with 106 additions and 110 deletions.
diff --git a/admin_cohort/__init__.py b/admin_cohort/__init__.py
@@ -1,5 +1,5 @@
 __title__ = 'Portail/Cohort360 API'
-__version__ = '3.13.7'
+__version__ = '3.13.8'
 __author__ = 'Assistance Publique - Hopitaux de Paris, Département I&D'
 
 

diff --git a/admin_cohort/settings.py b/admin_cohort/settings.py
@@ -124,9 +124,6 @@
 
 ROOT_URLCONF = 'admin_cohort.urls'
 
-MEDIA_ROOT = BASE_DIR / 'admin_cohort/media'
-MEDIA_URL = '/media/'
-
 TEMPLATES = [{'BACKEND': 'django.template.backends.django.DjangoTemplates',
               'DIRS': [BASE_DIR / 'admin_cohort/templates'],
               'APP_DIRS': True,

diff --git a/admin_cohort/static/admin_cohort/css/login.css b/admin_cohort/static/admin_cohort/css/login.css
@@ -0,0 +1,79 @@
+.center {
+    display: block;
+    margin: 5% auto;
+    width: 50%;
+}
+
+body {
+    margin: 0;
+    padding: 0;
+    background-color: #FAFAFA;
+}
+
+.login {
+    width: 382px;
+    overflow: hidden;
+    margin: auto;
+    padding: 80px;
+    border-radius: 15px;
+}
+
+.login-background {
+    margin: auto;
+    padding-top: 15%;
+    padding-bottom: 2%;
+    border-radius: 15px;
+    background: #1e488e;
+    text-align: center;
+}
+
+h2 {
+    text-align: center;
+    color: #5BC5F2;
+    padding: 20px;
+}
+
+label {
+    color: #5BC5F2;
+    font-size: 17px;
+}
+
+#id_username {
+    width: 300px;
+    height: 30px;
+    padding-left: 8px;
+}
+
+#id_password {
+    width: 300px;
+    height: 30px;
+    padding-left: 8px;
+}
+
+#login {
+    width: 150px;
+    height: 30px;
+    border: none;
+    border-radius: 17px;
+    padding-left: 7px;
+    background-color: #5BC5F2;
+    color: #FFFFFF;
+    margin-top: 2%;
+}
+
+#login:hover {
+    cursor: pointer;
+}
+
+span {
+    color: white;
+    font-size: 17px;
+}
+
+input {
+    margin-bottom: 2%;
+}
+
+input:focus {
+    outline: none !important;
+}
diff --git a/...ia/Logo_user_data_SVG_cohort360_small.png → ...mg/Logo_user_data_SVG_cohort360_small.png b/...ia/Logo_user_data_SVG_cohort360_small.png → ...mg/Logo_user_data_SVG_cohort360_small.png
diff --git a/admin_cohort/static/admin_cohort/img/favicon.ico b/admin_cohort/static/admin_cohort/img/favicon.ico
diff --git a/admin_cohort/media/logo-aphp-white.png → ...atic/admin_cohort/img/logo-aphp-white.png b/admin_cohort/media/logo-aphp-white.png → ...atic/admin_cohort/img/logo-aphp-white.png
diff --git a/admin_cohort/templates/login.html b/admin_cohort/templates/login.html
@@ -1,108 +1,28 @@
+{% load static %}
 <!DOCTYPE html>
 <html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Login</title>
-</head>
-<body>
-<div id="login-form-wrap">
-    <div class="login">
-        <img src="/media/Logo_user_data_SVG_cohort360_small.png" alt="Cohort360" class="center"/>
-        <div class="login-background">
-            <form method="post" id="login-form">
-                {% csrf_token %}
-                <input type="text" id="id_username" name="username" placeholder="Username"><i
-                    class="validation"><span></span><span></span></i>
-                <input type="password" id="id_password" name="password" placeholder="Password" required><i
-                    class="validation"><span></span><span></span></i>
-                <input type="submit" id="login" value="Login">
-            </form>
-            <img src="/media/logo-aphp-white.png" alt="Cohort360" class="center"/>
+    <head>
+        <meta charset="UTF-8">
+        <link rel="icon" href="{% static 'admin_cohort/img/favicon.ico' %}"/>
+        <title>Login</title>
+        <link rel="stylesheet" href="{% static 'admin_cohort/css/login.css' %}">
+    </head>
+    <body>
+        <div id="login-form-wrap">
+            <div class="login">
+                <img src="{% static 'admin_cohort/img/Logo_user_data_SVG_cohort360_small.png' %}" alt="Cohort360" class="center"/>
+                <div class="login-background">
+                    <form method="post" id="login-form">
+                        {% csrf_token %}
+                        <input type="text" id="id_username" name="username" placeholder="Username"><i
+                            class="validation"><span></span><span></span></i>
+                        <input type="password" id="id_password" name="password" placeholder="Password" required><i
+                            class="validation"><span></span><span></span></i>
+                        <input type="submit" id="login" value="Login">
+                    </form>
+                    <img src="{% static 'admin_cohort/img/logo-aphp-white.png' %}" alt="Cohort360" class="center"/>
+                </div>
+            </div>
         </div>
-    </div>
-</div>
-
-</body>
+    </body>
 </html>
-
-<style media="screen">
-    .center {
-        display: block;
-        margin: 5% auto;
-        width: 50%;
-    }
-
-    body {
-        margin: 0;
-        padding: 0;
-        background-color: #FAFAFA;
-    }
-
-    .login {
-        width: 382px;
-        overflow: hidden;
-        margin: auto;
-        padding: 80px;
-        border-radius: 15px;
-    }
-
-    .login-background {
-        margin: auto;
-        padding-top: 15%;
-        padding-bottom: 2%;
-        border-radius: 15px;
-        background: #1e488e;
-        text-align: center;
-    }
-
-    h2 {
-        text-align: center;
-        color: #5BC5F2;
-        padding: 20px;
-    }
-
-    label {
-        color: #5BC5F2;
-        font-size: 17px;
-    }
-
-    #id_username {
-        width: 300px;
-        height: 30px;
-        padding-left: 8px;
-    }
-
-    #id_password {
-        width: 300px;
-        height: 30px;
-        padding-left: 8px;
-    }
-
-    #login {
-        width: 150px;
-        height: 30px;
-        border: none;
-        border-radius: 17px;
-        padding-left: 7px;
-        background-color: #5BC5F2;
-        color: #FFFFFF;
-        margin-top: 2%;
-    }
-
-    #login:hover {
-        cursor: pointer;
-    }
-
-    span {
-        color: white;
-        font-size: 17px;
-    }
-
-    input {
-        margin-bottom: 2%;
-    }
-
-    input:focus {
-        outline: none !important;
-    }
-</style>
diff --git a/admin_cohort/urls.py b/admin_cohort/urls.py
@@ -34,4 +34,4 @@ class NestedDefaultRouter(NestedRouterMixin, routers.DefaultRouter):
                path("workspaces/", include(("workspaces.urls", "workspaces"), namespace="workspaces")),
                re_path(r"^docs", schema_view.with_ui(renderer="swagger", cache_timeout=0, )),
                re_path(r"^redoc/$", schema_view.with_ui(renderer="redoc", cache_timeout=0), name="schema-redoc"),
-               ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+               ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -e
 
-mkdir -p static/ /app/log
+mkdir -p /app/log
 
 # update variables in nginx
 sed -i s/{{BACK_HOST}}/"$BACK_HOST"/g /etc/nginx/nginx.conf;