From 30ce146c2b8aa6a4db447f9de7ef24bebeb4b088 Mon Sep 17 00:00:00 2001 From: darkicewolf50 Date: Sat, 2 Mar 2024 17:04:13 -0700 Subject: [PATCH 01/26] init sub teams --- src/Teams/Leadership.json | 9 +++++ src/Teams/SubTeams.css | 0 src/Teams/SubTeams.js | 34 +++++++++++++++++++ src/Teams/Teams.js | 5 --- src/index.js | 70 +++++++++++++++++++++++---------------- 5 files changed, 85 insertions(+), 33 deletions(-) create mode 100644 src/Teams/Leadership.json create mode 100644 src/Teams/SubTeams.css create mode 100644 src/Teams/SubTeams.js delete mode 100644 src/Teams/Teams.js diff --git a/src/Teams/Leadership.json b/src/Teams/Leadership.json new file mode 100644 index 0000000..8e55c28 --- /dev/null +++ b/src/Teams/Leadership.json @@ -0,0 +1,9 @@ +{ + "Team Captain": "Aidan Schroeder", + "Nole Tabelon": "Chassis Lead", + "Hewitt Yee": "Drivetrain Lead", + "Alex Buzdugan": "Electrical Lead", + "Brock Tomlinson": "Business and Softawre Lead", + "Ghaith Abu-Rub": "Suspension Lead", + "Anjali Patadia": "Steering Lead" +} diff --git a/src/Teams/SubTeams.css b/src/Teams/SubTeams.css new file mode 100644 index 0000000..e69de29 diff --git a/src/Teams/SubTeams.js b/src/Teams/SubTeams.js new file mode 100644 index 0000000..9b8f17f --- /dev/null +++ b/src/Teams/SubTeams.js @@ -0,0 +1,34 @@ +const SubTeams = () => { + // const jsonImport = (filePath) => { + // data = import(filePath); + // return data; + // }; + // leadership_json = jsonImport("./Leadership.json"); + // console.log(leadership_json); + return ( +
+
+

Leadership

+

gallery

+
+ + + + + + + + + + + + + + + +
Aidan SchroederTeam Captain
Hewitt YeeDrivetrain Lead
Nole TabelonChassis Lead
+
+ ); +}; + +export default SubTeams; diff --git a/src/Teams/Teams.js b/src/Teams/Teams.js deleted file mode 100644 index 98b7bec..0000000 --- a/src/Teams/Teams.js +++ /dev/null @@ -1,5 +0,0 @@ -export default function Teams() { - return ( -

Teams

- ); -}; \ No newline at end of file diff --git a/src/index.js b/src/index.js index dceadbb..cf5cd77 100644 --- a/src/index.js +++ b/src/index.js @@ -1,34 +1,48 @@ -import React from 'react'; -import ReactDOM from 'react-dom/client'; -import reportWebVitals from './reportWebVitals'; +import React from "react"; +import ReactDOM from "react-dom/client"; +import reportWebVitals from "./reportWebVitals"; import { BrowserRouter, Routes, Route } from "react-router-dom"; -import Header from './Header/Header'; -import AboutUs from './AboutUs/AboutUs'; -import Teams from './Teams/Teams'; -import OurSponsors from './OurSponsors/OurSponsors'; -import BecomeASponsor from './BecomeASponsor/BecomeASponsor'; -import JoinTheClub from './Club Membership & Upcoming Events/JoinTheClub/JoinTheClub'; -import UpcomingEvents from './Club Membership & Upcoming Events/UpcominEvents/UpcomingEvents'; -import Gallery from './Gallery/Gallery'; -import './index.css'; +import Header from "./Header/Header"; +import AboutUs from "./AboutUs/AboutUs"; +import SubTeams from "./Teams/SubTeams"; +import OurSponsors from "./OurSponsors/OurSponsors"; +import BecomeASponsor from "./BecomeASponsor/BecomeASponsor"; +import JoinTheClub from "./Club Membership & Upcoming Events/JoinTheClub/JoinTheClub"; +import UpcomingEvents from "./Club Membership & Upcoming Events/UpcominEvents/UpcomingEvents"; +import Gallery from "./Gallery/Gallery"; +import "./index.css"; -const root = ReactDOM.createRoot(document.getElementById('root')); +const root = ReactDOM.createRoot(document.getElementById("root")); root.render( - - - - }> - }> - }> - }> - }> - }> - }> - }> - - - - + + + + }> + }> + }> + }> + }> + }> + }> + }> + + + + ); // If you want to start measuring performance in your app, pass a function From 46676cc4321db50e20f7357096d0c428791c90f9 Mon Sep 17 00:00:00 2001 From: darkicewolf50 Date: Sat, 9 Mar 2024 10:39:49 -0700 Subject: [PATCH 02/26] testing iframe --- src/Teams/SubTeams.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/Teams/SubTeams.js b/src/Teams/SubTeams.js index 9b8f17f..7665341 100644 --- a/src/Teams/SubTeams.js +++ b/src/Teams/SubTeams.js @@ -7,6 +7,15 @@ const SubTeams = () => { // console.log(leadership_json); return (
+

Leadership

gallery

From c4ba085c3bf1edc57cffd19c1c342ee1b1c3b335 Mon Sep 17 00:00:00 2001 From: darkicewolf50 Date: Sat, 9 Mar 2024 16:00:56 -0700 Subject: [PATCH 03/26] init footer --- src/Footer/Ender.css | 33 ++++++++++++++ src/Footer/Ender.js | 28 ++++++++++++ src/Header/Header.js | 106 +++++++++++++++++++++++++++---------------- 3 files changed, 127 insertions(+), 40 deletions(-) create mode 100644 src/Footer/Ender.css create mode 100644 src/Footer/Ender.js diff --git a/src/Footer/Ender.css b/src/Footer/Ender.css new file mode 100644 index 0000000..90b6db3 --- /dev/null +++ b/src/Footer/Ender.css @@ -0,0 +1,33 @@ +#ender { + display: flex; + flex-direction: column; + padding-top: 10px; + padding-bottom: 10px; + justify-content: center; + background-color: lightgrey; +} + +#pointerCursor { + cursor: pointer; +} + +#ender div { + display: flex; + flex-direction: row; + justify-content: center; +} +#ender p { + padding-left: 2%; +} + +#ender .hidden { + display: flex; + flex-direction: row; + justify-content: center; + display: none; +} + +#ender .hidden li { + list-style-type: none; + padding-right: 2%; +} diff --git a/src/Footer/Ender.js b/src/Footer/Ender.js new file mode 100644 index 0000000..a118260 --- /dev/null +++ b/src/Footer/Ender.js @@ -0,0 +1,28 @@ +import "./Ender.css"; +/** + * @param {null} null - requires onthing + * @returns {JSX.Element} Page - HTML tags and JS functionality + * @description The Footer of the page + * @author Brock + * @todo add who helped developed the site and finalize css + */ +const Ender = () => { + return ( +
+
+

© 2023 by Schulich Off-Road

+

window.open("https://www.morphgenix.com/", "_blank")} + id="pointerCursor"> + Powered by: Morphgenix +

+
+
    +
  • Developed by:
    • +
  • Brock
    • +
+
+ ); +}; + +export default Ender; diff --git a/src/Header/Header.js b/src/Header/Header.js index 9d53f58..82869c5 100644 --- a/src/Header/Header.js +++ b/src/Header/Header.js @@ -1,52 +1,78 @@ -import logo from './logo.png'; +import logo from "./logo.png"; import DropdownMenu from "./DropdownMenu"; // import OpenPage from "./OpenPage"; import { useNavigate } from "react-router-dom"; import { useState } from "react"; import { Outlet } from "react-router-dom"; import "./Header.css"; +import Ender from "../Footer/Ender"; export default function Header() { - const [isDropdownVisible, setDropdownVisible] = useState(false); - const navigate = useNavigate(); + const [isDropdownVisible, setDropdownVisible] = useState(false); + const navigate = useNavigate(); - const OpenPage = (arg) => { - navigate(arg); - console.log(arg); - }; + const OpenPage = (arg) => { + navigate(arg); + console.log(arg); + }; - const handleMouseEnter = () => { - setDropdownVisible(true); - }; + const handleMouseEnter = () => { + setDropdownVisible(true); + }; - const handleMouseLeave = () => { - setDropdownVisible(false); - }; + const handleMouseLeave = () => { + setDropdownVisible(false); + }; - return ( - <> -
-
- OpenPage('/')} src={logo} alt="logo" /> -

Schulich Offroad

-
-
- - - - -
- - {isDropdownVisible && } -
- -
-
- - - ); -}; \ No newline at end of file + return ( + <> +
+
+ OpenPage("/")} + src={logo} + alt="logo" + /> +

Schulich Offroad

+
+
+ + + + +
+ + {isDropdownVisible && } +
+ +
+
+ + + + ); +} From 33ec6055c6e5f0587cd05d0dddd5ee55ecf248f8 Mon Sep 17 00:00:00 2001 From: darkicewolf50 Date: Wed, 13 Mar 2024 14:44:11 -0600 Subject: [PATCH 04/26] cange to html code from symbol --- src/Footer/Ender.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Footer/Ender.js b/src/Footer/Ender.js index a118260..b0054f2 100644 --- a/src/Footer/Ender.js +++ b/src/Footer/Ender.js @@ -10,7 +10,7 @@ const Ender = () => { return (