Merge branch 'prod2' of https://github.com/SuperSecureHuman/anokha-2024 into prod2

Author: Abhinav-ark

next.config.js

@@ -26,20 +26,37 @@ module.exports = withBundleAnalyzer({
   },
 
   images: {
-    domains: [
-      "anokha.amrita.edu",
-      "i.imgur.com",
-      "imgur.com",
-      "gravatar.com",
-      "wwd.com",
-    ],
     remotePatterns: [
       {
         protocol: "https",
         hostname: "**gravatar.com",
         port: "",
         pathname: "/avatar/**",
       },
+      {
+        protocol: "https",
+        hostname: "anokha.amrita.edu",
+        port: "",
+        pathname: "/**",
+      },
+      {
+        protocol: "https",
+        hostname: "i.imgur.com",
+        port: "",
+        pathname: "/**",
+      },
+      {
+        protocol: "https",
+        hostname: "imgur.com",
+        port: "",
+        pathname: "/**",
+      },
+      {
+        protocol: "https",
+        hostname: "**wwd.com",
+        port: "",
+        pathname: "/**",
+      }
     ],
   },
 });

package-lock.json

@@ -37,7 +37,7 @@ const navLinks = [
   },
   {
     title: "Contact Us",
-    path: "/",
+    path: "/#footer",
   },
 ];
 
@@ -155,7 +155,9 @@ const Navigationbar = () => {
                 <Button
                   className="relative border-[#1a4d76] border-0 inline-flex items-center w-[100px] md:w-[200px] justify-center px-2  md:px-2 md:py-2 md:text-lg font-bold text-white transition-all duration-100 bg-gray-900 font-pj rounded-xl focus:outline-none focus:ring-1 focus:ring-offset-2 focus:ring-gray-900 sm:before:content-['Login'] md:before:content-['Login_\/_Sign_Up'] hover:scale-[1.02] hover:border-[#1a4d76] hover:border-2"
                   onClick={handleForgetPassword}
-                ></Button>
+                >
+                  <p></p> {/* To fix: The prop `children` is marked as required in `MaterialTailwind.Button`, but its value is `undefined`.*/}
+                </Button>
               </div>
             )}
           </div>

src/app/components/EventHeader.jsx

@@ -566,7 +566,7 @@ const Event = () => {
           </h2>
           <br />
           <div className={showFullText ? "" : "line-clamp-[4]"} ref={Desc}>
-            <Markdown className="prose dark:prose-invert">
+            <Markdown className="prose dark:prose-invert text-white">
               {eventData.eventMarkdownDescription}
             </Markdown>
           </div>

src/app/events/[eventId]/page.js

@@ -111,9 +111,8 @@ export default function EventCard({
             src={imgSrc}
             width={400}
             height={400}
-            objectFit="contain"
             alt="https://i.imgur.com/iQy8GLM.jpg"
-            className=" rounded-2xl h-full transition duration-300 hover:filter hover:brightness-0 hover:grayscale-100 hover:opacity-0"
+            className=" rounded-2xl h-full object-fit transition duration-300 hover:filter hover:brightness-0 hover:grayscale-100 hover:opacity-0"
           />
           {secureLocalStorage.getItem("isLoggedIn") && isRegistered == "1" ? (
             <div class="absolute top-2 left-2 p-1 text-xs text-green-800 font-semibold border border-white rounded-lg bg-green-100">

src/app/events/components/EventCard.jsx

@@ -11,10 +11,11 @@ export default function FilterSelectButton({
   options,
   sendSelectedOption,
 }) {
-  const [currVal, setCurrVal] = useState(val());
-  const [buttonClick, setButtonClick] = useState(0);
-  function val() {
-    if (typeof window === "undefined") return null;
+
+  const val = () => {
+    if (typeof window === "undefined"){
+      return null;
+    } 
     let value;
     if (type === "eventType") {
       value = sessionStorage.getItem("eventTypeList");
@@ -27,6 +28,14 @@ export default function FilterSelectButton({
     }
     return value ? JSON.parse(value)?.[0] : null;
   }
+
+  const [currVal, setCurrVal] = useState();
+  const [buttonClick, setButtonClick] = useState(0);
+
+  useEffect(()=>{
+    setCurrVal(val())
+  },[])
+
   useEffect(() => {
     if ((!currVal || currVal == null || currVal == "") && buttonClick == 0) {
       return;

src/app/events/components/filterSelectButton.js renamed to src/app/events/components/filterSelectButton.jsx

@@ -51,11 +51,19 @@ const Events = () => {
 
   /* Randomize array in-place using Durstenfeld shuffle algorithm: Complexity 0(n)*/
   const shuffleArray = (array) => {
+    // Find the index of the object where eventName matches "Lumiere" (case-insensitive).
+    const lumiereIndex = array.findIndex((item) => item["eventName"].toLowerCase() === "lumiere");
+    // If "Lumiere" is found, swap it with the first element.
+    if (lumiereIndex !== -1) {
+      [array[0], array[lumiereIndex]] = [array[lumiereIndex], array[0]];
+    }
+    // Shuffle the rest of the array starting from the second element.
     const l = array.length;
-    for (let i = l - 1; i >= 0; i--) {
-        const j = Math.floor(Math.random() * (i + 1)) % l;
+    for (let i = l - 1; i >= 1; i--) {  // Start at 1 to leave array[0] unchanged
+        const j = Math.floor(Math.random() * (i - 1)) + 1;
         [array[i], array[j]] = [array[j], array[i]];
     }
+    return array;
   }
 
   useEffect(() => {
@@ -90,7 +98,7 @@ const Events = () => {
         }
       })
       .then((data) => {
-        console.log("Recived Data:", data);
+        // console.log("Recived Data:", data);
         shuffleArray(data.EVENTS)
         setEventsData(data.EVENTS);
         setFilteredData(data.EVENTS);
@@ -202,8 +210,8 @@ const Events = () => {
 
   // This empty bracket here is important
 
-  console.log("Events Data:", eventsData);
-  console.log("Filter Data:", filteredData);
+  // console.log("Events Data:", eventsData);
+  // console.log("Filter Data:", filteredData);
 
   const [webGLColors, setWebGLColors] = useState({
     color1: [43 / 255, 30 / 255, 56 / 255],

src/app/events/page.js

@@ -13,8 +13,10 @@ import {
 } from "../_util/constants";
 import secureLocalStorage from "react-secure-storage";
 import ToastAlert from "../_util/ToastAlerts";
+import { ConfirmDialog } from "primereact/confirmdialog";
+import { confirmDialog } from "primereact/confirmdialog";
 
-const Lumere = () => {
+const Lumiere = () => {
   const [webGLColors, setWebGLColors] = useState({
     color1: [43 / 255, 30 / 255, 56 / 255],
     color2: [11 / 255, 38 / 255],
@@ -154,6 +156,27 @@ const Lumere = () => {
       });
   }, []);
 
+
+  const accept = async () => {
+    await getPayUForm();
+  };
+
+  const reject = () => {
+    // do nothing
+  };
+
+  const confirmProceed = () => {
+    confirmDialog({
+      message: `Are you ready to make the payment? (You'll be redirected to the payment gateway to complete the registration.)`,
+      header: "Confirmation",
+      icon: "pi pi-exclamation-triangle",
+      defaultFocus: "accept",
+      style: { width: "35rem", margin: "5px" },
+      accept,
+      reject,
+    });
+  };
+
   const handleRegister = async (e) => {
     e.preventDefault();
     if (
@@ -164,9 +187,7 @@ const Lumere = () => {
       window.location.href = "/login";
       return;
     }
-    confirm(
-      "Are you ready to make the payment? (You'll be redirected to the payment gateway to complete the registration.)"
-    ) && (await getPayUForm());
+    confirmProceed();
   };
 
   return (
@@ -259,7 +280,7 @@ const Lumere = () => {
                 "Registrations Closed"
               )}
             </button>
-
+            <ConfirmDialog />
             <div className=" inset-0 flex justify-center items-center">
               <div
                 onClick={handleScrollMore}
@@ -343,4 +364,4 @@ const Lumere = () => {
   );
 };
 
-export default Lumere;
+export default Lumiere;

src/app/lumiere/page.js

@@ -72,7 +72,9 @@ export default function Home() {
 
       <AnokhaMarquee />
 
-      <Footer current_page="home" />
+      <section id ="footer">
+        <Footer current_page="home" />
+      </section>
     </main>
   );
 }