Merge branch 'old-dev' of https://github.com/gtech-mulearn/mulearn in…

…to old-dev
gtech-mulearn · May 30, 2024 · 916a286 · 916a286
2 parents 2093959 + 8ec576a
commit 916a286
Show file tree

Hide file tree

Showing 18 changed files with 5,976 additions and 2,765 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
@@ -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/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;
diff --git a/src/Pages/CampusChapters/CampusChapters.jsx b/src/Pages/CampusChapters/CampusChapters.jsx
@@ -17,11 +17,18 @@ const CampusChapters = () => {
   const [districts, setDistricts] = useState([]);
   const [selectedDistrict, setSelectedDistrict] = useState("all");
   const [campusData, setCampusData] = useState([]);
-  const districtZone={
-    'South':['Pathanamthitta','Trivandrum','Kollam'],
-    'Central':['Alappuzha','Ernakulam','Kottayam','Idukki'],
-    'North':['Palakkad','Thrissur','Kasaragod','Malappuram','Kozhikode','Kannur']
-  }
+  const districtZone = {
+    South: ["Pathanamthitta", "Trivandrum", "Kollam"],
+    Central: ["Alappuzha", "Ernakulam", "Kottayam", "Idukki"],
+    North: [
+      "Palakkad",
+      "Thrissur",
+      "Kasaragod",
+      "Malappuram",
+      "Kozhikode",
+      "Kannur",
+    ],
+  };
 
   useEffect(() => {
     axios
@@ -167,13 +174,13 @@ const CampusChapters = () => {
                   {
                     //iterate through the districts array and return the option element
                     districts
-                    .filter((district) => {
-                      if (selectedZone === 'all') return true
-                      return (  districtZone[selectedZone].includes(district) )
-                    })
-                    .map((district) => {
-                        return <option value={district}>{district}</option>
-                    })
+                      .filter((district) => {
+                        if (selectedZone === "all") return true;
+                        return districtZone[selectedZone].includes(district);
+                      })
+                      .map((district) => {
+                        return <option value={district}>{district}</option>;
+                      })
                   }
                 </select>
               </div>
@@ -184,11 +191,11 @@ const CampusChapters = () => {
                   // return the campuses that match the selected zone
                   if (
                     (campus.zone === selectedZone &&
-                    selectedDistrict === "all") |
+                      selectedDistrict === "all") |
                     (campus.zone === selectedZone &&
-                    campus.district === selectedDistrict) |
-                    (selectedZone === 'all' &&
-                    campus.district === selectedDistrict)
+                      campus.district === selectedDistrict) |
+                    (selectedZone === "all" &&
+                      campus.district === selectedDistrict)
                   ) {
                     return (
                       <div className={styles.college}>
@@ -317,13 +324,13 @@ const CampusChapters = () => {
             <div className={styles.d_video_container}>
               <div className={styles.d_video}>
                 <iframe
-                  src="https://www.youtube.com/embed/3sycnoFCeaM?si=a0t4z26fI-BaO5C_"
+                  src="https://www.youtube-nocookie.com/embed/3sycnoFCeaM?si=a0t4z26fI-BaO5C_"
                   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.d_main_container}>

diff --git a/src/Pages/CapTF/Level1.jsx b/src/Pages/CapTF/Level1.jsx
@@ -122,7 +122,7 @@ const Level1 = () => {
               + Muhammad Kutty Panaparambil Ismai's Son
             </p>
             <a
-              href="https://www.youtube.com/watch?v=dQw4w9WgXcQ"
+              href="https://www.youtube-nocookie.com/watch?v=dQw4w9WgXcQ"
               target="_blank"
               rel="noopener noreferrer"
             >

diff --git a/src/Pages/CapTF/Submission.jsx b/src/Pages/CapTF/Submission.jsx
@@ -58,7 +58,7 @@ const Submission = () => {
         <a
           href={
             showParam === "true" || name !== "Secret Key"
-              ? "https://www.youtube.com/watch?v=dQw4w9WgXcQ"
+              ? "https://www.youtube-nocookie.com/watch?v=dQw4w9WgXcQ"
               : process.env.REACT_APP_CTF_SUMISSION_LINK
           }
           target="_blank"