Merge pull request #5 from agl0809/develop

Dependencies imports paths modified

config/paths.js

@@ -44,7 +44,7 @@ module.exports = {
  appBuild: resolveApp('build'),
  appPublic: resolveApp('public'),
  appHtml: resolveApp('public/index.html'),
- appIndexJs: resolveApp('src/js/index.js'),
+ appIndexJs: resolveApp('src/index.js'),
  appPackageJson: resolveApp('package.json'),
  appSrc: resolveApp('src'),
  appTest: resolveApp('test'),

config/webpack.config.dev.js

@@ -86,6 +86,7 @@ module.exports = {
  alias: {
  'js': path.resolve('src/js'),
  'helpers': path.resolve('src/helpers'),
+ 'services': path.resolve('src/services'),
  'style': path.resolve('src/style'),
  // Support React Native Web
  // https://www.smashingmagazine.com/2016/08/a-glimpse-into-the-future-with-react-native-for-web/

config/webpack.config.prod.js

@@ -92,6 +92,7 @@ module.exports = {
  alias: {
  'js': path.resolve('src/js'),
  'helpers': path.resolve('src/helpers'),
+ 'services': path.resolve('src/services'),
  'style': path.resolve('src/style'),
  // Support React Native Web
  // https://www.smashingmagazine.com/2016/08/a-glimpse-into-the-future-with-react-native-for-web/

package.json

@@ -1,6 +1,6 @@
 {
  "name": "timeline-history-heatmap-react",
- "version": "0.3.0",
+ "version": "0.4.0",
  "private": true,
  "dependencies": {
  "leaflet": "^1.3.0",
@@ -51,8 +51,9 @@
  "coverage": "node scripts/test.js --env=jsdom --coverage"
  },
  "jest": {
+ "verbose": true,
  "collectCoverageFrom": [
- "src/js/**/*.{js,jsx,mjs}"
+ "src/**/*.{js,jsx,mjs}"
  ],
  "setupFiles": [
  "<rootDir>/config/polyfills.js"

__tests__/index.test.js → src/__tests__/index.test.js

@@ -1,7 +1,7 @@
-import {HEATMAP_CONTAINER_ID, LEAFLET_OPTIONS, HEAT_OPTIONS, JSON_FILE_URL} from 'helpers/constants';
-import start from 'js/index';
-import * as locationHistoryController from 'js/locationHistoryController';
-import * as MapController from 'js/mapController';
+import {HEATMAP_CONTAINER_ID, LEAFLET_OPTIONS, HEAT_OPTIONS, JSON_FILE_URL} from '../helpers/constants';
+import start from '../index';
+import * as locationHistoryController from '../locationHistoryController';
+import * as MapController from '../mapController';
 
 describe('running up the app', () => {
  it('spec name', () => {

__tests__/locationHistoryParser.test.js → src/__tests__/locationHistoryParser.test.js

@@ -1,4 +1,4 @@
-import {locationHistoryParser} from 'js/locationHistoryParser';
+import {locationHistoryParser} from '../locationHistoryParser';
 
 describe('parsing a service response', () => {
 

__tests__/locationhistoryController.test.js → src/__tests__/locationhistoryController.test.js

@@ -1,7 +1,7 @@
-import {getCoordinates} from 'js/locationHistoryController';
-import * as serviceDep from 'js/service';
-import * as parserDep from 'js/locationHistoryParser'
-import {SCALAR_E7} from 'helpers/constants';
+import {getCoordinates} from '../locationHistoryController';
+import * as serviceDep from '../services/service';
+import * as parserDep from '../locationHistoryParser'
+import {SCALAR_E7} from '../helpers/constants';
 
 describe('locationHistoryController', () => {
  it('should read the file content', function () {
@@ -11,7 +11,7 @@ describe('locationHistoryController', () => {
  let promise;
 
  serviceDep.service = jest.fn(() => {
- return new Promise((resolve, reject) => {
+ return new Promise((resolve) => {
  process.nextTick(
  () => resolve(fileContent)
  );

__tests__/map.test.js → src/__tests__/map.test.js

@@ -1,5 +1,5 @@
 import LeafMap from "leaflet";
-import * as Map from 'js/map';
+import * as Map from '../map';
 
 describe('drawing a map', () => {
  it('should create a map', () => {
@@ -31,7 +31,7 @@ describe('drawing a map', () => {
  expect(LeafMap.tileLayer).toBeCalledWith(URL_TEMPLATE, TILE_LAYER_OPTIONS);
  });
 
- it('should create a heat layer on the map using the coordenates received', () => {
+ it('should create a heat layer on the map using the coordinates received', () => {
  const heatOptions = {
  tileOpacity: 'any tileOpacity',
  heatOpacity: 'any heatOpacity',

__tests__/mapController.test.js → src/__tests__/mapController.test.js

@@ -1,5 +1,5 @@
-import {renderHeatMap} from 'js/mapController';
-import * as Map from 'js/map';
+import {renderHeatMap} from '../mapController';
+import * as Map from '../map';
 
 describe('Map Controller', () => {
 

__tests__/service.test.js → src/__tests__/services/service.test.js

@@ -1,4 +1,4 @@
-import {service} from 'js/service';
+import {service} from 'services/service';
 
 let ready_state, state;
 let oldXMLHttpRequest;

src/js/index.js → src/index.js

@@ -1,6 +1,6 @@
 import {HEATMAP_CONTAINER_ID, LEAFLET_OPTIONS, HEAT_OPTIONS, JSON_FILE_URL} from 'helpers/constants';
-import {getCoordinates} from 'js/locationHistoryController';
-import {renderHeatMap} from 'js/mapController';
+import {renderHeatMap} from './mapController';
+import {getCoordinates} from './locationHistoryController';
 
 export default function start() {
  getCoordinates(JSON_FILE_URL)

src/js/locationHistoryController.js → src/locationHistoryController.js

@@ -1,5 +1,5 @@
-import {locationHistoryParser} from 'js/locationHistoryParser';
-import {service} from 'js/service';
+import {locationHistoryParser} from './locationHistoryParser';
+import {service} from 'services/service';
 import {SCALAR_E7} from 'helpers/constants';
 
 function getCoordinates(JSONFileUrl) {

src/js/locationHistoryParser.js → src/locationHistoryParser.js

@@ -1,4 +1,4 @@
-import {SCALAR_E7} from '../helpers/constants';
+import {SCALAR_E7} from 'helpers/constants';
 
 function _getLagLngCoordinates(coordinates) {
  return coordinates.map(elem =>

src/js/mapController.js → src/mapController.js

@@ -1,4 +1,4 @@
-import * as Map from 'js/map';
+import * as Map from './map';
 
 function renderHeatMap(options) {
  let map = Map.createMap(options.containerId, options.mapOptions);