Skip to content

Commit

Permalink
removing main screen and logging out to authscreen
Browse files Browse the repository at this point in the history
  • Loading branch information
guokweijie committed Jul 7, 2022
1 parent 01966f4 commit 768870e
Show file tree
Hide file tree
Showing 10 changed files with 89 additions and 99 deletions.
2 changes: 1 addition & 1 deletion firebase.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"functions": {
"predeploy": [

]
}
}
32 changes: 31 additions & 1 deletion node_modules/.package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

56 changes: 54 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions src/firebase/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
12 changes: 0 additions & 12 deletions src/navigation/AppNavigator.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -41,22 +39,12 @@ const AppNavigator = () => {

const MainNavigator = () => (
<Stack.Navigator initialRouteName="Auth">
<Stack.Screen
name="Main"
options={{ title: 'Main Page' }}
component={MainScreen}
/>

<Stack.Screen
name="Auth"
options={{ headerTitle: 'Supper Snacks' }}
component={AuthScreen}
/>
<Stack.Screen
name="Group"
options={{ title: 'Group Link Page' }}
component={GroupLinkScreen}
/>

</Stack.Navigator>
);
Expand Down
38 changes: 0 additions & 38 deletions src/screens/GroupLinkScreen.js

This file was deleted.

1 change: 0 additions & 1 deletion src/screens/HomeScreen.js
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ const HomeScreen = ({navigation}) => {
</Pressable>
<Pressable
android_ripple={{ color: 'white' }}
onPress={() => navigation.navigate('Group')}
style={styles.button}
>
<Text style={styles.buttonText}>Residential Colleges</Text>
Expand Down
38 changes: 0 additions & 38 deletions src/screens/MainScreen.js

This file was deleted.

2 changes: 0 additions & 2 deletions src/screens/index.js
Original file line number Diff line number Diff line change
@@ -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';

0 comments on commit 768870e

Please sign in to comment.