diff --git a/web/src/components/ArchivedMemoDialog.tsx b/web/src/components/ArchivedMemoDialog.tsx index e5951fbf..c42a928c 100644 --- a/web/src/components/ArchivedMemoDialog.tsx +++ b/web/src/components/ArchivedMemoDialog.tsx @@ -36,10 +36,7 @@ const ArchivedMemoDialog: React.FC = (props: Props) => { return ( <>
-

- 🗂 - {t("archived.archived-memos")} -

+

{t("archived.archived-memos")}

diff --git a/web/src/components/CreateShortcutDialog.tsx b/web/src/components/CreateShortcutDialog.tsx index 9d519840..96354344 100644 --- a/web/src/components/CreateShortcutDialog.tsx +++ b/web/src/components/CreateShortcutDialog.tsx @@ -101,10 +101,7 @@ const CreateShortcutDialog: React.FC = (props: Props) => { return ( <>
-

- 🚀 - {shortcutId ? t("shortcut-list.edit-shortcut") : t("shortcut-list.create-shortcut")} -

+

{shortcutId ? t("shortcut-list.edit-shortcut") : t("shortcut-list.create-shortcut")}

diff --git a/web/src/components/ResourcesDialog.tsx b/web/src/components/ResourcesDialog.tsx index 4c1ca204..9a0b113e 100644 --- a/web/src/components/ResourcesDialog.tsx +++ b/web/src/components/ResourcesDialog.tsx @@ -154,10 +154,7 @@ const ResourcesDialog: React.FC = (props: Props) => { return ( <>
-

- 🌄 - {t("sidebar.resources")} -

+

{t("sidebar.resources")}

diff --git a/web/src/components/ResourcesSelectorDialog.tsx b/web/src/components/ResourcesSelectorDialog.tsx index afc519e8..891dfc43 100644 --- a/web/src/components/ResourcesSelectorDialog.tsx +++ b/web/src/components/ResourcesSelectorDialog.tsx @@ -82,10 +82,7 @@ const ResourcesSelectorDialog: React.FC = (props: Props) => { return ( <>
-

- 🌄 - {t("sidebar.resources")} -

+

{t("sidebar.resources")}

diff --git a/web/src/components/ShareMemoDialog.tsx b/web/src/components/ShareMemoDialog.tsx index c0985ee3..a85f8e5b 100644 --- a/web/src/components/ShareMemoDialog.tsx +++ b/web/src/components/ShareMemoDialog.tsx @@ -124,10 +124,7 @@ const ShareMemoDialog: React.FC = (props: Props) => { return ( <>
-

- 🌄 - {t("common.share")} Memo -

+

{t("common.share")} Memo

diff --git a/web/src/components/TagList.tsx b/web/src/components/TagList.tsx index f96bc1d3..6c6373dc 100644 --- a/web/src/components/TagList.tsx +++ b/web/src/components/TagList.tsx @@ -83,7 +83,7 @@ const TagList = () => { {tags.map((t, idx) => ( ))} - {tags.length < 3 &&

{t("tag-list.tip-text")}

} + {tags.length <= 3 &&

{t("tag-list.tip-text")}

}
); diff --git a/web/src/less/tag-list.less b/web/src/less/tag-list.less index 290365df..33d251bc 100644 --- a/web/src/less/tag-list.less +++ b/web/src/less/tag-list.less @@ -54,7 +54,7 @@ } > .tip-text { - @apply w-full bg-gray-50 dark:bg-zinc-700 mt-2 px-4 py-1 leading-5 rounded text-sm text-gray-400 font-mono; + @apply w-full bg-gray-50 dark:bg-zinc-700 mt-2 px-4 py-1 leading-6 rounded text-sm text-gray-400 font-mono; } } } diff --git a/web/src/locales/en.json b/web/src/locales/en.json index f624709e..5bdce7f5 100644 --- a/web/src/locales/en.json +++ b/web/src/locales/en.json @@ -141,7 +141,7 @@ "text-placeholder": "Starts with ^ to use regex" }, "tag-list": { - "tip-text": "Click the '+' button or input `#tag ` to create a new tag." + "tip-text": "Input `#tag` to create" }, "search": { "quickly-filter": "Quickly filter" diff --git a/web/src/store/module/global.ts b/web/src/store/module/global.ts index decbf3c8..5cf1b148 100644 --- a/web/src/store/module/global.ts +++ b/web/src/store/module/global.ts @@ -33,9 +33,20 @@ export const initialGlobalState = async () => { try { const { data } = (await api.getSystemStatus()).data; if (data) { - defaultGlobalState.systemStatus = data; - defaultGlobalState.locale = data.customizedProfile.locale; - defaultGlobalState.appearance = data.customizedProfile.appearance; + const customizedProfile = data.customizedProfile; + defaultGlobalState.systemStatus = { + ...data, + customizedProfile: { + name: customizedProfile.name || "memos", + logoUrl: customizedProfile.logoUrl || "/logo.png", + description: customizedProfile.description, + locale: customizedProfile.locale || "en", + appearance: customizedProfile.appearance || "system", + externalUrl: "", + }, + }; + defaultGlobalState.locale = customizedProfile.locale; + defaultGlobalState.appearance = customizedProfile.appearance; } } catch (error) { // do nth