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
a6fcdfce
Commit
a6fcdfce
authored
Oct 28, 2023
by
Steven
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: update memo comment i18n
parent
dca712d2
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
5 deletions
+24
-5
Header.tsx
web/src/components/Header.tsx
+6
-2
MemoCommentMessage.tsx
web/src/components/Inbox/MemoCommentMessage.tsx
+7
-1
en.json
web/src/locales/en.json
+3
-0
DailyReview.tsx
web/src/pages/DailyReview.tsx
+4
-2
user.ts
web/src/store/v1/user.ts
+4
-0
No files found.
web/src/components/Header.tsx
View file @
a6fcdfce
...
...
@@ -50,8 +50,12 @@ const Header = () => {
layoutStore
.
setHeaderStatus
(
true
);
}
};
window
.
addEventListener
(
"resize"
,
handleWindowResize
);
handleWindowResize
();
window
.
addEventListener
(
"resize"
,
handleWindowResize
);
return
()
=>
{
window
.
removeEventListener
(
"resize"
,
handleWindowResize
);
};
},
[
location
]);
const
homeNavLink
:
NavLinkItem
=
{
...
...
@@ -111,7 +115,7 @@ const Header = () => {
};
const
navLinks
:
NavLinkItem
[]
=
user
?
[
homeNavLink
,
dailyReviewNavLink
,
resourcesNavLink
,
inboxNavLink
,
explore
NavLink
,
archivedNavLink
,
settingNavLink
]
?
[
homeNavLink
,
dailyReviewNavLink
,
resourcesNavLink
,
exploreNavLink
,
inbox
NavLink
,
archivedNavLink
,
settingNavLink
]
:
[
exploreNavLink
,
signInNavLink
];
return
(
...
...
web/src/components/Inbox/MemoCommentMessage.tsx
View file @
a6fcdfce
...
...
@@ -5,8 +5,10 @@ import toast from "react-hot-toast";
import
{
activityServiceClient
}
from
"@/grpcweb"
;
import
useNavigateTo
from
"@/hooks/useNavigateTo"
;
import
useInboxStore
from
"@/store/v1/inbox"
;
import
{
extractUsernameFromName
}
from
"@/store/v1/user"
;
import
{
Activity
}
from
"@/types/proto/api/v2/activity_service"
;
import
{
Inbox
,
Inbox_Status
}
from
"@/types/proto/api/v2/inbox_service"
;
import
{
useTranslate
}
from
"@/utils/i18n"
;
import
Icon
from
"../Icon"
;
interface
Props
{
...
...
@@ -14,6 +16,7 @@ interface Props {
}
const
MemoCommentMessage
=
({
inbox
}:
Props
)
=>
{
const
t
=
useTranslate
();
const
navigateTo
=
useNavigateTo
();
const
inboxStore
=
useInboxStore
();
const
[
activity
,
setActivity
]
=
useState
<
Activity
|
undefined
>
(
undefined
);
...
...
@@ -90,7 +93,10 @@ const MemoCommentMessage = ({ inbox }: Props) => {
className="text-base leading-tight cursor-pointer text-gray-500 dark:text-gray-400 hover:underline hover:text-blue-600"
onClick={handleNavigateToMemo}
>
{inbox.sender} has a comment in your memo #{activity?.payload?.memoComment?.relatedMemoId}.
{t("inbox.memo-comment", {
user: extractUsernameFromName(inbox.sender),
memo: `
memo
#
$
{
activity
?.
payload
?.
memoComment
?.
relatedMemoId
}
`,
})}
</p>
</div>
</div>
...
...
web/src/locales/en.json
View file @
a6fcdfce
...
...
@@ -369,5 +369,8 @@
"file-exceeds-upload-limit-of"
:
"File {{file}} exceeds upload limit of {{size}} MiB"
,
"updating-setting-failed"
:
"Updating setting failed"
,
"password-login-disabled"
:
"Can't remove last identity provider when password login is disabled"
},
"inbox"
:
{
"memo-comment"
:
"{{user}} has a comment on your {{memo}}."
}
}
web/src/pages/DailyReview.tsx
View file @
a6fcdfce
...
...
@@ -116,10 +116,12 @@ const DailyReview = () => {
<
MemoResourceListView
resourceList=
{
memo
.
resourceList
}
/>
<
MemoRelationListView
memo=
{
memo
}
relationList=
{
memo
.
relationList
.
filter
((
relation
)
=>
relation
.
type
===
"REFERENCE"
)
}
/>
<
div
className=
"absolute left-1 sm:left-2 top-3 h-full"
>
<
Icon
.
Circle
className=
"w-4 h-auto bg-gray-400 text-gray-400 dark:bg-gray-500 dark:text-gray-500 rounded-full"
/>
{
index
!==
dailyMemos
.
length
-
1
&&
(
<
div
className=
"absolute top-2 left-
1.5 h-full w-1
bg-gray-400 dark:bg-gray-500 block"
></
div
>
<
div
className=
"absolute top-2 left-
[7px] h-full w-0.5
bg-gray-400 dark:bg-gray-500 block"
></
div
>
)
}
<
div
className=
"border-4 rounded-full border-white relative dark:border-zinc-700"
>
<
Icon
.
Circle
className=
"w-2 h-auto bg-gray-400 text-gray-400 dark:bg-gray-500 dark:text-gray-500 rounded-full"
/>
</
div
>
</
div
>
</
div
>
))
}
...
...
web/src/store/v1/user.ts
View file @
a6fcdfce
...
...
@@ -57,4 +57,8 @@ const useUserV1Store = create<UserV1Store>()((set, get) => ({
},
}));
export
const
extractUsernameFromName
=
(
name
:
string
)
=>
{
return
name
.
split
(
"/"
)[
1
];
};
export
default
useUserV1Store
;
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