Add info about meeting location, getting closer to replacing the old …

…bsli.space
osu-bsli · Aug 7, 2024 · c9c264a · c9c264a
1 parent 1d2bdf0
commit c9c264a
Show file tree

Hide file tree

Showing 13 changed files with 78 additions and 48 deletions.
diff --git a/src/assets/images/projects/sac/overview.webp b/src/assets/images/projects/sac/overview.webp
diff --git a/src/components/CustomStyles.astro b/src/components/CustomStyles.astro
@@ -31,7 +31,7 @@ import '@fontsource-variable/inter';
 
     --aw-color-text-heading: rgb(0 0 0);
     --aw-color-text-default: rgb(16 16 16);
-    --aw-color-text-muted: rgb(70, 70, 70);
+    --aw-color-text-muted: rgb(100, 100, 100);
     --aw-color-bg-page: rgb(255 255 255);
 
     --aw-color-bg-page-dark: rgb(30 30 30);

diff --git a/src/components/ui/ItemGrid2.astro b/src/components/ui/ItemGrid2.astro
@@ -41,7 +41,7 @@ const {
               {typeof image === 'string' ? (
                 <Fragment set:html={image} />
               ) : (
-                <Image class="size-64 rounded-lg mb-8"
+                <Image widths={[400, 800]} class="size-64 rounded-lg mb-8"
                   {...image}
                 />
               )}

diff --git a/src/components/widgets/Footer.astro b/src/components/widgets/Footer.astro
@@ -42,21 +42,6 @@ const {
   <h2 class="mb-4 text-center text-4xl font-bold">Our Sponsors</h2>
 
   <div class="flex flex-col gap-4 max-w-5xl m-auto">
-    <div
-      class="flex flex-row justify-center flex-wrap gap-4 md:gap-8 [&>*]:w-32 [&>*]:md:w-64"
-    >
-      <Image
-        layout="custom"
-        src="~/assets/images/sponsors/OSUCOE.webp"
-        alt="OSU College of Engineering Logo"
-      />
-      <Image
-        layout="custom"
-        src="~/assets/images/sponsors/osu battelle center.webp"
-        alt="OSU Battelle Center Logo"
-      />
-    </div>
-
     <div
       class="flex flex-row justify-center items-center flex-wrap gap-4 md:gap-8 [&>*]:w-32 [&>*]:md:w-64"
     >
@@ -86,6 +71,21 @@ const {
         alt="Ohio Space Grant Consortium Logo"
       />
     </div>
+
+    <div
+      class="flex flex-row justify-center flex-wrap gap-4 md:gap-8 [&>*]:w-32 [&>*]:md:w-64"
+    >
+      <Image
+        layout="custom"
+        src="~/assets/images/sponsors/OSUCOE.webp"
+        alt="OSU College of Engineering Logo"
+      />
+      <Image
+        layout="custom"
+        src="~/assets/images/sponsors/osu battelle center.webp"
+        alt="OSU Battelle Center Logo"
+      />
+    </div>
   </div>
 
   <div class="relative max-w-7xl mx-auto px-4 sm:px-6 dark:text-slate-300">

diff --git a/src/components/widgets/Hero.astro b/src/components/widgets/Hero.astro
@@ -32,7 +32,7 @@ const {
         {
           tagline && (
             <p
-              class="text-base text-secondary dark:text-blue-200 font-bold tracking-wide uppercase"
+              class="text-base text-primary font-bold tracking-wide uppercase"
               set:html={tagline}
             />
           )

diff --git a/src/components/widgets/OurProjects.astro b/src/components/widgets/OurProjects.astro
@@ -30,11 +30,11 @@ const {
 <WidgetWrapper id={id} isDark={isDark} containerClass={classes?.container as string} bg={bg}>
   <div class="p=4">
     <h2 class="text-4xl md:text-5xl font-bold tracking-tighter text-center font-heading">{title}</h2>
-    <p class="text-lg dark mt-8">{subtitle}</p>
+    <p class="text-lg text-center mt-8" set:html={subtitle}></p>
 
     <div class="flex flex-col lg:justify-between lg:flex-row mb-8 gap-8">
       {
-        items.map(({ image, name, description, href, meetingTimes}) => (
+        items.map(({ image, name, description, href, meetingTimes, meetingInfo}) => (
           <div class="flex flex-col my-4">
             <Image
               class="mx-auto w-full rounded-lg bg-gray-500 shadow-lg mb-4 mt-8"
@@ -50,6 +50,8 @@ const {
 
             <h3 class="text-large font-bold my-4">Meeting Times</h3>
 
+            <p>{meetingInfo}</p>
+
             {
               meetingTimes.map(({day, time}) => (
                 <p>{day}: {time}</p>

diff --git a/src/components/widgets/Socials.astro b/src/components/widgets/Socials.astro
@@ -18,7 +18,7 @@ const {
     linkedins.map((linkedin) => (
       <a class="flex flex-row gap-1" href={linkedin}>
         <Icon name="tabler:brand-linkedin" class="w-8 h-8" />
-        <p class="leading-loose">LinkedIn</p>
+        <p>LinkedIn</p>
       </a>
     ))
   }
@@ -27,7 +27,7 @@ const {
     emails.map((email) => (
       <a class="flex flex-row gap-1" href={"mailto:" + email}>
         <Icon name="tabler:mail" class="w-8 h-8" />
-        <p class="leading-loose">{email}</p>
+        <p>{email}</p>
       </a>
     ))
   }
@@ -36,7 +36,7 @@ const {
     facebooks.map((facebook) => (
       <a class="flex flex-row gap-1" href={facebook}>
         <Icon name="tabler:brand-facebook" class="w-8 h-8" />
-        <p class="leading-loose">Facebook</p>
+        <p>Facebook</p>
       </a>
     ))
   }
@@ -45,7 +45,7 @@ const {
     youtubes.map((youtube) => (
       <a class="flex flex-row gap-1" href={youtube}>
         <Icon name="tabler:brand-youtube" class="w-8 h-8" />
-        <p class="leading-loose">YouTube</p>
+        <p>YouTube</p>
       </a>
     ))
   }

diff --git a/src/components/widgets/SubteamInfo.astro b/src/components/widgets/SubteamInfo.astro
@@ -33,6 +33,6 @@ const { title, lead, images = [] } = Astro.props;
   </div>
 
   <div class="flex flex-col gap-4 md:w-1/2">
-    {images.map((i) => <Image class="m-auto" layout="contained" {...i} />)}
+    {images.map((i) => <Image class="m-auto" widths={[400, 800]} layout="contained" {...i} />)}
   </div>
 </div>
diff --git a/src/components/widgets/TeamOverviewLeader.astro b/src/components/widgets/TeamOverviewLeader.astro
@@ -11,7 +11,7 @@ const { title, people = [] } = Astro.props;
       people.map(({name, linkedins, emails }) => (
         <div class="flex flex-col items-end">
           {name}
-          <Socials classes={["justify-end"]} linkedins={linkedins} emails={emails}/>
+          <Socials classes={["flex-col items-end justify-end"]} linkedins={linkedins} emails={emails}/>
         </div>
       ))
     }

diff --git a/src/pages/contact.astro b/src/pages/contact.astro
@@ -17,6 +17,11 @@ const title = "Contact us";
       </p>
 
       <div class="flex flex-col gap-8 text-center">
+        <div>
+          <h2 class="font-bold">Join our Slack</h2>
+          <u><a href="https://linktr.ee/buckeye_sli">https://linktr.ee/buckeye_sli</a></u>
+        </div>
+
         <div>
           <h2 class="font-bold">General Inquiries</h2>
           <p>

diff --git a/src/pages/index.astro b/src/pages/index.astro
@@ -68,7 +68,6 @@ const metadata = {
   <OurProjects
     id="our-projects"
     title="Our Projects"
-    subtitle="The Buckeye Space Launch Initiative was founded with the goal of reaching space. We have become so much more by enabling students to become innovators and expand research and technology in the aerospace industry. From our competitive teams in rocketry to our liquid engine development program, we encourage students to innovate, get their hands dirty, and learn. Each subteam project has different goals and restrictions, giving students wide range of options to choose from."
     items={[
       {
         name: "NASA Student Launch Initiative (NASA)",
@@ -131,7 +130,19 @@ const metadata = {
         ],
       },
     ]}
-  />
+  >
+    <Fragment slot="subtitle">
+      <p class="text-center">
+        All BSLI project teams meet in the
+        <b>College of Engineering Makerspace</b>, located in
+        <b>Bolz Hall</b>.
+      </p>
+
+      <p class="text-center">
+        Meeting times can be found below, underneath each team description.
+      </p>
+    </Fragment>
+  </OurProjects>
 
   <!-- Steps Widget ****************** -->
 
@@ -160,7 +171,7 @@ const metadata = {
       {
         title: 'Step 4: <span class="font-medium">Talk to Us!</span>',
         description:
-          "Show up to a meeting. Talk to some people in each subteam and check out the vibe.",
+          "Show up to a meeting. Talk to some people in each project team and check out the vibe.",
         icon: "tabler:friends",
       },
       {
@@ -193,9 +204,7 @@ const metadata = {
       },
     ]}
   >
-    <Fragment slot="title">
-      Ready to join the leading edge of student rocketry at Ohio State?
-    </Fragment>
+    <Fragment slot="title"> Ready to build some rockets? </Fragment>
 
     <Fragment slot="subtitle"> </Fragment>
   </CallToAction>

diff --git a/src/pages/leadership.astro b/src/pages/leadership.astro
@@ -0,0 +1,18 @@
+---
+import Hero from "~/components/widgets/Hero.astro";
+import Layout from "~/layouts/PageLayout.astro";
+
+const title = "Leadership";
+---
+
+<Layout metadata={{ title }}>
+  <Hero
+    tagline="UNDER CONSTRUCTION"
+  >
+    <Fragment slot="title">This page will be available soon.</Fragment>
+
+    <Fragment slot="subtitle">
+      We are still in the process of transitioning BSLI to new leadership. Check back soon!
+    </Fragment>
+  </Hero>
+</Layout>
diff --git a/src/pages/projects/sac.astro b/src/pages/projects/sac.astro
@@ -101,19 +101,19 @@ const metadata = {
   >
     <TeamOverview
       slot="Overview"
-      title="TBD"
+      title="ILIAD"
       image={{
-        src: "",
-        alt: "TBD",
+        src: "~/assets/images/projects/sac/overview.webp",
+        alt: "Iliad",
       }}
       stats={[
-        { name: "HEIGHT", values: ["TBD", "TBD"] },
-        { name: "DIAMETER", values: ["TBD", "TBD"] },
-        { name: "MASS", values: ["TBD", "TBD"] },
-        { name: "THRUST", values: ["TBD", "TBD"] },
-        { name: "MOTOR", values: ["TBD"] },
-        { name: "APOGEE", values: ["TBD", "TBD"] },
-        { name: "TOP SPEED", values: ["TBD"] },
+        { name: "HEIGHT", values: ["3.38 m", "11.1 ft"] },
+        { name: "DIAMETER", values: ["0.15 m", "0.5 ft"] },
+        { name: "MASS", values: ["34.02 kg", "75 lbs"] },
+        { name: "THRUST", values: ["4425 N", "995 lbf"] },
+        { name: "MOTOR", values: ["O-CLASS"] },
+        { name: "APOGEE", values: ["8.9 km", "29.2k ft"] },
+        { name: "TOP SPEED", values: ["Mach 2.05"] },
       ]}
     >
       <TeamOverviewLeader
@@ -131,12 +131,8 @@ const metadata = {
         people={[
           {
             name: "TBD",
-            // linkedins: ["http://linkedin.com/in/alex-chou-b26b4514a"],
-            // emails: ["chou.315@osu.edu"],
-          },
-          {
-            // name: "Abby Atchley",
-            // emails: ["atchley.23@osu.edu"],
+            linkedins: [],
+            emails: [],
           },
         ]}
       />