Everything

package.json

@@ -39,7 +39,10 @@
     "react-markdown": "^9.0.1",
     "react-toastify": "^10.0.5",
     "react-zoom-pan-pinch": "^3.4.3",
+    "rehype-highlight": "^7.0.0",
+    "rehype-katex": "^7.0.1",
     "remark-gfm": "^4.0.0",
+    "remark-math": "^6.0.0",
     "tailwind-datepicker-react": "^1.4.3",
     "tailwind-gradient-mask-image": "^1.1.0",
     "xlsx": "^0.18.5"
@@ -48,6 +51,7 @@
     "@types/node": "^20",
     "@types/react": "^18",
     "@types/react-dom": "^18",
+    "@types/react-syntax-highlighter": "^15.5.13",
     "autoprefixer": "^10.0.1",
     "eslint": "^8",
     "eslint-config-next": "14.1.4",

src/app/(main)/Components/Navbar.tsx

@@ -6,7 +6,6 @@ import Image from "next/image";
 import Link from "next/link";
 import { usePathname, useSearchParams } from "next/navigation";
 import { RxCross2 } from "react-icons/rx";
-import ClubNavbar from "../../club/Components/Layout/Navbar";
 
 const Navbar = () => {
   const [showOptions, setShowOptions] = useState(false);
@@ -58,9 +57,7 @@ const Navbar = () => {
     };
   }, [Route, Params]);
 
-  return Route.includes("club") ? (
-    <ClubNavbar />
-  ) : (
+  return (
     <nav
       ref={navRef}
       className={
@@ -241,18 +238,6 @@ const Navbar = () => {
                 </Link>
               </li>
             )}
-
-            <li>
-              <Link
-                onClick={() => {
-                  setShowOptions(false);
-                }}
-                href="/club"
-                className="block rounded bg-blue-500 px-3 py-2 text-white hover:bg-gray-200 md:bg-transparent md:p-0 md:text-primary-500 md:hover:bg-transparent md:hover:text-blue-500"
-              >
-                Club
-              </Link>
-            </li>
           </ul>
         </div>
       </div>

src/app/(main)/activities/Upcoming.tsx

@@ -10,8 +10,6 @@ interface Props {
   description: string;
   actionButtonTitle1: string;
   actionButtonRedirect1: string;
-  actionButtonTitle2: string;
-  actionButtonRedirect2: string;
   image: string;
   timestamp: number;
 }
@@ -74,8 +72,6 @@ const Upcoming = ({
   description,
   actionButtonTitle1,
   actionButtonRedirect1,
-  actionButtonTitle2,
-  actionButtonRedirect2,
   image,
   timestamp,
 }: Props) => {
@@ -86,16 +82,16 @@ const Upcoming = ({
   const firstTwoWords = words.slice(0, 2).join(" ");
   const restOfSentence = words.slice(2).join(" ");
 
-  const detailsEncrypt = encrypt(actionButtonRedirect2);
+  const detailsEncrypt = encrypt(actionButtonRedirect1);
 
   return (
-    <div id="upcoming_event_container relative bg-white">
+    <div id="upcoming_event_container relative bg-white z-30">
       <div className="blog-section shadow-[09px_13px_40px_10px_#00000024]">
-        <div className="absolute right-0 -z-10 h-full w-full">
+        <div className="absolute right-0 -z-10 h-full w-full bg-white">
           <img
             src={image}
             alt={"Image"}
-            className="object-cover object-right gradient-mask-b-10 md:gradient-mask-l-40"
+            className="object-cover object-right opacity-60 gradient-mask-b-30 md:gradient-mask-l-0"
           />
         </div>
         <div className="left-part m-5 md:ml-10 md:mr-0">
@@ -105,21 +101,15 @@ const Upcoming = ({
               {restOfSentence}
             </h1>
           </div>
-          <p className="blog-content line-clamp-5">{description}</p>
+          <p className="blog-content line-clamp-5 text-base">{description}</p>
           <div className="buttons mt-2 flex flex-col gap-2 sm:mt-4 sm:flex-row sm:gap-5">
-            <a
-              href={actionButtonRedirect1}
-              className="register-button flex items-center justify-center"
-            >
-              <div>{actionButtonTitle1}</div>
-            </a>
             <Link
               href={`/details/${encodeURIComponent(
                 detailsEncrypt.toString(),
               )}/${category}/${timestamp}`}
               className="learn-more-button flex items-center justify-center"
             >
-              <div>{actionButtonTitle2}</div>
+              <div>{actionButtonTitle1}</div>
             </Link>
           </div>
         </div>

src/app/(main)/activities/page.tsx

@@ -60,18 +60,21 @@ const Activities = async ({
               <h1 className="pb-1 text-3xl md:text-5xl">UPCOMING</h1>
               <h1 className="text-5xl text-blue-500 md:text-7xl">EVENT</h1>
             </div>
-            <section className="h-fit w-full">
-              <Upcoming
-                category={upcoming[0].category}
-                title={upcoming[0].title}
-                description={upcoming[0].short_description}
-                actionButtonTitle1="Register"
-                actionButtonTitle2="Learn More"
-                actionButtonRedirect1="https://init.nditc.net/registration/participant"
-                actionButtonRedirect2={upcoming[0].details_url}
-                image={upcoming[0].image_url}
-                timestamp={upcoming[0].timestamp}
-              />
+            <section className="mb-8 flex h-fit w-full flex-col gap-8">
+              {upcoming.map((d, ind) => {
+                return (
+                  <Upcoming
+                    key={ind}
+                    category={d.category}
+                    title={d.title}
+                    description={d.short_description}
+                    actionButtonTitle1="Learn More"
+                    actionButtonRedirect1={d.details_url}
+                    image={d.image_url}
+                    timestamp={d.timestamp}
+                  />
+                );
+              })}
             </section>
           </>
         ) : null}

src/app/(main)/styles/markdown.css

@@ -10,18 +10,25 @@
 .markdown p {
   padding-bottom: 0.5rem;
 }
+
+.markdown p::first-line {
+  padding-left: 1rem;
+}
 .markdown a {
   color: #3b82f6;
 }
 .markdown h1 {
   font-size: 2.25rem;
-  padding-top: 1.25rem;
-  padding-bottom: 0.5rem;
+  padding-top: 2.5rem;
+  padding-bottom: 1rem;
   font-weight: 400;
 }
+/* .markdown h1::first-letter {
+  color: #2f4770;
+} */
 .markdown h2 {
   font-size: 1.875rem;
-  padding-top: 1.15rem;
+  padding-top: 2.5rem;
   padding-bottom: 0.5rem;
   font-weight: 400;
 }
@@ -30,11 +37,17 @@
 .markdown h5,
 .markdown h6 {
   font-size: 1.5rem;
-  padding-top: 0.65rem;
-  padding-bottom: 0.5rem;
+  padding-top: 0.25rem;
+  padding-bottom: 0.25rem;
   font-family: Nunito;
   font-weight: 700;
 }
+
+.markdown h4,
+.markdown h5,
+.markdown h6 {
+  font-size: 1.25rem !important;
+}
 .markdown table {
   border: 1px solid #e4e4e7;
   border-radius: 2px;
@@ -53,3 +66,18 @@
   padding: 0.5rem 2rem;
   border: 1px solid #d1d5db;
 }
+
+.markdown ul {
+  list-style-type: circle;
+  list-style-position: inside;
+}
+
+.markdown ol {
+  list-style-type: decimal;
+  list-style-position: inside;
+}
+
+.markdown li::marker {
+  color: #3b82f6;
+  font-weight: bold;
+}

src/app/api/getevents/route.ts

@@ -87,6 +87,10 @@ export async function POST(req: NextRequest) {
     imageURL: e.data().imageURL,
     description: e.data().description,
     category: e.data().category,
+    participated:
+      userParticipated && Array.isArray(userParticipated)
+        ? userParticipated.includes(e.id)
+        : false,
   }));
 
   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/api/memberdata/route.ts

@@ -16,8 +16,6 @@ export async function POST(req: NextRequest) {
 
   const member = await memberDOC.json();
 
-  console.log(member);
-
   if (!memberDOC.ok) {
     return NextResponse.json(
       { error: "No such Club Member exists" },