client/admin/src/app/app.component.html

@@ -232,7 +232,8 @@
             <li>
               <a
                 class="w-full flex items-center gap-x-3.5 py-2 px-2.5 text-sm text-gray-800 rounded-lg hover:bg-gray-100 dark:hover:bg-neutral-700 dark:text-neutral-200 dark:hover:text-neutral-300"
-                routerLink="/home"
+                routerLink="/"
+                [routerLinkActiveOptions]="{ exact: true }"
                 routerLinkActive="btn-active"
               >
                 <ng-icon name="ionHome"></ng-icon>Home

client/admin/src/app/app.routes.ts

@@ -13,7 +13,6 @@ import { AuthGuard } from './auth.guard';
 export const routes: Routes = [
   { path: 'login', component: LoginComponent },
   { path: '', component: HomeComponent, canActivate: [AuthGuard] },
-  { path: '**', redirectTo: '' },
   { path: 'talkgroups', component: TalkgroupsComponent },
   { path: 'talkgroups/import', component: ImportComponent },
   { path: 'talkgroups/:sys/:tg', component: TalkgroupRecordComponent },

client/admin/src/app/auth.guard.ts

@@ -1,7 +1,10 @@
-import { CanActivateFn } from '@angular/router';
+import { Router, CanActivateFn } from '@angular/router';
+import { inject } from '@angular/core';
 
 export const AuthGuard: CanActivateFn = (route, state) => {
+  const router: Router = inject(Router);
   if (sessionStorage.getItem('jwt') == null) {
+    router.navigate(['/login']);
     return false;
   } else {
     return true;

client/admin/src/app/login/login.component.ts

@@ -30,7 +30,7 @@ export class LoginComponent {
       )
       .subscribe((event) => {
         if (event?.status == 200) {
-          this.router.navigateByUrl('/home');
+          this.router.navigateByUrl('/');
         } else {
           this.failed = true;
         }