_Bastler/we_bstly-web
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

fix darktheme loading

Browse Source
This commit is contained in:
_Bastler 2021-03-29 14:59:22 +02:00
parent f76843a2e9
commit de7b2f507e
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/app/auth/auth.guard.ts
View File

@ -49,21 +49,27 @@ export class AuthenticatedGuard implements CanActivate {
} }
this.profileService.getAll(["locale", "darkTheme"]).toPromise().then((profileFields: any) => { this.profileService.getAll(["locale", "darkTheme"]).subscribe((profileFields: any) => {
let reload = false; let updateLocale = false;
let darktheme = 'false';
let updateTheme = false;
for(let profileField of profileFields) { for(let profileField of profileFields) {
if(profileField.name == "darkTheme" && profileField.value != localStorage.getItem("bstly.darkTheme")) { if(profileField.name == "darkTheme") {
localStorage.setItem("bstly.darkTheme", profileField.value); darktheme = profileField.value;
reload = true;
} else if(profileField.name == "locale" && this.i18nService.locales.indexOf(profileField.value) != -1 && localStorage.getItem("bstly.locale") != profileField.value) { } else if(profileField.name == "locale" && this.i18nService.locales.indexOf(profileField.value) != -1 && localStorage.getItem("bstly.locale") != profileField.value) {
if(this.i18nService.locale != profileField.value) { if(this.i18nService.locale != profileField.value) {
localStorage.setItem("bstly.locale", profileField.value); localStorage.setItem("bstly.locale", profileField.value);
reload = true; updateLocale = true;
} }
} }
} }
if(reload) { if(darktheme != localStorage.getItem("bstly.darkTheme")) {
localStorage.setItem("bstly.darkTheme", darktheme);
updateTheme = true;
}
if(updateLocale || updateTheme) {
window.location.reload(); window.location.reload();
} }
}) })

7
src/app/ui/profilefields/profilefields.component.ts
View File

@ -150,12 +150,11 @@ export class ProfileFieldDialog {
} }
booleanChange(profileField) { booleanChange(profileField) {
if(profileField.value == 'false') { if(profileField.value == 'true') {
profileField.value = 'true';
} else {
profileField.value = 'false'; profileField.value = 'false';
} else {
profileField.value = 'true';
} }
console.log(profileField);
} }
} }