Fixed user info navigation

CS-UCR · Dec 4, 2019 · bff78c9 · bff78c9
1 parent ec94508
commit bff78c9
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 34 deletions.
diff --git a/src/Navigation/navigation.js b/src/Navigation/navigation.js
@@ -17,7 +17,7 @@ import Login from '../authentication/User/LoginScreen'
 import MainScreen from '../components/MainScreen'
 import Feed from '../components/Feed'
 import myMap from '../components/myMap'
-// import UserInfo from '../components/UserInfo'
+import UserInfo from '../components/UserInfo'
 
 
 import AuthWorkspacesScreen from '../Screens/WorkSpace/user/AuthWorkspacesScreen2v'
@@ -103,11 +103,14 @@ const Drawer = createDrawerNavigator(
     },
 )
 
+
+
 const Authentication = createStackNavigator(
     {
         AuthenticationMenu: AuthenticationMenu,
         SignUp: SignUp,
-        Login:Login
+        Login:Login,
+        UserInfo:UserInfo
     },
     {
         defaultNavigationOptions: {

diff --git a/src/Screens/WorkSpace/Member/UserJoinWorkspacesScreen.js b/src/Screens/WorkSpace/Member/UserJoinWorkspacesScreen.js
@@ -84,9 +84,7 @@ const UserWorkspaceSettings = props => {
 
 
         if(findWorkspace && !validAccessCode){
-            console.log("Hello world")
             const updatedMemberList  = memberList.concat(AuthID)
-            console.log("After append, ", updatedMemberList)
             dispatch(
                 workspacesAction.joinWorkspace(
                     findWorkspace.id,

diff --git a/src/Screens/WorkSpace/user/AuthEdithWorkspaceScreen.js b/src/Screens/WorkSpace/user/AuthEdithWorkspaceScreen.js
@@ -119,16 +119,13 @@ const EditWorkspaceScreen = props => {
 
         if(formState.inputValues.emails){
 
-            console.log("Email: ", formState.inputValues.emails)
             const stripEmails= formState.inputValues.emails.split(',')
-            console.log("Strip: ", stripEmails)
             workspacesAction.addMembers(
                 stripEmails,
                 formState.inputValues.workspaceTitle,
                 editedWorkspace.accessCode
             )
         }
-        console.log("Submitted")
         props.navigation.goBack();
     }, [dispatch, workspaceId, formState])
 

diff --git a/src/authentication/User/SignUpScreen.js b/src/authentication/User/SignUpScreen.js
@@ -71,7 +71,7 @@ const SignUpScreen = props => {
     setError(null);
     try {
       await dispatch(action)
-      props.navigation.navigate('UserInfoRouteSignUp')
+      props.navigation.navigate('UserInfo')
       Alert.alert('Congratulation', 'You Have Successfully Sign Up',[{text:'Okay'}])
     } catch (err) {
       setError(err.message);

diff --git a/src/authentication/component/utilites/ImagePicker.js b/src/authentication/component/utilites/ImagePicker.js
@@ -1,4 +1,4 @@
-import React, { useState } from 'react'
+import React, { useState, useEffect } from 'react'
 import * as firebase from 'firebase'
 
 import { View, Button, Text, StyleSheet, Image , Alert}  from 'react-native'
@@ -29,7 +29,7 @@ const ImagePicker = props => {
             quality: 0.5
         })
 
-        const hello = await uploadImage(image.uri)
+        await uploadImage(image.uri)
             .then(()=> {
                 console.log("Success")
             })

diff --git a/src/authentication/store/Action/image.js b/src/authentication/store/Action/image.js
@@ -13,7 +13,6 @@ export const addImage = ( workspaceId,image) => {
                 to : newPath
             });
         } catch(error){
-            console.log(error);
             throw error
         }
 

diff --git a/src/authentication/store/Action/workspace.js b/src/authentication/store/Action/workspace.js
@@ -81,7 +81,6 @@ export const createWorkSpace = (workspaceTitle, color, imageUri) => {
     return async (dispatch, getState )=> {
         const authID =  getState().userAuth.userId
         const accessCode = makeId(5)
-        //console.log("user id", userID)
         const response = await fetch('https://lokos-studybuddy.firebaseio.com/workspaces.json', {
             method: 'POST',
             headers: {
@@ -161,7 +160,6 @@ export const updateWorkSpace = (id, workspaceTitle, color, imageUri) => {
 export const joinWorkspace = (id,members) => {
   return async (dispatch, getState) => {
     const authID =  getState().userAuth.userId
-    console.log("Members: ", members)
     const response =  await fetch(`https://lokos-studybuddy.firebaseio.com/workspaces/${id}.json`, 
       {
         method: 'PATCH',
@@ -174,7 +172,6 @@ export const joinWorkspace = (id,members) => {
       }
     );
 
-      console.log("hello")
       await firebase.database().ref(`/Users/${authID}/workspaces/`).once('value').then(async function(snapshot){
         let userWorkspaces = snapshot.val()
         let updatedWorkspace = []
@@ -187,8 +184,6 @@ export const joinWorkspace = (id,members) => {
           updatedWorkspace.push(id)
         }
 
-        console.log("UserWorkspaces: ", updatedWorkspace)
-
         await firebase.database().ref(`/Users/${authID}/workspaces/`).update(updatedWorkspace)
       })
 
@@ -210,19 +205,3 @@ export const joinWorkspace = (id,members) => {
     });
   };
 };
-
-// export const updateUserWorkspace = (id) => {
-//   return async(dispatch, getState) => {
-//     console.log("Hello worlds")
-//     const authID = getState().userAuth.userId
-//     console.log("AuthID, ", authID)
-
-
-
-
-//     dispatch({
-//     });
-//   }
-
-
-// }
diff --git a/src/authentication/store/Reducer/workspace.js b/src/authentication/store/Reducer/workspace.js
@@ -27,7 +27,6 @@ export default(state = initialState, action) => {
             }
         case CREATE_WORKSPACE:
             const accessCode = action.workspaceData.id.substring(0,5)
-            console.log("Access Code: ", accessCode)
             const newWorkSpace = new Workspace(
                 action.workspaceData.id,
                 action.workspaceData.workspaceTitle,

diff --git a/src/components/UserInfo.js b/src/components/UserInfo.js
@@ -167,7 +167,7 @@ export default class UserInfo extends Component{
             console.log(output)
             console.log("pushing into firebase")
             await firebase.database().ref('Users/' + this.state.userId + '/').update(output)
-            this.props.navigation.navigate('MainRoute')
+            this.props.navigation.navigate('MainScreenDrawer')
             Alert.alert('Notice','Successfully updated profile!',[{text:'Okay'}])
 
     }