usememos/memos
1
1
Fork 0
mirror of https://github.com/usememos/memos.git synced 2024-11-30 22:14:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

chore: upgrade version to v0.14.0 (#1970)

Browse Source 
* chore: upgrade version

* chore: update

* chore: update
This commit is contained in:
boojack 2023-07-16 13:48:10 +08:00 committed by GitHub
parent 220cba84ae
commit 589b104671
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/api/memo.md
View File

@ -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" }]
}
```

4
server/version/version.go
View File

@ -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" {

2
web/src/components/Empty.tsx
View File

@ -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>
);
};

9
web/src/components/MemoEditor/index.tsx
View File

@ -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,

2
web/src/components/MemoList.tsx
View File

@ -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>

32
web/src/pages/Auth.tsx
View File

@ -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} />