-More!

app/router.js

@@ -3,16 +3,18 @@ import { Dimensions, Platform } from 'react-native';
 import { createBottomTabNavigator, createStackNavigator } from 'react-navigation';
 import { Icon } from 'react-native-elements';
 
-import Auction from './containers/Auction.js';
+import AppHeader from './Components/AppHeader/AppHeader.js';
+
+import Auction from './screen/Auction.container.js';
 import Checkout from './screens/Checkout.js';
-import Event from './screens/Event.js';
-import Events from './screens/Events.js';
+import Event from './screens/Event.container.js';
+import Events from './screens/Events.container.js';
 import ImageDetail from './screens/ImageDetail.js';
 import Item from './screens/Item.js';
 import Marketplace from './screens/Marketplace.js';
-import Profile from './screens/Profile.js';
+import Profile from './screens/Profile.container.js';
 
-let screen = Dimensions.get('window');
+//let screen = Dimensions.get('window');
 
 export const Tabs = createBottomTabNavigator({
   'Event': {
@@ -49,7 +51,7 @@ export const AuctionStack = createStackNavigator({
   Auction: {
     screen: Auction,
     navigationOptions: ({navigation}) => ({
-      header: null,
+      header: <AppHeader navigation={navigation} />,
     }),
   },
   Item: {
@@ -74,7 +76,7 @@ export const BazaarStack = createStackNavigator({
   Bazaar: {
     screen: Marketplace,
     navigationOptions: ({navigation}) => ({
-      header: null,
+      header: <AppHeader navigation={navigation} />,
     }),
   },
   Item: {
@@ -107,7 +109,7 @@ export const EventsStack = createStackNavigator({
   Events: {
     screen: Events,
     navigationOptions: ({ navigation }) => ({
-      header: null,
+      header: <AppHeader navigation={navigation} />,
       tabBarVisible: false,
       gesturesEnabled: false
     }),
@@ -129,6 +131,12 @@ export const createRootNavigator = () => {
           gesturesEnabled: false
         }
       },
+      EventsStack: {
+        screen: EventsStack,
+        navigationOptions: {
+          gesturesEnabled: false
+        }
+      },
       Tabs: {
         screen: Tabs,
         navigationOptions: {
@@ -137,7 +145,6 @@ export const createRootNavigator = () => {
       }
     },
     {
-      headerMode: "none",
       mode: "modal"
     }
   );