Harmonize app setup files (#407)

* fix: harmonize app setup files * fix: harmonize app setup files
onecx · Oct 29, 2024 · 0313e2d · 0313e2d
1 parent a22724f
commit 0313e2d
Show file tree

Hide file tree

Showing 8 changed files with 123 additions and 138 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -52,17 +52,17 @@
     "@ngrx/router-store": "^18.0.1",
     "@ngx-translate/core": "^15.0.0",
     "@ngx-translate/http-loader": "^8.0.0",
-    "@onecx/accelerator": "^5.20.1",
-    "@onecx/angular-accelerator": "^5.20.1",
-    "@onecx/angular-auth": "^5.20.1",
-    "@onecx/angular-integration-interface": "^5.20.1",
-    "@onecx/angular-remote-components": "^5.20.1",
-    "@onecx/angular-testing": "^5.20.1",
-    "@onecx/angular-webcomponents": "^5.20.1",
-    "@onecx/integration-interface": "^5.20.1",
-    "@onecx/keycloak-auth": "^5.20.1",
-    "@onecx/portal-integration-angular": "^5.20.1",
-    "@onecx/portal-layout-styles": "^5.20.1",
+    "@onecx/accelerator": "^5.22.0",
+    "@onecx/angular-accelerator": "^5.22.0",
+    "@onecx/angular-auth": "^5.22.0",
+    "@onecx/angular-integration-interface": "^5.22.0",
+    "@onecx/angular-remote-components": "^5.22.0",
+    "@onecx/angular-testing": "^5.22.0",
+    "@onecx/angular-webcomponents": "^5.22.0",
+    "@onecx/integration-interface": "^5.22.0",
+    "@onecx/keycloak-auth": "^5.22.0",
+    "@onecx/portal-integration-angular": "^5.22.0",
+    "@onecx/portal-layout-styles": "^5.22.0",
     "@webcomponents/webcomponentsjs": "^2.8.0",
     "file-saver": "^2.0.5",
     "keycloak-angular": "^16.0.1",

diff --git a/src/app/_ws-mixins.scss b/src/app/_ws-mixins.scss
@@ -180,8 +180,8 @@
     .p-autocomplete-panel .p-autocomplete-items .p-autocomplete-item {
       padding-top: 0.4rem;
       padding-bottom: 0.4rem;
-      &:nth-child(odd) {
-        background-color: #f8f9fa;
+      &:nth-child(even) {
+        background-color: var(--table-body-row-even-bg);
       }
     }
     .p-autocomplete-clear-icon {
@@ -388,50 +388,50 @@
 @mixin dataview-list-zebra-rows {
   :host ::ng-deep {
     .p-dataview-list .p-dataview-content .p-grid > div {
-      &:nth-child(odd) {
-        background-color: #f8f9fa;
+      &:nth-child(even) {
+        background-color: var(--table-body-row-even-bg);
       }
     }
   }
 }
 @mixin dataview-list-flex-zebra-rows {
   :host ::ng-deep {
     .p-dataview-list .p-dataview-content > div {
-      &:nth-child(odd) {
-        background-color: #f8f9fa;
+      &:nth-child(even) {
+        background-color: var(--table-body-row-even-bg);
       }
     }
   }
 }
 @mixin dropdown-zebra-rows {
   :host ::ng-deep {
-    .p-dropdown-panel .p-dropdown-items *:nth-child(odd) .p-dropdown-item {
-      background-color: #f8f9fa;
+    .p-dropdown-panel .p-dropdown-items *:nth-child(even) .p-dropdown-item {
+      background-color: var(--table-body-row-even-bg);
     }
   }
 }
 @mixin listbox-zebra-rows {
   :host ::ng-deep {
     .p-listbox:not(.p-disabled) .p-listbox-item:not(.p-highlight):not(.p-disabled) {
-      &:nth-child(odd) {
-        background-color: #f8f9fa;
+      &:nth-child(even) {
+        background-color: var(--table-body-row-even-bg);
       }
     }
   }
 }
 @mixin picklist-zebra-rows {
   :host ::ng-deep {
     .p-picklist-list li {
-      &:nth-child(odd) {
-        background-color: #f8f9fa;
+      &:nth-child(even) {
+        background-color: var(--table-body-row-even-bg);
       }
     }
   }
 }
 @mixin table-zebra-rows {
   :host ::ng-deep {
-    .p-datatable .p-datatable-tbody > tr:nth-child(odd) > td {
-      background-color: #f8f9fa;
+    .p-datatable .p-datatable-tbody > tr:nth-child(even) > td {
+      background-color: var(--table-body-row-even-bg);
     }
   }
 }

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -1,39 +1,39 @@
 import { APP_INITIALIZER, NgModule } from '@angular/core'
 import { CommonModule } from '@angular/common'
-import { HttpClient, HttpClientModule } from '@angular/common/http'
+import { HttpClient, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
 import { RouterModule, Routes } from '@angular/router'
 import { BrowserModule } from '@angular/platform-browser'
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
 import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core'
 
-import { translateServiceInitializer, PortalCoreModule } from '@onecx/portal-integration-angular'
+import { KeycloakAuthModule } from '@onecx/keycloak-auth'
 import { createTranslateLoader } from '@onecx/angular-accelerator'
 import { APP_CONFIG, AppStateService, UserService } from '@onecx/angular-integration-interface'
-import { KeycloakAuthModule } from '@onecx/keycloak-auth'
+import { translateServiceInitializer, PortalCoreModule } from '@onecx/portal-integration-angular'
 
-import { AppComponent } from './app.component'
 import { environment } from 'src/environments/environment'
+import { AppComponent } from './app.component'
 
 const routes: Routes = [
   {
     path: '',
     loadChildren: () => import('./workspace/workspace.module').then((m) => m.WorkspaceModule)
   }
 ]
+
 @NgModule({
   bootstrap: [AppComponent],
   declarations: [AppComponent],
   imports: [
     CommonModule,
     BrowserModule,
-    HttpClientModule,
-    KeycloakAuthModule,
     BrowserAnimationsModule,
+    KeycloakAuthModule,
+    PortalCoreModule.forRoot('onecx-workspace-ui'),
     RouterModule.forRoot(routes, {
       initialNavigation: 'enabledBlocking',
       enableTracing: true
     }),
-    PortalCoreModule.forRoot('onecx-workspace-ui'),
     TranslateModule.forRoot({
       isolate: true,
       loader: {
@@ -50,11 +50,12 @@ const routes: Routes = [
       useFactory: translateServiceInitializer,
       multi: true,
       deps: [UserService, TranslateService]
-    }
+    },
+    provideHttpClient(withInterceptorsFromDi())
   ]
 })
 export class AppModule {
   constructor() {
-    console.info('App Module constructor')
+    console.info('OneCX Workspace Module constructor')
   }
 }