Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #60

Merged
merged 13 commits into from
Oct 9, 2019
Merged

Dev #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ece6773
removed import of config
Oct 9, 2019
eab2abc
Removed hardcoded API token
Oct 9, 2019
ae7ac30
merge
Oct 9, 2019
dc4a04d
Merge pull request #57 from hackforla/feature_react_pinmap
sellnat77 Oct 9, 2019
8685e8e
Removed console.log
Oct 9, 2019
487d207
Merge branch 'dev' of https://github.com/hackforla/310-data into feat…
Oct 9, 2019
77b4636
Cleaned up
Oct 9, 2019
99a9716
Merge pull request #58 from hackforla/feature_react_pinmap
sellnat77 Oct 9, 2019
685e61c
Added mapbox token to actions
sellnat77 Oct 9, 2019
6cb40e8
Added gh-pages deploy stuff
sellnat77 Oct 9, 2019
80cecbf
Fixed delivery file
sellnat77 Oct 9, 2019
6536a6a
Fixed delivery file
sellnat77 Oct 9, 2019
d7df070
Merge pull request #59 from hackforla/environment_injection
sellnat77 Oct 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/workflows/Continuous_Delivery.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,11 @@ jobs:
run: npm run-script build
- name: Run Tests
run: export CI=true && npm run test -- --coverage
env:
MAPBOX_TOKEN: ${{ secrets.MAPBOX_TOKEN }}
- name: Deploy
run: npm run deploy
env:
MAPBOX_TOKEN: ${{ secrets.MAPBOX_TOKEN }}
ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}

4 changes: 3 additions & 1 deletion .github/workflows/Continuous_Integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@ jobs:
with:
node-version: ${{ matrix.node-version }}
- name: Install Packages
run: npm install && echo $TEST_SECRET
run: npm install
- name: Build project
run: npm run-script build
- name: Run Tests
run: export CI=true && npm run test -- --coverage
env:
MAPBOX_TOKEN: ${{ secrets.MAPBOX_TOKEN }}
7 changes: 1 addition & 6 deletions src/components/PinMap/PinMap.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
import React, { Component } from 'react';
import { Map, Marker, Popup, TileLayer, Rectangle, Tooltip } from 'react-leaflet';
import Choropleth from 'react-leaflet-choropleth';
// import { mapToken } from '../../config.js';
import { getDataResources } from '../../Util/DataService.js';
import neighborhoodOverlay from '../../data/la-county-neighborhoods-v6.json';
import municipalOverlay from '../../data/la-county-municipal-regions-current.json';
import councilDistrictsOverlay from '../../data/la-city-council-districts-2012.json';
import axios from 'axios';

const DONT_LOOK_AT_THIS = 'pk.eyJ1Ijoiam9zaHVhbWFyeCIsImEiOiJjazFpb3RwcW8wYXM2M2Nud29zMWhjcnZ4In0.Rg9UY0SSJqCIPp275kRcUg';

const serviceRequests = [
'Bulky Items',
'Dead Animal Removal',
Expand Down Expand Up @@ -59,14 +56,12 @@ class PinMap extends Component {
request: serviceRequests[0],
position: [34.0173157, -118.2497254],
zoom: 10,
mapUrl: `https://api.tiles.mapbox.com/v4/mapbox.streets/{z}/{x}/{y}.png?access_token=${DONT_LOOK_AT_THIS}`,
mapUrl: `https://api.tiles.mapbox.com/v4/mapbox.streets/{z}/{x}/{y}.png?access_token=${process.env.MAPBOX_TOKEN}`,
dataUrl: 'https://data.lacity.org/resource/h65r-yf5i.json?$select=location,zipcode,address,requesttype,status,ncname,streetname,housenumber&$where=date_extract_m(CreatedDate)+between+2+and+3',
geoJSON: councilDistrictsOverlay,
showMarkers: false,
bounds: null,
};

console.log(process.env)
}

componentDidMount() {
Expand Down