Merge pull request #719 from liimaorg/feature/716-create-tags-angular

Settings -> Tags Angular Migration
liimaorg · Dec 18, 2023 · 829c06f · 829c06f
2 parents d78e1f6 + b5fc33e
commit 829c06f
Show file tree

Hide file tree

Showing 61 changed files with 1,352 additions and 984 deletions.
diff --git a/AMW_angular/io/angular.json b/AMW_angular/io/angular.json
@@ -32,7 +32,8 @@
               }
             ],
             "styles": [
-              "src/styles.scss"
+              "src/styles.scss",
+              "./node_modules/bootstrap-icons/font/bootstrap-icons.scss"
             ],
             "scripts": [
               "node_modules/codemirror/lib/codemirror.js",

diff --git a/AMW_angular/io/src/app/app-routing.module.ts b/AMW_angular/io/src/app/app-routing.module.ts
@@ -1,10 +1,19 @@
 import { Routes, RouterModule } from '@angular/router';
 import { NgModule } from '@angular/core';
 import { DeploymentsComponent } from './deployments/deployments.component';
+import {TagsComponent} from "./settings/tags/tags.component";
+import {SettingsComponent} from "./settings/settings.component";
 
 export const routes: Routes = [
   // default route only, the rest is done in module routing
-  { path: '', component: DeploymentsComponent }
+  { path: '', component: DeploymentsComponent },
+  {
+    path: 'settings',
+    component: SettingsComponent,
+    children: [
+      { path: 'tags', component: TagsComponent },
+    ],
+  },
 ];
 
 @NgModule({

diff --git a/AMW_angular/io/src/app/app.component.html b/AMW_angular/io/src/app/app.component.html
@@ -1,19 +1,13 @@
 <app-navigation [logoutUrl]="logoutUrl"></app-navigation>
 <div class="container-fluid h-100">
-  <div class="row bg-light" style="z-index: 9999;">
-    <div class="col">
-      <h4 class="pt-2 text-dark">
-        {{ (navigationStore.navigation$ | async).pageTitle }}
-      </h4>
-    </div>
-  </div>
+  <div class="row bg-light" style="z-index: 9999"></div>
   <main class="h-100">
     <div class="row h-100">
       <div class="col-auto p-0">
-      <app-navigation-sidebar
-        [navigation]="navigationStore.navigation$ | async"
-        (itemSelected)="navigateTo($event)"
-      ></app-navigation-sidebar>
+        <app-navigation-sidebar
+          [navigation]="navigationStore.navigation$ | async"
+          (itemSelected)="navigateTo($event)"
+        ></app-navigation-sidebar>
       </div>
       <div class="col h-100">
         <router-outlet></router-outlet>

diff --git a/AMW_angular/io/src/app/app.module.ts b/AMW_angular/io/src/app/app.module.ts
@@ -26,6 +26,7 @@ import { DeploymentsModule } from './deployments/deployments.module';
 import { NavigationStoreService } from './navigation/navigation-store.service';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { CodemirrorModule } from '@ctrl/ngx-codemirror';
+import { SettingsModule } from './settings/settings.module';
 
 // Application wide providers
 const APP_PROVIDERS = [NavigationStoreService];
@@ -43,13 +44,13 @@ const APP_PROVIDERS = [NavigationStoreService];
     DeploymentModule,
     DeploymentsModule,
     AuditviewModule,
-    PermissionModule,
     SettingModule,
     BaseModule,
     SharedModule,
     NavigationModule,
     NgbModule,
     CodemirrorModule,
+    SettingsModule,
   ],
   providers: [APP_PROVIDERS],
   bootstrap: [AppComponent],