Merge pull request #1554 from gtech-mulearn/old-dev-server

Prod
gtech-mulearn · May 30, 2024 · 25fdfd5 · 25fdfd5
2 parents dbc517c + 69f2ea5
commit 25fdfd5
Show file tree

Hide file tree

Showing 22 changed files with 6,043 additions and 2,818 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/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/">
@@ -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/yljq/#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">
-          µNewsletter
+         Donate
         </button>
       </a>
     </div>

diff --git a/src/Components/Navbar/Mobile.jsx b/src/Components/Navbar/Mobile.jsx
@@ -89,13 +89,13 @@ export const MobileMenu = ({
           </button>
         </a>
         <a
-          href="https://online.fliphtml5.com/slydm/yljq/#p=1"
+          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">
-            µNewsletter
+            Donate
           </button>
         </a>
       </div>

diff --git a/src/Components/Navbar/Mylinks.jsx b/src/Components/Navbar/Mylinks.jsx
@@ -132,6 +132,13 @@ export const links = [
             link: "/mulearn.apk",
             foreign: false,
           },
+          {
+            name: "µNewsletter",
+            submenu: false,
+            sublinks: [],
+            link: "https://online.fliphtml5.com/slydm/yljq/#p=1",
+            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"
+  }
+]
diff --git a/src/Pages/ArtOfTeaching/ArtOfTeaching.jsx b/src/Pages/ArtOfTeaching/ArtOfTeaching.jsx
@@ -1,22 +1,22 @@
-import React from "react"
-import Navbar from "../../Components/Navbar/Navbar"
-import Footer from "../../Components/Footer/Footer"
+import React from "react";
+import Navbar from "../../Components/Navbar/Navbar";
+import Footer from "../../Components/Footer/Footer";
 
-import styles from "./ArtOfTeaching.module.css"
-import "./ArtOfTeaching.scss"
+import styles from "./ArtOfTeaching.module.css";
+import "./ArtOfTeaching.scss";
 
-import Faq from "react-faq-component"
+import Faq from "react-faq-component";
 
-import fvimg from "./assets/fvimg.gif"
+import fvimg from "./assets/fvimg.gif";
 
-import MentorCard from "../../Components/MentorCard/MentorCard"
+import MentorCard from "../../Components/MentorCard/MentorCard";
 
-import { Swiper, SwiperSlide } from "swiper/react"
+import { Swiper, SwiperSlide } from "swiper/react";
 
 // Import Swiper styles
-import "swiper/css"
-import "swiper/css/pagination"
-import "swiper/css/navigation"
+import "swiper/css";
+import "swiper/css/pagination";
+import "swiper/css/navigation";
 
 // import { Pagination, Navigation } from "swiper"
 
@@ -50,15 +50,15 @@ const ArtOfTeaching = () => {
           "Yes, you can resubmit your entry if you think your previous submission lacked a certain element that you aimed for.",
       },
     ],
-  }
+  };
 
   const fstyles = {
     // bgColor: 'white',
     titleTextColor: "#f78c40",
     rowTitleColor: "#404040",
     rowContentColor: "#373737",
     arrowColor: "#f78c40",
-  }
+  };
   return (
     <>
       <Navbar />
@@ -72,8 +72,9 @@ const ArtOfTeaching = () => {
 
               <p className={styles.fv_tagline}>
                 µLearn is back with Art of Teaching to honor teachers who mould
-                our future generation. µLearn Foundation is partnering with Google
-                developers, KTU and Kerala University for Art of Teaching 2.0.
+                our future generation. µLearn Foundation is partnering with
+                Google developers, KTU and Kerala University for Art of Teaching
+                2.0.
               </p>
               <div className={styles.event_partners}>
                 <div className={styles.partners}>
@@ -292,11 +293,12 @@ const ArtOfTeaching = () => {
               <div className={styles.ytplayer}>
                 <iframe
                   className={styles.yt_video}
-                  src="https://www.youtube.com/embed/vPLuA5kXoBI"
+                  src="https://www.youtube-nocookie.com/embed/vPLuA5kXoBI"
                   title="YouTube video player"
                   frameborder="0"
                   allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
                   allowfullscreen
+                  loading="lazy"
                 ></iframe>
               </div>
             </div>
@@ -366,31 +368,34 @@ const ArtOfTeaching = () => {
               <div className={styles.video}>
                 <iframe
                   className={styles.ytvideo}
-                  src="https://www.youtube.com/embed/Wmo0StqW9Kc"
+                  src="https://www.youtube-nocookie.com/embed/Wmo0StqW9Kc"
                   title="YouTube video player"
                   frameborder="0"
                   allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
                   allowfullscreen
+                  loading="lazy"
                 ></iframe>
               </div>
               <div className={styles.video}>
                 <iframe
                   className={styles.ytvideo}
-                  src="https://www.youtube.com/embed/TEylubYDzhQ"
+                  src="https://www.youtube-nocookie.com/embed/TEylubYDzhQ"
                   title="YouTube video player"
                   frameborder="0"
                   allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
                   allowfullscreen
+                  loading="lazy"
                 ></iframe>
               </div>
               <div className={styles.video}>
                 <iframe
                   className={styles.ytvideo}
-                  src="https://www.youtube.com/embed/jRcseEVk2sk"
+                  src="https://www.youtube-nocookie.com/embed/jRcseEVk2sk"
                   title="YouTube video player"
                   frameborder="0"
                   allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
                   allowfullscreen
+                  loading="lazy"
                 ></iframe>
               </div>
             </div>
@@ -405,7 +410,7 @@ const ArtOfTeaching = () => {
       </div>
       <Footer />
     </>
-  )
-}
+  );
+};
 
-export default ArtOfTeaching
+export default ArtOfTeaching;