From 67acfdfbe49ee8a2d76f3e0183d3d5cf82149515 Mon Sep 17 00:00:00 2001 From: RajeshBhatt Date: Thu, 10 Oct 2024 13:10:37 -0700 Subject: [PATCH 1/8] OurCrew component added --- app/about_us/OurCrew.js | 68 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 app/about_us/OurCrew.js diff --git a/app/about_us/OurCrew.js b/app/about_us/OurCrew.js new file mode 100644 index 0000000..5633ee1 --- /dev/null +++ b/app/about_us/OurCrew.js @@ -0,0 +1,68 @@ +import styles from "./page.module.css"; + +const crewMembers = [ + { + name: "Captain Sarah Vega", + title: "Astronaut", + description: + "A former NASA astronaut with over 15 years of experience, Captain Vega leads our missions with unparalleled expertise and a passion for space exploration.", + image: "crew/image-anousheh-ansari.png", + alt: "Captain Sarah Vega - Astronaut", + }, + { + name: "Dr. Leo Redding", + title: "Chief Astrophysicist", + description: + "Our chief astrophysicist, Dr. Redding, is a renowned scientist who has contributed to major space discoveries. He ensures that every journey is as educational as it is exhilarating.", + image: "crew/image-douglas-hurley.png", + alt: "Dr. Leo Redding - Chief Astrophysicist", + }, + { + name: "Alex Santos", + title: "Mission Specialist", + description: + "As a mission specialist, Alex’s job is to ensure that every aspect of the journey runs smoothly. With a background in both science and adventure tourism, Alex is the perfect guide for our space travelers.", + image: "crew/image-victor-glover.png", + alt: "Alex Santos - Mission Specialist", + }, + { + name: "Maya Patel", + title: "Crew Member", + description: + "Maya brings a unique blend of technical skills and customer service experience to the team. She’s always ready to assist with any needs and to make sure every traveler has an unforgettable experience.", + image: "crew/image-mark-shuttleworth.png", + alt: "Maya Patel - Crew Member", + }, + { + name: "Hana Lee", + title: "Chief Engineer", + description: + "With her extensive background in aerospace engineering, Hana Lee is responsible for the state-of-the-art technology that powers our spacecraft. Her innovation ensures that our travelers are always in safe hands.", + image: "crew/image-anousheh-ansari.png", + alt: "Hana Lee - Chief Engineer", + }, +]; + +export const OurCrew = () => { + return ( +
+

+ Our crew is the heart and soul of Galactica. We are a diverse team of + seasoned space explorers, engineers, and visionaries who are united by a + common goal: to make space travel accessible and exciting for all. +

+
+ {crewMembers.map((member, index) => ( +
+
+ {member.alt} +
+
{member.name}
+
{member.title}
+

{member.description}

+
+ ))} +
+
+ ); +}; From 0020b9bce3665bf7d50f410311a5523a825e2471 Mon Sep 17 00:00:00 2001 From: RajeshBhatt Date: Thu, 10 Oct 2024 13:11:27 -0700 Subject: [PATCH 2/8] OurPartners.js component added --- app/about_us/OurPartners.js | 70 +++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 app/about_us/OurPartners.js diff --git a/app/about_us/OurPartners.js b/app/about_us/OurPartners.js new file mode 100644 index 0000000..7a1f4d8 --- /dev/null +++ b/app/about_us/OurPartners.js @@ -0,0 +1,70 @@ +import styles from "./page.module.css"; + +export const OurPartners = () => { + return ( +
+

+ We collaborate with some of the most respected names in the space and + technology industries to make every journey extraordinary. +

+
+
+ {"Alphabet +
+
+ {"Amazon +
+
+ {"CBC +
+
+ {"Microsoft +
+
+ {"NYU +
+
+ {"Queens +
+
+ {"Samsung +
+
+ {"Sodexo +
+
+
+ ); +}; From 1f91c41fea2701958340688f4392dcd8b7ff7771 Mon Sep 17 00:00:00 2001 From: RajeshBhatt Date: Thu, 10 Oct 2024 13:12:26 -0700 Subject: [PATCH 3/8] OurValues component added --- app/about_us/OurValues.js | 44 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 app/about_us/OurValues.js diff --git a/app/about_us/OurValues.js b/app/about_us/OurValues.js new file mode 100644 index 0000000..aa27852 --- /dev/null +++ b/app/about_us/OurValues.js @@ -0,0 +1,44 @@ +import styles from "./page.module.css"; + +const values = [ + { + number: 1, + title: "Exploration", + description: + "We are driven by a deep-seated desire to explore the unknown. We believe that the pursuit of discovery is at the heart of human nature, and we are committed to pushing the boundaries of what is possible.", + }, + { + number: 2, + title: "Innovation", + description: + "At Galactica, we prioritize cutting-edge technology and innovation. We are constantly evolving our spacecraft, safety protocols, and services to ensure that our travelers experience the most advanced and secure space journeys available.", + }, + { + number: 3, + title: "Sustainability", + description: + "We are committed to making space exploration sustainable for future generations. Our space missions are designed to minimize environmental impact, both on Earth and in space, and to foster a spirit of responsibility towards our universe.", + }, + { + number: 4, + title: "Community", + description: + "We believe in the power of collective exploration. Our journeys are not just about reaching new destinations; they are about building a community of space enthusiasts who share a passion for the stars.", + }, +]; + +export const OurValues = () => { + return ( +
+ {values.map((value) => ( +
+
{value.number}
+
+

{value.title}

+

{value.description}

+
+
+ ))} +
+ ); +}; From 0e9e4635ee98a032d47074d95a8158c0b9a04835 Mon Sep 17 00:00:00 2001 From: RajeshBhatt Date: Thu, 10 Oct 2024 13:13:14 -0700 Subject: [PATCH 4/8] page.js file added --- app/about_us/page.js | 54 ++++++++------------------------------------ 1 file changed, 10 insertions(+), 44 deletions(-) diff --git a/app/about_us/page.js b/app/about_us/page.js index 880ec42..04f86df 100644 --- a/app/about_us/page.js +++ b/app/about_us/page.js @@ -1,42 +1,6 @@ -import styles from './page.module.css'; - -// TASK - React 1 week 1 -// After you are finished with creating the page, move the OurValues, OurCrew, OurPartners components into their own files -// OurValues.js, OurCrew.js, OurPartners.js should live in this folder -// import and use the components from the newly created files - -const OurValues = () => { - // TASK - React 1 week 1 - // Create the "Our Values" section - // Use the descriptions provided in /app/about_us/README.md - // Some inspiration ideas found in /data/inspiration_about_us - return ( -

ADD OUR VALUES HERE

- ); -}; - -const OurCrew = () => { - // TASK - React 1 week 1 - // Create the "Our Crew section" - // Use the descriptions provided in /app/about_us/README.md - // Use the pictures from /public/crew - // Some inspiration ideas found in /data/inspiration_about_us - return ( -

ADD OUR CREW HERE

- ); -} - -const OurPartners = () => { - // TASK - React 1 week 1 - // Create the "Our Crew section" - // Use the descriptions provided in /app/about_us/README.md - // Use the pictures from /public/crew - // Some inspiration ideas found in /data/inspiration_about_us - return ( -

ADD OUR Partners HERE

- ); -} - +import { OurPartners } from "@/app/about_us/OurPartners"; +import { OurCrew } from "@/app/about_us/OurCrew"; +import { OurValues } from "@/app/about_us/OurValues"; export const Crew = () => { return ( @@ -45,18 +9,20 @@ export const Crew = () => {

About us

Our Values

- +

The crew

- +
- {/* TASK - React 1 week 1 */} - {/* Add in the "OurPartners" component here */} +
+

Our Partners

+ +
); -} +}; export default Crew; From 0147e30997517750a32e9c9a2905087cd46e36c0 Mon Sep 17 00:00:00 2001 From: RajeshBhatt Date: Thu, 10 Oct 2024 13:14:08 -0700 Subject: [PATCH 5/8] page.module.css file added --- app/about_us/page.module.css | 86 ++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/app/about_us/page.module.css b/app/about_us/page.module.css index 8cd0862..62fb524 100644 --- a/app/about_us/page.module.css +++ b/app/about_us/page.module.css @@ -3,3 +3,89 @@ width: 100vw; height: 100vh; } +/* Our Values */ +.container { + display: flex; + flex-wrap: wrap; + justify-content: space-between; + gap: 20px; + padding: 20px; +} + +.item { + flex: 1 1 calc(50% - 20px); + padding: 20px; + border-radius: 8px; +} + +.number { + font-size: 40px; + color: gray; +} + +.text { + font-size: 1rem; + color: white; +} + +/* Our Crew */ +.text_crew, +.text_partners { + width: 700px; + line-height: 22px; + padding-top: 10px; + margin: 12px 0 0 33px; +} + +.container_crew { + display: grid; + grid-template-columns: 1fr 1fr 1fr; + gap: 3rem; + padding: 2rem; +} +.item_crew { + display: flex; + flex-direction: column; + width: 280px; +} +.image_crew { + margin-bottom: 20px; +} +.image_crew img { + object-fit: cover; + display: block; + background-color: white; + height: 350px; + width: 280px; + border-radius: 20px; +} +.title_crew { + margin-top: 5px; + font-size: 14px; + color: gray; +} +.name_crew { + font-weight: bold; +} +.description_crew { + margin-top: 20px; + font-size: 14px; + font-style: italic; + line-height: 20px; +} + +/* Our Partners */ +.container_partners { + display: grid; + grid-template-columns: repeat(auto-fill, minmax(200px, 1fr)); + gap: 2rem; + padding: 2rem; + align-items: center; +} +.item_partners { + display: flex; + justify-content: center; +} +.image_partners { + max-width: 70%; +} From 6810c68e660184a3e9c184667ef1824e6d30b3c3 Mon Sep 17 00:00:00 2001 From: RajeshBhatt Date: Thu, 10 Oct 2024 13:22:07 -0700 Subject: [PATCH 6/8] footer and list item linkedin added --- components/ui/Footer.js | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/components/ui/Footer.js b/components/ui/Footer.js index eed8287..30e5fb5 100644 --- a/components/ui/Footer.js +++ b/components/ui/Footer.js @@ -1,15 +1,18 @@ -"use client" +"use client"; -import { usePathname } from 'next/navigation'; -import styles from './Footer.module.css'; +import { usePathname } from "next/navigation"; +import styles from "./Footer.module.css"; export const Footer = () => { - const path = usePathname().split('?')[0]; + const path = usePathname().split("?")[0]; return (

Galactica

-

Explore the universe and beyond. Your journey to the stars starts here.

+

+ Explore the universe and beyond. Your journey to the stars starts + here. +

© 2024 Galactica. All rights reserved.

{/* TASK - React 1 week 2 */} @@ -23,15 +26,15 @@ export const Footer = () => { */} {/* Docs for the Link: https://nextjs.org/docs/pages/api-reference/components/link */} - - {/* TASK - React 1 week 1 */} - {/* Add a new list item for LINKEDIN */}

Follow us

); -} +}; From bcbac8bd3126bb54d1bc4f91776b0b3fe13d69e2 Mon Sep 17 00:00:00 2001 From: RajeshBhatt Date: Thu, 10 Oct 2024 13:25:52 -0700 Subject: [PATCH 7/8] layout.js file added --- app/layout.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app/layout.js b/app/layout.js index 87ee54a..aa65974 100644 --- a/app/layout.js +++ b/app/layout.js @@ -17,12 +17,10 @@ export const RootLayout = ({ children }) => { {children} - {/* TASK - React 1 week 1 */} - {/* Import and use the Footer component here */} - {/* Footer found in the ui/Footer.js folder */} +