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
4499f45b
Commit
4499f45b
authored
Nov 08, 2023
by
Steven
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: deprecate daily review offset local setting
parent
504d1768
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
3 additions
and
42 deletions
+3
-42
PreferencesSection.tsx
web/src/components/Settings/PreferencesSection.tsx
+0
-35
TagList.tsx
web/src/components/TagList.tsx
+1
-1
DailyReview.tsx
web/src/pages/DailyReview.tsx
+2
-4
user.ts
web/src/store/module/user.ts
+0
-1
setting.d.ts
web/src/types/modules/setting.d.ts
+0
-1
No files found.
web/src/components/Settings/PreferencesSection.tsx
View file @
4499f45b
...
@@ -18,8 +18,6 @@ const PreferencesSection = () => {
...
@@ -18,8 +18,6 @@ const PreferencesSection = () => {
const
{
setting
,
localSetting
}
=
userStore
.
state
.
user
as
User
;
const
{
setting
,
localSetting
}
=
userStore
.
state
.
user
as
User
;
const
[
telegramUserId
,
setTelegramUserId
]
=
useState
<
string
>
(
setting
.
telegramUserId
);
const
[
telegramUserId
,
setTelegramUserId
]
=
useState
<
string
>
(
setting
.
telegramUserId
);
const
dailyReviewTimeOffsetOptions
:
number
[]
=
[...
Array
(
24
).
keys
()];
const
handleLocaleSelectChange
=
async
(
locale
:
Locale
)
=>
{
const
handleLocaleSelectChange
=
async
(
locale
:
Locale
)
=>
{
await
userStore
.
upsertUserSetting
(
"locale"
,
locale
);
await
userStore
.
upsertUserSetting
(
"locale"
,
locale
);
globalStore
.
setLocale
(
locale
);
globalStore
.
setLocale
(
locale
);
...
@@ -38,10 +36,6 @@ const PreferencesSection = () => {
...
@@ -38,10 +36,6 @@ const PreferencesSection = () => {
userStore
.
upsertLocalSetting
({
...
localSetting
,
enableDoubleClickEditing
:
event
.
target
.
checked
});
userStore
.
upsertLocalSetting
({
...
localSetting
,
enableDoubleClickEditing
:
event
.
target
.
checked
});
};
};
const
handleDailyReviewTimeOffsetChanged
=
(
value
:
number
)
=>
{
userStore
.
upsertLocalSetting
({
...
localSetting
,
dailyReviewTimeOffset
:
value
});
};
const
handleSaveTelegramUserId
=
async
()
=>
{
const
handleSaveTelegramUserId
=
async
()
=>
{
try
{
try
{
await
userStore
.
upsertUserSetting
(
"telegram-user-id"
,
telegramUserId
);
await
userStore
.
upsertUserSetting
(
"telegram-user-id"
,
telegramUserId
);
...
@@ -87,35 +81,6 @@ const PreferencesSection = () => {
...
@@ -87,35 +81,6 @@ const PreferencesSection = () => {
))
}
))
}
</
Select
>
</
Select
>
</
div
>
</
div
>
<
div
className=
"form-label selector"
>
<
span
className=
"text-sm break-keep text-ellipsis overflow-hidden"
>
{
t
(
"setting.preference-section.daily-review-time-offset"
)
}
</
span
>
<
span
className=
"w-auto inline-flex"
>
<
Select
placeholder=
"hh"
className=
"!min-w-fit"
value=
{
localSetting
.
dailyReviewTimeOffset
}
onChange=
{
(
_
,
value
)
=>
{
if
(
value
!==
null
)
{
handleDailyReviewTimeOffsetChanged
(
value
);
}
}
}
slotProps=
{
{
listbox
:
{
sx
:
{
maxHeight
:
"15rem"
,
overflow
:
"auto"
,
},
},
}
}
>
{
dailyReviewTimeOffsetOptions
.
map
((
item
)
=>
(
<
Option
key=
{
item
}
value=
{
item
}
className=
"whitespace-nowrap"
>
{
item
.
toString
().
padStart
(
2
,
"0"
)
}
</
Option
>
))
}
</
Select
>
</
span
>
</
div
>
<
label
className=
"form-label selector"
>
<
label
className=
"form-label selector"
>
<
span
className=
"text-sm break-keep"
>
{
t
(
"setting.preference-section.enable-double-click"
)
}
</
span
>
<
span
className=
"text-sm break-keep"
>
{
t
(
"setting.preference-section.enable-double-click"
)
}
</
span
>
...
...
web/src/components/TagList.tsx
View file @
4499f45b
...
@@ -132,7 +132,7 @@ const TagItemContainer: React.FC<TagItemContainerProps> = (props: TagItemContain
...
@@ -132,7 +132,7 @@ const TagItemContainer: React.FC<TagItemContainerProps> = (props: TagItemContain
className=
{
`flex flex-row justify-center items-center w-6 h-6 shrink-0 transition-all rotate-0 ${showSubTags && "rotate-90"}`
}
className=
{
`flex flex-row justify-center items-center w-6 h-6 shrink-0 transition-all rotate-0 ${showSubTags && "rotate-90"}`
}
onClick=
{
handleToggleBtnClick
}
onClick=
{
handleToggleBtnClick
}
>
>
<
Icon
.
ChevronRight
className=
"w-5 h-5 opacity-
8
0 dark:text-gray-400"
/>
<
Icon
.
ChevronRight
className=
"w-5 h-5 opacity-
4
0 dark:text-gray-400"
/>
</
span
>
</
span
>
)
:
null
}
)
:
null
}
</
div
>
</
div
>
...
...
web/src/pages/DailyReview.tsx
View file @
4499f45b
...
@@ -14,23 +14,21 @@ import DatePicker from "@/components/kit/DatePicker";
...
@@ -14,23 +14,21 @@ import DatePicker from "@/components/kit/DatePicker";
import
{
DAILY_TIMESTAMP
,
DEFAULT_MEMO_LIMIT
}
from
"@/helpers/consts"
;
import
{
DAILY_TIMESTAMP
,
DEFAULT_MEMO_LIMIT
}
from
"@/helpers/consts"
;
import
{
getDateStampByDate
,
getNormalizedDateString
,
getTimeStampByDate
,
getTimeString
}
from
"@/helpers/datetime"
;
import
{
getDateStampByDate
,
getNormalizedDateString
,
getTimeStampByDate
,
getTimeString
}
from
"@/helpers/datetime"
;
import
useCurrentUser
from
"@/hooks/useCurrentUser"
;
import
useCurrentUser
from
"@/hooks/useCurrentUser"
;
import
{
useMemoStore
,
useUserStore
}
from
"@/store/module"
;
import
{
useMemoStore
}
from
"@/store/module"
;
import
{
extractUsernameFromName
}
from
"@/store/v1"
;
import
{
extractUsernameFromName
}
from
"@/store/v1"
;
import
{
useTranslate
}
from
"@/utils/i18n"
;
import
{
useTranslate
}
from
"@/utils/i18n"
;
const
DailyReview
=
()
=>
{
const
DailyReview
=
()
=>
{
const
t
=
useTranslate
();
const
t
=
useTranslate
();
const
memoStore
=
useMemoStore
();
const
memoStore
=
useMemoStore
();
const
userStore
=
useUserStore
();
const
user
=
useCurrentUser
();
const
user
=
useCurrentUser
();
const
{
localSetting
}
=
userStore
.
state
.
user
as
User
;
const
currentDateStamp
=
getDateStampByDate
(
getNormalizedDateString
())
as
number
;
const
currentDateStamp
=
getDateStampByDate
(
getNormalizedDateString
())
as
number
;
const
[
selectedDateStamp
,
setSelectedDateStamp
]
=
useState
<
number
>
(
currentDateStamp
as
number
);
const
[
selectedDateStamp
,
setSelectedDateStamp
]
=
useState
<
number
>
(
currentDateStamp
as
number
);
const
[
showDatePicker
,
toggleShowDatePicker
]
=
useToggle
(
false
);
const
[
showDatePicker
,
toggleShowDatePicker
]
=
useToggle
(
false
);
const
dailyMemos
=
memoStore
.
state
.
memos
const
dailyMemos
=
memoStore
.
state
.
memos
.
filter
((
m
)
=>
{
.
filter
((
m
)
=>
{
const
displayTimestamp
=
getTimeStampByDate
(
m
.
displayTs
);
const
displayTimestamp
=
getTimeStampByDate
(
m
.
displayTs
);
const
selectedDateStampWithOffset
=
selectedDateStamp
+
localSetting
.
dailyReviewTimeOffset
*
60
*
60
*
1000
;
const
selectedDateStampWithOffset
=
selectedDateStamp
;
return
(
return
(
m
.
rowStatus
===
"NORMAL"
&&
m
.
rowStatus
===
"NORMAL"
&&
m
.
creatorUsername
===
extractUsernameFromName
(
user
.
name
)
&&
m
.
creatorUsername
===
extractUsernameFromName
(
user
.
name
)
&&
...
...
web/src/store/module/user.ts
View file @
4499f45b
...
@@ -15,7 +15,6 @@ const defaultSetting: Setting = {
...
@@ -15,7 +15,6 @@ const defaultSetting: Setting = {
const
defaultLocalSetting
:
LocalSetting
=
{
const
defaultLocalSetting
:
LocalSetting
=
{
enableDoubleClickEditing
:
false
,
enableDoubleClickEditing
:
false
,
dailyReviewTimeOffset
:
0
,
};
};
export
const
convertResponseModelUser
=
(
user
:
User
):
User
=>
{
export
const
convertResponseModelUser
=
(
user
:
User
):
User
=>
{
...
...
web/src/types/modules/setting.d.ts
View file @
4499f45b
...
@@ -13,7 +13,6 @@ interface Setting {
...
@@ -13,7 +13,6 @@ interface Setting {
interface
LocalSetting
{
interface
LocalSetting
{
enableDoubleClickEditing
:
boolean
;
enableDoubleClickEditing
:
boolean
;
dailyReviewTimeOffset
:
number
;
}
}
interface
UserLocaleSetting
{
interface
UserLocaleSetting
{
...
...
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