From 1b79e7b7e47d4f7113144427c2f082ef45919d46 Mon Sep 17 00:00:00 2001
From: LionelB <lionel@lumographe.fr>
Date: Thu, 12 Dec 2024 16:19:10 +0100
Subject: [PATCH] feat(orga): move footer at the bottom of the page

---
 orga/app/styles/components/layout/footer.scss |  5 ++---
 orga/app/styles/components/ui/action-bar.scss |  4 ----
 orga/app/templates/authenticated.hbs          | 18 ++++++++++++------
 orga/package-lock.json                        |  8 ++++----
 orga/package.json                             |  2 +-
 5 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/orga/app/styles/components/layout/footer.scss b/orga/app/styles/components/layout/footer.scss
index d8bceaefb3b..da2603adc95 100644
--- a/orga/app/styles/components/layout/footer.scss
+++ b/orga/app/styles/components/layout/footer.scss
@@ -4,13 +4,13 @@
   flex-shrink: 0;
   align-items: center;
   justify-content: space-between;
-  margin: 0 var(--pix-spacing-6x);
-  border-top: 1px solid var(--pix-neutral-20);
 
   @include device-is('desktop') {
     flex-direction: row;
   }
 
+  line-height: 1;
+
   &__navigation {
     display: flex;
     flex-direction: column;
@@ -33,7 +33,6 @@
   }
 
   &__copyrights {
-    padding: 16px 0;
     color: var(--pix-neutral-20)0;
     font-size: 0.75rem;
     font-family: $font-roboto;
diff --git a/orga/app/styles/components/ui/action-bar.scss b/orga/app/styles/components/ui/action-bar.scss
index 3d8c3d2c4c2..19ed53d793a 100644
--- a/orga/app/styles/components/ui/action-bar.scss
+++ b/orga/app/styles/components/ui/action-bar.scss
@@ -30,7 +30,3 @@
     }
   }
 }
-
-footer {
-  padding: var(--pix-spacing-4x) var(--pix-spacing-6x);
-}
diff --git a/orga/app/templates/authenticated.hbs b/orga/app/templates/authenticated.hbs
index 6403d357fe7..f3f9b48127b 100644
--- a/orga/app/templates/authenticated.hbs
+++ b/orga/app/templates/authenticated.hbs
@@ -1,11 +1,17 @@
 <PixAppLayout @variant="orga" class="app">
-  <Layout::Sidebar @placesCount={{@model.available}} @onChangeOrganization={{this.onChangeOrganization}} />
+  <:navigation>
 
-  <main class="main-content__body page">
-    <Banner::TopBanners />
-    {{outlet}}
-    <Layout::Footer />
-  </main>
+    <Layout::Sidebar @placesCount={{@model.available}} @onChangeOrganization={{this.onChangeOrganization}} />
+  </:navigation>
+  <:main>
 
+    <main class="main-content__body page">
+      <Banner::TopBanners />
+      {{outlet}}
+    </main>
+  </:main>
+  <:footer>
+    <Layout::Footer />
+  </:footer>
 </PixAppLayout>
 <NotificationContainer @position="bottom-right" />
\ No newline at end of file
diff --git a/orga/package-lock.json b/orga/package-lock.json
index b0518ff0438..803879efdc8 100644
--- a/orga/package-lock.json
+++ b/orga/package-lock.json
@@ -14,7 +14,7 @@
         "@1024pix/ember-matomo-tag-manager": "^2.4.3",
         "@1024pix/ember-testing-library": "^3.0.6",
         "@1024pix/eslint-config": "^1.3.8",
-        "@1024pix/pix-ui": "^51.2.0",
+        "@1024pix/pix-ui": "^52.0.0",
         "@1024pix/stylelint-config": "^5.1.24",
         "@babel/eslint-parser": "^7.19.1",
         "@babel/plugin-proposal-decorators": "^7.20.13",
@@ -922,9 +922,9 @@
       }
     },
     "node_modules/@1024pix/pix-ui": {
-      "version": "51.2.0",
-      "resolved": "https://registry.npmjs.org/@1024pix/pix-ui/-/pix-ui-51.2.0.tgz",
-      "integrity": "sha512-SYiCwxizS2dgAbQ4w2SrrBFUyIdRxPLAywDCArzFjpG5Dlruz7x0Gehz729wI5gUGObaslUGokHr3bNKU7tPyw==",
+      "version": "52.0.0",
+      "resolved": "https://registry.npmjs.org/@1024pix/pix-ui/-/pix-ui-52.0.0.tgz",
+      "integrity": "sha512-mwkYcEOAgLS/MSK3hFAu4ZO2kHSGDDybvoOZSKsT/Y1Z3VtprosSvN9jdLzCn2U649BzfDeaRx9mNRfS7zF8wg==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
diff --git a/orga/package.json b/orga/package.json
index 6dae91d87d6..59ff1ac16b8 100644
--- a/orga/package.json
+++ b/orga/package.json
@@ -55,7 +55,7 @@
     "@1024pix/ember-matomo-tag-manager": "^2.4.3",
     "@1024pix/ember-testing-library": "^3.0.6",
     "@1024pix/eslint-config": "^1.3.8",
-    "@1024pix/pix-ui": "^51.2.0",
+    "@1024pix/pix-ui": "^52.0.0",
     "@1024pix/stylelint-config": "^5.1.24",
     "@babel/eslint-parser": "^7.19.1",
     "@babel/plugin-proposal-decorators": "^7.20.13",