From 63231e0181a44bdc05eb1f35cb422a1eefafc2d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrick=20Ha=C3=9Fel?= <git@patrick-hassel.de>
Date: Tue, 29 Oct 2024 11:26:30 +0100
Subject: [PATCH] speaking routes

---
 src/main/angular/src/app/api/User/user.service.ts     | 2 +-
 src/main/angular/src/app/api/group/GroupService.ts    | 2 +-
 src/main/angular/src/app/app.routes.ts                | 7 ++-----
 src/main/angular/src/app/pages/user/user.component.ts | 6 +++---
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/main/angular/src/app/api/User/user.service.ts b/src/main/angular/src/app/api/User/user.service.ts
index 9b0a562..411450d 100644
--- a/src/main/angular/src/app/api/User/user.service.ts
+++ b/src/main/angular/src/app/api/User/user.service.ts
@@ -49,7 +49,7 @@ export class UserService {
   }
 
   goto(user: UserPublic) {
-    this.router.navigate(['/User', {uuid: user.publicUuid}]);
+    this.router.navigate(['/User', user.publicUuid]);
   }
 
   refresh() {
diff --git a/src/main/angular/src/app/api/group/GroupService.ts b/src/main/angular/src/app/api/group/GroupService.ts
index 72c4ea0..c5f6ee5 100644
--- a/src/main/angular/src/app/api/group/GroupService.ts
+++ b/src/main/angular/src/app/api/group/GroupService.ts
@@ -63,7 +63,7 @@ export class GroupService {
   }
 
   goto(group: Group) {
-    this.router.navigate(['Group', {uuid: group.uuid}]);
+    this.router.navigate(['Group', group.uuid]);
   }
 
 }
diff --git a/src/main/angular/src/app/app.routes.ts b/src/main/angular/src/app/app.routes.ts
index 9ee9a7e..9f9718a 100644
--- a/src/main/angular/src/app/app.routes.ts
+++ b/src/main/angular/src/app/app.routes.ts
@@ -14,15 +14,12 @@ export const routes: Routes = [
   {path: 'VoltageDrop', component: VoltageDropComponent},
 
   {path: 'Groups', component: GroupsComponent},
-  {path: 'Group', component: GroupComponent},
+  {path: 'Group/:uuid', component: GroupComponent},
 
-  {path: 'User', component: UserComponent},
+  {path: 'User/:publicUuid', component: UserComponent},
 
   {path: 'Profile', component: ProfileComponent},
 
-  // historic
-  {path: 'Solar', redirectTo: '/SolarSystem'},
-
   // fallback
   {path: '**', redirectTo: '/SolarSystem'},
 ];
diff --git a/src/main/angular/src/app/pages/user/user.component.ts b/src/main/angular/src/app/pages/user/user.component.ts
index a7f52c7..57afdf0 100644
--- a/src/main/angular/src/app/pages/user/user.component.ts
+++ b/src/main/angular/src/app/pages/user/user.component.ts
@@ -29,9 +29,9 @@ export class UserComponent implements OnInit {
 
   ngOnInit(): void {
     this.activatedRoute.params.subscribe(params => {
-      const uuid = params['uuid'];
-      if (uuid) {
-        this.userService.getCommonByUuid(uuid, user => this.user = user);
+      const publicUuid = params['publicUuid'];
+      if (publicUuid) {
+        this.userService.getCommonByUuid(publicUuid, user => this.user = user);
       }
     });
   }