Pull Request branch dev-clone to main #1

Merged
gitea merged 429 commits from dev-clone into main 2024-12-23 09:31:34 +00:00
6 changed files with 48 additions and 5 deletions
Showing only changes of commit 251d74d659 - Show all commits

View File

@ -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"

View File

@ -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,

View File

@ -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";