Merge pull request #3 from memphis-tools/development

update for manual django messages rendering
memphis-tools · Aug 9, 2024 · f9558ea · f9558ea
2 parents 5d0ea5b + a1defd7
commit f9558ea
Show file tree

Hide file tree

Showing 41 changed files with 119 additions and 19 deletions.
diff --git a/dummy_django_blog/Dockerfile b/dummy_django_blog/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.13.0b4-alpine3.20
+FROM python:3.12.5-alpine3.19
 
 RUN mkdir -p /home/dummy-operator; \
     addgroup -S dummy-operator; \

diff --git a/dummy_django_blog/dummy_django_blog/settings.py b/dummy_django_blog/dummy_django_blog/settings.py
@@ -49,7 +49,6 @@
     "django.contrib.staticfiles",
     "authentication",
     "blog",
-    "bootstrap5",
     "django_bootstrap_icons",
 ]
 

diff --git a/dummy_django_blog/media/avatars/dummy_image.jpg b/dummy_django_blog/media/avatars/dummy_image.jpg
diff --git a/dummy_django_blog/media/avatars/dummy_image_ZjtLOGe.jpg b/dummy_django_blog/media/avatars/dummy_image_ZjtLOGe.jpg
diff --git a/dummy_django_blog/media/billet_1.jpg b/dummy_django_blog/media/billet_1.jpg
diff --git a/dummy_django_blog/media/dummy_image.jpg b/dummy_django_blog/media/dummy_image.jpg
diff --git a/dummy_django_blog/media/photo_1.jpg b/dummy_django_blog/media/photo_1.jpg
diff --git a/dummy_django_blog/media/photo_10.jpg b/dummy_django_blog/media/photo_10.jpg
diff --git a/dummy_django_blog/media/photo_11.jpg b/dummy_django_blog/media/photo_11.jpg
diff --git a/dummy_django_blog/media/photo_2.jpg b/dummy_django_blog/media/photo_2.jpg
diff --git a/dummy_django_blog/media/photo_3.jpg b/dummy_django_blog/media/photo_3.jpg
diff --git a/dummy_django_blog/media/photo_4.jpg b/dummy_django_blog/media/photo_4.jpg
diff --git a/dummy_django_blog/media/photo_5.jpg b/dummy_django_blog/media/photo_5.jpg
diff --git a/dummy_django_blog/media/photo_6.jpg b/dummy_django_blog/media/photo_6.jpg
diff --git a/dummy_django_blog/media/photo_7.jpg b/dummy_django_blog/media/photo_7.jpg
diff --git a/dummy_django_blog/media/photo_8.jpg b/dummy_django_blog/media/photo_8.jpg
diff --git a/dummy_django_blog/media/photo_9.jpg b/dummy_django_blog/media/photo_9.jpg
diff --git a/dummy_django_blog/static/assets/css/styles.css b/dummy_django_blog/static/assets/css/styles.css
@@ -4,6 +4,69 @@
     box-sizing: border-box;
 }
 
+@font-face {
+  font-family: 'ArsenalSC';
+  src: url('../fonts/ArsenalSC-Regular.ttf') format('truetype');
+  font-weight: 400;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'Caveat';
+  src: url('../fonts/Caveat-Regular.ttf') format('truetype');
+  font-weight: 400;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'Caveat-large';
+  src: url('../fonts/Caveat-Medium.ttf') format('truetype');
+  font-weight: 700;
+  font-style: normal;
+  font-size: 2rem;
+}
+
+@font-face {
+  font-family: 'Ubuntu';
+  src: url('../fonts/Ubuntu-Regular.ttf') format('truetype');
+  font-weight: 500;
+  font-style: normal;
+}
+
+/* Django message */
+.django-messages li {
+  list-style: none;
+}
+
+.django-messages .success {
+    color: green;
+    background-color: #d4edda;
+    padding: 10px;
+    border-radius: 5px;
+}
+
+.django-messages .error {
+    color: red;
+    background-color: #f8d7da;
+    padding: 10px;
+    border-radius: 5px;
+}
+
+.django-messages .warning {
+    color: orange;
+    background-color: #fff3cd;
+    padding: 10px;
+    border-radius: 5px;
+}
+
+.django-messages .info {
+    color: blue;
+    background-color: #d1ecf1;
+    padding: 10px;
+    border-radius: 5px;
+}
+
+/* End Django messages */
 
 body {
   height: 100vh;
@@ -70,11 +133,11 @@ body .dropdown-item {
 }
 
 .navbar-brand {
-  font-family: "Caveat", cursive;
+  font-family: "Caveat-large", cursive;
   font-optical-sizing: auto;
   font-weight: 700;
   font-style: normal;
-  font-size: 2rem;
+  font-size: 24px;
   color: white !important;
 }
 
@@ -125,9 +188,10 @@ body .dropdown-item {
 }
 
 h1, h2, h3, h4, h5, h6 {
-    font-family: "Arsenal SC", sans-serif;
+    font-family: "ArsenalSC", sans-serif;
     font-weight: 400;
     font-style: normal;
+    color: white;
 }
 
 .feed-container {
@@ -142,14 +206,14 @@ h1, h2, h3, h4, h5, h6 {
 .feed-intro {
   padding: 5%;
   font-size: 1.5rem;
-  font-family: "Caveat", cursive;
+  font-family: "Caveat-large", cursive;
   font-optical-sizing: auto;
   font-weight: 700;
   font-style: normal;
 }
 
 .feed-intro h3 {
-  font-family: "Caveat", cursive;
+  font-family: "Caveat-large", cursive;
   font-optical-sizing: auto;
   font-weight: 700;
   font-style: normal;
@@ -187,6 +251,10 @@ h1, h2, h3, h4, h5, h6 {
   border-radius:
 }
 
+.home-elements {
+  color: white;
+}
+
 .home-elements h2 {
   font-size: 2rem;
 }

diff --git a/dummy_django_blog/static/assets/fonts/ArsenalSC-Bold.ttf b/dummy_django_blog/static/assets/fonts/ArsenalSC-Bold.ttf
diff --git a/dummy_django_blog/static/assets/fonts/ArsenalSC-BoldItalic.ttf b/dummy_django_blog/static/assets/fonts/ArsenalSC-BoldItalic.ttf
diff --git a/dummy_django_blog/static/assets/fonts/ArsenalSC-Italic.ttf b/dummy_django_blog/static/assets/fonts/ArsenalSC-Italic.ttf
diff --git a/dummy_django_blog/static/assets/fonts/ArsenalSC-Regular.ttf b/dummy_django_blog/static/assets/fonts/ArsenalSC-Regular.ttf
diff --git a/dummy_django_blog/static/assets/fonts/Caveat-Bold.ttf b/dummy_django_blog/static/assets/fonts/Caveat-Bold.ttf
diff --git a/dummy_django_blog/static/assets/fonts/Caveat-Medium.ttf b/dummy_django_blog/static/assets/fonts/Caveat-Medium.ttf
diff --git a/dummy_django_blog/static/assets/fonts/Caveat-Regular.ttf b/dummy_django_blog/static/assets/fonts/Caveat-Regular.ttf
diff --git a/dummy_django_blog/static/assets/fonts/Caveat-SemiBold.ttf b/dummy_django_blog/static/assets/fonts/Caveat-SemiBold.ttf
diff --git a/dummy_django_blog/static/assets/fonts/Caveat-VariableFont_wght.ttf b/dummy_django_blog/static/assets/fonts/Caveat-VariableFont_wght.ttf
diff --git a/dummy_django_blog/static/assets/fonts/Ubuntu-Bold.ttf b/dummy_django_blog/static/assets/fonts/Ubuntu-Bold.ttf
diff --git a/dummy_django_blog/static/assets/fonts/Ubuntu-BoldItalic.ttf b/dummy_django_blog/static/assets/fonts/Ubuntu-BoldItalic.ttf
diff --git a/dummy_django_blog/static/assets/fonts/Ubuntu-Italic.ttf b/dummy_django_blog/static/assets/fonts/Ubuntu-Italic.ttf
diff --git a/dummy_django_blog/static/assets/fonts/Ubuntu-Light.ttf b/dummy_django_blog/static/assets/fonts/Ubuntu-Light.ttf
diff --git a/dummy_django_blog/static/assets/fonts/Ubuntu-LightItalic.ttf b/dummy_django_blog/static/assets/fonts/Ubuntu-LightItalic.ttf
diff --git a/dummy_django_blog/static/assets/fonts/Ubuntu-Medium.ttf b/dummy_django_blog/static/assets/fonts/Ubuntu-Medium.ttf
diff --git a/dummy_django_blog/static/assets/fonts/Ubuntu-MediumItalic.ttf b/dummy_django_blog/static/assets/fonts/Ubuntu-MediumItalic.ttf
diff --git a/dummy_django_blog/static/assets/fonts/Ubuntu-Regular.ttf b/dummy_django_blog/static/assets/fonts/Ubuntu-Regular.ttf
diff --git a/dummy_django_blog/static/vendors/css/bootstrap.min.css b/dummy_django_blog/static/vendors/css/bootstrap.min.css
diff --git a/dummy_django_blog/static/vendors/js/bootstrap.bundle.min.js b/dummy_django_blog/static/vendors/js/bootstrap.bundle.min.js
diff --git a/dummy_django_blog/static/vendors/js/jquery-1.12.4.min.js b/dummy_django_blog/static/vendors/js/jquery-1.12.4.min.js
diff --git a/dummy_django_blog/static/vendors/js/popper.min.js b/dummy_django_blog/static/vendors/js/popper.min.js
diff --git a/dummy_django_blog/templates/base.html b/dummy_django_blog/templates/base.html
@@ -1,9 +1,5 @@
 {% load static %}
-{% load bootstrap5 %}
 {% load bootstrap_icons %}
-{% bootstrap_css %}
-{% bootstrap_javascript %}
-{% bootstrap_messages %}
 
 <!DOCTYPE html>
 <html lang="fr">
@@ -15,14 +11,23 @@
     <meta name="generator" content="Django">
     <meta name="author" content="Tommy Doe">
     <link rel="icon" type="image/x-icon" href="{% static 'favicon.ico' %}">
+    <!-- Bootstrap -->
+    <link rel="stylesheet" type="text/css" href="{% static 'vendors/css/bootstrap.min.css' %}">
     <!-- Custom css -->
     <link rel="stylesheet" type="text/css" href="{% static 'assets/css/styles.css' %}">
-    <!-- Google fonts -->
-    <link rel="preconnect" href="https://fonts.googleapis.com">
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link href="https://fonts.googleapis.com/css2?family=Arsenal+SC:ital,wght@0,400;0,700;1,400;1,700&family=Caveat:wght@400..700&family=family=Ubuntu:ital,wght@0,300;0,400;0,500;0,700;1,300;1,400;1,500;1,700&display=swap" rel="stylesheet">
 </head>
 <body>
+    <div class="django-messages">
+        {% if messages %}
+          <ul>
+              {% for message in messages %}
+                  <li class="{% if message.tags %}{{ message.tags }}{% endif %}">
+                      {{ message }}
+                  </li>
+              {% endfor %}
+          </ul>
+        {% endif %}
+    </div>
     <header>
         <nav class="navbar navbar-light navbar-light sticky-top navbar-custom">
             <div class="w-100 container-fluid">
@@ -120,10 +125,12 @@ <h6 class="dropdown-header">billets</h6>
       </div>
     </footer>
     <script src="{% static 'assets/js/scripts.js' %}"></script>
+    <!-- Bootstrap -->
+    <script src="{% static 'vendors/js/bootstrap.bundle.min.js' %}"></script>
     <!-- Popper -->
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.16.0/umd/popper.min.js"></script>
+    <script src="{% static 'vendors/js/popper.min.js' %}"></script>
     <!-- jquery -->
-    <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js"></script>
+    <script src="{% static 'vendors/js/jquery-1.12.4.min.js' %}"></script>
     <!-- custom blur for navbar -->
     <script>
     $(document).ready(function() {

diff --git a/pyproject.toml b/pyproject.toml
@@ -8,15 +8,14 @@ readme = "README.md"
 
 [tool.poetry.dependencies]
 python = ">3.11,<3.13"
-django = ">4.2.0"
+django = ">5.0.7"
 gunicorn = "^22.0.0"
 pillow = "^10.4.0"
 django-bootstrap-icons = "^0.9.0"
 pytest = "^8.2.2"
 django-pytest = "^0.2.0"
 coverage = "6.5.0"
 pylint = "^3.2.5"
-django-bootstrap-v5 = "1.0.11"
 python-dotenv = "^1.0.1"
 whitenoise = "^6.7.0"
 pytest-django = "^4.8.0"