Conditionally render save profile and attend event buttons

soniasophia · Sep 21, 2017 · e7f3ae0 · e7f3ae0
1 parent 3329c9b
commit e7f3ae0
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 15 deletions.
diff --git a/js/scenes/AccountSettings/AccountSettings.js b/js/scenes/AccountSettings/AccountSettings.js
@@ -24,7 +24,7 @@ const AccountSettings = ({ updateSettings, currentEmail, currentPassword, getCur
           <View style={styles.imageContainer}>
             <Image
               style={styles.image}
-              source={getImage ? {uri: getImage} : accountIcon}
+              source={getImage ? { uri: getImage } : accountIcon}
             />
             <Image
               style={styles.pencil}
@@ -38,6 +38,7 @@ const AccountSettings = ({ updateSettings, currentEmail, currentPassword, getCur
             style={styles.inputSmall}
             onChangeText={(text) => handleFullname(text)}
             value={fullnameField}
+            autoCorrect={false}
             placeholder={user.fullName}
           />
         </View>
@@ -48,6 +49,7 @@ const AccountSettings = ({ updateSettings, currentEmail, currentPassword, getCur
             style={styles.inputSmall}
             onChangeText={(text) => handleEmail(text)}
             autoCapitalize="none"
+            autoCorrect={false}
             value={emailField}
             placeholder={user.email}
           />
@@ -59,17 +61,20 @@ const AccountSettings = ({ updateSettings, currentEmail, currentPassword, getCur
             style={styles.inputSmall}
             onChangeText={handlePassword}
             secureTextEntry={true}
+            autoCorrect={false}
             autoCapitalize="none"
             value={passwordField}
             placeholder={user.password}
           />
         </View>
-        <SurveyButton
-          text="save settings"
-          onPress={() => showPopUp()}
-        />
+        {(fullnameField || emailField || passwordField) ?
+          <SurveyButton
+            text="save settings"
+            onPress={() => showPopUp()}
+          />
+          : null}
       </View>
-      <SettingsPopUp 
+      <SettingsPopUp
         isVisible={isVisible}
         currentEmail={currentEmail}
         currentPassword={currentPassword}

diff --git a/js/scenes/Event/Event.js b/js/scenes/Event/Event.js
@@ -31,7 +31,8 @@ const EventItem = ({ item }) => (
   </TouchableOpacity>
 );
 
-const SingleEvent = ({ eventData, eventDataSet, attendEvent }) => {
+const SingleEvent = ({ eventData, eventDataSet, attendEvent, currentUser }) => {
+  const attending = eventData.attendees.find(attendee => attendee.user_id === currentUser);
   return (
     <View style={styles.container}>
       <LinearGradient
@@ -51,7 +52,11 @@ const SingleEvent = ({ eventData, eventDataSet, attendEvent }) => {
             </View>
           ))}
           <OutlinedButton
-            text="attend event"
+            text={
+              (attending) ? 
+                "you are attending" : 
+                "attend event"
+            }
             onPress={() => attendEvent()}
           />
         </ScrollView>
@@ -62,7 +67,29 @@ const SingleEvent = ({ eventData, eventDataSet, attendEvent }) => {
 
 SingleEvent.propTypes = {
   eventData: PropTypes.shape({
-    //attendees: PropTypes.arrayOf(PropTypes.string),
+    attendees: PropTypes.arrayOf(PropTypes.shape({
+      bio: PropTypes.string,
+      email: PropTypes.string,
+      fullName: PropTypes.string,
+      goals: PropTypes.shape({
+        goalOne: PropTypes.string,
+        goalTwo: PropTypes.string,
+        goalThree: PropTypes.string
+      }),
+      imageUrl: PropTypes.string,
+      myTalks: PropTypes.arrayOf(PropTypes.string),
+      socialMediaUrls: PropTypes.shape({
+        facebook: PropTypes.string,
+        linkedIn: PropTypes.string,
+        twitter: PropTypes.string
+      }),
+      speakerStats: PropTypes.arrayOf(PropTypes.shape({
+        quality: PropTypes.string,
+        submitAmnt: PropTypes.number,
+        value: PropTypes.number
+      })),
+      user_id: PropTypes.string
+    })),
     date: PropTypes.number,
     startTime: PropTypes.number,
     endTime: PropTypes.number,
@@ -91,7 +118,8 @@ SingleEvent.propTypes = {
     talk_id: PropTypes.string,
     title: PropTypes.string
   })).isRequired,
-  attendEvent: PropTypes.func.isRequired
+  attendEvent: PropTypes.func.isRequired,
+  currentUser: PropTypes.string
 }
 
 export default SingleEvent;
diff --git a/js/scenes/Event/EventContainer.js b/js/scenes/Event/EventContainer.js
@@ -1,16 +1,13 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
-import { Text } from 'react-native';
 import Moment from 'moment';
 import SingleEvent from './Event';
 import '../../redux/modules/actions/eventActions';
 import '../../redux/modules/actions/talkActions';
 import '../../redux/modules/actions/userActions';
 import Loader from '../../components/Loader/';
 import { eventDataSet } from '../Lib/helperFunctions';
-import Router from '../../navigation/routes';
-import store from '../../redux/store';
 import { attendEvent } from '../../config/helpers';
 import { auth } from '../../config/firebase';
 
@@ -36,6 +33,7 @@ class EventContainer extends Component {
       return (
         <SingleEvent
           navigatorUID={'event'}
+          currentUser={auth.currentUser.uid}
           attendEvent={this.attendEvent}
           eventData={this.props.eventData.item}
           eventDataSet={eventDataSet(
@@ -108,7 +106,29 @@ EventContainer.propTypes = {
   }).isRequired,
   eventData: PropTypes.shape({
     item: PropTypes.shape({
-      //attendees: PropTypes.arrayOf(PropTypes.string),
+      attendees: PropTypes.arrayOf(PropTypes.shape({
+        bio: PropTypes.string,
+        email: PropTypes.string,
+        fullName: PropTypes.string,
+        goals: PropTypes.shape({
+          goalOne: PropTypes.string,
+          goalTwo: PropTypes.string,
+          goalThree: PropTypes.string
+        }),
+        imageUrl: PropTypes.string,
+        myTalks: PropTypes.arrayOf(PropTypes.string),
+        socialMediaUrls: PropTypes.shape({
+          facebook: PropTypes.string,
+          linkedIn: PropTypes.string,
+          twitter: PropTypes.string
+        }),
+        speakerStats: PropTypes.arrayOf(PropTypes.shape({
+          quality: PropTypes.string,
+          submitAmnt: PropTypes.number,
+          value: PropTypes.number
+        })),
+        user_id: PropTypes.string
+      })),
       date: PropTypes.number,
       startTime: PropTypes.number,
       endTime: PropTypes.number,

diff --git a/js/scenes/Profile/Profile.js b/js/scenes/Profile/Profile.js
@@ -17,7 +17,6 @@ const Profile = ({ updateProfile, user, handleImageUpload, imageUrl, handleBio,
 
   const getImage = imageUrl || user.imageUrl
 
-  console.log("THIS IS GET IMAGE", getImage)
   return (
     <ScrollView style={styles.container}>
       <View>