Merge branch 'main' into react-qull-ui-fixes

code100x · Sep 29, 2024 · 5e9dbed · 5e9dbed
2 parents a5471c3 + 06a1cb0
commit 5e9dbed
Show file tree

Hide file tree

Showing 24 changed files with 352 additions and 179 deletions.
diff --git a/.env.example b/.env.example
@@ -1,4 +1,3 @@
-BASE_URL=http://localhost:3000
 #
 # Database 
 #
@@ -20,8 +19,11 @@ NEXT_PUBLIC_GOOGLE_MAPS_API_KEY=maps-api-key
 # 
 # Email SMTP credentials
 # 
-EMAIL_USER=user@gmail.com
+EMAIL_USER= # your email ex: vineetagarwal@gmail.com
 EMAIL_PASSWORD=
+EMAIL_SERVICE=gmail
+EMAIL_HOST=smtp.gmail.com
+EMAIL_PORT=587
 
 # 
 # Google OAuth credentials

diff --git a/package.json b/package.json
@@ -35,6 +35,7 @@
     "@hookform/resolvers": "^3.9.0",
     "@prisma/client": "5.18.0",
     "@radix-ui/react-accordion": "^1.2.0",
+    "@radix-ui/react-avatar": "^1.1.0",
     "@radix-ui/react-checkbox": "^1.1.1",
     "@radix-ui/react-dialog": "^1.1.1",
     "@radix-ui/react-dropdown-menu": "^2.1.1",

diff --git a/prisma/migrations/20240921165842_update/migration.sql b/prisma/migrations/20240921165842_update/migration.sql
diff --git a/.../migrations/20240922173657_/migration.sql → ...grations/20240929090953_dev/migration.sql b/.../migrations/20240922173657_/migration.sql → ...grations/20240929090953_dev/migration.sql
@@ -1,3 +1,9 @@
+-- CreateEnum
+CREATE TYPE "OauthProvider" AS ENUM ('GOOGLE');
+
+-- CreateEnum
+CREATE TYPE "TokenType" AS ENUM ('EMAIL_VERIFICATION', 'RESET_PASSWORD');
+
 -- CreateEnum
 CREATE TYPE "Currency" AS ENUM ('INR', 'USD');
 
@@ -7,19 +13,35 @@ CREATE TYPE "WorkMode" AS ENUM ('remote', 'hybrid', 'office');
 -- CreateEnum
 CREATE TYPE "Role" AS ENUM ('USER', 'ADMIN');
 
+-- CreateEnum
+CREATE TYPE "EmployementType" AS ENUM ('Full_time', 'Part_time', 'Internship', 'Contract');
+
 -- CreateTable
 CREATE TABLE "User" (
     "id" TEXT NOT NULL,
     "name" TEXT NOT NULL,
-    "email" TEXT NOT NULL,
-    "password" TEXT NOT NULL,
+    "password" TEXT,
     "avatar" TEXT,
     "isVerified" BOOLEAN NOT NULL DEFAULT false,
     "role" "Role" NOT NULL DEFAULT 'USER',
+    "email" TEXT NOT NULL,
+    "emailVerified" TIMESTAMP(3),
+    "oauthProvider" "OauthProvider",
+    "oauthId" TEXT,
+    "blockedByAdmin" TIMESTAMP(3),
 
     CONSTRAINT "User_pkey" PRIMARY KEY ("id")
 );
 
+-- CreateTable
+CREATE TABLE "VerificationToken" (
+    "token" TEXT NOT NULL,
+    "identifier" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+    "type" "TokenType" NOT NULL
+);
+
 -- CreateTable
 CREATE TABLE "Job" (
     "id" TEXT NOT NULL,
@@ -30,16 +52,20 @@ CREATE TABLE "Job" (
     "company_bio" TEXT NOT NULL,
     "company_email" TEXT NOT NULL,
     "category" TEXT NOT NULL,
-    "type" TEXT NOT NULL,
+    "type" "EmployementType" NOT NULL,
     "work_mode" "WorkMode" NOT NULL,
     "currency" "Currency" NOT NULL DEFAULT 'INR',
     "city" TEXT NOT NULL,
     "address" TEXT NOT NULL,
     "application" TEXT NOT NULL,
     "companyLogo" TEXT NOT NULL,
+    "skills" TEXT[],
     "has_salary_range" BOOLEAN NOT NULL DEFAULT false,
     "minSalary" INTEGER,
     "maxSalary" INTEGER,
+    "has_experience_range" BOOLEAN NOT NULL DEFAULT false,
+    "minExperience" INTEGER,
+    "maxExperience" INTEGER,
     "is_verified_job" BOOLEAN NOT NULL DEFAULT false,
     "postedAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
     "updatedAt" TIMESTAMP(3) NOT NULL,
@@ -50,5 +76,8 @@ CREATE TABLE "Job" (
 -- CreateIndex
 CREATE UNIQUE INDEX "User_email_key" ON "User"("email");
 
+-- CreateIndex
+CREATE UNIQUE INDEX "VerificationToken_token_identifier_key" ON "VerificationToken"("token", "identifier");
+
 -- AddForeignKey
 ALTER TABLE "Job" ADD CONSTRAINT "Job_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -47,32 +47,32 @@ enum  TokenType {
 }
 
 model Job {
-  id                 String   @id @default(cuid())
+  id                 String          @id @default(cuid())
   userId             String
   title              String
   description        String?
-  companyName        String   @map("company_name")
-  companyBio         String   @map("company_bio")
-  companyEmail       String   @map("company_email")
-  category           String 
+  companyName        String          @map("company_name")
+  companyBio         String          @map("company_bio")
+  companyEmail       String          @map("company_email")
+  category           String
   type               EmployementType
-  workMode           WorkMode @map("work_mode")
-  currency           Currency @default(INR)
+  workMode           WorkMode        @map("work_mode")
+  currency           Currency        @default(INR)
   city               String
   address            String
   application        String
-  companyLogo        String 
+  companyLogo        String
   skills             String[]
-  hasSalaryRange     Boolean  @default(false) @map("has_salary_range")
+  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")
-  postedAt           DateTime @default(now())
-  updatedAt          DateTime @updatedAt
-  user               User     @relation(fields: [userId], references: [id])
+  isVerifiedJob      Boolean         @default(false) @map("is_verified_job")
+  postedAt           DateTime        @default(now())
+  updatedAt          DateTime        @updatedAt
+  user               User            @relation(fields: [userId], references: [id])
 }
 
 enum Currency {
@@ -97,4 +97,3 @@ enum EmployementType {
   Internship
   Contract
 }
-
diff --git a/src/actions/auth.actions.ts b/src/actions/auth.actions.ts
@@ -6,7 +6,6 @@ import {
 } from '@/config/auth.config';
 import APP_PATHS from '@/config/path.config';
 import prisma from '@/config/prisma.config';
-import { serverEnv } from '@/env/server';
 import { withServerActionAsyncCatcher } from '@/lib/async-catch';
 import { ErrorHandler } from '@/lib/error';
 import {
@@ -53,8 +52,7 @@ export const signUp = withServerActionAsyncCatcher<
         },
       });
 
-      const confirmationLink = `${serverEnv.BASE_URL}/${APP_PATHS.VERIFY_EMAIL}/${verificationToken.token}`;
-
+      const confirmationLink = `${process.env.NEXTAUTH_URL}${APP_PATHS.VERIFY_EMAIL}/${verificationToken.token}`;
       await sendConfirmationEmail(
         data.email,
         confirmationLink,
@@ -160,7 +158,7 @@ const resendVerificationLinkUtil = async ({
     data: { token: newToken, ...(reIssue ? { createdAt: new Date() } : {}) },
   });
 
-  const confirmationLink = `${serverEnv.BASE_URL}/${APP_PATHS.VERIFY_EMAIL}/${newToken}`;
+  const confirmationLink = `${process.env.NEXTAUTH_URL}/${APP_PATHS.VERIFY_EMAIL}/${newToken}`;
   await sendConfirmationEmail(email, confirmationLink, type);
 };
 
@@ -246,7 +244,7 @@ export const forgetPassword = withServerActionAsyncCatcher<
     },
   });
 
-  const resetPasswordLink = `${serverEnv.BASE_URL}/${APP_PATHS.RESET_PASSWORD}/${verificationToken.token}`;
+  const resetPasswordLink = `${process.env.NEXTAUTH_URL}/${APP_PATHS.RESET_PASSWORD}/${verificationToken.token}`;
 
   await sendConfirmationEmail(email, resetPasswordLink, 'RESET_PASSWORD');
 

diff --git a/src/actions/job.action.ts b/src/actions/job.action.ts
@@ -15,16 +15,15 @@ import {
 } from '@/lib/validators/jobs.validator';
 import { getJobFilters } from '@/services/jobs.services';
 import { ServerActionReturnType } from '@/types/api.types';
- 
+
 import { getServerSession } from 'next-auth';
 import { authOptions } from '@/lib/authOptions';
- 
+
 import {
   getAllJobsAdditonalType,
   getAllRecommendedJobs,
   getJobType,
 } from '@/types/jobs.types';
-
 
 type additional = {
   isVerifiedJob: boolean;
@@ -73,7 +72,7 @@ export const createJob = withServerActionAsyncCatcher<
       address,
       companyLogo,
       workMode,
-      isVerifiedJob: false, // Default to false since there's no session to check for admin role
+      isVerifiedJob: false,
     },
   });
   const message = 'Job created successfully, waiting for admin approval';

diff --git a/src/components/DescriptionEditor.tsx b/src/components/DescriptionEditor.tsx
@@ -56,7 +56,7 @@ const DescriptionEditor: React.FC<DescriptionEditorProps> = ({
       style={{ width: '100%' }}
       onChange={handleChange}
       placeholder={placeholder}
-      className="text-white bg-gray-800 overflow-hidden job-description-editor text-wrap max-w-[537px]"
+      className="text-white bg-gray-800  job-description-editor text-wrap max-w-[537px]"
     />
   );
 };

diff --git a/src/components/auth/signup.tsx b/src/components/auth/signup.tsx
@@ -40,7 +40,6 @@ export const Signup = () => {
   async function signupHandler(data: SignupSchemaType) {
     try {
       const response = await signUp(data);
-
       if (!response.status) {
         toast({
           title: response.message || 'Something went wrong',

diff --git a/src/components/job-card.tsx b/src/components/job-card.tsx
@@ -10,7 +10,7 @@ export default function JobCard({ job }: { job: JobType }) {
       {/* job card */}
       <div className="border-2 transition-all duration-115 ease-linear hover:bg-lightBgSecondary dark:hover:bg-darkBgSecondary flex flex-col gap-6 h-fit max-h-[10rem] p-4 rounded-xl">
         <div className="flex gap-4 items-center">
-          <div className="w-[4rem] h-[4rem] bg-primary/20 rounded-md">
+          <div className="w-[4rem] h-[4rem]  rounded-md">
             {job.companyLogo && (
               <Image
                 className="size-full object-cover "

diff --git a/src/components/job-form.tsx b/src/components/job-form.tsx
@@ -132,6 +132,7 @@ const PostJobForm = () => {
         (await submitImage(file)) ?? 'https://wwww.example.com';
       ``;
       const response = await createJob(data);
+
       if (!response.status) {
         return toast({
           title: response.message || 'Error',
@@ -182,14 +183,14 @@ const PostJobForm = () => {
         <div className="bg-gray-800/90 backdrop-blur-sm p-4 rounded-lg text-center text-white w-full md:w-48">
           <MailOpenIcon className="w-8 h-8 mb-3 mx-auto text-purple-500" />
           <p className="text-base font-semibold mb-1">Emailed to</p>
-          <p className="text-gray-400 text-sm">290,301 subscribers</p>
+          <p className="text-gray-400 text-sm">17,000 subscribers</p>
         </div>
 
         <div className="bg-gray-800/90 backdrop-blur-sm p-4 rounded-lg text-center text-white w-full md:w-48">
           <LucideRocket className="w-8 h-8 mb-3 mx-auto text-orange-500" />
           <p className="text-base font-semibold mb-1">Reach</p>
           <p className="text-gray-400 text-sm">
-            300,000<span className="text-blue-500">+</span>
+            500,000<span className="text-blue-500">+</span>
           </p>
         </div>
       </div>
@@ -382,7 +383,6 @@ const PostJobForm = () => {
                 innerRef={gmapsInputRef}
                 form={form}
               ></DynamicGmapsAutoSuggest>
-
               <FormField
                 control={form.control}
                 name="application"