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 0000000..8b8ba46 Binary files /dev/null and b/src/assets/profile-Avtars/mypfp.png differ 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) => ( + + )) } );