diff --git a/src/apps/admin/src/AdminApp.tsx b/src/apps/admin/src/AdminApp.tsx index 564392814..e255dad1d 100644 --- a/src/apps/admin/src/AdminApp.tsx +++ b/src/apps/admin/src/AdminApp.tsx @@ -3,7 +3,7 @@ import { Outlet, Routes } from 'react-router-dom' import { routerContext, RouterContextData } from '~/libs/core' -import { AdminAppContextProvider, Layout, SWRConfigProvider } from './lib' +import { AdminAppContextProvider, LayoutProps, SWRConfigProvider, useLayout } from './lib' import { toolTitle } from './admin-app.routes' import './lib/styles/index.scss' @@ -14,6 +14,7 @@ const AdminApp: FC = () => { const { getChildRoutes }: RouterContextData = useContext(routerContext) // eslint-disable-next-line react-hooks/exhaustive-deps -- missing dependency: getChildRoutes const childRoutes = useMemo(() => getChildRoutes(toolTitle), []) + const { Layout }: { Layout: FC } = useLayout() useEffect(() => { document.body.classList.add('admin-app') diff --git a/src/apps/admin/src/admin-app.routes.tsx b/src/apps/admin/src/admin-app.routes.tsx index 08e252429..b64649b3b 100644 --- a/src/apps/admin/src/admin-app.routes.tsx +++ b/src/apps/admin/src/admin-app.routes.tsx @@ -18,6 +18,7 @@ import { rootRoute, userManagementRouteId, } from './config/routes.config' +import { platformSkillRouteId } from './platform/routes.config' const AdminApp: LazyLoadedComponent = lazyLoad(() => import('./AdminApp')) @@ -111,6 +112,13 @@ const PermissionAddGroupMembersPage: LazyLoadedComponent = lazyLoad( ) const Platform: LazyLoadedComponent = lazyLoad(() => import('./platform/Platform')) +const SkillManagement: LazyLoadedComponent = lazyLoad( + () => import('./platform/skill-management/SkillManagement'), +) +const SkillManagementLandingPage: LazyLoadedComponent = lazyLoad( + () => import('./platform/skill-management/LandingPage'), + 'LandingPage', +) const BadgeDetailPage: LazyLoadedComponent = lazyLoad( () => import('../../gamification-admin/src/pages/badge-detail/BadgeDetailPage'), ) @@ -270,8 +278,22 @@ export const adminRoutes: ReadonlyArray = [ id: permissionManagementRouteId, route: permissionManagementRouteId, }, + + // Platform Management Module { children: [ + { + children: [ + { + element: , + id: 'skills-landing-page', + route: '', + }, + ], + element: , + id: platformSkillRouteId, + route: platformSkillRouteId, + }, { element: ( = props => <>{props.children} -export const Layout: FC = props => { - const { pathname }: { pathname: string } = useLocation() - const isPlatformPage = useMemo( - () => pathname.indexOf(platformRouteId) >= 0, - [pathname], - ) - - return ( - -
- - -
- {props.children} -
+export type LayoutProps = PropsWithChildren<{ + classes?: { // eslint-disable-line react/no-unused-prop-types -- it's actually used + contentClass?: string + innerClass?: string + outerClass?: string + layoutClass?: string + mainClass?: string + } +}> + +export const Layout: FC = props => ( + +
+ + +
+ {props.children}
- - ) +
+
+) + +export const PlatformLayout: FC = props => ( + + {props.children} + +) + +export const PlatformSkillsLayout: FC = props => ( + + {props.children} + +) + +export function useLayout(): { Layout: FC } { + const routerContextData: RouterContextData = useContext(routerContext) + + if (!routerContextData.initialized) return { Layout } + + const platformBaseRouteId = EnvironmentConfig.SUBDOMAIN === AppSubdomain.admin + ? `/${platformRouteId}` + : `/${AppSubdomain.admin}/${platformRouteId}` + + const skillManagementRouteId = EnvironmentConfig.SUBDOMAIN === AppSubdomain.admin + ? `/${platformRouteId}/${platformSkillRouteId}` + : `/${AppSubdomain.admin}/${platformRouteId}/${platformSkillRouteId}` + + if (window.location.pathname.toLowerCase() + .startsWith(skillManagementRouteId.toLowerCase())) { + return { Layout: PlatformSkillsLayout } + } + + if (window.location.pathname.toLowerCase() + .startsWith(platformBaseRouteId.toLowerCase())) { + return { Layout: PlatformLayout } + } + + return { Layout } } export default Layout diff --git a/src/apps/admin/src/lib/components/common/Tab/config/system-admin-tabs-config.ts b/src/apps/admin/src/lib/components/common/Tab/config/system-admin-tabs-config.ts index a3075d886..b3f1b0de2 100644 --- a/src/apps/admin/src/lib/components/common/Tab/config/system-admin-tabs-config.ts +++ b/src/apps/admin/src/lib/components/common/Tab/config/system-admin-tabs-config.ts @@ -10,6 +10,7 @@ import { platformRouteId, userManagementRouteId, } from '~/apps/admin/src/config/routes.config' +import { platformSkillRouteId } from '~/apps/admin/src/platform/routes.config' export const SystemAdminTabsConfig: TabsNavItem[] = [ { @@ -54,9 +55,15 @@ export const SystemAdminTabsConfig: TabsNavItem[] = [ }, { children: [ + { + + id: `${platformRouteId}/${platformSkillRouteId}`, + title: 'Skills', + }, { id: `${platformRouteId}/${gamificationAdminRouteId}`, title: 'Badges', + }, ], id: platformRouteId, diff --git a/src/apps/admin/src/platform-management/PlatformManagement.tsx b/src/apps/admin/src/platform-management/PlatformManagement.tsx new file mode 100644 index 000000000..e662b61c8 --- /dev/null +++ b/src/apps/admin/src/platform-management/PlatformManagement.tsx @@ -0,0 +1,34 @@ +import { FC, useContext, useMemo } from 'react' +import { Outlet, Routes } from 'react-router-dom' + +import { routerContext, RouterContextData } from '~/libs/core' + +import { adminRoutes } from '../admin-app.routes' +import { platformRouteId } from '../config/routes.config' + +/** + * The router outlet. + */ +export const PlatformManagement: FC = () => { + const childRoutes = useChildRoutes() + + return ( + <> + + {childRoutes} + + ) +} + +function useChildRoutes(): Array | undefined { + const { getRouteElement }: RouterContextData = useContext(routerContext) + const childRoutes = useMemo( + () => adminRoutes[0].children + ?.find(r => r.id === platformRouteId) + ?.children?.map(getRouteElement), + [], // eslint-disable-line react-hooks/exhaustive-deps -- missing dependency: getRouteElement + ) + return childRoutes +} + +export default PlatformManagement diff --git a/src/apps/admin/src/platform/routes.config.ts b/src/apps/admin/src/platform/routes.config.ts new file mode 100644 index 000000000..4a95b6fe8 --- /dev/null +++ b/src/apps/admin/src/platform/routes.config.ts @@ -0,0 +1 @@ +export const platformSkillRouteId = 'skills' diff --git a/src/apps/skills-manager/src/skills-manager/landing-page/LandingPage.module.scss b/src/apps/admin/src/platform/skill-management/LandingPage/LandingPage.module.scss similarity index 100% rename from src/apps/skills-manager/src/skills-manager/landing-page/LandingPage.module.scss rename to src/apps/admin/src/platform/skill-management/LandingPage/LandingPage.module.scss diff --git a/src/apps/skills-manager/src/skills-manager/landing-page/LandingPage.tsx b/src/apps/admin/src/platform/skill-management/LandingPage/LandingPage.tsx similarity index 88% rename from src/apps/skills-manager/src/skills-manager/landing-page/LandingPage.tsx rename to src/apps/admin/src/platform/skill-management/LandingPage/LandingPage.tsx index 3400b27f7..ca5c0487c 100644 --- a/src/apps/skills-manager/src/skills-manager/landing-page/LandingPage.tsx +++ b/src/apps/admin/src/platform/skill-management/LandingPage/LandingPage.tsx @@ -1,8 +1,8 @@ import { FC } from 'react' -import { ContentLayout, InputCheckbox, PageTitle } from '~/libs/ui' +import { InputCheckbox, PageTitle } from '~/libs/ui' -import { SkillsManagerContextValue, useSkillsManagerContext } from '../context' +import { SkillsManagerContextValue, useSkillsManagerContext } from '../lib/context' import { CategoriesAccordion, CategoryModal, @@ -10,8 +10,8 @@ import { PageHeader, SearchInput, SkillModal, -} from '../components' -import { BulkEditor } from '../components/bulk-editor' +} from '../lib/components' +import { BulkEditor } from '../lib/components/bulk-editor' import styles from './LandingPage.module.scss' @@ -30,7 +30,7 @@ const LandingPage: FC<{}> = () => { }: SkillsManagerContextValue = useSkillsManagerContext() return ( - +
Skills Manager | Admin = () => { )} {!!showSkillModal && } - +
) } diff --git a/src/apps/skills-manager/src/skills-manager/landing-page/index.ts b/src/apps/admin/src/platform/skill-management/LandingPage/index.ts similarity index 100% rename from src/apps/skills-manager/src/skills-manager/landing-page/index.ts rename to src/apps/admin/src/platform/skill-management/LandingPage/index.ts diff --git a/src/apps/admin/src/platform/skill-management/SkillManagement.tsx b/src/apps/admin/src/platform/skill-management/SkillManagement.tsx new file mode 100644 index 000000000..6e66d9795 --- /dev/null +++ b/src/apps/admin/src/platform/skill-management/SkillManagement.tsx @@ -0,0 +1,38 @@ +import { FC, useContext, useMemo } from 'react' +import { Outlet, Routes } from 'react-router-dom' + +import { routerContext, RouterContextData } from '~/libs/core' + +import { adminRoutes } from '../../admin-app.routes' +import { platformRouteId } from '../../config/routes.config' +import { platformSkillRouteId } from '../routes.config' + +import { SkillsManagerContext } from './lib/context' + +/** + * The router outlet. + */ +export const PlatformManagement: FC = () => { + const childRoutes = useChildRoutes() + + return ( + + + {childRoutes} + + ) +} + +function useChildRoutes(): Array | undefined { + const { getRouteElement }: RouterContextData = useContext(routerContext) + const childRoutes = useMemo( + () => adminRoutes[0].children + ?.find(r => r.id === platformRouteId) + ?.children?.find(r => r.id === platformSkillRouteId) + ?.children?.map(getRouteElement), + [], // eslint-disable-line react-hooks/exhaustive-deps -- missing dependency: getRouteElement + ) + return childRoutes +} + +export default PlatformManagement diff --git a/src/apps/skills-manager/src/skills-manager/components/accordion/Accordion.module.scss b/src/apps/admin/src/platform/skill-management/lib/components/accordion/Accordion.module.scss similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/accordion/Accordion.module.scss rename to src/apps/admin/src/platform/skill-management/lib/components/accordion/Accordion.module.scss diff --git a/src/apps/skills-manager/src/skills-manager/components/accordion/Accordion.tsx b/src/apps/admin/src/platform/skill-management/lib/components/accordion/Accordion.tsx similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/accordion/Accordion.tsx rename to src/apps/admin/src/platform/skill-management/lib/components/accordion/Accordion.tsx diff --git a/src/apps/skills-manager/src/skills-manager/components/accordion/accordion-item/AccordionItem.module.scss b/src/apps/admin/src/platform/skill-management/lib/components/accordion/accordion-item/AccordionItem.module.scss similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/accordion/accordion-item/AccordionItem.module.scss rename to src/apps/admin/src/platform/skill-management/lib/components/accordion/accordion-item/AccordionItem.module.scss diff --git a/src/apps/skills-manager/src/skills-manager/components/accordion/accordion-item/AccordionItem.tsx b/src/apps/admin/src/platform/skill-management/lib/components/accordion/accordion-item/AccordionItem.tsx similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/accordion/accordion-item/AccordionItem.tsx rename to src/apps/admin/src/platform/skill-management/lib/components/accordion/accordion-item/AccordionItem.tsx diff --git a/src/apps/skills-manager/src/skills-manager/components/accordion/accordion-item/index.ts b/src/apps/admin/src/platform/skill-management/lib/components/accordion/accordion-item/index.ts similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/accordion/accordion-item/index.ts rename to src/apps/admin/src/platform/skill-management/lib/components/accordion/accordion-item/index.ts diff --git a/src/apps/skills-manager/src/skills-manager/components/accordion/index.ts b/src/apps/admin/src/platform/skill-management/lib/components/accordion/index.ts similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/accordion/index.ts rename to src/apps/admin/src/platform/skill-management/lib/components/accordion/index.ts diff --git a/src/apps/skills-manager/src/skills-manager/components/actions-menu/ActionsMenu.module.scss b/src/apps/admin/src/platform/skill-management/lib/components/actions-menu/ActionsMenu.module.scss similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/actions-menu/ActionsMenu.module.scss rename to src/apps/admin/src/platform/skill-management/lib/components/actions-menu/ActionsMenu.module.scss diff --git a/src/apps/skills-manager/src/skills-manager/components/actions-menu/ActionsMenu.tsx b/src/apps/admin/src/platform/skill-management/lib/components/actions-menu/ActionsMenu.tsx similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/actions-menu/ActionsMenu.tsx rename to src/apps/admin/src/platform/skill-management/lib/components/actions-menu/ActionsMenu.tsx diff --git a/src/apps/skills-manager/src/skills-manager/components/actions-menu/index.ts b/src/apps/admin/src/platform/skill-management/lib/components/actions-menu/index.ts similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/actions-menu/index.ts rename to src/apps/admin/src/platform/skill-management/lib/components/actions-menu/index.ts diff --git a/src/apps/skills-manager/src/skills-manager/components/bulk-editor/BulkEditor.module.scss b/src/apps/admin/src/platform/skill-management/lib/components/bulk-editor/BulkEditor.module.scss similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/bulk-editor/BulkEditor.module.scss rename to src/apps/admin/src/platform/skill-management/lib/components/bulk-editor/BulkEditor.module.scss diff --git a/src/apps/skills-manager/src/skills-manager/components/bulk-editor/BulkEditor.tsx b/src/apps/admin/src/platform/skill-management/lib/components/bulk-editor/BulkEditor.tsx similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/bulk-editor/BulkEditor.tsx rename to src/apps/admin/src/platform/skill-management/lib/components/bulk-editor/BulkEditor.tsx diff --git a/src/apps/skills-manager/src/skills-manager/components/bulk-editor/archive-skills-modal/ArchiveSkillsModal.module.scss b/src/apps/admin/src/platform/skill-management/lib/components/bulk-editor/archive-skills-modal/ArchiveSkillsModal.module.scss similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/bulk-editor/archive-skills-modal/ArchiveSkillsModal.module.scss rename to src/apps/admin/src/platform/skill-management/lib/components/bulk-editor/archive-skills-modal/ArchiveSkillsModal.module.scss diff --git a/src/apps/skills-manager/src/skills-manager/components/bulk-editor/archive-skills-modal/ArchiveSkillsModal.tsx b/src/apps/admin/src/platform/skill-management/lib/components/bulk-editor/archive-skills-modal/ArchiveSkillsModal.tsx similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/bulk-editor/archive-skills-modal/ArchiveSkillsModal.tsx rename to src/apps/admin/src/platform/skill-management/lib/components/bulk-editor/archive-skills-modal/ArchiveSkillsModal.tsx diff --git a/src/apps/skills-manager/src/skills-manager/components/bulk-editor/archive-skills-modal/index.ts b/src/apps/admin/src/platform/skill-management/lib/components/bulk-editor/archive-skills-modal/index.ts similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/bulk-editor/archive-skills-modal/index.ts rename to src/apps/admin/src/platform/skill-management/lib/components/bulk-editor/archive-skills-modal/index.ts diff --git a/src/apps/skills-manager/src/skills-manager/components/bulk-editor/index.ts b/src/apps/admin/src/platform/skill-management/lib/components/bulk-editor/index.ts similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/bulk-editor/index.ts rename to src/apps/admin/src/platform/skill-management/lib/components/bulk-editor/index.ts diff --git a/src/apps/skills-manager/src/skills-manager/components/bulk-editor/move-skills-modal/MoveSkillsModal.module.scss b/src/apps/admin/src/platform/skill-management/lib/components/bulk-editor/move-skills-modal/MoveSkillsModal.module.scss similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/bulk-editor/move-skills-modal/MoveSkillsModal.module.scss rename to src/apps/admin/src/platform/skill-management/lib/components/bulk-editor/move-skills-modal/MoveSkillsModal.module.scss diff --git a/src/apps/skills-manager/src/skills-manager/components/bulk-editor/move-skills-modal/MoveSkillsModal.tsx b/src/apps/admin/src/platform/skill-management/lib/components/bulk-editor/move-skills-modal/MoveSkillsModal.tsx similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/bulk-editor/move-skills-modal/MoveSkillsModal.tsx rename to src/apps/admin/src/platform/skill-management/lib/components/bulk-editor/move-skills-modal/MoveSkillsModal.tsx diff --git a/src/apps/skills-manager/src/skills-manager/components/bulk-editor/move-skills-modal/index.ts b/src/apps/admin/src/platform/skill-management/lib/components/bulk-editor/move-skills-modal/index.ts similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/bulk-editor/move-skills-modal/index.ts rename to src/apps/admin/src/platform/skill-management/lib/components/bulk-editor/move-skills-modal/index.ts diff --git a/src/apps/skills-manager/src/skills-manager/components/bulk-editor/replace-skills-modal/ReplaceSkillsModal.module.scss b/src/apps/admin/src/platform/skill-management/lib/components/bulk-editor/replace-skills-modal/ReplaceSkillsModal.module.scss similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/bulk-editor/replace-skills-modal/ReplaceSkillsModal.module.scss rename to src/apps/admin/src/platform/skill-management/lib/components/bulk-editor/replace-skills-modal/ReplaceSkillsModal.module.scss diff --git a/src/apps/skills-manager/src/skills-manager/components/bulk-editor/replace-skills-modal/ReplaceSkillsModal.tsx b/src/apps/admin/src/platform/skill-management/lib/components/bulk-editor/replace-skills-modal/ReplaceSkillsModal.tsx similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/bulk-editor/replace-skills-modal/ReplaceSkillsModal.tsx rename to src/apps/admin/src/platform/skill-management/lib/components/bulk-editor/replace-skills-modal/ReplaceSkillsModal.tsx diff --git a/src/apps/skills-manager/src/skills-manager/components/bulk-editor/replace-skills-modal/index.ts b/src/apps/admin/src/platform/skill-management/lib/components/bulk-editor/replace-skills-modal/index.ts similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/bulk-editor/replace-skills-modal/index.ts rename to src/apps/admin/src/platform/skill-management/lib/components/bulk-editor/replace-skills-modal/index.ts diff --git a/src/apps/skills-manager/src/skills-manager/components/bulk-editor/search-skill-input/SearchSkillInput.tsx b/src/apps/admin/src/platform/skill-management/lib/components/bulk-editor/search-skill-input/SearchSkillInput.tsx similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/bulk-editor/search-skill-input/SearchSkillInput.tsx rename to src/apps/admin/src/platform/skill-management/lib/components/bulk-editor/search-skill-input/SearchSkillInput.tsx diff --git a/src/apps/skills-manager/src/skills-manager/components/bulk-editor/search-skill-input/index.ts b/src/apps/admin/src/platform/skill-management/lib/components/bulk-editor/search-skill-input/index.ts similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/bulk-editor/search-skill-input/index.ts rename to src/apps/admin/src/platform/skill-management/lib/components/bulk-editor/search-skill-input/index.ts diff --git a/src/apps/skills-manager/src/skills-manager/components/categories-accordion/CategoriesAccordion.module.scss b/src/apps/admin/src/platform/skill-management/lib/components/categories-accordion/CategoriesAccordion.module.scss similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/categories-accordion/CategoriesAccordion.module.scss rename to src/apps/admin/src/platform/skill-management/lib/components/categories-accordion/CategoriesAccordion.module.scss diff --git a/src/apps/skills-manager/src/skills-manager/components/categories-accordion/CategoriesAccordion.tsx b/src/apps/admin/src/platform/skill-management/lib/components/categories-accordion/CategoriesAccordion.tsx similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/categories-accordion/CategoriesAccordion.tsx rename to src/apps/admin/src/platform/skill-management/lib/components/categories-accordion/CategoriesAccordion.tsx diff --git a/src/apps/skills-manager/src/skills-manager/components/categories-accordion/index.ts b/src/apps/admin/src/platform/skill-management/lib/components/categories-accordion/index.ts similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/categories-accordion/index.ts rename to src/apps/admin/src/platform/skill-management/lib/components/categories-accordion/index.ts diff --git a/src/apps/skills-manager/src/skills-manager/components/category-modal/CategoryModal.module.scss b/src/apps/admin/src/platform/skill-management/lib/components/category-modal/CategoryModal.module.scss similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/category-modal/CategoryModal.module.scss rename to src/apps/admin/src/platform/skill-management/lib/components/category-modal/CategoryModal.module.scss diff --git a/src/apps/skills-manager/src/skills-manager/components/category-modal/CategoryModal.tsx b/src/apps/admin/src/platform/skill-management/lib/components/category-modal/CategoryModal.tsx similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/category-modal/CategoryModal.tsx rename to src/apps/admin/src/platform/skill-management/lib/components/category-modal/CategoryModal.tsx diff --git a/src/apps/skills-manager/src/skills-manager/components/category-modal/category-form.config.ts b/src/apps/admin/src/platform/skill-management/lib/components/category-modal/category-form.config.ts similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/category-modal/category-form.config.ts rename to src/apps/admin/src/platform/skill-management/lib/components/category-modal/category-form.config.ts diff --git a/src/apps/skills-manager/src/skills-manager/components/category-modal/index.ts b/src/apps/admin/src/platform/skill-management/lib/components/category-modal/index.ts similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/category-modal/index.ts rename to src/apps/admin/src/platform/skill-management/lib/components/category-modal/index.ts diff --git a/src/apps/skills-manager/src/skills-manager/components/index.ts b/src/apps/admin/src/platform/skill-management/lib/components/index.ts similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/index.ts rename to src/apps/admin/src/platform/skill-management/lib/components/index.ts diff --git a/src/apps/skills-manager/src/skills-manager/components/more-actions-menu/MoreActionsMenu.module.scss b/src/apps/admin/src/platform/skill-management/lib/components/more-actions-menu/MoreActionsMenu.module.scss similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/more-actions-menu/MoreActionsMenu.module.scss rename to src/apps/admin/src/platform/skill-management/lib/components/more-actions-menu/MoreActionsMenu.module.scss diff --git a/src/apps/skills-manager/src/skills-manager/components/more-actions-menu/MoreActionsMenu.tsx b/src/apps/admin/src/platform/skill-management/lib/components/more-actions-menu/MoreActionsMenu.tsx similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/more-actions-menu/MoreActionsMenu.tsx rename to src/apps/admin/src/platform/skill-management/lib/components/more-actions-menu/MoreActionsMenu.tsx diff --git a/src/apps/skills-manager/src/skills-manager/components/more-actions-menu/index.ts b/src/apps/admin/src/platform/skill-management/lib/components/more-actions-menu/index.ts similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/more-actions-menu/index.ts rename to src/apps/admin/src/platform/skill-management/lib/components/more-actions-menu/index.ts diff --git a/src/apps/skills-manager/src/skills-manager/components/page-header/PageHeader.module.scss b/src/apps/admin/src/platform/skill-management/lib/components/page-header/PageHeader.module.scss similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/page-header/PageHeader.module.scss rename to src/apps/admin/src/platform/skill-management/lib/components/page-header/PageHeader.module.scss diff --git a/src/apps/skills-manager/src/skills-manager/components/page-header/PageHeader.tsx b/src/apps/admin/src/platform/skill-management/lib/components/page-header/PageHeader.tsx similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/page-header/PageHeader.tsx rename to src/apps/admin/src/platform/skill-management/lib/components/page-header/PageHeader.tsx diff --git a/src/apps/skills-manager/src/skills-manager/components/page-header/index.ts b/src/apps/admin/src/platform/skill-management/lib/components/page-header/index.ts similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/page-header/index.ts rename to src/apps/admin/src/platform/skill-management/lib/components/page-header/index.ts diff --git a/src/apps/skills-manager/src/skills-manager/components/search-input/SearchInput.module.scss b/src/apps/admin/src/platform/skill-management/lib/components/search-input/SearchInput.module.scss similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/search-input/SearchInput.module.scss rename to src/apps/admin/src/platform/skill-management/lib/components/search-input/SearchInput.module.scss diff --git a/src/apps/skills-manager/src/skills-manager/components/search-input/SearchInput.tsx b/src/apps/admin/src/platform/skill-management/lib/components/search-input/SearchInput.tsx similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/search-input/SearchInput.tsx rename to src/apps/admin/src/platform/skill-management/lib/components/search-input/SearchInput.tsx diff --git a/src/apps/skills-manager/src/skills-manager/components/search-input/index.ts b/src/apps/admin/src/platform/skill-management/lib/components/search-input/index.ts similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/search-input/index.ts rename to src/apps/admin/src/platform/skill-management/lib/components/search-input/index.ts diff --git a/src/apps/skills-manager/src/skills-manager/components/skill-modals/SkillModal.module.scss b/src/apps/admin/src/platform/skill-management/lib/components/skill-modals/SkillModal.module.scss similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/skill-modals/SkillModal.module.scss rename to src/apps/admin/src/platform/skill-management/lib/components/skill-modals/SkillModal.module.scss diff --git a/src/apps/skills-manager/src/skills-manager/components/skill-modals/SkillModal.tsx b/src/apps/admin/src/platform/skill-management/lib/components/skill-modals/SkillModal.tsx similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/skill-modals/SkillModal.tsx rename to src/apps/admin/src/platform/skill-management/lib/components/skill-modals/SkillModal.tsx diff --git a/src/apps/skills-manager/src/skills-manager/components/skill-modals/index.ts b/src/apps/admin/src/platform/skill-management/lib/components/skill-modals/index.ts similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/skill-modals/index.ts rename to src/apps/admin/src/platform/skill-management/lib/components/skill-modals/index.ts diff --git a/src/apps/skills-manager/src/skills-manager/components/skill-modals/similar-skills-dropdown/SimilarSkillsDropdown.module.scss b/src/apps/admin/src/platform/skill-management/lib/components/skill-modals/similar-skills-dropdown/SimilarSkillsDropdown.module.scss similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/skill-modals/similar-skills-dropdown/SimilarSkillsDropdown.module.scss rename to src/apps/admin/src/platform/skill-management/lib/components/skill-modals/similar-skills-dropdown/SimilarSkillsDropdown.module.scss diff --git a/src/apps/skills-manager/src/skills-manager/components/skill-modals/similar-skills-dropdown/SimilarSkillsDropdown.tsx b/src/apps/admin/src/platform/skill-management/lib/components/skill-modals/similar-skills-dropdown/SimilarSkillsDropdown.tsx similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/skill-modals/similar-skills-dropdown/SimilarSkillsDropdown.tsx rename to src/apps/admin/src/platform/skill-management/lib/components/skill-modals/similar-skills-dropdown/SimilarSkillsDropdown.tsx diff --git a/src/apps/skills-manager/src/skills-manager/components/skill-modals/similar-skills-dropdown/index.ts b/src/apps/admin/src/platform/skill-management/lib/components/skill-modals/similar-skills-dropdown/index.ts similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/skill-modals/similar-skills-dropdown/index.ts rename to src/apps/admin/src/platform/skill-management/lib/components/skill-modals/similar-skills-dropdown/index.ts diff --git a/src/apps/skills-manager/src/skills-manager/components/skill-modals/skill-form/SkillForm.module.scss b/src/apps/admin/src/platform/skill-management/lib/components/skill-modals/skill-form/SkillForm.module.scss similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/skill-modals/skill-form/SkillForm.module.scss rename to src/apps/admin/src/platform/skill-management/lib/components/skill-modals/skill-form/SkillForm.module.scss diff --git a/src/apps/skills-manager/src/skills-manager/components/skill-modals/skill-form/SkillForm.tsx b/src/apps/admin/src/platform/skill-management/lib/components/skill-modals/skill-form/SkillForm.tsx similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/skill-modals/skill-form/SkillForm.tsx rename to src/apps/admin/src/platform/skill-management/lib/components/skill-modals/skill-form/SkillForm.tsx diff --git a/src/apps/skills-manager/src/skills-manager/components/skill-modals/skill-form/index.ts b/src/apps/admin/src/platform/skill-management/lib/components/skill-modals/skill-form/index.ts similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/skill-modals/skill-form/index.ts rename to src/apps/admin/src/platform/skill-management/lib/components/skill-modals/skill-form/index.ts diff --git a/src/apps/skills-manager/src/skills-manager/components/skills-list/SkillsList.module.scss b/src/apps/admin/src/platform/skill-management/lib/components/skills-list/SkillsList.module.scss similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/skills-list/SkillsList.module.scss rename to src/apps/admin/src/platform/skill-management/lib/components/skills-list/SkillsList.module.scss diff --git a/src/apps/skills-manager/src/skills-manager/components/skills-list/SkillsList.tsx b/src/apps/admin/src/platform/skill-management/lib/components/skills-list/SkillsList.tsx similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/skills-list/SkillsList.tsx rename to src/apps/admin/src/platform/skill-management/lib/components/skills-list/SkillsList.tsx diff --git a/src/apps/skills-manager/src/skills-manager/components/skills-list/index.ts b/src/apps/admin/src/platform/skill-management/lib/components/skills-list/index.ts similarity index 100% rename from src/apps/skills-manager/src/skills-manager/components/skills-list/index.ts rename to src/apps/admin/src/platform/skill-management/lib/components/skills-list/index.ts diff --git a/src/apps/skills-manager/src/skills-manager/config/constants.ts b/src/apps/admin/src/platform/skill-management/lib/config/constants.ts similarity index 100% rename from src/apps/skills-manager/src/skills-manager/config/constants.ts rename to src/apps/admin/src/platform/skill-management/lib/config/constants.ts diff --git a/src/apps/skills-manager/src/skills-manager/config/index.ts b/src/apps/admin/src/platform/skill-management/lib/config/index.ts similarity index 100% rename from src/apps/skills-manager/src/skills-manager/config/index.ts rename to src/apps/admin/src/platform/skill-management/lib/config/index.ts diff --git a/src/apps/skills-manager/src/skills-manager/context/index.ts b/src/apps/admin/src/platform/skill-management/lib/context/index.ts similarity index 100% rename from src/apps/skills-manager/src/skills-manager/context/index.ts rename to src/apps/admin/src/platform/skill-management/lib/context/index.ts diff --git a/src/apps/skills-manager/src/skills-manager/context/skills-manager.context.tsx b/src/apps/admin/src/platform/skill-management/lib/context/skills-manager.context.tsx similarity index 100% rename from src/apps/skills-manager/src/skills-manager/context/skills-manager.context.tsx rename to src/apps/admin/src/platform/skill-management/lib/context/skills-manager.context.tsx diff --git a/src/apps/skills-manager/src/skills-manager/context/use-skills-bulk-editor-context.tsx b/src/apps/admin/src/platform/skill-management/lib/context/use-skills-bulk-editor-context.tsx similarity index 100% rename from src/apps/skills-manager/src/skills-manager/context/use-skills-bulk-editor-context.tsx rename to src/apps/admin/src/platform/skill-management/lib/context/use-skills-bulk-editor-context.tsx diff --git a/src/apps/skills-manager/src/skills-manager/lib/index.ts b/src/apps/admin/src/platform/skill-management/lib/lib/index.ts similarity index 100% rename from src/apps/skills-manager/src/skills-manager/lib/index.ts rename to src/apps/admin/src/platform/skill-management/lib/lib/index.ts diff --git a/src/apps/skills-manager/src/skills-manager/lib/skills.utils.ts b/src/apps/admin/src/platform/skill-management/lib/lib/skills.utils.ts similarity index 100% rename from src/apps/skills-manager/src/skills-manager/lib/skills.utils.ts rename to src/apps/admin/src/platform/skill-management/lib/lib/skills.utils.ts diff --git a/src/apps/skills-manager/src/skills-manager/services/index.ts b/src/apps/admin/src/platform/skill-management/lib/services/index.ts similarity index 100% rename from src/apps/skills-manager/src/skills-manager/services/index.ts rename to src/apps/admin/src/platform/skill-management/lib/services/index.ts diff --git a/src/apps/skills-manager/src/skills-manager/services/skills-categories.service.ts b/src/apps/admin/src/platform/skill-management/lib/services/skills-categories.service.ts similarity index 100% rename from src/apps/skills-manager/src/skills-manager/services/skills-categories.service.ts rename to src/apps/admin/src/platform/skill-management/lib/services/skills-categories.service.ts diff --git a/src/apps/skills-manager/src/skills-manager/services/skills.service.ts b/src/apps/admin/src/platform/skill-management/lib/services/skills.service.ts similarity index 100% rename from src/apps/skills-manager/src/skills-manager/services/skills.service.ts rename to src/apps/admin/src/platform/skill-management/lib/services/skills.service.ts diff --git a/src/apps/platform/src/platform.routes.tsx b/src/apps/platform/src/platform.routes.tsx index b354da130..cfe671bc5 100644 --- a/src/apps/platform/src/platform.routes.tsx +++ b/src/apps/platform/src/platform.routes.tsx @@ -6,7 +6,6 @@ import { profilesRoutes } from '~/apps/profiles' import { talentSearchRoutes } from '~/apps/talent-search' import { accountsRoutes } from '~/apps/accounts' import { onboardingRoutes } from '~/apps/onboarding' -import { skillsManagerRoutes } from '~/apps/skills-manager' import { walletRoutes } from '~/apps/wallet' import { walletAdminRoutes } from '~/apps/wallet-admin' import { copilotsRoutes } from '~/apps/copilots' @@ -38,7 +37,6 @@ export const platformRoutes: Array = [ ...walletRoutes, ...walletAdminRoutes, ...accountsRoutes, - ...skillsManagerRoutes, ...homeRoutes, ...adminRoutes, ] diff --git a/src/apps/skills-manager/README.md b/src/apps/skills-manager/README.md deleted file mode 100644 index 02ce1d594..000000000 --- a/src/apps/skills-manager/README.md +++ /dev/null @@ -1 +0,0 @@ -# Admin App diff --git a/src/apps/skills-manager/index.tsx b/src/apps/skills-manager/index.tsx deleted file mode 100644 index 6f39cd49b..000000000 --- a/src/apps/skills-manager/index.tsx +++ /dev/null @@ -1 +0,0 @@ -export * from './src' diff --git a/src/apps/skills-manager/src/SkillsManagerApp.tsx b/src/apps/skills-manager/src/SkillsManagerApp.tsx deleted file mode 100644 index 42c521c7e..000000000 --- a/src/apps/skills-manager/src/SkillsManagerApp.tsx +++ /dev/null @@ -1,22 +0,0 @@ -import { FC, useContext } from 'react' -import { Outlet, Routes } from 'react-router-dom' - -import { routerContext, RouterContextData } from '~/libs/core' -import { SharedSwrConfig } from '~/libs/shared' - -import { toolTitle } from './skills-manager.routes' - -const SkillsManagerApp: FC<{}> = () => { - const { getChildRoutes }: RouterContextData = useContext(routerContext) - - return ( - - - - {getChildRoutes(toolTitle)} - - - ) -} - -export default SkillsManagerApp diff --git a/src/apps/skills-manager/src/index.ts b/src/apps/skills-manager/src/index.ts deleted file mode 100644 index 6b1936c79..000000000 --- a/src/apps/skills-manager/src/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -export { - skillsManagerRoutes, - rootRoute as skillsManagerRootRoute, -} from './skills-manager.routes' diff --git a/src/apps/skills-manager/src/skills-manager.routes.tsx b/src/apps/skills-manager/src/skills-manager.routes.tsx deleted file mode 100644 index 2ed9fc105..000000000 --- a/src/apps/skills-manager/src/skills-manager.routes.tsx +++ /dev/null @@ -1,34 +0,0 @@ -import { Navigate } from 'react-router-dom' - -import { lazyLoad, LazyLoadedComponent, PlatformRoute, UserRole } from '~/libs/core' -import { AppSubdomain, EnvironmentConfig, ToolTitle } from '~/config' - -import { skillsManagerRootRoute, skillsManagerRoutes as skillsManagerChildRoutes } from './skills-manager' - -const SkillsManagerApp: LazyLoadedComponent = lazyLoad(() => import('./SkillsManagerApp')) - -export const rootRoute: string = ( - EnvironmentConfig.SUBDOMAIN === AppSubdomain.skillsManager ? '' : `/${AppSubdomain.skillsManager}` -) - -export const toolTitle: string = ToolTitle.skillsManager -export const absoluteRootRoute: string = `${window.location.origin}${rootRoute}` - -export const skillsManagerRoutes: ReadonlyArray = [ - { - authRequired: true, - children: [ - ...skillsManagerChildRoutes, - { - element: , - id: 'Default SkillsManager Route', - route: '', - }, - ], - domain: AppSubdomain.skillsManager, - element: , - id: toolTitle, - rolesRequired: [UserRole.administrator], - route: rootRoute, - }, -] diff --git a/src/apps/skills-manager/src/skills-manager/SkillsManager.tsx b/src/apps/skills-manager/src/skills-manager/SkillsManager.tsx deleted file mode 100644 index b194d0edc..000000000 --- a/src/apps/skills-manager/src/skills-manager/SkillsManager.tsx +++ /dev/null @@ -1,22 +0,0 @@ -import { FC, useContext } from 'react' -import { Outlet, Routes } from 'react-router-dom' - -import { routerContext, RouterContextData } from '~/libs/core' - -import { skillsManagerRoutes } from './skills-manager.routes' -import { SkillsManagerContext } from './context' - -const SkillsManager: FC<{}> = () => { - const { getRouteElement }: RouterContextData = useContext(routerContext) - - return ( - - - - {skillsManagerRoutes.map(getRouteElement)} - - - ) -} - -export default SkillsManager diff --git a/src/apps/skills-manager/src/skills-manager/index.ts b/src/apps/skills-manager/src/skills-manager/index.ts deleted file mode 100644 index 563f214af..000000000 --- a/src/apps/skills-manager/src/skills-manager/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -export { - skillsManagerMainRoute as skillsManagerRoutes, - rootRoute as skillsManagerRootRoute, -} from './skills-manager.routes' diff --git a/src/apps/skills-manager/src/skills-manager/skills-manager.routes.tsx b/src/apps/skills-manager/src/skills-manager/skills-manager.routes.tsx deleted file mode 100644 index 04eea1c7f..000000000 --- a/src/apps/skills-manager/src/skills-manager/skills-manager.routes.tsx +++ /dev/null @@ -1,24 +0,0 @@ -import { lazyLoad, LazyLoadedComponent, PlatformRoute } from '~/libs/core' - -export const rootRoute: string = '/skills' - -const SkillsManager: LazyLoadedComponent = lazyLoad(() => import('./SkillsManager')) -const LandingPage: LazyLoadedComponent = lazyLoad(() => import('./landing-page'), 'LandingPage') - -export const skillsManagerRoutes: ReadonlyArray = [ - { - element: , - route: '', - }, -] - -export const skillsManagerMainRoute: ReadonlyArray = [ - { - children: [ - ...skillsManagerRoutes, - ], - element: , - id: 'Skills Manager', - route: rootRoute, - }, -] diff --git a/src/config/constants.ts b/src/config/constants.ts index 8b7b93ee1..b862beb0b 100644 --- a/src/config/constants.ts +++ b/src/config/constants.ts @@ -1,5 +1,4 @@ export enum AppSubdomain { - skillsManager = 'manage', accounts = 'account-settings', devCenter = 'devcenter', earn = 'earn', @@ -15,7 +14,6 @@ export enum AppSubdomain { } export enum ToolTitle { - skillsManager = 'Manage Skills', accounts = 'Account Settings', devCenter = 'Dev Center', earn = 'Opportunity Feed',