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
33f52320
Commit
33f52320
authored
Apr 30, 2024
by
Steven
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: remove lazy import components
parent
62959795
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
27 additions
and
25 deletions
+27
-25
CommonContextProvider.tsx
web/src/layouts/CommonContextProvider.tsx
+3
-3
HomeLayout.tsx
web/src/layouts/HomeLayout.tsx
+7
-2
SuspenseWrapper.tsx
web/src/layouts/SuspenseWrapper.tsx
+2
-2
Setting.tsx
web/src/pages/Setting.tsx
+0
-1
index.tsx
web/src/router/index.tsx
+15
-17
No files found.
web/src/layouts/CommonContextProvider.tsx
View file @
33f52320
...
...
@@ -24,7 +24,7 @@ const CommonContext = createContext<Context>({
const
CommonContextProvider
=
({
children
}:
{
children
:
React
.
ReactNode
})
=>
{
const
workspaceSettingStore
=
useWorkspaceSettingStore
();
const
userStore
=
useUserStore
();
const
[
loading
,
setLoading
]
=
useState
(
tru
e
);
const
[
initialized
,
setInitialized
]
=
useState
(
fals
e
);
const
[
commonContext
,
setCommonContext
]
=
useState
<
Pick
<
Context
,
"locale"
|
"appearance"
|
"profile"
>>
({
locale
:
"en"
,
appearance
:
"system"
,
...
...
@@ -56,7 +56,7 @@ const CommonContextProvider = ({ children }: { children: React.ReactNode }) => {
}
};
Promise
.
all
([
initialWorkspace
(),
initialUser
()]).
then
(()
=>
set
Loading
(
fals
e
));
Promise
.
all
([
initialWorkspace
(),
initialUser
()]).
then
(()
=>
set
Initialized
(
tru
e
));
},
[]);
return
(
...
...
@@ -67,7 +67,7 @@ const CommonContextProvider = ({ children }: { children: React.ReactNode }) => {
setAppearance
:
(
appearance
:
string
)
=>
setCommonContext
({
...
commonContext
,
appearance
}),
}
}
>
{
loading
?
null
:
<>
{
children
}
</>
}
{
!
initialized
?
null
:
<>
{
children
}
</>
}
</
CommonContext
.
Provider
>
);
};
...
...
web/src/layouts/HomeLayout.tsx
View file @
33f52320
import
{
Button
,
IconButton
,
Tooltip
}
from
"@mui/joy"
;
import
clsx
from
"clsx"
;
import
{
Suspense
,
useEffect
}
from
"react"
;
import
{
Suspense
,
useEffect
,
useState
}
from
"react"
;
import
{
Outlet
,
useLocation
}
from
"react-router-dom"
;
import
useLocalStorage
from
"react-use/lib/useLocalStorage"
;
import
Icon
from
"@/components/Icon"
;
...
...
@@ -17,6 +17,7 @@ const HomeLayout = () => {
const
{
sm
}
=
useResponsiveWidth
();
const
currentUser
=
useCurrentUser
();
const
[
collapsed
,
setCollapsed
]
=
useLocalStorage
<
boolean
>
(
"navigation-collapsed"
,
false
);
const
[
initialized
,
setInitialized
]
=
useState
(
false
);
// Redirect to explore page if not logged in.
useEffect
(()
=>
{
...
...
@@ -27,10 +28,14 @@ const HomeLayout = () => {
)
)
{
navigateTo
(
Routes
.
EXPLORE
);
return
;
}
setInitialized
(
true
);
},
[]);
return
(
return
!
initialized
?
(
<
Loading
/>
)
:
(
<
div
className=
"w-full min-h-full"
>
<
div
className=
{
clsx
(
"w-full transition-all mx-auto flex flex-row justify-center items-start"
,
collapsed
?
"sm:pl-16"
:
"sm:pl-56"
)
}
>
{
sm
&&
(
...
...
web/src/layouts/SuspenseWrapper.tsx
View file @
33f52320
...
...
@@ -2,12 +2,12 @@ import { Suspense } from "react";
import
{
Outlet
}
from
"react-router-dom"
;
import
Loading
from
"@/pages/Loading"
;
function
SuspenseWrapper
()
{
const
SuspenseWrapper
=
()
=>
{
return
(
<
Suspense
fallback=
{
<
Loading
/>
}
>
<
Outlet
/>
</
Suspense
>
);
}
}
;
export
default
SuspenseWrapper
;
web/src/pages/Setting.tsx
View file @
33f52320
...
...
@@ -23,7 +23,6 @@ interface State {
const
BASIC_SECTIONS
:
SettingSection
[]
=
[
"my-account"
,
"preference"
];
const
ADMIN_SECTIONS
:
SettingSection
[]
=
[
"member"
,
"system"
,
"storage"
,
"sso"
];
const
SECTION_ICON_MAP
:
Record
<
SettingSection
,
LucideIcon
>
=
{
"my-account"
:
Icon
.
User
,
preference
:
Icon
.
Cog
,
...
...
web/src/router/index.tsx
View file @
33f52320
import
{
lazy
}
from
"react"
;
import
{
createBrowserRouter
}
from
"react-router-dom"
;
import
App
from
"@/App"
;
import
HomeLayout
from
"@/layouts/HomeLayout"
;
import
SuspenseWrapper
from
"@/layouts/SuspenseWrapper"
;
const
SignIn
=
lazy
(()
=>
import
(
"@/pages/SignIn"
));
const
SignUp
=
lazy
(()
=>
import
(
"@/pages/SignUp"
));
const
AuthCallback
=
lazy
(()
=>
import
(
"@/pages/AuthCallback"
));
const
Explore
=
lazy
(()
=>
import
(
"@/pages/Explore"
));
const
Home
=
lazy
(()
=>
import
(
"@/pages/Home"
));
const
UserProfile
=
lazy
(()
=>
import
(
"@/pages/UserProfile"
));
const
MemoDetail
=
lazy
(()
=>
import
(
"@/pages/MemoDetail"
));
const
Archived
=
lazy
(()
=>
import
(
"@/pages/Archived"
));
const
Timeline
=
lazy
(()
=>
import
(
"@/pages/Timeline"
));
const
Resources
=
lazy
(()
=>
import
(
"@/pages/Resources"
));
const
Inboxes
=
lazy
(()
=>
import
(
"@/pages/Inboxes"
));
const
Setting
=
lazy
(()
=>
import
(
"@/pages/Setting"
));
const
About
=
lazy
(()
=>
import
(
"@/pages/About"
));
const
NotFound
=
lazy
(()
=>
import
(
"@/pages/NotFound"
));
const
PermissionDenied
=
lazy
(()
=>
import
(
"@/pages/PermissionDenied"
));
import
About
from
"@/pages/About"
;
import
Archived
from
"@/pages/Archived"
;
import
AuthCallback
from
"@/pages/AuthCallback"
;
import
Explore
from
"@/pages/Explore"
;
import
Home
from
"@/pages/Home"
;
import
Inboxes
from
"@/pages/Inboxes"
;
import
MemoDetail
from
"@/pages/MemoDetail"
;
import
NotFound
from
"@/pages/NotFound"
;
import
PermissionDenied
from
"@/pages/PermissionDenied"
;
import
Resources
from
"@/pages/Resources"
;
import
Setting
from
"@/pages/Setting"
;
import
SignIn
from
"@/pages/SignIn"
;
import
SignUp
from
"@/pages/SignUp"
;
import
Timeline
from
"@/pages/Timeline"
;
import
UserProfile
from
"@/pages/UserProfile"
;
export
enum
Routes
{
HOME
=
"/"
,
...
...
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