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
56617178
Commit
56617178
authored
Jan 26, 2024
by
Steven
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: tweak embedded memo style
parent
7edb3598
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
CreateMemoRelationDialog.tsx
web/src/components/CreateMemoRelationDialog.tsx
+2
-1
EmbeddedMemo.tsx
...c/components/MemoContent/EmbeddedContent/EmbeddedMemo.tsx
+3
-3
No files found.
web/src/components/CreateMemoRelationDialog.tsx
View file @
56617178
...
@@ -3,6 +3,7 @@ import React, { useState } from "react";
...
@@ -3,6 +3,7 @@ import React, { useState } from "react";
import
{
toast
}
from
"react-hot-toast"
;
import
{
toast
}
from
"react-hot-toast"
;
import
useDebounce
from
"react-use/lib/useDebounce"
;
import
useDebounce
from
"react-use/lib/useDebounce"
;
import
{
memoServiceClient
}
from
"@/grpcweb"
;
import
{
memoServiceClient
}
from
"@/grpcweb"
;
import
{
DEFAULT_MEMO_LIMIT
}
from
"@/helpers/consts"
;
import
{
getDateTimeString
}
from
"@/helpers/datetime"
;
import
{
getDateTimeString
}
from
"@/helpers/datetime"
;
import
useCurrentUser
from
"@/hooks/useCurrentUser"
;
import
useCurrentUser
from
"@/hooks/useCurrentUser"
;
import
{
Memo
}
from
"@/types/proto/api/v2/memo_service"
;
import
{
Memo
}
from
"@/types/proto/api/v2/memo_service"
;
...
@@ -34,7 +35,7 @@ const CreateMemoRelationDialog: React.FC<Props> = (props: Props) => {
...
@@ -34,7 +35,7 @@ const CreateMemoRelationDialog: React.FC<Props> = (props: Props) => {
filters
.
push
(
`content_search == [
${
JSON
.
stringify
(
searchText
)}
]`
);
filters
.
push
(
`content_search == [
${
JSON
.
stringify
(
searchText
)}
]`
);
}
}
const
{
memos
}
=
await
memoServiceClient
.
listMemos
({
const
{
memos
}
=
await
memoServiceClient
.
listMemos
({
limit
:
10
,
limit
:
DEFAULT_MEMO_LIMIT
,
filter
:
filters
.
length
>
0
?
filters
.
join
(
" && "
)
:
undefined
,
filter
:
filters
.
length
>
0
?
filters
.
join
(
" && "
)
:
undefined
,
});
});
setFetchedMemos
(
memos
);
setFetchedMemos
(
memos
);
...
...
web/src/components/MemoContent/EmbeddedContent/EmbeddedMemo.tsx
View file @
56617178
...
@@ -49,11 +49,11 @@ const EmbeddedMemo = ({ resourceId, params: paramsStr }: Props) => {
...
@@ -49,11 +49,11 @@ const EmbeddedMemo = ({ resourceId, params: paramsStr }: Props) => {
}
}
return
(
return
(
<
div
className=
"relative flex flex-col justify-start items-start w-full p-4 pt-3
mb-2 bg-white dark:bg-zinc-800 rounded-lg border border-gray-200 dark:border-zinc-700
"
>
<
div
className=
"relative flex flex-col justify-start items-start w-full p-4 pt-3
!my-2 bg-white dark:bg-zinc-800 rounded-lg border border-gray-200 dark:border-zinc-700 hover:shadow
"
>
<
div
className=
"w-full flex flex-row justify-between items-center"
>
<
div
className=
"w-full
mb-1
flex flex-row justify-between items-center"
>
<
span
className=
"text-sm text-gray-400 select-none"
>
{
getDateTimeString
(
memo
.
displayTime
)
}
</
span
>
<
span
className=
"text-sm text-gray-400 select-none"
>
{
getDateTimeString
(
memo
.
displayTime
)
}
</
span
>
<
Link
className=
"hover:opacity-80"
to=
{
`/m/${memo.name}`
}
unstable_viewTransition
>
<
Link
className=
"hover:opacity-80"
to=
{
`/m/${memo.name}`
}
unstable_viewTransition
>
<
Icon
.
ExternalLink
className=
"w-4 h-auto opacity-8
0"
/>
<
Icon
.
ArrowUpRight
className=
"w-5 h-auto opacity-80 text-gray-40
0"
/>
</
Link
>
</
Link
>
</
div
>
</
div
>
<
MemoContent
nodes=
{
memo
.
nodes
}
memoId=
{
memo
.
id
}
embeddedMemos=
{
context
.
embeddedMemos
}
/>
<
MemoContent
nodes=
{
memo
.
nodes
}
memoId=
{
memo
.
id
}
embeddedMemos=
{
context
.
embeddedMemos
}
/>
...
...
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