From 733baa8a273eb67e55537a795277c9a6e5fca10a Mon Sep 17 00:00:00 2001 From: yonava Date: Wed, 21 Feb 2024 13:30:19 -0500 Subject: [PATCH 01/14] moved join us callout to seperate component and removed unused member card --- src/components/JoinUsHero.jsx | 49 +++++++++++++++++++++ src/components/MemberCard.js | 37 ---------------- src/pages/about.js | 82 +---------------------------------- 3 files changed, 50 insertions(+), 118 deletions(-) create mode 100644 src/components/JoinUsHero.jsx delete mode 100644 src/components/MemberCard.js diff --git a/src/components/JoinUsHero.jsx b/src/components/JoinUsHero.jsx new file mode 100644 index 0000000..7f635b1 --- /dev/null +++ b/src/components/JoinUsHero.jsx @@ -0,0 +1,49 @@ +export default JoinUsHero = () => ( +
+
+
+ + + + People chatting + + +
+ + +

+ Interested in joining us? +

+ + + + +

+ We have applications for various positions that open at the + start of each semester. Upon completion, we will contact you + for an interview. If you are not sure which position is best + for you, apply to all positions! +

+ + + + + + + + + +
+ + + +
+
+
+); \ No newline at end of file diff --git a/src/components/MemberCard.js b/src/components/MemberCard.js deleted file mode 100644 index 4b426c7..0000000 --- a/src/components/MemberCard.js +++ /dev/null @@ -1,37 +0,0 @@ -import React from 'react'; - -import Row from 'react-bootstrap/Row'; -import Col from 'react-bootstrap/Col'; -import Image from 'react-bootstrap/Image'; -import Card from 'react-bootstrap/Card'; - -export default function MemberCard() { - return ( -
- - - - - - - - -
Name
- - - - -

- I have a passion for data analytics, hoping to apply my expertise - to the field of sustainability -

- - - -
- ); -} diff --git a/src/pages/about.js b/src/pages/about.js index beeef6d..0fad73b 100644 --- a/src/pages/about.js +++ b/src/pages/about.js @@ -23,7 +23,7 @@ const about = () => {

- Gain real-world experience by helping others + Gain Real-World Experience By Helping Others

@@ -100,86 +100,6 @@ const about = () => {
- {/* Interested in joining */} -
-
-
- - - - People chatting - - -
- - -

- Interested in joining us? -

- - - - -

- We have applications for various positions that open at - the start of each semester. Upon completion, we will - contact you for an interview. If you are not sure which - position is best for you, apply to all positions! -

- - - - - - - - - -
- - - -
-
-
- {/* Meet the Team */} - - {/* - -

Meet the team

- - - - - - - - - - - - - - - - - - - - - - - - - */} - - {/* Footer */}
); From 937002fff2188511fe10756bd6d7f03e4edb2878 Mon Sep 17 00:00:00 2001 From: yonava Date: Sun, 25 Feb 2024 16:45:24 -0500 Subject: [PATCH 02/14] jumbotron header --- src/components/JumbotronHeader.jsx | 36 ++++++++++++++++ src/components/Navbar.js | 60 +++++++++++++++++---------- src/pages/_app.js | 10 ++++- src/pages/about.js | 66 ++++++++++++------------------ src/pages/index.js | 2 - 5 files changed, 110 insertions(+), 64 deletions(-) create mode 100644 src/components/JumbotronHeader.jsx diff --git a/src/components/JumbotronHeader.jsx b/src/components/JumbotronHeader.jsx new file mode 100644 index 0000000..aa80087 --- /dev/null +++ b/src/components/JumbotronHeader.jsx @@ -0,0 +1,36 @@ +import Container from 'react-bootstrap/Container'; +import Row from 'react-bootstrap/Row'; +import Col from 'react-bootstrap/Col'; +import Button from 'react-bootstrap/Button'; +import Footer from '../components/Footer'; +import Navbar from '../components/Navbar'; + +export default function JumbotronHeader({ title, subtitle, actions }) { + return ( + + + + + +

+ {title} +

+ + + + +

+ {subtitle} +

+ + + + + {actions} + + + + + + ); +} \ No newline at end of file diff --git a/src/components/Navbar.js b/src/components/Navbar.js index 024b552..4ccd319 100644 --- a/src/components/Navbar.js +++ b/src/components/Navbar.js @@ -1,5 +1,4 @@ import React from 'react'; -import Head from 'next/head'; import Link from 'next/link'; import Navbar from 'react-bootstrap/Navbar'; @@ -7,37 +6,54 @@ import Nav from 'react-bootstrap/Nav'; import Container from 'react-bootstrap/Container'; export default function Index() { + + const pages = [ + { name: 'Home', link: '/' }, + { name: 'About', link: '/about' }, + { name: 'Services', link: '/services' }, + { name: 'Projects', link: '/projects' }, + { name: 'Apply', link: '/apply' }, + { name: 'Contact', link: 'https://forms.gle/uuA2s98v4oC4o8TU7', target: '_blank' }, + ] + return ( -
- - BUILD UMass - - + + - BUILD UMass + + BUILD UMass + -
+ ); } \ No newline at end of file diff --git a/src/pages/_app.js b/src/pages/_app.js index 4dfb4d2..3abaaaa 100644 --- a/src/pages/_app.js +++ b/src/pages/_app.js @@ -1,8 +1,16 @@ /* eslint-disable */ import '../node_modules/bootstrap/dist/css/bootstrap.min.css'; import '../styles/style.scss'; +import Footer from '../components/Footer'; +import Navbar from '../components/Navbar'; // Globalize CSS export default function MyApp({ Component, pageProps }) { - return ; + return ( + <> + + +