Merge branch 'main' into subgroup

fullstack-devcontainer/home/.npm/_cacache/index-v5/16/22/a61fd385b575269118e8cb63bddf1b4fae8adbbb675075bbae0bade58e8f

@@ -0,0 +1,2 @@
+
+13f3d835ccd2f93bfd2133cbb766f5ddbe268d7f	{"key":"make-fetch-happen:request-cache:https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.24.2.tgz","integrity":"sha512-kr3gqzczJjSAncwOS6i7fpb4dlqcvLidqrX5hpGBIM1wtt0QEVtf4wFaAwVv8QygFU8iWUMYEoJZWuWxyua4GQ==","time":1731622190323,"size":978771,"metadata":{"time":1731622190027,"url":"https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.24.2.tgz","reqHeaders":{},"resHeaders":{"cache-control":"public, must-revalidate, max-age=31557600","content-type":"application/octet-stream","date":"Thu, 14 Nov 2024 22:09:50 GMT","etag":"\"7a3b8ba447fa1f486e0c3a6d591fdb84\"","last-modified":"Sun, 27 Oct 2024 15:40:15 GMT","vary":"Accept-Encoding"},"options":{"compress":true}}}

fullstack-devcontainer/home/.npm/_cacache/index-v5/61/71/72a27436a6960333d098aa9260342a381997550b60296f44f537eff348b6

@@ -0,0 +1,2 @@
+
+387d12483c3823f429eb51ce9f913b869ce3594a	{"key":"make-fetch-happen:request-cache:https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.24.2.tgz","integrity":"sha512-TDdHLKCWgPuq9vQcmyLrhg/bgbOvIQ8rtWQK7MRxJ9nvaxKx38NvY7/Lo6cYuEnNHqf6rMqnivOIPIQt6H2AoA==","time":1731622190559,"size":928525,"metadata":{"time":1731622189976,"url":"https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.24.2.tgz","reqHeaders":{},"resHeaders":{"cache-control":"public, must-revalidate, max-age=31557600","content-type":"application/octet-stream","date":"Thu, 14 Nov 2024 22:09:49 GMT","etag":"\"53787e428a0fcdf9231c152f75f494c3\"","last-modified":"Sun, 27 Oct 2024 15:40:17 GMT","vary":"Accept-Encoding"},"options":{"compress":true}}}

fullstack-devcontainer/home/.npm/_cacache/index-v5/82/59/974ef046f769da36693d5d6a38f98646e6dd0adc620308999c6bc5158791

@@ -0,0 +1,2 @@
+
+6e3f3d5bbeca71b655aa2005b5173dabac6ca0d0	{"key":"make-fetch-happen:request-cache:https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz","integrity":"sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==","time":1731622190301,"size":3768056,"metadata":{"time":1731622189951,"url":"https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz","reqHeaders":{},"resHeaders":{"cache-control":"public, must-revalidate, max-age=31557600","content-type":"application/octet-stream","date":"Thu, 14 Nov 2024 22:09:49 GMT","etag":"\"b8ef0b6b992d518c1e23bc4d4dba6fbb\"","last-modified":"Sun, 09 Jun 2024 21:17:25 GMT","vary":"Accept-Encoding"},"options":{"compress":true}}}

fullstack-devcontainer/home/.npm/_logs/2024-11-14T22_09_55_438Z-debug-0.log

@@ -0,0 +1,13 @@
+0 verbose cli /usr/bin/node /usr/bin/npm
+1 info using [email protected]
+2 info using [email protected]
+3 silly config load:file:/usr/lib/node_modules/npm/npmrc
+4 silly config load:file:/home/fullstack-user/frontend/.npmrc
+5 silly config load:file:/home/fullstack-user/.npmrc
+6 silly config load:file:/usr/etc/npmrc
+7 verbose title npm run dev
+8 verbose argv "run" "dev"
+9 verbose logfile logs-max:10 dir:/home/fullstack-user/.npm/_logs/2024-11-14T22_09_55_438Z-
+10 verbose logfile /home/fullstack-user/.npm/_logs/2024-11-14T22_09_55_438Z-debug-0.log
+11 silly logfile start cleaning logs, removing 1 files
+12 silly logfile done cleaning log files

fullstack-devcontainer/home/.npm/_logs/2024-11-14T23_10_28_880Z-debug-0.log

@@ -0,0 +1,13 @@
+0 verbose cli /usr/bin/node /usr/bin/npm
+1 info using [email protected]
+2 info using [email protected]
+3 silly config load:file:/usr/lib/node_modules/npm/npmrc
+4 silly config load:file:/home/fullstack-user/frontend/.npmrc
+5 silly config load:file:/home/fullstack-user/.npmrc
+6 silly config load:file:/usr/etc/npmrc
+7 verbose title npm run dev
+8 verbose argv "run" "dev"
+9 verbose logfile logs-max:10 dir:/home/fullstack-user/.npm/_logs/2024-11-14T23_10_28_880Z-
+10 verbose logfile /home/fullstack-user/.npm/_logs/2024-11-14T23_10_28_880Z-debug-0.log
+11 silly logfile start cleaning logs, removing 1 files
+12 silly logfile done cleaning log files

fullstack-devcontainer/home/frontend/src/components/hero/globe-wrapper.tsx

@@ -5,9 +5,11 @@ import Globe from "@/components/hero/globe-source";
 
 export default function GlobeAndStars() {
   return (
-    <div className="w-full h-full">
-    <Particles className="absolute inset-0 z-1" quantity={150} ease={80} color={"#808080"} refresh />
-    <Globe className="absolute inset-0 z-2" />
+    <div className="particle-container relative w-full h-full">
+      <Particles className="absolute inset-0 z-1" quantity={150} ease={80} color={"#808080"} refresh />
+    <div className="globe-container relative w-full h-full">
+      <Globe className="absolute inset-0 z-2"/>
+    </div>
   </div>
   );
 }

fullstack-devcontainer/home/frontend/src/components/hero/navbar.tsx

@@ -27,6 +27,10 @@ const routeList: RouteProps[] = [
     href: "/home",
     label: "Home"
   },
+  {
+    href: "/about",
+    label: "About"
+  },
   {
     href: "/projects",
     label: "Projects",

fullstack-devcontainer/home/frontend/src/main.tsx

@@ -8,17 +8,23 @@ import {
 } from "react-router-dom";
 import { ThemeProvider } from './components/theme-provider.tsx';
 import Subgroup from './pages/subgroup/Subgroup.tsx';
+import About from './pages/About.tsx';
 
 const router = createBrowserRouter([
   {
     path: "/",
     element: <Home />
   },
-  
+
   {
     path: "/subgroup",
     element: <Subgroup />
   },
+
+  {
+    path: "/about",
+    element: <About />
+  },
 ]);
 
 ReactDOM.createRoot(document.getElementById('root')!).render(

fullstack-devcontainer/home/frontend/src/pages/About.css

@@ -0,0 +1,3 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;

fullstack-devcontainer/home/frontend/src/pages/About.tsx

@@ -0,0 +1,43 @@
+import React from 'react';
+import { Navbar } from '@/components/hero/navbar';
+
+
+const About: React.FC = () => {
+  return (
+    <>
+      <Navbar />
+      <div className="bg-gray-900 text-white min-h-screen flex flex-col items-center justify-start px-4 py-10">
+
+        {/* Team Picture at the Top */}
+        <div className="w-full max-w-3xl flex justify-center mb-10">
+          <div className="bg-gray-300 w-full h-48 md:h-60 lg:h-72 flex items-center justify-center text-gray-700">
+            Current Team Picture
+          </div>
+        </div>
+
+        {/* Goals and Philosophy Section */}
+        <div className="w-full max-w-5xl flex flex-col md:flex-row md:space-x-10 space-y-10 md:space-y-0">
+
+          {/* Our Goals */}
+          <div className="w-full md:w-1/2 space-y-4 text-center">
+            <h2 className="text-3xl font-semibold">Our Goals</h2>
+            <p className="text-lg">
+              Our goal is to make space accessible to people of all backgrounds and prove that anyone can be involved in space. We also wish to create a baseline design for future projects, keep both design and production simple, and open source all of our designs and procedures. Above all, we hope to inspire future generations to explore space!
+            </p>
+          </div>
+
+          {/* DIY Philosophy */}
+          <div className="w-full md:w-1/2 space-y-4 text-center">
+            <h2 className="text-3xl font-semibold">DIY Philosophy</h2>
+            <p className="text-lg">
+              Do It Yourself Philosophy! Our philosophy encourages collaborative education among an all-undergraduate team, utilizes processes commonly accessible to the informed public, and minimizes cost by minimizing pre-built component use. All of our projects are student built from scratch and are designed to avoid tolerance stack-up and maintain simplicity. With our DIY Philosophy, our members have the freedom to learn and build while having fun!
+            </p>
+          </div>
+
+        </div>
+      </div>
+    </>
+  );
+};
+
+export default About;

fullstack-devcontainer/home/frontend/src/pages/Home.css

@@ -74,4 +74,67 @@
   body {
     @apply bg-background text-foreground;
   }
+}
+
+.title-text {
+  font-weight: bold;
+  font-size: 15vh;
+  line-height: 17vh;
+  padding-bottom: 1.5vw;
+}
+
+/* .body-text {
+  font-size: 1.5vw;
+  line-height: 2vw;
+} */
+
+.side-by-side {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  position: relative;
+  justify-content: space-between;
+  padding-left: 3vh;
+  height: 90vh;
+}
+
+.welcome {
+  padding-top: 5vh;
+  width: 100%;
+  height: 100%;
+}
+
+.welcome-buttons {
+  display: flex;
+  flex-direction: row;
+  gap: 10vh;
+  padding-left: 10vh;
+  padding-top: 2vh;
+  align-items: center;
+}
+
+.join-button {
+  color: rgba(255, 255, 255, 0.85);
+  padding: 1vh 1vw;
+  background-color: #07223e; /* Set default color */
+  border-radius: 1vh;
+  border-width: 0.1vh;
+  border-color: rgba(255, 255, 255, 0.5);
+  box-shadow: 0vw 0vh 1vh 0.5vh rgba(255, 255, 255, 0.1);
+  font-size: 2vw;
+}
+
+.join-button:hover {
+  background-color: #092e55;
+  box-shadow: 0vw 0vh 1vh 0.5vh rgba(255, 255, 255, 0.2);
+  color: rgba(255, 255, 255, 0.95);
+}
+
+.contact-button {
+  color: rgba(255, 255, 255, 0.75);
+  font-size: 2vw;
+}
+
+.contact-button:hover {
+  color: rgba(255, 255, 255, 0.95);
 }

fullstack-devcontainer/home/frontend/src/pages/Home.tsx

@@ -7,7 +7,18 @@ function Home() {
   return (
     <ThemeProvider defaultTheme="system" storageKey="vite-ui-theme">  
       <Navbar />
-      <GlobeAndStars/>
+      <div className="side-by-side">
+        <div className="welcome">
+          <div className="title-text">
+            <h1>Brown<br />Space<br />Engineering</h1>
+          </div>
+          <div className="welcome-buttons">
+            <button className="join-button">Join BSE</button>
+            <button className="contact-button">Contact Us</button>
+          </div>
+        </div>
+          <GlobeAndStars/>
+      </div>
     </ThemeProvider>
   );
 }