-

-
SAKAI
+

+
SAKAI
diff --git a/src/app/components/landing/landing.component.ts b/src/app/components/landing/landing.component.ts
index 5b75fa2..a178afa 100644
--- a/src/app/components/landing/landing.component.ts
+++ b/src/app/components/landing/landing.component.ts
@@ -1,4 +1,7 @@
import { Component, OnInit, OnDestroy } from '@angular/core';
+import { ConfigService } from '../../service/app.config.service';
+import { AppConfig } from '../../api/appconfig';
+import { Subscription } from 'rxjs';
@Component({
selector: 'app-landing',
templateUrl: './landing.component.html',
@@ -49,19 +52,25 @@ import { Component, OnInit, OnDestroy } from '@angular/core';
}
`]
})
-export class LandingComponent implements OnInit {
+export class LandingComponent implements OnInit, OnDestroy {
- themeElement: any;
+ config: AppConfig;
- constructor() { }
+ subscription: Subscription;
+
+ constructor(public configService: ConfigService) { }
ngOnInit(): void {
- this.themeElement = document.getElementById('theme-css');
- this.themeElement.setAttribute('href','assets/theme/saga-blue/theme.css');
+ this.config = this.configService.config;
+ this.subscription = this.configService.configUpdate$.subscribe(config => {
+ this.config = config;
+ });
}
ngOnDestroy(): void {
- this.themeElement.setAttribute('href', 'assets/theme/lara-light-indigo/theme.css');
+ if(this.subscription){
+ this.subscription.unsubscribe();
+ }
}
}
diff --git a/src/app/components/login/login.component.html b/src/app/components/login/login.component.html
index 24c5559..3b6922f 100644
--- a/src/app/components/login/login.component.html
+++ b/src/app/components/login/login.component.html
@@ -1,9 +1,9 @@
-

+
-
+
diff --git a/src/app/components/login/login.component.ts b/src/app/components/login/login.component.ts
index 81f11f3..0bca5d9 100644
--- a/src/app/components/login/login.component.ts
+++ b/src/app/components/login/login.component.ts
@@ -1,5 +1,7 @@
-import { Component, OnInit } from '@angular/core';
-
+import { Component, OnInit, OnDestroy } from '@angular/core';
+import { ConfigService } from '../../service/app.config.service';
+import { AppConfig } from '../../api/appconfig';
+import { Subscription } from 'rxjs';
@Component({
selector: 'app-login',
templateUrl: './login.component.html',
@@ -12,29 +14,38 @@ import { Component, OnInit } from '@angular/core';
:host ::ng-deep .pi-eye{
transform:scale(1.6);
margin-right: 1rem;
+ color: var(--primary-color) !important;
}
:host ::ng-deep .pi-eye-slash{
transform:scale(1.6);
margin-right: 1rem;
+ color: var(--primary-color) !important;
}
`]
})
-export class LoginComponent implements OnInit {
+export class LoginComponent implements OnInit, OnDestroy {
valCheck: string[] = ['remember'];
- password: string;
- themeElement: any;
- constructor() { }
+ password: string;
+
+ config: AppConfig;
+
+ subscription: Subscription;
+
+ constructor(public configService: ConfigService){ }
ngOnInit(): void {
- this.themeElement = document.getElementById('theme-css');
- this.themeElement.setAttribute('href','assets/theme/saga-blue/theme.css');
+ this.config = this.configService.config;
+ this.subscription = this.configService.configUpdate$.subscribe(config => {
+ this.config = config;
+ });
}
ngOnDestroy(): void {
- this.themeElement.setAttribute('href', 'assets/theme/lara-light-indigo/theme.css');
+ if(this.subscription){
+ this.subscription.unsubscribe();
+ }
}
-
}
diff --git a/src/app/components/notfound/notfound.component.html b/src/app/components/notfound/notfound.component.html
index a5d359d..242095f 100644
--- a/src/app/components/notfound/notfound.component.html
+++ b/src/app/components/notfound/notfound.component.html
@@ -7,15 +7,15 @@
404
-
Looks like you are lost
-
Requested resource is not available.
+
Looks like you are lost
+
Requested resource is not available.
-
+
-
Frequently Asked Questions
-
Ultricies mi quis hendrerit dolor.
+
Frequently Asked Questions
+
Ultricies mi quis hendrerit dolor.
@@ -23,8 +23,8 @@
-
Solution Center
-
Phasellus faucibus scelerisque eleifend.
+
Solution Center
+
Phasellus faucibus scelerisque eleifend.
@@ -32,8 +32,8 @@
-
Permission Manager
-
Accumsan in nisl nisi scelerisque
+
Permission Manager
+
Accumsan in nisl nisi scelerisque
diff --git a/src/app/components/notfound/notfound.component.ts b/src/app/components/notfound/notfound.component.ts
index 1d57db4..567c8c3 100644
--- a/src/app/components/notfound/notfound.component.ts
+++ b/src/app/components/notfound/notfound.component.ts
@@ -4,4 +4,4 @@ import { Component } from '@angular/core';
selector: 'app-notfound',
templateUrl: './notfound.component.html',
})
-export class NotfoundComponent { }
+export class NotfoundComponent {}
\ No newline at end of file