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
c7822515
Commit
c7822515
authored
Feb 08, 2024
by
Steven
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: tweak view checks
parent
d86f0bac
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
7 deletions
+9
-7
MemoReactionListView.tsx
web/src/components/MemoReactionListView.tsx
+4
-2
MemoView.tsx
web/src/components/MemoView.tsx
+1
-1
ReactionSelector.tsx
web/src/components/ReactionSelector.tsx
+2
-2
ReactionView.tsx
web/src/components/ReactionView.tsx
+2
-2
No files found.
web/src/components/MemoReactionistView.tsx
→
web/src/components/MemoReaction
L
istView.tsx
View file @
c7822515
import
{
uniq
}
from
"lodash-es"
;
import
{
uniq
}
from
"lodash-es"
;
import
{
memo
,
useEffect
,
useState
}
from
"react"
;
import
{
memo
,
useEffect
,
useState
}
from
"react"
;
import
useCurrentUser
from
"@/hooks/useCurrentUser"
;
import
{
extractUsernameFromName
,
useUserStore
}
from
"@/store/v1"
;
import
{
extractUsernameFromName
,
useUserStore
}
from
"@/store/v1"
;
import
{
Memo
}
from
"@/types/proto/api/v2/memo_service"
;
import
{
Memo
}
from
"@/types/proto/api/v2/memo_service"
;
import
{
Reaction
,
Reaction_Type
}
from
"@/types/proto/api/v2/reaction_service"
;
import
{
Reaction
,
Reaction_Type
}
from
"@/types/proto/api/v2/reaction_service"
;
...
@@ -14,6 +15,7 @@ interface Props {
...
@@ -14,6 +15,7 @@ interface Props {
const
MemoReactionListView
=
(
props
:
Props
)
=>
{
const
MemoReactionListView
=
(
props
:
Props
)
=>
{
const
{
memo
,
reactions
}
=
props
;
const
{
memo
,
reactions
}
=
props
;
const
currentUser
=
useCurrentUser
();
const
userStore
=
useUserStore
();
const
userStore
=
useUserStore
();
const
[
reactionGroup
,
setReactionGroup
]
=
useState
<
Map
<
Reaction_Type
,
User
[]
>>
(
new
Map
());
const
[
reactionGroup
,
setReactionGroup
]
=
useState
<
Map
<
Reaction_Type
,
User
[]
>>
(
new
Map
());
...
@@ -31,8 +33,8 @@ const MemoReactionListView = (props: Props) => {
...
@@ -31,8 +33,8 @@ const MemoReactionListView = (props: Props) => {
},
[
reactions
]);
},
[
reactions
]);
return
(
return
(
<
div
className=
"w-full mt-2 flex flex-row justify-start items-start flex-wrap gap-1"
>
<
div
className=
"w-full mt-2 flex flex-row justify-start items-start flex-wrap gap-1
select-none
"
>
<
ReactionSelector
memo=
{
memo
}
/>
{
currentUser
&&
<
ReactionSelector
memo=
{
memo
}
/>
}
{
Array
.
from
(
reactionGroup
).
map
(([
reactionType
,
users
])
=>
{
{
Array
.
from
(
reactionGroup
).
map
(([
reactionType
,
users
])
=>
{
return
<
ReactionView
key=
{
`${reactionType.toString()} ${users.length}`
}
memo=
{
memo
}
reactionType=
{
reactionType
}
users=
{
users
}
/>;
return
<
ReactionView
key=
{
`${reactionType.toString()} ${users.length}`
}
memo=
{
memo
}
reactionType=
{
reactionType
}
users=
{
users
}
/>;
})
}
})
}
...
...
web/src/components/MemoView.tsx
View file @
c7822515
...
@@ -20,7 +20,7 @@ import { showCommonDialog } from "./Dialog/CommonDialog";
...
@@ -20,7 +20,7 @@ import { showCommonDialog } from "./Dialog/CommonDialog";
import
Icon
from
"./Icon"
;
import
Icon
from
"./Icon"
;
import
MemoContent
from
"./MemoContent"
;
import
MemoContent
from
"./MemoContent"
;
import
showMemoEditorDialog
from
"./MemoEditor/MemoEditorDialog"
;
import
showMemoEditorDialog
from
"./MemoEditor/MemoEditorDialog"
;
import
MemoReactionistView
from
"./MemoReactionistView"
;
import
MemoReactionistView
from
"./MemoReaction
L
istView"
;
import
MemoRelationListView
from
"./MemoRelationListView"
;
import
MemoRelationListView
from
"./MemoRelationListView"
;
import
MemoResourceListView
from
"./MemoResourceListView"
;
import
MemoResourceListView
from
"./MemoResourceListView"
;
import
showPreviewImageDialog
from
"./PreviewImageDialog"
;
import
showPreviewImageDialog
from
"./PreviewImageDialog"
;
...
...
web/src/components/ReactionSelector.tsx
View file @
c7822515
...
@@ -14,11 +14,11 @@ interface Props {
...
@@ -14,11 +14,11 @@ interface Props {
const
REACTION_TYPES
=
[
const
REACTION_TYPES
=
[
Reaction_Type
.
THUMBS_UP
,
Reaction_Type
.
THUMBS_UP
,
Reaction_Type
.
THUMBS_DOWN
,
Reaction_Type
.
LAUGH
,
Reaction_Type
.
HEART
,
Reaction_Type
.
HEART
,
Reaction_Type
.
ROCKET
,
Reaction_Type
.
ROCKET
,
Reaction_Type
.
LAUGH
,
Reaction_Type
.
EYES
,
Reaction_Type
.
EYES
,
Reaction_Type
.
THUMBS_DOWN
,
];
];
const
ReactionSelector
=
(
props
:
Props
)
=>
{
const
ReactionSelector
=
(
props
:
Props
)
=>
{
...
...
web/src/components/ReactionView.tsx
View file @
c7822515
...
@@ -40,9 +40,9 @@ const stringifyUsers = (users: User[]): string => {
...
@@ -40,9 +40,9 @@ const stringifyUsers = (users: User[]): string => {
return
users
.
map
((
user
)
=>
user
.
nickname
||
user
.
username
).
join
(
", "
);
return
users
.
map
((
user
)
=>
user
.
nickname
||
user
.
username
).
join
(
", "
);
}
}
return
`
${
users
return
`
${
users
.
slice
(
0
,
5
)
.
slice
(
0
,
4
)
.
map
((
user
)
=>
user
.
nickname
||
user
.
username
)
.
map
((
user
)
=>
user
.
nickname
||
user
.
username
)
.
join
(
", "
)}
and
${
users
.
length
-
5
}
others`
;
.
join
(
", "
)}
and
${
users
.
length
-
4
}
others`
;
};
};
const
ReactionView
=
(
props
:
Props
)
=>
{
const
ReactionView
=
(
props
:
Props
)
=>
{
...
...
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