diff --git a/react-app/components/ContractorEntry/AddContractorEntry.js b/react-app/components/ContractorEntry/AddContractorEntry.js
index 00b2437..5db8931 100644
--- a/react-app/components/ContractorEntry/AddContractorEntry.js
+++ b/react-app/components/ContractorEntry/AddContractorEntry.js
@@ -16,19 +16,23 @@ const AddContractorEntry = ({ props, contractorId }) => {
   const onFormSubmit = async (data) => {
     try {
       console.log(data)
+      const submitData = {
+        ...data,
+        contractorId,
+      }
       toast('Adding the entry!', {
         icon: '👏',
       })
       const token = localStorage.getItem('token')
       await axios
-        .post(getBaseUrl() + `/contractor/${contractorId}/entry`, data, {
+        .post(getBaseUrl() + `/employee`, submitData, {
           headers: {
             Authorization: `Bearer ${token}`,
           },
         })
         .then((response) => {
           console.log(response)
-          toast.success('Worker Entry added successfully')
+          toast.success('Employee Entry added successfully')
           // toast.custom((t) => (
           //   <div
           //     className={`${
@@ -125,7 +129,7 @@ const AddContractorEntry = ({ props, contractorId }) => {
                     as="div"
                     className="mb-5 flex items-center justify-between text-lg font-semibold leading-6 text-gray-800"
                   >
-                    <h3>Add Worker Entry</h3>
+                    <h3>Add Employee Entry</h3>
                     <Close onClick={handleClose} />
                   </Dialog.Title>
 
diff --git a/react-app/components/ContractorEntry/ViewContractorEntry.js b/react-app/components/ContractorEntry/ViewContractorEntry.js
index 6929683..30e0467 100644
--- a/react-app/components/ContractorEntry/ViewContractorEntry.js
+++ b/react-app/components/ContractorEntry/ViewContractorEntry.js
@@ -12,7 +12,7 @@ const Section = ({ title, children, ...props }) => (
   </section>
 )
 
-const STSEntryInfo = ({ vehicleEntry, ...props }) => {
+const ContractorEntryInfo = ({ employeeEntry, ...props }) => {
   const [isOpen, setIsOpen] = useState(false)
   const handleClose = () => setIsOpen(false)
   const handleOpen = () => setIsOpen(true)
@@ -55,73 +55,47 @@ const STSEntryInfo = ({ vehicleEntry, ...props }) => {
                     as="div"
                     className="mb-5 flex items-center justify-between text-lg font-semibold leading-6 text-gray-800"
                   >
-                    <h3>Vehicle Entry Information</h3>
+                    <h3>Employee Entry Information</h3>
                     <Close onClick={handleClose} />
                   </Dialog.Title>
 
                   <div className="mt-6 flex flex-col md:flex-row">
                     <div className="w-full">
-                      <Section title={'STS Information'}>
-                        <section className="mb-3 rounded-md border px-3 py-4">
-                          <h3 className="text-xl font-semibold text-gray-500">
-                            Ward No: {vehicleEntry?.sts?.wardNumber}
-                          </h3>
-                          <p className="text-gray-600">
-                            {' '}
-                            {vehicleEntry?.sts?.address}
-                          </p>
-                        </section>
-                      </Section>
-
-                      <Section title={'Vehicle Information'}>
-                        <section className="mb-3 rounded-md border px-3 py-4">
-                          <h3 className="text-xl font-semibold text-gray-500">
-                            Reg No: {vehicleEntry?.vehicle?.registrationNumber}
-                          </h3>
-                          <p className="text-gray-600">
-                            {' '}
-                            Capacity No: {vehicleEntry?.vehicle?.capacity}
-                          </p>
-                          <p className="text-gray-600">
-                            {' '}
-                            Truck Type: {vehicleEntry?.vehicle?.type}
-                          </p>
-                        </section>
-                      </Section>
-
-                      <Section title={'Waste Information'}>
-                        <h3 className="font-bond text-xl text-gray-500">
-                          Waste Volume Carried : {vehicleEntry?.volumeOfWaste}{' '}
-                          Ton
+                      <section className="mb-3 rounded-md border px-3 py-4">
+                        <h3 className="text-xl font-semibold text-gray-500">
+                          Name: {employeeEntry.name}
                         </h3>
-                      </Section>
+                        <p className="text-gray-600">
+                          Date of Birth:{' '}
+                          {new Date(employeeEntry?.dateOfBirth)
+                            .toISOString()
+                            .slice(0, 10)}
+                        </p>
+                        <p className="text-gray-600">
+                          Date of Hire:{' '}
+                          {new Date(employeeEntry?.dateOfHire)
+                            .toISOString()
+                            .slice(0, 10)}
+                        </p>
+                        <p className="text-gray-600">
+                          {' '}
+                          Job Title: {employeeEntry?.jobTitle}
+                        </p>
+                        <p className="text-gray-600">
+                          {' '}
+                          Payment/hour: {employeeEntry?.paymentRatePerHour} BDT
+                        </p>
 
-                      <Section title={'Time'}>
-                        <h3 className="font-bond text-xl text-gray-500">
-                          Arrival Time :{' '}
-                          {new Date(
-                            vehicleEntry?.timeOfArrival
-                          ).toLocaleString()}
-                        </h3>
-                        <h3 className="font-bond text-xl text-gray-500">
-                          Departure Time :{' '}
-                          {new Date(
-                            vehicleEntry?.timeOfDeparture
-                          ).toLocaleString()}
-                        </h3>
-                      </Section>
+                        <p className="text-gray-600">
+                          {' '}
+                          Phone Number: {employeeEntry?.phone}
+                        </p>
 
-                      <Section title={'Trip info'}>
-                        <h3 className="font-bond text-xl text-gray-500">
-                          Destination : {vehicleEntry.landfill?.name}
-                        </h3>
-                        <h3 className="font-bond text-xl text-gray-500">
-                          Distance : {vehicleEntry.bill?.distance} KM
-                        </h3>
-                        <h3 className="font-bond text-xl text-gray-500">
-                          Duration : {vehicleEntry.bill?.duration} Min
-                        </h3>
-                      </Section>
+                        <p className="text-gray-600">
+                          {' '}
+                          Routes: {employeeEntry?.assignedCollectionRoute}
+                        </p>
+                      </section>
                     </div>
                   </div>
                 </Dialog.Panel>
@@ -134,4 +108,4 @@ const STSEntryInfo = ({ vehicleEntry, ...props }) => {
   )
 }
 
-export default STSEntryInfo
+export default ContractorEntryInfo
diff --git a/react-app/components/ContractorEntryForm/index.js b/react-app/components/ContractorEntryForm/index.js
index e69de29..90203c9 100644
--- a/react-app/components/ContractorEntryForm/index.js
+++ b/react-app/components/ContractorEntryForm/index.js
@@ -0,0 +1,187 @@
+/* eslint-disable no-unused-expressions */
+import React, { useEffect, useState } from 'react'
+import { useForm } from 'react-hook-form'
+import Button from '../common/Button'
+import Input from '../common/Input'
+import Select from '../common/Select'
+import axios from 'axios'
+import { getBaseUrl } from '../../utils/url'
+const ContractorEntryForm = ({
+  type,
+  defaultValues,
+  onFormSubmit,
+  handleClose,
+  contractorId,
+  ...props
+}) => {
+  const {
+    register,
+    handleSubmit,
+    formState: { errors },
+    reset,
+    setValue,
+  } = useForm()
+
+  const [loading, setLoading] = useState(false)
+
+  useEffect(() => {
+    if (defaultValues) {
+      setValue('contractorId', contractorId)
+      setValue('name', defaultValues.name)
+      setValue('dateOfHire', defaultValues.dateOfHire)
+      setValue('jobTitle', defaultValues.jobTitle)
+      setValue('paymentRatePerHour', defaultValues.paymentRatePerHour)
+      setValue('phone', defaultValues.phone)
+      setValue('assignedCollectionRoute', defaultValues.assignedCollectionRoute)
+      setValue('volumeOfWaste', defaultValues.volumeOfWaste)
+      const formattedTimeOfArrival = defaultValues?.dateOfBirth
+        ? new Date(defaultValues?.dateOfBirth).toISOString().slice(0, 16)
+        : '' // Converts to "YYYY-MM-DDTHH:MM" format
+      setValue('dateOfBirth', formattedTimeOfArrival)
+    }
+  }, [])
+
+  const onSubmit = handleSubmit(async (data) => {
+    console.log(data)
+    setLoading(true)
+    // convert timeOfArrival to ISO string
+    data.dateOfBirth = new Date(data.dateOfBirth).toISOString()
+    await onFormSubmit(data)
+    setLoading(false)
+    reset()
+  })
+
+  return (
+    <div {...props} className="flex flex-col space-y-6">
+      <div>
+        <Input
+          name="contractorId"
+          label="Contractor ID"
+          placeholder={contractorId}
+          value={contractorId}
+          type="text"
+          error={errors.contractorId ? errors.contractorId.message : false}
+          disabled
+        />
+
+        <Input
+          name="name"
+          label="Full Name"
+          placeholder="Full Name of the Employee..."
+          type="text"
+          error={errors.name ? errors.name.message : false}
+          register={register('name', {
+            required: {
+              value: true,
+              message: 'Full name is required...',
+            },
+          })}
+        />
+
+        <Input
+          name="dateOfBirth"
+          label="Date of Birth"
+          placeholder="Date of Birth..."
+          type="datetime-local"
+          error={errors.dateOfBirth ? errors.dateOfBirth.message : false}
+          register={register('dateOfBirth', {
+            required: {
+              value: true,
+              message: 'Date of Birth is required',
+            },
+          })}
+        />
+
+        <Input
+          name="dateOfHire"
+          label="Date of Hire"
+          placeholder="Date of Hire..."
+          type="datetime-local"
+          error={errors.dateOfHire ? errors.dateOfHire.message : false}
+          register={register('dateOfHire', {
+            required: {
+              value: true,
+              message: 'Date of Hire is required',
+            },
+          })}
+        />
+
+        <Input
+          name="jobTitle"
+          label="Job Title"
+          placeholder="Job Title..."
+          type="text"
+          error={errors.jobTitle ? errors.jobTitle.message : false}
+          register={register('jobTitle', {
+            required: {
+              value: true,
+              message: 'Job Title is required',
+            },
+          })}
+        />
+
+        <Input
+          name="paymentRatePerHour"
+          label="Payment Rate Per Hour"
+          placeholder="Payment Rate Per Hour..."
+          type="text"
+          error={
+            errors.paymentRatePerHour
+              ? errors.paymentRatePerHour.message
+              : false
+          }
+          register={register('paymentRatePerHour', {
+            required: {
+              value: true,
+              message: 'Payment Rate Per Hour is required',
+            },
+          })}
+        />
+
+        <Input
+          name="phone"
+          label="Phone"
+          placeholder="Phone..."
+          type="text"
+          error={errors.phone ? errors.phone.message : false}
+          register={register('phone', {
+            required: {
+              value: true,
+              message: 'Phone is required',
+            },
+          })}
+        />
+
+        <Input
+          name="assignedCollectionRoute"
+          label="Assigned Collection Route"
+          placeholder="Assigned Collection Route..."
+          type="text"
+          error={
+            errors.assignedCollectionRoute
+              ? errors.assignedCollectionRoute.message
+              : false
+          }
+          register={register('assignedCollectionRoute', {
+            required: {
+              value: true,
+              message: 'Assigned Collection Route is required',
+            },
+          })}
+        />
+      </div>
+
+      <Button
+        type="button"
+        onClick={onSubmit}
+        className="w-full"
+        disable={loading}
+      >
+        {/* loading and type condition */}
+        {loading ? 'Adding' : 'Add Entry'}
+      </Button>
+    </div>
+  )
+}
+
+export default ContractorEntryForm
diff --git a/react-app/components/ContractorEntrys/ContractorEntryItem.js b/react-app/components/ContractorEntrys/ContractorEntryItem.js
index ac40881..6427db7 100644
--- a/react-app/components/ContractorEntrys/ContractorEntryItem.js
+++ b/react-app/components/ContractorEntrys/ContractorEntryItem.js
@@ -1,58 +1,53 @@
 /* eslint-disable react/prop-types */
 import React from 'react'
 import UpdateContractorEntry from '../ContractorEntry/UpdateContractorEntry'
-import ContractorInfoEntry from '../ContractorEntry/ViewContractorEntry'
+import ContractorEntryInfo from '../ContractorEntry/ViewContractorEntry'
+
+const ContractorEntryItem = ({id, name, dateOfBirth, dateOfHire, jobTitle, paymentRatePerHour, phone, assignedCollectionRoute}) => {
 
-const ContractorEntryItem = ({
-  id,
-  vehicleId,
-  volumeOfWaste,
-  timeOfArrival,
-  timeOfDeparture,
-  vehicle,
-  stsId,
-  sts,
-  landfill,
-  bill,
-}) => {
   return (
-    <div className="smooth-effect my-2 flex cursor-pointer items-center rounded-md border px-3 py-4 shadow-sm hover:bg-green-200 hover:shadow lg:px-6">
+    <div className="smooth-effect my-2 flex cursor-pointer items-center text-center justify-center rounded-md border py-4 shadow-sm hover:bg-green-200 hover:shadow lg:px-6">
       <div className="flex-1">
         <h3 className="text-xl font-semibold text-gray-800">
-          {vehicle.registrationNumber}
+          {name}
         </h3>
       </div>
-      <div className="flex-1">
-        <h3 className="text-xl text-gray-800">{volumeOfWaste} Ton</h3>
+      {/* <div className="flex-1 w-1/7">
+        <h3 className="text-md text-gray-800">{new Date(dateOfBirth).toISOString().slice(0, 10)}</h3>
       </div>
 
-      <div className="flex-1">
-        <h3 className="text-md text-gray-800">Landfill: {landfill?.name}</h3>
-      </div>
+      <div className="flex-1 w-1/7">
+        <h3 className="text-md text-gray-800">{new Date(dateOfHire).toISOString().slice(0, 10)}</h3>
+      </div> */}
 
       <div className="flex-1">
         <h3 className="text-md text-gray-800">
-          Arrival: {new Date(timeOfArrival).toLocaleString()}
+          {phone}
         </h3>
       </div>
 
       <div className="flex-1">
         <h3 className="text-md text-gray-800">
-          Departure: {new Date(timeOfDeparture).toLocaleString()}
+          {jobTitle}
         </h3>
       </div>
 
-      <ContractorInfoEntry
-        vehicleEntry={{
+        <div className="flex-1">
+            <h3 className="text-md text-gray-800">
+                {paymentRatePerHour}
+            </h3>
+        </div>
+
+      <ContractorEntryInfo
+        employeeEntry={{
           id,
-          vehicleId,
-          volumeOfWaste,
-          timeOfArrival,
-          timeOfDeparture,
-          vehicle,
-          sts,
-          landfill,
-          bill,
+            name,
+            dateOfBirth,
+            dateOfHire,
+            jobTitle,
+            paymentRatePerHour,
+            phone,
+            assignedCollectionRoute
         }}
       />
 
diff --git a/react-app/components/ContractorEntrys/ContractorEntryItems.js b/react-app/components/ContractorEntrys/ContractorEntryItems.js
index 2aa7359..354a9e1 100644
--- a/react-app/components/ContractorEntrys/ContractorEntryItems.js
+++ b/react-app/components/ContractorEntrys/ContractorEntryItems.js
@@ -4,15 +4,13 @@ import ContractorEntryItem from './ContractorEntryItem'
 const ContractorEntryItems = ({ contractorEntries }) => {
   return (
     <div className="block max-h-[75vh] overflow-y-auto rounded-lg border p-2 desktop:max-h-[80vh]">
-      {contractorEntries?.length
-        ? (
-            contractorEntries?.map((i) => <ContractorEntryItem key={i.id} {...i} />)
-          )
-        : (
+      {contractorEntries?.length ? (
+        contractorEntries?.map((i) => <ContractorEntryItem key={i.id} {...i} />)
+      ) : (
         <div className="h-[100px] w-full text-center font-bold text-gray-300">
           Add some employee entries of contractor
         </div>
-          )}
+      )}
     </div>
   )
 }
diff --git a/react-app/pages/contractor/[contractorId].js b/react-app/pages/contractor/[contractorId].js
index 54953e0..624b835 100644
--- a/react-app/pages/contractor/[contractorId].js
+++ b/react-app/pages/contractor/[contractorId].js
@@ -58,53 +58,53 @@ export default function VehicleEntry () {
     }
   }, [contractorId])
 
-  // useEffect(() => {
-  //   if (contractorId === null) return
-  //   setLoading(true)
-  //   const token = localStorage.getItem('token')
-  //   if (token.length > 0) {
-  //     axios
-  //       .get(getBaseUrl() + `/contractor/${contractorId}/entry`, {
-  //         headers: {
-  //           Authorization: `Bearer ${token}`
-  //         }
-  //       })
-  //       .then((res) => {
-  //         console.log(res.data)
-  //         res.data.sort((a, b) => b.id - a.id)
-  //         setContractorEntries(res.data)
-  //         setLoading(false)
-  //       })
-  //       .catch((err) => {
-  //         setLoading(false)
-  //         console.log(err)
-  //       })
-  //   }
-  // }, [contractorId])
+  useEffect(() => {
+    if (contractorId === null) return
+    setLoading(true)
+    const token = localStorage.getItem('token')
+    if (token.length > 0) {
+      axios
+        .get(getBaseUrl() + `/contractor/${contractorId}/employees`, {
+          headers: {
+            Authorization: `Bearer ${token}`
+          }
+        })
+        .then((res) => {
+          console.log(res.data)
+          res.data.sort((a, b) => b.id - a.id)
+          setContractorEntries(res.data)
+          setLoading(false)
+        })
+        .catch((err) => {
+          setLoading(false)
+          console.log(err)
+        })
+    }
+  }, [contractorId])
 
-  // useEffect(() => {
-  //   if (contractorId === null) return
-  //   setLoading(true)
-  //   const token = localStorage.getItem('token')
-  //   if (token.length > 0) {
-  //     axios
-  //       .get(getBaseUrl() + `/contractor/${contractorId}/add`, {
-  //         headers: {
-  //           Authorization: `Bearer ${token}`
-  //         }
-  //       })
-  //       .then((res) => {
-  //         console.log(res.data)
-  //         res.data.sort((a, b) => b.id - a.id)
-  //         setWasteEntries(res.data)
-  //         setLoading(false)
-  //       })
-  //       .catch((err) => {
-  //         setLoading(false)
-  //         console.log(err)
-  //       })
-  //   }
-  // }, [contractorId])
+  useEffect(() => {
+    if (contractorId === null) return
+    setLoading(true)
+    const token = localStorage.getItem('token')
+    if (token.length > 0) {
+      axios
+        .get(getBaseUrl() + `/contractor/${contractorId}/add`, {
+          headers: {
+            Authorization: `Bearer ${token}`
+          }
+        })
+        .then((res) => {
+          console.log(res.data)
+          res.data.sort((a, b) => b.id - a.id)
+          setWasteEntries(res.data)
+          setLoading(false)
+        })
+        .catch((err) => {
+          setLoading(false)
+          console.log(err)
+        })
+    }
+  }, [contractorId])
 
   return (
     <NoSSR>
@@ -145,10 +145,10 @@ export default function VehicleEntry () {
       </div>
 
       <div className="flex flex-row gap-3 md:px-6">
-        <div className="flex w-2/3   flex-col">
+        <div className="flex w-full flex-col">
           <div className="mt-3 flex items-center justify-between">
             <h1 className="text-2xl font-bold text-gray-700">
-              Contractor Entries{' '}
+              Employee Entries{' '}
             </h1>
             <div className="flex items-center space-x-2">
                 {contractorId && <AddContractorEntry contractorId={contractorId} />}  
@@ -161,7 +161,7 @@ export default function VehicleEntry () {
           )}
         </div>
 
-        <div className="flex w-1/3   flex-col">
+        {/* <div className="flex w-1/3   flex-col">
           <div className="mt-3 flex items-center justify-between">
             <h1 className="text-2xl font-bold text-gray-700">
               Waste Entries
@@ -175,7 +175,7 @@ export default function VehicleEntry () {
           ) : (
             <WasteEntryItems wasteEntries={wasteEntries} />
           )}
-        </div>
+        </div> */}
       </div>
     </div>
     </NoSSR>
diff --git a/react-app/utils/url.js b/react-app/utils/url.js
index 526fc15..abc002d 100644
--- a/react-app/utils/url.js
+++ b/react-app/utils/url.js
@@ -3,6 +3,7 @@ const url = process.env.API;
 
 export const getBaseUrl = () => {
     // console.log(process.env.API);
-    return process.env.API || 'http://3.208.28.247:5000';
+    //return process.env.API || 'http://3.208.28.247:5000';
+    return 'http://localhost:5000';
 }
  
\ No newline at end of file