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
fe4ec0b1
Commit
fe4ec0b1
authored
Dec 18, 2023
by
Steven
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: rename navigator
parent
7c5fdd1b
Changes
16
Show whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
160 additions
and
193 deletions
+160
-193
10002__memo.sql
store/db/sqlite/seed/10002__memo.sql
+1
-3
Memo.tsx
web/src/components/Memo.tsx
+2
-2
Navigation.tsx
web/src/components/Navigation.tsx
+6
-6
ar.json
web/src/locales/ar.json
+0
-4
de.json
web/src/locales/de.json
+0
-4
en.json
web/src/locales/en.json
+2
-3
fr.json
web/src/locales/fr.json
+0
-4
nl.json
web/src/locales/nl.json
+0
-4
pt-BR.json
web/src/locales/pt-BR.json
+0
-4
ru.json
web/src/locales/ru.json
+0
-4
zh-Hans.json
web/src/locales/zh-Hans.json
+2
-3
zh-Hant.json
web/src/locales/zh-Hant.json
+2
-3
SignIn.tsx
web/src/pages/SignIn.tsx
+82
-84
SignUp.tsx
web/src/pages/SignUp.tsx
+57
-59
Timeline.tsx
web/src/pages/Timeline.tsx
+3
-3
index.tsx
web/src/router/index.tsx
+3
-3
No files found.
store/db/sqlite/seed/10002__memo.sql
View file @
fe4ec0b1
...
@@ -55,9 +55,7 @@ VALUES
...
@@ -55,9 +55,7 @@ VALUES
'#TODO
'#TODO
- [x] Take more photos about **🌄 sunset**;
- [x] Take more photos about **🌄 sunset**;
- [ ] Clean the classroom;
- [ ] Clean the classroom;
- [ ] Watch *👦 The Boys*;
- [ ] Watch *👦 The Boys*;'
,
(👆 click to toggle status)
'
,
102
,
102
,
'PROTECTED'
'PROTECTED'
);
);
...
...
web/src/components/Memo.tsx
View file @
fe4ec0b1
...
@@ -212,7 +212,7 @@ const Memo: React.FC<Props> = (props: Props) => {
...
@@ -212,7 +212,7 @@ const Memo: React.FC<Props> = (props: Props) => {
className=
{
`group memo-wrapper ${"memos-" + memo.id} ${memo.pinned && props.showPinnedStyle ? "pinned" : ""}`
}
className=
{
`group memo-wrapper ${"memos-" + memo.id} ${memo.pinned && props.showPinnedStyle ? "pinned" : ""}`
}
ref=
{
memoContainerRef
}
ref=
{
memoContainerRef
}
>
>
<
div
className=
"memo-top-wrapper"
>
<
div
className=
"memo-top-wrapper
mb-1
"
>
<
div
className=
"w-full max-w-[calc(100%-20px)] flex flex-row justify-start items-center mr-1"
>
<
div
className=
"w-full max-w-[calc(100%-20px)] flex flex-row justify-start items-center mr-1"
>
{
props
.
showCreator
&&
creator
&&
(
{
props
.
showCreator
&&
creator
&&
(
<>
<>
...
@@ -303,7 +303,7 @@ const Memo: React.FC<Props> = (props: Props) => {
...
@@ -303,7 +303,7 @@ const Memo: React.FC<Props> = (props: Props) => {
</
div
>
</
div
>
</
div
>
</
div
>
{
props
.
showParent
&&
memo
.
parent
&&
(
{
props
.
showParent
&&
memo
.
parent
&&
(
<
div
className=
"w-auto max-w-full m
t
-1"
>
<
div
className=
"w-auto max-w-full m
b
-1"
>
<
Link
<
Link
className=
"px-2 py-0.5 border rounded-full max-w-xs w-auto text-xs flex flex-row justify-start items-center flex-nowrap text-gray-600 dark:text-gray-400 dark:border-gray-500 hover:shadow hover:opacity-80"
className=
"px-2 py-0.5 border rounded-full max-w-xs w-auto text-xs flex flex-row justify-start items-center flex-nowrap text-gray-600 dark:text-gray-400 dark:border-gray-500 hover:shadow hover:opacity-80"
to=
{
`/m/${memo.parent.id}`
}
to=
{
`/m/${memo.parent.id}`
}
...
...
web/src/components/Navigation.tsx
View file @
fe4ec0b1
...
@@ -43,11 +43,11 @@ const Navigation = () => {
...
@@ -43,11 +43,11 @@ const Navigation = () => {
title
:
t
(
"common.home"
),
title
:
t
(
"common.home"
),
icon
:
<
Icon
.
Home
className=
"mr-3 w-6 h-auto opacity-70"
/>,
icon
:
<
Icon
.
Home
className=
"mr-3 w-6 h-auto opacity-70"
/>,
};
};
const
dailyReview
NavLink
:
NavLinkItem
=
{
const
timeline
NavLink
:
NavLinkItem
=
{
id
:
"header-
daily-review
"
,
id
:
"header-
timeline
"
,
path
:
"/
review
"
,
path
:
"/
timeline
"
,
title
:
t
(
"
daily-review
.title"
),
title
:
t
(
"
timeline
.title"
),
icon
:
<
Icon
.
Calendar
className=
"mr-3 w-6 h-auto opacity-70"
/>,
icon
:
<
Icon
.
GanttChartSquare
className=
"mr-3 w-6 h-auto opacity-70"
/>,
};
};
const
resourcesNavLink
:
NavLinkItem
=
{
const
resourcesNavLink
:
NavLinkItem
=
{
id
:
"header-resources"
,
id
:
"header-resources"
,
...
@@ -94,7 +94,7 @@ const Navigation = () => {
...
@@ -94,7 +94,7 @@ const Navigation = () => {
};
};
const
navLinks
:
NavLinkItem
[]
=
user
const
navLinks
:
NavLinkItem
[]
=
user
?
[
homeNavLink
,
dailyReview
NavLink
,
resourcesNavLink
,
exploreNavLink
,
inboxNavLink
,
archivedNavLink
,
settingNavLink
]
?
[
homeNavLink
,
timeline
NavLink
,
resourcesNavLink
,
exploreNavLink
,
inboxNavLink
,
archivedNavLink
,
settingNavLink
]
:
[
exploreNavLink
,
signInNavLink
];
:
[
exploreNavLink
,
signInNavLink
];
return
(
return
(
...
...
web/src/locales/ar.json
View file @
fe4ec0b1
...
@@ -70,10 +70,6 @@
...
@@ -70,10 +70,6 @@
"visibility"
:
"الرؤية"
,
"visibility"
:
"الرؤية"
,
"yourself"
:
"نفسك"
"yourself"
:
"نفسك"
},
},
"daily-review"
:
{
"no-memos"
:
"عفوًا، لا يوجد شيء."
,
"title"
:
"المراجعة اليومية"
},
"editor"
:
{
"editor"
:
{
"cancel-edit"
:
"إلغاء التعديل"
,
"cancel-edit"
:
"إلغاء التعديل"
,
"cant-empty"
:
"المحتوى لا يمكن أن يكون فارغ"
,
"cant-empty"
:
"المحتوى لا يمكن أن يكون فارغ"
,
...
...
web/src/locales/de.json
View file @
fe4ec0b1
...
@@ -81,10 +81,6 @@
...
@@ -81,10 +81,6 @@
"visibility"
:
"Sichtbarkeit"
,
"visibility"
:
"Sichtbarkeit"
,
"yourself"
:
"Du selbst"
"yourself"
:
"Du selbst"
},
},
"daily-review"
:
{
"no-memos"
:
"Hoppla, da ist ja gar nichts."
,
"title"
:
"Tagesbilanz"
},
"days"
:
{
"days"
:
{
"fri"
:
"Fr"
,
"fri"
:
"Fr"
,
"mon"
:
"Mo"
,
"mon"
:
"Mo"
,
...
...
web/src/locales/en.json
View file @
fe4ec0b1
...
@@ -157,9 +157,8 @@
...
@@ -157,9 +157,8 @@
"hide"
:
"Hide"
,
"hide"
:
"Hide"
,
"save-all"
:
"Save all"
"save-all"
:
"Save all"
},
},
"daily-review"
:
{
"timeline"
:
{
"title"
:
"Daily Review"
,
"title"
:
"Timeline"
"no-memos"
:
"Oops, there is nothing."
},
},
"setting"
:
{
"setting"
:
{
"my-account"
:
"My Account"
,
"my-account"
:
"My Account"
,
...
...
web/src/locales/fr.json
View file @
fe4ec0b1
...
@@ -85,10 +85,6 @@
...
@@ -85,10 +85,6 @@
"visibility"
:
"Visibilité"
,
"visibility"
:
"Visibilité"
,
"yourself"
:
"Vous-même"
"yourself"
:
"Vous-même"
},
},
"daily-review"
:
{
"no-memos"
:
"Oups, il n'y a rien."
,
"title"
:
"Résumé journalier"
},
"days"
:
{
"days"
:
{
"fri"
:
"Ve"
,
"fri"
:
"Ve"
,
"mon"
:
"Lu"
,
"mon"
:
"Lu"
,
...
...
web/src/locales/nl.json
View file @
fe4ec0b1
...
@@ -123,10 +123,6 @@
...
@@ -123,10 +123,6 @@
"tag-name"
:
"LABEL_NAAM"
,
"tag-name"
:
"LABEL_NAAM"
,
"invalid-tag-name"
:
"Onjuiste label naam"
"invalid-tag-name"
:
"Onjuiste label naam"
},
},
"daily-review"
:
{
"title"
:
"Dagelijks"
,
"no-memos"
:
"Oeps, er is niks."
},
"setting"
:
{
"setting"
:
{
"my-account"
:
"Mijn account"
,
"my-account"
:
"Mijn account"
,
"preference"
:
"Voorkeuren"
,
"preference"
:
"Voorkeuren"
,
...
...
web/src/locales/pt-BR.json
View file @
fe4ec0b1
...
@@ -85,10 +85,6 @@
...
@@ -85,10 +85,6 @@
"visibility"
:
"Visibilidade"
,
"visibility"
:
"Visibilidade"
,
"yourself"
:
"Você mesmo"
"yourself"
:
"Você mesmo"
},
},
"daily-review"
:
{
"no-memos"
:
"Não há memos."
,
"title"
:
"Resumo Diário"
},
"days"
:
{
"days"
:
{
"fri"
:
"Sex"
,
"fri"
:
"Sex"
,
"mon"
:
"Seg"
,
"mon"
:
"Seg"
,
...
...
web/src/locales/ru.json
View file @
fe4ec0b1
...
@@ -78,10 +78,6 @@
...
@@ -78,10 +78,6 @@
"visibility"
:
"Видимость"
,
"visibility"
:
"Видимость"
,
"yourself"
:
"Вы"
"yourself"
:
"Вы"
},
},
"daily-review"
:
{
"no-memos"
:
"Записей нет."
,
"title"
:
"По дням"
},
"days"
:
{
"days"
:
{
"fri"
:
"Пт."
,
"fri"
:
"Пт."
,
"mon"
:
"Пон."
,
"mon"
:
"Пон."
,
...
...
web/src/locales/zh-Hans.json
View file @
fe4ec0b1
...
@@ -82,9 +82,8 @@
...
@@ -82,9 +82,8 @@
"yourself"
:
"您自己"
,
"yourself"
:
"您自己"
,
"inbox"
:
"通知"
"inbox"
:
"通知"
},
},
"daily-review"
:
{
"timeline"
:
{
"no-memos"
:
"哎呀,空无一物。"
,
"title"
:
"时间线"
"title"
:
"每日回顾"
},
},
"days"
:
{
"days"
:
{
"fri"
:
"五"
,
"fri"
:
"五"
,
...
...
web/src/locales/zh-Hant.json
View file @
fe4ec0b1
...
@@ -82,9 +82,8 @@
...
@@ -82,9 +82,8 @@
"visibility"
:
"可見度"
,
"visibility"
:
"可見度"
,
"yourself"
:
"你自己"
"yourself"
:
"你自己"
},
},
"daily-review"
:
{
"timeline"
:
{
"no-memos"
:
"可惜可惜,是日空空如也。"
,
"title"
:
"时间线"
"title"
:
"每日回顧"
},
},
"days"
:
{
"days"
:
{
"fri"
:
"五"
,
"fri"
:
"五"
,
...
...
web/src/pages/SignIn.tsx
View file @
fe4ec0b1
...
@@ -104,8 +104,7 @@ const SignIn = () => {
...
@@ -104,8 +104,7 @@ const SignIn = () => {
};
};
return
(
return
(
<
div
className=
"flex flex-row justify-center items-center w-full h-full dark:bg-zinc-800"
>
<
div
className=
"pt-12 pb-8 w-80 max-w-full h-auto mx-auto flex flex-col justify-start items-center"
>
<
div
className=
"w-80 max-w-full h-full min-h-screen py-4 flex flex-col justify-start items-center"
>
<
div
className=
"w-full py-4 grow flex flex-col justify-center items-center"
>
<
div
className=
"w-full py-4 grow flex flex-col justify-center items-center"
>
<
div
className=
"w-full flex flex-row justify-center items-center mb-6"
>
<
div
className=
"w-full flex flex-row justify-center items-center mb-6"
>
<
img
className=
"h-14 w-auto rounded-full shadow"
src=
{
systemStatus
.
customizedProfile
.
logoUrl
}
alt=
""
/>
<
img
className=
"h-14 w-auto rounded-full shadow"
src=
{
systemStatus
.
customizedProfile
.
logoUrl
}
alt=
""
/>
...
@@ -188,12 +187,11 @@ const SignIn = () => {
...
@@ -188,12 +187,11 @@ const SignIn = () => {
</>
</>
)
}
)
}
</
div
>
</
div
>
<
div
className=
"
flex flex-row items-center justify-center w-full gap-2"
>
<
div
className=
"mt-4
flex flex-row items-center justify-center w-full gap-2"
>
<
LocaleSelect
value=
{
locale
}
onChange=
{
handleLocaleSelectChange
}
/>
<
LocaleSelect
value=
{
locale
}
onChange=
{
handleLocaleSelectChange
}
/>
<
AppearanceSelect
value=
{
appearance
}
onChange=
{
handleAppearanceSelectChange
}
/>
<
AppearanceSelect
value=
{
appearance
}
onChange=
{
handleAppearanceSelectChange
}
/>
</
div
>
</
div
>
</
div
>
</
div
>
</
div
>
);
);
};
};
...
...
web/src/pages/SignUp.tsx
View file @
fe4ec0b1
...
@@ -70,8 +70,7 @@ const SignUp = () => {
...
@@ -70,8 +70,7 @@ const SignUp = () => {
};
};
return
(
return
(
<
div
className=
"flex flex-row justify-center items-center w-full h-full dark:bg-zinc-800"
>
<
div
className=
"pt-12 pb-8 w-80 max-w-full h-auto mx-auto flex flex-col justify-start items-center"
>
<
div
className=
"w-80 max-w-full h-full min-h-screen py-4 flex flex-col justify-start items-center"
>
<
div
className=
"w-full py-4 grow flex flex-col justify-center items-center"
>
<
div
className=
"w-full py-4 grow flex flex-col justify-center items-center"
>
<
div
className=
"w-full flex flex-row justify-center items-center mb-6"
>
<
div
className=
"w-full flex flex-row justify-center items-center mb-6"
>
<
img
className=
"h-14 w-auto rounded-full shadow"
src=
{
systemStatus
.
customizedProfile
.
logoUrl
}
alt=
""
/>
<
img
className=
"h-14 w-auto rounded-full shadow"
src=
{
systemStatus
.
customizedProfile
.
logoUrl
}
alt=
""
/>
...
@@ -128,12 +127,11 @@ const SignUp = () => {
...
@@ -128,12 +127,11 @@ const SignUp = () => {
</
Link
>
</
Link
>
</
p
>
</
p
>
</
div
>
</
div
>
<
div
className=
"
flex flex-row items-center justify-center w-full gap-2"
>
<
div
className=
"mt-4
flex flex-row items-center justify-center w-full gap-2"
>
<
LocaleSelect
value=
{
locale
}
onChange=
{
handleLocaleSelectChange
}
/>
<
LocaleSelect
value=
{
locale
}
onChange=
{
handleLocaleSelectChange
}
/>
<
AppearanceSelect
value=
{
appearance
}
onChange=
{
handleAppearanceSelectChange
}
/>
<
AppearanceSelect
value=
{
appearance
}
onChange=
{
handleAppearanceSelectChange
}
/>
</
div
>
</
div
>
</
div
>
</
div
>
</
div
>
);
);
};
};
...
...
web/src/pages/
DailyReview
.tsx
→
web/src/pages/
Timeline
.tsx
View file @
fe4ec0b1
...
@@ -18,7 +18,7 @@ import { useMemoStore } from "@/store/module";
...
@@ -18,7 +18,7 @@ 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
Timeline
=
()
=>
{
const
t
=
useTranslate
();
const
t
=
useTranslate
();
const
memoStore
=
useMemoStore
();
const
memoStore
=
useMemoStore
();
const
currentUser
=
useCurrentUser
();
const
currentUser
=
useCurrentUser
();
...
@@ -128,7 +128,7 @@ const DailyReview = () => {
...
@@ -128,7 +128,7 @@ const DailyReview = () => {
{
selectedDateStamp
===
currentDateStamp
&&
(
{
selectedDateStamp
===
currentDateStamp
&&
(
<
div
className=
"w-full pl-0 sm:pl-12 sm:mt-4"
>
<
div
className=
"w-full pl-0 sm:pl-12 sm:mt-4"
>
<
MemoEditor
cacheKey=
"
daily-review
-editor"
/>
<
MemoEditor
cacheKey=
"
timeline
-editor"
/>
</
div
>
</
div
>
)
}
)
}
</
div
>
</
div
>
...
@@ -138,4 +138,4 @@ const DailyReview = () => {
...
@@ -138,4 +138,4 @@ const DailyReview = () => {
);
);
};
};
export
default
DailyReview
;
export
default
Timeline
;
web/src/router/index.tsx
View file @
fe4ec0b1
...
@@ -13,7 +13,7 @@ const Home = lazy(() => import("@/pages/Home"));
...
@@ -13,7 +13,7 @@ const Home = lazy(() => import("@/pages/Home"));
const
UserProfile
=
lazy
(()
=>
import
(
"@/pages/UserProfile"
));
const
UserProfile
=
lazy
(()
=>
import
(
"@/pages/UserProfile"
));
const
MemoDetail
=
lazy
(()
=>
import
(
"@/pages/MemoDetail"
));
const
MemoDetail
=
lazy
(()
=>
import
(
"@/pages/MemoDetail"
));
const
Archived
=
lazy
(()
=>
import
(
"@/pages/Archived"
));
const
Archived
=
lazy
(()
=>
import
(
"@/pages/Archived"
));
const
DailyReview
=
lazy
(()
=>
import
(
"@/pages/DailyReview
"
));
const
Timeline
=
lazy
(()
=>
import
(
"@/pages/Timeline
"
));
const
Resources
=
lazy
(()
=>
import
(
"@/pages/Resources"
));
const
Resources
=
lazy
(()
=>
import
(
"@/pages/Resources"
));
const
Inboxes
=
lazy
(()
=>
import
(
"@/pages/Inboxes"
));
const
Inboxes
=
lazy
(()
=>
import
(
"@/pages/Inboxes"
));
const
Setting
=
lazy
(()
=>
import
(
"@/pages/Setting"
));
const
Setting
=
lazy
(()
=>
import
(
"@/pages/Setting"
));
...
@@ -59,10 +59,10 @@ const router = createBrowserRouter([
...
@@ -59,10 +59,10 @@ const router = createBrowserRouter([
),
),
},
},
{
{
path
:
"
review
"
,
path
:
"
timeline
"
,
element
:
(
element
:
(
<
AuthStatusProvider
>
<
AuthStatusProvider
>
<
DailyReview
/>
<
Timeline
/>
</
AuthStatusProvider
>
</
AuthStatusProvider
>
),
),
},
},
...
...
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