ui rebuild

ui/src/app/app.routes.ts

@@ -9,9 +9,11 @@ export const routes: Routes = [
   },
   {
     path: '',
-    canActivate: [authGuard],
     loadComponent: () =>
-      import('./shared/components/layout.component').then((m) => m.LayoutComponent),
+      import('./shared/components/layout/layout.component').then(
+        (m) => m.LayoutComponent
+      ),
+    canActivate: [authGuard],
     children: [
       {
         path: '',
@@ -21,28 +23,59 @@ export const routes: Routes = [
       {
         path: 'dashboard',
         loadComponent: () =>
-          import('./features/dashboard/dashboard.component').then((m) => m.DashboardComponent),
+          import('./features/dashboard/dashboard.component').then(
+            (m) => m.DashboardComponent
+          ),
       },
       {
         path: 'services',
-        loadComponent: () =>
-          import('./features/services/services-list.component').then(
-            (m) => m.ServicesListComponent
-          ),
+        children: [
+          {
+            path: '',
+            loadComponent: () =>
+              import('./features/services/services-list.component').then(
+                (m) => m.ServicesListComponent
+              ),
+          },
+          {
+            path: 'create',
+            loadComponent: () =>
+              import('./features/services/service-create.component').then(
+                (m) => m.ServiceCreateComponent
+              ),
+          },
+          {
+            path: ':name',
+            loadComponent: () =>
+              import('./features/services/service-detail.component').then(
+                (m) => m.ServiceDetailComponent
+              ),
+          },
+        ],
       },
       {
-        path: 'services/new',
-        loadComponent: () =>
-          import('./features/services/service-create.component').then(
-            (m) => m.ServiceCreateComponent
-          ),
+        path: 'domains',
+        children: [
+          {
+            path: '',
+            loadComponent: () =>
+              import('./features/domains/domains.component').then(
+                (m) => m.DomainsComponent
+              ),
+          },
+          {
+            path: ':domain',
+            loadComponent: () =>
+              import('./features/domains/domain-detail.component').then(
+                (m) => m.DomainDetailComponent
+              ),
+          },
+        ],
       },
       {
-        path: 'services/:name',
+        path: 'dns',
         loadComponent: () =>
-          import('./features/services/service-detail.component').then(
-            (m) => m.ServiceDetailComponent
-          ),
+          import('./features/dns/dns.component').then((m) => m.DnsComponent),
       },
       {
         path: 'registries',
@@ -51,28 +84,17 @@ export const routes: Routes = [
             (m) => m.RegistriesComponent
           ),
       },
-      {
-        path: 'dns',
-        loadComponent: () =>
-          import('./features/dns/dns.component').then((m) => m.DnsComponent),
-      },
-      {
-        path: 'domains',
-        loadComponent: () =>
-          import('./features/domains/domains.component').then((m) => m.DomainsComponent),
-      },
-      {
-        path: 'domains/:domain',
-        loadComponent: () =>
-          import('./features/domains/domain-detail.component').then(
-            (m) => m.DomainDetailComponent
-          ),
-      },
       {
         path: 'settings',
         loadComponent: () =>
-          import('./features/settings/settings.component').then((m) => m.SettingsComponent),
+          import('./features/settings/settings.component').then(
+            (m) => m.SettingsComponent
+          ),
       },
     ],
   },
+  {
+    path: '**',
+    redirectTo: 'dashboard',
+  },
 ];