Skip to content

Commit

Permalink
fixed/update deploy, blog backlinks, C.O.C update
Browse files Browse the repository at this point in the history
  • Loading branch information
sbaumohl committed Jun 15, 2024
1 parent eb27b57 commit a9fad89
Show file tree
Hide file tree
Showing 8 changed files with 124 additions and 128 deletions.
2 changes: 1 addition & 1 deletion .astro/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"_variables": {
"lastUpdateCheck": 1715924110054
"lastUpdateCheck": 1718490552117
}
}
16 changes: 16 additions & 0 deletions .astro/types.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,23 @@ 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";
body: string;
collection: "code-of-conduct";
data: any
} & { render(): Render[".md"] };
};
"docs": {
"Code-of-Conduct.md": {
id: "Code-of-Conduct.md";
slug: "code-of-conduct";
body: string;
collection: "docs";
data: any
} & { render(): Render[".md"] };
"Coordinator-Responsibilities.md": {
id: "Coordinator-Responsibilities.md";
slug: "coordinator-responsibilities";
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout your repository using git
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive
submodules: 'recursive'
- name: Install, build, and upload your site
uses: withastro/action@v0
with:
Expand Down
22 changes: 19 additions & 3 deletions astro.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,29 @@ export default defineConfig({
site: "https://www.upl.cs.wisc.edu/",
redirects: {
"/hours.html": "/hours",
"/blog.html": "/blog"
"/blog.html": "/blog",
"/coords": "/about",
// blog post back-links
"/2022/02/25/incorrect-reification.html": "/blog/incorrect-reification/",
"/2022/02/02/learning-to-code-with-projects.html":
"/blog/learning-to-code-with-projects/",
"/2022/02/09/a-cautionary-tale-of-amazon-web-service-classes.html":
"/blog/a-cautionary-tale-of-amazon-web-service-classes/",
"/2022/03/17/exploiting-github-actions.html":
"/blog/exploiting-github-actions/",
"/2022/04/03/why-i-use-firefox.html": "/blog/why-i-use-firefox/",
"/2022/04/16/Game-Design-and-Education.html":
"/blog/game-design-and-education/",
"/2022/04/7/Artificial-Consciousness-and-Phenomenology.html":
"/blog/artificial-consciousness-and-phenomenology/",
"/2022/05/12/Using-GPT3-To-Write-A-Blog-Post.html":
"/blog/using-gpt3-to-write-a-blog-post/",
},
integrations: [sitemap(), tailwind(), react(), playformCompress()],
compressHTML: false,
markdown: {
syntaxHighlight: "prism",
remarkPlugins: [remarkReadingTime],
optimize: true
}
optimize: true,
},
});
4 changes: 2 additions & 2 deletions src/components/Header.astro
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ const ROUTES: {
name: "Resources",
},
{
path: "/coords",
name: "Coords",
path: "/about",
name: "About Us",
},
{
path: "/hours",
Expand Down
2 changes: 1 addition & 1 deletion src/content/docs
Submodule docs updated 1 files
+0 −0 Code-of-Conduct.md
83 changes: 83 additions & 0 deletions src/pages/about.astro
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
---
import Layout from "../layouts/Layout.astro";
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: any) => d.id == "Code-of-Conduct.md")[0]
?.render();
console.log(coc.map((x) => x.id));
---

<Layout>
<div class="inline w-full overflow-hidden text-slate-800 mt-8">
<div class="mx-auto w-3/4">
<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">
<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>
</div>
</div></Layout
>
119 changes: 0 additions & 119 deletions src/pages/coords.astro

This file was deleted.

0 comments on commit a9fad89

Please sign in to comment.