Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

June work #2

Open
wants to merge 16 commits into
base: user-role
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
303 changes: 236 additions & 67 deletions package-lock.json

Large diffs are not rendered by default.

19 changes: 17 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,18 @@
"lint": "next lint"
},
"dependencies": {
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.5",
"@faker-js/faker": "^8.4.1",
"@mui/icons-material": "^5.15.19",
"@mui/material": "^5.15.19",
"@mui/x-date-pickers": "^7.6.2",
"@radix-ui/colors": "^3.0.0",
"@radix-ui/react-accordion": "^1.1.2",
"@radix-ui/react-checkbox": "^1.0.4",
"@radix-ui/react-dialog": "^1.0.5",
"@radix-ui/react-dropdown-menu": "^2.0.6",
"@radix-ui/react-hover-card": "^1.0.7",
"@radix-ui/react-icons": "^1.3.0",
"@radix-ui/react-label": "^2.0.2",
"@radix-ui/react-popover": "^1.0.7",
Expand All @@ -30,26 +38,32 @@
"clsx": "^2.0.0",
"cmdk": "^0.2.0",
"csv-parser": "^3.0.0",
"dayjs": "^1.11.10",
"embla-carousel-react": "^8.0.0-rc19",
"export-to-csv": "^1.3.0",
"formik": "^2.4.5",
"formik-wizard-form": "^2.1.0",
"framer-motion": "^10.16.4",
"js-cookie": "^3.0.5",
"jwt-decode": "^4.0.0",
"lucide-react": "^0.378.0",
"next": "^14.2.3",
"lucide-react": "^0.302.0",
"material-icons": "^1.13.12",
"material-react-table": "^2.13.0",
"next": "^14.1.4",
"next-auth": "^4.23.2",
"papaparse": "^5.4.1",
"pdf-lib": "^1.17.1",
"prettier": "^3.1.1",
"qs": "^6.12.0",
"react": "latest",
"react-chronos": "^1.0.5",
"react-cool-onclickoutside": "^1.7.0",
"react-dom": "latest",
"react-google-button": "^0.7.2",
"react-hot-toast": "^2.4.1",
"react-icons": "^4.12.0",
"react-modal": "^3.16.1",
"react-onclickoutside": "^6.13.1",
"react-redux": "^9.0.4",
"react-responsive": "^10.0.0",
"react-table": "^7.8.0",
Expand All @@ -60,6 +74,7 @@
"yup": "^1.3.3"
},
"devDependencies": {
"@tailwindcss/forms": "^0.5.7",
"@types/js-cookie": "^3.0.6",
"@types/node": "latest",
"@types/papaparse": "^5.3.10",
Expand Down
58 changes: 25 additions & 33 deletions src/app/(routes)/admin/jobs/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,49 +2,41 @@
import { fetchAllJobs } from "@/helpers/api";
import Cookies from "js-cookie";
import TableComponent from "@/components/TableComponent/TableComponent";
import generateColumns from "@/components/TableComponent/ColumnMapping";
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";

const dto = [
{
id: "string",
seasonId: "string",
recruiterId: "string",
companyId: "string",
role: "string",
active: "boolean",
currentStatus: "string",
season: {
id: "string",
year: "string",
type: "string",
},
company: {
id: "string",
name: "string",
},
}
];
const hiddenColumns = ['id'];

const dynamicColumns = generateColumns(dto[0]);

const StudentPage = async () => {
const AllStudents = await fetchAllJobs(Cookies.get("accessToken"),undefined);
const JobPage = async () => {
const columnHelper = createMRTColumnHelper<RecruitmentDTO>();
const columns = generateColumns(recruitmentDTO)
console.log(columns)
const AllJobs = await fetchAllJobs(Cookies.get("accessToken"),undefined);
console.log(AllJobs)
const visibleColumns = columns.filter(
(column:any) => !hiddenColumns.includes(column?.accessorKey)
);
return (
<div className="m-10">
<h1 className="text-center font-bold text-3xl my-5 py-5">Jobs</h1>
<div>
{AllStudents && (
<TableComponent
isAddButton={true}
AddButtonText={"Add Students"}
data={AllStudents}
columns={dynamicColumns}
dto={dto}
{AllJobs && (
<Table
data={AllJobs}
columns={visibleColumns}
/>
)}
</div>
</div>
);
};

export default StudentPage;
export default JobPage;
2 changes: 1 addition & 1 deletion src/app/(routes)/admin/students/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ interface Props {
}

const AdminStudentLayout = ({ children }: Props) => {
return <div className="mx-2 my-4 rounded-md bg-white">{children}</div>;
return <div className="mx-2 py-4 rounded-md bg-white">{children}</div>;
};

export default AdminStudentLayout;
52 changes: 22 additions & 30 deletions src/app/(routes)/admin/students/page.tsx
Original file line number Diff line number Diff line change
@@ -1,46 +1,38 @@
"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 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 { jsondto } from "@/dto/StudentDto";

const dto = [
{
id: "string",
userId: "string",
programId: "string",
rollNo: "number",
category: "string",
gender: "MALE",
cpi: "number",
user: {
name: "string",
email: "string",
contact: "string",
},
program: {
course: "string",
branch: "string",
year: "number",
},
},
];

const dynamicColumns = generateColumns(dto[0]);
const hiddenColumns = ['userId', 'programId', 'id'];


const StudentPage = async () => {
const AllStudents = await fetchStudentData(Cookies.get("accessToken"),undefined);
const columnHelper = createMRTColumnHelper<DTO>();
const columns = generateColumns(jsondto)
console.log(columns)
const AllStudents = await fetchStudentData(Cookies.get("accessToken"),null);
const visibleColumns = columns.filter(
(column:any) => !hiddenColumns.includes(column?.accessorKey)
);

return (
<div className="m-10">
<h1 className="text-center font-bold text-3xl my-5 py-5">Students</h1>
<div>
{AllStudents && (
<TableComponent
isAddButton={true}
AddButtonText={"Add Students"}
<Table
data={AllStudents}
columns={dynamicColumns}
dto={dto}
columns={visibleColumns}
/>
)}
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/app/(routes)/recruiter/prevjaf/[jaf]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ const JAFPage = ({
return (
<>
{jafs.map((jaf,index) => (
<div className="my-3">
<div key={index} className="my-3">
<JafCard JAF={jaf}/>
</div>
))}
Expand Down
81 changes: 0 additions & 81 deletions src/app/(routes)/student/[studentId]/page.tsx

This file was deleted.

87 changes: 87 additions & 0 deletions src/app/(routes)/student/interviewExperiences/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
"use client";
import React, { useState } from "react";
import { Separator } from "../../../../components/ui/separator";
import {
Accordion,
AccordionItem,
AccordionTrigger,
AccordionContent,
} from '@radix-ui/react-accordion';
import { ChevronDownIcon } from '@radix-ui/react-icons';
import {interviewExpData} from "../../../../dummyData/Interviews";

// interface Props {
// interviewExpData: InterviewExperience[];
// }



interface InterviewExperience {
ques: string;
ans: string;
student_name: string;
difficulty:string,
tags:Array<string>;
}

const InterviewExperiencesPage = () => {
const [open, setOpen] = useState<boolean>(false);
return (
<div>
<div>
<h1 className="text-xl font-bold px-3 py-5">Interview Experiences</h1>
</div>
<Separator/>
<div>
<Accordion
className=""
type="single"
defaultValue="1"
collapsible

>
{interviewExpData.map((e,i)=>(

<AccordionItem key={i} value={String(i+1)}
className="py-6 px-4 bg-white my-3 rounded-xl hover:drop-shadow-[0_0px_10px_rgba(0,0,0,0.25)] ">
<AccordionTrigger
className="font-semibold px-1 flex"
>
{e.ques}
<ChevronDownIcon className="ml-3 mt-0.5"/>


</AccordionTrigger>

<AccordionContent
className="px-1 pt-4"
>
<Separator className="mb-3"/>
{e.ans}
<br/>
<div className="flex gap-3">
<div className=" bg-slate-400 text-white mt-3 font-semibold px-2 py-1 border rounded-3xl inline-block text-xs ">
By {e.student_name}
</div>
<div className=" text-slate-500 mt-3 font-semibold px-2 py-1 border rounded-3xl inline-block border-slate-500 text-xs ">
{e.difficulty}
</div>
<div className=" text-slate-500 mt-3 font-semibold px-2 py-1 border rounded-3xl inline-block border-slate-500 text-xs ">
{e.tags[0]}
</div>
<div className=" text-slate-500 mt-3 font-semibold px-2 py-1 border rounded-3xl inline-block border-slate-500 text-xs ">
{e.tags[1]}
</div>
</div>
</AccordionContent>
</AccordionItem>

))}
</Accordion>
</div>

</div>
)
}

export default InterviewExperiencesPage;
Loading