Ajout des études de cas à la page d'accueil + fix recettes jetables(#427

) * add images * integrate new section in homepage * update dependencies * update poetry dependencies * try fix * add link to studies cases
gip-inclusion · Sep 19, 2022 · d132f16 · d132f16
1 parent 285a67e
commit d132f16
Show file tree

Hide file tree

Showing 15 changed files with 217 additions and 448 deletions.
diff --git a/.github/workflows/review-app-creation.yml b/.github/workflows/review-app-creation.yml
@@ -19,7 +19,8 @@ env:
   CONFIGURATION_ADDON: ${{ secrets.CLEVER_REVIEW_APPS_CONFIGURATION_ADDON }}
   S3_ADDON: ${{ secrets.CLEVER_REVIEW_APPS_S3_ADDON }}
   BRANCH: ${{ github.head_ref }}
-  PYTHON_VERSION: 3.10.6
+  PYTHON_VERSION: "3.10"
+
 
 jobs:
   create:

diff --git a/lemarche/static/images/bouygues_construction_logo.jpg b/lemarche/static/images/bouygues_construction_logo.jpg
diff --git a/lemarche/static/images/home-page-studie-cases.png b/lemarche/static/images/home-page-studie-cases.png
diff --git a/lemarche/static/images/ministere_agriculture_logo.jpg b/lemarche/static/images/ministere_agriculture_logo.jpg
diff --git a/lemarche/static/images/siemens_logo.jpg b/lemarche/static/images/siemens_logo.jpg
diff --git a/lemarche/static/itou_marche/base/_variables.scss b/lemarche/static/itou_marche/base/_variables.scss
@@ -40,3 +40,6 @@ $marche: #FE5455;
 $marche-light: #FFDDDD;
 $marche-lighter: #FFEEEE;
 $marche-lightest: #FFF6F6;
+$marche-gray-10: #F2F3F5;
+$marche-gray-light: rgb(251, 251, 251);
+$marche-purple: #6C38D9;
diff --git a/lemarche/static/itou_marche/layouts/_pages.scss b/lemarche/static/itou_marche/layouts/_pages.scss
@@ -89,8 +89,33 @@
 			}
 		}
 	}
+
+	.s-hp-studies-cases-tenders {
+		background-image: url('/static/images/home-page-studie-cases.png');
+		background-repeat: no-repeat;
+		.s-hp-studies-cases__row {
+			.card {
+				// background-color: $gray-100;
+				.card-img-top {
+					max-width: 80%;
+					margin: auto;
+				}
+				.card-footer {
+					p {
+						font-weight: 700;
+					}
+					background-color: $marche-gray-10;
+					color: $marche-purple;
+				}
+			}
+		}
+
+	}
 }
 
+.bg-gray-light{
+	background-color: $marche-gray-light;
+}
 
 .p-valoriser-achats {
 	.s-page-menu-01__col--cta {

diff --git a/lemarche/static/itou_marche/sections/_home.scss b/lemarche/static/itou_marche/sections/_home.scss
@@ -53,16 +53,7 @@
 
 .s-hp-slider-partners-tenders {
 	padding-top: 3rem;
-	padding-bottom: 0rem;
-	&__container{
-		&:after{
-			content: '';
-			display: inherit;
-			width: 50%;
-			margin: 2rem auto;
-			border-top: 1px solid $gray-200;
-		}
-	}
+	padding-bottom: 3rem;
 }
 .s-hp-slider-partners {
 	padding-top: 1.5rem;

diff --git a/lemarche/templates/pages/home.html b/lemarche/templates/pages/home.html
@@ -61,8 +61,9 @@ <h2 class="h1 font-weight-bolder m-0">Le marché c'est <span class="text-importa
 </section>
 
 {% include "pages/home_sections/_tenders_users_companies.html" %}
+{% include "pages/home_sections/_tenders_studies_case.html" %}
 
-<section class="s-cards-grid-01">
+<section class="s-cards-grid-01 bg-gray-light">
     <div class="s-cards-grid-01__container container">
         <div class="s-cards-grid-01__row row">
             <div class="s-cards-grid-01__col s-cards-grid-01__col--title col-12">
@@ -190,7 +191,7 @@ <h3 class="h1 mb-3 mb-lg-5">Nos ressources</h3>
 </section>
 
 {% if siaes_first_page %}
-    <section class="s-cards-grid-01 bg-marche-lightest">
+    <section class="s-cards-grid-01 bg-nuance-09">
         <div class="s-cards-grid-01__container container">
             <div class="s-cards-grid-01__row row">
                 <div class="s-cards-grid-01__col s-cards-grid-01__col--title col-12">

diff --git a/lemarche/templates/pages/home_sections/_tenders_studies_case.html b/lemarche/templates/pages/home_sections/_tenders_studies_case.html
@@ -0,0 +1,72 @@
+{% load static bootstrap4 wagtailcore_tags %}
+
+<section class="s-hp-studies-cases-tenders py-5">
+    <div class="s-hp-studies-cases-tenders__container container">
+        <div class="s-hp-studies-cases__row row">
+            <div class="col-sm-6 col-md-3 my-4 my-sm-auto">
+                <h2>100% des besoins ont reçu des réponses en 24h</h2>
+                <p>Gagnez du temps en utilisant le marché.</p>
+                {% if user.is_authenticated %}
+                    <a href="{% url 'tenders:create' %}" id="home-studie-cases" class="btn btn-sm btn-primary btn-ico d-block d-md-inline-block mb-2">
+                        <i class="ri-mail-send-line"></i>
+                        <span>Publier un besoin d'achat</span>
+                    </a>
+                {% else %}
+                    <a href="#" id="home-studie-cases-modal-btn" class="btn btn-sm btn-primary btn-ico" data-toggle="modal" data-target="#login_or_signup_modal" data-next-params="{% url 'tenders:create' %}">
+                        <i class="ri-mail-send-line"></i>
+                        <span>Publier un besoin d'achat</span>
+                    </a>
+                {% endif %}
+            </div>
+            <div class="col-sm-6 col-md-3 my-4 my-sm-auto">
+                <div class="card">
+                    <img src="{% static 'images/siemens_logo.jpg' %}" class="card-img-top" alt="Logo de Siemens">
+                    <div class="card-body">
+                        <a href="{% slugurl "siemens-besoin-en-développement-dapplications-it" %}">
+                          <h5 class="card-title">Besoin en développement d’applications IT</h5>
+                        </a>
+                    </div>
+                    <div class="card-footer">
+                        <p class="display-1 mb-1">
+                            <i class="ri-arrow-right-line ri-xl"></i> 48
+                        </p>
+                        <p class="display-4">structures répondantes</p>
+                    </div>
+                </div>
+            </div>
+            <div class="col-sm-6 col-md-3 my-4 my-md-auto">
+                    <div class="card">
+                        <img src="{% static 'images/bouygues_construction_logo.jpg' %}" class="card-img-top" alt="Logo de Bouygues construction">
+                        <div class="card-body">
+                        <a href="{% slugurl "bouygues-construction-recherche-dune-entreprise-de-nettoyage" %}">
+                          <h5 class="card-title">Recherche d’une entreprise de nettoyage</h5>
+                        </a>
+                        </div>
+                        <div class="card-footer">
+                            <p class="display-1 mb-1">
+                                <i class="ri-arrow-right-line ri-xl"></i> 68
+                            </p>
+                            <p class="display-4">structures répondantes</p>
+                        </div>
+                    </div>
+                </a>
+            </div>
+            <div class="col-sm-6 col-md-3 my-4 my-md-auto">
+                <div class="card">
+                    <img src="{% static 'images/ministere_agriculture_logo.jpg' %}" class="card-img-top" alt="Logo du ministère de l'agriculture et de l'alimentation">
+                    <div class="card-body">
+                        <a href="{% slugurl "ministère-de-lagriculture-besoin-en-prestations-de-cocktails-et-de-buffet" %}">
+                            <h5 class="card-title">Besoin en prestations de cocktails et de buffets</h5>
+                        </a>
+                    </div>
+                    <div class="card-footer">
+                        <p class="display-1 mb-1">
+                            <i class="ri-arrow-right-line ri-xl"></i> 18
+                        </p>
+                        <p class="display-4">structures répondantes</p>
+                    </div>
+                  </div>
+            </div>
+        </div>
+    </div>
+</section>
diff --git a/lemarche/templates/pages/home_sections/_tenders_users_companies.html b/lemarche/templates/pages/home_sections/_tenders_users_companies.html
@@ -1,6 +1,6 @@
 {% load static bootstrap4 %}
 
-<section class="s-hp-slider-partners-tenders">
+<section class="s-hp-slider-partners-tenders bg-gray-light">
     <div class="s-hp-slider-partners-tenders__container container">
         <div class="s-hp-slider-partners__row row">
             <div class="col-12">
@@ -39,20 +39,5 @@ <h3 class="h2 mb-3 mb-lg-5 text-center">ILS ONT PUBLIÉ UN BESOIN SUR LE MARCHÉ
                 <img width="120" src="{% static 'images/tenders_users_companies/logo-13-habitat.svg' %}" class="img-fluid" alt="13 Habitat, 1er bailleur social public dans les Bouches-du-Rhône et en région Provence-Alpes-Côte d'Azur" loading="lazy" />
             </div>
         </div>
-        <div class="row">
-            <div class="col py-3 d-flex justify-content-center align-items-center pt-3">
-                {% if user.is_authenticated %}
-                    <a href="{% url 'tenders:create' %}" id="home-buyers-demande" class="btn btn-primary btn-ico d-block d-md-inline-block mb-2">
-                        <i class="ri-mail-send-line ri-lg"></i>
-                        <span>Publier un besoin d'achat</span>
-                    </a>
-                {% else %}
-                    <a href="#" id="home-buyers-demande-modal-btn" class="btn btn-primary btn-ico" data-toggle="modal" data-target="#login_or_signup_modal" data-next-params="{% url 'tenders:create' %}">
-                        <i class="ri-mail-send-line ri-xl"></i>
-                        <span>Publier un besoin d'achat</span>
-                    </a>
-                {% endif %}
-            </div>
-        </div>
     </div>
 </section>