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 all 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
14 changes: 7 additions & 7 deletions .yarn/sdks/typescript/lib/tsserver.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -168,7 +168,7 @@ const moduleWrapper = (tsserver) => {
{
return str.replace(
/^\^?(zip:|\/zip(\/ts-nul-authority)?)\/+/,
process.platform === `win32` ? `` : `/`,
process.platform === `win32` ? `` : `/`
);
}
break;
Expand Down Expand Up @@ -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);

Expand All @@ -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)
);
},

Expand All @@ -252,8 +252,8 @@ const moduleWrapper = (tsserver) => {
JSON.parse(
JSON.stringify(msg, (key, value) => {
return typeof value === `string` ? toEditorPath(value) : value;
}),
),
})
)
);
},
});
Expand Down
14 changes: 7 additions & 7 deletions .yarn/sdks/typescript/lib/tsserverlibrary.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -168,7 +168,7 @@ const moduleWrapper = (tsserver) => {
{
return str.replace(
/^\^?(zip:|\/zip(\/ts-nul-authority)?)\/+/,
process.platform === `win32` ? `` : `/`,
process.platform === `win32` ? `` : `/`
);
}
break;
Expand Down Expand Up @@ -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);

Expand All @@ -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)
);
},

Expand All @@ -252,8 +252,8 @@ const moduleWrapper = (tsserver) => {
JSON.parse(
JSON.stringify(msg, (key, value) => {
return typeof value === `string` ? toEditorPath(value) : value;
}),
),
})
)
);
},
});
Expand Down
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
102 changes: 18 additions & 84 deletions data/archive.ts
Original file line number Diff line number Diff line change
@@ -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;
Loading