Merge pull request #50 from nditc/rafsan

up

src/app/api/getevents/route.ts

@@ -87,6 +87,7 @@ export async function POST(req: NextRequest) {
     imageURL: e.data().imageURL,
     description: e.data().description,
     category: e.data().category,
+    participated: userParticipated.includes(e.id),
   }));
 
   return NextResponse.json({

src/app/api/getquestion/route.ts

@@ -52,10 +52,7 @@ export async function POST(req: NextRequest) {
       { status: 404 },
     );
   } else if (now > endTime) {
-    return NextResponse.json(
-      { error: "The exam was over decades ago" },
-      { status: 404 },
-    );
+    return NextResponse.json({ error: "The exam is over" }, { status: 404 });
   }
 
   if ((data.ndc_id == "" || data.ndc_id == "none") && intra) {

src/app/club/Components/Admin/AddQuestions.tsx

@@ -318,7 +318,7 @@ const AddQuestions = ({
                   onClick={() => {
                     setCorrectOption(i);
                   }}
-                  className={`h-10 w-10 rounded-full border border-primary_dark text-xl transition-colors ${
+                  className={`h-10 w-10 shrink-0 rounded-full border border-primary_dark text-xl transition-colors ${
                     correctOption == i ? "bg-primary text-white" : "bg-white"
                   }`}
                 >
@@ -506,7 +506,7 @@ const Question = ({
                   type="button"
                   onClick={(e) => setCorrectOptionVal(i)}
                   disabled={!editing}
-                  className={`h-10 w-10 rounded-full border border-primary_dark text-xl transition-colors ${
+                  className={`h-10 w-10 shrink-0 rounded-full border border-primary_dark text-xl transition-colors ${
                     correctOptionVal == i ? "bg-primary text-white" : "bg-white"
                   }`}
                 >

src/app/club/Components/Events/EventCard.tsx

@@ -20,6 +20,7 @@ const EventCard = ({
   desc,
   id,
   category,
+  participated,
 }: {
   title: string;
   date: any;
@@ -29,6 +30,7 @@ const EventCard = ({
   desc: string;
   id: string;
   category: string;
+  participated: boolean;
 }) => {
   const now = Timestamp.now();
 
@@ -44,19 +46,25 @@ const EventCard = ({
 
   return (
     <div className="hover: relative flex flex-col overflow-hidden rounded-xl bg-white shadow lg:h-[20rem] lg:flex-row">
-      {ongoing && (
+      {participated && (
+        <div className="absolute right-5 top-5 rounded-xl bg-green-500 px-3 py-1 text-sm text-white">
+          Participated
+        </div>
+      )}
+
+      {ongoing && !participated && (
         <div className="absolute right-5 top-5 animate-pulse rounded-xl bg-orange-500 px-3 py-1 text-sm text-white">
           Ongoing
         </div>
       )}
 
-      {upcoming && (
+      {upcoming && !participated && (
         <div className="absolute right-5 top-5 rounded-xl bg-primary px-3 py-1 text-sm text-white">
           Upcoming
         </div>
       )}
 
-      {ended && (
+      {ended && !participated && (
         <div className="absolute right-5 top-5 rounded-xl bg-red-500 px-3 py-1 text-sm text-white">
           Ended
         </div>

src/app/club/Components/Events/EventList.tsx

@@ -22,6 +22,7 @@ const EventList = ({
             id={e.id}
             key={i}
             category={e.category}
+            participated={e.participated}
           />
         );
       })}

src/app/club/Components/Home/DamianPopUp.tsx

@@ -30,7 +30,7 @@ const DamianPopUp = () => {
   const [roll, setRoll] = useState("");
 
   useEffect(() => {
-    if (!userDataLoading && userData?.ndc_roll) {
+    if (!userDataLoading && !userData?.ndc_roll) {
       onOpen();
     }
   }, [userData, userDataLoading]);

src/app/club/Components/Participate/AnswerSheet.tsx

@@ -4,7 +4,7 @@ import { doc, setDoc } from "firebase/firestore";
 import { useAuthContext } from "../Layout/AuthContextProvider";
 import Timer from "./Timer";
 import Question from "./Question";
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import { RiContactsBookUploadLine } from "react-icons/ri";
 import ActualUser from "@/util/ActualUser";
 import { CgSpinner } from "react-icons/cg";
@@ -72,9 +72,9 @@ const AnswerSheet = ({
   description: string;
   showResult: boolean;
 }) => {
-  const [answers, setAnswers] = useState<answerInterface[]>(
-    Array(questions.length).fill({ option: 5, answer: "" }),
-  );
+  const KEY = `event_answer_${id}`;
+  const INIT = Array(questions.length).fill({ option: 5, answer: "" });
+  const [answers, setAnswers] = useState<answerInterface[]>(INIT);
 
   const { isOpen, onOpen, onOpenChange } = useDisclosure();
 
@@ -103,6 +103,7 @@ const AnswerSheet = ({
   const [examMarks, setExamMarks] = useState(1);
   const [resultMarks, setResultMarks] = useState(0);
   const [totalMarks, setTotalMarks] = useState(0);
+  const [loadedInit, setLoadedInit] = useState(false);
 
   const SubmitFunc = async () => {
     if (submitClicked) return;
@@ -114,11 +115,28 @@ const AnswerSheet = ({
         setResultMarks(res.result);
         setTotalMarks(res.totalMarks);
         onOpen();
+        localStorage.removeItem(KEY);
         //setSubmitClicked(false);
       })
       .catch(() => toast.error("Submission Error"));
   };
 
+  useEffect(() => {
+    if (localStorage.getItem(KEY)) {
+      const ans = JSON.parse(localStorage.getItem(KEY) || "{}");
+      setAnswers(ans);
+      setLoadedInit(true);
+    } else {
+      setLoadedInit(true);
+    }
+  }, [KEY]);
+
+  useEffect(() => {
+    if (loadedInit) {
+      localStorage.setItem(KEY, JSON.stringify(answers));
+    }
+  }, [answers, loadedInit, KEY]);
+
   const router = useRouter();
 
   return (

src/app/club/Components/Participate/Question.tsx

@@ -43,8 +43,13 @@ const Question = ({
   const [answer, setAnswer] = useState(givenAnswer);
 
   useEffect(() => {
-    setAnswerData(selectedVal, answer, index);
-  }, [selectedVal, answer]);
+    setAnswer(givenAnswer);
+    setSelectedVal(selectedOption);
+  }, [givenAnswer, selectedOption]);
+
+  // useEffect(() => {
+  //   setAnswerData(selectedVal, answer, index);
+  // }, [selectedVal, answer]);
 
   const modifiedText = useMemo(() => {
     const lines = (question || "").split("\n");
@@ -92,7 +97,9 @@ const Question = ({
                 option={options[i]}
                 selected={selectedVal}
                 index={i}
-                setSelected={setSelectedVal}
+                setSelected={(i) => {
+                  setAnswerData(i, answer, index);
+                }}
                 key={i}
               />
             );
@@ -107,7 +114,7 @@ const Question = ({
             <input
               className="h-16 rounded-xl border border-gray-300 px-5 py-3 focus:border-primary focus:outline-none"
               onChange={(e) => {
-                setAnswer(e.currentTarget.value);
+                setAnswerData(selectedVal, e.target.value, index);
               }}
               value={answer}
               name="answer"