usememos/memos
1
1
Fork 0
mirror of https://github.com/usememos/memos.git synced 2024-12-20 09:41:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: user default 'Basic Setting' should follow server's setting (#1795)

Browse Source 
fix: user default 'Basic Setting' should follow system setting
This commit is contained in:
冇 2023-06-07 00:38:50 +08:00 committed by GitHub
parent c27c6cea13
commit c14c6b3786
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web/src/store/module/user.ts
View File

@ -21,8 +21,15 @@ const defaultLocalSetting: LocalSetting = {
}; };
export const convertResponseModelUser = (user: User): User => { export const convertResponseModelUser = (user: User): User => {
// user default 'Basic Setting' should follow server's setting
// 'Basic Setting' fields: locale, appearance
const { systemStatus } = store.getState().global;
const { locale, appearance } = systemStatus.customizedProfile;
const systemSetting = { locale, appearance };
const setting: Setting = { const setting: Setting = {
...defaultSetting, ...defaultSetting,
...systemSetting,
}; };
const { localSetting: storageLocalSetting } = storage.get(["localSetting"]); const { localSetting: storageLocalSetting } = storage.get(["localSetting"]);
const localSetting: LocalSetting = { const localSetting: LocalSetting = {

4
web/src/types/modules/setting.d.ts vendored
View File

@ -1,5 +1,9 @@
type Appearance = "system" | "light" | "dark"; type Appearance = "system" | "light" | "dark";
interface BasicSetting {
locale: Locale;
appearance: Appearance;
}
interface Setting { interface Setting {
locale: Locale; locale: Locale;
appearance: Appearance; appearance: Appearance;