diff --git a/apps/frontend/src/modules/assessmentRequestManagement/modals/ConfirmModal.tsx b/apps/frontend/src/modules/assessmentRequest/modals/ConfirmModal.tsx similarity index 100% rename from apps/frontend/src/modules/assessmentRequestManagement/modals/ConfirmModal.tsx rename to apps/frontend/src/modules/assessmentRequest/modals/ConfirmModal.tsx diff --git a/apps/frontend/src/modules/assessmentRequestManagement/modals/CreateAssessmentRequestModal.tsx b/apps/frontend/src/modules/assessmentRequest/modals/CreateAssessmentRequestModal.tsx similarity index 100% rename from apps/frontend/src/modules/assessmentRequestManagement/modals/CreateAssessmentRequestModal.tsx rename to apps/frontend/src/modules/assessmentRequest/modals/CreateAssessmentRequestModal.tsx diff --git a/apps/frontend/src/modules/assessmentRequestManagement/queries/assessmentRequestQueries.ts b/apps/frontend/src/modules/assessmentRequest/queries/assessmentRequestQueries.ts similarity index 100% rename from apps/frontend/src/modules/assessmentRequestManagement/queries/assessmentRequestQueries.ts rename to apps/frontend/src/modules/assessmentRequest/queries/assessmentRequestQueries.ts diff --git a/apps/frontend/src/routeTree.gen.ts b/apps/frontend/src/routeTree.gen.ts index c0c2314..22543a9 100644 --- a/apps/frontend/src/routeTree.gen.ts +++ b/apps/frontend/src/routeTree.gen.ts @@ -18,10 +18,12 @@ import { Route as DashboardLayoutUsersIndexImport } from './routes/_dashboardLay import { Route as DashboardLayoutTimetableIndexImport } from './routes/_dashboardLayout/timetable/index' import { Route as DashboardLayoutDashboardIndexImport } from './routes/_dashboardLayout/dashboard/index' import { Route as DashboardLayoutAssessmentRequestIndexImport } from './routes/_dashboardLayout/assessmentRequest/index' +import { Route as DashboardLayoutAspectIndexImport } from './routes/_dashboardLayout/aspect/index' // Create Virtual Routes const IndexLazyImport = createFileRoute('/')() +const RegisterIndexLazyImport = createFileRoute('/register/')() const LogoutIndexLazyImport = createFileRoute('/logout/')() const LoginIndexLazyImport = createFileRoute('/login/')() const ForgotPasswordIndexLazyImport = createFileRoute('/forgot-password/')() @@ -41,6 +43,13 @@ const IndexLazyRoute = IndexLazyImport.update({ getParentRoute: () => rootRoute, } as any).lazy(() => import('./routes/index.lazy').then((d) => d.Route)) +const RegisterIndexLazyRoute = RegisterIndexLazyImport.update({ + path: '/register/', + getParentRoute: () => rootRoute, +} as any).lazy(() => + import('./routes/register/index.lazy').then((d) => d.Route), +) + const LogoutIndexLazyRoute = LogoutIndexLazyImport.update({ path: '/logout/', getParentRoute: () => rootRoute, @@ -94,6 +103,15 @@ const DashboardLayoutAssessmentRequestIndexRoute = ), ) +const DashboardLayoutAspectIndexRoute = DashboardLayoutAspectIndexImport.update( + { + path: '/aspect/', + getParentRoute: () => DashboardLayoutRoute, + } as any, +).lazy(() => + import('./routes/_dashboardLayout/aspect/index.lazy').then((d) => d.Route), +) + // Populate the FileRoutesByPath interface declare module '@tanstack/react-router' { @@ -140,6 +158,20 @@ declare module '@tanstack/react-router' { preLoaderRoute: typeof LogoutIndexLazyImport parentRoute: typeof rootRoute } + '/register/': { + id: '/register/' + path: '/register' + fullPath: '/register' + preLoaderRoute: typeof RegisterIndexLazyImport + parentRoute: typeof rootRoute + } + '/_dashboardLayout/aspect/': { + id: '/_dashboardLayout/aspect/' + path: '/aspect' + fullPath: '/aspect' + preLoaderRoute: typeof DashboardLayoutAspectIndexImport + parentRoute: typeof DashboardLayoutImport + } '/_dashboardLayout/assessmentRequest/': { id: '/_dashboardLayout/assessmentRequest/' path: '/assessmentRequest' @@ -176,6 +208,7 @@ declare module '@tanstack/react-router' { export const routeTree = rootRoute.addChildren({ IndexLazyRoute, DashboardLayoutRoute: DashboardLayoutRoute.addChildren({ + DashboardLayoutAspectIndexRoute, DashboardLayoutAssessmentRequestIndexRoute, DashboardLayoutDashboardIndexRoute, DashboardLayoutTimetableIndexRoute, @@ -185,6 +218,7 @@ export const routeTree = rootRoute.addChildren({ ForgotPasswordIndexLazyRoute, LoginIndexLazyRoute, LogoutIndexLazyRoute, + RegisterIndexLazyRoute, }) /* prettier-ignore-end */ @@ -200,7 +234,8 @@ export const routeTree = rootRoute.addChildren({ "/forgot-password/verify", "/forgot-password/", "/login/", - "/logout/" + "/logout/", + "/register/" ] }, "/": { @@ -209,6 +244,7 @@ export const routeTree = rootRoute.addChildren({ "/_dashboardLayout": { "filePath": "_dashboardLayout.tsx", "children": [ + "/_dashboardLayout/aspect/", "/_dashboardLayout/assessmentRequest/", "/_dashboardLayout/dashboard/", "/_dashboardLayout/timetable/", @@ -227,6 +263,13 @@ export const routeTree = rootRoute.addChildren({ "/logout/": { "filePath": "logout/index.lazy.tsx" }, + "/register/": { + "filePath": "register/index.lazy.tsx" + }, + "/_dashboardLayout/aspect/": { + "filePath": "_dashboardLayout/aspect/index.tsx", + "parent": "/_dashboardLayout" + }, "/_dashboardLayout/assessmentRequest/": { "filePath": "_dashboardLayout/assessmentRequest/index.tsx", "parent": "/_dashboardLayout" diff --git a/apps/frontend/src/routes/_dashboardLayout/assessmentRequest/index.lazy.tsx b/apps/frontend/src/routes/_dashboardLayout/assessmentRequest/index.lazy.tsx index 1a3503b..f2aa30f 100644 --- a/apps/frontend/src/routes/_dashboardLayout/assessmentRequest/index.lazy.tsx +++ b/apps/frontend/src/routes/_dashboardLayout/assessmentRequest/index.lazy.tsx @@ -1,13 +1,13 @@ import { useState } from "react"; -import { assessmentRequestQueryOptions } from "@/modules/assessmentRequestManagement/queries/assessmentRequestQueries"; +import { assessmentRequestQueryOptions } from "@/modules/assessmentRequest/queries/assessmentRequestQueries"; import PageTemplate from "@/components/PageTemplate"; import { createLazyFileRoute } from "@tanstack/react-router"; -import FormModal from "@/modules/assessmentRequestManagement/modals/CreateAssessmentRequestModal"; +import FormModal from "@/modules/assessmentRequest/modals/CreateAssessmentRequestModal"; import ExtractQueryDataType from "@/types/ExtractQueryDataType"; import { createColumnHelper } from "@tanstack/react-table"; import { Badge } from "@/shadcn/components/ui/badge"; import { Button } from "@/shadcn/components/ui/button"; -import StartAssessmentModal from "@/modules/assessmentRequestManagement/modals/ConfirmModal"; +import StartAssessmentModal from "@/modules/assessmentRequest/modals/ConfirmModal"; export const Route = createLazyFileRoute("/_dashboardLayout/assessmentRequest/")({ component: UsersPage, diff --git a/apps/frontend/src/routes/_dashboardLayout/assessmentRequest/index.tsx b/apps/frontend/src/routes/_dashboardLayout/assessmentRequest/index.tsx index 3eb169d..2cff5d2 100644 --- a/apps/frontend/src/routes/_dashboardLayout/assessmentRequest/index.tsx +++ b/apps/frontend/src/routes/_dashboardLayout/assessmentRequest/index.tsx @@ -1,4 +1,4 @@ -import { assessmentRequestQueryOptions } from "@/modules/assessmentRequestManagement/queries/assessmentRequestQueries" +import { assessmentRequestQueryOptions } from "@/modules/assessmentRequest/queries/assessmentRequestQueries" import { createFileRoute } from "@tanstack/react-router"; import { z } from "zod";