feat: Page de recherche : Tableau résultat de la recherche + footer p…

…ages
SocialGouv · Oct 13, 2023 · b026e32 · b026e32
1 parent 56e7ce6
commit b026e32
Show file tree

Hide file tree

Showing 44 changed files with 363 additions and 245 deletions.
diff --git a/src/client/src/components/App/_pages.scss b/src/client/src/components/App/_pages.scss
@@ -3,23 +3,32 @@
 .page {
     @extend .container;
     padding: $spacing-6;
-    background-color: white;
-
+    li,
     h1,
     h2,
     h3,
     h4,
     h5,
     h6 {
-        @extend .title;
+        font-family: $marianne;
+        color: $title-grey !important;
     }
 
     h1 {
         @extend .is-size-3;
         @extend .is-size-4-mobile;
         margin-top: 0;
     }
+    a {
+        color: $dark-blue !important;
+        font-family: $marianne;
+        text-decoration: underline !important;
+        text-underline-offset: 4px;
 
+        &:hover {
+            text-decoration-thickness: 2px !important;
+        }
+    }
     h2 {
         @extend .is-size-4;
         @extend .is-size-5-mobile;
@@ -30,7 +39,13 @@
         @extend .is-size-6-mobile;
     }
 
-    p {
+    p{
         margin-bottom: $spacing-4;
+        font-family: $marianne;
+        color: $title-grey !important;
+    }
+    div {
+        font-family: $marianne;
+        color: $title-grey !important;
     }
 }
diff --git a/src/client/src/components/App/_placeholders.scss b/src/client/src/components/App/_placeholders.scss
@@ -3,6 +3,10 @@
     background-color: $white;
     border-color: $grey !important;
 }
+%is-dark-blue {
+    color: $dark-blue !important;
+    background-color: $white;
+}
 
 %has-first-letter-uppercase {
     &::first-letter {

diff --git a/src/client/src/components/App/_variables.scss b/src/client/src/components/App/_variables.scss
@@ -81,7 +81,7 @@ $font-size-title: 1.5rem;
 $segoe: "Segoe Pro", sans-serif;
 $evolventa: "Evolventa", sans-serif;
 $roboto: Roboto, sans-serif;
-$marianne: "Marianne", sans-serif;
+$marianne: Marianne,arial,sans-serif;
 
 /* SPACING (values from Bulma) */
 $spacing-1: map-get($spacing-values, "1"); // 0.25rem

diff --git a/src/client/src/components/DataSheets/Sections/Enterprise/Agrements/Agrements.js b/src/client/src/components/DataSheets/Sections/Enterprise/Agrements/Agrements.js
@@ -5,7 +5,7 @@ import BlocTitle from "../../SharedComponents/BlocTitle/BlocTitle.jsx";
 import OrganismeFormation from "./OrganismeFormation";
 
 const Agrements = ({ enterprise }) => {
-  const [accordionOpen, setAccordionOpen] = useState(false);
+  const [accordionOpen, setAccordionOpen] = useState(true);
 
   return (
     <section id="agrements" className="data-sheet__bloc_section ">

diff --git a/src/client/src/components/DataSheets/Sections/Enterprise/Direccte/Direccte.js b/src/client/src/components/DataSheets/Sections/Enterprise/Direccte/Direccte.js
@@ -8,7 +8,7 @@ import InteractionType from "./InteractionType";
 
 const Direccte = ({ entreprise: { siren } }) => {
   const { loading, data, error } = useInteractionsBySiren(siren);
-  const [direccteAccordionOpen, setDireccteAccordionOpen] = useState(false);
+  const [direccteAccordionOpen, setDireccteAccordionOpen] = useState(true);
 
   if (loading || error) {
     return null;

diff --git a/src/client/src/components/DataSheets/Sections/Enterprise/Enterprise.js b/src/client/src/components/DataSheets/Sections/Enterprise/Enterprise.js
@@ -23,7 +23,7 @@ const Enterprise = ({ enterprise }) => {
   useScrollToLocationHash({ location });
 
   return (
-    <div>
+    <div className="data-sheet__main-content">
       <Header enterprise={enterprise} />
       <div className="data-sheet__main-container">
         <Infos enterprise={enterprise} />

diff --git a/...c/components/DataSheets/Sections/Enterprise/EnterpriseRelationship/RelationsEntreprise.js b/...c/components/DataSheets/Sections/Enterprise/EnterpriseRelationship/RelationsEntreprise.js
@@ -9,7 +9,7 @@ import Egapro from "./Egapro";
 import Psi from "./Psi";
 
 const RelationsEntreprise = ({ enterprise }) => {
-  const [accordionOpen, setAccordionOpen] = useState(false);
+  const [accordionOpen, setAccordionOpen] = useState(true);
 
   return (
     <section id="relationship" className="data-sheet__bloc_section">

diff --git a/src/client/src/components/DataSheets/Sections/Enterprise/Helps/Helps.js b/src/client/src/components/DataSheets/Sections/Enterprise/Helps/Helps.js
@@ -6,7 +6,7 @@ import Apprentissage from "./Subcategory/Apprentissage";
 import PlanDeRelance from "./Subcategory/PlanDeRelance";
 
 const Helps = ({ enterprise }) => {
-  const [accordionOpen, setAccordionOpen] = useState(false);
+  const [accordionOpen, setAccordionOpen] = useState(true);
 
   return (
     <section id="helps" className="data-sheet__bloc_section">

diff --git a/src/client/src/components/DataSheets/Sections/Enterprise/Infos/EnterpriseInfos.js b/src/client/src/components/DataSheets/Sections/Enterprise/Infos/EnterpriseInfos.js
@@ -37,7 +37,7 @@ import Mandataires from "./Mandataires";
 import ObservationRCS from "./ObservationRCS";
 
 const EnterpriseInfos = ({ enterprise: baseEntreprise }) => {
-  const [accordionOpen, setAccordionOpen] = useState(false);
+  const [accordionOpen, setAccordionOpen] = useState(true);
 
   const siren = getSiren(baseEntreprise);
 

diff --git a/src/client/src/components/DataSheets/Sections/Enterprise/Infos/Finances/finances.scss b/src/client/src/components/DataSheets/Sections/Enterprise/Infos/Finances/finances.scss
@@ -83,7 +83,7 @@ $border-color: var(--border-color);
         font-weight: 400;
         display: flex;
         flex-direction: column;
-        color: #161616;
+        color: $title-grey;
         @media print {
             display: none !important;
         }

diff --git a/src/client/src/components/DataSheets/Sections/Enterprise/Muteco/EnterpriseMuteco.js b/src/client/src/components/DataSheets/Sections/Enterprise/Muteco/EnterpriseMuteco.js
@@ -8,7 +8,7 @@ import Pse from "./Pse";
 import Rcc from "./Rcc";
 
 const EnterpriseMuteco = ({ enterprise }) => {
-  const [accordionOpen, setAccordionOpen] = useState(false);
+  const [accordionOpen, setAccordionOpen] = useState(true);
 
   return (
     <section id="muteco" className="data-sheet__bloc_section">

diff --git a/src/client/src/components/DataSheets/Sections/Establishment/Activity/Activite.js b/src/client/src/components/DataSheets/Sections/Establishment/Activity/Activite.js
@@ -17,7 +17,7 @@ import TrancheEffectifsInsee from "./TrancheEffectifsInsee";
 
 const Activite = ({ siret }) => {
   const { loading, data, error } = useSuccessionData(siret);
-  const [accordionOpen, setAccordionOpen] = useState(false);
+  const [accordionOpen, setAccordionOpen] = useState(true);
 
   return (
     <section id="activity" className="data-sheet__bloc_section">

diff --git a/src/client/src/components/DataSheets/Sections/Establishment/Agreements/Agrements.js b/src/client/src/components/DataSheets/Sections/Establishment/Agreements/Agrements.js
@@ -6,7 +6,7 @@ import AgrementsIAE from "./AgrementsIAE";
 import OrganismeFormation from "./OrganismeFormation";
 
 const Agrements = ({ siret }) => {
-  const [accordionOpen, setAccordionOpen] = useState(false);
+  const [accordionOpen, setAccordionOpen] = useState(true);
 
   return (
     <section id="agrements" className="data-sheet__bloc_section ">

diff --git a/src/client/src/components/DataSheets/Sections/Establishment/Dashboard/Dashboard.js b/src/client/src/components/DataSheets/Sections/Establishment/Dashboard/Dashboard.js
@@ -115,74 +115,76 @@ const Dashboard = ({ siret }) => {
 
   return (
     <div className="dashboard ">
-      <div className="columns column ">
-        <Item
-          icon={effectifItem}
-          name="Effectif"
-          value={effectifLoading ? "Chargement ..." : effectif}
-        />
-
-        <Item
-          icon={<Calendar />}
-          name="Visites"
-          smallText={!hasInteractions}
-          value={hasInteractions ? lastControl : "Pas d'intervention connue"}
-        />
-
-        <Item
-          icon={<Warning />}
-          name="Mutations économiques"
-          smallText={true}
-          value={
-            <>
-              {!activity.hasPse &&
-                !activity.hasRcc &&
-                !activity.hasLice &&
-                !activity.partialActivity &&
-                "Non"}
+      <div className="column ">
+        <div className="columns column ">
+          <Item
+            icon={effectifItem}
+            name="Effectif"
+            value={effectifLoading ? "Chargement ..." : effectif}
+          />
+
+          <Item
+            icon={<Calendar />}
+            name="Visites"
+            smallText={!hasInteractions}
+            value={hasInteractions ? lastControl : "Pas d'intervention connue"}
+          />
+
+          <Item
+            icon={<Warning />}
+            name="Mutations économiques"
+            smallText={true}
+            value={
+              <>
+                {!activity.hasPse &&
+                  !activity.hasRcc &&
+                  !activity.hasLice &&
+                  !activity.partialActivity &&
+                  "Non"}
+                <div>
+                  {activity.hasPse && "PSE-"}
+                  {activity.hasRcc && "RCC-"}
+                  {activity.hasLice && activity.liceTypes?.join("-")}
+                </div>
+
+                {activity.partialActivity && <div>Activité partielle</div>}
+              </>
+            }
+          />
+        </div>
+        <div className="columns column ">
+          <Item
+            icon={<Network />}
+            name="PSI"
+            smallText={true}
+            value={
               <div>
-                {activity.hasPse && "PSE-"}
-                {activity.hasRcc && "RCC-"}
-                {activity.hasLice && activity.liceTypes?.join("-")}
+                <ul>
+                  {isEstablishmentWithPsi && <li>Salariés détachés</li>}
+                  {isEnterprisePsiContractor && <li>Entreprise DO</li>}
+                </ul>
+                {!isEnterprisePsiContractor && !isEstablishmentWithPsi && "Non"}
               </div>
-
-              {activity.partialActivity && <div>Activité partielle</div>}
-            </>
-          }
-        />
-      </div>
-      <div className="columns column ">
-        <Item
-          icon={<Network />}
-          name="PSI"
-          smallText={true}
-          value={
-            <div>
-              <ul>
-                {isEstablishmentWithPsi && <li>Salariés détachés</li>}
-                {isEnterprisePsiContractor && <li>Entreprise DO</li>}
-              </ul>
-              {!isEnterprisePsiContractor && !isEstablishmentWithPsi && "Non"}
-            </div>
-          }
-        />
-        <Item
-          icon={<Hospital />}
-          name="Accident Travail"
-          value={data?.accidents_travail?.[0]?.total}
-          empty="Non"
-        />
-        <Item
-          icon={<HealthIcon />}
-          name="Aides"
-          value={hasAide(data) ? "Oui" : "Non"}
-        />
-
-        <Item
-          icon={<SchoolIcon />}
-          name="Organisme Formation"
-          value={isOrganismeFormation(data) ? "Oui" : "Non"}
-        />
+            }
+          />
+          <Item
+            icon={<Hospital />}
+            name="Accident Travail"
+            value={data?.accidents_travail?.[0]?.total}
+            empty="Non"
+          />
+          <Item
+            icon={<HealthIcon />}
+            name="Aides"
+            value={hasAide(data) ? "Oui" : "Non"}
+          />
+
+          <Item
+            icon={<SchoolIcon />}
+            name="Organisme Formation"
+            value={isOrganismeFormation(data) ? "Oui" : "Non"}
+          />
+        </div>
       </div>
     </div>
   );

diff --git a/src/client/src/components/DataSheets/Sections/Establishment/Direccte/Controles.js b/src/client/src/components/DataSheets/Sections/Establishment/Direccte/Controles.js
@@ -20,7 +20,7 @@ import { useControles } from "./Controles.gql";
 
 const Controles = ({ siret }) => {
   const { loading, data: interactions, error } = useControles(siret);
-  const [accordionOpen, setAccordionOpen] = useState(false);
+  const [accordionOpen, setAccordionOpen] = useState(true);
 
   if (loading || error) {
     return null;

diff --git a/src/client/src/components/DataSheets/Sections/Establishment/Establishment.js b/src/client/src/components/DataSheets/Sections/Establishment/Establishment.js
@@ -26,7 +26,7 @@ const Establishment = ({ siret }) => {
   const siren = getSirenFromSiret(siret);
 
   return (
-    <div>
+    <div className="data-sheet__main-content">
       <Header siret={siret} siren={siren} />
       <div className="data-sheet__main-container">
         <Activite siret={siret} />

diff --git a/src/client/src/components/DataSheets/Sections/Establishment/Helps/EstablishmentHelps.js b/src/client/src/components/DataSheets/Sections/Establishment/Helps/EstablishmentHelps.js
@@ -6,7 +6,7 @@ import Apprentissage from "./Subcategory/Apprentissage";
 import ContratsAides from "./Subcategory/ContratsAides";
 
 const EstablishmentHelps = ({ siret }) => {
-  const [accordionOpen, setAccordionOpen] = useState(false);
+  const [accordionOpen, setAccordionOpen] = useState(true);
 
   return (
     <section id="helps" className="data-sheet__bloc_section ">

diff --git a/.../src/components/DataSheets/Sections/Establishment/ListEtablishments/ListEstablishment.jsx b/.../src/components/DataSheets/Sections/Establishment/ListEtablishments/ListEstablishment.jsx
@@ -21,7 +21,7 @@ import PaginationTable from "../../SharedComponents/PaginationTable/PaginationTa
 const ListEstablishment = () => {
   const { loading, data: entreprise, error } = useEstablishmentData();
   const history = useHistory();
-  const [accordionOpen, setAccordionOpen] = useState(false);
+  const [accordionOpen, setAccordionOpen] = useState(true);
 
   const [currentPage, setCurrentPage] = useState(1);
   if (loading || error) {

diff --git a/src/client/src/components/DataSheets/Sections/Establishment/Muteco/EtablissementMuteco.js b/src/client/src/components/DataSheets/Sections/Establishment/Muteco/EtablissementMuteco.js
@@ -24,7 +24,7 @@ import Rcc from "./Rcc";
 
 const EtablissementMuteco = ({ siret }) => {
   const { data, loading, error } = useMutecoData(siret);
-  const [accordionOpen, setAccordionOpen] = useState(false);
+  const [accordionOpen, setAccordionOpen] = useState(true);
 
   if (loading || error) {
     return null;

diff --git a/...rc/components/DataSheets/Sections/Establishment/Relationship/EstablishmentRelationship.js b/...rc/components/DataSheets/Sections/Establishment/Relationship/EstablishmentRelationship.js
@@ -23,7 +23,7 @@ import WorkAccident from "./WorkAccident";
 
 const EstablishmentRelationship = ({ siret }) => {
   const { loading, data, error } = useAccordsEntreprise(siret);
-  const [accordionOpen, setAccordionOpen] = useState(false);
+  const [accordionOpen, setAccordionOpen] = useState(true);
 
   const accords = groupAccordsByType(data || []);
   const nbAccords = getGroupedAccordsSum(accords);

diff --git a/src/client/src/components/DataSheets/Sidebar/sidebar.scss b/src/client/src/components/DataSheets/Sidebar/sidebar.scss
@@ -14,10 +14,11 @@ $border-color: var(--border-color);
     > .aside-contain {
         position: -webkit-sticky;
         position: sticky;
-        top: 1rem;
+        top: 0;
         z-index: 1;
         display: block;
         padding: $spacing-4 0;
+        padding-top: 0 !important;
         margin-top: 2rem;
         overflow: auto;
         border-radius: $border-radius-2;
@@ -30,6 +31,7 @@ $border-color: var(--border-color);
             margin: 0;
             overflow: hidden;
             padding:0 $spacing-2;
+
         }
     }
 }