diff --git a/src/app/components/access/access.component.html b/src/app/components/access/access.component.html index e6e868c..c03f388 100644 --- a/src/app/components/access/access.component.html +++ b/src/app/components/access/access.component.html @@ -7,10 +7,10 @@
- +
-

Access Denied

- You do not have the necesary permisions. Please contact admins. +

Access Denied

+ You do not have the necesary permisions. Please contact admins. Access denied
Go to Dashboard diff --git a/src/app/components/access/access.component.ts b/src/app/components/access/access.component.ts index fb55ed1..401b3be 100644 --- a/src/app/components/access/access.component.ts +++ b/src/app/components/access/access.component.ts @@ -4,4 +4,4 @@ import { Component } from '@angular/core'; selector: 'app-access', templateUrl: './access.component.html', }) -export class AccessComponent { } +export class AccessComponent {} \ No newline at end of file diff --git a/src/app/components/error/error.component.html b/src/app/components/error/error.component.html index 1a061cf..f65429a 100644 --- a/src/app/components/error/error.component.html +++ b/src/app/components/error/error.component.html @@ -7,10 +7,10 @@
- +
-

Error Occured

- Requested resource is not available. +

Error Occured

+ Requested resource is not available. Error
Go to Dashboard diff --git a/src/app/components/error/error.component.ts b/src/app/components/error/error.component.ts index 8828f32..fff1795 100644 --- a/src/app/components/error/error.component.ts +++ b/src/app/components/error/error.component.ts @@ -4,4 +4,4 @@ import { Component } from '@angular/core'; selector: 'app-error', templateUrl: './error.component.html', }) -export class ErrorComponent { } +export class ErrorComponent {} \ No newline at end of file diff --git a/src/app/components/landing/landing.component.html b/src/app/components/landing/landing.component.html index f96ae3d..1cf4b67 100644 --- a/src/app/components/landing/landing.component.html +++ b/src/app/components/landing/landing.component.html @@ -1,37 +1,37 @@
- Sakai LogoSAKAI + Sakai LogoSAKAI - @@ -40,7 +40,7 @@

Eu sem integereget magna fermentum

Sed blandit libero volutpat sed cras. Fames ac turpis egestas integer. Placerat in egestas erat...

- +
@@ -48,8 +48,8 @@
-

Marvelous Features

- Placerat in egestas erat... +

Marvelous Features

+ Placerat in egestas erat...
@@ -58,8 +58,8 @@
-
Easy to Use
- Posuere morbi leo urna molestie. +
Easy to Use
+ Posuere morbi leo urna molestie.
@@ -70,8 +70,8 @@
-
Fresh Design
- Semper risus in hendrerit. +
Fresh Design
+ Semper risus in hendrerit.
@@ -82,8 +82,8 @@
-
Well Documented
- Non arcu risus quis varius quam quisque. +
Well Documented
+ Non arcu risus quis varius quam quisque.
@@ -94,8 +94,8 @@
-
Responsive Layout
- Nulla malesuada pellentesque elit. +
Responsive Layout
+ Nulla malesuada pellentesque elit.
@@ -106,8 +106,8 @@
-
Clean Code
- Condimentum lacinia quis vel eros. +
Clean Code
+ Condimentum lacinia quis vel eros. @@ -118,8 +118,8 @@
-
Dark Mode
- Convallis tellus id interdum velit laoreet. +
Dark Mode
+ Convallis tellus id interdum velit laoreet. @@ -130,8 +130,8 @@
-
Ready to Use
- Mauris sit amet massa vitae. +
Ready to Use
+ Mauris sit amet massa vitae. @@ -142,8 +142,8 @@
-
Modern Practices
- Elementum nibh tellus molestie nunc non. +
Modern Practices
+ Elementum nibh tellus molestie nunc non. @@ -154,8 +154,8 @@
-
Privacy
- Neque egestas congue quisque. +
Privacy
+ Neque egestas congue quisque. @@ -165,7 +165,7 @@

Joséphine Miller

Peak Interactive

“Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.”

- + Company logo @@ -174,8 +174,8 @@
-

Powerful Everywhere

- Amet consectetur adipiscing elit... +

Powerful Everywhere

+ Amet consectetur adipiscing elit...
@@ -187,8 +187,8 @@
-

Congue Quisque Egestas

- Lectus arcu bibendum at varius vel pharetra vel turpis nunc. Eget aliquet nibh praesent tristique magna sit amet purus gravida. Sit amet mattis vulputate enim nulla aliquet. +

Congue Quisque Egestas

+ Lectus arcu bibendum at varius vel pharetra vel turpis nunc. Eget aliquet nibh praesent tristique magna sit amet purus gravida. Sit amet mattis vulputate enim nulla aliquet.
@@ -197,8 +197,8 @@
-

Celerisque Eu Ultrices

- Adipiscing commodo elit at imperdiet dui. Viverra nibh cras pulvinar mattis nunc sed blandit libero. Suspendisse in est ante in. Mauris pharetra et ultrices neque ornare aenean euismod elementum nisi. +

Celerisque Eu Ultrices

+ Adipiscing commodo elit at imperdiet dui. Viverra nibh cras pulvinar mattis nunc sed blandit libero. Suspendisse in est ante in. Mauris pharetra et ultrices neque ornare aenean euismod elementum nisi.
@@ -209,22 +209,22 @@
-

Matchless Pricing

- Amet consectetur adipiscing elit... +

Matchless Pricing

+ Amet consectetur adipiscing elit...
-

Free

+

Free

- $0 - per month - + $0 + per month +
-
    +
    • Responsive Layout @@ -247,15 +247,15 @@
      -

      Startup

      +

      Startup

      - $1 - per month - + $1 + per month +
      -
        +
        • Responsive Layout @@ -278,15 +278,15 @@
          -

          Free

          +

          Free

          - $999 - per month - + $999 + per month +
          -
            +
            • Responsive Layout @@ -313,42 +313,42 @@
              - footer sections -

              SAKAI

              + footer sections +

              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 @@
              - Sakai logo + Sakai logo
              -
              +
              Image @@ -23,7 +23,7 @@
              - Forgot password? + Forgot password?
              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