From 7d7bffc20afb381a816627cbd5d7237d16054cbb Mon Sep 17 00:00:00 2001
From: Stevan Freeborn <65925598+StevanFreeborn@users.noreply.github.com>
Date: Mon, 10 Apr 2023 23:20:07 -0500
Subject: [PATCH] feat: add navigation between version 1 and 2

---
 src/app/components/Main.module.css    | 15 +++++++++++
 src/app/components/Main.tsx           | 23 ++++++++++++++++
 src/app/components/NavBar.tsx         | 39 ++++++++++++++++++---------
 src/app/components/SideBar.tsx        |  8 +++---
 src/app/layout.tsx                    | 15 +----------
 src/app/lib/markdoc.ts                |  6 ++---
 src/app/page.tsx                      | 25 ++++++++---------
 src/app/types/types.ts                |  2 +-
 src/app/version-1/page.tsx            | 22 +++++++++++++++
 src/docs/version_001/docsStructure.ts | 10 +------
 10 files changed, 106 insertions(+), 59 deletions(-)
 create mode 100644 src/app/components/Main.module.css
 create mode 100644 src/app/components/Main.tsx
 create mode 100644 src/app/version-1/page.tsx

diff --git a/src/app/components/Main.module.css b/src/app/components/Main.module.css
new file mode 100644
index 0000000..ceb333a
--- /dev/null
+++ b/src/app/components/Main.module.css
@@ -0,0 +1,15 @@
+.container {
+  display: flex;
+  width: 100%;
+  flex-direction: column;
+  justify-content: flex-start;
+  align-items: center;
+  margin: 0 auto;
+  overflow-y: auto;
+}
+
+.divider {
+  width: 100%;
+  height: 1px;
+  background-color: #848586;
+}
\ No newline at end of file
diff --git a/src/app/components/Main.tsx b/src/app/components/Main.tsx
new file mode 100644
index 0000000..aaefc94
--- /dev/null
+++ b/src/app/components/Main.tsx
@@ -0,0 +1,23 @@
+import { DocSection } from '../types/types';
+import styles from './Main.module.css';
+import Section from './Section';
+
+export default function Main({
+  versionSections,
+}: {
+  versionSections: DocSection[];
+}) {
+  return (
+    <main className={styles.container}>
+      {versionSections.map(section => (
+        <>
+          <Section key={section.title}>
+            {section.copy}
+            {section.example}
+          </Section>
+          <div className={styles.divider}>&nbsp;</div>
+        </>
+      ))}
+    </main>
+  );
+}
diff --git a/src/app/components/NavBar.tsx b/src/app/components/NavBar.tsx
index 63080e7..6201e8c 100644
--- a/src/app/components/NavBar.tsx
+++ b/src/app/components/NavBar.tsx
@@ -2,17 +2,26 @@
 
 import Link from 'next/link.js';
 import { useState } from 'react';
+import { DocsStructure } from '../types/types.js';
 import styles from './NavBar.module.css';
 
-function NavbarDropdown() {
-  const versions = ['Version 1', 'Version 2'];
+function NavbarDropdown({ version }: { version: string }) {
+  const versions = {
+    version_001: {
+      name: 'Version 1',
+      path: '/version-1',
+    },
+    version_002: {
+      name: 'Version 2',
+      path: '/',
+    },
+  } as { [key: string]: { name: string; path: string } };
+
+  const currentVersion = versions[version];
 
   const [isDropdownOpen, setIsDropdownOpen] =
     useState<boolean>(false);
 
-  const [version, setVersion] =
-    useState<string>('Version 2');
-
   const handleDropdownToggle = () => {
     setIsDropdownOpen(!isDropdownOpen);
   };
@@ -23,7 +32,7 @@ function NavbarDropdown() {
         className={styles.navLink}
         onClick={handleDropdownToggle}
       >
-        {version}{' '}
+        {currentVersion.name}{' '}
         {isDropdownOpen ? (
           <svg
             xmlns="http://www.w3.org/2000/svg"
@@ -61,31 +70,35 @@ function NavbarDropdown() {
             : styles.dropdownMenu
         }
       >
-        {versions
+        {Object.keys(versions)
           .filter(v => v !== version)
           .map(v => (
-            <a
+            <Link
+              href={`${versions[v].path}`}
               key={v}
               className={styles.navLink}
               onClick={() => {
-                setVersion(v);
                 setIsDropdownOpen(false);
               }}
             >
-              {v}
-            </a>
+              {versions[v].name}
+            </Link>
           ))}
       </div>
     </>
   );
 }
 
-export default function NavBar() {
+export default function NavBar({
+  version,
+}: {
+  version: DocsStructure;
+}) {
   return (
     <nav className={styles.nav}>
       <ul className={styles.navList}>
         <li className={styles.navItem}>
-          <NavbarDropdown />
+          <NavbarDropdown version={version.version} />
         </li>
         <li className={styles.navItem}>
           <Link
diff --git a/src/app/components/SideBar.tsx b/src/app/components/SideBar.tsx
index 67fc350..c9972a8 100644
--- a/src/app/components/SideBar.tsx
+++ b/src/app/components/SideBar.tsx
@@ -76,11 +76,9 @@ function ListTree({ docs }: { docs: Doc[] }) {
 }
 
 export default function SideBar({
-  versionOne,
-  versionTwo,
+  version,
 }: {
-  versionOne: DocsStructure;
-  versionTwo: DocsStructure;
+  version: DocsStructure;
 }) {
   return (
     <div className={styles.container}>
@@ -88,7 +86,7 @@ export default function SideBar({
         <span className={styles.onspring}>Onspring</span>{' '}
         <span className={styles.api}>API</span>
       </h1>
-      <ListTree docs={versionTwo.docs} />
+      <ListTree docs={version.docs} />
     </div>
   );
 }
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index fbda6ac..3709bb8 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1,8 +1,4 @@
-import { versionOne } from '@/docs/version_001/docsStructure';
-import { versionTwo } from '@/docs/version_002/docsStructure';
 import { ReactNode } from 'react';
-import NavBar from './components/NavBar';
-import SideBar from './components/SideBar';
 import './globals.css';
 
 export const metadata = {
@@ -25,16 +21,7 @@ export default function RootLayout({
 }) {
   return (
     <html lang="en">
-      <body>
-        <SideBar
-          versionOne={versionOne}
-          versionTwo={versionTwo}
-        />
-        <div className="container">
-          <NavBar />
-          {children}
-        </div>
-      </body>
+      <body>{children}</body>
     </html>
   );
 }
diff --git a/src/app/lib/markdoc.ts b/src/app/lib/markdoc.ts
index e7229ae..b95ce72 100644
--- a/src/app/lib/markdoc.ts
+++ b/src/app/lib/markdoc.ts
@@ -3,7 +3,7 @@ import fs from 'fs';
 import path from 'path';
 import React, { ReactNode } from 'react';
 import Code from '../components/Code';
-import { Doc, Section } from './../types/types';
+import { Doc, DocSection } from './../types/types';
 const DOCS_PATH = path.join(process.cwd(), 'src/docs');
 
 function getCopyPath(version: string, doc: Doc): string {
@@ -78,8 +78,8 @@ function getExampleChild(version: string, doc: Doc) {
 export function loadSections(
   version: string,
   docs: Doc[],
-  sections: Section[] = []
-): Section[] {
+  sections: DocSection[] = []
+): DocSection[] {
   for (const doc of docs) {
     sections.push({
       title: doc.title,
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 490fcf2..73beb79 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,25 +1,22 @@
 import { versionTwo } from '@/docs/version_002/docsStructure';
-import Section from './components/Section';
+import Main from './components/Main';
+import NavBar from './components/NavBar';
+import SideBar from './components/SideBar';
 import { loadSections } from './lib/markdoc';
-import styles from './page.module.css';
 
-export default function Home() {
+export default function Page() {
   const versionTwoSections = loadSections(
     versionTwo.version,
     versionTwo.docs
   );
 
   return (
-    <main className={styles.container}>
-      {versionTwoSections.map(section => (
-        <>
-          <Section key={section.title}>
-            {section.copy}
-            {section.example}
-          </Section>
-          <div className={styles.divider}>&nbsp;</div>
-        </>
-      ))}
-    </main>
+    <>
+      <SideBar version={versionTwo} />
+      <div className="container">
+        <NavBar version={versionTwo} />
+        <Main versionSections={versionTwoSections} />
+      </div>
+    </>
   );
 }
diff --git a/src/app/types/types.ts b/src/app/types/types.ts
index 533fb89..b28ecc0 100644
--- a/src/app/types/types.ts
+++ b/src/app/types/types.ts
@@ -13,7 +13,7 @@ export type Doc = {
   children?: Doc[];
 };
 
-export type Section = {
+export type DocSection = {
   title: string;
   copy: ReactNode;
   example: ReactNode;
diff --git a/src/app/version-1/page.tsx b/src/app/version-1/page.tsx
new file mode 100644
index 0000000..1634bb5
--- /dev/null
+++ b/src/app/version-1/page.tsx
@@ -0,0 +1,22 @@
+import { versionOne } from '@/docs/version_001/docsStructure';
+import Main from '../components/Main';
+import NavBar from '../components/NavBar';
+import SideBar from '../components/SideBar';
+import { loadSections } from '../lib/markdoc';
+
+export default function Page() {
+  const versionOneSections = loadSections(
+    versionOne.version,
+    versionOne.docs
+  );
+
+  return (
+    <>
+      <SideBar version={versionOne} />
+      <div className="container">
+        <NavBar version={versionOne} />
+        <Main versionSections={versionOneSections} />
+      </div>
+    </>
+  );
+}
diff --git a/src/docs/version_001/docsStructure.ts b/src/docs/version_001/docsStructure.ts
index 706f36c..382a451 100644
--- a/src/docs/version_001/docsStructure.ts
+++ b/src/docs/version_001/docsStructure.ts
@@ -2,13 +2,5 @@ import { DocsStructure } from '@/app/types/types';
 
 export const versionOne: DocsStructure = {
   version: 'version_001',
-  docs: [
-    {
-      title: 'Introduction',
-      folder: 'introduction',
-      copy: 'copy.md',
-      example: 'example.md',
-      children: [],
-    },
-  ],
+  docs: [],
 };