Merge pull request #13 from osakunta/next-site

Navbar + CMS Fetching
osakunta · Aug 6, 2024 · f41afac · f41afac
2 parents dfa1dc1 + 5410051
commit f41afac
Show file tree

Hide file tree

Showing 5 changed files with 140 additions and 14 deletions.
diff --git a/components/Carousel.tsx b/components/Carousel.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable react-hooks/exhaustive-deps */
 import styles from "@/styles/Carousel.module.css";
 import React, { useCallback, useEffect, useRef } from "react";
 import Link from "next/link";
@@ -8,6 +9,7 @@ import {
 } from "embla-carousel";
 import useEmblaCarousel from "embla-carousel-react";
 import { NextButton, PrevButton, usePrevNextButtons } from "./CarouselArrows";
+import Image from "next/image";
 
 const TWEEN_FACTOR_BASE = 0.84;
 
@@ -93,10 +95,12 @@ const Carousel: React.FC<PropType> = (props) => {
         <div className="embla__container">
           {slides.map((index) => (
             <div className="embla__slide" key={index}>
-              <img
+              <Image
                 className="embla__slide__img"
                 src={`https://picsum.photos/600/350?v=${index}`}
                 alt="Your alt text"
+                width={250}
+                height={100}
               />
             </div>
           ))}

diff --git a/components/Navbar.tsx b/components/Navbar.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable react-hooks/exhaustive-deps */
 import styles from "@/styles/Navbar.module.css";
 import Box from "@mui/material/Box";
 import Button from "@mui/material/Button";
@@ -14,15 +15,58 @@ import { useState, useEffect } from "react";
 import close from "../public/close.svg";
 import menu from "../public/menu.svg";
 import sato_logo_nav from "../public/sato_logo_nav.png";
+import { ListSubheader } from "@mui/material";
+import { useRouter } from "next/router";
 
 type Anchor = "right";
 
 const Navbar = () => {
   const [state, setState] = useState({
     right: false,
   });
+  const [cmsData, setCmsData] = useState<CMSData>({ data: [] });
+  const [loading, setLoading] = useState<boolean>(false);
+  const [error, setError] = useState<string | null>(null);
+  const router = useRouter();
+  const currentRoute = router.pathname;
+  const navGeneral = cmsData.data.slice(0, 4);
+  const navForMembers = cmsData.data.slice(4);
 
   useEffect(() => {
+    // Import text
+    const fetchData = async () => {
+      setLoading(true);
+      setError(null);
+
+      const collectionName: string = "Nav";
+      const url = `${process.env.NEXT_PUBLIC_DIRECTUS_URL}items/${collectionName}`;
+      const headers = {
+        "Content-Type": "application/json",
+      };
+
+      try {
+        const response = await fetch(url, {
+          method: "GET",
+          headers,
+        });
+        if (!response.ok) {
+          throw new Error(`Error: ${response.status} ${response.statusText}`);
+        }
+        const result = await response.json();
+        setCmsData(result);
+      } catch (err) {
+        if (err instanceof Error) {
+          setError(err.message);
+        } else {
+          setError("An unknown error occurred");
+        }
+      } finally {
+        setLoading(false);
+      }
+    };
+    fetchData();
+
+    // Scroll to hide header
     let prevScrollpos = window.scrollY;
     const handleScroll = () => {
       const currentScrollpos = window.scrollY;
@@ -41,6 +85,7 @@ const Navbar = () => {
     return () => window.removeEventListener("scroll", handleScroll);
   }, []);
 
+  // MUI Drawer toggling
   const toggleDrawer =
     (anchor: Anchor, open: boolean) =>
     (event: React.KeyboardEvent | React.MouseEvent) => {
@@ -66,27 +111,68 @@ const Navbar = () => {
         <Image src={close} alt="close icon" />
       </Button>
 
-      <List>
-        {["Inbox", "Starred", "Send email", "Drafts"].map((text, index) => (
-          <ListItem key={text} disablePadding>
-            <ListItemButton>
-              <ListItemIcon></ListItemIcon>
-              <ListItemText primary={text} />
-            </ListItemButton>
-          </ListItem>
-        ))}
+      {/* {cmsData.data.map((data: any) => (
+        <p key={data.id}>{data.text_en}</p>
+      ))} */}
+      <List disablePadding>
+        {navGeneral.map((data: CMSItem) => {
+          const route =
+            data.text_en.toLowerCase() === "home"
+              ? "/"
+              : `/${data.text_en.toLowerCase().replace(" ", "-")}`;
+
+          return (
+            <ListItem key={data.id} disablePadding>
+              <ListItemButton>
+                <ListItemIcon></ListItemIcon>
+                <Link
+                  href={route}
+                  className={
+                    route === currentRoute
+                      ? styles.navLinkActive
+                      : styles.navLink
+                  }
+                >
+                  {data.text_en}
+                </Link>
+              </ListItemButton>
+            </ListItem>
+          );
+        })}
       </List>
+      <br />
       <Divider />
-      <List>
-        {["All mail", "Trash", "Spam"].map((text, index) => (
-          <ListItem key={text} disablePadding>
+      <ListSubheader>For Members</ListSubheader>
+      <List disablePadding>
+        {navForMembers.map((data: any) => (
+          <ListItem key={data.id} disablePadding>
             <ListItemButton>
               <ListItemIcon></ListItemIcon>
-              <ListItemText primary={text} />
+              <Link
+                href={`/${data.text_en.toLowerCase().replace(" ", "-")}`}
+                className={
+                  `/${data.text_en.toLowerCase().replace(" ", "-")}` ===
+                  currentRoute
+                    ? styles.navLinkActive
+                    : styles.navLink
+                }
+              >
+                {data.text_en}
+              </Link>
             </ListItemButton>
           </ListItem>
         ))}
       </List>
+
+      <br />
+      <Divider />
+      <ListSubheader>Languages</ListSubheader>
+      <div>
+        <ListItemIcon></ListItemIcon>
+        <Button>FI</Button>
+        <Button>SV</Button>
+        <Button>EN</Button>
+      </div>
     </Box>
   );
 

diff --git a/hooks/types.ts b/hooks/types.ts
@@ -0,0 +1,14 @@
+type CMSItem = {
+  id: number;
+  user_created: null;
+  date_created: string;
+  user_updated: null;
+  date_updated: string | null;
+  text_en: string;
+  text_fi: string;
+  text_sv: string;
+};
+
+type CMSData = {
+  data: CMSItem[];
+};
diff --git a/pages/nation-info.tsx b/pages/nation-info.tsx
@@ -0,0 +1,9 @@
+import Navbar from "@/components/Navbar";
+
+export default function NationInfo() {
+  return (
+    <>
+      <Navbar />
+    </>
+  );
+}
diff --git a/styles/Navbar.module.css b/styles/Navbar.module.css
@@ -17,3 +17,16 @@
   align-items: center;
   top: 0;
 }
+
+.navLink {
+  text-decoration: none;
+  font-size: 1.2rem;
+  color: var(--black);
+}
+
+.navLinkActive {
+  text-decoration: none;
+  font-size: 1.2rem;
+  font-weight: 700;
+  color: var(--orange200);
+}