Menu link update

src/app/components/shared/layout/full.component.ts

@@ -69,8 +69,8 @@ export class FullComponent implements OnInit, OnDestroy {
             (userData) => {
                 this.currentUser = userData;
                 if (this.currentUser.role === 'Admin') {
-                    //this.links = this.menuItems.getMenuItemsAdmin();
+                    this.links = this.menuItems.getMenuItemsAdmin();
-                    this.links = this.menuItems.getMenuItems();
+                    //this.links = this.menuItems.getMenuItems();
                 } else {
                     this.links = this.menuItems.getMenuItems();
                 }

src/app/components/shared/menu-items.ts

@@ -24,17 +24,21 @@ const MENUITEMSADMIN: Menu[] = [
     { parent: 'page', state: 'les-fleurs', type: 'link', name: 'Fleurs', icon: 'marijuana', desc: '' },
     { parent: 'page', state: 'les-resines', type: 'link', name: 'Résines', icon: 'butter', desc: '' },
     { parent: 'page', state: 'les-molecules', type: 'link', name: 'Molécules', icon: 'molecule', desc: '' },
-    { state: 'dashboard', type: 'link', name: 'Dashboard', icon: 'dashboard', icontype: 'mat', desc: '' },
+    { state: 'shydive', type: 'menu', name: 'Skydive', icon: 'dashboard', icontype: 'mat', desc: '' },
-    { state: 'logbook', type: 'link', name: 'Carnet de saut', icon: 'assignment_turned_in', icontype: 'mat', desc: '' },
+    { parent: 'shydive', state: 'dashboard', type: 'link', name: 'Dashboard', icon: 'dashboard', icontype: 'mat', desc: '' },
-    { state: 'aeronefs', type: 'link', name: 'Aéronefs', icon: 'flight', icontype: 'mat', desc: '' },
+    { parent: 'shydive', state: 'logbook', type: 'link', name: 'Carnet de saut', icon: 'assignment_turned_in', icontype: 'mat', desc: '' },
-    { state: 'dropzones', type: 'link', name: 'Drop Zones', icon: 'flight_takeoff', icontype: 'mat', desc: '' },
+    { parent: 'shydive', state: 'aeronefs', type: 'link', name: 'Aéronefs', icon: 'flight', icontype: 'mat', desc: '' },
-    { state: 'canopies', type: 'link', name: 'Voiles', icon: 'paragliding', icontype: 'mat', desc: '' },
+    { parent: 'shydive', state: 'dropzones', type: 'link', name: 'Drop Zones', icon: 'flight_takeoff', icontype: 'mat', desc: '' },
-    { state: 'jumps', type: 'link', name: 'Sauts', icon: 'filter_drama', icontype: 'mat', desc: '' },
+    { parent: 'shydive', state: 'canopies', type: 'link', name: 'Voiles', icon: 'paragliding', icontype: 'mat', desc: '' },
-    { state: 'calculator', type: 'link', name: 'Taille de voile', icon: 'calculate', icontype: 'mat', desc: '' },
+    { parent: 'shydive', state: 'jumps', type: 'link', name: 'Sauts', icon: 'filter_drama', icontype: 'mat', desc: '' },
+    { parent: 'shydive', state: 'calculator', type: 'link', name: 'Taille de voile', icon: 'calculate', icontype: 'mat', desc: '' },
     { state: 'qcm', type: 'menu', name: 'QCM Brevets', icon: 'rule_folder', icontype: 'mat', desc: '' },
     { parent: 'qcm', state: 'bpa', type: 'link', name: 'BPA', icon: 'rule', icontype: 'mat' },
     { parent: 'qcm', state: 'c', type: 'link', name: 'Brevet C', icon: 'rule', icontype: 'mat' },
-    { parent: 'qcm', state: 'd', type: 'link', name: 'Brevet D', icon: 'rule', icontype: 'mat' }
+    { parent: 'qcm', state: 'd', type: 'link', name: 'Brevet D', icon: 'rule', icontype: 'mat' },
+    { state: 'herowars', type: 'menu', name: 'Hero Wars', icon: 'military_tech', icontype: 'mat', desc: '' },
+    { parent: 'herowars', state: 'guildwar', type: 'link', name: 'Guild War', icon: 'military_tech', icontype: 'mat', desc: '' },
+    { parent: 'herowars', state: 'guildraid', type: 'link', name: 'Guild Raid', icon: 'military_tech', icontype: 'mat', desc: '' }
 ];
 
 const MENUITEMS: Menu[] = [

src/app/routes/auth.routes.ts

@@ -13,51 +13,11 @@ import {
 } from '@resolvers';
 
 export const AUTH_ROUTES: Routes = [
-    {
-        path: 'aeronefs',
-        component: AeronefsComponent,
-        canActivate: [ authGuard, adminGuard ],
-        resolve: {
-            aeronefsPageData: aeronefsPageResolver
-        }
-    },
-    {
-        path: 'calculator',
-        component: CalculatorComponent,
-        canActivate: [ authGuard ],
-        resolve: {
-            isAuthenticated: authResolver
-        }
-    },
-    {
-        path: 'canopies',
-        component: CanopiesComponent,
-        canActivate: [ authGuard, adminGuard ],
-        resolve: {
-            canopiesPageData: canopiesPageResolver
-        }
-    },
-    {
-        path: 'dashboard',
-        component: DashboardComponent,
-        canActivate: [ authGuard, adminGuard ],
-        resolve: {
-            isAuthenticated: authResolver
-        }
-    },
     {
         path: 'demo',
         component: DemoComponent,
         canActivate: [ authGuard ]
     },
-    {
-        path: 'dropzones',
-        component: DropzonesComponent,
-        canActivate: [ authGuard, adminGuard ],
-        resolve: {
-            dropZonesPageData: dropZonesPageResolver
-        }
-    },
     {
         path: 'herowars',
         component: HerowarsComponent,
@@ -73,31 +33,6 @@ export const AUTH_ROUTES: Routes = [
         component: HerowarsGuildraidComponent,
         canActivate: [ authGuard ]
     },
-    {
-        path: 'jumps',
-        component: JumpsComponent,
-        canActivate: [ authGuard, adminGuard ],
-        resolve: {
-            pageData: jumpsPageResolver
-        }
-    },
-    {
-        path: 'jump/:slug',
-        component: JumpComponent,
-        canActivate: [ authGuard, adminGuard ],
-        resolve: {
-            pageData: jumpResolver
-        }
-    },
-    {
-        path: 'logbook',
-        component: LogbookComponent,
-        canActivate: [ authGuard, adminGuard ],
-        resolve: {
-            isAuthenticated: authResolver,
-            lastjump: lastjumpResolver
-        }
-    },
     {
         path: 'page/:slug',
         component: PageComponent,
@@ -170,5 +105,75 @@ export const AUTH_ROUTES: Routes = [
         path: 'settings/credentials',
         component: CredentialsComponent,
         canActivate: [ authGuard ]
+    },
+    {
+        path: 'skydive',
+        component: DemoComponent,
+        canActivate: [ authGuard ]
+    },
+    {
+        path: 'skydive/aeronefs',
+        component: AeronefsComponent,
+        canActivate: [ authGuard, adminGuard ],
+        resolve: {
+            aeronefsPageData: aeronefsPageResolver
+        }
+    },
+    {
+        path: 'skydive/calculator',
+        component: CalculatorComponent,
+        canActivate: [ authGuard ],
+        resolve: {
+            isAuthenticated: authResolver
+        }
+    },
+    {
+        path: 'skydive/canopies',
+        component: CanopiesComponent,
+        canActivate: [ authGuard, adminGuard ],
+        resolve: {
+            canopiesPageData: canopiesPageResolver
+        }
+    },
+    {
+        path: 'skydive/dashboard',
+        component: DashboardComponent,
+        canActivate: [ authGuard, adminGuard ],
+        resolve: {
+            isAuthenticated: authResolver
+        }
+    },
+    {
+        path: 'skydive/dropzones',
+        component: DropzonesComponent,
+        canActivate: [ authGuard, adminGuard ],
+        resolve: {
+            dropZonesPageData: dropZonesPageResolver
+        }
+    },
+    {
+        path: 'skydive/jumps',
+        component: JumpsComponent,
+        canActivate: [ authGuard, adminGuard ],
+        resolve: {
+            pageData: jumpsPageResolver
+        }
+    },
+    {
+        path: 'skydive/jump/:slug',
+        component: JumpComponent,
+        canActivate: [ authGuard, adminGuard ],
+        resolve: {
+            pageData: jumpResolver
+        }
+    },
+    {
+        path: 'skydive/logbook',
+        component: LogbookComponent,
+        canActivate: [ authGuard, adminGuard ],
+        resolve: {
+            isAuthenticated: authResolver,
+            lastjump: lastjumpResolver
+        }
     }
 ];