Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/rererereredesign2 #105

Merged
merged 11 commits into from
Sep 12, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 0 additions & 54 deletions components/ArchiveItem.tsx

This file was deleted.

32 changes: 0 additions & 32 deletions components/ArchiveSection.tsx

This file was deleted.

4 changes: 2 additions & 2 deletions components/Navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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>
);
Expand Down
81 changes: 46 additions & 35 deletions data/archive.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
export interface ArchivedEvent {
export interface EventArchive {
name: string;
type: string;
date: Date;
time: string;
location?: string;
description: string;
recording: string;
Expand All @@ -12,90 +10,103 @@ export interface ArchivedEvent {
}

export interface SeriesArchive {
seriesName: string;
events: ArchivedEvent[];
name: string;
events: EventArchive[];
}

export interface QuarterArchive {
name: string;
series: SeriesArchive[];
}

const archive = [
const archive: QuarterArchive[] = [
/*WINTER2023*/
{
name: "Winter 2023",
series: [
{
seriesName: "Cyber Academy: Web Hacking",
name: "Cyber Academy: Web Hacking",
events: [
{
name: "Week 6: SQL Injection",
date: new Date('5/9/24'),
date: new Date("5/9/24"),
location: "Math Sciences 5200",
description:
"Event description Event descriptionEvent description Event description",
"Event description event description event description event description event description",
recording: "https://youtube.com/<link_here>",
slides: "https://docs.google.com/",
tags: ["web", "sql", "hacking"],
graphicPath: "/images/archive.svg",
},
{
name: "XSS",
date: new Date('5/9/24'),
name: "Week 5: XSS",
date: new Date("5/9/24"),
location: "Math Sciences 5200",
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'),
name: "Example 3",
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",
tags: ["test3"],
graphicPath: "/images/cyber-symposium.png",
},
{
name: "XSS",
date: new Date('5/9/24'),
name: "Example 2",
date: new Date("5/9/24"),
location: "Math Sciences 5200",
description: "Event description",
recording: "https://youtube.com/<link_here>",
slides: "https://docs.google.com/",
tags: ["web", "xss", "hacking"],
graphicPath: "/images/archive.svg",
tags: ["test2"],
graphicPath: "/images/cyber-symposium.png",
},
{
name: "XSS",
date: new Date('5/9/24'),
name: "Example 1",
date: new Date("5/9/24"),
location: "Math Sciences 5200",
description: "Event description",
recording: "https://youtube.com/<link_here>",
slides: "https://docs.google.com/",
tags: ["web", "xss", "hacking"],
tags: ["test1"],
graphicPath: "/images/archive.svg",
},
],
},

{
name: "Special Topics",
events: [],
},
],
},

/*FALL2022*/
{
name: "Fall 2023",
name: "Fall 2022",
series: [
{
seriesName: "Cyber Academy: Forensics",
name: "Cyber Academy: Forensics",
events: [
{
name: "Binwalk",
date: new Date('5/9/24'),
name: "Example 2",
date: new Date("5/9/24"),
description: "Event description",
recording: "https://youtube.com/<link_here>",
slides: "https://docs.google.com/",
tags: ["web", "binwalk", "hacking"],
tags: ["test2"],
graphicPath: "/images/cyber-symposium.png",
},
{
name: "IDK",
date: new Date('5/9/24'),
name: "Example 1",
date: new Date("5/9/24"),
location: "Math Sciences 5200",
description: "Event description",
recording: "https://youtube.com/<link_here>",
slides: "https://docs.google.com/",
Expand All @@ -106,12 +117,12 @@ const archive = [
},
],
},
];

/*
quarter {

}
*/
/*Spring2022*/
{
name: "Spring 2022",
series: [],
},
];

export default archive;
30 changes: 15 additions & 15 deletions data/events.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,35 +5,35 @@ export interface EventType {
}

enum EventKind {
PBR = 'Psi Beta Rho',
CyLab = 'Cyber Lab',
LACTF = 'LA CTF',
CyTalks = 'Cyber Talks',
Misc = 'Miscellaneous',
PBR = "Psi Beta Rho",
CyLab = "Cyber Lab",
LACTF = "LA CTF",
CyTalks = "Cyber Talks",
Misc = "Miscellaneous",
}

export const eventTypes = [
{
name: EventKind.PBR,
description: 'add description here',
description: "add description here",
link: "https://pbr.uclaacm.com/",
},
{
name: EventKind.CyLab,
description: 'add description here',
description: "add description here",
},
{
name: EventKind.LACTF,
description: 'add description here',
link: 'https://lac.tf',
description: "add description here",
link: "https://lac.tf",
},
{
name: EventKind.CyTalks,
description: 'add description here',
description: "add description here",
},
{
name: EventKind.Misc,
description: 'add description here',
description: "add description here",
},
];

Expand All @@ -46,16 +46,16 @@ export interface Event {
description: string;
}

const matsci = 'Math Sciences 5200';
const defaultDescription = 'Example description.';
const matsci = "Math Sciences 5200";
const defaultDescription = "Example description.";

const eventsData: Event[] = [
{
name: 'Example Cyber Event',
name: "Example Cyber Event",
description: defaultDescription,
type: EventKind.CyLab,
date: new Date(),
time: '6:00 - 8:00 PM (PST)',
time: "6:00 - 8:00 PM (PST)",
location: matsci,
},
];
Expand Down
Loading
Loading