From 0c219ba1a997044a573e835e627a77f9aa5880ed Mon Sep 17 00:00:00 2001
From: AnsariTufail <168163201+AnsariTufail@users.noreply.github.com>
Date: Mon, 10 Feb 2025 12:09:15 +0530
Subject: [PATCH 1/2] Working on that Fixed alingment

---
 dev-dist/sw.js                                              | 2 +-
 src/Pages/ManageCMS/AboutUs/AboutUs.tsx                     | 2 +-
 src/Pages/ManageCMS/FAQ/EditDetails.tsx                     | 6 +++---
 src/Pages/ManageCMS/FAQ/FAQ.tsx                             | 2 +-
 src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx         | 2 +-
 src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicyAddModel.tsx | 2 +-
 .../ManageCMS/TermsAndConditions/TermsAndConditions.tsx     | 2 +-
 src/Pages/ManageContact/ManageContact.tsx                   | 6 +++---
 src/Pages/ManageGroups/EditDetailGroup.tsx                  | 6 +++---
 src/Pages/ManageGroups/ViewManageGroup.tsx                  | 6 +++---
 src/Pages/ManageJobs/ManageJobs.tsx                         | 4 ++--
 src/Pages/ManageJobs/ManageJobsAdd.tsx                      | 6 +++---
 src/Pages/ManageJobs/ViewManageJob.tsx                      | 6 +++---
 src/Pages/ManagePost/ViewDailog.tsx                         | 4 ++--
 src/Pages/MasterModule/AgencyMaster/AgencyMaster.tsx        | 6 +++---
 src/Pages/MasterModule/AgencyMaster/EditAgencyMaster.tsx    | 6 +++---
 src/Pages/MasterModule/AgencyMaster/ViewAgencyAddModel.tsx  | 2 +-
 src/Pages/MasterModule/AgencyMaster/ViewAgencyMaster.tsx    | 6 +++---
 src/Pages/MasterModule/Country/Country.tsx                  | 6 +++---
 src/Pages/MasterModule/Country/EditCountryModel.tsx         | 6 +++---
 src/Pages/MasterModule/JobStatus/EditJobStatusModel.tsx     | 6 +++---
 src/Pages/MasterModule/JobStatus/JobStatus.tsx              | 4 ++--
 src/Pages/MasterModule/JobType/EditJobModel.tsx             | 6 +++---
 src/Pages/MasterModule/JobType/JobType.tsx                  | 4 ++--
 src/Pages/MasterModule/TemplateMaster/EditTemplateModel.tsx | 6 +++---
 src/Pages/MasterModule/TemplateMaster/TemplateMaster.tsx    | 4 ++--
 src/Pages/MasterModule/WorkspaceMode/EditWorkModel.tsx      | 6 +++---
 src/Pages/MasterModule/WorkspaceMode/WorkspaceMode.tsx      | 4 ++--
 src/Pages/SubAdmin/ViewSubAdmin.tsx                         | 6 +++---
 src/components/AlertDailog.tsx                              | 1 -
 src/components/EditSubAdmin.tsx                             | 6 +++---
 31 files changed, 70 insertions(+), 71 deletions(-)

diff --git a/dev-dist/sw.js b/dev-dist/sw.js
index 8ae0392..9e48fdb 100644
--- a/dev-dist/sw.js
+++ b/dev-dist/sw.js
@@ -82,7 +82,7 @@ define(['./workbox-54d0af47'], (function (workbox) { 'use strict';
     "revision": "3ca0b8505b4bec776b69afdba2768812"
   }, {
     "url": "index.html",
-    "revision": "0.tm0o9v27ue"
+    "revision": "0.nq13s8vv818"
   }], {});
   workbox.cleanupOutdatedCaches();
   workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {
diff --git a/src/Pages/ManageCMS/AboutUs/AboutUs.tsx b/src/Pages/ManageCMS/AboutUs/AboutUs.tsx
index a86544c..a080942 100644
--- a/src/Pages/ManageCMS/AboutUs/AboutUs.tsx
+++ b/src/Pages/ManageCMS/AboutUs/AboutUs.tsx
@@ -20,7 +20,7 @@ const AboutUs = () => {
            AboutUs
           </Text>
 
-          <HStack mr={5}>
+          <HStack>
             
             <AboutUsAddModel />
           </HStack>
diff --git a/src/Pages/ManageCMS/FAQ/EditDetails.tsx b/src/Pages/ManageCMS/FAQ/EditDetails.tsx
index a8759e9..2ea1b8d 100644
--- a/src/Pages/ManageCMS/FAQ/EditDetails.tsx
+++ b/src/Pages/ManageCMS/FAQ/EditDetails.tsx
@@ -7,9 +7,9 @@ function EditDetails() {
 
         <DialogRoot placement="center">
             <DialogTrigger asChild>
-                <Button bg={"transparent"} size="sm">
-                    <FaRegEdit style={{ cursor: "pointer", }} color="#000" />
-                </Button>
+               
+                    <FaRegEdit style={{ cursor: "pointer", fontSize:'16px' }} color="#000" />
+               
                 {/* <Button><FaRegEdit /></Button> */}
 
             </DialogTrigger>
diff --git a/src/Pages/ManageCMS/FAQ/FAQ.tsx b/src/Pages/ManageCMS/FAQ/FAQ.tsx
index 44bd58d..4b833de 100644
--- a/src/Pages/ManageCMS/FAQ/FAQ.tsx
+++ b/src/Pages/ManageCMS/FAQ/FAQ.tsx
@@ -1,4 +1,4 @@
-import { Box, Button, HStack, Image, Input, Text } from "@chakra-ui/react";
+import { Box, HStack, Image, Input, Text } from "@chakra-ui/react";
 import MainFrame from "../../../components/MainFrame"
 import EditDetails from "./EditDetails";
 import { InputGroup } from "../../../components/ui/input-group";
diff --git a/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx b/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx
index 26e9126..d6fa126 100644
--- a/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx
+++ b/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx
@@ -20,7 +20,7 @@ const PrivacyPolicy = () => {
           Privacy Policy
           </Text>
 
-          <HStack mr={5}>
+          <HStack >
             
             <PrivacyPolicyAddModel />
           </HStack>
diff --git a/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicyAddModel.tsx b/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicyAddModel.tsx
index 566a00e..05eacd1 100644
--- a/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicyAddModel.tsx
+++ b/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicyAddModel.tsx
@@ -1,6 +1,6 @@
 import { FaRegEdit } from "react-icons/fa"
 import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../../components/ui/dialog"
-import { Field, Input, Stack, Text, Textarea } from "@chakra-ui/react"
+import { Field, Stack, Text, Textarea } from "@chakra-ui/react"
 import { Button } from "../../../components/ui/button"
 
 function PrivacyPolicyAddModel() {
diff --git a/src/Pages/ManageCMS/TermsAndConditions/TermsAndConditions.tsx b/src/Pages/ManageCMS/TermsAndConditions/TermsAndConditions.tsx
index 35f1e5a..0fe385e 100644
--- a/src/Pages/ManageCMS/TermsAndConditions/TermsAndConditions.tsx
+++ b/src/Pages/ManageCMS/TermsAndConditions/TermsAndConditions.tsx
@@ -20,7 +20,7 @@ const TermsAndConditions = () => {
            Terms And Conditions
           </Text>
 
-          <HStack mr={5}>
+          <HStack >
             
             <TermsAndConditionsAddModel />
           </HStack>
diff --git a/src/Pages/ManageContact/ManageContact.tsx b/src/Pages/ManageContact/ManageContact.tsx
index 1207bf7..e3bd9d6 100644
--- a/src/Pages/ManageContact/ManageContact.tsx
+++ b/src/Pages/ManageContact/ManageContact.tsx
@@ -1,4 +1,4 @@
-import { Box, HStack, Image, Input, Text } from "@chakra-ui/react";
+import { Box, HStack, Input, Text } from "@chakra-ui/react";
 import MainFrame from "../../components/MainFrame"
 import PendingRequests from "../../Pages/ManageContact/PendingRequests"
 import { InputGroup } from "../../components/ui/input-group";
@@ -47,8 +47,8 @@ const ManageContact = () => {
           Contact Requests
           </Text>
 
-          <HStack mr={5}>
-            <InputGroup marginRight={"1rem"}
+          <HStack >
+            <InputGroup 
               startElement={
                 <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
               }
diff --git a/src/Pages/ManageGroups/EditDetailGroup.tsx b/src/Pages/ManageGroups/EditDetailGroup.tsx
index 64d8c8f..31ad9ba 100644
--- a/src/Pages/ManageGroups/EditDetailGroup.tsx
+++ b/src/Pages/ManageGroups/EditDetailGroup.tsx
@@ -9,9 +9,9 @@ function EditDetailGroups() {
 
         <DialogRoot placement="center" >
             <DialogTrigger asChild>
-                <Button bg={"transparent"} size="sm">
-                    <FaRegEdit style={{ cursor: "pointer", }}  color="#000"/>
-                </Button>
+                
+                    <FaRegEdit style={{ cursor: "pointer", fontSize:'16px'}}  color="#000"/>
+                
                 {/* <Button><FaRegEdit /></Button> */}
 
             </DialogTrigger>
diff --git a/src/Pages/ManageGroups/ViewManageGroup.tsx b/src/Pages/ManageGroups/ViewManageGroup.tsx
index d479bc0..720e799 100644
--- a/src/Pages/ManageGroups/ViewManageGroup.tsx
+++ b/src/Pages/ManageGroups/ViewManageGroup.tsx
@@ -10,9 +10,9 @@ function ViewManageGroup() {
 
         <DialogRoot placement="center" >
             <DialogTrigger asChild>
-                <Button bg={"transparent"} size="sm">
-                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", }}  color="#000"/>
-                </Button>
+                
+                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize:'16px'}}  color="#000"/>
+               
                 {/* <Button><FaRegEdit /></Button> */}
 
             </DialogTrigger>
diff --git a/src/Pages/ManageJobs/ManageJobs.tsx b/src/Pages/ManageJobs/ManageJobs.tsx
index 6de9a5c..0e2beaa 100644
--- a/src/Pages/ManageJobs/ManageJobs.tsx
+++ b/src/Pages/ManageJobs/ManageJobs.tsx
@@ -73,8 +73,8 @@ const ManageJobs = () => {
             View job Posting
           </Text>
 
-          <HStack mr={5}>
-            <InputGroup marginRight={"1rem"}
+          <HStack >
+            <InputGroup 
               startElement={
                 <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
               }
diff --git a/src/Pages/ManageJobs/ManageJobsAdd.tsx b/src/Pages/ManageJobs/ManageJobsAdd.tsx
index 018b2e8..4d90998 100644
--- a/src/Pages/ManageJobs/ManageJobsAdd.tsx
+++ b/src/Pages/ManageJobs/ManageJobsAdd.tsx
@@ -19,9 +19,9 @@ function ManageJobsAdd() {
 
         <DialogRoot placement="center">
             <DialogTrigger asChild>
-                <Button bg={"transparent"} size="sm">
-                    <FaRegEdit style={{ cursor: "pointer", fontSize: "14px" }} color="#000" />
-                </Button>
+                
+                    <FaRegEdit style={{ cursor: "pointer", fontSize: "16px" }} color="#000" />
+                
             </DialogTrigger>
 
             <DialogContent
diff --git a/src/Pages/ManageJobs/ViewManageJob.tsx b/src/Pages/ManageJobs/ViewManageJob.tsx
index 3dcf57c..7dbcc0e 100644
--- a/src/Pages/ManageJobs/ViewManageJob.tsx
+++ b/src/Pages/ManageJobs/ViewManageJob.tsx
@@ -20,9 +20,9 @@ function ViewManageJob() {
 
         <DialogRoot placement="center">
             <DialogTrigger asChild>
-                <Button bg={"transparent"} size="sm">
-                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "14px" }}  color="#000"/>
-                </Button>
+               
+                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }}  color="#000"/>
+               
             </DialogTrigger>
 
             <DialogContent
diff --git a/src/Pages/ManagePost/ViewDailog.tsx b/src/Pages/ManagePost/ViewDailog.tsx
index f835014..dcd0c94 100644
--- a/src/Pages/ManagePost/ViewDailog.tsx
+++ b/src/Pages/ManagePost/ViewDailog.tsx
@@ -8,9 +8,9 @@ function ViewDailog() {
 
         <DialogRoot placement="center">
             <DialogTrigger asChild>
-                <Button bg={"transparent"} size="sm">
+                
                     <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} color="#000" />
-                </Button>
+                
             </DialogTrigger>
 
             <DialogContent
diff --git a/src/Pages/MasterModule/AgencyMaster/AgencyMaster.tsx b/src/Pages/MasterModule/AgencyMaster/AgencyMaster.tsx
index 360b868..76213a1 100644
--- a/src/Pages/MasterModule/AgencyMaster/AgencyMaster.tsx
+++ b/src/Pages/MasterModule/AgencyMaster/AgencyMaster.tsx
@@ -1,4 +1,4 @@
-import { Box, HStack, Image, Input, Text } from "@chakra-ui/react";
+import { Box, HStack, Input, Text } from "@chakra-ui/react";
 import MainFrame from "../../../components/MainFrame"
 import { InputGroup } from "../../../components/ui/input-group";
 import { LuSearch } from "react-icons/lu";
@@ -62,8 +62,8 @@ const AgencyMaster = () => {
           Agency Master
           </Text>
 
-          <HStack mr={5}>
-            <InputGroup marginRight={"1rem"}
+          <HStack >
+            <InputGroup 
               startElement={
                 <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
               }
diff --git a/src/Pages/MasterModule/AgencyMaster/EditAgencyMaster.tsx b/src/Pages/MasterModule/AgencyMaster/EditAgencyMaster.tsx
index 841a1ed..c075e91 100644
--- a/src/Pages/MasterModule/AgencyMaster/EditAgencyMaster.tsx
+++ b/src/Pages/MasterModule/AgencyMaster/EditAgencyMaster.tsx
@@ -10,9 +10,9 @@ function EditAgencyMaster() {
 
         <DialogRoot placement="center">
             <DialogTrigger asChild>
-                <Button bg={"transparent"} size="sm">
-                    <FaRegEdit style={{ cursor: "pointer", fontSize: "14px" }}  color="#000"/>
-                </Button>
+                
+                    <FaRegEdit style={{ cursor: "pointer", fontSize: "16px" }}  color="#000"/>
+               
             </DialogTrigger>
 
             <DialogContent
diff --git a/src/Pages/MasterModule/AgencyMaster/ViewAgencyAddModel.tsx b/src/Pages/MasterModule/AgencyMaster/ViewAgencyAddModel.tsx
index d17c6ef..73c309c 100644
--- a/src/Pages/MasterModule/AgencyMaster/ViewAgencyAddModel.tsx
+++ b/src/Pages/MasterModule/AgencyMaster/ViewAgencyAddModel.tsx
@@ -1,5 +1,5 @@
 import { DialogBody, DialogCloseTrigger, DialogContent, DialogFooter, DialogHeader, DialogRoot, DialogTitle, DialogTrigger } from "../../../components/ui/dialog"
-import { Field, Input, Stack, Text, Textarea } from "@chakra-ui/react"
+import { Field, Input, Stack, Text } from "@chakra-ui/react"
 import { IoMdAdd } from "react-icons/io"
 import { Button } from "../../../components/ui/button"
 
diff --git a/src/Pages/MasterModule/AgencyMaster/ViewAgencyMaster.tsx b/src/Pages/MasterModule/AgencyMaster/ViewAgencyMaster.tsx
index 2c5a6f0..63bab62 100644
--- a/src/Pages/MasterModule/AgencyMaster/ViewAgencyMaster.tsx
+++ b/src/Pages/MasterModule/AgencyMaster/ViewAgencyMaster.tsx
@@ -10,9 +10,9 @@ function ViewAgencyMaster() {
 
         <DialogRoot placement="center">
             <DialogTrigger asChild>
-                <Button bg={"transparent"} size="sm">
-                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "14px" }}  color="#000"/>
-                </Button>
+                
+                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }}  color="#000"/>
+            
             </DialogTrigger>
 
             <DialogContent
diff --git a/src/Pages/MasterModule/Country/Country.tsx b/src/Pages/MasterModule/Country/Country.tsx
index d1b3d00..063eb7d 100644
--- a/src/Pages/MasterModule/Country/Country.tsx
+++ b/src/Pages/MasterModule/Country/Country.tsx
@@ -1,4 +1,4 @@
-import { Box, HStack, Image, Input, Text } from "@chakra-ui/react";
+import { Box, HStack, Input, Text } from "@chakra-ui/react";
 import MainFrame from "../../../components/MainFrame"
 import { InputGroup } from "../../../components/ui/input-group";
 import { LuSearch } from "react-icons/lu";
@@ -49,8 +49,8 @@ const Country = () => {
           Country
           </Text>
 
-          <HStack mr={5}>
-            <InputGroup marginRight={"1rem"}
+          <HStack >
+            <InputGroup 
               startElement={
                 <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
               }
diff --git a/src/Pages/MasterModule/Country/EditCountryModel.tsx b/src/Pages/MasterModule/Country/EditCountryModel.tsx
index c9da0c4..a26501e 100644
--- a/src/Pages/MasterModule/Country/EditCountryModel.tsx
+++ b/src/Pages/MasterModule/Country/EditCountryModel.tsx
@@ -15,9 +15,9 @@ function EditCountryModel() {
                 {/* <Button bg={"transparent"} size="sm">
                     <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
                 </Button> */}
-                <Button bg={"transparent"} size="sm">
-                 <FaRegEdit style={{ cursor: "pointer", fontSize: "14px" }}  color="#000"/>
-                </Button>
+                
+                 <FaRegEdit style={{ cursor: "pointer", fontSize: "16px" }}  color="#000"/>
+                
 
             </DialogTrigger>
 
diff --git a/src/Pages/MasterModule/JobStatus/EditJobStatusModel.tsx b/src/Pages/MasterModule/JobStatus/EditJobStatusModel.tsx
index 5b0e081..7efe0a1 100644
--- a/src/Pages/MasterModule/JobStatus/EditJobStatusModel.tsx
+++ b/src/Pages/MasterModule/JobStatus/EditJobStatusModel.tsx
@@ -15,9 +15,9 @@ function EditJobStatusModel() {
                 {/* <Button bg={"transparent"} size="sm">
                     <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
                 </Button> */}
-                <Button bg={"transparent"} size="sm">
-                 <FaRegEdit style={{ cursor: "pointer", fontSize: "14px" }}  color="#000"/>
-                </Button>
+                
+                 <FaRegEdit style={{ cursor: "pointer", fontSize: "16px" }}  color="#000"/>
+                
 
             </DialogTrigger>
 
diff --git a/src/Pages/MasterModule/JobStatus/JobStatus.tsx b/src/Pages/MasterModule/JobStatus/JobStatus.tsx
index 95d83ff..409dfc1 100644
--- a/src/Pages/MasterModule/JobStatus/JobStatus.tsx
+++ b/src/Pages/MasterModule/JobStatus/JobStatus.tsx
@@ -49,8 +49,8 @@ const JobStatus = () => {
           Job Status
           </Text>
 
-          <HStack mr={5}>
-            <InputGroup marginRight={"1rem"}
+          <HStack >
+            <InputGroup 
               startElement={
                 <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
               }
diff --git a/src/Pages/MasterModule/JobType/EditJobModel.tsx b/src/Pages/MasterModule/JobType/EditJobModel.tsx
index 6a8021c..86938b0 100644
--- a/src/Pages/MasterModule/JobType/EditJobModel.tsx
+++ b/src/Pages/MasterModule/JobType/EditJobModel.tsx
@@ -16,9 +16,9 @@ function EditJobeModel() {
                 {/* <Button bg={"transparent"} size="sm">
                     <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
                 </Button> */}
-                <Button bg={"transparent"} size="sm">
-                 <FaRegEdit style={{ cursor: "pointer", fontSize: "14px" }}  color="#000"/>
-                </Button>
+                
+                 <FaRegEdit style={{ cursor: "pointer", fontSize: "16px" }}  color="#000"/>
+                
 
             </DialogTrigger>
 
diff --git a/src/Pages/MasterModule/JobType/JobType.tsx b/src/Pages/MasterModule/JobType/JobType.tsx
index ba43fba..353387f 100644
--- a/src/Pages/MasterModule/JobType/JobType.tsx
+++ b/src/Pages/MasterModule/JobType/JobType.tsx
@@ -49,8 +49,8 @@ const JobType = () => {
           Job Type
           </Text>
 
-          <HStack mr={5}>
-            <InputGroup marginRight={"1rem"}
+          <HStack >
+            <InputGroup 
               startElement={
                 <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
               }
diff --git a/src/Pages/MasterModule/TemplateMaster/EditTemplateModel.tsx b/src/Pages/MasterModule/TemplateMaster/EditTemplateModel.tsx
index 7e508c3..a96fffd 100644
--- a/src/Pages/MasterModule/TemplateMaster/EditTemplateModel.tsx
+++ b/src/Pages/MasterModule/TemplateMaster/EditTemplateModel.tsx
@@ -30,9 +30,9 @@ function EditTemplateModel() {
                 {/* <Button bg={"transparent"} size="sm">
                     <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
                 </Button> */}
-                <Button bg={"transparent"} size="sm">
-                 <FaRegEdit style={{ cursor: "pointer", fontSize: "14px" }}  color="#000"/>
-                </Button>
+                
+                 <FaRegEdit style={{ cursor: "pointer", fontSize: "16px" }}  color="#000"/>
+               
 
             </DialogTrigger>
 
diff --git a/src/Pages/MasterModule/TemplateMaster/TemplateMaster.tsx b/src/Pages/MasterModule/TemplateMaster/TemplateMaster.tsx
index 7764629..de0a4d3 100644
--- a/src/Pages/MasterModule/TemplateMaster/TemplateMaster.tsx
+++ b/src/Pages/MasterModule/TemplateMaster/TemplateMaster.tsx
@@ -62,8 +62,8 @@ const TemplateMaster = () => {
           Template Master
           </Text>
 
-          <HStack mr={5}>
-            <InputGroup marginRight={"1rem"}
+          <HStack >
+            <InputGroup 
               startElement={
                 <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
               }
diff --git a/src/Pages/MasterModule/WorkspaceMode/EditWorkModel.tsx b/src/Pages/MasterModule/WorkspaceMode/EditWorkModel.tsx
index b4fcde9..ec0defb 100644
--- a/src/Pages/MasterModule/WorkspaceMode/EditWorkModel.tsx
+++ b/src/Pages/MasterModule/WorkspaceMode/EditWorkModel.tsx
@@ -15,9 +15,9 @@ function EditWorkModel() {
                 {/* <Button bg={"transparent"} size="sm">
                     <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize: "16px" }} />
                 </Button> */}
-                <Button bg={"transparent"} size="sm">
-                 <FaRegEdit style={{ cursor: "pointer", fontSize: "14px" }}  color="#000"/>
-                </Button>
+                
+                 <FaRegEdit style={{ cursor: "pointer", fontSize: "16px" }}  color="#000"/>
+                
 
             </DialogTrigger>
 
diff --git a/src/Pages/MasterModule/WorkspaceMode/WorkspaceMode.tsx b/src/Pages/MasterModule/WorkspaceMode/WorkspaceMode.tsx
index a236b90..c5a2a21 100644
--- a/src/Pages/MasterModule/WorkspaceMode/WorkspaceMode.tsx
+++ b/src/Pages/MasterModule/WorkspaceMode/WorkspaceMode.tsx
@@ -49,8 +49,8 @@ const WorkspaceMode = () => {
           Workspace Mode
           </Text>
 
-          <HStack mr={5}>
-            <InputGroup marginRight={"1rem"}
+          <HStack >
+            <InputGroup 
               startElement={
                 <LuSearch fontSize={"xs"} style={{ position: 'relative', left: '10px' }} />
               }
diff --git a/src/Pages/SubAdmin/ViewSubAdmin.tsx b/src/Pages/SubAdmin/ViewSubAdmin.tsx
index d3f45b8..87f49a4 100644
--- a/src/Pages/SubAdmin/ViewSubAdmin.tsx
+++ b/src/Pages/SubAdmin/ViewSubAdmin.tsx
@@ -8,9 +8,9 @@ function ViewSubAdmin() {
 
         <DialogRoot placement="center" >
             <DialogTrigger asChild>
-                <Button bg={"transparent"} size="sm">
-                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", }} color="#000"/>
-                </Button>
+               
+                    <MdOutlineRemoveRedEye style={{ cursor: "pointer", fontSize:'16px'}} color="#000"/>
+               
                 {/* <Button><FaRegEdit /></Button> */}
 
             </DialogTrigger>
diff --git a/src/components/AlertDailog.tsx b/src/components/AlertDailog.tsx
index 0202dd6..afbad58 100644
--- a/src/components/AlertDailog.tsx
+++ b/src/components/AlertDailog.tsx
@@ -25,7 +25,6 @@ const AlertDailog: React.FC<DeleteConfirmationDialogProps> = ({
   onConfirm,
   alertText,
   alertCaption,
-  alertIcon,
   AltertTiggerIcon,
   button,
   iconColor,
diff --git a/src/components/EditSubAdmin.tsx b/src/components/EditSubAdmin.tsx
index 767022d..73ad646 100644
--- a/src/components/EditSubAdmin.tsx
+++ b/src/components/EditSubAdmin.tsx
@@ -8,9 +8,9 @@ function EditSubAdmin() {
 
         <DialogRoot placement="center">
             <DialogTrigger asChild>
-                <Button bg={"transparent"} size="sm">
-                    <FaRegEdit style={{ cursor: "pointer", }} color="#000" />
-                </Button>
+                
+                    <FaRegEdit style={{ cursor: "pointer", fontSize:'16px' }} color="#000" />
+               
                 {/* <Button><FaRegEdit /></Button> */}
 
             </DialogTrigger>

From d56678786b6b996532030c1869d723726e83e2ce Mon Sep 17 00:00:00 2001
From: "Siddhesh.More" <siddhesh.more@wdimails.com>
Date: Mon, 10 Feb 2025 12:27:51 +0530
Subject: [PATCH 2/2] update api

---
 .env                           |  4 +++-
 src/Pages/Login.tsx            | 42 ++++++++++++++++++++++++----------
 src/Redux/Service/apiSlice.tsx |  4 ++--
 3 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/.env b/.env
index 905ee5e..90e2eef 100644
--- a/.env
+++ b/.env
@@ -1,2 +1,4 @@
-VITE_API_URL=https://ssa.betadelivery.com/apia
+VITE_API_URL=https://ssa.betadelivery.com/apia/v1
+VITE_USER_NAME="Admin"
+VITE_PASSWORD="71%@L%es^bUX94`J9XT*%4&^%tUU^%Q^ffgt"
 VITE_APP_NAME=MyViteApp
\ No newline at end of file
diff --git a/src/Pages/Login.tsx b/src/Pages/Login.tsx
index d71bcfe..b8d4a68 100644
--- a/src/Pages/Login.tsx
+++ b/src/Pages/Login.tsx
@@ -29,25 +29,43 @@ const Login = () => {
     formState: { errors },
   } = useForm<FormValues>()
 
-
   const onSubmit = handleSubmit(async (data) => {
-    setIsLoading(true)
+    setIsLoading(true);
+  
+    // Encode Basic Auth Credentials
+    const username = import.meta.env.VITE_USER_NAME||''; // Replace with actual username
+    const password = import.meta.env.VITE_PASSWORD||''; // Replace with actual password
+    const basicAuth = btoa(`${username}:${password}`); // Encode to Base64
+  
     try {
-      const response = await axios.post(`${import.meta.env.VITE_API_URL}/v1/login`, {
-        mobile_number: data.mobileNumber,
-        password: data.password,
-      });
-      console.log('====================================');
+      const response = await axios.post(
+        `${import.meta.env.VITE_API_URL}/v1/login`,
+        {
+          mobile_number: data.mobileNumber,
+          password: data.password,
+        },
+        {
+          headers: {
+            Authorization: `Basic ${basicAuth}`,
+            "Content-Type": "application/json",
+          },
+        }
+      );
+  
+      console.log("====================================");
       console.log(response);
-      console.log('====================================');
+      console.log("====================================");
       dispatch(setToken(String(response.data["access-token"])));
-
     } catch (error) {
-      console.error("Login failed", error);
+      if (error) {
+
+        console.error("Login failed", error);
+        setIsLoading(false)
+        
+      }
     }
   });
-
-
+  
 
   
 
diff --git a/src/Redux/Service/apiSlice.tsx b/src/Redux/Service/apiSlice.tsx
index af6c96a..cc8ae3a 100644
--- a/src/Redux/Service/apiSlice.tsx
+++ b/src/Redux/Service/apiSlice.tsx
@@ -4,7 +4,7 @@ import { logout } from "./authSlice"; // Import logout action from authSlice
 import { RootState } from "../Store";
 
 const baseQuery = fetchBaseQuery({
-  baseUrl: "https://api.example.com",
+  baseUrl: `${import.meta.env.VITE_API_URL}`,
   prepareHeaders: (headers, { getState }) => {
     const token = (getState() as RootState).auth.token; // Get token from Redux store
     if (token) {
@@ -42,7 +42,7 @@ export const apiSlice = createApi({
 
 
 
-    
+
   }),
 });