Merge branch 'main' of https://github.com/Comet-Robotics/cometrobotic…

…s.org

package.json

@@ -16,6 +16,8 @@
     "@astrojs/check": "^0.5.4",
     "@astrojs/react": "^3.0.10",
     "@astrojs/sitemap": "^3.0.5",
+    "@fontsource-variable/open-sans": "^5.0.29",
+    "@fontsource-variable/unbounded": "^5.0.20",
     "@types/react": "^18.2.55",
     "@types/react-dom": "^18.2.19",
     "astro": "^4.3.6",

src/components/footer.astro

@@ -1,5 +1,19 @@
 ---
-import { socialLinks, clubEmail, footerLinks, sponsorLinks } from '../data'
+import {
+  socialLinks,
+  clubEmail,
+  footerLinks,
+  sponsorLinks,
+  websiteRepo,
+} from '../data'
+
+import childProcess from 'child_process'
+
+// obtain Git commit hash
+const hash = childProcess
+  .execSync('git rev-parse --short HEAD')
+  .toString()
+  .trim()
 ---
 
 <footer
@@ -40,4 +54,9 @@ import { socialLinks, clubEmail, footerLinks, sponsorLinks } from '../data'
       ))
     }
   </div>
+  <p>
+    Commit hash: <a target="_blank" href={`${websiteRepo}/commit/${hash}`}
+      ><code>{hash}</code></a
+    >
+  </p>
 </footer>

src/components/home/hero.astro

@@ -15,7 +15,7 @@
     <h1>
       We are Comet Robotics,<br /> the premiere robotics club at UT Dallas.
     </h1>
-    <a style={{ fontWeight: 500 }} href="#home-summary">
+    <a style={{ fontWeight: 500 }} id="to-summary" href="#to-summary">
       scroll down to learn more
       <span style={{ marginLeft: '1rem' }}> &darr;</span>
     </a>

src/components/join.astro

@@ -1,5 +1,4 @@
 ---
-import '../styles/App.css'
 import { discordInvite, makerspaceMap } from '../data'
 
 interface Props {
@@ -31,6 +30,7 @@ if (theme === 'dark') {
     <div style={{ display: 'flex', padding: '15px' }}>
       <a
         href={discordInvite}
+        target="_blank"
         style={{
           backgroundColor: '#1e1e1e',
           color: 'white',
@@ -49,6 +49,7 @@ if (theme === 'dark') {
       </a>
       <a
         href={makerspaceMap}
+        target="_blank"
         style={{
           backgroundColor: '#1e1e1e',
           color: 'white',
@@ -61,7 +62,7 @@ if (theme === 'dark') {
       >
         <h3>Find the Makerspace</h3>
         <span>
-          Our meeting are hosted at the UTDesign Makerspace, located on the 2nd
+          Our meetings are hosted at the UTDesign Makerspace, located on the 2nd
           floor of the Synergy Park North building (SPN 2.220).
         </span>
       </a>

src/components/navbar.astro

@@ -31,7 +31,7 @@ import { HOME_LINK, discordInvite, mainNavLinks } from '../data'
       display: 'flex',
       gap: '2rem',
       alignItems: 'center',
-      fontFamily: 'Mashine, sans-serif',
+      fontFamily: "'Mashine', sans-serif",
     }}
   >
     {mainNavLinks.map((link) => <a href={link.href}>{link.name}</a>)}
@@ -41,9 +41,10 @@ import { HOME_LINK, discordInvite, mainNavLinks } from '../data'
         padding: '0.5rem 1rem',
         color: 'white',
         borderRadius: '999px',
-        fontFamily: 'Mashine, sans-serif',
+        fontFamily: "'Mashine', sans-serif",
       }}
       href={discordInvite}
+      target="_blank"
     >
       Join
     </a>

src/content/config.ts

@@ -0,0 +1,31 @@
+import { defineCollection, z } from 'astro:content'
+
+const statSchema = z.object({
+  name: z.string(),
+  value: z.number(),
+  icon: z.string(),
+})
+
+const termSchema = z.object({
+  season: z.enum(['Spring', 'Summer', 'Fall']),
+  year: z.number(),
+})
+
+const projectSchema = z.object({
+  projectTitle: z.string(),
+  shortDescription: z.string(),
+  deprecated: z.boolean().default(false),
+  stats: z.array(statSchema),
+  startSeason: termSchema,
+  endSeason: termSchema.optional(),
+  mainImage: z.object({ src: z.string().url(), alt: z.string() }),
+})
+
+const projectCollection = defineCollection({
+  type: 'content',
+  schema: projectSchema,
+})
+
+export const collections = {
+  projects: projectCollection,
+}

src/data.ts

@@ -1,6 +1,6 @@
 interface LinkType { name: string, href: string }
 type LinkWithIconType = LinkType & { icon: string }
-const HOME_LINK: LinkType = { name: 'Home', href: '#' }
+const HOME_LINK: LinkType = { name: 'Home', href: '/' }
 
 const mainNavLinks: LinkType[] = [
   HOME_LINK,
@@ -49,7 +49,7 @@ const clubEmail = '[email protected]'
 const discordInvite = 'https://discord.gg/dTGwav3PVM'
 
 const makerspaceMap = 'https://g.page/utdesign-makerspace?share'
-
+const websiteRepo = 'https://github.com/Comet-Robotics/cometrobotics.org'
 const footerLinks: LinkType[] = [
   {
     name: 'Discord',
@@ -61,7 +61,7 @@ const footerLinks: LinkType[] = [
   },
   {
     name: 'Source Code',
-    href: 'https://github.com/Comet-Robotics/cometrobotics.org',
+    href: websiteRepo,
   },
   {
     name: 'SharePoint',
@@ -96,4 +96,4 @@ const linksPageLinks: LinkType[] = [
   },
 ]
 
-export { mainNavLinks, HOME_LINK, footerLinks, socialLinks, clubEmail, sponsorLinks, discordInvite, makerspaceMap, linksPageLinks }
+export { mainNavLinks, HOME_LINK, footerLinks, socialLinks, clubEmail, sponsorLinks, discordInvite, makerspaceMap, websiteRepo, linksPageLinks }

src/env.d.ts

@@ -1 +1,2 @@
+/// <reference path="../.astro/types.d.ts" />
 /// <reference types="astro/client" />

src/layouts/base.astro

@@ -1,9 +1,11 @@
 ---
+import '@fontsource-variable/unbounded'
+import '@fontsource-variable/open-sans'
 import '../styles/reset.css'
 import '../styles/index.css'
 import '../styles/App.css'
-import Navbar from '../components/navbar.astro'
 
+import Navbar from '../components/navbar.astro'
 import Footer from '../components/footer.astro'
 ---
 

src/pages/index.astro

@@ -1,7 +1,4 @@
 ---
-import '../styles/reset.css'
-import '../styles/index.css'
-import '../styles/App.css'
 import Hero from '../components/home/hero.astro'
 import BaseLayout from '../layouts/base.astro'
 import Summary from '../components/home/summary.astro'

src/pages/projects/project.astro

@@ -1,7 +1,4 @@
 ---
-import '../../styles/reset.css'
-import '../../styles/index.css'
-import '../../styles/App.css'
 import '../../styles/project.css'
 import BaseLayout from '../../layouts/base.astro'
 import Join from '../../components/join.astro'

src/pages/version.json.ts

@@ -0,0 +1,14 @@
+import childProcess from 'node:child_process'
+
+// obtain Git commit hash
+const hash = childProcess
+  .execSync('git rev-parse --short HEAD')
+  .toString()
+  .trim()
+
+export async function GET() {
+  const versionMetadata = {
+    hash,
+  }
+  return new Response(JSON.stringify(versionMetadata))
+}

src/styles/App.css

@@ -1,7 +1,5 @@
-@import url('https://fonts.googleapis.com/css2?family=Unbounded:wght@200;300;400;500;600;700;800;900&display=swap');
-@import url('https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300..800;1,300..800&display=swap');
 @font-face {
-  font-family: Mashine;
+  font-family: 'Mashine';
   src:
     url('/fonts/MashineBold.woff2') format('woff2'),
     url('/fonts/MashineBold.woff') format('woff');
@@ -11,7 +9,7 @@
 }
 
 @font-face {
-  font-family: Mashine;
+  font-family: 'Mashine';
   src:
     url('/fonts/MashineSemiBold.woff2') format('woff2'),
     url('/fonts/MashineSemiBold.woff') format('woff');
@@ -50,7 +48,7 @@ main {
   justify-content: flex-end;
   text-align: left;
   color: var(--text);
-  font-family: Unbounded, sans-serif;
+  font-family: 'Unbounded Variable', sans-serif;
   align-self: flex-start;
 }
 

src/styles/index.css

@@ -1,6 +1,5 @@
-@import url('https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300..800;1,300..800&display=swap');
 :root {
-  font-family: 'Open Sans', sans-serif;
+  font-family: 'Open Sans Variable', sans-serif;
   line-height: 1.5;
   font-weight: 400;
 

src/styles/project.css

@@ -20,11 +20,11 @@
 }
 
 .title {
-  font-family: Unbounded, sans-serif;
+  font-family: 'Unbounded Variable', sans-serif;
 }
 
 .short-description {
-  font-family: Unbounded, sans-serif;
+  font-family: 'Unbounded Variable', sans-serif;
   font-size: 2em;
   opacity: 90%;
 }
@@ -43,11 +43,11 @@
 }
 
 .stats h2 {
-  font-family: Unbounded, sans-serif;
+  font-family: 'Unbounded Variable', sans-serif;
 }
 
 .stats span {
-  font-family: Unbounded, sans-serif;
+  font-family: 'Unbounded Variable', sans-serif;
   font-size: 1.2em;
 }
 
@@ -141,7 +141,6 @@
 }
 
 @media (max-width: 768px) {
-
   .main-container {
     padding: 0px;
     padding-top: 120px;

tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "astro/tsconfigs/strict",
+  "extends": "astro/tsconfigs/strictest",
   "compilerOptions": {
     "jsx": "react-jsx",
     "jsxImportSource": "react"