diff --git a/src/client/web/src/client/index.ts b/src/client/web/src/client/index.ts index 7c1ccce..99963f3 100644 --- a/src/client/web/src/client/index.ts +++ b/src/client/web/src/client/index.ts @@ -20,6 +20,7 @@ export interface BgConfig { repeat: string; position: string; align: string; + bgColor: string; } export interface Preferences { @@ -28,6 +29,8 @@ export interface Preferences { lanPackURL: string; lan: string; theme: string; + avatar: string; + email: string; } export interface User { diff --git a/src/client/web/src/client/settings_mock.ts b/src/client/web/src/client/settings_mock.ts index 1dc7263..e7ec787 100644 --- a/src/client/web/src/client/settings_mock.ts +++ b/src/client/web/src/client/settings_mock.ts @@ -17,11 +17,13 @@ export const resps = { data: { siteName: "", siteDesc: "", + captchaEnabled: true, bg: { url: "clientCfg_bg_url", repeat: "clientCfg_bg_repeat", position: "clientCfg_bg_position", align: "clientCfg_bg_align", + bgColor: "clientCfg_bg_bg_Color" }, }, }, diff --git a/src/client/web/src/client/users_mock.ts b/src/client/web/src/client/users_mock.ts index dca0cda..f23335a 100644 --- a/src/client/web/src/client/users_mock.ts +++ b/src/client/web/src/client/users_mock.ts @@ -89,11 +89,14 @@ export const resps = { repeat: "bgRepeat", position: "bgPosition", align: "bgAlign", + bgColor: "bgColor", }, cssURL: "cssURL", lanPackURL: "lanPackURL", lan: "en_US", theme: "light", + avatar: "avatar", + email: "email", }, }, }, diff --git a/src/client/web/src/components/__test__/pane_login.test.tsx b/src/client/web/src/components/__test__/pane_login.test.tsx index 2775a14..d846e60 100644 --- a/src/client/web/src/components/__test__/pane_login.test.tsx +++ b/src/client/web/src/components/__test__/pane_login.test.tsx @@ -93,11 +93,14 @@ describe("Login", () => { repeat: "bgRepeat", position: "bgPosition", align: "bgAlign", + bgColor: "bgColor", }, cssURL: "cssURL", lanPackURL: "lanPackURL", lan: "en_US", theme: "light", + avatar: "avatar", + email: "email", }, }); @@ -122,11 +125,13 @@ describe("Login", () => { isVertical: false, siteName: "", siteDesc: "", + captchaEnabled: true, bg: { url: "clientCfg_bg_url", repeat: "clientCfg_bg_repeat", position: "clientCfg_bg_position", align: "clientCfg_bg_align", + bgColor: "clientCfg_bg_bg_Color", }, control: { controls: Map({ diff --git a/src/client/web/src/components/__test__/state_mgr.test.tsx b/src/client/web/src/components/__test__/state_mgr.test.tsx index 996fc8d..0829987 100644 --- a/src/client/web/src/components/__test__/state_mgr.test.tsx +++ b/src/client/web/src/components/__test__/state_mgr.test.tsx @@ -109,11 +109,14 @@ describe("State Manager", () => { repeat: "bgRepeat", position: "bgPosition", align: "bgAlign", + bgColor: "bgColor", }, cssURL: "cssURL", lanPackURL: "lanPackURL", lan: "en_US", theme: "light", + avatar: "avatar", + email: "email", }, }); @@ -326,11 +329,14 @@ describe("State Manager", () => { repeat: "", position: "", align: "", + bgColor: "", }, cssURL: "", lanPackURL: "", lan: "en_US", theme: "light", + avatar: "", + email: "", }, }); @@ -351,6 +357,7 @@ describe("State Manager", () => { position: "clientCfg_bg_position", repeat: "clientCfg_bg_repeat", url: "clientCfg_bg_url", + bgColor: "clientCfg_bg_bg_Color", }); }); }); diff --git a/src/client/web/src/components/__test__/topbar.test.tsx b/src/client/web/src/components/__test__/topbar.test.tsx index 913477e..e3abe03 100644 --- a/src/client/web/src/components/__test__/topbar.test.tsx +++ b/src/client/web/src/components/__test__/topbar.test.tsx @@ -139,11 +139,14 @@ describe("TopBar", () => { repeat: "", position: "", align: "", + bgColor: "", }, cssURL: "", lanPackURL: "", lan: "en_US", theme: "light", + avatar: "", + email: "", }, }); diff --git a/src/client/web/src/components/core_state.ts b/src/client/web/src/components/core_state.ts index 62a0921..f938ef3 100644 --- a/src/client/web/src/components/core_state.ts +++ b/src/client/web/src/components/core_state.ts @@ -34,6 +34,7 @@ export interface UIProps { repeat: string; position: string; align: string; + bgColor: string; }; control: { controls: Map; @@ -103,11 +104,14 @@ export function initState(): ICoreState { repeat: "", position: "", align: "", + bgColor: "", }, cssURL: "", lanPackURL: "", lan: "en_US", theme: "light", + avatar: "", + email: "", }, }, msg: { @@ -123,6 +127,7 @@ export function initState(): ICoreState { repeat: "", position: "", align: "", + bgColor: "", }, captchaEnabled: true, control: { diff --git a/src/client/web/src/components/pane_admin.tsx b/src/client/web/src/components/pane_admin.tsx index 44665af..f051cb8 100644 --- a/src/client/web/src/components/pane_admin.tsx +++ b/src/client/web/src/components/pane_admin.tsx @@ -830,6 +830,7 @@ export class BgCfg extends React.Component { repeat: "repeat", position: "center", align: "fixed", + bgColor: "", }, }); this.props.update(updater().updateUI); diff --git a/src/client/web/src/components/state_updater.ts b/src/client/web/src/components/state_updater.ts index ce7d4a8..c30d8f9 100644 --- a/src/client/web/src/components/state_updater.ts +++ b/src/client/web/src/components/state_updater.ts @@ -618,11 +618,14 @@ export class Updater { repeat: "", position: "", align: "", + bgColor: "", }, cssURL: "", lanPackURL: "", lan: "en_US", theme: "light", + avatar: "", + email: "", }; }; diff --git a/src/db/fileinfostore/file_info_store.go b/src/db/fileinfostore/file_info_store.go index d411e39..5f61fdf 100644 --- a/src/db/fileinfostore/file_info_store.go +++ b/src/db/fileinfostore/file_info_store.go @@ -80,9 +80,6 @@ func NewFileInfoStore(store kvstore.IKVStore) (*FileInfoStore, error) { boltdb: boltdb, mtx: &sync.RWMutex{}, } - if err = migrate(fi); err != nil { - return nil, err - } return fi, nil } diff --git a/src/server/server_users_test.go b/src/server/server_users_test.go index 123f613..1f44759 100644 --- a/src/server/server_users_test.go +++ b/src/server/server_users_test.go @@ -457,6 +457,8 @@ func TestUsersHandlers(t *testing.T) { }, CSSURL: "/cssurl", LanPackURL: "/lanpack", + Avatar: "a1", + Email: "email1", }, &db.Preferences{ Bg: &sitestore.BgConfig{ @@ -468,6 +470,8 @@ func TestUsersHandlers(t *testing.T) { }, CSSURL: "/cssurl2", LanPackURL: "/lanpack2", + Avatar: "a2", + Email: "email2", }, } for _, prefer := range prefers { diff --git a/src/server/testdata/test_quickshare.db b/src/server/testdata/test_quickshare.db index ddc0816..daa1c82 100644 Binary files a/src/server/testdata/test_quickshare.db and b/src/server/testdata/test_quickshare.db differ