From 9818e7ef247c887f35cb9535dda45cad606ed4cd Mon Sep 17 00:00:00 2001
From: Nicholas Langford <langfordn@icloud.com>
Date: Thu, 18 Jan 2024 03:53:26 +1100
Subject: [PATCH] Add first year fb group to navbar, remove calendar from
 navbar (dead link), refactor navbar using .map

---
 components/Navigation.jsx | 72 ++++++++++++---------------------------
 next.config.js            | 12 +++++++
 2 files changed, 33 insertions(+), 51 deletions(-)

diff --git a/components/Navigation.jsx b/components/Navigation.jsx
index 3c4352b..4d36707 100644
--- a/components/Navigation.jsx
+++ b/components/Navigation.jsx
@@ -21,16 +21,12 @@ import Headroom from "headroom.js";
 // reactstrap components
 import {
   Collapse,
-  UncontrolledDropdown,
   Navbar,
   NavItem,
   Nav,
   Container,
   Row,
   Col,
-  DropdownMenu,
-  DropdownItem,
-  DropdownToggle,
   NavbarToggler,
 } from "reactstrap";
 
@@ -48,6 +44,18 @@ import NextNavbarBrand from "./link/NextNavbarBrand.jsx";
 import NextNavLink from "./link/NextNavLink.jsx";
 import NavIcon from "./navigation/NavIcon.jsx";
 
+// Supports both internal and external links, but internal links/redirects are preferred
+const navLinks = [
+  // [text, link]
+  ["About Us", "/about"],
+  ["Team", "/team"],
+  ["Events", "/events"],
+  ["Publications", "/publications"],
+  ["Charity", "/charity"],
+  // ["Calendar", "/calendar"], // TODO add 2024 calendar
+  ["First Year FB Group", "/first-year-fb-group"],
+];
+
 const Navigation = () => {
   const router = useRouter();
   const [open, setOpen] = useState(false);
@@ -102,53 +110,15 @@ const Navigation = () => {
                 </Row>
               </div>
               <Nav className="navbar-nav-click align-items-lg-center" navbar>
-                <NavItem>
-                  <Link href="/about" passHref>
-                    <NextNavLink className={getNavLinkClass("/about")}>
-                      <span className="nav-link-inner--text">About Us</span>
-                    </NextNavLink>
-                  </Link>
-                </NavItem>
-
-                <NavItem>
-                  <Link href="/team" passHref>
-                    <NextNavLink className={getNavLinkClass("/team")}>
-                      <span className="nav-link-inner--text">The Team</span>
-                    </NextNavLink>
-                  </Link>
-                </NavItem>
-
-                <NavItem>
-                  <Link href="/events" passHref>
-                    <NextNavLink className={getNavLinkClass("/events")}>
-                      <span className="nav-link-inner--text">Events</span>
-                    </NextNavLink>
-                  </Link>
-                </NavItem>
-
-                <NavItem>
-                  <Link href="/publications" passHref>
-                    <NextNavLink className={getNavLinkClass("/publications")}>
-                      <span className="nav-link-inner--text">Publications</span>
-                    </NextNavLink>
-                  </Link>
-                </NavItem>
-
-                <NavItem>
-                  <Link href="/charity" passHref>
-                    <NextNavLink className={getNavLinkClass("/charity")}>
-                      <span className="nav-link-inner--text">Charity</span>
-                    </NextNavLink>
-                  </Link>
-                </NavItem>
-
-                <NavItem>
-                  <Link href="/calendar" passHref>
-                    <NextNavLink className={getNavLinkClass("/calendar")}>
-                      <span className="nav-link-inner--text">Calendar</span>
-                    </NextNavLink>
-                  </Link>
-                </NavItem>
+                {navLinks.map(([text, link]) => (
+                  <NavItem>
+                    <Link href={link} passHref>
+                      <NextNavLink className={getNavLinkClass(link)}>
+                        <span className="nav-link-inner--text">{text}</span>
+                      </NextNavLink>
+                    </Link>
+                  </NavItem>
+                ))}
               </Nav>
 
               <Nav className="align-items-lg-center ml-lg-auto" navbar>
diff --git a/next.config.js b/next.config.js
index 8ce186d..0c21e8d 100644
--- a/next.config.js
+++ b/next.config.js
@@ -11,6 +11,18 @@ const nextConfig = {
   sassOptions: {
     includePaths: [path.join(__dirname, "styles")],
   },
+  redirects: async () => [
+    // {
+    //   source: "/calendar",
+    //   destination: "", // TODO
+    //   permanent: false,
+    // },
+    {
+      source: "/first-year-fb-group",
+      destination: "https://www.facebook.com/groups/883034036564419/",
+      permanent: false,
+    },
+  ]
 };
 
 module.exports = nextConfig;