diff --git a/firebase.json b/firebase.json index 84af71a2..0502ea38 100644 --- a/firebase.json +++ b/firebase.json @@ -1,7 +1,7 @@ { "functions": { "predeploy": [ - + ] } } diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json index 3b934a73..ef0f4a82 100644 --- a/node_modules/.package-lock.json +++ b/node_modules/.package-lock.json @@ -4958,6 +4958,17 @@ "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==" }, + "node_modules/@react-native-async-storage/async-storage": { + "version": "1.17.7", + "resolved": "https://registry.npmjs.org/@react-native-async-storage/async-storage/-/async-storage-1.17.7.tgz", + "integrity": "sha512-mDtWhCcpxzrZhA95f6zi0pnBsjBEZW1LKZWfxVXG0UfaWpPxDBCKowNk2xjRTytckZeVhjmPJPtBU+8QNQcR0A==", + "dependencies": { + "merge-options": "^3.0.4" + }, + "peerDependencies": { + "react-native": "^0.0.0-0 || 0.60 - 0.69 || 1000.0.0" + } + }, "node_modules/@react-native-community/cli": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/@react-native-community/cli/-/cli-7.0.3.tgz", @@ -12610,6 +12621,14 @@ "node": ">=8" } }, + "node_modules/is-plain-obj": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", + "engines": { + "node": ">=8" + } + }, "node_modules/is-plain-object": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", @@ -13851,6 +13870,17 @@ "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==" }, + "node_modules/merge-options": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/merge-options/-/merge-options-3.0.4.tgz", + "integrity": "sha512-2Sug1+knBjkaMsMgf1ctR1Ujx+Ayku4EdJN4Z+C2+JzoeF7A3OZ9KM2GY0CpQS51NR61LTurMJrRKPhSs3ZRTQ==", + "dependencies": { + "is-plain-obj": "^2.1.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/merge-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", @@ -18198,7 +18228,7 @@ "node_modules/shell-quote": { "version": "1.6.1", "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz", - "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=", + "integrity": "sha512-V0iQEZ/uoem3NmD91rD8XiuozJnq9/ZJnbHVXHnWqP1ucAhS3yJ7sLIIzEi57wFFcK3oi3kFUC46uSyWr35mxg==", "dependencies": { "array-filter": "~0.0.0", "array-map": "~0.0.0", diff --git a/package-lock.json b/package-lock.json index 23981974..e277ea19 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,7 @@ "version": "1.0.0", "dependencies": { "@expo/webpack-config": "~0.16.2", + "@react-native-async-storage/async-storage": "~1.17.3", "@react-navigation/native": "^6.0.10", "@react-navigation/native-stack": "^6.6.2", "@reduxjs/toolkit": "^1.8.1", @@ -5002,6 +5003,17 @@ "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==" }, + "node_modules/@react-native-async-storage/async-storage": { + "version": "1.17.7", + "resolved": "https://registry.npmjs.org/@react-native-async-storage/async-storage/-/async-storage-1.17.7.tgz", + "integrity": "sha512-mDtWhCcpxzrZhA95f6zi0pnBsjBEZW1LKZWfxVXG0UfaWpPxDBCKowNk2xjRTytckZeVhjmPJPtBU+8QNQcR0A==", + "dependencies": { + "merge-options": "^3.0.4" + }, + "peerDependencies": { + "react-native": "^0.0.0-0 || 0.60 - 0.69 || 1000.0.0" + } + }, "node_modules/@react-native-community/cli": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/@react-native-community/cli/-/cli-7.0.3.tgz", @@ -12667,6 +12679,14 @@ "node": ">=8" } }, + "node_modules/is-plain-obj": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", + "engines": { + "node": ">=8" + } + }, "node_modules/is-plain-object": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", @@ -13908,6 +13928,17 @@ "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==" }, + "node_modules/merge-options": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/merge-options/-/merge-options-3.0.4.tgz", + "integrity": "sha512-2Sug1+knBjkaMsMgf1ctR1Ujx+Ayku4EdJN4Z+C2+JzoeF7A3OZ9KM2GY0CpQS51NR61LTurMJrRKPhSs3ZRTQ==", + "dependencies": { + "is-plain-obj": "^2.1.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/merge-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", @@ -18255,7 +18286,7 @@ "node_modules/shell-quote": { "version": "1.6.1", "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz", - "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=", + "integrity": "sha512-V0iQEZ/uoem3NmD91rD8XiuozJnq9/ZJnbHVXHnWqP1ucAhS3yJ7sLIIzEi57wFFcK3oi3kFUC46uSyWr35mxg==", "dependencies": { "array-filter": "~0.0.0", "array-map": "~0.0.0", @@ -25595,6 +25626,14 @@ "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==" }, + "@react-native-async-storage/async-storage": { + "version": "1.17.7", + "resolved": "https://registry.npmjs.org/@react-native-async-storage/async-storage/-/async-storage-1.17.7.tgz", + "integrity": "sha512-mDtWhCcpxzrZhA95f6zi0pnBsjBEZW1LKZWfxVXG0UfaWpPxDBCKowNk2xjRTytckZeVhjmPJPtBU+8QNQcR0A==", + "requires": { + "merge-options": "^3.0.4" + } + }, "@react-native-community/cli": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/@react-native-community/cli/-/cli-7.0.3.tgz", @@ -31582,6 +31621,11 @@ "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==" }, + "is-plain-obj": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==" + }, "is-plain-object": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", @@ -32542,6 +32586,14 @@ "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==" }, + "merge-options": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/merge-options/-/merge-options-3.0.4.tgz", + "integrity": "sha512-2Sug1+knBjkaMsMgf1ctR1Ujx+Ayku4EdJN4Z+C2+JzoeF7A3OZ9KM2GY0CpQS51NR61LTurMJrRKPhSs3ZRTQ==", + "requires": { + "is-plain-obj": "^2.1.0" + } + }, "merge-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", @@ -35996,7 +36048,7 @@ "shell-quote": { "version": "1.6.1", "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz", - "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=", + "integrity": "sha512-V0iQEZ/uoem3NmD91rD8XiuozJnq9/ZJnbHVXHnWqP1ucAhS3yJ7sLIIzEi57wFFcK3oi3kFUC46uSyWr35mxg==", "requires": { "array-filter": "~0.0.0", "array-map": "~0.0.0", diff --git a/package.json b/package.json index 4d99f9cb..02880fac 100644 --- a/package.json +++ b/package.json @@ -9,10 +9,12 @@ "eject": "expo eject" }, "dependencies": { + "@expo/webpack-config": "~0.16.2", "@react-navigation/native": "^6.0.10", "@react-navigation/native-stack": "^6.6.2", "@reduxjs/toolkit": "^1.8.1", "expo": "~45.0.0", + "expo-splash-screen": "~0.15.1", "expo-status-bar": "~1.3.0", "firebase": "^9.6.11", "react": "17.0.2", @@ -23,9 +25,8 @@ "react-native-screens": "~3.11.1", "react-native-web": "0.17.7", "react-redux": "^8.0.1", - "expo-splash-screen": "~0.15.1", "webpack-dev-server": "~3.11.0", - "@expo/webpack-config": "~0.16.2" + "@react-native-async-storage/async-storage": "~1.17.3" }, "devDependencies": { "@babel/core": "^7.12.9" diff --git a/src/firebase/index.js b/src/firebase/index.js index 50d39249..1df5d314 100644 --- a/src/firebase/index.js +++ b/src/firebase/index.js @@ -33,8 +33,6 @@ const firebaseConfig = { // https://firebase.google.com/docs/web/setup // https://docs.expo.dev/guides/using-firebase/ const app = initializeApp(firebaseConfig); -const messaging = getMessaging(app); -messaging.getToken({vapidKey:"BDGGnJytH87x6d886c7RfRvftpPViuXWxHb4ev9rGP72YuvmvuXCJ7XxaPDsFo9_IX7JlTGSvByeifflY6DOpHM"}); const auth = getAuth(); const db = getFirestore(app); diff --git a/src/navigation/AppNavigator.js b/src/navigation/AppNavigator.js index 7e8dd782..b0cb43c4 100644 --- a/src/navigation/AppNavigator.js +++ b/src/navigation/AppNavigator.js @@ -7,11 +7,9 @@ import { MaterialIcons } from '@expo/vector-icons'; import { auth } from '../firebase'; import { - MainScreen, AuthScreen, LoginScreen, HomeScreen, - GroupLinkScreen, } from '../screens'; const Stack = createNativeStackNavigator(); @@ -41,22 +39,12 @@ const AppNavigator = () => { const MainNavigator = () => ( - - ); diff --git a/src/screens/GroupLinkScreen.js b/src/screens/GroupLinkScreen.js deleted file mode 100644 index fc654c31..00000000 --- a/src/screens/GroupLinkScreen.js +++ /dev/null @@ -1,38 +0,0 @@ -import { StyleSheet, View, Pressable, Text } from 'react-native'; -import React from 'react'; - -const MainScreen = ({ navigation }) => { - return ( - - navigation.navigate('Auth')} - android_ripple={{ color: '#FFF' }} - > - Supper Snacks - - - ); -}; - -export default GroupLinkScreen; - -const styles = StyleSheet.create({ - container: { - backgroundColor: '#EBECF0', - flex: 1, - justifyContent: 'center', - alignItems: 'center', - }, - button: { - backgroundColor: '#407BFF', - marginVertical: 10, - paddingVertical: 10, - width: '80%', - alignItems: 'center', - borderRadius: 4, - }, - text: { - color: 'white', - }, -}); \ No newline at end of file diff --git a/src/screens/HomeScreen.js b/src/screens/HomeScreen.js index 635d5602..08c0b984 100644 --- a/src/screens/HomeScreen.js +++ b/src/screens/HomeScreen.js @@ -115,7 +115,6 @@ const HomeScreen = ({navigation}) => { navigation.navigate('Group')} style={styles.button} > Residential Colleges diff --git a/src/screens/MainScreen.js b/src/screens/MainScreen.js deleted file mode 100644 index 7da358cf..00000000 --- a/src/screens/MainScreen.js +++ /dev/null @@ -1,38 +0,0 @@ -import { StyleSheet, View, Pressable, Text } from 'react-native'; -import React from 'react'; - -const MainScreen = ({ navigation }) => { - return ( - - navigation.navigate('Auth')} - android_ripple={{ color: '#FFF' }} - > - Supper Snacks - - - ); -}; - -export default MainScreen; - -const styles = StyleSheet.create({ - container: { - backgroundColor: '#EBECF0', - flex: 1, - justifyContent: 'center', - alignItems: 'center', - }, - button: { - backgroundColor: '#407BFF', - marginVertical: 10, - paddingVertical: 10, - width: '80%', - alignItems: 'center', - borderRadius: 4, - }, - text: { - color: 'white', - }, -}); diff --git a/src/screens/index.js b/src/screens/index.js index 6584f97a..6c56c1d7 100644 --- a/src/screens/index.js +++ b/src/screens/index.js @@ -1,8 +1,6 @@ // 14 May -export { default as MainScreen } from './MainScreen'; // 21 May export { default as AuthScreen } from './AuthScreen'; export { default as HomeScreen } from './HomeScreen'; -export { default as GroupLinkScreen } from './GroupLinkScreen';