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
cc2e5ab6
Commit
cc2e5ab6
authored
May 27, 2022
by
boojack
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: update router
parent
5d6df87a
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
17 additions
and
43 deletions
+17
-43
useLoading.ts
web/src/hooks/useLoading.ts
+1
-3
useRefresh.ts
web/src/hooks/useRefresh.ts
+1
-3
home.less
web/src/less/home.less
+5
-0
memos.less
web/src/less/memos.less
+0
-6
Home.tsx
web/src/pages/Home.tsx
+10
-4
Memos.tsx
web/src/pages/Memos.tsx
+0
-18
homeRouter.tsx
web/src/routers/homeRouter.tsx
+0
-7
index.ts
web/src/routers/index.ts
+0
-2
No files found.
web/src/hooks/useLoading.ts
View file @
cc2e5ab6
import
{
useState
}
from
"react"
;
import
{
useState
}
from
"react"
;
function
useLoading
(
initialState
=
true
)
{
export
default
function
useLoading
(
initialState
=
true
)
{
const
[
state
,
setState
]
=
useState
({
isLoading
:
initialState
,
isFailed
:
false
,
isSucceed
:
false
});
const
[
state
,
setState
]
=
useState
({
isLoading
:
initialState
,
isFailed
:
false
,
isSucceed
:
false
});
return
{
return
{
...
@@ -31,5 +31,3 @@ function useLoading(initialState = true) {
...
@@ -31,5 +31,3 @@ function useLoading(initialState = true) {
},
},
};
};
}
}
export
default
useLoading
;
web/src/hooks/useRefresh.ts
View file @
cc2e5ab6
import
{
useCallback
,
useState
}
from
"react"
;
import
{
useCallback
,
useState
}
from
"react"
;
function
useRefresh
()
{
export
default
function
useRefresh
()
{
const
[,
setBoolean
]
=
useState
<
boolean
>
(
false
);
const
[,
setBoolean
]
=
useState
<
boolean
>
(
false
);
const
refresh
=
useCallback
(()
=>
{
const
refresh
=
useCallback
(()
=>
{
...
@@ -11,5 +11,3 @@ function useRefresh() {
...
@@ -11,5 +11,3 @@ function useRefresh() {
return
refresh
;
return
refresh
;
}
}
export
default
useRefresh
;
web/src/less/home.less
View file @
cc2e5ab6
@import "./mixin.less";
@import "./mixin.less";
@import "./memos-header.less";
#root {
#root {
background-color: #f6f5f4;
background-color: #f6f5f4;
...
@@ -7,4 +8,8 @@
...
@@ -7,4 +8,8 @@
#page-wrapper {
#page-wrapper {
@apply w-full h-full m-auto grid max-w-4xl mx-auto;
@apply w-full h-full m-auto grid max-w-4xl mx-auto;
grid-template-columns: min-content 1fr;
grid-template-columns: min-content 1fr;
.memos-wrapper {
@apply w-full h-full overflow-x-hidden flex flex-col justify-start items-start px-4 pr-10;
}
}
}
web/src/less/memos.less
deleted
100644 → 0
View file @
5d6df87a
@import "./mixin.less";
@import "./memos-header.less";
.memos-wrapper {
@apply w-full h-full overflow-x-hidden flex flex-col justify-start items-start px-4 pr-10;
}
web/src/pages/Home.tsx
View file @
cc2e5ab6
import
{
useEffect
}
from
"react"
;
import
{
useEffect
}
from
"react"
;
import
{
locationService
,
userService
}
from
"../services"
;
import
{
locationService
,
userService
}
from
"../services"
;
import
{
homeRouterSwitch
}
from
"../routers"
;
import
{
useAppSelector
}
from
"../store"
;
import
Sidebar
from
"../components/Sidebar"
;
import
Sidebar
from
"../components/Sidebar"
;
import
useLoading
from
"../hooks/useLoading"
;
import
useLoading
from
"../hooks/useLoading"
;
import
MemosHeader
from
"../components/MemosHeader"
;
import
MemoEditor
from
"../components/MemoEditor"
;
import
MemoFilter
from
"../components/MemoFilter"
;
import
MemoList
from
"../components/MemoList"
;
import
"../less/home.less"
;
import
"../less/home.less"
;
function
Home
()
{
function
Home
()
{
const
pathname
=
useAppSelector
((
state
)
=>
state
.
location
.
pathname
);
const
loadingState
=
useLoading
();
const
loadingState
=
useLoading
();
useEffect
(()
=>
{
useEffect
(()
=>
{
...
@@ -35,7 +36,12 @@ function Home() {
...
@@ -35,7 +36,12 @@ function Home() {
{
loadingState
.
isLoading
?
null
:
(
{
loadingState
.
isLoading
?
null
:
(
<
section
id=
"page-wrapper"
>
<
section
id=
"page-wrapper"
>
<
Sidebar
/>
<
Sidebar
/>
{
homeRouterSwitch
(
pathname
)
}
<
main
className=
"memos-wrapper"
>
<
MemosHeader
/>
<
MemoEditor
/>
<
MemoFilter
/>
<
MemoList
/>
</
main
>
</
section
>
</
section
>
)
}
)
}
</>
</>
...
...
web/src/pages/Memos.tsx
deleted
100644 → 0
View file @
5d6df87a
import
MemoEditor
from
"../components/MemoEditor"
;
import
MemosHeader
from
"../components/MemosHeader"
;
import
MemoFilter
from
"../components/MemoFilter"
;
import
MemoList
from
"../components/MemoList"
;
import
"../less/memos.less"
;
function
Memos
()
{
return
(
<
main
className=
"memos-wrapper"
>
<
MemosHeader
/>
<
MemoEditor
/>
<
MemoFilter
/>
<
MemoList
/>
</
main
>
);
}
export
default
Memos
;
web/src/routers/homeRouter.tsx
deleted
100644 → 0
View file @
5d6df87a
import
Memos
from
"../pages/Memos"
;
const
homeRouter
=
{
"*"
:
<
Memos
/>
,
};
export
default
homeRouter
;
web/src/routers/index.ts
View file @
cc2e5ab6
import
appRouter
from
"./appRouter"
;
import
appRouter
from
"./appRouter"
;
import
homeRouter
from
"./homeRouter"
;
// just like React-Router
// just like React-Router
interface
Router
{
interface
Router
{
...
@@ -19,4 +18,3 @@ const routerSwitch = (router: Router) => {
...
@@ -19,4 +18,3 @@ const routerSwitch = (router: Router) => {
};
};
export
const
appRouterSwitch
=
routerSwitch
(
appRouter
);
export
const
appRouterSwitch
=
routerSwitch
(
appRouter
);
export
const
homeRouterSwitch
=
routerSwitch
(
homeRouter
);
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