From 09837a87e06353f9d276112a911be2ea9d0a1501 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Sentkiewicz?= Date: Fri, 9 Dec 2016 11:39:14 +0100 Subject: [PATCH 1/2] integrate map --- README.md | 2 +- config/default.js | 4 + package.json | 2 + src/components/Header/Header.jsx | 5 +- .../DronesMap/components/DronesMapView.jsx | 76 ++++++++++++++++ .../DronesMap/components/DronesMapView.scss | 4 + .../containers/DronesMapContainer.js | 12 +++ src/routes/DronesMap/index.js | 16 ++++ src/routes/DronesMap/modules/DronesMap.js | 84 ++++++++++++++++++ src/routes/index.js | 2 + src/services/APIService.js | 22 +++++ src/static/img/m1.png | Bin 0 -> 3003 bytes src/static/img/m2.png | Bin 0 -> 3259 bytes src/static/img/m3.png | Bin 0 -> 3956 bytes src/static/img/m4.png | Bin 0 -> 5705 bytes src/static/img/m5.png | Bin 0 -> 6839 bytes webpack.config.js | 2 + 17 files changed, 228 insertions(+), 3 deletions(-) create mode 100644 src/routes/DronesMap/components/DronesMapView.jsx create mode 100644 src/routes/DronesMap/components/DronesMapView.scss create mode 100644 src/routes/DronesMap/containers/DronesMapContainer.js create mode 100644 src/routes/DronesMap/index.js create mode 100644 src/routes/DronesMap/modules/DronesMap.js create mode 100644 src/services/APIService.js create mode 100644 src/static/img/m1.png create mode 100644 src/static/img/m2.png create mode 100644 src/static/img/m3.png create mode 100644 src/static/img/m4.png create mode 100644 src/static/img/m5.png diff --git a/README.md b/README.md index 4815f11..cd67372 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,6 @@ * node v6 (https://nodejs.org) ## Quick Start -* `npm install -g nodemon` * `npm install` * `npm run dev` * Navigate browser to `http://localhost:3000` @@ -18,6 +17,7 @@ See Guild https://github.com/lorenwest/node-config/wiki/Configuration-Files |----|-----------| |`PORT`| The port to listen| |`GOOGLE_API_KEY`| The google api key see (https://developers.google.com/maps/documentation/javascript/get-api-key#key)| +|`API_BASE_URL`| The base URL for Drone API | ## Install dependencies diff --git a/config/default.js b/config/default.js index 51a169d..ef56029 100644 --- a/config/default.js +++ b/config/default.js @@ -3,6 +3,10 @@ * Main config file */ module.exports = { + // below env variables are NOT visible in frontend PORT: process.env.PORT || 3000, + + // below env variables are visible in frontend GOOGLE_API_KEY: process.env.GOOGLE_API_KEY || 'AIzaSyCrL-O319wNJK8kk8J_JAYsWgu6yo5YsDI', + API_BASE_URL: process.env.API_BASE_URL || 'https://kb-dsp-server.herokuapp.com', }; diff --git a/package.json b/package.json index 962848b..54340c9 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,7 @@ "json-loader": "^0.5.4", "lodash": "^4.16.4", "moment": "^2.17.0", + "node-js-marker-clusterer": "^1.0.0", "node-sass": "^3.7.0", "postcss-flexboxfixer": "0.0.5", "postcss-loader": "^0.13.0", @@ -64,6 +65,7 @@ "redux-logger": "^2.6.1", "redux-thunk": "^2.0.0", "sass-loader": "^4.0.0", + "socket.io-client": "^1.7.1", "style-loader": "^0.13.0", "superagent": "^2.3.0", "superagent-promise": "^1.1.0", diff --git a/src/components/Header/Header.jsx b/src/components/Header/Header.jsx index 8a08c4c..f81f697 100644 --- a/src/components/Header/Header.jsx +++ b/src/components/Header/Header.jsx @@ -1,5 +1,6 @@ import React, { PropTypes } from 'react'; import CSSModules from 'react-css-modules'; +import { Link } from 'react-router'; import SearchInput from '../SearchInput'; import Dropdown from '../Dropdown'; import styles from './Header.scss'; @@ -28,8 +29,8 @@ export const Header = ({location, selectedCategory, categories, user, notificati return (
  • ); pFad - Phonifier reborn

    Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

    Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


    Alternative Proxies:

    Alternative Proxy

    pFad Proxy

    pFad v3 Proxy

    pFad v4 Proxy