fix duplicate singleton

frontend/src/app/routes/settings/settings.routing.module.ts

@@ -3,30 +3,50 @@ import { RouterModule } from '@angular/router';
 import { Permission } from 'picsur-shared/dist/dto/permissions';
 import { PermissionGuard } from 'src/app/guards/permission.guard';
 import { PRoutes } from 'src/app/models/picsur-routes';
-import { SettingsGeneralRouteModule } from './settings-general/settings-home.module';
+import { SidebarResolverService } from 'src/app/services/sidebar-resolver/sidebar-resolver.service';
+import { SettingsGeneralRouteModule } from './settings-general/settings-general.module';
 import { SettingsSidebarComponent } from './settings-sidebar/settings-sidebar.component';
+import { SettingsSysprefRouteModule } from './settings-syspref/settings-syspref.module';
 
 const SettingsRoutes: PRoutes = [
   {
     path: '',
-    redirectTo: 'general',
-  },
-  {
-    path: 'general',
-    loadChildren: () => SettingsGeneralRouteModule,
-    canActivate: [PermissionGuard],
-    data: {
-      permissions: [Permission.Settings],
-      page: {
-        title: 'General',
-        icon: 'settings',
-        category: 'personal',
+    children: [
+      {
+        path: '',
+        redirectTo: 'general',
       },
+      {
+        path: 'general',
+        loadChildren: () => SettingsGeneralRouteModule,
+        data: {
+          permissions: [Permission.Settings],
+          page: {
+            title: 'General',
+            icon: 'settings',
+            category: 'personal',
+          },
+        },
+      },
+      {
+        path: 'general',
+        loadChildren: () => SettingsSysprefRouteModule,
+        data: {
+          permissions: [Permission.SysPrefManage],
+          page: {
+            title: 'Sys Preferences',
+            icon: 'settings',
+            category: 'system',
+          },
+        },
+      },
+    ],
+    canActivate: [PermissionGuard],
+    canActivateChild: [PermissionGuard],
+    data: {
+      sidebar: SettingsSidebarComponent,
     },
-  },
-  {
-    path: 'sidebar',
-    component: SettingsSidebarComponent,
+    resolve: SidebarResolverService.build(),
   },
 ];
 
@@ -41,7 +61,7 @@ export class SettingsRoutingModule {
       providers: [
         {
           provide: 'SettingsRoutes',
-          useFactory: () => SettingsRoutes,
+          useFactory: () => SettingsRoutes[0].children,
         },
       ],
     };