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.
TypeScript ai-agentai-resume-analyzerapplication-trackerapplication-tracking-systematscareerjob-applicationjob-automationjob-huntingjob-searchjob-seeker-toolsjob-trackerjob-trackingjobsearchjobseekersmcpollamaresumeresume-reviewself-hosted
Refactor: Add job form
Khuram Niaza0f31d09ffbc
diff --git a/src/app/dashboard/myjobs/page.tsx b/src/app/dashboard/myjobs/page.tsxindex c1fb972..f105b33 100644--- a/src/app/dashboard/myjobs/page.tsx+++ b/src/app/dashboard/myjobs/page.tsx@@ -1,4 +1,4 @@-import { File, ListFilter, PlusCircle } from "lucide-react";+import { File, ListFilter } from "lucide-react";import { Button } from "@/components/ui/button";import {@@ -17,22 +17,29 @@ import {DropdownMenuTrigger,} from "@/components/ui/dropdown-menu";import { Metadata } from "next";-import {- Dialog,- DialogContent,- DialogOverlay,- DialogTrigger,-} from "@/components/ui/dialog";import { AddJob } from "@/components/AddJob";-import { getJobsList } from "@/actions/job.actions";import MyJobsTable from "@/components/MyJobsTable";+import {+ getCompanyList,+ getJobLocationList,+ getJobSourceList,+ getJobTitleList,+ getStatusList,+} from "@/actions/job.actions";export const metadata: Metadata = {title: "My Jobs | JobSync",};async function MyJobs() {+ const [statuses, companies, titles, locations, sources] = await Promise.all([+ getStatusList(),+ getCompanyList(),+ getJobTitleList(),+ getJobLocationList(),+ getJobSourceList(),+ ]);return (<div className="col-span-3"><Card x-chunk="dashboard-06-chunk-0">@@ -66,21 +73,13 @@ async function MyJobs() {Export</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 Job- </span>- </Button>- </DialogTrigger>- <DialogOverlay>- <DialogContent className="lg:max-w-screen-lg lg:max-h-screen overflow-y-scroll">- <AddJob />- </DialogContent>- </DialogOverlay>- </Dialog>+ <AddJob+ jobStatuses={statuses}+ companies={companies}+ jobTitles={titles}+ locations={locations}+ jobSources={sources}+ /></div></div></CardHeader>diff --git a/src/components/AddJob.tsx b/src/components/AddJob.tsxindex cf6a39e..61fca36 100644--- a/src/components/AddJob.tsx+++ b/src/components/AddJob.tsx@@ -1,33 +1,318 @@-import { DialogHeader, DialogTitle } from "@/components/ui/dialog";-import AddJobForm from "./AddJobForm";+"use client";import {- getCompanyList,- getJobLocationList,- getJobSourceList,- getJobTitleList,- getStatusList,-} from "@/actions/job.actions";+ Dialog,+ DialogClose,+ DialogContent,+ DialogHeader,+ DialogOverlay,+ DialogTitle,+ DialogTrigger,+ DialogFooter,+} from "@/components/ui/dialog";+import { addJob } from "@/actions/job.actions";+import { Loader, PlusCircle } from "lucide-react";+import { Button } from "./ui/button";+import { useForm } from "react-hook-form";+import { useState, useTransition } from "react";+import { AddJobFormSchema } from "@/models/addJobForm.schema";+import { zodResolver } from "@hookform/resolvers/zod";+import { JOB_TYPES } from "@/models/job.model";+import { addDays } from "date-fns";+import { z } from "zod";+import { toast } from "./ui/use-toast";+import {+ Form,+ FormControl,+ FormField,+ FormItem,+ FormLabel,+ FormMessage,+} from "./ui/form";+import { Combobox } from "./ComboBox";+import { RadioGroup, RadioGroupItem } from "./ui/radio-group";+import SelectFormCtrl from "./Select";+import { DatePicker } from "./DatePicker";+import { SALARY_RANGES } from "@/lib/data/salaryRangeData";+import TiptapEditor from "./TiptapEditor";++interface AddJobProps {+ jobStatuses: { id: string; label: string; value: string }[];+ companies: any[];+ jobTitles: { id: string; label: string; value: string }[];+ locations: { id: string; label: string; value: string }[];+ jobSources: { id: string; label: string; value: string }[];+}++export function AddJob({+ jobStatuses,+ companies,+ jobTitles,+ locations,+ jobSources,+}: AddJobProps) {+ const [dialogOpen, setDialogOpen] = useState(false);+ const [isPending, startTransition] = useTransition();++ const form = useForm<z.infer<typeof AddJobFormSchema>>({+ resolver: zodResolver(AddJobFormSchema),+ // mode: "onChange",+ defaultValues: {+ type: Object.keys(JOB_TYPES)[0],+ dateApplied: new Date(),+ dueDate: addDays(new Date(), 3),+ status: jobStatuses[0].id,+ salaryRange: "1",+ },+ });++ function onSubmit(data: z.infer<typeof AddJobFormSchema>) {+ console.log("add job form data: ", data);+ startTransition(async () => {+ const res = await addJob(data);+ form.reset();+ setDialogOpen(false);+ });+ toast({+ description: "Job has been created successfully",+ });+ }-export async function AddJob() {- const [statuses, companies, titles, locations, sources] = await Promise.all([- getStatusList(),- getCompanyList(),- getJobTitleList(),- getJobLocationList(),- getJobSourceList(),- ]);return (<>- <DialogHeader>- <DialogTitle>Add Job</DialogTitle>- </DialogHeader>- <AddJobForm- jobStatuses={statuses}- companies={companies}- jobTitles={titles}- locations={locations}- jobSources={sources}- />+ <Dialog open={dialogOpen} onOpenChange={setDialogOpen}>+ <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 Job+ </span>+ </Button>+ </DialogTrigger>+ <DialogOverlay>+ <DialogContent className="lg:max-w-screen-lg lg:max-h-screen overflow-y-scroll">+ <DialogHeader>+ <DialogTitle>Add Job</DialogTitle>+ </DialogHeader>+ <Form {...form}>+ <form+ onSubmit={form.handleSubmit(onSubmit)}+ className="grid grid-cols-1 md:grid-cols-2 gap-4 p-4"+ >+ {/* Job Title */}+ <div>+ <FormField+ control={form.control}+ name="title"+ render={({ field }) => (+ <FormItem className="flex flex-col">+ <FormLabel>Job Title</FormLabel>+ <FormControl>+ <Combobox+ options={jobTitles}+ field={field}+ creatable+ />+ </FormControl>+ <FormMessage />+ </FormItem>+ )}+ />+ </div>+ {/* Company */}+ <div>+ <FormField+ control={form.control}+ name="company"+ render={({ field }) => (+ <FormItem className="flex flex-col">+ <FormLabel>Company</FormLabel>+ <FormControl>+ <Combobox+ options={companies}+ field={field}+ creatable+ />+ </FormControl>+ <FormMessage />+ </FormItem>+ )}+ />+ </div>+ {/* Location */}+ <div>+ <FormField+ control={form.control}+ name="location"+ render={({ field }) => (+ <FormItem className="flex flex-col">+ <FormLabel>Job Location</FormLabel>+ <FormControl>+ <Combobox+ options={locations}+ field={field}+ creatable+ />+ </FormControl>+ <FormMessage />+ </FormItem>+ )}+ />+ </div>+ {/* Job Type */}+ <div>+ <FormField+ control={form.control}+ name="type"+ render={({ field }) => (+ <FormItem className="flex flex-col">+ <FormLabel className="mb-2">Job Type</FormLabel>+ <RadioGroup+ onValueChange={field.onChange}+ defaultValue={field.value}+ className="flex space-y-1"+ >+ {Object.entries(JOB_TYPES).map(([key, value]) => (+ <FormItem+ key={key}+ className="flex items-center space-x-3 space-y-0"+ >+ <FormControl>+ <RadioGroupItem value={key} />+ </FormControl>+ <FormLabel className="font-normal">+ {value}+ </FormLabel>+ </FormItem>+ ))}+ </RadioGroup>+ <FormMessage />+ </FormItem>+ )}+ />+ </div>+ {/* Job Source */}+ <div>+ <FormField+ control={form.control}+ name="source"+ render={({ field }) => (+ <FormItem className="flex flex-col">+ <FormLabel>Job Source</FormLabel>+ <Combobox options={jobSources} field={field} />+ <FormMessage />+ </FormItem>+ )}+ />+ </div>+ {/* Status */}+ <div>+ <FormField+ control={form.control}+ name="status"+ render={({ field }) => (+ <FormItem className="flex flex-col [&>button]:capitalize">+ <FormLabel>Status</FormLabel>+ <SelectFormCtrl+ label="Job Status"+ options={jobStatuses}+ field={field}+ />+ <FormMessage />+ </FormItem>+ )}+ />+ </div>+ {/* Due Date */}+ <div>+ <FormField+ control={form.control}+ name="dueDate"+ render={({ field }) => (+ <FormItem className="flex flex-col">+ <FormLabel>Due Date</FormLabel>+ <DatePicker field={field} presets={true} />+ <FormMessage />+ </FormItem>+ )}+ />+ </div>+ {/* Date Applied */}+ <div className="flex flex-col">+ <FormField+ control={form.control}+ name="dateApplied"+ render={({ field }) => (+ <FormItem className="flex flex-col">+ <FormLabel>Date Applied</FormLabel>+ <DatePicker field={field} presets={false} />+ <FormMessage />+ </FormItem>+ )}+ />+ </div>+ {/* Salary Range */}+ <div>+ <FormField+ control={form.control}+ name="salaryRange"+ render={({ field }) => (+ <FormItem className="flex flex-col">+ <FormLabel>Salary Range</FormLabel>+ <FormControl>+ <SelectFormCtrl+ label="Salary Range"+ options={SALARY_RANGES}+ field={field}+ />+ </FormControl>+ <FormMessage />+ </FormItem>+ )}+ />+ </div>++ {/* Job Description */}+ <div className="md:col-span-2">+ <FormField+ control={form.control}+ name="jobDescription"+ render={({ field }) => (+ <FormItem className="flex flex-col">+ <FormLabel>Job Description</FormLabel>+ <FormControl>+ <TiptapEditor field={field} />+ </FormControl>+ <FormMessage />+ </FormItem>+ )}+ />+ </div>+ <div className="md:col-span-2">+ <DialogFooter+ // className="md:col-span+ >+ <DialogClose>+ <Button+ type="reset"+ variant="outline"+ className="mt-2 md:mt-0 w-full"+ >+ Cancel+ </Button>+ </DialogClose>+ <Button type="submit">+ Save+ {isPending ? (+ <Loader className="h-4 w-4 shrink-0 spinner" />+ ) : null}+ </Button>+ </DialogFooter>+ </div>+ </form>+ </Form>+ </DialogContent>+ </DialogOverlay>+ </Dialog></>);}diff --git a/src/components/AddJobForm.tsx b/src/components/AddJobForm.tsxdeleted file mode 100644index cb132ad..0000000--- a/src/components/AddJobForm.tsx+++ /dev/null@@ -1,281 +0,0 @@-"use client";-import { Button } from "@/components/ui/button";-import { DialogClose, DialogFooter } from "@/components/ui/dialog";-import {- Form,- FormControl,- FormField,- FormItem,- FormLabel,- FormMessage,-} from "@/components/ui/form";-import { Textarea } from "./ui/textarea";-import { z } from "zod";-import { AddJobFormSchema } from "@/models/addJobForm.schema";-import { useForm } from "react-hook-form";-import { zodResolver } from "@hookform/resolvers/zod";-import { toast } from "./ui/use-toast";-import { Combobox } from "./ComboBox";-import { DatePicker } from "./DatePicker";-import SelectFormCtrl from "./Select";-import { SALARY_RANGES } from "@/lib/data/salaryRangeData";-import { useRef, useTransition } from "react";-import { addDays } from "date-fns";-import { addJob } from "@/actions/job.actions";-import { Loader } from "lucide-react";-import { RadioGroup, RadioGroupItem } from "./ui/radio-group";-import { JOB_TYPES } from "@/models/job.model";-import { useRouter } from "next/router";-import { redirect } from "next/navigation";-import TiptapEditor from "./TiptapEditor";--interface AddJobFormProps {- jobStatuses: { id: string; label: string; value: string }[];- companies: any[];- jobTitles: { id: string; label: string; value: string }[];- locations: { id: string; label: string; value: string }[];- jobSources: { id: string; label: string; value: string }[];-}--export default function AddJobForm({- jobStatuses,- companies,- jobTitles,- locations,- jobSources,-}: AddJobFormProps) {- const [isPending, startTransition] = useTransition();-- const form = useForm<z.infer<typeof AddJobFormSchema>>({- resolver: zodResolver(AddJobFormSchema),- // mode: "onChange",- defaultValues: {- type: Object.keys(JOB_TYPES)[0],- dateApplied: new Date(),- dueDate: addDays(new Date(), 3),- status: jobStatuses[0].id,- salaryRange: "1",- // jobDescription: "Job details are provided here",- },- });-- function onSubmit(data: z.infer<typeof AddJobFormSchema>) {- console.log("add job form data: ", data);- startTransition(async () => {- const res = await addJob(data);- form.reset();- redirect("/dashboard/myjobs");- });- toast({- description: "Job has been created successfully",- });- }-- return (- <>- <Form {...form}>- <form- onSubmit={form.handleSubmit(onSubmit)}- className="grid grid-cols-1 md:grid-cols-2 gap-4 p-4"- >- {/* Job Title */}- <div>- <FormField- control={form.control}- name="title"- render={({ field }) => (- <FormItem className="flex flex-col">- <FormLabel>Job Title</FormLabel>- <FormControl>- <Combobox options={jobTitles} field={field} creatable />- </FormControl>- <FormMessage />- </FormItem>- )}- />- </div>- {/* Company */}- <div>- <FormField- control={form.control}- name="company"- render={({ field }) => (- <FormItem className="flex flex-col">- <FormLabel>Company</FormLabel>- <FormControl>- <Combobox options={companies} field={field} creatable />- </FormControl>- <FormMessage />- </FormItem>- )}- />- </div>- {/* Location */}- <div>- <FormField- control={form.control}- name="location"- render={({ field }) => (- <FormItem className="flex flex-col">- <FormLabel>Job Location</FormLabel>- <FormControl>- <Combobox options={locations} field={field} creatable />- </FormControl>- <FormMessage />- </FormItem>- )}- />- </div>- {/* Job Type */}- <div>- <FormField- control={form.control}- name="type"- render={({ field }) => (- <FormItem className="flex flex-col">- <FormLabel className="mb-2">Job Type</FormLabel>- <RadioGroup- onValueChange={field.onChange}- defaultValue={field.value}- className="flex space-y-1"- >- {Object.entries(JOB_TYPES).map(([key, value]) => (- <FormItem- key={key}- className="flex items-center space-x-3 space-y-0"- >- <FormControl>- <RadioGroupItem value={key} />- </FormControl>- <FormLabel className="font-normal">{value}</FormLabel>- </FormItem>- ))}- </RadioGroup>- <FormMessage />- </FormItem>- )}- />- </div>- {/* Job Source */}- <div>- <FormField- control={form.control}- name="source"- render={({ field }) => (- <FormItem className="flex flex-col">- <FormLabel>Job Source</FormLabel>- <Combobox options={jobSources} field={field} />- <FormMessage />- </FormItem>- )}- />- </div>- {/* Status */}- <div>- <FormField- control={form.control}- name="status"- render={({ field }) => (- <FormItem className="flex flex-col [&>button]:capitalize">- <FormLabel>Status</FormLabel>- <SelectFormCtrl- label="Job Status"- options={jobStatuses}- field={field}- />- <FormMessage />- </FormItem>- )}- />- </div>- {/* Due Date */}- <div>- <FormField- control={form.control}- name="dueDate"- render={({ field }) => (- <FormItem className="flex flex-col">- <FormLabel>Due Date</FormLabel>- <DatePicker field={field} presets={true} />- <FormMessage />- </FormItem>- )}- />- </div>- {/* Date Applied */}- <div className="flex flex-col">- <FormField- control={form.control}- name="dateApplied"- render={({ field }) => (- <FormItem className="flex flex-col">- <FormLabel>Date Applied</FormLabel>- <DatePicker field={field} presets={false} />- <FormMessage />- </FormItem>- )}- />- </div>- {/* Salary Range */}- <div>- <FormField- control={form.control}- name="salaryRange"- render={({ field }) => (- <FormItem className="flex flex-col">- <FormLabel>Salary Range</FormLabel>- <FormControl>- <SelectFormCtrl- label="Salary Range"- options={SALARY_RANGES}- field={field}- />- </FormControl>- <FormMessage />- </FormItem>- )}- />- </div>-- {/* Job Description */}- <div className="md:col-span-2">- <FormField- control={form.control}- name="jobDescription"- render={({ field }) => (- <FormItem className="flex flex-col">- <FormLabel>Job Description</FormLabel>- <FormControl>- <TiptapEditor field={field} />- </FormControl>- <FormMessage />- </FormItem>- )}- />- </div>- <div className="md:col-span-2">- <DialogFooter- // className="md:col-span- >- <DialogClose>- <Button- type="reset"- variant="outline"- className="mt-2 md:mt-0 w-full"- >- Cancel- </Button>- </DialogClose>- <Button type="submit">- Save- {isPending ? (- <Loader className="h-4 w-4 shrink-0 spinner" />- ) : null}- </Button>- </DialogFooter>- </div>- </form>- </Form>- </>- );-}