Add banner to login page

mesadsfr · Sep 14, 2023 · 73152a3 · 73152a3
1 parent a2ab757
commit 73152a3
Show file tree

Hide file tree

Showing 8 changed files with 103 additions and 14 deletions.
diff --git a/django/layout.html b/django/layout.html
@@ -0,0 +1 @@
+<!DOCTYPE html><html><head><script src="/static/assets/js/hot-update.408d01a7.js" defer="defer"></script></head><body>LoaderException: <br> <span style="color:#e36049">[html-bundler-webpack-plugin]</span>  Template compilation failed.<br>File: mesads/templates/django/layout.html<br>LoaderException: <br> html-bundler-webpack-plugin  Can't resolve '{% static '@gouvfr/dsfr/dsfr.min.css' %}' in the template mesads/templates/django/layout.html<br>Error: Can't resolve '{% static '@gouvfr/dsfr/dsfr.min.css' %}' in '/Users/niluje/dev/gouv/mesads/mesads/templates/django'<br>    at finishWithoutResolve (/Users/niluje/dev/gouv/mesads/node_modules/enhanced-resolve/lib/Resolver.js:369:18)<br>    at /Users/niluje/dev/gouv/mesads/node_modules/enhanced-resolve/lib/Resolver.js:461:15<br>    at /Users/niluje/dev/gouv/mesads/node_modules/enhanced-resolve/lib/Resolver.js:519:5<br>    at eval (eval at create (/Users/niluje/dev/gouv/mesads/node_modules/tapable/lib/HookCodeFactory.js:33:10), <anonymous>:15:1)<br>    at /Users/niluje/dev/gouv/mesads/node_modules/enhanced-resolve/lib/Resolver.js:519:5<br>    at eval (eval at create (/Users/niluje/dev/gouv/mesads/node_modules/tapable/lib/HookCodeFactory.js:33:10), <anonymous>:27:1)<br>    at /Users/niluje/dev/gouv/mesads/node_modules/enhanced-resolve/lib/DescriptionFilePlugin.js:89:43<br>    at /Users/niluje/dev/gouv/mesads/node_modules/enhanced-resolve/lib/Resolver.js:519:5<br>    at eval (eval at create (/Users/niluje/dev/gouv/mesads/node_modules/tapable/lib/HookCodeFactory.js:33:10), <anonymous>:15:1)<br>    at /Users/niluje/dev/gouv/mesads/node_modules/enhanced-resolve/lib/Resolver.js:519:5<br>    at resolveException (/Users/niluje/dev/gouv/mesads/node_modules/html-bundler-webpack-plugin/src/Loader/Messages/Exeptions.js:47:9)<br>    at Resolver.resolve (/Users/niluje/dev/gouv/mesads/node_modules/html-bundler-webpack-plugin/src/Loader/Resolver.js:168:9)<br>    at RenderMode.loaderRequireStyle (/Users/niluje/dev/gouv/mesads/node_modules/html-bundler-webpack-plugin/src/Loader/Modes/RenderMode.js:107:35)<br>    at Template.resolve (/Users/niluje/dev/gouv/mesads/node_modules/html-bundler-webpack-plugin/src/Loader/Template.js:175:32)<br>    at Template.compile (/Users/niluje/dev/gouv/mesads/node_modules/html-bundler-webpack-plugin/src/Loader/Template.js:126:33)<br>    at /Users/niluje/dev/gouv/mesads/node_modules/html-bundler-webpack-plugin/src/Loader/index.js:60:23</body></html>
diff --git a/django/skeleton.html b/django/skeleton.html
@@ -0,0 +1 @@
+<!DOCTYPE html><html><head><script src="/static/assets/js/hot-update.408d01a7.js" defer="defer"></script></head><body>LoaderException: <br> <span style="color:#e36049">[html-bundler-webpack-plugin]</span>  Template compilation failed.<br>File: mesads/templates/django/skeleton.html<br>LoaderException: <br> html-bundler-webpack-plugin  Can't resolve '{% static '@gouvfr/dsfr/dsfr.min.css' %}' in the template mesads/templates/django/skeleton.html<br>Error: Can't resolve '{% static '@gouvfr/dsfr/dsfr.min.css' %}' in '/Users/niluje/dev/gouv/mesads/mesads/templates/django'<br>    at finishWithoutResolve (/Users/niluje/dev/gouv/mesads/node_modules/enhanced-resolve/lib/Resolver.js:369:18)<br>    at /Users/niluje/dev/gouv/mesads/node_modules/enhanced-resolve/lib/Resolver.js:461:15<br>    at /Users/niluje/dev/gouv/mesads/node_modules/enhanced-resolve/lib/Resolver.js:519:5<br>    at eval (eval at create (/Users/niluje/dev/gouv/mesads/node_modules/tapable/lib/HookCodeFactory.js:33:10), <anonymous>:15:1)<br>    at /Users/niluje/dev/gouv/mesads/node_modules/enhanced-resolve/lib/Resolver.js:519:5<br>    at eval (eval at create (/Users/niluje/dev/gouv/mesads/node_modules/tapable/lib/HookCodeFactory.js:33:10), <anonymous>:27:1)<br>    at /Users/niluje/dev/gouv/mesads/node_modules/enhanced-resolve/lib/DescriptionFilePlugin.js:89:43<br>    at /Users/niluje/dev/gouv/mesads/node_modules/enhanced-resolve/lib/Resolver.js:519:5<br>    at eval (eval at create (/Users/niluje/dev/gouv/mesads/node_modules/tapable/lib/HookCodeFactory.js:33:10), <anonymous>:15:1)<br>    at /Users/niluje/dev/gouv/mesads/node_modules/enhanced-resolve/lib/Resolver.js:519:5<br>    at resolveException (/Users/niluje/dev/gouv/mesads/node_modules/html-bundler-webpack-plugin/src/Loader/Messages/Exeptions.js:47:9)<br>    at Resolver.resolve (/Users/niluje/dev/gouv/mesads/node_modules/html-bundler-webpack-plugin/src/Loader/Resolver.js:168:9)<br>    at RenderMode.loaderRequireStyle (/Users/niluje/dev/gouv/mesads/node_modules/html-bundler-webpack-plugin/src/Loader/Modes/RenderMode.js:107:35)<br>    at Template.resolve (/Users/niluje/dev/gouv/mesads/node_modules/html-bundler-webpack-plugin/src/Loader/Template.js:175:32)<br>    at Template.compile (/Users/niluje/dev/gouv/mesads/node_modules/html-bundler-webpack-plugin/src/Loader/Template.js:126:33)<br>    at /Users/niluje/dev/gouv/mesads/node_modules/html-bundler-webpack-plugin/src/Loader/index.js:60:23</body></html>
diff --git a/mesads/static/images/banner.svg b/mesads/static/images/banner.svg
diff --git a/mesads/static/style.css b/mesads/static/style.css
@@ -67,4 +67,11 @@ h1 {
 .tr-highlighted {
   /* !important is required to override the background-color set by default to even rows */
   background-color: rgba(0, 127, 127, 0.15) !important;
+}
+
+#main-container-banner {
+  background-image: url('/static/images/banner.svg');
+  background-repeat: no-repeat;
+  background-size: 100%;
+  padding-top: 25%;
 }
diff --git a/mesads/templates/django/base.html → mesads/templates/django/skeleton.html b/mesads/templates/django/base.html → mesads/templates/django/skeleton.html
@@ -98,19 +98,7 @@
       </div>
     </header>
 
-    <main class="fr-container {% block main_styles %}fr-pt-5w fr-pb-5w{% endblock %}">
-      {% for message in messages %}
-      <div class="fr-alert fr-alert--info
-        {% if message.level == DEFAULT_MESSAGE_LEVELS.INFO %}fr-alert--info {% endif %}
-        {% if message.level == DEFAULT_MESSAGE_LEVELS.SUCCESS %}fr-alert--success {% endif %}
-        {% if message.level == DEFAULT_MESSAGE_LEVELS.SUCCESS %}fr-alert--error {% endif %}
-      ">
-        <p>{{ message|safe }}</p>
-      </div>
-      {% endfor %}
-
-      {% block body %}{% endblock %}
-    </main>
+    {% block content %}{% endblock %}
 
     <footer class="fr-footer" role="contentinfo" id="footer">
       <div class="fr-container">

diff --git a/mesads/templates/webpack/base-banner.html b/mesads/templates/webpack/base-banner.html
@@ -0,0 +1,7 @@
+{% extends "base.html" %}
+
+{% block content %}
+<div id="main-container-banner">
+    {{ block.super }}
+</div>
+{% endblock %}
diff --git a/mesads/templates/webpack/base.html b/mesads/templates/webpack/base.html
@@ -0,0 +1,17 @@
+{% extends "skeleton.html" %}
+
+{% block content %}
+<main class="fr-container {% block main_styles %}fr-pt-5w fr-pb-5w{% endblock %}">
+{% for message in messages %}
+<div class="fr-alert fr-alert--info
+    {% if message.level == DEFAULT_MESSAGE_LEVELS.INFO %}fr-alert--info {% endif %}
+    {% if message.level == DEFAULT_MESSAGE_LEVELS.SUCCESS %}fr-alert--success {% endif %}
+    {% if message.level == DEFAULT_MESSAGE_LEVELS.SUCCESS %}fr-alert--error {% endif %}
+">
+    <p>{{ message|safe }}</p>
+</div>
+{% endfor %}
+
+{% block body %}{% endblock %}
+</main>
+{% endblock %}
diff --git a/mesads/templates/webpack/registration/login.html b/mesads/templates/webpack/registration/login.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "base-banner.html" %}
 
 {% block title %}Connexion à MesADS{% endblock %}