diff --git a/src/App.js b/src/App.js index 746468799..56075a152 100644 --- a/src/App.js +++ b/src/App.js @@ -53,6 +53,7 @@ import Submission from "./Pages/CapTF/Submission"; import Pathway from "./Pages/Pathway/Pathway"; import EnablersPage from "./Pages/EnablersPage/EnablersPage"; import In50Hours from "./Pages/In50Hours/In50Hours"; +import Manifesto from "./Pages/Manifesto/Manifesto"; function App() { const [redirects, setRedirects] = useState([]); const [isLoaded, setIsLoaded] = useState(false); @@ -124,6 +125,7 @@ function App() { } /> } /> } /> + } /> } /> diff --git a/src/Components/Footer/Footer.jsx b/src/Components/Footer/Footer.jsx index 1db9daaa1..85f334297 100644 --- a/src/Components/Footer/Footer.jsx +++ b/src/Components/Footer/Footer.jsx @@ -93,7 +93,7 @@ const Footer = () => { diff --git a/src/Components/Navbar/Mylinks.jsx b/src/Components/Navbar/Mylinks.jsx index 532108e30..e5ab7a9d0 100644 --- a/src/Components/Navbar/Mylinks.jsx +++ b/src/Components/Navbar/Mylinks.jsx @@ -23,6 +23,13 @@ export const links = [ link: "/enablers", foreign: false, }, + { + name: "Manifesto", + submenu: false, + sublinks: [], + link: "/manifesto", + foreign: false, + }, ], }, diff --git a/src/Pages/ArtOfTeaching/ArtOfTeaching.jsx b/src/Pages/ArtOfTeaching/ArtOfTeaching.jsx index 5b4cc710f..fbdde535c 100644 --- a/src/Pages/ArtOfTeaching/ArtOfTeaching.jsx +++ b/src/Pages/ArtOfTeaching/ArtOfTeaching.jsx @@ -8,7 +8,7 @@ import "./ArtOfTeaching.scss"; import Faq from "react-faq-component"; import fvimg from "./assets/fvimg.gif"; -import Guidlines from "./assets/Guidlines.pdf"; +import Guidlines from "./assets/Guidlines1.pdf"; import MentorCard from "../../Components/MentorCard/MentorCard"; @@ -73,7 +73,9 @@ const ArtOfTeaching = () => { }; + + const data = { title: "Frequently Asked Questions", rows: [ @@ -202,43 +204,15 @@ const ArtOfTeaching = () => {
- {/* */}

- Guidlines + Guidelines

@@ -247,7 +221,7 @@ const ArtOfTeaching = () => {
-

Task 1 - Self introduction with welcome ticket.

+

Task 1 - Self introduction.

@@ -260,7 +234,7 @@ const ArtOfTeaching = () => {
-

Task 1 - Detailed document submission of the designed course curriculam.

+

Task 1 - Detailed document submission of the designed course curriculum.

@@ -273,11 +247,12 @@ const ArtOfTeaching = () => {
-
+ +

@@ -318,12 +293,44 @@ const ArtOfTeaching = () => {

- +
+ +
+ +
+
+ +
+
+ + + + + +
diff --git a/src/Pages/ArtOfTeaching/assets/Guidlines.pdf b/src/Pages/ArtOfTeaching/assets/Guidlines1.pdf similarity index 93% rename from src/Pages/ArtOfTeaching/assets/Guidlines.pdf rename to src/Pages/ArtOfTeaching/assets/Guidlines1.pdf index 3618d10e4..165c77054 100644 Binary files a/src/Pages/ArtOfTeaching/assets/Guidlines.pdf and b/src/Pages/ArtOfTeaching/assets/Guidlines1.pdf differ diff --git a/src/Pages/Manifesto/Manifesto.jsx b/src/Pages/Manifesto/Manifesto.jsx new file mode 100644 index 000000000..8b2a88edd --- /dev/null +++ b/src/Pages/Manifesto/Manifesto.jsx @@ -0,0 +1,61 @@ +import React from "react"; +import Navbar from "../../Components/Navbar/Navbar"; +import Footer from "../../Components/Footer/Footer"; +import styles from "./Manifesto.module.css"; +import muLogoBg from "./assets/µ.png"; +import muLogo from "./assets/µLearn-logo.svg"; +import handImg from "./assets/hand.png"; +export default function Manifesto() { + return ( + <> + +
+
+ +
+
+ +
Our Manifesto
+
+

We,The Unbound, The Unbowed

+
+
+ +
+
+
+

+ We, the Unbound, the Unbowed, a tribe of relentless + learners, rise from the ashes of a broken education system.{" "} + + We are the mavericks who dared to question the status quo + + , the misfits who refused to be cogs in the machine of rote + memorization. For far too long, we've navigated the labyrinthine + corridors of standardized curriculums,{" "} + our creativity stifled by the stale{" "} + air of conformity. Not anymore! +

+
+
+

+ µLearn is our revolution. Here, curiosity{" "} + reigns, and collaboration is our weapon. We{" "} + transform failures into stepping stones, and together + we redefine learning. +

+
+
+

+ Welcome to the µLearn.Welcome to the{" "} + Revolution. +

{" "} + + + +
+
+
+ + ); +} diff --git a/src/Pages/Manifesto/Manifesto.module.css b/src/Pages/Manifesto/Manifesto.module.css new file mode 100644 index 000000000..41a46ce25 --- /dev/null +++ b/src/Pages/Manifesto/Manifesto.module.css @@ -0,0 +1,232 @@ +@font-face { + font-family: retro-team; + src: url("./assets/Fonts/Retro\ Team.otf"); +} +.main { + overflow-x: hidden; +} + +.head { + background-color: #f58c49; + height: 20vw; + position: relative; + display: flex; + margin-top: 6vw; +} + +.head .muLogoBg { + position: absolute; + width: 35vw; +} + +.head .textContainer { + display: flex; + flex-direction: column; + justify-content: center; + height: 100%; + width: 80%; + padding-left: 5rem; + padding-top: 3rem; +} + +.textContainer .logoContainer { + display: flex; + justify-content: space-between; +} + +.textContainer .logoContainer img { + width: 10vw; +} + +.logoContainer .ourManifestoText { + color: white; + text-transform: uppercase; + background-color: rgba(255, 255, 255, 0.28); + display: flex; + align-items: center; + padding: 0.5rem 2rem; + border-radius: 100px; + padding-right: 4rem; + font-size: 1.3vw; +} + +.head .textContainer h1 { + font-family: retro-team; + font-size: 6.5vw; + color: white; +} + +.head .imgContainer { + width: fit-content; + height: 100%; + position: relative; +} + +.head .imgContainer img { + position: absolute; + bottom: 0; + left: -4vw; + width: 20vw; +} + +.firstPara { + padding: 4rem 5rem; +} + +.firstPara p { + font-size: 2rem; + font-family: "Plus Jakarta Sans", sans-serif; + text-align: center; + letter-spacing: 1px; +} + +.firstPara p span { + font-weight: 600; +} + +.secondPara { + padding: 0 6rem; +} + +.secondPara p { + font-size: 2rem; + font-family: "Plus Jakarta Sans", sans-serif; + text-align: center; + letter-spacing: 1px; +} + +.secondPara p span { + color: #f58c49; + font-weight: 500; +} + +.joinRevolution { + background-color: #f58c49; + color: white; + display: flex; + justify-content: center; + padding: 1rem; + align-items: center; + height: fit-content; + gap: 2rem; + margin: 5rem 0; + margin-bottom: 6rem; /* 6rem*/ + flex-wrap: wrap; +} + +.joinRevolution h2 { + margin: 0; + font-size: 2rem; + font-weight: 400; + font-family: "Plus Jakarta Sans", sans-serif; + width: 100%; +} + +.joinRevolution h2 span { + font-weight: 600; +} + +.joinRevolution button { + background-color: white; + padding: 8px 2rem; + color: #f58c49; + font-size: 1.3rem; + font-weight: 600; + border-radius: 10px; + font-family: "Plus Jakarta Sans", sans-serif; +} + +@media (width<750px) { + .head { + height: 40vw; + } + .head .muLogoBg { + width: 55vw; + } + .head .textContainer { + padding-left: 3rem; + } + .textContainer .logoContainer img { + width: 15vw; + } + .logoContainer .ourManifestoText { + font-size: 1.5vw; + padding: 1vw 5vw; + padding-right: 6vw; + } + .head .textContainer h1 { + font-size: 10vw; + } + .head .imgContainer img { + left: -8vw; + width: 38vw; + } + + .firstPara { + padding: 3rem 2rem; + } + .firstPara p { + font-size: 1.8rem; + } + .secondPara { + padding: 0 2.5rem; + } + .secondPara p { + font-size: 1.8rem; + } + .joinRevolution { + gap: 1rem; + flex-wrap: wrap; + } +} + +@media (width<500px) { + .firstPara { + padding: 2.5rem 1.5rem; + } + .firstPara p { + font-size: 1.5rem; + } + .secondPara { + padding: 0 2rem; + } + .secondPara p { + font-size: 1.5rem; + } + .joinRevolution { + margin: 4rem 0; + margin-bottom: 2.5rem; + } + .joinRevolution h2 { + font-size: 1.4rem; + } + .joinRevolution button { + font-size: 1.2rem; + } +} + +@media (width<300px) { + .firstPara { + padding: 2rem 1rem; + } + .firstPara p { + font-size: 1rem; + } + .secondPara { + padding: 0 1.2rem; + } + .secondPara p { + font-size: 1rem; + } + .joinRevolution { + margin: 3rem 0; + margin-bottom: 0rem; + } + .joinRevolution h2 { + font-size: 1rem; + } + .joinRevolution button { + font-size: 1.2rem; + padding: 5px 1rem; + } +} diff --git a/src/Pages/Manifesto/assets/Fonts/Retro Team.otf b/src/Pages/Manifesto/assets/Fonts/Retro Team.otf new file mode 100644 index 000000000..1284a8118 Binary files /dev/null and b/src/Pages/Manifesto/assets/Fonts/Retro Team.otf differ diff --git a/src/Pages/Manifesto/assets/hand.png b/src/Pages/Manifesto/assets/hand.png new file mode 100644 index 000000000..18d0a38c4 Binary files /dev/null and b/src/Pages/Manifesto/assets/hand.png differ diff --git "a/src/Pages/Manifesto/assets/\302\265.png" "b/src/Pages/Manifesto/assets/\302\265.png" new file mode 100644 index 000000000..24aba6fa6 Binary files /dev/null and "b/src/Pages/Manifesto/assets/\302\265.png" differ diff --git "a/src/Pages/Manifesto/assets/\302\265Learn-logo.svg" "b/src/Pages/Manifesto/assets/\302\265Learn-logo.svg" new file mode 100644 index 000000000..5822b7bed --- /dev/null +++ "b/src/Pages/Manifesto/assets/\302\265Learn-logo.svg" @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/Pages/Wadhwani/Wadhwani.jsx b/src/Pages/Wadhwani/Wadhwani.jsx index 6c8955f63..16244366d 100644 --- a/src/Pages/Wadhwani/Wadhwani.jsx +++ b/src/Pages/Wadhwani/Wadhwani.jsx @@ -1,17 +1,18 @@ -import React, { useEffect, useState } from "react"; +import React from "react"; import Card from "@mui/material/Card"; import CardContent from "@mui/material/CardContent"; import Typography from "@mui/material/Typography"; -import { CircularProgress } from "@mui/material"; +// import { CircularProgress } from "@mui/material"; import styles from "./Wadhwani2.module.css"; import styles2 from "./Wadhwani.module.css"; import Navbar from "../../Components/Navbar/Navbar"; import Footer from "../../Components/Footer/Footer"; import leader from "./assets/Leader.gif"; -import { getData } from "./services/api"; +// import { getData } from "./services/api"; +import courseData from "./services/Data.json" import { ThemeProvider, createTheme } from "@mui/material/styles"; const theme = createTheme({ palette: { @@ -22,21 +23,22 @@ const theme = createTheme({ }); const Wadhwani = () => { - const [data, setData] = useState([]); - const [loading, setLoading] = useState(true); + // const [data, setData] = useState([]); + // const [loading, setLoading] = useState(true); - useEffect(() => { - getData(setData,setLoading) - }, []); + // useEffect(() => { + // getData(setData,setLoading) + // getData(setData) + // }, []); - if (loading) { - return ( -
- - Loading... -
- ); - } + // if (loading) { + // return ( + //
+ // + // Loading... + //
+ // ); + // } return ( @@ -63,7 +65,7 @@ const Wadhwani = () => {
- {data.map((item, index) => ( + {courseData.map((item, index) => (
{ - try { - const response = await axios.get( - "https://opensheet.elk.sh/1LEvZozIVVquXjSvtptQcjiU0_WFaxVuEYBCYyCdsCtY/sheet" - ); - setData(response.data); - setLoading(false); - } catch (error) { - console.error("Error fetching data:", error); - setLoading(false); - } -}; +// export const getData = async (setData, setLoading) => { +// try { +// const response = await axios.get( +// "https://opensheet.elk.sh/1LEvZozIVVquXjSvtptQcjiU0_WFaxVuEYBCYyCdsCtY/sheet" +// ); +// setData(response.data); +// setLoading(false); +// } catch (error) { +// console.error("Error fetching data:", error); +// setLoading(false); +// } +// };