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

Merge branch 'dev' into 'master'

Dev

See merge request web-et-numerique/llle_project/ecolyo!399
parents 9ee5550f 94bd1ebc
Branches
Tags
1 merge request!399Dev
......@@ -2,12 +2,20 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
### [1.2.3](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/compare/v1.2.2...v1.2.3) (2021-09-17)
### Bug Fixes
* **cicd:** deploy job for master branch was failing ([9ee5550](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/commit/9ee5550f645194c1b973ad467c823b0ef8bea15a))
* **cgu:** bug fix on displayed text for first cozy connection.
### [1.2.2](https://forge.grandlyon.com/web-et-numerique/llle_project/ecolyo/compare/v1.2.0...v1.2.2) (2021-09-17)
### ⚠ BREAKING CHANGES
* Change user profile's for the new terms managment
* Change user profile's for the new terms managment
### Features
......
......@@ -3,7 +3,7 @@
"slug": "ecolyo",
"icon": "icon.svg",
"categories": ["energy"],
"version": "1.2.0",
"version": "1.2.3",
"licence": "AGPL-3.0",
"editor": "Métropole de Lyon",
"default_locale": "fr",
......
{
"name": "ecolyo",
"version": "1.2.2",
"version": "1.2.3",
"scripts": {
"tx": "tx pull --all || true",
"lint": "yarn lint:js && yarn lint:styles",
......
......@@ -28,8 +28,12 @@ export const App = () => {
splashComponent={SplashScreen}
splashErrorComponent={SplashScreenError}
>
<TutorialWelcome open={!tutorial.isWelcomeSeen} />
{isLastTermAccepted && <Navbar />}
{isLastTermAccepted && (
<>
<TutorialWelcome open={!tutorial.isWelcomeSeen} />
<Navbar />
</>
)}
<Main>
<Content className="app-content">
<Routes isLastTermAccepted={isLastTermAccepted} />
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment