Merge branch 'Api-fix' of https://github.com/Web-Team-IITI-Gymkhana/t…

…pc-frontend into Api-fix
Web-Team-IITI-Gymkhana · Jul 14, 2024 · 3f537d3 · 3f537d3
2 parents 2e1d03b + 9373735
commit 3f537d3
Show file tree

Hide file tree

Showing 17 changed files with 22 additions and 64 deletions.
diff --git a/src/app/(authroutes)/passwordless/[token]/page.tsx b/src/app/(authroutes)/passwordless/[token]/page.tsx
@@ -5,9 +5,7 @@ import React, { useEffect, useState } from "react";
 import { useRouter } from "next/navigation";
 import Cookies from "js-cookie";
 import { jwtDecode } from "jwt-decode";
-import loadingImg from "@/components/Faculty/loadingSpinner.svg";
 import Loader from "@/components/Loader/loader";
-interface Props {}
 
 const LoginPage = ({
   params,

diff --git a/src/app/(routes)/admin/companies/allcompanies/page.tsx b/src/app/(routes)/admin/companies/allcompanies/page.tsx
@@ -1,5 +1,4 @@
 import CompanyCard from "@/components/company/CompanyCard";
-import { cookies } from "next/headers";
 import { fetchCompany } from "@/helpers/api";
 import { ChevronRight } from "lucide-react";
 import { ChevronLeft } from "lucide-react";

diff --git a/src/app/(routes)/admin/jobs/[...filter]/page.tsx b/src/app/(routes)/admin/jobs/[...filter]/page.tsx
@@ -1,9 +1,7 @@
 "use client";
 import { fetchAllJobs } from "@/helpers/api";
-import Cookies from "js-cookie";
 import TableComponent from "@/components/TableComponent/TableComponent";
 import generateColumns from "@/components/TableComponent/ColumnMapping";
-import { useRouter } from "next/router";
 import { useEffect, useState } from "react";
 
 

diff --git a/src/app/(routes)/admin/jobs/[jobId]/page.tsx b/src/app/(routes)/admin/jobs/[jobId]/page.tsx
@@ -15,7 +15,6 @@ import {
   GenderSelectList,
 } from "@/components/Recruiters/jobEdit";
 import { fetchJobById } from "@/helpers/api";
-import Cookies from "js-cookie";
 import Loader from "@/components/Loader/loader";
 import toast from "react-hot-toast";
 import JobCoordinatorForm from "@/components/Admin/AddForms";

diff --git a/src/app/(routes)/admin/jobs/loading.tsx b/src/app/(routes)/admin/jobs/loading.tsx
@@ -1,7 +1,6 @@
 "use client";
 
 import React, { Component } from "react";
-import { CircularProgress } from "@mui/material";
 import Loader from "@/components/Loader/loader"
 
 class Loading extends Component {

diff --git a/src/app/(routes)/admin/jobs/page.tsx b/src/app/(routes)/admin/jobs/page.tsx
@@ -1,14 +1,9 @@
 "use client";
 import { fetchAllJobs } from "@/helpers/api";
-import Cookies from "js-cookie";
-import TableComponent from "@/components/TableComponent/TableComponent";
 import generateColumns from "@/components/NewTableComponent/ColumnMapping";
 import type { RecruitmentDTO } from "@/dto/JobDto";
 import { recruitmentDTO } from "@/dto/JobDto";
 import {
-  MaterialReactTable,
-  useMaterialReactTable,
-  type MRT_Row,
   createMRTColumnHelper,
 } from "material-react-table";
 import Table from "@/components/NewTableComponent/Table";
@@ -24,7 +19,6 @@ const hiddenColumns = [
 ];
 
 const JobPage = () => {
-  const columnHelper = createMRTColumnHelper<RecruitmentDTO>();
   const columns = generateColumns(recruitmentDTO);
   const [loading, setLoading] = useState(true);
   const [allJobs, setAllJobs] = useState();
@@ -34,7 +28,7 @@ const JobPage = () => {
 
   useEffect(() => {
     const getData = async () => {
-      const data = await fetchAllJobs( undefined);
+      const data = await fetchAllJobs();
       setAllJobs(data);
       setLoading(false);
     };

diff --git a/src/app/(routes)/admin/recruiters/page.tsx b/src/app/(routes)/admin/recruiters/page.tsx
@@ -1,25 +1,16 @@
 "use client";
 import { fetchRecruiterData } from "@/helpers/api";
-import Cookies from "js-cookie";
 import Table from "@/components/NewTableComponent/Table";
-import type {DTO} from '@/dto/StudentDto'
-import {
-  MaterialReactTable,
-  useMaterialReactTable,
-  type MRT_Row,
-  createMRTColumnHelper,
-} from 'material-react-table';
 import generateColumns from "@/components/NewTableComponent/ColumnMapping";
 import { recruiterdto } from "@/dto/RecruiterDto";
-import type { RecruiterDTO } from "@/dto/RecruiterDto";
 
 const hiddenColumns = ['id','user.id','company.id'];
 
 
 const StudentPage = async () => {
   const columns = generateColumns(recruiterdto)
   console.log(columns)
-  const AllRecruiters = await fetchRecruiterData(null);
+  const AllRecruiters = await fetchRecruiterData();
   const visibleColumns = columns.filter(
     (column:any) => !hiddenColumns.includes(column?.accessorKey)
   );

diff --git a/src/app/(routes)/admin/resumes/page.tsx b/src/app/(routes)/admin/resumes/page.tsx
@@ -1,7 +1,6 @@
 "use client";
 import React, { useEffect, useState } from "react";
 import { fetchResumes, getResumeFile, patchResumeVerify } from "@/helpers/api";
-import Cookies from "js-cookie";
 import generateColumns from "@/components/NewTableComponent/ColumnMapping";
 import Table from "@/components/NewTableComponent/Table";
 import { resumeDto, Resume, ResumeTableData } from "@/dto/ResumeDto";

diff --git a/src/app/(routes)/admin/students/[...filter]/page.tsx b/src/app/(routes)/admin/students/[...filter]/page.tsx
@@ -1,6 +1,5 @@
 "use client";
 import { fetchStudentData } from "@/helpers/api";
-import Cookies from "js-cookie";
 import TableComponent from "@/components/TableComponent/TableComponent";
 import generateColumns from "@/components/TableComponent/ColumnMapping";
 import { useRouter } from "next/router";

diff --git a/src/app/(routes)/admin/students/page.tsx b/src/app/(routes)/admin/students/page.tsx
@@ -1,38 +1,27 @@
 "use client";
 import { useState, useEffect } from 'react';
 import { fetchStudentData, } from "@/helpers/api";
-import Cookies from "js-cookie";
 import Table from "@/components/NewTableComponent/Table";
 import type { DTO } from '@/dto/StudentDto';
-import { createMRTColumnHelper } from 'material-react-table';
 import generateColumns from "@/components/NewTableComponent/ColumnMapping";
 import { jsondto } from "@/dto/StudentDto";
-import { Form } from 'antd';
-import { cookies } from 'next/headers';
+
 const hiddenColumns = ['userId', 'programId','id'];
 
 const StudentPage = () => {
   const [students, setStudents] = useState<DTO[]>([]);
-  const columnHelper = createMRTColumnHelper<DTO>();
   const columns = generateColumns(jsondto);
 
-
-
-
-
-
   const visibleColumns = columns.filter(
     (column: any) => !hiddenColumns.includes(column?.accessorKey)
   );
 
   useEffect(() => {
     const fetchData = async () => {
-      const data = await fetchStudentData(null);
+      const data = await fetchStudentData();
       setStudents(data);
-      console.log(data);
     };
 
-
     fetchData();
   }, []);
 

diff --git a/src/components/NewTableComponent/StudentModal.tsx b/src/components/NewTableComponent/StudentModal.tsx
@@ -11,12 +11,10 @@ import TableHead from '@mui/material/TableHead';
 import TableRow from '@mui/material/TableRow';
 import Paper from '@mui/material/Paper';
 import { useEffect, useState } from 'react';
-import CircularProgress from '@mui/material/CircularProgress';
 import { createTheme, ThemeProvider } from '@mui/material/styles';
 import { grey } from '@mui/material/colors';
 import { Button } from '@mui/material';
 import {fetchRegistrations} from '@/helpers/api';
-import Cookies from 'js-cookie';
 import Loader from '@/components/Loader/loader';
 import { fetchStudentDataById, fetchRegistrationDataById } from '@/helpers/api';
 const redirect = () => {};

diff --git a/src/components/TableComponent/TableComponent.tsx b/src/components/TableComponent/TableComponent.tsx
@@ -2,8 +2,6 @@
 import * as React from "react";
 import { useState } from "react";
 import Modal from "react-modal";
-import { fetchStudentData } from "@/helpers/api";
-import Cookies from "js-cookie";
 import {
   ColumnDef,
   ColumnFiltersState,

diff --git a/src/components/company/AllCompaniesComponent.tsx b/src/components/company/AllCompaniesComponent.tsx
@@ -7,11 +7,8 @@ import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { ScrollArea } from "@/components/ui/scroll-area";
 import { Separator } from "@/components/ui/separator";
-import Cookies from "js-cookie";
 import Link from "next/link";
-import { revalidateTag } from "next/cache";
 import EachCompanyDiv from "./EachCompanyDiv";
-interface Props {}
 
 interface company {
   id: string;
@@ -31,7 +28,6 @@ const AllCompaniesComponent = async () => {
   const Recruiters = await fetchCompanyRecruiters(
     cookies()?.get("companyId")?.value,
   );
-  console.log("Recruiters", Recruiters);
   return (
     <div className="">
       <div className="border-r-2  rounded-md">

diff --git a/src/components/loginForms/loginForm.tsx b/src/components/loginForms/loginForm.tsx
@@ -11,8 +11,8 @@ import GoogleLogin from "./googleLogin";
 import { LoginWithEmail } from "@/components/loginForms/loginWithEmail";
 
 const LoginForm = () => {
-  const [email, setemail] = useState<String | null>(null);
-  const [role, setrole] = useState<String | null>("STUDENT");
+  const [email, setemail] = useState<string | null>(null);
+  const [role, setrole] = useState<string | null>("STUDENT");
   const router = useRouter();
   return (
     <>

diff --git a/src/components/loginForms/loginWithEmail.tsx b/src/components/loginForms/loginWithEmail.tsx
@@ -1,16 +1,12 @@
 import React from "react";
-import { url } from "../../helpers/api";
 import LockImg from "@/../public/icons/lock.svg";
 import toast from "react-hot-toast";
-import { apiCall } from "@/helpers/api";
-export const LoginWithEmail = (params: { email: String }) => {
+import { loginWithEmail } from "@/helpers/api";
+export const LoginWithEmail = (params: { email: string }) => {
   const onClick = async () => {
     try {
       const { email } = params;
-      const response = await apiCall("/auth/passwordless", {
-          method: "POST",
-          body: { email },
-      });
+      const response = await loginWithEmail(email);
 
       if (response.ok) {
           toast.success("Email has been sent");

diff --git a/src/helpers/api.ts b/src/helpers/api.ts
@@ -166,8 +166,7 @@ export const assignRecruiter = async (
 };
 
 export const fetchAllJobs = async (
-
-  filter: string | undefined
+  filter?: string
 ) => {
   return apiCall(filter ? `/jobs?${filter}` : "/jobs", {
 
@@ -176,8 +175,7 @@ export const fetchAllJobs = async (
 };
 
 export const fetchStudentData = async (
-
-  filter: string | undefined
+  filter?: string
 ) => {
   return apiCall(filter ? `/students?${filter}` : "/students", {
 
@@ -258,8 +256,7 @@ export const promoteStudent = async (body: any, eventId: string) => {
 };
 
 export const fetchRecruiterData = async (
-
-  filter: string | undefined
+  filter?: string
 ) => {
 
   return apiCall(filter ? `/recruiters?${filter}` : "/recruiters", {
@@ -356,6 +353,7 @@ export const fetchRegistrationDataById = async (studentId: any) => {
 };
 
 
+
 //OnClick Functions
 
 export const createJobEvent = async (
@@ -401,4 +399,12 @@ export const deleteEvent = async (jobId: string, eventId: string) => {
   } catch (error) {
     throw new Error("Error deleting event");
   }
-};
+};
+
+export const loginWithEmail = async (email: string) => {
+  return apiCall("/auth/passwordless", {
+    method: "POST",
+    body: { email },
+  });
+}
+
diff --git a/src/helpers/auth.ts b/src/helpers/auth.ts
@@ -6,7 +6,6 @@ import type {
 import type { NextAuthOptions } from "next-auth";
 import { getServerSession } from "next-auth";
 import GoogleProvider from "next-auth/providers/google";
-import { format } from "path";
 
 // You'll need to import and pass this
 // to `NextAuth` in `app/api/auth/[...nextauth]/route.ts`