Merge pull request #141 from uclaacm/feat/cyanea

feat/cyanea
uclaacm · Jan 7, 2024 · 9ed4712 · 9ed4712
2 parents cdd1cfd + b973c10
commit 9ed4712
Show file tree

Hide file tree

Showing 12 changed files with 3,222 additions and 3,040 deletions.
diff --git a/.yarn/releases/yarn-3.6.2.cjs b/.yarn/releases/yarn-3.6.2.cjs
diff --git a/.yarn/releases/yarn-4.0.2.cjs b/.yarn/releases/yarn-4.0.2.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -1 +1,5 @@
-yarnPath: .yarn/releases/yarn-3.6.2.cjs
+compressionLevel: mixed
+
+enableGlobalCache: false
+
+yarnPath: .yarn/releases/yarn-4.0.2.cjs
diff --git a/data/archive.ts b/data/archive.ts
diff --git a/data/events.json b/data/events.json
diff --git a/data/events.ts b/data/events.ts
@@ -1,3 +1,20 @@
+import eventsData from "./events.json" assert { type: "json" }
+
+export interface CyaneaEvent {
+  id: string
+  title: string
+  type?: string | string[] | null
+  description: string
+  location: string
+  banner?: string | null
+  start: number
+  end: number
+  links?: Record<string, string> | null
+  meta?: Record<string, any> | null
+}
+
+export default eventsData as CyaneaEvent[];
+
 export interface EventType {
   name: string;
   description: string;
@@ -14,6 +31,7 @@ enum EventKind {
   CyLab = "Cyber Lab",
   LACTF = "LA CTF",
   Misc = "Miscellaneous",
+  Special = "Cyber Special Topics",
 }
 
 export const eventTypes = [
@@ -49,195 +67,10 @@ export const eventTypes = [
     id: "misc",
     icon: "boba.svg"
   },
-];
-
-export interface Event {
-  name: string;
-  type: EventKind;
-  image?: string;
-  date: Date;
-  time: string;
-  location: string;
-  description: string;
-}
-
-const CyLabLoc = "Boelter 4760";
-const CyAcLoc = "Boelter 4760";
-const time = "6:00 - 8:00 PM (PST)";
-
-const defaultDescription = "We are a group of hackers & developers passionate about cybersecurity. We break things for fun and work to improve our skills in a variety of disciplines, whether it be reverse engineering, binary exploitation, cryptography, or something entirely different. We aim to nurture the love of cybersecurity in the students at UCLA!"
-
-const eventsData: Event[] = [
-  {
-    name: "ACM Fall GM",
-    description: defaultDescription,
-    image: "/images/events/acm-gm-f23.png",
-    type: EventKind.Misc,
-    date: new Date("10/2/23"),
-    time: "7:00 - 9:00 PM (PST)",
-    location: "Ackerman Grand Ballroom",
-  },
-  {
-    name: "Cyber Fall GM",
-    description: defaultDescription,
-    image: "/images/events/gm-f23.png",
-    type: EventKind.Misc,
-    date: new Date("10/4/23"),
-    time: time,
-    location: CyLabLoc,
-  },
-  {
-    name: "Setup & Intro to Linux",
-    description: defaultDescription,
-    type: EventKind.CyAc,
-    date: new Date("10/9/23"),
-    time: time,
-    location: CyAcLoc,
-  },
-  {
-    name: "Usable Security",
-    description: defaultDescription,
-    type: EventKind.CyLab,
-    date: new Date("10/11/23"),
-    time: time,
-    location: CyLabLoc,
-  },
-  {
-    name: "File Forensics",
-    description: defaultDescription,
-    type: EventKind.CyAc,
-    date: new Date("10/16/23"),
-    time: time,
-    location: CyAcLoc,
-  },
-  {
-    name: "Machine Unlearning",
-    description: defaultDescription,
-    type: EventKind.CyLab,
-    date: new Date("10/18/23"),
-    time: time,
-    location: CyLabLoc,
-  },
   {
-    name: "Intro to Binary Exploitation (Pwn)",
-    description: defaultDescription, 
-    type: EventKind.PBR, 
-    date: new Date("10/21/23"),
-    time: "12:00 - 6:00 PM (PST)", 
-    location: "TBD",
-  },
-  {
-    name: "OSINT & Social Engineering",
-    description: defaultDescription,
-    type: EventKind.CyAc,
-    date: new Date("10/23/23"),
-    time: time,
-    location: CyAcLoc,
-  },
-  {
-    name: "Starbleed",
-    description: defaultDescription,
-    type: EventKind.CyLab,
-    date: new Date("10/25/23"),
-    time: time,
-    location: CyLabLoc,
-  },
-  // {
-  //   name: "Study Social",
-  //   description: defaultDescription,
-  //   type: EventKind.Misc,
-  //   date: new Date("10/30/23"),
-  //   time: "TBD",
-  //   location: "TBD",
-  // },
-  // {
-  //   name: "Study Social",
-  //   description: defaultDescription,
-  //   type: EventKind.Misc,
-  //   date: new Date("11/01/23"),
-  //   time: "TBD",
-  //   location: "TBD",
-  // },
-  {
-    name: "Robert Chen, OtterSec Guest Speaker",
-    description: defaultDescription,
-    type: EventKind.CyAc,
-    date: new Date("11/06/23"),
-    time: time,
-    location: CyAcLoc,
-  },
-  // {
-  //   name: "Professor Tian Guest Speaker",
-  //   description: defaultDescription,
-  //   type: EventKind.CyLab,
-  //   date: new Date("11/08/23"),
-  //   time: time,
-  //   location: CyLabLoc,
-  // },
-  {
-    name: "Federated Learning Attacks & Defenses",
-    description: defaultDescription,
-    type: EventKind.PBR,
-    date: new Date("11/11/23"),
-    time: "TBD",
-    location: "TBD",
-  },
-  {
-    name: "Intro to Web Hacking",
-    description: defaultDescription,
-    type: EventKind.CyAc,
-    date: new Date("11/13/23"),
-    time: time,
-    location: CyAcLoc,
-  },
-  {
-    name: "Cyber CTF Infrastructure",
-    description: defaultDescription,
-    type: EventKind.CyLab,
-    date: new Date("11/15/23"),
-    time: time,
-    location: CyLabLoc,
-  },
-  {
-    name: "Intro to Ghidra",
-    description: defaultDescription,
-    type: EventKind.CyAc,
-    date: new Date("11/20/23"),
-    time: time,
-    location: CyAcLoc,
-  },
-  {
-    name: "Garbled Circuits",
-    description: defaultDescription,
-    type: EventKind.PBR,
-    date: new Date("11/25/23"),
-    time: "TBD",
-    location: "TBD",
-  },
-  {
-    name: "Quines and Polygots",
-    description: defaultDescription,
-    type: EventKind.CyAc,
-    date: new Date("11/27/23"),
-    time: time,
-    location: CyAcLoc,
-  },
-  {
-    name: "Careers in Cybersecurity",
-    description: defaultDescription,
-    type: EventKind.CyLab,
-    date: new Date("11/29/23"),
-    time: time,
-    location: CyLabLoc,
-  },
-  {
-    name: "AI x Cyber: Symposium",
-    description: defaultDescription,
-    type: EventKind.CyAc,
-    date: new Date("12/04/23"),
-    time: time,
-    location: CyAcLoc,
-  },
+    name: EventKind.Special,
+    description: "Cyber Special Topics explores the intersection of cybersecurity with other fields through exciting talks and demos. Each week, you\'ll be able to gain practical experience and insights that can be applied universally in the dynamic landscape of cybersecurity.",
+    id: "cyber-special-topics",
+    textIcon: "</>",
+  }
 ];
-
-export default eventsData;
diff --git a/package.json b/package.json
@@ -12,6 +12,7 @@
   },
   "dependencies": {
     "@types/js-yaml": "^4.0.5",
+    "@types/luxon": "^3.4.0",
     "@types/node": "18.14.1",
     "@types/react": "18.0.28",
     "@types/react-dom": "18.0.11",
@@ -21,6 +22,7 @@
     "gray-matter": "^4.0.3",
     "highlight.js": "^11.8.0",
     "husky": "^8.0.3",
+    "luxon": "^3.4.4",
     "marked": "^5.0.2",
     "next": "13.2.1",
     "next-seo": "^6.0.0",
@@ -33,6 +35,7 @@
   "devDependencies": {
     "@types/marked": "^4.3.0",
     "@typescript-eslint/eslint-plugin": "^5.54.1",
+    "@typescript-eslint/parser": "^5.62.0",
     "eslint": "^8.36.0",
     "eslint-config-next": "^13.2.4",
     "eslint-config-prettier": "^8.8.0",
@@ -43,5 +46,5 @@
     "eslint-plugin-react-hooks": "^4.6.0",
     "prettier": "^2.8.7"
   },
-  "packageManager": "yarn@3.6.2"
+  "packageManager": "yarn@4.0.2"
 }