Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Old dev #1086

Merged
merged 25 commits into from
Mar 3, 2024
Merged

Old dev #1086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
32aa47b
adjust-letter-spacing
AswinAsok Dec 2, 2023
f222ae5
Merge branch 'old-production' of https://github.com/gtech-mulearn/mul…
AswinAsok Dec 12, 2023
18d5429
fix(home):api-call
AswinAsok Dec 12, 2023
456573f
fix(home):build-issues
AswinAsok Dec 12, 2023
7391e85
fix(mustory):mustory-to-top
AswinAsok Dec 14, 2023
c8a638d
fix(navbar):enablers-added
AswinAsok Dec 17, 2023
a488afb
Merge branch 'old-dev' of https://github.com/gtech-mulearn/mulearn in…
AswinAsok Dec 17, 2023
7e83f49
Merge branch 'old-production' of https://github.com/gtech-mulearn/mul…
AswinAsok Dec 17, 2023
70fb49e
enabler-images
AswinAsok Dec 17, 2023
d71e01e
Merge branch 'old-dev' into old-production
AswinAsok Dec 17, 2023
a957e41
first-view-ready
AswinAsok Feb 18, 2024
6c2f3a8
feat(inital):ui-done
AswinAsok Feb 18, 2024
6cb671c
feat(in50hours):website-made
AswinAsok Feb 19, 2024
f096cae
Merge branch 'old-dev' into old-production
AswinAsok Feb 19, 2024
68b19a7
fix(build):remove-import
AswinAsok Feb 19, 2024
4edee17
fix(build):remove-import
AswinAsok Feb 19, 2024
67bc311
fix(responsive):fixed-viewport
AswinAsok Feb 19, 2024
c479e48
fix-css
AswinAsok Feb 19, 2024
bf9ad55
content-changes
AswinAsok Feb 19, 2024
843df2f
image-fixed
AswinAsok Feb 20, 2024
613f437
feat(apk):app-apk-added
AswinAsok Feb 23, 2024
2d4a4e5
Merge branch 'old-production' of https://github.com/gtech-mulearn/mul…
AswinAsok Feb 23, 2024
3ae0b55
Donation Button Integration
bijomathewjose Mar 3, 2024
7378e8b
Removed unnecessary hooks
bijomathewjose Mar 3, 2024
63cf54c
Merge pull request #1085 from bijomathewjose/old-dev
Jenin82 Mar 3, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Binary file added public/assets/team/enablerhq/Arun J S.webp
Binary file not shown.
Binary file added public/assets/team/enablerhq/Jibin N.webp
Binary file not shown.
Binary file not shown.
Binary file added public/assets/team/enablerhq/Sarju.webp
Binary file not shown.
Binary file added public/assets/team/enablerhq/Sunil K.webp
Binary file not shown.
Binary file added public/mulearn.apk
Binary file not shown.
2 changes: 2 additions & 0 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -94,6 +95,7 @@ function App() {
<Route path="*" element={<NotFound isLoaded={isLoaded} />} />
<Route path="/termsandconditions" element={<TermsAndCondition />} />
<Route path="/privacypolicy" element={<PrivacyPolicy />} />
<Route path="/in50hours" element={<In50Hours />} />
<Route element={<Layout />}>
<Route path="/" element={<Home />} />
<Route path="/blogs" element={<BlogLanding />} />
Expand Down
7 changes: 7 additions & 0 deletions src/Components/Navbar/Mylinks.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@ export const links = [
link: "/team",
foreign: false,
},
{
name: "Enablers",
submenu: false,
sublinks: [],
link: "/enablers",
foreign: false,
},
],
},

Expand Down
1 change: 1 addition & 0 deletions src/Components/TeamCard/TeamCard.css
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ img {
width: 8rem;
height: 8rem;
object-fit: cover;
object-position: top;
}

.team-card__content {
Expand Down
1 change: 1 addition & 0 deletions src/Pages/CampusLogoGen/campusLogoGen.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
80 changes: 37 additions & 43 deletions src/Pages/Home/Home.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
<div className={styles.rightside}>
Expand Down Expand Up @@ -114,6 +99,8 @@ const MuLiveCounter = () => {
};

const Home = () => {
const donationLink = process.env.REACT_APP_DONATION_LINK

return (
<>
<Navbar />
Expand All @@ -136,9 +123,12 @@ const Home = () => {
<a
target="_blank"
rel="noopener noreferrer"
href="https://app.mulearn.org/register"
href={donationLink}
>
<button className={styles.primary}>Join Us</button>
<button className={styles.primary}>Make a Donation ❤️</button>
</a>
<a target="_blank" rel="noopener noreferrer" href="/mulearn.apk">
<button className={styles.secondary}>Download APK</button>
</a>
</div>
</div>
Expand Down Expand Up @@ -323,6 +313,34 @@ const Home = () => {
</div>
</div>

<br />
<div className={styles.joinviewmain_container}>
<div className={styles.joinview_container}>
<div className={styles.join_view}>
<div className={styles.jv_texts}>
<p className={styles.jv_heading}>
The Story of Aami <span>MuStory</span>
</p>
<p className={styles.jv_content}>
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.
</p>
</div>
<div className={styles.mu_story}>
<iframe
src="https://www.youtube.com/embed/M9serw-CLU0?si=rqJ8ZNA4vl8byH07"
title="YouTube video player"
frameborder="0"
allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
allowfullscreen
></iframe>
</div>
</div>
</div>
</div>

<div className={styles.thirdviewmain_container}>
<div className={styles.thirdview_container}>
<div className={styles.third_view}>
Expand Down Expand Up @@ -489,30 +507,6 @@ const Home = () => {
</div>
</div>
</div>
<br />
<div className={styles.joinviewmain_container}>
<div className={styles.joinview_container}>
<div className={styles.join_view}>
<div className={styles.jv_texts}>
<p className={styles.jv_heading}>
The Story of Aami <span>MuStory</span>
</p>
<p className={styles.jv_content}>
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.
</p>
</div>
<div className={styles.mu_story}>
<iframe
src="https://www.youtube.com/embed/M9serw-CLU0?si=rqJ8ZNA4vl8byH07"
title="YouTube video player"
frameborder="0"
allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share"
allowfullscreen
></iframe>
</div>
</div>
</div>
</div>

<div className={styles.chart_view_container}>
<div className={styles.chart_view}>
Expand Down
117 changes: 117 additions & 0 deletions src/Pages/In50Hours/In50Hours.jsx
Original file line number Diff line number Diff line change
@@ -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 (
<>
<Navbar />
<div className={styles.mainContainer}>
<div className={styles.firstSectionContainer}>
<img src={heroImage} alt="" className={styles.fsImage} />
<div className={styles.fsTexts}>
<p className={styles.fsHeading}>
IN<span>50</span>HOURS
</p>
<p className={styles.fsTagline}>
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!
</p>
<p className={styles.supportedBy}>Organized By</p>
<img src={supporters} alt="" className={styles.supporters} />
<a
target="_blank"
rel="noreferrer"
href="https://www.makemypass.com/in50hours"
>
<button className={styles.register}>Register Now</button>
</a>
</div>
</div>

<div className={styles.steps}>
<div className={styles.step}>
<p className={styles.stepHeading}>
P<span>IT</span>CH
</p>
<p className={styles.stepTagline}>
Pitch your boldest ideas and captivate them all in just minutes.{" "}
</p>
</div>
<div className={styles.step}>
<p className={styles.stepHeading}>
PRO<span>TO</span>TYPE
</p>
<p className={styles.stepTagline}>
Dive into the hustle and bustle of collaboration as teams form and
dive headfirst into building their prototypes.
</p>
</div>
<div className={styles.step}>
<p className={styles.stepHeading}>
<span>GET</span> FUNDED
</p>
<p className={styles.stepTagline}>
Pitch your boldest ideas and captivate them all in just minutes.{" "}
</p>
</div>
</div>

<div className={styles.thirdSectionContainer}>
<div className={styles.tsTexts}>
<p className={styles.tsHeading}>
HOW <span>TO</span> JOIN
</p>
<p className={styles.tsTagline}>
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.
</p>
<p className={styles.supportedBy}>Ticketing Partner</p>
<img src={makemyPass} alt="" className={styles.tsImage} />{" "}
</div>
<img src={tsimg} alt="" className={styles.tsSideImage} />
</div>
<div className={styles.steps}>
<div className={styles.step}>
<p className={styles.stepHeading}>
STEP <span>1</span>
</p>
<p className={styles.stepTagline}>
Collect your coupons, got to the to In-50hr-Challenge and type
<strong> /get-in50hours-coupon</strong> to get your coupon code.
</p>
</div>
<div className={styles.step}>
<p className={styles.stepHeading}>
STEP <span>2</span>
</p>
<p className={styles.stepTagline}>
<strong>Go to MakeMyPass.com </strong> and register for the event
using the coupon code. In case you are not in level 5, you can pay
and register.
</p>
</div>
<div className={styles.step}>
<p className={styles.stepHeading}>
STEP <span>3</span>
</p>
<p className={styles.stepTagline}>
You will receive a confirmation mail having the ticket for joining
the event on the 23rd of February.
</p>
</div>
</div>
</div>
<Footer />
</>
);
};

export default In50Hours;
Loading
Loading