Merge pull request #105 from uclaacm/feat/rererereredesign2

Feat/rererereredesign2

.yarn/sdks/typescript/lib/tsserver.js

@@ -24,7 +24,7 @@ const moduleWrapper = (tsserver) => {
   const dependencyTreeRoots = new Set(
     pnpApi.getDependencyTreeRoots().map((locator) => {
       return `${locator.name}@${locator.reference}`;
-    }),
+    })
   );
 
   // VSCode sends the zip paths to TS using the "zip://" prefix, that TS
@@ -168,7 +168,7 @@ const moduleWrapper = (tsserver) => {
         {
           return str.replace(
             /^\^?(zip:|\/zip(\/ts-nul-authority)?)\/+/,
-            process.platform === `win32` ? `` : `/`,
+            process.platform === `win32` ? `` : `/`
           );
         }
         break;
@@ -215,7 +215,7 @@ const moduleWrapper = (tsserver) => {
           const [, major, minor] = (
             process.env.VSCODE_IPC_HOOK.match(
               // The RegExp from https://semver.org/ but without the caret at the start
-              /(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/,
+              /(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
             ) ?? []
           ).map(Number);
 
@@ -235,14 +235,14 @@ const moduleWrapper = (tsserver) => {
         parsedMessage,
         (key, value) => {
           return typeof value === "string" ? fromEditorPath(value) : value;
-        },
+        }
       );
 
       return originalOnMessage.call(
         this,
         isStringMessage
           ? processedMessageJSON
-          : JSON.parse(processedMessageJSON),
+          : JSON.parse(processedMessageJSON)
       );
     },
 
@@ -252,8 +252,8 @@ const moduleWrapper = (tsserver) => {
         JSON.parse(
           JSON.stringify(msg, (key, value) => {
             return typeof value === `string` ? toEditorPath(value) : value;
-          }),
-        ),
+          })
+        )
       );
     },
   });

.yarn/sdks/typescript/lib/tsserverlibrary.js

@@ -24,7 +24,7 @@ const moduleWrapper = (tsserver) => {
   const dependencyTreeRoots = new Set(
     pnpApi.getDependencyTreeRoots().map((locator) => {
       return `${locator.name}@${locator.reference}`;
-    }),
+    })
   );
 
   // VSCode sends the zip paths to TS using the "zip://" prefix, that TS
@@ -168,7 +168,7 @@ const moduleWrapper = (tsserver) => {
         {
           return str.replace(
             /^\^?(zip:|\/zip(\/ts-nul-authority)?)\/+/,
-            process.platform === `win32` ? `` : `/`,
+            process.platform === `win32` ? `` : `/`
           );
         }
         break;
@@ -215,7 +215,7 @@ const moduleWrapper = (tsserver) => {
           const [, major, minor] = (
             process.env.VSCODE_IPC_HOOK.match(
               // The RegExp from https://semver.org/ but without the caret at the start
-              /(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/,
+              /(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
             ) ?? []
           ).map(Number);
 
@@ -235,14 +235,14 @@ const moduleWrapper = (tsserver) => {
         parsedMessage,
         (key, value) => {
           return typeof value === "string" ? fromEditorPath(value) : value;
-        },
+        }
       );
 
       return originalOnMessage.call(
         this,
         isStringMessage
           ? processedMessageJSON
-          : JSON.parse(processedMessageJSON),
+          : JSON.parse(processedMessageJSON)
       );
     },
 
@@ -252,8 +252,8 @@ const moduleWrapper = (tsserver) => {
         JSON.parse(
           JSON.stringify(msg, (key, value) => {
             return typeof value === `string` ? toEditorPath(value) : value;
-          }),
-        ),
+          })
+        )
       );
     },
   });

components/Navbar.tsx

@@ -41,9 +41,9 @@ export default function Navbar() {
         <Link className={styles.hoverable} href="/blog">
           <li>Blog</li>
         </Link>
-        {/* <Link className={styles.hoverable} href="/archive">
+        <Link className={styles.hoverable} href="/archive">
           <li>Archive</li>
-        </Link> */}
+        </Link>
       </ul>
     </nav>
   );

data/archive.ts

@@ -1,117 +1,51 @@
-export interface ArchivedEvent {
+export interface EventArchive {
   name: string;
-  type: string;
   date: Date;
-  time: string;
   location?: string;
   description: string;
-  recording: string;
-  slides: string;
+  recording?: string;
+  slides?: string;
   tags: string[];
   graphicPath: string;
 }
 
 export interface SeriesArchive {
-  seriesName: string;
-  events: ArchivedEvent[];
+  name: string;
+  description: string;
+  events: EventArchive[];
 }
 
 export interface QuarterArchive {
   name: string;
   series: SeriesArchive[];
 }
 
-const archive = [
+const archive: QuarterArchive[] = [
+  /* WINTER 2023 */
   {
     name: "Winter 2023",
     series: [
       {
-        seriesName: "Cyber Academy: Web Hacking",
+        name: "Example Cyber Series",
+        description: "Learn how to hack websites!",
         events: [
           {
-            name: "Week 6: SQL Injection",
-            date: new Date('5/9/24'),
+            name: "Example Archived Event",
+            date: new Date("5/9/24"),
+            location: "Math Sciences 5200",
             description:
-              "Event description Event descriptionEvent description Event description",
-            recording: "https://youtube.com/<link_here>",
-            slides: "https://docs.google.com/",
+              "Lorem ipsum dolor sit amet, consectetur \
+                adipiscing elit, sed do eiusmod tempor \
+                incididunt ut labore et dolore magna aliqua. \
+                Ut enim ad minim veniam, quis nostrud exercitation \
+                ullamco laboris nisi ut aliquip ex ea commodo consequat.",
             tags: ["web", "sql", "hacking"],
             graphicPath: "/images/archive.svg",
           },
-          {
-            name: "XSS",
-            date: new Date('5/9/24'),
-            description: "Event description",
-            recording: "https://youtube.com/<link_here>",
-            slides: "https://docs.google.com/",
-            tags: ["web", "xss", "hacking"],
-            graphicPath: "/images/archive.svg",
-          },
-          {
-            name: "XSS",
-            date: new Date('5/9/24'),
-            description: "Event description",
-            recording: "https://youtube.com/<link_here>",
-            slides: "https://docs.google.com/",
-            tags: ["web", "xss", "hacking"],
-            graphicPath: "/images/archive.svg",
-          },
-          {
-            name: "XSS",
-            date: new Date('5/9/24'),
-            description: "Event description",
-            recording: "https://youtube.com/<link_here>",
-            slides: "https://docs.google.com/",
-            tags: ["web", "xss", "hacking"],
-            graphicPath: "/images/archive.svg",
-          },
-          {
-            name: "XSS",
-            date: new Date('5/9/24'),
-            description: "Event description",
-            recording: "https://youtube.com/<link_here>",
-            slides: "https://docs.google.com/",
-            tags: ["web", "xss", "hacking"],
-            graphicPath: "/images/archive.svg",
-          },
-        ],
-      },
-    ],
-  },
-  {
-    name: "Fall 2023",
-    series: [
-      {
-        seriesName: "Cyber Academy: Forensics",
-        events: [
-          {
-            name: "Binwalk",
-            date: new Date('5/9/24'),
-            description: "Event description",
-            recording: "https://youtube.com/<link_here>",
-            slides: "https://docs.google.com/",
-            tags: ["web", "binwalk", "hacking"],
-            graphicPath: "/images/cyber-symposium.png",
-          },
-          {
-            name: "IDK",
-            date: new Date('5/9/24'),
-            description: "Event description",
-            recording: "https://youtube.com/<link_here>",
-            slides: "https://docs.google.com/",
-            tags: ["test1"],
-            graphicPath: "/images/cyber-symposium.png",
-          },
         ],
       },
     ],
   },
 ];
 
-/* 
-    quarter {
-
-    }
-*/
-
 export default archive;