From 4b57ebdfe69e862373908590b0cf781ab0d71a02 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 9 Dec 2021 13:38:53 +0100 Subject: Fix theme update when logged in --- .../my-account-settings.component.html | 20 ++++++++++---------- client/src/app/core/theme/theme.service.ts | 1 - .../user-interface-settings.component.ts | 2 +- 3 files changed, 11 insertions(+), 12 deletions(-) (limited to 'client/src') diff --git a/client/src/app/+my-account/my-account-settings/my-account-settings.component.html b/client/src/app/+my-account/my-account-settings/my-account-settings.component.html index 48d06280b..8ca197fd4 100644 --- a/client/src/app/+my-account/my-account-settings/my-account-settings.component.html +++ b/client/src/app/+my-account/my-account-settings/my-account-settings.component.html @@ -20,6 +20,16 @@ +
+
+ +
+ +
+ +
+
+
@@ -42,16 +52,6 @@
-
-
- -
- -
- -
-
-
diff --git a/client/src/app/core/theme/theme.service.ts b/client/src/app/core/theme/theme.service.ts index c9e6fa700..ac3468941 100644 --- a/client/src/app/core/theme/theme.service.ts +++ b/client/src/app/core/theme/theme.service.ts @@ -141,7 +141,6 @@ export class ThemeService { } this.auth.userInformationLoaded - .pipe(first()) .subscribe(() => this.updateCurrentTheme()) } diff --git a/client/src/app/shared/shared-user-settings/user-interface-settings.component.ts b/client/src/app/shared/shared-user-settings/user-interface-settings.component.ts index bd1cb0353..d04a2c348 100644 --- a/client/src/app/shared/shared-user-settings/user-interface-settings.component.ts +++ b/client/src/app/shared/shared-user-settings/user-interface-settings.component.ts @@ -48,7 +48,7 @@ export class UserInterfaceSettingsComponent extends FormReactive implements OnIn }) if (this.reactiveUpdate) { - this.formValuesWatcher = this.form.valueChanges.subscribe(val => this.updateInterfaceSettings()) + this.formValuesWatcher = this.form.valueChanges.subscribe(() => this.updateInterfaceSettings()) } }) } -- cgit v1.2.3 From 2e694a3b9850fa8f426aa4bf31fc8a596ae2d310 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 9 Dec 2021 13:41:16 +0100 Subject: Fix homepage title --- client/src/app/+home/home-routing.module.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'client/src') diff --git a/client/src/app/+home/home-routing.module.ts b/client/src/app/+home/home-routing.module.ts index a2085f191..bedf26be0 100644 --- a/client/src/app/+home/home-routing.module.ts +++ b/client/src/app/+home/home-routing.module.ts @@ -5,7 +5,12 @@ import { HomeComponent } from './home.component' const homeRoutes: Routes = [ { path: '', - component: HomeComponent + component: HomeComponent, + data: { + meta: { + title: $localize`Homepage` + } + } } ] -- cgit v1.2.3