diff --git a/kdb-web/src/app/components/footer/footer.component.html b/kdb-web/src/app/components/footer/footer.component.html index 9d0a7414..2b104231 100644 --- a/kdb-web/src/app/components/footer/footer.component.html +++ b/kdb-web/src/app/components/footer/footer.component.html @@ -1,28 +1,28 @@ diff --git a/kdb-web/src/app/components/footer/footer.component.ts b/kdb-web/src/app/components/footer/footer.component.ts index d1c0d4a9..ef02100c 100644 --- a/kdb-web/src/app/components/footer/footer.component.ts +++ b/kdb-web/src/app/components/footer/footer.component.ts @@ -14,8 +14,8 @@ import { throwError } from "rxjs"; export class FooterComponent implements OnInit { - frontendVersion: SoftwareVersion = new SoftwareVersion("0", "0", "0"); - backendVersion: SoftwareVersion = new SoftwareVersion("0", "0", "0"); + public frontendVersion: SoftwareVersion = new SoftwareVersion("0", "0", "0"); + public backendVersion: SoftwareVersion = new SoftwareVersion("0", "0", "0"); public privacy: string = ""; public imprint: string = ""; @@ -27,8 +27,6 @@ export class FooterComponent implements OnInit { ) {} ngOnInit(): void { - this.privacy = this.settings.getPrivacyURL(); - this.imprint = this.settings.getImprintURL(); this.frontendVersion = this.settings.getWebVersion() ?? new SoftwareVersion('0', '0', '0'); this.spinnerService.showSpinner(); @@ -47,4 +45,12 @@ export class FooterComponent implements OnInit { }); } + public navigateToPrivacy(): void { + window.open(this.settings.getPrivacyURL(), "_blank"); + } + + public navigateToImprint(): void { + window.open(this.settings.getImprintURL(), "_blank"); + } + } diff --git a/kdb-web/src/app/modules/auth/auth.module.ts b/kdb-web/src/app/modules/auth/auth.module.ts index e0afca6a..a2a83a73 100644 --- a/kdb-web/src/app/modules/auth/auth.module.ts +++ b/kdb-web/src/app/modules/auth/auth.module.ts @@ -7,6 +7,7 @@ import { AuthHeaderComponent } from './components/auth-header/auth-header.compon import { ForgetPasswordComponent } from './components/forget-password/forget-password.component'; import { LoginComponent } from './components/login/login.component'; import { RegistrationComponent } from './components/registration/registration.component'; +import { AuthFooterComponent } from "./components/auth-footer/auth-footer.component"; @NgModule({ @@ -14,7 +15,8 @@ import { RegistrationComponent } from './components/registration/registration.co ForgetPasswordComponent, LoginComponent, RegistrationComponent, - AuthHeaderComponent + AuthHeaderComponent, + AuthFooterComponent ], imports: [ CommonModule, diff --git a/kdb-web/src/app/modules/auth/components/auth-footer/auth-footer.component.html b/kdb-web/src/app/modules/auth/components/auth-footer/auth-footer.component.html new file mode 100644 index 00000000..98a35a1e --- /dev/null +++ b/kdb-web/src/app/modules/auth/components/auth-footer/auth-footer.component.html @@ -0,0 +1,7 @@ + diff --git a/kdb-web/src/app/modules/auth/components/auth-footer/auth-footer.component.scss b/kdb-web/src/app/modules/auth/components/auth-footer/auth-footer.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/kdb-web/src/app/modules/auth/components/auth-footer/auth-footer.component.spec.ts b/kdb-web/src/app/modules/auth/components/auth-footer/auth-footer.component.spec.ts new file mode 100644 index 00000000..98d7ddb7 --- /dev/null +++ b/kdb-web/src/app/modules/auth/components/auth-footer/auth-footer.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { AuthFooterComponent } from './auth-footer.component'; + +describe('AuthFooterComponent', () => { + let component: AuthFooterComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ AuthFooterComponent ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(AuthFooterComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/kdb-web/src/app/modules/auth/components/auth-footer/auth-footer.component.ts b/kdb-web/src/app/modules/auth/components/auth-footer/auth-footer.component.ts new file mode 100644 index 00000000..763f1f92 --- /dev/null +++ b/kdb-web/src/app/modules/auth/components/auth-footer/auth-footer.component.ts @@ -0,0 +1,32 @@ +import { Component, OnInit } from "@angular/core"; +import { Router } from "@angular/router"; +import { SettingsService } from "../../../../services/settings/settings.service"; + +@Component({ + selector: "app-auth-footer", + templateUrl: "./auth-footer.component.html", + styleUrls: ["./auth-footer.component.scss"] +}) +export class AuthFooterComponent implements OnInit { + private privacy: string = ""; + private imprint: string = ""; + + constructor( + private settings: SettingsService + ) { + } + + ngOnInit(): void { + this.privacy = this.settings.getPrivacyURL(); + this.imprint = this.settings.getImprintURL(); + } + + public navigateToPrivacy(): void { + window.open(this.settings.getPrivacyURL(), "_blank"); + } + + public navigateToImprint(): void { + window.open(this.settings.getImprintURL(), "_blank"); + } + +} diff --git a/kdb-web/src/app/modules/auth/components/auth-header/auth-header.component.html b/kdb-web/src/app/modules/auth/components/auth-header/auth-header.component.html index 1b48c147..8a147def 100644 --- a/kdb-web/src/app/modules/auth/components/auth-header/auth-header.component.html +++ b/kdb-web/src/app/modules/auth/components/auth-header/auth-header.component.html @@ -1,10 +1,10 @@
-
- - -
-
- - -
-
\ No newline at end of file +
+ + +
+
+ + +
+ diff --git a/kdb-web/src/app/modules/auth/components/auth-header/auth-header.component.ts b/kdb-web/src/app/modules/auth/components/auth-header/auth-header.component.ts index 0858dc8a..8019406c 100644 --- a/kdb-web/src/app/modules/auth/components/auth-header/auth-header.component.ts +++ b/kdb-web/src/app/modules/auth/components/auth-header/auth-header.component.ts @@ -1,12 +1,10 @@ -import { Component, OnInit } from '@angular/core'; -import { Router } from '@angular/router'; -import { TranslateService, LangChangeEvent } from '@ngx-translate/core'; -import { MenuItem, PrimeNGConfig } from 'primeng/api'; -import { catchError } from 'rxjs'; -import { AuthService } from 'src/app/services/auth/auth.service'; -import { SettingsService } from 'src/app/services/settings/settings.service'; -import { SpinnerService } from 'src/app/services/spinner/spinner.service'; -import { ThemeService } from 'src/app/services/theme/theme.service'; +import { Component, OnInit } from "@angular/core"; +import { Router } from "@angular/router"; +import { TranslateService } from "@ngx-translate/core"; +import { MenuItem, PrimeNGConfig } from "primeng/api"; +import { SettingsService } from "src/app/services/settings/settings.service"; +import { SpinnerService } from "src/app/services/spinner/spinner.service"; +import { ThemeService } from "src/app/services/theme/theme.service"; @Component({ selector: 'app-auth-header', @@ -14,9 +12,8 @@ import { ThemeService } from 'src/app/services/theme/theme.service'; styleUrls: ['./auth-header.component.scss'] }) export class AuthHeaderComponent implements OnInit { - langList: MenuItem[] = []; - themeList: MenuItem[] = []; - userMenuList!: MenuItem[]; + public langList: MenuItem[] = []; + public themeList: MenuItem[] = []; constructor( private router: Router, @@ -27,12 +24,12 @@ export class AuthHeaderComponent implements OnInit { private config: PrimeNGConfig ) { } - ngOnInit(): void { + public ngOnInit(): void { this.initMenuLists(); this.loadLang(); } - initMenuLists(): void { + private initMenuLists(): void { this.langList = [ { label: 'English', command: () => { @@ -58,16 +55,16 @@ export class AuthHeaderComponent implements OnInit { }); } - changeTheme(name: string): void { + private changeTheme(name: string): void { this.themeService.setTheme(name, true); } - translate(lang: string) { + private translate(lang: string) { this.translateService.use(lang); this.translateService.get('primeng').subscribe(res => this.config.setTranslation(res)); } - loadLang(): void { + private loadLang(): void { let lang = localStorage.getItem(`default_lang`); if (!lang) { lang = 'en'; @@ -76,7 +73,7 @@ export class AuthHeaderComponent implements OnInit { this.translate(lang); } - setLang(lang: string): void { + private setLang(lang: string): void { localStorage.setItem(`default_lang`, lang); } diff --git a/kdb-web/src/app/modules/auth/components/forget-password/forget-password.component.html b/kdb-web/src/app/modules/auth/components/forget-password/forget-password.component.html index c8032ebb..a35906ec 100644 --- a/kdb-web/src/app/modules/auth/components/forget-password/forget-password.component.html +++ b/kdb-web/src/app/modules/auth/components/forget-password/forget-password.component.html @@ -1,63 +1,64 @@
-
diff --git a/kdb-web/src/app/modules/auth/components/login/login.component.html b/kdb-web/src/app/modules/auth/components/login/login.component.html index 9f32d0e7..f9809db0 100644 --- a/kdb-web/src/app/modules/auth/components/login/login.component.html +++ b/kdb-web/src/app/modules/auth/components/login/login.component.html @@ -62,4 +62,5 @@ + diff --git a/kdb-web/src/app/modules/auth/components/registration/registration.component.html b/kdb-web/src/app/modules/auth/components/registration/registration.component.html index e304d308..20e08284 100644 --- a/kdb-web/src/app/modules/auth/components/registration/registration.component.html +++ b/kdb-web/src/app/modules/auth/components/registration/registration.component.html @@ -82,4 +82,5 @@ + diff --git a/kdb-web/src/styles.scss b/kdb-web/src/styles.scss index aeb1a1e9..b9318b03 100644 --- a/kdb-web/src/styles.scss +++ b/kdb-web/src/styles.scss @@ -100,6 +100,9 @@ header { } } +.auth-footer { +} + .app { height: 100%; display: flex; @@ -474,6 +477,9 @@ footer { .right { width: 50%; text-align: right; + .p-button-label { + font-weight: unset !important; + } } } @@ -488,7 +494,8 @@ footer { gap: 15px; .login-form-wrapper, - .auth-header { + .auth-header, + .auth-footer { width: 350px; height: 450px; @@ -549,6 +556,11 @@ footer { width: 350px; height: 75px; } + + .auth-footer { + width: 350px; + height: 75px; + } } .input-field { diff --git a/kdb-web/src/styles/themes/default-dark-theme.scss b/kdb-web/src/styles/themes/default-dark-theme.scss index b2707156..2e6cac2c 100644 --- a/kdb-web/src/styles/themes/default-dark-theme.scss +++ b/kdb-web/src/styles/themes/default-dark-theme.scss @@ -231,8 +231,10 @@ background-color: $secondaryBackgroundColor; .login-form-wrapper, - .auth-header { + .auth-header, + .auth-footer { background-color: $primaryBackgroundColor; + color: $primaryTextColor !important; .login-form { .input-field { diff --git a/kdb-web/src/styles/themes/default-light-theme.scss b/kdb-web/src/styles/themes/default-light-theme.scss index 03b7d979..b8cd5b06 100644 --- a/kdb-web/src/styles/themes/default-light-theme.scss +++ b/kdb-web/src/styles/themes/default-light-theme.scss @@ -231,8 +231,10 @@ background-color: $secondaryBackgroundColor; .login-form-wrapper, - .auth-header { + .auth-header, + .auth-footer { background-color: $primaryBackgroundColor; + color: $primaryTextColor !important; .login-form { .input-field { diff --git a/kdb-web/src/styles/themes/sh-edraft-dark-theme.scss b/kdb-web/src/styles/themes/sh-edraft-dark-theme.scss index 63b5e59c..a116773e 100644 --- a/kdb-web/src/styles/themes/sh-edraft-dark-theme.scss +++ b/kdb-web/src/styles/themes/sh-edraft-dark-theme.scss @@ -235,8 +235,10 @@ background-color: $secondaryBackgroundColor; .login-form-wrapper, - .auth-header { + .auth-header, + .auth-footer { background-color: $primaryBackgroundColor; + color: $primaryTextColor !important; .login-form { .input-field { diff --git a/kdb-web/src/styles/themes/sh-edraft-light-theme.scss b/kdb-web/src/styles/themes/sh-edraft-light-theme.scss index 7d705b16..ab335ab3 100644 --- a/kdb-web/src/styles/themes/sh-edraft-light-theme.scss +++ b/kdb-web/src/styles/themes/sh-edraft-light-theme.scss @@ -231,8 +231,10 @@ background-color: $secondaryBackgroundColor; .login-form-wrapper, - .auth-header { + .auth-header, + .auth-footer { background-color: $primaryBackgroundColor; + color: $primaryTextColor !important; .login-form { .input-field {