Updated CMS queries; Improved main layout

rlebre · Oct 27, 2022 · 428df9d · 428df9d
1 parent 2d73aa8
commit 428df9d
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 69 deletions.
diff --git a/components/cookies-consent/index.tsx b/components/cookies-consent/index.tsx
@@ -19,31 +19,27 @@ const CookiesConsentBanner = () => {
     [setChose]
   );
 
-  return (
-    <>
-      {chose === 'NA' && (
-        <div className={styles.cookies__consent}>
-          <span className='font-medium w-7/8'>
-            This website uses cookies to ensure to gather anonymous data for statistical purposes. If you decline we
-            will stop to track your session.
-          </span>
-          <div className='flex flex-wrap gap-2 justify-end'>
-            <button
-              className={styles.cookies__accept}
-              onClick={() => {
-                cookiesAccepted('ACCEPTED');
-              }}
-            >
-              Accept
-            </button>
-            <button className={styles.cookies__decline} onClick={() => cookiesAccepted('DECLINED')}>
-              Decline
-            </button>
-          </div>
-        </div>
-      )}
-    </>
-  );
+  return chose === 'NA' ? (
+    <div className={styles.cookies__consent}>
+      <span className='font-medium w-7/8'>
+        This website uses cookies to ensure to gather anonymous data for statistical purposes. If you decline we will
+        stop to track your session.
+      </span>
+      <div className='flex flex-wrap gap-2 justify-end'>
+        <button
+          className={styles.cookies__accept}
+          onClick={() => {
+            cookiesAccepted('ACCEPTED');
+          }}
+        >
+          Accept
+        </button>
+        <button className={styles.cookies__decline} onClick={() => cookiesAccepted('DECLINED')}>
+          Decline
+        </button>
+      </div>
+    </div>
+  ) : null;
 };
 
 export const CookieConsentProvider = ({ children }: { children: React.ReactNode }) => {

diff --git a/pages/index.tsx b/pages/index.tsx
@@ -37,52 +37,48 @@ const Home: NextPage<HomeProps> = ({ about, applications, features, resources, c
         ))}
       </Carousel>
 
-      <div className='container'>
-        <main className={styles.main}>
-          <FlatSection title='About' subtitle1={about.subtitle1} subtitle2={about.subtitle2}>
-            <div className='flex items-center'>{about.about}</div>
-          </FlatSection>
+      <main className={styles.main}>
+        <FlatSection title='About' subtitle1={about.subtitle1} subtitle2={about.subtitle2}>
+          <div className='flex items-center'>{about.about}</div>
+        </FlatSection>
 
-          <GridSection title='Applications'>
-            {applications.map(({ attributes }) => (
-              <HomeCard key={`application-${attributes.title}`} {...attributes}></HomeCard>
-            ))}
-          </GridSection>
+        <GridSection title='Applications'>
+          {applications.map(({ attributes }) => (
+            <HomeCard key={`application-${attributes.title}`} {...attributes}></HomeCard>
+          ))}
+        </GridSection>
 
-          <GridSection title='Features'>
-            {features.map(({ attributes }) => (
-              <HomeCard key={`feature-${attributes.title}`} {...attributes}></HomeCard>
-            ))}
-          </GridSection>
+        <GridSection title='Features'>
+          {features.map(({ attributes }) => (
+            <HomeCard key={`feature-${attributes.title}`} {...attributes}></HomeCard>
+          ))}
+        </GridSection>
 
-          <GridSection title='Resources'>
-            <>
-              <div className='w-full'>
-                <p>Dicoogle is a free and open source software.</p>
-                <p>The code is available and you can freely contribute to its development.</p>
+        <GridSection title='Resources'>
+          <div className='w-full'>
+            <p>Dicoogle is a free and open source software.</p>
+            <p>The code is available and you can freely contribute to its development.</p>
 
-                <p>
-                  Dicoogle source code is under{' '}
-                  <Link href='http://www.gnu.org/copyleft/gpl.en.html'>
-                    <a rel='nofollow noreferrer' target='_blank' className='font-semibold'>
-                      GNU General Public License v3.0.
-                    </a>
-                  </Link>
-                </p>
-              </div>
+            <p>
+              Dicoogle source code is under{' '}
+              <Link href='http://www.gnu.org/copyleft/gpl.en.html'>
+                <a rel='nofollow noreferrer' target='_blank' className='font-semibold'>
+                  GNU General Public License v3.0.
+                </a>
+              </Link>
+            </p>
+          </div>
 
-              {resources.map(({ attributes }) => (
-                <Button
-                  key={`resource-${attributes.title}`}
-                  href={attributes.link}
-                  label={attributes.title}
-                  style='button2'
-                />
-              ))}
-            </>
-          </GridSection>
-        </main>
-      </div>
+          {resources.map(({ attributes }) => (
+            <Button
+              key={`resource-${attributes.title}`}
+              href={attributes.link}
+              label={attributes.title}
+              style='button2'
+            />
+          ))}
+        </GridSection>
+      </main>
     </>
   );
 };

diff --git a/services/cookie.ts b/services/cookie.ts
@@ -0,0 +1,3 @@
+export const getCookieNotice = () => {
+  return fetch(`${process.env.NEXT_PUBLIC_CMS_URL}/api/cookie-notice`).then((res) => res.json());
+};
diff --git a/services/documentation.ts b/services/documentation.ts
@@ -1,5 +1,5 @@
 export const getDocumentation = () => {
-  return fetch(`${process.env.NEXT_PUBLIC_CMS_URL}/api/documentations?populate=*`)
+  return fetch(`${process.env.NEXT_PUBLIC_CMS_URL}/api/cards?filters[type][$eq]=documentation&populate=*`)
     .then((res) => res.json())
     .then((res) => res.data);
 };
diff --git a/services/index-page.ts b/services/index-page.ts
@@ -9,11 +9,15 @@ export const getAbout = () => {
 };
 
 export const getApplications = () => {
-  return fetch(`${process.env.NEXT_PUBLIC_CMS_URL}/api/home-applications?populate=image`).then((res) => res.json());
+  return fetch(`${process.env.NEXT_PUBLIC_CMS_URL}/api/cards?filters[type][$eq]=application&populate=*`).then((res) =>
+    res.json()
+  );
 };
 
 export const getFeatures = () => {
-  return fetch(`${process.env.NEXT_PUBLIC_CMS_URL}/api/home-features?populate=image`).then((res) => res.json());
+  return fetch(`${process.env.NEXT_PUBLIC_CMS_URL}/api/cards?filters[type][$eq]=feature&populate=*`).then((res) =>
+    res.json()
+  );
 };
 
 export const getResources = () => {

diff --git a/styles/Home.module.scss b/styles/Home.module.scss
@@ -11,6 +11,7 @@
   justify-content: center;
   align-items: center;
   @apply md:mt-24;
+  @apply container;
 }
 
 .footer {