From 4901841eb36f318d4e1b0338a3aff2ce0133352b Mon Sep 17 00:00:00 2001
From: Deepanshu Mishra <d4deepanshu723@gmail.com>
Date: Mon, 21 Oct 2024 12:02:33 +0530
Subject: [PATCH 01/13] init

---
 src/app/onboarding/page.tsx    | 114 +++++++++++++++++++++++++++++++++
 src/components/auth/signup.tsx |   2 +-
 src/config/path.config.ts      |   1 +
 3 files changed, 116 insertions(+), 1 deletion(-)
 create mode 100644 src/app/onboarding/page.tsx

diff --git a/src/app/onboarding/page.tsx b/src/app/onboarding/page.tsx
new file mode 100644
index 00000000..3829af44
--- /dev/null
+++ b/src/app/onboarding/page.tsx
@@ -0,0 +1,114 @@
+'use client';
+
+import { useState } from 'react';
+import { useRouter } from 'next/navigation';
+import {
+  Dialog,
+  DialogContent,
+  DialogHeader,
+  DialogTitle,
+  DialogDescription,
+} from '@/components/ui/dialog';
+import { Button } from '@/components/ui/button';
+import { RadioGroup, RadioGroupItem } from '@/components/ui/radio-group';
+import { Label } from '@/components/ui/label';
+import { Input } from '@/components/ui/input';
+import { Textarea } from '@/components/ui/textarea';
+import { Building, Check } from 'lucide-react';
+
+export default function OnboardingPage() {
+  const [isOpen, setIsOpen] = useState(true);
+  const [selectedRole, setSelectedRole] = useState<string | null>(null);
+  const [showCompanySetup, setShowCompanySetup] = useState(false);
+  const [showConfirmation, setShowConfirmation] = useState(false);
+  const router = useRouter();
+
+  const handleRoleSelection = (role: string) => {
+    setSelectedRole(role);
+    if (role === 'jobSeeker') {
+      router.push('/login');
+    } else if (role === 'hr') {
+      setShowCompanySetup(true);
+    }
+    setIsOpen(false);
+  };
+
+  const handleCompanySetup = (e: React.FormEvent) => {
+    e.preventDefault();
+    setShowCompanySetup(false);
+    setShowConfirmation(true);
+  };
+
+  return (
+    <div className="min-h-screen flex items-center justify-center bg-gray-100">
+      <Dialog open={isOpen} onOpenChange={setIsOpen}>
+        <DialogContent className="sm:max-w-[425px]">
+          <DialogHeader>
+            <DialogTitle>Choose your role</DialogTitle>
+            <DialogDescription>
+              Select a role to personalize your experience
+            </DialogDescription>
+          </DialogHeader>
+          <RadioGroup onValueChange={handleRoleSelection}>
+            <div className="flex items-center space-x-2">
+              <RadioGroupItem value="jobSeeker" id="jobSeeker" />
+              <Label htmlFor="jobSeeker">Job Seeker</Label>
+            </div>
+            <div className="flex items-center space-x-2">
+              <RadioGroupItem value="hr" id="hr" />
+              <Label htmlFor="hr">HR</Label>
+            </div>
+          </RadioGroup>
+        </DialogContent>
+      </Dialog>
+
+      <Dialog open={showCompanySetup} onOpenChange={setShowCompanySetup}>
+        <DialogContent className="sm:max-w-[425px]">
+          <DialogHeader>
+            <DialogTitle>Set up your company profile</DialogTitle>
+          </DialogHeader>
+          <form onSubmit={handleCompanySetup} className="space-y-4">
+            <div className="flex justify-center">
+              <Building className="w-16 h-16 text-gray-400" />
+            </div>
+            <Input
+              type="file"
+              accept="image/*"
+              placeholder="Upload Company Logo"
+            />
+            <Input placeholder="Company Name" required />
+            <Input placeholder="Company Website" required />
+            <Textarea placeholder="Description" required />
+            <Button type="submit" className="w-full">
+              Finish Setup for {selectedRole}
+            </Button>
+          </form>
+        </DialogContent>
+      </Dialog>
+
+      <Dialog open={showConfirmation} onOpenChange={setShowConfirmation}>
+        <DialogContent className="sm:max-w-[425px] text-center">
+          <div className="flex justify-center mb-4">
+            <div className="rounded-full bg-green-100 p-3">
+              <Check className="w-8 h-8 text-green-600" />
+            </div>
+          </div>
+          <DialogTitle>You are All Set</DialogTitle>
+          <DialogDescription>Start posting jobs</DialogDescription>
+          <div className="flex flex-col gap-2 mt-4">
+            <Button onClick={() => router.push('/login')}>
+              Post your First Job
+            </Button>
+            <Button variant="outline" onClick={() => router.push('/')}>
+              Go to Home
+            </Button>
+          </div>
+        </DialogContent>
+      </Dialog>
+
+      <h1 className="text-4xl font-bold text-gray-800">
+        Welcome to Our Platform
+      </h1>
+    </div>
+  );
+}
diff --git a/src/components/auth/signup.tsx b/src/components/auth/signup.tsx
index 7f66aa73..e66d1bef 100644
--- a/src/components/auth/signup.tsx
+++ b/src/components/auth/signup.tsx
@@ -51,7 +51,7 @@ export const Signup = () => {
           variant: 'success',
         });
 
-        router.push(APP_PATHS.WELCOME);
+        router.push(APP_PATHS.ONBOARDING);
       }
     } catch {
       toast({
diff --git a/src/config/path.config.ts b/src/config/path.config.ts
index 60bd264b..cc77499f 100644
--- a/src/config/path.config.ts
+++ b/src/config/path.config.ts
@@ -19,5 +19,6 @@ const APP_PATHS = {
   RESUME: '/profile/resume',
   EXPERIENCE: '/profile/experience',
   SKILLS: '/profile/skills',
+  ONBOARDING: '/onboarding',
 };
 export default APP_PATHS;

From 84b2f10b14ea7a36cd559fa6debc189e74bb973c Mon Sep 17 00:00:00 2001
From: Deepanshu Mishra <d4deepanshu723@gmail.com>
Date: Mon, 21 Oct 2024 18:05:05 +0530
Subject: [PATCH 02/13] added_onboarding component

---
 src/app/onboarding/page.tsx          | 119 ++-------------------
 src/components/Onboarding.tsx        | 149 +++++++++++++++++++++++++++
 src/components/auth/signup.tsx       |  31 +++++-
 src/lib/validators/auth.validator.ts |   1 +
 4 files changed, 184 insertions(+), 116 deletions(-)
 create mode 100644 src/components/Onboarding.tsx

diff --git a/src/app/onboarding/page.tsx b/src/app/onboarding/page.tsx
index 3829af44..c8574a55 100644
--- a/src/app/onboarding/page.tsx
+++ b/src/app/onboarding/page.tsx
@@ -1,114 +1,11 @@
-'use client';
-
-import { useState } from 'react';
-import { useRouter } from 'next/navigation';
-import {
-  Dialog,
-  DialogContent,
-  DialogHeader,
-  DialogTitle,
-  DialogDescription,
-} from '@/components/ui/dialog';
-import { Button } from '@/components/ui/button';
-import { RadioGroup, RadioGroupItem } from '@/components/ui/radio-group';
-import { Label } from '@/components/ui/label';
-import { Input } from '@/components/ui/input';
-import { Textarea } from '@/components/ui/textarea';
-import { Building, Check } from 'lucide-react';
-
-export default function OnboardingPage() {
-  const [isOpen, setIsOpen] = useState(true);
-  const [selectedRole, setSelectedRole] = useState<string | null>(null);
-  const [showCompanySetup, setShowCompanySetup] = useState(false);
-  const [showConfirmation, setShowConfirmation] = useState(false);
-  const router = useRouter();
-
-  const handleRoleSelection = (role: string) => {
-    setSelectedRole(role);
-    if (role === 'jobSeeker') {
-      router.push('/login');
-    } else if (role === 'hr') {
-      setShowCompanySetup(true);
-    }
-    setIsOpen(false);
-  };
-
-  const handleCompanySetup = (e: React.FormEvent) => {
-    e.preventDefault();
-    setShowCompanySetup(false);
-    setShowConfirmation(true);
-  };
+import OnboardingComponent from '@/components/Onboarding';
 
+const OnboardingPage = () => {
   return (
-    <div className="min-h-screen flex items-center justify-center bg-gray-100">
-      <Dialog open={isOpen} onOpenChange={setIsOpen}>
-        <DialogContent className="sm:max-w-[425px]">
-          <DialogHeader>
-            <DialogTitle>Choose your role</DialogTitle>
-            <DialogDescription>
-              Select a role to personalize your experience
-            </DialogDescription>
-          </DialogHeader>
-          <RadioGroup onValueChange={handleRoleSelection}>
-            <div className="flex items-center space-x-2">
-              <RadioGroupItem value="jobSeeker" id="jobSeeker" />
-              <Label htmlFor="jobSeeker">Job Seeker</Label>
-            </div>
-            <div className="flex items-center space-x-2">
-              <RadioGroupItem value="hr" id="hr" />
-              <Label htmlFor="hr">HR</Label>
-            </div>
-          </RadioGroup>
-        </DialogContent>
-      </Dialog>
-
-      <Dialog open={showCompanySetup} onOpenChange={setShowCompanySetup}>
-        <DialogContent className="sm:max-w-[425px]">
-          <DialogHeader>
-            <DialogTitle>Set up your company profile</DialogTitle>
-          </DialogHeader>
-          <form onSubmit={handleCompanySetup} className="space-y-4">
-            <div className="flex justify-center">
-              <Building className="w-16 h-16 text-gray-400" />
-            </div>
-            <Input
-              type="file"
-              accept="image/*"
-              placeholder="Upload Company Logo"
-            />
-            <Input placeholder="Company Name" required />
-            <Input placeholder="Company Website" required />
-            <Textarea placeholder="Description" required />
-            <Button type="submit" className="w-full">
-              Finish Setup for {selectedRole}
-            </Button>
-          </form>
-        </DialogContent>
-      </Dialog>
-
-      <Dialog open={showConfirmation} onOpenChange={setShowConfirmation}>
-        <DialogContent className="sm:max-w-[425px] text-center">
-          <div className="flex justify-center mb-4">
-            <div className="rounded-full bg-green-100 p-3">
-              <Check className="w-8 h-8 text-green-600" />
-            </div>
-          </div>
-          <DialogTitle>You are All Set</DialogTitle>
-          <DialogDescription>Start posting jobs</DialogDescription>
-          <div className="flex flex-col gap-2 mt-4">
-            <Button onClick={() => router.push('/login')}>
-              Post your First Job
-            </Button>
-            <Button variant="outline" onClick={() => router.push('/')}>
-              Go to Home
-            </Button>
-          </div>
-        </DialogContent>
-      </Dialog>
-
-      <h1 className="text-4xl font-bold text-gray-800">
-        Welcome to Our Platform
-      </h1>
-    </div>
+    <>
+      <OnboardingComponent />
+    </>
   );
-}
+};
+
+export default OnboardingPage;
diff --git a/src/components/Onboarding.tsx b/src/components/Onboarding.tsx
new file mode 100644
index 00000000..61192139
--- /dev/null
+++ b/src/components/Onboarding.tsx
@@ -0,0 +1,149 @@
+'use client';
+
+import { useState } from 'react';
+import { useRouter } from 'next/navigation';
+import {
+  Dialog,
+  DialogContent,
+  DialogHeader,
+  DialogTitle,
+  DialogDescription,
+} from '@/components/ui/dialog';
+import { Button } from '@/components/ui/button';
+import { RadioGroup, RadioGroupItem } from '@/components/ui/radio-group';
+import { Label } from '@/components/ui/label';
+import { Input } from '@/components/ui/input';
+import { Textarea } from '@/components/ui/textarea';
+import { Building, Check } from 'lucide-react';
+import { useForm } from 'react-hook-form';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { z } from 'zod';
+
+const companySetupSchema = z.object({
+  companyName: z.string().min(1, 'Company name is required'),
+  companyWebsite: z.string().url('Invalid URL'),
+  description: z.string().min(10, 'Description must be at least 10 characters'),
+});
+
+type CompanySetupForm = z.infer<typeof companySetupSchema>;
+
+export default function OnboardingComponent() {
+  const [isOpen, setIsOpen] = useState(true);
+  const [selectedRole, setSelectedRole] = useState<string | null>(null);
+  const [showCompanySetup, setShowCompanySetup] = useState(false);
+  const [showConfirmation, setShowConfirmation] = useState(false);
+  const router = useRouter();
+
+  const {
+    register,
+    handleSubmit,
+    formState: { errors },
+  } = useForm<CompanySetupForm>({
+    resolver: zodResolver(companySetupSchema),
+  });
+
+  const handleRoleSelection = (role: string) => {
+    setSelectedRole(role);
+    if (role === 'jobSeeker') {
+      router.push('/home');
+    } else if (role === 'hr') {
+      setShowCompanySetup(true);
+    }
+    setIsOpen(false);
+  };
+
+  const handleCompanySetup = async () => {
+    setShowCompanySetup(false);
+    setShowConfirmation(true);
+  };
+
+  return (
+    <div className="min-h-screen flex items-center justify-center bg-gray-100">
+      <Dialog open={isOpen} onOpenChange={setIsOpen}>
+        <DialogContent className="sm:max-w-[425px]">
+          <DialogHeader>
+            <DialogTitle>Choose your role</DialogTitle>
+            <DialogDescription>
+              Select a role to personalize your experience
+            </DialogDescription>
+          </DialogHeader>
+          <RadioGroup onValueChange={handleRoleSelection}>
+            <div className="flex items-center space-x-2">
+              <RadioGroupItem value="jobSeeker" id="jobSeeker" />
+              <Label htmlFor="jobSeeker">Job Seeker</Label>
+            </div>
+            <div className="flex items-center space-x-2">
+              <RadioGroupItem value="hr" id="hr" />
+              <Label htmlFor="hr">HR</Label>
+            </div>
+          </RadioGroup>
+        </DialogContent>
+      </Dialog>
+
+      <Dialog open={showCompanySetup} onOpenChange={setShowCompanySetup}>
+        <DialogContent className="sm:max-w-[425px]">
+          <DialogHeader>
+            <DialogTitle>
+              Set up your company profile for {selectedRole}
+            </DialogTitle>
+          </DialogHeader>
+          <form
+            onSubmit={handleSubmit(handleCompanySetup)}
+            className="space-y-4"
+          >
+            <div className="flex justify-center">
+              <Building className="w-16 h-16 text-gray-400" />
+            </div>
+            <Input
+              type="file"
+              accept="image/*"
+              placeholder="Upload Company Logo"
+            />
+            <Input placeholder="Company Name" {...register('companyName')} />
+            {errors.companyName && (
+              <p className="text-red-500">{errors.companyName.message}</p>
+            )}
+            <Input
+              placeholder="Company Website"
+              {...register('companyWebsite')}
+            />
+            {errors.companyWebsite && (
+              <p className="text-red-500">{errors.companyWebsite.message}</p>
+            )}
+            <Textarea placeholder="Description" {...register('description')} />
+            {errors.description && (
+              <p className="text-red-500">{errors.description.message}</p>
+            )}
+            <Button type="submit" className="w-full">
+              Finish Setup
+            </Button>
+          </form>
+        </DialogContent>
+      </Dialog>
+
+      <Dialog open={showConfirmation} onOpenChange={setShowConfirmation}>
+        <DialogContent className="sm:max-w-[425px] text-center">
+          <div className="flex justify-center mb-4">
+            <div className="rounded-full bg-green-100 p-3">
+              <Check className="w-8 h-8 text-green-600" />
+            </div>
+          </div>
+          <DialogTitle>You are All Set</DialogTitle>
+          <DialogDescription>Start posting jobs</DialogDescription>
+          <div className="flex flex-col gap-2 mt-4">
+            <Button onClick={() => router.push('/post-job')}>
+              Post your First Job
+            </Button>
+            <Button variant="outline" onClick={() => router.push('/home')}>
+              Go to Home
+            </Button>
+          </div>
+        </DialogContent>
+      </Dialog>
+
+      <h1 className="text-4xl font-bold text-gray-800">
+        Welcome to Our Platform
+      </h1>
+    </div>
+  );
+}
diff --git a/src/components/auth/signup.tsx b/src/components/auth/signup.tsx
index e66d1bef..fc831e6d 100644
--- a/src/components/auth/signup.tsx
+++ b/src/components/auth/signup.tsx
@@ -7,10 +7,9 @@ import {
   SignupSchemaType,
 } from '@/lib/validators/auth.validator';
 import { zodResolver } from '@hookform/resolvers/zod';
-
 import Link from 'next/link';
 import { useRouter } from 'next/navigation';
-import { useForm } from 'react-hook-form';
+import { useForm, Controller } from 'react-hook-form';
 import {
   Form,
   FormControl,
@@ -23,6 +22,8 @@ import { useToast } from '../ui/use-toast';
 import { signUp } from '@/actions/auth.actions';
 import { DemarcationLine, GoogleOauthButton } from './social-auth';
 import { PasswordInput } from '../password-input';
+import { Switch } from '@/components/ui/switch';
+import { Label } from '../ui/label';
 
 export const Signup = () => {
   const { toast } = useToast();
@@ -34,6 +35,7 @@ export const Signup = () => {
       name: '',
       email: '',
       password: '',
+      role: 'USER',
     },
   });
 
@@ -50,12 +52,15 @@ export const Signup = () => {
           title: response.message || 'Signup successful! Welcome to 100xJobs!',
           variant: 'success',
         });
-
-        router.push(APP_PATHS.ONBOARDING);
+        if (data.role === 'HR') {
+          router.push(APP_PATHS.ONBOARDING);
+        } else {
+          router.push(APP_PATHS.HOME);
+        }
       }
     } catch {
       toast({
-        title: 'something went wrong',
+        title: 'Something went wrong',
         variant: 'destructive',
       });
     }
@@ -107,6 +112,22 @@ export const Signup = () => {
               </FormItem>
             )}
           />
+          <Controller
+            name="role"
+            control={form.control}
+            render={({ field }) => (
+              <div className="flex items-center space-x-2">
+                <Switch
+                  id="hr-mode"
+                  checked={field.value === 'HR'}
+                  onCheckedChange={(checked) =>
+                    field.onChange(checked ? 'HR' : 'USER')
+                  }
+                />
+                <Label htmlFor="hr-mode">I&apos;m an HR professional</Label>
+              </div>
+            )}
+          />
           <div className="flex justify-end">
             <Link
               href={APP_PATHS.FORGOT_PASSWORD}
diff --git a/src/lib/validators/auth.validator.ts b/src/lib/validators/auth.validator.ts
index a88e89bb..97f1a4b4 100644
--- a/src/lib/validators/auth.validator.ts
+++ b/src/lib/validators/auth.validator.ts
@@ -11,6 +11,7 @@ export const SignupSchema = z.object({
   name: z.string().min(1, 'Name is required'),
   email: z.string().email('Email is invalid').min(1, 'Email is required'),
   password: z.string().min(1, 'Password is required'),
+  role: z.enum(['USER', 'HR']),
 });
 
 export type SignupSchemaType = z.infer<typeof SignupSchema>;

From b005ccc279d2c4867f781038b807e6051ee5f076 Mon Sep 17 00:00:00 2001
From: Deepanshu Mishra <d4deepanshu723@gmail.com>
Date: Mon, 21 Oct 2024 18:08:45 +0530
Subject: [PATCH 03/13] :

---
 src/components/Onboarding.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Onboarding.tsx b/src/components/Onboarding.tsx
index 61192139..8f90b99c 100644
--- a/src/components/Onboarding.tsx
+++ b/src/components/Onboarding.tsx
@@ -142,7 +142,7 @@ export default function OnboardingComponent() {
       </Dialog>
 
       <h1 className="text-4xl font-bold text-gray-800">
-        Welcome to Our Platform
+        Welcome to Our 100xJobs
       </h1>
     </div>
   );

From cd436d00e6af79ebb68bbfbd7f8ad592f93b18ce Mon Sep 17 00:00:00 2001
From: Deepanshu Mishra <d4deepanshu723@gmail.com>
Date: Mon, 21 Oct 2024 21:44:39 +0530
Subject: [PATCH 04/13] onboard_signup_integration

---
 prisma/schema.prisma           |  12 +--
 src/app/onboarding/page.tsx    |  11 ---
 src/components/auth/signup.tsx | 166 ++++++++++++++++++++++-----------
 3 files changed, 119 insertions(+), 70 deletions(-)
 delete mode 100644 src/app/onboarding/page.tsx

diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 51b13f7a..0a3a45fd 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -19,12 +19,12 @@ model User {
 
   email         String    @unique
   emailVerified DateTime?
-  
+
   skills        String[]
   experience    Experience[]
   project       Project[]
   resume        String?
-  
+
   oauthProvider   OauthProvider?  // Tracks OAuth provider (e.g., 'google')
   oauthId String?
 
@@ -85,7 +85,7 @@ model Job {
 
 model Experience {
   id                Int @id @default(autoincrement())
-  companyName       String 
+  companyName       String
   designation       String
   EmploymentType    EmployementType
   address           String
@@ -93,14 +93,14 @@ model Experience {
   currentWorkStatus Boolean
   startDate         DateTime
   endDate           DateTime?
-  description       String  
-  userId            String 
+  description       String
+  userId            String
   user              User      @relation(fields: [userId] ,references: [id])
 }
 
 model Project {
   id              Int @id @default(autoincrement())
-  projectName     String 
+  projectName     String
   projectSummary  String
   projectLiveLink String?
   projectGithub   String
diff --git a/src/app/onboarding/page.tsx b/src/app/onboarding/page.tsx
deleted file mode 100644
index c8574a55..00000000
--- a/src/app/onboarding/page.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import OnboardingComponent from '@/components/Onboarding';
-
-const OnboardingPage = () => {
-  return (
-    <>
-      <OnboardingComponent />
-    </>
-  );
-};
-
-export default OnboardingPage;
diff --git a/src/components/auth/signup.tsx b/src/components/auth/signup.tsx
index fc831e6d..6a70a790 100644
--- a/src/components/auth/signup.tsx
+++ b/src/components/auth/signup.tsx
@@ -1,33 +1,49 @@
+// signup.tsx
 'use client';
+import { useState } from 'react';
+import { useRouter } from 'next/navigation';
+import {
+  Dialog,
+  DialogContent,
+  DialogHeader,
+  DialogTitle,
+} from '@/components/ui/dialog';
 import { Button } from '@/components/ui/button';
 import { Input } from '@/components/ui/input';
-import APP_PATHS from '@/config/path.config';
-import {
-  SignupSchema,
-  SignupSchemaType,
-} from '@/lib/validators/auth.validator';
+import { Textarea } from '@/components/ui/textarea';
 import { zodResolver } from '@hookform/resolvers/zod';
-import Link from 'next/link';
-import { useRouter } from 'next/navigation';
-import { useForm, Controller } from 'react-hook-form';
+import { z } from 'zod';
+import { useForm } from 'react-hook-form';
+import { useToast } from '../ui/use-toast';
+import { signUp } from '@/actions/auth.actions';
+import APP_PATHS from '@/config/path.config';
 import {
   Form,
-  FormControl,
   FormField,
   FormItem,
+  FormControl,
   FormLabel,
   FormMessage,
-} from '../ui/form';
-import { useToast } from '../ui/use-toast';
-import { signUp } from '@/actions/auth.actions';
-import { DemarcationLine, GoogleOauthButton } from './social-auth';
-import { PasswordInput } from '../password-input';
+} from '@/components/ui/form';
+import { SignupSchema } from '@/lib/validators/auth.validator';
+import prisma from '@/config/prisma.config';
+import { Label } from '@/components/ui/label';
 import { Switch } from '@/components/ui/switch';
-import { Label } from '../ui/label';
+
+const companySetupSchema = z.object({
+  companyName: z.string().min(1, 'Company name is required'),
+  companyWebsite: z.string().url('Invalid URL'),
+  description: z.string().min(10, 'Description must be at least 10 characters'),
+});
+
+type CompanySetupForm = z.infer<typeof companySetupSchema>;
+type SignupSchemaType = z.infer<typeof SignupSchema>;
 
 export const Signup = () => {
   const { toast } = useToast();
   const router = useRouter();
+  const [showCompanySetup, setShowCompanySetup] = useState(false);
+  const [isHr, setIsHr] = useState(false);
 
   const form = useForm<SignupSchemaType>({
     resolver: zodResolver(SignupSchema),
@@ -39,6 +55,14 @@ export const Signup = () => {
     },
   });
 
+  const {
+    register: companySetupForm,
+    handleSubmit: handleCompanySetupSubmit,
+    formState: { errors: companySetupErrors },
+  } = useForm<CompanySetupForm>({
+    resolver: zodResolver(companySetupSchema),
+  });
+
   async function signupHandler(data: SignupSchemaType) {
     try {
       const response = await signUp(data);
@@ -52,8 +76,8 @@ export const Signup = () => {
           title: response.message || 'Signup successful! Welcome to 100xJobs!',
           variant: 'success',
         });
-        if (data.role === 'HR') {
-          router.push(APP_PATHS.ONBOARDING);
+        if (isHr) {
+          setShowCompanySetup(true);
         } else {
           router.push(APP_PATHS.HOME);
         }
@@ -66,6 +90,23 @@ export const Signup = () => {
     }
   }
 
+  const handleCompanySetup = async () => {
+    try {
+      // Save company info to the database
+      await prisma.user.update({
+        where: { email: form.getValues('email') },
+        data: { onBoard: true },
+      });
+      setShowCompanySetup(false);
+      router.push(APP_PATHS.HOME);
+    } catch (error) {
+      toast({
+        title: `Error occcured: ${error}`,
+        variant: 'destructive',
+      });
+    }
+  };
+
   return (
     <>
       <Form {...form}>
@@ -106,35 +147,19 @@ export const Signup = () => {
               <FormItem>
                 <FormLabel>Password</FormLabel>
                 <FormControl>
-                  <PasswordInput field={field} placeholder="Password" />
+                  <Input type="password" {...field} placeholder="Password" />
                 </FormControl>
                 <FormMessage />
               </FormItem>
             )}
           />
-          <Controller
-            name="role"
-            control={form.control}
-            render={({ field }) => (
-              <div className="flex items-center space-x-2">
-                <Switch
-                  id="hr-mode"
-                  checked={field.value === 'HR'}
-                  onCheckedChange={(checked) =>
-                    field.onChange(checked ? 'HR' : 'USER')
-                  }
-                />
-                <Label htmlFor="hr-mode">I&apos;m an HR professional</Label>
-              </div>
-            )}
-          />
-          <div className="flex justify-end">
-            <Link
-              href={APP_PATHS.FORGOT_PASSWORD}
-              className="text-xs text-muted-foreground font-medium hover:underline"
-            >
-              Forgot your password?
-            </Link>
+          <div className="flex items-center space-x-2">
+            <Switch
+              id="hr-mode"
+              checked={isHr}
+              onCheckedChange={(checked) => setIsHr(checked)}
+            />
+            <Label htmlFor="hr-mode">I&apos;m an HR professional</Label>
           </div>
           <Button
             type="submit"
@@ -143,21 +168,56 @@ export const Signup = () => {
           >
             {form.formState.isSubmitting ? 'Please wait...' : 'Create Account'}
           </Button>
-          <DemarcationLine />
-          <GoogleOauthButton label="Sign up with Google" />
         </form>
       </Form>
-      <div className="flex items-center justify-center mt-6">
-        <span className="text-muted-foreground">
-          Already have an account?{' '}
-          <Link
-            href={APP_PATHS.SIGNIN}
-            className="text-muted-foreground font-semibold hover:underline"
+
+      <Dialog open={showCompanySetup} onOpenChange={setShowCompanySetup}>
+        <DialogContent className="sm:max-w-[425px]">
+          <DialogHeader>
+            <DialogTitle>Set up your company profile</DialogTitle>
+          </DialogHeader>
+          <form
+            onSubmit={handleCompanySetupSubmit(handleCompanySetup)}
+            className="space-y-4"
           >
-            Sign In
-          </Link>
-        </span>
-      </div>
+            <Input
+              type="file"
+              accept="image/*"
+              placeholder="Upload Company Logo"
+            />
+            <Input
+              placeholder="Company Name"
+              {...companySetupForm('companyName')}
+            />
+            {companySetupErrors.companyName && (
+              <p className="text-red-500">
+                {companySetupErrors.companyName.message}
+              </p>
+            )}
+            <Input
+              placeholder="Company Website"
+              {...companySetupForm('companyWebsite')}
+            />
+            {companySetupErrors.companyWebsite && (
+              <p className="text-red-500">
+                {companySetupErrors.companyWebsite.message}
+              </p>
+            )}
+            <Textarea
+              placeholder="Description"
+              {...companySetupForm('description')}
+            />
+            {companySetupErrors.description && (
+              <p className="text-red-500">
+                {companySetupErrors.description.message}
+              </p>
+            )}
+            <Button type="submit" className="w-full">
+              Finish Setup
+            </Button>
+          </form>
+        </DialogContent>
+      </Dialog>
     </>
   );
 };

From 7ac983e13f5a0694a02a257eda8b18964d030fb6 Mon Sep 17 00:00:00 2001
From: Deepanshu Mishra <d4deepanshu723@gmail.com>
Date: Mon, 21 Oct 2024 22:21:45 +0530
Subject: [PATCH 05/13] Merge branch 'main' of
 https://github.com/DeepanshuMishraa/job-board into dev


From 3ae4a2694d62961afde8758d39c4c3e65db2f1c3 Mon Sep 17 00:00:00 2001
From: Deepanshu Mishra <d4deepanshu723@gmail.com>
Date: Wed, 23 Oct 2024 18:40:45 +0530
Subject: [PATCH 06/13] update signup.tsx

---
 src/components/auth/signup.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/auth/signup.tsx b/src/components/auth/signup.tsx
index 6a70a790..0c22d941 100644
--- a/src/components/auth/signup.tsx
+++ b/src/components/auth/signup.tsx
@@ -1,4 +1,3 @@
-// signup.tsx
 'use client';
 import { useState } from 'react';
 import { useRouter } from 'next/navigation';
@@ -93,6 +92,7 @@ export const Signup = () => {
   const handleCompanySetup = async () => {
     try {
       // Save company info to the database
+      ('use server');
       await prisma.user.update({
         where: { email: form.getValues('email') },
         data: { onBoard: true },

From 4df3693951a7f84a5fe3887d66c58acd1e62ebbb Mon Sep 17 00:00:00 2001
From: Deepanshu Mishra <d4deepanshu723@gmail.com>
Date: Wed, 23 Oct 2024 22:59:40 +0530
Subject: [PATCH 07/13] add hr onboarding flow

---
 .../20241023172043_fix/migration.sql          |  35 ++
 prisma/schema.prisma                          |  66 ++--
 prisma/seed.ts                                | 310 ++++--------------
 src/actions/auth.actions.ts                   |  76 ++++-
 src/components/auth/signup.tsx                | 186 +++++------
 src/lib/validators/auth.validator.ts          |  26 +-
 6 files changed, 320 insertions(+), 379 deletions(-)
 create mode 100644 prisma/migrations/20241023172043_fix/migration.sql

diff --git a/prisma/migrations/20241023172043_fix/migration.sql b/prisma/migrations/20241023172043_fix/migration.sql
new file mode 100644
index 00000000..9e5d3691
--- /dev/null
+++ b/prisma/migrations/20241023172043_fix/migration.sql
@@ -0,0 +1,35 @@
+/*
+  Warnings:
+
+  - A unique constraint covering the columns `[companyId]` on the table `User` will be added. If there are existing duplicate values, this will fail.
+  - Added the required column `companyId` to the `Job` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- AlterTable
+ALTER TABLE "Job" ADD COLUMN     "companyId" TEXT NOT NULL;
+
+-- AlterTable
+ALTER TABLE "User" ADD COLUMN     "companyId" TEXT;
+
+-- CreateTable
+CREATE TABLE "Company" (
+    "id" TEXT NOT NULL,
+    "name" TEXT NOT NULL,
+    "website" TEXT,
+    "description" TEXT,
+    "userId" TEXT,
+
+    CONSTRAINT "Company_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Company_userId_key" ON "Company"("userId");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "User_companyId_key" ON "User"("companyId");
+
+-- AddForeignKey
+ALTER TABLE "Company" ADD CONSTRAINT "Company_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Job" ADD CONSTRAINT "Job_companyId_fkey" FOREIGN KEY ("companyId") REFERENCES "Company"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 6a94bcb5..fbc462e6 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -8,29 +8,39 @@ datasource db {
 }
 
 model User {
-  id   String @id @default(cuid())
-  name String
-
-  password   String?
-  avatar     String?
-  isVerified Boolean @default(false)
-  role       Role    @default(USER)
-  jobs       Job[]
-
-  email         String    @unique
+  id          String     @id @default(cuid())
+  name        String
+  email       String     @unique
+  password    String?
+  avatar      String?
+  isVerified  Boolean    @default(false)
+  role        Role       @default(USER)
   emailVerified DateTime?
 
-  skills        String[]
-  experience    Experience[]
-  project       Project[]
-  resume        String?
+  jobs        Job[]
+  skills      String[]
+  experience  Experience[]
+  project     Project[]
+  resume      String?
 
-  oauthProvider   OauthProvider?  // Tracks OAuth provider (e.g., 'google')
-  oauthId String?
+  oauthProvider OauthProvider?
+  oauthId     String?
 
   blockedByAdmin DateTime?
-  onBoard        Boolean    @default(false)
-  bookmark       Bookmark[]
+  onBoard     Boolean    @default(false)
+  bookmark    Bookmark[]
+  company     Company?   @relation("UserCompany")
+  companyId   String?    @unique
+}
+
+model Company {
+  id          String    @id @default(cuid())
+  name        String
+  website     String?
+  description String?
+  jobs        Job[]
+  user        User?     @relation("UserCompany", fields: [userId], references: [id])
+  userId      String?   @unique
 }
 
 enum OauthProvider {
@@ -55,6 +65,7 @@ enum TokenType {
 model Job {
   id                 String          @id @default(cuid())
   userId             String
+  companyId          String
   title              String
   description        String?
   companyName        String          @map("company_name")
@@ -75,24 +86,25 @@ model Job {
   hasSalaryRange     Boolean         @default(false) @map("has_salary_range")
   minSalary          Int?
   maxSalary          Int?
-  hasExperiencerange Boolean         @default(false) @map("has_experience_range")
+  hasExperienceRange Boolean         @default(false) @map("has_experience_range")
   minExperience      Int?
   maxExperience      Int?
   isVerifiedJob      Boolean         @default(false) @map("is_verified_job")
   deleted            Boolean         @default(false)
-  deletedAt          DateTime?
   postedAt           DateTime        @default(now())
   updatedAt          DateTime        @updatedAt
+
   user               User            @relation(fields: [userId], references: [id], onDelete: Cascade)
+  company            Company         @relation(fields: [companyId], references: [id], onDelete: Cascade)
   bookmark           Bookmark[]
 }
 
 model Bookmark {
-  id     String @id @default(uuid())
-  jobId  String
-  userId String
-  job    Job    @relation(fields: [jobId], references: [id], onDelete: Cascade)
-  user   User   @relation(fields: [userId], references: [id], onDelete: Cascade)
+  id      String @id @default(uuid())
+  jobId   String
+  userId  String
+  job     Job    @relation(fields: [jobId], references: [id], onDelete: Cascade)
+  user    User   @relation(fields: [userId], references: [id], onDelete: Cascade)
 }
 
 model Experience {
@@ -107,7 +119,7 @@ model Experience {
   endDate           DateTime?
   description       String
   userId            String
-  user              User      @relation(fields: [userId] ,references: [id])
+  user              User      @relation(fields: [userId], references: [id])
 }
 
 model Project {
@@ -117,7 +129,7 @@ model Project {
   projectLiveLink String?
   projectGithub   String
   userId          String
-  user            User @relation(fields: [userId] , references: [id])
+  user            User @relation(fields: [userId], references: [id])
 }
 
 enum Currency {
diff --git a/prisma/seed.ts b/prisma/seed.ts
index 5aa0b4a8..eabb4cd4 100644
--- a/prisma/seed.ts
+++ b/prisma/seed.ts
@@ -1,4 +1,3 @@
-/* eslint-disable no-console */
 import {
   PrismaClient,
   Currency,
@@ -17,7 +16,7 @@ const users = [
   { id: '3', name: 'Hr', email: 'hr@gmail.com', role: Role.HR },
 ];
 
-let jobs = [
+const jobs = [
   {
     id: '1',
     userId: '1',
@@ -31,7 +30,7 @@ let jobs = [
     type: EmployementType.Full_time,
     workMode: WorkMode.remote,
     currency: Currency.USD,
-    hasExperiencerange: true,
+    hasExperienceRange: true,
     minExperience: 1,
     maxExperience: 2,
     companyLogo: '',
@@ -43,273 +42,94 @@ let jobs = [
     isVerifiedJob: true,
   },
   {
-    id: '2',
-    userId: '2',
-    title: 'Backend Developer',
-    description: 'Build and maintain server-side logic.',
-    companyName: 'Innovatech',
-    companyBio:
-      'Innovatech specializes in backend systems and cloud-based solutions.',
-    companyEmail: 'careers@innovatech.com',
-    category: 'development',
-    type: EmployementType.Full_time,
-    workMode: WorkMode.office,
-    currency: Currency.USD,
-    hasExpiryDate: true,
-    expiryDate: new Date(new Date().setDate(new Date().getDate() + 49)),
-    hasExperiencerange: false,
-    companyLogo: '',
-    hasSalaryRange: false,
-    minSalary: null,
-    maxSalary: null,
-    isVerifiedJob: false,
-
-  },
-  {
-    id: '3',
-    userId: '1',
-    title: 'Full Stack Developer',
-    description: 'Develop both client-side and server-side software.',
-    companyName: 'Global Solutions',
-    companyBio:
-      'Global Solutions offers comprehensive IT services for businesses worldwide.',
-    companyEmail: 'recruitment@globalsolutions.com',
+    id: '14',
+    userId: '5',
+    title: 'Blockchain Developer',
+    description: 'Develop and implement blockchain solutions for various industries.',
+    companyName: 'ChainTech',
+    companyBio: 'ChainTech is revolutionizing industries through innovative blockchain solutions.',
+    companyEmail: 'jobs@chaintech.io',
     category: 'development',
     type: EmployementType.Full_time,
-    workMode: WorkMode.hybrid,
+    workMode: WorkMode.remote,
     currency: Currency.USD,
-    hasExpiryDate: false,
-    hasExperiencerange: true,
-    minExperience: 3,
+    hasExperienceRange: true,
+    minExperience: 2,
     maxExperience: 4,
     companyLogo: '',
     hasSalaryRange: true,
+    hasExpiryDate: false,
     minSalary: 90000,
-    maxSalary: 120000,
+    maxSalary: 140000,
     isVerifiedJob: true,
-    deleted: true
   },
   {
-    id: '4',
-    userId: '2',
-    title: 'DevOps Engineer',
-    description:
-      'Automate and streamline the company’s operations and processes.',
-    companyName: 'DevOps Ltd.',
-    companyBio:
-      'DevOps Ltd. specializes in automation and cloud infrastructure management.',
-    companyEmail: 'jobs@devopsltd.com',
-    category: 'development',
-    type: EmployementType.Full_time,
-    workMode: WorkMode.remote,
-    currency: Currency.USD,
-    hasExperiencerange: true,
-    minExperience: 1,
-    maxExperience: 2,
-    hasExpiryDate: true,
-    expiryDate: new Date(new Date().setDate(new Date().getDate() + 49)),
-    companyLogo: '',
-    hasSalaryRange: true,
-    minSalary: 50000,
-    maxSalary: 70000,
-    isVerifiedJob: true,
-  },
-  {
-    id: '5',
-    userId: '1',
-    title: 'Product Manager',
-    description:
-      'Oversee product development and ensure the success of the product.',
-    companyName: 'Productive Minds',
-    companyBio:
-      'Productive Minds helps businesses achieve their goals through strategic product management.',
-    companyEmail: 'hr@productiveminds.com',
-    category: 'management',
-    type: EmployementType.Full_time,
-    workMode: WorkMode.hybrid,
-    currency: Currency.USD,
-    hasExpiryDate: true,
-    expiryDate: new Date(new Date().setDate(new Date().getDate() + 49)),
-    hasExperiencerange: false,
-    companyLogo: '',
-    hasSalaryRange: true,
-    minSalary: 110000,
-    maxSalary: 150000,
-    isVerifiedJob: true,
-    deleted: true
-  },
-  {
-    id: '6',
-    userId: '2',
-    title: 'Data Scientist',
-    description:
-      'Analyze and interpret complex data to help the company make informed decisions.',
-    companyName: 'Data Insights',
-    companyBio:
-      'Data Insights provides data-driven solutions to empower businesses.',
-    companyEmail: 'recruitment@datainsights.com',
+    id: '15',
+    userId: '4',
+    title: 'AR/VR Developer',
+    description: 'Create immersive augmented and virtual reality experiences.',
+    companyName: 'ImmerseTech',
+    companyBio: 'ImmerseTech is pushing the boundaries of AR and VR technology.',
+    companyEmail: 'hiring@immersetech.com',
     category: 'development',
     type: EmployementType.Full_time,
     workMode: WorkMode.office,
     currency: Currency.USD,
-    hasExperiencerange: true,
+    hasExperienceRange: true,
     minExperience: 1,
-    maxExperience: 2,
+    maxExperience: 3,
     companyLogo: '',
-    hasExpiryDate: true,
-    expiryDate: new Date(new Date().setDate(new Date().getDate() + 49)),
     hasSalaryRange: true,
+    hasExpiryDate: true,
+    expiryDate: new Date(new Date().setDate(new Date().getDate() + 45)),
     minSalary: 80000,
-    maxSalary: 100000,
-    isVerifiedJob: false,
-
-  },
-  {
-    id: '7',
-    userId: '1',
-    title: 'UX/UI Designer',
-    description:
-      'Design user-friendly interfaces for web and mobile applications.',
-    companyName: 'Creative Designs',
-    companyBio:
-      'Creative Designs excels in crafting intuitive and visually appealing user interfaces.',
-    companyEmail: 'careers@creativedesigns.com',
-    category: 'design',
-    type: EmployementType.Full_time,
-    workMode: WorkMode.remote,
-    currency: Currency.USD,
-    hasExperiencerange: true,
-    hasExpiryDate: false,
-    minExperience: 1,
-    maxExperience: 2,
-    companyLogo: '',
-    hasSalaryRange: true,
-    minSalary: 70000,
-    maxSalary: 90000,
+    maxSalary: 120000,
     isVerifiedJob: false,
-    delted: true
-
   },
   {
-    id: '8',
-    userId: '2',
-    title: 'Mobile App Developer',
-    description: 'Develop and maintain mobile applications.',
-    companyName: 'App Innovators',
-    companyBio:
-      'App Innovators is a leader in mobile application development and innovation.',
-    companyEmail: 'careers@appinnovators.com',
-    category: 'development',
+    id: '16',
+    userId: '5',
+    title: 'Cybersecurity Specialist',
+    description: 'Protect company assets from cyber threats and implement security measures.',
+    companyName: 'CyberShield',
+    companyBio: 'CyberShield provides top-tier cybersecurity solutions for businesses of all sizes.',
+    companyEmail: 'careers@cybershield.com',
+    category: 'security',
     type: EmployementType.Full_time,
     workMode: WorkMode.hybrid,
     currency: Currency.USD,
-    hasExperiencerange: true,
-    hasExpiryDate: true,
-    expiryDate: new Date(new Date().setDate(new Date().getDate() + 49)),
-    minExperience: 1,
-    maxExperience: 2,
-    companyLogo: '',
-    hasSalaryRange: false,
-    minSalary: null,
-    maxSalary: null,
-    isVerifiedJob: true,
-    deleted: true
-
-  },
-  {
-    id: '9',
-    userId: '1',
-    title: 'Cloud Engineer',
-    description: 'Design and manage cloud-based systems and services.',
-    companyName: 'Cloud Works',
-    companyBio: 'Cloud Works provides cutting-edge cloud computing solutions.',
-    companyEmail: 'hr@cloudworks.com',
-    category: 'development',
-    type: EmployementType.Full_time,
-    workMode: WorkMode.office,
-    currency: Currency.USD,
-    hasExperiencerange: true,
-    hasExpiryDate: false,
-    minExperience: 1,
-    maxExperience: 2,
+    hasExperienceRange: true,
+    minExperience: 3,
+    maxExperience: 6,
     companyLogo: '',
     hasSalaryRange: true,
+    hasExpiryDate: true,
+    expiryDate: new Date(new Date().setDate(new Date().getDate() + 30)),
     minSalary: 100000,
-    maxSalary: 130000,
+    maxSalary: 150000,
     isVerifiedJob: true,
-
-  },
-  {
-    id: '10',
-    userId: '2',
-    title: 'Security Analyst',
-    description: 'Ensure the security and integrity of company systems.',
-    companyName: 'SecureTech',
-    companyBio:
-      'SecureTech specializes in cybersecurity solutions for modern businesses.',
-    companyEmail: 'security@securetech.com',
-    category: 'support',
-    type: EmployementType.Full_time,
-    workMode: WorkMode.remote,
-    currency: Currency.USD,
-    hasExperiencerange: true,
-    minExperience: 1,
-    maxExperience: 2,
-    companyLogo: '',
-    hasExpiryDate: true,
-    expiryDate: new Date(new Date().setDate(new Date().getDate() + 49)),
-    hasSalaryRange: true,
-    minSalary: 75000,
-    maxSalary: 95000,
-    isVerifiedJob: false,
-
   },
   {
-    id: '11',
-    userId: '1',
-    title: 'QA Engineer',
-    description: 'Ensure the quality of software products.',
-    companyName: 'QA Solutions',
-    companyBio:
-      'QA Solutions ensures top-notch quality assurance services for software.',
-    companyEmail: 'contact@qasolutions.com',
-    category: 'support',
+    id: '17',
+    userId: '4',
+    title: 'Data Engineer',
+    description: 'Design and implement data pipelines and infrastructure for big data processing.',
+    companyName: 'DataFlow',
+    companyBio: 'DataFlow specializes in building scalable data solutions for enterprise clients.',
+    companyEmail: 'jobs@dataflow.io',
+    category: 'development',
     type: EmployementType.Full_time,
     workMode: WorkMode.remote,
     currency: Currency.USD,
+    hasExperienceRange: true,
+    minExperience: 2,
+    maxExperience: 5,
     companyLogo: '',
     hasSalaryRange: true,
     hasExpiryDate: false,
-    hasExperiencerange: false,
-    minSalary: 25000,
-    maxSalary: 50000,
+    minSalary: 95000,
+    maxSalary: 140000,
     isVerifiedJob: true,
-
-  },
-  {
-    id: '12',
-    userId: '2',
-    title: 'Technical Writer',
-    description: 'Create and manage technical documentation.',
-    companyName: 'WriteTech',
-    companyBio:
-      'WriteTech specializes in high-quality technical writing services.',
-    companyEmail: 'hr@writetech.com',
-    category: 'writing',
-    type: EmployementType.Contract,
-    workMode: WorkMode.remote,
-    currency: Currency.USD,
-    hasExpiryDate: true,
-    expiryDate: new Date(new Date().setDate(new Date().getDate() + 49)),
-    hasExperiencerange: true,
-    minExperience: 1,
-    maxExperience: 2,
-    companyLogo: '',
-    hasSalaryRange: false,
-    minSalary: null,
-    maxSalary: null,
-    isVerifiedJob: true,
-    delted: false
   },
 ];
 
@@ -328,6 +148,7 @@ async function seedUsers() {
             password: hashedPassword,
             role: u.role || Role.USER,
             emailVerified: new Date(),
+            onBoard: u.onBoard || false,
           },
         });
         console.log(`User created or updated: ${u.email}`);
@@ -351,12 +172,23 @@ async function seedJobs() {
     const validJobs = jobs.filter((job) => existingUserIds.has(job.userId));
 
     await Promise.all(
-      validJobs.map(async (j) =>
-        prisma.job.upsert({
+      validJobs.map(async (j) => {
+        // Create a company for each job
+        const company = await prisma.company.create({
+          data: {
+            name: j.companyName,
+            description: j.companyBio,
+            website: faker.internet.url(),
+            userId: j.userId,
+          },
+        });
+
+        return prisma.job.upsert({
           where: { id: j.id },
           create: {
             id: j.id,
             userId: j.userId,
+            companyId: company.id,
             title: j.title,
             description: j.description,
             companyName: j.companyName,
@@ -369,7 +201,7 @@ async function seedJobs() {
             application: 'https://x.com/100xDevs',
             city: faker.location.city(),
             address: faker.location.city(),
-            hasExperiencerange: j.hasExperiencerange,
+            hasExperienceRange: j.hasExperienceRange,
             hasExpiryDate: j.hasExpiryDate,
             expiryDate: j.expiryDate,
             minExperience: j.minExperience,
@@ -391,8 +223,8 @@ async function seedJobs() {
             isVerifiedJob: j.isVerifiedJob,
           },
           update: {},
-        })
-      )
+        });
+      })
     );
     console.log('✅ Job seed completed successfully');
   } catch (error) {
@@ -405,4 +237,4 @@ async function main() {
   await seedJobs();
 }
 
-main();
\ No newline at end of file
+main()
diff --git a/src/actions/auth.actions.ts b/src/actions/auth.actions.ts
index 9db6d30b..84344c25 100644
--- a/src/actions/auth.actions.ts
+++ b/src/actions/auth.actions.ts
@@ -20,31 +20,88 @@ import { cookies } from 'next/headers';
 import { SuccessResponse } from '@/lib/success';
 import { isTokenExpiredUtil } from '@/lib/utils';
 import { TokenType } from '@prisma/client';
+// Extended signup type to include company info
+// Extended signup type to include company info
+type ExtendedSignupType = SignupSchemaType & {
+  companyInfo?: {
+    name: string;
+    website?: string;
+    description?: string;
+  };
+};
+
 export const signUp = withServerActionAsyncCatcher<
-  SignupSchemaType,
+  ExtendedSignupType,
   ServerActionReturnType
 >(async (_data) => {
-  const data = SignupSchema.parse(_data);
+  // Parse and validate the signup data
+  const baseData = SignupSchema.parse(_data);
 
   const userExist = await prisma.user.findFirst({
-    where: { email: data.email },
+    where: { email: baseData.email },
   });
 
   if (userExist)
-    throw new ErrorHandler('User with this email already exist', 'BAD_REQUEST');
+    throw new ErrorHandler(
+      'User with this email already exists',
+      'BAD_REQUEST'
+    );
 
   const hashedPassword = await bcryptjs.hash(
-    data.password,
+    baseData.password,
     PASSWORD_HASH_SALT_ROUNDS
   );
 
   try {
     await prisma.$transaction(
       async (txn) => {
+        // Create the user
         const user = await txn.user.create({
-          data: { ...data, password: hashedPassword },
+          data: {
+            name: baseData.name,
+            email: baseData.email,
+            password: hashedPassword,
+            role: baseData.role,
+            isVerified: false,
+            skills: [],
+            onBoard: false,
+          },
         });
 
+        // If HR role and company info provided, create company-related data
+        if (baseData.role === 'HR' && _data.companyInfo) {
+          // Create the company entry
+          const company = await txn.company.create({
+            data: {
+              name: _data.companyInfo.name,
+              website: _data.companyInfo.website || '',
+              description: _data.companyInfo.description || '',
+              userId: user.id,
+            },
+          });
+
+          // Create a job entry associated with the company
+          await txn.job.create({
+            data: {
+              userId: user.id,
+              companyId: company.id, // Linking the job with the company
+              title: 'Company Profile',
+              companyName: _data.companyInfo.name, // You can remove this if unnecessary now
+              companyBio: _data.companyInfo.description || '',
+              companyEmail: baseData.email,
+              category: 'Company',
+              type: 'Full_time',
+              workMode: 'office',
+              city: '',
+              address: '',
+              application: '',
+              companyLogo: '',
+              skills: [],
+            },
+          });
+        }
+
+        // Create verification token
         const verificationToken = await txn.verificationToken.create({
           data: {
             identifier: user.id,
@@ -55,13 +112,13 @@ export const signUp = withServerActionAsyncCatcher<
 
         const confirmationLink = `${process.env.NEXTAUTH_URL}${APP_PATHS.VERIFY_EMAIL}/${verificationToken.token}`;
         await sendConfirmationEmail(
-          data.email,
+          baseData.email,
           confirmationLink,
           'EMAIL_VERIFICATION'
         );
 
         cookies().set(PENDING_EMAIL_VERIFICATION_USER_ID, user.id, {
-          maxAge: 5 * 60, // 5 minutes
+          maxAge: 5 * 60,
           httpOnly: true,
           secure: process.env.NODE_ENV === 'production',
         });
@@ -78,7 +135,8 @@ export const signUp = withServerActionAsyncCatcher<
       'User registered successfully. A verification link has been sent to your email.',
       201
     ).serialize();
-  } catch (_err) {
+  } catch (err) {
+    console.error('Signup error:', err);
     throw new ErrorHandler(
       'Registration Failed, please try again!',
       'INTERNAL_SERVER_ERROR'
diff --git a/src/components/auth/signup.tsx b/src/components/auth/signup.tsx
index 0c22d941..ac652d39 100644
--- a/src/components/auth/signup.tsx
+++ b/src/components/auth/signup.tsx
@@ -1,17 +1,11 @@
 'use client';
 import { useState } from 'react';
 import { useRouter } from 'next/navigation';
-import {
-  Dialog,
-  DialogContent,
-  DialogHeader,
-  DialogTitle,
-} from '@/components/ui/dialog';
+
 import { Button } from '@/components/ui/button';
 import { Input } from '@/components/ui/input';
 import { Textarea } from '@/components/ui/textarea';
 import { zodResolver } from '@hookform/resolvers/zod';
-import { z } from 'zod';
 import { useForm } from 'react-hook-form';
 import { useToast } from '../ui/use-toast';
 import { signUp } from '@/actions/auth.actions';
@@ -24,27 +18,21 @@ import {
   FormLabel,
   FormMessage,
 } from '@/components/ui/form';
-import { SignupSchema } from '@/lib/validators/auth.validator';
-import prisma from '@/config/prisma.config';
 import { Label } from '@/components/ui/label';
 import { Switch } from '@/components/ui/switch';
-
-const companySetupSchema = z.object({
-  companyName: z.string().min(1, 'Company name is required'),
-  companyWebsite: z.string().url('Invalid URL'),
-  description: z.string().min(10, 'Description must be at least 10 characters'),
-});
-
-type CompanySetupForm = z.infer<typeof companySetupSchema>;
-type SignupSchemaType = z.infer<typeof SignupSchema>;
+import {
+  CompanyInfoSchema,
+  SignupSchema,
+  SignupData,
+  CompanyInfo,
+} from '@/lib/validators/auth.validator';
 
 export const Signup = () => {
   const { toast } = useToast();
   const router = useRouter();
-  const [showCompanySetup, setShowCompanySetup] = useState(false);
   const [isHr, setIsHr] = useState(false);
 
-  const form = useForm<SignupSchemaType>({
+  const form = useForm<SignupData>({
     resolver: zodResolver(SignupSchema),
     defaultValues: {
       name: '',
@@ -54,17 +42,35 @@ export const Signup = () => {
     },
   });
 
-  const {
-    register: companySetupForm,
-    handleSubmit: handleCompanySetupSubmit,
-    formState: { errors: companySetupErrors },
-  } = useForm<CompanySetupForm>({
-    resolver: zodResolver(companySetupSchema),
+  const companyForm = useForm<CompanyInfo>({
+    resolver: zodResolver(CompanyInfoSchema),
+    defaultValues: {
+      name: '',
+      website: '',
+      description: '',
+    },
   });
 
-  async function signupHandler(data: SignupSchemaType) {
+  async function signupHandler(data: Omit<SignupData, 'companyInfo'>) {
     try {
-      const response = await signUp(data);
+      const signupData: SignupData = {
+        ...data,
+        role: isHr ? 'HR' : 'USER',
+      };
+
+      if (isHr) {
+        const companyData = companyForm.getValues();
+        if (companyData.name) {
+          signupData.companyInfo = {
+            name: companyData.name,
+            website: companyData.website,
+            description: companyData.description,
+          };
+        }
+      }
+
+      const response = await signUp(signupData);
+
       if (!response.status) {
         toast({
           title: response.message || 'Something went wrong',
@@ -75,37 +81,15 @@ export const Signup = () => {
           title: response.message || 'Signup successful! Welcome to 100xJobs!',
           variant: 'success',
         });
-        if (isHr) {
-          setShowCompanySetup(true);
-        } else {
-          router.push(APP_PATHS.HOME);
-        }
+        router.push(APP_PATHS.HOME);
       }
-    } catch {
-      toast({
-        title: 'Something went wrong',
-        variant: 'destructive',
-      });
-    }
-  }
-
-  const handleCompanySetup = async () => {
-    try {
-      // Save company info to the database
-      ('use server');
-      await prisma.user.update({
-        where: { email: form.getValues('email') },
-        data: { onBoard: true },
-      });
-      setShowCompanySetup(false);
-      router.push(APP_PATHS.HOME);
     } catch (error) {
       toast({
-        title: `Error occcured: ${error}`,
+        title: `something went wrong ${error}`,
         variant: 'destructive',
       });
     }
-  };
+  }
 
   return (
     <>
@@ -161,6 +145,54 @@ export const Signup = () => {
             />
             <Label htmlFor="hr-mode">I&apos;m an HR professional</Label>
           </div>
+
+          {isHr && (
+            <div className="space-y-4">
+              <FormField
+                control={companyForm.control}
+                name="name"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>Company Name</FormLabel>
+                    <FormControl>
+                      <Input {...field} placeholder="Company Name" />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+              <FormField
+                control={companyForm.control}
+                name="website"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>Company Website</FormLabel>
+                    <FormControl>
+                      <Input {...field} placeholder="https://example.com" />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+              <FormField
+                control={companyForm.control}
+                name="description"
+                render={({ field }) => (
+                  <FormItem>
+                    <FormLabel>Company Description</FormLabel>
+                    <FormControl>
+                      <Textarea
+                        {...field}
+                        placeholder="Tell us about your company"
+                      />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+            </div>
+          )}
+
           <Button
             type="submit"
             disabled={form.formState.isSubmitting}
@@ -170,54 +202,6 @@ export const Signup = () => {
           </Button>
         </form>
       </Form>
-
-      <Dialog open={showCompanySetup} onOpenChange={setShowCompanySetup}>
-        <DialogContent className="sm:max-w-[425px]">
-          <DialogHeader>
-            <DialogTitle>Set up your company profile</DialogTitle>
-          </DialogHeader>
-          <form
-            onSubmit={handleCompanySetupSubmit(handleCompanySetup)}
-            className="space-y-4"
-          >
-            <Input
-              type="file"
-              accept="image/*"
-              placeholder="Upload Company Logo"
-            />
-            <Input
-              placeholder="Company Name"
-              {...companySetupForm('companyName')}
-            />
-            {companySetupErrors.companyName && (
-              <p className="text-red-500">
-                {companySetupErrors.companyName.message}
-              </p>
-            )}
-            <Input
-              placeholder="Company Website"
-              {...companySetupForm('companyWebsite')}
-            />
-            {companySetupErrors.companyWebsite && (
-              <p className="text-red-500">
-                {companySetupErrors.companyWebsite.message}
-              </p>
-            )}
-            <Textarea
-              placeholder="Description"
-              {...companySetupForm('description')}
-            />
-            {companySetupErrors.description && (
-              <p className="text-red-500">
-                {companySetupErrors.description.message}
-              </p>
-            )}
-            <Button type="submit" className="w-full">
-              Finish Setup
-            </Button>
-          </form>
-        </DialogContent>
-      </Dialog>
     </>
   );
 };
diff --git a/src/lib/validators/auth.validator.ts b/src/lib/validators/auth.validator.ts
index 97f1a4b4..514bbba5 100644
--- a/src/lib/validators/auth.validator.ts
+++ b/src/lib/validators/auth.validator.ts
@@ -7,11 +7,31 @@ export const SigninSchema = z.object({
 
 export type SigninSchemaType = z.infer<typeof SigninSchema>;
 
+export const companySetupSchema = z.object({
+  companyName: z.string().min(1, 'Company name is required'),
+  companyWebsite: z.string().url('Invalid URL'),
+  description: z.string().min(10, 'Description must be at least 10 characters'),
+});
+
+// Define the company info schema
+export const CompanyInfoSchema = z.object({
+  name: z.string(),
+  website: z.string().optional(),
+  description: z.string().optional(),
+});
+
+// Extend the base signup schema
 export const SignupSchema = z.object({
   name: z.string().min(1, 'Name is required'),
-  email: z.string().email('Email is invalid').min(1, 'Email is required'),
-  password: z.string().min(1, 'Password is required'),
-  role: z.enum(['USER', 'HR']),
+  email: z.string().email('Invalid email address'),
+  password: z.string().min(6, 'Password must be at least 6 characters'),
+  role: z.enum(['USER', 'HR']).default('USER'),
+  companyInfo: CompanyInfoSchema.optional(),
 });
 
+export type CompanyInfo = z.infer<typeof CompanyInfoSchema>;
+export type SignupData = z.infer<typeof SignupSchema>;
+
 export type SignupSchemaType = z.infer<typeof SignupSchema>;
+
+export type companySetupSchema = z.infer<typeof companySetupSchema>;

From f552516d59ed250db2e144e33318ec455091e6e9 Mon Sep 17 00:00:00 2001
From: Deepanshu Mishra <d4deepanshu723@gmail.com>
Date: Wed, 23 Oct 2024 23:10:55 +0530
Subject: [PATCH 08/13] remove_comments

---
 src/actions/auth.actions.ts | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/actions/auth.actions.ts b/src/actions/auth.actions.ts
index 84344c25..8818d7be 100644
--- a/src/actions/auth.actions.ts
+++ b/src/actions/auth.actions.ts
@@ -20,8 +20,6 @@ import { cookies } from 'next/headers';
 import { SuccessResponse } from '@/lib/success';
 import { isTokenExpiredUtil } from '@/lib/utils';
 import { TokenType } from '@prisma/client';
-// Extended signup type to include company info
-// Extended signup type to include company info
 type ExtendedSignupType = SignupSchemaType & {
   companyInfo?: {
     name: string;
@@ -34,7 +32,6 @@ export const signUp = withServerActionAsyncCatcher<
   ExtendedSignupType,
   ServerActionReturnType
 >(async (_data) => {
-  // Parse and validate the signup data
   const baseData = SignupSchema.parse(_data);
 
   const userExist = await prisma.user.findFirst({
@@ -55,7 +52,6 @@ export const signUp = withServerActionAsyncCatcher<
   try {
     await prisma.$transaction(
       async (txn) => {
-        // Create the user
         const user = await txn.user.create({
           data: {
             name: baseData.name,
@@ -86,7 +82,7 @@ export const signUp = withServerActionAsyncCatcher<
               userId: user.id,
               companyId: company.id, // Linking the job with the company
               title: 'Company Profile',
-              companyName: _data.companyInfo.name, // You can remove this if unnecessary now
+              companyName: _data.companyInfo.name,
               companyBio: _data.companyInfo.description || '',
               companyEmail: baseData.email,
               category: 'Company',
@@ -101,7 +97,6 @@ export const signUp = withServerActionAsyncCatcher<
           });
         }
 
-        // Create verification token
         const verificationToken = await txn.verificationToken.create({
           data: {
             identifier: user.id,

From dcdfb8eb7b8e65faf5b8eaa50a735a2189771033 Mon Sep 17 00:00:00 2001
From: Deepanshu Mishra <d4deepanshu723@gmail.com>
Date: Wed, 23 Oct 2024 23:20:38 +0530
Subject: [PATCH 09/13] fixes

---
 src/actions/job.action.ts            | 26 ++++++++++++++------------
 src/lib/validators/jobs.validator.ts |  5 +++--
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/actions/job.action.ts b/src/actions/job.action.ts
index 659edb3e..b0bf3eed 100644
--- a/src/actions/job.action.ts
+++ b/src/actions/job.action.ts
@@ -68,7 +68,8 @@ export const createJob = withSession<
     workMode,
     description,
     hasSalaryRange,
-    hasExperiencerange,
+    hasExperienceRange,
+    companyId,
     hasExpiryDate,
     expiryDate,
     maxSalary,
@@ -81,7 +82,8 @@ export const createJob = withSession<
       userId: auth.user.id,
       title,
       description,
-      hasExperiencerange,
+      hasExperienceRange,
+      companyId,
       minExperience,
       expiryDate,
       hasExpiryDate,
@@ -148,7 +150,7 @@ export const getAllJobs = withSession<
       companyName: true,
       city: true,
       companyBio: true,
-      hasExperiencerange: true,
+      hasExperienceRange: true,
       minExperience: true,
       maxExperience: true,
       hasExpiryDate: true,
@@ -288,7 +290,7 @@ export const getJobById = withServerActionAsyncCatcher<
       companyLogo: true,
       category: true,
       city: true,
-      hasExperiencerange: true,
+      hasExperienceRange: true,
       expiryDate: true,
       hasExpiryDate: true,
       minExperience: true,
@@ -416,7 +418,7 @@ export const toggleDeleteJobById = withServerActionAsyncCatcher<
     },
     select: {
       deleted: true,
-      deletedAt: true,
+      //   deletedAt: true,
     },
   });
 
@@ -425,7 +427,7 @@ export const toggleDeleteJobById = withServerActionAsyncCatcher<
   }
 
   const isNowDeleted = !job.deleted;
-  const deletedAt = isNowDeleted ? new Date() : null;
+  //   const deletedAt = isNowDeleted ? new Date() : null;
 
   const updatedJob = await prisma.job.update({
     where: {
@@ -433,7 +435,7 @@ export const toggleDeleteJobById = withServerActionAsyncCatcher<
     },
     data: {
       deleted: isNowDeleted,
-      deletedAt: deletedAt,
+      //   deletedAt: deletedAt,
     },
   });
 
@@ -497,14 +499,14 @@ export async function updateExpiredJobs() {
   });
 }
 export const deleteOldDeltedJobs = async () => {
-  const twoWeeksAgo = new Date(Date.now() - 14 * 24 * 60 * 60 * 1000);
+  //   const twoWeeksAgo = new Date(Date.now() - 14 * 24 * 60 * 60 * 1000);
 
   await prisma.job.deleteMany({
     where: {
       deleted: true,
-      deletedAt: {
-        lte: twoWeeksAgo,
-      },
+      //   deletedAt: {
+      //     lte: twoWeeksAgo,
+      //   },
     },
   });
 };
@@ -589,7 +591,7 @@ export async function GetBookmarkByUserId() {
             companyName: true,
             city: true,
             companyBio: true,
-            hasExperiencerange: true,
+            hasExperienceRange: true,
             minExperience: true,
             maxExperience: true,
             hasExpiryDate: true,
diff --git a/src/lib/validators/jobs.validator.ts b/src/lib/validators/jobs.validator.ts
index 83f9385c..44532c7a 100644
--- a/src/lib/validators/jobs.validator.ts
+++ b/src/lib/validators/jobs.validator.ts
@@ -17,6 +17,7 @@ export const JobPostSchema = z
       message: 'Curreny is required',
     }),
     skills: z.array(z.string()).optional(),
+    companyId: z.string(),
     category: z.string(),
     companyEmail: z.string().email('Invalid email').min(1, 'Email is required'),
     companyBio: z.string().min(1, 'Company Bio is required'),
@@ -30,7 +31,7 @@ export const JobPostSchema = z
       .number({ message: 'Max salary must be a number' })
       .nonnegative()
       .optional(),
-    hasExperiencerange: z.boolean(),
+    hasExperienceRange: z.boolean(),
     minExperience: z.coerce
       .number({ message: 'Min Experience must be a number' })
       .nonnegative()
@@ -90,7 +91,7 @@ export const JobPostSchema = z
       }
     }
 
-    if (data.hasExperiencerange) {
+    if (data.hasExperienceRange) {
       if (!data.minExperience) {
         return ctx.addIssue({
           message: 'Minimum Experience is required ',

From b67c0eec4a77d9ae1267987f61a7f41616b1f128 Mon Sep 17 00:00:00 2001
From: Deepanshu Mishra <d4deepanshu723@gmail.com>
Date: Wed, 23 Oct 2024 23:35:05 +0530
Subject: [PATCH 10/13] build fixes

---
 .../migration.sql                             | 12 ++++++++
 prisma/schema.prisma                          | 28 +++++++++++++------
 prisma/seed.ts                                |  2 +-
 src/actions/job.action.ts                     | 10 +++----
 src/lib/validators/jobs.validator.ts          |  4 +--
 5 files changed, 40 insertions(+), 16 deletions(-)
 create mode 100644 prisma/migrations/20241023180340_fix_project_mode/migration.sql

diff --git a/prisma/migrations/20241023180340_fix_project_mode/migration.sql b/prisma/migrations/20241023180340_fix_project_mode/migration.sql
new file mode 100644
index 00000000..871668ca
--- /dev/null
+++ b/prisma/migrations/20241023180340_fix_project_mode/migration.sql
@@ -0,0 +1,12 @@
+-- CreateEnum
+CREATE TYPE "ProjectStack" AS ENUM ('GO', 'PYTHON', 'MERN', 'NEXTJS', 'AI_GPT_APIS', 'SPRINGBOOT', 'OTHERS');
+
+-- DropForeignKey
+ALTER TABLE "Project" DROP CONSTRAINT "Project_userId_fkey";
+
+-- AlterTable
+ALTER TABLE "Project" ADD COLUMN     "projectThumbnail" TEXT,
+ADD COLUMN     "stack" "ProjectStack" NOT NULL DEFAULT 'OTHERS';
+
+-- AddForeignKey
+ALTER TABLE "Project" ADD CONSTRAINT "Project_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index fbc462e6..eee59b2d 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -86,7 +86,7 @@ model Job {
   hasSalaryRange     Boolean         @default(false) @map("has_salary_range")
   minSalary          Int?
   maxSalary          Int?
-  hasExperienceRange Boolean         @default(false) @map("has_experience_range")
+  hasExperiencerange Boolean         @default(false) @map("has_experience_range")
   minExperience      Int?
   maxExperience      Int?
   isVerifiedJob      Boolean         @default(false) @map("is_verified_job")
@@ -123,13 +123,25 @@ model Experience {
 }
 
 model Project {
-  id              Int @id @default(autoincrement())
-  projectName     String
-  projectSummary  String
-  projectLiveLink String?
-  projectGithub   String
-  userId          String
-  user            User @relation(fields: [userId], references: [id])
+  id               Int          @id @default(autoincrement())
+  projectName      String
+  projectThumbnail String?
+  projectSummary   String
+  projectLiveLink  String?
+  projectGithub    String
+  stack            ProjectStack @default(OTHERS)
+  userId           String
+  user             User         @relation(fields: [userId], references: [id], onDelete: Cascade)
+}
+
+enum ProjectStack {
+  GO
+  PYTHON
+  MERN
+  NEXTJS
+  AI_GPT_APIS
+  SPRINGBOOT
+  OTHERS
 }
 
 enum Currency {
diff --git a/prisma/seed.ts b/prisma/seed.ts
index eabb4cd4..87b1b023 100644
--- a/prisma/seed.ts
+++ b/prisma/seed.ts
@@ -201,7 +201,7 @@ async function seedJobs() {
             application: 'https://x.com/100xDevs',
             city: faker.location.city(),
             address: faker.location.city(),
-            hasExperienceRange: j.hasExperienceRange,
+            hasExperiencerange: j.hasExperienceRange,
             hasExpiryDate: j.hasExpiryDate,
             expiryDate: j.expiryDate,
             minExperience: j.minExperience,
diff --git a/src/actions/job.action.ts b/src/actions/job.action.ts
index b0bf3eed..b7c636bb 100644
--- a/src/actions/job.action.ts
+++ b/src/actions/job.action.ts
@@ -68,7 +68,7 @@ export const createJob = withSession<
     workMode,
     description,
     hasSalaryRange,
-    hasExperienceRange,
+    hasExperiencerange,
     companyId,
     hasExpiryDate,
     expiryDate,
@@ -82,7 +82,7 @@ export const createJob = withSession<
       userId: auth.user.id,
       title,
       description,
-      hasExperienceRange,
+      hasExperiencerange,
       companyId,
       minExperience,
       expiryDate,
@@ -150,7 +150,7 @@ export const getAllJobs = withSession<
       companyName: true,
       city: true,
       companyBio: true,
-      hasExperienceRange: true,
+      hasExperiencerange: true,
       minExperience: true,
       maxExperience: true,
       hasExpiryDate: true,
@@ -290,7 +290,7 @@ export const getJobById = withServerActionAsyncCatcher<
       companyLogo: true,
       category: true,
       city: true,
-      hasExperienceRange: true,
+      hasExperiencerange: true,
       expiryDate: true,
       hasExpiryDate: true,
       minExperience: true,
@@ -591,7 +591,7 @@ export async function GetBookmarkByUserId() {
             companyName: true,
             city: true,
             companyBio: true,
-            hasExperienceRange: true,
+            hasExperiencerange: true,
             minExperience: true,
             maxExperience: true,
             hasExpiryDate: true,
diff --git a/src/lib/validators/jobs.validator.ts b/src/lib/validators/jobs.validator.ts
index 44532c7a..b2e24819 100644
--- a/src/lib/validators/jobs.validator.ts
+++ b/src/lib/validators/jobs.validator.ts
@@ -31,7 +31,7 @@ export const JobPostSchema = z
       .number({ message: 'Max salary must be a number' })
       .nonnegative()
       .optional(),
-    hasExperienceRange: z.boolean(),
+    hasExperiencerange: z.boolean(),
     minExperience: z.coerce
       .number({ message: 'Min Experience must be a number' })
       .nonnegative()
@@ -91,7 +91,7 @@ export const JobPostSchema = z
       }
     }
 
-    if (data.hasExperienceRange) {
+    if (data.hasExperiencerange) {
       if (!data.minExperience) {
         return ctx.addIssue({
           message: 'Minimum Experience is required ',

From dd9be4b565c6090dcdb399bacc4d7acd531e8545 Mon Sep 17 00:00:00 2001
From: Deepanshu Mishra <d4deepanshu723@gmail.com>
Date: Thu, 24 Oct 2024 01:18:45 +0530
Subject: [PATCH 11/13] add logo upload

---
 .../migration.sql                             |   2 +
 prisma/schema.prisma                          |   1 +
 src/actions/auth.actions.ts                   |   3 +-
 src/components/Onboarding.tsx                 | 149 ------------------
 src/components/auth/signup.tsx                |  35 ++++
 src/lib/validators/auth.validator.ts          |   2 +
 6 files changed, 42 insertions(+), 150 deletions(-)
 create mode 100644 prisma/migrations/20241023193014_added_logo_field/migration.sql
 delete mode 100644 src/components/Onboarding.tsx

diff --git a/prisma/migrations/20241023193014_added_logo_field/migration.sql b/prisma/migrations/20241023193014_added_logo_field/migration.sql
new file mode 100644
index 00000000..258c08ef
--- /dev/null
+++ b/prisma/migrations/20241023193014_added_logo_field/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Company" ADD COLUMN     "logo" TEXT;
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index eee59b2d..14ec3d51 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -36,6 +36,7 @@ model User {
 model Company {
   id          String    @id @default(cuid())
   name        String
+  logo        String?
   website     String?
   description String?
   jobs        Job[]
diff --git a/src/actions/auth.actions.ts b/src/actions/auth.actions.ts
index 8818d7be..a5b43444 100644
--- a/src/actions/auth.actions.ts
+++ b/src/actions/auth.actions.ts
@@ -72,6 +72,7 @@ export const signUp = withServerActionAsyncCatcher<
               name: _data.companyInfo.name,
               website: _data.companyInfo.website || '',
               description: _data.companyInfo.description || '',
+              logo: _data.companyInfo.logo || '',
               userId: user.id,
             },
           });
@@ -84,6 +85,7 @@ export const signUp = withServerActionAsyncCatcher<
               title: 'Company Profile',
               companyName: _data.companyInfo.name,
               companyBio: _data.companyInfo.description || '',
+              companyLogo: _data.companyInfo.logo || '',
               companyEmail: baseData.email,
               category: 'Company',
               type: 'Full_time',
@@ -91,7 +93,6 @@ export const signUp = withServerActionAsyncCatcher<
               city: '',
               address: '',
               application: '',
-              companyLogo: '',
               skills: [],
             },
           });
diff --git a/src/components/Onboarding.tsx b/src/components/Onboarding.tsx
deleted file mode 100644
index 8f90b99c..00000000
--- a/src/components/Onboarding.tsx
+++ /dev/null
@@ -1,149 +0,0 @@
-'use client';
-
-import { useState } from 'react';
-import { useRouter } from 'next/navigation';
-import {
-  Dialog,
-  DialogContent,
-  DialogHeader,
-  DialogTitle,
-  DialogDescription,
-} from '@/components/ui/dialog';
-import { Button } from '@/components/ui/button';
-import { RadioGroup, RadioGroupItem } from '@/components/ui/radio-group';
-import { Label } from '@/components/ui/label';
-import { Input } from '@/components/ui/input';
-import { Textarea } from '@/components/ui/textarea';
-import { Building, Check } from 'lucide-react';
-import { useForm } from 'react-hook-form';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { z } from 'zod';
-
-const companySetupSchema = z.object({
-  companyName: z.string().min(1, 'Company name is required'),
-  companyWebsite: z.string().url('Invalid URL'),
-  description: z.string().min(10, 'Description must be at least 10 characters'),
-});
-
-type CompanySetupForm = z.infer<typeof companySetupSchema>;
-
-export default function OnboardingComponent() {
-  const [isOpen, setIsOpen] = useState(true);
-  const [selectedRole, setSelectedRole] = useState<string | null>(null);
-  const [showCompanySetup, setShowCompanySetup] = useState(false);
-  const [showConfirmation, setShowConfirmation] = useState(false);
-  const router = useRouter();
-
-  const {
-    register,
-    handleSubmit,
-    formState: { errors },
-  } = useForm<CompanySetupForm>({
-    resolver: zodResolver(companySetupSchema),
-  });
-
-  const handleRoleSelection = (role: string) => {
-    setSelectedRole(role);
-    if (role === 'jobSeeker') {
-      router.push('/home');
-    } else if (role === 'hr') {
-      setShowCompanySetup(true);
-    }
-    setIsOpen(false);
-  };
-
-  const handleCompanySetup = async () => {
-    setShowCompanySetup(false);
-    setShowConfirmation(true);
-  };
-
-  return (
-    <div className="min-h-screen flex items-center justify-center bg-gray-100">
-      <Dialog open={isOpen} onOpenChange={setIsOpen}>
-        <DialogContent className="sm:max-w-[425px]">
-          <DialogHeader>
-            <DialogTitle>Choose your role</DialogTitle>
-            <DialogDescription>
-              Select a role to personalize your experience
-            </DialogDescription>
-          </DialogHeader>
-          <RadioGroup onValueChange={handleRoleSelection}>
-            <div className="flex items-center space-x-2">
-              <RadioGroupItem value="jobSeeker" id="jobSeeker" />
-              <Label htmlFor="jobSeeker">Job Seeker</Label>
-            </div>
-            <div className="flex items-center space-x-2">
-              <RadioGroupItem value="hr" id="hr" />
-              <Label htmlFor="hr">HR</Label>
-            </div>
-          </RadioGroup>
-        </DialogContent>
-      </Dialog>
-
-      <Dialog open={showCompanySetup} onOpenChange={setShowCompanySetup}>
-        <DialogContent className="sm:max-w-[425px]">
-          <DialogHeader>
-            <DialogTitle>
-              Set up your company profile for {selectedRole}
-            </DialogTitle>
-          </DialogHeader>
-          <form
-            onSubmit={handleSubmit(handleCompanySetup)}
-            className="space-y-4"
-          >
-            <div className="flex justify-center">
-              <Building className="w-16 h-16 text-gray-400" />
-            </div>
-            <Input
-              type="file"
-              accept="image/*"
-              placeholder="Upload Company Logo"
-            />
-            <Input placeholder="Company Name" {...register('companyName')} />
-            {errors.companyName && (
-              <p className="text-red-500">{errors.companyName.message}</p>
-            )}
-            <Input
-              placeholder="Company Website"
-              {...register('companyWebsite')}
-            />
-            {errors.companyWebsite && (
-              <p className="text-red-500">{errors.companyWebsite.message}</p>
-            )}
-            <Textarea placeholder="Description" {...register('description')} />
-            {errors.description && (
-              <p className="text-red-500">{errors.description.message}</p>
-            )}
-            <Button type="submit" className="w-full">
-              Finish Setup
-            </Button>
-          </form>
-        </DialogContent>
-      </Dialog>
-
-      <Dialog open={showConfirmation} onOpenChange={setShowConfirmation}>
-        <DialogContent className="sm:max-w-[425px] text-center">
-          <div className="flex justify-center mb-4">
-            <div className="rounded-full bg-green-100 p-3">
-              <Check className="w-8 h-8 text-green-600" />
-            </div>
-          </div>
-          <DialogTitle>You are All Set</DialogTitle>
-          <DialogDescription>Start posting jobs</DialogDescription>
-          <div className="flex flex-col gap-2 mt-4">
-            <Button onClick={() => router.push('/post-job')}>
-              Post your First Job
-            </Button>
-            <Button variant="outline" onClick={() => router.push('/home')}>
-              Go to Home
-            </Button>
-          </div>
-        </DialogContent>
-      </Dialog>
-
-      <h1 className="text-4xl font-bold text-gray-800">
-        Welcome to Our 100xJobs
-      </h1>
-    </div>
-  );
-}
diff --git a/src/components/auth/signup.tsx b/src/components/auth/signup.tsx
index ac652d39..4a094b01 100644
--- a/src/components/auth/signup.tsx
+++ b/src/components/auth/signup.tsx
@@ -1,6 +1,7 @@
 'use client';
 import { useState } from 'react';
 import { useRouter } from 'next/navigation';
+import Image from 'next/image';
 
 import { Button } from '@/components/ui/button';
 import { Input } from '@/components/ui/input';
@@ -31,6 +32,7 @@ export const Signup = () => {
   const { toast } = useToast();
   const router = useRouter();
   const [isHr, setIsHr] = useState(false);
+  const [logoPreview, setLogoPreview] = useState<string | null>(null);
 
   const form = useForm<SignupData>({
     resolver: zodResolver(SignupSchema),
@@ -51,6 +53,17 @@ export const Signup = () => {
     },
   });
 
+  const handleLogoChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+    const file = event.target.files?.[0];
+    if (file) {
+      const reader = new FileReader();
+      reader.onloadend = () => {
+        setLogoPreview(reader.result as string);
+      };
+      reader.readAsDataURL(file);
+    }
+  };
+
   async function signupHandler(data: Omit<SignupData, 'companyInfo'>) {
     try {
       const signupData: SignupData = {
@@ -190,6 +203,28 @@ export const Signup = () => {
                   </FormItem>
                 )}
               />
+              <FormItem>
+                <FormLabel>Company Logo</FormLabel>
+                <FormControl>
+                  <Input
+                    type="file"
+                    accept="image/*"
+                    onChange={handleLogoChange}
+                  />
+                </FormControl>
+                {logoPreview && (
+                  <div className="mt-2">
+                    <Image
+                      src={logoPreview}
+                      alt="Company Logo Preview"
+                      width={100}
+                      height={100}
+                      className="object-contain"
+                    />
+                  </div>
+                )}
+                <FormMessage />
+              </FormItem>
             </div>
           )}
 
diff --git a/src/lib/validators/auth.validator.ts b/src/lib/validators/auth.validator.ts
index 514bbba5..1113e522 100644
--- a/src/lib/validators/auth.validator.ts
+++ b/src/lib/validators/auth.validator.ts
@@ -11,6 +11,7 @@ export const companySetupSchema = z.object({
   companyName: z.string().min(1, 'Company name is required'),
   companyWebsite: z.string().url('Invalid URL'),
   description: z.string().min(10, 'Description must be at least 10 characters'),
+  logo: z.string().optional(),
 });
 
 // Define the company info schema
@@ -18,6 +19,7 @@ export const CompanyInfoSchema = z.object({
   name: z.string(),
   website: z.string().optional(),
   description: z.string().optional(),
+  logo: z.string().optional(),
 });
 
 // Extend the base signup schema

From fdad287d1adeab52c73d2f09fb48388126f103bb Mon Sep 17 00:00:00 2001
From: Deepanshu Mishra <d4deepanshu723@gmail.com>
Date: Mon, 28 Oct 2024 01:59:10 +0530
Subject: [PATCH 12/13] Fix issues

---
 .../migration.sql                             |   2 +
 prisma/schema.prisma                          |   1 +
 prisma/seed.ts                                | 198 +++++++++++++-----
 src/actions/job.action.ts                     |  14 +-
 src/components/auth/signup.tsx                |   4 +-
 src/lib/validators/auth.validator.ts          |  22 +-
 6 files changed, 159 insertions(+), 82 deletions(-)
 create mode 100644 prisma/migrations/20241027195735_add_deleted_at_field/migration.sql

diff --git a/prisma/migrations/20241027195735_add_deleted_at_field/migration.sql b/prisma/migrations/20241027195735_add_deleted_at_field/migration.sql
new file mode 100644
index 00000000..091492ed
--- /dev/null
+++ b/prisma/migrations/20241027195735_add_deleted_at_field/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Job" ADD COLUMN     "deletedAt" TIMESTAMP(3);
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 14ec3d51..64566f13 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -92,6 +92,7 @@ model Job {
   maxExperience      Int?
   isVerifiedJob      Boolean         @default(false) @map("is_verified_job")
   deleted            Boolean         @default(false)
+  deletedAt          DateTime?
   postedAt           DateTime        @default(now())
   updatedAt          DateTime        @updatedAt
 
diff --git a/prisma/seed.ts b/prisma/seed.ts
index 87b1b023..2897404e 100644
--- a/prisma/seed.ts
+++ b/prisma/seed.ts
@@ -42,93 +42,166 @@ const jobs = [
     isVerifiedJob: true,
   },
   {
-    id: '14',
-    userId: '5',
-    title: 'Blockchain Developer',
-    description: 'Develop and implement blockchain solutions for various industries.',
-    companyName: 'ChainTech',
-    companyBio: 'ChainTech is revolutionizing industries through innovative blockchain solutions.',
-    companyEmail: 'jobs@chaintech.io',
+    id: '2',
+    userId: '2',
+    title: 'Backend Developer',
+    description: 'Build and maintain server-side logic.',
+    companyName: 'Innovatech',
+    companyBio:
+      'Innovatech specializes in backend systems and cloud-based solutions.',
+    companyEmail: 'careers@innovatech.com',
+    category: 'development',
+    type: EmployementType.Full_time,
+    workMode: WorkMode.office,
+    currency: Currency.USD,
+    hasExpiryDate: true,
+    expiryDate: new Date(new Date().setDate(new Date().getDate() + 49)),
+    hasExperienceRange: false,
+    companyLogo: '',
+    hasSalaryRange: false,
+    minSalary: null,
+    maxSalary: null,
+    isVerifiedJob: false,
+  },
+  {
+    id: '4',
+    userId: '2',
+    title: 'DevOps Engineer',
+    description:
+      'Automate and streamline the company operations and processes.',
+    companyName: 'DevOps Ltd.',
+    companyBio:
+      'DevOps Ltd. specializes in automation and cloud infrastructure management.',
+    companyEmail: 'jobs@devopsltd.com',
     category: 'development',
     type: EmployementType.Full_time,
     workMode: WorkMode.remote,
     currency: Currency.USD,
     hasExperienceRange: true,
-    minExperience: 2,
-    maxExperience: 4,
+    minExperience: 1,
+    maxExperience: 2,
+    hasExpiryDate: true,
+    expiryDate: new Date(new Date().setDate(new Date().getDate() + 49)),
     companyLogo: '',
     hasSalaryRange: true,
-    hasExpiryDate: false,
-    minSalary: 90000,
-    maxSalary: 140000,
+    minSalary: 50000,
+    maxSalary: 70000,
     isVerifiedJob: true,
   },
   {
-    id: '15',
-    userId: '4',
-    title: 'AR/VR Developer',
-    description: 'Create immersive augmented and virtual reality experiences.',
-    companyName: 'ImmerseTech',
-    companyBio: 'ImmerseTech is pushing the boundaries of AR and VR technology.',
-    companyEmail: 'hiring@immersetech.com',
+    id: '6',
+    userId: '2',
+    title: 'Data Scientist',
+    description:
+      'Analyze and interpret complex data to help the company make informed decisions.',
+    companyName: 'Data Insights',
+    companyBio:
+      'Data Insights provides data-driven solutions to empower businesses.',
+    companyEmail: 'recruitment@datainsights.com',
     category: 'development',
     type: EmployementType.Full_time,
     workMode: WorkMode.office,
     currency: Currency.USD,
     hasExperienceRange: true,
     minExperience: 1,
-    maxExperience: 3,
+    maxExperience: 2,
     companyLogo: '',
-    hasSalaryRange: true,
     hasExpiryDate: true,
-    expiryDate: new Date(new Date().setDate(new Date().getDate() + 45)),
+    expiryDate: new Date(new Date().setDate(new Date().getDate() + 49)),
+    hasSalaryRange: true,
     minSalary: 80000,
-    maxSalary: 120000,
+    maxSalary: 100000,
     isVerifiedJob: false,
   },
   {
-    id: '16',
-    userId: '5',
-    title: 'Cybersecurity Specialist',
-    description: 'Protect company assets from cyber threats and implement security measures.',
-    companyName: 'CyberShield',
-    companyBio: 'CyberShield provides top-tier cybersecurity solutions for businesses of all sizes.',
-    companyEmail: 'careers@cybershield.com',
-    category: 'security',
+    id: '9',
+    userId: '1',
+    title: 'Cloud Engineer',
+    description: 'Design and manage cloud-based systems and services.',
+    companyName: 'Cloud Works',
+    companyBio: 'Cloud Works provides cutting-edge cloud computing solutions.',
+    companyEmail: 'hr@cloudworks.com',
+    category: 'development',
     type: EmployementType.Full_time,
-    workMode: WorkMode.hybrid,
+    workMode: WorkMode.office,
     currency: Currency.USD,
     hasExperienceRange: true,
-    minExperience: 3,
-    maxExperience: 6,
+    hasExpiryDate: false,
+    minExperience: 1,
+    maxExperience: 2,
     companyLogo: '',
     hasSalaryRange: true,
-    hasExpiryDate: true,
-    expiryDate: new Date(new Date().setDate(new Date().getDate() + 30)),
     minSalary: 100000,
-    maxSalary: 150000,
+    maxSalary: 130000,
     isVerifiedJob: true,
   },
   {
-    id: '17',
-    userId: '4',
-    title: 'Data Engineer',
-    description: 'Design and implement data pipelines and infrastructure for big data processing.',
-    companyName: 'DataFlow',
-    companyBio: 'DataFlow specializes in building scalable data solutions for enterprise clients.',
-    companyEmail: 'jobs@dataflow.io',
-    category: 'development',
+    id: '10',
+    userId: '2',
+    title: 'Security Analyst',
+    description: 'Ensure the security and integrity of company systems.',
+    companyName: 'SecureTech',
+    companyBio:
+      'SecureTech specializes in cybersecurity solutions for modern businesses.',
+    companyEmail: 'security@securetech.com',
+    category: 'support',
     type: EmployementType.Full_time,
     workMode: WorkMode.remote,
     currency: Currency.USD,
     hasExperienceRange: true,
-    minExperience: 2,
-    maxExperience: 5,
+    minExperience: 1,
+    maxExperience: 2,
+    companyLogo: '',
+    hasExpiryDate: true,
+    expiryDate: new Date(new Date().setDate(new Date().getDate() + 49)),
+    hasSalaryRange: true,
+    minSalary: 75000,
+    maxSalary: 95000,
+    isVerifiedJob: false,
+  },
+  {
+    id: '11',
+    userId: '1',
+    title: 'QA Engineer',
+    description: 'Ensure the quality of software products.',
+    companyName: 'QA Solutions',
+    companyBio:
+      'QA Solutions ensures top-notch quality assurance services for software.',
+    companyEmail: 'contact@qasolutions.com',
+    category: 'support',
+    type: EmployementType.Full_time,
+    workMode: WorkMode.remote,
+    currency: Currency.USD,
     companyLogo: '',
     hasSalaryRange: true,
     hasExpiryDate: false,
-    minSalary: 95000,
-    maxSalary: 140000,
+    hasExperienceRange: false,
+    minSalary: 25000,
+    maxSalary: 50000,
+    isVerifiedJob: true,
+  },
+  {
+    id: '12',
+    userId: '2',
+    title: 'Technical Writer',
+    description: 'Create and manage technical documentation.',
+    companyName: 'WriteTech',
+    companyBio:
+      'WriteTech specializes in high-quality technical writing services.',
+    companyEmail: 'hr@writetech.com',
+    category: 'writing',
+    type: EmployementType.Contract,
+    workMode: WorkMode.remote,
+    currency: Currency.USD,
+    hasExpiryDate: true,
+    expiryDate: new Date(new Date().setDate(new Date().getDate() + 49)),
+    hasExperienceRange: true,
+    minExperience: 1,
+    maxExperience: 2,
+    companyLogo: '',
+    hasSalaryRange: false,
+    minSalary: null,
+    maxSalary: null,
     isVerifiedJob: true,
   },
 ];
@@ -171,17 +244,28 @@ async function seedJobs() {
 
     const validJobs = jobs.filter((job) => existingUserIds.has(job.userId));
 
-    await Promise.all(
-      validJobs.map(async (j) => {
-        // Create a company for each job
-        const company = await prisma.company.create({
-          data: {
-            name: j.companyName,
-            description: j.companyBio,
+    // Create companies first, one per user
+    const userCompanies = new Map();
+    for (const job of validJobs) {
+      if (!userCompanies.has(job.userId)) {
+        const company = await prisma.company.upsert({
+          where: { userId: job.userId },
+          update: {},
+          create: {
+            name: job.companyName,
+            description: job.companyBio,
             website: faker.internet.url(),
-            userId: j.userId,
+            userId: job.userId,
           },
         });
+        userCompanies.set(job.userId, company);
+      }
+    }
+
+    // Then create jobs using the existing companies
+    await Promise.all(
+      validJobs.map(async (j) => {
+        const company = userCompanies.get(j.userId);
 
         return prisma.job.upsert({
           where: { id: j.id },
diff --git a/src/actions/job.action.ts b/src/actions/job.action.ts
index b7c636bb..54b6216e 100644
--- a/src/actions/job.action.ts
+++ b/src/actions/job.action.ts
@@ -418,7 +418,7 @@ export const toggleDeleteJobById = withServerActionAsyncCatcher<
     },
     select: {
       deleted: true,
-      //   deletedAt: true,
+      deletedAt: true,
     },
   });
 
@@ -427,7 +427,7 @@ export const toggleDeleteJobById = withServerActionAsyncCatcher<
   }
 
   const isNowDeleted = !job.deleted;
-  //   const deletedAt = isNowDeleted ? new Date() : null;
+  const deletedAt = isNowDeleted ? new Date() : null;
 
   const updatedJob = await prisma.job.update({
     where: {
@@ -435,7 +435,7 @@ export const toggleDeleteJobById = withServerActionAsyncCatcher<
     },
     data: {
       deleted: isNowDeleted,
-      //   deletedAt: deletedAt,
+      deletedAt: deletedAt,
     },
   });
 
@@ -499,14 +499,14 @@ export async function updateExpiredJobs() {
   });
 }
 export const deleteOldDeltedJobs = async () => {
-  //   const twoWeeksAgo = new Date(Date.now() - 14 * 24 * 60 * 60 * 1000);
+  const twoWeeksAgo = new Date(Date.now() - 14 * 24 * 60 * 60 * 1000);
 
   await prisma.job.deleteMany({
     where: {
       deleted: true,
-      //   deletedAt: {
-      //     lte: twoWeeksAgo,
-      //   },
+      deletedAt: {
+        lte: twoWeeksAgo,
+      },
     },
   });
 };
diff --git a/src/components/auth/signup.tsx b/src/components/auth/signup.tsx
index 4a094b01..6fa5b252 100644
--- a/src/components/auth/signup.tsx
+++ b/src/components/auth/signup.tsx
@@ -22,7 +22,7 @@ import {
 import { Label } from '@/components/ui/label';
 import { Switch } from '@/components/ui/switch';
 import {
-  CompanyInfoSchema,
+  companyInfoSchema,
   SignupSchema,
   SignupData,
   CompanyInfo,
@@ -45,7 +45,7 @@ export const Signup = () => {
   });
 
   const companyForm = useForm<CompanyInfo>({
-    resolver: zodResolver(CompanyInfoSchema),
+    resolver: zodResolver(companyInfoSchema),
     defaultValues: {
       name: '',
       website: '',
diff --git a/src/lib/validators/auth.validator.ts b/src/lib/validators/auth.validator.ts
index 1113e522..45e19ec0 100644
--- a/src/lib/validators/auth.validator.ts
+++ b/src/lib/validators/auth.validator.ts
@@ -7,18 +7,11 @@ export const SigninSchema = z.object({
 
 export type SigninSchemaType = z.infer<typeof SigninSchema>;
 
-export const companySetupSchema = z.object({
-  companyName: z.string().min(1, 'Company name is required'),
-  companyWebsite: z.string().url('Invalid URL'),
-  description: z.string().min(10, 'Description must be at least 10 characters'),
-  logo: z.string().optional(),
-});
-
 // Define the company info schema
-export const CompanyInfoSchema = z.object({
-  name: z.string(),
-  website: z.string().optional(),
-  description: z.string().optional(),
+export const companyInfoSchema = z.object({
+  name: z.string().min(1, 'Company name is required'),
+  website: z.string().url('Invalid URL'),
+  description: z.string().min(10, 'Description must be at least 10 characters'),
   logo: z.string().optional(),
 });
 
@@ -28,12 +21,9 @@ export const SignupSchema = z.object({
   email: z.string().email('Invalid email address'),
   password: z.string().min(6, 'Password must be at least 6 characters'),
   role: z.enum(['USER', 'HR']).default('USER'),
-  companyInfo: CompanyInfoSchema.optional(),
+  companyInfo: companyInfoSchema.optional(),
 });
 
-export type CompanyInfo = z.infer<typeof CompanyInfoSchema>;
+export type CompanyInfo = z.infer<typeof companyInfoSchema>;
 export type SignupData = z.infer<typeof SignupSchema>;
-
 export type SignupSchemaType = z.infer<typeof SignupSchema>;
-
-export type companySetupSchema = z.infer<typeof companySetupSchema>;

From 97dc5a2c85ad40da6672561851d532ae81bddc39 Mon Sep 17 00:00:00 2001
From: Deepanshu Mishra <d4deepanshu723@gmail.com>
Date: Mon, 28 Oct 2024 02:22:04 +0530
Subject: [PATCH 13/13] bug fixes + improve image uploader

---
 src/actions/auth.actions.ts          | 33 ++++---------
 src/components/auth/signup.tsx       | 38 +--------------
 src/components/image-upload.tsx      | 72 ++++++++++++++++++++++++++++
 src/lib/validators/auth.validator.ts |  8 +++-
 4 files changed, 89 insertions(+), 62 deletions(-)
 create mode 100644 src/components/image-upload.tsx

diff --git a/src/actions/auth.actions.ts b/src/actions/auth.actions.ts
index a5b43444..04aad73d 100644
--- a/src/actions/auth.actions.ts
+++ b/src/actions/auth.actions.ts
@@ -50,7 +50,7 @@ export const signUp = withServerActionAsyncCatcher<
   );
 
   try {
-    await prisma.$transaction(
+    const result = await prisma.$transaction(
       async (txn) => {
         const user = await txn.user.create({
           data: {
@@ -64,10 +64,11 @@ export const signUp = withServerActionAsyncCatcher<
           },
         });
 
+        let company = null;
         // If HR role and company info provided, create company-related data
         if (baseData.role === 'HR' && _data.companyInfo) {
-          // Create the company entry
-          const company = await txn.company.create({
+          // Create the company entry and store the result
+          company = await txn.company.create({
             data: {
               name: _data.companyInfo.name,
               website: _data.companyInfo.website || '',
@@ -76,26 +77,6 @@ export const signUp = withServerActionAsyncCatcher<
               userId: user.id,
             },
           });
-
-          // Create a job entry associated with the company
-          await txn.job.create({
-            data: {
-              userId: user.id,
-              companyId: company.id, // Linking the job with the company
-              title: 'Company Profile',
-              companyName: _data.companyInfo.name,
-              companyBio: _data.companyInfo.description || '',
-              companyLogo: _data.companyInfo.logo || '',
-              companyEmail: baseData.email,
-              category: 'Company',
-              type: 'Full_time',
-              workMode: 'office',
-              city: '',
-              address: '',
-              application: '',
-              skills: [],
-            },
-          });
         }
 
         const verificationToken = await txn.verificationToken.create({
@@ -119,7 +100,8 @@ export const signUp = withServerActionAsyncCatcher<
           secure: process.env.NODE_ENV === 'production',
         });
 
-        return user;
+        // Return both user and company information
+        return { user, company };
       },
       {
         maxWait: 5000,
@@ -129,7 +111,8 @@ export const signUp = withServerActionAsyncCatcher<
 
     return new SuccessResponse(
       'User registered successfully. A verification link has been sent to your email.',
-      201
+      201,
+      { userId: result.user.id, companyId: result.company?.id }
     ).serialize();
   } catch (err) {
     console.error('Signup error:', err);
diff --git a/src/components/auth/signup.tsx b/src/components/auth/signup.tsx
index 6fa5b252..5232f8b8 100644
--- a/src/components/auth/signup.tsx
+++ b/src/components/auth/signup.tsx
@@ -1,8 +1,6 @@
 'use client';
 import { useState } from 'react';
 import { useRouter } from 'next/navigation';
-import Image from 'next/image';
-
 import { Button } from '@/components/ui/button';
 import { Input } from '@/components/ui/input';
 import { Textarea } from '@/components/ui/textarea';
@@ -27,12 +25,12 @@ import {
   SignupData,
   CompanyInfo,
 } from '@/lib/validators/auth.validator';
+import ImageUpload from '../image-upload';
 
 export const Signup = () => {
   const { toast } = useToast();
   const router = useRouter();
   const [isHr, setIsHr] = useState(false);
-  const [logoPreview, setLogoPreview] = useState<string | null>(null);
 
   const form = useForm<SignupData>({
     resolver: zodResolver(SignupSchema),
@@ -53,17 +51,6 @@ export const Signup = () => {
     },
   });
 
-  const handleLogoChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-    const file = event.target.files?.[0];
-    if (file) {
-      const reader = new FileReader();
-      reader.onloadend = () => {
-        setLogoPreview(reader.result as string);
-      };
-      reader.readAsDataURL(file);
-    }
-  };
-
   async function signupHandler(data: Omit<SignupData, 'companyInfo'>) {
     try {
       const signupData: SignupData = {
@@ -203,28 +190,7 @@ export const Signup = () => {
                   </FormItem>
                 )}
               />
-              <FormItem>
-                <FormLabel>Company Logo</FormLabel>
-                <FormControl>
-                  <Input
-                    type="file"
-                    accept="image/*"
-                    onChange={handleLogoChange}
-                  />
-                </FormControl>
-                {logoPreview && (
-                  <div className="mt-2">
-                    <Image
-                      src={logoPreview}
-                      alt="Company Logo Preview"
-                      width={100}
-                      height={100}
-                      className="object-contain"
-                    />
-                  </div>
-                )}
-                <FormMessage />
-              </FormItem>
+              <ImageUpload />
             </div>
           )}
 
diff --git a/src/components/image-upload.tsx b/src/components/image-upload.tsx
new file mode 100644
index 00000000..2c1e9d91
--- /dev/null
+++ b/src/components/image-upload.tsx
@@ -0,0 +1,72 @@
+import { useState } from 'react';
+import Image from 'next/image';
+import { Button } from '@/components/ui/button';
+import { FormItem, FormLabel, FormMessage } from '@/components/ui/form';
+import { Upload } from 'lucide-react';
+
+export default function ImageUpload() {
+  const [logoPreview, setLogoPreview] = useState<string | null>(null);
+
+  const handleLogoChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+    const file = event.target.files?.[0];
+    if (file) {
+      const reader = new FileReader();
+      reader.onloadend = () => {
+        setLogoPreview(reader.result as string);
+      };
+      reader.readAsDataURL(file);
+    }
+  };
+
+  return (
+    <FormItem>
+      <FormLabel>Company Logo</FormLabel>
+      <div className="flex items-center justify-center w-full">
+        <label
+          htmlFor="dropzone-file"
+          className="flex flex-col items-center justify-center w-full h-64 border-2 border-gray-300 border-dashed rounded-lg cursor-pointer bg-gray-50 dark:hover:bg-bray-800 dark:bg-gray-700 hover:bg-gray-100 dark:border-gray-600 dark:hover:border-gray-500 dark:hover:bg-gray-600"
+        >
+          {logoPreview ? (
+            <div className="relative w-full h-full">
+              <Image
+                src={logoPreview}
+                alt="Company Logo Preview"
+                layout="fill"
+                objectFit="contain"
+              />
+            </div>
+          ) : (
+            <div className="flex flex-col items-center justify-center pt-5 pb-6">
+              <Upload className="w-8 h-8 mb-4 text-gray-500 dark:text-gray-400" />
+              <p className="mb-2 text-sm text-gray-500 dark:text-gray-400">
+                <span className="font-semibold">Click to upload</span> or drag
+                and drop
+              </p>
+              <p className="text-xs text-gray-500 dark:text-gray-400">
+                SVG, PNG, JPG or GIF (MAX. 800x400px)
+              </p>
+            </div>
+          )}
+          <input
+            id="dropzone-file"
+            type="file"
+            className="hidden"
+            onChange={handleLogoChange}
+            accept="image/*"
+          />
+        </label>
+      </div>
+      {logoPreview && (
+        <Button
+          type="button"
+          variant="outline"
+          className="mt-2"
+          onClick={() => setLogoPreview(null)}
+        >
+          Remove Image
+        </Button>
+      )}
+      <FormMessage />
+    </FormItem>
+  );
+}
diff --git a/src/lib/validators/auth.validator.ts b/src/lib/validators/auth.validator.ts
index 45e19ec0..5a9e59bb 100644
--- a/src/lib/validators/auth.validator.ts
+++ b/src/lib/validators/auth.validator.ts
@@ -10,7 +10,13 @@ export type SigninSchemaType = z.infer<typeof SigninSchema>;
 // Define the company info schema
 export const companyInfoSchema = z.object({
   name: z.string().min(1, 'Company name is required'),
-  website: z.string().url('Invalid URL'),
+  website: z
+    .string()
+    .url('Website URL is invalid')
+    .refine((url) => url.startsWith('https'), {
+      message: 'Website URL must start with https://',
+    }),
+
   description: z.string().min(10, 'Description must be at least 10 characters'),
   logo: z.string().optional(),
 });