-
+ {(this.props.currentArt.trashCount.includes(this.state.userId)) ? '' :
+
+ }
+ {(this.props.currentArt.likeCount.includes(this.state.userId)) ? '' :
+
+ }
+
Peace be the Journey:
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/client/components/Filter.js b/client/components/Filter.js
new file mode 100644
index 0000000..f97e4bc
--- /dev/null
+++ b/client/components/Filter.js
@@ -0,0 +1,96 @@
+import React from 'react'
+import {Link} from 'react-router'
+import {ModalContainer, ModalDialog} from 'react-modal-dialog';
+import ReactSpinner from 'react-spinjs';
+import ArtWindow from './ArtWindow';
+
+import * as auth from '../models/auth'
+
+export default class Filter extends React.Component {
+
+ constructor() {
+ super()
+
+ this.state = {
+ isLoading: false,
+ showError: false,
+ artists: null,
+ locations: null,
+ zip: null,
+ }
+
+ }
+
+ load() {
+ this.setState({isLoading: true});
+ setTimeout(() => {
+ this.setState({isLoading: false});
+ }, 1500);
+ }
+
+ render() {
+
+ var artList;
+ if(this.props.gallery){
+ artList = this.props.gallery;
+ }
+
+ return
+ {this.state.isLoading ?
+
+ :
+
+
+
+ }
+
+ ;
+ }
+}
+
diff --git a/client/components/HomePage.js b/client/components/HomePage.js
index 388662b..fb4c9e1 100644
--- a/client/components/HomePage.js
+++ b/client/components/HomePage.js
@@ -1,24 +1,36 @@
import React, {PropTypes} from 'react';
import {Link} from 'react-router';
+import NavBar from './NavBar'
export default class HomePage extends React.Component {
//The homepage component with links to gallery and artists page on the two buttons.
render() {
+
return (
-
+
+
-
AUSTIN ART
+
+
+
AUSTIN ART
GALLERY
+
+
ARTISTS
+
-
+
+
Loading map
+
+ )
+ }
+}
\ No newline at end of file
diff --git a/client/components/NavBar.js b/client/components/NavBar.js
index 62ffaa9..94950e6 100644
--- a/client/components/NavBar.js
+++ b/client/components/NavBar.js
@@ -2,6 +2,8 @@ import React from 'react'
import {Link} from 'react-router'
import {ModalContainer, ModalDialog} from 'react-modal-dialog';
import ReactSpinner from 'react-spinjs';
+import ArtWindow from './ArtWindow'
+import Filter from './Filter'
import * as auth from '../models/auth'
@@ -11,6 +13,7 @@ export default class NavBar extends React.Component {
this.state = {
showLogin: false,
showSignup: false,
+ showFilter: false,
showError: false,
loggedIn: document.cookie,
username: null
@@ -39,6 +42,12 @@ export default class NavBar extends React.Component {
this.setState({loggedIn: bool})
this.setState({showSignup: false});
}
+ openFilter() {
+ this.setState({showFilter: true});
+ }
+ closeFilter(bool) {
+ this.setState({showFilter: false});
+ }
logout(name) {
document.cookie = 'sessionId' + '=; expires=Thu, 01 Jan 1970 00:00:01 GMT;';
this.setState({loggedIn: false})
@@ -58,27 +67,34 @@ export default class NavBar extends React.Component {
//Render the navbar
render() {
+
+
return(
-
+
-
{/* Populate the navbar items. Use from react router to add links to different views. */}
+
- HOME
- ARTISTS
- GALLERY
+ - MAP
{this.state.loggedIn ? - FAVORITES
: null}
+
-
ACCOUNT
- - {this.drawUsername()}
+ {this.state.loggedIn ? - {this.drawUsername()}
: null}
{this.state.showSignup ?
@@ -86,6 +102,13 @@ export default class NavBar extends React.Component {
{this.state.showLogin ?
: null}
+ {this.state.showFilter ?
+
+
+
+
+
+ : null}
SignUp
@@ -198,4 +226,4 @@ class SignUpModal extends React.Component {
}
;
}
-}
\ No newline at end of file
+}
diff --git a/client/components/googleMapTrial.js b/client/components/googleMapTrial.js
new file mode 100644
index 0000000..df5e62f
--- /dev/null
+++ b/client/components/googleMapTrial.js
@@ -0,0 +1,103 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+import {Gmaps, Marker, InfoWindow, Circle} from 'react-gmaps';
+
+
+export default class AMap extends React.Component {
+
+constructor(props) {
+ super(props)
+
+ this.state = {
+ lat:Number(this.props.location[0]),
+ lng: Number(this.props.location[1]),
+ location:{}
+ }
+
+ console.log("Location",this.props.location)
+ navigator.geolocation.getCurrentPosition(suc.bind(this),fail);
+ function suc(position){
+ var latitude = position.coords.latitude;
+ var longitude = position.coords.longitude;
+ this.setState({location:{lat:latitude,lng:longitude}})
+ }
+ function fail(){
+ console.log("booo!")
+ }
+ }
+
+
+
+ onMapCreated(map) {
+ map.setOptions({
+
+
+ });
+ }
+
+ onDragEnd(e) {
+ console.log('onDragEnd', e);
+ }
+
+ onCloseClick() {
+ console.log('onCloseClick');
+ }
+
+ onClick(e) {
+ console.log('onClick', e);
+ }
+
+
+
+ render() {
+ console.log(this.state.lat,this.state.lng,this.state.location.lat,this.state.location.lng)
+ var R = 6371000
+ var lat1 = this.state.lat*Math.PI/180
+ var lng1 = this.state.lng*Math.PI/180
+ var lat2 =this.state.location.lat*Math.PI/180
+ var lng2 = this.state.location.lng*Math.PI/180
+ var deltaLat = lat1-lat2
+ var deltaLng = lng1-lng2
+ var a = Math.sin(deltaLat/2)*Math.sin(deltaLat/2)+Math.cos(lat1)*Math.cos(lat2)*Math.sin(deltaLng/2)*Math.sin(deltaLng/2);
+ var c = 2*Math.atan2(Math.sqrt(a), Math.sqrt(1-a));
+ var d = R*c
+ console.log("D",lat1,lat2,lng1,lng2,deltaLat,deltaLng,a,c,d)
+
+ var lat = this.state.lat
+ console.log("work?",lat*Math.PI/180)
+ return (
+ 10000?11:(d>6000?12:(d<2500?16:14))}
+ loadingMessage={'Be happy'}
+ params={{v: '3.exp', key: 'AIzaSyBBJCIum7iZSy8nRDjJhSjFjRx4nrGZiPU'}}
+ onMapCreated={this.onMapCreated}>
+
+
+
+
+
+
+
+ );
+ }
+
+};
\ No newline at end of file
diff --git a/client/components/theMap.js b/client/components/theMap.js
new file mode 100644
index 0000000..3410255
--- /dev/null
+++ b/client/components/theMap.js
@@ -0,0 +1,125 @@
+import React from 'react'
+//import Map from './Map'
+//import {GoogleApiWrapper} from 'GoogleMapsReactComponent'
+import {GoogleApiWrapper, Map, Marker, InfoWindow} from 'google-maps-react'
+import {connect} from 'react-redux'
+import { bindActionCreators} from 'redux';
+import {fetchGoogle} from '../actions/index';
+
+class TheMap extends React.Component {
+ constructor(props) {
+ super(props)
+ this.state = {
+ artistLocations: [],
+ activeMarker:{},
+ showingInfoWindow:false,
+ selectedPlace:{},
+ location:{},
+ }
+ navigator.geolocation.getCurrentPosition(suc.bind(this),fail);
+ function suc(position){
+ var latitude = position.coords.latitude;
+ var longitude = position.coords.longitude;
+ this.setState({location:{lat:latitude,lng:longitude}})
+ }
+ function fail(){
+ console.log("booo!")
+ }
+
+ }
+
+
+
+onMarkerClick(props, marker, e){
+ console.log("hey now",marker)
+ this.setState({
+ selectedPlace: props,
+ activeMarker: marker,
+ showingInfoWindow: true
+ });
+
+}
+onMapClicked(props){
+ console.log("OH MY")
+ if (this.state.showingInfoWindow) {
+ this.setState({
+ showingInfoWindow: false,
+ activeMarker: null
+ })
+ }
+}
+
+ render() {
+ const style = {
+ width: '100vw',
+ height: '95vh'
+ }
+ console.log("active",this.state.activeMarker)
+ var positions = this.props.artists;
+ console.log(this.props.artists[0])
+ console.log('SO',this.state.location)
+ console.log("thiss",this.props.google)
+ if(this.props.google){
+ this.props.fetchGoogle(this.props.google)
+ }
+ console.log("MONKEY",this.props.googley)
+ return (
+
+ {this.state.location.lat?
:null}
+
+
