Archived
Fix back stack after login
Minor refactor
This commit is contained in:
1 parent
61c91cfed4
commit
b3f066ea2c
3 files changed
+8
-14
No files matched your search
+6
-13
@@ -2,27 +2,20 @@ import React from 'react';
|
||||
import {connect} from "react-redux";
|
||||
import {TabNavigator, StackNavigator} from "react-navigation";
|
||||
|
||||
import LoginScreen from "./screens/LoginScreen";
|
||||
import EventsScreen from "./screens/EventScreen";
|
||||
import EventDetailsScreen from "./screens/EventDetailsScreen";
|
||||
import AboutScreen from "./screens/AboutScreen";
|
||||
import EventDetailsScreen from "./screens/EventDetailsScreen";
|
||||
import EventListScreen from "./screens/EventListScreen";
|
||||
import LoginScreen from "./screens/LoginScreen";
|
||||
import MembershipScreen from "./screens/MembershipScreen";
|
||||
import Login from "./modules/login/Login";
|
||||
|
||||
|
||||
/* Navigation */
|
||||
const tabBarRoutes = {
|
||||
// Login: { screen: LoginScreen },
|
||||
Events: { screen: EventsScreen },
|
||||
EventList: { screen: EventListScreen },
|
||||
Membership: { screen: MembershipScreen },
|
||||
About: { screen: AboutScreen },
|
||||
};
|
||||
|
||||
const tabBarOptions = {
|
||||
tabBarPosition: 'bottom',
|
||||
};
|
||||
|
||||
/* Navigation */
|
||||
const tabNav = TabNavigator(tabBarRoutes, tabBarOptions);
|
||||
const tabNav = TabNavigator(tabBarRoutes, {tabBarPosition: 'bottom'});
|
||||
|
||||
const DuskenContainer = StackNavigator({
|
||||
Root: { screen: tabNav },
|
||||
|
||||
File renamed without changes.
@@ -7,7 +7,8 @@ export default class LoginScreen extends Component {
|
||||
};
|
||||
|
||||
onLogin = () => {
|
||||
this.props.navigation.navigate('Membership');
|
||||
// This works since LoginScreen is allways navigated to from MembershipScreen
|
||||
this.props.navigation.goBack();
|
||||
};
|
||||
|
||||
render() {
|
||||
|
||||
Reference in new issue
Block a user