diff --git a/package-lock.json b/package-lock.json index 50289e1b0..3f8506755 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,6 @@ "@testing-library/user-event": "^13.5.0", "axios": "^1.3.4", "crypto-js": "^4.1.1", - "flowbite": "^1.5.3", "flowbite-react": "^0.2.0", "gh-avatar": "^3.0.0", "html-to-image": "^1.11.11", @@ -9251,6 +9250,7 @@ "version": "1.8.1", "resolved": "https://registry.npmjs.org/flowbite/-/flowbite-1.8.1.tgz", "integrity": "sha512-lXTcO8a6dRTPFpINyOLcATCN/pK1Of/jY4PryklPllAiqH64tSDUsOdQpar3TO59ZXWwugm2e92oaqwH6X90Xg==", + "peer": true, "dependencies": { "@popperjs/core": "^2.9.3", "mini-svg-data-uri": "^1.4.3" @@ -13397,6 +13397,7 @@ "version": "1.4.4", "resolved": "https://registry.npmjs.org/mini-svg-data-uri/-/mini-svg-data-uri-1.4.4.tgz", "integrity": "sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg==", + "peer": true, "bin": { "mini-svg-data-uri": "cli.js" } diff --git a/package.json b/package.json index 3c5f98d93..78c5ce7d6 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,6 @@ "@testing-library/user-event": "^13.5.0", "axios": "^1.3.4", "crypto-js": "^4.1.1", - "flowbite": "^1.5.3", "flowbite-react": "^0.2.0", "gh-avatar": "^3.0.0", "html-to-image": "^1.11.11", diff --git a/public/assets/team/enablerhq/Arun J S.webp b/public/assets/team/enablerhq/Arun J S.webp new file mode 100644 index 000000000..06d274152 Binary files /dev/null and b/public/assets/team/enablerhq/Arun J S.webp differ diff --git a/public/assets/team/enablerhq/Jibin N.webp b/public/assets/team/enablerhq/Jibin N.webp new file mode 100644 index 000000000..d5b796ad4 Binary files /dev/null and b/public/assets/team/enablerhq/Jibin N.webp differ diff --git a/public/assets/team/enablerhq/Mohamed Ziyad TA.webp b/public/assets/team/enablerhq/Mohamed Ziyad TA.webp new file mode 100644 index 000000000..150af3523 Binary files /dev/null and b/public/assets/team/enablerhq/Mohamed Ziyad TA.webp differ diff --git a/public/assets/team/enablerhq/Sarju.webp b/public/assets/team/enablerhq/Sarju.webp new file mode 100644 index 000000000..3bbda85d4 Binary files /dev/null and b/public/assets/team/enablerhq/Sarju.webp differ diff --git a/public/assets/team/enablerhq/Sunil K.webp b/public/assets/team/enablerhq/Sunil K.webp new file mode 100644 index 000000000..4427e00f4 Binary files /dev/null and b/public/assets/team/enablerhq/Sunil K.webp differ diff --git a/public/mulearn.apk b/public/mulearn.apk new file mode 100644 index 000000000..c4de2c621 Binary files /dev/null and b/public/mulearn.apk differ diff --git a/src/App.js b/src/App.js index 88ba7297f..dbb38f8f6 100644 --- a/src/App.js +++ b/src/App.js @@ -51,6 +51,7 @@ import Spiderman from "./Pages/CapTF/Spiderman"; import Submission from "./Pages/CapTF/Submission"; import Pathway from "./Pages/Pathway/Pathway"; import EnablersPage from "./Pages/EnablersPage/EnablersPage"; +import In50Hours from "./Pages/In50Hours/In50Hours"; function App() { const [redirects, setRedirects] = useState([]); const [isLoaded, setIsLoaded] = useState(false); @@ -94,6 +95,7 @@ function App() { } /> } /> } /> + } /> }> } /> } /> diff --git a/src/Components/Navbar/Mylinks.jsx b/src/Components/Navbar/Mylinks.jsx index 837d6161f..b2cbaa1f6 100644 --- a/src/Components/Navbar/Mylinks.jsx +++ b/src/Components/Navbar/Mylinks.jsx @@ -16,6 +16,13 @@ export const links = [ link: "/team", foreign: false, }, + { + name: "Enablers", + submenu: false, + sublinks: [], + link: "/enablers", + foreign: false, + }, ], }, diff --git a/src/Components/TeamCard/TeamCard.css b/src/Components/TeamCard/TeamCard.css index 503cc16cf..72d5a7111 100644 --- a/src/Components/TeamCard/TeamCard.css +++ b/src/Components/TeamCard/TeamCard.css @@ -23,6 +23,7 @@ img { width: 8rem; height: 8rem; object-fit: cover; + object-position: top; } .team-card__content { diff --git a/src/Pages/CampusLogoGen/campusLogoGen.module.css b/src/Pages/CampusLogoGen/campusLogoGen.module.css index d55871810..30af31b78 100644 --- a/src/Pages/CampusLogoGen/campusLogoGen.module.css +++ b/src/Pages/CampusLogoGen/campusLogoGen.module.css @@ -7,6 +7,7 @@ bottom: calc(6.3rem - 10px); font-family: "Plus Jakarta Sans", sans-serif; font-size: 1.7rem; + letter-spacing: 0.25px; } .campusCodeYip { diff --git a/src/Pages/Home/Home.jsx b/src/Pages/Home/Home.jsx index 3e70006a5..a951ef262 100644 --- a/src/Pages/Home/Home.jsx +++ b/src/Pages/Home/Home.jsx @@ -29,30 +29,15 @@ const MuLiveCounter = () => { "wss://mulearn.org/ws/v1/public/landing-stats/" ); - socket.addEventListener("open", (event) => console.log("connected")); - socket.addEventListener("message", (event) => { setCounts(JSON.parse(event.data)); + console.log("Message from server ", event.data); }); socket.addEventListener("error", (event) => { console.error("WebSocket error: ", event); }); - - return () => { - socket.close(); - if (!counts) { - fetch("https://mulearn.org/api/v1/get-log/global-count/") - .then((response) => response.json()) - .then((data) => { - setCounts(data.response); - }) - .catch((error) => { - console.error("Error:", error); - }); - } - }; - }, [counts]); + }, []); return (
@@ -114,6 +99,8 @@ const MuLiveCounter = () => { }; const Home = () => { + const donationLink = process.env.REACT_APP_DONATION_LINK + return ( <> @@ -136,9 +123,12 @@ const Home = () => { - + + + +
@@ -323,6 +313,34 @@ const Home = () => { +
+
+
+
+
+

+ The Story of Aami MuStory +

+

+ Meet Aami, an eager learner hungry for growth! Join her voyage + through the captivating µVerse, where she seizes opportunities, + builds learning circles, and immerses herself in events, + emerging industry-ready with newfound skills and confidence. +

+
+
+ +
+
+
+
+
@@ -489,30 +507,6 @@ const Home = () => {
-
-
-
-
-
-

- The Story of Aami MuStory -

-

- Meet Aami, an eager learner hungry for growth! Join her voyage through the captivating µVerse, where she seizes opportunities, builds learning circles, and immerses herself in events, emerging industry-ready with newfound skills and confidence. -

-
-
- -
-
-
-
diff --git a/src/Pages/In50Hours/In50Hours.jsx b/src/Pages/In50Hours/In50Hours.jsx new file mode 100644 index 000000000..6170d8b16 --- /dev/null +++ b/src/Pages/In50Hours/In50Hours.jsx @@ -0,0 +1,117 @@ +import React from "react"; +import Navbar from "../../Components/Navbar/Navbar"; +import styles from "./In50Hours.module.css"; +import Footer from "../../Components/Footer/Footer"; +import heroImage from "./heroimg.png"; +import supporters from "./supporters.png"; +import makemyPass from "./makemypass.png"; +import tsimg from "./tsimg.png"; + +const In50Hours = () => { + return ( + <> + +
+
+ +
+

+ IN50HOURS +

+

+ Get ready to hack your way to success in just 50 hours at In50Hr! + Dive into a whirlwind of innovation, collaboration, and + caffeine-fueled brilliance! +

+

Organized By

+ + + + +
+
+ +
+
+

+ PITCH +

+

+ Pitch your boldest ideas and captivate them all in just minutes.{" "} +

+
+
+

+ PROTOTYPE +

+

+ Dive into the hustle and bustle of collaboration as teams form and + dive headfirst into building their prototypes. +

+
+
+

+ GET FUNDED +

+

+ Pitch your boldest ideas and captivate them all in just minutes.{" "} +

+
+
+ +
+
+

+ HOW TO JOIN +

+

+ If you are already into the level 5, you can participate in the + event completely free of cost. If you are not, you can still + participate by paying a nominal fee of INR 1000. +

+

Ticketing Partner

+ {" "} +
+ +
+
+
+

+ STEP 1 +

+

+ Collect your coupons, got to the to In-50hr-Challenge and type + /get-in50hours-coupon to get your coupon code. +

+
+
+

+ STEP 2 +

+

+ Go to MakeMyPass.com and register for the event + using the coupon code. In case you are not in level 5, you can pay + and register. +

+
+
+

+ STEP 3 +

+

+ You will receive a confirmation mail having the ticket for joining + the event on the 23rd of February. +

+
+
+
+
+ + ); +}; + +export default In50Hours; diff --git a/src/Pages/In50Hours/In50Hours.module.css b/src/Pages/In50Hours/In50Hours.module.css new file mode 100644 index 000000000..f5b58b3ec --- /dev/null +++ b/src/Pages/In50Hours/In50Hours.module.css @@ -0,0 +1,221 @@ +.fsImage { + max-width: 45rem; + width: 100%; + object-fit: cover; +} + +.mainContainer { + display: flex; + flex-direction: column; + justify-content: space-between; + align-items: center; +} + +.firstSectionContainer { + display: flex; + flex-direction: row-reverse; + flex-wrap: wrap; + align-items: center; + justify-content: space-between; + padding: 1rem; + color: #414d59; + max-width: 1300px; + width: 100%; +} + +.fsHeading { + font-size: 4.5rem; + font-weight: 600; + text-align: left; + font-family: "Poppins", sans-serif; +} + +.fsHeading span { + color: #0098ca; +} + +.fsTagline { + font-size: 1rem; + font-weight: 400; + text-align: left; + font-family: "Poppins", sans-serif; + margin-top: -1rem; + max-width: 30rem; +} + +.supporters { + width: 18rem; +} + +.supportedBy { + font-size: 1.05rem; + font-weight: 600; + text-align: left; + font-family: "Poppins", sans-serif; + margin-top: 1rem; + margin-bottom: 0.5rem; +} + +.steps { + display: flex; + flex-direction: row; + align-items: flex-start; + justify-content: space-between; + color: #414d59; + max-width: 1300px; + width: 100%; + margin: auto; + flex-wrap: wrap; +} + +.step { + width: 20rem; + margin: 1rem; + margin-top: 0; +} + +.stepHeading { + font-size: 1.5rem; + font-weight: 600; + text-align: left; + font-family: "Poppins", sans-serif; + margin-top: 1rem; +} + +.stepHeading span { + color: #0098ca; +} + +.stepTagline { + font-size: 1rem; + font-weight: 400; + text-align: left; + font-family: "Poppins", sans-serif; + margin-top: 0.5rem; + margin-bottom: 1rem; +} + +.tsHeading { + font-size: 3.25rem; + font-weight: 700; + text-align: left; + font-family: "Poppins", sans-serif; +} + +.tsHeading span { + color: #0098ca; +} + +.tsTagline { + font-size: 1rem; + font-weight: 400; + text-align: left; + font-family: "Poppins", sans-serif; + margin-bottom: 1rem; + max-width: 30rem; +} + +.thirdSectionContainer { + max-width: 1300px; + width: 100%; + display: flex; + flex-direction: row; + flex-wrap: wrap; + align-items: center; + justify-content: space-between; + padding: 1rem; + color: #414d59; + margin: auto; +} + +.register { + background-color: #0098ca; + color: #ffffff; + margin-top: 1rem; + padding: 0.5rem 1.5rem; + border-radius: 0.5rem; +} + +.tsImage { + width: 8rem; +} + +@media (max-width: 1240px) { + .firstSectionContainer { + flex-direction: column; + align-items: flex-start; + } + .fsImage { + max-width: 30rem; + } + + .fsHeading { + font-size: 3.75rem; + } + + .fsTagline { + font-size: 0.875rem; + } + + .stepHeading { + font-size: 1.25rem; + } + + .stepTagline { + font-size: 0.875rem; + } +} + +@media (max-width: 728px) { + .fsImage { + width: 20rem; + } + + .tsImage { + width: 5rem; + } + + .fsHeading { + font-size: 3rem; + } + + .fsTagline { + font-size: 0.875rem; + margin-top: 1rem; + } + + .firstSectionContainer { + flex-direction: column; + align-items: flex-start; + } + + .steps { + justify-content: flex-start; + } + + .stepHeading { + font-size: 1.25rem; + } + + .stepTagline { + font-size: 0.875rem; + } + + .tsHeading { + font-size: 2.25rem; + } + + .tsTagline { + font-size: 0.875rem; + } +} + +.tsSideImage { + width: 30rem; +} + +@media (max-width: 728px) { + .tsSideImage { + width: 20rem; + } +} diff --git a/src/Pages/In50Hours/heroimg.png b/src/Pages/In50Hours/heroimg.png new file mode 100644 index 000000000..e552b577c Binary files /dev/null and b/src/Pages/In50Hours/heroimg.png differ diff --git a/src/Pages/In50Hours/makemypass.png b/src/Pages/In50Hours/makemypass.png new file mode 100644 index 000000000..c185d7437 Binary files /dev/null and b/src/Pages/In50Hours/makemypass.png differ diff --git a/src/Pages/In50Hours/supporters.png b/src/Pages/In50Hours/supporters.png new file mode 100644 index 000000000..6a48b4357 Binary files /dev/null and b/src/Pages/In50Hours/supporters.png differ diff --git a/src/Pages/In50Hours/tsimg.png b/src/Pages/In50Hours/tsimg.png new file mode 100644 index 000000000..9073d701b Binary files /dev/null and b/src/Pages/In50Hours/tsimg.png differ diff --git a/src/Pages/Teams/2023/enablerhq.json b/src/Pages/Teams/2023/enablerhq.json new file mode 100644 index 000000000..8f3090c2c --- /dev/null +++ b/src/Pages/Teams/2023/enablerhq.json @@ -0,0 +1,27 @@ +[ + { + "name": "Sarju S", + "position": "Enablers HQ", + "image": "assets/team/enablerhq/Sarju.webp" + }, + { + "name": "Arun J S", + "position": "Enablers HQ", + "image": "assets/team/enablerhq/Arun J S.webp" + }, + { + "name": "Jibin N", + "position": "Enablers HQ", + "image": "assets/team/enablerhq/Jibin N.webp" + }, + { + "name": "Mohamed Ziyad TA", + "position": "Enablers HQ", + "image": "assets/team/enablerhq/Mohamed Ziyad TA.webp" + }, + { + "name": "Sunil K", + "position": "Enablers HQ", + "image": "assets/team/enablerhq/Sunil K.webp" + } +] diff --git a/src/Pages/Teams/Teams.jsx b/src/Pages/Teams/Teams.jsx index ef38ab936..cb9ccf7f9 100644 --- a/src/Pages/Teams/Teams.jsx +++ b/src/Pages/Teams/Teams.jsx @@ -21,6 +21,7 @@ const Teams = () => { let mulearnhq = require("./2023/mulearnhq.json"); let communityteam = require("./2023/communityteam.json"); let associates = require("./2023/associates.json"); + let enablerhq = require("./2023/enablerhq.json"); const handleFilterChange = (e) => { setTeamfilter(e.target.value); @@ -66,6 +67,7 @@ const Teams = () => { + @@ -146,6 +148,24 @@ const Teams = () => { )} + {(teamName === "all" || teamName === "enablerhq") && ( +
+

Enablers HQ

+

+
+ {enablerhq.map((member) => { + return ( + + ); + })} +
+
+ )} + {(teamName === "all" || teamName === "mulearnpillar3") && (

µLearn Pillars Q3

@@ -176,7 +196,7 @@ const Teams = () => {
)} - {(teamName === "mulearnpillar1") && ( + {teamName === "mulearnpillar1" && (

µLearn Pillars Q1