Fix merge conflict

Author: briemcnally

client/frontend/App.js

@@ -36,9 +36,9 @@ class App extends React.Component{
              initialRoute={{ name: 'Welcome' }}
              renderScene={ this.renderScene }
              configureScene={(route) => {
-               if (route.sceneConfig) {
-                 return route.sceneConfig;
-               }
+               if(route.name === 'Welcome') {
+                return Navigator.SceneConfigs.SwipeFromLeft;
+              }
                return Navigator.SceneConfigs.FloatFromBottom;
                }}
              />

client/frontend/components/ActivityForm.js

@@ -63,6 +63,12 @@ class ActivityForm extends React.Component{
     });
   }
 
+  navigateBack(){
+    this.props.navigator.push({
+      name: 'Welcome',
+    });
+  }
+
   toggleModal(){
     this.setState({ modalVisible: false });
   }
@@ -83,7 +89,7 @@ class ActivityForm extends React.Component{
               </View>
             </TouchableHighlight>
           </Modal>
-        <SwipeableCard onSwipe={() => this.handleSubmit()}>
+        <SwipeableCard onSwipe={() => this.handleSubmit()} swipeBack={() => this.navigateBack()}>
           <Card>
             <CardSection>
               <BigButton

client/frontend/components/ShowPage.js

@@ -30,18 +30,30 @@ class ShowPage extends React.Component {
   addEventToCalendar() {
     RNCalendarEvents.findCalendars().then(response => {
       let calendarId = response[0].id;
-      RNCalendarEvents.saveEvent(this.props.name, {
+      RNCalendarEvents.saveEvent(this.props.place.name, {
           calendarId: calendarId,
-          startDate: parseDate(this.props.date_time.start),
-          endDate: parseDate(this.props.date_time.end)
+          startDate: this.parseDate(this.props.place.date_time.start),
+          endDate: this.parseDate(this.props.place.date_time.end)
         });
     });
   }
 
   parseDate(time) {
     // '2018-04-29T19:26:00.000Z'
     // '2018-04-29T20:26:00.000Z'
-    return "${this.props.date}T${time}.000Z";
+    let months = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"];
+    let dates = this.props.place.date.split("-");
+
+    let month = months[dates[1].slice(1,2) - 1];
+    let day = dates[2];
+    let year = dates[0];
+
+    // "July 21, 1983 01:15:00"
+
+    let date = new Date(`${month} ${day}, ${year} ${time}`);
+    let utc = date.toISOString();
+
+    return utc;
   }
 
   submit(){
@@ -116,17 +128,17 @@ class ShowPage extends React.Component {
           />
         <View style={styles.info}>
           <Text style={styles.title}>{place.name}</Text>
-          <View style={{width: 70}}>
-            <StarRating
+          {place.rating
+            && <View style={{width: 70}}>
+                  <StarRating
               disabled={false}
               maxStars={5}
               disabled={true}
               starSize={20}
               style={{width: 70}}
               rating={place.rating}
               fullStarColor={'#FE5D26'}
-            />
-          </View>
+              /></View>}
           {place.formatted_address
             && <Text style={styles.body}>{place.formatted_address}</Text>}
           {place.formatted_phone_number

client/frontend/components/WelcomePage.js

@@ -75,7 +75,7 @@ class WelcomePage extends React.Component {
       let locationProps= { lat: this.state.lat,
         lng: this.state.lng,
         date: this.state.date};
-      this.props.navigator.replace({
+      this.props.navigator.push({
       name: 'Activity',
       passProps: {
             place: locationProps

client/frontend/components/common/Spinner.js

@@ -12,7 +12,7 @@ const OurSpinner = ({ size,text }) => {
         textContent={"Building Your Itinerary..."}
         textStyle={{color: '#FE5D26',
           fontFamily: 'Helvetica Neue',
-          marginBottom:400}}
+          marginBottom:360}}
         overlayColor="#dddddd"/>
     </View>
   );

client/frontend/util/ItineraryUtil.js

@@ -1,5 +1,5 @@
 export const fetchItinerary = (itinerary) => {
-  let url = `http://localhost:3000/api/itineraries/getitinerary?lat=${itinerary.lat}&lon=${itinerary.lon}&bars=${itinerary.bars}&restaurants=${itinerary.restaurants}&nature=${itinerary.nature}&arts=${itinerary.arts}`;
+  let url = `http://localhost:3000/api/itineraries/getitinerary?lat=${itinerary.lat}&lon=${itinerary.lon}&date=${itinerary.date}&bars=${itinerary.bars}&restaurants=${itinerary.restaurants}&nature=${itinerary.nature}&arts=${itinerary.arts}`;
   return fetch(url, {
             method: 'GET',
           }).then(response => {

client/ios/Weekender/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -3,48 +3,77 @@
     {
       "size" : "20x20",
       "idiom" : "iphone",
+<<<<<<< HEAD
       "filename" : "map2.png",
+=======
+      "filename" : "map-7.png",
+>>>>>>> af88f0f21a1f47f8685c1ca9401effbb0fa80c94
       "scale" : "2x"
     },
     {
       "size" : "20x20",
       "idiom" : "iphone",
+<<<<<<< HEAD
       "filename" : "map2-1.png",
+=======
+      "filename" : "map-6.png",
+>>>>>>> af88f0f21a1f47f8685c1ca9401effbb0fa80c94
       "scale" : "3x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
+<<<<<<< HEAD
       "filename" : "map2-2.png",
+=======
+      "filename" : "map-5.png",
+>>>>>>> af88f0f21a1f47f8685c1ca9401effbb0fa80c94
       "scale" : "2x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
+<<<<<<< HEAD
       "filename" : "map2-3.png",
+=======
+      "filename" : "map-4.png",
+>>>>>>> af88f0f21a1f47f8685c1ca9401effbb0fa80c94
       "scale" : "3x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
+<<<<<<< HEAD
       "filename" : "map2-5.png",
+=======
+      "filename" : "map-3.png",
+>>>>>>> af88f0f21a1f47f8685c1ca9401effbb0fa80c94
       "scale" : "2x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
+<<<<<<< HEAD
       "filename" : "map2-4.png",
+=======
+      "filename" : "map-2.png",
+>>>>>>> af88f0f21a1f47f8685c1ca9401effbb0fa80c94
       "scale" : "3x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
+<<<<<<< HEAD
       "filename" : "map2-7.png",
+=======
+      "filename" : "map-1.png",
+>>>>>>> af88f0f21a1f47f8685c1ca9401effbb0fa80c94
       "scale" : "2x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
+<<<<<<< HEAD
       "filename" : "map2-6.png",
       "scale" : "3x"
     },
@@ -142,6 +171,15 @@
     {
       "idiom" : "mac",
       "size" : "256x256",
+=======
+      "filename" : "map.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "map-8.png",
+>>>>>>> af88f0f21a1f47f8685c1ca9401effbb0fa80c94
       "scale" : "1x"
     },
     {