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: upgrade version to `v0.14.0` (#1970)

boojack589b10467109
diff --git a/docs/api/memo.md b/docs/api/memo.md
index b54d22f06..448ef4893 100644
--- a/docs/api/memo.md
+++ b/docs/api/memo.md
@@ -13,7 +13,7 @@ POST /api/v1/memo
"content": "Memo content",
"visibility": "PUBLIC",
"resourceIdList": [123, 456],
- "relationList": [{ "relatedMemoId": 789, "type": "LINK" }]
+ "relationList": [{ "relatedMemoId": 789, "type": "REFERENCE" }]
}
```
diff --git a/server/version/version.go b/server/version/version.go
index b83b3a620..9d85b23ed 100644
--- a/server/version/version.go
+++ b/server/version/version.go
@@ -9,10 +9,10 @@ import (
// Version is the service current released version.
// Semantic versioning: https://semver.org/
-var Version = "0.13.2"
+var Version = "0.14.0"
// DevVersion is the service current development version.
-var DevVersion = "0.13.2"
+var DevVersion = "0.14.0"
func GetCurrentVersion(mode string) string {
if mode == "dev" || mode == "demo" {
diff --git a/web/src/components/Empty.tsx b/web/src/components/Empty.tsx
index 30e5b611f..9a299f73b 100644
--- a/web/src/components/Empty.tsx
+++ b/web/src/components/Empty.tsx
@@ -1,7 +1,7 @@
const Empty = () => {
return (
<div className="mx-auto">
- <img className="w-24 h-auto dark:opacity-40" src="/assets/empty.png" alt="" />
+ <img className="w-24 h-auto opacity-60 dark:opacity-40" src="/assets/empty.png" alt="" />
</div>
);
};
diff --git a/web/src/components/MemoEditor/index.tsx b/web/src/components/MemoEditor/index.tsx
index 74bfbb86c..ac87996e6 100644
--- a/web/src/components/MemoEditor/index.tsx
+++ b/web/src/components/MemoEditor/index.tsx
@@ -7,8 +7,7 @@ import { getMatchedNodes } from "@/labs/marked";
import { upsertMemoResource } from "@/helpers/api";
import { TAB_SPACE_WIDTH, UNKNOWN_ID } from "@/helpers/consts";
import { useFilterStore, useGlobalStore, useMemoStore, useResourceStore, useTagStore, useUserStore } from "@/store/module";
-import storage from "@/helpers/storage";
-import { clearContentQueryParam, getContentQueryParam } from "@/helpers/utils";
+import { clearContentQueryParam } from "@/helpers/utils";
import Icon from "../Icon";
import Editor, { EditorRefActions } from "./Editor";
import showCreateResourceDialog from "../CreateResourceDialog";
@@ -21,10 +20,6 @@ import "@/less/memo-editor.less";
const listItemSymbolList = ["- [ ] ", "- [x] ", "- [X] ", "* ", "- "];
const emptyOlReg = /^(\d+)\. $/;
-const getInitialContent = (): string => {
- return getContentQueryParam() ?? storage.get(["editorContentCache"]).editorContentCache ?? "";
-};
-
interface Props {
className?: string;
memoId?: MemoId;
@@ -377,7 +372,7 @@ const MemoEditor = (props: Props) => {
const editorConfig = useMemo(
() => ({
className: `memo-editor`,
- initialContent: getInitialContent(),
+ initialContent: "",
placeholder: t("editor.placeholder"),
fullscreen: state.fullscreen,
onContentChange: handleContentChange,
diff --git a/web/src/components/MemoList.tsx b/web/src/components/MemoList.tsx
index 04b4261d0..97f5d01e1 100644
--- a/web/src/components/MemoList.tsx
+++ b/web/src/components/MemoList.tsx
@@ -164,7 +164,7 @@ const MemoList = () => {
<p className="status-text">
{isComplete ? (
sortedMemos.length === 0 && (
- <div className="w-full mt-4 mb-8 flex flex-col justify-center items-center italic">
+ <div className="w-full mt-12 mb-8 flex flex-col justify-center items-center italic">
<Empty />
<p className="mt-4 text-gray-600 dark:text-gray-400">{t("message.no-data")}</p>
</div>
diff --git a/web/src/pages/Auth.tsx b/web/src/pages/Auth.tsx
index 8425bfd08..022f362db 100644
--- a/web/src/pages/Auth.tsx
+++ b/web/src/pages/Auth.tsx
@@ -158,19 +158,32 @@ const Auth = () => {
</div>
<div className="flex flex-row justify-end items-center w-full mt-6">
{actionBtnLoadingState.isLoading && <Icon.Loader className="w-4 h-auto mr-2 animate-spin dark:text-gray-300" />}
- {systemStatus?.allowSignUp && (
+ {!systemStatus.host ? (
+ <Button disabled={actionBtnLoadingState.isLoading} onClick={handleSignUpButtonClick}>
+ {t("common.sign-up")}
+ </Button>
+ ) : (
<>
- <Button variant={"plain"} disabled={actionBtnLoadingState.isLoading} onClick={handleSignUpButtonClick}>
- {t("common.sign-up")}
+ {systemStatus?.allowSignUp && (
+ <>
+ <Button variant={"plain"} disabled={actionBtnLoadingState.isLoading} onClick={handleSignUpButtonClick}>
+ {t("common.sign-up")}
+ </Button>
+ <span className="mr-2 font-mono text-gray-200">/</span>
+ </>
+ )}
+ <Button type="submit" disabled={actionBtnLoadingState.isLoading} onClick={handleSignInButtonClick}>
+ {t("common.sign-in")}
</Button>
- <span className="mr-2 font-mono text-gray-200">/</span>
</>
)}
- <Button type="submit" disabled={actionBtnLoadingState.isLoading} onClick={handleSignInButtonClick}>
- {t("common.sign-in")}
- </Button>
</div>
</form>
+ {!systemStatus.host && (
+ <p className="w-full inline-block float-right text-sm mt-4 text-gray-500 text-right whitespace-pre-wrap">
+ {t("auth.host-tip")}
+ </p>
+ )}
{identityProviderList.length > 0 && (
<>
<Divider className="!my-4">{t("common.or")}</Divider>
@@ -190,11 +203,6 @@ const Auth = () => {
</div>
</>
)}
- {!systemStatus?.host && (
- <p className="w-full inline-block float-right text-sm mt-4 text-gray-500 text-right whitespace-pre-wrap">
- {t("auth.host-tip")}
- </p>
- )}
</div>
<div className="flex flex-row items-center justify-center w-full gap-2">
<LocaleSelect value={locale} onChange={handleLocaleSelectChange} />