Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
feat: set editor font style (#174)
boojacke9d303326fb3
diff --git a/api/user_setting.go b/api/user_setting.goindex 367278852..8c7cacd77 100644--- a/api/user_setting.go+++ b/api/user_setting.go@@ -12,6 +12,8 @@ const (UserSettingLocaleKey UserSettingKey = "locale"// UserSettingMemoVisibilityKey is the key type for user preference memo default visibility.UserSettingMemoVisibilityKey UserSettingKey = "memoVisibility"+ // UserSettingEditorFontStyleKey is the key type for editor font style.+ UserSettingEditorFontStyleKey UserSettingKey = "editorFontStyle")// String returns the string format of UserSettingKey type.@@ -21,13 +23,16 @@ func (key UserSettingKey) String() string {return "locale"case UserSettingMemoVisibilityKey:return "memoVisibility"+ case UserSettingEditorFontStyleKey:+ return "editorFontFamily"}return ""}var (- UserSettingLocaleValue = []string{"en", "zh"}- UserSettingMemoVisibilityValue = []Visibility{Privite, Protected, Public}+ UserSettingLocaleValue = []string{"en", "zh"}+ UserSettingMemoVisibilityValue = []Visibility{Privite, Protected, Public}+ UserSettingEditorFontStyleValue = []string{"normal", "mono"})type UserSetting struct {@@ -45,7 +50,7 @@ type UserSettingUpsert struct {func (upsert UserSettingUpsert) Validate() error {if upsert.Key == UserSettingLocaleKey {- var localeValue string+ localeValue := "en"err := json.Unmarshal([]byte(upsert.Value), &localeValue)if err != nil {return fmt.Errorf("failed to unmarshal user setting locale value")@@ -62,7 +67,7 @@ func (upsert UserSettingUpsert) Validate() error {return fmt.Errorf("invalid user setting locale value")}} else if upsert.Key == UserSettingMemoVisibilityKey {- var memoVisibilityValue Visibility+ memoVisibilityValue := Priviteerr := json.Unmarshal([]byte(upsert.Value), &memoVisibilityValue)if err != nil {return fmt.Errorf("failed to unmarshal user setting memo visibility value")@@ -78,6 +83,23 @@ func (upsert UserSettingUpsert) Validate() error {if invalid {return fmt.Errorf("invalid user setting memo visibility value")}+ } else if upsert.Key == UserSettingEditorFontStyleKey {+ editorFontStyleValue := "normal"+ err := json.Unmarshal([]byte(upsert.Value), &editorFontStyleValue)+ if err != nil {+ return fmt.Errorf("failed to unmarshal user setting editor font style")+ }++ invalid := true+ for _, value := range UserSettingEditorFontStyleValue {+ if editorFontStyleValue == value {+ invalid = false+ break+ }+ }+ if invalid {+ return fmt.Errorf("invalid user setting editor font style value")+ }} else {return fmt.Errorf("invalid user setting key")}diff --git a/web/src/components/MemoEditor.tsx b/web/src/components/MemoEditor.tsxindex 313aa44a8..da06af0f1 100644--- a/web/src/components/MemoEditor.tsx+++ b/web/src/components/MemoEditor.tsx@@ -18,6 +18,7 @@ interface State {const MemoEditor: React.FC<Props> = () => {const { t, locale } = useI18n();+ const user = useAppSelector((state) => state.user.user);const editorState = useAppSelector((state) => state.editor);const tags = useAppSelector((state) => state.memo.tags);const [state, setState] = useState<State>({@@ -27,6 +28,7 @@ const MemoEditor: React.FC<Props> = () => {const editorRef = useRef<EditorRefActions>(null);const prevGlobalStateRef = useRef(editorState);const tagSeletorRef = useRef<HTMLDivElement>(null);+ const editorFontStyle = user?.setting.editorFontStyle || "normal";useEffect(() => {if (editorState.markMemoId && editorState.markMemoId !== UNKNOWN_ID) {@@ -214,7 +216,7 @@ const MemoEditor: React.FC<Props> = () => {const editorConfig = useMemo(() => ({- className: "memo-editor",+ className: `memo-editor ${editorFontStyle}`,initialContent: getEditorContentCache(),placeholder: t("editor.placeholder"),fullscreen: state.fullscreen,@@ -222,7 +224,7 @@ const MemoEditor: React.FC<Props> = () => {onConfirmBtnClick: handleSaveBtnClick,onContentChange: handleContentChange,}),- [isEditing, state.fullscreen, locale]+ [isEditing, state.fullscreen, locale, editorFontStyle]);return (diff --git a/web/src/components/Settings/PreferencesSection.tsx b/web/src/components/Settings/PreferencesSection.tsxindex 072365b70..d4ed00ab4 100644--- a/web/src/components/Settings/PreferencesSection.tsx+++ b/web/src/components/Settings/PreferencesSection.tsx@@ -19,6 +19,17 @@ const localeSelectorItems = [},];+const editorFontStyleSelectorItems = [+ {+ text: "Normal",+ value: "normal",+ },+ {+ text: "Mono",+ value: "mono",+ },+];+const PreferencesSection: React.FC<Props> = () => {const { t } = useI18n();const { setting } = useAppSelector((state) => state.user.user as User);@@ -32,14 +43,21 @@ const PreferencesSection: React.FC<Props> = () => {await userService.upsertUserSetting("memoVisibility", value);};+ const handleEditorFontStyleChanged = async (value: string) => {+ await userService.upsertUserSetting("editorFontStyle", value);+ };+return (<div className="section-container preferences-section-container">- <label className="form-label">- <span className="normal-text">{t("common.language")}:</span>+ <p className="title-text">{t("common.language")}</p>+ <label className="form-label selector">+ <span className="normal-text">+ {t("common.language")}: <BetaBadge className="ml-2" />+ </span><Selector className="ml-2 w-28" value={setting.locale} dataSource={localeSelectorItems} handleValueChanged={handleLocaleChanged} />- <BetaBadge className="ml-2" /></label>- <label className="form-label">+ <p className="title-text">{t("setting.preference")}</p>+ <label className="form-label selector"><span className="normal-text">{t("setting.preference-section.default-memo-visibility")}:</span><SelectorclassName="ml-2 w-32"@@ -48,6 +66,15 @@ const PreferencesSection: React.FC<Props> = () => {handleValueChanged={handleDefaultMemoVisibilityChanged}/></label>+ <label className="form-label selector">+ <span className="normal-text">{t("setting.preference-section.editor-font-style")}:</span>+ <Selector+ className="ml-2 w-32"+ value={setting.editorFontStyle}+ dataSource={editorFontStyleSelectorItems}+ handleValueChanged={handleEditorFontStyleChanged}+ />+ </label></div>);};diff --git a/web/src/less/editor.less b/web/src/less/editor.lessindex d1ec1f4d7..cd280a42f 100644--- a/web/src/less/editor.less+++ b/web/src/less/editor.less@@ -1,8 +1,13 @@@import "./mixin.less";.common-editor-wrapper {- .flex(column, flex-start, flex-start);- @apply relative w-full h-auto bg-white;+ @apply flex flex-col justify-start items-start relative w-full h-auto bg-white;++ &.mono {+ > .common-editor-inputer {+ @apply font-mono;+ }+ }> .common-editor-inputer {@apply w-full h-full mt-1 mb-1 text-base resize-none overflow-x-hidden overflow-y-auto bg-transparent whitespace-pre-wrap;diff --git a/web/src/less/setting-dialog.less b/web/src/less/setting-dialog.lessindex 333b005be..3dc0937b7 100644--- a/web/src/less/setting-dialog.less+++ b/web/src/less/setting-dialog.less@@ -50,7 +50,7 @@}> .form-label {- @apply flex flex-row justify-start items-center w-full mb-2;+ @apply flex flex-row items-center w-full mb-2;> .normal-text {@apply shrink-0 select-text;diff --git a/web/src/less/settings/preferences-section.less b/web/src/less/settings/preferences-section.lessindex b10e4f9f5..c7a167c35 100644--- a/web/src/less/settings/preferences-section.less+++ b/web/src/less/settings/preferences-section.less@@ -1,8 +1,12 @@@import "../mixin.less";.preferences-section-container {- > .form-label {- @apply mb-2;+ > .title-text {+ @apply mt-4 first:mt-1;+ }++ > .form-label.selector {+ @apply mb-2 flex flex-row justify-between items-center;> .normal-text {@apply mr-2 text-sm;diff --git a/web/src/locales/en.json b/web/src/locales/en.jsonindex 46835dfab..8563f2b4f 100644--- a/web/src/locales/en.json+++ b/web/src/locales/en.json@@ -56,7 +56,8 @@"title": "Account Information"},"preference-section": {- "default-memo-visibility": "Default memo visibility"+ "default-memo-visibility": "Default memo visibility",+ "editor-font-style": "Editor font style"},"member-section": {"create-a-member": "Create a member"diff --git a/web/src/locales/zh.json b/web/src/locales/zh.jsonindex e1633f415..01eb65797 100644--- a/web/src/locales/zh.json+++ b/web/src/locales/zh.json@@ -56,7 +56,8 @@"title": "账号信息"},"preference-section": {- "default-memo-visibility": "默认 Memo 可见性"+ "default-memo-visibility": "默认 Memo 可见性",+ "editor-font-style": "编辑器字体样式"},"member-section": {"create-a-member": "创建成员"diff --git a/web/src/services/userService.ts b/web/src/services/userService.tsindex 0a1c89175..8c618002c 100644--- a/web/src/services/userService.ts+++ b/web/src/services/userService.ts@@ -7,6 +7,7 @@ import { setUser, patchUser, setHost, setOwner } from "../store/modules/user";const defauleSetting: Setting = {locale: "en",memoVisibility: "PRIVATE",+ editorFontStyle: "normal",};export const convertResponseModelUser = (user: User): User => {@@ -16,7 +17,7 @@ export const convertResponseModelUser = (user: User): User => {if (user.userSettingList) {for (const userSetting of user.userSettingList) {- setting[userSetting.key] = JSON.parse(userSetting.value);+ (setting as any)[userSetting.key] = JSON.parse(userSetting.value);}}@@ -92,7 +93,7 @@ const userService = {}},- upsertUserSetting: async (key: string, value: any) => {+ upsertUserSetting: async (key: keyof Setting, value: any) => {await api.upsertUserSetting({key: key as any,value: JSON.stringify(value),diff --git a/web/src/types/modules/setting.d.ts b/web/src/types/modules/setting.d.tsindex 38271afc9..9508a3bc2 100644--- a/web/src/types/modules/setting.d.ts+++ b/web/src/types/modules/setting.d.ts@@ -1,6 +1,7 @@interface Setting {locale: Locale;memoVisibility: Visibility;+ editorFontStyle: "normal" | "mono";}interface UserLocaleSetting {@@ -13,7 +14,12 @@ interface UserMemoVisibilitySetting {value: Visibility;}-type UserSetting = UserLocaleSetting;+interface UserEditorFontStyleSetting {+ key: "editorFontStyle";+ value: "normal" | "mono";+}++type UserSetting = UserLocaleSetting | UserMemoVisibilitySetting | UserEditorFontStyleSetting;interface UserSettingUpsert {key: keyof Setting;