From 1a784a99840e36a2d4bd7b44a35649703a4bc4fe Mon Sep 17 00:00:00 2001
From: Dora Su <dora.su@uwaterloo.ca>
Date: Wed, 26 May 2021 16:13:54 +0000
Subject: [PATCH] Add new routes to the navbar

---
 components/Navbar.tsx          | 53 +++++++++++++++++++++++++++-------
 pages/resources.mdx            |  1 -
 pages/resources/services.mdx   |  1 +
 pages/resources/tech-talks.mdx |  1 +
 4 files changed, 44 insertions(+), 12 deletions(-)
 delete mode 100644 pages/resources.mdx
 create mode 100644 pages/resources/services.mdx
 create mode 100644 pages/resources/tech-talks.mdx

diff --git a/components/Navbar.tsx b/components/Navbar.tsx
index 1111c7a6..5bf8d8c4 100644
--- a/components/Navbar.tsx
+++ b/components/Navbar.tsx
@@ -50,24 +50,35 @@ const menu: NavLink[] = [
   },
   {
     name: "Resources",
-    route: "/resources",
+    route: "/resources/services",
+    submenu: [
+      {
+        name: "Services",
+        route: "/resources/services",
+      },
+      {
+        name: "Tech Talks",
+        route: "/resources/tech-talks",
+      },
+      {
+        name: "CS Club Wiki",
+        route: "https://wiki.csclub.uwaterloo.ca/",
+      },
+    ],
   },
 ];
 
 function NavItem(props: NavLink) {
   const router = useRouter();
+  const externalLink =
+    props.route.includes("http://") || props.route.includes("https://");
   return (
     <>
-      <Link href={props.route}>
+      {externalLink ? (
         <a
-          title={props.name}
-          className={
-            router.pathname === props.route ||
-            ((props.submenu?.length ?? 0) > 0 &&
-              router.pathname.startsWith(props.route))
-              ? styles.currentPage
-              : ""
-          }
+          href={props.route}
+          target="_blank"
+          rel="noopener noreferrer"
           onClick={() => {
             if (document.activeElement instanceof HTMLElement) {
               document.activeElement.blur();
@@ -76,7 +87,27 @@ function NavItem(props: NavLink) {
         >
           {props.name}
         </a>
-      </Link>
+      ) : (
+        <Link href={props.route}>
+          <a
+            title={props.name}
+            className={
+              router.pathname === props.route ||
+              ((props.submenu?.length ?? 0) > 0 &&
+                router.pathname.startsWith(props.route))
+                ? styles.currentPage
+                : ""
+            }
+            onClick={() => {
+              if (document.activeElement instanceof HTMLElement) {
+                document.activeElement.blur();
+              }
+            }}
+          >
+            {props.name}
+          </a>
+        </Link>
+      )}
       {(props.submenu?.length ?? 0) > 0 ? (
         <ul className={styles.dropdown}>
           {props.submenu?.map((item) => {
diff --git a/pages/resources.mdx b/pages/resources.mdx
deleted file mode 100644
index 29b953b0..00000000
--- a/pages/resources.mdx
+++ /dev/null
@@ -1 +0,0 @@
-# Resources page
diff --git a/pages/resources/services.mdx b/pages/resources/services.mdx
new file mode 100644
index 00000000..3effab29
--- /dev/null
+++ b/pages/resources/services.mdx
@@ -0,0 +1 @@
+# Services Page
\ No newline at end of file
diff --git a/pages/resources/tech-talks.mdx b/pages/resources/tech-talks.mdx
new file mode 100644
index 00000000..bbb0e906
--- /dev/null
+++ b/pages/resources/tech-talks.mdx
@@ -0,0 +1 @@
+# Tech Talks Page
\ No newline at end of file