Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
canifa_note
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Vũ Hoàng Anh
canifa_note
Commits
589b1046
Unverified
Commit
589b1046
authored
Jul 16, 2023
by
boojack
Committed by
GitHub
Jul 16, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: upgrade version to `v0.14.0` (#1970)
* chore: upgrade version * chore: update * chore: update
parent
220cba84
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
27 additions
and
24 deletions
+27
-24
memo.md
docs/api/memo.md
+1
-1
version.go
server/version/version.go
+2
-2
Empty.tsx
web/src/components/Empty.tsx
+1
-1
index.tsx
web/src/components/MemoEditor/index.tsx
+2
-7
MemoList.tsx
web/src/components/MemoList.tsx
+1
-1
Auth.tsx
web/src/pages/Auth.tsx
+20
-12
No files found.
docs/api/memo.md
View file @
589b1046
...
@@ -13,7 +13,7 @@ POST /api/v1/memo
...
@@ -13,7 +13,7 @@ POST /api/v1/memo
"content"
:
"Memo content"
,
"content"
:
"Memo content"
,
"visibility"
:
"PUBLIC"
,
"visibility"
:
"PUBLIC"
,
"resourceIdList"
:
[
123
,
456
],
"resourceIdList"
:
[
123
,
456
],
"relationList"
:
[{
"relatedMemoId"
:
789
,
"type"
:
"
LINK
"
}]
"relationList"
:
[{
"relatedMemoId"
:
789
,
"type"
:
"
REFERENCE
"
}]
}
}
```
```
...
...
server/version/version.go
View file @
589b1046
...
@@ -9,10 +9,10 @@ import (
...
@@ -9,10 +9,10 @@ import (
// Version is the service current released version.
// Version is the service current released version.
// Semantic versioning: https://semver.org/
// Semantic versioning: https://semver.org/
var
Version
=
"0.1
3.2
"
var
Version
=
"0.1
4.0
"
// DevVersion is the service current development version.
// DevVersion is the service current development version.
var
DevVersion
=
"0.1
3.2
"
var
DevVersion
=
"0.1
4.0
"
func
GetCurrentVersion
(
mode
string
)
string
{
func
GetCurrentVersion
(
mode
string
)
string
{
if
mode
==
"dev"
||
mode
==
"demo"
{
if
mode
==
"dev"
||
mode
==
"demo"
{
...
...
web/src/components/Empty.tsx
View file @
589b1046
const
Empty
=
()
=>
{
const
Empty
=
()
=>
{
return
(
return
(
<
div
className=
"mx-auto"
>
<
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
>
</
div
>
);
);
};
};
...
...
web/src/components/MemoEditor/index.tsx
View file @
589b1046
...
@@ -7,8 +7,7 @@ import { getMatchedNodes } from "@/labs/marked";
...
@@ -7,8 +7,7 @@ import { getMatchedNodes } from "@/labs/marked";
import
{
upsertMemoResource
}
from
"@/helpers/api"
;
import
{
upsertMemoResource
}
from
"@/helpers/api"
;
import
{
TAB_SPACE_WIDTH
,
UNKNOWN_ID
}
from
"@/helpers/consts"
;
import
{
TAB_SPACE_WIDTH
,
UNKNOWN_ID
}
from
"@/helpers/consts"
;
import
{
useFilterStore
,
useGlobalStore
,
useMemoStore
,
useResourceStore
,
useTagStore
,
useUserStore
}
from
"@/store/module"
;
import
{
useFilterStore
,
useGlobalStore
,
useMemoStore
,
useResourceStore
,
useTagStore
,
useUserStore
}
from
"@/store/module"
;
import
storage
from
"@/helpers/storage"
;
import
{
clearContentQueryParam
}
from
"@/helpers/utils"
;
import
{
clearContentQueryParam
,
getContentQueryParam
}
from
"@/helpers/utils"
;
import
Icon
from
"../Icon"
;
import
Icon
from
"../Icon"
;
import
Editor
,
{
EditorRefActions
}
from
"./Editor"
;
import
Editor
,
{
EditorRefActions
}
from
"./Editor"
;
import
showCreateResourceDialog
from
"../CreateResourceDialog"
;
import
showCreateResourceDialog
from
"../CreateResourceDialog"
;
...
@@ -21,10 +20,6 @@ import "@/less/memo-editor.less";
...
@@ -21,10 +20,6 @@ import "@/less/memo-editor.less";
const
listItemSymbolList
=
[
"- [ ] "
,
"- [x] "
,
"- [X] "
,
"* "
,
"- "
];
const
listItemSymbolList
=
[
"- [ ] "
,
"- [x] "
,
"- [X] "
,
"* "
,
"- "
];
const
emptyOlReg
=
/^
(\d
+
)\.
$/
;
const
emptyOlReg
=
/^
(\d
+
)\.
$/
;
const
getInitialContent
=
():
string
=>
{
return
getContentQueryParam
()
??
storage
.
get
([
"editorContentCache"
]).
editorContentCache
??
""
;
};
interface
Props
{
interface
Props
{
className
?:
string
;
className
?:
string
;
memoId
?:
MemoId
;
memoId
?:
MemoId
;
...
@@ -377,7 +372,7 @@ const MemoEditor = (props: Props) => {
...
@@ -377,7 +372,7 @@ const MemoEditor = (props: Props) => {
const
editorConfig
=
useMemo
(
const
editorConfig
=
useMemo
(
()
=>
({
()
=>
({
className
:
`memo-editor`
,
className
:
`memo-editor`
,
initialContent
:
getInitialContent
()
,
initialContent
:
""
,
placeholder
:
t
(
"editor.placeholder"
),
placeholder
:
t
(
"editor.placeholder"
),
fullscreen
:
state
.
fullscreen
,
fullscreen
:
state
.
fullscreen
,
onContentChange
:
handleContentChange
,
onContentChange
:
handleContentChange
,
...
...
web/src/components/MemoList.tsx
View file @
589b1046
...
@@ -164,7 +164,7 @@ const MemoList = () => {
...
@@ -164,7 +164,7 @@ const MemoList = () => {
<
p
className=
"status-text"
>
<
p
className=
"status-text"
>
{
isComplete
?
(
{
isComplete
?
(
sortedMemos
.
length
===
0
&&
(
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
/>
<
Empty
/>
<
p
className=
"mt-4 text-gray-600 dark:text-gray-400"
>
{
t
(
"message.no-data"
)
}
</
p
>
<
p
className=
"mt-4 text-gray-600 dark:text-gray-400"
>
{
t
(
"message.no-data"
)
}
</
p
>
</
div
>
</
div
>
...
...
web/src/pages/Auth.tsx
View file @
589b1046
...
@@ -158,6 +158,12 @@ const Auth = () => {
...
@@ -158,6 +158,12 @@ const Auth = () => {
</
div
>
</
div
>
<
div
className=
"flex flex-row justify-end items-center w-full mt-6"
>
<
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"
/>
}
{
actionBtnLoadingState
.
isLoading
&&
<
Icon
.
Loader
className=
"w-4 h-auto mr-2 animate-spin dark:text-gray-300"
/>
}
{
!
systemStatus
.
host
?
(
<
Button
disabled=
{
actionBtnLoadingState
.
isLoading
}
onClick=
{
handleSignUpButtonClick
}
>
{
t
(
"common.sign-up"
)
}
</
Button
>
)
:
(
<>
{
systemStatus
?.
allowSignUp
&&
(
{
systemStatus
?.
allowSignUp
&&
(
<>
<>
<
Button
variant=
{
"plain"
}
disabled=
{
actionBtnLoadingState
.
isLoading
}
onClick=
{
handleSignUpButtonClick
}
>
<
Button
variant=
{
"plain"
}
disabled=
{
actionBtnLoadingState
.
isLoading
}
onClick=
{
handleSignUpButtonClick
}
>
...
@@ -169,8 +175,15 @@ const Auth = () => {
...
@@ -169,8 +175,15 @@ const Auth = () => {
<
Button
type=
"submit"
disabled=
{
actionBtnLoadingState
.
isLoading
}
onClick=
{
handleSignInButtonClick
}
>
<
Button
type=
"submit"
disabled=
{
actionBtnLoadingState
.
isLoading
}
onClick=
{
handleSignInButtonClick
}
>
{
t
(
"common.sign-in"
)
}
{
t
(
"common.sign-in"
)
}
</
Button
>
</
Button
>
</>
)
}
</
div
>
</
div
>
</
form
>
</
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
&&
(
{
identityProviderList
.
length
>
0
&&
(
<>
<>
<
Divider
className=
"!my-4"
>
{
t
(
"common.or"
)
}
</
Divider
>
<
Divider
className=
"!my-4"
>
{
t
(
"common.or"
)
}
</
Divider
>
...
@@ -190,11 +203,6 @@ const Auth = () => {
...
@@ -190,11 +203,6 @@ const Auth = () => {
</
div
>
</
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
>
<
div
className=
"flex flex-row items-center justify-center w-full gap-2"
>
<
div
className=
"flex flex-row items-center justify-center w-full gap-2"
>
<
LocaleSelect
value=
{
locale
}
onChange=
{
handleLocaleSelectChange
}
/>
<
LocaleSelect
value=
{
locale
}
onChange=
{
handleLocaleSelectChange
}
/>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment