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
1489feb0
Commit
1489feb0
authored
Oct 09, 2023
by
Steven
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: update common dialog default color
parent
acdeabb8
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
374 additions
and
379 deletions
+374
-379
ArchivedMemo.tsx
web/src/components/ArchivedMemo.tsx
+1
-1
ChangeMemoCreatedTsDialog.tsx
web/src/components/ChangeMemoCreatedTsDialog.tsx
+6
-9
Memo.tsx
web/src/components/Memo.tsx
+1
-1
MemberSection.tsx
web/src/components/Settings/MemberSection.tsx
+2
-2
SSOSection.tsx
web/src/components/Settings/SSOSection.tsx
+1
-1
StorageSection.tsx
web/src/components/Settings/StorageSection.tsx
+1
-1
SystemSection.tsx
web/src/components/Settings/SystemSection.tsx
+1
-1
en.json
web/src/locales/en.json
+361
-363
No files found.
web/src/components/ArchivedMemo.tsx
View file @
1489feb0
...
...
@@ -22,7 +22,7 @@ const ArchivedMemo: React.FC<Props> = (props: Props) => {
showCommonDialog
({
title
:
t
(
"memo.delete-memo"
),
content
:
t
(
"memo.delete-confirm"
),
style
:
"
warning
"
,
style
:
"
danger
"
,
dialogName
:
"delete-memo-dialog"
,
onConfirm
:
async
()
=>
{
await
memoStore
.
deleteMemoById
(
memo
.
id
);
...
...
web/src/components/ChangeMemoCreatedTsDialog.tsx
View file @
1489feb0
import
{
Button
}
from
"@mui/joy"
;
import
{
useEffect
,
useState
}
from
"react"
;
import
{
toast
}
from
"react-hot-toast"
;
import
{
getNormalizedTimeString
,
getUnixTime
}
from
"@/helpers/datetime"
;
...
...
@@ -69,10 +70,6 @@ const ChangeMemoCreatedTsDialog: React.FC<Props> = (props: Props) => {
</
button
>
</
div
>
<
div
className=
"flex flex-col justify-start items-start !w-72 max-w-full"
>
<
div
className=
"w-full bg-yellow-100 border border-yellow-400 rounded p-2 text-black"
>
<
p
className=
"uppercase"
>
{
t
(
"message.change-memo-created-time-warning-1"
)
}
</
p
>
<
p
>
{
t
(
"message.change-memo-created-time-warning-2"
)
}
</
p
>
</
div
>
<
input
className=
"input-text mt-2"
type=
"datetime-local"
...
...
@@ -80,13 +77,13 @@ const ChangeMemoCreatedTsDialog: React.FC<Props> = (props: Props) => {
max=
{
maxDatetimeValue
}
onChange=
{
handleDatetimeInputChange
}
/>
<
div
className=
"flex flex-row justify-end items-center mt-
2 w-full
"
>
<
span
className=
"btn-text
"
onClick=
{
handleCloseBtnClick
}
>
<
div
className=
"flex flex-row justify-end items-center mt-
4 w-full gap-x-2
"
>
<
Button
color=
"neutral"
variant=
"plain
"
onClick=
{
handleCloseBtnClick
}
>
{
t
(
"common.cancel"
)
}
</
spa
n
>
<
span
className=
"btn-
primary"
onClick=
{
handleSaveBtnClick
}
>
</
Butto
n
>
<
Button
color=
"
primary"
onClick=
{
handleSaveBtnClick
}
>
{
t
(
"common.save"
)
}
</
spa
n
>
</
Butto
n
>
</
div
>
</
div
>
</>
...
...
web/src/components/Memo.tsx
View file @
1489feb0
...
...
@@ -149,7 +149,7 @@ const Memo: React.FC<Props> = (props: Props) => {
showCommonDialog
({
title
:
t
(
"memo.delete-memo"
),
content
:
t
(
"memo.delete-confirm"
),
style
:
"
warning
"
,
style
:
"
danger
"
,
dialogName
:
"delete-memo-dialog"
,
onConfirm
:
async
()
=>
{
await
memoStore
.
deleteMemoById
(
memo
.
id
);
...
...
web/src/components/Settings/MemberSection.tsx
View file @
1489feb0
...
...
@@ -78,7 +78,7 @@ const PreferencesSection = () => {
showCommonDialog
({
title
:
t
(
"setting.member-section.archive-member"
),
content
:
t
(
"setting.member-section.archive-warning"
,
{
username
:
user
.
username
}),
style
:
"
warning
"
,
style
:
"
danger
"
,
dialogName
:
"archive-user-dialog"
,
onConfirm
:
async
()
=>
{
await
userStore
.
patchUser
({
...
...
@@ -102,7 +102,7 @@ const PreferencesSection = () => {
showCommonDialog
({
title
:
t
(
"setting.member-section.delete-member"
),
content
:
t
(
"setting.member-section.delete-warning"
,
{
username
:
user
.
username
}),
style
:
"
warning
"
,
style
:
"
danger
"
,
dialogName
:
"delete-user-dialog"
,
onConfirm
:
async
()
=>
{
await
userStore
.
deleteUser
({
...
...
web/src/components/Settings/SSOSection.tsx
View file @
1489feb0
...
...
@@ -41,7 +41,7 @@ const SSOSection = () => {
showCommonDialog
({
title
:
t
(
"setting.sso-section.delete-sso"
),
content
:
content
,
style
:
"
warning
"
,
style
:
"
danger
"
,
dialogName
:
"delete-identity-provider-dialog"
,
onConfirm
:
async
()
=>
{
try
{
...
...
web/src/components/Settings/StorageSection.tsx
View file @
1489feb0
...
...
@@ -40,7 +40,7 @@ const StorageSection = () => {
showCommonDialog
({
title
:
t
(
"setting.storage-section.delete-storage"
),
content
:
t
(
"setting.storage-section.warning-text"
,
{
name
:
storage
.
name
}),
style
:
"
warning
"
,
style
:
"
danger
"
,
dialogName
:
"delete-storage-dialog"
,
onConfirm
:
async
()
=>
{
try
{
...
...
web/src/components/Settings/SystemSection.tsx
View file @
1489feb0
...
...
@@ -88,7 +88,7 @@ const SystemSection = () => {
showCommonDialog
({
title
:
t
(
"setting.system-section.enable-password-login"
),
content
:
t
(
"setting.system-section.enable-password-login-warning"
),
style
:
"
warning
"
,
style
:
"
danger
"
,
dialogName
:
"enable-password-login-dialog"
,
onConfirm
:
async
()
=>
{
setState
({
...
state
,
disablePasswordLogin
:
value
});
...
...
web/src/locales/en.json
View file @
1489feb0
This diff is collapsed.
Click to expand it.
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