Merge pull request #3261 from betagouv/retours-ux-dila-global

Améliorations UX - site actuel
betagouv · Dec 13, 2023 · 672eba8 · 672eba8
2 parents 08fae7e + f439dd2
commit 672eba8
Show file tree

Hide file tree

Showing 44 changed files with 720 additions and 497 deletions.
diff --git a/app/assets/images/je-donne-mon-avis.svg b/app/assets/images/je-donne-mon-avis.svg
diff --git a/app/assets/images/lightbulb-flash-fill.svg b/app/assets/images/lightbulb-flash-fill.svg
diff --git a/app/assets/images/pointbetagouvfr.svg b/app/assets/images/pointbetagouvfr.svg
diff --git a/app/controllers/solicitations_controller.rb b/app/controllers/solicitations_controller.rb
@@ -61,7 +61,7 @@ def search_company
       if siret_is_set?
         update_step_company_method
       elsif siren_is_set?
-        redirect_path = { controller: "/solicitations", action: "search_facility", uuid: @solicitation.uuid, anchor: 'section-formulaire' }.merge(search_params)
+        redirect_path = { controller: "/solicitations", action: "search_facility", uuid: @solicitation.uuid, anchor: 'section-breadcrumbs' }.merge(search_params)
         redirect_to redirect_path and return
       else
         result = SearchFacility::Diffusable.new(search_params).from_full_text_or_siren
@@ -109,7 +109,7 @@ def update_step_company_method
     @solicitation.go_to_step_description if @solicitation.may_go_to_step_description?
     sanitized_params = sanitize_params(solicitation_params)
     if @solicitation.update(sanitized_params)
-      redirect_to step_description_solicitation_path(@solicitation.uuid, anchor: 'section-formulaire')
+      redirect_to step_description_solicitation_path(@solicitation.uuid, anchor: 'section-breadcrumbs')
     else
       flash.alert = @solicitation.errors.full_messages.to_sentence
       render :step_company
@@ -151,12 +151,12 @@ def redirect_to_solicitation_step
     solicitation.update(relaunch: params.require(:relaunch)) if params[:relaunch].present?
     case solicitation.status
     when 'step_company'
-      redirect_to step_company_search_solicitation_path(solicitation.uuid, anchor: 'section-formulaire')
+      redirect_to step_company_search_solicitation_path(solicitation.uuid, anchor: 'section-breadcrumbs')
     # canceled : mail mauvaise qualité à modifier
     when 'step_description','canceled'
-      redirect_to step_description_solicitation_path(solicitation.uuid, anchor: 'section-formulaire')
+      redirect_to step_description_solicitation_path(solicitation.uuid, anchor: 'section-breadcrumbs')
     else
-      redirect_to step_contact_solicitation_path(solicitation.uuid, anchor: 'section-formulaire')
+      redirect_to step_contact_solicitation_path(solicitation.uuid, anchor: 'section-breadcrumbs')
     end
   end
 
@@ -181,7 +181,7 @@ def build_institution_filters
 
   # on dirige vers la recherche de siret si le champs "company" est le siret
   def retrieve_company_step_path
-    @solicitation.company_step_is_siret? ? step_company_search_solicitation_path(@solicitation.uuid, anchor: 'section-formulaire') : step_company_solicitation_path(@solicitation.uuid, anchor: 'section-formulaire')
+    @solicitation.company_step_is_siret? ? step_company_search_solicitation_path(@solicitation.uuid, anchor: 'section-breadcrumbs') : step_company_solicitation_path(@solicitation.uuid, anchor: 'section-breadcrumbs')
   end
 
   def siret_is_set?

diff --git a/app/front/packs/pages.js b/app/front/packs/pages.js
@@ -21,6 +21,7 @@ import "@hotwired/turbo-rails";
 
 require("@rails/ujs").start();
 require('remixicon/fonts/remixicon.css');
+require('@gouvfr/dsfr/dist/utility/icons/icons-communication/icons-communication.css')
 require('@gouvfr/dsfr/dist/dsfr/dsfr.css')
 require('stylesheets/pages.sass')
 

diff --git a/app/front/stylesheets/components/cards-landing.sass b/app/front/stylesheets/components/cards-landing.sass
@@ -0,0 +1,13 @@
+// Carte landings
+
+.landing-card.fr-enlarge-link
+  border: 2px solid transparent
+  &:hover
+    border: 2px solid $blue
+  .fr-card__title
+    font-size: 1.5rem
+    line-height: 2rem
+  .fr-card__desc
+    font-size: 1rem
+    line-height: 1.5rem
+    margin-top: 1rem
diff --git a/app/front/stylesheets/components/tiles.sass b/app/front/stylesheets/components/tiles.sass
@@ -1,10 +1,4 @@
 .landing
-  .fr-tile
-    flex-direction: column !important
-    box-shadow: none
-    border: 2px solid transparent
-    &:hover
-      border: 2px solid $blue
   .landing-subject
     background: #f9fafc
     box-shadow: none

diff --git a/app/front/stylesheets/pages.sass b/app/front/stylesheets/pages.sass
@@ -9,6 +9,7 @@
 @import 'components/tiles'
 @import 'components/charts'
 @import 'components/skeleton_card'
+@import 'components/cards-landing'
 
 //pages
 @import "pages/home"

diff --git a/app/front/stylesheets/pages/home.sass b/app/front/stylesheets/pages/home.sass
@@ -52,6 +52,6 @@
       margin-right: 0.5rem
 .contact-us
   font-size: 1.2rem
-  margin: 2rem 0 0 0
+  margin: 3rem 0 2rem
   a
     color: $blue