Skip to content

Job application tracker and AI-powered job search assistant. Helps job seekers manage their search journey with AI resume review, job matching, task logging, and application analytics, all while keeping your data private.

Filter jobs, add jobs applied count to companies

Khuram Niaz47dd868bf863
diff --git a/src/actions/company.actions.ts b/src/actions/company.actions.ts
new file mode 100644
index 0000000..386db5c
--- /dev/null
+++ b/src/actions/company.actions.ts
@@ -0,0 +1,41 @@
+"use server";
+import prisma from "@/lib/db";
+import { getCurrentUser } from "@/utils/user.utils";
+
+export const getCompanyList = async (
+ countBy?: string
+): Promise<any | undefined> => {
+ try {
+ const companies = await prisma.company.findMany({
+ ...(countBy
+ ? {
+ select: {
+ label: true,
+ value: true,
+ _count: {
+ select: {
+ jobsApplied: {
+ where: {
+ Status: {
+ value: countBy,
+ },
+ },
+ },
+ },
+ },
+ },
+ }
+ : {}),
+ // orderBy: {
+ // jobsApplied: {
+ // _count: "desc",
+ // },
+ // },
+ });
+ return companies;
+ } catch (error) {
+ const msg = "Failed to fetch company list. ";
+ console.error(msg, error);
+ throw new Error(msg);
+ }
+};
diff --git a/src/actions/job.actions.ts b/src/actions/job.actions.ts
index b5ad7b1..21dcb77 100644
--- a/src/actions/job.actions.ts
+++ b/src/actions/job.actions.ts
@@ -15,17 +15,6 @@ export const getStatusList = async (): Promise<any | undefined> => {
}
};
-export const getCompanyList = async (): Promise<any | undefined> => {
- try {
- const companies = await prisma.company.findMany();
- return companies;
- } catch (error) {
- const msg = "Failed to fetch company list. ";
- console.error(msg, error);
- throw new Error(msg);
- }
-};
-
export const getJobTitleList = async (): Promise<any | undefined> => {
try {
const list = await prisma.jobTitle.findMany();
@@ -61,7 +50,8 @@ export const getJobLocationList = async (): Promise<any | undefined> => {
export const getJobsList = async (
page = 1,
- limit = 10
+ limit = 10,
+ filter?: string
): Promise<any | undefined> => {
try {
const user = await getCurrentUser();
@@ -70,10 +60,19 @@ export const getJobsList = async (
throw new Error("Not authenticated");
}
const skip = (page - 1) * limit;
+
+ const filterBy = filter
+ ? {
+ Status: {
+ value: filter,
+ },
+ }
+ : {};
const [data, total] = await Promise.all([
prisma.job.findMany({
where: {
userId: user.id,
+ ...filterBy,
},
skip,
take: limit,
@@ -95,6 +94,7 @@ export const getJobsList = async (
prisma.job.count({
where: {
userId: user.id,
+ ...filterBy,
},
}),
]);
diff --git a/src/app/dashboard/admin/page.tsx b/src/app/dashboard/admin/page.tsx
index 6eaa113..b09d2de 100644
--- a/src/app/dashboard/admin/page.tsx
+++ b/src/app/dashboard/admin/page.tsx
@@ -1,9 +1,9 @@
-import { getCompanyList } from "@/actions/job.actions";
+import { getCompanyList } from "@/actions/company.actions";
import CompaniesTable from "@/components/CompaniesTable";
import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
async function AdminPage() {
- const companies = await getCompanyList();
+ const companies = await getCompanyList("applied");
return (
<div className="flex flex-col col-span-3">
<h3 className="text-2xl font-semibold leading-none tracking-tight mb-4">
diff --git a/src/app/dashboard/myjobs/page.tsx b/src/app/dashboard/myjobs/page.tsx
index 9f7af99..d8c9e20 100644
--- a/src/app/dashboard/myjobs/page.tsx
+++ b/src/app/dashboard/myjobs/page.tsx
@@ -1,13 +1,13 @@
import { Metadata } from "next";
import {
- getCompanyList,
getJobLocationList,
getJobSourceList,
getJobTitleList,
getStatusList,
} from "@/actions/job.actions";
import JobsContainer from "@/components/JobsContainer";
+import { getCompanyList } from "@/actions/company.actions";
export const metadata: Metadata = {
title: "My Jobs | JobSync",
diff --git a/src/components/AddJob.tsx b/src/components/AddJob.tsx
index 0043bc6..f84b170 100644
--- a/src/components/AddJob.tsx
+++ b/src/components/AddJob.tsx
@@ -131,7 +131,7 @@ export function AddJob({
<Dialog open={dialogOpen} onOpenChange={setDialogOpen}>
{/* <DialogTrigger asChild></DialogTrigger> */}
<DialogOverlay>
- <DialogContent className="lg:max-w-screen-lg lg:max-h-screen overflow-y-scroll">
+ <DialogContent className="h-full xl:h-[85vh] lg:h-[95vh] lg:max-w-screen-lg lg:max-h-screen overflow-y-scroll">
<DialogHeader>
<DialogTitle>{pageTitle}</DialogTitle>
</DialogHeader>
@@ -209,6 +209,7 @@ export function AddJob({
<FormItem className="flex flex-col">
<FormLabel className="mb-2">Job Type</FormLabel>
<RadioGroup
+ name="type"
onValueChange={field.onChange}
defaultValue={field.value}
className="flex space-y-1"
diff --git a/src/components/CompaniesTable.tsx b/src/components/CompaniesTable.tsx
index 9267114..94cdef8 100644
--- a/src/components/CompaniesTable.tsx
+++ b/src/components/CompaniesTable.tsx
@@ -1,3 +1,4 @@
+"use client";
import { Button } from "./ui/button";
import Image from "next/image";
@@ -26,10 +27,17 @@ import {
CardHeader,
CardTitle,
} from "./ui/card";
-import { Dialog, DialogContent, DialogTrigger } from "./ui/dialog";
+import { Dialog, DialogContent } from "./ui/dialog";
import { Company } from "@/models/job.model";
+import { useState } from "react";
function CompaniesTable({ companies }: { companies: Company[] }) {
+ const [dialogOpen, setDialogOpen] = useState(false);
+ const addCompanyForm = () => {
+ // reset();
+ // resetEditJob();
+ setDialogOpen(true);
+ };
return (
<div className="col-span-3">
<Card x-chunk="dashboard-06-chunk-0">
@@ -37,41 +45,13 @@ function CompaniesTable({ companies }: { companies: Company[] }) {
<CardTitle>Companies</CardTitle>
<div className="flex items-center">
<div className="ml-auto flex items-center gap-2">
- <DropdownMenu>
- <DropdownMenuTrigger asChild>
- <Button variant="outline" size="sm" className="h-8 gap-1">
- <ListFilter className="h-3.5 w-3.5" />
- <span className="sr-only sm:not-sr-only sm:whitespace-nowrap">
- Filter
- </span>
- </Button>
- </DropdownMenuTrigger>
- <DropdownMenuContent align="end">
- <DropdownMenuLabel>Filter by</DropdownMenuLabel>
- <DropdownMenuSeparator />
- <DropdownMenuCheckboxItem checked>
- Applied
- </DropdownMenuCheckboxItem>
- <DropdownMenuCheckboxItem>Draft</DropdownMenuCheckboxItem>
- <DropdownMenuCheckboxItem>Interview</DropdownMenuCheckboxItem>
- <DropdownMenuCheckboxItem>Archived</DropdownMenuCheckboxItem>
- </DropdownMenuContent>
- </DropdownMenu>
- <Button size="sm" variant="outline" className="h-8 gap-1">
- <File className="h-3.5 w-3.5" />
+ <Button size="sm" className="h-8 gap-1" onClick={addCompanyForm}>
+ <PlusCircle className="h-3.5 w-3.5" />
<span className="sr-only sm:not-sr-only sm:whitespace-nowrap">
- Export
+ Add Company
</span>
</Button>
- <Dialog>
- <DialogTrigger asChild>
- <Button size="sm" className="h-8 gap-1">
- <PlusCircle className="h-3.5 w-3.5" />
- <span className="sr-only sm:not-sr-only sm:whitespace-nowrap">
- Add Company
- </span>
- </Button>
- </DialogTrigger>
+ <Dialog open={dialogOpen} onOpenChange={setDialogOpen}>
<DialogContent className="lg:max-w-screen-lg lg:max-h-screen overflow-y-scroll"></DialogContent>
</Dialog>
</div>
@@ -86,6 +66,7 @@ function CompaniesTable({ companies }: { companies: Company[] }) {
</TableHead>
<TableHead>Company Name</TableHead>
<TableHead>Value</TableHead>
+ <TableHead>Jobs Applied</TableHead>
<TableHead>Actions</TableHead>
<TableHead>
<span className="sr-only">Actions</span>
@@ -93,7 +74,7 @@ function CompaniesTable({ companies }: { companies: Company[] }) {
</TableRow>
</TableHeader>
<TableBody>
- {companies.map((company: any) => {
+ {companies.map((company: Company) => {
return (
<TableRow key={company.id}>
<TableCell className="hidden sm:table-cell">
@@ -111,6 +92,9 @@ function CompaniesTable({ companies }: { companies: Company[] }) {
<TableCell className="font-medium">
{company.value}
</TableCell>
+ <TableCell className="font-medium">
+ {company._count?.jobsApplied}
+ </TableCell>
<TableCell>
<DropdownMenu>
<DropdownMenuTrigger asChild>
diff --git a/src/components/JobsContainer.tsx b/src/components/JobsContainer.tsx
index 062ae35..5575206 100644
--- a/src/components/JobsContainer.tsx
+++ b/src/components/JobsContainer.tsx
@@ -7,14 +7,7 @@ import {
CardHeader,
CardTitle,
} from "./ui/card";
-import {
- DropdownMenu,
- DropdownMenuCheckboxItem,
- DropdownMenuContent,
- DropdownMenuLabel,
- DropdownMenuSeparator,
- DropdownMenuTrigger,
-} from "./ui/dropdown-menu";
+import { DropdownMenuSeparator } from "./ui/dropdown-menu";
import { Button } from "./ui/button";
import { File, ListFilter } from "lucide-react";
import MyJobsTable from "./MyJobsTable";
@@ -33,6 +26,15 @@ import {
JobStatus,
JobTitle,
} from "@/models/job.model";
+import {
+ Select,
+ SelectContent,
+ SelectGroup,
+ SelectItem,
+ SelectLabel,
+ SelectTrigger,
+ SelectValue,
+} from "./ui/select";
type MyJobsProps = {
statuses: JobStatus[];
@@ -58,9 +60,8 @@ function JobsContainer({
const totalPages = Math.ceil(totalJobs / jobsPerPage);
- const loadJobs = async (page: number) => {
- const { data, total } = await getJobsList(page, jobsPerPage);
-
+ const loadJobs = async (page: number, filter?: string) => {
+ const { data, total } = await getJobsList(page, jobsPerPage, filter);
setJobs(data);
setTotalJobs(total);
};
@@ -92,6 +93,10 @@ function JobsContainer({
loadJobs(currentPage);
}, [currentPage]);
+ const onFilterChange = (filterBy: string) => {
+ filterBy === "none" ? reloadJobs() : loadJobs(1, filterBy);
+ };
+
return (
<>
<Card x-chunk="dashboard-06-chunk-0">
@@ -99,26 +104,23 @@ function JobsContainer({
<CardTitle>My Jobs</CardTitle>
<div className="flex items-center">
<div className="ml-auto flex items-center gap-2">
- <DropdownMenu>
- <DropdownMenuTrigger asChild>
- <Button variant="outline" size="sm" className="h-8 gap-1">
- <ListFilter className="h-3.5 w-3.5" />
- <span className="sr-only sm:not-sr-only sm:whitespace-nowrap">
- Filter
- </span>
- </Button>
- </DropdownMenuTrigger>
- <DropdownMenuContent align="end">
- <DropdownMenuLabel>Filter by</DropdownMenuLabel>
- <DropdownMenuSeparator />
- <DropdownMenuCheckboxItem checked>
- Applied
- </DropdownMenuCheckboxItem>
- <DropdownMenuCheckboxItem>Draft</DropdownMenuCheckboxItem>
- <DropdownMenuCheckboxItem>Interview</DropdownMenuCheckboxItem>
- <DropdownMenuCheckboxItem>Archived</DropdownMenuCheckboxItem>
- </DropdownMenuContent>
- </DropdownMenu>
+ <Select onValueChange={onFilterChange}>
+ <SelectTrigger className="w-[120px] h-8">
+ <ListFilter className="h-3.5 w-3.5" />
+ <SelectValue placeholder="Filter" />
+ </SelectTrigger>
+ <SelectContent>
+ <SelectGroup>
+ <SelectLabel>Filter by</SelectLabel>
+ <DropdownMenuSeparator />
+ <SelectItem value="none">None</SelectItem>
+ <SelectItem value="applied">Applied</SelectItem>
+ <SelectItem value="interview">Interview</SelectItem>
+ <SelectItem value="draft">Draft</SelectItem>
+ <SelectItem value="rejected">Rejected</SelectItem>
+ </SelectGroup>
+ </SelectContent>
+ </Select>
<Button size="sm" variant="outline" className="h-8 gap-1">
<File className="h-3.5 w-3.5" />
<span className="sr-only sm:not-sr-only sm:whitespace-nowrap">
diff --git a/src/components/MyJobsTable.tsx b/src/components/MyJobsTable.tsx
index 134d274..2aec3fd 100644
--- a/src/components/MyJobsTable.tsx
+++ b/src/components/MyJobsTable.tsx
@@ -259,11 +259,13 @@ function MyJobsTable({
of
<strong> {totalJobs}</strong> jobs
</div>
- <TablePagination
- currentPage={currentPage}
- totalPages={totalPages}
- onPageChange={onPageChange}
- />
+ {totalJobs > jobsPerPage ? (
+ <TablePagination
+ currentPage={currentPage}
+ totalPages={totalPages}
+ onPageChange={onPageChange}
+ />
+ ) : null}
<AlertDialog open={alertOpen} onOpenChange={setAlertOpen}>
<AlertDialogContent>
<AlertDialogHeader>
diff --git a/src/components/ui/dialog.tsx b/src/components/ui/dialog.tsx
index bc8aecb..42b363d 100644
--- a/src/components/ui/dialog.tsx
+++ b/src/components/ui/dialog.tsx
@@ -38,7 +38,7 @@ const DialogContent = React.forwardRef<
<DialogPrimitive.Content
ref={ref}
className={cn(
- "h-full xl:h-[85vh] lg:h-[95vh] fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg",
+ "fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg",
className
)}
{...props}
diff --git a/src/models/job.model.ts b/src/models/job.model.ts
index caf586c..4402fe6 100644
--- a/src/models/job.model.ts
+++ b/src/models/job.model.ts
@@ -26,6 +26,9 @@ export interface Company {
value: string;
createdBy: string;
logoUrl?: string;
+ _count?: {
+ jobsApplied: number;
+ };
}
export interface JobStatus {