diff --git a/routes/ADrawer.js b/routes/ADrawer.js
index 2617974..5b2e7f9 100644
--- a/routes/ADrawer.js
+++ b/routes/ADrawer.js
@@ -1,185 +1,185 @@
-import React,{useState} from 'react'
-import {StyleSheet, Text, View, TouchableOpacity,Dimensions, Alert} from 'react-native'
-import MIcon from 'react-native-vector-icons/MaterialIcons'
-import MCIcon from 'react-native-vector-icons/MaterialCommunityIcons'
-import {SafeAreaView, NavigationActions} from 'react-navigation'
-import firebase from '../assets/DatabaseConfig'
-
-export default function CustomerDrawer({navigation}) {
-
-    const [screen, setScreen]=useState('Home')
-
-    // console.log(navigation.dangerouslyGetParent().state.routes[1])
-
-    // console.log(navigation.state.routes[1].key)
-    navigateToScreen = ( route ) =>(
-        () => {
-        navigation.dispatch(NavigationActions.navigate({routeName:route}));
-        setScreen(route)
-    })
-
-    function onSignoutPress() {
-        // console.log("meow")
-        Alert.alert(
-          "Logout",
-          "Are you sure you want to logout?",
-          [
-            {
-              text: "Yes",
-              onPress: ()=>{
-                firebase.auth().signOut()
-                .then(() => {
-                  navigation.navigate("LoginStack")
-                })
-                .catch(function(error) {
-                  alert(error)
-                })
-              }
-            },
-            {
-              text: "No",
-            //   onPress: ()=> {console.log("NO")},
-            }
-          ]
-          , {cancelable: false}
-        )
-      }
-
-    return(
-
-        <SafeAreaView style={styles.Safe}>
-
-            <View style={styles.HeaderImage}>
-                <MIcon style={styles.MatIcon} name="account-circle"  size={100} />
-                <Text style={styles.HeaderText}>
-                    Hello {navigation.getParam('user')}
-                </Text>
-            </View>
-
-            <TouchableOpacity style={[styles.TouchOpp,(screen==='Home') ? styles.Active: null]} onPress={navigateToScreen('Home')} activeOpacity={0.3}>
-                <MCIcon style={[styles.FAIcon,(screen==='Home') ? styles.ActiveLogo: null]} name='home' size={24}/>
-                <Text style={[styles.TextDraw,(screen==='Home') ? styles.ActiveText: null]}>
-                    {/* {navigation.state.routes.map((item)=>console.log(item.key))} */}
-                    Home
-                </Text>
-            </TouchableOpacity>
-
-            <TouchableOpacity style={[styles.TouchOpp,(screen==='Profile') ? styles.Active: null]} onPress={navigateToScreen('Profile')} activeOpacity={0.3}>
-                <MCIcon style={[styles.FAIcon,(screen==='Profile') ? styles.ActiveLogo: null]} name='account-box' size={24}/>
-                <Text style={[styles.TextDraw,(screen==='Profile') ? styles.ActiveText: null]}>
-                    Profile
-                </Text>
-            </TouchableOpacity>
-
-            <TouchableOpacity style={[styles.TouchOpp,(screen==='Orders') ? styles.Active: null]} onPress={navigateToScreen('Orders')} activeOpacity={0.3}>
-                <MCIcon style={[styles.FAIcon,(screen==='Orders') ? styles.ActiveLogo: null]} name='truck-delivery' size={24}/>
-                <Text style={[styles.TextDraw,(screen==='Orders') ? styles.ActiveText: null]}>
-                    Orders
-                </Text>
-            </TouchableOpacity>
-
-            <TouchableOpacity style={[styles.TouchOpp,(screen==='Customers') ? styles.Active: null]} onPress={navigateToScreen('Customers')} activeOpacity={0.3}>
-                <MIcon style={[styles.FAIcon,(screen==='Customers') ? styles.ActiveLogo: null]} name='people' size={24}/>
-                <Text style={[styles.TextDraw,(screen==='Customers') ? styles.ActiveText: null]}>
-                    Customers
-                </Text>
-            </TouchableOpacity>
-
-            <View style={styles.lineStyle}/>
-
-            <TouchableOpacity style={[styles.TouchOpp,{}]} onPress={()=>{}} activeOpacity={0.3}>
-                <MIcon style={styles.FAIcon} name='power-settings-new' size={24}/>
-                <Text style={styles.TextDraw}>
-                    Shutdown
-                </Text>
-            </TouchableOpacity>
-
-            <TouchableOpacity style={[styles.TouchOpp,{}]} onPress={onSignoutPress} activeOpacity={0.3}>
-            <MCIcon style={[styles.FAIcon,{transform:[{rotate:'180deg'}],paddingLeft:0,paddingRight:16}]} name='logout-variant' size={24}/>
-                <Text style={styles.TextDraw}>
-                    Sign out
-                </Text>
-            </TouchableOpacity>
-            
-        </SafeAreaView>
-
-    )
-
-}
-
-const styles=StyleSheet.create({
-    Safe: {
-        backgroundColor:'#ffffff'
-    },
-
-    HeaderImage: {
-        width:'100%',
-        height:Dimensions.get('window').height/4,
-        backgroundColor:"#d00f16",
-        justifyContent:'flex-end'
-    },
-
-    HeaderText:{
-        fontFamily:'Roboto-Bold',
-        color:'#ffffff',
-        fontSize:24,
-        paddingLeft:16,
-        paddingBottom:16,
-        paddingTop:8
-    },
-
-    TextDraw:{
-        paddingTop:16,
-        paddingBottom:16,
-        paddingLeft:32,
-        color:"rgba(00,00,00,1)",
-        fontFamily:'Roboto-Medium',
-        fontSize:14,
-        alignSelf:'center',
-    },
-
-    MatIcon:{
-        paddingLeft:8,
-        color:"#ffffff",
-    },
-
-    FAIcon:{
-        paddingLeft:16,
-        paddingTop:12,
-        paddingBottom:12,
-        color:"rgba(00,00,00,0.58)"
-    },
-
-    TouchOpp:{
-        flexDirection:'row',
-        alignItems:'center',
-        justifyContent:'flex-start',
-    },
-
-    lineStyle:{
-        borderWidth: 1,
-        borderColor:'rgba(00,00,00,0.12)',
-        marginTop:Dimensions.get('window').height-560,
-        marginBottom:8,
-        alignSelf:'center',
-        width:Dimensions.get('window').width/1.6
-   },
-
-   Active:{
-       backgroundColor:'rgba(208,15,22,0.15)'
-     
-   },
-
-   ActiveText:{
-       color:'#d00f16'
-   },
-
-   ActiveLogo:{
-       color:'#d00f16'
-   }
-
-    
-
-
-
+import React,{useState} from 'react'
+import {StyleSheet, Text, View, TouchableOpacity,Dimensions, Alert} from 'react-native'
+import MIcon from 'react-native-vector-icons/MaterialIcons'
+import MCIcon from 'react-native-vector-icons/MaterialCommunityIcons'
+import {SafeAreaView, NavigationActions} from 'react-navigation'
+import firebase from '../assets/DatabaseConfig'
+
+export default function CustomerDrawer({navigation}) {
+
+    const [screen, setScreen]=useState('Home')
+
+    // console.log(navigation.dangerouslyGetParent().state.routes[1])
+
+    // console.log(navigation.state.routes[1].key)
+    navigateToScreen = ( route ) =>(
+        () => {
+        navigation.dispatch(NavigationActions.navigate({routeName:route}));
+        setScreen(route)
+    })
+
+    function onSignoutPress() {
+        // console.log("meow")
+        Alert.alert(
+          "Logout",
+          "Are you sure you want to logout?",
+          [
+            {
+              text: "Yes",
+              onPress: ()=>{
+                firebase.auth().signOut()
+                .then(() => {
+                  navigation.navigate("LoginStack")
+                })
+                .catch(function(error) {
+                  alert(error)
+                })
+              }
+            },
+            {
+              text: "No",
+            //   onPress: ()=> {console.log("NO")},
+            }
+          ]
+          , {cancelable: false}
+        )
+      }
+
+    return(
+
+        <SafeAreaView style={styles.Safe}>
+
+            <View style={styles.HeaderImage}>
+                <MIcon style={styles.MatIcon} name="account-circle"  size={100} />
+                <Text style={styles.HeaderText}>
+                    Hello {navigation.getParam('user')}
+                </Text>
+            </View>
+
+            <TouchableOpacity style={[styles.TouchOpp,(screen==='Home') ? styles.Active: null]} onPress={navigateToScreen('Home')} activeOpacity={0.3}>
+                <MCIcon style={[styles.FAIcon,(screen==='Home') ? styles.ActiveLogo: null]} name='home' size={24}/>
+                <Text style={[styles.TextDraw,(screen==='Home') ? styles.ActiveText: null]}>
+                    {/* {navigation.state.routes.map((item)=>console.log(item.key))} */}
+                    Home
+                </Text>
+            </TouchableOpacity>
+
+            <TouchableOpacity style={[styles.TouchOpp,(screen==='Profile') ? styles.Active: null]} onPress={navigateToScreen('Profile')} activeOpacity={0.3}>
+                <MCIcon style={[styles.FAIcon,(screen==='Profile') ? styles.ActiveLogo: null]} name='account-box' size={24}/>
+                <Text style={[styles.TextDraw,(screen==='Profile') ? styles.ActiveText: null]}>
+                    Profile
+                </Text>
+            </TouchableOpacity>
+
+            <TouchableOpacity style={[styles.TouchOpp,(screen==='Orders') ? styles.Active: null]} onPress={navigateToScreen('Orders')} activeOpacity={0.3}>
+                <MCIcon style={[styles.FAIcon,(screen==='Orders') ? styles.ActiveLogo: null]} name='truck-delivery' size={24}/>
+                <Text style={[styles.TextDraw,(screen==='Orders') ? styles.ActiveText: null]}>
+                    Orders
+                </Text>
+            </TouchableOpacity>
+
+            <TouchableOpacity style={[styles.TouchOpp,(screen==='Customers') ? styles.Active: null]} onPress={navigateToScreen('Customers')} activeOpacity={0.3}>
+                <MIcon style={[styles.FAIcon,(screen==='Customers') ? styles.ActiveLogo: null]} name='people' size={24}/>
+                <Text style={[styles.TextDraw,(screen==='Customers') ? styles.ActiveText: null]}>
+                    Customers
+                </Text>
+            </TouchableOpacity>
+
+            <View style={styles.lineStyle}/>
+
+            <TouchableOpacity style={[styles.TouchOpp,{}]} onPress={()=>{}} activeOpacity={0.3}>
+                <MIcon style={styles.FAIcon} name='power-settings-new' size={24}/>
+                <Text style={styles.TextDraw}>
+                    Shutdown
+                </Text>
+            </TouchableOpacity>
+
+            <TouchableOpacity style={[styles.TouchOpp,{}]} onPress={onSignoutPress} activeOpacity={0.3}>
+            <MCIcon style={[styles.FAIcon,{transform:[{rotate:'180deg'}],paddingLeft:0,paddingRight:16}]} name='logout-variant' size={24}/>
+                <Text style={styles.TextDraw}>
+                    Sign out
+                </Text>
+            </TouchableOpacity>
+            
+        </SafeAreaView>
+
+    )
+
+}
+
+const styles=StyleSheet.create({
+    Safe: {
+        backgroundColor:'#ffffff'
+    },
+
+    HeaderImage: {
+        width:'100%',
+        height:Dimensions.get('window').height/4,
+        backgroundColor:"#d00f16",
+        justifyContent:'flex-end'
+    },
+
+    HeaderText:{
+        fontFamily:'Roboto-Bold',
+        color:'#ffffff',
+        fontSize:24,
+        paddingLeft:16,
+        paddingBottom:16,
+        paddingTop:8
+    },
+
+    TextDraw:{
+        paddingTop:16,
+        paddingBottom:16,
+        paddingLeft:32,
+        color:"rgba(00,00,00,1)",
+        fontFamily:'Roboto-Medium',
+        fontSize:14,
+        alignSelf:'center',
+    },
+
+    MatIcon:{
+        paddingLeft:8,
+        color:"#ffffff",
+    },
+
+    FAIcon:{
+        paddingLeft:16,
+        paddingTop:12,
+        paddingBottom:12,
+        color:"rgba(00,00,00,0.58)"
+    },
+
+    TouchOpp:{
+        flexDirection:'row',
+        alignItems:'center',
+        justifyContent:'flex-start',
+    },
+
+    lineStyle:{
+        borderWidth: 1,
+        borderColor:'rgba(00,00,00,0.12)',
+        marginTop:Dimensions.get('window').height-560,
+        marginBottom:8,
+        alignSelf:'center',
+        width:Dimensions.get('window').width/1.6
+   },
+
+   Active:{
+       backgroundColor:'rgba(208,15,22,0.15)'
+     
+   },
+
+   ActiveText:{
+       color:'#d00f16'
+   },
+
+   ActiveLogo:{
+       color:'#d00f16'
+   }
+
+    
+
+
+
 })
\ No newline at end of file
diff --git a/routes/AdminDrawer.js b/routes/AdminDrawer.js
index 198e128..c29be34 100644
--- a/routes/AdminDrawer.js
+++ b/routes/AdminDrawer.js
@@ -1,184 +1,184 @@
-import { createDrawerNavigator} from 'react-navigation-drawer';
-import {Dimensions} from 'react-native'
-// import { createStackNavigator } from 'react-navigation-stack';  
-// import { createAppContainer } from 'react-navigation';
-// import Login from '../screens/Login';
-// import Registration from '../screens/Registration';
-// import Forgotpwemail from '../screens/Forgotpwemail';
-// import Home from '../screens/Home';
-// import Kitchen from '../screens/Kitchen';
-// import Store from '../screens/Store';
-// import AdminMenu from '../screens/AdminMenu';
-// import CustMenu from '../screens/CustMenu';
-// import Pending_Order_Admin from '../screens/Pending_Order_Admin';
-// import PendingOrdersList from '../screens/PendingOrdersList';
-// import RedemptionPoints from '../screens/RedemptionPoints';
-// import Signout from '../screens/Signout';
-// import Subcategory from '../screens/Subcategory';
-// import Customer_Profile from '../screens/Customer_Profile';
-// import change_password_customer from '../screens/change_password_customer';
-// import Forgotpw from '../screens/Forgotpw';
-// import Change_Password from '../screens/ChangePassword';
-import React from 'react';
-// import { Button } from 'react-native';
-import OrderStack from './OrderStack';
-// import LoginStack from './LoginStack';
-import RedemptionStack from './RedemptionStack';
-import AdminStack from './AdminStack';
-import CustomerStack from './CustomerStack';
-import ProfileStack from './ProfileStack';
-import ADrawer from './ADrawer';
-
-// import firebase from '@react-native-firebase/app';
-// import ReviewDetails from '../screens/reviewDetails';
-
-const Stacks = {
-
-    Home:{
-        screen:AdminStack
-    },
-
-    Orders:{
-        screen:OrderStack
-    },
-
-    Redemption:{
-        screen:RedemptionStack,
-        navigationOptions:{
-          title:"Redemption Points"
-        }
-    },
-
-    Customers:{
-      screen:CustomerStack
-    },
-
-    Profile:{
-      screen:ProfileStack
-    },
-
-    // Signout: {
-    //   screen:Signout
-
-    // },
-
-    
-   
-
-   
-    
-
-
-//   Home: {
-//     screen: Home,
-//     navigationOptions:{
-//       title: 'LSD',
-//       headerLeft:() => null,
-//       // gestureEnabled:true
-//     }
-//   },
-
-//   Login: {
-//     screen: Login,
-//     navigationOptions:{
-//       headerShown:false
-//     }
-//   },
-
-//   Registration: {
-//     screen: Registration,
-//     navigationOptions:{
-//       title:null,
-//       headerTransparent: true
-//     }
-//   },
-
-//   Forgotpwemail: {
-//     screen: Forgotpwemail,
-//     navigationOptions:{
-//       title:null,
-//       headerTransparent: true
-//     }
-//   },
-
-//   Home: {
-//     screen: Home,
-//     navigationOptions:{
-//       title: 'LSD',
-//       headerLeft:() => null,
-//       // gestureEnabled:true
-//     }
-//   },
-
-//   Kitchen:{
-//     screen:Kitchen
-    
-//   },
-
-//   Store:{
-//     screen:Store
-//   },
-
-//   CustMenu:{
-//     screen:CustMenu
-//   },
-
-//   AdminMenu:{
-//     screen:AdminMenu
-//   },
-
-//   AddItem:{
-//       screen: AddItem
-//   },
-
-//   UpdateItem:{
-//       screen:UpdateItem
-//   }
-
-  
-
-  // Customer_Profile: {
-  //     screen: Customer_Profile,
-  //     navigationOptions:{
-  //       headerShown:false
-  //     }
-  //   },
-  
-  // change_password_customer: {
-  //   screen: change_password_customer,
-  // },
-
-};
-
-// home stack navigator screens
-const AdminDrawer = createDrawerNavigator(Stacks,
-  {
-    drawerWidth:Dimensions.get('window').width-120,
-    contentComponent: ADrawer,
-    gesturesEnabled: false,
-    edgeWidth:0
-  }
-)
-//   , {
-//   defaultNavigationOptions: {
-//     headerTintColor: '#444',
-//     headerStyle: { 
-//     backgroundColor: '#d00f16', 
-//     height: 60,
-//     shadowColor: "black",
-//     shadowOffset: {
-//       width: 0,
-//       height: 2,
-//     },
-//     shadowOpacity: 0.9,
-//     shadowRadius: 1.50,
-//     elevation: 3,
-//   },
-
-  
-    
-//   }
-// });
-
-// export default createAppContainer(HomeStack);
+import { createDrawerNavigator} from 'react-navigation-drawer';
+import {Dimensions} from 'react-native'
+// import { createStackNavigator } from 'react-navigation-stack';  
+// import { createAppContainer } from 'react-navigation';
+// import Login from '../screens/Login';
+// import Registration from '../screens/Registration';
+// import Forgotpwemail from '../screens/Forgotpwemail';
+// import Home from '../screens/Home';
+// import Kitchen from '../screens/Kitchen';
+// import Store from '../screens/Store';
+// import AdminMenu from '../screens/AdminMenu';
+// import CustMenu from '../screens/CustMenu';
+// import Pending_Order_Admin from '../screens/Pending_Order_Admin';
+// import PendingOrdersList from '../screens/PendingOrdersList';
+// import RedemptionPoints from '../screens/RedemptionPoints';
+// import Signout from '../screens/Signout';
+// import Subcategory from '../screens/Subcategory';
+// import Customer_Profile from '../screens/Customer_Profile';
+// import change_password_customer from '../screens/change_password_customer';
+// import Forgotpw from '../screens/Forgotpw';
+// import Change_Password from '../screens/ChangePassword';
+import React from 'react';
+// import { Button } from 'react-native';
+import OrderStack from './OrderStack';
+// import LoginStack from './LoginStack';
+import RedemptionStack from './RedemptionStack';
+import AdminStack from './AdminStack';
+import CustomerStack from './CustomerStack';
+import ProfileStack from './ProfileStack';
+import ADrawer from './ADrawer';
+
+// import firebase from '@react-native-firebase/app';
+// import ReviewDetails from '../screens/reviewDetails';
+
+const Stacks = {
+
+    Home:{
+        screen:AdminStack
+    },
+
+    Orders:{
+        screen:OrderStack
+    },
+
+    Redemption:{
+        screen:RedemptionStack,
+        navigationOptions:{
+          title:"Redemption Points"
+        }
+    },
+
+    Customers:{
+      screen:CustomerStack
+    },
+
+    Profile:{
+      screen:ProfileStack
+    },
+
+    // Signout: {
+    //   screen:Signout
+
+    // },
+
+    
+   
+
+   
+    
+
+
+//   Home: {
+//     screen: Home,
+//     navigationOptions:{
+//       title: 'LSD',
+//       headerLeft:() => null,
+//       // gestureEnabled:true
+//     }
+//   },
+
+//   Login: {
+//     screen: Login,
+//     navigationOptions:{
+//       headerShown:false
+//     }
+//   },
+
+//   Registration: {
+//     screen: Registration,
+//     navigationOptions:{
+//       title:null,
+//       headerTransparent: true
+//     }
+//   },
+
+//   Forgotpwemail: {
+//     screen: Forgotpwemail,
+//     navigationOptions:{
+//       title:null,
+//       headerTransparent: true
+//     }
+//   },
+
+//   Home: {
+//     screen: Home,
+//     navigationOptions:{
+//       title: 'LSD',
+//       headerLeft:() => null,
+//       // gestureEnabled:true
+//     }
+//   },
+
+//   Kitchen:{
+//     screen:Kitchen
+    
+//   },
+
+//   Store:{
+//     screen:Store
+//   },
+
+//   CustMenu:{
+//     screen:CustMenu
+//   },
+
+//   AdminMenu:{
+//     screen:AdminMenu
+//   },
+
+//   AddItem:{
+//       screen: AddItem
+//   },
+
+//   UpdateItem:{
+//       screen:UpdateItem
+//   }
+
+  
+
+  // Customer_Profile: {
+  //     screen: Customer_Profile,
+  //     navigationOptions:{
+  //       headerShown:false
+  //     }
+  //   },
+  
+  // change_password_customer: {
+  //   screen: change_password_customer,
+  // },
+
+};
+
+// home stack navigator screens
+const AdminDrawer = createDrawerNavigator(Stacks,
+  {
+    drawerWidth:Dimensions.get('window').width-120,
+    contentComponent: ADrawer,
+    gesturesEnabled: false,
+    edgeWidth:0
+  }
+)
+//   , {
+//   defaultNavigationOptions: {
+//     headerTintColor: '#444',
+//     headerStyle: { 
+//     backgroundColor: '#d00f16', 
+//     height: 60,
+//     shadowColor: "black",
+//     shadowOffset: {
+//       width: 0,
+//       height: 2,
+//     },
+//     shadowOpacity: 0.9,
+//     shadowRadius: 1.50,
+//     elevation: 3,
+//   },
+
+  
+    
+//   }
+// });
+
+// export default createAppContainer(HomeStack);
 export default AdminDrawer;
\ No newline at end of file
diff --git a/routes/AdminStack.js b/routes/AdminStack.js
index fda45d8..6b2766e 100644
--- a/routes/AdminStack.js
+++ b/routes/AdminStack.js
@@ -1,177 +1,177 @@
-import { createStackNavigator } from 'react-navigation-stack';
-import { createAppContainer } from 'react-navigation';
-import Login from '../screens/Login';
-import Registration from '../screens/Registration';
-import Forgotpwemail from '../screens/Forgotpwemail';
-import Home from '../screens/Home';
-import Kitchen from '../screens/Kitchen';
-import Store from '../screens/Store';
-import AdminMenu from '../screens/AdminMenu';
-import CustMenu from '../screens/CustMenu';
-import Pending_Order_Admin from '../screens/Pending_Order_Admin';
-// import Subcategory from '../screens/Subcategory';
-import Customer_Profile from '../screens/Customer_Profile';
-import change_password_customer from '../screens/change_password_customer';
-// import Forgotpw from '../screens/Forgotpw';
-// import Change_Password from '../screens/ChangePassword';
-import React from 'react';
-import { Button } from 'react-native';
-import AddItem from '../screens/AddItem'
-import UpdateItem from '../screens/UpdateItem'
-import Icon from 'react-native-vector-icons/MaterialIcons';
-import { TouchableOpacity } from 'react-native-gesture-handler';
-// import firebase from '@react-native-firebase/app';
-// import ReviewDetails from '../screens/reviewDetails';
-
-const screens = {
-
-//   Home: {
-//     screen: Home,
-//     navigationOptions:{
-//       title: 'LSD',
-//       headerLeft:() => null,
-//       // gestureEnabled:true
-//     }
-//   },
-
-//   Login: {
-//     screen: Login,
-//     navigationOptions:{
-//       headerShown:false
-//     }
-//   },
-
-//   Registration: {
-//     screen: Registration,
-//     navigationOptions:{
-//       title:null,
-//       headerTransparent: true
-//     }
-//   },
-
-//   Forgotpwemail: {
-//     screen: Forgotpwemail,
-//     navigationOptions:{
-//       title:null,
-//       headerTransparent: true
-//     }
-//   },
-
-  Home: {
-    screen: Home,
-    navigationOptions:({navigation})=>{
-
-      return{
-        title: 'Home',
-        headerTintColor:'white',
-        headerLeft:() => (
-          <TouchableOpacity
-            onPress={() => navigation.toggleDrawer()}
-            // title="Info"
-            // color="#e8e8e8"
-            style={{paddingLeft:16}}
-          >
-            <Icon name='menu' size={28} color={'white'}/>
-
-
-          </TouchableOpacity>
-        ),
-      }
-    }
-      
-      // gestureEnabled:true
-      // headerLeft: () => (
-      //   <Button
-      //     onPress={() => navigation.openDrawer}
-      //     title="Info"
-      //     color="#e8e8e8"
-      //   />)
-      
-      },
-      
-    // },
-    
-
-  Kitchen:{
-    screen:Kitchen
-    
-  },
-
-  Store:{
-    screen:Store
-  },
-
-//   CustMenu:{
-//     screen:CustMenu
-//   },
-
-  AdminMenu:{
-    screen:AdminMenu,
-    navigationOptions:({navigation})=>{
-
-      return{
-        title: navigation.getParam('Sub'),
-        headerTintColor:'white',
-      }
-    }
-    
-  },
-
-  AddItem:{
-      screen: AddItem,
-      navigationOptions:({navigation})=>{
-
-        return{
-          title: 'Add item',
-          headerTintColor:'white',
-        }
-      }
-  },
-
-  UpdateItem:{
-      screen:UpdateItem,
-      navigationOptions:{
-              title:"Update Item"
-            }
-      // title:"Item Name"
-  }
-
-
-
-  // Customer_Profile: {
-  //     screen: Customer_Profile,
-  //     navigationOptions:{
-  //       headerShown:false
-  //     }
-  //   },
-  
-  // change_password_customer: {
-  //   screen: change_password_customer,
-  // },
-
-};
-
-// home stack navigator screens
-const AdminStack = createStackNavigator(screens, {
-  defaultNavigationOptions: {
-    headerTintColor: '#ffffff',
-    headerStyle: { 
-    backgroundColor: '#d00f16', 
-    height: 60,
-    shadowColor: "black",
-    shadowOffset: {
-      width: 0,
-      height: 2,
-    },
-    shadowOpacity: 0.9,
-    shadowRadius: 1.50,
-    elevation: 3,
-  },
-
-  
-    
-  }
-});
-
-// export default createAppContainer(HomeStack);
+import { createStackNavigator } from 'react-navigation-stack';
+import { createAppContainer } from 'react-navigation';
+import Login from '../screens/Login';
+import Registration from '../screens/Registration';
+import Forgotpwemail from '../screens/Forgotpwemail';
+import Home from '../screens/Home';
+import Kitchen from '../screens/Kitchen';
+import Store from '../screens/Store';
+import AdminMenu from '../screens/AdminMenu';
+import CustMenu from '../screens/CustMenu';
+import Pending_Order_Admin from '../screens/Pending_Order_Admin';
+// import Subcategory from '../screens/Subcategory';
+import Customer_Profile from '../screens/Customer_Profile';
+import change_password_customer from '../screens/change_password_customer';
+// import Forgotpw from '../screens/Forgotpw';
+// import Change_Password from '../screens/ChangePassword';
+import React from 'react';
+import { Button } from 'react-native';
+import AddItem from '../screens/AddItem'
+import UpdateItem from '../screens/UpdateItem'
+import Icon from 'react-native-vector-icons/MaterialIcons';
+import { TouchableOpacity } from 'react-native-gesture-handler';
+// import firebase from '@react-native-firebase/app';
+// import ReviewDetails from '../screens/reviewDetails';
+
+const screens = {
+
+//   Home: {
+//     screen: Home,
+//     navigationOptions:{
+//       title: 'LSD',
+//       headerLeft:() => null,
+//       // gestureEnabled:true
+//     }
+//   },
+
+//   Login: {
+//     screen: Login,
+//     navigationOptions:{
+//       headerShown:false
+//     }
+//   },
+
+//   Registration: {
+//     screen: Registration,
+//     navigationOptions:{
+//       title:null,
+//       headerTransparent: true
+//     }
+//   },
+
+//   Forgotpwemail: {
+//     screen: Forgotpwemail,
+//     navigationOptions:{
+//       title:null,
+//       headerTransparent: true
+//     }
+//   },
+
+  Home: {
+    screen: Home,
+    navigationOptions:({navigation})=>{
+
+      return{
+        title: 'Home',
+        headerTintColor:'white',
+        headerLeft:() => (
+          <TouchableOpacity
+            onPress={() => navigation.toggleDrawer()}
+            // title="Info"
+            // color="#e8e8e8"
+            style={{paddingLeft:16}}
+          >
+            <Icon name='menu' size={28} color={'white'}/>
+
+
+          </TouchableOpacity>
+        ),
+      }
+    }
+      
+      // gestureEnabled:true
+      // headerLeft: () => (
+      //   <Button
+      //     onPress={() => navigation.openDrawer}
+      //     title="Info"
+      //     color="#e8e8e8"
+      //   />)
+      
+      },
+      
+    // },
+    
+
+  Kitchen:{
+    screen:Kitchen
+    
+  },
+
+  Store:{
+    screen:Store
+  },
+
+//   CustMenu:{
+//     screen:CustMenu
+//   },
+
+  AdminMenu:{
+    screen:AdminMenu,
+    navigationOptions:({navigation})=>{
+
+      return{
+        title: navigation.getParam('Sub'),
+        headerTintColor:'white',
+      }
+    }
+    
+  },
+
+  AddItem:{
+      screen: AddItem,
+      navigationOptions:({navigation})=>{
+
+        return{
+          title: 'Add item',
+          headerTintColor:'white',
+        }
+      }
+  },
+
+  UpdateItem:{
+      screen:UpdateItem,
+      navigationOptions:{
+              title:"Update Item"
+            }
+      // title:"Item Name"
+  }
+
+
+
+  // Customer_Profile: {
+  //     screen: Customer_Profile,
+  //     navigationOptions:{
+  //       headerShown:false
+  //     }
+  //   },
+  
+  // change_password_customer: {
+  //   screen: change_password_customer,
+  // },
+
+};
+
+// home stack navigator screens
+const AdminStack = createStackNavigator(screens, {
+  defaultNavigationOptions: {
+    headerTintColor: '#ffffff',
+    headerStyle: { 
+    backgroundColor: '#d00f16', 
+    height: 60,
+    shadowColor: "black",
+    shadowOffset: {
+      width: 0,
+      height: 2,
+    },
+    shadowOpacity: 0.9,
+    shadowRadius: 1.50,
+    elevation: 3,
+  },
+
+  
+    
+  }
+});
+
+// export default createAppContainer(HomeStack);
 export default AdminStack
\ No newline at end of file
diff --git a/routes/CDrawer.js b/routes/CDrawer.js
index b51d7cc..e822f2f 100644
--- a/routes/CDrawer.js
+++ b/routes/CDrawer.js
@@ -1,171 +1,171 @@
-import React,{useState} from 'react'
-import {StyleSheet, Text, View, TouchableOpacity,Dimensions, Alert} from 'react-native'
-import MIcon from 'react-native-vector-icons/MaterialIcons'
-import MCIcon from 'react-native-vector-icons/MaterialCommunityIcons'
-import FIcon from 'react-native-vector-icons/FontAwesome'
-import {SafeAreaView, NavigationActions} from 'react-navigation'
-import firebase from '../assets/DatabaseConfig'
-// import { Directions } from 'react-native-gesture-handler'
-
-export default function CustomerDrawer({navigation}) {
-
-    const [screen, setScreen]=useState('Home')
-
-    navigateToScreen = ( route ) =>(
-        () => {
-        navigation.dispatch(NavigationActions.navigate({routeName:route}));
-        setScreen(route)
-    })
-
-    function onSignoutPress() {
-        // console.log("meow")
-        Alert.alert(
-          "Logout",
-          "Are you sure you want to logout?",
-          [
-            {
-              text: "Yes",
-              onPress: ()=>{
-                firebase.auth().signOut()
-                .then(() => {
-                  navigation.navigate("LoginStack")
-                })
-                .catch(function(error) {
-                  alert(error)
-                })
-              }
-            },
-            {
-              text: "No",
-            //   onPress: ()=> {console.log("NO")},
-            }
-          ]
-          , {cancelable: false}
-        )
-      }
-
-    return(
-
-        <SafeAreaView style={styles.Safe}>
-
-            <View style={styles.HeaderImage}>
-                <MIcon style={styles.MatIcon} name="account-circle"  size={100} />
-                <Text style={styles.HeaderText}>
-                    Hello {navigation.getParam('user')}
-                </Text>
-            </View>
-            {/* <View > */}
-            <TouchableOpacity style={[styles.TouchOpp,(screen==='Home') ? styles.Active: null]} onPress={navigateToScreen('Home')} activeOpacity={0.3}>
-                <MCIcon style={[styles.FAIcon,(screen==='Home') ? styles.ActiveLogo: null]} name='home' size={24}/>
-                <Text style={[styles.TextDraw,(screen==='Home') ? styles.ActiveText: null]}>
-                    Home
-                </Text>
-            </TouchableOpacity>
-
-            <TouchableOpacity style={[styles.TouchOpp,(screen==='Profile') ? styles.Active: null]} onPress={navigateToScreen('Profile')} activeOpacity={0.3}>
-                <MCIcon style={[styles.FAIcon,(screen==='Profile') ? styles.ActiveLogo: null]} name='account-box' size={24}/>
-                <Text style={[styles.TextDraw,(screen==='Profile') ? styles.ActiveText: null]}>
-                    Profile
-                </Text>
-            </TouchableOpacity>
-
-            <TouchableOpacity style={[styles.TouchOpp,(screen==='Order') ? styles.Active: null]} onPress={navigateToScreen('Order')} activeOpacity={0.3}>
-                <MCIcon style={[styles.FAIcon,(screen==='Order') ? styles.ActiveLogo: null]} name='truck-delivery' size={24}/>
-                <Text style={[styles.TextDraw,(screen==='Order') ? styles.ActiveText: null]}>
-                    Order
-                </Text>
-            </TouchableOpacity>
-
-            <View style={styles.lineStyle}/>
-
-            <TouchableOpacity style={[styles.TouchOpp,{}]} onPress={()=>{Alert.alert("Contact us","+92 345 1234567")}} activeOpacity={0.3}>
-                <MIcon style={styles.FAIcon} name='phone' size={24}/>
-                <Text style={styles.TextDraw}>
-                    Contact us
-                </Text>
-            </TouchableOpacity>
-
-            <TouchableOpacity style={[styles.TouchOpp,{}]} onPress={onSignoutPress} activeOpacity={0.3}>
-            <MCIcon style={[styles.FAIcon,{transform:[{rotate:'180deg'}],paddingLeft:0,paddingRight:16}]} name='logout-variant' size={24}/>
-                <Text style={styles.TextDraw}>
-                    Sign out
-                </Text>
-            </TouchableOpacity>
-            
-        </SafeAreaView>
-
-    )
-
-}
-
-const styles=StyleSheet.create({
-    Safe: {
-        backgroundColor:'#ffffff'
-    },
-
-    HeaderImage: {
-        width:'100%',
-        height:Dimensions.get('window').height/4,
-        backgroundColor:"#d00f16",
-        justifyContent:'flex-end'
-    },
-
-    HeaderText:{
-        fontFamily:'Roboto-Bold',
-        color:'#ffffff',
-        fontSize:24,
-        paddingLeft:16,
-        paddingBottom:16,
-        paddingTop:8
-    },
-
-    TextDraw:{
-        paddingTop:16,
-        paddingBottom:16,
-        paddingLeft:32,
-        color:"rgba(00,00,00,1)",
-        fontFamily:'Roboto-Medium',
-        fontSize:14,
-        alignSelf:'center',
-    },
-
-    MatIcon:{
-        paddingLeft:8,
-        color:"#ffffff",
-    },
-
-    FAIcon:{
-        paddingLeft:16,
-        paddingTop:12,
-        paddingBottom:12,
-        color:"rgba(00,00,00,0.58)"
-    },
-
-    TouchOpp:{
-        flexDirection:'row',
-        alignItems:'center',
-        justifyContent:'flex-start',
-    },
-
-    lineStyle:{
-        borderWidth: 1,
-        borderColor:'rgba(00,00,00,0.12)',
-        marginTop:Dimensions.get('window').height-510,
-        marginBottom:8,
-        alignSelf:'center',
-        width:Dimensions.get('window').width/1.6
-   },
-
-   Active:{
-       backgroundColor:'rgba(208,15,22,0.15)'
-   },
-
-   ActiveText:{
-       color:'#d00f16'
-   },
-
-   ActiveLogo:{
-       color:'#d00f16'
-   }
-
+import React,{useState} from 'react'
+import {StyleSheet, Text, View, TouchableOpacity,Dimensions, Alert} from 'react-native'
+import MIcon from 'react-native-vector-icons/MaterialIcons'
+import MCIcon from 'react-native-vector-icons/MaterialCommunityIcons'
+import FIcon from 'react-native-vector-icons/FontAwesome'
+import {SafeAreaView, NavigationActions} from 'react-navigation'
+import firebase from '../assets/DatabaseConfig'
+// import { Directions } from 'react-native-gesture-handler'
+
+export default function CustomerDrawer({navigation}) {
+
+    const [screen, setScreen]=useState('Home')
+
+    navigateToScreen = ( route ) =>(
+        () => {
+        navigation.dispatch(NavigationActions.navigate({routeName:route}));
+        setScreen(route)
+    })
+
+    function onSignoutPress() {
+        // console.log("meow")
+        Alert.alert(
+          "Logout",
+          "Are you sure you want to logout?",
+          [
+            {
+              text: "Yes",
+              onPress: ()=>{
+                firebase.auth().signOut()
+                .then(() => {
+                  navigation.navigate("LoginStack")
+                })
+                .catch(function(error) {
+                  alert(error)
+                })
+              }
+            },
+            {
+              text: "No",
+            //   onPress: ()=> {console.log("NO")},
+            }
+          ]
+          , {cancelable: false}
+        )
+      }
+
+    return(
+
+        <SafeAreaView style={styles.Safe}>
+
+            <View style={styles.HeaderImage}>
+                <MIcon style={styles.MatIcon} name="account-circle"  size={100} />
+                <Text style={styles.HeaderText}>
+                    Hello {navigation.getParam('user')}
+                </Text>
+            </View>
+            {/* <View > */}
+            <TouchableOpacity style={[styles.TouchOpp,(screen==='Home') ? styles.Active: null]} onPress={navigateToScreen('Home')} activeOpacity={0.3}>
+                <MCIcon style={[styles.FAIcon,(screen==='Home') ? styles.ActiveLogo: null]} name='home' size={24}/>
+                <Text style={[styles.TextDraw,(screen==='Home') ? styles.ActiveText: null]}>
+                    Home
+                </Text>
+            </TouchableOpacity>
+
+            <TouchableOpacity style={[styles.TouchOpp,(screen==='Profile') ? styles.Active: null]} onPress={navigateToScreen('Profile')} activeOpacity={0.3}>
+                <MCIcon style={[styles.FAIcon,(screen==='Profile') ? styles.ActiveLogo: null]} name='account-box' size={24}/>
+                <Text style={[styles.TextDraw,(screen==='Profile') ? styles.ActiveText: null]}>
+                    Profile
+                </Text>
+            </TouchableOpacity>
+
+            <TouchableOpacity style={[styles.TouchOpp,(screen==='Order') ? styles.Active: null]} onPress={navigateToScreen('Order')} activeOpacity={0.3}>
+                <MCIcon style={[styles.FAIcon,(screen==='Order') ? styles.ActiveLogo: null]} name='truck-delivery' size={24}/>
+                <Text style={[styles.TextDraw,(screen==='Order') ? styles.ActiveText: null]}>
+                    Order
+                </Text>
+            </TouchableOpacity>
+
+            <View style={styles.lineStyle}/>
+
+            <TouchableOpacity style={[styles.TouchOpp,{}]} onPress={()=>{Alert.alert("Contact us","+92 345 1234567")}} activeOpacity={0.3}>
+                <MIcon style={styles.FAIcon} name='phone' size={24}/>
+                <Text style={styles.TextDraw}>
+                    Contact us
+                </Text>
+            </TouchableOpacity>
+
+            <TouchableOpacity style={[styles.TouchOpp,{}]} onPress={onSignoutPress} activeOpacity={0.3}>
+            <MCIcon style={[styles.FAIcon,{transform:[{rotate:'180deg'}],paddingLeft:0,paddingRight:16}]} name='logout-variant' size={24}/>
+                <Text style={styles.TextDraw}>
+                    Sign out
+                </Text>
+            </TouchableOpacity>
+            
+        </SafeAreaView>
+
+    )
+
+}
+
+const styles=StyleSheet.create({
+    Safe: {
+        backgroundColor:'#ffffff'
+    },
+
+    HeaderImage: {
+        width:'100%',
+        height:Dimensions.get('window').height/4,
+        backgroundColor:"#d00f16",
+        justifyContent:'flex-end'
+    },
+
+    HeaderText:{
+        fontFamily:'Roboto-Bold',
+        color:'#ffffff',
+        fontSize:24,
+        paddingLeft:16,
+        paddingBottom:16,
+        paddingTop:8
+    },
+
+    TextDraw:{
+        paddingTop:16,
+        paddingBottom:16,
+        paddingLeft:32,
+        color:"rgba(00,00,00,1)",
+        fontFamily:'Roboto-Medium',
+        fontSize:14,
+        alignSelf:'center',
+    },
+
+    MatIcon:{
+        paddingLeft:8,
+        color:"#ffffff",
+    },
+
+    FAIcon:{
+        paddingLeft:16,
+        paddingTop:12,
+        paddingBottom:12,
+        color:"rgba(00,00,00,0.58)"
+    },
+
+    TouchOpp:{
+        flexDirection:'row',
+        alignItems:'center',
+        justifyContent:'flex-start',
+    },
+
+    lineStyle:{
+        borderWidth: 1,
+        borderColor:'rgba(00,00,00,0.12)',
+        marginTop:Dimensions.get('window').height-510,
+        marginBottom:8,
+        alignSelf:'center',
+        width:Dimensions.get('window').width/1.6
+   },
+
+   Active:{
+       backgroundColor:'rgba(208,15,22,0.15)'
+   },
+
+   ActiveText:{
+       color:'#d00f16'
+   },
+
+   ActiveLogo:{
+       color:'#d00f16'
+   }
+
 })
\ No newline at end of file
diff --git a/routes/CustomerDrawer.js b/routes/CustomerDrawer.js
index dd40031..614a9a1 100644
--- a/routes/CustomerDrawer.js
+++ b/routes/CustomerDrawer.js
@@ -1,184 +1,184 @@
-import { createDrawerNavigator} from 'react-navigation-drawer';
-import {Dimensions} from 'react-native'
-// import { createStackNavigator } from 'react-navigation-stack';  
-// import { createAppContainer } from 'react-navigation';
-// import Login from '../screens/Login';
-// import Registration from '../screens/Registration';
-// import Forgotpwemail from '../screens/Forgotpwemail';
-// import Home from '../screens/Home';
-// import Kitchen from '../screens/Kitchen';
-// import Store from '../screens/Store';
-// import AdminMenu from '../screens/AdminMenu';
-// import CustMenu from '../screens/CustMenu';
-// import Pending_Order_Admin from '../screens/Pending_Order_Admin';
-// import PendingOrdersList from '../screens/PendingOrdersList';
-// import RedemptionPoints from '../screens/RedemptionPoints';
-// import Signout from '../screens/Signout';
-// import Subcategory from '../screens/Subcategory';
-// import Customer_Profile from '../screens/Customer_Profile';
-// import change_password_customer from '../screens/change_password_customer';
-// import Forgotpw from '../screens/Forgotpw';
-// import Change_Password from '../screens/ChangePassword';
-// import React from 'react';
-// import { Button } from 'react-native';
-// import OrderStack from './OrderStack';
-// import LoginStack from './LoginStack';
-// import RedemptionStack from './RedemptionStack';
-// import AdminStack from './AdminStack';
-// import CustomerStack from './CustomerStack';
-import HomeStack from './HomeStack';
-import CustomerOrderStack from './CustomerOrderStack';
-import ProfileStack from './ProfileStack';
-import CDrawer from './CDrawer'
-// import Shopping from '../screens/Shopping_cart';
-
-// import firebase from '@react-native-firebase/app';
-// import ReviewDetails from '../screens/reviewDetails';
-
-const Stacks = {
-
-    Home:{
-        screen:HomeStack
-    },
-
-    Order:{
-        screen:CustomerOrderStack
-    },
-
-    Profile:{
-        screen:ProfileStack
-    },
-
-    // Signout: {
-    //   screen:Signout
-
-    // },
-
-    // Shopping_cart:{
-    //     screen:Shopping
-    // }
-    // RedemptionStack:{
-    //     screen:RedemptionStack
-    // },
-
-    // CustomerStack:{
-    //   screen:CustomerStack
-    // }
-
-   
-    
-
-
-//   Home: {
-//     screen: Home,
-//     navigationOptions:{
-//       title: 'LSD',
-//       headerLeft:() => null,
-//       // gestureEnabled:true
-//     }
-//   },
-
-//   Login: {
-//     screen: Login,
-//     navigationOptions:{
-//       headerShown:false
-//     }
-//   },
-
-//   Registration: {
-//     screen: Registration,
-//     navigationOptions:{
-//       title:null,
-//       headerTransparent: true
-//     }
-//   },
-
-//   Forgotpwemail: {
-//     screen: Forgotpwemail,
-//     navigationOptions:{
-//       title:null,
-//       headerTransparent: true
-//     }
-//   },
-
-//   Home: {
-//     screen: Home,
-//     navigationOptions:{
-//       title: 'LSD',
-//       headerLeft:() => null,
-//       // gestureEnabled:true
-//     }
-//   },
-
-//   Kitchen:{
-//     screen:Kitchen
-    
-//   },
-
-//   Store:{
-//     screen:Store
-//   },
-
-//   CustMenu:{
-//     screen:CustMenu
-//   },
-
-//   AdminMenu:{
-//     screen:AdminMenu
-//   },
-
-//   AddItem:{
-//       screen: AddItem
-//   },
-
-//   UpdateItem:{
-//       screen:UpdateItem
-//   }
-
-  
-
-  // Customer_Profile: {
-  //     screen: Customer_Profile,
-  //     navigationOptions:{
-  //       headerShown:false
-  //     }
-  //   },
-  
-  // change_password_customer: {
-  //   screen: change_password_customer,
-  // },
-
-};
-
-// home stack navigator screens
-const CustomerDrawer = createDrawerNavigator(Stacks,
-  {
-    drawerWidth:Dimensions.get('window').width-120,
-    contentComponent: CDrawer,
-    gesturesEnabled: false,
-    edgeWidth:0
-  }
-  )
-// , {
-//   defaultNavigationOptions: {
-//     headerTintColor: '#444',
-//     headerStyle: { 
-//     backgroundColor: '#d00f16', 
-//     height: 60,
-//     shadowColor: "black",
-//     shadowOffset: {
-//       width: 0,
-//       height: 2,
-//     },
-//     shadowOpacity: 0.9,
-//     shadowRadius: 1.50,
-//     elevation: 3,
-//   },
-
-  
-    
-//   }
-// });
-
-export default CustomerDrawer;
+import { createDrawerNavigator} from 'react-navigation-drawer';
+import {Dimensions} from 'react-native'
+// import { createStackNavigator } from 'react-navigation-stack';  
+// import { createAppContainer } from 'react-navigation';
+// import Login from '../screens/Login';
+// import Registration from '../screens/Registration';
+// import Forgotpwemail from '../screens/Forgotpwemail';
+// import Home from '../screens/Home';
+// import Kitchen from '../screens/Kitchen';
+// import Store from '../screens/Store';
+// import AdminMenu from '../screens/AdminMenu';
+// import CustMenu from '../screens/CustMenu';
+// import Pending_Order_Admin from '../screens/Pending_Order_Admin';
+// import PendingOrdersList from '../screens/PendingOrdersList';
+// import RedemptionPoints from '../screens/RedemptionPoints';
+// import Signout from '../screens/Signout';
+// import Subcategory from '../screens/Subcategory';
+// import Customer_Profile from '../screens/Customer_Profile';
+// import change_password_customer from '../screens/change_password_customer';
+// import Forgotpw from '../screens/Forgotpw';
+// import Change_Password from '../screens/ChangePassword';
+// import React from 'react';
+// import { Button } from 'react-native';
+// import OrderStack from './OrderStack';
+// import LoginStack from './LoginStack';
+// import RedemptionStack from './RedemptionStack';
+// import AdminStack from './AdminStack';
+// import CustomerStack from './CustomerStack';
+import HomeStack from './HomeStack';
+import CustomerOrderStack from './CustomerOrderStack';
+import ProfileStack from './ProfileStack';
+import CDrawer from './CDrawer'
+// import Shopping from '../screens/Shopping_cart';
+
+// import firebase from '@react-native-firebase/app';
+// import ReviewDetails from '../screens/reviewDetails';
+
+const Stacks = {
+
+    Home:{
+        screen:HomeStack
+    },
+
+    Order:{
+        screen:CustomerOrderStack
+    },
+
+    Profile:{
+        screen:ProfileStack
+    },
+
+    // Signout: {
+    //   screen:Signout
+
+    // },
+
+    // Shopping_cart:{
+    //     screen:Shopping
+    // }
+    // RedemptionStack:{
+    //     screen:RedemptionStack
+    // },
+
+    // CustomerStack:{
+    //   screen:CustomerStack
+    // }
+
+   
+    
+
+
+//   Home: {
+//     screen: Home,
+//     navigationOptions:{
+//       title: 'LSD',
+//       headerLeft:() => null,
+//       // gestureEnabled:true
+//     }
+//   },
+
+//   Login: {
+//     screen: Login,
+//     navigationOptions:{
+//       headerShown:false
+//     }
+//   },
+
+//   Registration: {
+//     screen: Registration,
+//     navigationOptions:{
+//       title:null,
+//       headerTransparent: true
+//     }
+//   },
+
+//   Forgotpwemail: {
+//     screen: Forgotpwemail,
+//     navigationOptions:{
+//       title:null,
+//       headerTransparent: true
+//     }
+//   },
+
+//   Home: {
+//     screen: Home,
+//     navigationOptions:{
+//       title: 'LSD',
+//       headerLeft:() => null,
+//       // gestureEnabled:true
+//     }
+//   },
+
+//   Kitchen:{
+//     screen:Kitchen
+    
+//   },
+
+//   Store:{
+//     screen:Store
+//   },
+
+//   CustMenu:{
+//     screen:CustMenu
+//   },
+
+//   AdminMenu:{
+//     screen:AdminMenu
+//   },
+
+//   AddItem:{
+//       screen: AddItem
+//   },
+
+//   UpdateItem:{
+//       screen:UpdateItem
+//   }
+
+  
+
+  // Customer_Profile: {
+  //     screen: Customer_Profile,
+  //     navigationOptions:{
+  //       headerShown:false
+  //     }
+  //   },
+  
+  // change_password_customer: {
+  //   screen: change_password_customer,
+  // },
+
+};
+
+// home stack navigator screens
+const CustomerDrawer = createDrawerNavigator(Stacks,
+  {
+    drawerWidth:Dimensions.get('window').width-120,
+    contentComponent: CDrawer,
+    gesturesEnabled: false,
+    edgeWidth:0
+  }
+  )
+// , {
+//   defaultNavigationOptions: {
+//     headerTintColor: '#444',
+//     headerStyle: { 
+//     backgroundColor: '#d00f16', 
+//     height: 60,
+//     shadowColor: "black",
+//     shadowOffset: {
+//       width: 0,
+//       height: 2,
+//     },
+//     shadowOpacity: 0.9,
+//     shadowRadius: 1.50,
+//     elevation: 3,
+//   },
+
+  
+    
+//   }
+// });
+
+export default CustomerDrawer;
 // export default CustomerDrawer
\ No newline at end of file
diff --git a/routes/CustomerOrderStack.js b/routes/CustomerOrderStack.js
index 19d6ff6..1ff1620 100644
--- a/routes/CustomerOrderStack.js
+++ b/routes/CustomerOrderStack.js
@@ -1,163 +1,163 @@
-import { createStackNavigator } from 'react-navigation-stack';
-import { createAppContainer } from 'react-navigation';
-import Icon from "react-native-vector-icons/MaterialIcons"
-import Login from '../screens/Login';
-import Registration from '../screens/Registration';
-import Forgotpwemail from '../screens/Forgotpwemail';
-import Home from '../screens/Home';
-import Kitchen from '../screens/Kitchen';
-import Store from '../screens/Store';
-import AdminMenu from '../screens/AdminMenu';
-import CustMenu from '../screens/CustMenu';
-import Pending_Order_Admin from '../screens/Pending_Order_Admin';
-import PendingOrdersList from '../screens/PendingOrdersList';
-import Order_Detail_Customer from '../screens/Order_Detail_Customer';
-// import Subcategory from '../screens/Subcategory';
-import Customer_Profile from '../screens/Customer_Profile';
-import change_password_customer from '../screens/change_password_customer';
-// import Forgotpw from '../screens/Forgotpw';
-// import Change_Password from '../screens/ChangePassword';
-import React from 'react';
-import { Button,TouchableOpacity } from 'react-native';
-// import firebase from '@react-native-firebase/app';
-// import ReviewDetails from '../screens/reviewDetails';
-
-const screens = {
-
-    // Pending_Order_Admin:{
-    //     screen:Pending_Order_Admin
-    // },
-
-    // PendingOrdersList:{
-    //     screen:PendingOrdersList
-    // }
-
-    Order_Detail_Customer:{
-        screen:Order_Detail_Customer,
-        navigationOptions:({navigation})=>{
-
-          return{
-            title: 'Your Order',
-            headerLeft:() => (
-              <TouchableOpacity
-                onPress={() => navigation.toggleDrawer()}
-                // title="Info"
-                // color="#e8e8e8"
-                style={{paddingLeft:16}}
-              >
-                <Icon name='menu' size={28} color={'white'}/>
-    
-    
-              </TouchableOpacity>
-            ),
-          }
-        }
-    }
-
-
-//   Home: {
-//     screen: Home,
-//     navigationOptions:{
-//       title: 'LSD',
-//       headerLeft:() => null,
-//       // gestureEnabled:true
-//     }
-//   },
-
-//   Login: {
-//     screen: Login,
-//     navigationOptions:{
-//       headerShown:false
-//     }
-//   },
-
-//   Registration: {
-//     screen: Registration,
-//     navigationOptions:{
-//       title:null,
-//       headerTransparent: true
-//     }
-//   },
-
-//   Forgotpwemail: {
-//     screen: Forgotpwemail,
-//     navigationOptions:{
-//       title:null,
-//       headerTransparent: true
-//     }
-//   },
-
-//   Home: {
-//     screen: Home,
-//     navigationOptions:{
-//       title: 'LSD',
-//       headerLeft:() => null,
-//       // gestureEnabled:true
-//     }
-//   },
-
-//   Kitchen:{
-//     screen:Kitchen
-    
-//   },
-
-//   Store:{
-//     screen:Store
-//   },
-
-//   CustMenu:{
-//     screen:CustMenu
-//   },
-
-//   AdminMenu:{
-//     screen:AdminMenu
-//   },
-
-//   AddItem:{
-//       screen: AddItem
-//   },
-
-//   UpdateItem:{
-//       screen:UpdateItem
-//   }
-
-  
-
-  // Customer_Profile: {
-  //     screen: Customer_Profile,
-  //     navigationOptions:{
-  //       headerShown:false
-  //     }
-  //   },
-  
-  // change_password_customer: {
-  //   screen: change_password_customer,
-  // },
-
-};
-
-// home stack navigator screens
-const CustomerOrderStack = createStackNavigator(screens, {
-  defaultNavigationOptions: {
-
-    headerTintColor: '#ffffff',
-    headerStyle: { 
-    backgroundColor: '#d00f16', 
-    height: 60,
-    shadowColor: "black",
-    shadowOffset: {
-      width: 0,
-      height: 2,
-    },
-    shadowOpacity: 0.9,
-    shadowRadius: 1.50,
-    elevation: 3,
-  },
-
-  
-    
-  }
-});
-
-// export default createAppContainer(HomeStack);
+import { createStackNavigator } from 'react-navigation-stack';
+import { createAppContainer } from 'react-navigation';
+import Icon from "react-native-vector-icons/MaterialIcons"
+import Login from '../screens/Login';
+import Registration from '../screens/Registration';
+import Forgotpwemail from '../screens/Forgotpwemail';
+import Home from '../screens/Home';
+import Kitchen from '../screens/Kitchen';
+import Store from '../screens/Store';
+import AdminMenu from '../screens/AdminMenu';
+import CustMenu from '../screens/CustMenu';
+import Pending_Order_Admin from '../screens/Pending_Order_Admin';
+import PendingOrdersList from '../screens/PendingOrdersList';
+import Order_Detail_Customer from '../screens/Order_Detail_Customer';
+// import Subcategory from '../screens/Subcategory';
+import Customer_Profile from '../screens/Customer_Profile';
+import change_password_customer from '../screens/change_password_customer';
+// import Forgotpw from '../screens/Forgotpw';
+// import Change_Password from '../screens/ChangePassword';
+import React from 'react';
+import { Button,TouchableOpacity } from 'react-native';
+// import firebase from '@react-native-firebase/app';
+// import ReviewDetails from '../screens/reviewDetails';
+
+const screens = {
+
+    // Pending_Order_Admin:{
+    //     screen:Pending_Order_Admin
+    // },
+
+    // PendingOrdersList:{
+    //     screen:PendingOrdersList
+    // }
+
+    Order_Detail_Customer:{
+        screen:Order_Detail_Customer,
+        navigationOptions:({navigation})=>{
+
+          return{
+            title: 'Your Order',
+            headerLeft:() => (
+              <TouchableOpacity
+                onPress={() => navigation.toggleDrawer()}
+                // title="Info"
+                // color="#e8e8e8"
+                style={{paddingLeft:16}}
+              >
+                <Icon name='menu' size={28} color={'white'}/>
+    
+    
+              </TouchableOpacity>
+            ),
+          }
+        }
+    }
+
+
+//   Home: {
+//     screen: Home,
+//     navigationOptions:{
+//       title: 'LSD',
+//       headerLeft:() => null,
+//       // gestureEnabled:true
+//     }
+//   },
+
+//   Login: {
+//     screen: Login,
+//     navigationOptions:{
+//       headerShown:false
+//     }
+//   },
+
+//   Registration: {
+//     screen: Registration,
+//     navigationOptions:{
+//       title:null,
+//       headerTransparent: true
+//     }
+//   },
+
+//   Forgotpwemail: {
+//     screen: Forgotpwemail,
+//     navigationOptions:{
+//       title:null,
+//       headerTransparent: true
+//     }
+//   },
+
+//   Home: {
+//     screen: Home,
+//     navigationOptions:{
+//       title: 'LSD',
+//       headerLeft:() => null,
+//       // gestureEnabled:true
+//     }
+//   },
+
+//   Kitchen:{
+//     screen:Kitchen
+    
+//   },
+
+//   Store:{
+//     screen:Store
+//   },
+
+//   CustMenu:{
+//     screen:CustMenu
+//   },
+
+//   AdminMenu:{
+//     screen:AdminMenu
+//   },
+
+//   AddItem:{
+//       screen: AddItem
+//   },
+
+//   UpdateItem:{
+//       screen:UpdateItem
+//   }
+
+  
+
+  // Customer_Profile: {
+  //     screen: Customer_Profile,
+  //     navigationOptions:{
+  //       headerShown:false
+  //     }
+  //   },
+  
+  // change_password_customer: {
+  //   screen: change_password_customer,
+  // },
+
+};
+
+// home stack navigator screens
+const CustomerOrderStack = createStackNavigator(screens, {
+  defaultNavigationOptions: {
+
+    headerTintColor: '#ffffff',
+    headerStyle: { 
+    backgroundColor: '#d00f16', 
+    height: 60,
+    shadowColor: "black",
+    shadowOffset: {
+      width: 0,
+      height: 2,
+    },
+    shadowOpacity: 0.9,
+    shadowRadius: 1.50,
+    elevation: 3,
+  },
+
+  
+    
+  }
+});
+
+// export default createAppContainer(HomeStack);
 export default CustomerOrderStack
\ No newline at end of file
diff --git a/routes/CustomerStack.js b/routes/CustomerStack.js
index 0165bf2..2e529b8 100644
--- a/routes/CustomerStack.js
+++ b/routes/CustomerStack.js
@@ -1,143 +1,143 @@
-import { createStackNavigator } from 'react-navigation-stack';
-import { createAppContainer } from 'react-navigation';
-import Icon from 'react-native-vector-icons/MaterialIcons'
-import Login from '../screens/Login';
-import Registration from '../screens/Registration';
-import Forgotpwemail from '../screens/Forgotpwemail';
-import Home from '../screens/Home';
-import Kitchen from '../screens/Kitchen';
-import Store from '../screens/Store';
-import AdminMenu from '../screens/AdminMenu';
-import CustMenu from '../screens/CustMenu';
-import Pending_Order_Admin from '../screens/Pending_Order_Admin';
-// import Subcategory from '../screens/Subcategory';
-import Customer_Profile from '../screens/Customer_Profile';
-import change_password_customer from '../screens/change_password_customer';
-import Customer from '../screens/Customers';
-// import Forgotpw from '../screens/Forgotpw';
-// import Change_Password from '../screens/ChangePassword';
-import React from 'react';
-import { Button,TouchableOpacity } from 'react-native';
-// import firebase from '@react-native-firebase/app';
-// import ReviewDetails from '../screens/reviewDetails';
-
-const screens = {
-
-  // Home: {
-  //   screen: Home,
-  //   navigationOptions:{
-  //     title: 'LSD',
-  //     headerLeft:() => null,
-  //     // gestureEnabled:true
-  //   }
-  // },
-
-  Customer:{
-      screen:Customer,
-      navigationOptions:({navigation})=>{
-
-        return{
-          title: 'Home',
-          headerTintColor:'white',
-          headerLeft:() => (
-            <TouchableOpacity
-              onPress={() => navigation.toggleDrawer()}
-              // title="Info"
-              // color="#e8e8e8"
-              style={{paddingLeft:16}}
-            >
-              <Icon name='menu' size={28} color={'white'}/>
-  
-  
-            </TouchableOpacity>
-          ),
-        }
-      }
-  }
-
-//   Login: {
-//     screen: Login,
-//     navigationOptions:{
-//       headerShown:false
-//     }
-//   },
-
-//   Registration: {
-//     screen: Registration,
-//     navigationOptions:{
-//       title:null,
-//       headerTransparent: true
-//     }
-//   },
-
-//   Forgotpwemail: {
-//     screen: Forgotpwemail,
-//     navigationOptions:{
-//       title:null,
-//       headerTransparent: true
-//     }
-//   },
-
-  // Home: {
-  //   screen: Home,
-  //   navigationOptions:{
-  //     title: 'LSD',
-  //     headerLeft:() => null,
-  //     // gestureEnabled:true
-  //   }
-  // },
-
-  // Kitchen:{
-  //   screen:Kitchen
-    
-  // },
-
-  // Store:{
-  //   screen:Store
-  // },
-
-  // CustMenu:{
-  //   screen:CustMenu
-  // },
-
-  // AdminMenu:{
-  //   screen:AdminMenu
-  // },
-
-  // Customer_Profile: {
-  //     screen: Customer_Profile,
-  //     navigationOptions:{
-  //       headerShown:false
-  //     }
-  //   },
-  
-  // change_password_customer: {
-  //   screen: change_password_customer,
-  // },
-
-};
-
-// home stack navigator screens
-const CustomerStack = createStackNavigator(screens, {
-  defaultNavigationOptions: {
-    headerTintColor: '#444',
-    headerStyle: { 
-    backgroundColor: '#d00f16', 
-    height: 60,
-    shadowColor: "black",
-    shadowOffset: {
-      width: 0,
-      height: 2,
-    },
-    shadowOpacity: 0.9,
-    shadowRadius: 1.50,
-    elevation: 3,
-  },
-
-  
-    
-  }
-});
-
-// export default createAppContainer(HomeStack);
+import { createStackNavigator } from 'react-navigation-stack';
+import { createAppContainer } from 'react-navigation';
+import Icon from 'react-native-vector-icons/MaterialIcons'
+import Login from '../screens/Login';
+import Registration from '../screens/Registration';
+import Forgotpwemail from '../screens/Forgotpwemail';
+import Home from '../screens/Home';
+import Kitchen from '../screens/Kitchen';
+import Store from '../screens/Store';
+import AdminMenu from '../screens/AdminMenu';
+import CustMenu from '../screens/CustMenu';
+import Pending_Order_Admin from '../screens/Pending_Order_Admin';
+// import Subcategory from '../screens/Subcategory';
+import Customer_Profile from '../screens/Customer_Profile';
+import change_password_customer from '../screens/change_password_customer';
+import Customer from '../screens/Customers';
+// import Forgotpw from '../screens/Forgotpw';
+// import Change_Password from '../screens/ChangePassword';
+import React from 'react';
+import { Button,TouchableOpacity } from 'react-native';
+// import firebase from '@react-native-firebase/app';
+// import ReviewDetails from '../screens/reviewDetails';
+
+const screens = {
+
+  // Home: {
+  //   screen: Home,
+  //   navigationOptions:{
+  //     title: 'LSD',
+  //     headerLeft:() => null,
+  //     // gestureEnabled:true
+  //   }
+  // },
+
+  Customer:{
+      screen:Customer,
+      navigationOptions:({navigation})=>{
+
+        return{
+          title: 'Home',
+          headerTintColor:'white',
+          headerLeft:() => (
+            <TouchableOpacity
+              onPress={() => navigation.toggleDrawer()}
+              // title="Info"
+              // color="#e8e8e8"
+              style={{paddingLeft:16}}
+            >
+              <Icon name='menu' size={28} color={'white'}/>
+  
+  
+            </TouchableOpacity>
+          ),
+        }
+      }
+  }
+
+//   Login: {
+//     screen: Login,
+//     navigationOptions:{
+//       headerShown:false
+//     }
+//   },
+
+//   Registration: {
+//     screen: Registration,
+//     navigationOptions:{
+//       title:null,
+//       headerTransparent: true
+//     }
+//   },
+
+//   Forgotpwemail: {
+//     screen: Forgotpwemail,
+//     navigationOptions:{
+//       title:null,
+//       headerTransparent: true
+//     }
+//   },
+
+  // Home: {
+  //   screen: Home,
+  //   navigationOptions:{
+  //     title: 'LSD',
+  //     headerLeft:() => null,
+  //     // gestureEnabled:true
+  //   }
+  // },
+
+  // Kitchen:{
+  //   screen:Kitchen
+    
+  // },
+
+  // Store:{
+  //   screen:Store
+  // },
+
+  // CustMenu:{
+  //   screen:CustMenu
+  // },
+
+  // AdminMenu:{
+  //   screen:AdminMenu
+  // },
+
+  // Customer_Profile: {
+  //     screen: Customer_Profile,
+  //     navigationOptions:{
+  //       headerShown:false
+  //     }
+  //   },
+  
+  // change_password_customer: {
+  //   screen: change_password_customer,
+  // },
+
+};
+
+// home stack navigator screens
+const CustomerStack = createStackNavigator(screens, {
+  defaultNavigationOptions: {
+    headerTintColor: '#444',
+    headerStyle: { 
+    backgroundColor: '#d00f16', 
+    height: 60,
+    shadowColor: "black",
+    shadowOffset: {
+      width: 0,
+      height: 2,
+    },
+    shadowOpacity: 0.9,
+    shadowRadius: 1.50,
+    elevation: 3,
+  },
+
+  
+    
+  }
+});
+
+// export default createAppContainer(HomeStack);
 export default CustomerStack
\ No newline at end of file
diff --git a/routes/HomeStack.js b/routes/HomeStack.js
index 855d650..6910d09 100644
--- a/routes/HomeStack.js
+++ b/routes/HomeStack.js
@@ -1,243 +1,243 @@
-import { createStackNavigator } from 'react-navigation-stack';
-import { createAppContainer } from 'react-navigation';
-import Icon from "react-native-vector-icons/MaterialIcons"
-import Login from '../screens/Login';
-import Registration from '../screens/Registration';
-import Forgotpwemail from '../screens/Forgotpwemail';
-import Home from '../screens/Home';
-import Kitchen from '../screens/Kitchen';
-import Store from '../screens/Store';
-import AdminMenu from '../screens/AdminMenu';
-import CustMenu from '../screens/CustMenu';
-import Pending_Order_Admin from '../screens/Pending_Order_Admin';
-import ShoppingCart from '../screens/Shopping_cart'
-// import Subcategory from '../screens/Subcategory';
-import Customer_Profile from '../screens/Customer_Profile';
-import change_password_customer from '../screens/change_password_customer';
-// import Forgotpw from '../screens/Forgotpw';
-// import Change_Password from '../screens/ChangePassword';
-import React from 'react';
-import { Button,TouchableOpacity,Text } from 'react-native';
-import Checkout from '../screens/Checkout'
-import AsyncStorage from '@react-native-community/async-storage';
-// import firebase from '@react-native-firebase/app';
-// import ReviewDetails from '../screens/reviewDetails';
-
-// async function emptyitems(name) {
-//     try {
-//       const item = await AsyncStorage.removeItem(name)
-//     } catch(e) {
-//       console.log(e)
-//     }
-
-//   }
-
-// async function removeData() {
-  
-//   try {
-//     const value = await AsyncStorage.getAllKeys()
-//     if(value !== null) {
-//       value.forEach(function(name) {
-//         emptyitems(name)
-//       })
-//     }
-//     console.log("Here")
-//     // const keys=await AsyncStorage.getAllKeys()
-//     // await AsyncStorage.multiRemove(keys)
-//   }
-//    catch(e) {
-//     console.log(e)
-//   }
-// }
-
-const screens = {
-
-  // Home: {
-  //   screen: Home,
-  //   navigationOptions:{
-  //     title: 'LSD',
-  //     headerLeft:() => null,
-  //     // gestureEnabled:true
-  //   }
-  // },
-
-  // Login: {
-  //   screen: Login,
-  //   navigationOptions:{
-  //     headerShown:false
-  //   }
-  // },
-
-  // Registration: {
-  //   screen: Registration,
-  //   navigationOptions:{
-  //     title:null,
-  //     headerTransparent: true
-  //   }
-  // },
-
-  // Forgotpwemail: {
-  //   screen: Forgotpwemail,
-  //   navigationOptions:{
-  //     title:null,
-  //     headerTransparent: true
-  //   }
-  // },
-
-  Home: {
-    screen: Home,
-    navigationOptions:({navigation})=>{
-
-      return{
-        title: 'Home',
-        headerTintColor:'white',
-        headerLeft:() => (
-          <TouchableOpacity
-            onPress={() => navigation.toggleDrawer()}
-            // title="Info"
-            // color="#e8e8e8"
-            style={{paddingLeft:16}}
-          >
-            <Icon name='menu' size={24} color={'white'}/>
-
-
-          </TouchableOpacity>
-        ),
-      }
-    }
-  },
-
-  Kitchen:{
-    screen:Kitchen
-    
-  },
-
-  Store:{
-    screen:Store
-  },
-
-  CustMenu:{
-    screen:CustMenu,
-    navigationOptions:({navigation})=>{
-
-      return{
-        title: navigation.getParam('Sub'),
-        headerTintColor:'white',
-        // headerRight:()=>null,
-       
-      }
-    }
-  },
-
-  // AdminMenu:{
-  //   screen:AdminMenu
-  // },
-
-  ShoppingCart:{
-    screen:ShoppingCart,
-    // navigationOptions:{
-    //   headerRight:()=>null
-    // }
-    navigationOptions:({navigation})=>{
-
-      return{
-        title: 'Shopping Cart',
-        headerTintColor:'white',
-        headerRight:()=>null,
-       
-      }
-    }
-  },
-
-  Checkout:{
-    screen:Checkout,
-    navigationOptions:{
-      headerRight:()=>null
-    }
-  }
-
-
-  // Customer_Profile: {
-  //     screen: Customer_Profile,
-  //     navigationOptions:{
-  //       headerShown:false
-  //     }
-  //   },
-  
-  // change_password_customer: {
-  //   screen: change_password_customer,
-  // },
-
-};
-
-// home stack navigator screens
-const HomeStack = createStackNavigator(screens, {
-  defaultNavigationOptions: ({navigation})=>{
-
-    return {
-
-      headerTintColor: '#ffffff',
-      headerStyle: { 
-        backgroundColor: '#d00f16', 
-        height: 60,
-        shadowColor: "black",
-        shadowOffset: {
-            width: 0,
-            height: 2,
-          },
-        shadowOpacity: 0.9,
-        shadowRadius: 1.50,
-        elevation: 3,
-      },
-
-      headerRight:() => (
-        <TouchableOpacity
-          onPress={() => navigation.navigate('ShoppingCart')}
-          // title="Info"
-          // color="#e8e8e8"
-          activeOpacity={0.3}
-          style={{paddingRight:16}}
-        >
-          <Icon name='shopping-cart' size={28} color={'white'}/>
-
-
-        </TouchableOpacity>
-      ),
-
-    }
-  }
-  //   headerTintColor: '#444',
-  //   headerStyle: { 
-  //     backgroundColor: '#d00f16', 
-  //     height: 60,
-  //     shadowColor: "black",
-  //     shadowOffset: {
-  //         width: 0,
-  //         height: 2,
-  //       },
-  //     shadowOpacity: 0.9,
-  //     shadowRadius: 1.50,
-  //     elevation: 3,
-    
-  //   headerRight:() => (
-  //     <TouchableOpacity
-  //       onPress={() => navigation.toggleDrawer()}
-  //       // title="Info"
-  //       // color="#e8e8e8"
-  //       style={{paddingLeft:16}}
-  //     >
-  //       <Icon name='shopping_cart' size={28} color={'white'}/>
-
-
-  //     </TouchableOpacity>
-  //   ),
-
-  // },
-
-  
-    
-  }
-);
-
-// export default createAppContainer(HomeStack);
+import { createStackNavigator } from 'react-navigation-stack';
+import { createAppContainer } from 'react-navigation';
+import Icon from "react-native-vector-icons/MaterialIcons"
+import Login from '../screens/Login';
+import Registration from '../screens/Registration';
+import Forgotpwemail from '../screens/Forgotpwemail';
+import Home from '../screens/Home';
+import Kitchen from '../screens/Kitchen';
+import Store from '../screens/Store';
+import AdminMenu from '../screens/AdminMenu';
+import CustMenu from '../screens/CustMenu';
+import Pending_Order_Admin from '../screens/Pending_Order_Admin';
+import ShoppingCart from '../screens/Shopping_cart'
+// import Subcategory from '../screens/Subcategory';
+import Customer_Profile from '../screens/Customer_Profile';
+import change_password_customer from '../screens/change_password_customer';
+// import Forgotpw from '../screens/Forgotpw';
+// import Change_Password from '../screens/ChangePassword';
+import React from 'react';
+import { Button,TouchableOpacity,Text } from 'react-native';
+import Checkout from '../screens/Checkout'
+import AsyncStorage from '@react-native-community/async-storage';
+// import firebase from '@react-native-firebase/app';
+// import ReviewDetails from '../screens/reviewDetails';
+
+// async function emptyitems(name) {
+//     try {
+//       const item = await AsyncStorage.removeItem(name)
+//     } catch(e) {
+//       console.log(e)
+//     }
+
+//   }
+
+// async function removeData() {
+  
+//   try {
+//     const value = await AsyncStorage.getAllKeys()
+//     if(value !== null) {
+//       value.forEach(function(name) {
+//         emptyitems(name)
+//       })
+//     }
+//     console.log("Here")
+//     // const keys=await AsyncStorage.getAllKeys()
+//     // await AsyncStorage.multiRemove(keys)
+//   }
+//    catch(e) {
+//     console.log(e)
+//   }
+// }
+
+const screens = {
+
+  // Home: {
+  //   screen: Home,
+  //   navigationOptions:{
+  //     title: 'LSD',
+  //     headerLeft:() => null,
+  //     // gestureEnabled:true
+  //   }
+  // },
+
+  // Login: {
+  //   screen: Login,
+  //   navigationOptions:{
+  //     headerShown:false
+  //   }
+  // },
+
+  // Registration: {
+  //   screen: Registration,
+  //   navigationOptions:{
+  //     title:null,
+  //     headerTransparent: true
+  //   }
+  // },
+
+  // Forgotpwemail: {
+  //   screen: Forgotpwemail,
+  //   navigationOptions:{
+  //     title:null,
+  //     headerTransparent: true
+  //   }
+  // },
+
+  Home: {
+    screen: Home,
+    navigationOptions:({navigation})=>{
+
+      return{
+        title: 'Home',
+        headerTintColor:'white',
+        headerLeft:() => (
+          <TouchableOpacity
+            onPress={() => navigation.toggleDrawer()}
+            // title="Info"
+            // color="#e8e8e8"
+            style={{paddingLeft:16}}
+          >
+            <Icon name='menu' size={24} color={'white'}/>
+
+
+          </TouchableOpacity>
+        ),
+      }
+    }
+  },
+
+  Kitchen:{
+    screen:Kitchen
+    
+  },
+
+  Store:{
+    screen:Store
+  },
+
+  CustMenu:{
+    screen:CustMenu,
+    navigationOptions:({navigation})=>{
+
+      return{
+        title: navigation.getParam('Sub'),
+        headerTintColor:'white',
+        // headerRight:()=>null,
+       
+      }
+    }
+  },
+
+  // AdminMenu:{
+  //   screen:AdminMenu
+  // },
+
+  ShoppingCart:{
+    screen:ShoppingCart,
+    // navigationOptions:{
+    //   headerRight:()=>null
+    // }
+    navigationOptions:({navigation})=>{
+
+      return{
+        title: 'Shopping Cart',
+        headerTintColor:'white',
+        headerRight:()=>null,
+       
+      }
+    }
+  },
+
+  Checkout:{
+    screen:Checkout,
+    navigationOptions:{
+      headerRight:()=>null
+    }
+  }
+
+
+  // Customer_Profile: {
+  //     screen: Customer_Profile,
+  //     navigationOptions:{
+  //       headerShown:false
+  //     }
+  //   },
+  
+  // change_password_customer: {
+  //   screen: change_password_customer,
+  // },
+
+};
+
+// home stack navigator screens
+const HomeStack = createStackNavigator(screens, {
+  defaultNavigationOptions: ({navigation})=>{
+
+    return {
+
+      headerTintColor: '#ffffff',
+      headerStyle: { 
+        backgroundColor: '#d00f16', 
+        height: 60,
+        shadowColor: "black",
+        shadowOffset: {
+            width: 0,
+            height: 2,
+          },
+        shadowOpacity: 0.9,
+        shadowRadius: 1.50,
+        elevation: 3,
+      },
+
+      headerRight:() => (
+        <TouchableOpacity
+          onPress={() => navigation.navigate('ShoppingCart')}
+          // title="Info"
+          // color="#e8e8e8"
+          activeOpacity={0.3}
+          style={{paddingRight:16}}
+        >
+          <Icon name='shopping-cart' size={28} color={'white'}/>
+
+
+        </TouchableOpacity>
+      ),
+
+    }
+  }
+  //   headerTintColor: '#444',
+  //   headerStyle: { 
+  //     backgroundColor: '#d00f16', 
+  //     height: 60,
+  //     shadowColor: "black",
+  //     shadowOffset: {
+  //         width: 0,
+  //         height: 2,
+  //       },
+  //     shadowOpacity: 0.9,
+  //     shadowRadius: 1.50,
+  //     elevation: 3,
+    
+  //   headerRight:() => (
+  //     <TouchableOpacity
+  //       onPress={() => navigation.toggleDrawer()}
+  //       // title="Info"
+  //       // color="#e8e8e8"
+  //       style={{paddingLeft:16}}
+  //     >
+  //       <Icon name='shopping_cart' size={28} color={'white'}/>
+
+
+  //     </TouchableOpacity>
+  //   ),
+
+  // },
+
+  
+    
+  }
+);
+
+// export default createAppContainer(HomeStack);
 export default HomeStack
\ No newline at end of file
diff --git a/routes/LoginStack.js b/routes/LoginStack.js
index d300c5e..f8be663 100644
--- a/routes/LoginStack.js
+++ b/routes/LoginStack.js
@@ -1,126 +1,126 @@
-import { createStackNavigator } from 'react-navigation-stack';
-import { createAppContainer } from 'react-navigation';
-import Login from '../screens/Login';
-import Registration from '../screens/Registration';
-import Forgotpwemail from '../screens/Forgotpwemail';
-import Home from '../screens/Home';
-import Kitchen from '../screens/Kitchen';
-import Store from '../screens/Store';
-import AdminMenu from '../screens/AdminMenu';
-import CustMenu from '../screens/CustMenu';
-import splashscreen from '../screens/splashscreen';
-import Pending_Order_Admin from '../screens/Pending_Order_Admin';
-// import Subcategory from '../screens/Subcategory';
-import Customer_Profile from '../screens/Customer_Profile';
-import change_password_customer from '../screens/change_password_customer';
-// import Forgotpw from '../screens/Forgotpw';
-// import Change_Password from '../screens/ChangePassword';
-import React from 'react';
-import { Button } from 'react-native';
-// import firebase from '@react-native-firebase/app';
-// import ReviewDetails from '../screens/reviewDetails';
-
-const screens = {
-
-  // Home: {
-  //   screen: Home,
-  //   navigationOptions:{
-  //     title: 'LSD',
-  //     headerLeft:() => null,
-  //     // gestureEnabled:true
-  //   }
-  // },
-
-  splashscreen: {
-    screen: splashscreen,
-    navigationOptions:{
-      headerShown:false
-    }
-  },
-
-  Login: {
-    screen: Login,
-    navigationOptions:{
-      headerShown:false
-    }
-  },
-
-  Registration: {
-    screen: Registration,
-    navigationOptions:{
-      title:null,
-      headerTransparent: true
-    }
-  },
-
-  Forgotpwemail: {
-    screen: Forgotpwemail,
-    navigationOptions:{
-      title:null,
-      headerTransparent: true
-    }
-  },
-
-  // Home: {
-  //   screen: Home,
-  //   navigationOptions:{
-  //     title: 'LSD',
-  //     headerLeft:() => null,
-  //     // gestureEnabled:true
-  //   }
-  // },
-
-  // Kitchen:{
-  //   screen:Kitchen
-    
-  // },
-
-  // Store:{
-  //   screen:Store
-  // },
-
-  // CustMenu:{
-  //   screen:CustMenu
-  // },
-
-  // AdminMenu:{
-  //   screen:AdminMenu
-  // },
-
-  // Customer_Profile: {
-  //     screen: Customer_Profile,
-  //     navigationOptions:{
-  //       headerShown:false
-  //     }
-  //   },
-  
-  // change_password_customer: {
-  //   screen: change_password_customer,
-  // },
-
-};
-
-// home stack navigator screens
-const LoginStack = createStackNavigator(screens, {
-  defaultNavigationOptions: {
-    headerTintColor: '#444',
-    headerStyle: { 
-    backgroundColor: '#d00f16', 
-    height: 60,
-    shadowColor: "black",
-    shadowOffset: {
-      width: 0,
-      height: 2,
-    },
-    shadowOpacity: 0.9,
-    shadowRadius: 1.50,
-    elevation: 3,
-  },
-
-  
-    
-  }
-});
-
-// export default createAppContainer(HomeStack);
+import { createStackNavigator } from 'react-navigation-stack';
+import { createAppContainer } from 'react-navigation';
+import Login from '../screens/Login';
+import Registration from '../screens/Registration';
+import Forgotpwemail from '../screens/Forgotpwemail';
+import Home from '../screens/Home';
+import Kitchen from '../screens/Kitchen';
+import Store from '../screens/Store';
+import AdminMenu from '../screens/AdminMenu';
+import CustMenu from '../screens/CustMenu';
+import splashscreen from '../screens/splashscreen';
+import Pending_Order_Admin from '../screens/Pending_Order_Admin';
+// import Subcategory from '../screens/Subcategory';
+import Customer_Profile from '../screens/Customer_Profile';
+import change_password_customer from '../screens/change_password_customer';
+// import Forgotpw from '../screens/Forgotpw';
+// import Change_Password from '../screens/ChangePassword';
+import React from 'react';
+import { Button } from 'react-native';
+// import firebase from '@react-native-firebase/app';
+// import ReviewDetails from '../screens/reviewDetails';
+
+const screens = {
+
+  // Home: {
+  //   screen: Home,
+  //   navigationOptions:{
+  //     title: 'LSD',
+  //     headerLeft:() => null,
+  //     // gestureEnabled:true
+  //   }
+  // },
+
+  splashscreen: {
+    screen: splashscreen,
+    navigationOptions:{
+      headerShown:false
+    }
+  },
+
+  Login: {
+    screen: Login,
+    navigationOptions:{
+      headerShown:false
+    }
+  },
+
+  Registration: {
+    screen: Registration,
+    navigationOptions:{
+      title:null,
+      headerTransparent: true
+    }
+  },
+
+  Forgotpwemail: {
+    screen: Forgotpwemail,
+    navigationOptions:{
+      title:null,
+      headerTransparent: true
+    }
+  },
+
+  // Home: {
+  //   screen: Home,
+  //   navigationOptions:{
+  //     title: 'LSD',
+  //     headerLeft:() => null,
+  //     // gestureEnabled:true
+  //   }
+  // },
+
+  // Kitchen:{
+  //   screen:Kitchen
+    
+  // },
+
+  // Store:{
+  //   screen:Store
+  // },
+
+  // CustMenu:{
+  //   screen:CustMenu
+  // },
+
+  // AdminMenu:{
+  //   screen:AdminMenu
+  // },
+
+  // Customer_Profile: {
+  //     screen: Customer_Profile,
+  //     navigationOptions:{
+  //       headerShown:false
+  //     }
+  //   },
+  
+  // change_password_customer: {
+  //   screen: change_password_customer,
+  // },
+
+};
+
+// home stack navigator screens
+const LoginStack = createStackNavigator(screens, {
+  defaultNavigationOptions: {
+    headerTintColor: '#444',
+    headerStyle: { 
+    backgroundColor: '#d00f16', 
+    height: 60,
+    shadowColor: "black",
+    shadowOffset: {
+      width: 0,
+      height: 2,
+    },
+    shadowOpacity: 0.9,
+    shadowRadius: 1.50,
+    elevation: 3,
+  },
+
+  
+    
+  }
+});
+
+// export default createAppContainer(HomeStack);
 export default LoginStack
\ No newline at end of file
diff --git a/routes/OrderStack.js b/routes/OrderStack.js
index a493888..bb001f6 100644
--- a/routes/OrderStack.js
+++ b/routes/OrderStack.js
@@ -1,170 +1,170 @@
-import { createStackNavigator } from 'react-navigation-stack';
-import { createAppContainer } from 'react-navigation';
-import Icon from "react-native-vector-icons/MaterialIcons"
-import Login from '../screens/Login';
-import Registration from '../screens/Registration';
-import Forgotpwemail from '../screens/Forgotpwemail';
-import Home from '../screens/Home';
-import Kitchen from '../screens/Kitchen';
-import Store from '../screens/Store';
-import AdminMenu from '../screens/AdminMenu';
-import CustMenu from '../screens/CustMenu';
-import Pending_Order_Admin from '../screens/Pending_Order_Admin';
-import PendingOrdersList from '../screens/PendingOrdersList';
-// import Subcategory from '../screens/Subcategory';
-import Customer_Profile from '../screens/Customer_Profile';
-import change_password_customer from '../screens/change_password_customer';
-// import Forgotpw from '../screens/Forgotpw';
-// import Change_Password from '../screens/ChangePassword';
-import React from 'react';
-import {TouchableOpacity } from 'react-native';
-// import firebase from '@react-native-firebase/app';
-// import ReviewDetails from '../screens/reviewDetails';
-
-const screens = {
-
-    PendingOrdersList:{
-      screen:PendingOrdersList,
-
-      navigationOptions:({navigation})=>{
-
-        return{
-          title: 'Orders',
-          headerTintColor:'white',
-          headerLeft:() => (
-            <TouchableOpacity
-              onPress={() => navigation.toggleDrawer()}
-              // title="Info"
-              // color="#e8e8e8"
-              style={{paddingLeft:16}}
-            >
-              <Icon name='menu' size={28} color={'white'}/>
-
-
-            </TouchableOpacity>
-          ),
-        }
-      }
-    },
-
-    Pending_Order_Admin:{
-        screen:Pending_Order_Admin,
-        navigationOptions:({navigation})=>{
-
-          return{
-            title: 'Order Detail',
-            headerTintColor:'white',
-            
-          }
-        }
-        
-    },
-
-    
-
-
-//   Home: {
-//     screen: Home,
-//     navigationOptions:{
-//       title: 'LSD',
-//       headerLeft:() => null,
-//       // gestureEnabled:true
-//     }
-//   },
-
-//   Login: {
-//     screen: Login,
-//     navigationOptions:{
-//       headerShown:false
-//     }
-//   },
-
-//   Registration: {
-//     screen: Registration,
-//     navigationOptions:{
-//       title:null,
-//       headerTransparent: true
-//     }
-//   },
-
-//   Forgotpwemail: {
-//     screen: Forgotpwemail,
-//     navigationOptions:{
-//       title:null,
-//       headerTransparent: true
-//     }
-//   },
-
-//   Home: {
-//     screen: Home,
-//     navigationOptions:{
-//       title: 'LSD',
-//       headerLeft:() => null,
-//       // gestureEnabled:true
-//     }
-//   },
-
-//   Kitchen:{
-//     screen:Kitchen
-    
-//   },
-
-//   Store:{
-//     screen:Store
-//   },
-
-//   CustMenu:{
-//     screen:CustMenu
-//   },
-
-//   AdminMenu:{
-//     screen:AdminMenu
-//   },
-
-//   AddItem:{
-//       screen: AddItem
-//   },
-
-//   UpdateItem:{
-//       screen:UpdateItem
-//   }
-
-  
-
-  // Customer_Profile: {
-  //     screen: Customer_Profile,
-  //     navigationOptions:{
-  //       headerShown:false
-  //     }
-  //   },
-  
-  // change_password_customer: {
-  //   screen: change_password_customer,
-  // },
-
-};
-
-// home stack navigator screens
-const OrderStack = createStackNavigator(screens, {
-  defaultNavigationOptions: {
-    headerTintColor: '#ffffff',
-    headerStyle: { 
-    backgroundColor: '#d00f16', 
-    height: 60,
-    shadowColor: "black",
-    shadowOffset: {
-      width: 0,
-      height: 2,
-    },
-    shadowOpacity: 0.9,
-    shadowRadius: 1.50,
-    elevation: 3,
-  },
-
-  
-    
-  }
-});
-
-// export default createAppContainer(HomeStack);
+import { createStackNavigator } from 'react-navigation-stack';
+import { createAppContainer } from 'react-navigation';
+import Icon from "react-native-vector-icons/MaterialIcons"
+import Login from '../screens/Login';
+import Registration from '../screens/Registration';
+import Forgotpwemail from '../screens/Forgotpwemail';
+import Home from '../screens/Home';
+import Kitchen from '../screens/Kitchen';
+import Store from '../screens/Store';
+import AdminMenu from '../screens/AdminMenu';
+import CustMenu from '../screens/CustMenu';
+import Pending_Order_Admin from '../screens/Pending_Order_Admin';
+import PendingOrdersList from '../screens/PendingOrdersList';
+// import Subcategory from '../screens/Subcategory';
+import Customer_Profile from '../screens/Customer_Profile';
+import change_password_customer from '../screens/change_password_customer';
+// import Forgotpw from '../screens/Forgotpw';
+// import Change_Password from '../screens/ChangePassword';
+import React from 'react';
+import {TouchableOpacity } from 'react-native';
+// import firebase from '@react-native-firebase/app';
+// import ReviewDetails from '../screens/reviewDetails';
+
+const screens = {
+
+    PendingOrdersList:{
+      screen:PendingOrdersList,
+
+      navigationOptions:({navigation})=>{
+
+        return{
+          title: 'Orders',
+          headerTintColor:'white',
+          headerLeft:() => (
+            <TouchableOpacity
+              onPress={() => navigation.toggleDrawer()}
+              // title="Info"
+              // color="#e8e8e8"
+              style={{paddingLeft:16}}
+            >
+              <Icon name='menu' size={28} color={'white'}/>
+
+
+            </TouchableOpacity>
+          ),
+        }
+      }
+    },
+
+    Pending_Order_Admin:{
+        screen:Pending_Order_Admin,
+        navigationOptions:({navigation})=>{
+
+          return{
+            title: 'Order Detail',
+            headerTintColor:'white',
+            
+          }
+        }
+        
+    },
+
+    
+
+
+//   Home: {
+//     screen: Home,
+//     navigationOptions:{
+//       title: 'LSD',
+//       headerLeft:() => null,
+//       // gestureEnabled:true
+//     }
+//   },
+
+//   Login: {
+//     screen: Login,
+//     navigationOptions:{
+//       headerShown:false
+//     }
+//   },
+
+//   Registration: {
+//     screen: Registration,
+//     navigationOptions:{
+//       title:null,
+//       headerTransparent: true
+//     }
+//   },
+
+//   Forgotpwemail: {
+//     screen: Forgotpwemail,
+//     navigationOptions:{
+//       title:null,
+//       headerTransparent: true
+//     }
+//   },
+
+//   Home: {
+//     screen: Home,
+//     navigationOptions:{
+//       title: 'LSD',
+//       headerLeft:() => null,
+//       // gestureEnabled:true
+//     }
+//   },
+
+//   Kitchen:{
+//     screen:Kitchen
+    
+//   },
+
+//   Store:{
+//     screen:Store
+//   },
+
+//   CustMenu:{
+//     screen:CustMenu
+//   },
+
+//   AdminMenu:{
+//     screen:AdminMenu
+//   },
+
+//   AddItem:{
+//       screen: AddItem
+//   },
+
+//   UpdateItem:{
+//       screen:UpdateItem
+//   }
+
+  
+
+  // Customer_Profile: {
+  //     screen: Customer_Profile,
+  //     navigationOptions:{
+  //       headerShown:false
+  //     }
+  //   },
+  
+  // change_password_customer: {
+  //   screen: change_password_customer,
+  // },
+
+};
+
+// home stack navigator screens
+const OrderStack = createStackNavigator(screens, {
+  defaultNavigationOptions: {
+    headerTintColor: '#ffffff',
+    headerStyle: { 
+    backgroundColor: '#d00f16', 
+    height: 60,
+    shadowColor: "black",
+    shadowOffset: {
+      width: 0,
+      height: 2,
+    },
+    shadowOpacity: 0.9,
+    shadowRadius: 1.50,
+    elevation: 3,
+  },
+
+  
+    
+  }
+});
+
+// export default createAppContainer(HomeStack);
 export default OrderStack
\ No newline at end of file
diff --git a/routes/ProfileStack.js b/routes/ProfileStack.js
index 77dd890..b0c53ad 100644
--- a/routes/ProfileStack.js
+++ b/routes/ProfileStack.js
@@ -1,153 +1,153 @@
-import { createStackNavigator } from 'react-navigation-stack';
-import { createAppContainer } from 'react-navigation';
-import Icon from "react-native-vector-icons/MaterialIcons"
-import Login from '../screens/Login';
-import Registration from '../screens/Registration';
-import Forgotpwemail from '../screens/Forgotpwemail';
-import Home from '../screens/Home';
-import Kitchen from '../screens/Kitchen';
-import Store from '../screens/Store';
-import AdminMenu from '../screens/AdminMenu';
-import CustMenu from '../screens/CustMenu';
-import Pending_Order_Admin from '../screens/Pending_Order_Admin';
-// import Subcategory from '../screens/Subcategory';
-import CustomerProfile from '../screens/Customer_Profile';
-import ChangePassword from '../screens/change_password_customer';
-import ChangePhone from '../screens/change_phone_customer';
-// import Customer from '../screens/Customer';
-// import Forgotpw from '../screens/Forgotpw';
-// import Change_Password from '../screens/ChangePassword';
-import React from 'react';
-import { Button, TouchableOpacity } from 'react-native';
-// import firebase from '@react-native-firebase/app';
-// import ReviewDetails from '../screens/reviewDetails';
-
-const screens = {
-
-  // Home: {
-  //   screen: Home,
-  //   navigationOptions:{
-  //     title: 'LSD',
-  //     headerLeft:() => null,
-  //     // gestureEnabled:true
-  //   }
-  // },
-
-  CustomerProfile:{
-      screen: CustomerProfile,
-      navigationOptions:({navigation})=>{
-
-        return{
-          title: 'My Profile',
-          headerTransparent:true,
-          headerTintColor:'white',
-          headerLeft:() => (
-            <TouchableOpacity
-              onPress={() => navigation.toggleDrawer()}
-              // title="Info"
-              // color="#e8e8e8"
-              style={{paddingLeft:16}}
-            >
-              <Icon name='menu' size={28} color={'white'}/>
-  
-  
-            </TouchableOpacity>
-          ),
-        }
-      }
-  },
-
-  ChangePassword:{
-      screen:ChangePassword
-  },
-
-  ChangePhone:{
-      screen:ChangePhone
-  }
-
-//   Login: {
-//     screen: Login,
-//     navigationOptions:{
-//       headerShown:false
-//     }
-//   },
-
-//   Registration: {
-//     screen: Registration,
-//     navigationOptions:{
-//       title:null,
-//       headerTransparent: true
-//     }
-//   },
-
-//   Forgotpwemail: {
-//     screen: Forgotpwemail,
-//     navigationOptions:{
-//       title:null,
-//       headerTransparent: true
-//     }
-//   },
-
-  // Home: {
-  //   screen: Home,
-  //   navigationOptions:{
-  //     title: 'LSD',
-  //     headerLeft:() => null,
-  //     // gestureEnabled:true
-  //   }
-  // },
-
-  // Kitchen:{
-  //   screen:Kitchen
-    
-  // },
-
-  // Store:{
-  //   screen:Store
-  // },
-
-  // CustMenu:{
-  //   screen:CustMenu
-  // },
-
-  // AdminMenu:{
-  //   screen:AdminMenu
-  // },
-
-  // Customer_Profile: {
-  //     screen: Customer_Profile,
-  //     navigationOptions:{
-  //       headerShown:false
-  //     }
-  //   },
-  
-  // change_password_customer: {
-  //   screen: change_password_customer,
-  // },
-
-};
-
-// home stack navigator screens
-const ProfileStack = createStackNavigator(screens, {
-  defaultNavigationOptions: {
-    headerTintColor: '#fff',
-    headerStyle: { 
-    backgroundColor: '#d00f16', 
-    height: 60,
-    shadowColor: "black",
-    shadowOffset: {
-      width: 0,
-      height: 2,
-    },
-    shadowOpacity: 0.9,
-    shadowRadius: 1.50,
-    elevation: 3,
-  },
-
-  
-    
-  }
-});
-
-// export default createAppContainer(HomeStack);
+import { createStackNavigator } from 'react-navigation-stack';
+import { createAppContainer } from 'react-navigation';
+import Icon from "react-native-vector-icons/MaterialIcons"
+import Login from '../screens/Login';
+import Registration from '../screens/Registration';
+import Forgotpwemail from '../screens/Forgotpwemail';
+import Home from '../screens/Home';
+import Kitchen from '../screens/Kitchen';
+import Store from '../screens/Store';
+import AdminMenu from '../screens/AdminMenu';
+import CustMenu from '../screens/CustMenu';
+import Pending_Order_Admin from '../screens/Pending_Order_Admin';
+// import Subcategory from '../screens/Subcategory';
+import CustomerProfile from '../screens/Customer_Profile';
+import ChangePassword from '../screens/change_password_customer';
+import ChangePhone from '../screens/change_phone_customer';
+// import Customer from '../screens/Customer';
+// import Forgotpw from '../screens/Forgotpw';
+// import Change_Password from '../screens/ChangePassword';
+import React from 'react';
+import { Button, TouchableOpacity } from 'react-native';
+// import firebase from '@react-native-firebase/app';
+// import ReviewDetails from '../screens/reviewDetails';
+
+const screens = {
+
+  // Home: {
+  //   screen: Home,
+  //   navigationOptions:{
+  //     title: 'LSD',
+  //     headerLeft:() => null,
+  //     // gestureEnabled:true
+  //   }
+  // },
+
+  CustomerProfile:{
+      screen: CustomerProfile,
+      navigationOptions:({navigation})=>{
+
+        return{
+          title: 'My Profile',
+          headerTransparent:true,
+          headerTintColor:'white',
+          headerLeft:() => (
+            <TouchableOpacity
+              onPress={() => navigation.toggleDrawer()}
+              // title="Info"
+              // color="#e8e8e8"
+              style={{paddingLeft:16}}
+            >
+              <Icon name='menu' size={28} color={'white'}/>
+  
+  
+            </TouchableOpacity>
+          ),
+        }
+      }
+  },
+
+  ChangePassword:{
+      screen:ChangePassword
+  },
+
+  ChangePhone:{
+      screen:ChangePhone
+  }
+
+//   Login: {
+//     screen: Login,
+//     navigationOptions:{
+//       headerShown:false
+//     }
+//   },
+
+//   Registration: {
+//     screen: Registration,
+//     navigationOptions:{
+//       title:null,
+//       headerTransparent: true
+//     }
+//   },
+
+//   Forgotpwemail: {
+//     screen: Forgotpwemail,
+//     navigationOptions:{
+//       title:null,
+//       headerTransparent: true
+//     }
+//   },
+
+  // Home: {
+  //   screen: Home,
+  //   navigationOptions:{
+  //     title: 'LSD',
+  //     headerLeft:() => null,
+  //     // gestureEnabled:true
+  //   }
+  // },
+
+  // Kitchen:{
+  //   screen:Kitchen
+    
+  // },
+
+  // Store:{
+  //   screen:Store
+  // },
+
+  // CustMenu:{
+  //   screen:CustMenu
+  // },
+
+  // AdminMenu:{
+  //   screen:AdminMenu
+  // },
+
+  // Customer_Profile: {
+  //     screen: Customer_Profile,
+  //     navigationOptions:{
+  //       headerShown:false
+  //     }
+  //   },
+  
+  // change_password_customer: {
+  //   screen: change_password_customer,
+  // },
+
+};
+
+// home stack navigator screens
+const ProfileStack = createStackNavigator(screens, {
+  defaultNavigationOptions: {
+    headerTintColor: '#fff',
+    headerStyle: { 
+    backgroundColor: '#d00f16', 
+    height: 60,
+    shadowColor: "black",
+    shadowOffset: {
+      width: 0,
+      height: 2,
+    },
+    shadowOpacity: 0.9,
+    shadowRadius: 1.50,
+    elevation: 3,
+  },
+
+  
+    
+  }
+});
+
+// export default createAppContainer(HomeStack);
 export default ProfileStack
\ No newline at end of file
diff --git a/routes/RedemptionStack.js b/routes/RedemptionStack.js
index 0f0f1e4..6f9b880 100644
--- a/routes/RedemptionStack.js
+++ b/routes/RedemptionStack.js
@@ -1,155 +1,155 @@
-import { createStackNavigator } from 'react-navigation-stack';
-import { createAppContainer } from 'react-navigation';
-import Icon from "react-native-vector-icons/MaterialIcons"
-import Login from '../screens/Login';
-import Registration from '../screens/Registration';
-import Forgotpwemail from '../screens/Forgotpwemail';
-import Home from '../screens/Home';
-import Kitchen from '../screens/Kitchen';
-import Store from '../screens/Store';
-import AdminMenu from '../screens/AdminMenu';
-import CustMenu from '../screens/CustMenu';
-import Pending_Order_Admin from '../screens/Pending_Order_Admin';
-import PendingOrdersList from '../screens/PendingOrdersList';
-import RedemptionPoints from '../screens/RedemptionPoints';
-// import Subcategory from '../screens/Subcategory';
-import Customer_Profile from '../screens/Customer_Profile';
-import change_password_customer from '../screens/change_password_customer';
-// import Forgotpw from '../screens/Forgotpw';
-// import Change_Password from '../screens/ChangePassword';
-import React from 'react';
-import { Button,TouchableOpacity} from 'react-native';
-// import firebase from '@react-native-firebase/app';
-// import ReviewDetails from '../screens/reviewDetails';
-
-const screens = {
-
-    RedemptionPoints:{
-        screen: RedemptionPoints,
-        navigationOptions:({navigation})=>{
-
-          return{
-            title: 'Redemption Points',
-            headerTintColor:'white',
-            headerLeft:() => (
-              <TouchableOpacity
-                onPress={() => navigation.toggleDrawer()}
-                // title="Info"
-                // color="#e8e8e8"
-                style={{paddingLeft:16}}
-              >
-                <Icon name='menu' size={28} color={'white'}/>
-    
-    
-              </TouchableOpacity>
-            ),
-          }
-        }
-    }
-
-
-//   Home: {
-//     screen: Home,
-//     navigationOptions:{
-//       title: 'LSD',
-//       headerLeft:() => null,
-//       // gestureEnabled:true
-//     }
-//   },
-
-//   Login: {
-//     screen: Login,
-//     navigationOptions:{
-//       headerShown:false
-//     }
-//   },
-
-//   Registration: {
-//     screen: Registration,
-//     navigationOptions:{
-//       title:null,
-//       headerTransparent: true
-//     }
-//   },
-
-//   Forgotpwemail: {
-//     screen: Forgotpwemail,
-//     navigationOptions:{
-//       title:null,
-//       headerTransparent: true
-//     }
-//   },
-
-//   Home: {
-//     screen: Home,
-//     navigationOptions:{
-//       title: 'LSD',
-//       headerLeft:() => null,
-//       // gestureEnabled:true
-//     }
-//   },
-
-//   Kitchen:{
-//     screen:Kitchen
-    
-//   },
-
-//   Store:{
-//     screen:Store
-//   },
-
-//   CustMenu:{
-//     screen:CustMenu
-//   },
-
-//   AdminMenu:{
-//     screen:AdminMenu
-//   },
-
-//   AddItem:{
-//       screen: AddItem
-//   },
-
-//   UpdateItem:{
-//       screen:UpdateItem
-//   }
-
-  
-
-  // Customer_Profile: {
-  //     screen: Customer_Profile,
-  //     navigationOptions:{
-  //       headerShown:false
-  //     }
-  //   },
-  
-  // change_password_customer: {
-  //   screen: change_password_customer,
-  // },
-
-};
-
-// home stack navigator screens
-const RedemptionStack = createStackNavigator(screens, {
-  defaultNavigationOptions: {
-    headerTintColor: '#ffffff',
-    headerStyle: { 
-    backgroundColor: '#d00f16', 
-    height: 60,
-    shadowColor: "black",
-    shadowOffset: {
-      width: 0,
-      height: 2,
-    },
-    shadowOpacity: 0.9,
-    shadowRadius: 1.50,
-    elevation: 3,
-  },
-
-  
-    
-  }
-});
-
-// export default createAppContainer(HomeStack);
+import { createStackNavigator } from 'react-navigation-stack';
+import { createAppContainer } from 'react-navigation';
+import Icon from "react-native-vector-icons/MaterialIcons"
+import Login from '../screens/Login';
+import Registration from '../screens/Registration';
+import Forgotpwemail from '../screens/Forgotpwemail';
+import Home from '../screens/Home';
+import Kitchen from '../screens/Kitchen';
+import Store from '../screens/Store';
+import AdminMenu from '../screens/AdminMenu';
+import CustMenu from '../screens/CustMenu';
+import Pending_Order_Admin from '../screens/Pending_Order_Admin';
+import PendingOrdersList from '../screens/PendingOrdersList';
+import RedemptionPoints from '../screens/RedemptionPoints';
+// import Subcategory from '../screens/Subcategory';
+import Customer_Profile from '../screens/Customer_Profile';
+import change_password_customer from '../screens/change_password_customer';
+// import Forgotpw from '../screens/Forgotpw';
+// import Change_Password from '../screens/ChangePassword';
+import React from 'react';
+import { Button,TouchableOpacity} from 'react-native';
+// import firebase from '@react-native-firebase/app';
+// import ReviewDetails from '../screens/reviewDetails';
+
+const screens = {
+
+    RedemptionPoints:{
+        screen: RedemptionPoints,
+        navigationOptions:({navigation})=>{
+
+          return{
+            title: 'Redemption Points',
+            headerTintColor:'white',
+            headerLeft:() => (
+              <TouchableOpacity
+                onPress={() => navigation.toggleDrawer()}
+                // title="Info"
+                // color="#e8e8e8"
+                style={{paddingLeft:16}}
+              >
+                <Icon name='menu' size={28} color={'white'}/>
+    
+    
+              </TouchableOpacity>
+            ),
+          }
+        }
+    }
+
+
+//   Home: {
+//     screen: Home,
+//     navigationOptions:{
+//       title: 'LSD',
+//       headerLeft:() => null,
+//       // gestureEnabled:true
+//     }
+//   },
+
+//   Login: {
+//     screen: Login,
+//     navigationOptions:{
+//       headerShown:false
+//     }
+//   },
+
+//   Registration: {
+//     screen: Registration,
+//     navigationOptions:{
+//       title:null,
+//       headerTransparent: true
+//     }
+//   },
+
+//   Forgotpwemail: {
+//     screen: Forgotpwemail,
+//     navigationOptions:{
+//       title:null,
+//       headerTransparent: true
+//     }
+//   },
+
+//   Home: {
+//     screen: Home,
+//     navigationOptions:{
+//       title: 'LSD',
+//       headerLeft:() => null,
+//       // gestureEnabled:true
+//     }
+//   },
+
+//   Kitchen:{
+//     screen:Kitchen
+    
+//   },
+
+//   Store:{
+//     screen:Store
+//   },
+
+//   CustMenu:{
+//     screen:CustMenu
+//   },
+
+//   AdminMenu:{
+//     screen:AdminMenu
+//   },
+
+//   AddItem:{
+//       screen: AddItem
+//   },
+
+//   UpdateItem:{
+//       screen:UpdateItem
+//   }
+
+  
+
+  // Customer_Profile: {
+  //     screen: Customer_Profile,
+  //     navigationOptions:{
+  //       headerShown:false
+  //     }
+  //   },
+  
+  // change_password_customer: {
+  //   screen: change_password_customer,
+  // },
+
+};
+
+// home stack navigator screens
+const RedemptionStack = createStackNavigator(screens, {
+  defaultNavigationOptions: {
+    headerTintColor: '#ffffff',
+    headerStyle: { 
+    backgroundColor: '#d00f16', 
+    height: 60,
+    shadowColor: "black",
+    shadowOffset: {
+      width: 0,
+      height: 2,
+    },
+    shadowOpacity: 0.9,
+    shadowRadius: 1.50,
+    elevation: 3,
+  },
+
+  
+    
+  }
+});
+
+// export default createAppContainer(HomeStack);
 export default RedemptionStack
\ No newline at end of file
diff --git a/routes/Switch.js b/routes/Switch.js
index 783f566..49fe9a3 100644
--- a/routes/Switch.js
+++ b/routes/Switch.js
@@ -1,164 +1,164 @@
-import { createDrawerNavigator} from 'react-navigation-drawer';
-import { createStackNavigator } from 'react-navigation-stack';  
-import { createAppContainer, createSwitchNavigator } from 'react-navigation';
-import Login from '../screens/Login';
-import Registration from '../screens/Registration';
-import Forgotpwemail from '../screens/Forgotpwemail';
-import Home from '../screens/Home';
-import Kitchen from '../screens/Kitchen';
-import Store from '../screens/Store';
-import AdminMenu from '../screens/AdminMenu';
-import CustMenu from '../screens/CustMenu';
-import Pending_Order_Admin from '../screens/Pending_Order_Admin';
-import PendingOrdersList from '../screens/PendingOrdersList';
-import RedemptionPoints from '../screens/RedemptionPoints';
-// import Subcategory from '../screens/Subcategory';
-import Customer_Profile from '../screens/Customer_Profile';
-import change_password_customer from '../screens/change_password_customer';
-// import Forgotpw from '../screens/Forgotpw';
-// import Change_Password from '../screens/ChangePassword';
-import React from 'react';
-import { Button } from 'react-native';
-import OrderStack from './OrderStack';
-import LoginStack from './LoginStack';
-import RedemptionStack from './RedemptionStack';
-import AdminDrawer from './AdminDrawer';
-import CustomerStack from './CustomerStack';
-import ProfileStack from './ProfileStack';
-import CustomerDrawer from './CustomerDrawer';
-
-// import firebase from '@react-native-firebase/app';
-// import ReviewDetails from '../screens/reviewDetails';
-
-const Switches = {
-
-    LoginStack:{
-        screen:LoginStack
-    },
-
-    AdminDrawer:{
-        screen:AdminDrawer
-    },
-
-    CustomerDrawer:{
-        screen:CustomerDrawer
-    },
-
-    // CustomerStack:{
-    //   screen:CustomerStack
-    // },
-
-    // ProfileStack:{
-    //   screen:ProfileStack
-    // }
-
-   
-    
-
-
-//   Home: {
-//     screen: Home,
-//     navigationOptions:{
-//       title: 'LSD',
-//       headerLeft:() => null,
-//       // gestureEnabled:true
-//     }
-//   },
-
-//   Login: {
-//     screen: Login,
-//     navigationOptions:{
-//       headerShown:false
-//     }
-//   },
-
-//   Registration: {
-//     screen: Registration,
-//     navigationOptions:{
-//       title:null,
-//       headerTransparent: true
-//     }
-//   },
-
-//   Forgotpwemail: {
-//     screen: Forgotpwemail,
-//     navigationOptions:{
-//       title:null,
-//       headerTransparent: true
-//     }
-//   },
-
-//   Home: {
-//     screen: Home,
-//     navigationOptions:{
-//       title: 'LSD',
-//       headerLeft:() => null,
-//       // gestureEnabled:true
-//     }
-//   },
-
-//   Kitchen:{
-//     screen:Kitchen
-    
-//   },
-
-//   Store:{
-//     screen:Store
-//   },
-
-//   CustMenu:{
-//     screen:CustMenu
-//   },
-
-//   AdminMenu:{
-//     screen:AdminMenu
-//   },
-
-//   AddItem:{
-//       screen: AddItem
-//   },
-
-//   UpdateItem:{
-//       screen:UpdateItem
-//   }
-
-  
-
-  // Customer_Profile: {
-  //     screen: Customer_Profile,
-  //     navigationOptions:{
-  //       headerShown:false
-  //     }
-  //   },
-  
-  // change_password_customer: {
-  //   screen: change_password_customer,
-  // },
-
-};
-
-// home stack navigator screens
-const Navigate = createSwitchNavigator(Switches)
-//   , {
-//   defaultNavigationOptions: {
-//     headerTintColor: '#444',
-//     headerStyle: { 
-//     backgroundColor: '#d00f16', 
-//     height: 60,
-//     shadowColor: "black",
-//     shadowOffset: {
-//       width: 0,
-//       height: 2,
-//     },
-//     shadowOpacity: 0.9,
-//     shadowRadius: 1.50,
-//     elevation: 3,
-//   },
-
-  
-    
-//   }
-// });
-
-// export default createAppContainer(HomeStack);
+import { createDrawerNavigator} from 'react-navigation-drawer';
+import { createStackNavigator } from 'react-navigation-stack';  
+import { createAppContainer, createSwitchNavigator } from 'react-navigation';
+import Login from '../screens/Login';
+import Registration from '../screens/Registration';
+import Forgotpwemail from '../screens/Forgotpwemail';
+import Home from '../screens/Home';
+import Kitchen from '../screens/Kitchen';
+import Store from '../screens/Store';
+import AdminMenu from '../screens/AdminMenu';
+import CustMenu from '../screens/CustMenu';
+import Pending_Order_Admin from '../screens/Pending_Order_Admin';
+import PendingOrdersList from '../screens/PendingOrdersList';
+import RedemptionPoints from '../screens/RedemptionPoints';
+// import Subcategory from '../screens/Subcategory';
+import Customer_Profile from '../screens/Customer_Profile';
+import change_password_customer from '../screens/change_password_customer';
+// import Forgotpw from '../screens/Forgotpw';
+// import Change_Password from '../screens/ChangePassword';
+import React from 'react';
+import { Button } from 'react-native';
+import OrderStack from './OrderStack';
+import LoginStack from './LoginStack';
+import RedemptionStack from './RedemptionStack';
+import AdminDrawer from './AdminDrawer';
+import CustomerStack from './CustomerStack';
+import ProfileStack from './ProfileStack';
+import CustomerDrawer from './CustomerDrawer';
+
+// import firebase from '@react-native-firebase/app';
+// import ReviewDetails from '../screens/reviewDetails';
+
+const Switches = {
+
+    LoginStack:{
+        screen:LoginStack
+    },
+
+    AdminDrawer:{
+        screen:AdminDrawer
+    },
+
+    CustomerDrawer:{
+        screen:CustomerDrawer
+    },
+
+    // CustomerStack:{
+    //   screen:CustomerStack
+    // },
+
+    // ProfileStack:{
+    //   screen:ProfileStack
+    // }
+
+   
+    
+
+
+//   Home: {
+//     screen: Home,
+//     navigationOptions:{
+//       title: 'LSD',
+//       headerLeft:() => null,
+//       // gestureEnabled:true
+//     }
+//   },
+
+//   Login: {
+//     screen: Login,
+//     navigationOptions:{
+//       headerShown:false
+//     }
+//   },
+
+//   Registration: {
+//     screen: Registration,
+//     navigationOptions:{
+//       title:null,
+//       headerTransparent: true
+//     }
+//   },
+
+//   Forgotpwemail: {
+//     screen: Forgotpwemail,
+//     navigationOptions:{
+//       title:null,
+//       headerTransparent: true
+//     }
+//   },
+
+//   Home: {
+//     screen: Home,
+//     navigationOptions:{
+//       title: 'LSD',
+//       headerLeft:() => null,
+//       // gestureEnabled:true
+//     }
+//   },
+
+//   Kitchen:{
+//     screen:Kitchen
+    
+//   },
+
+//   Store:{
+//     screen:Store
+//   },
+
+//   CustMenu:{
+//     screen:CustMenu
+//   },
+
+//   AdminMenu:{
+//     screen:AdminMenu
+//   },
+
+//   AddItem:{
+//       screen: AddItem
+//   },
+
+//   UpdateItem:{
+//       screen:UpdateItem
+//   }
+
+  
+
+  // Customer_Profile: {
+  //     screen: Customer_Profile,
+  //     navigationOptions:{
+  //       headerShown:false
+  //     }
+  //   },
+  
+  // change_password_customer: {
+  //   screen: change_password_customer,
+  // },
+
+};
+
+// home stack navigator screens
+const Navigate = createSwitchNavigator(Switches)
+//   , {
+//   defaultNavigationOptions: {
+//     headerTintColor: '#444',
+//     headerStyle: { 
+//     backgroundColor: '#d00f16', 
+//     height: 60,
+//     shadowColor: "black",
+//     shadowOffset: {
+//       width: 0,
+//       height: 2,
+//     },
+//     shadowOpacity: 0.9,
+//     shadowRadius: 1.50,
+//     elevation: 3,
+//   },
+
+  
+    
+//   }
+// });
+
+// export default createAppContainer(HomeStack);
 export default createAppContainer(Navigate)
\ No newline at end of file
diff --git a/screens/AddItem.js b/screens/AddItem.js
index 1c360d0..d1e180d 100644
--- a/screens/AddItem.js
+++ b/screens/AddItem.js
@@ -1,414 +1,414 @@
-import React, {useState} from 'react';
-import Icon from 'react-native-vector-icons/FontAwesome';
-import {
-  StyleSheet,
-  Text,
-  View,
-  TouchableOpacity,
-  TextInput,
-  Alert,
-  Keyboard,
-  TouchableWithoutFeedback,
-  ScrollView,
-  // Button,
-  // Picker,
-} from 'react-native';
-import {Picker} from '@react-native-community/picker';
-
-// import ModalDropdown from 'react-native-modal-dropdown';
-// import DropDownItem from "react-native-drop-down-item";
-// import {
-//   TouchableHighlight,
-//   BorderlessButton,
-// } from "react-native-gesture-handler";
-// import firebase from "@react-native-firebase/app";
-import Categoryy from './PickerList.js';
-// import SubCategory from './Subcategory.js';
-import firebase from '../assets/DatabaseConfig';
-import database from '@react-native-firebase/database';
-
-export default function AddItem({navigation}) {
-  const pressHandler = () => {
-    if (Category === 'Choose a category') {
-      alert('Please choose a category');
-      // return
-    } else if (SubCategory === 'Choose a subcategory') {
-      alert('Please choose a subcategory');
-      // return
-    } else if (ProductName.length < 1) {
-      alert('Invalid product name');
-    } else if (ProductPrice < 0) {
-      alert('Invalid product price');
-    } else if (ProductQuantity < 0) {
-      alert('Invalid product quantity');
-    } else {
-      // firebase.database().ref('/Inventory/'+Category+"/"+SubCategory+"/"+ProductName).set({
-      //   Price: ProductPrice,
-      //   Qty: ProductQuantity
-      // })
-
-      // setProductName('')
-      // setProductPrice('')
-      // setProductQuantity('')
-      // setCategory('Choose a category')
-      // setSubCategory('Choose a subcategory')
-
-      // alert("Item added successfully")
-
-      firebase
-        .database()
-        .ref('/Inventory/' + Category + '/' + SubCategory + '/' + ProductName)
-        .once('value')
-        .then(snapshot => {
-          console.log('HERERE');
-          // console.log(value)
-          console.log(snapshot.exists());
-          if (snapshot.exists()) {
-            console.log('EXISTS');
-            ReplaceAlert();
-          } else {
-            ItemAdded();
-            console.log('NOT EXISTS');
-          }
-        });
-    }
-  };
-
-  function ReplaceAlert() {
-    console.log('ALERT');
-
-    Alert.alert(
-      'Product already exists',
-      'Replace ' + JSON.stringify(ProductName),
-      [
-        {
-          text: 'Cancel',
-          // style:"destructive"
-          type: 'destructive',
-        },
-
-        {
-          text: 'Confirm',
-          onPress: () => ItemAdded(),
-        },
-      ],
-
-      {cancelable: false},
-    );
-  }
-
-  function ItemAdded() {
-    console.log('ADD');
-
-    firebase
-      .database()
-      .ref('/Inventory/' + Category + '/' + SubCategory + '/' + ProductName)
-      .set({
-        Price: parseInt(ProductPrice),
-        Qty: parseInt(ProductQuantity),
-      })
-      .then(() => {
-        setProductName('');
-        setProductPrice('');
-        setProductQuantity('');
-        setCategory('Choose a category');
-        setSubCategory('Choose a subcategory');
-
-        alert('Item added successfully');
-      })
-      .catch((e)=>alert('Add item failed. Please check your internet connection'));
-  }
-
-  // console.log(Category.getS)
-
-  // let AddWait= await Add
-
-  const [ProductName, setProductName] = useState('');
-  const [ProductPrice, setProductPrice] = useState('');
-  const [ProductQuantity, setProductQuantity] = useState('');
-  const [Category, setCategory] = useState('Choose a category');
-  const [SubCategory, setSubCategory] = useState('Choose a subcategory');
-
-  const SubCat = {
-    'Choose a category': ['Choose a subcategory'],
-    Kitchen: ['Choose a subcategory', 'Desi', 'Fast Food', 'Fresh Juice'],
-    Store: [
-      'Choose a subcategory',
-      'Stationery',
-      'Beverages',
-      'Grocery',
-      'Grooming',
-      'Electronics',
-    ],
-  };
-
-  const Cat = ['Choose a category', 'Kitchen', 'Store'];
-
-  return (
-    <TouchableWithoutFeedback
-      onPress={() => {
-        Keyboard.dismiss();
-      }}>
-      <View style={styles.screen}>
-        {/* <View style={styles.TopBar}>
-        <TouchableOpacity style={styles.TopBarBack}>
-          <Icon name="arrow-left" size={32} color="white" />
-        </TouchableOpacity>
-
-        <View style={styles.TopBarText}>
-          <Text
-            style={{fontSize: 30, fontFamily: 'Roboto-Bold', color: 'white'}}>
-            Add Item
-          </Text>
-        </View>
-
-        <TouchableOpacity style={styles.TopBarSearch}>
-          <Icon name="search" size={32} color="white" />
-        </TouchableOpacity>
-      </View> */}
-
-        <View style={styles.RestScreen}>
-          <View style={styles.viewstyle}>
-            <Picker
-              selectedValue={Category}
-              style={styles.container}
-              // placeholder= "Choose a category"
-              // onPress={}
-              onValueChange={(itemValue, itemIndex) => setCategory(itemValue)}>
-              {/* <Picker.Item label="Choose a category" value="null" /> */}
-              {Cat.map((item, index) => {
-                return <Picker.Item label={item} value={item} key={index} />;
-              })}
-              {/* <Picker.Item label="Choose a category" value="null" />
-          <Picker.Item label="Food" value="food" />
-          <Picker.Item label="Stationary" value="stationary" />
-          <Picker.Item label="Grocery" value="grocery" /> */}
-            </Picker>
-            {/* <Categoryy >{'Change'}</Categoryy> */}
-          </View>
-
-          <View style={styles.viewstyle}>
-            <Picker
-              selectedValue={SubCategory}
-              style={styles.container}
-              // placeholder= "Choose a category"
-              // onPress={}
-              onValueChange={(itemValue, itemIndex) =>
-                setSubCategory(itemValue)
-              }>
-              {/* <Picker.Item label="Choose a category" value="null" /> */}
-              {SubCat[Category].map((item, index) => {
-                return <Picker.Item label={item} value={item} key={index} />;
-              })}
-              {/* <Picker.Item label="Choose a category" value="null" />
-            <Picker.Item label="Food" value="food" />
-            <Picker.Item label="Stationary" value="stationary" />
-            <Picker.Item label="Grocery" value="grocery" /> */}
-            </Picker>
-
-            {/* <SubCategory /> */}
-          </View>
-
-          {/* <TouchableOpacity style={{width: '100%'}}> */}
-          <TextInput
-            style={styles.TextInputbox}
-            // style={{fontSize: 12}}
-            placeholder="Product Name"
-            placeholderTextColor="black"
-            onChangeText={ProductName => setProductName(ProductName)}
-            defaultValue={ProductName}
-            // allowFontScalingrr
-          />
-          {/* </TouchableOpacity> */}
-
-          {/* <TouchableOpacity style={{width: '100%'}}> */}
-          <TextInput
-            style={styles.TextInputbox}
-            placeholder="Product Price"
-            placeholderTextColor="black"
-            onChangeText={ProductPrice => setProductPrice(ProductPrice)}
-            defaultValue={ProductPrice}
-            keyboardType="numeric"
-            // onBlur={()=>{this.}}
-          />
-          {/* </TouchableOpacity> */}
-
-          {/* <TouchableOpacity style={{width: '100%'}}> */}
-          <TextInput
-            style={styles.TextInputbox}
-            placeholder="Product Quantity"
-            placeholderTextColor="black"
-            // value=""
-            keyboardType="numeric"
-            onChangeText={ProductQuantity =>
-              setProductQuantity(ProductQuantity)
-            }
-            defaultValue={ProductQuantity}
-          />
-          {/* </TouchableOpacity> */}
-
-          <View style={styles.bigbutton}>
-            <TouchableOpacity
-              onPress={pressHandler}
-              style={styles.Confirmbutton}>
-              <Text style={styles.bigbuttontext}>Confirm</Text>
-            </TouchableOpacity>
-          </View>
-        </View>
-      </View>
-    </TouchableWithoutFeedback>
-  );
-}
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    // paddingTop: 40,
-    // backgroundColor:'red',
-    alignItems: 'center',
-    justifyContent: 'center',
-    flexDirection: 'row',
-    marginVertical: 10,
-    width: '100%',
-    height: 50,
-    elevation: 2,
-  },
-
-  Screen: {
-    // flexDirection: "column",
-    height: '100%',
-    backgroundColor: '#e8e8e8',
-    // padding: '10%',
-    // backgroundColor: '#e8e8e8',
-    // height: '90%',
-    // justifyContent: 'center',
-    // alignItems: 'center',
-  },
-  TopBar: {
-    padding: 20,
-    flexDirection: 'row',
-    flex: 2,
-
-    width: '100%',
-    height: '100%',
-    backgroundColor: '#d00f16',
-    alignItems: 'center',
-    justifyContent: 'space-between',
-  },
-  TopBarText: {
-    flexDirection: 'row',
-    fontSize: 30,
-    fontFamily: 'Roboto-Bold',
-    color: 'white',
-    textAlign: 'left',
-    alignItems: 'flex-start',
-    flex: 6,
-  },
-  TopBarSearch: {
-    alignItems: 'flex-end',
-    color: 'white',
-    fontSize: 20,
-    flex: 1,
-  },
-  TopBarBack: {
-    color: 'white',
-    flex: 1,
-    fontSize: 20,
-  },
-  RestScreen: {
-    // flex: 8,
-    // width: 100,
-    padding: '10%',
-    backgroundColor: '#e8e8e8',
-    height: '100%',
-    justifyContent: 'center',
-    alignItems: 'center',
-  },
-  firstbox: {
-    width: '100%',
-    flexDirection: 'row',
-    marginVertical: 10,
-    borderColor: 'black',
-    backgroundColor: 'white',
-    borderWidth: 0.5,
-    borderRadius: 10,
-    height: 50,
-    // padding: 30,
-    alignItems: 'center',
-    shadowColor: 'darkgrey',
-    shadowOpacity: 20,
-    // justifyContent: "center",
-  },
-  TextInputbox: {
-    // width: '100%',
-    width: 280,
-    paddingHorizontal: 16,
-    flexDirection: 'row',
-    marginVertical: 16,
-    borderColor: 'black',
-    backgroundColor: 'white',
-    borderWidth: 0,
-    borderBottomWidth: 1,
-    borderRadius: 4,
-    height: 56,
-    // fontSize: 20,
-    // shadowColor: 'darkgrey',
-    // shadowOpacity: 20,
-    // justifyContent: "center",
-  },
-
-  Confirmbutton: {
-    // padding: '5%',
-    // marginVertical: 10,
-    // paddingHorizontal: 15,
-    backgroundColor: '#d00f16',
-    borderRadius: 20,
-    width: 200,
-    height: 40,
-    shadowColor: '#000',
-    shadowOffset: {width: 2, height: 4},
-    shadowOpacity: 0.9,
-    shadowRadius: 6,
-    elevation: 2,
-    // minHeight: '6%',
-    textAlign: 'center',
-    justifyContent: 'center',
-    alignItems: 'center',
-    elevation: 2,
-  },
-  bigbuttontext: {
-    fontWeight: 'bold',
-    color: 'white',
-    fontFamily: 'Roboto',
-    fontSize: 20,
-    textAlign: 'center',
-    // paddingTop: '2%',
-
-    // opacity: 1,
-  },
-  bigbutton: {
-    // padding: '50%',
-    // marginVertical: 10,
-    // paddingHorizontal: '23%',
-    flex: 2,
-    alignItems: 'center',
-    justifyContent: 'flex-end',
-  },
-  viewstyle: {
-    // padding: 30,
-    height: 56,
-    marginVertical: 16,
-    width: 280,
-    alignItems: 'center',
-    borderColor: 'black',
-    backgroundColor: 'white',
-    borderWidth: 0,
-    // borderBottomWidth: 1,
-    borderRadius: 4,
-    shadowColor: '#000',
-    shadowOffset: {width: 2, height: 4},
-    shadowOpacity: 0.9,
-    shadowRadius: 6,
-    elevation: 2,
-  },
-});
+import React, {useState} from 'react';
+import Icon from 'react-native-vector-icons/FontAwesome';
+import {
+  StyleSheet,
+  Text,
+  View,
+  TouchableOpacity,
+  TextInput,
+  Alert,
+  Keyboard,
+  TouchableWithoutFeedback,
+  ScrollView,
+  // Button,
+  // Picker,
+} from 'react-native';
+import {Picker} from '@react-native-community/picker';
+
+// import ModalDropdown from 'react-native-modal-dropdown';
+// import DropDownItem from "react-native-drop-down-item";
+// import {
+//   TouchableHighlight,
+//   BorderlessButton,
+// } from "react-native-gesture-handler";
+// import firebase from "@react-native-firebase/app";
+import Categoryy from './PickerList.js';
+// import SubCategory from './Subcategory.js';
+import firebase from '../assets/DatabaseConfig';
+import database from '@react-native-firebase/database';
+
+export default function AddItem({navigation}) {
+  const pressHandler = () => {
+    if (Category === 'Choose a category') {
+      alert('Please choose a category');
+      // return
+    } else if (SubCategory === 'Choose a subcategory') {
+      alert('Please choose a subcategory');
+      // return
+    } else if (ProductName.length < 1) {
+      alert('Invalid product name');
+    } else if (ProductPrice < 0) {
+      alert('Invalid product price');
+    } else if (ProductQuantity < 0) {
+      alert('Invalid product quantity');
+    } else {
+      // firebase.database().ref('/Inventory/'+Category+"/"+SubCategory+"/"+ProductName).set({
+      //   Price: ProductPrice,
+      //   Qty: ProductQuantity
+      // })
+
+      // setProductName('')
+      // setProductPrice('')
+      // setProductQuantity('')
+      // setCategory('Choose a category')
+      // setSubCategory('Choose a subcategory')
+
+      // alert("Item added successfully")
+
+      firebase
+        .database()
+        .ref('/Inventory/' + Category + '/' + SubCategory + '/' + ProductName)
+        .once('value')
+        .then(snapshot => {
+          console.log('HERERE');
+          // console.log(value)
+          console.log(snapshot.exists());
+          if (snapshot.exists()) {
+            console.log('EXISTS');
+            ReplaceAlert();
+          } else {
+            ItemAdded();
+            console.log('NOT EXISTS');
+          }
+        });
+    }
+  };
+
+  function ReplaceAlert() {
+    console.log('ALERT');
+
+    Alert.alert(
+      'Product already exists',
+      'Replace ' + JSON.stringify(ProductName),
+      [
+        {
+          text: 'Cancel',
+          // style:"destructive"
+          type: 'destructive',
+        },
+
+        {
+          text: 'Confirm',
+          onPress: () => ItemAdded(),
+        },
+      ],
+
+      {cancelable: false},
+    );
+  }
+
+  function ItemAdded() {
+    console.log('ADD');
+
+    firebase
+      .database()
+      .ref('/Inventory/' + Category + '/' + SubCategory + '/' + ProductName)
+      .set({
+        Price: parseInt(ProductPrice),
+        Qty: parseInt(ProductQuantity),
+      })
+      .then(() => {
+        setProductName('');
+        setProductPrice('');
+        setProductQuantity('');
+        setCategory('Choose a category');
+        setSubCategory('Choose a subcategory');
+
+        alert('Item added successfully');
+      })
+      .catch((e)=>alert('Add item failed. Please check your internet connection'));
+  }
+
+  // console.log(Category.getS)
+
+  // let AddWait= await Add
+
+  const [ProductName, setProductName] = useState('');
+  const [ProductPrice, setProductPrice] = useState('');
+  const [ProductQuantity, setProductQuantity] = useState('');
+  const [Category, setCategory] = useState('Choose a category');
+  const [SubCategory, setSubCategory] = useState('Choose a subcategory');
+
+  const SubCat = {
+    'Choose a category': ['Choose a subcategory'],
+    Kitchen: ['Choose a subcategory', 'Desi', 'Fast Food', 'Fresh Juice'],
+    Store: [
+      'Choose a subcategory',
+      'Stationery',
+      'Beverages',
+      'Grocery',
+      'Grooming',
+      'Electronics',
+    ],
+  };
+
+  const Cat = ['Choose a category', 'Kitchen', 'Store'];
+
+  return (
+    <TouchableWithoutFeedback
+      onPress={() => {
+        Keyboard.dismiss();
+      }}>
+      <View style={styles.screen}>
+        {/* <View style={styles.TopBar}>
+        <TouchableOpacity style={styles.TopBarBack}>
+          <Icon name="arrow-left" size={32} color="white" />
+        </TouchableOpacity>
+
+        <View style={styles.TopBarText}>
+          <Text
+            style={{fontSize: 30, fontFamily: 'Roboto-Bold', color: 'white'}}>
+            Add Item
+          </Text>
+        </View>
+
+        <TouchableOpacity style={styles.TopBarSearch}>
+          <Icon name="search" size={32} color="white" />
+        </TouchableOpacity>
+      </View> */}
+
+        <View style={styles.RestScreen}>
+          <View style={styles.viewstyle}>
+            <Picker
+              selectedValue={Category}
+              style={styles.container}
+              // placeholder= "Choose a category"
+              // onPress={}
+              onValueChange={(itemValue, itemIndex) => setCategory(itemValue)}>
+              {/* <Picker.Item label="Choose a category" value="null" /> */}
+              {Cat.map((item, index) => {
+                return <Picker.Item label={item} value={item} key={index} />;
+              })}
+              {/* <Picker.Item label="Choose a category" value="null" />
+          <Picker.Item label="Food" value="food" />
+          <Picker.Item label="Stationary" value="stationary" />
+          <Picker.Item label="Grocery" value="grocery" /> */}
+            </Picker>
+            {/* <Categoryy >{'Change'}</Categoryy> */}
+          </View>
+
+          <View style={styles.viewstyle}>
+            <Picker
+              selectedValue={SubCategory}
+              style={styles.container}
+              // placeholder= "Choose a category"
+              // onPress={}
+              onValueChange={(itemValue, itemIndex) =>
+                setSubCategory(itemValue)
+              }>
+              {/* <Picker.Item label="Choose a category" value="null" /> */}
+              {SubCat[Category].map((item, index) => {
+                return <Picker.Item label={item} value={item} key={index} />;
+              })}
+              {/* <Picker.Item label="Choose a category" value="null" />
+            <Picker.Item label="Food" value="food" />
+            <Picker.Item label="Stationary" value="stationary" />
+            <Picker.Item label="Grocery" value="grocery" /> */}
+            </Picker>
+
+            {/* <SubCategory /> */}
+          </View>
+
+          {/* <TouchableOpacity style={{width: '100%'}}> */}
+          <TextInput
+            style={styles.TextInputbox}
+            // style={{fontSize: 12}}
+            placeholder="Product Name"
+            placeholderTextColor="black"
+            onChangeText={ProductName => setProductName(ProductName)}
+            defaultValue={ProductName}
+            // allowFontScalingrr
+          />
+          {/* </TouchableOpacity> */}
+
+          {/* <TouchableOpacity style={{width: '100%'}}> */}
+          <TextInput
+            style={styles.TextInputbox}
+            placeholder="Product Price"
+            placeholderTextColor="black"
+            onChangeText={ProductPrice => setProductPrice(ProductPrice)}
+            defaultValue={ProductPrice}
+            keyboardType="numeric"
+            // onBlur={()=>{this.}}
+          />
+          {/* </TouchableOpacity> */}
+
+          {/* <TouchableOpacity style={{width: '100%'}}> */}
+          <TextInput
+            style={styles.TextInputbox}
+            placeholder="Product Quantity"
+            placeholderTextColor="black"
+            // value=""
+            keyboardType="numeric"
+            onChangeText={ProductQuantity =>
+              setProductQuantity(ProductQuantity)
+            }
+            defaultValue={ProductQuantity}
+          />
+          {/* </TouchableOpacity> */}
+
+          <View style={styles.bigbutton}>
+            <TouchableOpacity
+              onPress={pressHandler}
+              style={styles.Confirmbutton}>
+              <Text style={styles.bigbuttontext}>Confirm</Text>
+            </TouchableOpacity>
+          </View>
+        </View>
+      </View>
+    </TouchableWithoutFeedback>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    // paddingTop: 40,
+    // backgroundColor:'red',
+    alignItems: 'center',
+    justifyContent: 'center',
+    flexDirection: 'row',
+    marginVertical: 10,
+    width: '100%',
+    height: 50,
+    elevation: 2,
+  },
+
+  Screen: {
+    // flexDirection: "column",
+    height: '100%',
+    backgroundColor: '#e8e8e8',
+    // padding: '10%',
+    // backgroundColor: '#e8e8e8',
+    // height: '90%',
+    // justifyContent: 'center',
+    // alignItems: 'center',
+  },
+  TopBar: {
+    padding: 20,
+    flexDirection: 'row',
+    flex: 2,
+
+    width: '100%',
+    height: '100%',
+    backgroundColor: '#d00f16',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+  },
+  TopBarText: {
+    flexDirection: 'row',
+    fontSize: 30,
+    fontFamily: 'Roboto-Bold',
+    color: 'white',
+    textAlign: 'left',
+    alignItems: 'flex-start',
+    flex: 6,
+  },
+  TopBarSearch: {
+    alignItems: 'flex-end',
+    color: 'white',
+    fontSize: 20,
+    flex: 1,
+  },
+  TopBarBack: {
+    color: 'white',
+    flex: 1,
+    fontSize: 20,
+  },
+  RestScreen: {
+    // flex: 8,
+    // width: 100,
+    padding: '10%',
+    backgroundColor: '#e8e8e8',
+    height: '100%',
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  firstbox: {
+    width: '100%',
+    flexDirection: 'row',
+    marginVertical: 10,
+    borderColor: 'black',
+    backgroundColor: 'white',
+    borderWidth: 0.5,
+    borderRadius: 10,
+    height: 50,
+    // padding: 30,
+    alignItems: 'center',
+    shadowColor: 'darkgrey',
+    shadowOpacity: 20,
+    // justifyContent: "center",
+  },
+  TextInputbox: {
+    // width: '100%',
+    width: 280,
+    paddingHorizontal: 16,
+    flexDirection: 'row',
+    marginVertical: 16,
+    borderColor: 'black',
+    backgroundColor: 'white',
+    borderWidth: 0,
+    borderBottomWidth: 1,
+    borderRadius: 4,
+    height: 56,
+    // fontSize: 20,
+    // shadowColor: 'darkgrey',
+    // shadowOpacity: 20,
+    // justifyContent: "center",
+  },
+
+  Confirmbutton: {
+    // padding: '5%',
+    // marginVertical: 10,
+    // paddingHorizontal: 15,
+    backgroundColor: '#d00f16',
+    borderRadius: 20,
+    width: 200,
+    height: 40,
+    shadowColor: '#000',
+    shadowOffset: {width: 2, height: 4},
+    shadowOpacity: 0.9,
+    shadowRadius: 6,
+    elevation: 2,
+    // minHeight: '6%',
+    textAlign: 'center',
+    justifyContent: 'center',
+    alignItems: 'center',
+    elevation: 2,
+  },
+  bigbuttontext: {
+    fontWeight: 'bold',
+    color: 'white',
+    fontFamily: 'Roboto',
+    fontSize: 20,
+    textAlign: 'center',
+    // paddingTop: '2%',
+
+    // opacity: 1,
+  },
+  bigbutton: {
+    // padding: '50%',
+    // marginVertical: 10,
+    // paddingHorizontal: '23%',
+    flex: 2,
+    alignItems: 'center',
+    justifyContent: 'flex-end',
+  },
+  viewstyle: {
+    // padding: 30,
+    height: 56,
+    marginVertical: 16,
+    width: 280,
+    alignItems: 'center',
+    borderColor: 'black',
+    backgroundColor: 'white',
+    borderWidth: 0,
+    // borderBottomWidth: 1,
+    borderRadius: 4,
+    shadowColor: '#000',
+    shadowOffset: {width: 2, height: 4},
+    shadowOpacity: 0.9,
+    shadowRadius: 6,
+    elevation: 2,
+  },
+});
diff --git a/screens/AdminMenu.js b/screens/AdminMenu.js
index 4ab5f3b..faee3b7 100644
--- a/screens/AdminMenu.js
+++ b/screens/AdminMenu.js
@@ -1,386 +1,386 @@
-import React, {useState} from 'react';
-// import Icon from 'react-native-vector-icons/FontAwesome';
-import Icon from 'react-native-vector-icons/MaterialIcons';
-import {
-  StyleSheet,
-  ScrollView,
-  Text,
-  View,
-  TouchableOpacity,
-  TextInput,
-  Image,
-  Alert
-  // Button,
-  // Picker,
-} from 'react-native';
-import newbiryani from '../assets/images/newbiryani.png';
-import {FlatList} from 'react-native-gesture-handler';
-import {NavigationEvents} from 'react-navigation';
-import Swipeable from 'react-native-gesture-handler/Swipeable';
-// import DropDownItem from "react-native-drop-down-item";
-// import {
-//   TouchableHighlight,
-//   BorderlessButton,
-// } from "react-native-gesture-handler"
-import firebase from '../assets/DatabaseConfig';
-import auth from '@react-native-firebase/auth';
-import database from '@react-native-firebase/database';
-
-export default function AdminMenu({navigation}) {
-  // console.log(navigation.getParam('Sub'))
-
-  const handleAddPress = () => {
-    navigation.navigate('AddItem');
-  };
-
-  // console.log("Admin: ", navigation.getParam('Sub'), navigation.getParam('Cat'))
-
-  const [product, setProduct] = useState([]);
-  // {name: 'pencil', price: 10, quantity: 2},
-  // {name: 'ruler', price: '50'},
-  // {name: 'sharpener', price: '5'},
-  // {name: 'eraser', price: '4'},
-  // {name: 'pen', price: '54'},
-  // {name: 'marker', price: '22'},
-  // {name: 'tape', price: '44'},
-  // {name: 'ribbon', price: '22'},
-  // {name: 'pillow', price: '21'},
-  // {name: 'toy', price: '10'},
-  // {name: 'car', price: '11'},
-  // {name: 'box', price: '12'},
-  // ]);
-
-  function onscreenload() {
-    mydb = firebase
-      .database()
-      .ref(
-        '/Inventory/' +
-          navigation.getParam('Cat') +
-          '/' +
-          navigation.getParam('Sub'),
-      );
-    mydb.once('value').then(function(snapshot) {
-      // product = []
-      let prodarr = [];
-      snapshot.forEach(function(childsnapshot) {
-        let newprod = {
-          name: childsnapshot.key,
-          price: childsnapshot.child('Price').val(),
-          quantity: childsnapshot.child('Qty').val(),
-        };
-        // console.log(newprod)
-        prodarr.push(newprod);
-      });
-      setProduct(prodarr);
-    });
-  }
-
-
-
-  const leftActions = (item) => {
-    return (
-      <View style={{flexDirection: 'row', marginVertical: 5, width: '35%'}}>
-        <TouchableOpacity
-          style={{
-            flex: 1,
-            backgroundColor: '#34ade9',
-            // height: 100,
-            alignItems: 'center',
-            justifyContent: 'center',
-
-            // marginVertical: 5,
-          }}
-          onPress={() => {
-            navigation.navigate('UpdateItem', {
-              CAT: navigation.getParam('Cat'),
-              SUB: navigation.getParam('Sub'),
-              ITEM: item,
-            });
-          }}>
-          <Icon name="edit" color="white" size={24} />
-        </TouchableOpacity>
-        <TouchableOpacity
-          style={{
-            flex: 1,
-            backgroundColor: 'red',
-            opacity: 1,
-            // height: 100,
-            alignItems: 'center',
-            justifyContent: 'center',
-            // marginVertical: 5,
-          }}
-          onPress={()=>{
-
-              Alert.alert(
-                'Remove '+item.name+"?",
-                'The item will be deleted permanently',
-                [
-                  {
-                    text: 'Cancel',
-                    // style:"destructive"
-                    type: 'destructive',
-                  },
-          
-                  {
-                    text: 'Confirm',
-                    onPress: () => removeItem(item),
-                  },
-                ],
-          
-                {cancelable: false},
-              );
-          }}
-          >
-          <Icon name="delete" color="white" size={24} />
-        </TouchableOpacity>
-      </View>
-    );
-  };
-
-  const removeItem=(item)=>{
-    setProduct(()=>{
-      return product.filter((I)=>I.name!=item.name)
-
-    })
-
-    mydb = firebase
-      .database()
-      .ref(
-        '/Inventory/' +
-          navigation.getParam('Cat') +
-          '/' +
-          navigation.getParam('Sub') +
-          '/'+item.name,
-      ).remove()
-    
-  }
-
-  return (
-    <View style={styles.Screen}>
-      <NavigationEvents
-        onWillFocus={() => {
-          onscreenload();
-        }}
-      />
-      <View style={{height: '90%'}}>
-        <FlatList
-          data={product}
-          keyExtractor={item => item.name}
-          renderItem={({item}) => (
-            <Swipeable renderRightActions={()=>leftActions(item)}>
-              <View raised style={styles.TextInputbox}>
-                <View style={{width: 100, height: 100}}>
-                  <Image
-                    source={newbiryani}
-                    style={{
-                      width: '100%',
-                      height: '100%',
-                      resizeMode: 'stretch',
-                    }}
-                  />
-                </View>
-                <View
-                  style={{
-                    flexDirection: 'column',
-                    justifyContent: 'space-between',
-                    // paddingHorizontal: 20,
-                    padding: 20,
-                    width: '65%',
-                  }}>
-                  <Text style={styles.title}>{item.name}</Text>
-                  <Text style={styles.boxfont}>{'Rs. ' + item.price}</Text>
-                </View>
-
-                <TouchableOpacity
-                  style={{justifyContent: 'center', alignItems: 'flex-end'}}>
-                  <Icon name="chevron-left" color="black" size={24} />
-                </TouchableOpacity>
-              </View>
-            </Swipeable>
-          )}
-        />
-      </View>
-      {/* </View> */}
-      <View
-        style={{
-          flexDirection: 'row',
-          alignItems: 'center',
-          // paddingb: 5,
-          paddingRight: 10,
-          // paddingBottom: 20,
-          justifyContent: 'flex-end',
-          // padding: 15,
-          // paddingLeft: 12,
-        }}>
-        <TouchableOpacity style={styles.plusbutton} onPress={handleAddPress}>
-          <Icon name="add" color="white" size={24} />
-        </TouchableOpacity>
-      </View>
-    </View>
-  );
-}
-
-const styles = StyleSheet.create({
-  // confirmbutton: {
-  //   flexDirection: 'row',
-  //   // width: "30%",
-  //   padding: 50,
-  //   alignItems: 'center',
-  //   justifyContent: 'center',
-  // },
-  Screen: {
-    // flexDirection: "column",
-    height: '100%',
-    // padding: '10%',
-    paddingTop: '5%',
-    // marginVertical: 10,
-    backgroundColor: '#e8e8e8',
-
-    // flex: '20%',
-  },
-  TopBar: {
-    padding: 20,
-    flexDirection: 'row',
-    flex: 2,
-
-    width: '100%',
-    height: '100%',
-    backgroundColor: '#d00f16',
-    alignItems: 'center',
-    justifyContent: 'space-between',
-  },
-  TopBarText: {
-    // padding: 40,
-    flexDirection: 'row',
-    fontSize: 30,
-    fontFamily: 'Roboto-Bold',
-    color: 'white',
-    textAlign: 'left',
-    alignItems: 'flex-start',
-    flex: 6,
-  },
-  TopBarSearch: {
-    // flexDirection: "row",
-    alignItems: 'flex-end',
-    color: 'white',
-    fontSize: 20,
-    flex: 1,
-  },
-  TopBarBack: {
-    color: 'white',
-    flex: 1,
-    fontSize: 20,
-  },
-  RestScreen: {
-    // flex: 9,
-    // width: 100,
-    // flex: 8,
-    // width: 100,
-    backgroundColor: '#e8e8e8',
-    height: '100%',
-    // justifyContent: 'center',
-    // alignItems: 'center',
-  },
-  firstbox: {
-    width: '100%',
-    flexDirection: 'row',
-    marginVertical: 10,
-    borderColor: 'black',
-    backgroundColor: 'white',
-    borderWidth: 0.5,
-    borderRadius: 10,
-    height: 50,
-    paddingTop: 40,
-    // justifyContent: 'center',
-    alignItems: 'center',
-    shadowColor: 'darkgrey',
-    shadowOpacity: 20,
-    // justifyContent: "center",
-  },
-  TextInputbox: {
-    flexDirection: 'row',
-    // padding: 15,
-    paddingHorizontal: 5,
-    width: '100%',
-    height: 100,
-    // borderRadius: 5,
-    elevation: 2,
-    // borderBottomWidth: 2,
-    // flexDirection: 'row',
-    marginVertical: 5,
-    borderColor: 'black',
-    backgroundColor: 'white',
-    borderWidth: 0,
-    // alignContent: 'center',
-    // justifyContent: 'space-between',
-    // textAlign: 'left',
-    fontFamily: 'Roboto',
-    shadowColor: 'darkgrey',
-    shadowOpacity: 5,
-    // borderRadius: 10,
-    // height: 50,
-  },
-  title: {
-    fontSize: 20,
-    color: 'black',
-    // fontWeight: 'bold',
-  },
-  boxfont: {
-    fontSize: 14,
-    color: 'black',
-    // paddingTop: 4,
-  },
-
-  Confirmbutton: {
-    // padding: 20,
-    // paddingBottom: 20,
-    paddingHorizontal: 15,
-    backgroundColor: '#d00f16',
-    borderRadius: 2,
-    width: 90,
-    height: 36,
-    shadowColor: '#000',
-    shadowOffset: {width: 2, height: 4},
-    shadowOpacity: 0.9,
-    shadowRadius: 6,
-    elevation: 5,
-    // minHeight: '6%',
-    textAlign: 'center',
-    justifyContent: 'center',
-    alignItems: 'center',
-  },
-  bigbuttontext: {
-    fontWeight: 'bold',
-    color: 'white',
-    fontFamily: 'Roboto-Bold',
-    fontSize: 20,
-    textAlign: 'center',
-    paddingTop: '2%',
-
-    // opacity: 1,
-  },
-  bigbutton: {
-    // padding: '50%',
-    paddingHorizontal: '23%',
-    flex: 2,
-    alignItems: 'center',
-    justifyContent: 'flex-end',
-  },
-  plusbutton: {
-    // paddingHorizontal: 15,
-    // paddingTop: 28,
-    backgroundColor: '#d00f16',
-    borderRadius: 180,
-    width: 56,
-    height: 56,
-    shadowColor: '#000',
-    shadowOffset: {width: 2, height: 4},
-    shadowOpacity: 0.9,
-    shadowRadius: 6,
-    elevation: 5,
-    // minHeight: '6%',
-    textAlign: 'center',
-    justifyContent: 'center',
-    alignItems: 'center',
-  },
-});
+import React, {useState} from 'react';
+// import Icon from 'react-native-vector-icons/FontAwesome';
+import Icon from 'react-native-vector-icons/MaterialIcons';
+import {
+  StyleSheet,
+  ScrollView,
+  Text,
+  View,
+  TouchableOpacity,
+  TextInput,
+  Image,
+  Alert
+  // Button,
+  // Picker,
+} from 'react-native';
+import newbiryani from '../assets/images/newbiryani.png';
+import {FlatList} from 'react-native-gesture-handler';
+import {NavigationEvents} from 'react-navigation';
+import Swipeable from 'react-native-gesture-handler/Swipeable';
+// import DropDownItem from "react-native-drop-down-item";
+// import {
+//   TouchableHighlight,
+//   BorderlessButton,
+// } from "react-native-gesture-handler"
+import firebase from '../assets/DatabaseConfig';
+import auth from '@react-native-firebase/auth';
+import database from '@react-native-firebase/database';
+
+export default function AdminMenu({navigation}) {
+  // console.log(navigation.getParam('Sub'))
+
+  const handleAddPress = () => {
+    navigation.navigate('AddItem');
+  };
+
+  // console.log("Admin: ", navigation.getParam('Sub'), navigation.getParam('Cat'))
+
+  const [product, setProduct] = useState([]);
+  // {name: 'pencil', price: 10, quantity: 2},
+  // {name: 'ruler', price: '50'},
+  // {name: 'sharpener', price: '5'},
+  // {name: 'eraser', price: '4'},
+  // {name: 'pen', price: '54'},
+  // {name: 'marker', price: '22'},
+  // {name: 'tape', price: '44'},
+  // {name: 'ribbon', price: '22'},
+  // {name: 'pillow', price: '21'},
+  // {name: 'toy', price: '10'},
+  // {name: 'car', price: '11'},
+  // {name: 'box', price: '12'},
+  // ]);
+
+  function onscreenload() {
+    mydb = firebase
+      .database()
+      .ref(
+        '/Inventory/' +
+          navigation.getParam('Cat') +
+          '/' +
+          navigation.getParam('Sub'),
+      );
+    mydb.once('value').then(function(snapshot) {
+      // product = []
+      let prodarr = [];
+      snapshot.forEach(function(childsnapshot) {
+        let newprod = {
+          name: childsnapshot.key,
+          price: childsnapshot.child('Price').val(),
+          quantity: childsnapshot.child('Qty').val(),
+        };
+        // console.log(newprod)
+        prodarr.push(newprod);
+      });
+      setProduct(prodarr);
+    });
+  }
+
+
+
+  const leftActions = (item) => {
+    return (
+      <View style={{flexDirection: 'row', marginVertical: 5, width: '35%'}}>
+        <TouchableOpacity
+          style={{
+            flex: 1,
+            backgroundColor: '#34ade9',
+            // height: 100,
+            alignItems: 'center',
+            justifyContent: 'center',
+
+            // marginVertical: 5,
+          }}
+          onPress={() => {
+            navigation.navigate('UpdateItem', {
+              CAT: navigation.getParam('Cat'),
+              SUB: navigation.getParam('Sub'),
+              ITEM: item,
+            });
+          }}>
+          <Icon name="edit" color="white" size={24} />
+        </TouchableOpacity>
+        <TouchableOpacity
+          style={{
+            flex: 1,
+            backgroundColor: 'red',
+            opacity: 1,
+            // height: 100,
+            alignItems: 'center',
+            justifyContent: 'center',
+            // marginVertical: 5,
+          }}
+          onPress={()=>{
+
+              Alert.alert(
+                'Remove '+item.name+"?",
+                'The item will be deleted permanently',
+                [
+                  {
+                    text: 'Cancel',
+                    // style:"destructive"
+                    type: 'destructive',
+                  },
+          
+                  {
+                    text: 'Confirm',
+                    onPress: () => removeItem(item),
+                  },
+                ],
+          
+                {cancelable: false},
+              );
+          }}
+          >
+          <Icon name="delete" color="white" size={24} />
+        </TouchableOpacity>
+      </View>
+    );
+  };
+
+  const removeItem=(item)=>{
+    setProduct(()=>{
+      return product.filter((I)=>I.name!=item.name)
+
+    })
+
+    mydb = firebase
+      .database()
+      .ref(
+        '/Inventory/' +
+          navigation.getParam('Cat') +
+          '/' +
+          navigation.getParam('Sub') +
+          '/'+item.name,
+      ).remove()
+    
+  }
+
+  return (
+    <View style={styles.Screen}>
+      <NavigationEvents
+        onWillFocus={() => {
+          onscreenload();
+        }}
+      />
+      <View style={{height: '90%'}}>
+        <FlatList
+          data={product}
+          keyExtractor={item => item.name}
+          renderItem={({item}) => (
+            <Swipeable renderRightActions={()=>leftActions(item)}>
+              <View raised style={styles.TextInputbox}>
+                <View style={{width: 100, height: 100}}>
+                  <Image
+                    source={newbiryani}
+                    style={{
+                      width: '100%',
+                      height: '100%',
+                      resizeMode: 'stretch',
+                    }}
+                  />
+                </View>
+                <View
+                  style={{
+                    flexDirection: 'column',
+                    justifyContent: 'space-between',
+                    // paddingHorizontal: 20,
+                    padding: 20,
+                    width: '65%',
+                  }}>
+                  <Text style={styles.title}>{item.name}</Text>
+                  <Text style={styles.boxfont}>{'Rs. ' + item.price}</Text>
+                </View>
+
+                <TouchableOpacity
+                  style={{justifyContent: 'center', alignItems: 'flex-end'}}>
+                  <Icon name="chevron-left" color="black" size={24} />
+                </TouchableOpacity>
+              </View>
+            </Swipeable>
+          )}
+        />
+      </View>
+      {/* </View> */}
+      <View
+        style={{
+          flexDirection: 'row',
+          alignItems: 'center',
+          // paddingb: 5,
+          paddingRight: 10,
+          // paddingBottom: 20,
+          justifyContent: 'flex-end',
+          // padding: 15,
+          // paddingLeft: 12,
+        }}>
+        <TouchableOpacity style={styles.plusbutton} onPress={handleAddPress}>
+          <Icon name="add" color="white" size={24} />
+        </TouchableOpacity>
+      </View>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  // confirmbutton: {
+  //   flexDirection: 'row',
+  //   // width: "30%",
+  //   padding: 50,
+  //   alignItems: 'center',
+  //   justifyContent: 'center',
+  // },
+  Screen: {
+    // flexDirection: "column",
+    height: '100%',
+    // padding: '10%',
+    paddingTop: '5%',
+    // marginVertical: 10,
+    backgroundColor: '#e8e8e8',
+
+    // flex: '20%',
+  },
+  TopBar: {
+    padding: 20,
+    flexDirection: 'row',
+    flex: 2,
+
+    width: '100%',
+    height: '100%',
+    backgroundColor: '#d00f16',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+  },
+  TopBarText: {
+    // padding: 40,
+    flexDirection: 'row',
+    fontSize: 30,
+    fontFamily: 'Roboto-Bold',
+    color: 'white',
+    textAlign: 'left',
+    alignItems: 'flex-start',
+    flex: 6,
+  },
+  TopBarSearch: {
+    // flexDirection: "row",
+    alignItems: 'flex-end',
+    color: 'white',
+    fontSize: 20,
+    flex: 1,
+  },
+  TopBarBack: {
+    color: 'white',
+    flex: 1,
+    fontSize: 20,
+  },
+  RestScreen: {
+    // flex: 9,
+    // width: 100,
+    // flex: 8,
+    // width: 100,
+    backgroundColor: '#e8e8e8',
+    height: '100%',
+    // justifyContent: 'center',
+    // alignItems: 'center',
+  },
+  firstbox: {
+    width: '100%',
+    flexDirection: 'row',
+    marginVertical: 10,
+    borderColor: 'black',
+    backgroundColor: 'white',
+    borderWidth: 0.5,
+    borderRadius: 10,
+    height: 50,
+    paddingTop: 40,
+    // justifyContent: 'center',
+    alignItems: 'center',
+    shadowColor: 'darkgrey',
+    shadowOpacity: 20,
+    // justifyContent: "center",
+  },
+  TextInputbox: {
+    flexDirection: 'row',
+    // padding: 15,
+    paddingHorizontal: 5,
+    width: '100%',
+    height: 100,
+    // borderRadius: 5,
+    elevation: 2,
+    // borderBottomWidth: 2,
+    // flexDirection: 'row',
+    marginVertical: 5,
+    borderColor: 'black',
+    backgroundColor: 'white',
+    borderWidth: 0,
+    // alignContent: 'center',
+    // justifyContent: 'space-between',
+    // textAlign: 'left',
+    fontFamily: 'Roboto',
+    shadowColor: 'darkgrey',
+    shadowOpacity: 5,
+    // borderRadius: 10,
+    // height: 50,
+  },
+  title: {
+    fontSize: 20,
+    color: 'black',
+    // fontWeight: 'bold',
+  },
+  boxfont: {
+    fontSize: 14,
+    color: 'black',
+    // paddingTop: 4,
+  },
+
+  Confirmbutton: {
+    // padding: 20,
+    // paddingBottom: 20,
+    paddingHorizontal: 15,
+    backgroundColor: '#d00f16',
+    borderRadius: 2,
+    width: 90,
+    height: 36,
+    shadowColor: '#000',
+    shadowOffset: {width: 2, height: 4},
+    shadowOpacity: 0.9,
+    shadowRadius: 6,
+    elevation: 5,
+    // minHeight: '6%',
+    textAlign: 'center',
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  bigbuttontext: {
+    fontWeight: 'bold',
+    color: 'white',
+    fontFamily: 'Roboto-Bold',
+    fontSize: 20,
+    textAlign: 'center',
+    paddingTop: '2%',
+
+    // opacity: 1,
+  },
+  bigbutton: {
+    // padding: '50%',
+    paddingHorizontal: '23%',
+    flex: 2,
+    alignItems: 'center',
+    justifyContent: 'flex-end',
+  },
+  plusbutton: {
+    // paddingHorizontal: 15,
+    // paddingTop: 28,
+    backgroundColor: '#d00f16',
+    borderRadius: 180,
+    width: 56,
+    height: 56,
+    shadowColor: '#000',
+    shadowOffset: {width: 2, height: 4},
+    shadowOpacity: 0.9,
+    shadowRadius: 6,
+    elevation: 5,
+    // minHeight: '6%',
+    textAlign: 'center',
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+});
diff --git a/screens/Checkout.js b/screens/Checkout.js
index 48b0127..0a42011 100644
--- a/screens/Checkout.js
+++ b/screens/Checkout.js
@@ -1,551 +1,551 @@
-import React,{useState, useEffect} from 'react';
-import {Text, View, StyleSheet, Button, TouchableOpacity,Dimensions, Alert} from 'react-native';
-import AsyncStorage from '@react-native-community/async-storage';
-import SwitchExample from './switch1.js';
-import Category from './PickerList.js';
-import Icon from 'react-native-vector-icons/FontAwesome';
-import {Picker} from '@react-native-community/picker';
-import { NavigationEvents } from 'react-navigation';
-import firebase from "../assets/DatabaseConfig"
-
-
-export default function Checkout({navigation}) {
-
-  const [RedPts,setRedPts]=useState(0)
-  const [Total,setTotal]=useState(0)
-  const [Subtotal,setSubtotal]=useState(0)
-  const [Location,setLocation]=useState("null")
-  const [RedPtsStore,setRedPtsStore]=useState(0)
-  const [Switch,setSwitch]=useState(false)
-  const [Delivery,setDelivery]=useState(20)
-  const [Products, setProducts]=useState([])
-  const [OutStock,setOutStock]=useState(" ")
-  const [AddRedPts,setAddRedPts]=useState()
-
-  const handlePress=async ()=>{
-
-    if (Location=="null"){
-      alert("Please choose a location")
-      return
-    }
-
-
-    else if (OutStock!=" "){
-      let al=  OutStock+" is out of stock"
-      Alert.alert("Apologies",al)
-      return
-    }
-
-    Press2()
-    const keys=await AsyncStorage.getAllKeys()
-    await AsyncStorage.multiRemove(keys).then(navigation.navigate('Home'))
-    
-  }
-
-  const Press=()=>{
-
-    Products.forEach((item)=>{
-      firebase
-      .database()
-      .ref(
-        '/Inventory/' +
-          item.CAT +
-          '/' +
-          item.SUB +
-          '/' +
-          item.name
-      )
-      .update({
-        Qty:item.available-item.quantity
-
-      })
-      .catch(()=>{Alert.alert("Checkout Failed","Please check your Internet connection")})
-  
-  
-  })
-
-}
-
-const Press2=()=>{
-
-   
-    let Email=firebase.auth().currentUser.email.substr(0, 8)
-
-    firebase
-        .database()
-        .ref('/Orders/' + Email)
-        .once('value')
-        .then(snapshot => {
-          // console.log('HERERE');
-          
-          // console.log(snapshot.exists());
-          
-            
-          if (snapshot.exists()){
-            ExistsAlert()
-          }
-          else{
-            Press()
-            PlaceOrder(Email);
-
-          }
-
-          
-        }).catch((e)=>{Alert.alert("Checkout Failed","Please check your Internet connection")})
-    
-  }
-  
-  
-  
-  
-  
-  function ExistsAlert(){
-    Alert.alert("Checkout failed", "You already have an order in progress")
-  }
-
-
-  
-  function ProdQty(){
-
-    for (let i=0; i<Products.length; i++){
-
-      ProdQtyGet(i)
-      if (OutStock!=" ")
-      {
-        break
-      }
-
-  }
-}
-
-
-  function ProdQtyGet(i){
-
-    
-    if (Products[i].quantity>Products[i].available){
-      setOutStock(Products[i].name)
-    }
-
-  }
-  
-  const PlaceOrder=(Email)=>{
-
-    Products.forEach((item)=>{
-      
-      delete item.CAT
-      delete item.SUB
-      delete item.available
-    })
-
-
-    let Hour=new Date().getHours()
-    let Min=new Date().getMinutes()
-    let time=Hour+":"+Min
-    // console.log(time)
-    firebase.database().ref('/Orders/'+Email).set({
-      Subtotal: Subtotal,
-      RedPts:RedPts,
-      Total:Total,
-      Delivery:Delivery,
-      Location:Location,
-      Time:time,
-      OrderStatus: "Confirmed",
-      Products: Products
-
-    }).then(()=>{
-
-      if (Switch){
-
-        firebase.database().ref('/Users/'+Email).update({
-          Redemptionpoints:0
-        })
-
-      }
-      else{
-
-        
-
-        firebase.database().ref('/Users/'+Email).once("value").then((snapshot)=>{
-          
-          setAddRedPts((Total*0.4)+snapshot.child("Redemptionpoints").val())
-          
-        })
- 
-      }
-
-      
-    }).then(Alert.alert("Checkout Successful!","Your order has been placed."))
-    .catch((e)=>{Alert.alert(e)})
-
-  }
-
-  function toggleSwitch1(value) {
- 
-    setSwitch(value)
-    
-    console.log('Switch 1 is: ' + value);
-    if (value==true)
-    {
-      
-      setRedPts(RedPtsStore)
-      setTotal(Total=>Total-RedPtsStore)
-    }
-    else
-    {
-      setRedPts(0)
-      setTotal(Total=>Total+RedPtsStore)
-
-    }
-  };
-
-
-  async function LoadData() {
-
-    
-
-    let emailcheck = firebase.auth().currentUser.email;
-    let RedPoints=0
-    mydb = await firebase.database().ref('/Users/' + emailcheck.substr(0, 8))
-    .once('value').then(function(snapshot) {
-      
-      RedPoints= snapshot.child('Redemptionpoints').val()
-      setRedPtsStore(RedPoints)
-
-    })
-
-  }
-
-  useEffect(()=>{
-    ProdQty()
-  },[Products])
-
-  useEffect(()=>{
-
-    let Email=firebase.auth().currentUser.email.substr(0, 8)
-
-       
-    firebase.database().ref('/Users/'+Email).update({
-          Redemptionpoints: parseInt(AddRedPts)
-          
-    })
-    
-  },[AddRedPts])
-
-
-    return (
-      
-      
-      <View style={styles.container}>
-        {/*Heading Container*/}
-        
-        <NavigationEvents
-        onWillFocus={() => 
-          {
-            setSubtotal(navigation.getParam('Subtotal'))
-            setTotal(navigation.getParam('Subtotal')+Delivery)
-            setProducts(navigation.getParam('Products'))
-            
-            LoadData()
-
-          }
-        }
-        
-        />
-
-        {/*Main Body*/}
-        <View style={styles.body}>
-          <View style={styles.textbox}>
-            {/* <Category /> */}
-            <Picker
-              selectedValue={Location}
-              style={[styles.containerpicker]}
-              mode={"dropdown"}
-              onValueChange={(itemValue) => setLocation(itemValue)}>
-              <Picker.Item label="Choose a Location" value="null" />
-              <Picker.Item label="M1" value="M1" />
-              <Picker.Item label="M2" value="M2" />
-              <Picker.Item label="M3" value="M3" />
-              <Picker.Item label="M4" value="M4" />
-              <Picker.Item label="M5" value="M5" />
-              <Picker.Item label="M6" value="M6" />
-              <Picker.Item label="M7" value="M7" />
-              <Picker.Item label="Female Barrier" value="Female Barrier" />
-              <Picker.Item label="SDSB" value="SDSB" />
-              <Picker.Item label="SSE" value="SSE" />
-              <Picker.Item label="Law Buildling" value="Law Building" />
-              <Picker.Item label="Library" value="Library" />
-            </Picker>
-          </View>
-
-          <View style={styles.textbox2}>
-            <View style={styles.write_on_the_edges}>
-              <Text style={{fontSize: 16, marginLeft: 16, alignSelf:'center',}}>Redeem Points</Text>
-              <SwitchExample
-                toggleSwitch1={toggleSwitch1}
-                switch1Value={Switch}
-                REDPTS={RedPtsStore}
-              />
-            </View>
-          </View>
-
-          <Text
-            style={{
-              fontFamily: 'Roboto',
-              fontSize: 16,
-              marginLeft: 16,
-              paddingLeft: 8,
-              marginTop: 30,
-            }}>
-            Total Amount
-          </Text>
-          <View style={[styles.lower_body,{marginTop:4}]}>
-            <View style={styles.write_on_the_edges}>
-              <Text
-                style={{
-                  fontSize: 16,
-                  marginLeft: 16,
-                  marginTop: 10,
-                  marginBottom: 5,
-                }}>
-                Subtotal
-              </Text>
-              <Text
-                style={{
-                  fontSize: 16,
-                  marginRight: 16,
-                  marginTop: 10,
-                  marginBottom: 5,
-                }}>
-                Rs. {Subtotal}
-              </Text>
-            </View>
-            <View style={styles.write_on_the_edges}>
-              <Text style={{fontSize: 16, marginLeft: 16, marginBottom: 5, color:!Switch? 'rgba(00,00,00,0.2)': 'black' }}>
-                Points Discount
-              </Text>
-              <Text style={{fontSize: 16, marginRight: 16, marginBottom: 5, color:!Switch? 'rgba(00,00,00,0.2)': 'black'}}>
-                Rs. {RedPts}
-              </Text>
-            </View>
-            <View style={styles.write_on_the_edges}>
-              <Text style={{fontSize: 16, marginLeft: 16, marginBottom: 5}}>
-                Delivery Charges
-              </Text>
-              <Text style={{fontSize: 16, marginRight: 16, marginBottom: 5}}>
-                Rs. {Delivery}
-              </Text>
-            </View>
-            
-            <View style={styles.lineStyle}/>
-
-            <View style={styles.write_on_the_edges}>
-              <Text
-                style={{
-                  
-                  marginLeft: 16,
-                  marginTop: 10,
-                  marginBottom: 5,
-                  fontFamily:"Roboto-Medium",
-                  fontSize:20
-                }}>
-                Total
-              </Text>
-              <Text
-                style={{
-                  
-                  marginRight: 16,
-                  marginTop: 10,
-                  marginBottom: 5,
-                  fontFamily:"Roboto-Medium",
-                  fontSize:20
-                }}>
-                Rs. {Total}
-              </Text>
-            </View>
-          </View>
-
-          <Text
-            style={{
-              fontFamily: 'Roboto',
-              fontSize: 15,
-              marginLeft: '5%',
-              marginTop: 30,
-              paddingLeft: 8,
-            }}>
-            Payment Method
-          </Text>
-
-          <View style={[styles.textbox1,{marginTop:4}]}>
-            <View
-              style={{
-                flexDirection: 'row',
-                alignItems: 'center',
-                marginLeft: 16,
-              }}>
-              <Icon name="money" color="#d00f16" size={24} style={{alignSelf:'center'}} />
-              <Text style={{fontSize: 16, marginLeft: 16, fontFamily:"Roboto-Regular"}}>
-                Cash on Delivery
-              </Text>
-            </View>
-          </View>
-
-          <View style={styles.bigbutton}>
-            <TouchableOpacity
-              onPress={handlePress}
-              style={styles.Confirmbutton}>
-              <Text style={styles.bigbuttontext}>Confirm Order</Text>
-            </TouchableOpacity>
-          </View>
-        </View>
-      </View>
-    );
-  }
-
-
-const styles = StyleSheet.create({
-  containerpicker: {
-    flex: 1,
-    
-    alignItems: 'center',
-    justifyContent: 'center',
-    flexDirection: 'row',
-    marginVertical: 10,
-    width: '98%',
-    height: 50,
-    elevation: 2,
-    marginLeft:8,
-    
-  },
-
-  container: {
-    
-    width: '100%',
-    backgroundColor: '#e8e8e8',
-    alignItems: 'center',
-    padding: '10%',
-    
-  },
-  heading: {
-    height: '2%',
-    width: '90%',
-    backgroundColor: '#d00f16',
-    marginTop: 20,
-  },
-  body: {
-    width: '100%',
-    height: '100%',
-    backgroundColor: '#e8e8e8',
-    
-    
-  },
-  textbox: {
-    marginTop: 20,
-    
-    marginLeft: '5%',
-    
-    width: '90%',
-    height: 56,
-    elevation: 5,
-    borderRadius: 5,
-    shadowColor: 'darkgrey',
-    shadowOpacity: 20,
-    justifyContent: 'center',
-    borderBottomWidth: 0,
-    backgroundColor: 'white',
-    fontFamily: 'Roboto-Bold',
-  },
-  textbox2: {
-    marginTop: 20,
-    
-    marginLeft: '5%',
-    
-    width: '90%',
-    height: 56,
-    
-    borderRadius: 5,
-    
-    
-    justifyContent: 'center',
-    borderBottomWidth: 0,
-    backgroundColor: 'white',
-    fontFamily: 'Roboto-Bold',
-  },
-  lower_body: {
-    marginTop: 0,
-    
-    marginLeft: '5%',
-    width: '90%',
-    height: 150,
-    justifyContent: 'flex-start',
-    borderBottomWidth: 0,
-    backgroundColor: 'white',
-    fontFamily: 'Roboto-Bold',
-    borderRadius: 5,
-  },
-  textbox1: {
-    marginTop: 0,
-    borderRadius: 5,
-    height: 56,
-    marginLeft: '5%',
-    width: '90%',
-    height: '8%',
-    justifyContent: 'center',
-    borderBottomWidth: 0,
-    backgroundColor: 'white',
-    fontFamily: 'Roboto-Bold',
-  },
-  Confirmbutton: {
-    
-    
-    padding: '5%',
-    
-    paddingHorizontal: 15,
-    backgroundColor: '#d00f16',
-    borderRadius: 20,
-    width: 200,
-    height: 40,
-    shadowColor: '#000',
-    shadowOffset: {width: 2, height: 4},
-    shadowOpacity: 0.9,
-    shadowRadius: 6,
-    
-    
-    textAlign: 'center',
-    justifyContent: 'center',
-    alignItems: 'center',
-    elevation: 2,
-  },
-  bigbuttontext: {
-    fontWeight: 'bold',
-    color: 'white',
-    fontFamily: 'Roboto-Bold',
-    fontSize: 20,
-    textAlign: 'center',
-    
-    
-
-    
-  },
-  bigbutton: {
-    paddingHorizontal: '23%',
-    
-    alignItems: 'center',
-    marginTop:"10%"
-    
-  },
-  write_on_the_edges: {
-    flexDirection: 'row',
-    justifyContent: 'space-between',
-  },
-  
-  lineStyle:{
-    borderWidth: 1,
-    borderColor:'rgba(00,00,00,0.05)',
-    marginTop:8,
-    
-    alignSelf:'center',
-    width:Dimensions.get('window').width/2
-  },
-});
-
-
+import React,{useState, useEffect} from 'react';
+import {Text, View, StyleSheet, Button, TouchableOpacity,Dimensions, Alert} from 'react-native';
+import AsyncStorage from '@react-native-community/async-storage';
+import SwitchExample from './switch1.js';
+import Category from './PickerList.js';
+import Icon from 'react-native-vector-icons/FontAwesome';
+import {Picker} from '@react-native-community/picker';
+import { NavigationEvents } from 'react-navigation';
+import firebase from "../assets/DatabaseConfig"
+
+
+export default function Checkout({navigation}) {
+
+  const [RedPts,setRedPts]=useState(0)
+  const [Total,setTotal]=useState(0)
+  const [Subtotal,setSubtotal]=useState(0)
+  const [Location,setLocation]=useState("null")
+  const [RedPtsStore,setRedPtsStore]=useState(0)
+  const [Switch,setSwitch]=useState(false)
+  const [Delivery,setDelivery]=useState(20)
+  const [Products, setProducts]=useState([])
+  const [OutStock,setOutStock]=useState(" ")
+  const [AddRedPts,setAddRedPts]=useState()
+
+  const handlePress=async ()=>{
+
+    if (Location=="null"){
+      alert("Please choose a location")
+      return
+    }
+
+
+    else if (OutStock!=" "){
+      let al=  OutStock+" is out of stock"
+      Alert.alert("Apologies",al)
+      return
+    }
+
+    Press2()
+    const keys=await AsyncStorage.getAllKeys()
+    await AsyncStorage.multiRemove(keys).then(navigation.navigate('Home'))
+    
+  }
+
+  const Press=()=>{
+
+    Products.forEach((item)=>{
+      firebase
+      .database()
+      .ref(
+        '/Inventory/' +
+          item.CAT +
+          '/' +
+          item.SUB +
+          '/' +
+          item.name
+      )
+      .update({
+        Qty:item.available-item.quantity
+
+      })
+      .catch(()=>{Alert.alert("Checkout Failed","Please check your Internet connection")})
+  
+  
+  })
+
+}
+
+const Press2=()=>{
+
+   
+    let Email=firebase.auth().currentUser.email.substr(0, 8)
+
+    firebase
+        .database()
+        .ref('/Orders/' + Email)
+        .once('value')
+        .then(snapshot => {
+          console.log('HERERE');
+          
+          console.log(snapshot.exists());
+          
+            
+          if (snapshot.exists()){
+            ExistsAlert()
+          }
+          else{
+            Press()
+            PlaceOrder(Email);
+
+          }
+
+          
+        }).catch((e)=>{Alert.alert("Checkout Failed","Please check your Internet connection")})
+    
+  }
+  
+  
+  
+  
+  
+  function ExistsAlert(){
+    Alert.alert("Checkout failed", "You already have an order in progress")
+  }
+
+
+  
+  function ProdQty(){
+
+    for (let i=0; i<Products.length; i++){
+
+      ProdQtyGet(i)
+      if (OutStock!=" ")
+      {
+        break
+      }
+
+  }
+}
+
+
+  function ProdQtyGet(i){
+
+    
+    if (Products[i].quantity>Products[i].available){
+      setOutStock(Products[i].name)
+    }
+
+  }
+  
+  const PlaceOrder=(Email)=>{
+
+    Products.forEach((item)=>{
+      
+      delete item.CAT
+      delete item.SUB
+      delete item.available
+    })
+
+
+    let Hour=new Date().getHours()
+    let Min=new Date().getMinutes()
+    let time=Hour+":"+Min
+    console.log(time)
+    firebase.database().ref('/Orders/'+Email).set({
+      Subtotal: Subtotal,
+      RedPts:RedPts,
+      Total:Total,
+      Delivery:Delivery,
+      Location:Location,
+      Time:time,
+      OrderStatus: "Confirmed",
+      Products: Products
+
+    }).then(()=>{
+
+      if (Switch){
+
+        firebase.database().ref('/Users/'+Email).update({
+          Redemptionpoints:0
+        })
+
+      }
+      else{
+
+        
+
+        firebase.database().ref('/Users/'+Email).once("value").then((snapshot)=>{
+          
+          setAddRedPts((Total*0.4)+snapshot.child("Redemptionpoints").val())
+          
+        })
+ 
+      }
+
+      
+    }).then(Alert.alert("Checkout Successful!","Your order has been placed."))
+    .catch((e)=>{Alert.alert("Checkout Failed","Please check your Internet connection")})
+
+  }
+
+  function toggleSwitch1(value) {
+ 
+    setSwitch(value)
+    
+    console.log('Switch 1 is: ' + value);
+    if (value==true)
+    {
+      
+      setRedPts(RedPtsStore)
+      setTotal(Total=>Total-RedPtsStore)
+    }
+    else
+    {
+      setRedPts(0)
+      setTotal(Total=>Total+RedPtsStore)
+
+    }
+  };
+
+
+  async function LoadData() {
+
+    
+
+    let emailcheck = firebase.auth().currentUser.email;
+    let RedPoints=0
+    mydb = await firebase.database().ref('/Users/' + emailcheck.substr(0, 8))
+    .once('value').then(function(snapshot) {
+      
+      RedPoints= snapshot.child('Redemptionpoints').val()
+      setRedPtsStore(RedPoints)
+
+    })
+
+  }
+
+  useEffect(()=>{
+    ProdQty()
+  },[Products])
+
+  useEffect(()=>{
+
+    let Email=firebase.auth().currentUser.email.substr(0, 8)
+
+       
+    firebase.database().ref('/Users/'+Email).update({
+          Redemptionpoints:AddRedPts
+          
+    })
+    
+  },[AddRedPts])
+
+
+    return (
+      
+      
+      <View style={styles.container}>
+        {/*Heading Container*/}
+        
+        <NavigationEvents
+        onWillFocus={() => 
+          {
+            setSubtotal(navigation.getParam('Subtotal'))
+            setTotal(navigation.getParam('Subtotal')+Delivery)
+            setProducts(navigation.getParam('Products'))
+            
+            LoadData()
+
+          }
+        }
+        
+        />
+
+        {/*Main Body*/}
+        <View style={styles.body}>
+          <View style={styles.textbox}>
+            {/* <Category /> */}
+            <Picker
+              selectedValue={Location}
+              style={[styles.containerpicker]}
+              mode={"dropdown"}
+              onValueChange={(itemValue) => setLocation(itemValue)}>
+              <Picker.Item label="Choose a Location" value="null" />
+              <Picker.Item label="M1" value="M1" />
+              <Picker.Item label="M2" value="M2" />
+              <Picker.Item label="M3" value="M3" />
+              <Picker.Item label="M4" value="M4" />
+              <Picker.Item label="M5" value="M5" />
+              <Picker.Item label="M6" value="M6" />
+              <Picker.Item label="M7" value="M7" />
+              <Picker.Item label="Female Barrier" value="Female Barrier" />
+              <Picker.Item label="SDSB" value="SDSB" />
+              <Picker.Item label="SSE" value="SSE" />
+              <Picker.Item label="Law Buildling" value="Law Building" />
+              <Picker.Item label="Library" value="Library" />
+            </Picker>
+          </View>
+
+          <View style={styles.textbox2}>
+            <View style={styles.write_on_the_edges}>
+              <Text style={{fontSize: 16, marginLeft: 16, alignSelf:'center',}}>Redeem Points</Text>
+              <SwitchExample
+                toggleSwitch1={toggleSwitch1}
+                switch1Value={Switch}
+                REDPTS={RedPtsStore}
+              />
+            </View>
+          </View>
+
+          <Text
+            style={{
+              fontFamily: 'Roboto',
+              fontSize: 16,
+              marginLeft: 16,
+              paddingLeft: 8,
+              marginTop: 30,
+            }}>
+            Total Amount
+          </Text>
+          <View style={[styles.lower_body,{marginTop:4}]}>
+            <View style={styles.write_on_the_edges}>
+              <Text
+                style={{
+                  fontSize: 16,
+                  marginLeft: 16,
+                  marginTop: 10,
+                  marginBottom: 5,
+                }}>
+                Subtotal
+              </Text>
+              <Text
+                style={{
+                  fontSize: 16,
+                  marginRight: 16,
+                  marginTop: 10,
+                  marginBottom: 5,
+                }}>
+                Rs. {Subtotal}
+              </Text>
+            </View>
+            <View style={styles.write_on_the_edges}>
+              <Text style={{fontSize: 16, marginLeft: 16, marginBottom: 5, color:!Switch? 'rgba(00,00,00,0.2)': 'black' }}>
+                Points Discount
+              </Text>
+              <Text style={{fontSize: 16, marginRight: 16, marginBottom: 5, color:!Switch? 'rgba(00,00,00,0.2)': 'black'}}>
+                Rs. {RedPts}
+              </Text>
+            </View>
+            <View style={styles.write_on_the_edges}>
+              <Text style={{fontSize: 16, marginLeft: 16, marginBottom: 5}}>
+                Delivery Charges
+              </Text>
+              <Text style={{fontSize: 16, marginRight: 16, marginBottom: 5}}>
+                Rs. {Delivery}
+              </Text>
+            </View>
+            
+            <View style={styles.lineStyle}/>
+
+            <View style={styles.write_on_the_edges}>
+              <Text
+                style={{
+                  
+                  marginLeft: 16,
+                  marginTop: 10,
+                  marginBottom: 5,
+                  fontFamily:"Roboto-Medium",
+                  fontSize:20
+                }}>
+                Total
+              </Text>
+              <Text
+                style={{
+                  
+                  marginRight: 16,
+                  marginTop: 10,
+                  marginBottom: 5,
+                  fontFamily:"Roboto-Medium",
+                  fontSize:20
+                }}>
+                Rs. {Total}
+              </Text>
+            </View>
+          </View>
+
+          <Text
+            style={{
+              fontFamily: 'Roboto',
+              fontSize: 15,
+              marginLeft: '5%',
+              marginTop: 30,
+              paddingLeft: 8,
+            }}>
+            Payment Method
+          </Text>
+
+          <View style={[styles.textbox1,{marginTop:4}]}>
+            <View
+              style={{
+                flexDirection: 'row',
+                alignItems: 'center',
+                marginLeft: 16,
+              }}>
+              <Icon name="money" color="#d00f16" size={24} style={{alignSelf:'center'}} />
+              <Text style={{fontSize: 16, marginLeft: 16, fontFamily:"Roboto-Regular"}}>
+                Cash on Delivery
+              </Text>
+            </View>
+          </View>
+
+          <View style={styles.bigbutton}>
+            <TouchableOpacity
+              onPress={handlePress}
+              style={styles.Confirmbutton}>
+              <Text style={styles.bigbuttontext}>Confirm Order</Text>
+            </TouchableOpacity>
+          </View>
+        </View>
+      </View>
+    );
+  }
+
+
+const styles = StyleSheet.create({
+  containerpicker: {
+    flex: 1,
+    
+    alignItems: 'center',
+    justifyContent: 'center',
+    flexDirection: 'row',
+    marginVertical: 10,
+    width: '98%',
+    height: 50,
+    elevation: 2,
+    marginLeft:8,
+    
+  },
+
+  container: {
+    
+    width: '100%',
+    backgroundColor: '#e8e8e8',
+    alignItems: 'center',
+    padding: '10%',
+    
+  },
+  heading: {
+    height: '2%',
+    width: '90%',
+    backgroundColor: '#d00f16',
+    marginTop: 20,
+  },
+  body: {
+    width: '100%',
+    height: '100%',
+    backgroundColor: '#e8e8e8',
+    
+    
+  },
+  textbox: {
+    marginTop: 20,
+    
+    marginLeft: '5%',
+    
+    width: '90%',
+    height: 56,
+    elevation: 5,
+    borderRadius: 5,
+    shadowColor: 'darkgrey',
+    shadowOpacity: 20,
+    justifyContent: 'center',
+    borderBottomWidth: 0,
+    backgroundColor: 'white',
+    fontFamily: 'Roboto-Bold',
+  },
+  textbox2: {
+    marginTop: 20,
+    
+    marginLeft: '5%',
+    
+    width: '90%',
+    height: 56,
+    
+    borderRadius: 5,
+    
+    
+    justifyContent: 'center',
+    borderBottomWidth: 0,
+    backgroundColor: 'white',
+    fontFamily: 'Roboto-Bold',
+  },
+  lower_body: {
+    marginTop: 0,
+    
+    marginLeft: '5%',
+    width: '90%',
+    height: 150,
+    justifyContent: 'flex-start',
+    borderBottomWidth: 0,
+    backgroundColor: 'white',
+    fontFamily: 'Roboto-Bold',
+    borderRadius: 5,
+  },
+  textbox1: {
+    marginTop: 0,
+    borderRadius: 5,
+    height: 56,
+    marginLeft: '5%',
+    width: '90%',
+    height: '8%',
+    justifyContent: 'center',
+    borderBottomWidth: 0,
+    backgroundColor: 'white',
+    fontFamily: 'Roboto-Bold',
+  },
+  Confirmbutton: {
+    
+    
+    padding: '5%',
+    
+    paddingHorizontal: 15,
+    backgroundColor: '#d00f16',
+    borderRadius: 20,
+    width: 200,
+    height: 40,
+    shadowColor: '#000',
+    shadowOffset: {width: 2, height: 4},
+    shadowOpacity: 0.9,
+    shadowRadius: 6,
+    
+    
+    textAlign: 'center',
+    justifyContent: 'center',
+    alignItems: 'center',
+    elevation: 2,
+  },
+  bigbuttontext: {
+    fontWeight: 'bold',
+    color: 'white',
+    fontFamily: 'Roboto-Bold',
+    fontSize: 20,
+    textAlign: 'center',
+    
+    
+
+    
+  },
+  bigbutton: {
+    paddingHorizontal: '23%',
+    
+    alignItems: 'center',
+    marginTop:"30%"
+    
+  },
+  write_on_the_edges: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+  },
+  
+  lineStyle:{
+    borderWidth: 1,
+    borderColor:'rgba(00,00,00,0.05)',
+    marginTop:8,
+    
+    alignSelf:'center',
+    width:Dimensions.get('window').width/2
+  },
+});
+
+
diff --git a/screens/CustMenu.js b/screens/CustMenu.js
index 469b067..f283310 100644
--- a/screens/CustMenu.js
+++ b/screens/CustMenu.js
@@ -1,363 +1,363 @@
-import React, {useState} from 'react';
-import Icon from 'react-native-vector-icons/MaterialIcons';
-import AsyncStorage from '@react-native-community/async-storage';
-import {StyleSheet, Text, View, TouchableOpacity, Image} from 'react-native';
-import {FlatList} from 'react-native-gesture-handler';
-import {NavigationEvents} from 'react-navigation';
-import newbiryani from '../assets/images/newbiryani.png';
-// import function1 from './Shopping_cart';
-import firebase from '../assets/DatabaseConfig';
-import auth from '@react-native-firebase/auth';
-import database from '@react-native-firebase/database';
-import {add} from 'react-native-reanimated';
-import Swipeable from 'react-native-gesture-handler/Swipeable';
-
-export default function CustMenu({navigation}) {
-  // console.log(" Customer: ", navigation.getParam('Sub'), navigation.getParam('Cat'))
-
-  const [product, setProduct] = useState([
-    // {name: 'meow', price: 0, quantity: 0},
-  ]);
-
-  async function storeData(name, price, avail) {
-    try {
-      console.log(" CustomerMENU: ", navigation.getParam('Sub'), navigation.getParam('Cat'))
-
-      await AsyncStorage.setItem(
-        name,
-        JSON.stringify({price: parseInt(price), quantity: 1, available:avail, category:navigation.getParam('Cat'), subcat: navigation.getParam('Sub')}),
-      );
-      // await AsyncStorage.removeItem("@storage_Key")
-    } catch (e) {
-      // saving error
-    }
-  }
-
-  // async function getData() {
-  //   try {
-  //     // const value = await AsyncStorage.getItem("order")
-  //     const value = await AsyncStorage.getAllKeys()
-  //     if(value !== null) {
-  //       console.log(value)
-  //       // value previously stored
-  //     }
-  //     else {
-  //       console.log("lmao")
-  //     }
-  //   } catch(e) {
-  //     console.log(e)
-  //     // error reading value
-  //   }
-  // }
-
-  function handleaddcart(name, price, avail) {
-    // ShoppingCart.apply(frommenu(3))
-    // Shopping({navigation}).frommenu(5)
-    // function1()
-
-    storeData(name, price, avail);
-    // getData()
-  }
-
-  // setProduct([])
-
-  function onscreenload() {
-    mydb = firebase
-      .database()
-      .ref(
-        '/Inventory/' +
-          navigation.getParam('Cat') +
-          '/' +
-          navigation.getParam('Sub'),
-      );
-    mydb.once('value').then(function(snapshot) {
-      // product = []
-      let prodarr = [];
-      snapshot.forEach(function(childsnapshot) {
-        let newprod = {
-          name: childsnapshot.key,
-          price: childsnapshot.child('Price').val(),
-          avail: childsnapshot.child('Qty').val(),
-        };
-        // console.log(newprod)
-        prodarr.push(newprod);
-      });
-      setProduct(prodarr);
-    });
-  }
-
-  // mydb = firebase.database().ref('/Inventory/'+navigation.getParam('Cat')+'/'+navigation.getParam('Sub'))
-  // mydb.once("value")
-  //   .then(function(snapshot) {
-  //     // product = []
-  //     snapshot.forEach(function(childsnapshot) {
-  //       let newprod = {name: childsnapshot.key, price: childsnapshot.child("Price").val(), quantity: childsnapshot.child("Qty").val()}
-  //       // console.log(newprod)
-  //       product.push(newprod)
-  //     })
-  //   })
-
-  //   const onAdd = () => setProd;
-  // const onMin = () => setProduct(prev => prev - 1)
-  // function onMin(props) {
-  //   return props.quantity - 1;
-  // }
-  //   const onAdd = () => setProduct(prev => prev + 1);
-  const swipeSettings = {
-    autoclose: true,
-    onClose: (secId, rowId, direction) => {},
-    onOpen: (secId, rowId, direction) => {},
-    right: [
-      {
-        onPress: () => {},
-        text: 'Add',
-        type: 'Add',
-        backgroundColor: 'red',
-        height: '90%',
-        width: '100%',
-        // padding: 10/,
-        // marginVertical: 10,
-      },
-
-      // rowId: 1,
-      // secId: 1
-    ],
-  };
-  return (
-    // <ScrollView>
-    <View style={styles.Screen}>
-      <NavigationEvents
-        onWillFocus={
-          onscreenload
-        }
-      />
-      {/* <View style={{width: '100%', height: 460, marginVertical: 12}}> */}
-      <FlatList
-        data={product}
-        //   extraData={quantity}
-        keyExtractor={item => item.name}
-        renderItem={({item}) => (
-          <View raised style={styles.TextInputbox}>
-            <View style={{width: 100, height: 100}}>
-              <Image
-                source={newbiryani}
-                style={{
-                  width: '100%',
-                  height: '100%',
-                  resizeMode: 'stretch',
-                }}
-              />
-            </View>
-            <View
-              style={{
-                flexDirection: 'column',
-                justifyContent: 'space-between',
-                // paddingHorizontal: 20,
-                padding: 20,
-                width: '65%',
-              }}>
-              <Text style={styles.title}>{item.name}</Text>
-              <Text style={styles.boxfont}>{'Rs. ' + item.price}</Text>
-            </View>
-            <View style={{justifyContent: 'center', alignItems: 'flex-end'}}>
-              <TouchableOpacity
-                onPress={() => {
-                  handleaddcart(item.name, item.price, item.avail);
-                  alert('Added to Cart');
-                }}>
-                <Icon name="add-shopping-cart" color="red" size={24} />
-              </TouchableOpacity>
-            </View>
-          </View>
-        )}
-      />
-    </View>
-    // </ScrollView>
-  );
-}
-{
-  /* <View
-        style={{
-          flexDirection: 'row',
-          justifyContent: 'flex-end',
-          paddingTop: 15,
-          paddingLeft: 12,
-        }}>
-        <TouchableOpacity style={styles.plusbutton} onPress={handleAddPress} >
-          <Icon name="plus" color="white"/>
-        </TouchableOpacity>
-      </View> */
-}
-// </View>
-//   );
-// }
-
-const styles = StyleSheet.create({
-  // confirmbutton: {
-  //   flexDirection: 'row',
-  //   // width: "30%",
-  //   padding: 50,
-  //   alignItems: 'center',
-  //   justifyContent: 'center',
-  // },
-  Screen: {
-    // flexDirection: "column",
-    height: '100%',
-    // padding: '10%',
-    paddingTop: '5%',
-    // marginVertical: 10,
-    backgroundColor: '#e8e8e8',
-
-    // flex: '20%',
-  },
-  TopBar: {
-    padding: 20,
-    flexDirection: 'row',
-    flex: 2,
-
-    width: '100%',
-    height: '100%',
-    backgroundColor: '#d00f16',
-    alignItems: 'center',
-    justifyContent: 'space-between',
-  },
-  TopBarText: {
-    // padding: 40,
-    flexDirection: 'row',
-    fontSize: 30,
-    fontFamily: 'Roboto-Bold',
-    color: 'white',
-    textAlign: 'left',
-    alignItems: 'flex-start',
-    flex: 6,
-  },
-  TopBarSearch: {
-    // flexDirection: "row",
-    alignItems: 'flex-end',
-    color: 'white',
-    fontSize: 20,
-    flex: 1,
-  },
-  TopBarBack: {
-    color: 'white',
-    flex: 1,
-    fontSize: 20,
-  },
-  RestScreen: {
-    // flex: 9,
-    // width: 100,
-    // flex: 8,
-    // width: 100,
-    // paddingTop: 50,
-    backgroundColor: '#e8e8e8',
-    height: '100%',
-    // justifyContent: 'center',
-    // padding: 40,
-    // alignItems: 'center',
-    // justifyContent: 'center',
-    // alignItems: 'center',
-  },
-  firstbox: {
-    width: 128,
-    flexDirection: 'row',
-    // marginVertical: 10,
-    borderColor: 'black',
-    backgroundColor: 'white',
-    borderWidth: 0.5,
-    borderRadius: 10,
-    height: '100%',
-    paddingTop: 40,
-    // justifyContent: 'center',
-    alignItems: 'center',
-    shadowColor: 'darkgrey',
-    shadowOpacity: 20,
-    // justifyContent: "center",
-  },
-  TextInputbox: {
-    flexDirection: 'row',
-    // padding: 15,
-    paddingHorizontal: 5,
-    width: '100%',
-    height: 100,
-    // borderRadius: 5,
-    elevation: 2,
-    // borderBottomWidth: 2,
-    // flexDirection: 'row',
-    marginVertical: 5,
-    borderColor: 'black',
-    backgroundColor: 'white',
-    borderWidth: 0,
-    // alignContent: 'center',
-    // justifyContent: 'space-between',
-    // textAlign: 'left',
-    fontFamily: 'Roboto',
-    shadowColor: 'darkgrey',
-    shadowOpacity: 5,
-    // borderRadius: 10,
-    // height: 50,
-  },
-  title: {
-    fontSize: 20,
-    color: 'black',
-    // fontWeight: 'bold',
-  },
-  boxfont: {
-    fontSize: 14,
-    color: 'black',
-    // paddingTop: 4,
-  },
-
-  Confirmbutton: {
-    // padding: 20,
-    // paddingBottom: 20,
-    // paddingHorizontal: 15,
-    backgroundColor: '#d00f16',
-    borderRadius: 2,
-    width: 18,
-    height: 18,
-    shadowColor: '#000',
-    // shadowOffset: {width: 2, height: 4},
-    shadowOpacity: 20,
-    // shadowRadius: 6,
-    elevation: 5,
-    // minHeight: '6%',
-    // textAlign: 'center',
-    justifyContent: 'center',
-    alignItems: 'center',
-    marginHorizontal: 16,
-  },
-  bigbuttontext: {
-    fontWeight: 'bold',
-    color: 'white',
-    fontFamily: 'Roboto-Bold',
-    fontSize: 20,
-    textAlign: 'center',
-    paddingTop: '2%',
-
-    // opacity: 1,
-  },
-  bigbutton: {
-    // padding: '50%',
-    paddingHorizontal: '23%',
-    flex: 2,
-    alignItems: 'center',
-    justifyContent: 'flex-end',
-  },
-  plusbutton: {
-    // paddingHorizontal: 15,
-    // paddingTop: 28,
-    backgroundColor: '#d00f16',
-    borderRadius: 180,
-    width: 56,
-    height: 56,
-    shadowColor: '#000',
-    shadowOffset: {width: 2, height: 4},
-    shadowOpacity: 0.9,
-    shadowRadius: 6,
-    elevation: 5,
-    // minHeight: '6%',
-    textAlign: 'center',
-    justifyContent: 'center',
-    alignItems: 'center',
-  },
-});
+import React, {useState} from 'react';
+import Icon from 'react-native-vector-icons/MaterialIcons';
+import AsyncStorage from '@react-native-community/async-storage';
+import {StyleSheet, Text, View, TouchableOpacity, Image} from 'react-native';
+import {FlatList} from 'react-native-gesture-handler';
+import {NavigationEvents} from 'react-navigation';
+import newbiryani from '../assets/images/newbiryani.png';
+// import function1 from './Shopping_cart';
+import firebase from '../assets/DatabaseConfig';
+import auth from '@react-native-firebase/auth';
+import database from '@react-native-firebase/database';
+import {add} from 'react-native-reanimated';
+import Swipeable from 'react-native-gesture-handler/Swipeable';
+
+export default function CustMenu({navigation}) {
+  // console.log(" Customer: ", navigation.getParam('Sub'), navigation.getParam('Cat'))
+
+  const [product, setProduct] = useState([
+    // {name: 'meow', price: 0, quantity: 0},
+  ]);
+
+  async function storeData(name, price, avail) {
+    try {
+      console.log(" CustomerMENU: ", navigation.getParam('Sub'), navigation.getParam('Cat'))
+
+      await AsyncStorage.setItem(
+        name,
+        JSON.stringify({price: parseInt(price), quantity: 1, available:avail, category:navigation.getParam('Cat'), subcat: navigation.getParam('Sub')}),
+      );
+      // await AsyncStorage.removeItem("@storage_Key")
+    } catch (e) {
+      // saving error
+    }
+  }
+
+  // async function getData() {
+  //   try {
+  //     // const value = await AsyncStorage.getItem("order")
+  //     const value = await AsyncStorage.getAllKeys()
+  //     if(value !== null) {
+  //       console.log(value)
+  //       // value previously stored
+  //     }
+  //     else {
+  //       console.log("lmao")
+  //     }
+  //   } catch(e) {
+  //     console.log(e)
+  //     // error reading value
+  //   }
+  // }
+
+  function handleaddcart(name, price, avail) {
+    // ShoppingCart.apply(frommenu(3))
+    // Shopping({navigation}).frommenu(5)
+    // function1()
+
+    storeData(name, price, avail);
+    // getData()
+  }
+
+  // setProduct([])
+
+  function onscreenload() {
+    mydb = firebase
+      .database()
+      .ref(
+        '/Inventory/' +
+          navigation.getParam('Cat') +
+          '/' +
+          navigation.getParam('Sub'),
+      );
+    mydb.once('value').then(function(snapshot) {
+      // product = []
+      let prodarr = [];
+      snapshot.forEach(function(childsnapshot) {
+        let newprod = {
+          name: childsnapshot.key,
+          price: childsnapshot.child('Price').val(),
+          avail: childsnapshot.child('Qty').val(),
+        };
+        // console.log(newprod)
+        prodarr.push(newprod);
+      });
+      setProduct(prodarr);
+    });
+  }
+
+  // mydb = firebase.database().ref('/Inventory/'+navigation.getParam('Cat')+'/'+navigation.getParam('Sub'))
+  // mydb.once("value")
+  //   .then(function(snapshot) {
+  //     // product = []
+  //     snapshot.forEach(function(childsnapshot) {
+  //       let newprod = {name: childsnapshot.key, price: childsnapshot.child("Price").val(), quantity: childsnapshot.child("Qty").val()}
+  //       // console.log(newprod)
+  //       product.push(newprod)
+  //     })
+  //   })
+
+  //   const onAdd = () => setProd;
+  // const onMin = () => setProduct(prev => prev - 1)
+  // function onMin(props) {
+  //   return props.quantity - 1;
+  // }
+  //   const onAdd = () => setProduct(prev => prev + 1);
+  const swipeSettings = {
+    autoclose: true,
+    onClose: (secId, rowId, direction) => {},
+    onOpen: (secId, rowId, direction) => {},
+    right: [
+      {
+        onPress: () => {},
+        text: 'Add',
+        type: 'Add',
+        backgroundColor: 'red',
+        height: '90%',
+        width: '100%',
+        // padding: 10/,
+        // marginVertical: 10,
+      },
+
+      // rowId: 1,
+      // secId: 1
+    ],
+  };
+  return (
+    // <ScrollView>
+    <View style={styles.Screen}>
+      <NavigationEvents
+        onWillFocus={
+          onscreenload
+        }
+      />
+      {/* <View style={{width: '100%', height: 460, marginVertical: 12}}> */}
+      <FlatList
+        data={product}
+        //   extraData={quantity}
+        keyExtractor={item => item.name}
+        renderItem={({item}) => (
+          <View raised style={styles.TextInputbox}>
+            <View style={{width: 100, height: 100}}>
+              <Image
+                source={newbiryani}
+                style={{
+                  width: '100%',
+                  height: '100%',
+                  resizeMode: 'stretch',
+                }}
+              />
+            </View>
+            <View
+              style={{
+                flexDirection: 'column',
+                justifyContent: 'space-between',
+                // paddingHorizontal: 20,
+                padding: 20,
+                width: '65%',
+              }}>
+              <Text style={styles.title}>{item.name}</Text>
+              <Text style={styles.boxfont}>{'Rs. ' + item.price}</Text>
+            </View>
+            <View style={{justifyContent: 'center', alignItems: 'flex-end'}}>
+              <TouchableOpacity
+                onPress={() => {
+                  handleaddcart(item.name, item.price, item.avail);
+                  alert('Added to Cart');
+                }}>
+                <Icon name="add-shopping-cart" color="red" size={24} />
+              </TouchableOpacity>
+            </View>
+          </View>
+        )}
+      />
+    </View>
+    // </ScrollView>
+  );
+}
+{
+  /* <View
+        style={{
+          flexDirection: 'row',
+          justifyContent: 'flex-end',
+          paddingTop: 15,
+          paddingLeft: 12,
+        }}>
+        <TouchableOpacity style={styles.plusbutton} onPress={handleAddPress} >
+          <Icon name="plus" color="white"/>
+        </TouchableOpacity>
+      </View> */
+}
+// </View>
+//   );
+// }
+
+const styles = StyleSheet.create({
+  // confirmbutton: {
+  //   flexDirection: 'row',
+  //   // width: "30%",
+  //   padding: 50,
+  //   alignItems: 'center',
+  //   justifyContent: 'center',
+  // },
+  Screen: {
+    // flexDirection: "column",
+    height: '100%',
+    // padding: '10%',
+    paddingTop: '5%',
+    // marginVertical: 10,
+    backgroundColor: '#e8e8e8',
+
+    // flex: '20%',
+  },
+  TopBar: {
+    padding: 20,
+    flexDirection: 'row',
+    flex: 2,
+
+    width: '100%',
+    height: '100%',
+    backgroundColor: '#d00f16',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+  },
+  TopBarText: {
+    // padding: 40,
+    flexDirection: 'row',
+    fontSize: 30,
+    fontFamily: 'Roboto-Bold',
+    color: 'white',
+    textAlign: 'left',
+    alignItems: 'flex-start',
+    flex: 6,
+  },
+  TopBarSearch: {
+    // flexDirection: "row",
+    alignItems: 'flex-end',
+    color: 'white',
+    fontSize: 20,
+    flex: 1,
+  },
+  TopBarBack: {
+    color: 'white',
+    flex: 1,
+    fontSize: 20,
+  },
+  RestScreen: {
+    // flex: 9,
+    // width: 100,
+    // flex: 8,
+    // width: 100,
+    // paddingTop: 50,
+    backgroundColor: '#e8e8e8',
+    height: '100%',
+    // justifyContent: 'center',
+    // padding: 40,
+    // alignItems: 'center',
+    // justifyContent: 'center',
+    // alignItems: 'center',
+  },
+  firstbox: {
+    width: 128,
+    flexDirection: 'row',
+    // marginVertical: 10,
+    borderColor: 'black',
+    backgroundColor: 'white',
+    borderWidth: 0.5,
+    borderRadius: 10,
+    height: '100%',
+    paddingTop: 40,
+    // justifyContent: 'center',
+    alignItems: 'center',
+    shadowColor: 'darkgrey',
+    shadowOpacity: 20,
+    // justifyContent: "center",
+  },
+  TextInputbox: {
+    flexDirection: 'row',
+    // padding: 15,
+    paddingHorizontal: 5,
+    width: '100%',
+    height: 100,
+    // borderRadius: 5,
+    elevation: 2,
+    // borderBottomWidth: 2,
+    // flexDirection: 'row',
+    marginVertical: 5,
+    borderColor: 'black',
+    backgroundColor: 'white',
+    borderWidth: 0,
+    // alignContent: 'center',
+    // justifyContent: 'space-between',
+    // textAlign: 'left',
+    fontFamily: 'Roboto',
+    shadowColor: 'darkgrey',
+    shadowOpacity: 5,
+    // borderRadius: 10,
+    // height: 50,
+  },
+  title: {
+    fontSize: 20,
+    color: 'black',
+    // fontWeight: 'bold',
+  },
+  boxfont: {
+    fontSize: 14,
+    color: 'black',
+    // paddingTop: 4,
+  },
+
+  Confirmbutton: {
+    // padding: 20,
+    // paddingBottom: 20,
+    // paddingHorizontal: 15,
+    backgroundColor: '#d00f16',
+    borderRadius: 2,
+    width: 18,
+    height: 18,
+    shadowColor: '#000',
+    // shadowOffset: {width: 2, height: 4},
+    shadowOpacity: 20,
+    // shadowRadius: 6,
+    elevation: 5,
+    // minHeight: '6%',
+    // textAlign: 'center',
+    justifyContent: 'center',
+    alignItems: 'center',
+    marginHorizontal: 16,
+  },
+  bigbuttontext: {
+    fontWeight: 'bold',
+    color: 'white',
+    fontFamily: 'Roboto-Bold',
+    fontSize: 20,
+    textAlign: 'center',
+    paddingTop: '2%',
+
+    // opacity: 1,
+  },
+  bigbutton: {
+    // padding: '50%',
+    paddingHorizontal: '23%',
+    flex: 2,
+    alignItems: 'center',
+    justifyContent: 'flex-end',
+  },
+  plusbutton: {
+    // paddingHorizontal: 15,
+    // paddingTop: 28,
+    backgroundColor: '#d00f16',
+    borderRadius: 180,
+    width: 56,
+    height: 56,
+    shadowColor: '#000',
+    shadowOffset: {width: 2, height: 4},
+    shadowOpacity: 0.9,
+    shadowRadius: 6,
+    elevation: 5,
+    // minHeight: '6%',
+    textAlign: 'center',
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+});
diff --git a/screens/Customers.js b/screens/Customers.js
index 9d8c9b7..62f6576 100644
--- a/screens/Customers.js
+++ b/screens/Customers.js
@@ -1,310 +1,310 @@
-import React, {useState} from 'react';
-import Icon from 'react-native-vector-icons/FontAwesome';
-import {StyleSheet, Text, View, TouchableOpacity, Alert} from 'react-native';
-import {FlatList} from 'react-native-gesture-handler';
-import {NavigationEvents} from 'react-navigation';
-import firebase from '../assets/DatabaseConfig';
-import auth from '@react-native-firebase/auth';
-import database from '@react-native-firebase/database';
-
-export default function Customers({navigation}) {
-  const [cust, setcust] = useState([]); //[
-  // {name: 'example', email: 'example@lums.edu.pk', banstat: true},
-  // {name: 'jawadg02', email: 'abcde@ab.com2', banstat: 0},
-  // ]);
-
-  function banalert(item, index) {
-    if (!item.banstat) {
-      Alert.alert(
-        'Ban User',
-        'Are you sure you want to ban this user?',
-        [
-          {
-            text: 'Yes',
-            onPress: () => {
-              // console.log("YES")
-              // console.log(item.name)
-              // console.log(index)
-              let tempcust = cust;
-              tempcust[index] = {
-                name: item.name,
-                email: item.email,
-                banstat: true,
-              };
-              mydb = firebase
-                .database()
-                .ref('/Users/' + item.email.substr(0, 8));
-              mydb.update({
-                BanStatus: true,
-              });
-              // .then(
-              //   console.log("\nCust:", cust),
-              // setcust(tempcust),
-              //   console.log("\nCust:", cust)
-              // )
-              // window.location.reload(false)
-
-              // console.log(tempcust)
-              // setcust(tempcust)
-              onscreenload();
-            },
-          },
-          {
-            text: 'No',
-            onPress: () => {
-              console.log('NO');
-            },
-            // style: "cancel"
-          },
-        ],
-        {cancelable: false},
-      );
-    } else {
-      Alert.alert(
-        'Unban User',
-        'Are you sure you want to unban this user?',
-        [
-          {
-            text: 'Yes',
-            onPress: () => {
-              // console.log("YES")
-              // console.log(item.name)
-              // console.log(index)
-              let tempcust = cust;
-              tempcust[index] = {
-                name: item.name,
-                email: item.email,
-                banstat: false,
-              };
-              mydb = firebase
-                .database()
-                .ref('/Users/' + item.email.substr(0, 8));
-              mydb.update({
-                BanStatus: false,
-              });
-              // .then(
-              //   console.log("\nCust:", cust),
-              // setcust(tempcust),
-              //   console.log("\nCust:", cust)
-              // )
-
-              // console.log(tempcust)
-              // setcust(tempcust)
-              onscreenload();
-            },
-          },
-          {
-            text: 'No',
-            onPress: () => {
-              console.log('NO');
-            },
-            // style: "cancel"
-          },
-        ],
-        {cancelable: false},
-      );
-    }
-  }
-
-  function onscreenload() {
-    // setcust([{name: 'example', email: 'example@lums.edu.pk', banstat: true}, ])
-    // console.log("db access")
-    mydb = firebase.database().ref('/Users');
-    mydb.once('value').then(function(snapshot) {
-      // product = []
-      let custarr = [];
-      snapshot.forEach(function(childsnapshot) {
-        let customer = {
-          name: childsnapshot.child('Username').val(),
-          email: childsnapshot.child('Useremail').val(),
-          banstat: childsnapshot.child('BanStatus').val(),
-        };
-        // console.log(childsnapshot.child("BanStatus"))
-        custarr.push(customer);
-        // console.log(customer)
-      });
-      setcust(custarr);
-    });
-  }
-
-  return (
-    <View style={styles.Screen}>
-      <NavigationEvents
-        onDidFocus={() => {
-          onscreenload();
-        }}
-      />
-      <View style={{width: '100%'}}>
-        <FlatList
-          data={cust}
-          keyExtractor={item => item.name}
-          renderItem={({item, index}) => (
-            <TouchableOpacity raised style={styles.TextInputbox}>
-              <View style={{flexDirection: 'column'}}>
-                <Text style={styles.title}>{item.name}</Text>
-                <Text style={styles.boxfont}>{item.email}</Text>
-              </View>
-
-              <TouchableOpacity
-                onPress={() => banalert(item, index)}
-                style={{justifyContent: 'center'}}>
-                <Icon
-                  name="ban"
-                  size={24}
-                  color={item.banstat ? 'black' : 'red'}
-                />
-              </TouchableOpacity>
-            </TouchableOpacity>
-          )}
-        />
-      </View>
-    </View>
-  );
-}
-
-const styles = StyleSheet.create({
-  // confirmbutton: {
-  //   flexDirection: 'row',
-  //   // width: "30%",
-  //   padding: 50,
-  //   alignItems: 'center',
-  //   justifyContent: 'center',
-  // },
-
-  Screen: {
-    // flexDirection: "column",
-    height: '100%',
-    padding: '10%',
-    backgroundColor: '#e8e8e8',
-
-    // flex: '20%',
-  },
-  TopBar: {
-    padding: 20,
-    flexDirection: 'row',
-    flex: 2,
-
-    width: '100%',
-    height: '100%',
-    backgroundColor: '#d00f16',
-    alignItems: 'center',
-    justifyContent: 'space-between',
-  },
-  TopBarText: {
-    // padding: 40,
-    flexDirection: 'row',
-    fontSize: 30,
-    fontFamily: 'Roboto-Bold',
-    color: 'white',
-    textAlign: 'left',
-    alignItems: 'flex-start',
-    flex: 6,
-  },
-  TopBarSearch: {
-    // flexDirection: "row",
-    alignItems: 'flex-end',
-    color: 'white',
-    fontSize: 20,
-    flex: 1,
-  },
-  TopBarBack: {
-    color: 'white',
-    flex: 1,
-    fontSize: 20,
-  },
-  RestScreen: {
-    // flex: 9,
-    // width: 100,
-    // flex: 8,
-    // width: 100,
-    padding: '15%',
-    backgroundColor: '#e8e8e8',
-    height: '90%',
-    justifyContent: 'center',
-    alignItems: 'center',
-    // justifyContent: 'center',
-    // alignItems: 'center',
-  },
-  firstbox: {
-    width: '100%',
-    flexDirection: 'row',
-    marginVertical: 10,
-    borderColor: 'black',
-    backgroundColor: 'white',
-    borderWidth: 0.5,
-    borderRadius: 10,
-    height: 50,
-    paddingTop: 40,
-    // justifyContent: 'center',
-    alignItems: 'center',
-    shadowColor: 'darkgrey',
-    shadowOpacity: 20,
-    // justifyContent: "center",
-  },
-  TextInputbox: {
-    flexDirection: 'row',
-    padding: 7,
-    paddingHorizontal: 16,
-    width: 328,
-    height: 64,
-    borderRadius: 5,
-    elevation: 5,
-    // flexDirection: 'row',
-    marginVertical: 10,
-    borderColor: 'black',
-    backgroundColor: 'white',
-    borderWidth: 0,
-    alignContent: 'center',
-    justifyContent: 'space-between',
-    textAlign: 'left',
-    fontFamily: 'Roboto-Bold',
-    shadowColor: 'darkgrey',
-    shadowOpacity: 20,
-    // borderRadius: 10,
-    // height: 50,
-  },
-  title: {
-    fontSize: 16,
-    fontWeight: 'bold',
-  },
-  boxfont: {
-    fontSize: 12,
-    paddingTop: 4,
-  },
-
-  Confirmbutton: {
-    // padding: 20,
-    // paddingBottom: 20,
-    paddingHorizontal: 15,
-    backgroundColor: '#d00f16',
-    borderRadius: 20,
-    width: 200,
-    height: 40,
-    shadowColor: '#000',
-    shadowOffset: {width: 2, height: 4},
-    shadowOpacity: 0.9,
-    shadowRadius: 6,
-    elevation: 2,
-    minHeight: '6%',
-    textAlign: 'center',
-    justifyContent: 'center',
-    alignItems: 'center',
-  },
-  bigbuttontext: {
-    fontWeight: 'bold',
-    color: 'white',
-    fontFamily: 'Roboto-Bold',
-    fontSize: 20,
-    textAlign: 'center',
-    paddingTop: '2%',
-
-    // opacity: 1,
-  },
-  bigbutton: {
-    // padding: '50%',
-    paddingHorizontal: '23%',
-    flex: 2,
-    alignItems: 'center',
-    justifyContent: 'flex-end',
-  },
-});
+import React, {useState} from 'react';
+import Icon from 'react-native-vector-icons/FontAwesome';
+import {StyleSheet, Text, View, TouchableOpacity, Alert} from 'react-native';
+import {FlatList} from 'react-native-gesture-handler';
+import {NavigationEvents} from 'react-navigation';
+import firebase from '../assets/DatabaseConfig';
+import auth from '@react-native-firebase/auth';
+import database from '@react-native-firebase/database';
+
+export default function Customers({navigation}) {
+  const [cust, setcust] = useState([]); //[
+  // {name: 'example', email: 'example@lums.edu.pk', banstat: true},
+  // {name: 'jawadg02', email: 'abcde@ab.com2', banstat: 0},
+  // ]);
+
+  function banalert(item, index) {
+    if (!item.banstat) {
+      Alert.alert(
+        'Ban User',
+        'Are you sure you want to ban this user?',
+        [
+          {
+            text: 'Yes',
+            onPress: () => {
+              // console.log("YES")
+              // console.log(item.name)
+              // console.log(index)
+              let tempcust = cust;
+              tempcust[index] = {
+                name: item.name,
+                email: item.email,
+                banstat: true,
+              };
+              mydb = firebase
+                .database()
+                .ref('/Users/' + item.email.substr(0, 8));
+              mydb.update({
+                BanStatus: true,
+              });
+              // .then(
+              //   console.log("\nCust:", cust),
+              // setcust(tempcust),
+              //   console.log("\nCust:", cust)
+              // )
+              // window.location.reload(false)
+
+              // console.log(tempcust)
+              // setcust(tempcust)
+              onscreenload();
+            },
+          },
+          {
+            text: 'No',
+            onPress: () => {
+              console.log('NO');
+            },
+            // style: "cancel"
+          },
+        ],
+        {cancelable: false},
+      );
+    } else {
+      Alert.alert(
+        'Unban User',
+        'Are you sure you want to unban this user?',
+        [
+          {
+            text: 'Yes',
+            onPress: () => {
+              // console.log("YES")
+              // console.log(item.name)
+              // console.log(index)
+              let tempcust = cust;
+              tempcust[index] = {
+                name: item.name,
+                email: item.email,
+                banstat: false,
+              };
+              mydb = firebase
+                .database()
+                .ref('/Users/' + item.email.substr(0, 8));
+              mydb.update({
+                BanStatus: false,
+              });
+              // .then(
+              //   console.log("\nCust:", cust),
+              // setcust(tempcust),
+              //   console.log("\nCust:", cust)
+              // )
+
+              // console.log(tempcust)
+              // setcust(tempcust)
+              onscreenload();
+            },
+          },
+          {
+            text: 'No',
+            onPress: () => {
+              console.log('NO');
+            },
+            // style: "cancel"
+          },
+        ],
+        {cancelable: false},
+      );
+    }
+  }
+
+  function onscreenload() {
+    // setcust([{name: 'example', email: 'example@lums.edu.pk', banstat: true}, ])
+    // console.log("db access")
+    mydb = firebase.database().ref('/Users');
+    mydb.once('value').then(function(snapshot) {
+      // product = []
+      let custarr = [];
+      snapshot.forEach(function(childsnapshot) {
+        let customer = {
+          name: childsnapshot.child('Username').val(),
+          email: childsnapshot.child('Useremail').val(),
+          banstat: childsnapshot.child('BanStatus').val(),
+        };
+        // console.log(childsnapshot.child("BanStatus"))
+        custarr.push(customer);
+        // console.log(customer)
+      });
+      setcust(custarr);
+    });
+  }
+
+  return (
+    <View style={styles.Screen}>
+      <NavigationEvents
+        onDidFocus={() => {
+          onscreenload();
+        }}
+      />
+      <View style={{width: '100%'}}>
+        <FlatList
+          data={cust}
+          keyExtractor={item => item.name}
+          renderItem={({item, index}) => (
+            <TouchableOpacity raised style={styles.TextInputbox}>
+              <View style={{flexDirection: 'column'}}>
+                <Text style={styles.title}>{item.name}</Text>
+                <Text style={styles.boxfont}>{item.email}</Text>
+              </View>
+
+              <TouchableOpacity
+                onPress={() => banalert(item, index)}
+                style={{justifyContent: 'center'}}>
+                <Icon
+                  name="ban"
+                  size={24}
+                  color={item.banstat ? 'black' : 'red'}
+                />
+              </TouchableOpacity>
+            </TouchableOpacity>
+          )}
+        />
+      </View>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  // confirmbutton: {
+  //   flexDirection: 'row',
+  //   // width: "30%",
+  //   padding: 50,
+  //   alignItems: 'center',
+  //   justifyContent: 'center',
+  // },
+
+  Screen: {
+    // flexDirection: "column",
+    height: '100%',
+    padding: '10%',
+    backgroundColor: '#e8e8e8',
+
+    // flex: '20%',
+  },
+  TopBar: {
+    padding: 20,
+    flexDirection: 'row',
+    flex: 2,
+
+    width: '100%',
+    height: '100%',
+    backgroundColor: '#d00f16',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+  },
+  TopBarText: {
+    // padding: 40,
+    flexDirection: 'row',
+    fontSize: 30,
+    fontFamily: 'Roboto-Bold',
+    color: 'white',
+    textAlign: 'left',
+    alignItems: 'flex-start',
+    flex: 6,
+  },
+  TopBarSearch: {
+    // flexDirection: "row",
+    alignItems: 'flex-end',
+    color: 'white',
+    fontSize: 20,
+    flex: 1,
+  },
+  TopBarBack: {
+    color: 'white',
+    flex: 1,
+    fontSize: 20,
+  },
+  RestScreen: {
+    // flex: 9,
+    // width: 100,
+    // flex: 8,
+    // width: 100,
+    padding: '15%',
+    backgroundColor: '#e8e8e8',
+    height: '90%',
+    justifyContent: 'center',
+    alignItems: 'center',
+    // justifyContent: 'center',
+    // alignItems: 'center',
+  },
+  firstbox: {
+    width: '100%',
+    flexDirection: 'row',
+    marginVertical: 10,
+    borderColor: 'black',
+    backgroundColor: 'white',
+    borderWidth: 0.5,
+    borderRadius: 10,
+    height: 50,
+    paddingTop: 40,
+    // justifyContent: 'center',
+    alignItems: 'center',
+    shadowColor: 'darkgrey',
+    shadowOpacity: 20,
+    // justifyContent: "center",
+  },
+  TextInputbox: {
+    flexDirection: 'row',
+    padding: 7,
+    paddingHorizontal: 16,
+    width: 328,
+    height: 64,
+    borderRadius: 5,
+    elevation: 5,
+    // flexDirection: 'row',
+    marginVertical: 10,
+    borderColor: 'black',
+    backgroundColor: 'white',
+    borderWidth: 0,
+    alignContent: 'center',
+    justifyContent: 'space-between',
+    textAlign: 'left',
+    fontFamily: 'Roboto-Bold',
+    shadowColor: 'darkgrey',
+    shadowOpacity: 20,
+    // borderRadius: 10,
+    // height: 50,
+  },
+  title: {
+    fontSize: 16,
+    fontWeight: 'bold',
+  },
+  boxfont: {
+    fontSize: 12,
+    paddingTop: 4,
+  },
+
+  Confirmbutton: {
+    // padding: 20,
+    // paddingBottom: 20,
+    paddingHorizontal: 15,
+    backgroundColor: '#d00f16',
+    borderRadius: 20,
+    width: 200,
+    height: 40,
+    shadowColor: '#000',
+    shadowOffset: {width: 2, height: 4},
+    shadowOpacity: 0.9,
+    shadowRadius: 6,
+    elevation: 2,
+    minHeight: '6%',
+    textAlign: 'center',
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  bigbuttontext: {
+    fontWeight: 'bold',
+    color: 'white',
+    fontFamily: 'Roboto-Bold',
+    fontSize: 20,
+    textAlign: 'center',
+    paddingTop: '2%',
+
+    // opacity: 1,
+  },
+  bigbutton: {
+    // padding: '50%',
+    paddingHorizontal: '23%',
+    flex: 2,
+    alignItems: 'center',
+    justifyContent: 'flex-end',
+  },
+});
diff --git a/screens/Forgotpwemail.js b/screens/Forgotpwemail.js
index 29d7fc7..2aa7161 100644
--- a/screens/Forgotpwemail.js
+++ b/screens/Forgotpwemail.js
@@ -1,258 +1,258 @@
-import React, {useState} from 'react';
-import {
-  StyleSheet,
-  Text,
-  View,
-  ImageBackground,
-  Image,
-  TextInput,
-  Button,
-  TouchableOpacity,
-  TouchableWithoutFeedback,
-  Keyboard,
-} from 'react-native';
-import backg from '../assets/images/backg.png';
-import lsdlogo from '../assets/images/lsdlogo.png';
-import firebase from '../assets/DatabaseConfig';
-// const image = "./assets/lsdlogo.png" ;
-// import { Ionicons } from '@expo/vector-icons';
-import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
-// import firebase from "@react-native-firebase/app" ;
-// import auth from "@react-native-firebase/auth" ;
-
-function END(mail) {
-  return mail.endsWith('@lums.edu.pk');
-}
-
-// export const Login = ({navigation}) => {
-export default function Forgotpwemail({navigation}) {
-  // firebase.auth().currentUser.reload()
-
-  const ConfirmPress = () => {
-    navigation.navigate('Login');
-    // console.log("meow")
-  };
-
-  const [email, setEmail] = useState('');
-  const [errorMessage, setErrorMessage] = useState();
-
-  const emailInputHandler = inputEmail => {
-    setEmail(inputEmail);
-  };
-
-  const errorMessageInputHandler = inputError => {
-    setErrorMessage(inputError);
-  };
-
-  const handleConfirmPress = () => {
-    emaillums = END(email);
-    if (emaillums) {
-      handleResetEmail();
-      console.log('Login');
-    } else {
-      alert('Please enter your LUMS email.');
-    }
-  };
-
-  async function handleResetEmail() {
-    let meow1 = firebase
-      .auth()
-      .sendPasswordResetEmail(email)
-      .then(() => {
-        ConfirmPress();
-        console.log('User sent pw reset email');
-        // console.log(firebase.auth().currentUser)
-      })
-      .catch(function(error) {
-        console.log(error);
-        alert(error);
-        errorMessageInputHandler;
-      });
-    let meow1w = await meow1;
-
-    // LoginPress()
-  }
-
-  return (
-    <TouchableWithoutFeedback
-      onPress={() => {
-        Keyboard.dismiss();
-      }}>
-      <View style={styles.container}>
-        <ImageBackground source={backg} style={styles.bgimage}>
-          <View style={styles.topsentence}>
-            <Text style={styles.toptext}>
-              Forgot your password? That's fine! Confirm your email and we'll
-              send you a link
-            </Text>
-          </View>
-
-          <View style={styles.maincontainer}>
-            <View style={styles.inputbox}>
-              <Icon
-                style={styles.inputicon}
-                name="email-outline"
-                size={24}
-                color="#d00f16"
-              />
-              <TextInput
-                placeholder="Email Address"
-                style={styles.inputtext}
-                onChangeText={emailInputHandler}
-                value={email}
-              />
-            </View>
-          </View>
-          <View style={styles.bigbutton}>
-            <TouchableOpacity
-              style={styles.confirmbutton}
-              onPress={handleConfirmPress}>
-              <Text style={styles.bigbuttontext}>Confirm</Text>
-            </TouchableOpacity>
-          </View>
-        </ImageBackground>
-      </View>
-    </TouchableWithoutFeedback>
-  );
-}
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    flexDirection: 'column',
-  },
-  bgimage: {
-    flex: 1,
-    resizeMode: 'stretch',
-    // width: "110%",
-    // width: '110%',
-    // height: '100%',
-    // paddingTop:'12%',
-    // paddingLeft:'20%',
-    justifyContent: 'center',
-    // alignItems: "center",
-  },
-  inputbox: {
-    // marginTop: '6%',
-    color: 'grey',
-    // paddingTop: '6%',
-    flexDirection: 'row',
-    backgroundColor: 'white',
-    borderRadius: 6,
-    justifyContent: 'flex-start',
-    alignItems: 'center',
-    paddingHorizontal: '2%',
-    width: 280,
-    height: 56,
-    borderColor: 'black',
-    borderBottomWidth: 0.5,
-  },
-  inputicon: {
-    flex: 2,
-    // paddingTop: '3%',
-    // paddingLeft: '2%',
-  },
-  inputtext: {
-    marginLeft: 5,
-    flex: 20,
-    // backgroundColor: "white",
-    fontSize: 14,
-    // borderWidth: 1,
-    // borderRadius: 6,
-    // borderColor: '#777',
-    width: '70%',
-    fontFamily: 'Roboto-Bold',
-    // shadowColor: '#000',
-    // shadowOffset: { width: 2, height: 4 },
-    // shadowOpacity: 0.9,
-    // shadowRadius: 6,
-    // elevation: 2,
-  },
-  maincontainer: {
-    alignItems: 'center',
-    justifyContent: 'flex-end',
-    paddingBottom: '10%',
-    // flex: 6,
-    // paddingLeft: '30%',
-    // paddingTop: '30%',
-  },
-  toptext: {
-    fontWeight: 'bold',
-    color: '#d00f16',
-    fontFamily: 'Roboto-Medium',
-    fontSize: 18,
-
-    // opacity: 1,
-  },
-  bigbuttontext: {
-    fontWeight: 'bold',
-    color: 'white',
-    fontFamily: 'Roboto-Bold',
-    fontSize: 20,
-    textAlign: 'center',
-    paddingTop: '1%',
-    paddingBottom: '1%',
-
-    // opacity: 1,
-  },
-  topsentence: {
-    // opacity: 0.8,
-    paddingTop: '35%',
-    // paddingBottom: 1,
-    justifyContent: 'center',
-    width: '70%',
-    marginLeft: '15%',
-    // marginRight: '8%',
-    flex: 1,
-    alignItems: 'baseline',
-
-    // fontWeight: "bold",
-    // backgroundColor: 'rgba(52, 52, 52, 0.8)',
-    // backgroundColor: 'transparent',
-    // backgroundColor: "None",
-  },
-  bigbutton: {
-    // paddingTop: 10,
-    // paddingHorizontal: '23%',
-    paddingTop: '15%',
-    alignItems: 'center',
-    // minHeight: '0%',
-    // paddingVertical: 5,
-    // paddingVertical: '5%',
-    flex: 2,
-    // shadowColor: '#000',
-    // shadowOffset: { width: 2, height: 4 },
-    // shadowOpacity: 0.9,
-    // shadowRadius: 6,
-    // elevation: 2,
-    // fontSize: 25,
-
-    // fontWeight: "bold",
-    // backgroundColor: 'rgba(52, 52, 52, 0.8)',
-    // backgroundColor: 'transparent',
-    // backgroundColor: "None",
-  },
-  confirmbutton: {
-    // paddingHorizontal: 15,
-    backgroundColor: '#d00f16',
-    borderRadius: 20,
-    width: 200,
-    height: 40,
-    shadowColor: '#000',
-    shadowOffset: {width: 2, height: 4},
-    shadowOpacity: 0.9,
-    shadowRadius: 6,
-    elevation: 2,
-    // minHeight: '6%',
-    textAlign: 'center',
-    justifyContent: 'center',
-    alignItems: 'center',
-    elevation: 2,
-
-    // alignItems: "center",
-    // paddingTop: 10,
-    // fontSize: 25,
-  },
-});
-
-// export default Login;
+import React, {useState} from 'react';
+import {
+  StyleSheet,
+  Text,
+  View,
+  ImageBackground,
+  Image,
+  TextInput,
+  Button,
+  TouchableOpacity,
+  TouchableWithoutFeedback,
+  Keyboard,
+} from 'react-native';
+import backg from '../assets/images/backg.png';
+import lsdlogo from '../assets/images/lsdlogo.png';
+import firebase from '../assets/DatabaseConfig';
+// const image = "./assets/lsdlogo.png" ;
+// import { Ionicons } from '@expo/vector-icons';
+import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
+// import firebase from "@react-native-firebase/app" ;
+// import auth from "@react-native-firebase/auth" ;
+
+function END(mail) {
+  return mail.endsWith('@lums.edu.pk');
+}
+
+// export const Login = ({navigation}) => {
+export default function Forgotpwemail({navigation}) {
+  // firebase.auth().currentUser.reload()
+
+  const ConfirmPress = () => {
+    navigation.navigate('Login');
+    // console.log("meow")
+  };
+
+  const [email, setEmail] = useState('');
+  const [errorMessage, setErrorMessage] = useState();
+
+  const emailInputHandler = inputEmail => {
+    setEmail(inputEmail);
+  };
+
+  const errorMessageInputHandler = inputError => {
+    setErrorMessage(inputError);
+  };
+
+  const handleConfirmPress = () => {
+    emaillums = END(email);
+    if (emaillums) {
+      handleResetEmail();
+      console.log('Login');
+    } else {
+      alert('Please enter your LUMS email.');
+    }
+  };
+
+  async function handleResetEmail() {
+    let meow1 = firebase
+      .auth()
+      .sendPasswordResetEmail(email)
+      .then(() => {
+        ConfirmPress();
+        console.log('User sent pw reset email');
+        // console.log(firebase.auth().currentUser)
+      })
+      .catch(function(error) {
+        console.log(error);
+        alert(error);
+        errorMessageInputHandler;
+      });
+    let meow1w = await meow1;
+
+    // LoginPress()
+  }
+
+  return (
+    <TouchableWithoutFeedback
+      onPress={() => {
+        Keyboard.dismiss();
+      }}>
+      <View style={styles.container}>
+        <ImageBackground source={backg} style={styles.bgimage}>
+          <View style={styles.topsentence}>
+            <Text style={styles.toptext}>
+              Forgot your password? That's fine! Confirm your email and we'll
+              send you a link
+            </Text>
+          </View>
+
+          <View style={styles.maincontainer}>
+            <View style={styles.inputbox}>
+              <Icon
+                style={styles.inputicon}
+                name="email-outline"
+                size={24}
+                color="#d00f16"
+              />
+              <TextInput
+                placeholder="Email Address"
+                style={styles.inputtext}
+                onChangeText={emailInputHandler}
+                value={email}
+              />
+            </View>
+          </View>
+          <View style={styles.bigbutton}>
+            <TouchableOpacity
+              style={styles.confirmbutton}
+              onPress={handleConfirmPress}>
+              <Text style={styles.bigbuttontext}>Confirm</Text>
+            </TouchableOpacity>
+          </View>
+        </ImageBackground>
+      </View>
+    </TouchableWithoutFeedback>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    flexDirection: 'column',
+  },
+  bgimage: {
+    flex: 1,
+    resizeMode: 'stretch',
+    // width: "110%",
+    // width: '110%',
+    // height: '100%',
+    // paddingTop:'12%',
+    // paddingLeft:'20%',
+    justifyContent: 'center',
+    // alignItems: "center",
+  },
+  inputbox: {
+    // marginTop: '6%',
+    color: 'grey',
+    // paddingTop: '6%',
+    flexDirection: 'row',
+    backgroundColor: 'white',
+    borderRadius: 6,
+    justifyContent: 'flex-start',
+    alignItems: 'center',
+    paddingHorizontal: '2%',
+    width: 280,
+    height: 56,
+    borderColor: 'black',
+    borderBottomWidth: 0.5,
+  },
+  inputicon: {
+    flex: 2,
+    // paddingTop: '3%',
+    // paddingLeft: '2%',
+  },
+  inputtext: {
+    marginLeft: 5,
+    flex: 20,
+    // backgroundColor: "white",
+    fontSize: 14,
+    // borderWidth: 1,
+    // borderRadius: 6,
+    // borderColor: '#777',
+    width: '70%',
+    fontFamily: 'Roboto-Bold',
+    // shadowColor: '#000',
+    // shadowOffset: { width: 2, height: 4 },
+    // shadowOpacity: 0.9,
+    // shadowRadius: 6,
+    // elevation: 2,
+  },
+  maincontainer: {
+    alignItems: 'center',
+    justifyContent: 'flex-end',
+    paddingBottom: '10%',
+    // flex: 6,
+    // paddingLeft: '30%',
+    // paddingTop: '30%',
+  },
+  toptext: {
+    fontWeight: 'bold',
+    color: '#d00f16',
+    fontFamily: 'Roboto-Medium',
+    fontSize: 18,
+
+    // opacity: 1,
+  },
+  bigbuttontext: {
+    fontWeight: 'bold',
+    color: 'white',
+    fontFamily: 'Roboto-Bold',
+    fontSize: 20,
+    textAlign: 'center',
+    paddingTop: '1%',
+    paddingBottom: '1%',
+
+    // opacity: 1,
+  },
+  topsentence: {
+    // opacity: 0.8,
+    paddingTop: '35%',
+    // paddingBottom: 1,
+    justifyContent: 'center',
+    width: '70%',
+    marginLeft: '15%',
+    // marginRight: '8%',
+    flex: 1,
+    alignItems: 'baseline',
+
+    // fontWeight: "bold",
+    // backgroundColor: 'rgba(52, 52, 52, 0.8)',
+    // backgroundColor: 'transparent',
+    // backgroundColor: "None",
+  },
+  bigbutton: {
+    // paddingTop: 10,
+    // paddingHorizontal: '23%',
+    paddingTop: '15%',
+    alignItems: 'center',
+    // minHeight: '0%',
+    // paddingVertical: 5,
+    // paddingVertical: '5%',
+    flex: 2,
+    // shadowColor: '#000',
+    // shadowOffset: { width: 2, height: 4 },
+    // shadowOpacity: 0.9,
+    // shadowRadius: 6,
+    // elevation: 2,
+    // fontSize: 25,
+
+    // fontWeight: "bold",
+    // backgroundColor: 'rgba(52, 52, 52, 0.8)',
+    // backgroundColor: 'transparent',
+    // backgroundColor: "None",
+  },
+  confirmbutton: {
+    // paddingHorizontal: 15,
+    backgroundColor: '#d00f16',
+    borderRadius: 20,
+    width: 200,
+    height: 40,
+    shadowColor: '#000',
+    shadowOffset: {width: 2, height: 4},
+    shadowOpacity: 0.9,
+    shadowRadius: 6,
+    elevation: 2,
+    // minHeight: '6%',
+    textAlign: 'center',
+    justifyContent: 'center',
+    alignItems: 'center',
+    elevation: 2,
+
+    // alignItems: "center",
+    // paddingTop: 10,
+    // fontSize: 25,
+  },
+});
+
+// export default Login;
diff --git a/screens/Home.js b/screens/Home.js
index e558787..f770dfa 100644
--- a/screens/Home.js
+++ b/screens/Home.js
@@ -1,91 +1,91 @@
-import React, {useState} from 'react';
-// import { AppLoading } from 'expo';
-// import Navigator from './route/NavigDraw'
-import {
-  StyleSheet,
-  Text,
-  View,
-  Image,
-  ImageBackground,
-  Dimensions,
-  TouchableOpacity,
-  Button,
-  BackHandler,
-} from 'react-native';
-
-export default function Home({navigation}) {
-  const StorePress = () => {
-    navigation.navigate('Store');
-  };
-
-  const KitchenPress = () => {
-    navigation.navigate('Kitchen');
-  };
-
-  // BackHandler.addEventListener('hardwareBackPress', function () {BackHandler.exitApp()});
-  // BackHandler.removeEventListener('hardwareBackPress', true);
-
-  return (
-    <View style={styles.home}>
-      <TouchableOpacity
-        style={styles.button}
-        activeOpacity={0.8}
-        onPress={KitchenPress}>
-        <ImageBackground
-          source={require('../assets/images/Kitchen.jpg')}
-          style={styles.image}>
-          <View style={styles.textcontainer}>
-            <Text style={styles.text}>Kitchen</Text>
-          </View>
-        </ImageBackground>
-      </TouchableOpacity>
-
-      <TouchableOpacity
-        style={styles.button}
-        activeOpacity={0.8}
-        onPress={StorePress}>
-        <ImageBackground
-          source={require('../assets/images/Store.jpg')}
-          style={styles.image}>
-          <View style={styles.textcontainer}>
-            <Text style={styles.text}>Store</Text>
-          </View>
-        </ImageBackground>
-      </TouchableOpacity>
-
-      {/* <Button title= 'Goto /> */}
-    </View>
-  );
-}
-
-const styles = StyleSheet.create({
-  home: {
-    flex: 1,
-    backgroundColor: '#e8e8e8',
-  },
-  text: {
-    fontFamily: 'Roboto-Bold',
-    color: '#d00f16',
-    marginLeft: 16,
-    fontSize: 45,
-  },
-  image: {
-    justifyContent: 'flex-end',
-    resizeMode: 'contain',
-    width: Dimensions.get('window').width,
-    height: Dimensions.get('window').height / 2.5,
-    marginTop: 10,
-  },
-
-  textcontainer: {
-    backgroundColor: 'rgba(0,0,0,0.75)',
-    width: Dimensions.get('window').width,
-    height: 60,
-    justifyContent: 'center',
-    marginBottom: 12,
-  },
-
-  // button:{
-
-  // }
-});
+import React, {useState} from 'react';
+// import { AppLoading } from 'expo';
+// import Navigator from './route/NavigDraw'
+import {
+  StyleSheet,
+  Text,
+  View,
+  Image,
+  ImageBackground,
+  Dimensions,
+  TouchableOpacity,
+  Button,
+  BackHandler,
+} from 'react-native';
+
+export default function Home({navigation}) {
+  const StorePress = () => {
+    navigation.navigate('Store');
+  };
+
+  const KitchenPress = () => {
+    navigation.navigate('Kitchen');
+  };
+
+  // BackHandler.addEventListener('hardwareBackPress', function () {BackHandler.exitApp()});
+  // BackHandler.removeEventListener('hardwareBackPress', true);
+
+  return (
+    <View style={styles.home}>
+      <TouchableOpacity
+        style={styles.button}
+        activeOpacity={0.8}
+        onPress={KitchenPress}>
+        <ImageBackground
+          source={require('../assets/images/Kitchen.jpg')}
+          style={styles.image}>
+          <View style={styles.textcontainer}>
+            <Text style={styles.text}>Kitchen</Text>
+          </View>
+        </ImageBackground>
+      </TouchableOpacity>
+
+      <TouchableOpacity
+        style={styles.button}
+        activeOpacity={0.8}
+        onPress={StorePress}>
+        <ImageBackground
+          source={require('../assets/images/Store.jpg')}
+          style={styles.image}>
+          <View style={styles.textcontainer}>
+            <Text style={styles.text}>Store</Text>
+          </View>
+        </ImageBackground>
+      </TouchableOpacity>
+
+      {/* <Button title= 'Goto /> */}
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  home: {
+    flex: 1,
+    backgroundColor: '#e8e8e8',
+  },
+  text: {
+    fontFamily: 'Roboto-Bold',
+    color: '#d00f16',
+    marginLeft: 16,
+    fontSize: 45,
+  },
+  image: {
+    justifyContent: 'flex-end',
+    resizeMode: 'contain',
+    width: Dimensions.get('window').width,
+    height: Dimensions.get('window').height / 2.5,
+    marginTop: 10,
+  },
+
+  textcontainer: {
+    backgroundColor: 'rgba(0,0,0,0.75)',
+    width: Dimensions.get('window').width,
+    height: 60,
+    justifyContent: 'center',
+    marginBottom: 12,
+  },
+
+  // button:{
+
+  // }
+});
diff --git a/screens/Kitchen.js b/screens/Kitchen.js
index 0368c07..053d525 100644
--- a/screens/Kitchen.js
+++ b/screens/Kitchen.js
@@ -1,144 +1,144 @@
-import React, {useState} from 'react';
-// import { AppLoading } from 'expo';
-// import Navigator from './route/NavigDraw'
-import {
-  StyleSheet,
-  Text,
-  View,
-  Image,
-  ImageBackground,
-  Dimensions,
-  TouchableOpacity,
-  Button,
-  ScrollView,
-} from 'react-native';
-import firebase from '../assets/DatabaseConfig';
-import auth from '@react-native-firebase/auth';
-import database from '@react-native-firebase/database';
-
-export default function Kitchen({navigation}) {
-  const [SubCat, setSubCat] = useState([
-    {Sub: 'Desi', Cat: 'Kitchen'},
-    {Sub: 'Fast Food', Cat: 'Kitchen'},
-    {Sub: 'Fresh Juice', Cat: 'Kitchen'},
-  ]);
-
-  const handleDesifood = () => {
-    // setSubCat("Stationery")
-    email = firebase.auth().currentUser.email;
-    mydb = firebase.database().ref('/Users/' + email.substr(0, 8));
-    mydb.once('value').then(function(snapshot) {
-      custflag = snapshot.child('Customerflag').val();
-      if (custflag) {
-        navigation.navigate('CustMenu', SubCat[0]);
-      } else {
-        navigation.navigate('AdminMenu', SubCat[0]);
-      }
-    });
-  };
-
-  const handleFastfood = () => {
-    // setSubCat("Stationery")
-    email = firebase.auth().currentUser.email;
-    mydb = firebase.database().ref('/Users/' + email.substr(0, 8));
-    mydb.once('value').then(function(snapshot) {
-      custflag = snapshot.child('Customerflag').val();
-      if (custflag) {
-        navigation.navigate('CustMenu', SubCat[1]);
-      } else {
-        navigation.navigate('AdminMenu', SubCat[1]);
-      }
-    });
-  };
-
-  const handleJuices = () => {
-    // setSubCat("Stationery")
-    email = firebase.auth().currentUser.email;
-    mydb = firebase.database().ref('/Users/' + email.substr(0, 8));
-    mydb.once('value').then(function(snapshot) {
-      custflag = snapshot.child('Customerflag').val();
-      if (custflag) {
-        navigation.navigate('CustMenu', SubCat[2]);
-      } else {
-        navigation.navigate('AdminMenu', SubCat[2]);
-      }
-    });
-  };
-
-  return (
-    <ScrollView style={styles.home}>
-      <TouchableOpacity
-        style={styles.button}
-        activeOpacity={0.8}
-        onPress={handleDesifood}>
-        <ImageBackground
-          source={require('../assets/images/Desifood.png')}
-          style={styles.image}>
-          <View style={styles.textcontainer}>
-            <Text style={styles.text}>Desi Food</Text>
-          </View>
-        </ImageBackground>
-      </TouchableOpacity>
-
-      <TouchableOpacity
-        style={styles.button}
-        activeOpacity={0.8}
-        onPress={handleFastfood}>
-        <ImageBackground
-          source={require('../assets/images/Fastfood.png')}
-          style={styles.image}>
-          <View style={styles.textcontainer}>
-            <Text style={styles.text}>Fast Food</Text>
-          </View>
-        </ImageBackground>
-      </TouchableOpacity>
-
-      <TouchableOpacity
-        style={[styles.button, {marginBottom: 10}]}
-        activeOpacity={0.8}
-        onPress={handleJuices}>
-        <ImageBackground
-          source={require('../assets/images/Juices.png')}
-          style={styles.image}>
-          <View style={styles.textcontainer}>
-            <Text style={styles.text}>Fresh Juices</Text>
-          </View>
-        </ImageBackground>
-      </TouchableOpacity>
-
-      {/* <Button title= 'Goto /> */}
-    </ScrollView>
-  );
-}
-
-const styles = StyleSheet.create({
-  home: {
-    flex: 1,
-    backgroundColor: '#e8e8e8',
-  },
-  text: {
-    fontFamily: 'Roboto-Bold',
-    color: '#d00f16',
-    marginLeft: 16,
-    fontSize: 45,
-  },
-  image: {
-    justifyContent: 'flex-end',
-    resizeMode: 'contain',
-    width: Dimensions.get('window').width,
-    height: Dimensions.get('window').height / 2.5,
-    marginTop: 10,
-  },
-
-  textcontainer: {
-    backgroundColor: 'rgba(0,0,0,0.75)',
-    width: Dimensions.get('window').width,
-    height: 60,
-    justifyContent: 'center',
-    marginBottom: 12,
-  },
-
-  // button:{
-
-  // }
-});
+import React, {useState} from 'react';
+// import { AppLoading } from 'expo';
+// import Navigator from './route/NavigDraw'
+import {
+  StyleSheet,
+  Text,
+  View,
+  Image,
+  ImageBackground,
+  Dimensions,
+  TouchableOpacity,
+  Button,
+  ScrollView,
+} from 'react-native';
+import firebase from '../assets/DatabaseConfig';
+import auth from '@react-native-firebase/auth';
+import database from '@react-native-firebase/database';
+
+export default function Kitchen({navigation}) {
+  const [SubCat, setSubCat] = useState([
+    {Sub: 'Desi', Cat: 'Kitchen'},
+    {Sub: 'Fast Food', Cat: 'Kitchen'},
+    {Sub: 'Fresh Juice', Cat: 'Kitchen'},
+  ]);
+
+  const handleDesifood = () => {
+    // setSubCat("Stationery")
+    email = firebase.auth().currentUser.email;
+    mydb = firebase.database().ref('/Users/' + email.substr(0, 8));
+    mydb.once('value').then(function(snapshot) {
+      custflag = snapshot.child('Customerflag').val();
+      if (custflag) {
+        navigation.navigate('CustMenu', SubCat[0]);
+      } else {
+        navigation.navigate('AdminMenu', SubCat[0]);
+      }
+    });
+  };
+
+  const handleFastfood = () => {
+    // setSubCat("Stationery")
+    email = firebase.auth().currentUser.email;
+    mydb = firebase.database().ref('/Users/' + email.substr(0, 8));
+    mydb.once('value').then(function(snapshot) {
+      custflag = snapshot.child('Customerflag').val();
+      if (custflag) {
+        navigation.navigate('CustMenu', SubCat[1]);
+      } else {
+        navigation.navigate('AdminMenu', SubCat[1]);
+      }
+    });
+  };
+
+  const handleJuices = () => {
+    // setSubCat("Stationery")
+    email = firebase.auth().currentUser.email;
+    mydb = firebase.database().ref('/Users/' + email.substr(0, 8));
+    mydb.once('value').then(function(snapshot) {
+      custflag = snapshot.child('Customerflag').val();
+      if (custflag) {
+        navigation.navigate('CustMenu', SubCat[2]);
+      } else {
+        navigation.navigate('AdminMenu', SubCat[2]);
+      }
+    });
+  };
+
+  return (
+    <ScrollView style={styles.home}>
+      <TouchableOpacity
+        style={styles.button}
+        activeOpacity={0.8}
+        onPress={handleDesifood}>
+        <ImageBackground
+          source={require('../assets/images/Desifood.png')}
+          style={styles.image}>
+          <View style={styles.textcontainer}>
+            <Text style={styles.text}>Desi Food</Text>
+          </View>
+        </ImageBackground>
+      </TouchableOpacity>
+
+      <TouchableOpacity
+        style={styles.button}
+        activeOpacity={0.8}
+        onPress={handleFastfood}>
+        <ImageBackground
+          source={require('../assets/images/Fastfood.png')}
+          style={styles.image}>
+          <View style={styles.textcontainer}>
+            <Text style={styles.text}>Fast Food</Text>
+          </View>
+        </ImageBackground>
+      </TouchableOpacity>
+
+      <TouchableOpacity
+        style={[styles.button, {marginBottom: 10}]}
+        activeOpacity={0.8}
+        onPress={handleJuices}>
+        <ImageBackground
+          source={require('../assets/images/Juices.png')}
+          style={styles.image}>
+          <View style={styles.textcontainer}>
+            <Text style={styles.text}>Fresh Juices</Text>
+          </View>
+        </ImageBackground>
+      </TouchableOpacity>
+
+      {/* <Button title= 'Goto /> */}
+    </ScrollView>
+  );
+}
+
+const styles = StyleSheet.create({
+  home: {
+    flex: 1,
+    backgroundColor: '#e8e8e8',
+  },
+  text: {
+    fontFamily: 'Roboto-Bold',
+    color: '#d00f16',
+    marginLeft: 16,
+    fontSize: 45,
+  },
+  image: {
+    justifyContent: 'flex-end',
+    resizeMode: 'contain',
+    width: Dimensions.get('window').width,
+    height: Dimensions.get('window').height / 2.5,
+    marginTop: 10,
+  },
+
+  textcontainer: {
+    backgroundColor: 'rgba(0,0,0,0.75)',
+    width: Dimensions.get('window').width,
+    height: 60,
+    justifyContent: 'center',
+    marginBottom: 12,
+  },
+
+  // button:{
+
+  // }
+});
diff --git a/screens/Login.js b/screens/Login.js
index dd7449e..0fee881 100644
--- a/screens/Login.js
+++ b/screens/Login.js
@@ -1,382 +1,382 @@
-import React, {useState} from 'react';
-import {
-  StyleSheet,
-  Text,
-  View,
-  ScrollView,
-  KeyboardAvoidingView,
-  ImageBackground,
-  Image,
-  TextInput,
-  TouchableOpacity,
-  Keyboard,
-  TouchableWithoutFeedback,
-} from 'react-native';
-import backg from '../assets/images/backg.png';
-import lsdlogo from '../assets/images/lsdlogo.png';
-import AsyncStorage from '@react-native-community/async-storage';
-import firebase from '../assets/DatabaseConfig';
-// import auth from "@react-native-firebase/auth" ;
-// import database from "@react-native-firebase/database" ;
-
-import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
-// import {NavigationEvents} from 'react-navigation';
-
-function END(mail) {
-  return mail.endsWith('@lums.edu.pk');
-}
-
-export default function Login({navigation}) {
-  // async function emptyitems(name) {
-  //   try {
-  //     const item = await AsyncStorage.removeItem(name)
-  //   } catch(e) {
-  //     console.log(e)
-  //   }
-
-  // }
-
-  async function removeData() {
-    try {
-      // const value = await AsyncStorage.getAllKeys()
-      // if(value !== null) {
-      //   value.forEach(function(name) {
-      //     emptyitems(name)
-      //   })
-      // }
-      const keys = await AsyncStorage.getAllKeys();
-      await AsyncStorage.multiRemove(keys);
-    } catch (e) {
-      console.log(e);
-    }
-  }
-
-  const LoginPress = () => {
-    let emailcheck = firebase.auth().currentUser.email;
-    mydb = firebase.database().ref('/Users/' + emailcheck.substr(0, 8));
-    mydb.once('value').then(function(snapshot) {
-      let custflag = snapshot.child('Customerflag').val();
-      let username = snapshot.child('Username').val();
-      if (custflag) {
-        removeData();
-        navigation.navigate('CustomerDrawer', {user: username});
-      } else {
-        navigation.navigate('AdminDrawer', {user: username});
-      }
-    });
-  };
-
-  const [email, setEmail] = useState('');
-  const [password, setPassword] = useState('');
-  // const [repassword, setRepassword] = useState("");
-  // const [username, setUsername] = useState("");
-  // const [phone, setPhone] = useState("");
-  // const [errorMessage, setErrorMessage] = useState();
-
-  const emailInputHandler = inputEmail => {
-    setEmail(inputEmail);
-  };
-
-  const passwordInputHandler = inputPassword => {
-    setPassword(inputPassword);
-  };
-
-  // const errorMessageInputHandler = (inputError) => {
-  //   setErrorMessage(inputError);
-  // };
-
-  const handleFpPress = () => {
-    navigation.navigate('Forgotpwemail');
-  };
-
-  const handleSuPress = () => {
-    navigation.navigate('Registration');
-  };
-
-  const handleLoginPress = () => {
-    if (email == '') {
-      alert('Please enter your email address');
-    } else if (password == '') {
-      alert('Please enter your password');
-    } else {
-      emaillums = END(email);
-      if (emaillums) {
-        // if (password.length>=8) {
-        mydb = firebase.database().ref('/Users/' + email.substr(0, 8));
-        mydb.once('value').then(function(snapshot) {
-          let banstat = snapshot.child('BanStatus').val();
-
-          if (!banstat) {
-            handleLogin();
-          } else {
-            alert('You are banned for misconduct.');
-          }
-        });
-        // .catch(e=>console.log(e))
-        // }
-        // else {
-        //   alert("Please enter 8 or more characters for password.")
-        // }
-      } else {
-        alert('Please enter your LUMS email.');
-      }
-    }
-
-    // emaillums = END(email)
-    // if (emaillums){
-    //   if (password.length>=8) {
-    //     mydb = firebase.database().ref('/Users/'+email.substr(0,8))
-    //     mydb.once("value")
-    //     .then(function(snapshot) {
-
-    //       let banstat = snapshot.child("BanStatus").val()
-
-    //       if (!banstat) {
-    //             handleLogin()
-    //       }
-
-    //       else {
-    //         alert("You are banned for misconduct.")
-    //       }
-
-    //     })
-    //     .catch(e=>console.log(e))
-    //   }
-    //   else {
-    //     alert("Please enter 8 or more characters for password.")
-    //   }
-    // }
-
-    // else {
-    //   alert("Please enter your LUMS email.")
-    // }
-  };
-
-  async function handleLogin() {
-    firebase
-      .auth()
-      .signInWithEmailAndPassword(email, password)
-      .then(() => {
-        if (firebase.auth().currentUser.emailVerified) {
-          LoginPress();
-        } else {
-          firebase.auth().currentUser.reload();
-          alert('Please verify email before logging in.');
-        }
-      })
-      .catch(function(error) {
-        alert(error);
-      });
-  }
-
-  // function loginexists() {
-  //   meow = firebase.auth().onAuthStateChanged(function(user) {
-  //     if (user) {
-  //       LoginPress();
-  //     }
-  //   });
-  // }
-
-  return (
-    <ImageBackground source={backg} style={styles.bgimage}>
-      <TouchableWithoutFeedback
-        onPress={() => {
-          Keyboard.dismiss();
-        }}>
-        <View style={styles.container} scrollEnabled={false}>
-        {/* <NavigationEvents
-          onDidFocus={() => {
-            loginexists();
-          }}
-        /> */}
-          <View style={styles.maincontainer}>
-            <Image style={styles.stretch} source={lsdlogo} />
-            <View style={styles.inputbox}>
-              <Icon
-                style={styles.inputicon}
-                name="email-outline"
-                size={24}
-                color="#d00f16"
-              />
-              <TextInput
-                placeholder="Email Address"
-                style={styles.inputtext}
-                onChangeText={emailInputHandler}
-                value={email}
-              />
-            </View>
-            <View style={styles.inputbox}>
-              <Icon
-                style={styles.inputicon2}
-                name="lock-outline"
-                size={24}
-                color="#d00f16"
-              />
-              <TextInput
-                secureTextEntry
-                placeholder="Password"
-                style={styles.inputtext2}
-                onChangeText={passwordInputHandler}
-                value={password}
-              />
-            </View>
-            <View style={styles.clearbutton}>
-              <TouchableOpacity onPress={handleFpPress}>
-                <Text style={styles.buttontext}>Forgot Password?</Text>
-              </TouchableOpacity>
-            </View>
-          </View>
-
-          <View style={styles.loginbutton}>
-            <TouchableOpacity
-              style={[styles.bigbutton]}
-              onPress={handleLoginPress}>
-              <Text style={styles.bigbuttontext}>Login</Text>
-            </TouchableOpacity>
-          </View>
-          <View style={styles.clearbottombutton}>
-            <TouchableOpacity onPress={handleSuPress}>
-              <Text style={styles.buttontext}>New user? Sign up!</Text>
-            </TouchableOpacity>
-          </View>
-        </View>
-      </TouchableWithoutFeedback>
-    </ImageBackground>
-  );
-}
-
-const styles = StyleSheet.create({
-  container: {
-    // backgroundColor: "white",
-    flex: 1,
-    flexDirection: 'column',
-    // justifyContent: 'center',
-    // alignItems:'center',
-  },
-
-  bgimage: {
-    flex: 1,
-    resizeMode: 'stretch',
-    justifyContent: 'center',
-  },
-
-  inputbox: {
-    color: 'grey',
-    // paddingTop: '6%',
-    flexDirection: 'row',
-    backgroundColor: 'white',
-    borderRadius: 6,
-    // justifyContent: 'flex-start',
-    alignItems: 'center',
-    paddingHorizontal: '2%',
-    width: 280,
-    height: 56,
-    borderColor: 'black',
-    borderBottomWidth: 0.5,
-    marginTop: '6%',
-  },
-
-  inputicon: {
-    flex: 2,
-    // paddingTop: '3%',
-    // paddingLeft: '2%',
-  },
-  inputicon2: {
-    flex: 2,
-    // paddingTop: '3%',
-    // paddingRight: '1%',
-    paddingLeft: 1,
-  },
-  inputtext: {
-    // marginLeft: 5,
-    flex: 20,
-    fontSize: 14,
-    // width: '70%',
-    marginLeft: 3,
-    fontFamily: 'Roboto-Medium',
-  },
-  inputtext2: {
-    // marginLeft: 5,
-    flex: 20,
-    fontSize: 14,
-    // width: '70%',
-    marginLeft: 2,
-    fontFamily: 'Roboto-Medium',
-  },
-
-  stretch: {
-    width: '60%',
-    height: '40%',
-    resizeMode: 'contain',
-  },
-
-  maincontainer: {
-    // backgroundColor: "white",
-    alignItems: 'center',
-    justifyContent: 'flex-end',
-    paddingTop: '10%',
-    flex: 10,
-  },
-
-  buttontext: {
-    fontWeight: 'bold',
-    color: '#d00f16',
-    fontFamily: 'Roboto-Medium',
-    fontSize: 14,
-  },
-
-  bigbuttontext: {
-    fontWeight: 'bold',
-    color: 'white',
-    fontFamily: 'Roboto-Bold',
-    fontSize: 20,
-    textAlign: 'center',
-    paddingTop: '1%',
-    paddingBottom: '1%',
-  },
-
-  clearbutton: {
-    opacity: 0.8,
-    paddingTop: 16,
-    flexDirection: 'row',
-    // textAlign: 'left',
-    // paddingBottom: 40,
-    marginLeft: '47%',
-    marginRight: '13%',
-    flex: 1,
-  },
-
-  clearbottombutton: {
-    opacity: 0.8,
-    justifyContent: 'center',
-    marginLeft: '35%',
-    flex: 1,
-    alignItems: 'baseline',
-    // backgroundColor: "yellow",
-  },
-
-  bigbutton: {
-    backgroundColor: '#d00f16',
-    borderRadius: 20,
-    width: 200,
-    height: 40,
-    shadowColor: '#000',
-    shadowOffset: {width: 2, height: 4},
-    shadowOpacity: 0.9,
-    shadowRadius: 6,
-    // elevation: 2,
-    // minHeight: '6%',
-    textAlign: 'center',
-    justifyContent: 'center',
-    alignItems: 'center',
-    elevation: 2,
-  },
-
-  loginbutton: {
-    flex: 1,
-    width: '50%',
-    borderRadius: 17,
-    textAlign: 'center',
-    alignSelf: 'center',
-  },
-});
+import React, {useState} from 'react';
+import {
+  StyleSheet,
+  Text,
+  View,
+  ScrollView,
+  KeyboardAvoidingView,
+  ImageBackground,
+  Image,
+  TextInput,
+  TouchableOpacity,
+  Keyboard,
+  TouchableWithoutFeedback,
+} from 'react-native';
+import backg from '../assets/images/backg.png';
+import lsdlogo from '../assets/images/lsdlogo.png';
+import AsyncStorage from '@react-native-community/async-storage';
+import firebase from '../assets/DatabaseConfig';
+// import auth from "@react-native-firebase/auth" ;
+// import database from "@react-native-firebase/database" ;
+
+import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
+// import {NavigationEvents} from 'react-navigation';
+
+function END(mail) {
+  return mail.endsWith('@lums.edu.pk');
+}
+
+export default function Login({navigation}) {
+  // async function emptyitems(name) {
+  //   try {
+  //     const item = await AsyncStorage.removeItem(name)
+  //   } catch(e) {
+  //     console.log(e)
+  //   }
+
+  // }
+
+  async function removeData() {
+    try {
+      // const value = await AsyncStorage.getAllKeys()
+      // if(value !== null) {
+      //   value.forEach(function(name) {
+      //     emptyitems(name)
+      //   })
+      // }
+      const keys = await AsyncStorage.getAllKeys();
+      await AsyncStorage.multiRemove(keys);
+    } catch (e) {
+      console.log(e);
+    }
+  }
+
+  const LoginPress = () => {
+    let emailcheck = firebase.auth().currentUser.email;
+    mydb = firebase.database().ref('/Users/' + emailcheck.substr(0, 8));
+    mydb.once('value').then(function(snapshot) {
+      let custflag = snapshot.child('Customerflag').val();
+      let username = snapshot.child('Username').val();
+      if (custflag) {
+        removeData();
+        navigation.navigate('CustomerDrawer', {user: username});
+      } else {
+        navigation.navigate('AdminDrawer', {user: username});
+      }
+    });
+  };
+
+  const [email, setEmail] = useState('');
+  const [password, setPassword] = useState('');
+  // const [repassword, setRepassword] = useState("");
+  // const [username, setUsername] = useState("");
+  // const [phone, setPhone] = useState("");
+  // const [errorMessage, setErrorMessage] = useState();
+
+  const emailInputHandler = inputEmail => {
+    setEmail(inputEmail);
+  };
+
+  const passwordInputHandler = inputPassword => {
+    setPassword(inputPassword);
+  };
+
+  // const errorMessageInputHandler = (inputError) => {
+  //   setErrorMessage(inputError);
+  // };
+
+  const handleFpPress = () => {
+    navigation.navigate('Forgotpwemail');
+  };
+
+  const handleSuPress = () => {
+    navigation.navigate('Registration');
+  };
+
+  const handleLoginPress = () => {
+    if (email == '') {
+      alert('Please enter your email address');
+    } else if (password == '') {
+      alert('Please enter your password');
+    } else {
+      emaillums = END(email);
+      if (emaillums) {
+        // if (password.length>=8) {
+        mydb = firebase.database().ref('/Users/' + email.substr(0, 8));
+        mydb.once('value').then(function(snapshot) {
+          let banstat = snapshot.child('BanStatus').val();
+
+          if (!banstat) {
+            handleLogin();
+          } else {
+            alert('You are banned for misconduct.');
+          }
+        });
+        // .catch(e=>console.log(e))
+        // }
+        // else {
+        //   alert("Please enter 8 or more characters for password.")
+        // }
+      } else {
+        alert('Please enter your LUMS email.');
+      }
+    }
+
+    // emaillums = END(email)
+    // if (emaillums){
+    //   if (password.length>=8) {
+    //     mydb = firebase.database().ref('/Users/'+email.substr(0,8))
+    //     mydb.once("value")
+    //     .then(function(snapshot) {
+
+    //       let banstat = snapshot.child("BanStatus").val()
+
+    //       if (!banstat) {
+    //             handleLogin()
+    //       }
+
+    //       else {
+    //         alert("You are banned for misconduct.")
+    //       }
+
+    //     })
+    //     .catch(e=>console.log(e))
+    //   }
+    //   else {
+    //     alert("Please enter 8 or more characters for password.")
+    //   }
+    // }
+
+    // else {
+    //   alert("Please enter your LUMS email.")
+    // }
+  };
+
+  async function handleLogin() {
+    firebase
+      .auth()
+      .signInWithEmailAndPassword(email, password)
+      .then(() => {
+        if (firebase.auth().currentUser.emailVerified) {
+          LoginPress();
+        } else {
+          firebase.auth().currentUser.reload();
+          alert('Please verify email before logging in.');
+        }
+      })
+      .catch(function(error) {
+        alert(error);
+      });
+  }
+
+  // function loginexists() {
+  //   meow = firebase.auth().onAuthStateChanged(function(user) {
+  //     if (user) {
+  //       LoginPress();
+  //     }
+  //   });
+  // }
+
+  return (
+    <ImageBackground source={backg} style={styles.bgimage}>
+      <TouchableWithoutFeedback
+        onPress={() => {
+          Keyboard.dismiss();
+        }}>
+        <View style={styles.container} scrollEnabled={false}>
+        {/* <NavigationEvents
+          onDidFocus={() => {
+            loginexists();
+          }}
+        /> */}
+          <View style={styles.maincontainer}>
+            <Image style={styles.stretch} source={lsdlogo} />
+            <View style={styles.inputbox}>
+              <Icon
+                style={styles.inputicon}
+                name="email-outline"
+                size={24}
+                color="#d00f16"
+              />
+              <TextInput
+                placeholder="Email Address"
+                style={styles.inputtext}
+                onChangeText={emailInputHandler}
+                value={email}
+              />
+            </View>
+            <View style={styles.inputbox}>
+              <Icon
+                style={styles.inputicon2}
+                name="lock-outline"
+                size={24}
+                color="#d00f16"
+              />
+              <TextInput
+                secureTextEntry
+                placeholder="Password"
+                style={styles.inputtext2}
+                onChangeText={passwordInputHandler}
+                value={password}
+              />
+            </View>
+            <View style={styles.clearbutton}>
+              <TouchableOpacity onPress={handleFpPress}>
+                <Text style={styles.buttontext}>Forgot Password?</Text>
+              </TouchableOpacity>
+            </View>
+          </View>
+
+          <View style={styles.loginbutton}>
+            <TouchableOpacity
+              style={[styles.bigbutton]}
+              onPress={handleLoginPress}>
+              <Text style={styles.bigbuttontext}>Login</Text>
+            </TouchableOpacity>
+          </View>
+          <View style={styles.clearbottombutton}>
+            <TouchableOpacity onPress={handleSuPress}>
+              <Text style={styles.buttontext}>New user? Sign up!</Text>
+            </TouchableOpacity>
+          </View>
+        </View>
+      </TouchableWithoutFeedback>
+    </ImageBackground>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    // backgroundColor: "white",
+    flex: 1,
+    flexDirection: 'column',
+    // justifyContent: 'center',
+    // alignItems:'center',
+  },
+
+  bgimage: {
+    flex: 1,
+    resizeMode: 'stretch',
+    justifyContent: 'center',
+  },
+
+  inputbox: {
+    color: 'grey',
+    // paddingTop: '6%',
+    flexDirection: 'row',
+    backgroundColor: 'white',
+    borderRadius: 6,
+    // justifyContent: 'flex-start',
+    alignItems: 'center',
+    paddingHorizontal: '2%',
+    width: 280,
+    height: 56,
+    borderColor: 'black',
+    borderBottomWidth: 0.5,
+    marginTop: '6%',
+  },
+
+  inputicon: {
+    flex: 2,
+    // paddingTop: '3%',
+    // paddingLeft: '2%',
+  },
+  inputicon2: {
+    flex: 2,
+    // paddingTop: '3%',
+    // paddingRight: '1%',
+    paddingLeft: 1,
+  },
+  inputtext: {
+    // marginLeft: 5,
+    flex: 20,
+    fontSize: 14,
+    // width: '70%',
+    marginLeft: 3,
+    fontFamily: 'Roboto-Medium',
+  },
+  inputtext2: {
+    // marginLeft: 5,
+    flex: 20,
+    fontSize: 14,
+    // width: '70%',
+    marginLeft: 2,
+    fontFamily: 'Roboto-Medium',
+  },
+
+  stretch: {
+    width: '60%',
+    height: '40%',
+    resizeMode: 'contain',
+  },
+
+  maincontainer: {
+    // backgroundColor: "white",
+    alignItems: 'center',
+    justifyContent: 'flex-end',
+    paddingTop: '10%',
+    flex: 10,
+  },
+
+  buttontext: {
+    fontWeight: 'bold',
+    color: '#d00f16',
+    fontFamily: 'Roboto-Medium',
+    fontSize: 14,
+  },
+
+  bigbuttontext: {
+    fontWeight: 'bold',
+    color: 'white',
+    fontFamily: 'Roboto-Bold',
+    fontSize: 20,
+    textAlign: 'center',
+    paddingTop: '1%',
+    paddingBottom: '1%',
+  },
+
+  clearbutton: {
+    opacity: 0.8,
+    paddingTop: 16,
+    flexDirection: 'row',
+    // textAlign: 'left',
+    // paddingBottom: 40,
+    marginLeft: '47%',
+    marginRight: '13%',
+    flex: 1,
+  },
+
+  clearbottombutton: {
+    opacity: 0.8,
+    justifyContent: 'center',
+    marginLeft: '35%',
+    flex: 1,
+    alignItems: 'baseline',
+    // backgroundColor: "yellow",
+  },
+
+  bigbutton: {
+    backgroundColor: '#d00f16',
+    borderRadius: 20,
+    width: 200,
+    height: 40,
+    shadowColor: '#000',
+    shadowOffset: {width: 2, height: 4},
+    shadowOpacity: 0.9,
+    shadowRadius: 6,
+    // elevation: 2,
+    // minHeight: '6%',
+    textAlign: 'center',
+    justifyContent: 'center',
+    alignItems: 'center',
+    elevation: 2,
+  },
+
+  loginbutton: {
+    flex: 1,
+    width: '50%',
+    borderRadius: 17,
+    textAlign: 'center',
+    alignSelf: 'center',
+  },
+});
diff --git a/screens/PendingOrdersList.js b/screens/PendingOrdersList.js
index 67cc836..1ea094c 100644
--- a/screens/PendingOrdersList.js
+++ b/screens/PendingOrdersList.js
@@ -1,226 +1,226 @@
-import React, {useState} from 'react';
-import Icon from 'react-native-vector-icons/FontAwesome';
-import {
-  StyleSheet,
-  ScrollView,
-  Text,
-  View,
-  TouchableOpacity,
-  TextInput,
-  // Button,
-  // Picker,
-} from 'react-native';
-import {FlatList} from 'react-native-gesture-handler';
-import {NavigationEvents} from 'react-navigation';
-import firebase from '../assets/DatabaseConfig';
-
-
-export default function Orders({navigation}) {
-  
-  const handlePress = (orderid) => {
-    navigation.navigate('Pending_Order_Admin', {orderid: orderid});
-  };
-  
-  const [order, setorder] = useState([ ]);
-
-  function getOrders() {
-    // console.log("meow")
-    mydb = firebase.database().ref('/Orders');
-    mydb.once('value').then(function(snapshot) {
-      // product = []
-      let orderarr = [];
-      snapshot.forEach(function(childsnapshot) {
-        let order = {
-          // name: childsnapshot.child('Username').val(),
-          orderid: childsnapshot.key,
-        };
-        // console.log(childsnapshot)
-        orderarr.push(order);
-      });
-      setorder(orderarr);
-    });
-
-  }
-
-
-
-
-  return (
-    <View style={styles.Screen}>
-      <NavigationEvents onWillFocus={() => { getOrders() }} />
-      {/* <View style={styles.TopBar}>
-        <TouchableOpacity style={styles.TopBarBack}>
-          <Icon name="arrow-left" size={32} color="white" />
-        </TouchableOpacity>
-
-        <View style={styles.TopBarText}>
-          <Text
-            style={{fontSize: 30, fontFamily: 'Roboto-Bold', color: 'white'}}>
-            Customers
-          </Text>
-        </View>
-
-        <TouchableOpacity style={styles.TopBarSearch}>
-          <Icon name="search" size={32} color="white" />
-        </TouchableOpacity>
-      </View> */}
-      {/* <View style={styles.RestScreen}> */}
-      {/* <View style={{width: '100%'}}> */}
-      {/* <TouchableOpacity raised style={{elevation: 2}}> */}
-      <FlatList
-        data={order}
-        keyExtractor={item => item.orderid}
-        renderItem={({item}) => (
-          <TouchableOpacity style={styles.TextInputbox} onPress={() => handlePress(item.orderid)}>
-            <Text style={{fontSize: 16, fontFamily: 'Roboto-Bold'}}>
-              {'OrderID ' + item.orderid}
-            </Text>
-          </TouchableOpacity>
-        )}
-      />
-      {/* </TouchableOpacity> */}
-    </View>
-    // </View>
-  );
-}
-
-const styles = StyleSheet.create({
-  // confirmbutton: {
-  //   flexDirection: 'row',
-  //   // width: "30%",
-  //   padding: 50,
-  //   alignItems: 'center',
-  //   justifyContent: 'center',
-  // },
-  Screen: {
-    // flexDirection: "column",
-    height: '100%',
-    paddingLeft: '10%',
-    paddingTop: '10%',
-    backgroundColor: '#e8e8e8',
-    justifyContent: 'center',
-    // alignItems: 'center',
-
-    // flex: '20%',
-  },
-  TopBar: {
-    padding: 20,
-    flexDirection: 'row',
-    flex: 2,
-
-    width: '100%',
-    height: '100%',
-    backgroundColor: '#d00f16',
-    alignItems: 'center',
-    justifyContent: 'space-between',
-  },
-  TopBarText: {
-    // padding: 40,
-    flexDirection: 'row',
-    fontSize: 30,
-    fontFamily: 'Roboto-Bold',
-    color: 'white',
-    textAlign: 'left',
-    alignItems: 'flex-start',
-    flex: 6,
-  },
-  TopBarSearch: {
-    // flexDirection: "row",
-    alignItems: 'flex-end',
-    color: 'white',
-    fontSize: 20,
-    flex: 1,
-  },
-  TopBarBack: {
-    color: 'white',
-    flex: 1,
-    fontSize: 20,
-  },
-  RestScreen: {
-    // flex: 9,
-    // width: 100,
-    // flex: 8,
-    // width: 100,
-    padding: '15%',
-    backgroundColor: '#e8e8e8',
-    height: '90%',
-    justifyContent: 'center',
-    alignItems: 'center',
-    // justifyContent: 'center',
-    // alignItems: 'center',
-  },
-  firstbox: {
-    width: '100%',
-    flexDirection: 'row',
-    marginVertical: 10,
-    borderColor: 'black',
-    backgroundColor: 'white',
-    borderWidth: 0.5,
-    borderRadius: 10,
-    height: 50,
-    paddingTop: 40,
-    // justifyContent: 'center',
-    alignItems: 'center',
-    shadowColor: 'darkgrey',
-    shadowOpacity: 20,
-    // justifyContent: "center",
-  },
-  TextInputbox: {
-    // paddingTop: 13,
-    // paddingHorizontal: 16,
-    width: '90%',
-    height: 58,
-    flexDirection: 'row',
-    marginVertical: 10,
-    borderColor: 'black',
-    backgroundColor: 'white',
-    borderWidth: 0,
-
-    // elevation: 2,
-    shadowColor: 'darkgrey',
-    shadowOpacity: 1,
-    elevation: 2,
-    borderRadius: 5,
-    fontSize: 6,
-    fontFamily: 'Roboto-Bold',
-    // height: 50,
-    justifyContent: 'center',
-    alignItems: 'center',
-  },
-
-  Confirmbutton: {
-    // padding: 20,
-    // paddingBottom: 20,
-    paddingHorizontal: 15,
-    backgroundColor: '#d00f16',
-    borderRadius: 20,
-    width: 200,
-    height: 40,
-    shadowColor: '#000',
-    shadowOffset: {width: 2, height: 4},
-    shadowOpacity: 0.9,
-    shadowRadius: 6,
-    elevation: 2,
-    minHeight: '6%',
-    // textAlign: 'center',
-    justifyContent: 'center',
-    // alignItems: 'center',
-  },
-  bigbuttontext: {
-    fontWeight: 'bold',
-    color: 'white',
-    fontFamily: 'Roboto-Bold',
-    fontSize: 20,
-    textAlign: 'center',
-    paddingTop: '2%',
-
-    // opacity: 1,
-  },
-  bigbutton: {
-    // padding: '50%',
-    paddingHorizontal: '23%',
-    flex: 2,
-    alignItems: 'center',
-    justifyContent: 'flex-end',
-  },
-});
+import React, {useState} from 'react';
+import Icon from 'react-native-vector-icons/FontAwesome';
+import {
+  StyleSheet,
+  ScrollView,
+  Text,
+  View,
+  TouchableOpacity,
+  TextInput,
+  // Button,
+  // Picker,
+} from 'react-native';
+import {FlatList} from 'react-native-gesture-handler';
+import {NavigationEvents} from 'react-navigation';
+import firebase from '../assets/DatabaseConfig';
+
+
+export default function Orders({navigation}) {
+  
+  const handlePress = (orderid) => {
+    navigation.navigate('Pending_Order_Admin', {orderid: orderid});
+  };
+  
+  const [order, setorder] = useState([ ]);
+
+  function getOrders() {
+    // console.log("meow")
+    mydb = firebase.database().ref('/Orders');
+    mydb.once('value').then(function(snapshot) {
+      // product = []
+      let orderarr = [];
+      snapshot.forEach(function(childsnapshot) {
+        let order = {
+          // name: childsnapshot.child('Username').val(),
+          orderid: childsnapshot.key,
+        };
+        // console.log(childsnapshot)
+        orderarr.push(order);
+      });
+      setorder(orderarr);
+    });
+
+  }
+
+
+
+
+  return (
+    <View style={styles.Screen}>
+      <NavigationEvents onWillFocus={() => { getOrders() }} />
+      {/* <View style={styles.TopBar}>
+        <TouchableOpacity style={styles.TopBarBack}>
+          <Icon name="arrow-left" size={32} color="white" />
+        </TouchableOpacity>
+
+        <View style={styles.TopBarText}>
+          <Text
+            style={{fontSize: 30, fontFamily: 'Roboto-Bold', color: 'white'}}>
+            Customers
+          </Text>
+        </View>
+
+        <TouchableOpacity style={styles.TopBarSearch}>
+          <Icon name="search" size={32} color="white" />
+        </TouchableOpacity>
+      </View> */}
+      {/* <View style={styles.RestScreen}> */}
+      {/* <View style={{width: '100%'}}> */}
+      {/* <TouchableOpacity raised style={{elevation: 2}}> */}
+      <FlatList
+        data={order}
+        keyExtractor={item => item.orderid}
+        renderItem={({item}) => (
+          <TouchableOpacity style={styles.TextInputbox} onPress={() => handlePress(item.orderid)}>
+            <Text style={{fontSize: 16, fontFamily: 'Roboto-Bold'}}>
+              {'OrderID ' + item.orderid}
+            </Text>
+          </TouchableOpacity>
+        )}
+      />
+      {/* </TouchableOpacity> */}
+    </View>
+    // </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  // confirmbutton: {
+  //   flexDirection: 'row',
+  //   // width: "30%",
+  //   padding: 50,
+  //   alignItems: 'center',
+  //   justifyContent: 'center',
+  // },
+  Screen: {
+    // flexDirection: "column",
+    height: '100%',
+    paddingLeft: '10%',
+    paddingTop: '10%',
+    backgroundColor: '#e8e8e8',
+    justifyContent: 'center',
+    // alignItems: 'center',
+
+    // flex: '20%',
+  },
+  TopBar: {
+    padding: 20,
+    flexDirection: 'row',
+    flex: 2,
+
+    width: '100%',
+    height: '100%',
+    backgroundColor: '#d00f16',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+  },
+  TopBarText: {
+    // padding: 40,
+    flexDirection: 'row',
+    fontSize: 30,
+    fontFamily: 'Roboto-Bold',
+    color: 'white',
+    textAlign: 'left',
+    alignItems: 'flex-start',
+    flex: 6,
+  },
+  TopBarSearch: {
+    // flexDirection: "row",
+    alignItems: 'flex-end',
+    color: 'white',
+    fontSize: 20,
+    flex: 1,
+  },
+  TopBarBack: {
+    color: 'white',
+    flex: 1,
+    fontSize: 20,
+  },
+  RestScreen: {
+    // flex: 9,
+    // width: 100,
+    // flex: 8,
+    // width: 100,
+    padding: '15%',
+    backgroundColor: '#e8e8e8',
+    height: '90%',
+    justifyContent: 'center',
+    alignItems: 'center',
+    // justifyContent: 'center',
+    // alignItems: 'center',
+  },
+  firstbox: {
+    width: '100%',
+    flexDirection: 'row',
+    marginVertical: 10,
+    borderColor: 'black',
+    backgroundColor: 'white',
+    borderWidth: 0.5,
+    borderRadius: 10,
+    height: 50,
+    paddingTop: 40,
+    // justifyContent: 'center',
+    alignItems: 'center',
+    shadowColor: 'darkgrey',
+    shadowOpacity: 20,
+    // justifyContent: "center",
+  },
+  TextInputbox: {
+    // paddingTop: 13,
+    // paddingHorizontal: 16,
+    width: '90%',
+    height: 58,
+    flexDirection: 'row',
+    marginVertical: 10,
+    borderColor: 'black',
+    backgroundColor: 'white',
+    borderWidth: 0,
+
+    // elevation: 2,
+    shadowColor: 'darkgrey',
+    shadowOpacity: 1,
+    elevation: 2,
+    borderRadius: 5,
+    fontSize: 6,
+    fontFamily: 'Roboto-Bold',
+    // height: 50,
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+
+  Confirmbutton: {
+    // padding: 20,
+    // paddingBottom: 20,
+    paddingHorizontal: 15,
+    backgroundColor: '#d00f16',
+    borderRadius: 20,
+    width: 200,
+    height: 40,
+    shadowColor: '#000',
+    shadowOffset: {width: 2, height: 4},
+    shadowOpacity: 0.9,
+    shadowRadius: 6,
+    elevation: 2,
+    minHeight: '6%',
+    // textAlign: 'center',
+    justifyContent: 'center',
+    // alignItems: 'center',
+  },
+  bigbuttontext: {
+    fontWeight: 'bold',
+    color: 'white',
+    fontFamily: 'Roboto-Bold',
+    fontSize: 20,
+    textAlign: 'center',
+    paddingTop: '2%',
+
+    // opacity: 1,
+  },
+  bigbutton: {
+    // padding: '50%',
+    paddingHorizontal: '23%',
+    flex: 2,
+    alignItems: 'center',
+    justifyContent: 'flex-end',
+  },
+});
diff --git a/screens/PickerExample.js b/screens/PickerExample.js
index 8115ddd..e6b47ac 100644
--- a/screens/PickerExample.js
+++ b/screens/PickerExample.js
@@ -1,30 +1,30 @@
-import React, { Component } from 'react';
-import { View, Text, Picker, StyleSheet } from 'react-native'
-
-class PickerExample extends Component {
-   state = {user: ''}
-   updateUser = (user) => {
-      this.setState({ user: user })
-   }
-   render() {
-      return (
-         <View>
-            <Picker selectedValue = {this.state.user} onValueChange = {this.updateUser}>
-               <Picker.Item label="Select Delivery Location" value=""/>
-               <Picker.Item label="SSE" value="1" />
-               <Picker.Item label="SDSB" value="2"/>
-               <Picker.Item label="B1" value="3"/>
-               <Picker.Item label="M7" value="4"/>
-               <Picker.Item label="Campus Residence" value="5"/>
-            </Picker>
-         </View>
-      )
-   }
-}
-export default PickerExample
-
-const styles = StyleSheet.create({
-   text: {
-      fontSize: 18,
-   }
+import React, { Component } from 'react';
+import { View, Text, Picker, StyleSheet } from 'react-native'
+
+class PickerExample extends Component {
+   state = {user: ''}
+   updateUser = (user) => {
+      this.setState({ user: user })
+   }
+   render() {
+      return (
+         <View>
+            <Picker selectedValue = {this.state.user} onValueChange = {this.updateUser}>
+               <Picker.Item label="Select Delivery Location" value=""/>
+               <Picker.Item label="SSE" value="1" />
+               <Picker.Item label="SDSB" value="2"/>
+               <Picker.Item label="B1" value="3"/>
+               <Picker.Item label="M7" value="4"/>
+               <Picker.Item label="Campus Residence" value="5"/>
+            </Picker>
+         </View>
+      )
+   }
+}
+export default PickerExample
+
+const styles = StyleSheet.create({
+   text: {
+      fontSize: 18,
+   }
 })
\ No newline at end of file
diff --git a/screens/PickerList.js b/screens/PickerList.js
index 03b65aa..ad256f5 100644
--- a/screens/PickerList.js
+++ b/screens/PickerList.js
@@ -1,47 +1,47 @@
-import React, {useState} from 'react';
-import {View, StyleSheet, TouchableOpacity} from 'react-native';
-import {Picker} from '@react-native-community/picker';
-
-export default function Category() {
-  const [selectedValue, setSelectedValue] = useState('Choose a category');
-  return (
-    // <TouchableOpacity raised style={styles.viewstyle}>
-    <Picker
-      selectedValue={selectedValue}
-      style={styles.container}
-      onValueChange={(itemValue, itemIndex) => setSelectedValue(itemValue)}>
-      <Picker.Item label="Choose a Location" value="null" />
-      <Picker.Item label="M5" value="M5" />
-      <Picker.Item label="SDSB" value="SDSB" />
-      <Picker.Item label="Female Barrier" value="Female Barrier" />
-    </Picker>
-    // </TouchableOpacity>
-  );
-}
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    // paddingTop: 40,
-    alignItems: 'center',
-    justifyContent: 'center',
-    flexDirection: 'row',
-    marginVertical: 10,
-    width: '100%',
-    height: 50,
-    elevation: 2,
-  },
-  viewstyle: {
-    // padding: 30,
-    width: '100%',
-    alignItems: 'center',
-    borderColor: 'black',
-    backgroundColor: 'white',
-    borderWidth: 0,
-    borderRadius: 10,
-    // padding: 30,
-    // alignItems: 'center',
-    shadowColor: 'darkgrey',
-    shadowOpacity: 20,
-  },
-});
+import React, {useState} from 'react';
+import {View, StyleSheet, TouchableOpacity} from 'react-native';
+import {Picker} from '@react-native-community/picker';
+
+export default function Category() {
+  const [selectedValue, setSelectedValue] = useState('Choose a category');
+  return (
+    // <TouchableOpacity raised style={styles.viewstyle}>
+    <Picker
+      selectedValue={selectedValue}
+      style={styles.container}
+      onValueChange={(itemValue, itemIndex) => setSelectedValue(itemValue)}>
+      <Picker.Item label="Choose a Location" value="null" />
+      <Picker.Item label="M5" value="M5" />
+      <Picker.Item label="SDSB" value="SDSB" />
+      <Picker.Item label="Female Barrier" value="Female Barrier" />
+    </Picker>
+    // </TouchableOpacity>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    // paddingTop: 40,
+    alignItems: 'center',
+    justifyContent: 'center',
+    flexDirection: 'row',
+    marginVertical: 10,
+    width: '100%',
+    height: 50,
+    elevation: 2,
+  },
+  viewstyle: {
+    // padding: 30,
+    width: '100%',
+    alignItems: 'center',
+    borderColor: 'black',
+    backgroundColor: 'white',
+    borderWidth: 0,
+    borderRadius: 10,
+    // padding: 30,
+    // alignItems: 'center',
+    shadowColor: 'darkgrey',
+    shadowOpacity: 20,
+  },
+});
diff --git a/screens/RedemptionPoints.js b/screens/RedemptionPoints.js
index 56bd724..8f17761 100644
--- a/screens/RedemptionPoints.js
+++ b/screens/RedemptionPoints.js
@@ -1,186 +1,186 @@
-import React from 'react';
-import Icon from 'react-native-vector-icons/FontAwesome';
-import {
-  StyleSheet,
-  Text,
-  View,
-  TouchableOpacity,
-  TextInput,
-  TouchableWithoutFeedback,
-  Keyboard,
-  // Button,
-  // Picker,
-} from 'react-native';
-// import DropDownItem from "react-native-drop-down-item";
-// import {
-//   TouchableHighlight,
-//   BorderlessButton,
-// } from "react-native-gesture-handler"
-
-export default function RedemptionPoints() {
-  return (
-    <TouchableWithoutFeedback onPress = {() =>{
-      Keyboard.dismiss()
-    }}>
-    <View style={styles.Screen}>
-      {/* <View style={styles.TopBar}>
-        <TouchableOpacity style={styles.TopBarBack}>
-          <Icon name="arrow-left" size={32} color="white" />
-        </TouchableOpacity>
-
-        <View style={styles.TopBarText}>
-          <Text
-            style={{fontSize: 30, fontFamily: 'Roboto-Bold', color: 'white'}}>
-            Redemption Points
-          </Text>
-        </View>
-      </View> */}
-
-      <View style={styles.RestScreen}>
-        <View style={styles.TextInputbox}>
-          <TextInput
-            // style={{fontSize: 12}}
-            placeholder="Rs. per point"
-            placeholderTextColor="black"
-          />
-        </View>
-
-        <View style={styles.bigbutton}>
-          <TouchableOpacity
-            onPress={() => alert('Confirmed!')}
-            style={styles.Confirmbutton}>
-            <Text style={styles.bigbuttontext}>Confirm</Text>
-          </TouchableOpacity>
-        </View>
-      </View>
-    </View>
-    </TouchableWithoutFeedback>
-  );
-}
-
-const styles = StyleSheet.create({
-  // confirmbutton: {
-  //   flexDirection: 'row',
-  //   // width: "30%",
-  //   padding: 50,
-  //   alignItems: 'center',
-  //   justifyContent: 'center',
-  // },
-  Screen: {
-    // flexDirection: "column",
-    height: '100%',
-    backgroundColor:'#e8e8e8'
-    // flex: '20%',
-  },
-  TopBar: {
-    padding: 20,
-    flexDirection: 'row',
-    flex: 2,
-
-    width: '100%',
-    height: '100%',
-    backgroundColor: '#d00f16',
-    alignItems: 'center',
-    justifyContent: 'space-between',
-  },
-  TopBarText: {
-    // padding: 40,
-    flexDirection: 'row',
-    fontSize: 25,
-    fontFamily: 'Roboto-Bold',
-    color: 'white',
-    textAlign: 'left',
-    alignItems: 'flex-start',
-    flex: 6,
-  },
-  TopBarSearch: {
-    // flexDirection: "row",
-    alignItems: 'flex-end',
-    color: 'white',
-    fontSize: 20,
-    flex: 1,
-  },
-  TopBarBack: {
-    color: 'white',
-    flex: 1,
-    fontSize: 20,
-  },
-  RestScreen: {
-    // flex: 9,
-    // width: 100,
-    padding: 60,
-    backgroundColor: '#e8e8e8',
-    height: '90%',
-    // justifyContent: 'center',
-    alignItems: 'center',
-  },
-  firstbox: {
-    width: '100%',
-    flexDirection: 'row',
-    marginVertical: 10,
-    borderColor: 'black',
-    backgroundColor: 'white',
-    borderWidth: 0.5,
-    borderRadius: 10,
-    height: 50,
-    paddingTop: 40,
-    // justifyContent: 'center',
-    alignItems: 'center',
-    shadowColor: 'darkgrey',
-    shadowOpacity: 20,
-    // justifyContent: "center",
-  },
-  TextInputbox: {
-    width: '100%',
-    flexDirection: 'row',
-    marginVertical: 10,
-    borderColor: 'black',
-    backgroundColor: 'white',
-    borderWidth: 0.5,
-    borderRadius: 10,
-    height: 50,
-    // padding: 20,
-    alignItems: 'center',
-    // fontSize: 20,
-    // shadowColor: 'darkgrey',
-    // shadowOpacity: 20,
-    // justifyContent: "center",
-  },
-
-  Confirmbutton: {
-    // padding: 20,
-    // paddingBottom: 20,
-
-    paddingHorizontal: 15,
-    backgroundColor: '#d00f16',
-    borderRadius: 20,
-    width: 200,
-    height: 40,
-    shadowColor: '#000',
-    shadowOffset: {width: 2, height: 4},
-    shadowOpacity: 0.9,
-    shadowRadius: 6,
-    elevation: 2,
-    minHeight: '6%',
-    textAlign: 'center',
-    justifyContent: 'center',
-    alignItems: 'center',
-  },
-  bigbuttontext: {
-    fontWeight: 'bold',
-    color: 'white',
-    fontFamily: 'Roboto-Bold',
-    fontSize: 20,
-    textAlign: 'center',
-    paddingTop: '2%',
-
-    // opacity: 1,
-  },
-  bigbutton: {
-    // padding: '50%',
-    paddingHorizontal: '23%',
-    flex: 2,
-    alignItems: 'center',
-    justifyContent: 'flex-end',
-  },
-});
+import React from 'react';
+import Icon from 'react-native-vector-icons/FontAwesome';
+import {
+  StyleSheet,
+  Text,
+  View,
+  TouchableOpacity,
+  TextInput,
+  TouchableWithoutFeedback,
+  Keyboard,
+  // Button,
+  // Picker,
+} from 'react-native';
+// import DropDownItem from "react-native-drop-down-item";
+// import {
+//   TouchableHighlight,
+//   BorderlessButton,
+// } from "react-native-gesture-handler"
+
+export default function RedemptionPoints() {
+  return (
+    <TouchableWithoutFeedback onPress = {() =>{
+      Keyboard.dismiss()
+    }}>
+    <View style={styles.Screen}>
+      {/* <View style={styles.TopBar}>
+        <TouchableOpacity style={styles.TopBarBack}>
+          <Icon name="arrow-left" size={32} color="white" />
+        </TouchableOpacity>
+
+        <View style={styles.TopBarText}>
+          <Text
+            style={{fontSize: 30, fontFamily: 'Roboto-Bold', color: 'white'}}>
+            Redemption Points
+          </Text>
+        </View>
+      </View> */}
+
+      <View style={styles.RestScreen}>
+        <View style={styles.TextInputbox}>
+          <TextInput
+            // style={{fontSize: 12}}
+            placeholder="Rs. per point"
+            placeholderTextColor="black"
+          />
+        </View>
+
+        <View style={styles.bigbutton}>
+          <TouchableOpacity
+            onPress={() => alert('Confirmed!')}
+            style={styles.Confirmbutton}>
+            <Text style={styles.bigbuttontext}>Confirm</Text>
+          </TouchableOpacity>
+        </View>
+      </View>
+    </View>
+    </TouchableWithoutFeedback>
+  );
+}
+
+const styles = StyleSheet.create({
+  // confirmbutton: {
+  //   flexDirection: 'row',
+  //   // width: "30%",
+  //   padding: 50,
+  //   alignItems: 'center',
+  //   justifyContent: 'center',
+  // },
+  Screen: {
+    // flexDirection: "column",
+    height: '100%',
+    backgroundColor:'#e8e8e8'
+    // flex: '20%',
+  },
+  TopBar: {
+    padding: 20,
+    flexDirection: 'row',
+    flex: 2,
+
+    width: '100%',
+    height: '100%',
+    backgroundColor: '#d00f16',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+  },
+  TopBarText: {
+    // padding: 40,
+    flexDirection: 'row',
+    fontSize: 25,
+    fontFamily: 'Roboto-Bold',
+    color: 'white',
+    textAlign: 'left',
+    alignItems: 'flex-start',
+    flex: 6,
+  },
+  TopBarSearch: {
+    // flexDirection: "row",
+    alignItems: 'flex-end',
+    color: 'white',
+    fontSize: 20,
+    flex: 1,
+  },
+  TopBarBack: {
+    color: 'white',
+    flex: 1,
+    fontSize: 20,
+  },
+  RestScreen: {
+    // flex: 9,
+    // width: 100,
+    padding: 60,
+    backgroundColor: '#e8e8e8',
+    height: '90%',
+    // justifyContent: 'center',
+    alignItems: 'center',
+  },
+  firstbox: {
+    width: '100%',
+    flexDirection: 'row',
+    marginVertical: 10,
+    borderColor: 'black',
+    backgroundColor: 'white',
+    borderWidth: 0.5,
+    borderRadius: 10,
+    height: 50,
+    paddingTop: 40,
+    // justifyContent: 'center',
+    alignItems: 'center',
+    shadowColor: 'darkgrey',
+    shadowOpacity: 20,
+    // justifyContent: "center",
+  },
+  TextInputbox: {
+    width: '100%',
+    flexDirection: 'row',
+    marginVertical: 10,
+    borderColor: 'black',
+    backgroundColor: 'white',
+    borderWidth: 0.5,
+    borderRadius: 10,
+    height: 50,
+    // padding: 20,
+    alignItems: 'center',
+    // fontSize: 20,
+    // shadowColor: 'darkgrey',
+    // shadowOpacity: 20,
+    // justifyContent: "center",
+  },
+
+  Confirmbutton: {
+    // padding: 20,
+    // paddingBottom: 20,
+
+    paddingHorizontal: 15,
+    backgroundColor: '#d00f16',
+    borderRadius: 20,
+    width: 200,
+    height: 40,
+    shadowColor: '#000',
+    shadowOffset: {width: 2, height: 4},
+    shadowOpacity: 0.9,
+    shadowRadius: 6,
+    elevation: 2,
+    minHeight: '6%',
+    textAlign: 'center',
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  bigbuttontext: {
+    fontWeight: 'bold',
+    color: 'white',
+    fontFamily: 'Roboto-Bold',
+    fontSize: 20,
+    textAlign: 'center',
+    paddingTop: '2%',
+
+    // opacity: 1,
+  },
+  bigbutton: {
+    // padding: '50%',
+    paddingHorizontal: '23%',
+    flex: 2,
+    alignItems: 'center',
+    justifyContent: 'flex-end',
+  },
+});
diff --git a/screens/Registration.js b/screens/Registration.js
index 72ba42e..37c3e70 100644
--- a/screens/Registration.js
+++ b/screens/Registration.js
@@ -1,399 +1,399 @@
-import React, {useState} from 'react';
-import {
-  StyleSheet,
-  Text,
-  View,
-  ScrollView,
-  ImageBackground,
-  TextInput,
-  TouchableOpacity,
-  TouchableWithoutFeedback,
-  Keyboard,
-} from 'react-native';
-import backg from '../assets/images/backg.png';
-import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
-import firebase from '../assets/DatabaseConfig';
-// import dist from "react-native-firebase" ;
-// import firebase from "react-native-firebase" ;
-// import firebase from "../node_modules/@react-native-firebase";
-// import * as firebase from "../node_modules/@react-native-firebase" ;
-// import firebase from "@react-native-firebase/app" ;
-import auth from '@react-native-firebase/auth';
-import database from '@react-native-firebase/database';
-
-function END(mail) {
-  return mail.endsWith('@lums.edu.pk');
-}
-
-// export const Registration = ({navigation}) => {
-export default function Registration({navigation}) {
-  // const SignUpPress = props =>{
-  //   // firebase.auth().onAuthStateChanged(user => {
-  //   //   navigation.navigate('Login')
-  //   // })
-  //   navigation.navigate('Login')
-  // }
-  const SignUpPress = () => {
-    navigation.navigate('Login');
-  };
-
-  const [email, setEmail] = useState('');
-  const [password, setPassword] = useState('');
-  const [repassword, setRepassword] = useState('');
-  const [username, setUsername] = useState('');
-  const [phone, setPhone] = useState('');
-  const [errorMessage, setErrorMessage] = useState();
-
-  const emailInputHandler = inputEmail => {
-    setEmail(inputEmail);
-  };
-
-  const passwordInputHandler = inputPassword => {
-    setPassword(inputPassword);
-  };
-
-  const repasswordInputHandler = inputRepassword => {
-    setRepassword(inputRepassword);
-  };
-
-  const phoneInputHandler = inputPhone => {
-    setPhone(inputPhone);
-  };
-
-  const usernameInputHandler = inputUsername => {
-    setUsername(inputUsername);
-  };
-
-  const errorMessageInputHandler = inputError => {
-    setErrorMessage(inputError);
-  };
-
-  const handleSignUpPress = () => {
-    emaillums = END(email);
-    if (emaillums && email.length == 20) {
-      if (password.length >= 8) {
-        if (password == repassword) {
-          if (phone.length == 11) {
-            if (username) {
-              handleSignUp();
-              console.log('Signup');
-            } else {
-              alert('Username cannot be empty');
-            }
-          } else {
-            alert('Your Phone number must be 11 digits long.');
-          }
-        } else {
-          alert('Your re-entered password doesnot match.');
-        }
-      } else {
-        alert('Please enter more than 8 characters for password.');
-      }
-    } else {
-      alert('Please enter your LUMS email.');
-      // console.log("email ghalat")
-      // firebase.auth().currentUser.reload()
-      // console.log(firebase.auth().currentUser)
-    }
-  };
-
-  async function handleSignUp() {
-    let meow1 = firebase
-      .auth()
-      .createUserWithEmailAndPassword(email, password)
-      .then(function(result) {
-        console.log('User created');
-
-        firebase
-          .auth()
-          .currentUser.sendEmailVerification()
-          .then(() => {
-            firebase
-              .database()
-              .ref('/Users/' + email.substr(0, 8))
-              .set({
-                Username: username,
-                Useremail: email,
-                Phonenumber: phone,
-                Customerflag: true,
-                Redemptionpoints: 0,
-                BanStatus: false,
-                // ChangeRate: 10,
-              }).catch((e)=>alert(e))
-            console.log('Verify Email');
-            SignUpPress();
-          })
-          .catch(function(error) {
-            console.log(error);
-          });
-
-        console.log('Now Waiting for Verify');
-
-        return result.user.updateProfile({
-          displayName: username,
-        });
-      })
-      .catch(function(error) {
-        console.log(error);
-        // alert(error)
-      });
-    // .catch(error => errorMessageInputHandler)
-    let meow1w = await meow1;
-
-    // let meow2 = firebase
-    //   .auth().currentUser.sendEmailVerification()
-    //   .then(()=> {
-    //     firebase.database().ref('/Users/'+email.substr(0,8)).set({
-    //       Username: username,
-    //       Useremail: email,
-    //       Phonenumber: phone,
-    //       Customerflag: true,
-    //       Redemptionpoints: 0,
-    //       BanStatus: false,
-    //       // ChangeRate: 10,
-    //     })
-    //     console.log("Verify Email")
-    //     SignUpPress()
-    //   } )
-    //   .catch(function(error) {console.log(error)} )
-    // let meow2w = await meow2
-
-    // console.log("Now Waiting for Verify")
-
-    // let meow3 = firebase
-    //   .auth()
-    //   .onAuthStateChanged(function(user) {
-    //     console.log(user)
-    //     // this.props.navigation.navigate('Login')
-    //   })
-    //   .catch(function(error) {console.log(error)} )
-    // let meow3w = await meow3
-    // console.log("really waiting")
-    // SignUpPress()
-    // console.log(firebase.auth().currentUser)
-    // console.log(errorMessage)
-  }
-
-  return (
-    // <ScrollView style={styles.container}>
-    <ImageBackground source={backg} style={styles.bgimage}>
-      <TouchableWithoutFeedback
-        onPress={() => {
-          Keyboard.dismiss();
-        }}>
-        <ScrollView style={styles.container}>
-          <View style={styles.maincontainer}>
-            <View style={styles.bigheading}>
-              <Text style={styles.headingtext}>Get on board!</Text>
-            </View>
-            <View style={styles.inputbox}>
-              <Icon
-                style={styles.inputicon}
-                name="email-outline"
-                size={24}
-                color="#d00f16"
-              />
-              <TextInput
-                placeholder="Email Address"
-                style={styles.inputtext}
-                onChangeText={emailInputHandler}
-                value={email}
-              />
-            </View>
-            <View style={styles.inputbox}>
-              <Icon
-                style={styles.inputicon2}
-                name="lock-outline"
-                size={24}
-                color="#d00f16"
-              />
-              <TextInput
-                secureTextEntry
-                placeholder="Password"
-                style={styles.inputtext}
-                onChangeText={passwordInputHandler}
-                value={password}
-              />
-            </View>
-            <View style={styles.inputbox}>
-              <Icon
-                style={styles.inputicon2}
-                name="lock-open-outline"
-                size={24}
-                color="#d00f16"
-              />
-              <TextInput
-                placeholder="Re-enter Password"
-                style={styles.inputtext}
-                onChangeText={repasswordInputHandler}
-                value={repassword}
-              />
-            </View>
-            <View style={styles.inputbox}>
-              <Icon
-                style={styles.inputicon}
-                name="account-outline"
-                size={24}
-                color="#d00f16"
-              />
-              <TextInput
-                placeholder="Username"
-                style={styles.inputtext}
-                onChangeText={usernameInputHandler}
-                value={username}
-              />
-            </View>
-            <View style={styles.inputbox}>
-              <Icon
-                style={styles.inputicon}
-                name="phone-outline"
-                size={24}
-                color="#d00f16"
-              />
-              <TextInput
-                placeholder="Phone Number"
-                style={styles.inputtext}
-                keyboardType="numeric"
-                onChangeText={phoneInputHandler}
-                value={phone}
-              />
-            </View>
-          </View>
-          <View style={styles.bigbutton}>
-            <TouchableOpacity
-              style={styles.signupbutton}
-              onPress={handleSignUpPress}>
-              <Text style={styles.bigbuttontext}>Sign up</Text>
-            </TouchableOpacity>
-          </View>
-        </ScrollView>
-      </TouchableWithoutFeedback>
-    </ImageBackground>
-    // </ScrollView>
-  );
-}
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    flexDirection: 'column',
-    // justifyContent: "center",
-    // alignItems: "center",
-  },
-  bgimage: {
-    flex: 1,
-    resizeMode: 'stretch',
-    justifyContent: 'center',
-    // position: "absolute",
-  },
-  bigheading: {
-    // flex: 1,
-    paddingTop: '14%',
-    justifyContent: 'center',
-  },
-  headingtext: {
-    // flex: 1,
-    // justifyContent: "center",
-    fontFamily: 'Roboto-Medium',
-    fontSize: 45,
-    color: '#d00f16',
-    // fontWeight: "bold",
-  },
-  inputbox: {
-    marginTop: '6%',
-    color: 'grey',
-    // paddingTop: '6%',
-    flexDirection: 'row',
-    backgroundColor: 'white',
-    borderRadius: 6,
-    // justifyContent: 'center',
-    alignItems: 'center',
-    paddingHorizontal: '2%',
-    width: 280,
-    height: 56,
-    borderColor: 'black',
-    borderBottomWidth: 0.5,
-    // shadowColor: '#000',
-    // shadowOffset: { width: 2, height: 4 },
-    // shadowOpacity: 0.9,
-    // shadowRadius: 6,
-    // elevation: 2,
-  },
-  inputicon: {
-    flex: 2,
-    // paddingTop: '3%',
-    // paddingLeft: '2%',
-    // color: "grey",
-    // paddingTop: '6%',
-    // flexDirection: "row",
-    // flex: 1,
-  },
-  inputicon2: {
-    flex: 2,
-    // paddingTop: '3%',
-    // paddingLeft: '3%',
-    // paddingRight: '1%',
-  },
-  inputtext: {
-    marginLeft: 5,
-    flex: 20,
-    // padding: '2%',
-    // backgroundColor: "white",
-    fontSize: 14,
-    // borderWidth: 1,
-    // borderRadius: 6,
-    // borderColor: '#777',
-    // fontWeight: 'bold',
-    width: '65%',
-    fontFamily: 'Roboto-Medium',
-    // shadowColor: '#000',
-    // shadowOffset: { width: 2, height: 4 },
-    // shadowOpacity: 0.9,
-    // shadowRadius: 6,
-    // elevation: 2,
-  },
-  maincontainer: {
-    alignItems: 'center',
-    justifyContent: 'flex-end',
-    flex: 10,
-  },
-  bigbuttontext: {
-    fontWeight: 'bold',
-    color: 'white',
-    fontFamily: 'Roboto-Bold',
-    fontSize: 20,
-    textAlign: 'center',
-    // minHeight: '10%',
-    paddingTop: '1%',
-    paddingBottom: '1%',
-  },
-  bigbutton: {
-    // paddingHorizontal: '23%',
-    paddingTop: '15%',
-    // justifyContent: 'center',
-    alignItems: 'center',
-    // paddingBottom: '15%',
-    // minHeight: '6%',
-    flex: 2,
-  },
-  signupbutton: {
-    // paddingHorizontal: '20%',
-    // paddingTop: '5%',
-    backgroundColor: '#d00f16',
-    borderRadius: 20,
-    width: 200,
-    height: 40,
-    shadowColor: '#000',
-    shadowOffset: {width: 2, height: 4},
-    shadowOpacity: 0.9,
-    shadowRadius: 6,
-    elevation: 2,
-    // minHeight: '6%',
-    textAlign: 'center',
-    justifyContent: 'center',
-    alignItems: 'center',
-    elevation: 2,
-  },
-});
-
-// export default Registration;
+import React, {useState} from 'react';
+import {
+  StyleSheet,
+  Text,
+  View,
+  ScrollView,
+  ImageBackground,
+  TextInput,
+  TouchableOpacity,
+  TouchableWithoutFeedback,
+  Keyboard,
+} from 'react-native';
+import backg from '../assets/images/backg.png';
+import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
+import firebase from '../assets/DatabaseConfig';
+// import dist from "react-native-firebase" ;
+// import firebase from "react-native-firebase" ;
+// import firebase from "../node_modules/@react-native-firebase";
+// import * as firebase from "../node_modules/@react-native-firebase" ;
+// import firebase from "@react-native-firebase/app" ;
+import auth from '@react-native-firebase/auth';
+import database from '@react-native-firebase/database';
+
+function END(mail) {
+  return mail.endsWith('@lums.edu.pk');
+}
+
+// export const Registration = ({navigation}) => {
+export default function Registration({navigation}) {
+  // const SignUpPress = props =>{
+  //   // firebase.auth().onAuthStateChanged(user => {
+  //   //   navigation.navigate('Login')
+  //   // })
+  //   navigation.navigate('Login')
+  // }
+  const SignUpPress = () => {
+    navigation.navigate('Login');
+  };
+
+  const [email, setEmail] = useState('');
+  const [password, setPassword] = useState('');
+  const [repassword, setRepassword] = useState('');
+  const [username, setUsername] = useState('');
+  const [phone, setPhone] = useState('');
+  const [errorMessage, setErrorMessage] = useState();
+
+  const emailInputHandler = inputEmail => {
+    setEmail(inputEmail);
+  };
+
+  const passwordInputHandler = inputPassword => {
+    setPassword(inputPassword);
+  };
+
+  const repasswordInputHandler = inputRepassword => {
+    setRepassword(inputRepassword);
+  };
+
+  const phoneInputHandler = inputPhone => {
+    setPhone(inputPhone);
+  };
+
+  const usernameInputHandler = inputUsername => {
+    setUsername(inputUsername);
+  };
+
+  const errorMessageInputHandler = inputError => {
+    setErrorMessage(inputError);
+  };
+
+  const handleSignUpPress = () => {
+    emaillums = END(email);
+    if (emaillums && email.length == 20) {
+      if (password.length >= 8) {
+        if (password == repassword) {
+          if (phone.length == 11) {
+            if (username) {
+              handleSignUp();
+              console.log('Signup');
+            } else {
+              alert('Username cannot be empty');
+            }
+          } else {
+            alert('Your Phone number must be 11 digits long.');
+          }
+        } else {
+          alert('Your re-entered password doesnot match.');
+        }
+      } else {
+        alert('Please enter more than 8 characters for password.');
+      }
+    } else {
+      alert('Please enter your LUMS email.');
+      // console.log("email ghalat")
+      // firebase.auth().currentUser.reload()
+      // console.log(firebase.auth().currentUser)
+    }
+  };
+
+  async function handleSignUp() {
+    let meow1 = firebase
+      .auth()
+      .createUserWithEmailAndPassword(email, password)
+      .then(function(result) {
+        console.log('User created');
+
+        firebase
+          .auth()
+          .currentUser.sendEmailVerification()
+          .then(() => {
+            firebase
+              .database()
+              .ref('/Users/' + email.substr(0, 8))
+              .set({
+                Username: username,
+                Useremail: email,
+                Phonenumber: phone,
+                Customerflag: true,
+                Redemptionpoints: 0,
+                BanStatus: false,
+                // ChangeRate: 10,
+              }).catch((e)=>alert(e))
+            console.log('Verify Email');
+            SignUpPress();
+          })
+          .catch(function(error) {
+            console.log(error);
+          });
+
+        console.log('Now Waiting for Verify');
+
+        return result.user.updateProfile({
+          displayName: username,
+        });
+      })
+      .catch(function(error) {
+        console.log(error);
+        // alert(error)
+      });
+    // .catch(error => errorMessageInputHandler)
+    let meow1w = await meow1;
+
+    // let meow2 = firebase
+    //   .auth().currentUser.sendEmailVerification()
+    //   .then(()=> {
+    //     firebase.database().ref('/Users/'+email.substr(0,8)).set({
+    //       Username: username,
+    //       Useremail: email,
+    //       Phonenumber: phone,
+    //       Customerflag: true,
+    //       Redemptionpoints: 0,
+    //       BanStatus: false,
+    //       // ChangeRate: 10,
+    //     })
+    //     console.log("Verify Email")
+    //     SignUpPress()
+    //   } )
+    //   .catch(function(error) {console.log(error)} )
+    // let meow2w = await meow2
+
+    // console.log("Now Waiting for Verify")
+
+    // let meow3 = firebase
+    //   .auth()
+    //   .onAuthStateChanged(function(user) {
+    //     console.log(user)
+    //     // this.props.navigation.navigate('Login')
+    //   })
+    //   .catch(function(error) {console.log(error)} )
+    // let meow3w = await meow3
+    // console.log("really waiting")
+    // SignUpPress()
+    // console.log(firebase.auth().currentUser)
+    // console.log(errorMessage)
+  }
+
+  return (
+    // <ScrollView style={styles.container}>
+    <ImageBackground source={backg} style={styles.bgimage}>
+      <TouchableWithoutFeedback
+        onPress={() => {
+          Keyboard.dismiss();
+        }}>
+        <ScrollView style={styles.container}>
+          <View style={styles.maincontainer}>
+            <View style={styles.bigheading}>
+              <Text style={styles.headingtext}>Get on board!</Text>
+            </View>
+            <View style={styles.inputbox}>
+              <Icon
+                style={styles.inputicon}
+                name="email-outline"
+                size={24}
+                color="#d00f16"
+              />
+              <TextInput
+                placeholder="Email Address"
+                style={styles.inputtext}
+                onChangeText={emailInputHandler}
+                value={email}
+              />
+            </View>
+            <View style={styles.inputbox}>
+              <Icon
+                style={styles.inputicon2}
+                name="lock-outline"
+                size={24}
+                color="#d00f16"
+              />
+              <TextInput
+                secureTextEntry
+                placeholder="Password"
+                style={styles.inputtext}
+                onChangeText={passwordInputHandler}
+                value={password}
+              />
+            </View>
+            <View style={styles.inputbox}>
+              <Icon
+                style={styles.inputicon2}
+                name="lock-open-outline"
+                size={24}
+                color="#d00f16"
+              />
+              <TextInput
+                placeholder="Re-enter Password"
+                style={styles.inputtext}
+                onChangeText={repasswordInputHandler}
+                value={repassword}
+              />
+            </View>
+            <View style={styles.inputbox}>
+              <Icon
+                style={styles.inputicon}
+                name="account-outline"
+                size={24}
+                color="#d00f16"
+              />
+              <TextInput
+                placeholder="Username"
+                style={styles.inputtext}
+                onChangeText={usernameInputHandler}
+                value={username}
+              />
+            </View>
+            <View style={styles.inputbox}>
+              <Icon
+                style={styles.inputicon}
+                name="phone-outline"
+                size={24}
+                color="#d00f16"
+              />
+              <TextInput
+                placeholder="Phone Number"
+                style={styles.inputtext}
+                keyboardType="numeric"
+                onChangeText={phoneInputHandler}
+                value={phone}
+              />
+            </View>
+          </View>
+          <View style={styles.bigbutton}>
+            <TouchableOpacity
+              style={styles.signupbutton}
+              onPress={handleSignUpPress}>
+              <Text style={styles.bigbuttontext}>Sign up</Text>
+            </TouchableOpacity>
+          </View>
+        </ScrollView>
+      </TouchableWithoutFeedback>
+    </ImageBackground>
+    // </ScrollView>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    flexDirection: 'column',
+    // justifyContent: "center",
+    // alignItems: "center",
+  },
+  bgimage: {
+    flex: 1,
+    resizeMode: 'stretch',
+    justifyContent: 'center',
+    // position: "absolute",
+  },
+  bigheading: {
+    // flex: 1,
+    paddingTop: '14%',
+    justifyContent: 'center',
+  },
+  headingtext: {
+    // flex: 1,
+    // justifyContent: "center",
+    fontFamily: 'Roboto-Medium',
+    fontSize: 45,
+    color: '#d00f16',
+    // fontWeight: "bold",
+  },
+  inputbox: {
+    marginTop: '6%',
+    color: 'grey',
+    // paddingTop: '6%',
+    flexDirection: 'row',
+    backgroundColor: 'white',
+    borderRadius: 6,
+    // justifyContent: 'center',
+    alignItems: 'center',
+    paddingHorizontal: '2%',
+    width: 280,
+    height: 56,
+    borderColor: 'black',
+    borderBottomWidth: 0.5,
+    // shadowColor: '#000',
+    // shadowOffset: { width: 2, height: 4 },
+    // shadowOpacity: 0.9,
+    // shadowRadius: 6,
+    // elevation: 2,
+  },
+  inputicon: {
+    flex: 2,
+    // paddingTop: '3%',
+    // paddingLeft: '2%',
+    // color: "grey",
+    // paddingTop: '6%',
+    // flexDirection: "row",
+    // flex: 1,
+  },
+  inputicon2: {
+    flex: 2,
+    // paddingTop: '3%',
+    // paddingLeft: '3%',
+    // paddingRight: '1%',
+  },
+  inputtext: {
+    marginLeft: 5,
+    flex: 20,
+    // padding: '2%',
+    // backgroundColor: "white",
+    fontSize: 14,
+    // borderWidth: 1,
+    // borderRadius: 6,
+    // borderColor: '#777',
+    // fontWeight: 'bold',
+    width: '65%',
+    fontFamily: 'Roboto-Medium',
+    // shadowColor: '#000',
+    // shadowOffset: { width: 2, height: 4 },
+    // shadowOpacity: 0.9,
+    // shadowRadius: 6,
+    // elevation: 2,
+  },
+  maincontainer: {
+    alignItems: 'center',
+    justifyContent: 'flex-end',
+    flex: 10,
+  },
+  bigbuttontext: {
+    fontWeight: 'bold',
+    color: 'white',
+    fontFamily: 'Roboto-Bold',
+    fontSize: 20,
+    textAlign: 'center',
+    // minHeight: '10%',
+    paddingTop: '1%',
+    paddingBottom: '1%',
+  },
+  bigbutton: {
+    // paddingHorizontal: '23%',
+    paddingTop: '15%',
+    // justifyContent: 'center',
+    alignItems: 'center',
+    // paddingBottom: '15%',
+    // minHeight: '6%',
+    flex: 2,
+  },
+  signupbutton: {
+    // paddingHorizontal: '20%',
+    // paddingTop: '5%',
+    backgroundColor: '#d00f16',
+    borderRadius: 20,
+    width: 200,
+    height: 40,
+    shadowColor: '#000',
+    shadowOffset: {width: 2, height: 4},
+    shadowOpacity: 0.9,
+    shadowRadius: 6,
+    elevation: 2,
+    // minHeight: '6%',
+    textAlign: 'center',
+    justifyContent: 'center',
+    alignItems: 'center',
+    elevation: 2,
+  },
+});
+
+// export default Registration;
diff --git a/screens/Shopping_cart.js b/screens/Shopping_cart.js
index 947f4fc..f887954 100644
--- a/screens/Shopping_cart.js
+++ b/screens/Shopping_cart.js
@@ -1,597 +1,597 @@
-import React, {useState} from 'react';
-import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
-import AsyncStorage from '@react-native-community/async-storage';
-import {StyleSheet, Text, View, TouchableOpacity, Image} from 'react-native';
-import {FlatList} from 'react-native-gesture-handler';
-import {NavigationEvents} from 'react-navigation';
-import newbiryani from '../assets/images/newbiryani.png';
-import Swipeable from 'react-native-gesture-handler/Swipeable';
-// import DropDownItem from "react-native-drop-down-item";
-// import {
-//   TouchableHighlight,
-//   BorderlessButton,
-// } from "react-native-gesture-handler"
-
-export default function Shopping({navigation}) {
-  const [product, setProduct] = useState([]);
-  // const [product, setProduct] = useState([
-  //   {name: 'pencil', price: '40', quantity: 0},
-  //   {name: 'ruler', price: '50', quantity: 0},
-  //   {name: 'sharpener', price: '5', quantity: 0},
-  // ]);
-  const [total, setTotal] = useState(0);
-  //   const onAdd = () => setProd;
-  // const onMin = () => setProduct(prev => prev - 1)
-  const handlePress = () => {
-    if (product.length==0){
-      alert('Shopping cart is empty')
-      return
-    }
-    navigation.navigate('Checkout',{Subtotal: total, Products: product});
-  };
-  
-  async function qtyless(name, price, quantity) {
-    try {
-      await AsyncStorage.setItem(
-        name,
-        JSON.stringify({
-          price: parseInt(price),
-          quantity: parseInt(quantity) - 1,
-        }),
-      );
-      // await AsyncStorage.removeItem("@storage_Key")
-    } catch (e) {
-      // saving error
-    }
-  }
-
-  async function qtymore(name, price, quantity) {
-    try {
-      await AsyncStorage.setItem(
-        name,
-        JSON.stringify({
-          price: parseInt(price),
-          quantity: parseInt(quantity) + 1,
-        }),
-      );
-      // await AsyncStorage.removeItem("@storage_Key")
-    } catch (e) {
-      // saving error
-    }
-  }
-
-  // function onMin(item) {
-  //   console.log(item);
-  //   if (item.quantity != 0) {
-  //     // item.quantity = item.quantity-1
-  //     qtyless(item.name, item.price, item.quantity);
-  //     getData();
-  //   }
-  // }
-
-  // function onPlus(item) {
-  //   console.log(item);
-  //   // item.quantity = item.quantity+1
-  //   qtymore(item.name, item.price, item.quantity);
-  //   getData();
-  // }
-  function onMin(item) {
-    console.log(item);
-    if (item.quantity != 0) {
-      // item.quantity = item.quantity-1
-      qtyless(item.name, item.price, item.quantity).then(()=>{
-        let i=product.findIndex(element=>element.name==item.name)
-        let New=[...product]
-        New[i]={...New[i],"quantity":parseInt(item.quantity)-1}
-        setProduct(New)
-        setTotal(total=>total-item.price)
-      })
-      // getData()
-      // console.log(product)
-
-    }
-  }
-
-  function onPlus(item) {
-    console.log(item)
-    console.log(product)
-    // item.quantity = item.quantity+1
-    // qtymore(item.name, item.price, item.quantity).then(()=>{
-
-      // console.log(product.findIndex(element=>element.name==item.name))
-      console.log(product)
-      // product[product.findIndex(element=>element.name==item.name)].quantity=item.quantity+1
-      // setProduct((PROD)=>{
-      //   PROD.map((item)=>{
-      //     console.log(item)
-      //   })
-      // })
-      qtymore(item.name, item.price, item.quantity).then(()=>{
-        let i=product.findIndex(element=>element.name==item.name)
-        let New=[...product]
-        New[i]={...New[i],"quantity":parseInt(item.quantity)+1}
-        setProduct(New)
-        setTotal(total=>total+item.price)
-      })
-
-
-      console.log(product)
-      
-    // })
-    // getData()
-  }
-
-  // async function storeData() {
-  //   try {
-  //     await AsyncStorage.setItem('@storage_Key', 'stored value')
-  //   } catch (e) {
-  //     // saving error
-  //   }
-  // }
-
-  async function getitem(name,prodarr,Total) {
-    console.log("TOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO   ",Total)
-    try {
-      const item = await AsyncStorage.getItem(name);
-      // console.log(name)
-      // const value = await AsyncStorage.getAllKeys()
-      if (item !== null) {
-        let myitem = JSON.parse(item);
-        console.log(myitem)
-
-        let newprod = {
-          name: name,
-          price: parseInt(myitem.price),
-          quantity: parseInt(myitem.quantity),
-          CAT: myitem.category,
-          SUB: myitem.subcat,
-          available: myitem.available
-        };
-
-        // console.log(myitem.price+10)
-        // console.log(myitem.price*myitem.quantity)
-        Total=Total+(myitem.price*myitem.quantity)
-        setTotal(total=>total+Total)
-        // console.log("TOTAL    ",Total)
-
-        // console.log(newprod)
-
-        prodarr.push(newprod)
-      }
-    } catch (e) {
-      // console.log(e);
-      // error reading value
-    }
-
-    // prodarr.push(newprod)
-  }
-
-  async function getData() {
-    // console.log("!@#$%^&         ",product)
-    setTotal(0)
-    try {
-      const value = await AsyncStorage.getAllKeys()
-      // console.log("VALVALVLAVLAVLLVALAV", value)
-      if(value !== null) {
-        // console.log("VALLL",value)
-        let prodarr  = []
-        let Total=0
-        value.forEach(function(name) {
-          // let newprod = getitem(name, prodarr)
-          getitem(name, prodarr, Total).then(()=>{
-            // console.log("1PROD",prodarr)
-            // console.log("PRODDDDD",product)
-            setProduct(prodarr)   
-          })
-          // console.log(prodarr)
-
-          // prodarr.push(newprod)
-
-          // console.log(name)
-        });
-        // setProduct(prodarr);
-        // value previously stored
-      } 
-      // else {
-      //   console.log('lmao');
-      // }
-    } catch (e) {
-      // error reading value
-    }
-  }
-
-  // function blurry() {
-  //   console.log("hsadhasdashdhasdahsd")
-  // }
-
-  // function DeleteCart(item){
-  //   console.log(item)
-  //   setProduct((item)=>{
-  //     // product.findIndex((I)=>I=item.name)
-      
-  //     AsyncStorage.removeItem(item.name).then(setTotal(total=>total-(item.quantity*item.price)))
-  //     return product.filter((I)=>I.name!=item.name)
-  //   })
-  // }
-
-  const leftActions = (item) => {
-    return (
-      <View
-        style={{
-          flexDirection: 'row',
-          marginVertical: 2,
-          width: '17.5%',
-          // opacity: 0.8,
-          borderRadius: 2,
-          // paddingVertical: ,
-        }}>
-        <TouchableOpacity
-          style={{
-            flex: 1,
-            backgroundColor: '#d00f16',
-            // opacity: 0.2,
-            // height: 100,
-            alignItems: 'center',
-            justifyContent: 'center',
-            // marginVertical: 5,
-          }}
-          onPress={()=>setProduct(()=>{
-            // product.findIndex((I)=>I=item.name)
-            AsyncStorage.removeItem(item.name).then(setTotal(total=>total-(item.quantity*item.price)))
-            return product.filter((I)=>I.name!=item.name)
-            })
-          }
-            
-          >
-          <Icon name="delete" color="white" size={24} />
-        </TouchableOpacity>
-      </View>
-    );
-  };
-  //   const onAdd = () => setProduct(prev => prev + 1);
-
-  return (
-    <View style={styles.Screen}>
-      <NavigationEvents
-        onWillFocus={() => {
-          getData();
-        }}
-      />
-      <View style={{width: '100%', height: '65%', marginVertical:12}}>
-        <FlatList
-          data={product}
-          keyExtractor={item => item.name}
-          renderItem={({item}) => (
-            <Swipeable renderLeftActions={()=>leftActions(item)}>
-              <View style={styles.TextInputbox}>
-                <View style={{width: 100, height: 100, flex: 2}}>
-                  <Image
-                    source={newbiryani}
-                    style={{
-                      width: '100%',
-                      height: '100%',
-                      resizeMode: 'stretch',
-                    }}
-                  />
-                </View>
-                <View
-                  style={{
-                    flex: 5,
-                    flexDirection: 'column',
-                    justifyContent: 'space-around',
-                    // alignItems: '',
-                    paddingHorizontal: '5%',
-                  }}>
-                  <Text style={styles.title}>{item.name}</Text>
-                  <Text style={styles.title1}>{'Rs. ' + item.price}</Text>
-                </View>
-
-                <View
-                  style={{
-                    flexDirection: 'column',
-                    justifyContent: 'space-around',
-                    // alignContent: 'flex-end',
-                    // paddingLeft: 100,
-                    flex: 1,
-                  }}>
-                  {/* <View >
-                  <Text>{item.quantity}</Text>
-                </View> */}
-                  <TouchableOpacity
-                    style={styles.Confirmbutton}
-                    onPress={() => {
-                      onPlus(item);
-                    }}>
-                    {/* // onPress={onAdd(item.quantity)}> */}
-                    <Icon name="plus" color="#ffffff" />
-                  </TouchableOpacity>
-                  <Text style={{paddingLeft: 22, opacity: 0.5}}>
-                    {item.quantity}
-                  </Text>
-                  <TouchableOpacity
-                    style={[styles.Confirmbutton,{backgroundColor: item.quantity==1? "grey": "#d00f16" }]}
-                    disabled={item.quantity==1}
-                    onPress={() => {
-                      onMin(item);
-                    }}>
-                    {/* //   onPress={item => setProduct(item.quantity + 1)}> */}
-                    {/* //   onPress={onMin(item)}> */}
-                    {/* <Text style={styles.boxfont}>UPDATE</Text> */}
-                    <Icon name="minus" color="#ffffff" style="light" />
-                  </TouchableOpacity>
-                </View>
-              </View>
-            </Swipeable>
-          )}
-        />
-      </View>
-      <View style={{alignItems: 'center', paddingTop: '5%'}}>
-        <View style={styles.totalbox}>
-          {/* <View
-            style={{
-              flexDirection: 'row',
-              justifyContent: 'space-between',
-              paddingVertical: 10,
-            }}>
-            <Text style={styles.totalboxfont}>SubTotal</Text>
-            <Text style={styles.totalboxfont}>Rs. {total}</Text>
-          </View>
-          <View
-            style={{
-              flexDirection: 'row',
-              justifyContent: 'space-between',
-              paddingVertical: 10,
-            }}>
-            <Text style={styles.totalboxfont}>Discount</Text>
-            <Text style={styles.totalboxfont}>Rs. {total}</Text>
-          </View> */}
-          <View
-            style={{
-              flexDirection: 'row',
-              justifyContent: 'space-between',
-              paddingVertical: 10,
-            }}>
-            <Text style={styles.totalboxfont1}>Total</Text>
-            <Text style={styles.totalboxfont1}>Rs. {total}</Text>
-          </View>
-        </View>
-      </View>
-      <View style={styles.bigbutton}>
-        <TouchableOpacity
-          onPress={handlePress}
-          style={[styles.Confirmationbutton]}>
-          <Text style={styles.bigbuttontext}>Checkout</Text>
-        </TouchableOpacity>
-      </View>
-    </View>
-  );
-}
-
-const styles = StyleSheet.create({
-  // confirmbutton: {
-  //   flexDirection: 'row',
-  //   // width: "30%",
-  //   padding: 50,
-  //   alignItems: 'center',
-  //   justifyContent: 'center',
-  // },
-  Screen: {
-    // flexDirection: 'row',
-    height: '100%',
-    // paddingTop: '10%',
-    // justifyContent: 'center',
-    backgroundColor: '#e8e8e8',
-
-    // flex: '20%',
-  },
-  TopBar: {
-    padding: 20,
-    flexDirection: 'row',
-    flex: 2,
-
-    width: '100%',
-    height: '100%',
-    backgroundColor: '#d00f16',
-    alignItems: 'center',
-    justifyContent: 'space-between',
-  },
-  TopBarText: {
-    // padding: 40,
-    flexDirection: 'row',
-    fontSize: 30,
-    fontFamily: 'Roboto-Bold',
-    color: 'white',
-    textAlign: 'left',
-    alignItems: 'flex-start',
-    flex: 6,
-  },
-  TopBarSearch: {
-    // flexDirection: "row",
-    alignItems: 'flex-end',
-    color: 'white',
-    fontSize: 20,
-    flex: 1,
-  },
-  TopBarBack: {
-    color: 'white',
-    flex: 1,
-    fontSize: 20,
-  },
-  RestScreen: {
-    // flex: 9,
-    // width: 100,
-    // flex: 8,
-    // width: 100,
-    paddingTop: 50,
-    backgroundColor: '#e8e8e8',
-    height: '560',
-    // justifyContent: 'center',
-    // padding: 40,
-    alignItems: 'center',
-    // justifyContent: 'center',
-    // alignItems: 'center',
-  },
-  firstbox: {
-    width: '100%',
-    flexDirection: 'row',
-    marginVertical: 10,
-    borderColor: 'black',
-    backgroundColor: 'white',
-    borderWidth: 0.5,
-    borderRadius: 10,
-    height: 50,
-    paddingTop: 40,
-    // justifyContent: 'center',
-    alignItems: 'center',
-    shadowColor: 'darkgrey',
-    shadowOpacity: 20,
-    // justifyContent: "center",
-  },
-  totalbox: {
-    width: '100%',
-    flexDirection: 'column',
-    // marginVertical: 10,
-    borderColor: 'black',
-    backgroundColor: 'white',
-    // borderWidth: 0.5,
-    // borderRadius: 5,
-    height: 50,
-    // paddingHorizontal: 20,
-    paddingHorizontal: '5.7%',
-    // paddingBottom: '10%',
-    // paddingLeft: 5,
-    // paddingTop: 40,
-    justifyContent: 'space-between',
-    // alignContent: 'center',
-    shadowColor: 'darkgrey',
-    shadowOpacity: 20,
-  },
-  TextInputbox: {
-    flexDirection: 'row',
-    padding: 7,
-    // paddingHorizontal: '5.7%',
-    width: '100%',
-    height: 100,
-    borderRadius: 5,
-    // elevation: 5,
-    // flexDirection: 'row',
-    marginVertical: 2,
-    // borderColor: 'black',
-    backgroundColor: 'white',
-    borderWidth: 0,
-    // borderBottomWidth: 1,
-    // alignContent: 'center',
-    // justifyContent: 'space-around',
-    // textAlign: 'left',
-    fontFamily: 'Roboto',
-    shadowColor: 'darkgrey',
-    shadowOpacity: 20,
-    // borderRadius: 10,
-    // height: 50,
-  },
-  title: {
-    fontSize: 20,
-    color: 'black',
-    // paddingHorizontal:
-    // fontWeight: 'bold',
-  },
-  title1: {
-    fontSize: 14,
-    color: 'black',
-    opacity: 0.5,
-  },
-  totalboxfont: {
-    fontSize: 16,
-    fontFamily: 'Roboto',
-    color: 'black',
-    opacity: 0.5,
-    // paddingHorizontal: 10,
-  },
-  totalboxfont1: {
-    fontSize: 20,
-    fontWeight: 'bold',
-    fontFamily: 'Roboto-bold',
-    color: 'black',
-    // opacity: 0.5,
-    // paddingHorizontal: 10,
-  },
-  boxfont: {
-    fontSize: 14,
-    color: '#ffffff',
-    // paddingTop: 4,
-  },
-
-  Confirmbutton: {
-    // padding: 20,
-    // paddingBottom: 20,
-    // paddingHorizontal: 15,
-    backgroundColor: '#d00f16',
-    borderRadius: 2,
-    width: 20,
-    height: 20,
-    shadowColor: '#000',
-    borderRadius: 180,
-    // shadowOffset: {width: 2, height: 4},
-    shadowOpacity: 20,
-    // shadowRadius: 6,
-    elevation: 5,
-    // minHeight: '6%',
-    // textAlign: 'center',
-    justifyContent: 'center',
-    alignItems: 'center',
-    marginHorizontal: 16,
-  },
-  Confirmationbutton: {
-    // padding: '5%',
-    // marginVertical: 10,
-    paddingHorizontal: 15,
-    backgroundColor: '#d00f16',
-    borderRadius: 20,
-    width: 200,
-    height: 40,
-    shadowColor: '#000',
-    shadowOffset: {width: 2, height: 4},
-    shadowOpacity: 0.9,
-    shadowRadius: 6,
-    // elevation: 2,
-    // minHeight: '6%',
-    textAlign: 'center',
-    justifyContent: 'center',
-    alignItems: 'center',
-    elevation: 2,
-  },
-  bigbuttontext: {
-    fontWeight: 'bold',
-    color: 'white',
-    fontFamily: 'Roboto-Bold',
-    fontSize: 20,
-    textAlign: 'center',
-    // paddingTop: '2%',
-
-    // opacity: 1,
-  },
-  bigbutton: {
-    paddingTop: '10%',
-    paddingHorizontal: '23%',
-    // flex: 2,
-    alignItems: 'center',
-    justifyContent: 'center',
-  },
-  plusbutton: {
-    // paddingHorizontal: 15,
-    // paddingTop: 28,
-    backgroundColor: '#d00f16',
-    borderRadius: 180,
-    width: 56,
-    height: 56,
-    shadowColor: '#000',
-    shadowOffset: {width: 2, height: 4},
-    shadowOpacity: 0.9,
-    shadowRadius: 6,
-    elevation: 5,
-    // minHeight: '6%',
-    textAlign: 'center',
-    justifyContent: 'center',
-    alignItems: 'center',
-  },
-});
+import React, {useState} from 'react';
+import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
+import AsyncStorage from '@react-native-community/async-storage';
+import {StyleSheet, Text, View, TouchableOpacity, Image} from 'react-native';
+import {FlatList} from 'react-native-gesture-handler';
+import {NavigationEvents} from 'react-navigation';
+import newbiryani from '../assets/images/newbiryani.png';
+import Swipeable from 'react-native-gesture-handler/Swipeable';
+// import DropDownItem from "react-native-drop-down-item";
+// import {
+//   TouchableHighlight,
+//   BorderlessButton,
+// } from "react-native-gesture-handler"
+
+export default function Shopping({navigation}) {
+  const [product, setProduct] = useState([]);
+  // const [product, setProduct] = useState([
+  //   {name: 'pencil', price: '40', quantity: 0},
+  //   {name: 'ruler', price: '50', quantity: 0},
+  //   {name: 'sharpener', price: '5', quantity: 0},
+  // ]);
+  const [total, setTotal] = useState(0);
+  //   const onAdd = () => setProd;
+  // const onMin = () => setProduct(prev => prev - 1)
+  const handlePress = () => {
+    if (product.length==0){
+      alert('Shopping cart is empty')
+      return
+    }
+    navigation.navigate('Checkout',{Subtotal: total, Products: product});
+  };
+  
+  async function qtyless(name, price, quantity) {
+    try {
+      await AsyncStorage.setItem(
+        name,
+        JSON.stringify({
+          price: parseInt(price),
+          quantity: parseInt(quantity) - 1,
+        }),
+      );
+      // await AsyncStorage.removeItem("@storage_Key")
+    } catch (e) {
+      // saving error
+    }
+  }
+
+  async function qtymore(name, price, quantity) {
+    try {
+      await AsyncStorage.setItem(
+        name,
+        JSON.stringify({
+          price: parseInt(price),
+          quantity: parseInt(quantity) + 1,
+        }),
+      );
+      // await AsyncStorage.removeItem("@storage_Key")
+    } catch (e) {
+      // saving error
+    }
+  }
+
+  // function onMin(item) {
+  //   console.log(item);
+  //   if (item.quantity != 0) {
+  //     // item.quantity = item.quantity-1
+  //     qtyless(item.name, item.price, item.quantity);
+  //     getData();
+  //   }
+  // }
+
+  // function onPlus(item) {
+  //   console.log(item);
+  //   // item.quantity = item.quantity+1
+  //   qtymore(item.name, item.price, item.quantity);
+  //   getData();
+  // }
+  function onMin(item) {
+    console.log(item);
+    if (item.quantity != 0) {
+      // item.quantity = item.quantity-1
+      qtyless(item.name, item.price, item.quantity).then(()=>{
+        let i=product.findIndex(element=>element.name==item.name)
+        let New=[...product]
+        New[i]={...New[i],"quantity":parseInt(item.quantity)-1}
+        setProduct(New)
+        setTotal(total=>total-item.price)
+      })
+      // getData()
+      // console.log(product)
+
+    }
+  }
+
+  function onPlus(item) {
+    console.log(item)
+    console.log(product)
+    // item.quantity = item.quantity+1
+    // qtymore(item.name, item.price, item.quantity).then(()=>{
+
+      // console.log(product.findIndex(element=>element.name==item.name))
+      console.log(product)
+      // product[product.findIndex(element=>element.name==item.name)].quantity=item.quantity+1
+      // setProduct((PROD)=>{
+      //   PROD.map((item)=>{
+      //     console.log(item)
+      //   })
+      // })
+      qtymore(item.name, item.price, item.quantity).then(()=>{
+        let i=product.findIndex(element=>element.name==item.name)
+        let New=[...product]
+        New[i]={...New[i],"quantity":parseInt(item.quantity)+1}
+        setProduct(New)
+        setTotal(total=>total+item.price)
+      })
+
+
+      console.log(product)
+      
+    // })
+    // getData()
+  }
+
+  // async function storeData() {
+  //   try {
+  //     await AsyncStorage.setItem('@storage_Key', 'stored value')
+  //   } catch (e) {
+  //     // saving error
+  //   }
+  // }
+
+  async function getitem(name,prodarr,Total) {
+    console.log("TOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO   ",Total)
+    try {
+      const item = await AsyncStorage.getItem(name);
+      // console.log(name)
+      // const value = await AsyncStorage.getAllKeys()
+      if (item !== null) {
+        let myitem = JSON.parse(item);
+        console.log(myitem)
+
+        let newprod = {
+          name: name,
+          price: parseInt(myitem.price),
+          quantity: parseInt(myitem.quantity),
+          CAT: myitem.category,
+          SUB: myitem.subcat,
+          available: myitem.available
+        };
+
+        // console.log(myitem.price+10)
+        // console.log(myitem.price*myitem.quantity)
+        Total=Total+(myitem.price*myitem.quantity)
+        setTotal(total=>total+Total)
+        // console.log("TOTAL    ",Total)
+
+        // console.log(newprod)
+
+        prodarr.push(newprod)
+      }
+    } catch (e) {
+      // console.log(e);
+      // error reading value
+    }
+
+    // prodarr.push(newprod)
+  }
+
+  async function getData() {
+    // console.log("!@#$%^&         ",product)
+    setTotal(0)
+    try {
+      const value = await AsyncStorage.getAllKeys()
+      // console.log("VALVALVLAVLAVLLVALAV", value)
+      if(value !== null) {
+        // console.log("VALLL",value)
+        let prodarr  = []
+        let Total=0
+        value.forEach(function(name) {
+          // let newprod = getitem(name, prodarr)
+          getitem(name, prodarr, Total).then(()=>{
+            // console.log("1PROD",prodarr)
+            // console.log("PRODDDDD",product)
+            setProduct(prodarr)   
+          })
+          // console.log(prodarr)
+
+          // prodarr.push(newprod)
+
+          // console.log(name)
+        });
+        // setProduct(prodarr);
+        // value previously stored
+      } 
+      // else {
+      //   console.log('lmao');
+      // }
+    } catch (e) {
+      // error reading value
+    }
+  }
+
+  // function blurry() {
+  //   console.log("hsadhasdashdhasdahsd")
+  // }
+
+  // function DeleteCart(item){
+  //   console.log(item)
+  //   setProduct((item)=>{
+  //     // product.findIndex((I)=>I=item.name)
+      
+  //     AsyncStorage.removeItem(item.name).then(setTotal(total=>total-(item.quantity*item.price)))
+  //     return product.filter((I)=>I.name!=item.name)
+  //   })
+  // }
+
+  const leftActions = (item) => {
+    return (
+      <View
+        style={{
+          flexDirection: 'row',
+          marginVertical: 2,
+          width: '17.5%',
+          // opacity: 0.8,
+          borderRadius: 2,
+          // paddingVertical: ,
+        }}>
+        <TouchableOpacity
+          style={{
+            flex: 1,
+            backgroundColor: '#d00f16',
+            // opacity: 0.2,
+            // height: 100,
+            alignItems: 'center',
+            justifyContent: 'center',
+            // marginVertical: 5,
+          }}
+          onPress={()=>setProduct(()=>{
+            // product.findIndex((I)=>I=item.name)
+            AsyncStorage.removeItem(item.name).then(setTotal(total=>total-(item.quantity*item.price)))
+            return product.filter((I)=>I.name!=item.name)
+            })
+          }
+            
+          >
+          <Icon name="delete" color="white" size={24} />
+        </TouchableOpacity>
+      </View>
+    );
+  };
+  //   const onAdd = () => setProduct(prev => prev + 1);
+
+  return (
+    <View style={styles.Screen}>
+      <NavigationEvents
+        onWillFocus={() => {
+          getData();
+        }}
+      />
+      <View style={{width: '100%', height: 480, marginVertical:12}}>
+        <FlatList
+          data={product}
+          keyExtractor={item => item.name}
+          renderItem={({item}) => (
+            <Swipeable renderLeftActions={()=>leftActions(item)}>
+              <View style={styles.TextInputbox}>
+                <View style={{width: 100, height: 100, flex: 2}}>
+                  <Image
+                    source={newbiryani}
+                    style={{
+                      width: '100%',
+                      height: '100%',
+                      resizeMode: 'stretch',
+                    }}
+                  />
+                </View>
+                <View
+                  style={{
+                    flex: 5,
+                    flexDirection: 'column',
+                    justifyContent: 'space-around',
+                    // alignItems: '',
+                    paddingHorizontal: '5%',
+                  }}>
+                  <Text style={styles.title}>{item.name}</Text>
+                  <Text style={styles.title1}>{'Rs. ' + item.price}</Text>
+                </View>
+
+                <View
+                  style={{
+                    flexDirection: 'column',
+                    justifyContent: 'space-around',
+                    // alignContent: 'flex-end',
+                    // paddingLeft: 100,
+                    flex: 1,
+                  }}>
+                  {/* <View >
+                  <Text>{item.quantity}</Text>
+                </View> */}
+                  <TouchableOpacity
+                    style={styles.Confirmbutton}
+                    onPress={() => {
+                      onPlus(item);
+                    }}>
+                    {/* // onPress={onAdd(item.quantity)}> */}
+                    <Icon name="plus" color="#ffffff" />
+                  </TouchableOpacity>
+                  <Text style={{paddingLeft: 22, opacity: 0.5}}>
+                    {item.quantity}
+                  </Text>
+                  <TouchableOpacity
+                    style={[styles.Confirmbutton,{backgroundColor: item.quantity==1? "grey": "#d00f16" }]}
+                    disabled={item.quantity==1}
+                    onPress={() => {
+                      onMin(item);
+                    }}>
+                    {/* //   onPress={item => setProduct(item.quantity + 1)}> */}
+                    {/* //   onPress={onMin(item)}> */}
+                    {/* <Text style={styles.boxfont}>UPDATE</Text> */}
+                    <Icon name="minus" color="#ffffff" style="light" />
+                  </TouchableOpacity>
+                </View>
+              </View>
+            </Swipeable>
+          )}
+        />
+      </View>
+      <View style={{alignItems: 'center', paddingTop: '5%'}}>
+        <View style={styles.totalbox}>
+          {/* <View
+            style={{
+              flexDirection: 'row',
+              justifyContent: 'space-between',
+              paddingVertical: 10,
+            }}>
+            <Text style={styles.totalboxfont}>SubTotal</Text>
+            <Text style={styles.totalboxfont}>Rs. {total}</Text>
+          </View>
+          <View
+            style={{
+              flexDirection: 'row',
+              justifyContent: 'space-between',
+              paddingVertical: 10,
+            }}>
+            <Text style={styles.totalboxfont}>Discount</Text>
+            <Text style={styles.totalboxfont}>Rs. {total}</Text>
+          </View> */}
+          <View
+            style={{
+              flexDirection: 'row',
+              justifyContent: 'space-between',
+              paddingVertical: 10,
+            }}>
+            <Text style={styles.totalboxfont1}>Total</Text>
+            <Text style={styles.totalboxfont1}>Rs. {total}</Text>
+          </View>
+        </View>
+      </View>
+      <View style={styles.bigbutton}>
+        <TouchableOpacity
+          onPress={handlePress}
+          style={[styles.Confirmationbutton]}>
+          <Text style={styles.bigbuttontext}>Checkout</Text>
+        </TouchableOpacity>
+      </View>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  // confirmbutton: {
+  //   flexDirection: 'row',
+  //   // width: "30%",
+  //   padding: 50,
+  //   alignItems: 'center',
+  //   justifyContent: 'center',
+  // },
+  Screen: {
+    // flexDirection: 'row',
+    height: '100%',
+    // paddingTop: '10%',
+    // justifyContent: 'center',
+    backgroundColor: '#e8e8e8',
+
+    // flex: '20%',
+  },
+  TopBar: {
+    padding: 20,
+    flexDirection: 'row',
+    flex: 2,
+
+    width: '100%',
+    height: '100%',
+    backgroundColor: '#d00f16',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+  },
+  TopBarText: {
+    // padding: 40,
+    flexDirection: 'row',
+    fontSize: 30,
+    fontFamily: 'Roboto-Bold',
+    color: 'white',
+    textAlign: 'left',
+    alignItems: 'flex-start',
+    flex: 6,
+  },
+  TopBarSearch: {
+    // flexDirection: "row",
+    alignItems: 'flex-end',
+    color: 'white',
+    fontSize: 20,
+    flex: 1,
+  },
+  TopBarBack: {
+    color: 'white',
+    flex: 1,
+    fontSize: 20,
+  },
+  RestScreen: {
+    // flex: 9,
+    // width: 100,
+    // flex: 8,
+    // width: 100,
+    paddingTop: 50,
+    backgroundColor: '#e8e8e8',
+    height: '560',
+    // justifyContent: 'center',
+    // padding: 40,
+    alignItems: 'center',
+    // justifyContent: 'center',
+    // alignItems: 'center',
+  },
+  firstbox: {
+    width: '100%',
+    flexDirection: 'row',
+    marginVertical: 10,
+    borderColor: 'black',
+    backgroundColor: 'white',
+    borderWidth: 0.5,
+    borderRadius: 10,
+    height: 50,
+    paddingTop: 40,
+    // justifyContent: 'center',
+    alignItems: 'center',
+    shadowColor: 'darkgrey',
+    shadowOpacity: 20,
+    // justifyContent: "center",
+  },
+  totalbox: {
+    width: '100%',
+    flexDirection: 'column',
+    // marginVertical: 10,
+    borderColor: 'black',
+    backgroundColor: 'white',
+    // borderWidth: 0.5,
+    // borderRadius: 5,
+    height: 50,
+    // paddingHorizontal: 20,
+    paddingHorizontal: '5.7%',
+    // paddingBottom: '10%',
+    // paddingLeft: 5,
+    // paddingTop: 40,
+    justifyContent: 'space-between',
+    // alignContent: 'center',
+    shadowColor: 'darkgrey',
+    shadowOpacity: 20,
+  },
+  TextInputbox: {
+    flexDirection: 'row',
+    padding: 7,
+    // paddingHorizontal: '5.7%',
+    width: '100%',
+    height: 100,
+    borderRadius: 5,
+    // elevation: 5,
+    // flexDirection: 'row',
+    marginVertical: 2,
+    // borderColor: 'black',
+    backgroundColor: 'white',
+    borderWidth: 0,
+    // borderBottomWidth: 1,
+    // alignContent: 'center',
+    // justifyContent: 'space-around',
+    // textAlign: 'left',
+    fontFamily: 'Roboto',
+    shadowColor: 'darkgrey',
+    shadowOpacity: 20,
+    // borderRadius: 10,
+    // height: 50,
+  },
+  title: {
+    fontSize: 20,
+    color: 'black',
+    // paddingHorizontal:
+    // fontWeight: 'bold',
+  },
+  title1: {
+    fontSize: 14,
+    color: 'black',
+    opacity: 0.5,
+  },
+  totalboxfont: {
+    fontSize: 16,
+    fontFamily: 'Roboto',
+    color: 'black',
+    opacity: 0.5,
+    // paddingHorizontal: 10,
+  },
+  totalboxfont1: {
+    fontSize: 20,
+    fontWeight: 'bold',
+    fontFamily: 'Roboto-bold',
+    color: 'black',
+    // opacity: 0.5,
+    // paddingHorizontal: 10,
+  },
+  boxfont: {
+    fontSize: 14,
+    color: '#ffffff',
+    // paddingTop: 4,
+  },
+
+  Confirmbutton: {
+    // padding: 20,
+    // paddingBottom: 20,
+    // paddingHorizontal: 15,
+    backgroundColor: '#d00f16',
+    borderRadius: 2,
+    width: 20,
+    height: 20,
+    shadowColor: '#000',
+    borderRadius: 180,
+    // shadowOffset: {width: 2, height: 4},
+    shadowOpacity: 20,
+    // shadowRadius: 6,
+    elevation: 5,
+    // minHeight: '6%',
+    // textAlign: 'center',
+    justifyContent: 'center',
+    alignItems: 'center',
+    marginHorizontal: 16,
+  },
+  Confirmationbutton: {
+    // padding: '5%',
+    // marginVertical: 10,
+    paddingHorizontal: 15,
+    backgroundColor: '#d00f16',
+    borderRadius: 20,
+    width: 200,
+    height: 40,
+    shadowColor: '#000',
+    shadowOffset: {width: 2, height: 4},
+    shadowOpacity: 0.9,
+    shadowRadius: 6,
+    // elevation: 2,
+    // minHeight: '6%',
+    textAlign: 'center',
+    justifyContent: 'center',
+    alignItems: 'center',
+    elevation: 2,
+  },
+  bigbuttontext: {
+    fontWeight: 'bold',
+    color: 'white',
+    fontFamily: 'Roboto-Bold',
+    fontSize: 20,
+    textAlign: 'center',
+    // paddingTop: '2%',
+
+    // opacity: 1,
+  },
+  bigbutton: {
+    paddingTop: '10%',
+    paddingHorizontal: '23%',
+    // flex: 2,
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
+  plusbutton: {
+    // paddingHorizontal: 15,
+    // paddingTop: 28,
+    backgroundColor: '#d00f16',
+    borderRadius: 180,
+    width: 56,
+    height: 56,
+    shadowColor: '#000',
+    shadowOffset: {width: 2, height: 4},
+    shadowOpacity: 0.9,
+    shadowRadius: 6,
+    elevation: 5,
+    // minHeight: '6%',
+    textAlign: 'center',
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+});
diff --git a/screens/Signout.js b/screens/Signout.js
index b78c9bb..92402e4 100644
--- a/screens/Signout.js
+++ b/screens/Signout.js
@@ -1,66 +1,66 @@
-import React from "react";
-import { StyleSheet, Alert, View, ImageBackground, Image, TextInput, Button, TouchableOpacity, } from "react-native";
-import LoginStack from '../routes/LoginStack';
-import firebase from "../assets/DatabaseConfig" ;
-import auth from "@react-native-firebase/auth" ;
-import database from "@react-native-firebase/database" ;
-
-
-export default function Shopping({navigation}) {
-
-  function onSignoutPress() {
-    console.log("meow")
-    Alert.alert(
-      "Logout",
-      "Are you sure you want to logout?"
-      [
-        {
-          text: "Yes",
-          onPress: ()=>{
-            firebase.auth().signOut()
-            .then(() => {
-              navigation.navigate("LoginStack")
-            })
-            .catch(function(error) {
-              // console.log(error)
-              alert(error)
-            })
-          }
-        },
-        {
-          text: "No",
-          onPress: ()=> {console.log("NO")},
-        }
-      ], {cancelable: false}
-    )
-  }
-  
-  return (
-    <View style={styles.Screen}>
-
-      <Button title="signout" onPress={onSignoutPress}> </Button>
-
-    </View>
-
-
-  );
-}
-
-
-const styles = StyleSheet.create({
-  // confirmbutton: {
-  //   flexDirection: 'row',
-  //   // width: "30%",
-  //   padding: 50,
-  //   alignItems: 'center',
-  //   justifyContent: 'center',
-  // },
-  Screen: {
-    // flexDirection: "column",
-    height: '100%',
-    padding: '10%',
-    backgroundColor: '#d3d3d3',
-
-    // flex: '20%',
-  },
+import React from "react";
+import { StyleSheet, Alert, View, ImageBackground, Image, TextInput, Button, TouchableOpacity, } from "react-native";
+import LoginStack from '../routes/LoginStack';
+import firebase from "../assets/DatabaseConfig" ;
+import auth from "@react-native-firebase/auth" ;
+import database from "@react-native-firebase/database" ;
+
+
+export default function Shopping({navigation}) {
+
+  function onSignoutPress() {
+    console.log("meow")
+    Alert.alert(
+      "Logout",
+      "Are you sure you want to logout?"
+      [
+        {
+          text: "Yes",
+          onPress: ()=>{
+            firebase.auth().signOut()
+            .then(() => {
+              navigation.navigate("LoginStack")
+            })
+            .catch(function(error) {
+              // console.log(error)
+              alert(error)
+            })
+          }
+        },
+        {
+          text: "No",
+          onPress: ()=> {console.log("NO")},
+        }
+      ], {cancelable: false}
+    )
+  }
+  
+  return (
+    <View style={styles.Screen}>
+
+      <Button title="signout" onPress={onSignoutPress}> </Button>
+
+    </View>
+
+
+  );
+}
+
+
+const styles = StyleSheet.create({
+  // confirmbutton: {
+  //   flexDirection: 'row',
+  //   // width: "30%",
+  //   padding: 50,
+  //   alignItems: 'center',
+  //   justifyContent: 'center',
+  // },
+  Screen: {
+    // flexDirection: "column",
+    height: '100%',
+    padding: '10%',
+    backgroundColor: '#d3d3d3',
+
+    // flex: '20%',
+  },
 });
\ No newline at end of file
diff --git a/screens/Store.js b/screens/Store.js
index 832506f..2b89848 100644
--- a/screens/Store.js
+++ b/screens/Store.js
@@ -1,211 +1,211 @@
-import React, {useState} from 'react';
-// import { AppLoading } from 'expo';
-// import Navigator from './route/NavigDraw'
-import {
-  StyleSheet,
-  Text,
-  View,
-  Image,
-  ImageBackground,
-  Dimensions,
-  TouchableOpacity,
-  Button,
-  ScrollView,
-} from 'react-native';
-import firebase from '../assets/DatabaseConfig';
-import auth from '@react-native-firebase/auth';
-import database from '@react-native-firebase/database';
-
-export default function Store({navigation}) {
-  // const [product, setProduct] = useState([ {name: 'ribbon'} ]);
-  const [SubCat, setSubCat] = useState([
-    {Sub: 'Stationery', Cat: 'Store'},
-    {Sub: 'Beverages', Cat: 'Store'},
-    {Sub: 'Grooming', Cat: 'Store'},
-    {Sub: 'Grocery', Cat: 'Store'},
-    {Sub: 'Electronics', Cat: 'Store'},
-  ]);
-
-  const handleStationary = () => {
-    // setSubCat("Stationery")
-    email = firebase.auth().currentUser.email;
-    mydb = firebase.database().ref('/Users/' + email.substr(0, 8));
-    mydb.once('value').then(function(snapshot) {
-      custflag = snapshot.child('Customerflag').val();
-      if (custflag) {
-        navigation.navigate('CustMenu', SubCat[0]);
-      } else {
-        navigation.navigate('AdminMenu', SubCat[0]);
-      }
-    });
-  };
-
-  const handleBeverages = () => {
-    // setSubCat("Stationery")
-    email = firebase.auth().currentUser.email;
-    mydb = firebase.database().ref('/Users/' + email.substr(0, 8));
-    mydb.once('value').then(function(snapshot) {
-      custflag = snapshot.child('Customerflag').val();
-      if (custflag) {
-        navigation.navigate('CustMenu', SubCat[1]);
-      } else {
-        navigation.navigate('AdminMenu', SubCat[1]);
-      }
-    });
-  };
-
-  const handleGrooming = () => {
-    // setSubCat("Stationery")
-    email = firebase.auth().currentUser.email;
-    mydb = firebase.database().ref('/Users/' + email.substr(0, 8));
-    mydb.once('value').then(function(snapshot) {
-      custflag = snapshot.child('Customerflag').val();
-      if (custflag) {
-        navigation.navigate('CustMenu', SubCat[2]);
-      } else {
-        navigation.navigate('AdminMenu', SubCat[2]);
-      }
-    });
-  };
-
-  const handleGrocery = () => {
-    // setSubCat("Stationery")
-    email = firebase.auth().currentUser.email;
-    mydb = firebase.database().ref('/Users/' + email.substr(0, 8));
-    mydb.once('value').then(function(snapshot) {
-      custflag = snapshot.child('Customerflag').val();
-      if (custflag) {
-        navigation.navigate('CustMenu', SubCat[3]);
-      } else {
-        navigation.navigate('AdminMenu', SubCat[3]);
-      }
-    });
-  };
-
-  const handleElectronics = () => {
-    // setSubCat("Stationery")
-    email = firebase.auth().currentUser.email;
-    mydb = firebase.database().ref('/Users/' + email.substr(0, 8));
-    mydb.once('value').then(function(snapshot) {
-      custflag = snapshot.child('Customerflag').val();
-      if (custflag) {
-        navigation.navigate('CustMenu', SubCat[4]);
-      } else {
-        navigation.navigate('AdminMenu', SubCat[4]);
-      }
-    });
-  };
-
-  return (
-    <ScrollView style={styles.home}>
-      <TouchableOpacity
-        style={styles.button}
-        activeOpacity={0.8}
-        onPress={handleStationary}>
-        <ImageBackground
-          source={require('../assets/images/Stationary.png')}
-          style={styles.image}>
-          <View style={styles.textcontainer}>
-            <Text style={styles.text}>Stationery</Text>
-          </View>
-        </ImageBackground>
-      </TouchableOpacity>
-
-      <TouchableOpacity
-        style={styles.button}
-        activeOpacity={0.8}
-        onPress={handleBeverages}>
-        <ImageBackground
-          source={require('../assets/images/Beverages.png')}
-          style={styles.image}>
-          <View style={styles.textcontainer}>
-            <Text style={styles.text}>Beverages</Text>
-          </View>
-        </ImageBackground>
-      </TouchableOpacity>
-
-      <TouchableOpacity
-        style={styles.button}
-        activeOpacity={0.8}
-        onPress={handleGrooming}>
-        <ImageBackground
-          source={require('../assets/images/Grooming.png')}
-          style={styles.image}>
-          <View style={styles.textcontainer}>
-            <Text style={styles.text}>Grooming</Text>
-          </View>
-        </ImageBackground>
-      </TouchableOpacity>
-
-      <TouchableOpacity
-        style={styles.button}
-        activeOpacity={0.8}
-        onPress={handleGrocery}>
-        <ImageBackground
-          source={require('../assets/images/Grocery.png')}
-          style={styles.image}>
-          <View style={styles.textcontainer}>
-            <Text style={styles.text}>Grocery</Text>
-          </View>
-        </ImageBackground>
-      </TouchableOpacity>
-
-      {/* <TouchableOpacity style={styles.button} activeOpacity={0.8}> 
-            <ImageBackground source= {require('../assets/images/Electronics.png')} style={styles.image}>
-                <View style={styles.textcontainer}>
-                    <Text style={styles.text}>
-                        Electronics
-                    </Text>
-                </View>
-            </ImageBackground>
-        </TouchableOpacity> */}
-
-      <TouchableOpacity
-        style={[styles.button, {marginBottom: 10}]}
-        activeOpacity={0.8}
-        onPress={handleElectronics}>
-        <ImageBackground
-          source={require('../assets/images/Electronics.png')}
-          style={styles.image}>
-          <View style={styles.textcontainer}>
-            <Text style={styles.text}>Electronics</Text>
-          </View>
-        </ImageBackground>
-      </TouchableOpacity>
-
-      {/* <Button title= 'Goto /> */}
-    </ScrollView>
-  );
-}
-
-const styles = StyleSheet.create({
-  home: {
-    flex: 1,
-    backgroundColor: '#e8e8e8',
-  },
-  text: {
-    fontFamily: 'Roboto-Bold',
-    color: '#d00f16',
-    marginLeft: 16,
-    fontSize: 45,
-  },
-  image: {
-    justifyContent: 'flex-end',
-    resizeMode: 'contain',
-    width: Dimensions.get('window').width,
-    height: Dimensions.get('window').height / 2.5,
-    marginTop: 10,
-  },
-
-  textcontainer: {
-    backgroundColor: 'rgba(0,0,0,0.75)',
-    width: Dimensions.get('window').width,
-    height: 60,
-    justifyContent: 'center',
-    marginBottom: 12,
-  },
-
-  // button:{
-
-  // }
-});
+import React, {useState} from 'react';
+// import { AppLoading } from 'expo';
+// import Navigator from './route/NavigDraw'
+import {
+  StyleSheet,
+  Text,
+  View,
+  Image,
+  ImageBackground,
+  Dimensions,
+  TouchableOpacity,
+  Button,
+  ScrollView,
+} from 'react-native';
+import firebase from '../assets/DatabaseConfig';
+import auth from '@react-native-firebase/auth';
+import database from '@react-native-firebase/database';
+
+export default function Store({navigation}) {
+  // const [product, setProduct] = useState([ {name: 'ribbon'} ]);
+  const [SubCat, setSubCat] = useState([
+    {Sub: 'Stationery', Cat: 'Store'},
+    {Sub: 'Beverages', Cat: 'Store'},
+    {Sub: 'Grooming', Cat: 'Store'},
+    {Sub: 'Grocery', Cat: 'Store'},
+    {Sub: 'Electronics', Cat: 'Store'},
+  ]);
+
+  const handleStationary = () => {
+    // setSubCat("Stationery")
+    email = firebase.auth().currentUser.email;
+    mydb = firebase.database().ref('/Users/' + email.substr(0, 8));
+    mydb.once('value').then(function(snapshot) {
+      custflag = snapshot.child('Customerflag').val();
+      if (custflag) {
+        navigation.navigate('CustMenu', SubCat[0]);
+      } else {
+        navigation.navigate('AdminMenu', SubCat[0]);
+      }
+    });
+  };
+
+  const handleBeverages = () => {
+    // setSubCat("Stationery")
+    email = firebase.auth().currentUser.email;
+    mydb = firebase.database().ref('/Users/' + email.substr(0, 8));
+    mydb.once('value').then(function(snapshot) {
+      custflag = snapshot.child('Customerflag').val();
+      if (custflag) {
+        navigation.navigate('CustMenu', SubCat[1]);
+      } else {
+        navigation.navigate('AdminMenu', SubCat[1]);
+      }
+    });
+  };
+
+  const handleGrooming = () => {
+    // setSubCat("Stationery")
+    email = firebase.auth().currentUser.email;
+    mydb = firebase.database().ref('/Users/' + email.substr(0, 8));
+    mydb.once('value').then(function(snapshot) {
+      custflag = snapshot.child('Customerflag').val();
+      if (custflag) {
+        navigation.navigate('CustMenu', SubCat[2]);
+      } else {
+        navigation.navigate('AdminMenu', SubCat[2]);
+      }
+    });
+  };
+
+  const handleGrocery = () => {
+    // setSubCat("Stationery")
+    email = firebase.auth().currentUser.email;
+    mydb = firebase.database().ref('/Users/' + email.substr(0, 8));
+    mydb.once('value').then(function(snapshot) {
+      custflag = snapshot.child('Customerflag').val();
+      if (custflag) {
+        navigation.navigate('CustMenu', SubCat[3]);
+      } else {
+        navigation.navigate('AdminMenu', SubCat[3]);
+      }
+    });
+  };
+
+  const handleElectronics = () => {
+    // setSubCat("Stationery")
+    email = firebase.auth().currentUser.email;
+    mydb = firebase.database().ref('/Users/' + email.substr(0, 8));
+    mydb.once('value').then(function(snapshot) {
+      custflag = snapshot.child('Customerflag').val();
+      if (custflag) {
+        navigation.navigate('CustMenu', SubCat[4]);
+      } else {
+        navigation.navigate('AdminMenu', SubCat[4]);
+      }
+    });
+  };
+
+  return (
+    <ScrollView style={styles.home}>
+      <TouchableOpacity
+        style={styles.button}
+        activeOpacity={0.8}
+        onPress={handleStationary}>
+        <ImageBackground
+          source={require('../assets/images/Stationary.png')}
+          style={styles.image}>
+          <View style={styles.textcontainer}>
+            <Text style={styles.text}>Stationery</Text>
+          </View>
+        </ImageBackground>
+      </TouchableOpacity>
+
+      <TouchableOpacity
+        style={styles.button}
+        activeOpacity={0.8}
+        onPress={handleBeverages}>
+        <ImageBackground
+          source={require('../assets/images/Beverages.png')}
+          style={styles.image}>
+          <View style={styles.textcontainer}>
+            <Text style={styles.text}>Beverages</Text>
+          </View>
+        </ImageBackground>
+      </TouchableOpacity>
+
+      <TouchableOpacity
+        style={styles.button}
+        activeOpacity={0.8}
+        onPress={handleGrooming}>
+        <ImageBackground
+          source={require('../assets/images/Grooming.png')}
+          style={styles.image}>
+          <View style={styles.textcontainer}>
+            <Text style={styles.text}>Grooming</Text>
+          </View>
+        </ImageBackground>
+      </TouchableOpacity>
+
+      <TouchableOpacity
+        style={styles.button}
+        activeOpacity={0.8}
+        onPress={handleGrocery}>
+        <ImageBackground
+          source={require('../assets/images/Grocery.png')}
+          style={styles.image}>
+          <View style={styles.textcontainer}>
+            <Text style={styles.text}>Grocery</Text>
+          </View>
+        </ImageBackground>
+      </TouchableOpacity>
+
+      {/* <TouchableOpacity style={styles.button} activeOpacity={0.8}> 
+            <ImageBackground source= {require('../assets/images/Electronics.png')} style={styles.image}>
+                <View style={styles.textcontainer}>
+                    <Text style={styles.text}>
+                        Electronics
+                    </Text>
+                </View>
+            </ImageBackground>
+        </TouchableOpacity> */}
+
+      <TouchableOpacity
+        style={[styles.button, {marginBottom: 10}]}
+        activeOpacity={0.8}
+        onPress={handleElectronics}>
+        <ImageBackground
+          source={require('../assets/images/Electronics.png')}
+          style={styles.image}>
+          <View style={styles.textcontainer}>
+            <Text style={styles.text}>Electronics</Text>
+          </View>
+        </ImageBackground>
+      </TouchableOpacity>
+
+      {/* <Button title= 'Goto /> */}
+    </ScrollView>
+  );
+}
+
+const styles = StyleSheet.create({
+  home: {
+    flex: 1,
+    backgroundColor: '#e8e8e8',
+  },
+  text: {
+    fontFamily: 'Roboto-Bold',
+    color: '#d00f16',
+    marginLeft: 16,
+    fontSize: 45,
+  },
+  image: {
+    justifyContent: 'flex-end',
+    resizeMode: 'contain',
+    width: Dimensions.get('window').width,
+    height: Dimensions.get('window').height / 2.5,
+    marginTop: 10,
+  },
+
+  textcontainer: {
+    backgroundColor: 'rgba(0,0,0,0.75)',
+    width: Dimensions.get('window').width,
+    height: 60,
+    justifyContent: 'center',
+    marginBottom: 12,
+  },
+
+  // button:{
+
+  // }
+});
diff --git a/screens/Subcategory.js b/screens/Subcategory.js
index f804b8d..282f55f 100644
--- a/screens/Subcategory.js
+++ b/screens/Subcategory.js
@@ -1,48 +1,48 @@
-import React, {useState} from 'react';
-import {View, StyleSheet, TouchableOpacity} from 'react-native';
-import {Picker} from '@react-native-community/picker';
-
-export default function SubCategory() {
-  const [selectedValue, setSelectedValue] = useState('Choose a subcategory');
-  return (
-    // <TouchableOpacity raised style={styles.viewstyle}>
-    <Picker
-      selectedValue={selectedValue}
-      style={styles.container}
-      onValueChange={(itemValue, itemIndex) => setSelectedValue(itemValue)}>
-      <Picker.Item label="Choose a subcategory" value="null" />
-      <Picker.Item label="Food" value="food" />
-      <Picker.Item label="Stationary" value="stationary" />
-      <Picker.Item label="Grocery" value="grocery" />
-    </Picker>
-    // </TouchableOpacity>
-  );
-}
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    // paddingTop: 40,
-    alignItems: 'center',
-    justifyContent: 'center',
-    flexDirection: 'row',
-    marginVertical: 10,
-    width: '100%',
-    height: 50,
-    elevation: 2,
-  },
-  viewstyle: {
-    // padding: 30,
-    width: '100%',
-    alignItems: 'center',
-    borderColor: 'black',
-    backgroundColor: 'white',
-    borderWidth: 0,
-    borderRadius: 10,
-    // padding: 30,
-    // alignItems: 'center',
-    shadowColor: 'darkgrey',
-    shadowOpacity: 20,
-    // sha,
-  },
-});
+import React, {useState} from 'react';
+import {View, StyleSheet, TouchableOpacity} from 'react-native';
+import {Picker} from '@react-native-community/picker';
+
+export default function SubCategory() {
+  const [selectedValue, setSelectedValue] = useState('Choose a subcategory');
+  return (
+    // <TouchableOpacity raised style={styles.viewstyle}>
+    <Picker
+      selectedValue={selectedValue}
+      style={styles.container}
+      onValueChange={(itemValue, itemIndex) => setSelectedValue(itemValue)}>
+      <Picker.Item label="Choose a subcategory" value="null" />
+      <Picker.Item label="Food" value="food" />
+      <Picker.Item label="Stationary" value="stationary" />
+      <Picker.Item label="Grocery" value="grocery" />
+    </Picker>
+    // </TouchableOpacity>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    // paddingTop: 40,
+    alignItems: 'center',
+    justifyContent: 'center',
+    flexDirection: 'row',
+    marginVertical: 10,
+    width: '100%',
+    height: 50,
+    elevation: 2,
+  },
+  viewstyle: {
+    // padding: 30,
+    width: '100%',
+    alignItems: 'center',
+    borderColor: 'black',
+    backgroundColor: 'white',
+    borderWidth: 0,
+    borderRadius: 10,
+    // padding: 30,
+    // alignItems: 'center',
+    shadowColor: 'darkgrey',
+    shadowOpacity: 20,
+    // sha,
+  },
+});
diff --git a/screens/UpdateItem.js b/screens/UpdateItem.js
index 608a527..73a271a 100644
--- a/screens/UpdateItem.js
+++ b/screens/UpdateItem.js
@@ -1,321 +1,321 @@
-import React, {useState} from 'react';
-import Icon from 'react-native-vector-icons/FontAwesome';
-import {
-  StyleSheet,
-  Text,
-  View,
-  TouchableOpacity,
-  TextInput,
-  TouchableWithoutFeedback,
-  ScrollView,
-  Keyboard,
-  // Button,
-  // Picker,
-} from 'react-native';
-// import DropDownItem from "react-native-drop-down-item";
-// import {
-//   TouchableHighlight,
-//   BorderlessButton,
-// } from "react-native-gesture-handler"
-import firebase from '../assets/DatabaseConfig';
-import database from '@react-native-firebase/database';
-
-export default function UpdateItem({navigation}) {
-  console.log(navigation.getParam('ITEM'));
-
-  const [ProductName, setProductName] = useState(
-    navigation.getParam('ITEM').name,
-  );
-  const [ProductPrice, setProductPrice] = useState(
-    navigation.getParam('ITEM').price,
-  );
-  const [ProductQuantity, setProductQuantity] = useState(
-    navigation.getParam('ITEM').quantity,
-  );
-
-  const pressHandler = () => {
-    // if (ProductName==''){
-    //   alert("Name field cannot be empty")
-    // }
-    if (ProductPrice == '') {
-      alert('Price field cannot be empty')
-      return
-    } else if (ProductQuantity == '') {
-      alert('Quantity field cannot be empty');
-      return
-    } else if (ProductPrice < 0) {
-      alert('Price must be greater than 0');
-      return
-    } else if (ProductQuantity < 0) {
-      alert('Quantity must be greater than 0');
-      return
-    } else {
-      console.log('sadasd');
-
-      firebase
-        .database()
-        .ref(
-          '/Inventory/' +
-            navigation.getParam('CAT') +
-            '/' +
-            navigation.getParam('SUB') +
-            '/' +
-            navigation.getParam('ITEM').name,
-        )
-        .update({
-          Price: parseInt(ProductPrice),
-          Qty: parseInt(ProductQuantity),
-        })
-        .then(() => {
-          alert('Item successfully updated');
-        })
-        .catch(() => {
-          alert('Please check your internet connection');
-        });
-    }
-  };
-
-  // const QtypressHandler = () =>{
-
-  //   // if (ProductName.length<1){
-  //   //   alert("Invalid product name")
-  //   // }
-  //   // if (ProductPrice<0){
-  //   //   alert("Invalid product price")
-  //   // }
-  //   if (ProductQuantity<0){
-  //     alert("Quantity must be greater than 0")
-  //   }
-  //   else{
-
-  //   }
-  // }
-
-  // const NamepressHandler = () =>{
-
-  //   if (ProductName.length<1){
-  //     alert("Name field cannot be empty")
-  //   }
-  //   // if (ProductPrice<0){
-  //   //   alert("Invalid product price")
-  //   // }
-  //   // else if (ProductQuantity<0){
-  //   //   alert("Invalid product quantity")
-  //   // }
-  //   else{
-
-  //   }
-  // }
-
-  return (
-    <TouchableWithoutFeedback
-      onPress={() => {
-        Keyboard.dismiss();
-      }}>
-      {/* <View style={styles.Screen}> */}
-      {/* <View style={styles.TopBar}>
-        <TouchableOpacity style={styles.TopBarBack}>
-          <Icon name="arrow-left" size={32} color="white" />
-        </TouchableOpacity>
-
-        <View style={styles.TopBarText}>
-          <Text
-            style={{fontSize: 30, fontFamily: 'Roboto-Bold', color: 'white'}}>
-            Update Item
-          </Text>
-        </View>
-
-        <TouchableOpacity style={styles.TopBarSearch}>
-          <Icon name="search" size={32} color="white" />
-        </TouchableOpacity>
-      </View> */}
-
-      <View style={styles.RestScreen}>
-        {/* <View style={{width: '100%'}}> */}
-        <TextInput
-          style={styles.TextInputbox}
-          placeholder={ProductName}
-          placeholderTextColor="grey"
-          onChangeText={ProductName => setProductName(ProductName)}
-          // defaultValue={ProductName}
-          editable={false}
-          // keyboardType="numeric"
-        />
-        {/* </View> */}
-
-        {/* <View style={styles.bigbutton}>
-          <TouchableOpacity
-            onPress={() => alert('Confirmed!')}
-            style={styles.Confirmbutton}>
-            <Text style={styles.bigbuttontext}>Confirm</Text>
-          </TouchableOpacity>
-        </View>  */}
-
-        {/* <View style={{width: '100%'}}> */}
-        <TextInput
-          style={styles.TextInputbox}
-          placeholder="Product Price"
-          placeholderTextColor="black"
-          onChangeText={ProductPrice => setProductPrice(parseInt(ProductPrice))}
-          // defaultValue={ProductPrice}
-          keyboardType="numeric"
-        />
-        {/* </View> */}
-
-        {/* <View style={styles.bigbutton}>
-          <TouchableOpacity
-            onPress={() => alert('Confirmed!')}
-            style={styles.Confirmbutton}>
-            <Text style={styles.bigbuttontext}>Confirm</Text>
-          </TouchableOpacity>
-        </View> */}
-
-        {/* <View style={{width: '100%'}}> */}
-        <TextInput
-          style={styles.TextInputbox}
-          placeholder="Product Quantity"
-          placeholderTextColor="black"
-          onChangeText={ProductQuantity => setProductQuantity(parseInt(ProductQuantity))}
-          // defaultValue={ProductQuantity}
-          keyboardType="numeric"
-        />
-        {/* </View> */}
-
-        <View style={styles.bigbutton}>
-          <TouchableOpacity onPress={pressHandler} style={styles.Confirmbutton}>
-            <Text style={styles.bigbuttontext}>Confirm</Text>
-          </TouchableOpacity>
-        </View>
-      </View>
-      {/* </View> */}
-    </TouchableWithoutFeedback>
-  );
-}
-
-const styles = StyleSheet.create({
-  // confirmbutton: {
-  //   flexDirection: 'row',
-  //   // width: "30%",
-  //   padding: 50,
-  //   alignItems: 'center',
-  //   justifyContent: 'center',
-  // },
-  Screen: {
-    // flexDirection: "column",
-    height: '100%',
-    backgroundColor: '#e8e8e8',
-    // flex: '20%',
-  },
-  TopBar: {
-    padding: 20,
-    flexDirection: 'row',
-    flex: 2,
-
-    width: '100%',
-    height: '100%',
-    backgroundColor: '#d00f16',
-    alignItems: 'center',
-    justifyContent: 'space-between',
-  },
-  TopBarText: {
-    // padding: 40,
-    flexDirection: 'row',
-    fontSize: 30,
-    fontFamily: 'Roboto-Bold',
-    color: 'white',
-    textAlign: 'left',
-    alignItems: 'flex-start',
-    flex: 6,
-  },
-  TopBarSearch: {
-    // flexDirection: "row",
-    alignItems: 'flex-end',
-    color: 'white',
-    fontSize: 20,
-    flex: 1,
-  },
-  TopBarBack: {
-    color: 'white',
-    flex: 1,
-    fontSize: 20,
-  },
-  RestScreen: {
-    // flex: 9,
-    // width: 100,
-    padding: '10%',
-    backgroundColor: '#e8e8e8',
-    height: '100%',
-    justifyContent: 'center',
-    alignItems: 'center',
-  },
-  firstbox: {
-    width: '100%',
-    flexDirection: 'row',
-    marginVertical: 10,
-    borderColor: 'black',
-    backgroundColor: 'white',
-    borderWidth: 0.5,
-    borderRadius: 10,
-    height: 50,
-    paddingTop: 40,
-    // justifyContent: 'center',
-    alignItems: 'center',
-    shadowColor: 'darkgrey',
-    shadowOpacity: 20,
-    // justifyContent: "center",
-  },
-  TextInputbox: {
-    width: 280,
-    paddingHorizontal: 16,
-    flexDirection: 'row',
-    marginVertical: 16,
-    borderColor: 'black',
-    backgroundColor: 'white',
-    borderWidth: 0,
-    borderBottomWidth: 1,
-    borderRadius: 4,
-    height: 56,
-    // fontSize: 20,
-    // shadowColor: 'darkgrey',
-    // shadowOpacity: 20,
-    // justifyContent: "center",
-  },
-
-  Confirmbutton: {
-    // padding: 20,
-    // paddingBottom: 20,
-    // paddingHorizontal: 15,
-    backgroundColor: '#d00f16',
-    borderRadius: 20,
-    width: 200,
-    height: 40,
-    padding: '6%',
-    shadowColor: '#000',
-    shadowOffset: {width: 2, height: 4},
-    shadowOpacity: 0.9,
-    shadowRadius: 6,
-    elevation: 2,
-    // minHeight: '6%',
-
-    textAlign: 'center',
-    justifyContent: 'center',
-    alignItems: 'center',
-  },
-  bigbuttontext: {
-    fontWeight: 'bold',
-    color: 'white',
-    fontFamily: 'Roboto',
-    fontSize: 20,
-    textAlign: 'center',
-    // paddingTop: '2%',
-
-    // opacity: 1,
-  },
-  bigbutton: {
-    // padding: '50%',
-    // paddingHorizontal: '23%',
-    flex: 2,
-    alignItems: 'center',
-    justifyContent: 'flex-end',
-  },
-});
+import React, {useState} from 'react';
+import Icon from 'react-native-vector-icons/FontAwesome';
+import {
+  StyleSheet,
+  Text,
+  View,
+  TouchableOpacity,
+  TextInput,
+  TouchableWithoutFeedback,
+  ScrollView,
+  Keyboard,
+  // Button,
+  // Picker,
+} from 'react-native';
+// import DropDownItem from "react-native-drop-down-item";
+// import {
+//   TouchableHighlight,
+//   BorderlessButton,
+// } from "react-native-gesture-handler"
+import firebase from '../assets/DatabaseConfig';
+import database from '@react-native-firebase/database';
+
+export default function UpdateItem({navigation}) {
+  console.log(navigation.getParam('ITEM'));
+
+  const [ProductName, setProductName] = useState(
+    navigation.getParam('ITEM').name,
+  );
+  const [ProductPrice, setProductPrice] = useState(
+    navigation.getParam('ITEM').price,
+  );
+  const [ProductQuantity, setProductQuantity] = useState(
+    navigation.getParam('ITEM').quantity,
+  );
+
+  const pressHandler = () => {
+    // if (ProductName==''){
+    //   alert("Name field cannot be empty")
+    // }
+    if (ProductPrice == '') {
+      alert('Price field cannot be empty')
+      return
+    } else if (ProductQuantity == '') {
+      alert('Quantity field cannot be empty');
+      return
+    } else if (ProductPrice < 0) {
+      alert('Price must be greater than 0');
+      return
+    } else if (ProductQuantity < 0) {
+      alert('Quantity must be greater than 0');
+      return
+    } else {
+      console.log('sadasd');
+
+      firebase
+        .database()
+        .ref(
+          '/Inventory/' +
+            navigation.getParam('CAT') +
+            '/' +
+            navigation.getParam('SUB') +
+            '/' +
+            navigation.getParam('ITEM').name,
+        )
+        .update({
+          Price: parseInt(ProductPrice),
+          Qty: parseInt(ProductQuantity),
+        })
+        .then(() => {
+          alert('Item successfully updated');
+        })
+        .catch(() => {
+          alert('Please check your internet connection');
+        });
+    }
+  };
+
+  // const QtypressHandler = () =>{
+
+  //   // if (ProductName.length<1){
+  //   //   alert("Invalid product name")
+  //   // }
+  //   // if (ProductPrice<0){
+  //   //   alert("Invalid product price")
+  //   // }
+  //   if (ProductQuantity<0){
+  //     alert("Quantity must be greater than 0")
+  //   }
+  //   else{
+
+  //   }
+  // }
+
+  // const NamepressHandler = () =>{
+
+  //   if (ProductName.length<1){
+  //     alert("Name field cannot be empty")
+  //   }
+  //   // if (ProductPrice<0){
+  //   //   alert("Invalid product price")
+  //   // }
+  //   // else if (ProductQuantity<0){
+  //   //   alert("Invalid product quantity")
+  //   // }
+  //   else{
+
+  //   }
+  // }
+
+  return (
+    <TouchableWithoutFeedback
+      onPress={() => {
+        Keyboard.dismiss();
+      }}>
+      {/* <View style={styles.Screen}> */}
+      {/* <View style={styles.TopBar}>
+        <TouchableOpacity style={styles.TopBarBack}>
+          <Icon name="arrow-left" size={32} color="white" />
+        </TouchableOpacity>
+
+        <View style={styles.TopBarText}>
+          <Text
+            style={{fontSize: 30, fontFamily: 'Roboto-Bold', color: 'white'}}>
+            Update Item
+          </Text>
+        </View>
+
+        <TouchableOpacity style={styles.TopBarSearch}>
+          <Icon name="search" size={32} color="white" />
+        </TouchableOpacity>
+      </View> */}
+
+      <View style={styles.RestScreen}>
+        {/* <View style={{width: '100%'}}> */}
+        <TextInput
+          style={styles.TextInputbox}
+          placeholder={ProductName}
+          placeholderTextColor="grey"
+          onChangeText={ProductName => setProductName(ProductName)}
+          // defaultValue={ProductName}
+          editable={false}
+          // keyboardType="numeric"
+        />
+        {/* </View> */}
+
+        {/* <View style={styles.bigbutton}>
+          <TouchableOpacity
+            onPress={() => alert('Confirmed!')}
+            style={styles.Confirmbutton}>
+            <Text style={styles.bigbuttontext}>Confirm</Text>
+          </TouchableOpacity>
+        </View>  */}
+
+        {/* <View style={{width: '100%'}}> */}
+        <TextInput
+          style={styles.TextInputbox}
+          placeholder="Product Price"
+          placeholderTextColor="black"
+          onChangeText={ProductPrice => setProductPrice(parseInt(ProductPrice))}
+          // defaultValue={ProductPrice}
+          keyboardType="numeric"
+        />
+        {/* </View> */}
+
+        {/* <View style={styles.bigbutton}>
+          <TouchableOpacity
+            onPress={() => alert('Confirmed!')}
+            style={styles.Confirmbutton}>
+            <Text style={styles.bigbuttontext}>Confirm</Text>
+          </TouchableOpacity>
+        </View> */}
+
+        {/* <View style={{width: '100%'}}> */}
+        <TextInput
+          style={styles.TextInputbox}
+          placeholder="Product Quantity"
+          placeholderTextColor="black"
+          onChangeText={ProductQuantity => setProductQuantity(parseInt(ProductQuantity))}
+          // defaultValue={ProductQuantity}
+          keyboardType="numeric"
+        />
+        {/* </View> */}
+
+        <View style={styles.bigbutton}>
+          <TouchableOpacity onPress={pressHandler} style={styles.Confirmbutton}>
+            <Text style={styles.bigbuttontext}>Confirm</Text>
+          </TouchableOpacity>
+        </View>
+      </View>
+      {/* </View> */}
+    </TouchableWithoutFeedback>
+  );
+}
+
+const styles = StyleSheet.create({
+  // confirmbutton: {
+  //   flexDirection: 'row',
+  //   // width: "30%",
+  //   padding: 50,
+  //   alignItems: 'center',
+  //   justifyContent: 'center',
+  // },
+  Screen: {
+    // flexDirection: "column",
+    height: '100%',
+    backgroundColor: '#e8e8e8',
+    // flex: '20%',
+  },
+  TopBar: {
+    padding: 20,
+    flexDirection: 'row',
+    flex: 2,
+
+    width: '100%',
+    height: '100%',
+    backgroundColor: '#d00f16',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+  },
+  TopBarText: {
+    // padding: 40,
+    flexDirection: 'row',
+    fontSize: 30,
+    fontFamily: 'Roboto-Bold',
+    color: 'white',
+    textAlign: 'left',
+    alignItems: 'flex-start',
+    flex: 6,
+  },
+  TopBarSearch: {
+    // flexDirection: "row",
+    alignItems: 'flex-end',
+    color: 'white',
+    fontSize: 20,
+    flex: 1,
+  },
+  TopBarBack: {
+    color: 'white',
+    flex: 1,
+    fontSize: 20,
+  },
+  RestScreen: {
+    // flex: 9,
+    // width: 100,
+    padding: '10%',
+    backgroundColor: '#e8e8e8',
+    height: '100%',
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  firstbox: {
+    width: '100%',
+    flexDirection: 'row',
+    marginVertical: 10,
+    borderColor: 'black',
+    backgroundColor: 'white',
+    borderWidth: 0.5,
+    borderRadius: 10,
+    height: 50,
+    paddingTop: 40,
+    // justifyContent: 'center',
+    alignItems: 'center',
+    shadowColor: 'darkgrey',
+    shadowOpacity: 20,
+    // justifyContent: "center",
+  },
+  TextInputbox: {
+    width: 280,
+    paddingHorizontal: 16,
+    flexDirection: 'row',
+    marginVertical: 16,
+    borderColor: 'black',
+    backgroundColor: 'white',
+    borderWidth: 0,
+    borderBottomWidth: 1,
+    borderRadius: 4,
+    height: 56,
+    // fontSize: 20,
+    // shadowColor: 'darkgrey',
+    // shadowOpacity: 20,
+    // justifyContent: "center",
+  },
+
+  Confirmbutton: {
+    // padding: 20,
+    // paddingBottom: 20,
+    // paddingHorizontal: 15,
+    backgroundColor: '#d00f16',
+    borderRadius: 20,
+    width: 200,
+    height: 40,
+    padding: '6%',
+    shadowColor: '#000',
+    shadowOffset: {width: 2, height: 4},
+    shadowOpacity: 0.9,
+    shadowRadius: 6,
+    elevation: 2,
+    // minHeight: '6%',
+
+    textAlign: 'center',
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  bigbuttontext: {
+    fontWeight: 'bold',
+    color: 'white',
+    fontFamily: 'Roboto',
+    fontSize: 20,
+    textAlign: 'center',
+    // paddingTop: '2%',
+
+    // opacity: 1,
+  },
+  bigbutton: {
+    // padding: '50%',
+    // paddingHorizontal: '23%',
+    flex: 2,
+    alignItems: 'center',
+    justifyContent: 'flex-end',
+  },
+});
diff --git a/screens/change_phone_customer.js b/screens/change_phone_customer.js
index 94a1f16..b7fd40b 100644
--- a/screens/change_phone_customer.js
+++ b/screens/change_phone_customer.js
@@ -1,191 +1,191 @@
-import React, {useState} from 'react';
-import {
-  Text,
-  View,
-  TextInput,
-  StyleSheet,
-  Button,
-  TouchableOpacity,
-  TouchableWithoutFeedback,
-  Keyboard,
-  ScrollView,
-} from 'react-native';
-import Icon from 'react-native-vector-icons/FontAwesome';
-import firebase from '../assets/DatabaseConfig';
-import auth from '@react-native-firebase/auth';
-import database from '@react-native-firebase/database';
-
-export default function Change_Phone({navigation}) {
-  
-  const [phone, setPhone] = useState('');
-  const [rephone, setRephone] = useState('');
-
-  const phoneInputHandler = inputPhone => {
-    setPhone(inputPhone);
-  };
-
-  const rephoneInputHandler = inputRephone => {
-    setRephone(inputRephone);
-  };
-
-  const handleConfirmPress = () => {
-    if (phone.length == 11) {
-      if (phone == rephone) {
-        let emailcheck = firebase.auth().currentUser.email;
-        firebase
-          .database()
-          .ref('/Users/' + emailcheck.substr(0, 8))
-          .update({
-            Phonenumber: phone,
-          })
-          .then(() => {
-            alert('Phone number successfully updated');
-          })
-          .catch(() => {
-            alert('Please check your internet connection');
-          });
-        // firebase.auth().currentUser.updatePassword(password)
-        // .then(
-        //     alert("Password succesfully changed!")
-        // )
-        // .catch(function(error) {
-        //     alert(error)
-        // })
-        // console.log("changed")
-      } else {
-        alert('phone numbers do not match!');
-      }
-    } else {
-      alert('Phone number must be 11 characters.');
-    }
-  };
-
-  //Main Container View//
-  return (
-    <TouchableWithoutFeedback
-      onPress={() => {
-        Keyboard.dismiss();
-      }}>
-      {/* <View style={styles.container}> */}
-      <View style={styles.body}>
-        <View style={styles.iconstyle}>
-          <Icon
-            name="phone"
-            color="#d00f16"
-            size={120}
-            style={{
-              transform: [{rotateX: '360deg'}],
-              transform: [{rotate: '90deg'}],
-            }}
-          />
-        </View>
-        <View style={{paddingTop: '5%'}}>
-          {/* </View> */}
-          {/* <View style={styles.textbox}> */}
-          <TextInput
-            style={styles.textbox}
-            keyboardType="numeric"
-            placeholder="New Phone Number"
-            onChangeText={phoneInputHandler}
-            value={phone}
-          />
-          {/* </View> */}
-          {/* <View style={styles.textbox}> */}
-          <TextInput
-            style={styles.textbox}
-            keyboardType="numeric"
-            placeholder="Confirm Phone Number"
-            onChangeText={rephoneInputHandler}
-            value={rephone}
-          />
-        </View>
-
-        <View
-          style={{
-            marginTop: '15%',
-            marginBottom: '40%',
-            width: '50%',
-            justifyContent: 'flex-end',
-          }}>
-          <TouchableOpacity
-            onPress={handleConfirmPress}
-            style={styles.Confirmbutton}>
-            <Text style={styles.bigbuttontext}>Confirm</Text>
-          </TouchableOpacity>
-        </View>
-      </View>
-      {/* </View> */}
-    </TouchableWithoutFeedback>
-  );
-}
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    // width:'100%',
-    backgroundColor: '#e8e8e8',
-    // justifyContent: "center",
-    // alignContent: "center",
-  },
-  body: {
-    width: '100%',
-    height: '100%',
-    backgroundColor: '#e8e8e8',
-    // backgroundColor: 'yellow',
-    // marginTop: 50,
-    paddingTop: '10%',
-    alignItems: 'center',
-    // justifyContent: 'center',
-  },
-  textbox: {
-    width: 280,
-    paddingHorizontal: 16,
-    flexDirection: 'row',
-    marginVertical: 16,
-    borderColor: 'black',
-    backgroundColor: 'white',
-    borderWidth: 0,
-    borderBottomWidth: 1,
-    borderRadius: 4,
-    height: 56,
-  },
-  iconstyle: {
-    // marginTop: '10%',
-    borderRadius: 180,
-    height: 180,
-    width: 180,
-    // paddingBottom: '15%',
-    backgroundColor: '#ffffff',
-    alignItems: 'center',
-    justifyContent: 'center',
-  },
-  Confirmbutton: {
-    padding: '5%',
-    // marginVertical: 10,
-    paddingHorizontal: 15,
-    backgroundColor: '#d00f16',
-    borderRadius: 20,
-    width: 200,
-    height: 40,
-    shadowColor: '#000',
-    shadowOffset: {width: 2, height: 4},
-    shadowOpacity: 0.9,
-    shadowRadius: 6,
-    elevation: 2,
-    // minHeight: '6%',
-    textAlign: 'center',
-    justifyContent: 'center',
-    alignItems: 'center',
-    elevation: 2,
-  },
-  bigbuttontext: {
-    // fontWeight: 'bold',
-    color: 'white',
-    fontFamily: 'Roboto-Bold',
-    fontSize: 20,
-    textAlign: 'center',
-    // paddingTop: '2%',
-
-    // opacity: 1,
-  },
-});
+import React, {useState} from 'react';
+import {
+  Text,
+  View,
+  TextInput,
+  StyleSheet,
+  Button,
+  TouchableOpacity,
+  TouchableWithoutFeedback,
+  Keyboard,
+  ScrollView,
+} from 'react-native';
+import Icon from 'react-native-vector-icons/FontAwesome';
+import firebase from '../assets/DatabaseConfig';
+import auth from '@react-native-firebase/auth';
+import database from '@react-native-firebase/database';
+
+export default function Change_Phone({navigation}) {
+  
+  const [phone, setPhone] = useState('');
+  const [rephone, setRephone] = useState('');
+
+  const phoneInputHandler = inputPhone => {
+    setPhone(inputPhone);
+  };
+
+  const rephoneInputHandler = inputRephone => {
+    setRephone(inputRephone);
+  };
+
+  const handleConfirmPress = () => {
+    if (phone.length == 11) {
+      if (phone == rephone) {
+        let emailcheck = firebase.auth().currentUser.email;
+        firebase
+          .database()
+          .ref('/Users/' + emailcheck.substr(0, 8))
+          .update({
+            Phonenumber: phone,
+          })
+          .then(() => {
+            alert('Phone number successfully updated');
+          })
+          .catch(() => {
+            alert('Please check your internet connection');
+          });
+        // firebase.auth().currentUser.updatePassword(password)
+        // .then(
+        //     alert("Password succesfully changed!")
+        // )
+        // .catch(function(error) {
+        //     alert(error)
+        // })
+        // console.log("changed")
+      } else {
+        alert('phone numbers do not match!');
+      }
+    } else {
+      alert('Phone number must be 11 characters.');
+    }
+  };
+
+  //Main Container View//
+  return (
+    <TouchableWithoutFeedback
+      onPress={() => {
+        Keyboard.dismiss();
+      }}>
+      {/* <View style={styles.container}> */}
+      <View style={styles.body}>
+        <View style={styles.iconstyle}>
+          <Icon
+            name="phone"
+            color="#d00f16"
+            size={120}
+            style={{
+              transform: [{rotateX: '360deg'}],
+              transform: [{rotate: '90deg'}],
+            }}
+          />
+        </View>
+        <View style={{paddingTop: '5%'}}>
+          {/* </View> */}
+          {/* <View style={styles.textbox}> */}
+          <TextInput
+            style={styles.textbox}
+            keyboardType="numeric"
+            placeholder="New Phone Number"
+            onChangeText={phoneInputHandler}
+            value={phone}
+          />
+          {/* </View> */}
+          {/* <View style={styles.textbox}> */}
+          <TextInput
+            style={styles.textbox}
+            keyboardType="numeric"
+            placeholder="Confirm Phone Number"
+            onChangeText={rephoneInputHandler}
+            value={rephone}
+          />
+        </View>
+
+        <View
+          style={{
+            marginTop: '15%',
+            marginBottom: '40%',
+            width: '50%',
+            justifyContent: 'flex-end',
+          }}>
+          <TouchableOpacity
+            onPress={handleConfirmPress}
+            style={styles.Confirmbutton}>
+            <Text style={styles.bigbuttontext}>Confirm</Text>
+          </TouchableOpacity>
+        </View>
+      </View>
+      {/* </View> */}
+    </TouchableWithoutFeedback>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    // width:'100%',
+    backgroundColor: '#e8e8e8',
+    // justifyContent: "center",
+    // alignContent: "center",
+  },
+  body: {
+    width: '100%',
+    height: '100%',
+    backgroundColor: '#e8e8e8',
+    // backgroundColor: 'yellow',
+    // marginTop: 50,
+    paddingTop: '10%',
+    alignItems: 'center',
+    // justifyContent: 'center',
+  },
+  textbox: {
+    width: 280,
+    paddingHorizontal: 16,
+    flexDirection: 'row',
+    marginVertical: 16,
+    borderColor: 'black',
+    backgroundColor: 'white',
+    borderWidth: 0,
+    borderBottomWidth: 1,
+    borderRadius: 4,
+    height: 56,
+  },
+  iconstyle: {
+    // marginTop: '10%',
+    borderRadius: 180,
+    height: 180,
+    width: 180,
+    // paddingBottom: '15%',
+    backgroundColor: '#ffffff',
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
+  Confirmbutton: {
+    padding: '5%',
+    // marginVertical: 10,
+    paddingHorizontal: 15,
+    backgroundColor: '#d00f16',
+    borderRadius: 20,
+    width: 200,
+    height: 40,
+    shadowColor: '#000',
+    shadowOffset: {width: 2, height: 4},
+    shadowOpacity: 0.9,
+    shadowRadius: 6,
+    elevation: 2,
+    // minHeight: '6%',
+    textAlign: 'center',
+    justifyContent: 'center',
+    alignItems: 'center',
+    elevation: 2,
+  },
+  bigbuttontext: {
+    // fontWeight: 'bold',
+    color: 'white',
+    fontFamily: 'Roboto-Bold',
+    fontSize: 20,
+    textAlign: 'center',
+    // paddingTop: '2%',
+
+    // opacity: 1,
+  },
+});
diff --git a/screens/splashscreen.js b/screens/splashscreen.js
index bed9dcf..38b20b2 100644
--- a/screens/splashscreen.js
+++ b/screens/splashscreen.js
@@ -1,112 +1,112 @@
-import React from "react";
-import { ActivityIndicator, StyleSheet, View, ImageBackground, Image, Keyboard, TouchableWithoutFeedback} from "react-native";
-import backg from "../assets/images/backg.png" ;
-import lsdlogo from "../assets/images/lsdlogo.png" ;
-import AsyncStorage from '@react-native-community/async-storage';
-import { NavigationEvents } from 'react-navigation';
-import firebase from "../assets/DatabaseConfig" ;
-
-
-export default function splashscreen({navigation}) {
-
-  async function removeData() {
-    try {
-      const keys = await AsyncStorage.getAllKeys();
-      await AsyncStorage.multiRemove(keys);
-    } catch (e) {
-      console.log(e);
-    }
-  }
-
-  const LoginPress = () => {
-    let emailcheck = firebase.auth().currentUser.email;
-    mydb = firebase.database().ref('/Users/' + emailcheck.substr(0, 8));
-    mydb.once('value').then(function(snapshot) {
-      let custflag = snapshot.child('Customerflag').val();
-      let username = snapshot.child('Username').val();
-      if (custflag) {
-        removeData();
-        navigation.navigate('CustomerDrawer', {user: username});
-      } else {
-        navigation.navigate('AdminDrawer', {user: username});
-      }
-    });
-  };
-  
-  function loginexists() {
-    meow = firebase.auth().onAuthStateChanged(function(user) {
-      if (user) {
-        LoginPress()
-      }
-      else {
-        navigation.navigate('Login')
-      }
-    })
-  }
-  
-  return (
-    <TouchableWithoutFeedback onPress = {() =>{
-      Keyboard.dismiss()
-    }}>
-      <View style={styles.container}>
-        <NavigationEvents onWillFocus={() => {loginexists()}} />
-        <ImageBackground source={backg} style={styles.bgimage}>
-          <View style={styles.maincontainer}>
-            <View style={styles.logocontainer} >
-              <Image
-                style={styles.stretch}
-                source={lsdlogo}
-              />
-            </View>
-            <ActivityIndicator size="large" color="#d00f16" style={styles.activity} />
-          </View>
-        </ImageBackground>
-      </View>
-    </TouchableWithoutFeedback>
-  );
-};
-  
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    flexDirection: "column"
-  },
-
-  bgimage: {
-    flex: 1,
-    resizeMode: "stretch",
-    justifyContent: "center",
-  },
-
-  logocontainer: {
-    flex: 6,
-    flexDirection: "column",
-    paddingLeft: "13%",
-    justifyContent: "flex-end",
-  },
-
-  activity: {
-    paddingTop: "5%",
-    flex: 4,
-    justifyContent: "flex-start",
-  },
-
-  stretch: {
-    width: '70%',
-    height: '50%',
-    resizeMode: "contain",
-  },
-
-  maincontainer: {
-    flex: 6,
-  },
-
-});
-  
-  
-  
-  
-  
-  
-  
-
+import React from "react";
+import { ActivityIndicator, StyleSheet, View, ImageBackground, Image, Keyboard, TouchableWithoutFeedback} from "react-native";
+import backg from "../assets/images/backg.png" ;
+import lsdlogo from "../assets/images/lsdlogo.png" ;
+import AsyncStorage from '@react-native-community/async-storage';
+import { NavigationEvents } from 'react-navigation';
+import firebase from "../assets/DatabaseConfig" ;
+
+
+export default function splashscreen({navigation}) {
+
+  async function removeData() {
+    try {
+      const keys = await AsyncStorage.getAllKeys();
+      await AsyncStorage.multiRemove(keys);
+    } catch (e) {
+      console.log(e);
+    }
+  }
+
+  const LoginPress = () => {
+    let emailcheck = firebase.auth().currentUser.email;
+    mydb = firebase.database().ref('/Users/' + emailcheck.substr(0, 8));
+    mydb.once('value').then(function(snapshot) {
+      let custflag = snapshot.child('Customerflag').val();
+      let username = snapshot.child('Username').val();
+      if (custflag) {
+        removeData();
+        navigation.navigate('CustomerDrawer', {user: username});
+      } else {
+        navigation.navigate('AdminDrawer', {user: username});
+      }
+    });
+  };
+  
+  function loginexists() {
+    meow = firebase.auth().onAuthStateChanged(function(user) {
+      if (user) {
+        LoginPress()
+      }
+      else {
+        navigation.navigate('Login')
+      }
+    })
+  }
+  
+  return (
+    <TouchableWithoutFeedback onPress = {() =>{
+      Keyboard.dismiss()
+    }}>
+      <View style={styles.container}>
+        <NavigationEvents onWillFocus={() => {loginexists()}} />
+        <ImageBackground source={backg} style={styles.bgimage}>
+          <View style={styles.maincontainer}>
+            <View style={styles.logocontainer} >
+              <Image
+                style={styles.stretch}
+                source={lsdlogo}
+              />
+            </View>
+            <ActivityIndicator size="large" color="#d00f16" style={styles.activity} />
+          </View>
+        </ImageBackground>
+      </View>
+    </TouchableWithoutFeedback>
+  );
+};
+  
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    flexDirection: "column"
+  },
+
+  bgimage: {
+    flex: 1,
+    resizeMode: "stretch",
+    justifyContent: "center",
+  },
+
+  logocontainer: {
+    flex: 6,
+    flexDirection: "column",
+    paddingLeft: "13%",
+    justifyContent: "flex-end",
+  },
+
+  activity: {
+    paddingTop: "5%",
+    flex: 4,
+    justifyContent: "flex-start",
+  },
+
+  stretch: {
+    width: '70%',
+    height: '50%',
+    resizeMode: "contain",
+  },
+
+  maincontainer: {
+    flex: 6,
+  },
+
+});
+  
+  
+  
+  
+  
+  
+  
+
diff --git a/screens/switch1.js b/screens/switch1.js
index e694d63..31297e1 100644
--- a/screens/switch1.js
+++ b/screens/switch1.js
@@ -1,19 +1,19 @@
-import React, {useState} from 'react';
-import {Text, View, Switch, StyleSheet} from 'react-native';
-
-export default (SwitchExample = props => {
-  const [isEnabled, setIsEnabled] = useState(false);
-  const toggleSwitch = () => setIsEnabled(previousState => !previousState);
-  return (
-    <View>
-      <Switch
-        onValueChange={props.toggleSwitch1}
-        value={props.switch1Value}
-        trackColor={{true: 'red', false: '#e8e8e8'}}
-        thumbColor={isEnabled ? 'ffffff' : '#e8e8e8'}
-        disabled={props.REDPTS==0}
-        //   thumbTintColor="#d00f16"
-      />
-    </View>
-  );
-});
+import React, {useState} from 'react';
+import {Text, View, Switch, StyleSheet} from 'react-native';
+
+export default (SwitchExample = props => {
+  const [isEnabled, setIsEnabled] = useState(false);
+  const toggleSwitch = () => setIsEnabled(previousState => !previousState);
+  return (
+    <View>
+      <Switch
+        onValueChange={props.toggleSwitch1}
+        value={props.switch1Value}
+        trackColor={{true: 'red', false: '#e8e8e8'}}
+        thumbColor={isEnabled ? 'ffffff' : '#e8e8e8'}
+        disabled={props.REDPTS==0}
+        //   thumbTintColor="#d00f16"
+      />
+    </View>
+  );
+});