feat: move footer to everywhere in the app

Author: NoeTerrier

app/src/components/Footer.tsx

@@ -3,6 +3,10 @@ import styles from "@/styles/Footer.module.scss";
 import { Association } from "@/types/aliases";
 
 export default function Footer({ association }: { association: Association }) {
+  if (association == null) {
+    return;
+  }
+
   return (
     <div className={styles.footer}>
       <div className={styles.bgAnimated}>

app/src/directus.ts

@@ -32,24 +32,15 @@ export function populateLayoutProps<T>(
   f?: GetServerSideProps<T>
 ): GetServerSideProps<T & { layoutProps: SocialLink[] }> {
   return async (context: GetServerSidePropsContext) => {
-    let association = await directus().request(
-      readSingleton("association", {
-        fields: ["*", { social_links: ["*"] }],
-      })
-    );
+    let association = await directus().request(readSingleton("association"));
 
-    let socialLinks = await directus().request(
-      readItems("social_links", {
-        fields: ["*"],
-        filter: {
-          id: {
-            _in: (
-              association.social_links as { social_links_id: number }[]
-            ).map((s) => s.social_links_id),
-          },
-        },
-      })
-    );
+    let socialLinks = await directus()
+      .request(
+        readItems("association_social_links", {
+          fields: [{ social_links_id: ["*"] }],
+        })
+      )
+      .then((result) => result.map((s) => s.social_links_id));
 
     let langs = await directus().request(readItems("languages"));
 
@@ -59,6 +50,7 @@ export function populateLayoutProps<T>(
 
     let layoutProps = {
       layoutProps: {
+        association: association,
         socialLinks: socialLinks,
         commissions: commissions,
         langs: langs,

app/src/pages/_app.tsx

@@ -2,6 +2,7 @@
 // This is required to get a url for the `background-image` css property.
 // @ts-ignore
 import Background from "../../public/background.svg?url";
+import Footer from "@/components/Footer";
 import NavigationBar from "@/components/NavigationBar";
 import "@/styles/fonts.scss";
 import "@/styles/globals.scss";
@@ -20,6 +21,7 @@ export default function App({ Component, pageProps }: AppProps) {
       >
         <Component {...pageProps} />
       </div>
+      <Footer association={pageProps.association} />
     </>
   );
 }

app/src/pages/association.tsx

@@ -12,7 +12,7 @@ export default function AssociationPage(
     <AssociationDescription
       association={props.association}
       social_links={props.social_links}
-    ></AssociationDescription>
+    />
   );
 }
 

app/src/pages/index.tsx

@@ -2,7 +2,6 @@ import PreviewImage from "@/assets/galleryPreview.png";
 import AssociationDescription from "@/components/AssociationDescription";
 import Card from "@/components/Card";
 import DirectusImage from "@/components/DirectusImage";
-import Footer from "@/components/Footer";
 import NewsCard from "@/components/NewsCard";
 import PartnersList from "@/components/PartnersList";
 import { directus, populateLayoutProps } from "@/directus";
@@ -68,8 +67,6 @@ export default function Home(
           ))}
         </div>
       </div>
-
-      <Footer association={props.association} />
     </>
   );
 }

app/src/styles/AssociationDescription.module.scss

@@ -1,8 +1,4 @@
-@import "glass";
-
 .description {
-  @extend .glass;
-
   background-color: var(--background-color);
 
   width: 100%;

app/src/styles/Footer.module.scss

@@ -1,7 +1,6 @@
 .footer {
   color: #fff;
   text-align: center;
-  padding: 5px;
   position: relative;
   width: 100%;
 

app/src/styles/globals.scss

@@ -30,6 +30,8 @@ a {
 
   gap: 4rem;
 
+  padding-top: 3rem;
+  padding-bottom: 6rem;
   min-height: 100vh;
 
   background-position: left top;