From c63436bac4423e439b7e7d06331fac5052e39f67 Mon Sep 17 00:00:00 2001 From: Nico Date: Tue, 28 May 2024 17:43:30 -0700 Subject: [PATCH] i don't want to PR so here this is probably broken but it is merging the coords and coc page :D --- .astro/types.d.ts | 52 +++++++++++++-- .gitmodules | 6 +- src/components/Header.astro | 4 -- src/content/code-of-conduct | 1 - src/content/docs | 1 + src/pages/code-of-conduct.astro | 17 ----- src/pages/coords.astro | 108 ++++++++++++++++++-------------- 7 files changed, 111 insertions(+), 78 deletions(-) delete mode 160000 src/content/code-of-conduct create mode 160000 src/content/docs delete mode 100644 src/pages/code-of-conduct.astro diff --git a/.astro/types.d.ts b/.astro/types.d.ts index 87a82ea..94592f9 100644 --- a/.astro/types.d.ts +++ b/.astro/types.d.ts @@ -190,12 +190,54 @@ declare module 'astro:content' { data: InferEntrySchema<"blog"> } & { render(): Render[".md"] }; }; -"code-of-conduct": { -"code-of-conduct.md": { - id: "code-of-conduct.md"; - slug: "code-of-conduct"; +"docs": { +"Coordinator-Responsibilities.md": { + id: "Coordinator-Responsibilities.md"; + slug: "coordinator-responsibilities"; body: string; - collection: "code-of-conduct"; + collection: "docs"; + data: any +} & { render(): Render[".md"] }; +"New User Form/New_User_Signup_Form.md": { + id: "New User Form/New_User_Signup_Form.md"; + slug: "new-user-form/new_user_signup_form"; + body: string; + collection: "docs"; + data: any +} & { render(): Render[".md"] }; +"New User Form/README.md": { + id: "New User Form/README.md"; + slug: "new-user-form/readme"; + body: string; + collection: "docs"; + data: any +} & { render(): Render[".md"] }; +"README.md": { + id: "README.md"; + slug: "readme"; + body: string; + collection: "docs"; + data: any +} & { render(): Render[".md"] }; +"Start-Of-Semester-Checklist.md": { + id: "Start-Of-Semester-Checklist.md"; + slug: "start-of-semester-checklist"; + body: string; + collection: "docs"; + data: any +} & { render(): Render[".md"] }; +"building-tour-guide.md": { + id: "building-tour-guide.md"; + slug: "building-tour-guide"; + body: string; + collection: "docs"; + data: any +} & { render(): Render[".md"] }; +"coord-app.md": { + id: "coord-app.md"; + slug: "coord-app"; + body: string; + collection: "docs"; data: any } & { render(): Render[".md"] }; }; diff --git a/.gitmodules b/.gitmodules index af0d466..9899e10 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ -[submodule "src/content/code-of-conduct"] - path = src/content/code-of-conduct - url = https://gist.github.com/nicosalm/289c14c5a6709872803d50178763f9ac [submodule "src/content/resources"] path = src/content/resources url = https://github.com/UW-UPL/resources +[submodule "src/content/docs"] + path = src/content/docs + url = https://github.com/UW-UPL/Documentation diff --git a/src/components/Header.astro b/src/components/Header.astro index 91ad668..40af3a1 100644 --- a/src/components/Header.astro +++ b/src/components/Header.astro @@ -29,10 +29,6 @@ const ROUTES: { path: "/hours", name: "Hours", }, - { - path: "/code-of-conduct", - name: "Code of Conduct", - }, ]; --- diff --git a/src/content/code-of-conduct b/src/content/code-of-conduct deleted file mode 160000 index 4797c58..0000000 --- a/src/content/code-of-conduct +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4797c58efec9c1906dfaf989f33016c3abafdce8 diff --git a/src/content/docs b/src/content/docs new file mode 160000 index 0000000..2d2a2a2 --- /dev/null +++ b/src/content/docs @@ -0,0 +1 @@ +Subproject commit 2d2a2a295f6192921b0202997143f210482dac89 diff --git a/src/pages/code-of-conduct.astro b/src/pages/code-of-conduct.astro deleted file mode 100644 index 8cbd897..0000000 --- a/src/pages/code-of-conduct.astro +++ /dev/null @@ -1,17 +0,0 @@ ---- -import { getCollection } from "astro:content"; -import Layout from "../layouts/Layout.astro"; - -const coc = await getCollection("code-of-conduct"); -const coc_rendered = await coc.filter(d => d.id == "code-of-conduct.md")[0].render(); ---- - - -
-
-
- -
-
-
- diff --git a/src/pages/coords.astro b/src/pages/coords.astro index 38e16f4..0a9dc94 100644 --- a/src/pages/coords.astro +++ b/src/pages/coords.astro @@ -4,55 +4,67 @@ import CoordCard from "../components/CoordCard.astro"; import { getCollection } from "astro:content"; const CoordsCollection = await getCollection("coordinators"); + +const coc = await getCollection("docs"); +const coc_rendered = await coc.filter(d => d.id == "Code-of-Conduct")[0].render(); + --- -
-

- Meet the Coords -

-

- These are the people that run the UPL day-to-day. If you have any - questions, reach out to upl(at)cs.wisc.edu -

-
- { - CoordsCollection.filter((d) => d.data.isActive).map((coord) => ( - - )) - } -
-
-

- Faculty Advisor -

-

- Our faculty advisor is Professor Bart Miller, who can be contacted at - bart (at) cs.wisc.edu -

-
-
- -
-
+
+

+ Meet the Coords +

+

+ These are the people that run the UPL day-to-day. If you have any + questions, reach out to upl(at)cs.wisc.edu +

+
+ { + CoordsCollection.filter((d) => d.data.isActive).map((coord) => ( + + )) + } +
+
+

+ Faculty Advisor +

+

+ Our faculty advisor is Professor Bart Miller, who can be contacted at + bart (at) cs.wisc.edu +

+
+
+ +
+
+
+
+
+ +
+
+
+