From 5e61eaa1c651d5dca0136cf634c7375e1924bf7f Mon Sep 17 00:00:00 2001 From: "Siddhesh.More" Date: Wed, 15 Jan 2025 18:44:06 +0530 Subject: [PATCH 01/13] update --- src/Layouts/DefaultLayout.tsx | 2 +- src/Routes/Nav.ts | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/Layouts/DefaultLayout.tsx b/src/Layouts/DefaultLayout.tsx index 5750ec9..5dc8b49 100644 --- a/src/Layouts/DefaultLayout.tsx +++ b/src/Layouts/DefaultLayout.tsx @@ -27,7 +27,7 @@ const DefaultLayout: FC<{ children: React.ReactNode }> = ({ children }) => { {title} : - navigate(path)} gap={0} style={{ cursor: 'pointer', borderRadius: '8px', padding: '5px', width: '100%', display: 'flex', alignItems: 'center', border: '1px solid #ffffff', backgroundColor:'#fff',color:'#000', fontSize: '14px' }}> {title} + navigate(path)} gap={0} style={{ cursor: 'pointer', borderRadius: '8px', padding: '5px', width: '100%', display: 'flex', alignItems: 'center', border: '1px solid #ffffff', backgroundColor:'#fff',color:'#000', fontSize: '14px', fontWeight:'normal' }}> {title} {children?.map(({ title, path, Icon }, index) => navigate(path)} style={{ marginTop: 6, cursor: 'pointer', borderRadius: '8px', padding: '6px', width: '100%', display: 'flex', alignItems: 'center', gap: 6, border: '1px solid #ffffff', backgroundColor:'#fff',color:'#000' }} > {title})} )} diff --git a/src/Routes/Nav.ts b/src/Routes/Nav.ts index f225b1a..8bfe22e 100644 --- a/src/Routes/Nav.ts +++ b/src/Routes/Nav.ts @@ -1,6 +1,7 @@ import { LiaUsersSolid } from "react-icons/lia"; import { LuBellDot } from "react-icons/lu"; import { MdOutlineSupportAgent, MdPostAdd } from "react-icons/md"; +import { TiUserOutline } from "react-icons/ti"; import { GoDotFill } from "react-icons/go"; import { TbFileSettings, TbLayoutDashboard, TbReport, TbUsers, TbUsersGroup } from "react-icons/tb"; @@ -16,9 +17,21 @@ export const nav = [ }, { title: "Manage Users", - path: "/manage-user", - Icon: TbUsers, - type:'single' + path: "/register-user", + Icon: TiUserOutline, + type:'multiple', + children: [ + { + title: "Register Users", + path: "/register-user", + Icon: GoDotFill, + }, + { + title: "Deactivated Accounts", + path: "/deactivate-accounts", + Icon: GoDotFill, + }, + ], }, { title: "Manage Groups", -- 2.34.1 From a8f9aee8ff380dab3654c108b55e47d394191827 Mon Sep 17 00:00:00 2001 From: "Siddhesh.More" Date: Wed, 15 Jan 2025 19:46:50 +0530 Subject: [PATCH 02/13] update --- src/Layouts/DefaultLayout.tsx | 4 +- src/Pages/Dashboard/Dashboard.tsx | 5 +- src/Pages/ManageCommunity/ManageCommunity.tsx | 10 --- src/Pages/ManageCommunity/ManagePost.tsx | 11 ---- src/Pages/ManageGroups/ManageGroups.tsx | 11 ---- .../ManageJobs.tsx} | 10 +-- src/Pages/ManagePost/ManagePost.tsx | 8 +++ src/Pages/ManageSubAdmin/ManageSubAdmin.tsx | 11 ++++ .../DeactivatedAccounts.tsx | 11 ++++ .../RegisterUsers/RegisterUsers.tsx | 11 ++++ src/Pages/ManageUsers/ManageUsers.tsx | 11 ---- src/Pages/SubAdmin/SubAdmin.tsx | 11 ---- src/Pages/Support/Support.tsx | 11 ---- src/Routes/Nav.ts | 66 +++++-------------- src/Routes/Routes.ts | 42 +++++++----- src/components/MainFrame.tsx | 4 +- 16 files changed, 97 insertions(+), 140 deletions(-) delete mode 100644 src/Pages/ManageCommunity/ManageCommunity.tsx delete mode 100644 src/Pages/ManageCommunity/ManagePost.tsx delete mode 100644 src/Pages/ManageGroups/ManageGroups.tsx rename src/Pages/{Reporting/Reporting.tsx => ManageJobs/ManageJobs.tsx} (53%) create mode 100644 src/Pages/ManagePost/ManagePost.tsx create mode 100644 src/Pages/ManageSubAdmin/ManageSubAdmin.tsx create mode 100644 src/Pages/ManageUser/DeactivatedAccounts/DeactivatedAccounts.tsx create mode 100644 src/Pages/ManageUser/RegisterUsers/RegisterUsers.tsx delete mode 100644 src/Pages/ManageUsers/ManageUsers.tsx delete mode 100644 src/Pages/SubAdmin/SubAdmin.tsx delete mode 100644 src/Pages/Support/Support.tsx diff --git a/src/Layouts/DefaultLayout.tsx b/src/Layouts/DefaultLayout.tsx index 1a13610..97cac25 100644 --- a/src/Layouts/DefaultLayout.tsx +++ b/src/Layouts/DefaultLayout.tsx @@ -15,7 +15,7 @@ const DefaultLayout: FC<{ children: React.ReactNode }> = ({ children }) => { return ( - + @@ -27,7 +27,7 @@ const DefaultLayout: FC<{ children: React.ReactNode }> = ({ children }) => { navigate(path)} gap={0} style={{ cursor: 'pointer', borderRadius: '8px', padding: '5px', width: '100%', display: 'flex', alignItems: 'center', border: '1px solid #ffffff', backgroundColor:'#fff',color:'#000', fontSize: '14px', fontWeight:'normal' }}> {title} - {children?.map(({ title, path, Icon }, index) => navigate(path)} style={{ marginTop: 6, cursor: 'pointer', borderRadius: '8px', padding: '6px', width: '100%', display: 'flex', alignItems: 'center', gap: 6, border: '1px solid #ffffff', backgroundColor:'#fff',color:'#000' }} > {title})} + {children?.map(({ title, path, Icon }, index) => navigate(path)} style={{ marginTop: 6, cursor: 'pointer', borderRadius: '8px', padding: '6px', width: '100%', display: 'flex', alignItems: 'center', gap: 6, border: '1px solid #ffffff', backgroundColor:'#fff',color:'#000' }} > {title})} )} diff --git a/src/Pages/Dashboard/Dashboard.tsx b/src/Pages/Dashboard/Dashboard.tsx index d063737..a322836 100644 --- a/src/Pages/Dashboard/Dashboard.tsx +++ b/src/Pages/Dashboard/Dashboard.tsx @@ -1,7 +1,10 @@ +import MainFrame from "../../components/MainFrame" const Dashboard = () => { return ( -
Dashboard
+ + + ) } diff --git a/src/Pages/ManageCommunity/ManageCommunity.tsx b/src/Pages/ManageCommunity/ManageCommunity.tsx deleted file mode 100644 index 9588a01..0000000 --- a/src/Pages/ManageCommunity/ManageCommunity.tsx +++ /dev/null @@ -1,10 +0,0 @@ -import MainFrame from "../../components/MainFrame" - -const ManageCommunity = () => { - return ( - - - - ) -} -export default ManageCommunity \ No newline at end of file diff --git a/src/Pages/ManageCommunity/ManagePost.tsx b/src/Pages/ManageCommunity/ManagePost.tsx deleted file mode 100644 index 17f55ca..0000000 --- a/src/Pages/ManageCommunity/ManagePost.tsx +++ /dev/null @@ -1,11 +0,0 @@ -import MainFrame from "../../components/MainFrame" - -const ManagePost = () => { - return ( - - - - ) -} - -export default ManagePost \ No newline at end of file diff --git a/src/Pages/ManageGroups/ManageGroups.tsx b/src/Pages/ManageGroups/ManageGroups.tsx deleted file mode 100644 index ae5dedc..0000000 --- a/src/Pages/ManageGroups/ManageGroups.tsx +++ /dev/null @@ -1,11 +0,0 @@ -import MainFrame from "../../components/MainFrame" - -const ManageGroups = () => { - return ( - - - - ) -} - -export default ManageGroups \ No newline at end of file diff --git a/src/Pages/Reporting/Reporting.tsx b/src/Pages/ManageJobs/ManageJobs.tsx similarity index 53% rename from src/Pages/Reporting/Reporting.tsx rename to src/Pages/ManageJobs/ManageJobs.tsx index 7f0e7c3..2c13107 100644 --- a/src/Pages/Reporting/Reporting.tsx +++ b/src/Pages/ManageJobs/ManageJobs.tsx @@ -1,11 +1,11 @@ import MainFrame from "../../components/MainFrame" -const Reporting = () => { +const ManageJobs = () => { return ( - - - + + ) } -export default Reporting \ No newline at end of file + +export default ManageJobs \ No newline at end of file diff --git a/src/Pages/ManagePost/ManagePost.tsx b/src/Pages/ManagePost/ManagePost.tsx new file mode 100644 index 0000000..edbb8e2 --- /dev/null +++ b/src/Pages/ManagePost/ManagePost.tsx @@ -0,0 +1,8 @@ + +const ManagePost = () => { + return ( +
ManagePost
+ ) +} + +export default ManagePost \ No newline at end of file diff --git a/src/Pages/ManageSubAdmin/ManageSubAdmin.tsx b/src/Pages/ManageSubAdmin/ManageSubAdmin.tsx new file mode 100644 index 0000000..6ffd6d5 --- /dev/null +++ b/src/Pages/ManageSubAdmin/ManageSubAdmin.tsx @@ -0,0 +1,11 @@ +import MainFrame from '../../components/MainFrame' + +const ManageSubAdmin = () => { + return ( + + + + ) +} + +export default ManageSubAdmin \ No newline at end of file diff --git a/src/Pages/ManageUser/DeactivatedAccounts/DeactivatedAccounts.tsx b/src/Pages/ManageUser/DeactivatedAccounts/DeactivatedAccounts.tsx new file mode 100644 index 0000000..1b031a0 --- /dev/null +++ b/src/Pages/ManageUser/DeactivatedAccounts/DeactivatedAccounts.tsx @@ -0,0 +1,11 @@ +import MainFrame from '../../../components/MainFrame' + +const DeactivatedAccounts = () => { + return ( + + + + ) +} + +export default DeactivatedAccounts \ No newline at end of file diff --git a/src/Pages/ManageUser/RegisterUsers/RegisterUsers.tsx b/src/Pages/ManageUser/RegisterUsers/RegisterUsers.tsx new file mode 100644 index 0000000..f32f938 --- /dev/null +++ b/src/Pages/ManageUser/RegisterUsers/RegisterUsers.tsx @@ -0,0 +1,11 @@ +import MainFrame from '../../../components/MainFrame' + +const RegisterUsers = () => { + return ( + + + + ) +} + +export default RegisterUsers \ No newline at end of file diff --git a/src/Pages/ManageUsers/ManageUsers.tsx b/src/Pages/ManageUsers/ManageUsers.tsx deleted file mode 100644 index e6080cd..0000000 --- a/src/Pages/ManageUsers/ManageUsers.tsx +++ /dev/null @@ -1,11 +0,0 @@ -import MainFrame from "../../components/MainFrame" - -const ManageUsers = () => { - return ( - - - - ) -} - -export default ManageUsers \ No newline at end of file diff --git a/src/Pages/SubAdmin/SubAdmin.tsx b/src/Pages/SubAdmin/SubAdmin.tsx deleted file mode 100644 index 4ed0414..0000000 --- a/src/Pages/SubAdmin/SubAdmin.tsx +++ /dev/null @@ -1,11 +0,0 @@ -import MainFrame from "../../components/MainFrame" - -const SubAdmin = () => { - return ( - - - - - ) -} -export default SubAdmin \ No newline at end of file diff --git a/src/Pages/Support/Support.tsx b/src/Pages/Support/Support.tsx deleted file mode 100644 index 47bd3d4..0000000 --- a/src/Pages/Support/Support.tsx +++ /dev/null @@ -1,11 +0,0 @@ -import MainFrame from "../../components/MainFrame" - -const Support = () => { - return ( - - - - - ) -} -export default Support \ No newline at end of file diff --git a/src/Routes/Nav.ts b/src/Routes/Nav.ts index 8bfe22e..78d1c1d 100644 --- a/src/Routes/Nav.ts +++ b/src/Routes/Nav.ts @@ -1,11 +1,10 @@ -import { LiaUsersSolid } from "react-icons/lia"; -import { LuBellDot } from "react-icons/lu"; -import { MdOutlineSupportAgent, MdPostAdd } from "react-icons/md"; -import { TiUserOutline } from "react-icons/ti"; import { GoDotFill } from "react-icons/go"; +import { PiSuitcaseBold } from "react-icons/pi"; +import { RiSuitcase2Line } from "react-icons/ri"; +import { TbEdit, TbLayoutDashboard } from "react-icons/tb"; +import { TiUserAddOutline, TiUserOutline } from "react-icons/ti"; +import { CgWorkAlt } from "react-icons/cg"; -import { TbFileSettings, TbLayoutDashboard, TbReport, TbUsers, TbUsersGroup } from "react-icons/tb"; -import { RiUserSettingsLine } from "react-icons/ri"; export const nav = [ @@ -34,57 +33,28 @@ export const nav = [ ], }, { - title: "Manage Groups", - path: "/manage-groups", - Icon: TbUsersGroup, + title: "Manage Post", + path: "/manage-post", + Icon: TbEdit, type:'single' }, { - title: "Community", - path: "/manage-community", - Icon: LiaUsersSolid, - type:'multiple', - children: [ - { - title: "Manage Community", - path: "/manage-community", - Icon: GoDotFill, - }, - { - title: "Manage Post", - path: "/manage-post", - Icon: GoDotFill, - }, - ], - }, - { - title: "Support", - path: "/support", - Icon: MdOutlineSupportAgent, + title: "Manage Sub-Admin", + path: "/manage-sub-admin", + Icon: TiUserAddOutline, type:'single' }, { - title: "Sub-Admin", - path: "/sub-admin", - Icon: RiUserSettingsLine, + title: "Manage Jobs", + path: "/manage-jobs", + Icon: CgWorkAlt, type:'single' }, { - title: "Reporting", - path: "/reporting", - Icon: TbReport, + title: "Manage Jobs", + path: "/manage-jobs", + Icon: CgWorkAlt, type:'single' }, - { - title: "CMS", - path: "/cms", - Icon: TbFileSettings, - type:'single' - }, - { - title: "Manage Notifications", - path: "/manage-notification", - Icon: LuBellDot, - type:'single' - } + ]; \ No newline at end of file diff --git a/src/Routes/Routes.ts b/src/Routes/Routes.ts index b58d3ec..8aefe07 100644 --- a/src/Routes/Routes.ts +++ b/src/Routes/Routes.ts @@ -1,24 +1,32 @@ -import CMS from "../Pages/CMS/CMS"; import Dashboard from "../Pages/Dashboard/Dashboard"; -import ManageCommunity from "../Pages/ManageCommunity/ManageCommunity"; -import ManagePost from "../Pages/ManageCommunity/ManagePost"; -import ManageGroups from "../Pages/ManageGroups/ManageGroups"; -import ManageUsers from "../Pages/ManageUsers/ManageUsers"; +import ManageJobs from "../Pages/ManageJobs/ManageJobs"; +import ManagePost from "../Pages/ManagePost/ManagePost"; +import ManageSubAdmin from "../Pages/ManageSubAdmin/ManageSubAdmin"; +import DeactivatedAccounts from "../Pages/ManageUser/DeactivatedAccounts/DeactivatedAccounts"; +import RegisterUsers from "../Pages/ManageUser/RegisterUsers/RegisterUsers"; import Profile from "../Pages/Profile/Profile"; -import Reporting from "../Pages/Reporting/Reporting"; -import SubAdmin from "../Pages/SubAdmin/SubAdmin"; -import Support from "../Pages/Support/Support"; export const RouteLink = [ { path: "/", Component: Dashboard }, - { path: "/manage-user", Component: ManageUsers }, - { path: "/manage-groups", Component: ManageGroups }, - { path: "/manage-community", Component: ManageCommunity}, - { path: "/manage-post", Component: ManagePost}, - { path: "/support", Component: Support}, - { path: "/sub-admin", Component: SubAdmin}, - { path: "/reporting", Component: Reporting}, - { path: "/cms", Component: CMS}, - { path: "/manage-notification", Component: CMS}, + { path: "/register-user", Component: RegisterUsers }, + { path: "/deactivate-accounts", Component: DeactivatedAccounts }, + { path: "/manage-post", Component: ManagePost }, + { path: "/manage-sub-admin", Component: ManageSubAdmin }, + { path: "/manage-jobs", Component: ManageJobs }, + + + + + + + + + + + + + + + { path: "/profile", Component: Profile}, ] \ No newline at end of file diff --git a/src/components/MainFrame.tsx b/src/components/MainFrame.tsx index 32c5f64..df552e2 100644 --- a/src/components/MainFrame.tsx +++ b/src/components/MainFrame.tsx @@ -13,10 +13,10 @@ interface MainFrameProps { const MainFrame: FC = ({ children, title }) => { return ( - + Date: Wed, 15 Jan 2025 20:33:14 +0530 Subject: [PATCH 03/13] updated --- src/Constants/Constaants.tsx | 30 +++++++++++ src/Layouts/DefaultLayout.tsx | 9 +++- src/Pages/ManageCMS/AboutUs/AboutUs.tsx | 11 ++++ src/Pages/ManageCMS/FAQ/FreqAskQuestion.tsx | 12 +++++ .../ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx | 11 ++++ .../TermsAndCondition/TermsAndCondition.tsx | 11 ++++ src/Pages/ManageContactUs/ManageContactUs.tsx | 11 ++++ src/Routes/Nav.ts | 52 ++++++++++++++++--- src/Routes/Routes.ts | 23 ++++++++ src/components/MainFrame.tsx | 6 +-- 10 files changed, 165 insertions(+), 11 deletions(-) create mode 100644 src/Constants/Constaants.tsx create mode 100644 src/Pages/ManageCMS/AboutUs/AboutUs.tsx create mode 100644 src/Pages/ManageCMS/FAQ/FreqAskQuestion.tsx create mode 100644 src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx create mode 100644 src/Pages/ManageCMS/TermsAndCondition/TermsAndCondition.tsx create mode 100644 src/Pages/ManageContactUs/ManageContactUs.tsx diff --git a/src/Constants/Constaants.tsx b/src/Constants/Constaants.tsx new file mode 100644 index 0000000..842f931 --- /dev/null +++ b/src/Constants/Constaants.tsx @@ -0,0 +1,30 @@ +export const getTitle = (loactions:string) =>{ + + if (loactions==='/') { + return 'Dashboard' + }else if (loactions==='/register-user') { + return 'Manage User - Register User' + } else if (loactions==='/deactivate-accounts') { + return 'Manage User - Deactivated User' + } else if (loactions==='/manage-post') { + return 'Manage Post' + } else if (loactions==='/manage-sub-admin') { + return 'Manage Sub Admin' + } else if (loactions==='/manage-jobs') { + return 'Manage Jobs' + } else if (loactions==='/manage-contact-us') { + return 'Manage Contact Us' + } else if (loactions==='/manage-contact-us') { + return 'Manage Contact Us' + }else if (loactions==='/faq') { + return 'Manage CMS - FAQ' + }else if (loactions==='/about-us') { + return 'Manage CMS - About Us' + }else if (loactions==='/privacy-policy') { + return 'Manage CMS - Privacy Policy' + }else if (loactions==='/terms-and-condition') { + return 'Manage CMS - Tems And Condition' + }else if (loactions==='/profile') { + return 'My Profile' + } +} \ No newline at end of file diff --git a/src/Layouts/DefaultLayout.tsx b/src/Layouts/DefaultLayout.tsx index 97cac25..c6df190 100644 --- a/src/Layouts/DefaultLayout.tsx +++ b/src/Layouts/DefaultLayout.tsx @@ -6,10 +6,14 @@ import { nav } from "../Routes/Nav"; import logo from '../assets/logo.svg'; import { AccordionItem, AccordionItemContent, AccordionItemTrigger, AccordionRoot } from "../components/ui/accordion"; import { Avatar } from "../components/ui/avatar"; +import { getTitle } from "../Constants/Constaants"; const DefaultLayout: FC<{ children: React.ReactNode }> = ({ children }) => { const navigate = useNavigate() const location = useLocation() + const headerTitle = getTitle(location?.pathname) + + @@ -33,7 +37,9 @@ const DefaultLayout: FC<{ children: React.ReactNode }> = ({ children }) => { - + + {headerTitle} + navigate('/profile')} > @@ -42,6 +48,7 @@ const DefaultLayout: FC<{ children: React.ReactNode }> = ({ children }) => { ritesh.pandey@wdimails.com + {children} diff --git a/src/Pages/ManageCMS/AboutUs/AboutUs.tsx b/src/Pages/ManageCMS/AboutUs/AboutUs.tsx new file mode 100644 index 0000000..c16d6d9 --- /dev/null +++ b/src/Pages/ManageCMS/AboutUs/AboutUs.tsx @@ -0,0 +1,11 @@ +import MainFrame from '../../../components/MainFrame' + +const AboutUs = () => { + return ( + + + + ) +} + +export default AboutUs \ No newline at end of file diff --git a/src/Pages/ManageCMS/FAQ/FreqAskQuestion.tsx b/src/Pages/ManageCMS/FAQ/FreqAskQuestion.tsx new file mode 100644 index 0000000..f562825 --- /dev/null +++ b/src/Pages/ManageCMS/FAQ/FreqAskQuestion.tsx @@ -0,0 +1,12 @@ +import { Text } from '@chakra-ui/react' +import MainFrame from '../../../components/MainFrame' + +const FreqAskQuestion = () => { + return ( + + hello + + ) +} + +export default FreqAskQuestion \ No newline at end of file diff --git a/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx b/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx new file mode 100644 index 0000000..8a43a36 --- /dev/null +++ b/src/Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy.tsx @@ -0,0 +1,11 @@ +import MainFrame from '../../../components/MainFrame' + +const PrivacyPolicy = () => { + return ( + + + + ) +} + +export default PrivacyPolicy \ No newline at end of file diff --git a/src/Pages/ManageCMS/TermsAndCondition/TermsAndCondition.tsx b/src/Pages/ManageCMS/TermsAndCondition/TermsAndCondition.tsx new file mode 100644 index 0000000..fac9972 --- /dev/null +++ b/src/Pages/ManageCMS/TermsAndCondition/TermsAndCondition.tsx @@ -0,0 +1,11 @@ +import MainFrame from '../../../components/MainFrame' + +const TermsAndCondition = () => { + return ( + + + + ) +} + +export default TermsAndCondition \ No newline at end of file diff --git a/src/Pages/ManageContactUs/ManageContactUs.tsx b/src/Pages/ManageContactUs/ManageContactUs.tsx new file mode 100644 index 0000000..f713710 --- /dev/null +++ b/src/Pages/ManageContactUs/ManageContactUs.tsx @@ -0,0 +1,11 @@ +import MainFrame from '../../components/MainFrame' + +const ManageContactUs = () => { + return ( + + + + ) +} + +export default ManageContactUs \ No newline at end of file diff --git a/src/Routes/Nav.ts b/src/Routes/Nav.ts index 78d1c1d..22aba5f 100644 --- a/src/Routes/Nav.ts +++ b/src/Routes/Nav.ts @@ -1,9 +1,12 @@ import { GoDotFill } from "react-icons/go"; -import { PiSuitcaseBold } from "react-icons/pi"; -import { RiSuitcase2Line } from "react-icons/ri"; -import { TbEdit, TbLayoutDashboard } from "react-icons/tb"; -import { TiUserAddOutline, TiUserOutline } from "react-icons/ti"; +import { PiHeadphonesBold, PiSuitcaseBold } from "react-icons/pi"; +import { RiSuitcase2Line, RiUserSettingsLine } from "react-icons/ri"; +import { TbEdit, TbHeadphonesFilled, TbLayoutDashboard } from "react-icons/tb"; +import { TiDocument, TiDocumentText, TiUser, TiUserAddOutline, TiUserOutline } from "react-icons/ti"; import { CgWorkAlt } from "react-icons/cg"; +import { HiOutlineDocumentReport, HiOutlineDocumentText } from "react-icons/hi"; +import { LuUserRound } from "react-icons/lu"; + export const nav = [ @@ -51,9 +54,44 @@ export const nav = [ type:'single' }, { - title: "Manage Jobs", - path: "/manage-jobs", - Icon: CgWorkAlt, + title: "Manage Contact Us", + path: "/manage-contact-us", + Icon: PiHeadphonesBold, + type:'single' + }, + + { + title: "Manage CMS", + path: "/faq", + Icon: TiDocumentText, + type:'multiple', + children: [ + { + title: "FAQ", + path: "/faq", + Icon: GoDotFill, + }, + { + title: "About Us", + path: "/about-us", + Icon: GoDotFill, + }, + { + title: "Privacy Policy", + path: "/privacy-policy", + Icon: GoDotFill, + }, + { + title: "Terms And Conditions", + path: "/terms-and-condition", + Icon: GoDotFill, + }, + ], + }, + { + title: "My Profile", + path: "/profile", + Icon: RiUserSettingsLine, type:'single' }, diff --git a/src/Routes/Routes.ts b/src/Routes/Routes.ts index 8aefe07..a9ee324 100644 --- a/src/Routes/Routes.ts +++ b/src/Routes/Routes.ts @@ -1,5 +1,9 @@ import Dashboard from "../Pages/Dashboard/Dashboard"; +import AboutUs from "../Pages/ManageCMS/AboutUs/AboutUs"; +import FreqAskQuestion from "../Pages/ManageCMS/FAQ/FreqAskQuestion"; +import PrivacyPolicy from "../Pages/ManageCMS/PrivacyPolicy/PrivacyPolicy"; +import ManageContactUs from "../Pages/ManageContactUs/ManageContactUs"; import ManageJobs from "../Pages/ManageJobs/ManageJobs"; import ManagePost from "../Pages/ManagePost/ManagePost"; import ManageSubAdmin from "../Pages/ManageSubAdmin/ManageSubAdmin"; @@ -13,6 +17,25 @@ export const RouteLink = [ { path: "/manage-post", Component: ManagePost }, { path: "/manage-sub-admin", Component: ManageSubAdmin }, { path: "/manage-jobs", Component: ManageJobs }, + { path: "/manage-contact-us", Component: ManageContactUs }, + { path: "/faq", Component: FreqAskQuestion }, + + + + { path: "/about-us", Component: AboutUs }, + + + + { path: "/privacy-policy", Component: PrivacyPolicy }, + + + { path: "/terms-and-condition", Component: PrivacyPolicy }, + + + + + + diff --git a/src/components/MainFrame.tsx b/src/components/MainFrame.tsx index df552e2..6aabdd2 100644 --- a/src/components/MainFrame.tsx +++ b/src/components/MainFrame.tsx @@ -1,4 +1,4 @@ -import { Box, Text, VStack } from "@chakra-ui/react" +import { Box, VStack } from "@chakra-ui/react" import { motion } from "framer-motion" import React, { FC } from "react" import { OPACITY_ON_LOAD } from "../Layouts/animations" @@ -11,9 +11,9 @@ interface MainFrameProps { title?: string } -const MainFrame: FC = ({ children, title }) => { +const MainFrame: FC = ({ children }) => { return ( - + Date: Wed, 15 Jan 2025 20:33:34 +0530 Subject: [PATCH 04/13] update --- src/Routes/Nav.ts | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/Routes/Nav.ts b/src/Routes/Nav.ts index 22aba5f..c0450b5 100644 --- a/src/Routes/Nav.ts +++ b/src/Routes/Nav.ts @@ -1,11 +1,9 @@ -import { GoDotFill } from "react-icons/go"; -import { PiHeadphonesBold, PiSuitcaseBold } from "react-icons/pi"; -import { RiSuitcase2Line, RiUserSettingsLine } from "react-icons/ri"; -import { TbEdit, TbHeadphonesFilled, TbLayoutDashboard } from "react-icons/tb"; -import { TiDocument, TiDocumentText, TiUser, TiUserAddOutline, TiUserOutline } from "react-icons/ti"; import { CgWorkAlt } from "react-icons/cg"; -import { HiOutlineDocumentReport, HiOutlineDocumentText } from "react-icons/hi"; -import { LuUserRound } from "react-icons/lu"; +import { GoDotFill } from "react-icons/go"; +import { PiHeadphonesBold } from "react-icons/pi"; +import { RiUserSettingsLine } from "react-icons/ri"; +import { TbEdit, TbLayoutDashboard } from "react-icons/tb"; +import { TiDocumentText, TiUserAddOutline, TiUserOutline } from "react-icons/ti"; -- 2.34.1 From 7157a6396974b56061b21adb47fd91b86f724dd3 Mon Sep 17 00:00:00 2001 From: "Pratham.Mandavkar" Date: Wed, 15 Jan 2025 20:36:12 +0530 Subject: [PATCH 05/13] OTPpages --- src/App.tsx | 56 ++++++++---- src/Contexts/GlobalStateProvider.tsx | 2 +- src/Pages/OnBoarding/LoginOtp.tsx | 132 +++++++++++++++++++++++++++ src/assets/icons/edit.png | Bin 0 -> 667 bytes src/components/ui/pin-input.tsx | 27 ++++++ 5 files changed, 197 insertions(+), 20 deletions(-) create mode 100644 src/Pages/OnBoarding/LoginOtp.tsx create mode 100644 src/assets/icons/edit.png create mode 100644 src/components/ui/pin-input.tsx diff --git a/src/App.tsx b/src/App.tsx index fa6affb..7b53971 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,24 +1,42 @@ -import { useContext } from 'react'; +import { useContext } from "react"; import { Route, BrowserRouter as Router, Routes } from "react-router-dom"; -import GlobalStateContext from './Contexts/GlobalStateContext'; -import DefaultLayout from './Layouts/DefaultLayout'; -import Login from './Pages/Login'; -import { RouteLink } from './Routes/Routes'; +import GlobalStateContext from "./Contexts/GlobalStateContext"; +import DefaultLayout from "./Layouts/DefaultLayout"; +import Login from "./Pages/Login"; +import { RouteLink } from "./Routes/Routes"; +import LoginOtp from "./Pages/OnBoarding/LoginOtp"; -function App() { - const context = useContext(GlobalStateContext); - if (!context) throw new Error('App must be used within a GlobalStateProvider'); - const { isAuthenticate } = context; +function App() { + const context = useContext(GlobalStateContext); + if (!context) + throw new Error("App must be used within a GlobalStateProvider"); + const { isAuthenticate } = context; - return ( - - - } /> - {RouteLink.map(({ path, Component }, index) => (} />))}) : ()} /> - } /> - - - ); -} + return ( + + + } /> + } /> + + + {RouteLink.map(({ path, Component }, index) => ( + } /> + ))} + + + ) : ( + + ) + } + /> + } /> + + + ); +} export default App; diff --git a/src/Contexts/GlobalStateProvider.tsx b/src/Contexts/GlobalStateProvider.tsx index 1f2c713..9a839de 100644 --- a/src/Contexts/GlobalStateProvider.tsx +++ b/src/Contexts/GlobalStateProvider.tsx @@ -5,7 +5,7 @@ import GlobalStateContext from './GlobalStateContext'; const GlobalStateProvider = ({ children }:{children:ReactNode}) => { - const [isAuthenticate, setIsAuthenticate] = useState(true); + const [isAuthenticate, setIsAuthenticate] = useState(false); return ( diff --git a/src/Pages/OnBoarding/LoginOtp.tsx b/src/Pages/OnBoarding/LoginOtp.tsx new file mode 100644 index 0000000..3fa635a --- /dev/null +++ b/src/Pages/OnBoarding/LoginOtp.tsx @@ -0,0 +1,132 @@ +import { Center, HStack, Image, Input, Text, VStack } from "@chakra-ui/react"; +import { useContext, useState } from "react"; +import { useForm } from "react-hook-form"; +import GlobalStateContext from "../../Contexts/GlobalStateContext"; +import logo from "../../assets/logo.svg"; +import uiEdit from "../../assets/icons/edit.png"; +import { Button } from "../../components/ui/button"; +import { Field } from "../../components/ui/field"; +import { Toaster, toaster } from "../../components/ui/toaster"; +import { PinInput } from "../../components/ui/pin-input"; + +interface FormValues { + mobileNumber: number; +} + +const LoginOtp = () => { + const [isLoading, setIsLoading] = useState(false); + const context = useContext(GlobalStateContext); + if (!context) { + throw new Error("App must be used within a GlobalStateProvider"); + } + const { setIsAuthenticate } = context; + const { + register, + handleSubmit, + formState: { errors }, + } = useForm(); + + const onSubmit = handleSubmit((data) => { + setIsLoading(true); + if (data?.mobileNumber === 1234567890) { + setTimeout(() => { + setIsAuthenticate(true); + setIsLoading(false); + }, 3000); // 3-second delay + } else { + toaster.create({ + title: `Invalid Credentials`, + type: "error", + }); + setIsLoading(false); + } + }); + + return ( + + + + + + +
+ +
+ +
+ + + Enter otp + + + OTP has been send to your E-mail Address + + + + + 9619565889 + + + + + + + + Forgot password + + +
+ + + + ); +}; + +export default LoginOtp; diff --git a/src/assets/icons/edit.png b/src/assets/icons/edit.png new file mode 100644 index 0000000000000000000000000000000000000000..2aeaad044baee7c745aa8b2a4b2e02a437de8ff6 GIT binary patch literal 667 zcmV;M0%ZM(P)Px%RY^oaRA>e5ncZ>1Fbse@0wXX&N5})%N}hP>H8wmj0vo^x-3T^d1V&&4dP-1; z-TYXIgL6IiuID&bBz=2Ey2*e0X9RU#e5v0DQQa>`O?;zEAz5e=~+O8M< zNwQg_LS51MrhkOCw9kS;@6Nn)%^tdd5 z(8rhK#yai{VK~$>iER)J5|t5_ASYmkEUfcA0pOZFM41Z!88t!lBNh5O#3t!0T9Dgw z384L4DWOaHwSt)O8v1J^|3k5D3E| zE`Wo49p34h3o$zYZYE|4z=4=800*LaF*(#U7uc!pyM$cl1j(U;UHaY*z{^DWb7Xb^ zJ|Ti+fFep|LjAV3OD-sYk4yvy7y>~VX=ppQpKTfTa-W>(Q})_o8v6}8Lkb7L$wVJy z&~evH1a-2{_`4v=H$HFA-sgKY{yvEQmu2M?_u^kb&=Jj$?Wt?Ps$)v2AFj`^dXOQUN_8kQF4Tqbn7b$*vr|b)`F-%25!8j>9Z3J^6TU92`ZoeH=)28ex=dGW z7^PI`i%;h>xxJ%K`lwPFix)8hF#<6HF#>amz%LGocy$b2GiU$+002ovPDHLkV1i+) BCWHV0 literal 0 HcmV?d00001 diff --git a/src/components/ui/pin-input.tsx b/src/components/ui/pin-input.tsx new file mode 100644 index 0000000..93e013c --- /dev/null +++ b/src/components/ui/pin-input.tsx @@ -0,0 +1,27 @@ +import { PinInput as ChakraPinInput, Group } from "@chakra-ui/react" +import * as React from "react" + +export interface PinInputProps extends ChakraPinInput.RootProps { + rootRef?: React.Ref + count?: number + inputProps?: React.InputHTMLAttributes + attached?: boolean +} + +export const PinInput = React.forwardRef( + function PinInput(props, ref) { + const { count = 4, inputProps, rootRef, attached, ...rest } = props + return ( + + + + + {Array.from({ length: count }).map((_, index) => ( + + ))} + + + + ) + }, +) -- 2.34.1 From 9688f07e4fd156cc3f0b2e05111b02de641b98c3 Mon Sep 17 00:00:00 2001 From: "Siddhesh.More" Date: Thu, 16 Jan 2025 12:10:28 +0530 Subject: [PATCH 06/13] UPDATE --- dev-dist/sw.js | 2 +- src/Constants/Constaants.tsx | 30 --- src/Constants/Constants.tsx | 19 ++ src/Layouts/DefaultLayout.tsx | 22 +- src/Pages/ManagePost/ManagePost.tsx | 5 +- .../RegisterUsers/RegisterUsers.tsx | 225 ++++++++++++++++++ src/Routes/Nav.ts | 18 +- src/Routes/Routes.ts | 12 +- src/components/DataTable.tsx | 35 +++ src/index.css | 77 +----- 10 files changed, 319 insertions(+), 126 deletions(-) delete mode 100644 src/Constants/Constaants.tsx create mode 100644 src/Constants/Constants.tsx create mode 100644 src/components/DataTable.tsx diff --git a/dev-dist/sw.js b/dev-dist/sw.js index b003956..c8fe26e 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.jlpvaemfr1" + "revision": "0.7mpt2f2te58" }], {}); workbox.cleanupOutdatedCaches(); workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), { diff --git a/src/Constants/Constaants.tsx b/src/Constants/Constaants.tsx deleted file mode 100644 index 842f931..0000000 --- a/src/Constants/Constaants.tsx +++ /dev/null @@ -1,30 +0,0 @@ -export const getTitle = (loactions:string) =>{ - - if (loactions==='/') { - return 'Dashboard' - }else if (loactions==='/register-user') { - return 'Manage User - Register User' - } else if (loactions==='/deactivate-accounts') { - return 'Manage User - Deactivated User' - } else if (loactions==='/manage-post') { - return 'Manage Post' - } else if (loactions==='/manage-sub-admin') { - return 'Manage Sub Admin' - } else if (loactions==='/manage-jobs') { - return 'Manage Jobs' - } else if (loactions==='/manage-contact-us') { - return 'Manage Contact Us' - } else if (loactions==='/manage-contact-us') { - return 'Manage Contact Us' - }else if (loactions==='/faq') { - return 'Manage CMS - FAQ' - }else if (loactions==='/about-us') { - return 'Manage CMS - About Us' - }else if (loactions==='/privacy-policy') { - return 'Manage CMS - Privacy Policy' - }else if (loactions==='/terms-and-condition') { - return 'Manage CMS - Tems And Condition' - }else if (loactions==='/profile') { - return 'My Profile' - } -} \ No newline at end of file diff --git a/src/Constants/Constants.tsx b/src/Constants/Constants.tsx new file mode 100644 index 0000000..09c8792 --- /dev/null +++ b/src/Constants/Constants.tsx @@ -0,0 +1,19 @@ +export const getTitle = (location: string): string => { + const titles: { [key: string]: string } = { + '/': 'Dashboard', + '/manage-user/register-user': 'Manage User', + '/manage-user/deactivate-accounts': 'Manage User', + '/manage-post': 'Manage Post', + '/manage-sub-admin': 'Manage Sub Admin', + '/manage-jobs': 'Manage Jobs', + '/manage-contact-us': 'Manage Contact Us', + '/manage-cms/faq': 'Manage CMS', + '/manage-cms/about-us': 'Manage CMS', + '/manage-cms/privacy-policy': 'Manage CMS', + '/manage-cms/terms-and-condition': 'Manage CMS', + '/profile': 'My Profile', + }; + + return titles[location] || 'Page Not Found'; + }; + \ No newline at end of file diff --git a/src/Layouts/DefaultLayout.tsx b/src/Layouts/DefaultLayout.tsx index c6df190..cac6cd9 100644 --- a/src/Layouts/DefaultLayout.tsx +++ b/src/Layouts/DefaultLayout.tsx @@ -6,12 +6,14 @@ import { nav } from "../Routes/Nav"; import logo from '../assets/logo.svg'; import { AccordionItem, AccordionItemContent, AccordionItemTrigger, AccordionRoot } from "../components/ui/accordion"; import { Avatar } from "../components/ui/avatar"; -import { getTitle } from "../Constants/Constaants"; +import { getTitle } from "../Constants/Constants"; const DefaultLayout: FC<{ children: React.ReactNode }> = ({ children }) => { const navigate = useNavigate() const location = useLocation() const headerTitle = getTitle(location?.pathname) + console.log(location); + @@ -19,27 +21,27 @@ const DefaultLayout: FC<{ children: React.ReactNode }> = ({ children }) => { return ( - + - - {nav?.map(({ title, path, Icon, type, children }, index) => type === 'single' ? - {title} : + + {nav?.map(({ title, path, Icon, type, children, initPath }, index) => type === 'single' ? + {title} : - - navigate(path)} gap={0} style={{ cursor: 'pointer', borderRadius: '8px', padding: '5px', width: '100%', display: 'flex', alignItems: 'center', border: '1px solid #ffffff', backgroundColor:'#fff',color:'#000', fontSize: '14px', fontWeight:'normal' }}> {title} + + navigate(path)} gap={0} style={{ cursor: 'pointer', borderRadius: '8px', padding: '5px', width: '100%', display: 'flex', alignItems: 'center', border: '1px solid #ffffff', backgroundColor:'#fff',color:'#000', fontSize: '14px', fontWeight:'normal' }}> {title} {children?.map(({ title, path, Icon }, index) => navigate(path)} style={{ marginTop: 6, cursor: 'pointer', borderRadius: '8px', padding: '6px', width: '100%', display: 'flex', alignItems: 'center', gap: 6, border: '1px solid #ffffff', backgroundColor:'#fff',color:'#000' }} > {title})} )} - - {headerTitle} - + + {headerTitle} + navigate('/profile')} > diff --git a/src/Pages/ManagePost/ManagePost.tsx b/src/Pages/ManagePost/ManagePost.tsx index edbb8e2..2dc46be 100644 --- a/src/Pages/ManagePost/ManagePost.tsx +++ b/src/Pages/ManagePost/ManagePost.tsx @@ -1,7 +1,10 @@ +import MainFrame from "../../components/MainFrame" const ManagePost = () => { return ( -
ManagePost
+ + + ) } diff --git a/src/Pages/ManageUser/RegisterUsers/RegisterUsers.tsx b/src/Pages/ManageUser/RegisterUsers/RegisterUsers.tsx index f32f938..312e8d9 100644 --- a/src/Pages/ManageUser/RegisterUsers/RegisterUsers.tsx +++ b/src/Pages/ManageUser/RegisterUsers/RegisterUsers.tsx @@ -1,9 +1,234 @@ +import { Box, HStack, Input, Stack, Table, Text } from '@chakra-ui/react' import MainFrame from '../../../components/MainFrame' +import { InputGroup } from '../../../components/ui/input-group' +import { LuSearch } from 'react-icons/lu' +import DataTable from '../../../components/DataTable' + + + + + // Table setup + const tableHeadRow = [ + "Sr. No", + "First Name", + "Mobile number", + "Gender", + "DOB", + "Type of User", + "Language", + "Status", + "Action", + ]; + + + + const usersData:any[] = [ + { + "Sr. No": 1, + "First Name": "Ritesh", + "Mobile number": "9876543210", + "Gender": "Male", + "DOB": "15-01-1990", + "Type of User": "Admin", + "Language": "English", + "Status": "Active", + "Action": "Edit/Delete", + }, + { + 'Sr. No': 2, + "First Name": "Anjali", + "Mobile number": "9123456789", + "Gender": "Female", + "DOB": "21-06-1995", + "Type of User": "Customer", + "Language": "Hindi", + "Status": "Inactive", + "Action": "Edit/Delete", + }, + { + 'Sr. No': 3, + "First Name": "Rajesh", + "Mobile number": "9871234560", + "Gender": "Male", + "DOB": "12-12-1985", + "Type of User": "Vendor", + "Language": "English", + "Status": "Active", + "Action": "Edit/Delete", + }, + { + 'Sr. No': 4, + "First Name": "Priya", + "Mobile number": "9988776655", + "Gender": "Female", + "DOB": "05-05-1998", + "Type of User": "Customer", + "Language": "Tamil", + "Status": "Active", + "Action": "Edit/Delete", + }, + { + 'Sr. No': 5, + "First Name": "Amit", + "Mobile number": "8899665544", + "Gender": "Male", + "DOB": "03-03-1992", + "Type of User": "Admin", + "Language": "Gujarati", + "Status": "Inactive", + "Action": "Edit/Delete", + }, + { + 'Sr. No': 6, + "First Name": "Amit", + "Mobile number": "8899665544", + "Gender": "Male", + "DOB": "03-03-1992", + "Type of User": "Admin", + "Language": "Gujarati", + "Status": "Inactive", + "Action": "Edit/Delete", + }, + { + 'Sr. No': 7, + "First Name": "Amit", + "Mobile number": "8899665544", + "Gender": "Male", + "DOB": "03-03-1992", + "Type of User": "Admin", + "Language": "Gujarati", + "Status": "Inactive", + "Action": "Edit/Delete", + }, + { + 'Sr. No': 5, + "First Name": "Amit", + "Mobile number": "8899665544", + "Gender": "Male", + "DOB": "03-03-1992", + "Type of User": "Admin", + "Language": "Gujarati", + "Status": "Inactive", + "Action": "Edit/Delete", + }, + { + 'Sr. No': 6, + "First Name": "Amit", + "Mobile number": "8899665544", + "Gender": "Male", + "DOB": "03-03-1992", + "Type of User": "Admin", + "Language": "Gujarati", + "Status": "Inactive", + "Action": "Edit/Delete", + }, + { + 'Sr. No': 7, + "First Name": "Amit", + "Mobile number": "8899665544", + "Gender": "Male", + "DOB": "03-03-1992", + "Type of User": "Admin", + "Language": "Gujarati", + "Status": "Inactive", + "Action": "Edit/Delete", + }, + { + 'Sr. No': 8, + "First Name": "Amit", + "Mobile number": "8899665544", + "Gender": "Male", + "DOB": "03-03-1992", + "Type of User": "Admin", + "Language": "Gujarati", + "Status": "Inactive", + "Action": "Edit/Delete", + }, + { + 'Sr. No': 9, + "First Name": "Amit", + "Mobile number": "8899665544", + "Gender": "Male", + "DOB": "03-03-1992", + "Type of User": "Admin", + "Language": "Gujarati", + "Status": "Inactive", + "Action": "Edit/Delete", + }, + { + 'Sr. No': 10, + "First Name": "Amit", + "Mobile number": "8899665544", + "Gender": "Male", + "DOB": "03-03-1992", + "Type of User": "Admin", + "Language": "Gujarati", + "Status": "Inactive", + "Action": "Edit/Delete", + }, + { + 'Sr. No': 11, + "First Name": "Amit", + "Mobile number": "8899665544", + "Gender": "Male", + "DOB": "03-03-1992", + "Type of User": "Admin", + "Language": "Gujarati", + "Status": "Inactive", + "Action": "Edit/Delete", + }, + { + 'Sr. No': 12, + "First Name": "Amit", + "Mobile number": "8899665544", + "Gender": "Male", + "DOB": "03-03-1992", + "Type of User": "Admin", + "Language": "Gujarati", + "Status": "Inactive", + "Action": "Edit/Delete", + }, + { + 'Sr. No': 13, + "First Name": "Amit", + "Mobile number": "8899665544", + "Gender": "Male", + "DOB": "03-03-1992", + "Type of User": "Admin", + "Language": "Gujarati", + "Status": "Inactive", + "Action": "Edit/Delete", + }, + ]; + const RegisterUsers = () => { + return ( + + Register User + + + + } + w={'100%'} + color={'#000'} + > + + + + + + + + + + ) } diff --git a/src/Routes/Nav.ts b/src/Routes/Nav.ts index c0450b5..5c3852d 100644 --- a/src/Routes/Nav.ts +++ b/src/Routes/Nav.ts @@ -17,18 +17,19 @@ export const nav = [ }, { title: "Manage Users", - path: "/register-user", + path: "/manage-user/register-user", + initPath:'/manage-user', Icon: TiUserOutline, type:'multiple', children: [ { title: "Register Users", - path: "/register-user", + path: "/manage-user/register-user", Icon: GoDotFill, }, { title: "Deactivated Accounts", - path: "/deactivate-accounts", + path: "/manage-user/deactivate-accounts", Icon: GoDotFill, }, ], @@ -60,28 +61,29 @@ export const nav = [ { title: "Manage CMS", - path: "/faq", + initPath:'/manage-cms', + path: "/manage-cms/faq", Icon: TiDocumentText, type:'multiple', children: [ { title: "FAQ", - path: "/faq", + path: "/manage-cms/faq", Icon: GoDotFill, }, { title: "About Us", - path: "/about-us", + path: "/manage-cms/about-us", Icon: GoDotFill, }, { title: "Privacy Policy", - path: "/privacy-policy", + path: "/manage-cms/privacy-policy", Icon: GoDotFill, }, { title: "Terms And Conditions", - path: "/terms-and-condition", + path: "/manage-cms/terms-and-condition", Icon: GoDotFill, }, ], diff --git a/src/Routes/Routes.ts b/src/Routes/Routes.ts index a9ee324..6157151 100644 --- a/src/Routes/Routes.ts +++ b/src/Routes/Routes.ts @@ -12,24 +12,24 @@ import RegisterUsers from "../Pages/ManageUser/RegisterUsers/RegisterUsers"; import Profile from "../Pages/Profile/Profile"; export const RouteLink = [ { path: "/", Component: Dashboard }, - { path: "/register-user", Component: RegisterUsers }, - { path: "/deactivate-accounts", Component: DeactivatedAccounts }, + { path: "/manage-user/register-user", Component: RegisterUsers }, + { path: "/manage-user/deactivate-accounts", Component: DeactivatedAccounts }, { path: "/manage-post", Component: ManagePost }, { path: "/manage-sub-admin", Component: ManageSubAdmin }, { path: "/manage-jobs", Component: ManageJobs }, { path: "/manage-contact-us", Component: ManageContactUs }, - { path: "/faq", Component: FreqAskQuestion }, + { path: "/manage-cms/faq", Component: FreqAskQuestion }, - { path: "/about-us", Component: AboutUs }, + { path: "/manage-cms/about-us", Component: AboutUs }, - { path: "/privacy-policy", Component: PrivacyPolicy }, + { path: "/manage-cms/privacy-policy", Component: PrivacyPolicy }, - { path: "/terms-and-condition", Component: PrivacyPolicy }, + { path: "/manage-cms/terms-and-condition", Component: PrivacyPolicy }, diff --git a/src/components/DataTable.tsx b/src/components/DataTable.tsx new file mode 100644 index 0000000..cb5cbbe --- /dev/null +++ b/src/components/DataTable.tsx @@ -0,0 +1,35 @@ +import { Stack, Table } from "@chakra-ui/react" + + +interface TableProps { + tableHeadRow: string[]; + data: Record[]; +} + + + +const DataTable: React.FC = ({ tableHeadRow, data }) => { + return ( + + + + + {tableHeadRow.map((item, index)=>{item})} + + + + + {data.map((item:any, index) => ( + + {tableHeadRow.map((heading)=>{item[heading]} )} + + ))} + + + + + ) +} + +export default DataTable \ No newline at end of file diff --git a/src/index.css b/src/index.css index 1ac4b6c..7e69aee 100644 --- a/src/index.css +++ b/src/index.css @@ -1,4 +1,4 @@ -*{ +body{ margin: 0; padding: 0; box-sizing: border-box; @@ -21,7 +21,12 @@ /* background-color: #e2e8f01c !important; */ } - +.active>.css-1ic543h { + -webkit-transition: rotate 0.2s; + transition: rotate 0.2s; + transform-origin: center; + color: #fff; +} .linkChild:hover{ color: #02A0A0 !important; @@ -48,71 +53,3 @@ /* background-color: #e2e8f01c !important; */ } - -/* Sphere.css */ - -/* ✅ Red Spheres */ -.red-sphere-1, -.red-sphere-2, -.red-sphere-3{ - position: absolute; - border-radius: 50%; - background-color: #D90B2E46; - box-shadow: 0 4px 30px rgba(0, 0, 0, 0.1); - filter: blur(100px); -} - -/* ✅ Blue Spheres */ -.blue-sphere-1, -.blue-sphere-2, -.blue-sphere-3{ - position: absolute; - border-radius: 50%; - background-color: #009DAB46; - box-shadow: 0 4px 30px rgba(0, 0, 0, 0.1); - filter: blur(100px); -} - -/* 🔧 Positioning for Spheres */ -.red-sphere-1 { - width: 250px; - height: 250px; - top: 10%; - left: 5%; -} - -.blue-sphere-1 { - width: 320px; - height: 320px; - top: 30%; - right: 0%; -} - -.red-sphere-2 { - width: 180px; - height: 180px; - bottom: 15%; - left: 20%; -} - -.blue-sphere-2 { - width: 140px; - height: 140px; - bottom: 5%; - right: 25%; -} - -.red-sphere-3 { - width: 480px; - height: 480px; - bottom: 55%; - left: 40%; -} - -.blue-sphere-3{ - width: 300px; - height: 300px; - bottom: 10%; - right: 40%; -} - -- 2.34.1 From 50a56cfe6b238506b20b9cbdd87558df1f961ae0 Mon Sep 17 00:00:00 2001 From: "Pratham.Mandavkar" Date: Thu, 16 Jan 2025 16:29:15 +0530 Subject: [PATCH 07/13] OnBoarding forms --- dev-dist/sw.js | 2 +- src/App.tsx | 2 + src/Layouts/DefaultLayout.tsx | 218 +++++++-- src/Pages/Login.tsx | 135 ++++-- .../RegisterUsers/RegisterUsers.tsx | 447 +++++++++--------- src/Pages/OnBoarding/CreatePass.tsx | 149 ++++++ src/Pages/OnBoarding/LoginOtp.tsx | 12 +- src/components/MainFrame.tsx | 2 +- src/index.css | 24 + 9 files changed, 675 insertions(+), 316 deletions(-) create mode 100644 src/Pages/OnBoarding/CreatePass.tsx diff --git a/dev-dist/sw.js b/dev-dist/sw.js index c8fe26e..0ba50c7 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.7mpt2f2te58" + "revision": "0.46s6apu2028" }], {}); workbox.cleanupOutdatedCaches(); workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), { diff --git a/src/App.tsx b/src/App.tsx index 7b53971..0ba553c 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -5,6 +5,7 @@ import DefaultLayout from "./Layouts/DefaultLayout"; import Login from "./Pages/Login"; import { RouteLink } from "./Routes/Routes"; import LoginOtp from "./Pages/OnBoarding/LoginOtp"; +import CreatePass from "./Pages/OnBoarding/CreatePass"; function App() { const context = useContext(GlobalStateContext); @@ -17,6 +18,7 @@ function App() { } /> } /> + }/> = ({ children }) => { - const navigate = useNavigate() - const location = useLocation() - const headerTitle = getTitle(location?.pathname) + const navigate = useNavigate(); + const location = useLocation(); + const headerTitle = getTitle(location?.pathname); console.log(location); - - - - - - return ( - - - - + + + - - {nav?.map(({ title, path, Icon, type, children, initPath }, index) => type === 'single' ? - {title} : - - - navigate(path)} gap={0} style={{ cursor: 'pointer', borderRadius: '8px', padding: '5px', width: '100%', display: 'flex', alignItems: 'center', border: '1px solid #ffffff', backgroundColor:'#fff',color:'#000', fontSize: '14px', fontWeight:'normal' }}> {title} - {children?.map(({ title, path, Icon }, index) => navigate(path)} style={{ marginTop: 6, cursor: 'pointer', borderRadius: '8px', padding: '6px', width: '100%', display: 'flex', alignItems: 'center', gap: 6, border: '1px solid #ffffff', backgroundColor:'#fff',color:'#000' }} > {title})} - - )} + + {nav?.map(({ title, path, Icon, type, children, initPath }, index) => + type === "single" ? ( + + {" "} + + {title} + + + ) : ( + + + navigate(path)} + gap={0} + style={{ + cursor: "pointer", + borderRadius: "8px", + padding: "5px", + width: "100%", + display: "flex", + alignItems: "center", + border: "1px solid #ffffff", + backgroundColor: "#fff", + color: "#000", + fontSize: "14px", + fontWeight: "normal", + }} + > + {" "} + + + {title} + + + {children?.map(({ title, path, Icon }, index) => ( + navigate(path)} + style={{ + marginTop: 6, + cursor: "pointer", + borderRadius: "8px", + padding: "6px", + width: "100%", + display: "flex", + alignItems: "center", + gap: 6, + border: "1px solid #ffffff", + backgroundColor: "#fff", + color: "#000", + }} + > + {" "} + + {title} + + + ))} + + + ) + )} - - - {headerTitle} - - - navigate('/profile')} > - - - Ritesh Pandey - ritesh.pandey@wdimails.com - - + + + + {headerTitle} + + + + navigate("/profile")}> + + + + Ritesh Pandey + + ritesh.pandey@wdimails.com + + {children} diff --git a/src/Pages/Login.tsx b/src/Pages/Login.tsx index ea2c5dd..5c37c55 100644 --- a/src/Pages/Login.tsx +++ b/src/Pages/Login.tsx @@ -1,96 +1,127 @@ -import { Center, HStack, Image, Input, Text, VStack } from "@chakra-ui/react" -import { useContext, useState } from "react" -import { useForm } from "react-hook-form" -import GlobalStateContext from "../Contexts/GlobalStateContext" -import logo from '../assets/logo.svg' -import { Button } from "../components/ui/button" -import { Field } from "../components/ui/field" -import { Toaster, toaster } from "../components/ui/toaster" +import { Center, HStack, Image, Input, Text, VStack } from "@chakra-ui/react"; +import { useContext, useState } from "react"; +import { useForm } from "react-hook-form"; +import GlobalStateContext from "../Contexts/GlobalStateContext"; +import logo from "../assets/logo.svg"; +import { Button } from "../components/ui/button"; +import { Field } from "../components/ui/field"; +import { Toaster, toaster } from "../components/ui/toaster"; +import { LuUser } from "react-icons/lu"; interface FormValues { - mobileNumber: number + mobileNumber: number; } const Login = () => { - - const [isLoading, setIsLoading] = useState(false) + const [isLoading, setIsLoading] = useState(false); const context = useContext(GlobalStateContext); if (!context) { - throw new Error('App must be used within a GlobalStateProvider'); + throw new Error("App must be used within a GlobalStateProvider"); } const { setIsAuthenticate } = context; const { register, handleSubmit, formState: { errors }, - } = useForm() - + } = useForm(); const onSubmit = handleSubmit((data) => { - setIsLoading(true) + setIsLoading(true); if (data?.mobileNumber === 1234567890) { setTimeout(() => { setIsAuthenticate(true); - setIsLoading(false) + setIsLoading(false); }, 3000); // 3-second delay - } else { toaster.create({ title: `Invalid Credentials`, type: "error", - }) - setIsLoading(false) + }); + setIsLoading(false); } }); - return ( - - - - - - - + + + - - - - - - -
+ +
+
+ + + LOGIN + + + + + - - -
- - LOGIN - - - - - {/* Forget password */} + Forget password - + Forgot password - -
- ) -} + ); +}; -export default Login \ No newline at end of file +export default Login; diff --git a/src/Pages/ManageUser/RegisterUsers/RegisterUsers.tsx b/src/Pages/ManageUser/RegisterUsers/RegisterUsers.tsx index 312e8d9..4388fbe 100644 --- a/src/Pages/ManageUser/RegisterUsers/RegisterUsers.tsx +++ b/src/Pages/ManageUser/RegisterUsers/RegisterUsers.tsx @@ -1,236 +1,233 @@ -import { Box, HStack, Input, Stack, Table, Text } from '@chakra-ui/react' -import MainFrame from '../../../components/MainFrame' -import { InputGroup } from '../../../components/ui/input-group' -import { LuSearch } from 'react-icons/lu' -import DataTable from '../../../components/DataTable' +import { Box, HStack, Input, Stack, Table, Text } from "@chakra-ui/react"; +import MainFrame from "../../../components/MainFrame"; +import { InputGroup } from "../../../components/ui/input-group"; +import { LuSearch } from "react-icons/lu"; +import DataTable from "../../../components/DataTable"; +// Table setup +const tableHeadRow = [ + "Sr. No", + "First Name", + "Mobile number", + "Gender", + "DOB", + "Type of User", + "Language", + "Status", + "Action", +]; - - - // Table setup - const tableHeadRow = [ - "Sr. No", - "First Name", - "Mobile number", - "Gender", - "DOB", - "Type of User", - "Language", - "Status", - "Action", - ]; - - - - const usersData:any[] = [ - { - "Sr. No": 1, - "First Name": "Ritesh", - "Mobile number": "9876543210", - "Gender": "Male", - "DOB": "15-01-1990", - "Type of User": "Admin", - "Language": "English", - "Status": "Active", - "Action": "Edit/Delete", - }, - { - 'Sr. No': 2, - "First Name": "Anjali", - "Mobile number": "9123456789", - "Gender": "Female", - "DOB": "21-06-1995", - "Type of User": "Customer", - "Language": "Hindi", - "Status": "Inactive", - "Action": "Edit/Delete", - }, - { - 'Sr. No': 3, - "First Name": "Rajesh", - "Mobile number": "9871234560", - "Gender": "Male", - "DOB": "12-12-1985", - "Type of User": "Vendor", - "Language": "English", - "Status": "Active", - "Action": "Edit/Delete", - }, - { - 'Sr. No': 4, - "First Name": "Priya", - "Mobile number": "9988776655", - "Gender": "Female", - "DOB": "05-05-1998", - "Type of User": "Customer", - "Language": "Tamil", - "Status": "Active", - "Action": "Edit/Delete", - }, - { - 'Sr. No': 5, - "First Name": "Amit", - "Mobile number": "8899665544", - "Gender": "Male", - "DOB": "03-03-1992", - "Type of User": "Admin", - "Language": "Gujarati", - "Status": "Inactive", - "Action": "Edit/Delete", - }, - { - 'Sr. No': 6, - "First Name": "Amit", - "Mobile number": "8899665544", - "Gender": "Male", - "DOB": "03-03-1992", - "Type of User": "Admin", - "Language": "Gujarati", - "Status": "Inactive", - "Action": "Edit/Delete", - }, - { - 'Sr. No': 7, - "First Name": "Amit", - "Mobile number": "8899665544", - "Gender": "Male", - "DOB": "03-03-1992", - "Type of User": "Admin", - "Language": "Gujarati", - "Status": "Inactive", - "Action": "Edit/Delete", - }, - { - 'Sr. No': 5, - "First Name": "Amit", - "Mobile number": "8899665544", - "Gender": "Male", - "DOB": "03-03-1992", - "Type of User": "Admin", - "Language": "Gujarati", - "Status": "Inactive", - "Action": "Edit/Delete", - }, - { - 'Sr. No': 6, - "First Name": "Amit", - "Mobile number": "8899665544", - "Gender": "Male", - "DOB": "03-03-1992", - "Type of User": "Admin", - "Language": "Gujarati", - "Status": "Inactive", - "Action": "Edit/Delete", - }, - { - 'Sr. No': 7, - "First Name": "Amit", - "Mobile number": "8899665544", - "Gender": "Male", - "DOB": "03-03-1992", - "Type of User": "Admin", - "Language": "Gujarati", - "Status": "Inactive", - "Action": "Edit/Delete", - }, - { - 'Sr. No': 8, - "First Name": "Amit", - "Mobile number": "8899665544", - "Gender": "Male", - "DOB": "03-03-1992", - "Type of User": "Admin", - "Language": "Gujarati", - "Status": "Inactive", - "Action": "Edit/Delete", - }, - { - 'Sr. No': 9, - "First Name": "Amit", - "Mobile number": "8899665544", - "Gender": "Male", - "DOB": "03-03-1992", - "Type of User": "Admin", - "Language": "Gujarati", - "Status": "Inactive", - "Action": "Edit/Delete", - }, - { - 'Sr. No': 10, - "First Name": "Amit", - "Mobile number": "8899665544", - "Gender": "Male", - "DOB": "03-03-1992", - "Type of User": "Admin", - "Language": "Gujarati", - "Status": "Inactive", - "Action": "Edit/Delete", - }, - { - 'Sr. No': 11, - "First Name": "Amit", - "Mobile number": "8899665544", - "Gender": "Male", - "DOB": "03-03-1992", - "Type of User": "Admin", - "Language": "Gujarati", - "Status": "Inactive", - "Action": "Edit/Delete", - }, - { - 'Sr. No': 12, - "First Name": "Amit", - "Mobile number": "8899665544", - "Gender": "Male", - "DOB": "03-03-1992", - "Type of User": "Admin", - "Language": "Gujarati", - "Status": "Inactive", - "Action": "Edit/Delete", - }, - { - 'Sr. No': 13, - "First Name": "Amit", - "Mobile number": "8899665544", - "Gender": "Male", - "DOB": "03-03-1992", - "Type of User": "Admin", - "Language": "Gujarati", - "Status": "Inactive", - "Action": "Edit/Delete", - }, - ]; - +const usersData: any[] = [ + { + "Sr. No": 1, + "First Name": "Ritesh", + "Mobile number": "9876543210", + Gender: "Male", + DOB: "15-01-1990", + "Type of User": "Admin", + Language: "English", + Status: "Active", + Action: "Edit/Delete", + }, + { + "Sr. No": 2, + "First Name": "Anjali", + "Mobile number": "9123456789", + Gender: "Female", + DOB: "21-06-1995", + "Type of User": "Customer", + Language: "Hindi", + Status: "Inactive", + Action: "Edit/Delete", + }, + { + "Sr. No": 3, + "First Name": "Rajesh", + "Mobile number": "9871234560", + Gender: "Male", + DOB: "12-12-1985", + "Type of User": "Vendor", + Language: "English", + Status: "Active", + Action: "Edit/Delete", + }, + { + "Sr. No": 4, + "First Name": "Priya", + "Mobile number": "9988776655", + Gender: "Female", + DOB: "05-05-1998", + "Type of User": "Customer", + Language: "Tamil", + Status: "Active", + Action: "Edit/Delete", + }, + { + "Sr. No": 5, + "First Name": "Amit", + "Mobile number": "8899665544", + Gender: "Male", + DOB: "03-03-1992", + "Type of User": "Admin", + Language: "Gujarati", + Status: "Inactive", + Action: "Edit/Delete", + }, + { + "Sr. No": 6, + "First Name": "Amit", + "Mobile number": "8899665544", + Gender: "Male", + DOB: "03-03-1992", + "Type of User": "Admin", + Language: "Gujarati", + Status: "Inactive", + Action: "Edit/Delete", + }, + { + "Sr. No": 7, + "First Name": "Amit", + "Mobile number": "8899665544", + Gender: "Male", + DOB: "03-03-1992", + "Type of User": "Admin", + Language: "Gujarati", + Status: "Inactive", + Action: "Edit/Delete", + }, + { + "Sr. No": 5, + "First Name": "Amit", + "Mobile number": "8899665544", + Gender: "Male", + DOB: "03-03-1992", + "Type of User": "Admin", + Language: "Gujarati", + Status: "Inactive", + Action: "Edit/Delete", + }, + { + "Sr. No": 6, + "First Name": "Amit", + "Mobile number": "8899665544", + Gender: "Male", + DOB: "03-03-1992", + "Type of User": "Admin", + Language: "Gujarati", + Status: "Inactive", + Action: "Edit/Delete", + }, + { + "Sr. No": 7, + "First Name": "Amit", + "Mobile number": "8899665544", + Gender: "Male", + DOB: "03-03-1992", + "Type of User": "Admin", + Language: "Gujarati", + Status: "Inactive", + Action: "Edit/Delete", + }, + { + "Sr. No": 8, + "First Name": "Amit", + "Mobile number": "8899665544", + Gender: "Male", + DOB: "03-03-1992", + "Type of User": "Admin", + Language: "Gujarati", + Status: "Inactive", + Action: "Edit/Delete", + }, + { + "Sr. No": 9, + "First Name": "Amit", + "Mobile number": "8899665544", + Gender: "Male", + DOB: "03-03-1992", + "Type of User": "Admin", + Language: "Gujarati", + Status: "Inactive", + Action: "Edit/Delete", + }, + { + "Sr. No": 10, + "First Name": "Amit", + "Mobile number": "8899665544", + Gender: "Male", + DOB: "03-03-1992", + "Type of User": "Admin", + Language: "Gujarati", + Status: "Inactive", + Action: "Edit/Delete", + }, + { + "Sr. No": 11, + "First Name": "Amit", + "Mobile number": "8899665544", + Gender: "Male", + DOB: "03-03-1992", + "Type of User": "Admin", + Language: "Gujarati", + Status: "Inactive", + Action: "Edit/Delete", + }, + { + "Sr. No": 12, + "First Name": "Amit", + "Mobile number": "8899665544", + Gender: "Male", + DOB: "03-03-1992", + "Type of User": "Admin", + Language: "Gujarati", + Status: "Inactive", + Action: "Edit/Delete", + }, + { + "Sr. No": 13, + "First Name": "Amit", + "Mobile number": "8899665544", + Gender: "Male", + DOB: "03-03-1992", + "Type of User": "Admin", + Language: "Gujarati", + Status: "Inactive", + Action: "Edit/Delete", + }, +]; const RegisterUsers = () => { - return ( - - Register User + + + Register User + - - + } - w={'100%'} - color={'#000'} - > - - - - + bgSize={"xs"} + flex="1" + startElement={} + w={"100%"} + color={"#000"} + > + + + + - - - - - - + - ) -} + ); +}; -export default RegisterUsers \ No newline at end of file +export default RegisterUsers; diff --git a/src/Pages/OnBoarding/CreatePass.tsx b/src/Pages/OnBoarding/CreatePass.tsx new file mode 100644 index 0000000..0fd60ac --- /dev/null +++ b/src/Pages/OnBoarding/CreatePass.tsx @@ -0,0 +1,149 @@ +import { Center, HStack, Image, Input, Text, VStack } from "@chakra-ui/react"; +import { useContext, useState } from "react"; +import { useForm } from "react-hook-form"; +import GlobalStateContext from "../../Contexts/GlobalStateContext"; +import logo from "../../assets/logo.svg"; +import { Button } from "../../components/ui/button"; +import { Field } from "../../components/ui/field"; +import { Toaster, toaster } from "../../components/ui/toaster"; + +interface FormValues { + password: string; + confirmPassword: string; +} + +const CreatePass = () => { + const [isLoading, setIsLoading] = useState(false); + const context = useContext(GlobalStateContext); + if (!context) { + throw new Error("App must be used within a GlobalStateProvider"); + } + const { setIsAuthenticate } = context; + const { + register, + handleSubmit, + formState: { errors }, + } = useForm(); + + const onSubmit = handleSubmit((data) => { + setIsLoading(true); + if (data?.password === "password123") { + setTimeout(() => { + setIsAuthenticate(true); + setIsLoading(false); + }, 3000); + } else { + toaster.create({ + title: `Invalid Credentials`, + type: "error", + }); + setIsLoading(false); + } + }); + + return ( + + + + + + +
+ +
+ +
+ + + create a password + + + + + + + + + value === getValues("password") || "Passwords do not match", + })} + placeholder="Confirm your password" + /> + + + + Forgot password + + +
+ + + + ); +}; + +export default CreatePass; diff --git a/src/Pages/OnBoarding/LoginOtp.tsx b/src/Pages/OnBoarding/LoginOtp.tsx index 3fa635a..b5c9b7e 100644 --- a/src/Pages/OnBoarding/LoginOtp.tsx +++ b/src/Pages/OnBoarding/LoginOtp.tsx @@ -1,4 +1,4 @@ -import { Center, HStack, Image, Input, Text, VStack } from "@chakra-ui/react"; +import { Center, HStack, Image, Input, Text, VStack } from "@chakra-ui/react"; import { useContext, useState } from "react"; import { useForm } from "react-hook-form"; import GlobalStateContext from "../../Contexts/GlobalStateContext"; @@ -106,6 +106,16 @@ const LoginOtp = () => { + + Resend OTP + - Forgot password + + Forgot password? +
diff --git a/src/Pages/ManageUser/RegisterUsers/RegisterUsers.tsx b/src/Pages/ManageUser/RegisterUsers/RegisterUsers.tsx index 4388fbe..704abef 100644 --- a/src/Pages/ManageUser/RegisterUsers/RegisterUsers.tsx +++ b/src/Pages/ManageUser/RegisterUsers/RegisterUsers.tsx @@ -1,8 +1,27 @@ -import { Box, HStack, Input, Stack, Table, Text } from "@chakra-ui/react"; +import { + Box, + HStack, + Input, + Stack, + Table, + Text, + VStack, +} from "@chakra-ui/react"; import MainFrame from "../../../components/MainFrame"; import { InputGroup } from "../../../components/ui/input-group"; import { LuSearch } from "react-icons/lu"; import DataTable from "../../../components/DataTable"; +import { Switch } from "../../../components/ui/switch"; +import { Button } from "../../../components/ui/button"; +import { FaRegEye } from "react-icons/fa"; +import { CiEdit } from "react-icons/ci"; +import { RiDeleteBin5Line } from "react-icons/ri"; +import { + PaginationItems, + PaginationNextTrigger, + PaginationPrevTrigger, + PaginationRoot, +} from "../../../components/ui/pagination"; // Table setup const tableHeadRow = [ @@ -13,7 +32,7 @@ const tableHeadRow = [ "DOB", "Type of User", "Language", - "Status", + "Activate/Deactivate", "Action", ]; @@ -26,180 +45,119 @@ const usersData: any[] = [ DOB: "15-01-1990", "Type of User": "Admin", Language: "English", - Status: "Active", - Action: "Edit/Delete", + "Activate/Deactivate": ( + + Yes + + No + + ), + Action: ( + + + + + + ), }, { "Sr. No": 2, - "First Name": "Anjali", - "Mobile number": "9123456789", - Gender: "Female", - DOB: "21-06-1995", - "Type of User": "Customer", - Language: "Hindi", - Status: "Inactive", - Action: "Edit/Delete", + "First Name": "Ritesh", + "Mobile number": "9876543210", + Gender: "Male", + DOB: "15-01-1990", + "Type of User": "Admin", + Language: "English", + "Activate/Deactivate": ( + + Yes + + No + + ), + Action: ( + + + + + + ), }, { "Sr. No": 3, - "First Name": "Rajesh", - "Mobile number": "9871234560", + "First Name": "Ritesh", + "Mobile number": "9876543210", Gender: "Male", - DOB: "12-12-1985", - "Type of User": "Vendor", + DOB: "15-01-1990", + "Type of User": "Admin", Language: "English", - Status: "Active", - Action: "Edit/Delete", + "Activate/Deactivate": ( + + Yes + + No + + ), + Action: ( + + + + + + ), }, { "Sr. No": 4, - "First Name": "Priya", - "Mobile number": "9988776655", - Gender: "Female", - DOB: "05-05-1998", - "Type of User": "Customer", - Language: "Tamil", - Status: "Active", - Action: "Edit/Delete", + "First Name": "Ritesh", + "Mobile number": "9876543210", + Gender: "Male", + DOB: "15-01-1990", + "Type of User": "Admin", + Language: "English", + "Activate/Deactivate": ( + + Yes + + No + + ), + Action: ( + + + + + + ), }, { "Sr. No": 5, - "First Name": "Amit", - "Mobile number": "8899665544", + "First Name": "Ritesh", + "Mobile number": "9876543210", Gender: "Male", - DOB: "03-03-1992", + DOB: "15-01-1990", "Type of User": "Admin", - Language: "Gujarati", - Status: "Inactive", - Action: "Edit/Delete", - }, - { - "Sr. No": 6, - "First Name": "Amit", - "Mobile number": "8899665544", - Gender: "Male", - DOB: "03-03-1992", - "Type of User": "Admin", - Language: "Gujarati", - Status: "Inactive", - Action: "Edit/Delete", - }, - { - "Sr. No": 7, - "First Name": "Amit", - "Mobile number": "8899665544", - Gender: "Male", - DOB: "03-03-1992", - "Type of User": "Admin", - Language: "Gujarati", - Status: "Inactive", - Action: "Edit/Delete", - }, - { - "Sr. No": 5, - "First Name": "Amit", - "Mobile number": "8899665544", - Gender: "Male", - DOB: "03-03-1992", - "Type of User": "Admin", - Language: "Gujarati", - Status: "Inactive", - Action: "Edit/Delete", - }, - { - "Sr. No": 6, - "First Name": "Amit", - "Mobile number": "8899665544", - Gender: "Male", - DOB: "03-03-1992", - "Type of User": "Admin", - Language: "Gujarati", - Status: "Inactive", - Action: "Edit/Delete", - }, - { - "Sr. No": 7, - "First Name": "Amit", - "Mobile number": "8899665544", - Gender: "Male", - DOB: "03-03-1992", - "Type of User": "Admin", - Language: "Gujarati", - Status: "Inactive", - Action: "Edit/Delete", - }, - { - "Sr. No": 8, - "First Name": "Amit", - "Mobile number": "8899665544", - Gender: "Male", - DOB: "03-03-1992", - "Type of User": "Admin", - Language: "Gujarati", - Status: "Inactive", - Action: "Edit/Delete", - }, - { - "Sr. No": 9, - "First Name": "Amit", - "Mobile number": "8899665544", - Gender: "Male", - DOB: "03-03-1992", - "Type of User": "Admin", - Language: "Gujarati", - Status: "Inactive", - Action: "Edit/Delete", - }, - { - "Sr. No": 10, - "First Name": "Amit", - "Mobile number": "8899665544", - Gender: "Male", - DOB: "03-03-1992", - "Type of User": "Admin", - Language: "Gujarati", - Status: "Inactive", - Action: "Edit/Delete", - }, - { - "Sr. No": 11, - "First Name": "Amit", - "Mobile number": "8899665544", - Gender: "Male", - DOB: "03-03-1992", - "Type of User": "Admin", - Language: "Gujarati", - Status: "Inactive", - Action: "Edit/Delete", - }, - { - "Sr. No": 12, - "First Name": "Amit", - "Mobile number": "8899665544", - Gender: "Male", - DOB: "03-03-1992", - "Type of User": "Admin", - Language: "Gujarati", - Status: "Inactive", - Action: "Edit/Delete", - }, - { - "Sr. No": 13, - "First Name": "Amit", - "Mobile number": "8899665544", - Gender: "Male", - DOB: "03-03-1992", - "Type of User": "Admin", - Language: "Gujarati", - Status: "Inactive", - Action: "Edit/Delete", + Language: "English", + "Activate/Deactivate": ( + + Yes + + No + + ), + Action: ( + + + + + + ), }, ]; const RegisterUsers = () => { return ( - + Register User @@ -226,6 +184,20 @@ const RegisterUsers = () => { + + + + {/* */} + + + + ); }; diff --git a/src/Pages/OnBoarding/LoginOtp.tsx b/src/Pages/OnBoarding/LoginOtp.tsx index b5c9b7e..9ddf6ce 100644 --- a/src/Pages/OnBoarding/LoginOtp.tsx +++ b/src/Pages/OnBoarding/LoginOtp.tsx @@ -8,6 +8,7 @@ import { Button } from "../../components/ui/button"; import { Field } from "../../components/ui/field"; import { Toaster, toaster } from "../../components/ui/toaster"; import { PinInput } from "../../components/ui/pin-input"; +import { useNavigate } from "react-router-dom"; interface FormValues { mobileNumber: number; @@ -16,6 +17,7 @@ interface FormValues { const LoginOtp = () => { const [isLoading, setIsLoading] = useState(false); const context = useContext(GlobalStateContext); + const navigate = useNavigate(); if (!context) { throw new Error("App must be used within a GlobalStateProvider"); } @@ -117,7 +119,7 @@ const LoginOtp = () => { Resend OTP diff --git a/src/Pages/OnBoarding/LoginWithPass.tsx b/src/Pages/OnBoarding/LoginWithPass.tsx new file mode 100644 index 0000000..96a8c3b --- /dev/null +++ b/src/Pages/OnBoarding/LoginWithPass.tsx @@ -0,0 +1,170 @@ +import { Center, HStack, Image, Input, Text, VStack } from "@chakra-ui/react"; +import { useContext, useState } from "react"; +import GlobalStateContext from "../../Contexts/GlobalStateContext"; +import logo from "../../assets/logo.svg"; +import { Button } from "../../components/ui/button"; +import { Toaster, toaster } from "../../components/ui/toaster"; +import { NavLink, useNavigate } from "react-router-dom"; +import { Field } from "../../components/ui/field"; + +const LoginWithPass = () => { + const [isLoading, setIsLoading] = useState(false); + const [mobileNumber, setMobileNumber] = useState(""); + const [password, setPassword] = useState(""); + const context = useContext(GlobalStateContext); + const navigate = useNavigate(); + + if (!context) { + throw new Error("App must be used within a GlobalStateProvider"); + } + + const { setIsAuthenticate } = context; + + // Validation functions + const validateMobileNumber = (mobile: string) => { + if (!mobile) { + return "Mobile Number is required"; + } + if (mobile.length !== 10) { + return "Mobile Number must be 10 digits long"; + } + return ""; + }; + + const validatePassword = (password: string) => { + if (!password) { + return "Password is required"; + } + if (password.length < 6) { + return "Password must be at least 6 characters long"; + } + return ""; + }; + + const onHandleSubmit = () => { + const mobileError = validateMobileNumber(mobileNumber); + const passwordError = validatePassword(password); + + if (mobileError || passwordError) { + toaster.create({ + title: mobileError || passwordError, + type: "error", + }); + return; + } + + setIsLoading(true); + if (mobileNumber === "1231239870" && password === " ") { + navigate("/"); + } else { + setIsLoading(false); + toaster.create({ + title: "Invalid Credentials", + type: "error", + }); + } + }; + + return ( + + + + + + +
+ +
+ +
{ + e.preventDefault(); + onHandleSubmit(); + }} + > + + + LogIn + + + + + setMobileNumber(e.target.value)} + placeholder="Enter your mobile number" + /> + + + + setPassword(e.target.value)} + placeholder="Enter your password" + /> + + + Forget password + + + + + + + Forgot password + + +
+ + + + ); +}; + +export default LoginWithPass; diff --git a/src/components/DataTable.tsx b/src/components/DataTable.tsx index cb5cbbe..e569383 100644 --- a/src/components/DataTable.tsx +++ b/src/components/DataTable.tsx @@ -14,7 +14,7 @@ const DataTable: React.FC = ({ tableHeadRow, data }) => { - {tableHeadRow.map((item, index)=>{item})} + {tableHeadRow.map((item, index)=>{item})} diff --git a/src/components/ui/link-button.tsx b/src/components/ui/link-button.tsx new file mode 100644 index 0000000..defa1c3 --- /dev/null +++ b/src/components/ui/link-button.tsx @@ -0,0 +1,12 @@ +"use client" + +import type { HTMLChakraProps, RecipeProps } from "@chakra-ui/react" +import { createRecipeContext } from "@chakra-ui/react" + +export interface LinkButtonProps + extends HTMLChakraProps<"a", RecipeProps<"button">> {} + +const { withContext } = createRecipeContext({ key: "button" }) + +// Replace "a" with your framework's link component +export const LinkButton = withContext("a") diff --git a/src/components/ui/pagination.tsx b/src/components/ui/pagination.tsx new file mode 100644 index 0000000..fc21919 --- /dev/null +++ b/src/components/ui/pagination.tsx @@ -0,0 +1,215 @@ +"use client"; + +import type { ButtonProps, TextProps } from "@chakra-ui/react"; +import { + Button, + Pagination as ChakraPagination, + IconButton, + Text, + createContext, + usePaginationContext, +} from "@chakra-ui/react"; +import * as React from "react"; +import { + HiChevronLeft, + HiChevronRight, + HiMiniEllipsisHorizontal, +} from "react-icons/hi2"; +import { LinkButton } from "./link-button"; + +interface ButtonVariantMap { + current: ButtonProps["variant"]; + default: ButtonProps["variant"]; + ellipsis: ButtonProps["variant"]; +} + +type PaginationVariant = "outline" | "solid" | "subtle"; + +interface ButtonVariantContext { + size: ButtonProps["size"]; + variantMap: ButtonVariantMap; + getHref?: (page: number) => string; +} + +const [RootPropsProvider, useRootProps] = createContext({ + name: "RootPropsProvider", +}); + +export interface PaginationRootProps + extends Omit { + size?: ButtonProps["size"]; + variant?: PaginationVariant; + getHref?: (page: number) => string; +} + +const variantMap: Record = { + outline: { default: "ghost", ellipsis: "plain", current: "outline" }, + solid: { default: "outline", ellipsis: "outline", current: "solid" }, + subtle: { default: "ghost", ellipsis: "plain", current: "subtle" }, +}; + +export const PaginationRoot = React.forwardRef< + HTMLDivElement, + PaginationRootProps +>(function PaginationRoot(props, ref) { + const { size = "sm", variant = "outline", getHref, ...rest } = props; + return ( + + + + ); +}); + +export const PaginationEllipsis = React.forwardRef< + HTMLDivElement, + ChakraPagination.EllipsisProps +>(function PaginationEllipsis(props, ref) { + const { size, variantMap } = useRootProps(); + return ( + + + + ); +}); + +export const PaginationItem = React.forwardRef< + HTMLButtonElement, + ChakraPagination.ItemProps +>(function PaginationItem(props, ref) { + const { page } = usePaginationContext(); + const { size, variantMap, getHref } = useRootProps(); + + const current = page === props.value; + const variant = current ? variantMap.current : variantMap.default; + + if (getHref) { + return ( + + {props.value} + + ); + } + + return ( + + + + ); +}); + +export const PaginationPrevTrigger = React.forwardRef< + HTMLButtonElement, + ChakraPagination.PrevTriggerProps +>(function PaginationPrevTrigger(props, ref) { + const { size, variantMap, getHref } = useRootProps(); + const { previousPage } = usePaginationContext(); + + if (getHref) { + return ( + + + + ); + } + + return ( + + + + + + ); +}); + +export const PaginationNextTrigger = React.forwardRef< + HTMLButtonElement, + ChakraPagination.NextTriggerProps +>(function PaginationNextTrigger(props, ref) { + const { size, variantMap, getHref } = useRootProps(); + const { nextPage } = usePaginationContext(); + + if (getHref) { + return ( + + + + ); + } + + return ( + + + + ); +}); + +export const PaginationItems = (props: React.HTMLAttributes) => { + return ( + + {({ pages }) => + pages.map((page, index) => { + return page.type === "ellipsis" ? ( + + ) : ( + + ); + }) + } + + ); +}; + +interface PageTextProps extends TextProps { + format?: "short" | "compact" | "long"; +} + +export const PaginationPageText = React.forwardRef< + HTMLParagraphElement, + PageTextProps +>(function PaginationPageText(props, ref) { + const { format = "compact", ...rest } = props; + const { page, totalPages, pageRange, count } = usePaginationContext(); + const content = React.useMemo(() => { + if (format === "short") return `${page} / ${totalPages}`; + if (format === "compact") return `${page} of ${totalPages}`; + return `${pageRange.start + 1} - ${Math.min(pageRange.end, count)} of ${count}`; + }, [format, page, totalPages, pageRange, count]); + + return ( + + {content} + + ); +}); diff --git a/src/components/ui/switch.tsx b/src/components/ui/switch.tsx new file mode 100644 index 0000000..a677ca2 --- /dev/null +++ b/src/components/ui/switch.tsx @@ -0,0 +1,39 @@ +import { Switch as ChakraSwitch } from "@chakra-ui/react" +import * as React from "react" + +export interface SwitchProps extends ChakraSwitch.RootProps { + inputProps?: React.InputHTMLAttributes + rootRef?: React.Ref + trackLabel?: { on: React.ReactNode; off: React.ReactNode } + thumbLabel?: { on: React.ReactNode; off: React.ReactNode } +} + +export const Switch = React.forwardRef( + function Switch(props, ref) { + const { inputProps, children, rootRef, trackLabel, thumbLabel, ...rest } = + props + + return ( + + + + + {thumbLabel && ( + + {thumbLabel?.on} + + )} + + {trackLabel && ( + + {trackLabel.on} + + )} + + {children != null && ( + {children} + )} + + ) + }, +) -- 2.34.1 From cc33540e4fc64424d3a285f6e14d0b70c1393bd9 Mon Sep 17 00:00:00 2001 From: "Pratham.Mandavkar" Date: Fri, 17 Jan 2025 17:38:05 +0530 Subject: [PATCH 09/13] MyProfile and minor changes --- dev-dist/sw.js | 2 +- src/Layouts/DefaultLayout.tsx | 4 +- .../RegisterUsers/RegisterUsers.tsx | 167 ++++++++++++- src/Pages/Profile/Profile.tsx | 59 ++++- src/Routes/Nav.ts | 221 ++++++++++-------- src/Routes/Routes.ts | 52 ++--- src/assets/profile-Avtars/mypfp.png | Bin 0 -> 31476 bytes src/components/MainFrame.tsx | 2 +- src/components/ui/pagination.tsx | 29 +-- 9 files changed, 382 insertions(+), 154 deletions(-) create mode 100644 src/assets/profile-Avtars/mypfp.png diff --git a/dev-dist/sw.js b/dev-dist/sw.js index 92d566b..21173fd 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.o063ar5rjc" + "revision": "0.g1faafl9ja8" }], {}); workbox.cleanupOutdatedCaches(); workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), { diff --git a/src/Layouts/DefaultLayout.tsx b/src/Layouts/DefaultLayout.tsx index face04c..dc62e93 100644 --- a/src/Layouts/DefaultLayout.tsx +++ b/src/Layouts/DefaultLayout.tsx @@ -31,11 +31,11 @@ const DefaultLayout: FC<{ children: React.ReactNode }> = ({ children }) => { w="100%" h="100vh" > - + - + {nav?.map(({ title, path, Icon, type, children, initPath }, index) => type === "single" ? ( ), }, + { + "Sr. No": 6, + "First Name": "Ritesh", + "Mobile number": "9876543210", + Gender: "Male", + DOB: "15-01-1990", + "Type of User": "Admin", + Language: "English", + "Activate/Deactivate": ( + + Yes + + No + + ), + Action: ( + + + + + + ), + }, + { + "Sr. No": 6, + "First Name": "Ritesh", + "Mobile number": "9876543210", + Gender: "Male", + DOB: "15-01-1990", + "Type of User": "Admin", + Language: "English", + "Activate/Deactivate": ( + + Yes + + No + + ), + Action: ( + + + + + + ), + }, + { + "Sr. No": 7, + "First Name": "Ritesh", + "Mobile number": "9876543210", + Gender: "Male", + DOB: "15-01-1990", + "Type of User": "Admin", + Language: "English", + "Activate/Deactivate": ( + + Yes + + No + + ), + Action: ( + + + + + + ), + }, + { + "Sr. No": 7, + "First Name": "Ritesh", + "Mobile number": "9876543210", + Gender: "Male", + DOB: "15-01-1990", + "Type of User": "Admin", + Language: "English", + "Activate/Deactivate": ( + + Yes + + No + + ), + Action: ( + + + + + + ), + }, + { + "Sr. No": 8, + "First Name": "Ritesh", + "Mobile number": "9876543210", + Gender: "Male", + DOB: "15-01-1990", + "Type of User": "Admin", + Language: "English", + "Activate/Deactivate": ( + + Yes + + No + + ), + Action: ( + + + + + + ), + }, + { + "Sr. No": 9, + "First Name": "Ritesh", + "Mobile number": "9876543210", + Gender: "Male", + DOB: "15-01-1990", + "Type of User": "Admin", + Language: "English", + "Activate/Deactivate": ( + + Yes + + No + + ), + Action: ( + + + + + + ), + }, + { + "Sr. No": 10, + "First Name": "Ritesh", + "Mobile number": "9876543210", + Gender: "Male", + DOB: "15-01-1990", + "Type of User": "Admin", + Language: "English", + "Activate/Deactivate": ( + + Yes + + No + + ), + Action: ( + + + + + + ), + }, ]; const RegisterUsers = () => { @@ -184,20 +345,20 @@ const RegisterUsers = () => { - - + {/* */} + ); }; diff --git a/src/Pages/Profile/Profile.tsx b/src/Pages/Profile/Profile.tsx index ff8f49e..3298d63 100644 --- a/src/Pages/Profile/Profile.tsx +++ b/src/Pages/Profile/Profile.tsx @@ -1,11 +1,60 @@ -import MainFrame from "../../components/MainFrame" +import { Circle, HStack, Image, Input, Text, VStack } from "@chakra-ui/react"; +import MainFrame from "../../components/MainFrame"; +import mypfp from "../../assets/profile-Avtars/mypfp.png"; +import { FaCamera } from "react-icons/fa"; +import { Field } from "../../components/ui/field"; +import { Button } from "../../components/ui/button"; const Profile = () => { return ( - + + + + + + + + + + + Jackson David + + + Employee ID: #1245679 + + + + + + + + + + + + + + + + + + + Update Password + + + + - ) -} + ); +}; -export default Profile \ No newline at end of file +export default Profile; diff --git a/src/Routes/Nav.ts b/src/Routes/Nav.ts index 5c3852d..1e4c231 100644 --- a/src/Routes/Nav.ts +++ b/src/Routes/Nav.ts @@ -3,96 +3,135 @@ import { GoDotFill } from "react-icons/go"; import { PiHeadphonesBold } from "react-icons/pi"; import { RiUserSettingsLine } from "react-icons/ri"; import { TbEdit, TbLayoutDashboard } from "react-icons/tb"; -import { TiDocumentText, TiUserAddOutline, TiUserOutline } from "react-icons/ti"; - - +import { + TiDocumentText, + TiUserAddOutline, + TiUserOutline, +} from "react-icons/ti"; export const nav = [ - - { - title: "Dashboard", - path: "/", - Icon: TbLayoutDashboard, - type:'single' - }, - { - title: "Manage Users", - path: "/manage-user/register-user", - initPath:'/manage-user', - Icon: TiUserOutline, - type:'multiple', - children: [ - { - title: "Register Users", - path: "/manage-user/register-user", - Icon: GoDotFill, - }, - { - title: "Deactivated Accounts", - path: "/manage-user/deactivate-accounts", - Icon: GoDotFill, - }, - ], - }, - { - title: "Manage Post", - path: "/manage-post", - Icon: TbEdit, - type:'single' - }, - { - title: "Manage Sub-Admin", - path: "/manage-sub-admin", - Icon: TiUserAddOutline, - type:'single' - }, - { - title: "Manage Jobs", - path: "/manage-jobs", - Icon: CgWorkAlt, - type:'single' - }, - { - title: "Manage Contact Us", - path: "/manage-contact-us", - Icon: PiHeadphonesBold, - type:'single' - }, - - { - title: "Manage CMS", - initPath:'/manage-cms', - path: "/manage-cms/faq", - Icon: TiDocumentText, - type:'multiple', - children: [ - { - title: "FAQ", - path: "/manage-cms/faq", - Icon: GoDotFill, - }, - { - title: "About Us", - path: "/manage-cms/about-us", - Icon: GoDotFill, - }, - { - title: "Privacy Policy", - path: "/manage-cms/privacy-policy", - Icon: GoDotFill, - }, - { - title: "Terms And Conditions", - path: "/manage-cms/terms-and-condition", - Icon: GoDotFill, - }, - ], - }, - { - title: "My Profile", - path: "/profile", - Icon: RiUserSettingsLine, - type:'single' - }, - - ]; \ No newline at end of file + { + title: "Dashboard", + path: "/", + Icon: TbLayoutDashboard, + type: "single", + }, + { + title: "Manage Users", + path: "/manage-user/register-user", + initPath: "/manage-user", + Icon: TiUserOutline, + type: "multiple", + children: [ + { + title: "Register Users", + path: "/manage-user/register-user", + Icon: GoDotFill, + }, + { + title: "Deactivated Accounts", + path: "/manage-user/deactivate-accounts", + Icon: GoDotFill, + }, + ], + }, + { + title: "Manage Post", + path: "/manage-post", + Icon: TbEdit, + type: "single", + }, + { + title: "Manage Sub-Admin", + path: "/manage-sub-admin", + Icon: TiUserAddOutline, + type: "single", + }, + { + title: "Manage Jobs", + path: "/manage-jobs", + Icon: CgWorkAlt, + type: "single", + }, + { + title: "Manage Contact Us", + path: "/manage-contact-us", + Icon: PiHeadphonesBold, + type: "single", + }, + + { + title: "Manage CMS", + initPath: "/manage-cms", + path: "/manage-cms/faq", + Icon: TiDocumentText, + type: "multiple", + children: [ + { + title: "FAQ", + path: "/manage-cms/faq", + Icon: GoDotFill, + }, + { + title: "About Us", + path: "/manage-cms/about-us", + Icon: GoDotFill, + }, + { + title: "Privacy Policy", + path: "/manage-cms/privacy-policy", + Icon: GoDotFill, + }, + { + title: "Terms And Conditions", + path: "/manage-cms/terms-and-condition", + Icon: GoDotFill, + }, + ], + }, + { + title: "My Profile", + path: "/profile", + Icon: RiUserSettingsLine, + type: "single", + }, + { + title: "Master Module", + initPath: "/master-module", + path: "/master-module/agency-master", + Icon: TiDocumentText, + type: "multiple", + children: [ + { + title: "Agency Master", + path: "/master-module/agency-master", + Icon: GoDotFill, + }, + { + title: "Template Master", + path: "/master-module/template-master", + Icon: GoDotFill, + }, + { + title: "Job Type", + path: "/master-module/job-type", + Icon: GoDotFill, + }, + { + title: "Workspace model", + path: "/master-module/workspace-model", + Icon: GoDotFill, + }, + { + title: "Country", + path: "/master-module/country", + Icon: GoDotFill, + }, + { + title: "Job Status", + path: "/master-module/job-status", + Icon: GoDotFill, + }, + ], + }, +]; diff --git a/src/Routes/Routes.ts b/src/Routes/Routes.ts index 6157151..df63538 100644 --- a/src/Routes/Routes.ts +++ b/src/Routes/Routes.ts @@ -1,4 +1,3 @@ - import Dashboard from "../Pages/Dashboard/Dashboard"; import AboutUs from "../Pages/ManageCMS/AboutUs/AboutUs"; import FreqAskQuestion from "../Pages/ManageCMS/FAQ/FreqAskQuestion"; @@ -11,45 +10,22 @@ import DeactivatedAccounts from "../Pages/ManageUser/DeactivatedAccounts/Deactiv import RegisterUsers from "../Pages/ManageUser/RegisterUsers/RegisterUsers"; import Profile from "../Pages/Profile/Profile"; export const RouteLink = [ - { path: "/", Component: Dashboard }, - { path: "/manage-user/register-user", Component: RegisterUsers }, - { path: "/manage-user/deactivate-accounts", Component: DeactivatedAccounts }, - { path: "/manage-post", Component: ManagePost }, - { path: "/manage-sub-admin", Component: ManageSubAdmin }, - { path: "/manage-jobs", Component: ManageJobs }, - { path: "/manage-contact-us", Component: ManageContactUs }, - { path: "/manage-cms/faq", Component: FreqAskQuestion }, + { path: "/", Component: Dashboard }, + { path: "/manage-user/register-user", Component: RegisterUsers }, + { path: "/manage-user/deactivate-accounts", Component: DeactivatedAccounts }, + { path: "/manage-post", Component: ManagePost }, + { path: "/manage-sub-admin", Component: ManageSubAdmin }, + { path: "/manage-jobs", Component: ManageJobs }, + { path: "/manage-contact-us", Component: ManageContactUs }, + { path: "/manage-cms/faq", Component: FreqAskQuestion }, + { path: "/manage-cms/about-us", Component: AboutUs }, + { path: "/manage-cms/privacy-policy", Component: PrivacyPolicy }, - { path: "/manage-cms/about-us", Component: AboutUs }, + { path: "/manage-cms/terms-and-condition", Component: PrivacyPolicy }, + { path: "/profile", Component: Profile }, - - { path: "/manage-cms/privacy-policy", Component: PrivacyPolicy }, - - - { path: "/manage-cms/terms-and-condition", Component: PrivacyPolicy }, - - - - - - - - - - - - - - - - - - - - - - { path: "/profile", Component: Profile}, -] \ No newline at end of file + { path: "/my-profile", Component: Profile }, +]; diff --git a/src/assets/profile-Avtars/mypfp.png b/src/assets/profile-Avtars/mypfp.png new file mode 100644 index 0000000000000000000000000000000000000000..8b8ba467d1b8dcbb7267053fb958d4f4e84d0c0e GIT binary patch literal 31476 zcmV*TKwQ6xP)PyA07*naRCodGy#;txSKjs=TIwyutx#xjO9I3_Awmoygt%eB-3jg*ED+o+5L|); zPY4#Y#i7&Aw9}ENBkw!&Jm34h*ZqC>f1h>Ej?s3e?UZv)u4`TU=stVztlzr-w$`?> zvHtxkt^jV`s*cYd+vCyG2t0W<9FLw&!_ya=@Z{M6Jb8W&kDtFVwkOZO!;|Nzw3$A8 zOTNo}a9`Y~?E7g19z5~kZ~iJy-g*$$EAUHS0X%ro6c3)J89{seoUptctd~Le@4xpQ zOJw%0x7SQsrhp&>vwqkY!l7cA9FpepS50r zA9V#p`6P;Ih3^NL+!~ZtrTkHS%=+Onm3GA6ZBUO zU|BG&K$;hjRsdfy0QEpJsPpjIaP#Vs7I-$2hOoraGks?^hsTB}s|9x9SNoL3547e1 zO@R<|fRX25HCJC9FlFNFe|CPK`2q0j0{J^Uc{cUc>5&$8qionlD8^>^&0#OeZU%3{kL%xe~{G_)(-eDbU^FCW$ZUk zpKY@GjsGH!27i#NU|Tz(^&0&9eZcBB{&*6tK^g1d^Ro=VRv3Rcj8dv*jg0>L3Sd>y zimxI2)?@3vJzh$rpnA<;)QkN+i*{$6q$D~BXtc-OZ7()WLs z0Lw3-sFn_+6~dnuLIU{p#dFv1l#{@-ui#@SU1F(%v=5pAntR%$SQh%)jsCAr%$EU+Dt z9I7M6wkjgpzGnQt6yz*Nic1}QaVFpRn%Tl=Y0*?`bo8fFLIQYl`5a8>?ubN(YUtLw z3c7x3gK^Pbpqjl5nm=AC!m42@=;Pi5dgVNf>*k1lo=p(n={-cWwLwU88~8V|K_Bn7_*=>C z3gMv&7HwUF!TxQK>RbmsY+pzBHZ}-vrM0N`)$otI_c1)w0ii8yq>YR8s&s#^5NH)% zk5b2P2}yq|g#R9dVn*)Sip>)SVS20&Mg@05UysH{2&rULLxLF9p$@2Mr8?P@=lI=) zvzV72hBW88Na*wdBHO(tpanP6zRT~&cW#8;Ge;w`T~&dTFov{v7xxe5mD^w0{hP&e zbB0kX;5Nhi%Kt<@-pe}hSLe>4VD%y_?H_|_J$*1S!VN?H+oHGIM@V$|5YZi86GbC1 z6@f?-_4>}u$Ql@hUT*b~*twb!z@SfT5YW^HT|PFopif>erIOsQ??*P+Fy11}Q*E%} zZOP4Xg0ZYg`3rQ~mv!h@>AgP`7UJ&S9au9m9gF)!VtSk(rp9<wZKoR zBEHl60wPUanyduTudxlrM)>`p0MM&+onLyaPoHfvtIWQ2KH(2DNvT{nc5T9e1yhif z(F1dmx?)CL7fg@!!{lf$j0<0L2P2@63~rYTKLkGgz~{vXw^ic$UC>)61xRuwqcu#x6e-3Bf- zZP2Y%HKe;XM6zQI#C3cZ1e_)>_f7wiey4Xs8x(KfWEp;NqZK$i}+Sy)Y{!1hbO5N}HJwh?xliMhGWIdkTc3LpozvKsyZZX>L@*So=3c4OPTb z1zZS?dz~r*4#8t{saXY1AKJk2LmPB{&jy{|wLz!%Y~a`MEhIVAM}MzRk>*klNe(rT z(D?(z+P^I@MzpPB1ktyV4Yo}gV?3Y7$Bv+6&t~KE$_5)Vc>O!}7wFYM@R!Rc6 zWAace>=lMtsiC5Ngm6xh1|LmPHYy<@q)#|D%n?+>Azj)SeM6=zn08>^Pp^hFP3g}O zI_K&(aI9v7&hOix<2zcjd(#GNF4bQ{RNETJ@M?zsUd_gDbigaq#6znY>$CHEyOHMa;%P6`?rkIQi7<|FtDi>;Us(tKn0)OTQ+cb z-v&WV-$ie?CK7q2sXM^Cxxm=lt&s^v!*5V+m1)YzYO-@P@e{u-EJA`qQ;ELLPVMr& z#RF!bio6L<)+?oo)+O*wYDgdOY|c{5N$x5pCjk^wG%-McR0^oJ(|Y=1N)Ipb3nz4U zg$AK52Klx`UyqLszTtafHkMUGLP*u3e<<+1WdqwcwB}T;3PPK`k6x~g1wck#Y3ec! zLZuzx-2xe&p9<(y#$?A@=wVw`qOp1qgPXsH2S*O!@}~9h{iv$=rAbcJadrDT^H)U< ztgp)b8m)ez1|gI0U!5yJ&hT{1i0`5WU=o9je&DQlKcfnoAoRhM9^L}s#0Xc633b5m zKm}nF@!?p;#y|=qntI<*AZ%m<&-zv1_r66BeEip&B{;fxmZTqM#`_!L<71kl3Ou!CdV-01`h<*->LH{#+SmQ#QV>SA(;!rp zG=$LSBP~Ef-;n;GSG_8TYX3gcT^eApUn>D_RB%U8SOTsZ6;}h(P84#W50$rxt&z;5Me$k?W3bdDP z2_YMmkRTF5!Z9MqpoE0bxvo^uXgNb29EOS*CgqtAWMIa%W)*aA{fh(b5=Q8oz~3?`S440VS;b?3}a!%SrhE zT1`}gNopB>LIsLXQ}kK>5o8Zd27@gxgHQh+A!Nl&W|SvXaE8h?)W3}}rJ&4FDj_>P zBcoI&1)ys!R>r)Bh&Gx6>H#FwW5b+4f0LzgR9w~6YvaP51x7|@sfe0?__`59RVcvU zW#jMKzhwfE`AeF~7N&~$Rjzwu?k4Gf-@9L_55$1Xv8>sc6y+l7Mz{!@+Umh8`j1KK6WoXR*=^K4NMncO%$>)4sRn92Ckbx7b602tz zFrkS^C1ht;)h(=yp??1(*O@yD$W@Jh!Kek~@dxkpI} z+N$Ac0>r?84y8ckdpoC%#ORQY#tyG_d@q5LO2K0G5NI+|k*H=`u!L!f zIz|YoMt)37)T;uTq2VpxlYk1No-{oPk}@+jr6YX&ZEa9cz;mk&418VlNvVePA(=~L zWsNd}Rj~k7Q4gasjTsaw52B6aHiuc3D*ig6sCe{r^D8}~Rp9UG&*#p*T~Y+i3X^~) zHsFkS_5R_-voP4dwLoAp`;-r+l*mg=Pj-Bor5X$bf=PQVU&!DI6>YFzYsuxMI@gnW zPo;!}kZB2)t;O0^7hq||>U};9JWcJC3iCJAZ>p^VQLEa~l#suxDR6BmZ=)%!QY2JG zHu`{Ugp$hWTDxKpsiaiJl07?(*GXM3Gv5AZqp0Ry(EVRmucD9V$Hv4qXDu9Cx==b8 zC*2MUqCeJIYC#E8SvVA&goNtI&aXfun0%k+Blki7Ox1gGjv+fUJ3Jv|t*Bq4*U;C! zshFSqj!A7zfGf2v>xZi6d|xRc_dzq3L7{%0O+^ip9cv1RoP9wMxqgiTQNN|nNHz3n zsHHD>oXSV!=lI>6QR$WhBJkvi&wnhXVa@>>nw`rBCmGaGTgQcyW0wrjI@pA0PYm&I zBM_+24`p*DhL@Fr8ye#@f#T6-AwjJ011>* zIQ>=uSJ{?o$iYCtPk)sA~(%mgV0ML zW2YmC%-^xLk|0L6e_uLphG$bTDOsb*I!+BnO(Ch0 zR67MD!BaqT%h$C^7A;l5d4N4SRF$O*xr7DN6P&C&zMGQ(sC-KWqzc3+IJxC(>V56G zDLP7Xl*hn4rB>wKTq3VDht>3_vZ|<*QBz04_=YHUMIcfM=~Gfg`8|Rd)&6xnJaW(o z9ItI;yZSO&dBu=K^UOE?QmSa~6*Lcz9z;Ut+M)#PTpaD0JJV*pSAk0n8+niE1u6;W z@v%^vjS5L9sghJ3HU*>}N5R^QG@Z#av(CbLNKX@R8D@5-{pSd zJH8L5e4ZRXCNO?|@ghQ+*FbQyDu}Ur51$>}Z-mqg)KHzvFO$wNXEprh;zf*$atGIV z(PqD!Kx8tVIXt(T1o3V0rC0;XwPUzIFT?*Co}UWy6>At&v6@jCsdxmDrn;6=(Q=9^K*MDksip*w zD$C+=ny10dt76xTvAD2)4cux~6<@o1o7WKC!E99#WaVcI+?cZ(a`D`Bcg{Ls==~ju z{wWZpzVagtM5Zv9Xg4W9H6%Jz7X@KS8ap&qQp{G*CZ$x8(~(qgN1N!Y%`qg@4AL+H zsnwC%NHmistnx9nJf&8=&E+$was*BJoqWs$Kev2e`@H6ha!wtXu_;yc&E!y|{3e`Q|VpJR<1b5_G^J2sWMi;}jkT?uVWIrZia_OS3>48M9@3??B<|^t8Xdnw-iv^mIcwTvDWz*HRWi|&oiRRj>x8x+4Q0KeFiq-JH3NM z3FT`*DutwJNFPlVS*rjD6_HBg|8W&5`exM&)ssNdwA9R6Q#4ljoCJ=I^9czmRglm5 zz6K#v6&i#zNBO&&Usx7GMohIp4OP8DMeOjp0O(#<%dOI+*38mcMhk!tGAgU7{>SLi z;Z0FQuA}4dfeA#-s^9=v6Q7yqeKmgCyrMbRlwRGj8DTBo60lwdq6*e<`VUhX3PuJl z2qYU-Qh`a31xiubw~)~JeNhdn4t+>ADi1p`KgZ}JBeMk2_oFIE=*&5WjYK)wsi~q` zB({|VT}s2L1%gx_Qw4(bb%}aXxkc65SCM5k zlyAuOZU~@iR7KwS)c<1}a19*}WGq(TcL^fTKdi;;m=xn@o~3U;r7D_pO=-@k{sLBI zib&8HSdhBUx>aO#GzL^?mhp8qLd5U0@$(8!rIh-L69T59t@OjxYTeui0Vjyw4d{Qq zC1$M__|g0=O=UEtVMixq8lWvDRYLHnn%pul#P?K$RLd0-!irR|h7Q1*qJ%s)`iEL0 zh+4^8_cofp$Mgk#Mf!(&vs9l~4%P-H(aIRQg$SRznsb_wsBjN<@gLV)XU&rYWIfha)5egsWt8eHg+>1*5;j#*W5T z7EWcp(sb1n_f07XP(cua$lvAf&@^T0!udn0tJXM`s_gWH(*&pq zQog2{qm3lBq5(+%k5N(04eJDWktNWT4Q3H5!a6kH|7N-UyZF&fpcVnF5h! zH&s_Dq1qC}gih7uy13NR&X3nkyWX#fr4ZNgeR+S!w2|f&tT9fp`w3=d;K_?~W;Q|@ z|Jir*auL$Jnh`|8qI^6)rlJuLj^2cgej-89!^qb-!n1R+Q7QFs5=?eF6OdKVqr>Y` z3Z{yx2_oNDQB$fS;aAlvrr=LaqiIQ{)N+?vi5hcu1c9a@8-p^MDOy)@dsJbiZYHJE zqP+U&>akuCRfP>fmXF3Pc9S_+FC3hX`v? z1-(6+;m;M^)6oq2-@i9s(VSBj{O9t1fAn<-6JgPVNI3YMfUxrsD0U#KA_ERwF^$T| zbOWP+Y@Ch2eW}LJQ%MP?0+Rbu5mzcC!B@XS5Sgc>`Nl1Oo5#V=F*3>gCZS;GB`}1G zK^2um*L*)MIZp*7AR1WA1v1}h+VXMvrc6=&R?8!5zN}UY%Va*!iN{9Ym;NEa*Zf1J z%2Z^ndWWVdK~&d@mIJQ=K~(1u(e`zOG_Q&?tFw#)r5ONdI+uSZm0`{)3;vTQ#ROLf zBF$5(5dmR`Av{zlsvRM7t5pRZ-_~FxG*n48LalFvmVmNahETF8C`~|`l$RZp0CFZi z(*u0Y0fNWCPS0afP*P1*V@I#75nlBKj|`bINT;FLtY2BlI-!cEmH ztGZMUMrY}Vsi2TDZ}m_TOa&(gkMD19N?Jv!D?y;rDbusEEy1O7^S9k<*}$g(2M?u& zwT)>D`mb7fpQ(C>zAgPoUOQe34rDxUlbSNmS`Tsd?+Kt0?W*DN@uMasG5T4i+Zeo} zO8Kt^ZSdfQ&ntSuKj@$M)w#0>`lLpsASy*HtBQn3)q^q$NEo^0?amaCm2Ih>3R3!6 z1daQnNlKMqXBG3ep$(iq(0oy<2tP+9;`{8xdMF78n~Ko#cq?jpMb!gKC^f~@OkZXG zDi!2=RAKIuYxdA2=dm)XOEn`zR6fl|Wqwp^e2qRT>rYkr9zo@K$THWY{Tjt7m*QK(r>pvs+CglAI-_`C_NO0Lny$oh7LFbCy3UaD0A?9ZklzLSq zoMju2l^wn!P{;cnlmRf-;io(ntehDH7K>EHyH3?fQQ$X z*O-Hl0+Ie9;nUJH{CpjW$kKH0=iAmiL45k+$KMJZW?D(3M$zJJo8ejSEo~No4n);K zsfZPUNHrh?VxrQ7tX3LCJ#dvh=5qD?p1$e9CCEx`_50vw6ue4V38rcc7E!f$d~AeA zucFE?tw=qUnX9%OfCw>Rrb>43I60Fg-zwORfOLcY!*5uxTjcnmCY<6Vkr zYIC1uK_rk-?W>9p-K~xJnx{W%20xxYjZhudT(?J-EEH2xrt=s;BzQ^<2&5iFb{=+Q zDi1prJ10kZmCn!u!{zARYrTPpmUWTl@DT=ix5Si)j+h_sRH`jXa>epqzR2$DkJbGH zv36iE)(#4m?b0+)%!uxc{vNFm)VL;GtG`)FdG)_nR$-M1tgW=BMRN(J@;8-wGJrz0 zV&h|VZahCK6VH*?hXV(LNc@~cIt{r^23ZIlA!1X-0)&uC$bbw7E`FB-2cym0H(zI! zj$RR&BaQCxru;4kIjebUV`F3PW+?}k+}YE96o?$z^&l!$2O?HIU3j2W#Z1ZnYh1m4j$}TfX8`D z@bo|yp6<`W?JYBKa=}3C92?1^z9c1U;p6tV4VBcerZ1U9Y?k6Q0Zqxq`f zq;g6#C@XJHO7&%VnP+{?1g04*t-cLB>S)cirsn55RMSjsn%PulDlQ?UN^%0THt$d? z0?>*AOa%cd%|XAA5OT00%wk^G(17OvM_<$gqBb|Or|sJUDnT3*;cYcf&D|^|h|31| zDF-402$daYkTqc;(gNO^`braYvCUJ@%%P?eQG_vII(^OntH%VYE z$Qp+HdHr!{Mla+|NkQ(U1nirVj3cx9NIN{Uw;cD0dHunbzfQ*~?f?KF07*naRA7K? zslulg4#t_qLvVW05c%xp5z$zZ=7$NP_DFGPiqKDLz^m@tpn`hW*CM(!duh&c;Vb&8 zR6#1S@^zi7E3=f-rrwsK1eJf(BCHKdf!MX#TR5|NxjBOP!xkgP<7Z1%XEo=o9z@no z(nnH(8jjdhN4<~8QJ$Y+c%37?NA0Q@7wU)$%SYngj@fvyd!Dq%`xXg^&krsY2){hK z(g@=3Pp=0XLHy&{%|;c}Lr67LASwX=_qF}_$Mpl!{(0jN*#2?-plsD+zW=|k9l+m< z_u}tY_8L@mH~vz%8-KaH8{b``!tN003GpA!ZW6Vn;3S$yW|M|`{rS3|8x5o{^!;%O+9|M#xqNO5 z{!p+{299q|t`$}10CRuGY@Ay*9J|KFVnrWc%!+YDy5lGCs{O9fPgVY^1g`3;Y8q{@ zV}SqzI%-N76_HTVZ)CtofjBtO!8}2H{QN~Z@boX3du^$LklV5#c9k_$xFn#qo~hn6 z05XO^-fQwga$?Bqssv~ahmmx7Rr z_P?$w2&r;ZLzDU`xQr0qI*R{hD>)({%40q^0IEK(Z4b)6xX=G}H4lHgve&4-{C&bm zbynsw{a5<2JZ`Gw*ZFG%#xIX%gFrsmGatokCgAwoe%LZH0&`;B(ATAz5lHQ3rrOPW zXi=zvPCzs)xyYz1%istl(;c)rR7AR4>$>I%BCCa7R(opBQ=aq?Rs=R; zf~az7>_jw4X~KrL`~bO`NfL;;wRxI=NZ*jAsqzo?W+{C`ns=H>x=~D0)zR7UX*!x9 z)BvP%RS2H}E`iXXexig_LxUpzKX;C6U@Ab%0m*$I5D?43$RLppMh+N%)TttUT%HeA zp1v=AVEV%k_sqwgtuw?-r$4$V*$Z*D_2F8hs+gFxHdOAC*HsUqN`VkWR_pMyG)o!S z;h@J=*USFz%;Ndur)hc-EcMtD(iZBUSXL3$jPbG{Dm7&1ph-G6(NiL#49@&e5UC`_ z0L}TWM#cGSDG0TojAnwC22rV-9y$V7w())Sn)<9#OYTFjj+#%YnZ8OHm48YY)nGvw zjppg8brSU@j5NCmBh7FHBL}3r+h^h8ic#1xwkL-Bw-VowaM8Ti(jVITrz|F?pGW|i ze`FO7qpu1?7KanWFV2|d()_^7s%*@;$XfxZwt5g*#BBmmyVrwKM5Trd(1f-404Em= z!nJjiBue^&K{S}9lCChArQcoJDe6;J4Hbw+XsBogvs1yP2TpJo}DjLkw-yB(44n$f73|!G~X6j~NW|GX2?E0y;6bMz3*OlhK zHuJ*-Bhwi)T?rynLlTv)TLm|Fo9TTPEAtaA$v-5FdJsACvNVhpA1vSE+NSI<>^Srd zl^RZta*!M$JK4(=(Ui8x7E?||N(rJ;8mi9U%0x)%yU{E)LU`kl=Ib#iqccTc23^_r z6toJ&^2*2nPI;fPY~Y5zEmhs*Cu$(lA6AN}K&0QyL8>r&4Au?`L!5mLV`-boPvolL z)g+CabBcLGR+a>P@{Z)) zidJcf`j>&Ie8jJgX&@@olpXoc7qmbP6;W@R(qAhJqB2SURR|T7dPOV?B7ajUqFxoL zh&)CP9LiUepv|du20t-d6p`mz8HgOPSm3ZY%?DkZy)J6UYpShKzy-B97gC#`%(;?E z5owmPbda^FW({IRexjx14;75l;-h8i64Mt{M4CffCx(isK%{@j2p-L((Ouh0FoGa5 zpQZ;<kZV~wdTN>r z$%rXIEl;L~rH^zTy+#PC)o5IJfKh@6pL?=`F)94bMG zE33zs^AYtR>hp-~sEjbOtW8zaXo-9+V8f2C%u_9Gp;S>z+7lK5M`xP847|$TQ}9-7 zo|>YlWff5mqDo`1JWq?9Y9Ll*n$kz4X-Y-Bx@ICSE+2*Eef$y7R8vLeE9xgDGh)ht zP*wn_S4F0M5yWTt`Q{ll)h0ZbU(3c4>Pz(?=8POx4n!6<^G;AyMEZz)&IEpRyBcDa zvQV2KmQuv6GmMorN)Z`JB!rACiXs}*7g}kX@)OIe;$BI(Ghn0A7fQh-S%2%OF)CUa zbQQfWs;F{}h9Ur^h%`-&6*;Da`lu=Msf?QHK`hRhfXmrqq|`3i zv7RU%2RL3|1tPCEQ$}jwqgkpZS92u={r}C(9+$2=#pB2JW_E(#`_EG#(huQ3p7oIg zk0EsWE-I%*e`SzQGZZWtDjn)&rm4y!mJQZ0nO{-Bh8>+j5v7WZTB?c~EqbacqY*}f zsaX+hFMCZ7BKM^r)PQGMT+bXs)tdcs4p>7jR30rVVUY0LT*Y~m}YuN%0ge_c7Cf=0?{O;Z%AKPsUc18ip)}# zx?nJiCOii&n)C#5Z)Or=?B11mot$8-MNLhL$Q+_qeN7EHe{w`ffcY!pqi55MRW*3@ z^q{4I$fYuzKYU9}Ag%>NMI?xv&`Ohu5j^G=(_KHtu{jw=5NT?a%_FK{jSAH0{X=$K zQ=O@%h-E=kFj9$1!)P*9O-iN(aP+X1eJlk43c@lzp;E%Kff=QQrPR<6DHRY;t~G+l zXmDj9>it6oYV;s-3Kka}mYFVP6p^VTMohV?02kuo^r;1X(#;=4eT9vs%(&1GHhK`% z3=9oKZQ?3{B#1M5y5Q8pK`#Z7K?)V9p}$0>c(iXZKF?c@&-X3EXM308;enNSdL#$G zIhG^y5?N5qlzkm>?e!_gG~i;N~brp>Khe!kzkHN`BY%X1Ry_as-Dq&P|X)qrl?Xu z?f19IssUPksRrWjPpy-R8fBU)MN}X%NTsT3^opn=rkt~RHftD8FC2uq2`&h4^_r}G zqnW1Fq~uLf7fmz}X_mUxcn@dSWLpA=TI3WjUQ}0|(~`E|78b#;K^=+AF>f2TqQsQkY+P;hN{q8lKAuw z^Vb+nQ^Fs$M0Yq&| zl%*_yRmhCDTrl34e@qDbf70D_KL*5`6KcCXpSh8UL|G9l)+pjSZsQ8Q~#Le zr```#01`e8K$hBR@M-f7Hwt{e%g@1+Bdc*QHw(p^X5-9?3D~z_4AxH>j8&5cV0GpI z?3p_XrHRW6 zL+O`~U)bANV(LOc8QrdBIS?5zpc-;Jy{C(;`%)Q*g{vkAgnrI;@O83xOOzc zSQfS)@;u1X5ns@Zi7-fo{``5tuhL8KaWIkrd{KD1Uc377h}@o=)JgQOWtdyPvDPKcGht<_%87 z$>rlEkzbiSPeWHVKch>^rq+*(i1W1{!O4$gR%p>HYQieuTR^U^?pNl)Ba9gi@ z48VMry96u7^v005P(%fIAm|5})Y@R89kZyvYbS6ZiV1MThKcF8x_*kWyiM;TDiHTg zPC=?mb%{z7Lf(Iafie2${2wr4$_18Zr8 z-uf-}&1Kb8zn z#>DhUq(=lG+{YP#?hazY(v&qSsjK$5e@rlL@0eS`nm3%~&*@aA-V%&Wi+sr-QF>r7sks3{x6U%iaNtoELAbXQ=Jbz2(VB^p;!(+b z25S_E`=_QM&9#Qiz+k>s^AEK|K7DnnAwkTYJph?Ba%{Ba(4x&16}}Ma{rqFhf<@Fz?1F zNwJ=nY0ShK31QbnK`P+|H*Q%DU; zm3k20@BCIR;9^)gP9@}7gwB0kT00#vf$pNnR5mKJ@^3YjCWwU21fYDX(d7_xiFfDk0>(M(7`U)YD4Zxc;f*`)}di{yfV8 zk-0=mOy;Wr=fe8+lV76&74$^6k&&enU;@Ks`5b5hAX6exQ5acf%BjsJHvW9s? zLPz*iW5}PSVX8cguXE+rJ1x?wMLQ+pX;44Tg;enI`y3d!uQRKsfC{d`*I5*qrgV^pgS7ZyFZ78D#IVG0 z%L=I{M zagbj#$s4lJn`WuXAF73jJ!)0M*B38Z4v3GQAGEQw=}!tmZg1u0!nsCOsji`a!g+^; zFzC~&Sl+j5r696)a!y7xX7`K2m35OPnaza00#OekJ3m)FQ!r@TRq~pGltA*k_jk?5 z_02PJYwIk@%W{gpa?$@3Rr^lC5*FaBu=*f;`dP z*9EEJei)O|9m__gW5=8kxRjHLlI?TxAa|jF%X3ouVBYXi?n2z!HXCPGjK`V@eUTpS zQwqk>iJ?*ws6afuXfQaa5yTNetp!9*HKQ7GQ7&bc(lm`|-OO?zq-py2>3JJVtg2Bk zK0bB~T^d(2PPt)u6;l|@A8sAl0|zH0;rOIv92ygY(;1Ptk`{!bcyC-u@WJ^WZa5v` zgzLRSQPRIVO8Q6Q_Mj--9^3=>$EV}^tYNsbb_%}Ovj|`AU5podvjjd?rmzu60!pZq zIuZ~z1t3!b`lf&+5QK~0Ee$%&POYi^5+LrApc5dqZx$h(TR9#%6Z&D(lmR%obPTR< zodcS~Y9LYjR|5vOd{4n_%pY!_jeWBRA-$Wg(O>ND>x?sthvCACky2H|9HIhod{}E) zhJUt#oq03Eyw}4qI_|)y9aJ3hM;6f z8XnIdiw6_?;MUCHc(h|4zSzAG&ktxOEWuJ8T){#JIirEKtZb@+M=7sTIKsj2v+=P~ zE&`~kUbr9C^l*Q^d!A9r6>u8dT%kO>)L>B-L>?#i#be`giihS7L9cFpMrB+xE>-fc zs;Y({?w^{9nQ_ii!Ne*iF43=7LxQ+$aDOX^mIUKhXU`(ISsf(Sf1_g1Dg&_W>joeT zJJv&Crv@l;_!vcwO{86MX@)DV&2iPI18xL6;a0RC?xjZHv%azTtZy7{PZ)&HC-%Yp z`6Kao>nuFpJs(PG*vWaPD0XyK@Nmne@A*0*5EF6lLL*2@`9%G47szJ_ulhdsq4uNp zp`a$j1WiFmpH?-ct}g{~+e}$-`Q(z}hz)cTWn4NeUO;5T^wffZI6AAJ+=pX9iU+#4 zd0nE@TpdpjV(0g&;?l&- z#CeE&ruD_}*dXkk(ccInBc?}Y_Qk%*$ym~>3&LBzDQ zXj!9=?tK4#>o$^{+hS(Z_kIwFXWLiDp*A04ZS(iB=#%#`r*k9B@BFE;Eq3}8%j_Fr zON$S%qtypE*!DvlZCf43+EoX?OHgUb3ZVA&N~@+@3taVXhwEJ(a3`)S?hi@C!$E1d zH8KswW71H(a)LmlhmimfII1KYA5%fqXSih<9w+Lu@iAYM`!Uiat>Dg81djWl|aX7t9MNr}iA7>elj)eN_7 z)0V|hAhNX068oe@gZMw6JwS?cM{I6Y?R!BiXkQ(xT|UK%q47AsaXw1&a!``D2G{qj z#PvPdDA~6fH}|f>)t$>wv~7ue=H%)b$elL^yJwBSy3|l?i1x(VuAQ;Lr!Drju7(rs zs^eVy>Y|`j&caR~nc#G7j$+R?xax0@dr94JC#4%c8WKmrLDV-rfC>x+ zA-9s(n>P%1CZ^-=l)fmLJq&l~w+>Fl{j@0DP7afHH?=!H&q$Eh?k0rdW~8^Y8=)?^ z9_)x~ft^t7*&4gQR+6tm2jznW40xAd5u9hemVOiVN0moKO#pyM( zq@7ti8wKm;2ykcD&o#b&eC1ReS(b@|SraR4e2;DKf-%@MWe_$b24YoL2W)9u6DQkM z7n4`>H5(eCq`%1yf7PcQN}~Nx66K2v4h>Q4-5S>d>~JnE43|bE;`)G4+!z{(lF^B{ zF)|*v7`e?HjQeSkxRVl&`vc-}FQcabb}QN!H^N+TEx-U3!SZY^<}-a-`Ax%?j|&|d zqp))$t#Qy`5X=50fh>a`&Eq>6<%APMdSL(LRP3G*j}1e+A;qbdEMr*~L@r@siT%)` z6_Nk&tbys@3u3N)edH|~4?@O97z~PRyvVZO9xTpV>Nn2zJdGiG2&kV$-NJtPFNUZu?qd%8D7=$poYT;?xvH&Y$2+ zdreIl(G@lASYK3~Ch+NYAL3Hy1`@fw>f1q6FZY)6y(`Y2mI9oCC4o%fB4Fhkqr&AH z2dT0_tM7SU*ttHA1ll4u(GR_x8=9TusXx|??~4^9(~vbRS=yY87-aT}!sw)MV;h&!4Kw>h zVcvjPEFKhxMS~NJpXc{hj!MTG=Jcix#P*rPusp;GdF^Xy$JMF65gvijp|OBU;PfCe zh;*jihsbYNU7#x>w1()dY^iDjT0Qw515N~&CNf)I>kqM~)dyJ9>;r6aX=-d6?CWDw z^AF^`+*TjpK${PZ-%$esf4kiEdkL5qI@HAamLFh3leZCFx2gncd>YiiSLe=IL9_%A z|90aFo*dbNuTCGtKknYeHy1A=pm80{{Nx>pc(vdx&CyvbK2%=xRP z&b$N@%Ve9mvST-URv-|bHIV*@ccJ`j@P8ieXw!L0GTNwrZi3E%mL!JZk{?w z&U44i;n+221a{9IDdsl^AzlZwdvsVSusLcEa9 zWF~gSyxx&G+_@pjf_R|4ULr_6Ql21kB}=aUxsum$_vl zsHbvfV$ZDMSn6koW9>C{G+x&Vpj^|kI*u$_Xqh1L7HyVN;&v~0J&w)phf6C*;qJDX zlED72i#zensST3z8sgIyi^J@Z-@df3bJ(Xf4lbF9oN;}yU|_r`Awis+5+V&cIc6Ee{qZ7Pc91!f~iZCA+1bDi^ z(ZKCWT;HVpnNX5`r)-DF{<(CMN~UYm?%GFt|q`G9tT3iw*Wc zdbcj<9~B^rVa?3wiRB|w1CX-owLG$9ERL<1jFT%fjs7%E+k=b8V{5pxmP4%o zK*GuV>N>lI;DTP3;2xDbM@s^+VA&+eU+o+hi%Tm;$vP{%=O5R7xwU0FHV*5KHGP6{ z#N|^{(80bAc6N0TlZ_D09}p)X5|{}|q3Gu8j=>qdaN^hzTrIwW3+K*a!sub>=I4fy z{nJrgT#TDHZ{qUh%Loq(1IVx^qHj}7_HTi)UY{bnU2WvIFXJC}ZiJH^>tbbUC^C~mL}@3* z2V!EJKPE{Fz@*qN7#86rv-G>TJIR3IF4^oJIN9mgJOa(t6vW}-j$=% znT$ zq;AMajmNojX9YF_cQXG35~9My6df}l4VNxml=m)NxPYL*AY-T2{6q&aU3&(3BGA(r zE{={!2=&LRv3;?6Tpx+T6378jIX25ki8vebWYn`?(<@)CW;PJ{Zs^9h)|8L|RH}DF_K- zCp&w%J2@aF+z&BBg-smAczFBz@>48 zATot=&Y>Z`J!C;M@^xjFVy4Q(U<+6(5 zs_nGy9dWYE43Lw)ZLn}qyyP)Cm@FNhj739|5bWb2W-`+&y%Kuh;zdotmoLpS9y{M- z)Hkw=J9-3q3XDVgrDNajotQBt6Vcs5;qUH@UfumLF)0L7Qp3f3r#ccwf_Pxb1e|p( z4sx$)lM{v;mrnfWJ+rwZ5-3@N zd1lE_0dZxzKlVB4I!wp<*qzc=8Z^?j}dcxWL#HdCWm5ruSm=v5R05~edRnV0+A-^ zsuu4drd4A};{WC9Wqg^x9nTKs;EUrs@P8gWs<_jZRTFb~E{jK5z;cRTo<5G^wG(8% z9B(Df*#KOjZB@SjnIVurufGOjFMs5@d~8xg9f%C+)5K!#j78s9wrAn&-i^3&`I4~% zuUWZF0v-f0%$E^SEjXh(bJ?w%lcPi^hxZJ^m_dDT?dny`o<0=;o~~FwWe|=n8iTX` zt&OP&R>f>|ZHoEv&d5sjLUzAEY#AAaZKHc&^N1*{$_T>JbZ@MnpUdf2hN_wij*YN$ zc(RzfEWt~S=n7XSXY@~vL!gHPV!L`Fq>B&s?AeWiGpErzHKiPgJoc{Mu1M?N1<`>X zm_KV8t`rra_{tUR-mwjlpJp z*j`*Kx`e|A@{kh4#d&=ZAL0!!SEmX)v;s0V$W!u>!{fSQX685n@${)v2oLbXq7i90 zJ+ZH0=6@5JnQ_*x4(5m1A}h^P06aRoFU~I;DYwQxzjTDGO3s-LOv4n|)iHv|`H{N^ z_Y_lcdPYx)icTCm3Ug*mLy)JF__Q9*T7=Zo)w$AR_Hc2=;Ftg;hx=musA0wd==$~R zSiNkqoHs$FAFZOyEZ^HQeF)CFer!y$Fi>;Ep#ge3G{v?tF(}zIO_qB6;_wQYD=D{h zTQ?p5_t8_!fKe70wt%|@6GSfMz%^euJ%~&FaWNw*2^EEtRXHOdyKeyUyi7hK6=-Wu zAFLYNTMD_EtY#HS;kG3x-jO9B5=Ksex^rMHt{&KgjdLerL~;a%#)qMIgg@M!okSU_ zj`|kl?T(p!V?;S7^h?B{gZqsgd)dNyvZC9mD0dWg{zxD!?AQR?TpD9etRvPB3CD?f z17zMH3ln~OVvQ`5!4A#kC~`8oVxL`Y4Pq8`cWi+D10%6%+F*3^_d=guy(FSLfA$P9 zrBk~3!OgK#r2wjd!^7Db!+QoIBg!9B$Bz<4q;Jetc=<9iM-9QO!O7S(Wgu2_wYP!s zQW%guG8F}mADJu-+nPA++6b%rcg5MI!}0a0b>KZV`2XQ8@6Ie9jH7b~;OlewmI30E zCq6coa1)yU`Rp?Rku%XbiIo#qX`b$#lq4yQ9phrLZb&%R3=F{mzviY6V^zaBA&bY@I(IQ~D<&Eiy>zOhbKK z(K|8-ONOUnJr^Awl89AV3vtzub5xyr%hX{w>(@qL;*_Ja9co~fZ*we5_r`%~X>vYX zx%;0t4@u*_F1X(5we^``u5_JiQ!weziX65Rk)D{*KORE|_7e!HVzZ`CK{r2Fq;~U@ zbcF)0vTcx;D@Mh2#n7ICm_2o3DG+(wo0rX#b7k&u$E;zZj8sSF8OwsW(YH0$4-Uhv z&C?}v{o>Ga+}t!3hiCT2`XSxK)c!ngvt@vI>sEESHJc^Wo8H(sMb>uV>~oqvykFnJ zY3TwYm2vH$P%%~W0$S-ntcAlaO{Lb9os0e*~#n~mH1*Wlja4Ip@g@Ux?v z@cHpAcyMAX9_DYy<5N5Fh zP8n)Y!v+FWu6=D$!*zp0r8v(8hwM;Wtz3`Gb#!Wge6JRm zK6((29y}nwMG)8JWFy?yRZP=ve(sg}v{Z6eCr2cQ`HCq$CNUJNmn{-gS{-ju;bolP zza0mbOq4P=R@E>CLu+F7;CK``Xhr9$k|sOIR@{MyxeH`fJ1*sMaC(~fzVv@L4(o=y zd)8V4h}v!0NTMYysd!`KOj+TK<_|&SG7h|hEqy9B1>(lAPDT(5?d#xzS1at8(od>I zE^pENLh%jvuF@bpv|d0|N~i(2%?KbNtf)QA--c^@R-)w4M%*bli1TMo;oO;1C^~Z- zw@>Eca(8E$vUJ(L9?sd;!V16USd!|A+)0VJyJNQ8+k$rrHiB4kMD7grn>!}qjc57?d+G({DJ-0}{=ye-=|r#FDN1Yjp$>)61!+#~mOZuL?lJXA79 zX&29%B_Ixo3B-VCf60IPx;nte#R1%QadVWy_JuE5-S?@qB@9igk`~E4Z zI6A8@KHIm!{1uVOeD!AuH==obaD#xzRmfOdsz9WF$cQQZL$-|rLU2g81VoWzW1Q>e zgloH3;I6^^Y;pkW;dSY??jPT3kk4r zRy-%rE(>Zexk6S3@z{B93*L}auZVok`yu}6+*aJ(HcQqI-4N7Xmfnz={vGS0ASD!c zFXp4<{Bc}9bxdkwPaNKlMPoBCZ&(U;%pQR~^T%R;RwnXu=HSxSC8F9iwLd?$SE<}qVHV}jgXb>BdW*$!{!kYSlOqG zR6fzHrvH96YXp80{f9z;cr@AGv9CjtHH z@?o6s;ew)04UNB_=g<&ydpe66^8OLe4lWh5l!{3BsD#}9Ae2Xz4#leV{0Tq!jve9Z_R9OMZ z0M{O`)}>MxdwiNn4wOM9E;!7z5!bR|<!Y5^cVjWB`u;6+n& z2l0#i{dkg>B@5_sb!(b$rxy+upGzqst8F+7W9OhSnPD!blwB=ZFo`RfeSTy;zPx-` z0D69IpHbx$R0=o(_1nTD-`mvZ)%NC+vAFDH3iF?AUmf!U+l%i+HDthvcXg86uU+1S z?=J6>8rF_iS|8#zvtj^8yJ)X-3UD|-vELY}_ltDwOIJXKsDl`WKZeN_+C)={B zO%s|B(;85IF;h2GM+KwW63V=V<8hWn5{9W-ENfdF+F3wkkc_!pMo;OlQyrPUV6L}# z?G*g;-aYdNk#`H$|CxK_^o#t1c(ix1tX|E44M*LAB|~K8=}jXdk<-5`R`l_g&dVkL za>F{7S~}xqh%;{X>w(`K-Hxw|kK>!GC-A!~$MD;tqoQO2UeQr`o$vE?zR$<%bNmip zS6g|n=qP@3=@9O2U5rBKk4i1^zumPd=Jj;OreWPtuz08_9d9zjoEwYP^^K_vJ}0QW zw+2%Idoz=;Dy*Yso*K-;>yd5(nSzf>PUxuSs!^q1oX^wLT3*+nhPKu|1$b2Z(kb?~Kx<#wUiT}=A@6F8?F-h1IF;y^{ z`*f&37Z>6Ft_7lqPkA?_OgK-nA~axE&XOTZ<>) z>%t@W_Qomv>GoOtp`<__^Z5^H-(1TF8$o2dw|yxtd45_7LatS_ETS_wZR^mCUJ~i$ zviQ7ljobz5L=Je%HG-$^eW=~shWD#jDfv>GdMkSS;{c60@+M)Q>E zBo2F6c(8w?1*qZE^NK&?7LT7THD~km|2}$xd%G5ikH{OfaF+h1m7}FBjAd49 z28BweXXu1A7Tdksw+F6gX5jIGb@=AmN&NBFS^W9Vd1L$2 z?Q>w`Yig_B=kq_7oWU0t58}>(F}Up2QcG1BU^(5s237{P!=fY)iR#kK- z)wtC?DzqELX!l+usA@@ks{ZAbqa`4+%Jq{{>RuSo4lfEc2nn8;+m{ZBGSjRU)4J%W zQSH@hRBko}r2uJ2&oF07ACgc?1o+G@6fPWzEAGurW~psWtnqFk*O?Ju*2dC&J~FGX zEJn=b`ng&;YfZnsaMJuieE4*!5kU385&|~&_hd_FCW!PCSz*JV26I*{aa)@10|smu zIN-|E8;5qotl+lDv#(paBiq-(71vL3Bghdq;sS85Z#0U=rQ^Y}DfrF)4Wc$wM#5IM z5yG!7<>Ai4ak$#e#ZWn8N_L-XUjxfMKgHriH{|pW!ijnP<-QeE3RVR%5W~AbDInDy zpwykD2rP>hxEww^Haq!}Sa%$4U;2(#R|ZCkKd4MbT1ZeI`5`5HlF%_ehkoawM6-WeOZw85!% zrPs45WFV(geSz|dTXPiqw#S{=Koo~L<7&7w?xc6a!_oclV%7vap~%50<(X8Sb5!bDdr>*XWL%)x@k$s&Y%+h@tKD@9cITBJI1aAA&A{Hsk< zr38-W$^ZyeXNh-nTnIkmF45qT)tfslGZ+!3f*H4N`t%p+i$a>X$n7;!T z(?W0~$W$D`K+$@S<}z(-S-Ov?A*~P=D9}ITtQe{x&*A2ldFBrxCndai(X=dw^4#1P zlKTC{Qz+RyLsUg|TAHUU`rb6WyNuMF8pW_WXJ_mhAE(XrOLRqcp8#x4@x~F)rZ~w} z$;vLMODOH@h@V&F&=5t=O;GIF3fKMZrCsy0MX^^K5ZEHeM)Fw|NhFA8ZEIp#03)Pc z(pg#ULx>0=i_{4u)s7HqcL&}eK^q2c=p)j1q$(0tc53=tR8RuU^IIJ2f?Z5y7|dVh z7K^=G;^xHO`0{)n{#a6AG^5L!(#pK%>whRYgKux17GJn5n1u1k$sM>lJ_WbBd1%E1 zhTl8cp$4*(edK!5@}OBtD}??b^M+J!s<_c zm(I#g&1q5Wv;0?wPf=&Nwd&LTuTbX^)Sa$5OOu~)nOfF zwgs=_%D(<$c`$v!>&(HBN-jnDyXN5!mkP{Z5jiWrvOi1k6Yu4&mD`G`yC_jHj?c|7 zfar(iy}Mw`sA!2)9-G})BC0eK7bMWP@x_KA;Sz4A@5ZS}1#>cRd}su6(*v+8$POp` zTH?4z6C8K_7>7GGz_E5*ecRMd*ww*d$A&oW(;VvqY_WS#I5rQ9!1CTcVv;h5acoY8 z!5p0;5M5b4Ud%S$mitfVx8QGA_DTZ(AJ-3p?SEa}Ct&_Ae~qXj&x!C|${sC)&drUJ zkvAn7OQ^Pft#RDe6h*ykUt3!t&go-Zi*Uiii33qQcNo6dz7$^_*nn^HcjL>`d+_Yk z4m>@z1HU=73tt}Eis!j&@MzOQ++I8pcSok;YEWlf^=*%0_hu&5wXKQM?W<#*QzNX( z2#`qW(ll>LUC>8l+JXZP2M!L5RP;OB=HMT9?wUV{kDsPh#-T+_iTeG80-Rbr0>x`4 zipo$m7_eDCG+fkhc`qOFsc6peb!KeccW^5+i})0Dm!?^j4)abbchmiV{Dz7DlY z1)!u1jzK8rrUo#ZprpGe?j(kwIK~GT!<}$3v@@k|H-k`A#CyAzn?Hmv^A8oB z=I$plMRR@Y3Q<8u>UhsU&hKLck44AqDC>uWAvZHgKs=i@RLm!urA$6^jTovUp|(2T@cK%IjTTpttlIyv*e9QedZ9U_JlBRN~)Cd(f6Y7$b4jWzW~gSb4FH_ zBX+tr#c8`TKpJ2Yf0sUQWvvW&3PJ){U|SP=yqaS}uK=kEV!(^%tFABAkk^w%_cXgX z=S4&piF6Zy+luiMs-}3XUm^szC z9`bxz;^3feI6SkD96KYx@>_<1hmmP2Kh07GX|8XWEQ>w!{7N>@#Gi``%^$>y@`vR> zeDcD_oD=){bNge_Wqf<-0{&i7g1_Flj+09=4Y|awlHX!yrg_K+Bx@iqt{5dIAC-k2 zi8(NudmQaKdw{d&3G?D)4}pxJm2R$v)P%2;)DaY}JHy`~JcN)S89|)cM~c0V&Fv>X zBVQ+sG(p+^cy5c-mhv$nWKNO37J=ijaaIF6JNHe~mYtpFz~AM7!2y9#Cb-%h6?x??MWT8%H4jWpla9;|LxrNr$7x7c*G-hVNcx5J1sS*@ockuHNHM^! zaj`P5j!{9*cT|n0D?dZukTX9B1;h3PgeE2Pg4_~Fnx<4?rc+cDm4gAzOs>Vs+@Zd4 zW(gyt^d|}T%0B*b4Cj^&m*XbH0_vXm;O(?|epG)d){5R;B$YrQc`oOcj=<$rV+XL5dU;g@jHhAwWn7 zAq5f$X{Hb`KmwRTAd~wz|ox1K6@66mgcdc3XulL^P-RC=; z97qU4DB1guZ|!qVPTA+=d%oY>zIXro=3F_yX}&H}JfGiUUv9KEgtE-|KKlNc{X|Mx zp!hB<5=V+>Xc0T+D1*=W)t*gu0P*_z(i>7}gEWRGeBQUeKYLPE#}8GdGkzk#Fu@72 zvvO;$YiEI0umB7`921j?in@JPk|dujNwh|Bq6TlQJ$6Y7A0QJ@;eCF4zyi=D=ZTC0 zB9oKP1sGrtEM#OFtBV%57mX`y*Ux;?;d(g z&!oO;25(Idl|A#LWdDK~Ik+fR_T@z@2<&FSo-kNGS)8cvL2i-H!|Y{nn+3#x z`*w1$eg>~I9m4?$Q*!C#S7k-a>uP$VYD9U7FzZMht|m6%qpEy1{vhwck=7U1hU>u! zA&Ud&NFa&D=sdp@5SFCKuioEc2Q?JAQCXWefabn-cDr=t@7|Nt4)-YzKaiiQ0UJ~S z5Ktkadzgl(A_}8bAnz7xsT{XaN(L)D&!HKTg1BL>9#Jnq1X!a^n3fc6dqRjJVxAfp z`Aif?qn#6a$)a&RB|pp+7>ewteQcQYK(sKlmnsp#Cd^Zmlk>T_Yq0`I^^JLdU^M$O ziRuzL=KBH){;n}w4VX7ST3yHKtHZ)Ux?+7&u%>>fqR~KDRDhc4SPgtHtc>H!)8xa# z6nm)Q#Vge}OWiQm@+zCE7L}9bi#3XhiAMhv{3h~nMimJ#Fu@Ic98pRh2S6s-7iHNR z?Zmuf;8%HqYP6mM%%uke#tz(#)YZHg5LK3*b zAExU8<}49fz$R_MVgcOmq>fR)n}v-%mOE!pk_!iIk+KlE6|>Y0qK(bd-yZ%zD{Pop z_=)8I@bQ>Dtm2qd21bBnFzHc3Of4V;K7b(dimEcf@rwY2*BWIsAOZ&fVy6E2$U2RJ zQb(%M(W4uMsu@h$a~pCrkV1EX0}Er-JpHgBUXCuAsl^0Zv-xhJDk`e#X_6Y#)Eog6 zb!JgO;rWI@w>g zWK5E`ldWC(K)xw0R4yH~(^a6V87(ysnxkE#r~iHKD_I#A(ZZ1uYc zGys(M07L>e1VgB!#LwK45vmC!83zCW8j49oK~&1hBt;o{EfXIAfWast5K=t@fLuhC zwio|-e2exgr60{dPVLZ?#qSTTQqWL4d`X7!I{{V;!9Omqpt2|-p96%zX#iB;cKchF zDZOE?27!Q?!FRz=W$|GEsTt;R?qdS$u`F8`D@=KQGb)lWOV=a}6)ps1tdQ@|oYec& z{+h>X{jsVdZv$LqM>}+PyU_&r-*11Z0UJuOs5_<5+XQW>`()BFNpGZ#s3L#I4^rQ2 z?ls?wbOvT0%1A2Vc5T8Fy{z=esni|F`2?6;>`mPVqN| z;D0-@r9y6zUHrz>H6Wstd@c~OAQ*F+^TGs2%_$;aK>!80LCxf3q5>!r81*}`GEITZ7}Q0&w`?Fu1AEEbk$t3ea*%9E50QPj zQQE}nG`Y%+^W@h%3sogCRsVEky(%E}rT;j+LyNuXU3#NIttr3)BmmRD#%z)D1`!BR zP|n#b9DoNv`{qwkQ=0NKRGr89E-XBlu6$QxigV=k{0{skfQ(s+DbAw9LWWuT$Iq^* zVP(H}t$)0-y@v+2n;mO=FPq9Hz~vA33frQHKr*RFb~91&n@~kFIgL^n5KRQt_>P#3 z++GqDC_k3EBxP8D%o_HJ!Bv^*Qp3t&8N>?-k3Xz02gve$35PI)3-TYWY3mP?;5sarvC&DKSeKSN2-1 zG`y9N{3jQFAv%j0&7kNVD*$Cj8Bs-Va~v=M6bpcwUHnvhMSd%SIz)Qk%ZU>#jLLpz zTReW@2EA!+2A=od?V3}hAr>80cA}V8Yi>MC17;1EN z|8m*CAXZ*z`KUblP+jTvOj`*XGeTk}M@aOf2@*dkOlC%mm5lL2Bz?rIGJ8aCg|i@} zmlRLvBh+V7DMKk85lgNMK_rt1C8cDH&FLXl5=ib z;W~C?jgxKZp|UA)lx&zDENkP2N?Gg>t%|{~C29(Yx&XMk1OOrn4*)W_&u^e6>55eO zxPaX%QCg?Vd2-(8wyd!?gjiWsZF%wruB!WX4BC)S+%J#FClXCLe#AY9NyQ`7>aKYF6<@S8p{pMuxebh%` z1V~2P=8sAD7dpwPAwiN58!e0S=1EC$p_DFPDl1BgW!aJC8lOhyk1 zkmp;sbe~Ur->204#ti+!6)EMm@e4T`pOD9m9}KYU$s|&Wnvz>2NV8*hw7ns`lWGW* zcCEDe{_H7P7WJA=Dkhg!+RUG#sSJE4R1yEk_)hqTfQUJ2r5`qF;Dn$FX6qNLvt`DR zUhau+U^K@TkN8MO-!{_og-#MYC{U8(r^@W~RCy~mM@p9!OWCRwvSDqRj*aWfWz&Xr zI@Yc(RcHYhh#5us3#DLDp3KS4RHc0*Wv0YNO_E6yLS@{rAQ{l(MQPp4GL_Be7laSc z??Mp)sSzq~7>AUG?~ge>k*C{_^SD3Lz0ppuD(yiI%t>E=-i( zPq(@b#-G-ISRQXs&pn=KSYH@zn>3QAA8RJhw{0!mI<}X-eqChn>;5u&aG*p^7^h=a zT8gA6C+bL^K273dqGaln$r2tiQbrF9kbpj~NcT=1rE|Ns()O`t(!61PHIEH|9J{w^ zE=QLntB=dV@w*RJRme92BOs#wfcRzkY>lY0yMshNn~>@C!-BBg!-?d8#6&7$%vwugHWYU&sDHHt_-?P+s0sq7(Vtx*XX( zH&&kd$)j!}1t0R+6(jeMkaqlV(!*hktlvIdW}dZeL(*|K4Md941!()6LadgQhl z&Feob44&JfK|Ot(`^_GzdmVV55VrXL_bZ7REax}oYQo<-=MAdtd>8y)10w2=6+q;e zKn`li24;d;1hv@mL@C>;a$B^_uUheMH)T;Nj5e%4rOKv!dazp+P1zgQ?;~f%WW+=> zCMpSTCN5Pne?3Z4ezWHDh@hHC6h=U zbgLq@ljPYvn??~eBznjsWwH{qA#X?2lwI_ug$1S^0S;98jo7Jx;&-(gG=qsJ& zSV^jyoa_!Ez(j=(Fmm4P*kA`e=Wf)HLWN_?Q><<} zxR`dpxH%(SdbVjM0j(R$nCE>Zq*FTydA_ZT>hOdNYWGv=->Q-HYSB<${z*OQ(6pgE z-}qsL4lti>RA0w)O&Tbu9h%gaXPY$C0mRQddJSaEUQZC8ZS|zYj2bM5^JmIeYpr@x z0!mcms3IQQq;;=mlQO;`3k~W|wGbvL5oC5*kggy=!{%T1Fn+h+=0Td8R6{q2sG<$` zDjHQ}vSETzgNjL}fg6{JYU)sdk!T|@5O2Jhn7N&aTXo(ny4LI?D839c5aN4ieq-If?B4jErjkgbaPAxdgOrF0Zy~Ca*r( zMEd(S7k}T!_4vAP3kmRTA^o3zT!Pv?rXT}z-R+z$`@<0 zwQ>g2nrNv7;%4=0QFYWElbXc6$r)mjQb9wyf&dN4djd4%4L78WbJVb=)zA&&cbDf? zDa*Cc^gtC?O&y{g+SvC;;D%0b`{qy49NN*6BvlIIFOmQ^JL7>7btIz7_pnF_48NvZ*wDO@U`j~vWTx3?Nzx^nf7=M8TL ztsV17^M8JY-TbH^6B{5= zNX%0vIHn%EIq zr$os9H>T(jShr3Jku{?RO8&rJGJj|fSs61>_RgEE#n>m7q{*3*OyT&!f;jg^Wz?Ik zTPzf)Hb?dv((H=h6W;^%#+2s!?VV>8b!%^%*Z~^A;fzqF8D=7N@y^ z#Qfcr9wGbYOp$|gV&!0VtOEF6e3+``<|$+3oybwLH7Qi~W=Cm6^GLxAIk7lR&J<_r z__ScAygNHww>Yt-i*w{WSR4QlRbQ$(x~*(Ck^<^hSvG9o?TBqcECezh@+s9HVF9G*L+Y4va)13H;DY^y5Vd z8cijb0+4`oqBu>CEl!b--X$(m;H+*gSja!#l< zgLA`7)y7w)R$#^`AseG<2IZNmAWBMr=5L>$wYeJJ#Q;rZkZO|OhUtvIoH{P$Ge)|u zb3wn)p#qF_@&-mq;E1FGnTe#LG^itk+XO*0pIDl%z9mXZvnjfuz5iyUoLusTd|oQIUfKw5K=wE_hj(_LN4=mqO8#75MH_Sh253GcC*Lj;^pKj?dMvU&fxn}hq^4< z>H%6B7pScRt=;V|7z+~=MvbJp%HS{sQ5}w$tw73EsVEAdfEq}E#gvV)2U4S)E3(vo z{CveMIm_)8S?*}7iMn!BlXh{c9L$TA&1oU3VB51MXgw%Bbb#ylid0IL^)QNtfnV{ z7XmvRj}|7${`t}RJT5+i3CZh-=u!cLLIW4Dd#W_5h%$2?oa6OM7_LfB-ju6b@jZcX z_xuF;pRb)wzjqa~>U@}7z3O*um8kvEQ}bQ57Il+Vi)tdN*IvospX zOGyfBFZtpAvL<1e?3^`G8#7_P9>|MU$acRODLb<# zTFrnnLS@~|U|AkFSaL&qOLnlIw#*=aL@AyY9nhhzG(*8d0Rhl_J_~_SLRwzn6H-A0 zgr@s9je>W+87JSLIc0Mtydrl!XILE&d5&F8RLrxZD;G+!>-vhAscZ=%*Jcv_bbvEC zMkYQ0cn(q-C{^D0o-*ubb!0?`Ix@QRk7ayUABpJROrcB&cv_N!I!aDRPbrD+FDv4L zq$@19#3gM?qXX@wk87Lp;z~FN+RS6c+ zyOjVCSHU6*jL++trl5{=Q+l`qp}Jc4nMvvmsU1yJ)Daj@uU+gmQz;HdNtn#Q_`$+h zZN~_V6iowwCy)k;ZL=myNSDSknhynP)B?q~rS`eHp9=T~3Cx;2)tZcSw3%a2wV z6JGKWo-?}hj}$;)9@Dvr?3f)cK!`~Sa0WzR@tLE9_cCYb4P0gS?HWY|M$FXnJJw0*RQh@PYauk3^)@h)3q%=BT`Dkm0tt-d z?$#%dl+YKO$e^d|D3C@WfpS!*AKh@EetfQb50`twjVgwKn)&1K=X&Wdy(LNqRU7~NlYYk0y)U8;c*RRTr;1VjVlmdtT7&aat51&{#782a4x!@w8Ru8s`wts_D0 z>Pmk2YiMRpF19z9|&Fo9}1u<2@*2 zt1fsqdY)XmTw>>c*ngZjs*y!@tDB@hfe!*8rbrwZfy2NEgeG{xaaT^1OzhS|20mq} z96)*w9uIWE2Y~(C){)Q`n@QP>;hGKsK2HEKPccIY$f!R^shi6mG(j0EW~@A6Us)RI zFW+om=KyHZZx=3=+-R=f*N@q?7S(g{`R6z1i|u>-MA!d8VNZd+re#+vRa7itI1Pm!+zoX&~f?Ny_^f2+1X4 z67P0hfRu#4R?5Wm*MJPEiS8=ln-)n=4PvbD|lnOUHz58$m0ZZHfKzf^66H; zRI`oBY%n${4r8tw^V7iR?F*uUCLqH_a|p<+O&qR`e^Wze*Oywz^YV`zu5so1GVndu;FInn<)*g2vNt<*ud+61Trr60+^&B7)Jg0 z8+~sKfJ8(|%yS`_4+=8muV+p=0NxBh3qs1*{LDPH#nG2iKuKd@zuN(lY1E6`1-5@k84VN^o z&cw9ib0`G(`Fk5>*Sx91P7VMAG!pPA9@Q}1=CM^%2g;iGA@Y9ibd7@kRhZdd)=x_=+LLulZ4V65hZajova=|FdDznL34Z-sOqG#FY(2gW-zvAidm zbH8#c!GW+Mgyx|dogiO?>hS#9d-QS>R8M66W&u2XZU3%2+LB zbb>N91EA--THWF7-Kw!#lhKYU$alVQsl@RIJ&CE|+uFp~F;yK?)hswV7ap+YzctLr zU3+`SRCP>MwGJ*^Ip(A$?izNLe~=SZwKI^83RX_WJ@|{Gjy8kQQbDIw?H;gJt&dc7 zbbQC!>pMEWV6`~7FP^08c;SlEN7V!}YRl2_1@8;KZuul!MF7rDjt3n?@`4wy2Hf%l za9(hK{Q|C3hXdq;2Bc+%&U5mD_ZLsMbvBN<`TzxU8~|@?u0Iejc7VLkfxL8e1OKB3 zVlp`=dHcVB1LS=MqyymXPwEHx9o#@VDUZ9K@^DPh2N|83Id=<4-D>3ob!s}O;{aGQ zleo6MtEN53S=ID}wA=gZZ|bBWY8x*#{(U^mR!1d&=%V4MUyaXGTYUftWuaQf@g;BW zOY$3OWs{?Rwu0nte_6S7b)*BOSJc%5J|_Wxw`ZjDd37wMyj&s|uAH}>Px;;D-^c~J zB{<6Gpl~1k0`ADGWy01zzf!@wvQdLsSDp5R_tDgIPNk|}K*3ZqRu%Ku1La>@rsgqK zJUZw()h<>2tDV0+Xup7UZI7!X<-5!CdRYSJ?4e`r+lc3)=!cV2y7&dGu9L7P&} z`QFK2K)cfsnMFY_UQSj}tv!{%dQ5@EG-Ol-A7Gj1S*9fUP~Kys1^?w_{fw(u{hXl6 fo%|2p-h2HYtJ#2;>_LlT00000NkvXXu0mjf>_Z~_ literal 0 HcmV?d00001 diff --git a/src/components/MainFrame.tsx b/src/components/MainFrame.tsx index 1adcf9e..8d9f19c 100644 --- a/src/components/MainFrame.tsx +++ b/src/components/MainFrame.tsx @@ -16,7 +16,7 @@ const MainFrame: FC = ({ children }) => { - @@ -174,18 +179,16 @@ export const PaginationItems = (props: React.HTMLAttributes) => { return ( {({ pages }) => - pages.map((page, index) => { - return page.type === "ellipsis" ? ( - - ) : ( - - ); - }) + pages.map((page, index) => ( + + )) } ); -- 2.34.1 From d6ba0818c252476c0caca97a15ad246583fc796b Mon Sep 17 00:00:00 2001 From: "Pratham.Mandavkar" Date: Mon, 20 Jan 2025 13:09:25 +0530 Subject: [PATCH 10/13] UseForms --- dev-dist/sw.js | 2 +- package-lock.json | 1 - src/Contexts/GlobalStateProvider.tsx | 2 +- src/Pages/OnBoarding/LoginWithPass.tsx | 92 ++++++++++++-------------- src/Pages/Profile/Profile.tsx | 53 +++++++++++++-- src/index.css | 2 +- 6 files changed, 92 insertions(+), 60 deletions(-) diff --git a/dev-dist/sw.js b/dev-dist/sw.js index 21173fd..18ba53a 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.g1faafl9ja8" + "revision": "0.s3ua6eoia6o" }], {}); workbox.cleanupOutdatedCaches(); workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), { diff --git a/package-lock.json b/package-lock.json index 22e03c6..ac4ad4f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1668,7 +1668,6 @@ }, "node_modules/@clack/prompts/node_modules/is-unicode-supported": { "version": "1.3.0", - "extraneous": true, "inBundle": true, "license": "MIT", "engines": { diff --git a/src/Contexts/GlobalStateProvider.tsx b/src/Contexts/GlobalStateProvider.tsx index 1f2c713..9a839de 100644 --- a/src/Contexts/GlobalStateProvider.tsx +++ b/src/Contexts/GlobalStateProvider.tsx @@ -5,7 +5,7 @@ import GlobalStateContext from './GlobalStateContext'; const GlobalStateProvider = ({ children }:{children:ReactNode}) => { - const [isAuthenticate, setIsAuthenticate] = useState(true); + const [isAuthenticate, setIsAuthenticate] = useState(false); return ( diff --git a/src/Pages/OnBoarding/LoginWithPass.tsx b/src/Pages/OnBoarding/LoginWithPass.tsx index 96a8c3b..765cceb 100644 --- a/src/Pages/OnBoarding/LoginWithPass.tsx +++ b/src/Pages/OnBoarding/LoginWithPass.tsx @@ -1,5 +1,6 @@ import { Center, HStack, Image, Input, Text, VStack } from "@chakra-ui/react"; -import { useContext, useState } from "react"; +import { useContext } from "react"; +import { useForm } from "react-hook-form"; import GlobalStateContext from "../../Contexts/GlobalStateContext"; import logo from "../../assets/logo.svg"; import { Button } from "../../components/ui/button"; @@ -8,9 +9,11 @@ import { NavLink, useNavigate } from "react-router-dom"; import { Field } from "../../components/ui/field"; const LoginWithPass = () => { - const [isLoading, setIsLoading] = useState(false); - const [mobileNumber, setMobileNumber] = useState(""); - const [password, setPassword] = useState(""); + const { + register, + handleSubmit, + formState: { errors }, + } = useForm(); const context = useContext(GlobalStateContext); const navigate = useNavigate(); @@ -20,44 +23,13 @@ const LoginWithPass = () => { const { setIsAuthenticate } = context; - // Validation functions - const validateMobileNumber = (mobile: string) => { - if (!mobile) { - return "Mobile Number is required"; - } - if (mobile.length !== 10) { - return "Mobile Number must be 10 digits long"; - } - return ""; - }; + const onSubmit = (data: { mobileNumber: string; password: string }) => { + const { mobileNumber, password } = data; - const validatePassword = (password: string) => { - if (!password) { - return "Password is required"; - } - if (password.length < 6) { - return "Password must be at least 6 characters long"; - } - return ""; - }; - - const onHandleSubmit = () => { - const mobileError = validateMobileNumber(mobileNumber); - const passwordError = validatePassword(password); - - if (mobileError || passwordError) { - toaster.create({ - title: mobileError || passwordError, - type: "error", - }); - return; - } - - setIsLoading(true); - if (mobileNumber === "1231239870" && password === " ") { + if (mobileNumber === "1231239870" && password === "admin@123") { navigate("/"); + setIsAuthenticate(true); } else { - setIsLoading(false); toaster.create({ title: "Invalid Credentials", type: "error", @@ -93,10 +65,7 @@ const LoginWithPass = () => { p={{ base: 4, md: 16 }} w={{ base: "100%", md: "50%" }} h={"100%"} - onSubmit={(e) => { - e.preventDefault(); - onHandleSubmit(); - }} + onSubmit={handleSubmit(onSubmit)} > { setMobileNumber(e.target.value)} + {...register("mobileNumber", { + required: "Mobile Number is required", + minLength: { + value: 10, + message: "Mobile Number must be 10 digits long", + }, + maxLength: { + value: 10, + message: "Mobile Number must be 10 digits long", + }, + })} placeholder="Enter your mobile number" /> + {errors.mobileNumber && ( + + {errors.mobileNumber.message} + + )} setPassword(e.target.value)} + {...register("password", { + required: "Password is required", + minLength: { + value: 6, + message: "Password must be at least 6 characters long", + }, + })} placeholder="Enter your password" /> - + {errors.password && ( + + {errors.password.message} + + )} + { - - Forgot password
diff --git a/src/Pages/Profile/Profile.tsx b/src/Pages/Profile/Profile.tsx index 3298d63..21fce8c 100644 --- a/src/Pages/Profile/Profile.tsx +++ b/src/Pages/Profile/Profile.tsx @@ -4,7 +4,7 @@ import mypfp from "../../assets/profile-Avtars/mypfp.png"; import { FaCamera } from "react-icons/fa"; import { Field } from "../../components/ui/field"; import { Button } from "../../components/ui/button"; - +import { Editable } from "@chakra-ui/react"; const Profile = () => { return ( @@ -27,16 +27,59 @@ const Profile = () => { - + + First Name + + + + + + + Last Name + + + + + + {/* - + */} - + {/* - + */} + + Phone Number + + + + + diff --git a/src/index.css b/src/index.css index 1a8109e..6b587a8 100644 --- a/src/index.css +++ b/src/index.css @@ -68,7 +68,7 @@ body{ /* Style the scrollbar thumb (the draggable part) */ ::-webkit-scrollbar-thumb { - background-color: #02A0A0; /* Gray color for the thumb */ + background-color: #f3f3f3; /* Gray color for the thumb */ border-radius: 10px; border: 3px solid #f1f1f1; /* Border around the thumb */ } -- 2.34.1 From 25e8ffe2855016e454e191c6f81bcdd843b7eca6 Mon Sep 17 00:00:00 2001 From: "Pratham.Mandavkar" Date: Mon, 20 Jan 2025 15:27:34 +0530 Subject: [PATCH 11/13] Array conversion --- src/Contexts/GlobalStateProvider.tsx | 2 +- .../DeactivatedAccounts.tsx | 92 +++++- .../RegisterUsers/RegisterUsers.tsx | 283 +----------------- src/Pages/Profile/Profile.tsx | 19 +- src/components/DataTable.tsx | 4 +- src/components/ui/pagination.tsx | 40 ++- 6 files changed, 139 insertions(+), 301 deletions(-) diff --git a/src/Contexts/GlobalStateProvider.tsx b/src/Contexts/GlobalStateProvider.tsx index 9a839de..1f2c713 100644 --- a/src/Contexts/GlobalStateProvider.tsx +++ b/src/Contexts/GlobalStateProvider.tsx @@ -5,7 +5,7 @@ import GlobalStateContext from './GlobalStateContext'; const GlobalStateProvider = ({ children }:{children:ReactNode}) => { - const [isAuthenticate, setIsAuthenticate] = useState(false); + const [isAuthenticate, setIsAuthenticate] = useState(true); return ( diff --git a/src/Pages/ManageUser/DeactivatedAccounts/DeactivatedAccounts.tsx b/src/Pages/ManageUser/DeactivatedAccounts/DeactivatedAccounts.tsx index 1b031a0..3cc0cd9 100644 --- a/src/Pages/ManageUser/DeactivatedAccounts/DeactivatedAccounts.tsx +++ b/src/Pages/ManageUser/DeactivatedAccounts/DeactivatedAccounts.tsx @@ -1,11 +1,91 @@ -import MainFrame from '../../../components/MainFrame' +import { + Box, + HStack, + Input, + Text +} from "@chakra-ui/react"; +import { LuSearch } from "react-icons/lu"; +import DataTable from "../../../components/DataTable"; +import MainFrame from "../../../components/MainFrame"; +import { InputGroup } from "../../../components/ui/input-group"; +import { + PaginationItems, + PaginationNextTrigger, + PaginationPrevTrigger, + PaginationRoot, +} from "../../../components/ui/pagination"; +import { Switch } from "../../../components/ui/switch"; + +const tableHeadRow = [ + "Sr. No", + "First Name", + "Last Name", + "Company name", + "Activate/Deactivate", +]; + +const usersData = [ + ...Array.from({ length: 10 }, (_, i) => ({ + "Sr. No": i + 1, + "First Name": "Ritesh", + "Last Name": "Joshi", + "Company name": "WDI", + "Activate/Deactivate": ( + + Yes + + No + + ), + })), +]; const DeactivatedAccounts = () => { return ( - - - ) -} + + + Registered Users + -export default DeactivatedAccounts \ No newline at end of file + + } + w="100%" + color="#000" + > + + + + + + + + + + + + + + + + ); +}; + +export default DeactivatedAccounts; diff --git a/src/Pages/ManageUser/RegisterUsers/RegisterUsers.tsx b/src/Pages/ManageUser/RegisterUsers/RegisterUsers.tsx index cfb797d..a3b40dc 100644 --- a/src/Pages/ManageUser/RegisterUsers/RegisterUsers.tsx +++ b/src/Pages/ManageUser/RegisterUsers/RegisterUsers.tsx @@ -2,26 +2,21 @@ import { Box, HStack, Input, - Stack, - Table, - Text, - VStack, + Text } from "@chakra-ui/react"; +import { CiEdit } from "react-icons/ci"; +import { FaRegEye } from "react-icons/fa"; +import { LuSearch } from "react-icons/lu"; +import { RiDeleteBin5Line } from "react-icons/ri"; +import DataTable from "../../../components/DataTable"; import MainFrame from "../../../components/MainFrame"; import { InputGroup } from "../../../components/ui/input-group"; -import { LuSearch } from "react-icons/lu"; -import DataTable from "../../../components/DataTable"; -import { Switch } from "../../../components/ui/switch"; -import { Button } from "../../../components/ui/button"; -import { FaRegEye } from "react-icons/fa"; -import { CiEdit } from "react-icons/ci"; -import { RiDeleteBin5Line } from "react-icons/ri"; import { PaginationItems, PaginationNextTrigger, - PaginationPrevTrigger, - PaginationRoot, + PaginationRoot } from "../../../components/ui/pagination"; +import { Switch } from "../../../components/ui/switch"; // Table setup const tableHeadRow = [ @@ -37,8 +32,8 @@ const tableHeadRow = [ ]; const usersData: any[] = [ - { - "Sr. No": 1, + ...Array.from({ length: 10 }, (_, i) => ({ + "Sr. No": i + 1, "First Name": "Ritesh", "Mobile number": "9876543210", Gender: "Male", @@ -59,260 +54,7 @@ const usersData: any[] = [ ), - }, - { - "Sr. No": 2, - "First Name": "Ritesh", - "Mobile number": "9876543210", - Gender: "Male", - DOB: "15-01-1990", - "Type of User": "Admin", - Language: "English", - "Activate/Deactivate": ( - - Yes - - No - - ), - Action: ( - - - - - - ), - }, - { - "Sr. No": 3, - "First Name": "Ritesh", - "Mobile number": "9876543210", - Gender: "Male", - DOB: "15-01-1990", - "Type of User": "Admin", - Language: "English", - "Activate/Deactivate": ( - - Yes - - No - - ), - Action: ( - - - - - - ), - }, - { - "Sr. No": 4, - "First Name": "Ritesh", - "Mobile number": "9876543210", - Gender: "Male", - DOB: "15-01-1990", - "Type of User": "Admin", - Language: "English", - "Activate/Deactivate": ( - - Yes - - No - - ), - Action: ( - - - - - - ), - }, - { - "Sr. No": 5, - "First Name": "Ritesh", - "Mobile number": "9876543210", - Gender: "Male", - DOB: "15-01-1990", - "Type of User": "Admin", - Language: "English", - "Activate/Deactivate": ( - - Yes - - No - - ), - Action: ( - - - - - - ), - }, - { - "Sr. No": 6, - "First Name": "Ritesh", - "Mobile number": "9876543210", - Gender: "Male", - DOB: "15-01-1990", - "Type of User": "Admin", - Language: "English", - "Activate/Deactivate": ( - - Yes - - No - - ), - Action: ( - - - - - - ), - }, - { - "Sr. No": 6, - "First Name": "Ritesh", - "Mobile number": "9876543210", - Gender: "Male", - DOB: "15-01-1990", - "Type of User": "Admin", - Language: "English", - "Activate/Deactivate": ( - - Yes - - No - - ), - Action: ( - - - - - - ), - }, - { - "Sr. No": 7, - "First Name": "Ritesh", - "Mobile number": "9876543210", - Gender: "Male", - DOB: "15-01-1990", - "Type of User": "Admin", - Language: "English", - "Activate/Deactivate": ( - - Yes - - No - - ), - Action: ( - - - - - - ), - }, - { - "Sr. No": 7, - "First Name": "Ritesh", - "Mobile number": "9876543210", - Gender: "Male", - DOB: "15-01-1990", - "Type of User": "Admin", - Language: "English", - "Activate/Deactivate": ( - - Yes - - No - - ), - Action: ( - - - - - - ), - }, - { - "Sr. No": 8, - "First Name": "Ritesh", - "Mobile number": "9876543210", - Gender: "Male", - DOB: "15-01-1990", - "Type of User": "Admin", - Language: "English", - "Activate/Deactivate": ( - - Yes - - No - - ), - Action: ( - - - - - - ), - }, - { - "Sr. No": 9, - "First Name": "Ritesh", - "Mobile number": "9876543210", - Gender: "Male", - DOB: "15-01-1990", - "Type of User": "Admin", - Language: "English", - "Activate/Deactivate": ( - - Yes - - No - - ), - Action: ( - - - - - - ), - }, - { - "Sr. No": 10, - "First Name": "Ritesh", - "Mobile number": "9876543210", - Gender: "Male", - DOB: "15-01-1990", - "Type of User": "Admin", - Language: "English", - "Activate/Deactivate": ( - - Yes - - No - - ), - Action: ( - - - - - - ), - }, + })), ]; const RegisterUsers = () => { @@ -352,13 +94,12 @@ const RegisterUsers = () => { pageSize={3} defaultPage={1} > - + {/* */} - ); }; diff --git a/src/Pages/Profile/Profile.tsx b/src/Pages/Profile/Profile.tsx index 21fce8c..0ef11fb 100644 --- a/src/Pages/Profile/Profile.tsx +++ b/src/Pages/Profile/Profile.tsx @@ -17,24 +17,27 @@ const Profile = () => { - + Jackson David - Employee ID: #1245679 + Employee ID: #1245679 - First Name + + First Name + @@ -42,7 +45,9 @@ const Profile = () => { - Last Name + + Last Name + { */} - Phone Number + + Phone Number + = ({ tableHeadRow, data }) => { - {tableHeadRow.map((item, index)=>{item})} + {tableHeadRow.map((item, index)=>{item})} @@ -22,7 +22,7 @@ const DataTable: React.FC = ({ tableHeadRow, data }) => { {data.map((item:any, index) => ( - {tableHeadRow.map((heading)=>{item[heading]} )} + {tableHeadRow.map((heading)=>{item[heading]} )} ))} diff --git a/src/components/ui/pagination.tsx b/src/components/ui/pagination.tsx index cccf059..930b004 100644 --- a/src/components/ui/pagination.tsx +++ b/src/components/ui/pagination.tsx @@ -10,11 +10,7 @@ import { usePaginationContext, } from "@chakra-ui/react"; import * as React from "react"; -import { - HiChevronLeft, - HiChevronRight, - HiMiniEllipsisHorizontal, -} from "react-icons/hi2"; +import { HiChevronLeft, HiChevronRight } from "react-icons/hi2"; import { LinkButton } from "./link-button"; interface ButtonVariantMap { @@ -43,7 +39,7 @@ export interface PaginationRootProps } const variantMap: Record = { - outline: { default: "ghost", ellipsis: "plain", current: "outline" }, + outline: { default: "ghost", ellipsis: "plain", current: "solid" }, solid: { default: "outline", ellipsis: "outline", current: "solid" }, subtle: { default: "ghost", ellipsis: "plain", current: "subtle" }, }; @@ -74,7 +70,7 @@ export const PaginationEllipsis = React.forwardRef< return ( ); @@ -92,7 +88,14 @@ export const PaginationItem = React.forwardRef< if (getHref) { return ( - + {props.value} ); @@ -101,10 +104,12 @@ export const PaginationItem = React.forwardRef< return ( @@ -125,6 +130,7 @@ export const PaginationPrevTrigger = React.forwardRef< href={previousPage != null ? getHref(previousPage) : undefined} variant={variantMap.default} size={size} + _hover={{ bg: "#02A0A0", color: "white" }} > @@ -153,8 +159,13 @@ export const PaginationNextTrigger = React.forwardRef< href={nextPage != null ? getHref(nextPage) : undefined} variant={variantMap.default} size={size} + borderRadius="94px" + bg="#02A0A0" + color="white" + w="136px" + _hover={{ bg: "#026060" }} > - + Next ); } @@ -164,11 +175,12 @@ export const PaginationNextTrigger = React.forwardRef< @@ -181,8 +193,6 @@ export const PaginationItems = (props: React.HTMLAttributes) => { {({ pages }) => pages.map((page, index) => ( Date: Mon, 20 Jan 2025 15:28:54 +0530 Subject: [PATCH 12/13] NN --- src/Pages/ManageUser/RegisterUsers/RegisterUsers.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Pages/ManageUser/RegisterUsers/RegisterUsers.tsx b/src/Pages/ManageUser/RegisterUsers/RegisterUsers.tsx index a3b40dc..e0e1807 100644 --- a/src/Pages/ManageUser/RegisterUsers/RegisterUsers.tsx +++ b/src/Pages/ManageUser/RegisterUsers/RegisterUsers.tsx @@ -41,14 +41,14 @@ const usersData: any[] = [ "Type of User": "Admin", Language: "English", "Activate/Deactivate": ( - + Yes No ), Action: ( - + -- 2.34.1 From 6a73d33cda311325b74d431d54eee2967f3f0fce Mon Sep 17 00:00:00 2001 From: "Pratham.Mandavkar" Date: Tue, 21 Jan 2025 12:14:28 +0530 Subject: [PATCH 13/13] N --- .../Component/DeleteConfirmationDialog.tsx | 82 ++++++++++++++++++ .../Component/EditRegisterUser.tsx | 77 ++++++++++++++++ .../RegisterUsers/RegisterUsers.tsx | 30 ++++--- src/assets/icons/delete.png | Bin 0 -> 2019 bytes 4 files changed, 177 insertions(+), 12 deletions(-) create mode 100644 src/Pages/ManageUser/RegisterUsers/Component/DeleteConfirmationDialog.tsx create mode 100644 src/Pages/ManageUser/RegisterUsers/Component/EditRegisterUser.tsx create mode 100644 src/assets/icons/delete.png diff --git a/src/Pages/ManageUser/RegisterUsers/Component/DeleteConfirmationDialog.tsx b/src/Pages/ManageUser/RegisterUsers/Component/DeleteConfirmationDialog.tsx new file mode 100644 index 0000000..88af6e8 --- /dev/null +++ b/src/Pages/ManageUser/RegisterUsers/Component/DeleteConfirmationDialog.tsx @@ -0,0 +1,82 @@ +import React from "react"; + +import { + DialogActionTrigger, + DialogCloseTrigger, + DialogContent, + DialogFooter, + DialogHeader, + DialogRoot, + DialogTitle, + DialogTrigger, +} from "../../../../components/ui/dialog"; +import { RiDeleteBin5Line } from "react-icons/ri"; +import { DialogBody, Image, Text } from "@chakra-ui/react"; +import { Button } from "../../../../components/ui/button"; +import DelteIcon from "../../../../assets/icons/delete.png"; + +interface DeleteConfirmationDialogProps { + onConfirm: () => void; +} + +const DeleteConfirmationDialog: React.FC = ({ + onConfirm, +}) => { + return ( + + + + + + + {/* Are you sure? */} + + + + + + Delete User + +

+ {" "} + Are you sure you want to delete this user +

+ + + + + + + + + + + ); +}; + +export default DeleteConfirmationDialog; diff --git a/src/Pages/ManageUser/RegisterUsers/Component/EditRegisterUser.tsx b/src/Pages/ManageUser/RegisterUsers/Component/EditRegisterUser.tsx new file mode 100644 index 0000000..e24a0e9 --- /dev/null +++ b/src/Pages/ManageUser/RegisterUsers/Component/EditRegisterUser.tsx @@ -0,0 +1,77 @@ +import React, { useRef } from "react"; +import { Input, Stack } from "@chakra-ui/react"; +import { Button } from "../../../../components/ui/button"; +import { + DialogActionTrigger, + DialogBody, + DialogContent, + DialogFooter, + DialogHeader, + DialogRoot, + DialogTitle, + DialogTrigger, +} from "../../../../components/ui/dialog"; +import { Field } from "../../../../components/ui/field"; +import { FaRegEye } from "react-icons/fa"; + +interface EditRegisterUser { + onConfirm: () => void; +} + +const EditRegisterUser: React.FC = ({ onConfirm }) => { + const ref = useRef(null); // Initialize the ref properly + + return ( +
+ ref.current}> + + + + + + Edit user Accounts + + + + + + + + + + + + + + + + + + + + + + + +
+ ); +}; + +export default EditRegisterUser; diff --git a/src/Pages/ManageUser/RegisterUsers/RegisterUsers.tsx b/src/Pages/ManageUser/RegisterUsers/RegisterUsers.tsx index e0e1807..ed37e1e 100644 --- a/src/Pages/ManageUser/RegisterUsers/RegisterUsers.tsx +++ b/src/Pages/ManageUser/RegisterUsers/RegisterUsers.tsx @@ -1,22 +1,19 @@ -import { - Box, - HStack, - Input, - Text -} from "@chakra-ui/react"; +import { Box, HStack, Input, Text } from "@chakra-ui/react"; import { CiEdit } from "react-icons/ci"; import { FaRegEye } from "react-icons/fa"; import { LuSearch } from "react-icons/lu"; -import { RiDeleteBin5Line } from "react-icons/ri"; import DataTable from "../../../components/DataTable"; import MainFrame from "../../../components/MainFrame"; import { InputGroup } from "../../../components/ui/input-group"; import { PaginationItems, PaginationNextTrigger, - PaginationRoot + PaginationRoot, } from "../../../components/ui/pagination"; import { Switch } from "../../../components/ui/switch"; +import { Button } from "../../../components/ui/button"; +import DeleteConfirmationDialog from "./Component/DeleteConfirmationDialog"; +import EditRegisterUser from "./Component/EditRegisterUser"; // Table setup const tableHeadRow = [ @@ -41,7 +38,7 @@ const usersData: any[] = [ "Type of User": "Admin", Language: "English", "Activate/Deactivate": ( - + Yes No @@ -49,9 +46,18 @@ const usersData: any[] = [ ), Action: ( - + {/* */} + { + console.log("User deleted:", i + 1); + }} + /> - + { + console.log("User deleted:", i + 1); + }} + /> ), })), @@ -87,6 +93,7 @@ const RegisterUsers = () => { + { defaultPage={1} > - {/* */} diff --git a/src/assets/icons/delete.png b/src/assets/icons/delete.png new file mode 100644 index 0000000000000000000000000000000000000000..383f0f0af79be69ceba8ebe58e17ea4a1e5d8415 GIT binary patch literal 2019 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 qm!9)IDJiwRPq{$Rp