From 507dc5be47b35fd215daa366276488c37f820035 Mon Sep 17 00:00:00 2001 From: darkicewolf50 Date: Sat, 9 Mar 2024 14:29:31 -0700 Subject: [PATCH 01/10] init home page --- src/AboutUs/AboutUs.css | 25 ++++++++++++++++++++++ src/AboutUs/AboutUs.js | 47 ++++++++++++++++++++++++++++++++++++----- 2 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 src/AboutUs/AboutUs.css diff --git a/src/AboutUs/AboutUs.css b/src/AboutUs/AboutUs.css new file mode 100644 index 0000000..9beacc2 --- /dev/null +++ b/src/AboutUs/AboutUs.css @@ -0,0 +1,25 @@ +#aboutUs { + display: flex; + flex-direction: column; + align-content: center; +} + +#benefits { + display: flex; + flex-direction: column; +} + +.aboutUs article { + display: grid; + grid-template-columns: 50% 45%; + column-gap: 15px; + align-content: center; + padding-top: 15px; + padding-left: 5%; + padding-right: 5%; +} + +.aboutUs img { + height: 300px; + width: 100%; +} diff --git a/src/AboutUs/AboutUs.js b/src/AboutUs/AboutUs.js index 77531ed..f4eda45 100644 --- a/src/AboutUs/AboutUs.js +++ b/src/AboutUs/AboutUs.js @@ -1,5 +1,42 @@ -export default function AboutsUs() { - return ( -

About Us

- ); -}; \ No newline at end of file +import "./AboutUs.css"; + +const AboutsUs = () => { + return ( +
+ Schulich off Road Banner +
+ Who we are//temp +

Who we are

+
+
+

+ What we do, breifly list the broad categories of what people do in our + team +

+ montage of images mainly showcasing team memebers working +
+
+

+ What are the benefits of joing the team small list of how we actually + beneit new members +

+
    +
  • benefit 1
    • +
  • benefit 2
    • +
  • benefit 3
    • +
+
+
+ ); +}; + +export default AboutsUs; From d927a28f3c1b93688def14eadcc07f4c4046ab30 Mon Sep 17 00:00:00 2001 From: darkicewolf50 Date: Sat, 9 Mar 2024 14:44:21 -0700 Subject: [PATCH 02/10] jsdoc comments --- src/AboutUs/AboutUs.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/AboutUs/AboutUs.js b/src/AboutUs/AboutUs.js index f4eda45..9e548ff 100644 --- a/src/AboutUs/AboutUs.js +++ b/src/AboutUs/AboutUs.js @@ -1,5 +1,12 @@ import "./AboutUs.css"; +/** + * @param {null} null - needs nothing + * @returns {JSX.Element} page - returns the content of the page + * @description The home/About us Page + * @author Brock + * @todo Add content in paragraphs, real photos add add banner image slider + */ const AboutsUs = () => { return (
From 030ea75e745da1ec7e33def3cc965067b1365d33 Mon Sep 17 00:00:00 2001 From: darkicewolf50 Date: Sat, 23 Mar 2024 16:35:13 -0600 Subject: [PATCH 03/10] added aboutUs: added content and a bunch of css --- src/AboutUs/AboutUs.css | 40 +++++++++++++++- src/AboutUs/AboutUs.js | 100 +++++++++++++++++++++++++++++++--------- 2 files changed, 118 insertions(+), 22 deletions(-) diff --git a/src/AboutUs/AboutUs.css b/src/AboutUs/AboutUs.css index 9beacc2..ea3d2f9 100644 --- a/src/AboutUs/AboutUs.css +++ b/src/AboutUs/AboutUs.css @@ -9,7 +9,11 @@ flex-direction: column; } -.aboutUs article { +#benefits h2 { + text-align: center; +} + +.aboutUs div { display: grid; grid-template-columns: 50% 45%; column-gap: 15px; @@ -19,7 +23,41 @@ padding-right: 5%; } +.aboutUs div div { + display: flex; + flex-direction: column; +} + +.aboutUs h2 { + border-bottom: solid 2px black; +} + .aboutUs img { height: 300px; width: 100%; } + +.aboutUs div img { + padding-top: 4rem; +} + +.aboutUs ul { + padding: 0px; + padding-left: 10%; +} + +.aboutUs li { + max-width: 15rem; +} + +.aboutUs table { + display: flex; + justify-content: center; + padding-bottom: 2rem; +} + +.aboutUs td { + padding: 5rem; + padding-top: 0px; + padding-bottom: 0px; +} diff --git a/src/AboutUs/AboutUs.js b/src/AboutUs/AboutUs.js index 9e548ff..d0705a5 100644 --- a/src/AboutUs/AboutUs.js +++ b/src/AboutUs/AboutUs.js @@ -5,7 +5,7 @@ import "./AboutUs.css"; * @returns {JSX.Element} page - returns the content of the page * @description The home/About us Page * @author Brock - * @todo Add content in paragraphs, real photos add add banner image slider + * @todo Add real photos add add banner image slider */ const AboutsUs = () => { return ( @@ -14,34 +14,92 @@ const AboutsUs = () => { src="https://res.cloudinary.com/dpgrgsh7g/image/upload/v1710016930/IMG-20240207-WA0000_e1jcf4.jpg" alt="Schulich off Road Banner" /> -
+
Who we are//temp -

Who we are

-
-
-

- What we do, breifly list the broad categories of what people do in our - team -

+
+

Schulich Off-Road

+

+ Schulich Off-Road is a student organization responsible for + designing, building, and racing an off-road vehicle in the Baja SAE + intercollegiate competition organized by the Society of Automotive + Engineers (SAE) every year. Schulich Off-Road's cars are tough, + dependable, competitive, and extremely fun to drive. +

+

+ Schulich Off-road is a team consisting of talented and determined + competitive individuals in engineering who strive to expand their + horizons, earn experience, and network with leading companies in + their respective fields. Our members achieve this by being a part of + one of our 6 sub-teams: Drivetrain, Logistics and Software, + Suspension, Chassis and Ergonomics, Steering, and Electrical and + Testing. +

+
+ +
+
+

Our Work / Projects

+

+ Students involved in Schulich Off-Road gain practical experience in + design and manufacturing by constructing various car components. + They learn to balance cost, manufacturing limitations, and + performance to develop optimal parts, budgets, and processes. This + involves using CAD technology like SolidWorks and FEA simulations. +

+

+ Additionally, members acquire hands-on skills such as welding and + operating metal cutting machines. Each team member handles a + specific component, collaborating, researching, and troubleshooting + throughout the design and execution process. After building the + vehicle, students can attend competitions worldwide, where they must + address issues promptly and work as a team to replace broken parts + to stay competitive. +

+
montage of images mainly showcasing team memebers working -
-
-

- What are the benefits of joing the team small list of how we actually - beneit new members -

-
    -
  • benefit 1
    • -
  • benefit 2
    • -
  • benefit 3
    • -
-
+ +
+

Benefits of being a part of the team

+ + + + + + + + + + + +
+

Hands on-Experience

+ 		+

Application of knowledge

+
+
    +
  • Designing & Drawings
    • +
  • Testing Parts
    • +
  • Manufacturing the product
    • +
+ 		+
    +
  • + Get the chance to work on one or more of the many projects + offered by your chosen sub-team +
    • +
+
+ (If we do a rotating images thing for the top, and still want to keep this on the bottom, maybe we can change it to a more collage type thing for this box) +
); }; From 79be60008394daa27934e85f0c1648f0079f3574 Mon Sep 17 00:00:00 2001 From: darkicewolf50 Date: Sat, 9 Mar 2024 14:29:31 -0700 Subject: [PATCH 04/10] init home page --- src/AboutUs/AboutUs.css | 25 ++++++++++++++++++++++ src/AboutUs/AboutUs.js | 47 ++++++++++++++++++++++++++++++++++++----- 2 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 src/AboutUs/AboutUs.css diff --git a/src/AboutUs/AboutUs.css b/src/AboutUs/AboutUs.css new file mode 100644 index 0000000..9beacc2 --- /dev/null +++ b/src/AboutUs/AboutUs.css @@ -0,0 +1,25 @@ +#aboutUs { + display: flex; + flex-direction: column; + align-content: center; +} + +#benefits { + display: flex; + flex-direction: column; +} + +.aboutUs article { + display: grid; + grid-template-columns: 50% 45%; + column-gap: 15px; + align-content: center; + padding-top: 15px; + padding-left: 5%; + padding-right: 5%; +} + +.aboutUs img { + height: 300px; + width: 100%; +} diff --git a/src/AboutUs/AboutUs.js b/src/AboutUs/AboutUs.js index 77531ed..f4eda45 100644 --- a/src/AboutUs/AboutUs.js +++ b/src/AboutUs/AboutUs.js @@ -1,5 +1,42 @@ -export default function AboutsUs() { - return ( -

About Us

- ); -}; \ No newline at end of file +import "./AboutUs.css"; + +const AboutsUs = () => { + return ( +
+ Schulich off Road Banner +
+ Who we are//temp +

Who we are

+
+
+

+ What we do, breifly list the broad categories of what people do in our + team +

+ montage of images mainly showcasing team memebers working +
+
+

+ What are the benefits of joing the team small list of how we actually + beneit new members +

+
    +
  • benefit 1
    • +
  • benefit 2
    • +
  • benefit 3
    • +
+
+
+ ); +}; + +export default AboutsUs; From f669a3a72e2089b7d0192cdec1bb78b960935f42 Mon Sep 17 00:00:00 2001 From: darkicewolf50 Date: Sat, 9 Mar 2024 14:44:21 -0700 Subject: [PATCH 05/10] jsdoc comments --- src/AboutUs/AboutUs.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/AboutUs/AboutUs.js b/src/AboutUs/AboutUs.js index f4eda45..9e548ff 100644 --- a/src/AboutUs/AboutUs.js +++ b/src/AboutUs/AboutUs.js @@ -1,5 +1,12 @@ import "./AboutUs.css"; +/** + * @param {null} null - needs nothing + * @returns {JSX.Element} page - returns the content of the page + * @description The home/About us Page + * @author Brock + * @todo Add content in paragraphs, real photos add add banner image slider + */ const AboutsUs = () => { return (
From 71a9ddc7e12abb8897250344e3b1be2f7def04a4 Mon Sep 17 00:00:00 2001 From: darkicewolf50 Date: Sat, 23 Mar 2024 16:35:13 -0600 Subject: [PATCH 06/10] added aboutUs: added content and a bunch of css --- src/AboutUs/AboutUs.css | 40 +++++++++++++++- src/AboutUs/AboutUs.js | 100 +++++++++++++++++++++++++++++++--------- 2 files changed, 118 insertions(+), 22 deletions(-) diff --git a/src/AboutUs/AboutUs.css b/src/AboutUs/AboutUs.css index 9beacc2..ea3d2f9 100644 --- a/src/AboutUs/AboutUs.css +++ b/src/AboutUs/AboutUs.css @@ -9,7 +9,11 @@ flex-direction: column; } -.aboutUs article { +#benefits h2 { + text-align: center; +} + +.aboutUs div { display: grid; grid-template-columns: 50% 45%; column-gap: 15px; @@ -19,7 +23,41 @@ padding-right: 5%; } +.aboutUs div div { + display: flex; + flex-direction: column; +} + +.aboutUs h2 { + border-bottom: solid 2px black; +} + .aboutUs img { height: 300px; width: 100%; } + +.aboutUs div img { + padding-top: 4rem; +} + +.aboutUs ul { + padding: 0px; + padding-left: 10%; +} + +.aboutUs li { + max-width: 15rem; +} + +.aboutUs table { + display: flex; + justify-content: center; + padding-bottom: 2rem; +} + +.aboutUs td { + padding: 5rem; + padding-top: 0px; + padding-bottom: 0px; +} diff --git a/src/AboutUs/AboutUs.js b/src/AboutUs/AboutUs.js index 9e548ff..d0705a5 100644 --- a/src/AboutUs/AboutUs.js +++ b/src/AboutUs/AboutUs.js @@ -5,7 +5,7 @@ import "./AboutUs.css"; * @returns {JSX.Element} page - returns the content of the page * @description The home/About us Page * @author Brock - * @todo Add content in paragraphs, real photos add add banner image slider + * @todo Add real photos add add banner image slider */ const AboutsUs = () => { return ( @@ -14,34 +14,92 @@ const AboutsUs = () => { src="https://res.cloudinary.com/dpgrgsh7g/image/upload/v1710016930/IMG-20240207-WA0000_e1jcf4.jpg" alt="Schulich off Road Banner" /> -
+
Who we are//temp -

Who we are

-
-
-

- What we do, breifly list the broad categories of what people do in our - team -

+
+

Schulich Off-Road

+

+ Schulich Off-Road is a student organization responsible for + designing, building, and racing an off-road vehicle in the Baja SAE + intercollegiate competition organized by the Society of Automotive + Engineers (SAE) every year. Schulich Off-Road's cars are tough, + dependable, competitive, and extremely fun to drive. +

+

+ Schulich Off-road is a team consisting of talented and determined + competitive individuals in engineering who strive to expand their + horizons, earn experience, and network with leading companies in + their respective fields. Our members achieve this by being a part of + one of our 6 sub-teams: Drivetrain, Logistics and Software, + Suspension, Chassis and Ergonomics, Steering, and Electrical and + Testing. +

+
+ +
+
+

Our Work / Projects

+

+ Students involved in Schulich Off-Road gain practical experience in + design and manufacturing by constructing various car components. + They learn to balance cost, manufacturing limitations, and + performance to develop optimal parts, budgets, and processes. This + involves using CAD technology like SolidWorks and FEA simulations. +

+

+ Additionally, members acquire hands-on skills such as welding and + operating metal cutting machines. Each team member handles a + specific component, collaborating, researching, and troubleshooting + throughout the design and execution process. After building the + vehicle, students can attend competitions worldwide, where they must + address issues promptly and work as a team to replace broken parts + to stay competitive. +

+
montage of images mainly showcasing team memebers working -
-
-

- What are the benefits of joing the team small list of how we actually - beneit new members -

-
    -
  • benefit 1
    • -
  • benefit 2
    • -
  • benefit 3
    • -
-
+ +
+

Benefits of being a part of the team

+ + + + + + + + + + + +
+

Hands on-Experience

+ 		+

Application of knowledge

+
+
    +
  • Designing & Drawings
    • +
  • Testing Parts
    • +
  • Manufacturing the product
    • +
+ 		+
    +
  • + Get the chance to work on one or more of the many projects + offered by your chosen sub-team +
    • +
+
+ (If we do a rotating images thing for the top, and still want to keep this on the bottom, maybe we can change it to a more collage type thing for this box) +
); }; From 7f090600cb26f559033e9338955dcd348581b394 Mon Sep 17 00:00:00 2001 From: darkicewolf50 Date: Sat, 8 Mar 2025 12:04:06 -0700 Subject: [PATCH 07/10] feat(homePage): banner mostly complete and 2 hour challenge complete, most of page sort of done --- src/Header/Header.js | 3 ++ src/Home/Home.css | 45 ++++++++++++++++ src/Home/Home.jsx | 119 +++++++++++++++++++++++++++++++++++++++++++ src/index.js | 5 ++ 4 files changed, 172 insertions(+) create mode 100644 src/Home/Home.css create mode 100644 src/Home/Home.jsx diff --git a/src/Header/Header.js b/src/Header/Header.js index 4e36533..b742b79 100644 --- a/src/Header/Header.js +++ b/src/Header/Header.js @@ -68,6 +68,9 @@ const Header = () => {