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 server #1612

Merged
merged 30 commits into from
Aug 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
6801ab4
fix():Replaced Magazine link in Navbar with new one
Nandana-pradeep33 Jul 23, 2024
5a7e2cb
feat (wadhwani) : added wadhwani course page
karivarkey Jul 25, 2024
b1c44b6
fix():Changed guidline pdf(Art of teaching Guidlines)
Nandana-pradeep33 Jul 26, 2024
c837c3f
Merge pull request #1598 from Nandana-pradeep33/old-dev
viraka Jul 27, 2024
049b160
Merge pull request #1599 from karivarkey/old-dev
viraka Jul 28, 2024
92af23a
fix (API key): Fixed API key reveal in Wadhwani pages
karivarkey Jul 29, 2024
d42aec4
Merge pull request #1602 from karivarkey/old-dev
viraka Jul 29, 2024
e526489
fix(Wadhwani): fixed-api-issue.
viraka Jul 29, 2024
0481bd6
Merge pull request #1601 from gtech-mulearn/old-dev
viraka Jul 29, 2024
4bdd48d
refactor: Update Launchpad links and add iframe for external content
alanfrancis442 Aug 2, 2024
0b954e0
Merge branch 'gtech-mulearn:old-dev' into old-dev
alanfrancis442 Aug 2, 2024
eb79b15
Merge pull request #1604 from alanfrancis442/old-dev
Jenin82 Aug 2, 2024
7042f08
refactor: Remove unused CSS import in Launchpad.jsx
alanfrancis442 Aug 2, 2024
5f727c3
Merge branch 'gtech-mulearn:old-dev' into old-dev
alanfrancis442 Aug 2, 2024
ef9376a
Merge pull request #1606 from alanfrancis442/old-dev
Jenin82 Aug 2, 2024
ff077cd
Merge pull request #1605 from gtech-mulearn/old-dev
Jenin82 Aug 2, 2024
2434bf8
fix(ui):wadhwani styles fix
arjuncvinod Aug 3, 2024
79a57c3
Merge pull request #1607 from arjuncvinod/old-dev
viraka Aug 3, 2024
cd51049
Merge pull request #1608 from gtech-mulearn/old-dev
viraka Aug 3, 2024
2906e11
feat(manifesto):manifesto page added
arjuncvinod Aug 4, 2024
ccc96c3
feat(manifesto):nav link added
arjuncvinod Aug 4, 2024
33797fd
fix: Changed Guidlines pdf and content
Nandana-pradeep33 Jul 31, 2024
c8f9a8d
fix(ArtOfTeaching):Added an introductory vedio of Art Of Teaching 3.0
Nandana-pradeep33 Jul 31, 2024
651769c
fix(ArtOfTeaching):Made changes in content
Nandana-pradeep33 Aug 5, 2024
abafffd
fix(url):youtube footer url updated
arjuncvinod Aug 5, 2024
2ca1f51
fix(wadhwani):page loader removed, sheet api removed and data.json added
arjuncvinod Aug 5, 2024
4c7b96b
Merge branch 'gtech-mulearn:old-dev' into old-dev
arjuncvinod Aug 5, 2024
5defbc5
Merge pull request #1603 from Nandana-pradeep33/old-dev
viraka Aug 7, 2024
e4bfefb
Merge pull request #1609 from arjuncvinod/old-dev
viraka Aug 7, 2024
2f940f8
Merge pull request #1611 from gtech-mulearn/old-dev
viraka Aug 7, 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
4 changes: 4 additions & 0 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import Career from "./Pages/Career/Career";
import LeaderBoard from "./Pages/LeaderBoard/leaderBoard";
import WikiSyllabus from "./Pages/WikiSyllabus/WikiSyllabus";
import HacktoberFest from "./Pages/Events/HacktoberFest/HacktoberFest";
import Wadhwani from "./Pages/Wadhwani/Wadhwani";
// import Yip from "./Pages/YIP/Yip";
import CampusChapters from "./Pages/CampusChapters/CampusChapters";
import BlogLanding from "./Pages/CampusChapters/Blogs/BlogLanding";
Expand Down Expand Up @@ -52,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);
Expand Down Expand Up @@ -122,6 +124,8 @@ function App() {
<Route path="events/learningfest" element={<KKEMLearningFest />} />
<Route path="/keralatechfest" element={<KKEMLearningFest />} />
<Route path="/maveliportfolio" element={<MaveliPortfolio />} />
<Route path="/wadhwani" element={<Wadhwani />} />
<Route path="/manifesto" element={<Manifesto />} />

<Route path="/team">
<Route path="" element={<Teams />} />
Expand Down
2 changes: 1 addition & 1 deletion src/Components/Footer/Footer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ const Footer = () => {
</a>

<a
href="https://www.youtube-nocookie.com/c/mulearn"
href="https://www.youtube.com/c/mulearn"
target="_blank"
rel="noopener noreferrer"
>
Expand Down
22 changes: 13 additions & 9 deletions src/Components/Navbar/Mylinks.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@ export const links = [
link: "/enablers",
foreign: false,
},
{
name: "Manifesto",
submenu: false,
sublinks: [],
link: "/manifesto",
foreign: false,
},
],
},

Expand Down Expand Up @@ -122,7 +129,7 @@ export const links = [
name: "Magazine",
submenu: false,
sublinks: [],
link: "https://online.fliphtml5.com/blxtf/bicl/#p=1",
link: "https://online.fliphtml5.com/slydm/hrgi/",
foreign: true,
},
{
Expand All @@ -138,10 +145,8 @@ export const links = [
sublinks: [],
link: "https://online.fliphtml5.com/slydm/yljq/#p=1",
foreign: false,
}
},
],


},
],
},
Expand Down Expand Up @@ -191,7 +196,7 @@ export const links = [
foreign: true,
},
{
name: "IEEE Launchpad",
name: "Launchpad",
submenu: false,
sublinks: [],
link: "/launchpad",
Expand All @@ -203,8 +208,7 @@ export const links = [
sublinks: [],
link: "/in50hours",
foreign: false,
}

},
],
},
{
Expand Down Expand Up @@ -575,7 +579,7 @@ export const links = [
submenu: false,
sublinks: [],
foreign: true,
}
},
],
},
{
Expand All @@ -589,7 +593,7 @@ export const links = [
submenu: false,
sublinks: [],
foreign: false,
}
},
],
},
],
Expand Down
77 changes: 42 additions & 35 deletions src/Pages/ArtOfTeaching/ArtOfTeaching.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down Expand Up @@ -73,7 +73,9 @@ const ArtOfTeaching = () => {

};




const data = {
title: "Frequently Asked Questions",
rows: [
Expand Down Expand Up @@ -202,43 +204,15 @@ const ArtOfTeaching = () => {

<div className={styles.cards_container_desktop}>
<Swiper
// pagination={true}
// navigation={true}
// modules={[Pagination, Navigation]}

className="aswiper"
>
<SwiperSlide>

{/* <div className={styles.topic_card_android}>
<div className={styles.topic_card}>
<p className={styles.card_heading}>
<span>Android Development with Kotlin</span> by Google.
</p>
<p className={styles.card_description}>
If you choose Android Development as the content you
would have to learn the Android Development with Kotlin
and have to create a 3 minute video summary of the
course.
</p>
<a
href="https://developer.android.com/courses/android-basics-compose/course"
target="_blank"
rel="noopener noreferrer"
>
<button
style={{ fontSize: "1rem" }}
className={styles.detailsbtn}
type="submit"
>
View Course
</button>
</a>
</div>
</div>*/}

<div className={styles.topic_card_android}>
<p className={styles.card_heading}>
<span> Guidlines</span>
<span>Guidelines</span>
</p>
<div style={timelineStyle}>
<div>
Expand All @@ -247,7 +221,7 @@ const ArtOfTeaching = () => {
<div className=" pl-4" style={timelineItemStyle}>
<div className=" pl-4" style={circleStyle}></div>
<div className=" ml-4" style={lineStyle}></div>
<div style={contentStyle} ><p style={{fontSize:'17px'}}>Task 1 - Self introduction with welcome ticket.</p></div>
<div style={contentStyle} ><p style={{fontSize:'17px'}}>Task 1 - Self introduction.</p></div>
</div>
<div className=" pl-4" style={timelineItemStyle}>
<div className=" pl-4" style={circleStyle}></div>
Expand All @@ -260,7 +234,7 @@ const ArtOfTeaching = () => {
<div className=" pl-4"style={timelineItemStyle}>
<div className=" pl-4"style={circleStyle}></div>
<div className="ml-4" style={lineStyle}></div>
<div style={contentStyle}><p style={{fontSize:'17px'}}>Task 1 - Detailed document submission of the designed course curriculam.</p></div>
<div style={contentStyle}><p style={{fontSize:'17px'}}>Task 1 - Detailed document submission of the designed course curriculum.</p></div>

</div>
<div className="mt-2">
Expand All @@ -273,11 +247,12 @@ const ArtOfTeaching = () => {
</div>
</div>
</SwiperSlide>


</Swiper>
</div>



<div className={styles.cards_container_mobile} style={{marginTop:'45px',marginBottom:'30px'}}>
<div className={styles.topic_card_android} style={{marginTop:'45px',marginBottom:'30px'}}>
<p className={styles.card_heading}>
Expand Down Expand Up @@ -318,12 +293,44 @@ const ArtOfTeaching = () => {
</div>
</div>
</div>

<div className={`w-full max-w-md lg:max-w-2xl`}>
<iframe
className={styles.yt_video}
src="https://www.youtube.com/embed/r5izRx-4j68?si=L9gHSznyZTeCI3b3"
title="YouTube video player"
frameborder="0"
allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
allowfullscreen
loading="lazy"
></iframe>
</div>

</div>
</div>
</div>


<div className="hidden lg:flex items-center justify-center lg:h-[500px] lg:mb-4">
<div className="w-full max-w-md lg:max-w-3xl xl:max-w-4xl 2xl:max-w-5xl">
<iframe

className="flex items-center justify-center mx-auto lg:w-[750px] h-56 lg:h-70 xl:h-96 rounded-lg"
src="https://www.youtube.com/embed/r5izRx-4j68?si=L9gHSznyZTeCI3b3"
title="YouTube video player"
frameborder="0"

allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
allowFullScreen
loading="lazy"
></iframe>
</div>
</div>






<div className={styles.fourth_view_container}>
<div className={styles.fourth_view}>
<div className={styles.left_side}>
Expand Down
Binary file not shown.
29 changes: 15 additions & 14 deletions src/Pages/Launchpad/Launchpad.jsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import React from "react";
import Navbar from "../../Components/Navbar/Navbar";
import Footer from "../../Components/Footer/Footer";
import styles from "./Launchpad.module.css";
// import styles from "./Launchpad.module.css";
import "./steps.css";
const Launchpad = () => {
return (
<>
<Navbar />
<div className={styles.main_container}>
{/*<div className={styles.main_container}>
<div className={styles.first_view_container}>
<div className={styles.first_view}>
<div className={styles.fv_texts}>
Expand All @@ -18,8 +18,7 @@ const Launchpad = () => {
The IEEE LAUNCHPAD Job Fair is an opportunity to secure your
spotlight and connect with potential employers through karma
points!{" "}
{/* <br />
<br /> */}

This event is designed to facilitate meaningful interactions
between talented individuals like yourself and companies seeking
top-tier talent.
Expand Down Expand Up @@ -48,15 +47,7 @@ const Launchpad = () => {
<div className="ktimeline__event__content">
<div className="ktimeline__event__title">Step One</div>
<div className="ktimeline__event__description">
{/* Register{" "}
<a
href="https://forms.gle/C5e6XHhVGkV3axQS8"
target="_blank"
rel="noopener noreferrer"
>
here
</a>
{" "}and */}

Get ready for the adventure! Once you receive your
confirmation email, we're set to chart a course to your
future!
Expand Down Expand Up @@ -179,7 +170,17 @@ const Launchpad = () => {
</div>
</div>
</div>
</div>
</div>*/}

<iframe
title="launchpad leaderboard"
style={{
height: "100vh",
width: "100%",
}}
src="https://mu-3.vercel.app/launchpad"
frameborder="0"
></iframe>
<Footer />
</>
);
Expand Down
61 changes: 61 additions & 0 deletions src/Pages/Manifesto/Manifesto.jsx
Original file line number Diff line number Diff line change
@@ -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 (
<>
<Navbar />
<div className={styles.main}>
<div className={styles.head}>
<img src={muLogoBg} alt="" className={styles.muLogoBg} />
<div className={styles.textContainer}>
<div className={styles.logoContainer}>
<img src={muLogo} alt="" />
<div className={styles.ourManifestoText}>Our Manifesto</div>
</div>
<h1>We,The Unbound, The Unbowed</h1>
</div>
<div className={styles.imgContainer}>
<img src={handImg} alt="" />
</div>
</div>
<div className={styles.firstPara}>
<p>
<span>We, the Unbound, the Unbowed</span>, a tribe of relentless
learners, rise from the ashes of a broken education system.{" "}
<span>
We are the mavericks who dared to question the status quo
</span>
, 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,{" "}
<span>our creativity stifled</span> by the stale{" "}
<span>air of conformity. Not anymore!</span>
</p>
</div>
<div className={styles.secondPara}>
<p>
<span> µLearn is our revolution.</span> Here, curiosity{" "}
<span>reigns</span>, and collaboration is our weapon. We{" "}
<span>transform</span> failures into stepping stones, and together
we <span>redefine</span> learning.
</p>
</div>
<div className={styles.joinRevolution}>
<h2>
Welcome to the <span>µLearn.</span>Welcome to the{" "}
<span>Revolution.</span>
</h2>{" "}
<a href="https://app.mulearn.org" target="_blank" rel="noreferrer">
<button>Join µLearn</button>
</a>
</div>
</div>
<Footer />
</>
);
}
Loading
Loading