Merge branch 'old-production' of https://github.com/gtech-mulearn/mul…

…earn into old-production
gtech-mulearn · Jun 8, 2024 · 43c772a · 43c772a
2 parents 635e7e9 + 97c5f6f
commit 43c772a
Show file tree

Hide file tree

Showing 36 changed files with 7,617 additions and 2,824 deletions.
diff --git a/.babelrc b/.babelrc
@@ -0,0 +1,4 @@
+{
+    "plugins": ["@babel/plugin-proposal-private-property-in-object"]
+  }
+
diff --git a/.eslintrc b/.eslintrc
@@ -0,0 +1,14 @@
+{
+    "parser": "@babel/eslint-parser",
+    "parserOptions": {
+      "requireConfigFile": false,
+      "babelOptions": {
+        "plugins": ["@babel/plugin-proposal-private-property-in-object"]
+      }
+    },
+    "extends": [
+      "react-app",
+      "react-app/jest"
+    ]
+  }
+
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -54,6 +54,9 @@
     ]
   },
   "devDependencies": {
+    "@babel/core": "^7.24.5",
+    "@babel/eslint-parser": "^7.24.5",
+    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "autoprefixer": "^10.4.12",
     "postcss": "^8.4.17",
     "sass": "^1.55.0",

diff --git a/src/App.js b/src/App.js
@@ -44,7 +44,7 @@ import Journey from "./Pages/UserJourney/Journey";
 import MutechLeaderboard from "./Pages/MutechLeaderBoard/MutechLeaderBoard";
 import CodeStorm from "./Pages/Events/GTA/CodeStorm/CodeStorm";
 import KKEMLearningFest from "./Pages/KKEMLearningFest/KKEMLearningFest";
-
+import Launchpad from "./Pages/Launchpad/Launchpad";
 import MaveliPortfolio from "./Pages/Events/MaveliPortfolio/MaveliPortfolio";
 import Level1 from "./Pages/CapTF/Level1";
 import Spiderman from "./Pages/CapTF/Spiderman";
@@ -96,6 +96,7 @@ function App() {
           <Route path="/termsandconditions" element={<TermsAndCondition />} />
           <Route path="/privacypolicy" element={<PrivacyPolicy />} />
           <Route path="/in50hours" element={<In50Hours />} />
+          <Route path="/pathway" element={<Pathway />} />
           <Route element={<Layout />}>
             <Route path="/" element={<Home />} />
             <Route path="/blogs" element={<BlogLanding />} />
@@ -147,13 +148,14 @@ function App() {
             />
             <Route path="/yipredirect" element={<YipForm />} />
             <Route path="/journey" element={<Journey />} />
-            <Route path="/pathway" element={<Pathway />} />
+
             <Route path="/enablers" element={<EnablersPage />} />
           </Route>
 
           <Route path="/level1" element={<Level1 />} />
           <Route path="/spiderman" element={<Spiderman />} />
           <Route path="/submission" element={<Submission />} />
+          <Route path="/launchpad" element={<Launchpad />} />
         </Routes>
       </Router>
     </div>

diff --git a/src/Components/Footer/Footer.jsx b/src/Components/Footer/Footer.jsx
@@ -22,7 +22,7 @@ const Footer = () => {
             />
 
             <div className={styles.links}>
-              <a href="/careers">
+              <a href="https://mulearn.org/careers">
                 <p className={styles.link}>Career Labs</p>
               </a>
               <a href="https://gtechmulearn.medium.com/">
@@ -48,7 +48,7 @@ const Footer = () => {
 
           <div className={styles.fs_rightside}>
             <a
-              href="http://mulearn.org/whatsapp-community"
+              href="https://mulearn.org/r/whatsapp-community"
               target="_blank"
               rel="noopener noreferrer"
             >
@@ -70,7 +70,7 @@ const Footer = () => {
               />
             </a>
             <a
-              href="http://www.instagram.com/gtechmulearn/"
+              href="https://www.instagram.com/mulearn.official/"
               target="_blank"
               rel="noopener noreferrer"
             >
@@ -93,7 +93,7 @@ const Footer = () => {
             </a>
 
             <a
-              href="https://www.youtube.com/c/mulearn"
+              href="https://www.youtube-nocookie.com/c/mulearn"
               target="_blank"
               rel="noopener noreferrer"
             >

diff --git a/src/Components/Navbar/Desktop.jsx b/src/Components/Navbar/Desktop.jsx
@@ -42,13 +42,13 @@ export const Resources = ({ notificationOpen }) => {
         </button>
       </a>
       <a
-        href="https://online.fliphtml5.com/slydm/hrgi/#p=1"
+        href="https://app.mulearn.org/donation"
         target="_blank"
         rel="noopener noreferrer"
         className="py-7 px-3 inline-block"
       >
         <button className="border-2 border-muorange text-muorange px-6 py-2 rounded-md">
-          μBook
+         Donate
         </button>
       </a>
     </div>

diff --git a/src/Components/Navbar/Mobile.jsx b/src/Components/Navbar/Mobile.jsx
@@ -85,17 +85,17 @@ export const MobileMenu = ({
           className="py-3 px-28 "
         >
           <button className="bg-orange-400 text-white  px-6 py-2 rounded-md ">
-            Join Discord
+            Join µLearn
           </button>
         </a>
         <a
-          href="http://mulearn.org/r/magazine"
+          href="https://app.mulearn.org/donation"
           target="_blank"
           rel="noopener noreferrer"
           className="py-3 px-3 inline-block"
         >
           <button className="border-2 border-orange-400 text-orange-400 px-6 py-2 rounded-md">
-            Magazine
+            Donate
           </button>
         </a>
       </div>

diff --git a/src/Components/Navbar/Mylinks.jsx b/src/Components/Navbar/Mylinks.jsx
@@ -114,6 +114,35 @@ export const links = [
           },
         ],
       },
+      {
+        name: "Others",
+        submenu: true,
+        sublinks: [
+          {
+            name: "Magazine",
+            submenu: false,
+            sublinks: [],
+            link: "https://online.fliphtml5.com/blxtf/bicl/#p=1",
+            foreign: true,
+          },
+          {
+            name: "Download Apk",
+            submenu: false,
+            sublinks: [],
+            link: "/mulearn.apk",
+            foreign: false,
+          },
+          {
+            name: "µNewsletter",
+            submenu: false,
+            sublinks: [],
+            link: "https://online.fliphtml5.com/slydm/yljq/#p=1",
+            foreign: false,
+          }
+        ],
+
+
+      },
     ],
   },
   {
@@ -154,6 +183,28 @@ export const links = [
             link: "/events/gta/codestorm",
             foreign: false,
           },
+          {
+            name: "Top100 Coders",
+            submenu: false,
+            sublinks: [],
+            link: "https://top100coders.com/",
+            foreign: true,
+          },
+          {
+            name: "IEEE Launchpad",
+            submenu: false,
+            sublinks: [],
+            link: "/launchpad",
+            foreign: false,
+          },
+          {
+            name: "in50hours",
+            submenu: false,
+            sublinks: [],
+            link: "/in50hours",
+            foreign: false,
+          }
+
         ],
       },
       {

diff --git a/src/Components/Testimonials/Card.jsx b/src/Components/Testimonials/Card.jsx
@@ -12,6 +12,7 @@ const Card = ({ person }) => {
           frameborder="0"
           allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
           allowfullscreen
+          loading="lazy"
         ></iframe>
       </div>
     </>

diff --git a/src/Components/Testimonials/testimonials-data.json b/src/Components/Testimonials/testimonials-data.json
@@ -1,42 +1,42 @@
 [
-    {
-        "name": "Dr Saji Gopinath",
-        "video": "https://www.youtube.com/embed/LgDKzzz8xp4"
-    },
-    {
-        "name": "Dr Pv Unnikrishnan",
-        "video": "https://www.youtube.com/embed/Rn2v9mkar4Q"
-    },
-    {
-        "name": "K. N. Balagopal",
-        "video": "https://www.youtube.com/embed/XoybSPRL3pw"
-    },
-    {
-        "name": "Anoop P Ambika",
-        "video": "https://www.youtube.com/embed/UcAM0_Kgbn0"
-    },
-    {
-        "name": "Dr P. K. Biju",
-        "video": "https://www.youtube.com/embed/tvmqUINECCI"
-    },
-    {
-        "name": "Dr RAJASREE M S",
-        "video": "https://www.youtube.com/embed/Kx2lRDjzMMk"
-    },
-    {
-        "name": "Google",
-        "video": "https://www.youtube.com/embed/b7u86JWH6ww"
-    },
-    {
-        "name": "Rajeev",
-        "video": "https://www.youtube.com/embed/duM15-tOwFo"
-    },
-    {
-        "name": "Sangeetha ",
-        "video": "https://www.youtube.com/embed/SyxOSPx4b5o"
-    },
-    {
-        "name": "Joy sebastian",
-        "video": "https://www.youtube.com/embed/X79zbLQufl0"
-    }
-]
+  {
+    "name": "Dr Saji Gopinath",
+    "video": "https://www.youtube-nocookie.com/embed/LgDKzzz8xp4"
+  },
+  {
+    "name": "Dr Pv Unnikrishnan",
+    "video": "https://www.youtube-nocookie.com/embed/Rn2v9mkar4Q"
+  },
+  {
+    "name": "K. N. Balagopal",
+    "video": "https://www.youtube-nocookie.com/embed/XoybSPRL3pw"
+  },
+  {
+    "name": "Anoop P Ambika",
+    "video": "https://www.youtube-nocookie.com/embed/UcAM0_Kgbn0"
+  },
+  {
+    "name": "Dr P. K. Biju",
+    "video": "https://www.youtube-nocookie.com/embed/tvmqUINECCI"
+  },
+  {
+    "name": "Dr RAJASREE M S",
+    "video": "https://www.youtube-nocookie.com/embed/Kx2lRDjzMMk"
+  },
+  {
+    "name": "Google",
+    "video": "https://www.youtube-nocookie.com/embed/b7u86JWH6ww"
+  },
+  {
+    "name": "Rajeev",
+    "video": "https://www.youtube-nocookie.com/embed/duM15-tOwFo"
+  },
+  {
+    "name": "Sangeetha ",
+    "video": "https://www.youtube-nocookie.com/embed/SyxOSPx4b5o"
+  },
+  {
+    "name": "Joy sebastian",
+    "video": "https://www.youtube-nocookie.com/embed/X79zbLQufl0"
+  }
+]