diff --git a/apps/backend/src/drizzle/seeds/subAspectsSeeder.ts b/apps/backend/src/drizzle/seeds/subAspectsSeeder.ts index 7c082d2..d31c177 100644 --- a/apps/backend/src/drizzle/seeds/subAspectsSeeder.ts +++ b/apps/backend/src/drizzle/seeds/subAspectsSeeder.ts @@ -4,7 +4,9 @@ import { aspects } from "../schema/aspects"; import { eq, and } from "drizzle-orm"; const subAspectSeeder = async () => { - const subAspectsData: (typeof subAspects.$inferInsert & { aspectName: string })[] = [ + const subAspectsData: (typeof subAspects.$inferInsert & { + aspectName: string; + })[] = [ /////// Aspect 1 { name: "Kesadaran", @@ -114,7 +116,7 @@ const subAspectSeeder = async () => { aspectName: "Proteksi", }, { - name: "Manajemen Identitas dan Aset", + name: "Manajemen Identitas dan Akses", createdAt: new Date(), updatedAt: new Date(), deletedAt: null, diff --git a/apps/frontend/src/assets/logos/amati-logo-old.png b/apps/frontend/src/assets/logos/amati-logo-old.png new file mode 100644 index 0000000..bf15f56 Binary files /dev/null and b/apps/frontend/src/assets/logos/amati-logo-old.png differ diff --git a/apps/frontend/src/assets/logos/amati-logo.png b/apps/frontend/src/assets/logos/amati-logo.png index bf15f56..7f94e49 100644 Binary files a/apps/frontend/src/assets/logos/amati-logo.png and b/apps/frontend/src/assets/logos/amati-logo.png differ diff --git a/apps/frontend/src/components/AppHeader.tsx b/apps/frontend/src/components/AppHeader.tsx index 4f4f701..ebbf575 100644 --- a/apps/frontend/src/components/AppHeader.tsx +++ b/apps/frontend/src/components/AppHeader.tsx @@ -62,68 +62,78 @@ export default function AppHeader({ toggle }: Props) { )} - + {/* Conditional Navlinks */} {!isSuperAdmin && ( -
- {showAssessmentResultLinks && ( - <> - { - if (window.opener) { - window.close(); - } - }} - > - Permohonan Assessment - - - Hasil Assessment - - - )} +
+ {showAssessmentResultLinks && ( + <> + { + if (window.opener) { + window.close(); + } + }} + > + Permohonan Assessment + + + Hasil Assessment + + + )} - {showAssessmentLinks && ( - <> - { - if (window.opener) { - window.close(); - } - }} - > - Permohonan Assessment - - - Assessment - - - )} -
+ {showAssessmentLinks && ( + <> + { + if (window.opener) { + window.close(); + } + }} + > + Permohonan Assessment + + + Assessment + + + )} +
)} ) : ( - {user?.name?.charAt(0) ?? "A"} + + {user?.name?.charAt(0) ?? "A"} + )} diff --git a/apps/frontend/src/routeTree.gen.ts b/apps/frontend/src/routeTree.gen.ts index 6f7f054..9cb45df 100644 --- a/apps/frontend/src/routeTree.gen.ts +++ b/apps/frontend/src/routeTree.gen.ts @@ -16,6 +16,7 @@ import { Route as rootRoute } from './routes/__root' import { Route as VerifyingLayoutImport } from './routes/_verifyingLayout' import { Route as DashboardLayoutImport } from './routes/_dashboardLayout' import { Route as AssessmentLayoutImport } from './routes/_assessmentLayout' +import { Route as LoginIndexImport } from './routes/login/index' import { Route as VerifyingLayoutVerifyingIndexImport } from './routes/_verifyingLayout/verifying/index' import { Route as DashboardLayoutUsersIndexImport } from './routes/_dashboardLayout/users/index' import { Route as DashboardLayoutTimetableIndexImport } from './routes/_dashboardLayout/timetable/index' @@ -32,7 +33,6 @@ import { Route as AssessmentLayoutAssessmentIndexImport } from './routes/_assess const IndexLazyImport = createFileRoute('/')() const RegisterIndexLazyImport = createFileRoute('/register/')() const LogoutIndexLazyImport = createFileRoute('/logout/')() -const LoginIndexLazyImport = createFileRoute('/login/')() const ForgotPasswordIndexLazyImport = createFileRoute('/forgot-password/')() const ForgotPasswordVerifyLazyImport = createFileRoute( '/forgot-password/verify', @@ -72,11 +72,6 @@ const LogoutIndexLazyRoute = LogoutIndexLazyImport.update({ getParentRoute: () => rootRoute, } as any).lazy(() => import('./routes/logout/index.lazy').then((d) => d.Route)) -const LoginIndexLazyRoute = LoginIndexLazyImport.update({ - path: '/login/', - getParentRoute: () => rootRoute, -} as any).lazy(() => import('./routes/login/index.lazy').then((d) => d.Route)) - const ForgotPasswordIndexLazyRoute = ForgotPasswordIndexLazyImport.update({ path: '/forgot-password/', getParentRoute: () => rootRoute, @@ -84,6 +79,11 @@ const ForgotPasswordIndexLazyRoute = ForgotPasswordIndexLazyImport.update({ import('./routes/forgot-password/index.lazy').then((d) => d.Route), ) +const LoginIndexRoute = LoginIndexImport.update({ + path: '/login/', + getParentRoute: () => rootRoute, +} as any) + const ForgotPasswordVerifyLazyRoute = ForgotPasswordVerifyLazyImport.update({ path: '/forgot-password/verify', getParentRoute: () => rootRoute, @@ -222,6 +222,13 @@ declare module '@tanstack/react-router' { preLoaderRoute: typeof ForgotPasswordVerifyLazyImport parentRoute: typeof rootRoute } + '/login/': { + id: '/login/' + path: '/login' + fullPath: '/login' + preLoaderRoute: typeof LoginIndexImport + parentRoute: typeof rootRoute + } '/forgot-password/': { id: '/forgot-password/' path: '/forgot-password' @@ -229,13 +236,6 @@ declare module '@tanstack/react-router' { preLoaderRoute: typeof ForgotPasswordIndexLazyImport parentRoute: typeof rootRoute } - '/login/': { - id: '/login/' - path: '/login' - fullPath: '/login' - preLoaderRoute: typeof LoginIndexLazyImport - parentRoute: typeof rootRoute - } '/logout/': { id: '/logout/' path: '/logout' @@ -344,8 +344,8 @@ export const routeTree = rootRoute.addChildren({ VerifyingLayoutVerifyingIndexRoute, }), ForgotPasswordVerifyLazyRoute, + LoginIndexRoute, ForgotPasswordIndexLazyRoute, - LoginIndexLazyRoute, LogoutIndexLazyRoute, RegisterIndexLazyRoute, }) @@ -363,8 +363,8 @@ export const routeTree = rootRoute.addChildren({ "/_dashboardLayout", "/_verifyingLayout", "/forgot-password/verify", - "/forgot-password/", "/login/", + "/forgot-password/", "/logout/", "/register/" ] @@ -400,12 +400,12 @@ export const routeTree = rootRoute.addChildren({ "/forgot-password/verify": { "filePath": "forgot-password/verify.lazy.tsx" }, + "/login/": { + "filePath": "login/index.tsx" + }, "/forgot-password/": { "filePath": "forgot-password/index.lazy.tsx" }, - "/login/": { - "filePath": "login/index.lazy.tsx" - }, "/logout/": { "filePath": "logout/index.lazy.tsx" }, diff --git a/apps/frontend/src/routes/index.lazy.tsx b/apps/frontend/src/routes/index.lazy.tsx index 5f2829f..036da44 100644 --- a/apps/frontend/src/routes/index.lazy.tsx +++ b/apps/frontend/src/routes/index.lazy.tsx @@ -1,27 +1,17 @@ -import { createLazyFileRoute, useNavigate } from "@tanstack/react-router"; -import { useEffect } from "react"; +import { createLazyFileRoute, Navigate } from "@tanstack/react-router"; export const Route = createLazyFileRoute("/")({ component: HomePage, }); export default function HomePage() { - const navigate = useNavigate(); - const userRole = JSON.parse(localStorage.getItem('userRole') || '{}'); + const userRole = JSON.parse(localStorage.getItem("userRole") || "{}"); - useEffect(() => { - if (userRole === "super-admin") { - navigate({ - to: "/users", - replace: true, - }); - } else if (userRole === "user") { - navigate({ - to: "/assessmentRequest", - replace: true, - }); - } - }, [navigate]); - - return
index.lazy
; + return userRole === "super-admin" ? ( + + ) : userRole === "user" ? ( + + ) : ( + + ); } diff --git a/apps/frontend/src/routes/login/index.lazy.tsx b/apps/frontend/src/routes/login/index.tsx similarity index 97% rename from apps/frontend/src/routes/login/index.lazy.tsx rename to apps/frontend/src/routes/login/index.tsx index 8ea13fe..09fa3a1 100644 --- a/apps/frontend/src/routes/login/index.lazy.tsx +++ b/apps/frontend/src/routes/login/index.tsx @@ -1,4 +1,4 @@ -import { createLazyFileRoute, useNavigate } from "@tanstack/react-router"; +import { createFileRoute, useNavigate } from "@tanstack/react-router"; import { useMutation } from "@tanstack/react-query"; import { Input } from '@/shadcn/components/ui/input.tsx'; import { Button } from '@/shadcn/components/ui/button.tsx'; @@ -21,7 +21,7 @@ import useAuth from "@/hooks/useAuth"; import { TbArrowNarrowRight } from "react-icons/tb"; import amatilogo from "@/assets/logos/amati-logo.png"; -export const Route = createLazyFileRoute("/login/")({ +export const Route = createFileRoute("/login/")({ component: LoginPage, }); @@ -36,6 +36,7 @@ const formSchema = z.object({ }); export default function LoginPage() { + console.log("hii"); const [errorMessage, setErrorMessage] = useState(""); const navigate = useNavigate();