Skip to content

Commit

Permalink
Merge pull request #4 from fullstackatbrown/about-page
Browse files Browse the repository at this point in the history
Adding About Page
  • Loading branch information
Robert-Daly-256 authored Nov 15, 2024
2 parents 146f0bf + 8487a1b commit 5f25e8f
Show file tree
Hide file tree
Showing 26 changed files with 1,928 additions and 7,029 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -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}}}
Original file line number Diff line number Diff line change
@@ -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}}}
Original file line number Diff line number Diff line change
@@ -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}}}
6,704 changes: 0 additions & 6,704 deletions fullstack-devcontainer/home/.npm/_logs/2024-10-27T17_09_34_778Z-debug-0.log

This file was deleted.

This file was deleted.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,7 @@
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-10-27T17_15_25_881Z-
10 verbose logfile /home/fullstack-user/.npm/_logs/2024-10-27T17_15_25_881Z-debug-0.log
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
13 verbose cwd /home/fullstack-user/frontend
14 verbose os Linux 5.15.153.1-microsoft-standard-WSL2
15 verbose node v22.9.0
16 verbose npm v10.8.3
17 verbose exit 127
18 verbose code 127

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,7 @@
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-10-27T17_18_52_619Z-
10 verbose logfile /home/fullstack-user/.npm/_logs/2024-10-27T17_18_52_619Z-debug-0.log
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
13 verbose cwd /home/fullstack-user/frontend
14 verbose os Linux 5.15.153.1-microsoft-standard-WSL2
15 verbose node v22.9.0
16 verbose npm v10.8.3
17 verbose exit 127
18 verbose code 127

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ const routeList: RouteProps[] = [
href: "/home",
label: "Home"
},
{
href: "/about",
label: "About"
},
{
href: "/projects",
label: "Projects",
Expand All @@ -37,7 +41,7 @@ const routeList: RouteProps[] = [
},
{
href: "/members",
label: "Mailing List",
label: "Members",
},
{
href: "/sponsors",
Expand Down
5 changes: 5 additions & 0 deletions fullstack-devcontainer/home/frontend/src/main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,17 @@ import {
RouterProvider,
} from "react-router-dom";
import { ThemeProvider } from './components/theme-provider.tsx';
import About from './pages/About.tsx';

const router = createBrowserRouter([
{
path: "/",
element: <Home />
},
{
path: "/about",
element: <About />
},
]);

ReactDOM.createRoot(document.getElementById('root')!).render(
Expand Down
3 changes: 3 additions & 0 deletions fullstack-devcontainer/home/frontend/src/pages/About.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
43 changes: 43 additions & 0 deletions fullstack-devcontainer/home/frontend/src/pages/About.tsx
Original file line number Diff line number Diff line change
@@ -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;

0 comments on commit 5f25e8f

Please sign in to comment.