-
Notifications
You must be signed in to change notification settings - Fork 92
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor: use modern routing + get some data for line profile page (#291
- Loading branch information
Showing
8 changed files
with
246 additions
and
265 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,115 +1,15 @@ | ||
| import { useCallback, useEffect } from 'react' | ||
| import 'antd/dist/antd.min.css' | ||
| import './App.scss' | ||
| import { ConfigProvider } from 'antd' | ||
| import 'leaflet/dist/leaflet.css' | ||
| import heIL from 'antd/es/locale/he_IL' | ||
| import { BrowserRouter as Router, useSearchParams } from 'react-router-dom' | ||
| import { PageSearchState, SearchContext } from './model/pageState' | ||
| import moment from 'moment' | ||
| import { useSessionStorage } from 'usehooks-ts' | ||
| import { useLocation } from 'react-router-dom' | ||
| import ReactGA from 'react-ga4' | ||
| import { CacheProvider } from '@emotion/react' | ||
| import createCache from '@emotion/cache' | ||
| import rtlPlugin from 'stylis-plugin-rtl' | ||
| import 'moment/locale/he' | ||
| import { heIL as heILmui } from '@mui/x-date-pickers/locales' | ||
| import { ThemeProvider, createTheme } from '@mui/material' | ||
| import { AdapterMoment } from '@mui/x-date-pickers/AdapterMoment' | ||
| import { LocalizationProvider } from '@mui/x-date-pickers' | ||
| import { EasterEgg } from './pages/EasterEgg/EasterEgg' | ||
| import { usePages } from './routes' | ||
| import MainLayout from './layout' | ||
| import { Envelope } from './pages/EasterEgg/Envelope' | ||
|
|
||
| const theme = createTheme( | ||
| { | ||
| direction: 'rtl', | ||
| palette: { | ||
| primary: { | ||
| main: '#5f5bff', | ||
| }, | ||
| }, | ||
| }, | ||
| heILmui, | ||
| ) | ||
|
|
||
| // Create rtl cache | ||
| const cacheRtl = createCache({ | ||
| key: 'muirtl', | ||
| stylisPlugins: [rtlPlugin], | ||
| }) | ||
|
|
||
| const App = () => { | ||
| const location = useLocation() | ||
|
|
||
| const [searchParams, setSearchParams] = useSearchParams() | ||
| const operatorId = searchParams.get('operatorId') | ||
| const lineNumber = searchParams.get('lineNumber') | ||
| const routeKey = searchParams.get('routeKey') | ||
| const timestamp = searchParams.get('timestamp') | ||
| const pages = usePages() | ||
|
|
||
| useEffect(() => { | ||
| ReactGA.send({ hitType: 'pageview', page: location.pathname + location.search }) | ||
| }, [location]) | ||
|
|
||
| const [search, setSearch] = useSessionStorage<PageSearchState>('search', { | ||
| timestamp: +timestamp! || moment().valueOf(), | ||
| operatorId: operatorId || '', | ||
| lineNumber: lineNumber || '', | ||
| routeKey: routeKey || '', | ||
| }) | ||
|
|
||
| useEffect(() => { | ||
| const page = pages.find((page) => page.path === location.pathname) | ||
| if (page?.searchParamsRequired) { | ||
| const params = new URLSearchParams({ timestamp: search.timestamp.toString() }) | ||
|
|
||
| if (search.operatorId) { | ||
| params.set('operatorId', search.operatorId) | ||
| } | ||
| if (search.lineNumber) { | ||
| params.set('lineNumber', search.lineNumber) | ||
| } | ||
| if (search.routeKey) { | ||
| params.set('routeKey', search.routeKey) | ||
| } | ||
| setSearchParams(params) | ||
| } | ||
| }, [search.lineNumber, search.operatorId, search.routeKey, search.timestamp, location.pathname]) | ||
|
|
||
| const safeSetSearch = useCallback((mutate: (prevState: PageSearchState) => PageSearchState) => { | ||
| setSearch((current: PageSearchState) => { | ||
| const newSearch = mutate(current) | ||
| return newSearch | ||
| }) | ||
| }, []) | ||
|
|
||
| return ( | ||
| <SearchContext.Provider value={{ search, setSearch: safeSetSearch }}> | ||
| <CacheProvider value={cacheRtl}> | ||
| <ThemeProvider theme={theme}> | ||
| <LocalizationProvider dateAdapter={AdapterMoment} adapterLocale="he"> | ||
| <ConfigProvider direction="rtl" locale={heIL}> | ||
| <MainLayout /> | ||
| </ConfigProvider> | ||
| </LocalizationProvider> | ||
| </ThemeProvider> | ||
| </CacheProvider> | ||
| </SearchContext.Provider> | ||
| ) | ||
| } | ||
|
|
||
| const RoutedApp = () => ( | ||
| <Router> | ||
| <App /> | ||
| <EasterEgg code="storybook"> | ||
| <a href="/storybook/index.html"> | ||
| <Envelope /> | ||
| </a> | ||
| </EasterEgg> | ||
| </Router> | ||
| import router from './routes' | ||
| import { RouterProvider } from 'react-router-dom' | ||
| import { Suspense } from 'react' | ||
| import Preloader from './shared/Preloader' | ||
|
|
||
| export const RoutedApp = () => ( | ||
| <Suspense fallback={<Preloader />}> | ||
| <RouterProvider router={router} /> | ||
| </Suspense> | ||
| ) | ||
| export default RoutedApp |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.