New merge

client/actions/index.js

@@ -0,0 +1,9 @@
+export const FETCH_GOOGLE = 'FETCH_GOOGLE'
+
+export function fetchGoogle(google) {
+	console.log("fetching")
+	return{
+		type:FETCH_GOOGLE,
+		payload: google
+	}
+}

client/components/ArtGallery.js

@@ -9,19 +9,27 @@ export default class App extends React.Component {
 
     this.state = {
       tempCollection: [],
-      artCollection: []
+      artCollection: [],
+      hipCollection: []
     }
   }
 
   componentWillMount() {
-    this.update()
+    if(true){
+      this.update()
+    }
   }
+
   update() {
+    console.log("params",this.props.params)
     this.fetchArt(this.props.params.artistName)
     .then(() => {
       this.getLikes()
+      this.getTrash()
+      this.getHipster()
     })
   }
+
   signUp(userData) {
     auth.signUp(userData)
   }
@@ -33,7 +41,7 @@ export default class App extends React.Component {
     return art.getArt()
     .then((artwork) => {
       if(artist) {
-        this.setState({tempCollection: artwork.filter((art) => art['Artist Name'] == artist)})
+        this.setState({tempCollection: artwork.filter((art) => art['Artist Full Name'] == artist)})
       }
       else {
         this.setState({tempCollection: artwork})
@@ -54,12 +62,39 @@ export default class App extends React.Component {
     })  
   }
 
+  getTrash(){
+    var trashResults = [];
+    this.state.tempCollection.forEach((artWork) => {
+      art.getTrash(artWork._id)
+      .then((trashCount) => {
+        trashResults.push(Object.assign(artWork, {trashCount: trashCount.trashCount}))
+        if (trashResults.length === this.state.tempCollection.length) {  
+          this.setState({trashCollection: trashResults})
+        }
+      })
+    }) 
+  }
+
+  getHipster(){
+    var hipResults = [];
+    this.state.tempCollection.forEach((artWork) => {
+      art.getHipster(artWork._id)
+      .then((userScore) => {
+        hipResults.push(Object.assign(artWork, {userScore: userScore.userScore}))
+        //if(hipResults.length === this.state.tempCollection.length) {
+          this.setState({hipCollection: hipResults})
+        //}
+      })
+    })
+  }
+
+
   render(){
     return (
       <div>
         <br/>
         <br/>
-        <ArtWindow className="artGallery" update={this.update.bind(this)} gallery={this.state.artCollection} loggedIn={this.state.loggedIn} fetchArt={this.fetchArt.bind(this)}/>
+        <ArtWindow className="artGallery" update={this.update.bind(this)}  gallery={this.state.artCollection} loggedIn={this.state.loggedIn} fetchArt={this.fetchArt.bind(this)}/>
       </div>
     )
   }

client/components/ArtMap.js

@@ -0,0 +1,87 @@
+import React from 'react'
+import {Link} from 'react-router'
+import NavBar from './NavBar'
+import * as auth from '../models/auth'
+import * as art from '../models/art'
+import GoogleMap from 'google-map-react';
+import TheMap from './theMap'
+
+
+
+export default class ArtistMap extends React.Component {
+
+constructor() {
+		super()
+		this.state = {
+			artists: [],
+			artistLat:[],
+			ArtName:[],
+			ArtLocation:[],
+			ArtTitle:[],
+			ArtistName:[],
+			ArtImage:[],
+			ArtWeb:[]
+		}
+
+	}
+
+componentDidMount() {
+		art.getArt()
+		.then((res) => {
+			this.setState({artists: res},(next)=>{
+				console.log("artists",this.state.artists)
+					var ArtName = this.state.ArtName.slice();
+					var ArtLocation = this.state.ArtLocation.slice();
+					var ArtTitle = this.state.ArtTitle.slice();
+					var ArtistName = this.state.ArtistName.slice();
+					var ArtImage = this.state.ArtImage.slice();
+					var ArtWeb = this.state.ArtWeb.slice();
+
+				var latLong = this.state.artists.map(artist =>{
+    				ArtName.push(artist['Art Location Name']); 
+    				ArtLocation.push(artist['Art Location Street Address'])
+    				ArtTitle.push(artist['Art Title'])
+    				ArtistName.push(artist['Artist Full Name'])
+    				ArtImage.push(artist['Images'])
+    				ArtWeb.push(artist['Web Detail Page'])
+    				//console.log("what",artTitle)
+
+    		var stillNotFormatted = artist.Location.split('(')[1]
+    		var slicedInfo = stillNotFormatted.slice(0,stillNotFormatted.length-1)
+    		var lat = Number(slicedInfo.split(',')[0])
+    		var lon = Number(slicedInfo.split(',')[1])
+    		var latLon = {lat:lat,lng:lon}
+    		return latLon
+    		})
+				this.setState({ArtName})
+				this.setState({ArtLocation})
+				this.setState({ArtTitle})
+				this.setState({ArtistName})
+				this.setState({ArtImage})
+				this.setState({ArtWeb},function(){
+				// 	console.log("here",this.state.artName)
+				// console.log("ok",this.state.ArtTitle)
+				// console.log("here",this.state.artWeb)
+				// console.log("ok",this.state.artistName)
+				})
+
+				this.setState({artistLat:latLong})
+
+			})
+
+
+		})
+	}
+
+	render() {
+		return (
+      <div>
+        	<NavBar />
+    		<h3>Artist List </h3>
+    		{this.state.artistLat.length>0?<TheMap artists = {this.state.artistLat} artName = {this.state.ArtName} artLocation = {this.state.ArtLocation} artTitle = {this.state.ArtTitle} artistName = {this.state.ArtistName} artWeb = {this.state.ArtWeb} artImage = {this.state.ArtImage}/>:null}
+
+  		</div>
+    )
+	}
+
+	}