feat: fix conflict

SocialGouv · Nov 1, 2023 · 7d8aa68 · 7d8aa68
2 parents 4f86204 + 8290ad9
commit 7d8aa68
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+# [27.85.0](https://github.com/SocialGouv/fce/compare/v27.84.0...v27.85.0) (2023-10-29)
+
+
+### Features
+
+* notify users about new design ([#300](https://github.com/SocialGouv/fce/issues/300)) ([c171806](https://github.com/SocialGouv/fce/commit/c1718069f0958068ecef8a9535b212fc812f75cb))
+
+# [27.84.0](https://github.com/SocialGouv/fce/compare/v27.83.0...v27.84.0) (2023-10-18)
+
+
+### Features
+
+* corriger le lien egapro ([#299](https://github.com/SocialGouv/fce/issues/299)) ([d51c458](https://github.com/SocialGouv/fce/commit/d51c458ea3de23d947f5f6a44168d76fc33d300e))
+
 # [27.83.0](https://github.com/SocialGouv/fce/compare/v27.82.2...v27.83.0) (2023-09-13)
 
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fce",
-  "version": "27.83.0",
+  "version": "27.85.0",
   "description": "",
   "author": "commit42",
   "private": true,

diff --git a/src/client/src/components/App/App.js b/src/client/src/components/App/App.js
@@ -68,11 +68,17 @@ const App = () => {
                           <Maintenance />
                         ) : (
                           <Switch>
-                            <PrivateRoute exact path="/" component={Search} />
+                            <PrivateRoute
+                              exact
+                              displayMessage
+                              path="/"
+                              component={Search}
+                            />
                             <PrivateRoute
                               exact
                               path="/search"
                               component={Search}
+                              displayMessage
                             />
                             <PrivateRoute
                               exact

diff --git a/src/client/src/components/App/Header/header.scss b/src/client/src/components/App/Header/header.scss
@@ -101,26 +101,26 @@
 
 .beta-message {
     @extend %flex-center;
-    height: 40px;
-    font-size: 0.9rem;
-    font-weight: bold;
-    text-align: center;
+    font-size: 1rem;
     letter-spacing: 0.04rem;
-    color: $black;
-    background-color: #ffe15b;
+    color: #0063cb;
+    background-color: #e8edff;
+    padding: 1rem;
     box-shadow: inset 0 2px 6px rgba(0, 0, 0, 0.1);
-
+    &__nouveaute {
+        font-weight: bold;
+    }
     &__feedback-link {
         margin-left: $spacing-1;
         padding: $spacing-1 $spacing-2;
-        color: $dark-grey;
-        background-color: $white;
+        color: #0063cb !important;
+        transition: background-size 0s;
+        background-color: #b9c7f3;
         border-radius: $border-radius-1;
-        transition: color $duration-2, background-color $duration-2;
 
         &:hover {
             color: $white;
-            background-color: $primary;
+            background-color: #a9bfff;
         }
     }
 }
diff --git a/src/client/src/components/App/Layout.js b/src/client/src/components/App/Layout.js
@@ -37,6 +37,7 @@ const Layout = ({
 
 Layout.propTypes = {
   children: PropTypes.node,
+  displayMessage: PropTypes.bool,
   hasLandingHeader: PropTypes.bool,
   hasSharedButton: PropTypes.bool,
 };

diff --git a/src/client/src/components/DataSheets/Sections/Enterprise/EnterpriseRelationship/Egapro.js b/src/client/src/components/DataSheets/Sections/Enterprise/EnterpriseRelationship/Egapro.js
@@ -55,7 +55,7 @@ const Egapro = ({ enterprise }) => (
       </div>
       <span className="text">
         <a
-          href={`https://egapro.travail.gouv.fr/consulter-index/recherche?q=${enterprise.siren}`}
+          href={`https://egapro.travail.gouv.fr/index-egapro/recherche?query=${enterprise.siren}`}
           rel="noreferrer noopener"
           target="_blank"
         >

diff --git a/src/client/src/services/PrivateRoute/PrivateRoute.js b/src/client/src/services/PrivateRoute/PrivateRoute.js
@@ -77,6 +77,7 @@ const PrivateRoute = ({
 
 PrivateRoute.propTypes = {
   component: PropTypes.elementType,
+  displayMessage: PropTypes.bool,
   history: PropTypes.shape({
     push: PropTypes.func,
   }),