Merge branch 'feature/BETERAN-BACKEND-APP-BROWSER-init' of https://gitlab.loafle.net/bet/beteran-backend-app-browser into feature/BETERAN-BACKEND-APP-BROWSER-init

src/app/mock-api/common/navigation/data.ts

@@ -46,13 +46,6 @@ export const defaultNavigation: FuseNavigationItem[] = [
         icon: 'heroicons_outline:academic-cap',
         link: '/member/user',
       },
-      {
-        id: 'member.user_view',
-        title: 'User-view',
-        type: 'basic',
-        icon: 'heroicons_outline:academic-cap',
-        link: '/member/user/view',
-      },
     ],
   },
   {

src/app/modules/admin/member/user/components/list.component.html

@@ -225,7 +225,10 @@
                   </div>
                 </div>
                 <!-- id -->
-                <div class="hidden sm:block truncate">
+                <div
+                  class="hidden sm:block truncate"
+                  (click)="viewUserDetail(user.id)"
+                >
                   {{ user.id }}
                 </div>
 

src/app/modules/admin/member/user/components/list.component.ts

@@ -32,6 +32,7 @@ import { FuseConfirmationService } from '@fuse/services/confirmation';
 import { User } from '../models/user';
 import { UserPagination } from '../models/user-pagination';
 import { UserService } from '../services/user.service';
+import { Router } from '@angular/router';
 
 @Component({
   selector: 'user-list',
@@ -80,7 +81,8 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
     private _changeDetectorRef: ChangeDetectorRef,
     private _fuseConfirmationService: FuseConfirmationService,
     private _formBuilder: FormBuilder,
-    private _userService: UserService
+    private _userService: UserService,
+    private router: Router
   ) {}
 
   // -----------------------------------------------------------------------------------------------------
@@ -162,6 +164,10 @@ export class ListComponent implements OnInit, AfterViewInit, OnDestroy {
   // @ Public methods
   // -----------------------------------------------------------------------------------------------------
 
+  viewUserDetail(id: string): void {
+    let url: string = 'member/user/' + id;
+    this.router.navigateByUrl(url);
+  }
   // -----------------------------------------------------------------------------------------------------
   // @ Private methods
   // -----------------------------------------------------------------------------------------------------

src/app/modules/admin/member/user/user.routing.ts

@@ -3,7 +3,7 @@ import { Route } from '@angular/router';
 import { ListComponent } from 'app/modules/admin/member/user/components/list.component';
 import { ViewComponent } from 'app/modules/admin/member/user/components/view.component';
 
-import { UsersResolver } from './resolvers/user.resolver';
+import { UsersResolver, UserResolver } from './resolvers/user.resolver';
 
 export const userRoutes: Route[] = [
   {
@@ -14,7 +14,10 @@ export const userRoutes: Route[] = [
     },
   },
   {
-    path: 'view',
+    path: ':id',
     component: ViewComponent,
+    resolve: {
+      users: UserResolver,
+    },
   },
 ];

src/assets/i18n/en.json

@@ -3,7 +3,6 @@
   "Dashboards": "Dashboards",
   "Member": "Member",
   "User": "User",
-  "User-view": "User View",
   "Project": "Project",
   "Partner": "Partner",
   "Analytics": "Analytics",

src/assets/i18n/ko.json

@@ -3,7 +3,6 @@
   "Dashboards": "대쉬보드",
   "Member": "회원",
   "User": "사용자",
-  "User-view": "사용자 상세보기",
   "Project": "프로젝트",
   "Partner": "파트너",
   "Analytics": "Analytics",