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 daf9af5..3f1a4c0 100644 --- a/src/Pages/Login.tsx +++ b/src/Pages/Login.tsx @@ -27,26 +27,47 @@ const Login = () => { register, handleSubmit, formState: { errors }, - } = useForm(); + } = useForm() const onSubmit = handleSubmit(async (data) => { 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, + }, + { + headers: { + Authorization: `Basic ${basicAuth}`, + "Content-Type": "application/json", + }, } ); + console.log("===================================="); console.log(response); 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) + + } } }); + + + return ( 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 - + 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() { - + + + {/* */} 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 - + 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 - + diff --git a/src/Pages/ManageContact/ManageContact.tsx b/src/Pages/ManageContact/ManageContact.tsx index 07458b7..d4d44ed 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"; @@ -46,8 +46,8 @@ const ManageContact = () => { Contact Requests - - + } 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() { - + + + {/* */} 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() { - + + + {/* */} 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 - - + } 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() { - + + + - + + + - + { Agency Master - - + } 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() { - + + + - + + + { Country - - + } 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() { {/* */} - + + + 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() { {/* */} - + + + 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 - - + } 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() { {/* */} - + + + 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 - - + } 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() { {/* */} - + + + 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 - - + } 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() { {/* */} - + + + 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 - - + } diff --git a/src/Pages/SubAdmin/ViewSubAdmin.tsx b/src/Pages/SubAdmin/ViewSubAdmin.tsx index 83f953f..c1d3a56 100644 --- a/src/Pages/SubAdmin/ViewSubAdmin.tsx +++ b/src/Pages/SubAdmin/ViewSubAdmin.tsx @@ -8,9 +8,9 @@ function ViewSubAdmin() { - + + + {/* */} 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({ - + }), }); 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 = ({ onConfirm, alertText, alertCaption, - alertIcon, AltertTiggerIcon, button, iconColor,