Skip to content
Snippets Groups Projects
Commit b5ebd7c0 authored by Bastien DUMONT's avatar Bastien DUMONT :angel:
Browse files

chore: move theme provider

parent d28225bd
No related branches found
No related tags found
1 merge request!12413.1 Release
import { ThemeProvider } from '@material-ui/core'
import Navbar from 'components/Navbar/Navbar' import Navbar from 'components/Navbar/Navbar'
import AppRoutes from 'components/Routes/Routes' import AppRoutes from 'components/Routes/Routes'
import SplashRoot from 'components/Splash/SplashRoot' import SplashRoot from 'components/Splash/SplashRoot'
...@@ -10,7 +9,6 @@ import React, { useEffect } from 'react' ...@@ -10,7 +9,6 @@ import React, { useEffect } from 'react'
import { useLocation } from 'react-router-dom' import { useLocation } from 'react-router-dom'
import { useAppSelector } from 'store/hooks' import { useAppSelector } from 'store/hooks'
import MatomoTracker from 'utils/matomoTracker' import MatomoTracker from 'utils/matomoTracker'
import { theme } from './theme'
import usePageTitle from './Hooks/usePageTitle' import usePageTitle from './Hooks/usePageTitle'
interface AppProps { interface AppProps {
...@@ -41,20 +39,18 @@ export const App = ({ tracker }: AppProps) => { ...@@ -41,20 +39,18 @@ export const App = ({ tracker }: AppProps) => {
return ( return (
<Layout> <Layout>
<ThemeProvider theme={theme}> <SplashRoot>
<SplashRoot> {termsStatus.accepted && (
{termsStatus.accepted && ( <>
<> <WelcomeModal open={!onboarding.isWelcomeSeen} />
<WelcomeModal open={!onboarding.isWelcomeSeen} /> <Navbar />
<Navbar /> </>
</> )}
)} <main className="app-content">
<main className="app-content"> <AppRoutes termsStatus={termsStatus} />
<AppRoutes termsStatus={termsStatus} /> </main>
</main> </SplashRoot>
</SplashRoot> {process.env.NODE_ENV !== 'production' ? <CozyDevtools /> : null}
{process.env.NODE_ENV !== 'production' ? <CozyDevtools /> : null}
</ThemeProvider>
</Layout> </Layout>
) )
} }
......
...@@ -5,8 +5,10 @@ declare let __PIWIK_SITEID__: number ...@@ -5,8 +5,10 @@ declare let __PIWIK_SITEID__: number
declare let __SENTRY_DSN__: string declare let __SENTRY_DSN__: string
declare let Piwik: any declare let Piwik: any
import { ThemeProvider } from '@material-ui/core'
import * as Sentry from '@sentry/react' import * as Sentry from '@sentry/react'
import { BrowserTracing } from '@sentry/tracing' import { BrowserTracing } from '@sentry/tracing'
import { theme } from 'components/theme'
import CozyClient, { Client, CozyProvider } from 'cozy-client' import CozyClient, { Client, CozyProvider } from 'cozy-client'
import { isFlagshipApp } from 'cozy-device-helper' import { isFlagshipApp } from 'cozy-device-helper'
import { handleOAuthResponse } from 'cozy-harvest-lib/dist/helpers/oauth' import { handleOAuthResponse } from 'cozy-harvest-lib/dist/helpers/oauth'
...@@ -109,7 +111,9 @@ const init = () => { ...@@ -109,7 +111,9 @@ const init = () => {
<CozyProvider client={client}> <CozyProvider client={client}>
<I18n lang={locale} polyglot={polyglot}> <I18n lang={locale} polyglot={polyglot}>
<HashRouter {...history}> <HashRouter {...history}>
<App tracker={tracker} /> <ThemeProvider theme={theme}>
<App tracker={tracker} />
</ThemeProvider>
</HashRouter> </HashRouter>
</I18n> </I18n>
</CozyProvider> </CozyProvider>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment