Merge pull request #19 from BramSrna/ResolveBack

Iteration 1 Milestone

Application/navigation/MainDrawerNavigator.js

@@ -1,43 +1,94 @@
 import {
     createDrawerNavigator,
-    createAppContainer
+    createAppContainer,
+    createStackNavigator
 } from 'react-navigation';
 import HomePage from '../pages/HomePage';
 import YourLists from '../pages/YourLists'
 import CurrentList from '../pages/CurrentList'
+import MapCreatorPage from '../pages/MapCreatorPage'
+import SideMenu from './SideMenu';
+import RegisterItemPage from '../pages/RegisterItemPage'
+import CrowdSourcePage from '../pages/CrowdSourcePage';
+import AddItemLocationPage from '../pages/AddItemLocationPage';
 
-import CrowdSourcePage from '../pages/CrowdSourcePage'
-import CrowdSourceNavigator from './CrowdSourceNavigator';
 
-const MainDrawerNavigator = createDrawerNavigator({
+const StackNavigator = createStackNavigator({
     Home: {
         screen: HomePage
     },
-    CrowdSourceOptionPage: {
-        screen: CrowdSourcePage,
-        navigationOptions:{
-            drawerLabel: "Crowd Source Options"
+    AddItemLocationPage: {
+        screen: AddItemLocationPage
+    },
+    MapCreatorPage: {
+        screen: MapCreatorPage
+    },
+    YourListsPage: {
+        screen: YourLists
+    },
+    CurrentListPage: {
+        screen: CurrentList
+    },
+    CrowdSourcePage: {
+        screen: CrowdSourcePage
+    },
+    RegisterItemPage: {
+        screen: RegisterItemPage
+    },
+}, {
+    //TODO
+    initialRouteName: "YourListsPage",
+    headerMode: "none"
+});
+
+const MainDrawerNavigator = createDrawerNavigator({
+    Home: {
+        screen: StackNavigator,
+        navigationOptions: {
+            drawerLabel: "Home"
         }
     },
-    CrowdSource: {
-        screen: CrowdSourceNavigator
+    AddItemLocationPage: {
+        screen: StackNavigator,
+        navigationOptions: {
+            drawerLabel: "Add Item Location"
+        }
+    },
+    MapCreatorPage: {
+        screen: StackNavigator,
+        navigationOptions: {
+            drawerLabel: "Map a Store"
+        }
     },
     YourListsPage: {
-        screen: YourLists,
+        screen: StackNavigator,
         navigationOptions: {
             drawerLabel: "Your Lists"
         }
     },
+    CrowdSourcePage: {
+        screen: StackNavigator,
+        navigationOptions: {
+            drawerLabel: () => null
+        }
+    },
+    RegisterItemPage: {
+        screen: StackNavigator,
+        navigationOptions: {
+            drawerLabel: "Register an Item"
+        }
+    },
     CurrentListPage: {
-        screen: CurrentList,
+        screen: StackNavigator,
         navigationOptions: {
             drawerLabel: () => null
         }
-    }
-
+    },
 
 }, {
-    gesturesEnabled: false
+    gesturesEnabled: false,
+    contentComponent: SideMenu,
+    drawerWidth: 250
 });
 
 const App = createAppContainer(MainDrawerNavigator);

Application/navigation/RootNavigation.js

@@ -4,16 +4,13 @@ import LoginPage from "../pages/LoginPage";
 import ForgotPasswordPage from "../pages/ForgotPasswordPage";
 import VerificationPage from "../pages/VerificationPage";
 import RegisterPage from "../pages/RegisterPage";
-import MainDrawerNavigator from './MainDrawerNavigator';
 
 const RootStackNavigator = createStackNavigator(
   {
     Login: {screen: LoginPage},
     ForgotPassword: {screen: ForgotPasswordPage},
     Registration: {screen:RegisterPage},
     Verification: {screen: VerificationPage},
-
-    Main: { screen: MainDrawerNavigator, },
   },
   {
     headerMode: "none"

Application/navigation/SideMenu.js

@@ -0,0 +1,72 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import styles from './SideMenuStyle';
+import { NavigationActions } from 'react-navigation';
+import { ScrollView, Text, View } from 'react-native';
+import firebase from 'firebase';
+
+class SideMenu extends Component {
+
+    constructor(props) {
+        super(props)
+    }
+    navigateToScreen = (route) => () => {
+        if (route == 'Logout') {
+            firebase.auth().signOut();
+        } else {
+            const navigateAction = NavigationActions.navigate({
+                routeName: route
+            });
+            this.props.navigation.dispatch(navigateAction);
+        }
+    }
+
+    render() {
+        return (
+            <View style={styles.container}>
+                <ScrollView>
+                    <View>
+                        <Text style={styles.sectionHeadingStyle}>
+                            Your Data
+            </Text>
+                        <View style={styles.navSectionStyle}>
+                            {/* <Text style={styles.navItemStyle} onPress={this.navigateToScreen('Home')}>
+                                Home
+              </Text> */}
+                            <Text style={styles.navItemStyle} onPress={this.navigateToScreen('YourListsPage')}>
+                                Your Lists
+              </Text>
+                        </View>
+                    </View>
+                    <View>
+                        <Text style={styles.sectionHeadingStyle}>
+                            Feedback
+            </Text>
+                        <View style={styles.navSectionStyle}>
+                            <Text style={styles.navItemStyle} onPress={this.navigateToScreen('AddItemLocationPage')}>
+                                Add Item Location
+              </Text>
+                            <Text style={styles.navItemStyle} onPress={this.navigateToScreen('MapCreatorPage')}>
+                                Map a Store
+              </Text>
+                            <Text style={styles.navItemStyle} onPress={this.navigateToScreen('RegisterItemPage')}>
+                                Register an Item
+              </Text>
+                        </View>
+                    </View>
+                </ScrollView>
+                <View style={styles.footerContainer}>
+                    <Text onPress={this.navigateToScreen('Logout')}>
+                        Sign Out
+              </Text>
+                </View>
+            </View>
+        );
+    }
+}
+
+SideMenu.propTypes = {
+    navigation: PropTypes.object
+};
+
+export default SideMenu;

Application/navigation/SideMenuStyle.js

@@ -0,0 +1,26 @@
+export default {
+    container: {
+        paddingTop: 35,
+        flex: 1,
+        backgroundColor: 'black',
+        color: 'white',
+    },
+    navItemStyle: {
+        padding: 10,
+        paddingHorizontal: 30
+    },
+    navSectionStyle: {
+        backgroundColor: 'white'
+    },
+    sectionHeadingStyle: {
+        paddingVertical: 10,
+        paddingHorizontal: 10,
+        color: 'white',
+        fontWeight: 'bold',
+        fontSize: 20
+    },
+    footerContainer: {
+        padding: 20,
+        backgroundColor: 'white',
+    }
+};