Skip to content

armgit / memos

Public Imported from GitHub
0

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.

chore: update dialog title (#834)

boojackf6039f2eb967
diff --git a/web/src/components/ArchivedMemoDialog.tsx b/web/src/components/ArchivedMemoDialog.tsx
index e5951fbf5..c42a928c1 100644
--- a/web/src/components/ArchivedMemoDialog.tsx
+++ b/web/src/components/ArchivedMemoDialog.tsx
@@ -36,10 +36,7 @@ const ArchivedMemoDialog: React.FC<Props> = (props: Props) => {
return (
<>
<div className="dialog-header-container">
- <p className="title-text">
- <span className="icon-text">πŸ—‚</span>
- {t("archived.archived-memos")}
- </p>
+ <p className="title-text">{t("archived.archived-memos")}</p>
<button className="btn close-btn" onClick={destroy}>
<Icon.X className="icon-img" />
</button>
diff --git a/web/src/components/CreateShortcutDialog.tsx b/web/src/components/CreateShortcutDialog.tsx
index 9d519840c..963543443 100644
--- a/web/src/components/CreateShortcutDialog.tsx
+++ b/web/src/components/CreateShortcutDialog.tsx
@@ -101,10 +101,7 @@ const CreateShortcutDialog: React.FC<Props> = (props: Props) => {
return (
<>
<div className="dialog-header-container">
- <p className="title-text">
- <span className="icon-text">πŸš€</span>
- {shortcutId ? t("shortcut-list.edit-shortcut") : t("shortcut-list.create-shortcut")}
- </p>
+ <p className="title-text">{shortcutId ? t("shortcut-list.edit-shortcut") : t("shortcut-list.create-shortcut")}</p>
<button className="btn close-btn" onClick={destroy}>
<Icon.X />
</button>
diff --git a/web/src/components/ResourcesDialog.tsx b/web/src/components/ResourcesDialog.tsx
index 4c1ca2043..9a0b113ef 100644
--- a/web/src/components/ResourcesDialog.tsx
+++ b/web/src/components/ResourcesDialog.tsx
@@ -154,10 +154,7 @@ const ResourcesDialog: React.FC<Props> = (props: Props) => {
return (
<>
<div className="dialog-header-container">
- <p className="title-text">
- <span className="icon-text">πŸŒ„</span>
- {t("sidebar.resources")}
- </p>
+ <p className="title-text">{t("sidebar.resources")}</p>
<button className="btn close-btn" onClick={destroy}>
<Icon.X className="icon-img" />
</button>
diff --git a/web/src/components/ResourcesSelectorDialog.tsx b/web/src/components/ResourcesSelectorDialog.tsx
index afc519e8e..891dfc436 100644
--- a/web/src/components/ResourcesSelectorDialog.tsx
+++ b/web/src/components/ResourcesSelectorDialog.tsx
@@ -82,10 +82,7 @@ const ResourcesSelectorDialog: React.FC<Props> = (props: Props) => {
return (
<>
<div className="dialog-header-container">
- <p className="title-text">
- <span className="icon-text">πŸŒ„</span>
- {t("sidebar.resources")}
- </p>
+ <p className="title-text">{t("sidebar.resources")}</p>
<button className="btn close-btn" onClick={destroy}>
<Icon.X className="icon-img" />
</button>
diff --git a/web/src/components/ShareMemoDialog.tsx b/web/src/components/ShareMemoDialog.tsx
index c0985ee36..a85f8e5bc 100644
--- a/web/src/components/ShareMemoDialog.tsx
+++ b/web/src/components/ShareMemoDialog.tsx
@@ -124,10 +124,7 @@ const ShareMemoDialog: React.FC<Props> = (props: Props) => {
return (
<>
<div className="dialog-header-container">
- <p className="title-text">
- <span className="icon-text">πŸŒ„</span>
- {t("common.share")} Memo
- </p>
+ <p className="title-text">{t("common.share")} Memo</p>
<button className="btn close-btn" onClick={handleCloseBtnClick}>
<Icon.X className="icon-img" />
</button>
diff --git a/web/src/components/TagList.tsx b/web/src/components/TagList.tsx
index f96bc1d3a..6c6373dc8 100644
--- a/web/src/components/TagList.tsx
+++ b/web/src/components/TagList.tsx
@@ -83,7 +83,7 @@ const TagList = () => {
{tags.map((t, idx) => (
<TagItemContainer key={t.text + "-" + idx} tag={t} tagQuery={query?.tag} />
))}
- {tags.length < 3 && <p className="tip-text">{t("tag-list.tip-text")}</p>}
+ {tags.length <= 3 && <p className="tip-text">{t("tag-list.tip-text")}</p>}
</div>
</div>
);
diff --git a/web/src/less/tag-list.less b/web/src/less/tag-list.less
index 290365df1..33d251bc5 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 f624709e1..5bdce7f58 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 decbf3c8e..5cf1b148f 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