Revert "feature"

This reverts commit 7673146.
code100x · Sep 15, 2024 · 27d38be · 27d38be
1 parent 7673146
commit 27d38be
Show file tree

Hide file tree

Showing 15 changed files with 75 additions and 159 deletions.
diff --git a/.env.example b/.env.example
@@ -15,7 +15,3 @@ NEXTAUTH_URL="http://localhost:3000"
 CDN_API_KEY=api-key
 CDN_BASE_UPLOAD_URL=https://sg.storage.bunnycdn.com/job-board/assets
 CDN_BASE_ACCESS_URL=https://job-board.b-cdn.net/assets
-
-
-NEXT_PUBLIC_GOOGLE_MAPS_API_KEY=
-
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -27,10 +27,6 @@ jobs:
 
       - name: Run format check
         run: npm run check
-
-      - name: Run format fix if check fails
-        if: ${{ failure() }}
-        run: npm run format
 
       - name: Run build
-        run: npm run build
+        run: npm run build
diff --git a/package.json b/package.json
@@ -9,27 +9,16 @@
     "lint": "next lint",
     "dev:docker": "npm run db:seed & next dev",
     "db:seed": "npx prisma db push & npx prisma db seed",
-    "check": "prettier --check \"**/*.{ts,tsx,js,jsx,md,mdx,css}\"",
     "format": "prettier --write \"**/*.{ts,tsx,js,jsx,md,mdx,css}\"",
+    "check": "prettier --check \"**/*.{ts,tsx,js,jsx,md,mdx,css}\"",
     "prepare": "husky"
   },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
-  "lint-staged": {
-    "**/*.{ts,tsx,js,jsx,md,mdx,css}": [
-      "prettier --write"
-    ]
-  },
   "prisma": {
     "seed": "ts-node --compiler-options {\"module\":\"CommonJS\"} prisma/seed.ts"
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.645.0",
     "@aws-sdk/s3-request-presigner": "^3.645.0",
-    "@faker-js/faker": "^9.0.0",
     "@hookform/resolvers": "^3.9.0",
     "@prisma/client": "5.18.0",
     "@radix-ui/react-accordion": "^1.2.0",

diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -30,8 +30,7 @@ model Job {
   type           String
   workMode       WorkMode @map("work_mode")
   currency       Currency @default(INR)
-  city           String
-  address        String
+  location       JobLocations
   application    String
   companyLogo    String 
   hasSalaryRange Boolean  @default(false) @map("has_salary_range")
@@ -59,3 +58,15 @@ enum Role {
   ADMIN
 }
 
+enum JobLocations {
+  BANGLORE
+  DELHI
+  MUMBAI
+  CHENNAI
+  PUNE
+  HYDERABAD
+  KOLKATA
+  AHMEDABAD
+  JAIPUR
+  SURAT
+}
diff --git a/prisma/seed.ts b/prisma/seed.ts
@@ -1,14 +1,16 @@
 /* eslint-disable no-console */
 import { Currency, Role, WorkMode } from '@prisma/client';
-import { faker } from '@faker-js/faker';
 import bcrypt from 'bcryptjs';
 import prisma from '../src/config/prisma.config';
+import { JobLocations } from '@prisma/client';
 
 const users = [
   { id: '1', name: 'Jack', email: '[email protected]' },
   { id: '2', name: 'Admin', email: '[email protected]', role: Role.ADMIN },
 ];
 
+const locationArr = Object.keys(JobLocations);
+
 let jobs = [
   {
     id: '1',
@@ -284,6 +286,13 @@ async function seedUsers() {
 }
 
 async function seedJobs() {
+  jobs = jobs.map((j, index) => {
+    return {
+      ...j,
+      location:
+        locationArr[index] !== undefined ? locationArr[index] : locationArr[3],
+    };
+  });
   try {
     await Promise.all(
       jobs.map(async (j) =>
@@ -302,8 +311,8 @@ async function seedJobs() {
             workMode: j.workMode,
             currency: j.currency,
             application: j.application,
-            city: faker.location.city(),
-            address: faker.location.streetAddress(),
+            //@ts-ignore
+            location: j.location,
             companyLogo: j.companyLogo,
             hasSalaryRange: j.hasSalaryRange,
             minSalary: j.minSalary,

diff --git a/src/actions/job.action.ts b/src/actions/job.action.ts
@@ -29,8 +29,7 @@ export const createJob = withServerActionAsyncCatcher<
     type,
     category,
     application,
-    city,
-    address,
+    location,
     companyLogo,
     title,
     workMode,
@@ -53,8 +52,7 @@ export const createJob = withServerActionAsyncCatcher<
       hasSalaryRange,
       minSalary,
       maxSalary,
-      city,
-      address,
+      location,
       companyLogo,
       workMode,
       isVerifiedJob: false, // Default to false since there's no session to check for admin role
@@ -75,8 +73,8 @@ export const getAllJobs = withServerActionAsyncCatcher<
   if (data?.salaryrange && !Array.isArray(data?.salaryrange)) {
     data.salaryrange = Array.of(data?.salaryrange);
   }
-  if (data?.city && !Array.isArray(data?.city)) {
-    data.city = Array.of(data?.city);
+  if (data?.location && !Array.isArray(data?.location)) {
+    data.location = Array.of(data?.location);
   }
   const result = JobQuerySchema.parse(data);
   const { filterQueries, orderBy, pagination } = getJobFilters(result);
@@ -92,8 +90,7 @@ export const getAllJobs = withServerActionAsyncCatcher<
       title: true,
       description: true,
       companyName: true,
-      city: true,
-      address: true,
+      location: true,
       workMode: true,
       minSalary: true,
       maxSalary: true,
@@ -134,8 +131,7 @@ export const getJobById = withServerActionAsyncCatcher<
       companyBio: true,
       companyEmail: true,
       companyLogo: true,
-      city: true,
-      address: true,
+      location: true,
       workMode: true,
       minSalary: true,
       maxSalary: true,
@@ -146,15 +142,3 @@ export const getJobById = withServerActionAsyncCatcher<
     job,
   }).serialize();
 });
-
-export const getCityFilters = async () => {
-  const response = await prisma.job.findMany({
-    select: {
-      city: true,
-    },
-  });
-  const cities = Array.from(new Set(response.map((res) => res.city)));
-  return new SuccessResponse(`Cities fetched successfully`, 200, {
-    cities,
-  }).serialize();
-};
diff --git a/src/app/globals.css b/src/app/globals.css
@@ -345,30 +345,3 @@
   overflow-x: hidden !important; /* Allow horizontal scrolling */
   overflow-y: hidden !important; /* Hide vertical overflow */
 }
-
-.pac-container {
-  background-color: black !important;
-  color: #fff;
-  border-radius: 8px;
-  padding-top: 5px;
-  padding-bottom: 5px;
-  font-family: '__Inter_36bd41', '__Inter_Fallback', sans-serif !important;
-  font-size: 14px !important;
-}
-.pac-item {
-  color: #fff !important;
-  border: none;
-  font-size: 14px;
-}
-.pac-item:hover {
-  background-color: hsl(0, 0%, 14.9%) !important;
-  cursor: pointer;
-}
-.pac-item-query {
-  color: white;
-  font-weight: bold;
-}
-
-.pac-logo.hdpi::after {
-  content: none;
-}
diff --git a/src/components/all-jobs.tsx b/src/components/all-jobs.tsx
@@ -40,7 +40,7 @@ const AllJobs = async ({ searchParams }: PaginatorProps) => {
               <div className="flex gap-2 text-xs text-muted-foreground">
                 <span className="flex items-center gap-0.5">
                   <Icon icon="location" size={12} />
-                  {job.address}{' '}
+                  {job.location}{' '}
                   <span className="capitalize">({job.workMode})</span>
                 </span>
                 <span className="flex items-center gap-0.5">

diff --git a/src/components/gmaps-autosuggest.tsx b/src/components/gmaps-autosuggest.tsx
diff --git a/src/components/job-form.tsx b/src/components/job-form.tsx
@@ -31,7 +31,6 @@ import Image from 'next/image';
 import { FaFileUpload } from 'react-icons/fa';
 import { Switch } from './ui/switch';
 import { Label } from './ui/label';
-import { GmapsAutocompleteAddress } from './gmaps-autosuggest';
 
 const PostJobForm = () => {
   const { toast } = useToast();
@@ -44,8 +43,7 @@ const PostJobForm = () => {
       companyName: '',
       companyBio: '',
       companyEmail: '',
-      city: '',
-      address: '',
+      location: undefined,
       companyLogo: '',
       workMode: 'remote',
       type: 'full-time',
@@ -112,8 +110,7 @@ const PostJobForm = () => {
 
   const handleFormSubmit = async (data: JobPostSchemaType) => {
     try {
-      data.companyLogo =
-        (await submitImage(file)) ?? 'https://wwww.example.com';
+      data.companyLogo = (await submitImage(file)) ?? '';
       ``;
       const response = await createJob(data);
       if (!response.status) {
@@ -345,7 +342,22 @@ const PostJobForm = () => {
               )}
             </div>
 
-            <GmapsAutocompleteAddress form={form}></GmapsAutocompleteAddress>
+            <FormField
+              control={form.control}
+              name="location"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel className="font-medium">Location</FormLabel>
+                  <FormControl>
+                    <Input
+                      {...field}
+                      className="w-full bg-gray-800 border-none text-white"
+                      placeholder="Where is the job located?"
+                    />
+                  </FormControl>
+                </FormItem>
+              )}
+            />
 
             <FormField
               control={form.control}

diff --git a/src/layouts/footer.tsx b/src/layouts/footer.tsx
@@ -28,10 +28,10 @@ const Footer = () => {
           <div className="flex flex-col gap-2">
             <p className="font-bold text-base md:text-lg">Follow us on</p>
             <div className="flex gap-3">
-              {socials.map((social, index) => (
+              {socials.map((social) => (
                 <Link
                   target="_blank"
-                  key={social.href + index}
+                  key={social.href}
                   href={social.href}
                   aria-label={social.label}
                 >
@@ -48,9 +48,9 @@ const Footer = () => {
           <div className="flex flex-col gap-2 ">
             <p className="font-bold text-xl md:text-2xl">100xLinks</p>
 
-            {footerLinks['100xlinks'].map((link, index) => (
+            {footerLinks['100xlinks'].map((link) => (
               <Link
-                key={link.href + index}
+                key={link.href}
                 href={link.href}
                 className="text-foreground/60 hover:text-foreground/80 sm:text-lg font-light"
               >
@@ -61,9 +61,9 @@ const Footer = () => {
           <div className="flex flex-col gap-2 ">
             <p className="font-bold text-xl md:text-2xl">100xLegal</p>
 
-            {footerLinks['100xlegal'].map((link, index) => (
+            {footerLinks['100xlegal'].map((link) => (
               <Link
-                key={link.href + index}
+                key={link.href}
                 href={link.href}
                 className="text-foreground/60 hover:text-foreground/80 sm:text-lg font-light"
               >