Skip to content
Snippets Groups Projects
Commit 439fb1fa authored by Hugo SUBTIL's avatar Hugo SUBTIL
Browse files

Merge branch 'fix/set-cgu-before-tutorial' into 'dev'

Add tutorial welcome conditionned by cgu

See merge request web-et-numerique/llle_project/ecolyo!398
parents 9ee5550f 1feffe52
Branches
Tags
5 merge requests!404chore(release): 1.2.4,!403chore(release): 1.2.4,!401fix: Change default value for monthly analysis notification to true,!399Dev,!398Add tutorial welcome conditionned by cgu
...@@ -28,8 +28,12 @@ export const App = () => { ...@@ -28,8 +28,12 @@ export const App = () => {
splashComponent={SplashScreen} splashComponent={SplashScreen}
splashErrorComponent={SplashScreenError} splashErrorComponent={SplashScreenError}
> >
<TutorialWelcome open={!tutorial.isWelcomeSeen} /> {isLastTermAccepted && (
{isLastTermAccepted && <Navbar />} <>
<TutorialWelcome open={!tutorial.isWelcomeSeen} />
<Navbar />
</>
)}
<Main> <Main>
<Content className="app-content"> <Content className="app-content">
<Routes isLastTermAccepted={isLastTermAccepted} /> <Routes isLastTermAccepted={isLastTermAccepted} />
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment