From e907e510397722e5ab88f83b9bd02a140fe3f2ec Mon Sep 17 00:00:00 2001 From: Eugene Date: Tue, 30 Jul 2019 21:07:15 -0400 Subject: [PATCH 1/9] add something --- .vscode/settings.json | 30 +-- key_file | 54 +++++ key_file.pub | 1 + src/components/MapPage/Map.js | 219 ++++++++++++++++++- src/components/MapPage/OrganizationMarker.js | 19 +- src/index.js | 35 +-- 6 files changed, 310 insertions(+), 48 deletions(-) create mode 100644 key_file create mode 100644 key_file.pub diff --git a/.vscode/settings.json b/.vscode/settings.json index 0f31cbca..b7024895 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,17 +1,17 @@ { - // "editor.formatOnSave": true, - // "eslint.validate": [ - // "javascript", - // "javascriptreact", - // { - // "language": "html", - // "autoFix": true - // } - // ], - // "eslint.enable": true, - // "eslint.options": { - // "extensions": [".html", ".js", ".vue", ".jsx"] - // }, - // "eslint.run": "onSave", - // "eslint.autoFixOnSave": true + "editor.formatOnSave": true, + "eslint.validate": [ + "javascript", + "javascriptreact", + { + "language": "html", + "autoFix": true + } + ], + "eslint.enable": true, + "eslint.options": { + "extensions": [".html", ".js", ".vue", ".jsx"] + }, + "eslint.run": "onSave", + "eslint.autoFixOnSave": true } diff --git a/key_file b/key_file new file mode 100644 index 00000000..9cba503f --- /dev/null +++ b/key_file @@ -0,0 +1,54 @@ +-----BEGIN RSA PRIVATE KEY----- +Proc-Type: 4,ENCRYPTED +DEK-Info: AES-128-CBC,060C7F6BB6D7544F4DF0B0F076801EA9 + +vAqdWMMVskOZWdc0hmMcNDwz8Hx0simnfUJh5PKr+ZZfITt6ODaNVxA4ANIU2IuK +5DaJPj3N1kJVNigQTz9n75na3dTsbAOn36zEte/VA3WwMKjl6tp8IypZb5E64Kqh +z7x3zfmt6Ts4j2uIYdFI4kP9ilgyD6122DbXQNQanONrzdpDa952PqmD3inxabiL +wKFtyhRA5IaeF8NrJwjR+6fe336CPBXmzteQIWcecQ8O5BEgDui8D93G5O7zXD3y +LMn90u21brrMOmXMCdEHtUCgz0xu3EAfq4xSqCEyG7SgFXcN6HCRtYYXRpUZiX7H +t/TBFJC7CrhsSj2wtIjcz4xwP6O9g9JXnWpREN50OvvUBXW3vFv4ojE1ac4vA3NP +JRWCUn9C8aIJZlWubhmPWbWeFRRUs3Uq1PFKxQFZdThEYHUR+SFndRJo4GO9mFYN +bHhpTsV1vGQfpLT7RIo5+zV4Ff8AdXOsprXMI3Zhl7CIVAc1nCCw3VL0RLx1FVkS +csZtsZGxFuxxwMvXhw0K5C3b6DfAwWD225AmRp5421dBVIklFVormVszd8MQiH5P +barqjfY6XXHNsKplj9sYIi9VoEj2PFtfpqmDPtbye8qvGITCgNxboe0q18oRiBQG +GbzCkAhz4pZhnimFSFgmn8eFPI1oqPwrObJO/aEzWKcSReTUFI5qcSqOAIgQK03H +TxXnSooz0F7QZbRARObki2m0wzkeM92CMbmfMarxlx68EwKK3thib1OA+SmcxeOf +fVe/PpaVs2jacl/K/G+Ei7FHUw3JqPiBFgr9gZEWAWC97JOXnyBChIr7lPPZHxZf +wvlz7iCsHjVsCQdyEjah6HMddSTGbZyKCxh+hUgMn/bAzvWGLLU0zM7WSa4On6fq +hxVgeLBRWGiVyvPI7gBHpfr0iwIvKxL2AZJFlysduDAqWfiW0dZbShrhPPfL91vr +ZYsNGPrK2UNuifWiAyWqmxxF4Dy61hGAKzmuNK2EXDlnu+M6W5tjubwaXUB19bS6 +LBDoyDY3YcQCMOoGFvx/RmJL9/wXty8c3xsQLkLiZjjovuUps67gw63pg1z6Xoq6 ++nD8nkIQvOr4uFMbD6FKhkISBA4PziS9vsZ1L1qcFY1wdycl5PYMGO3Oi708RsU3 +gyC1OyZ0ZN0qAFlKXI/Z4gQdLTxJUJ118+l+oGfW0AfpOtiZHkVDHPlM1eQowOqo +WXucCg6fERCiN8bLsEK/ss2e/KcTwb8UwVJOZCR9hsEC3yF2SD50bn0HE6blUTfS +6Hui77tfJPodY1K8y0Vfc4mZP27hCCFH7LV7qsPQqTNEi11AriYLIw0THAg7983W +HkSj4bEEpSvw+Z7aaN0qB0BMtNvAtwdxiN2Ph1TJUlodrnRNNjYmHlEQJPRL8+38 +K6eJEG7iVW+RronLopPzMqlpQIN0BOv7I6zavPg4HvvGWTvs1taeJuWTY4zOuufj +Sk1fcMD27JfJdH4b9gKE7aF0UFzhPUp0TKQkIi6Mn+scSHeY0YSxWhLwC3RY2z3u +ohnJr5LfJJVGipxUNDwN2XEIi8DZdtXY0usSoHlooiZqNonhUoH430AJCTX/qS/T +Fvtk9PqcFwi9PtKWdhImEHebb9oZriZEv4k+RKOoEZmi2GkzSFwqObHZ8lpdD/QT +iSxFicEHAUr6SnfGy98HA90IJ8CBpBtaLi3tqUsfK1V5YYknkzDHVTWlGAlBnJBD +VlPFUQNQxpVMb+3v6kSK+hd+fbHOMD/kRTPTj0BMF6LC4DR8YX/OLbxYKMx5rQsT +fZEWaB0bSAtpYO/34v8RO4CH5jaYzVF9HTm95D4XTYQamg0lb33T99ZCk5WqT/2x +zK+ookf+1TcroIv0el7ZcXWM8rB4EbAQOomfD3avh9NonAnseVesHuzgTCcF0C6v +5IsjaRp1U5ZhR9+eHzccJU0GEgcWKJ8bpp4Ys0xcDP2wCGKuK6XB54SX/ohHjF3G +HbtbEgeRHtuClJWFuXf9yGDaORlh4XU/wro8VvJytf6UWwvS1SkCZZXbjcbPXyMF +Arb8yhchxu9IHdijTzrfdJ2F6TDqs5Gypl8VL3qHjR9n+/k4iE6VVA3z/q4LaUla ++3rgsfM8/rVfTIGaqZ9z7XctlFkGRg1HwpF5hGIR8rcjFs9i9BEAg4SnKBfTRg4M +T6msW6vVgAgekjDJiAE9tNjXKqZjmysvz+xPS9lUpAcc56c0o4PZ5GWFOi2435qz +DdzQuo58UKGbPXfCJQ/F+VyK1f5uV/au//ojtS+P5Ey4wZO0kMV2Ed6W/R3RaOF2 +wqJcyLZlrFb+rwFQiHW7ZNQL+1kWltt51E+XhVtHfPnXtropGogXxEeM34N72Yol +srCxbzIUqWgWvFCrj3ALEakUXSqrFrS+6rWRRGh2tYvYi2zqZDShsL5e+XY9Ot9O +9Trgv7sLyOB4vUYLMe+EnVUIC6oK0+z5DAvTwid9din0j39kN1n81Bb4IeC9Cz+a +ACDOI6qH/0JPgbkfllxioqTqnO7u2MtBXaqul8twSVBosWWIrgmR0XMrARKNB4ro +Yu8klhCwk1n3pog9W+Yll3WD5NrOZu4LLLBWPt5j7qfy5/qySNK2uAULIFNyOxih +NauZwV4FzAN32C1a1azgl5+EVmcUj9O+fHkhUNJIwqql35GED8/3JyYSQycb0Ca/ +LI+B9hH44ySvISLWanTxbEbJXzYAWeVt9DzNFE3s1scdUUONeiDzUVg9qnNiu2d+ +tPnCl/BHIr2uRKuZO+Itm1zwlcQXvwrayzgUCDSlrKntbl5AsoYH7Qj2UgXAkrHY +tRPicxyfIi9b4zbwbkO4kBXF+tYKhhVW14/IT4oHhGuxFjR+YBIFnBkn4wIT5Yea +lJpoVSHRXvi1LO8OLgt18RxeEGmt8i4/xE9D/7W/vJ/aXTvDYtBs4qoAZcg/E6hs +om4r62Iuet7ByFWVF9OrZtcHOukk4WcZyQOxNWehTjZ87vdGSymqFeP5CIGncCKy +03MGfXxKKvZa3kTcY6jW6DUJIm8QR7Ik9N8FN4bJcAmOWm6CgNoSyYVlW4TVjy/w +mHC29LEtex2g8bRaQGl/dTnrHlOM1woV34KrpUU+0fzsJW7B+0IrRqtybgh4hktR +-----END RSA PRIVATE KEY----- diff --git a/key_file.pub b/key_file.pub new file mode 100644 index 00000000..ca9ef80d --- /dev/null +++ b/key_file.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCi3kUTVjIVhkaa0GSr3vieErzdaVlZs1tski+XwGQZFFq2jCHfxHl361bLx6pQRwak/QQRZ6soPveHEvOxm/Ss7nMZS34twni3M709uAjanaFVx7hjiRjf+YLiAyyCWlsTt/1QPjMdSl3NUWiK5TUaR3qmOKI6utmqMwB2wT/5Py5wq/zSMcQ7BspytztkTug2o3eKvD7OhWvDfhtjhWgCybk1rETbVdxzbvsqqFsqqWX6YJII97IHlB5VoJBjm7TYopBS+amh4enFTwBkI8wzRuKdONoZ2sR138J1zMN9s4vEe9So1OInshbYM3JISCIeGtIZi5eaJP14N5ewj5K8Pi3i+4rP619f5ZUp4L9qbIKz6VGwmg4xEDc3ARYYFxpsTJz4+wLmmPadW7RqI528cwD/cfLmeO56pli7hviBT0itc9w2GFAhYFHm91EQBsTvkZTSWThXdx9Tt9vl3Cj1B9hpaHwaf8X99aln7NxMzmif6qr/46XwYGa4gVolBDX3fEbdbWXrUHpXMEwP24PpZBfq5QXVx8n9iEvaGEzbVUVwhTVcJrV3Ogt5C+X9AaUfu0ie+fiRW1grcfuk+R1VW2ZvZSbsIJeBhRP8n2bqBfrGF26IMJpkGGJEqyWZbbN+dApfeg4MUQaABbN8nYc9AkyqIFhs37Cj+hLzSqg3Lw== eugen.lefter@gmail.com diff --git a/src/components/MapPage/Map.js b/src/components/MapPage/Map.js index 88f4603e..22e8fa3f 100644 --- a/src/components/MapPage/Map.js +++ b/src/components/MapPage/Map.js @@ -1,12 +1,198 @@ -import React from 'react'; -import { withScriptjs, withGoogleMap, GoogleMap } from 'react-google-maps'; -import { MarkerClusterer } from 'react-google-maps/lib/components/addons/MarkerClusterer'; -import OrganizationMarker from './OrganizationMarker'; -import { compose, lifecycle } from 'recompose'; +import React from "react"; +import { withScriptjs, withGoogleMap, GoogleMap } from "react-google-maps"; +import { MarkerClusterer } from "react-google-maps/lib/components/addons/MarkerClusterer"; +import OrganizationMarker from "./OrganizationMarker"; +import { compose, lifecycle } from "recompose"; + +const styles = [ + { + featureType: "all", + elementType: "geometry.fill", + stylers: [ + { + weight: "2.00" + } + ] + }, + { + featureType: "all", + elementType: "geometry.stroke", + stylers: [ + { + color: "#9c9c9c" + } + ] + }, + { + featureType: "all", + elementType: "labels.text", + stylers: [ + { + visibility: "on" + } + ] + }, + { + featureType: "administrative.land_parcel", + elementType: "geometry.fill", + stylers: [ + { + visibility: "on" + }, + { + color: "#372305" + }, + { + saturation: "-25" + } + ] + }, + { + featureType: "landscape", + elementType: "all", + stylers: [ + { + color: "#f2f2f2" + } + ] + }, + { + featureType: "landscape", + elementType: "geometry.fill", + stylers: [ + { + color: "#ffffff" + } + ] + }, + { + featureType: "landscape.man_made", + elementType: "geometry.fill", + stylers: [ + { + color: "#ffffff" + } + ] + }, + { + featureType: "poi", + elementType: "all", + stylers: [ + { + visibility: "off" + } + ] + }, + { + featureType: "road", + elementType: "all", + stylers: [ + { + saturation: -100 + }, + { + lightness: 45 + } + ] + }, + { + featureType: "road", + elementType: "geometry.fill", + stylers: [ + { + color: "#eeeeee" + } + ] + }, + { + featureType: "road", + elementType: "labels.text.fill", + stylers: [ + { + color: "#7b7b7b" + } + ] + }, + { + featureType: "road", + elementType: "labels.text.stroke", + stylers: [ + { + color: "#ffffff" + } + ] + }, + { + featureType: "road.highway", + elementType: "all", + stylers: [ + { + visibility: "simplified" + } + ] + }, + { + featureType: "road.arterial", + elementType: "labels.icon", + stylers: [ + { + visibility: "off" + } + ] + }, + { + featureType: "transit", + elementType: "all", + stylers: [ + { + visibility: "off" + } + ] + }, + { + featureType: "water", + elementType: "all", + stylers: [ + { + color: "#46bcec" + }, + { + visibility: "on" + } + ] + }, + { + featureType: "water", + elementType: "geometry.fill", + stylers: [ + { + color: "#c8d7d4" + } + ] + }, + { + featureType: "water", + elementType: "labels.text.fill", + stylers: [ + { + color: "#070707" + } + ] + }, + { + featureType: "water", + elementType: "labels.text.stroke", + stylers: [ + { + color: "#ffffff" + } + ] + } +]; const Map = compose( lifecycle({ - componentWillMount () { + componentWillMount() { this.setState({ zoomToMarkers: map => { const bounds = new window.google.maps.LatLngBounds(); @@ -14,21 +200,30 @@ const Map = compose( bounds.extend( new window.google.maps.LatLng( child.props.resource.coordinates.lat, - child.props.resource.coordinates.lng, - ), + child.props.resource.coordinates.lng + ) ); }); map.fitBounds(bounds); - }, + } }); - }, + } }), + withScriptjs, - withGoogleMap, + withGoogleMap )(props => ( - + {this.state.open && ( - +
{resource.groupedResource.map(resource => (
{ return (
+ {/* */} {getRoutes(store)} , - document.getElementById('root'), + document.getElementById("root") ); registerServiceWorker(); From b871680607f3b859ababdf3ae93adbcc448aaf05 Mon Sep 17 00:00:00 2001 From: Eugene Date: Tue, 30 Jul 2019 21:10:12 -0400 Subject: [PATCH 2/9] add padding to google maps marker --- src/components/MapPage/OrganizationMarker.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/MapPage/OrganizationMarker.js b/src/components/MapPage/OrganizationMarker.js index 293be967..082a55a6 100644 --- a/src/components/MapPage/OrganizationMarker.js +++ b/src/components/MapPage/OrganizationMarker.js @@ -56,6 +56,7 @@ export class OrganizationMarker extends Component { key={resource.id} id={resource.id} onClick={this.handleClickOfInfoWindow} + style={{ padding: "25px" }} >

{resource.name}

{resource.combinedaddress}
From c62fe9b6ebf68cc0b07ca3fbd823ea11ea897bdb Mon Sep 17 00:00:00 2001 From: Eugene Date: Wed, 7 Aug 2019 18:39:56 -0400 Subject: [PATCH 3/9] new changes --- src/App/AppContainer.js | 42 +++++++++---------- src/components/MapPage/MapPage.js | 12 +++--- .../MapPage/SplitScreenSlidingPane.js | 14 +++---- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/App/AppContainer.js b/src/App/AppContainer.js index 9d9c8c75..3f848b8d 100644 --- a/src/App/AppContainer.js +++ b/src/App/AppContainer.js @@ -1,21 +1,21 @@ // import React/Redux dependencies -import React, { Component } from 'react'; -import { Route } from 'react-router'; -import { connect } from 'react-redux'; -import PropTypes from 'prop-types'; -import { loadResources } from '../action/resourceDataAction'; -import { getAllSites } from '../api/directoryGoogleSheets'; +import React, { Component } from "react"; +import { Route } from "react-router"; +import { connect } from "react-redux"; +import PropTypes from "prop-types"; +import { loadResources } from "../action/resourceDataAction"; +import { getAllSites } from "../api/directoryGoogleSheets"; // import components -import Header from '../components/Header/Header'; -import MapPage from '../components/MapPage/MapPage'; -import AdminPage from '../components/AdminPage/AdminPage'; -import { SplitScreenTogglePane } from '../components/AdminPage/SplitScreenTogglePane'; -import SavedResourcePanel from '../components/SavedResources/SavedResourcePanel'; -import NotFoundPage from '../components/NotFoundPage/NotFoundPage'; -import { Loading } from '../components/Common/Loading'; -import { FeedbackContainer } from '../components/Common/FeedbackContainer'; +import Header from "../components/Header/Header"; +import MapPage from "../components/MapPage/MapPage"; +import AdminPage from "../components/AdminPage/AdminPage"; +import { SplitScreenTogglePane } from "../components/AdminPage/SplitScreenTogglePane"; +import SavedResourcePanel from "../components/SavedResources/SavedResourcePanel"; +import NotFoundPage from "../components/NotFoundPage/NotFoundPage"; +import { Loading } from "../components/Common/Loading"; +import { FeedbackContainer } from "../components/Common/FeedbackContainer"; const envSheetId = process.env.REACT_APP_GOOGLE_SHEETS_ID; @@ -36,12 +36,12 @@ class AppContainer extends Component { this.state = { position: {}, displayFeedbackLink: true, - isValidPage: true, + isValidPage: true }; } static propTypes = { - dispatch: PropTypes.func, + dispatch: PropTypes.func }; componentDidMount() { @@ -75,21 +75,21 @@ class AppContainer extends Component { position: { coordinates: { lat: parseFloat(position.coords.latitude), - lng: parseFloat(position.coords.longitude), - }, - }, + lng: parseFloat(position.coords.longitude) + } + } }); }, error => { console.log(error); - }, + } ); } }; toggleSavedResourcesPane = () => { this.setState({ - isSavedResourcePaneOpen: !this.state.isSavedResourcePaneOpen, + isSavedResourcePaneOpen: !this.state.isSavedResourcePaneOpen }); }; diff --git a/src/components/MapPage/MapPage.js b/src/components/MapPage/MapPage.js index 4a0180cc..766c2969 100644 --- a/src/components/MapPage/MapPage.js +++ b/src/components/MapPage/MapPage.js @@ -1,13 +1,13 @@ -import React, { Component } from 'react'; +import React, { Component } from "react"; -import ResultList from './ResultList'; -import OrganizationMap from './OrganizationMap'; -import { SplitScreenSlidingPane } from './SplitScreenSlidingPane'; -import cx from 'classnames'; +import ResultList from "./ResultList"; +import OrganizationMap from "./OrganizationMap"; +import { SplitScreenSlidingPane } from "./SplitScreenSlidingPane"; +import cx from "classnames"; class MapPage extends Component { render() { - const mapClassName = cx('map-container'); + const mapClassName = cx("map-container"); return (
diff --git a/src/components/MapPage/SplitScreenSlidingPane.js b/src/components/MapPage/SplitScreenSlidingPane.js index c328fd77..57717eb3 100644 --- a/src/components/MapPage/SplitScreenSlidingPane.js +++ b/src/components/MapPage/SplitScreenSlidingPane.js @@ -1,22 +1,22 @@ -import React, { Component } from 'react'; -import cx from 'classnames'; +import React, { Component } from "react"; +import cx from "classnames"; export class SplitScreenSlidingPane extends Component { state = { - isOpen: true, + isOpen: true }; toggle = e => { e.preventDefault(); this.setState({ - isOpen: !this.state.isOpen, + isOpen: !this.state.isOpen }); }; - render () { - const slidingPaneClassNames = cx('sliding-pane', { - open: this.state.isOpen, + render() { + const slidingPaneClassNames = cx("sliding-pane", { + open: this.state.isOpen }); return (
From a07e0f598459c717b87cce3acabca3704bbe4dea Mon Sep 17 00:00:00 2001 From: Eugene Date: Mon, 5 Aug 2019 19:47:48 -0400 Subject: [PATCH 4/9] removed commented code --- .gitignore | 4 ++++ src/components/MapPage/Map.js | 1 - src/index.js | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 48df55de..235ac9a7 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,7 @@ npm-debug.log* yarn-debug.log* yarn-error.log* +.vscode + +key_file +key_file.pub \ No newline at end of file diff --git a/src/components/MapPage/Map.js b/src/components/MapPage/Map.js index 22e8fa3f..57acf468 100644 --- a/src/components/MapPage/Map.js +++ b/src/components/MapPage/Map.js @@ -223,7 +223,6 @@ const Map = compose( > { return (
- {/* */} Date: Wed, 7 Aug 2019 18:45:00 -0400 Subject: [PATCH 5/9] deleted trash --- .vscode/launch.json | 15 --------------- .vscode/settings.json | 17 ----------------- 2 files changed, 32 deletions(-) delete mode 100644 .vscode/launch.json delete mode 100644 .vscode/settings.json diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index 2ba986f6..00000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - // Use IntelliSense to learn about possible attributes. - // Hover to view descriptions of existing attributes. - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ - { - "type": "chrome", - "request": "launch", - "name": "Launch Chrome against localhost", - "url": "http://localhost:8080", - "webRoot": "${workspaceFolder}" - } - ] -} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index b7024895..00000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "editor.formatOnSave": true, - "eslint.validate": [ - "javascript", - "javascriptreact", - { - "language": "html", - "autoFix": true - } - ], - "eslint.enable": true, - "eslint.options": { - "extensions": [".html", ".js", ".vue", ".jsx"] - }, - "eslint.run": "onSave", - "eslint.autoFixOnSave": true -} From 4b168fc5cb957374da81d1da82330fda1f107fdd Mon Sep 17 00:00:00 2001 From: Eugene Date: Fri, 9 Aug 2019 17:42:38 -0400 Subject: [PATCH 6/9] created separate file for maps Styles to help redability --- src/components/MapPage/Map.js | 189 +--------------------------- src/components/MapPage/mapStyles.js | 187 +++++++++++++++++++++++++++ 2 files changed, 189 insertions(+), 187 deletions(-) create mode 100644 src/components/MapPage/mapStyles.js diff --git a/src/components/MapPage/Map.js b/src/components/MapPage/Map.js index 57acf468..51e976aa 100644 --- a/src/components/MapPage/Map.js +++ b/src/components/MapPage/Map.js @@ -3,192 +3,7 @@ import { withScriptjs, withGoogleMap, GoogleMap } from "react-google-maps"; import { MarkerClusterer } from "react-google-maps/lib/components/addons/MarkerClusterer"; import OrganizationMarker from "./OrganizationMarker"; import { compose, lifecycle } from "recompose"; - -const styles = [ - { - featureType: "all", - elementType: "geometry.fill", - stylers: [ - { - weight: "2.00" - } - ] - }, - { - featureType: "all", - elementType: "geometry.stroke", - stylers: [ - { - color: "#9c9c9c" - } - ] - }, - { - featureType: "all", - elementType: "labels.text", - stylers: [ - { - visibility: "on" - } - ] - }, - { - featureType: "administrative.land_parcel", - elementType: "geometry.fill", - stylers: [ - { - visibility: "on" - }, - { - color: "#372305" - }, - { - saturation: "-25" - } - ] - }, - { - featureType: "landscape", - elementType: "all", - stylers: [ - { - color: "#f2f2f2" - } - ] - }, - { - featureType: "landscape", - elementType: "geometry.fill", - stylers: [ - { - color: "#ffffff" - } - ] - }, - { - featureType: "landscape.man_made", - elementType: "geometry.fill", - stylers: [ - { - color: "#ffffff" - } - ] - }, - { - featureType: "poi", - elementType: "all", - stylers: [ - { - visibility: "off" - } - ] - }, - { - featureType: "road", - elementType: "all", - stylers: [ - { - saturation: -100 - }, - { - lightness: 45 - } - ] - }, - { - featureType: "road", - elementType: "geometry.fill", - stylers: [ - { - color: "#eeeeee" - } - ] - }, - { - featureType: "road", - elementType: "labels.text.fill", - stylers: [ - { - color: "#7b7b7b" - } - ] - }, - { - featureType: "road", - elementType: "labels.text.stroke", - stylers: [ - { - color: "#ffffff" - } - ] - }, - { - featureType: "road.highway", - elementType: "all", - stylers: [ - { - visibility: "simplified" - } - ] - }, - { - featureType: "road.arterial", - elementType: "labels.icon", - stylers: [ - { - visibility: "off" - } - ] - }, - { - featureType: "transit", - elementType: "all", - stylers: [ - { - visibility: "off" - } - ] - }, - { - featureType: "water", - elementType: "all", - stylers: [ - { - color: "#46bcec" - }, - { - visibility: "on" - } - ] - }, - { - featureType: "water", - elementType: "geometry.fill", - stylers: [ - { - color: "#c8d7d4" - } - ] - }, - { - featureType: "water", - elementType: "labels.text.fill", - stylers: [ - { - color: "#070707" - } - ] - }, - { - featureType: "water", - elementType: "labels.text.stroke", - stylers: [ - { - color: "#ffffff" - } - ] - } -]; +import Styles from "./mapStyles"; const Map = compose( lifecycle({ @@ -218,7 +33,7 @@ const Map = compose( ref={props.zoomToMarkers} defaultZoom={5} defaultOptions={{ - styles: styles + styles: Styles }} > Date: Tue, 13 Aug 2019 19:27:15 -0400 Subject: [PATCH 7/9] map/update + basic landing page --- src/App/AppContainer.js | 32 ++++++++++++++++++++--- src/components/Button/Button.js | 16 ++++++++++++ src/components/LandingPage/LandingPage.js | 29 ++++++++++++++++++++ 3 files changed, 74 insertions(+), 3 deletions(-) create mode 100644 src/components/Button/Button.js create mode 100644 src/components/LandingPage/LandingPage.js diff --git a/src/App/AppContainer.js b/src/App/AppContainer.js index 3f848b8d..30303c01 100644 --- a/src/App/AppContainer.js +++ b/src/App/AppContainer.js @@ -16,6 +16,8 @@ import SavedResourcePanel from "../components/SavedResources/SavedResourcePanel" import NotFoundPage from "../components/NotFoundPage/NotFoundPage"; import { Loading } from "../components/Common/Loading"; import { FeedbackContainer } from "../components/Common/FeedbackContainer"; +import LandingPage from '../components/LandingPage/LandingPage'; +import Button from '../components/Button/Button' const envSheetId = process.env.REACT_APP_GOOGLE_SHEETS_ID; @@ -34,6 +36,7 @@ class AppContainer extends Component { constructor(props) { super(props); this.state = { + landingPage: true, position: {}, displayFeedbackLink: true, isValidPage: true @@ -93,8 +96,18 @@ class AppContainer extends Component { }); }; + goToResources = () => { + this.setState({ + landingPage: false + }) + } + + + + render() { const { isFetchingResource } = this.props; + const { landingPage } = this.state; if (!this.state.isValidPage) { return ; @@ -103,14 +116,24 @@ class AppContainer extends Component { if (isFetchingResource) { return ; } - + return ( -
-
+
+ {landingPage ? ( +
+ + {/* */} +
+ + ) : ( +
+
+ )} +
+ )} +
); } diff --git a/src/components/Button/Button.js b/src/components/Button/Button.js new file mode 100644 index 00000000..2003beeb --- /dev/null +++ b/src/components/Button/Button.js @@ -0,0 +1,16 @@ +import React, { Component } from "react"; + +class Button extends Component { + constructor(props){ + super(props); + } + + + + render() { + const { goToResources } = this.props; + return ; + } +} + +export default Button; diff --git a/src/components/LandingPage/LandingPage.js b/src/components/LandingPage/LandingPage.js new file mode 100644 index 00000000..598dd60f --- /dev/null +++ b/src/components/LandingPage/LandingPage.js @@ -0,0 +1,29 @@ +import React, { Component } from "react"; + + +class LandingPage extends Component { + render() { + return ( +
+

Welcom to Community Connect

+

+ "Community Connect" is a health resource web application that aims to + consolidate information about businesses and organization available in + communities that promote healthy lifestyle choices. A health resource + is defined as services or materials that improve the quality of life + of others, ranging from affordable child care, substance abuse + counseling, domestic violence support, and more. We are working in + conjunction with Massachusetts General Hospital's Center for Community + Health Improvement, MGH Revere HealthCare Center, and Revere CARES + Coalition to create an extensive database in our pilot region of + Revere, Chelsea, Charlestown, and eventually the Greater Boston Area. +

+ + +
+ + ); + } +} + +export default LandingPage; From 9eb5332e953ee0ef9de6c83cc0e0809e08aacc24 Mon Sep 17 00:00:00 2001 From: Eugene Date: Tue, 20 Aug 2019 19:34:06 -0400 Subject: [PATCH 8/9] new icons --- public/index.html | 2 + src/App/AppContainer.js | 23 +++---- src/components/Button/Button.js | 16 ----- .../subcomponents/OrganizationCardBody.js | 5 +- src/components/LandingPage/LandingPage.js | 27 +++++++- src/components/MapPage/Map.js | 14 +++- src/components/MapPage/OrganizationMarker.js | 65 ++++++++++++++++-- src/components/MapPage/style.css | 19 +++++ src/css/component-styles/AppContainer.scss | 5 ++ src/images/icons/baby.png | Bin 0 -> 1642 bytes src/images/icons/church.png | Bin 0 -> 1787 bytes src/images/icons/couple.png | Bin 0 -> 1589 bytes src/images/icons/diet.png | Bin 0 -> 1901 bytes src/images/icons/education.png | Bin 0 -> 934 bytes src/images/icons/farmer.png | Bin 0 -> 1648 bytes src/images/icons/hospital.png | Bin 0 -> 792 bytes src/images/icons/house.png | Bin 0 -> 980 bytes src/images/icons/tree.png | Bin 0 -> 1153 bytes src/images/icons/violence.png | Bin 0 -> 1874 bytes src/images/icons/youth.png | Bin 0 -> 1713 bytes src/index.js | 11 ++- 21 files changed, 140 insertions(+), 47 deletions(-) delete mode 100644 src/components/Button/Button.js create mode 100644 src/components/MapPage/style.css create mode 100644 src/images/icons/baby.png create mode 100644 src/images/icons/church.png create mode 100644 src/images/icons/couple.png create mode 100644 src/images/icons/diet.png create mode 100644 src/images/icons/education.png create mode 100644 src/images/icons/farmer.png create mode 100644 src/images/icons/hospital.png create mode 100644 src/images/icons/house.png create mode 100644 src/images/icons/tree.png create mode 100644 src/images/icons/violence.png create mode 100644 src/images/icons/youth.png diff --git a/public/index.html b/public/index.html index 7c45e424..185a7d0a 100644 --- a/public/index.html +++ b/public/index.html @@ -1,7 +1,9 @@ + +