Commit ad965b34 authored by Malsha Rathnasiri's avatar Malsha Rathnasiri

integrate

parent 48a4f9a7
const { getDefaultConfig } = require("@expo/metro-config");
const defaultConfig = getDefaultConfig(__dirname);
defaultConfig.resolver.assetExts.push("cjs");
module.exports = defaultConfig;
\ No newline at end of file
...@@ -18,7 +18,7 @@ import useColorScheme from '../hooks/useColorScheme'; ...@@ -18,7 +18,7 @@ import useColorScheme from '../hooks/useColorScheme';
import { LoginScreen } from '../screens/loginScreen'; import { LoginScreen } from '../screens/loginScreen';
import ModalScreen from '../screens/ModalScreen'; import ModalScreen from '../screens/ModalScreen';
import NotFoundScreen from '../screens/NotFoundScreen'; import NotFoundScreen from '../screens/NotFoundScreen';
import { SignupScreen } from '../screens/SignupScreen'; // import { SignupScreen } from '../screens/SignupScreen';
import ChatScreen from '../screens/TabOneScreen'; import ChatScreen from '../screens/TabOneScreen';
import TabTwoScreen from '../screens/TabTwoScreen'; import TabTwoScreen from '../screens/TabTwoScreen';
import { RootStackParamList, RootTabParamList, RootTabScreenProps } from '../types'; import { RootStackParamList, RootTabParamList, RootTabScreenProps } from '../types';
...@@ -75,7 +75,7 @@ function RootNavigator() { ...@@ -75,7 +75,7 @@ function RootNavigator() {
<Stack.Navigator > <Stack.Navigator >
{isAuthenticated ? <Stack.Screen name="Root" options={{ headerShown: false }}>{(props) => <BottomTabNavigator {...props} onLogout={onLogout} />}</Stack.Screen> : {isAuthenticated ? <Stack.Screen name="Root" options={{ headerShown: false }}>{(props) => <BottomTabNavigator {...props} onLogout={onLogout} />}</Stack.Screen> :
<Stack.Screen name='Root' options={{ headerShown: false }}>{(props) => <LoginScreen {...props} onLogin={onLogin} />}</Stack.Screen>} <Stack.Screen name='Root' options={{ headerShown: false }}>{(props) => <LoginScreen {...props} onLogin={onLogin} />}</Stack.Screen>}
<Stack.Screen name='Signup' component={SignupScreen} options={{ headerShown: false, title: 'Sign up' }} /> {/* <Stack.Screen name='Signup' component={Signup} options={{ headerShown: false, title: 'Sign up' }} /> */}
<Stack.Screen name="NotFound" component={NotFoundScreen} options={{ title: 'Oops!' }} /> <Stack.Screen name="NotFound" component={NotFoundScreen} options={{ title: 'Oops!' }} />
<Stack.Group screenOptions={{ presentation: 'modal' }}> <Stack.Group screenOptions={{ presentation: 'modal' }}>
<Stack.Screen name="Modal" component={ModalScreen} /> <Stack.Screen name="Modal" component={ModalScreen} />
......
...@@ -14,43 +14,49 @@ ...@@ -14,43 +14,49 @@
"preset": "jest-expo" "preset": "jest-expo"
}, },
"dependencies": { "dependencies": {
"@expo/vector-icons": "^12.0.0", "@expo/vector-icons": "^13.0.0",
"@react-native-async-storage/async-storage": "~1.15.0", "@react-native-async-storage/async-storage": "~1.17.3",
"@react-native-community/slider": "4.1.12", "@react-native-community/slider": "4.2.1",
"@react-navigation/bottom-tabs": "^6.0.5", "@react-navigation/bottom-tabs": "^6.0.5",
"@react-navigation/native": "^6.0.2", "@react-navigation/native": "^6.0.2",
"@react-navigation/native-stack": "^6.1.0", "@react-navigation/native-stack": "^6.1.0",
"axios": "^0.27.2", "axios": "^0.27.2",
"expo": "~44.0.0", "expo": "^45.0.0",
"expo-asset": "~8.4.4", "expo-asset": "~8.5.0",
"expo-av": "~10.2.0", "expo-av": "~11.2.3",
"expo-constants": "~13.0.0", "expo-barcode-scanner": "^12.0.0",
"expo-file-system": "~13.1.4", "expo-constants": "~13.1.1",
"expo-font": "~10.0.4", "expo-file-system": "~14.0.0",
"expo-linking": "~3.0.0", "expo-font": "~10.1.0",
"expo-media-library": "~14.0.0", "expo-linking": "~3.1.0",
"expo-speech": "~10.1.0", "expo-media-library": "~14.1.0",
"expo-splash-screen": "~0.14.0", "expo-speech": "~10.2.0",
"expo-status-bar": "~1.2.0", "expo-splash-screen": "~0.15.1",
"expo-web-browser": "~10.1.0", "expo-status-bar": "~1.3.0",
"expo-web-browser": "~10.2.1",
"firebase": "^9.14.0",
"jwt-decode": "^3.1.2", "jwt-decode": "^3.1.2",
"native-base": "^3.4.11", "native-base": "^3.4.11",
"react": "17.0.1", "react": "17.0.2",
"react-dom": "17.0.1", "react-dom": "17.0.2",
"react-native": "0.64.3", "react-native": "0.68.2",
"react-native-google-places-autocomplete": "^2.5.1",
"react-native-maps": "^1.3.2",
"react-native-multi-selectbox": "^1.5.0", "react-native-multi-selectbox": "^1.5.0",
"react-native-safe-area-context": "3.3.2", "react-native-radio-form": "^1.1.0",
"react-native-screens": "~3.10.1", "react-native-safe-area-context": "4.2.4",
"react-native-svg": "12.1.1", "react-native-screens": "~3.11.1",
"react-native-web": "0.17.1", "react-native-sqlite-storage": "^6.0.1",
"react-native-svg": "12.3.0",
"react-native-web": "0.17.7",
"styled-system": "^5.1.5" "styled-system": "^5.1.5"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.12.9", "@babel/core": "^7.12.9",
"@types/react": "~17.0.21", "@types/react": "~17.0.21",
"@types/react-native": "~0.64.12", "@types/react-native": "~0.67.6",
"jest": "^26.6.3", "jest": "^26.6.3",
"jest-expo": "~44.0.1", "jest-expo": "^45.0.0",
"react-test-renderer": "17.0.1", "react-test-renderer": "17.0.1",
"typescript": "~4.3.5" "typescript": "~4.3.5"
}, },
......
...@@ -5,7 +5,7 @@ import { Input, NativeBaseProvider, Button, Icon, Box, Image, AspectRatio } from ...@@ -5,7 +5,7 @@ import { Input, NativeBaseProvider, Button, Icon, Box, Image, AspectRatio } from
import { FontAwesome5, MaterialCommunityIcons } from '@expo/vector-icons'; import { FontAwesome5, MaterialCommunityIcons } from '@expo/vector-icons';
import { useNavigation } from '@react-navigation/native'; import { useNavigation } from '@react-navigation/native';
import { alignContent, flex, flexDirection, marginBottom, width } from 'styled-system'; import { alignContent, flex, flexDirection, marginBottom, width } from 'styled-system';
import { colors } from '../utils/index' import { colors } from '../util/index'
const { PRIMARY_COLOR, SECONDARY_COLOR,BORDER_COLOR } = colors; const { PRIMARY_COLOR, SECONDARY_COLOR,BORDER_COLOR } = colors;
import { useRoute } from '@react-navigation/native'; import { useRoute } from '@react-navigation/native';
......
...@@ -5,7 +5,7 @@ import { Input, NativeBaseProvider, Button, Icon, Box, Image, AspectRatio } from ...@@ -5,7 +5,7 @@ import { Input, NativeBaseProvider, Button, Icon, Box, Image, AspectRatio } from
import { FontAwesome5, MaterialCommunityIcons } from '@expo/vector-icons'; import { FontAwesome5, MaterialCommunityIcons } from '@expo/vector-icons';
import { useNavigation } from '@react-navigation/native'; import { useNavigation } from '@react-navigation/native';
import SQLite from 'react-native-sqlite-storage'; import SQLite from 'react-native-sqlite-storage';
import { colors } from '../utils/index' import { colors } from '../util/index'
const { PRIMARY_COLOR, SECONDARY_COLOR,BORDER_COLOR } = colors const { PRIMARY_COLOR, SECONDARY_COLOR,BORDER_COLOR } = colors
import Comment from './Comment'; import Comment from './Comment';
import { marginBottom } from 'styled-system'; import { marginBottom } from 'styled-system';
......
...@@ -3,7 +3,7 @@ import React from 'react'; ...@@ -3,7 +3,7 @@ import React from 'react';
import { Input, NativeBaseProvider, Button, Icon, Box, Image, AspectRatio } from 'native-base'; import { Input, NativeBaseProvider, Button, Icon, Box, Image, AspectRatio } from 'native-base';
import { StyleSheet, Text, View, TouchableOpacity } from 'react-native'; import { StyleSheet, Text, View, TouchableOpacity } from 'react-native';
import { useRoute } from '@react-navigation/native'; import { useRoute } from '@react-navigation/native';
import { colors } from '../utils/index' import { colors } from '../util/index'
const { PRIMARY_COLOR, SECONDARY_COLOR,BORDER_COLOR } = colors const { PRIMARY_COLOR, SECONDARY_COLOR,BORDER_COLOR } = colors
function GenerateSeatNo() { function GenerateSeatNo() {
......
...@@ -5,7 +5,7 @@ import { Input, NativeBaseProvider, Button, Icon, Box, Image, AspectRatio } from ...@@ -5,7 +5,7 @@ import { Input, NativeBaseProvider, Button, Icon, Box, Image, AspectRatio } from
import { FontAwesome5, MaterialCommunityIcons } from '@expo/vector-icons'; import { FontAwesome5, MaterialCommunityIcons } from '@expo/vector-icons';
import { useNavigation } from '@react-navigation/native'; import { useNavigation } from '@react-navigation/native';
import { alignContent, flex, flexDirection, width } from 'styled-system'; import { alignContent, flex, flexDirection, width } from 'styled-system';
import { colors } from '../utils/index' import { colors } from '../util/index'
const { PRIMARY_COLOR, SECONDARY_COLOR,BORDER_COLOR } = colors const { PRIMARY_COLOR, SECONDARY_COLOR,BORDER_COLOR } = colors
import { useRoute } from '@react-navigation/native'; import { useRoute } from '@react-navigation/native';
......
...@@ -11,6 +11,7 @@ import GenerateSeatNo from "./GenerateSeatNo"; ...@@ -11,6 +11,7 @@ import GenerateSeatNo from "./GenerateSeatNo";
import PaymentQR from "./PaymentQR"; import PaymentQR from "./PaymentQR";
import ConfirmPayment from "./ConfirmPayment"; import ConfirmPayment from "./ConfirmPayment";
import PaymentStatus from "./PaymentStatus"; import PaymentStatus from "./PaymentStatus";
import Location from "./Location";
const Stack = createNativeStackNavigator(); const Stack = createNativeStackNavigator();
......
...@@ -5,7 +5,7 @@ import { Input, NativeBaseProvider, Button, Icon, Box, Image, AspectRatio } from ...@@ -5,7 +5,7 @@ import { Input, NativeBaseProvider, Button, Icon, Box, Image, AspectRatio } from
import { FontAwesome5, MaterialCommunityIcons } from '@expo/vector-icons'; import { FontAwesome5, MaterialCommunityIcons } from '@expo/vector-icons';
import { useNavigation } from '@react-navigation/native'; import { useNavigation } from '@react-navigation/native';
import { alignContent, flex, flexDirection, width } from 'styled-system'; import { alignContent, flex, flexDirection, width } from 'styled-system';
import { colors } from '../utils/index' import { colors } from '../util/index'
const { PRIMARY_COLOR, SECONDARY_COLOR,BORDER_COLOR } = colors; const { PRIMARY_COLOR, SECONDARY_COLOR,BORDER_COLOR } = colors;
import { useRoute } from '@react-navigation/native'; import { useRoute } from '@react-navigation/native';
......
...@@ -5,9 +5,10 @@ ...@@ -5,9 +5,10 @@
import { FontAwesome5, MaterialCommunityIcons } from '@expo/vector-icons'; import { FontAwesome5, MaterialCommunityIcons } from '@expo/vector-icons';
import { useNavigation } from '@react-navigation/native'; import { useNavigation } from '@react-navigation/native';
import { alignContent, flex, flexDirection, width } from 'styled-system'; import { alignContent, flex, flexDirection, width } from 'styled-system';
import { colors } from '../utils/index'
const { PRIMARY_COLOR, SECONDARY_COLOR,BORDER_COLOR } = colors; const { PRIMARY_COLOR, SECONDARY_COLOR,BORDER_COLOR } = colors;
import { useRoute } from '@react-navigation/native'; import { useRoute } from '@react-navigation/native';
import { colors } from '../util';
function RegInfo() { function RegInfo() {
......
...@@ -7,12 +7,12 @@ import { useNavigation } from '@react-navigation/native'; ...@@ -7,12 +7,12 @@ import { useNavigation } from '@react-navigation/native';
import SelectBox from 'react-native-multi-selectbox'; import SelectBox from 'react-native-multi-selectbox';
import { xorBy } from 'lodash'; import { xorBy } from 'lodash';
import RadioForm from 'react-native-radio-form'; import RadioForm from 'react-native-radio-form';
import { colors } from '../utils/index'
const { PRIMARY_COLOR, SECONDARY_COLOR,BORDER_COLOR } = colors const { PRIMARY_COLOR, SECONDARY_COLOR,BORDER_COLOR } = colors
import { useRoute } from '@react-navigation/native'; import { useRoute } from '@react-navigation/native';
import { marginBottom } from 'styled-system'; import { marginBottom } from 'styled-system';
import { collection, doc, setDoc, addDoc,getDocs,query ,where} from "firebase/firestore"; import { collection, doc, setDoc, addDoc,getDocs,query ,where} from "firebase/firestore";
import {db} from './config'; import {db} from './config';
import { colors } from '../util';
function RouteInfo() { function RouteInfo() {
const navigation = useNavigation(); const navigation = useNavigation();
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment