i don't want to PR so here this is probably broken but it is merging the

coords and coc page :D
UW-UPL · May 29, 2024 · c63436b · c63436b
1 parent fcc7dd4
commit c63436b
Show file tree

Hide file tree

Showing 7 changed files with 111 additions and 78 deletions.
diff --git 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
@@ -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
@@ -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
diff --git a/src/content/docs b/src/content/docs
diff --git a/src/pages/code-of-conduct.astro b/src/pages/code-of-conduct.astro
diff --git 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();
+
 ---
 
 <Layout>
-	<div class="text-gray-700 font-sans">
-		<h1 class="text-4xl font-semibold font-lato text-center pb-2">
-			Meet the Coords
-		</h1>
-		<p class="text-lg text-gray-600 font-light pb-14 text-center">
-			These are the people that run the UPL day-to-day. If you have any
-			questions, reach out to upl(at)cs.wisc.edu
-		</p>
-		<div
-			class="grid lg:grid-cols-4 md:grid-cols-3 grid-cols-2 gap-x-8 gap-y-16"
-		>
-			{
-				CoordsCollection.filter((d) => d.data.isActive).map((coord) => (
-					<CoordCard {coord} />
-				))
-			}
-		</div>
-		<div class="font-sans mt-8">
-			<h1 class="text-4xl font-semibold font-lato text-center pb-2">
-				Faculty Advisor
-			</h1>
-			<p class="text-lg text-gray-600 font-light pb-14 text-center">
-				Our faculty advisor is Professor Bart Miller, who can be contacted at
-				bart (at) cs.wisc.edu
-			</p>
-		</div>
-		<div class="sm:mb-8 mx-auto sm:w-1/4 w-1/2">
-			<CoordCard
-				{...{
-					coord: {
-						data: {
-							name: "Bart Miller",
-							study: "Faculty Advisor",
-							image: "bart-miller.webp",
-							personalLink: "https://www.cs.wisc.edu/~bart/",
-							links: [
-								{
-									name: "Test",
-									url: "https://www.google.com",
-								},
-							],
-							bio: "Barton Miller is a Vilas Distinguished Achievement Professor and the Amar and Belinder Sohi Professor of Computer Sciences at the University of Wisconsin, Madison. He received his B.A. degree from the University of California, San Diego in 1977, and M.S. and Ph.D. degrees in Computer Science from the University of California, Berkeley in 1980 and 1984. Professor Miller is a Fellow of the ACM."
-						},
-					},
-				}}
-			/>
-		</div>
-	</div>
+    <div class="text-gray-700 font-sans">
+        <h1 class="text-4xl font-semibold font-lato text-center pb-2">
+            Meet the Coords
+        </h1>
+        <p class="text-lg text-gray-600 font-light pb-14 text-center">
+            These are the people that run the UPL day-to-day. If you have any
+            questions, reach out to upl(at)cs.wisc.edu
+        </p>
+        <div
+            class="grid lg:grid-cols-4 md:grid-cols-3 grid-cols-2 gap-x-8 gap-y-16"
+            >
+            {
+            CoordsCollection.filter((d) => d.data.isActive).map((coord) => (
+                    <CoordCard {coord} />
+            ))
+            }
+        </div>
+        <div class="font-sans mt-8">
+            <h1 class="text-4xl font-semibold font-lato text-center pb-2">
+                Faculty Advisor
+            </h1>
+            <p class="text-lg text-gray-600 font-light pb-14 text-center">
+                Our faculty advisor is Professor Bart Miller, who can be contacted at
+                bart (at) cs.wisc.edu
+            </p>
+        </div>
+        <div class="sm:mb-8 mx-auto sm:w-1/4 w-1/2">
+            <CoordCard
+            {...{
+                coord: {
+                    data: {
+                        name: "Bart Miller",
+                        study: "Faculty Advisor",
+                        image: "bart-miller.webp",
+                        personalLink: "https://www.cs.wisc.edu/~bart/",
+                        links: [
+                            {
+                                name: "Test",
+                                url: "https://www.google.com",
+                            },
+                        ],
+                        bio: "Barton Miller is a Vilas Distinguished Achievement Professor and the Amar and Belinder Sohi Professor of Computer Sciences at the University of Wisconsin, Madison. He received his B.A. degree from the University of California, San Diego in 1977, and M.S. and Ph.D. degrees in Computer Science from the University of California, Berkeley in 1980 and 1984. Professor Miller is a Fellow of the ACM."
+                    },
+                },
+            }}
+            />
+        </div>
+    </div>
+    <div class="inline w-full overflow-hidden text-slate-800 mt-8">
+        <div class="mx-auto w-3/4">
+            <div class="text-base/6 font-sans prose prose-lg prose-zinc">
+                <coc_rendered.Content>
+            </div>
+        </div>
+    </div>
+
 </Layout>