Skip to content

Commit

Permalink
Merge pull request #166 from ballyalley-o/development
Browse files Browse the repository at this point in the history
Fix Loading transition to page
  • Loading branch information
ballyalley-o authored May 7, 2024
2 parents 9beebf2 + 29d2207 commit 8384990
Show file tree
Hide file tree
Showing 13 changed files with 414 additions and 158 deletions.
146 changes: 146 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,15 @@
"@mui/icons-material": "^5.15.11",
"@mui/lab": "^5.0.0-alpha.169",
"@mui/material": "^5.15.11",
"@react-spring/web": "^9.7.3",
"@reduxjs/toolkit": "^2.2.2",
"@types/axios": "^0.14.0",
"@types/node": "^20.11.24",
"@types/nprogress": "^0.2.3",
"@types/react-avatar-editor": "^13.0.2",
"axios": "^1.6.8",
"framer-motion": "^11.0.8",
"gsap": "^3.12.5",
"markdown-to-jsx": "^7.4.1",
"notistack": "^3.0.1",
"nprogress": "^0.2.0",
Expand All @@ -35,6 +37,7 @@
"react-helmet-async": "^2.0.4",
"react-redux": "^9.1.0",
"react-router-dom": "^6.22.2",
"react-use-measure": "^2.1.1",
"redux-persist": "^6.0.0",
"reselect": "^5.1.0",
"simplebar-react": "^3.2.4",
Expand Down
36 changes: 36 additions & 0 deletions public/asset/svg/tccp-vector-p.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion src/app.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { Fragment, useEffect } from 'react'
import { BrowserRouter } from 'react-router-dom'
import { HelmetProvider } from 'react-helmet-async'
import { AppNavBar, AppFooter } from 'component'
import { Fallback } from 'page'
import { AuthProvider } from 'auth/auth-provider'
import { SettingProvider } from 'component/setting'
Expand Down
2 changes: 2 additions & 0 deletions src/component/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@ export { default as Typography } from './typography/typography'
export { default as Markdown } from './markdown/markdown'
// meta
export { default as Meta } from './meta/meta'
// loading screen
export { default as LoadingScreen } from './loading-screen/loading-screen'
Loading

0 comments on commit 8384990

Please sign in to comment.