Browse Source

Fixed login redirection

Arnaud Vergnet 4 years ago
parent
commit
9f74e64d70
2 changed files with 25 additions and 23 deletions
  1. 5
    3
      src/components/Custom/ErrorView.js
  2. 20
    20
      src/navigation/DrawerNavigator.js

+ 5
- 3
src/components/Custom/ErrorView.js View File

@@ -86,11 +86,13 @@ class ErrorView extends React.PureComponent<Props, State> {
86 86
         </Button>;
87 87
     }
88 88
 
89
-    goToLogin = () => this.props.navigation.navigate("login",
89
+    goToLogin = () => {
90
+        console.log(this.props.route);
91
+        this.props.navigation.navigate("login",
90 92
         {
91
-           screen: 'index',
93
+           screen: 'login',
92 94
            params: {nextScreen: this.props.route.name}
93
-        });
95
+        })};
94 96
 
95 97
     getLoginButton() {
96 98
         return <Button

+ 20
- 20
src/navigation/DrawerNavigator.js View File

@@ -39,12 +39,12 @@ const AboutStack = createStackNavigator();
39 39
 function AboutStackComponent() {
40 40
     return (
41 41
         <AboutStack.Navigator
42
-            initialRouteName="index"
42
+            initialRouteName="about"
43 43
             headerMode="float"
44 44
             screenOptions={defaultScreenOptions}
45 45
         >
46 46
             <AboutStack.Screen
47
-                name="index"
47
+                name="about"
48 48
                 component={AboutScreen}
49 49
                 options={({navigation}) => {
50 50
                     const openDrawer = getDrawerButton.bind(this, navigation);
@@ -77,12 +77,12 @@ const SettingsStack = createStackNavigator();
77 77
 function SettingsStackComponent() {
78 78
     return (
79 79
         <SettingsStack.Navigator
80
-            initialRouteName="index"
80
+            initialRouteName="settings"
81 81
             headerMode="float"
82 82
             screenOptions={defaultScreenOptions}
83 83
         >
84 84
             <SettingsStack.Screen
85
-                name="index"
85
+                name="settings"
86 86
                 component={SettingsScreen}
87 87
                 options={({navigation}) => {
88 88
                     const openDrawer = getDrawerButton.bind(this, navigation);
@@ -101,12 +101,12 @@ const SelfMenuStack = createStackNavigator();
101 101
 function SelfMenuStackComponent() {
102 102
     return (
103 103
         <SelfMenuStack.Navigator
104
-            initialRouteName="index"
104
+            initialRouteName="self-menu"
105 105
             headerMode="float"
106 106
             screenOptions={defaultScreenOptions}
107 107
         >
108 108
             <SelfMenuStack.Screen
109
-                name="index"
109
+                name="self-menu"
110 110
                 component={SelfMenuScreen}
111 111
                 options={({navigation}) => {
112 112
                     const openDrawer = getDrawerButton.bind(this, navigation);
@@ -125,12 +125,12 @@ const AvailableRoomStack = createStackNavigator();
125 125
 function AvailableRoomStackComponent() {
126 126
     return (
127 127
         <AvailableRoomStack.Navigator
128
-            initialRouteName="index"
128
+            initialRouteName="available-rooms"
129 129
             headerMode="float"
130 130
             screenOptions={defaultScreenOptions}
131 131
         >
132 132
             <AvailableRoomStack.Screen
133
-                name="index"
133
+                name="available-rooms"
134 134
                 component={AvailableRoomScreen}
135 135
                 options={({navigation}) => {
136 136
                     const openDrawer = getDrawerButton.bind(this, navigation);
@@ -149,12 +149,12 @@ const BibStack = createStackNavigator();
149 149
 function BibStackComponent() {
150 150
     return (
151 151
         <BibStack.Navigator
152
-            initialRouteName="index"
152
+            initialRouteName="bib"
153 153
             headerMode="float"
154 154
             screenOptions={defaultScreenOptions}
155 155
         >
156 156
             <BibStack.Screen
157
-                name="index"
157
+                name="bib"
158 158
                 component={BibScreen}
159 159
                 options={({navigation}) => {
160 160
                     const openDrawer = getDrawerButton.bind(this, navigation);
@@ -173,12 +173,12 @@ const TetrisStack = createStackNavigator();
173 173
 function TetrisStackComponent() {
174 174
     return (
175 175
         <TetrisStack.Navigator
176
-            initialRouteName="index"
176
+            initialRouteName="tetris"
177 177
             headerMode="float"
178 178
             screenOptions={defaultScreenOptions}
179 179
         >
180 180
             <TetrisStack.Screen
181
-                name="index"
181
+                name="tetris"
182 182
                 component={TetrisScreen}
183 183
                 options={({navigation}) => {
184 184
                     const openDrawer = getDrawerButton.bind(this, navigation);
@@ -197,12 +197,12 @@ const LoginStack = createStackNavigator();
197 197
 function LoginStackComponent() {
198 198
     return (
199 199
         <LoginStack.Navigator
200
-            initialRouteName="index"
200
+            initialRouteName="login"
201 201
             headerMode="float"
202 202
             screenOptions={defaultScreenOptions}
203 203
         >
204 204
             <LoginStack.Screen
205
-                name="index"
205
+                name="login"
206 206
                 component={LoginScreen}
207 207
                 options={({navigation}) => {
208 208
                     const openDrawer = getDrawerButton.bind(this, navigation);
@@ -221,12 +221,12 @@ const ProfileStack = createStackNavigator();
221 221
 function ProfileStackComponent() {
222 222
     return (
223 223
         <ProfileStack.Navigator
224
-            initialRouteName="index"
224
+            initialRouteName="profile"
225 225
             headerMode="float"
226 226
             screenOptions={defaultScreenOptions}
227 227
         >
228 228
             <ProfileStack.Screen
229
-                name="index"
229
+                name="profile"
230 230
                 component={ProfileScreen}
231 231
                 options={({navigation}) => {
232 232
                     const openDrawer = getDrawerButton.bind(this, navigation);
@@ -256,12 +256,12 @@ const VoteStack = createStackNavigator();
256 256
 function VoteStackComponent() {
257 257
     return (
258 258
         <VoteStack.Navigator
259
-            initialRouteName="index"
259
+            initialRouteName="vote"
260 260
             headerMode="float"
261 261
             screenOptions={defaultScreenOptions}
262 262
         >
263 263
             <VoteStack.Screen
264
-                name="index"
264
+                name="vote"
265 265
                 component={VoteScreen}
266 266
                 options={({navigation}) => {
267 267
                     const openDrawer = getDrawerButton.bind(this, navigation);
@@ -280,12 +280,12 @@ const ClubStack = createStackNavigator();
280 280
 function ClubStackComponent() {
281 281
     return (
282 282
         <ClubStack.Navigator
283
-            initialRouteName={"index"}
283
+            initialRouteName={"club-list"}
284 284
             headerMode="float"
285 285
             screenOptions={defaultScreenOptions}
286 286
         >
287 287
             <ClubStack.Screen
288
-                name="index"
288
+                name="club-list"
289 289
                 component={ClubListScreen}
290 290
                 options={({navigation}) => {
291 291
                     const openDrawer = getDrawerButton.bind(this, navigation);

Loading…
Cancel
Save