fix: reviewing router logic on landing page to set redirection with e…

…nv.url
SocialGouv · Jul 7, 2021 · 68ec854 · 68ec854
1 parent 3814bb2
commit 68ec854
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 4 deletions.
diff --git a/tumeplay-app/environnements/env.dev.guyane b/tumeplay-app/environnements/env.dev.guyane
@@ -1,2 +1,3 @@
 REACT_APP_API_URL=http://localhost:1337
 REACT_APP_ZONE=guyane
+REACT_APP_OTHER_ZONE_URL=https://tumeplay.numericite.fr
diff --git a/tumeplay-app/environnements/env.dev.metropole b/tumeplay-app/environnements/env.dev.metropole
@@ -1,2 +1,3 @@
 REACT_APP_API_URL=http://localhost:1337
 REACT_APP_ZONE=metropole
+REACT_APP_OTHER_ZONE_URL=https://guyane.tumeplay.numericite.fr
diff --git a/tumeplay-app/environnements/env.preprod.guyane b/tumeplay-app/environnements/env.preprod.guyane
@@ -1,2 +1,3 @@
 REACT_APP_API_URL=https://bo.tumeplay.numericite.fr
 REACT_APP_ZONE=guyane
+REACT_APP_OTHER_ZONE_URL=https://tumeplay.numericite.fr
diff --git a/tumeplay-app/environnements/env.preprod.metropole b/tumeplay-app/environnements/env.preprod.metropole
@@ -1,2 +1,3 @@
 REACT_APP_API_URL=https://bo.tumeplay.numericite.fr
 REACT_APP_ZONE=metropole
+REACT_APP_OTHER_ZONE_URL=https://guyane.tumeplay.numericite.fr
diff --git a/tumeplay-app/src/routes/routes.js b/tumeplay-app/src/routes/routes.js
@@ -112,7 +112,7 @@ const AppStack = createStackNavigator(
     },
   },
   {
-    initialRouteName: process.env.REACT_APP_ZONE === 'guyane' ? 'LandingScreen' : 'LandingPage',
+    initialRouteName: 'LandingPage',
     headerLayoutPreset: 'center',
     defaultNavigationOptions: ({navigation}) => ({
       header: <CustomHeader navigation={navigation} />,

diff --git a/tumeplay-app/src/screens/LandingPage.js b/tumeplay-app/src/screens/LandingPage.js
@@ -9,9 +9,17 @@ const LandingPage = (props) => {
   const guyane = require('../assets/pictures/Guyane.png')
 
   const handleRedirection = (name) => {
-    if(name === 'guyane') {
-      window.location.href = 'https://guyane.tumeplay.numericite.fr/'
-    } else {
+    if(process.env.REACT_APP_ZONE === 'metropole' && name === 'guyane') {
+      window.location.href = process.env.REACT_APP_OTHER_ZONE_URL
+    }
+    if(process.env.REACT_APP_ZONE === 'metropole' && name === 'metropole') {
+      props.navigation.navigate('LandingScreen')
+    }
+    if(process.env.REACT_APP_ZONE === 'guyane' && name === 'metropole') {
+      console.log(process.env.REACT_APP_OTHER_ZONE_URL)
+      window.location.href = process.env.REACT_APP_OTHER_ZONE_URL
+    }
+    if(process.env.REACT_APP_ZONE === 'guyane' && name === 'guyane') {
       props.navigation.navigate('LandingScreen')
     }
   }