Fix add & edit profile

Author: bhavik66

src/layout/index.js

@@ -1,6 +1,7 @@
 import React, { Component } from 'react'
 import { createStackNavigator, createAppContainer } from 'react-navigation'
 
+import Test from '../screens/test'
 import Splash from '../screens/splash'
 import Register from '../screens/register'
 import Profile from '../screens/profile'
@@ -10,6 +11,9 @@ import Chat from '../screens/chat'
 import HeaderIcon from '../components/headerIcon'
 
 const AppNavigator = createStackNavigator({
+  // Test: {
+  //   screen: Test
+  // },
   Splash: {
     screen: Splash,
     navigationOptions: {

src/screens/profile.js

@@ -26,11 +26,6 @@ export default class Profile extends Component {
       isFromFile: false
     }
     this.size = new Animated.Value(150)
-
-    this.props.User.checkForExisting(user => {
-      this._name = user.name
-      this._avatar = user.avatar
-    })
   }
 
   componentWillMount() {
@@ -49,6 +44,10 @@ export default class Profile extends Component {
     this.keyboardWillHideSub.remove()
   }
 
+  componentDidMount() {
+    this.props.User.getCurrentUser()
+  }
+
   keyboardWillShow = event => {
     Animated.timing(this.size, {
       duration: 100,
@@ -96,14 +95,20 @@ export default class Profile extends Component {
           <TouchableOpacity
             style={style.footerButton}
             onPress={async () => {
-              if (this._name === this.props.User.name) {
-                //TO DO
+              this.setState({ isLoading: true })
+              if (this.props.User.key === '') {
+                this.props.User.save().then(userKey => {
+                  saveKey(userKey).then(() => {
+                    this.props.navigation.replace('Splash')
+                  })
+                })
+              } else {
+                this.props.User.update().then(data => {
+                  saveKey(this.props.User.key).then(() => {
+                    this.props.navigation.replace('Splash')
+                  })
+                })
               }
-              // this.setState({ isLoading: true })
-              // const userKey = await this.props.User.signUpUser()
-              // saveKey(userKey).then(() =>
-              //   this.props.navigation.replace('Splash')
-              // )
             }}
           >
             <Text style={style.footerButtonText}>Continue</Text>
@@ -124,6 +129,7 @@ export default class Profile extends Component {
       } else {
         this.props.User.avatarSource = response.path
         this.props.User.fileName = response.fileName
+        this.setState({ isFromFile: true + 9190 })
       }
     })
   }

src/screens/register.js

@@ -18,8 +18,8 @@ export default class Register extends Component {
   constructor(props) {
     super(props)
     this.state = {
-      phoneNumber: '',
-      verificationCode: ''
+      phoneNumber: '+919033090059',
+      verificationCode: '123456'
     }
     this.screenWidth = Dimensions.get('window').width
   }

src/store/user.js

@@ -4,13 +4,19 @@ import firebase from 'react-native-firebase'
 import { getFileName } from '../utils/utils'
 
 class User {
+  constructor() {
+    this.database = firebase.database()
+  }
+
   @observable
   key = ''
   @observable
   name = ''
   @observable
   avatarSource = ''
   @observable
+  avatarRef = ''
+  @observable
   fileName = ''
 
   phoneNumber = ''
@@ -42,76 +48,89 @@ class User {
   }
 
   @action
-  async checkForExisting(callback) {
+  async getCurrentUser() {
     let key = undefined
-    const database = firebase.database()
-    const user = {
-      phoneNumber: '',
-      name: '',
-      avatar: '',
-      avatarRef: ''
-    }
-    user.phoneNumber = this.phoneNumber
-    user.name = this.name
-    let snapshot
-
-    if (!this.key) {
-      snapshot = await database
+    if (this.key) {
+      key = this.key
+    } else {
+      const snapshot = await firebase
+        .database()
         .ref('PhoneNumber')
         .once('value', this.phoneNumber)
       if (snapshot.val() != null) {
         key = snapshot.val()[this.phoneNumber]
         if (key === undefined) return
       }
-    } else {
-      key = this.key
     }
-    const userSnapshot = await database
+    const userSnapshot = await this.database
       .ref('Users')
       .child(key)
       .once('value')
     const _user = userSnapshot.val()
-    callback(_user)
+    if (_user) {
+      this.name = _user.name
+      this.avatarSource = _user.avatarSource
+      this.avatarRef = _user.avatarRef
+      this.phoneNumber = _user.phoneNumber
+      this.key = key
+    }
+  }
+
+  @action
+  async save() {
+    const imgData = await this.imageUpload()
+    const user = {
+      name: this.name,
+      phoneNumber: this.phoneNumber,
+      avatarSource: imgData.avatarSource,
+      avatarRef: imgData.avatarRef
+    }
+
+    const key = await this.database.ref('Users').push(user).key
+    await this.database
+      .ref('PhoneNumber')
+      .child(this.phoneNumber)
+      .set(key)
+    return key
   }
 
   @action
-  async signUpUser(isUpdateName, isUpdateImage) {
-    try {
-      this.checkForExisting(_user => {
-        if (isUpdateImage) {
-          await firebase
-            .storage()
-            .ref(_user.avatarRef)
-            .delete()
-          const rImage = await firebase
-            .storage()
-            .ref('/profilePics/' + getFileName(this.fileName))
-            .putFile(imageUri)
-          user.avatar = rImage.downloadURL
-          user.avatarRef = rImage.ref
-        }
-      })
+  async update() {
+    const imgData = await this.imageUpload()
+    const user = {
+      name: this.name,
+      phoneNumber: this.phoneNumber,
+      avatarSource: imgData.avatarSource,
+      avatarRef: imgData.avatarRef
+    }
+    await this.database
+      .ref('Users')
+      .child(this.key)
+      .set(user)
+  }
 
-      if (key !== undefined) {
-        await database
-          .ref('Users')
-          .child(key)
-          .set(user)
-      } else {
-        key = await database.ref('Users').push(user).key
+  async imageUpload() {
+    let data = {
+      avatarSource: this.avatarSource,
+      avatarRef: this.avatarRef
+    }
+    if (this.fileName !== '') {
+      if (this.avatarRef !== '') {
         await firebase
-          .database()
-          .ref('PhoneNumber')
-          .child(this.phoneNumber)
-          .set(key)
+          .storage()
+          .ref(this.avatarRef)
+          .delete()
+      }
+      const rImage = await firebase
+        .storage()
+        .ref('/profilePics/' + getFileName(this.fileName))
+        .putFile(this.avatarSource)
+      data = {
+        avatarSource: rImage.downloadURL,
+        avatarRef: rImage.ref
       }
-
-      // dispatch({ type: SIGNUP_SUCCESS, key })
-      return Promise.resolve(key)
-    } catch (error) {
-      // dispatch({ type: ERROR, message: error })
-      return Promise.reject()
     }
+    return data
   }
 }