diff --git a/public/headers/orgs.png b/public/headers/orgs.png new file mode 100644 index 0000000..0f7185a Binary files /dev/null and b/public/headers/orgs.png differ diff --git a/src/app/orgs/organizations.json b/src/app/orgs/organizations.json new file mode 100644 index 0000000..6da256c --- /dev/null +++ b/src/app/orgs/organizations.json @@ -0,0 +1,54 @@ +[ + { + "name": "abtmtr.link", + "main": { + "title": "Systems Administrator", + "email": "me@abtmtr.link", + "url": "https://abtmtr.link/" + }, + "involvement": [ + { + "description": "It's me", + "start": "August 2023" + } + ] + }, + { + "name": "Fyra Labs", + "main": { + "title": "Artist in Residence", + "email": "mtr@fyralabs.com", + "url": "https://fyralabs.com/about/" + }, + "involvement": [ + { + "description": "Testing for UM on ARM Chromebooks", + "supervisor": "Owen Zimmerman", + "start": "February 2024" + }, + { + "description": "Drew Plasmanine art for Jaiden and Lleyton", + "date": "March 2024" + }, + { + "description": "Miscellaneous involvement", + "start": "April 2024" + } + ] + }, + { + "name": "Team Elrant", + "main": { + "title": "Member", + "email": "abtmtr@elrant.team", + "url": "https://github.com/orgs/elrant/people" + }, + "involvement": [ + { + "_type": "default", + "description": "Member", + "start": "May 2024" + } + ] + } +] diff --git a/src/app/orgs/page.tsx b/src/app/orgs/page.tsx new file mode 100644 index 0000000..2fcfa8f --- /dev/null +++ b/src/app/orgs/page.tsx @@ -0,0 +1,56 @@ +import { MainLayout } from "@/layout/MainLayout/MainLayout"; +import Link from "next/link"; +import o from "./organizations.json"; +import { ConditionalNull } from "@/components/utility/Conditional"; + +export default async function Home() { + const organizations: { + name: string, + main: { + title: string, + email?: string, + url: string + }, + involvement: { + description: string, + supervisor?: string, + start?: string, + date?: string, + end?: string + }[] + }[] = o; + return ( + + ORGANIZATIONS +

Organizations, corporations, companies, or just general groups I'm a part of.

+

All of it's listed here, as well as my work for them.

+ {organizations.map((organization) => (
+

{organization.name}

+

{organization.main.title} + + {" - "}{organization.main.email} + +

+ {organization.involvement.map((involvement) => (<> +
+

{involvement.description}

+

+ + {involvement.supervisor} + + + {" - "} + + + {involvement.start || involvement.date} + + + {" - "}{involvement.end} + +

+
+ ))} +
))} +
+ ) +} \ No newline at end of file diff --git a/src/layout/MainLayout/Sidebar/Main/Main.tsx b/src/layout/MainLayout/Sidebar/Main/Main.tsx index fbd9220..511a9e7 100644 --- a/src/layout/MainLayout/Sidebar/Main/Main.tsx +++ b/src/layout/MainLayout/Sidebar/Main/Main.tsx @@ -110,6 +110,18 @@ export function SidebarMain({currentPage}:{currentPage:string}) { Stories + currentPage.includes("/orgs/") ? impossiblePlay() : openPlay()} + // onMouseEnter={hoverPlay} + > +
+ corporate_fare + Organizations +
+