From becafb6cb709450e96ccc7e8d0682e5c5d5e093c Mon Sep 17 00:00:00 2001 From: FordoA455 Date: Tue, 26 Nov 2024 16:31:45 -0800 Subject: [PATCH 1/9] Adding info page file Signed-off-by: FordoA455 --- src/components/InfoPage.tsx | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 src/components/InfoPage.tsx diff --git a/src/components/InfoPage.tsx b/src/components/InfoPage.tsx new file mode 100644 index 0000000..33194a3 --- /dev/null +++ b/src/components/InfoPage.tsx @@ -0,0 +1,14 @@ +import "../App.css"; +import Typography from '@mui/joy/Typography'; +import Sheet from '@mui/joy/Sheet'; +import Grid from '@mui/joy/Grid'; +import React, { useState, useEffect } from 'react'; + +export default function InfoPage() { + return ( + + + + + ); +} \ No newline at end of file From f64aa19f4565a5cee28baf5014438f7a94b520a6 Mon Sep 17 00:00:00 2001 From: FordoA455 Date: Tue, 26 Nov 2024 16:31:45 -0800 Subject: [PATCH 2/9] Adding info page file Signed-off-by: FordoA455 --- src/components/InfoPage.tsx | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 src/components/InfoPage.tsx diff --git a/src/components/InfoPage.tsx b/src/components/InfoPage.tsx new file mode 100644 index 0000000..33194a3 --- /dev/null +++ b/src/components/InfoPage.tsx @@ -0,0 +1,14 @@ +import "../App.css"; +import Typography from '@mui/joy/Typography'; +import Sheet from '@mui/joy/Sheet'; +import Grid from '@mui/joy/Grid'; +import React, { useState, useEffect } from 'react'; + +export default function InfoPage() { + return ( + + + + + ); +} \ No newline at end of file From 711d86de0f882b1b27f13a17e73f943ea71c8d10 Mon Sep 17 00:00:00 2001 From: FordoA455 Date: Sat, 30 Nov 2024 00:29:23 -0800 Subject: [PATCH 3/9] Adding info cards Signed-off-by: FordoA455 --- src/App.css | 4 +-- src/App.tsx | 3 +- src/components/InfoPage.tsx | 64 ++++++++++++++++++++++++++++++++++--- 3 files changed, 63 insertions(+), 8 deletions(-) diff --git a/src/App.css b/src/App.css index afc91c2..26396b8 100644 --- a/src/App.css +++ b/src/App.css @@ -48,8 +48,8 @@ h2 { } .info { - height: 600px; - background-color:#61dafb; + /* height: 600px; + background-color:#000000; */ } .schedule { diff --git a/src/App.tsx b/src/App.tsx index e81fd49..850a41b 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -6,6 +6,7 @@ import Prospectus from "./components/Prospectus" import Faqs from "./components/Faqs"; import Title from "./components/Title"; import Schedule from "./components/Schedule"; +import InfoPage from './components/InfoPage'; function App() { const home = useRef(null); @@ -50,7 +51,7 @@ function App() {
-

INFO

+
diff --git a/src/components/InfoPage.tsx b/src/components/InfoPage.tsx index 33194a3..d06c027 100644 --- a/src/components/InfoPage.tsx +++ b/src/components/InfoPage.tsx @@ -2,13 +2,67 @@ import "../App.css"; import Typography from '@mui/joy/Typography'; import Sheet from '@mui/joy/Sheet'; import Grid from '@mui/joy/Grid'; +import Card from '@mui/joy/Card'; +import CardContent from '@mui/joy/CardContent'; import React, { useState, useEffect } from 'react'; export default function InfoPage() { return ( - - - - - ); +
+ + + Where Boundaries Fade and Ideas Flourish + MVHacks is proud to give a platform for aspiring tech enthusiasts to grow and learn by making unique projects that progress society. + + + + + Workshops and advice to help you grow + With specialized judges that are currently in the tech industry, at MVHacks you'll receive the best feedback to help you improve. + + + + + Real world collaboration and innovation + The MVHacks schedule is currently in development, but expect team-building exercises, workshops, and challenges! + + +
); } \ No newline at end of file From fd6ce3126ae03018b520de3b52fe036d30fcfd03 Mon Sep 17 00:00:00 2001 From: FordoA455 Date: Tue, 26 Nov 2024 16:31:45 -0800 Subject: [PATCH 4/9] Adding info page file Signed-off-by: FordoA455 --- src/components/InfoPage.tsx | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 src/components/InfoPage.tsx diff --git a/src/components/InfoPage.tsx b/src/components/InfoPage.tsx new file mode 100644 index 0000000..33194a3 --- /dev/null +++ b/src/components/InfoPage.tsx @@ -0,0 +1,14 @@ +import "../App.css"; +import Typography from '@mui/joy/Typography'; +import Sheet from '@mui/joy/Sheet'; +import Grid from '@mui/joy/Grid'; +import React, { useState, useEffect } from 'react'; + +export default function InfoPage() { + return ( + + + + + ); +} \ No newline at end of file From 7c6ee78d4766c6d9d43c975343d07ec3ce3817e4 Mon Sep 17 00:00:00 2001 From: FordoA455 Date: Sat, 30 Nov 2024 00:29:23 -0800 Subject: [PATCH 5/9] Adding info cards Signed-off-by: FordoA455 --- src/App.css | 4 +-- src/App.tsx | 3 +- src/components/InfoPage.tsx | 64 ++++++++++++++++++++++++++++++++++--- 3 files changed, 63 insertions(+), 8 deletions(-) diff --git a/src/App.css b/src/App.css index afc91c2..26396b8 100644 --- a/src/App.css +++ b/src/App.css @@ -48,8 +48,8 @@ h2 { } .info { - height: 600px; - background-color:#61dafb; + /* height: 600px; + background-color:#000000; */ } .schedule { diff --git a/src/App.tsx b/src/App.tsx index e81fd49..850a41b 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -6,6 +6,7 @@ import Prospectus from "./components/Prospectus" import Faqs from "./components/Faqs"; import Title from "./components/Title"; import Schedule from "./components/Schedule"; +import InfoPage from './components/InfoPage'; function App() { const home = useRef(null); @@ -50,7 +51,7 @@ function App() {
-

INFO

+
diff --git a/src/components/InfoPage.tsx b/src/components/InfoPage.tsx index 33194a3..d06c027 100644 --- a/src/components/InfoPage.tsx +++ b/src/components/InfoPage.tsx @@ -2,13 +2,67 @@ import "../App.css"; import Typography from '@mui/joy/Typography'; import Sheet from '@mui/joy/Sheet'; import Grid from '@mui/joy/Grid'; +import Card from '@mui/joy/Card'; +import CardContent from '@mui/joy/CardContent'; import React, { useState, useEffect } from 'react'; export default function InfoPage() { return ( - - - - - ); +
+ + + Where Boundaries Fade and Ideas Flourish + MVHacks is proud to give a platform for aspiring tech enthusiasts to grow and learn by making unique projects that progress society. + + + + + Workshops and advice to help you grow + With specialized judges that are currently in the tech industry, at MVHacks you'll receive the best feedback to help you improve. + + + + + Real world collaboration and innovation + The MVHacks schedule is currently in development, but expect team-building exercises, workshops, and challenges! + + +
); } \ No newline at end of file From 5aadbcd3296df85946b26447801b581716932b99 Mon Sep 17 00:00:00 2001 From: FordoA455 Date: Sat, 30 Nov 2024 00:34:06 -0800 Subject: [PATCH 6/9] Removing unecessary dependencies Signed-off-by: FordoA455 --- src/components/InfoPage.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/InfoPage.tsx b/src/components/InfoPage.tsx index d06c027..65c937d 100644 --- a/src/components/InfoPage.tsx +++ b/src/components/InfoPage.tsx @@ -1,10 +1,8 @@ import "../App.css"; import Typography from '@mui/joy/Typography'; -import Sheet from '@mui/joy/Sheet'; -import Grid from '@mui/joy/Grid'; import Card from '@mui/joy/Card'; import CardContent from '@mui/joy/CardContent'; -import React, { useState, useEffect } from 'react'; +import React from 'react'; export default function InfoPage() { return ( From 523a20891e19515e290ad02f620e637dad2c0a0c Mon Sep 17 00:00:00 2001 From: FordoA455 Date: Mon, 2 Dec 2024 23:06:34 -0800 Subject: [PATCH 7/9] Turning info blocks to flex columns Signed-off-by: FordoA455 --- src/components/InfoPage.tsx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/InfoPage.tsx b/src/components/InfoPage.tsx index 65c937d..b2f4773 100644 --- a/src/components/InfoPage.tsx +++ b/src/components/InfoPage.tsx @@ -14,8 +14,8 @@ export default function InfoPage() { sx={{ "--Card-padding": "16px", "--Card-radius": "26px", - display: "block", - height: "200px", + display: "flex", + flexDirection: "column", width: "50%", backgroundColor: "black" }}> @@ -31,8 +31,8 @@ export default function InfoPage() { sx={{ "--Card-padding": "16px", "--Card-radius": "26px", - display: "block", - height: "200px", + display: "flex", + flexDirection: "column", width: "50%", marginLeft: "48%", marginTop: "100px", @@ -50,8 +50,8 @@ export default function InfoPage() { sx={{ "--Card-padding": "16px", "--Card-radius": "26px", - display: "block", - height: "200px", + display: "flex", + flexDirection: "column", marginTop: "100px", width: "50%", backgroundColor: "black" From 534aec0aa2f95cd8f073cbc57c6e808e395dfa92 Mon Sep 17 00:00:00 2001 From: FordoA455 Date: Mon, 2 Dec 2024 23:20:52 -0800 Subject: [PATCH 8/9] Resizing blocks for mobile Signed-off-by: FordoA455 --- src/components/InfoPage.tsx | 189 +++++++++++++++++++++++++----------- src/components/Navbar.tsx | 2 +- 2 files changed, 132 insertions(+), 59 deletions(-) diff --git a/src/components/InfoPage.tsx b/src/components/InfoPage.tsx index b2f4773..b053d46 100644 --- a/src/components/InfoPage.tsx +++ b/src/components/InfoPage.tsx @@ -2,65 +2,138 @@ import "../App.css"; import Typography from '@mui/joy/Typography'; import Card from '@mui/joy/Card'; import CardContent from '@mui/joy/CardContent'; -import React from 'react'; +import React, {useState, useEffect} from 'react'; export default function InfoPage() { + const [isMobile, setIsMobile] = useState(false); + + useEffect(() => { + const handleResize = () => { + setIsMobile(window.innerWidth < 830); // Adjust the breakpoint as needed + }; + + window.addEventListener('resize', handleResize); + handleResize(); // Initial check on component mount + + return () => { + window.removeEventListener('resize', handleResize); + }; + }, []); return ( -
- - - Where Boundaries Fade and Ideas Flourish - MVHacks is proud to give a platform for aspiring tech enthusiasts to grow and learn by making unique projects that progress society. - - - - - Workshops and advice to help you grow - With specialized judges that are currently in the tech industry, at MVHacks you'll receive the best feedback to help you improve. - - - - - Real world collaboration and innovation - The MVHacks schedule is currently in development, but expect team-building exercises, workshops, and challenges! - - -
); +
+ {!isMobile && (
+ + + Where Boundaries Fade and Ideas Flourish + MVHacks is proud to give a platform for aspiring tech enthusiasts to grow and learn by making unique projects that progress society. + + + + + Workshops and advice to help you grow + With specialized judges that are currently in the tech industry, at MVHacks you'll receive the best feedback to help you improve. + + + + + Real world collaboration and innovation + The MVHacks schedule is currently in development, but expect team-building exercises, workshops, and challenges! + + +
)} + {isMobile && (
+ + + Where Boundaries Fade and Ideas Flourish + MVHacks is proud to give a platform for aspiring tech enthusiasts to grow and learn by making unique projects that progress society. + + + + + Workshops and advice to help you grow + With specialized judges that are currently in the tech industry, at MVHacks you'll receive the best feedback to help you improve. + + + + + Real world collaboration and innovation + The MVHacks schedule is currently in development, but expect team-building exercises, workshops, and challenges! + + +
)} +
+ ); } \ No newline at end of file diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx index 2631b25..cdb43d2 100644 --- a/src/components/Navbar.tsx +++ b/src/components/Navbar.tsx @@ -46,7 +46,7 @@ export default function Navbar({ onOptionSelect }: any) { return (
- mvhackslogo + mvhackslogo onOptionSelect('home')}> MV HACKS 8.0 From 55800dbb9b4c0b9a03ca2ffa2cb711c29e2dc17f Mon Sep 17 00:00:00 2001 From: FordoA455 Date: Mon, 2 Dec 2024 23:30:41 -0800 Subject: [PATCH 9/9] Moving carousel below info Signed-off-by: FordoA455 --- src/App.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.tsx b/src/App.tsx index d79e5be..043e60b 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -52,8 +52,8 @@ function App() {
- +