Merge branch 'develop' into feature/backlog-count

Author: Princekumarofficial

.env.development

@@ -1,6 +1,6 @@
-NEXT_PUBLIC_BACKEND_URL=https://tpc.jxp.codes
-NEXT_PUBLIC_FRONTEND_URL=https://tpc.jxp.codes
-NEXTAUTH_URL=https://tpc.jxp.codes/portal/api/auth
-NEXT_PUBLIC_RECAPTCHA_SITE_KEY=6Ldd9KYrAAAAAO2UAAHuvK-lSFU3qj6HqXHzf5o1
+NEXT_PUBLIC_BACKEND_URL=https://placement.iiti.ac.in
+NEXT_PUBLIC_FRONTEND_URL=https://placement.iiti.ac.in
+NEXTAUTH_URL=https://placement.iiti.ac.in/portal/api/auth
+NEXT_PUBLIC_RECAPTCHA_SITE_KEY=6LedhmcrAAAAAGugyAoh4uyYPKGpOSFQf6trz-y4
 NEXT_PUBLIC_BASE_PATH="/portal"
-NEXT_PUBLIC_ASSET_PREFIX="/portal"
+NEXT_PUBLIC_ASSET_PREFIX="/portal"

.env.example

@@ -4,5 +4,5 @@ GOOGLE_CLIENT_ID=
 GOOGLE_CLIENT_SECRET=
 NEXT_PUBLIC_SECRET=secret
 NEXT_PUBLIC_BASE_PATH="/portal"
-NEXTAUTH_URL=https://localhost:3000/portal/api/auth
+NEXTAUTH_URL=https://localhost:5001/portal/api/auth
 NEXT_PUBLIC_RECAPTCHA_SITE_KEY=

.gitignore

@@ -34,3 +34,9 @@ yarn-error.log*
 *.tsbuildinfo
 next-env.d.ts
 .env
+
+# Environment files
+.env
+.env.*
+!.env.example
+!.env.sample

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:alpine
+FROM node:20-alpine
 
 WORKDIR /usr/app
 

package.json

@@ -15,6 +15,7 @@
     "@mui/icons-material": "^5.15.20",
     "@mui/material": "^5.15.20",
     "@mui/x-date-pickers": "^7.6.2",
+    "@nestjs/typeorm": "^11.0.1",
     "@radix-ui/colors": "^3.0.0",
     "@radix-ui/react-accordion": "^1.1.2",
     "@radix-ui/react-checkbox": "^1.0.4",
@@ -36,6 +37,8 @@
     "antd": "^5.19.1",
     "axios": "^1.6.3",
     "chartjs": "^0.3.24",
+    "class-transformer": "^0.5.1",
+    "class-validator": "^0.15.1",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",
     "cmdk": "^0.2.0",
@@ -55,8 +58,10 @@
     "material-react-table": "^2.13.0",
     "next": "^14.1.4",
     "next-auth": "^4.23.2",
+    "nodemailer": "^8.0.7",
     "papaparse": "^5.4.1",
     "pdf-lib": "^1.17.1",
+    "pg": "^8.20.0",
     "prettier": "3.3.3",
     "qs": "^6.12.0",
     "radix-ui": "^1.0.1",
@@ -67,7 +72,7 @@
     "react-dom": "latest",
     "react-google-button": "^0.7.2",
     "react-google-recaptcha": "^3.1.0",
-    "react-hot-toast": "^2.4.1",
+    "react-hot-toast": "^2.6.0",
     "react-icons": "^4.12.0",
     "react-modal": "^3.16.1",
     "react-quill": "^2.0.0",
@@ -80,6 +85,7 @@
     "tailwind-merge": "^2.6.0",
     "tailwind-scrollbar-hide": "^2.0.0",
     "tailwindcss-animate": "^1.0.7",
+    "typeorm": "^0.3.29",
     "xlsx": "^0.18.5",
     "xlsx-js-style": "^1.2.0",
     "yup": "^1.3.3"

src/app/(authroutes)/layout.tsx

@@ -44,7 +44,7 @@ const AuthLayout = async ({ children }: Props) => {
 
           {/* Right side - Form section - Scrollable */}
           <div className="flex-1 flex flex-col justify-center px-8 py-12 lg:px-12 xl:px-16 bg-white lg:ml-[560px]">
-            <div className="sm:mx-auto sm:w-full sm:max-w-lg lg:max-w-xl xl:max-w-2xl">
+            <div className="sm:mx-auto sm:w-full max-w-none">
               <Suspense fallback={<div className="animate-pulse bg-gray-200 h-64 rounded-lg"></div>}>
                 {children}
               </Suspense>

src/app/(routes)/admin/jobs/[jobId]/page.tsx

@@ -25,7 +25,12 @@ import Salaries from "@/components/Admin/Job/Salaries";
 import SelectionProcedure from "@/components/Admin/Job/SelectionProcedure";
 import Clashes from "@/components/Admin/Job/Clashes";
 import JobAnalytics from "@/components/Admin/Job/JobAnalytics";
-import { ClashesFC } from "@/dto/Clashes";
+import {
+  ClashesFC,
+  EMPTY_CLASHES,
+  isValidClashesResponse,
+  normalizeClashesResponse,
+} from "@/dto/Clashes";
 const currentStatusOptions = [
   "INITIALIZED",
   "SCHEDULED",
@@ -42,7 +47,7 @@ const currentStatusOptions = [
 
 const JobDetailPage = ({ params }: { params: { jobId: string } }) => {
   const [job, setData] = useState<JobDetailFC>(null);
-  const [clashes, setClashes] = useState<ClashesFC>(null);
+  const [clashes, setClashes] = useState<ClashesFC>(EMPTY_CLASHES);
   const [loading, setLoading] = useState(true);
   const [editMode, setEditMode] = useState(false);
   const [formData, setFormData] = useState(null);
@@ -87,25 +92,32 @@ const JobDetailPage = ({ params }: { params: { jobId: string } }) => {
   useEffect(() => {
     const fetchData = async () => {
       try {
-        const [
-          jobDetailData,
-          jafDetailsData,
-          recruiterData,
-          facultyData,
-          clashes,
-        ] = await Promise.all([
+        const [jobDetailData, jafDetailsData, recruiterData, facultyData] =
+          await Promise.all([
           fetchJobById(params.jobId),
           getJafDetails(),
           fetchRecruiterData(),
           fetchFaculties(),
-          fetchClashes(params.jobId),
         ]);
         setJafDetails(jafDetailsData);
         setData(jobDetailData);
         setFormData(jobDetailData);
         setFacultyData(facultyData);
-        setClashes(clashes);
+        try {
+          const clashesData = await fetchClashes(params.jobId);
+          const normalizedClashes = normalizeClashesResponse(clashesData);
+
+          if (!isValidClashesResponse(clashesData)) {
+            toast.error("Could not load clashes for this job");
+          }
+
+          setClashes(normalizedClashes);
+        } catch (_error) {
+          setClashes(EMPTY_CLASHES);
+          toast.error("Could not load clashes for this job");
+        }
       } catch (error) {
+        setClashes(EMPTY_CLASHES);
         toast.error("Error fetching data");
       } finally {
         setLoading(false);
@@ -702,7 +714,7 @@ const JobDetailPage = ({ params }: { params: { jobId: string } }) => {
             loading={loading}
           />
           {job && <JobAnalytics jobId={job.id} />}
-          {clashes ? <Clashes clashes={clashes} /> : <Loader />}
+          <Clashes clashes={clashes} />
         </div>
       )}
     </div>

src/app/(routes)/admin/noticeboard/page.tsx

@@ -0,0 +1,5 @@
+import NoticeBoard from "@/components/Admin/NoticeBoard";
+
+export default function Page() {
+    return <NoticeBoard />;
+}

src/app/(routes)/admin/noticeboardview/page.tsx

@@ -0,0 +1,5 @@
+import NoticeBoardView from "@/components/Admin/NoticeBoardView";
+
+export default function Page() {
+    return <NoticeBoardView />;
+}

src/app/(routes)/admin/oncampus-offers/page.tsx

@@ -1,7 +1,7 @@
 "use client";
 import { fetchAllSeasons, fetchOnCampusOffers, deleteOnCampusOffers } from "@/helpers/api";
 import generateColumns from "@/components/NewTableComponent/ColumnMapping";
-import { onCampusOfferDTO } from "@/dto/onCampusOfferDTO";
+import { onCampusOfferDTO, ON_CAMPUS_OFFER_STATUS_LABELS } from "@/dto/onCampusOfferDTO";
 import Table from "@/components/NewTableComponent/Table";
 import { useEffect, useState } from "react";
 import Loader from "@/components/Loader/loader";
@@ -12,7 +12,17 @@ const internHiddenColumns = ["salary.firstYearCTC", "salary.totalCTC", "salary.s
 const placementHiddenColumns = ["salary.stipend", "salary.otherCompensations", "salary.salaryPeriod"];
 
 const OnCampusOffersPage = () => {
-  const columns = generateColumns(onCampusOfferDTO);
+  const columns = generateColumns(onCampusOfferDTO).map((col: any) =>
+    col.accessorKey === "status"
+      ? {
+          ...col,
+          cell: ({ getValue }: { getValue: () => unknown }) => {
+            const val = getValue() as string;
+            return ON_CAMPUS_OFFER_STATUS_LABELS[val] ?? val;
+          },
+        }
+      : col,
+  );
   const [seasons, setSeasons] = useState<{ id: string; name: string, type: string }[]>([]);
   const [selectedSeason, setSelectedSeason] = useState<string>("");
   const [loading, setLoading] = useState(true);