fix(header): Display expanded header on homepage, otherwise compact v…

…ersion
dataesr · Nov 13, 2024 · 98227f8 · 98227f8
1 parent d2cd33b
commit 98227f8
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 36 deletions.
diff --git a/client/src/layout/header.jsx b/client/src/layout/header.jsx
@@ -16,36 +16,8 @@ const {
 } = import.meta.env;
 
 // TODO : all, Link from dsfr-plus
-export default function Header({ isSticky }) {
-  return isSticky ? (
-    <Container as="section" className="filters sticky" fluid>
-      <Row className="fr-p-1w" verticalAlign="top">
-        <Ribbon />
-        <Col offsetXs="1" xs="2">
-          <a
-            href="/"
-            title={`Accueil - ${VITE_MINISTER_NAME.replaceAll(
-              '<br>',
-              ' ',
-            )}`}
-          >
-            <Title as="h1" className="fr-m-0" look="h6">
-              {VITE_APP_NAME}
-              {VITE_HEADER_TAG && (
-                <Badge
-                  className="fr-ml-1w"
-                  color={VITE_HEADER_TAG_COLOR}
-                  size="sm"
-                >
-                  {VITE_HEADER_TAG}
-                </Badge>
-              )}
-            </Title>
-          </a>
-        </Col>
-      </Row>
-    </Container>
-  ) : (
+export default function Header({ isExpanded }) {
+  return isExpanded ? (
     <header role="banner" className="fr-header">
       <Ribbon />
       <div className="fr-header__body">
@@ -85,12 +57,40 @@ export default function Header({ isSticky }) {
         </div>
       </div>
     </header>
+  ) : (
+    <Container as="section" className="filters sticky" fluid>
+      <Row className="fr-p-1w" verticalAlign="top">
+        <Ribbon />
+        <Col offsetXs="1" xs="2">
+          <a
+            href="/"
+            title={`Accueil - ${VITE_MINISTER_NAME.replaceAll(
+              '<br>',
+              ' ',
+            )}`}
+          >
+            <Title as="h1" className="fr-m-0" look="h6">
+              {VITE_APP_NAME}
+              {VITE_HEADER_TAG && (
+                <Badge
+                  className="fr-ml-1w"
+                  color={VITE_HEADER_TAG_COLOR}
+                  size="sm"
+                >
+                  {VITE_HEADER_TAG}
+                </Badge>
+              )}
+            </Title>
+          </a>
+        </Col>
+      </Row>
+    </Container>
   );
 }
 
 Header.defaultProps = {
-  isSticky: false,
+  isExpanded: false,
 };
 Header.propTypes = {
-  isSticky: PropTypes.bool,
+  isExpanded: PropTypes.bool,
 };
diff --git a/client/src/pages/datasets/results.jsx b/client/src/pages/datasets/results.jsx
@@ -105,7 +105,7 @@ export default function Affiliations() {
 
   return (
     <>
-      <Header isSticky />
+      <Header />
       <Container as="section" className="fr-mt-4w">
         {isFetching && (
           <Row>

diff --git a/client/src/pages/home.jsx b/client/src/pages/home.jsx
@@ -10,7 +10,7 @@ import { isInProduction } from '../utils/helpers';
 export default function Home() {
   return (
     <>
-      <Header />
+      <Header isExpanded />
       <Container as="section" className="fr-mt-4w">
         <Row gutters className="fr-mb-16w">
           <Col sm={12} md={4}>

diff --git a/client/src/pages/openalex-ror/results.jsx b/client/src/pages/openalex-ror/results.jsx
@@ -156,7 +156,7 @@ export default function Affiliations() {
 
   return (
     <>
-      <Header isSticky />
+      <Header />
       <Container fluid as="main" className="wm-bg">
         {isFetching && (
           <Container style={{ textAlign: 'center', minHeight: '600px' }} className="fr-pt-5w wm-font">

diff --git a/client/src/pages/publications/results.jsx b/client/src/pages/publications/results.jsx
@@ -105,7 +105,7 @@ export default function Affiliations() {
 
   return (
     <>
-      <Header isSticky />
+      <Header />
       <Container as="section" className="fr-mt-4w">
         {isFetching && (
           <Row>