From a8f9aee8ff380dab3654c108b55e47d394191827 Mon Sep 17 00:00:00 2001 From: "Siddhesh.More" Date: Wed, 15 Jan 2025 19:46:50 +0530 Subject: [PATCH] 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 ( - +