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.

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

Bump node-notifier from 8.0.0 to 8.0.1 in /web #3

Open
wants to merge 71 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
c5fd588
initial zips download
neolefty Sep 30, 2020
28d8d97
gitignore
neolefty Sep 30, 2020
e75cf98
load devotions descriptions into app
neolefty Sep 30, 2020
12c6f5f
flames
neolefty Oct 2, 2020
6edb675
don't reconvert every build
neolefty Oct 2, 2020
fc6e084
popup; aggregate by zip
neolefty Oct 2, 2020
fc75523
tweaks
neolefty Oct 2, 2020
b1aa574
state shapes
neolefty Oct 5, 2020
2ee0554
new map style
neolefty Oct 5, 2020
60c254f
missing comma
neolefty Oct 5, 2020
0020f86
better title
neolefty Oct 5, 2020
ce613e1
zoom out a little
neolefty Oct 7, 2020
45c27fe
zip and maxzoom 10
neolefty Oct 7, 2020
1f5c11e
remove zeroes
neolefty Oct 7, 2020
25a5e82
fewer details
neolefty Oct 7, 2020
5b3d377
black initial background
neolefty Oct 7, 2020
3db6f68
another attempt to make the bg black without flashing white
neolefty Oct 7, 2020
016f7a4
vary flame size by number of gatherings
neolefty Oct 14, 2020
5441e91
remove unused React logo
neolefty Oct 14, 2020
5b681c9
add quote
neolefty Oct 14, 2020
ff53160
add link
neolefty Oct 14, 2020
b951a60
last updated
neolefty Oct 14, 2020
69fe0c7
remove maxwidth
neolefty Oct 14, 2020
c6d36d6
tweak maxwidth
neolefty Oct 14, 2020
f7f5a6c
tweak update
neolefty Oct 14, 2020
0c293fb
fix link
neolefty Oct 14, 2020
5d45e6c
add todo file
neolefty Oct 14, 2020
0f3896e
add todo items
neolefty Oct 14, 2020
82d9764
fix names in manifest
neolefty Oct 15, 2020
f91646a
add csvtojson
Oct 20, 2020
097f506
script to look up location of zip codes via Mapbox API
neolefty Oct 20, 2020
f5a238d
rename csv
neolefty Oct 20, 2020
bf12cf5
Merge branch 'master' of github.com:neolefty/devotions-map
neolefty Oct 20, 2020
c9f1d21
geolocate on server
neolefty Oct 20, 2020
0219cb9
update data
neolefty Oct 21, 2020
4576dad
add geocode to data
neolefty Oct 21, 2020
97a2bbb
remove unused script
neolefty Oct 21, 2020
11ed2b1
straighten out config during build
neolefty Oct 21, 2020
e73974e
tweak explanation
neolefty Oct 21, 2020
c080155
date
neolefty Oct 21, 2020
827f569
move todos
neolefty Oct 21, 2020
b7814b6
city name
neolefty Oct 21, 2020
dc37226
spacing
neolefty Oct 21, 2020
f902b5e
data
neolefty Oct 21, 2020
103bef7
timestamp
neolefty Oct 21, 2020
ac6c2e2
link tweak
neolefty Oct 21, 2020
780edec
Merge branch 'master' of github.com:neolefty/devotions-map
neolefty Oct 21, 2020
fd9bf3e
zero-downtime deploy
neolefty Oct 21, 2020
396c506
full stops
neolefty Oct 21, 2020
0f159a5
auto-update-date
neolefty Oct 21, 2020
90eea3a
try not to cache
neolefty Oct 21, 2020
6d5ce64
include timestamp etc
neolefty Oct 27, 2020
b0d12a3
rename gatherings to households
neolefty Oct 27, 2020
98c9859
update dependencies; switch from flames to stars
neolefty Oct 27, 2020
4d79f66
hide beta dir
neolefty Oct 27, 2020
8e72333
beta build
neolefty Oct 27, 2020
7c05722
done
neolefty Oct 27, 2020
4c00115
chubbier stars
neolefty Oct 27, 2020
fa7228a
smaller stars, one more zoom level
neolefty Oct 27, 2020
2386a2a
tweak lower right
neolefty Oct 28, 2020
b5e00e8
todos
neolefty Oct 28, 2020
d30a35f
tweak star size
neolefty Oct 28, 2020
32fe65a
fluid font size
neolefty Oct 28, 2020
fc9783d
trello
neolefty Dec 7, 2020
b7bc4c0
data update
neolefty Dec 13, 2020
cbe9773
upgrade to React 17
neolefty Dec 13, 2020
b433aed
Merge branch 'master' of github.com:neolefty/devotions-map
neolefty Dec 13, 2020
097d964
ts config
neolefty Dec 13, 2020
99a7cd8
data
neolefty Dec 13, 2020
8d439e4
Merge branch 'react-17'
neolefty Dec 13, 2020
158c84f
Bump node-notifier from 8.0.0 to 8.0.1 in /web
dependabot[bot] Dec 22, 2020
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
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,7 @@ Roi Qualls writes:
> Strictly speaking clusters are not defined by county, but rather by locality. That is, localities never span clusters. This is relevant in urban areas. For example, OH-03 (Franklin County / Columbus) includes all of Westerville, including the part that goes into Delaware County. OH-05 (Hamilton Cty / Cinci) includes a township in Indiana. At the scale that we typically publish maps these are negligible considerations. If we start doing cluster level maps it becomes more relevant. That being said, all of the maps that I have done are at the county level.

> I have attached a spreadsheet of the county – cluster relationship in IN, OH, MI. I believe this is still current. We should check to make sure the list reflects the update to one of the counties in N. MI which was changed to a different cluster.

## States

I followed [these instructions](https://docs.mapbox.com/help/tutorials/style-single-country/) to add a layer to the map highlighting Michigain, Ohio, and Indiana — using the file [**Admin 1 — States, Provinces (without large lakes)**](http://www.naturalearthdata.com/downloads/10m-cultural-vectors/) instead of **Admin 0 — Countries**.
15 changes: 15 additions & 0 deletions Todo.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# To Do

## Map Features

* Add city name to the geographic lookup, clean up the results if necessary, and display it on the map
* Cluster markers when zoomed out

## Building

* Move geographic lookup out of the spreadsheet and into a build script, to escape Google's API throttling

## Server

* Automate SSL cert reload
* Check SSL cert renewal automation
Binary file added data/ne_10m_admin_1_states_provinces_lakes.zip
Binary file not shown.
1 change: 1 addition & 0 deletions data/spreadsheet/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
log.csv
129 changes: 129 additions & 0 deletions data/spreadsheet/devotions.csv

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions data/spreadsheet/download.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/bin/sh
wget --output-file="log.csv" "https://docs.google.com/spreadsheets/d/1gF4wZSEhv5A9xrjPrO5qn61_cHOozNLB-GSzwDkLQqQ/export?format=csv&gid=237615734" -O "import.csv"
155 changes: 155 additions & 0 deletions data/spreadsheet/import.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
zip,description,timestamp
47906,2 individuals weekly,5/3/2020 11:11:09
,,
49418,24 individuals Every other week,5/4/2020 0:03:12
45322,5 individuals Weekly,6/2/2020 17:45:33
48423,15 individuals Weekly,6/3/2020 6:43:44
47374,7 individuals Weekly,6/3/2020 7:32:05
43040,5 individuals Monthly,6/3/2020 8:38:58
43342,5 individuals Monthly,6/3/2020 8:42:37
46260,2 individuals every other week,6/3/2020 9:36:40
48108,5 individuals Weekly,6/3/2020 15:19:32
48105,12 individuals weekly,6/3/2020 17:15:22
44646,2 individuals weekly,6/3/2020 18:29:18
44264,11 individuals Weekly,6/3/2020 22:22:24
44264,7 individuals Weekly,6/3/2020 22:24:36
45420,40 individuals weekly,6/4/2020 21:25:13
45440,8 individuals Monthly,6/5/2020 13:08:13
48322,8 individuals Monthly,6/6/2020 15:46:46
43081,16 individuals WEEKLY,6/10/2020 9:35:49
45069,4 individuals Week,6/10/2020 11:14:31
48423,10 individuals weekly,6/10/2020 15:46:12
43040,10 individuals Weekly,6/12/2020 14:49:20
49735,6 individuals Weekly,6/12/2020 15:04:29
47130,8 individuals Weekly,6/12/2020 15:07:23
48178,10 individuals monthly,6/12/2020 15:32:08
,,
44685,48 individuals Weekly,6/12/2020 20:18:46
45742,12 individuals monthly,6/12/2020 20:49:55
,,
44118,19 individuals weekly,6/13/2020 11:17:04
,,
43219,45 individuals Started monthly now bi-weekly,6/13/2020 17:32:27
48423,4 individuals Weekly,6/13/2020 21:56:06
43209,6 individuals weekly on Fridays at 6:00pm,6/13/2020 23:20:44
44902,3 individuals Once month,6/14/2020 10:29:49
46947,0 individuals Monthly,6/14/2020 21:33:10
44118,6 individuals Every other week,6/14/2020 22:42:47
46807,4 individuals weekely,6/15/2020 10:00:06
46032,"2 individuals once a week, Thursdays",6/15/2020 14:57:26
48420,5 individuals Monthly ,6/16/2020 8:40:04
45387,"9 individuals every other week at least, sometimes more",6/16/2020 22:33:03
,,
43221,30 individuals Monthly,6/17/2020 13:22:23
47401,2 individuals Daily,6/19/2020 2:45:02
46278,9 individuals Once a month,6/19/2020 16:57:51
44146,7 individuals weekly,6/20/2020 10:34:54
44146,8 individuals daily,6/20/2020 10:38:01
46224,4 individuals 5-6 days per week,6/20/2020 12:55:38
47906,50 individuals every other week,6/21/2020 15:49:55
47906,4 individuals Weekly,6/21/2020 16:20:44
,,
44857,1 individuals Monthly ,6/23/2020 10:20:32
44116,3 individuals Bi-monthly,6/23/2020 16:37:08
46260,2 individuals weekly,6/24/2020 12:40:06
45231,2 individuals Weekly ,6/25/2020 19:24:46
,,
,,
44406,3 individuals Monthly ,6/26/2020 11:21:03
44119,2 individuals Weekly,6/26/2020 11:27:59
43551,6 individuals Monthly,6/26/2020 12:28:38
,,
44121,6 individuals First and Third Tuesday of the month,6/26/2020 12:41:06
48198,2 individuals Weekly,6/26/2020 13:40:14
44122,24 individuals 2nd and 4th Friday,6/26/2020 22:07:12
44022,2 individuals Daily,6/27/2020 22:06:20
48126,5 individuals Every other week,6/28/2020 10:31:07
48223,6 individuals Bimonthly ,6/28/2020 10:32:43
48439,9 individuals weekly,6/28/2020 10:34:08
44072,3 individuals weekly,6/29/2020 16:48:43
46220,2 individuals weekly,6/29/2020 19:22:33
,,
48423,2 individuals Daily Dawn Devotionals,7/6/2020 6:18:15
48473,4 individuals Weekly,7/8/2020 11:22:10
48083,10 individuals Every week (used to be every month),7/9/2020 6:52:20
49001,"3 individuals Weekly, 8:00am Sunday",7/9/2020 16:16:58
45431,1 individuals Weekly,7/9/2020 22:55:02
48235,10 individuals monthly ,7/10/2020 23:19:21
46635,5 individuals Weekly,7/12/2020 13:13:13
49684,4 individuals weekly,7/13/2020 14:10:51
46514,2 individuals twice a week,7/14/2020 13:44:42
43081,2 individuals Daily,7/14/2020 19:43:56
49507,2 individuals Daily,7/15/2020 11:41:28
,,
47401,8 individuals weekly,7/17/2020 17:23:20
49007,8 individuals Weekly,7/17/2020 20:25:40
46615,10 individuals Monthly,7/18/2020 14:11:03
48104,4 individuals Weekly,7/19/2020 20:00:06
45387,12 individuals Weekly,7/20/2020 23:29:43
45458,24 individuals each Gregorian month,7/21/2020 10:21:43
49855,2 individuals Weekly,7/24/2020 7:20:28
45387,2 individuals Weekly,7/24/2020 13:16:59
45387,12 individuals monthly,7/24/2020 13:22:40
45387,2 individuals 1-2 times monthly ,7/25/2020 17:30:47
45434,4 individuals every other week,7/26/2020 22:53:21
43078,5 individuals monthly,7/29/2020 11:05:08
43072,5 individuals monthly,7/29/2020 11:08:25
43078,5 individuals monthly,7/29/2020 11:11:05
,,
44870,12 individuals weekly,7/31/2020 21:29:40
,,
44839,2 individuals Daily,7/31/2020 21:38:53
48111,4 individuals every week,8/1/2020 20:03:10
46835,7 individuals weekly,8/2/2020 10:35:23
43560,8 individuals Monthly,8/2/2020 22:53:05
43560,3 individuals Weekly,8/3/2020 12:26:05
43560,4 individuals Every other week,8/3/2020 12:28:54
,,
49546,30 individuals Monthly,8/8/2020 14:03:08
,,
45387,4 individuals 4 Days a week,8/23/2020 7:06:39
48197,2 individuals Weekly,8/26/2020 18:07:12
44060,8 individuals every other week,8/28/2020 15:16:35
44118,2 individuals Daily ,9/1/2020 20:31:40
44110,12 individuals Monthly ,9/13/2020 15:53:10
46814,20 individuals Weekly,9/14/2020 21:50:09
44023,25 individuals Every other week,9/20/2020 18:50:49
48911,8 individuals Every other week,9/27/2020 12:00:05
48864,4 individuals Weekly,9/27/2020 12:20:06
48823,15 individuals monthly,9/27/2020 16:29:28
48808,40 individuals weekly,10/4/2020 14:47:51
48823,15 individuals monthly,10/6/2020 17:47:04
45133,2 individuals Monthly,10/8/2020 7:09:43
43551,6 individuals Weekly,10/8/2020 9:19:52
43420,10 individuals Monthly,10/8/2020 9:22:37
43230,5 individuals Weekly,10/8/2020 12:22:46
43230,16 individuals Weekly,10/8/2020 12:25:32
45619,4 individuals 4-6 weeks ,10/9/2020 19:45:03
44202,5 individuals Daily,10/13/2020 20:46:24
49855,4 individuals Biweekly,10/14/2020 17:32:43
47250,3 individuals Biweekly,10/14/2020 17:46:46
48197,2 individuals Daily,10/14/2020 20:56:48
,,
45133,7 individuals Monthly,10/17/2020 17:39:32
,,
,,
,,
,,
,,
,,
45322,10 individuals Weekly,10/25/2020 19:59:00
48827,15 individuals Monthly,10/28/2020 16:28:17
44308,6 individuals Monthly,10/30/2020 12:04:52
,,
48911,4 individuals Monthly,10/30/2020 13:01:03
48108,6 individuals Monthly,10/30/2020 16:17:19
,,
48104,4 individuals Weekly,10/31/2020 14:01:59
,,
49071,2 individuals Biweekly,11/1/2020 8:48:48
43725,5 individuals Weekly,11/1/2020 10:52:01
46201,5 individuals Monthly,11/2/2020 14:28:05
47404,3 individuals Weekly,11/2/2020 20:03:39
,,
43229,2 individuals Weekly,11/18/2020 11:05:27
44039,9 individuals Weekly,11/18/2020 11:25:31
98 changes: 98 additions & 0 deletions data/spreadsheet/zips.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
zip,lng,lat,place
47906,-86.92,40.43,"West Lafayette, Indiana 47906, United States"
49418,-85.76,42.88,"Grandville, Michigan 49418, United States"
45322,-84.28,39.86,"Englewood, Ohio 45322, United States"
48423,-83.52,43.03,"Davison, Michigan 48423, United States"
47374,-84.89,39.83,"Richmond, Indiana 47374, United States"
43040,-83.38,40.25,"Marysville, Ohio 43040, United States"
43342,-83.19,40.45,"Prospect, Ohio 43342, United States"
46260,-86.16,39.93,"Indianapolis, Indiana 46260, United States"
48108,-83.75,42.24,"Ann Arbor, Michigan 48108, United States"
48105,-83.72,42.3,"Ann Arbor, Michigan 48105, United States"
44646,-81.52,40.8,"Massillon, Ohio 44646, United States"
44264,-81.5,41.25,"Peninsula, Ohio 44264, United States"
45420,-84.17,39.74,"Dayton, Ohio 45420, United States"
45440,-84.1,39.69,"Dayton, Ohio 45440, United States"
48322,-83.36,42.54,"West Bloomfield, Michigan 48322, United States"
43081,-82.94,40.13,"Westerville, Ohio 43081, United States"
45069,-84.43,39.32,"West Chester, Ohio 45069, United States"
49735,-84.68,45.03,"Gaylord, Michigan 49735, United States"
47130,-85.75,38.27,"Jeffersonville, Indiana 47130, United States"
48178,-83.65,42.44,"South Lyon, Michigan 48178, United States"
43078,-83.75,40.11,"Urbana, Ohio 43078, United States"
44685,-81.46,40.97,"Uniontown, Ohio 44685, United States"
45742,-81.72,39.28,"Little Hocking, Ohio 45742, United States"
44118,-81.53,41.49,"Cleveland, Ohio 44118, United States"
43219,-82.92,40.05,"Columbus, Ohio 43219, United States"
43209,-82.94,39.95,"Columbus, Ohio 43209, United States"
44902,-82.52,40.76,"Mansfield, Ohio 44902, United States"
46807,-85.14,41.05,"Fort Wayne, Indiana 46807, United States"
46032,-86.13,40,"Carmel, Indiana 46032, United States"
48420,-83.73,43.18,"Clio, Michigan 48420, United States"
45387,-83.89,39.81,"Yellow Springs, Ohio 45387, United States"
43221,-83.04,40,"Columbus, Ohio 43221, United States"
47401,-86.5,39.16,"Bloomington, Indiana 47401, United States"
46278,-86.27,39.88,"Indianapolis, Indiana 46278, United States"
44146,-81.53,41.4,"Bedford, Ohio 44146, United States"
46224,-86.24,39.79,"Indianapolis, Indiana 46224, United States"
44857,-82.61,41.24,"Norwalk, Ohio 44857, United States"
44116,-81.85,41.46,"Rocky River, Ohio 44116, United States"
45231,-84.52,39.22,"Cincinnati, Ohio 45231, United States"
44406,-80.76,41.01,"Canfield, Ohio 44406, United States"
44119,-81.53,41.59,"Cleveland, Ohio 44119, United States"
43551,-83.6,41.55,"Perrysburg, Ohio 43551, United States"
44121,-81.54,41.53,"Cleveland, Ohio 44121, United States"
48198,-83.61,42.24,"Ypsilanti, Michigan 48198, United States"
44122,-81.5,41.5,"Beachwood, Ohio 44122, United States"
44022,-81.39,41.43,"Chagrin Falls, Ohio 44022, United States"
48126,-83.22,42.32,"Dearborn, Michigan 48126, United States"
48223,-83.22,42.39,"Detroit, Michigan 48223, United States"
48439,-83.62,42.92,"Grand Blanc, Michigan 48439, United States"
44072,-81.34,41.48,"Novelty, Ohio 44072, United States"
46220,-86.14,39.87,"Indianapolis, Indiana 46220, United States"
48473,-83.84,42.96,"Swartz Creek, Michigan 48473, United States"
48083,-83.11,42.54,"Troy, Michigan 48083, United States"
49001,-85.56,42.25,"Kalamazoo, Michigan 49001, United States"
45431,-84.05,39.77,"Dayton, Ohio 45431, United States"
48235,-83.18,42.42,"Detroit, Michigan 48235, United States"
46635,-86.21,41.7,"South Bend, Indiana 46635, United States"
49684,-85.62,44.76,"Traverse City, Michigan 49684, United States"
46514,-86,41.68,"Elkhart, Indiana 46514, United States"
49507,-85.64,42.94,"Grand Rapids, Michigan 49507, United States"
49007,-85.58,42.29,"Kalamazoo, Michigan 49007, United States"
46615,-86.22,41.67,"South Bend, Indiana 46615, United States"
48104,-83.74,42.28,"Ann Arbor, Michigan 48104, United States"
45458,-84.22,39.63,"Dayton, Ohio 45458, United States"
49855,-87.41,46.56,"Marquette, Michigan 49855, United States"
45434,-84.03,39.72,"Dayton, Ohio 45434, United States"
43072,-83.96,40.13,"Saint Paris, Ohio 43072, United States"
44870,-82.68,41.48,"Sandusky, Ohio 44870, United States"
44839,-82.64,41.38,"Huron, Ohio 44839, United States"
48111,-83.49,42.22,"Belleville, Michigan 48111, United States"
46835,-85.1,41.13,"Fort Wayne, Indiana 46835, United States"
43560,-83.7,41.7,"Sylvania, Ohio 43560, United States"
49546,-85.58,42.92,"Grand Rapids, Michigan 49546, United States"
48197,-83.62,42.25,"Ypsilanti, Michigan 48197, United States"
44060,-81.36,41.66,"Mentor, Ohio 44060, United States"
44110,-81.57,41.57,"Cleveland, Ohio 44110, United States"
46814,-85.28,41.07,"Fort Wayne, Indiana 46814, United States"
44023,-81.39,41.36,"Chagrin Falls, Ohio 44023, United States"
48911,-84.54,42.66,"Lansing, Michigan 48911, United States"
48864,-84.46,42.72,"Okemos, Michigan 48864, United States"
48823,-84.47,42.73,"East Lansing, Michigan 48823, United States"
46947,-86.33,40.76,"Logansport, Indiana 46947, United States"
48808,-84.47,42.8,"Bath, Michigan 48808, United States"
45133,-83.61,39.2,"Hillsboro, Ohio 45133, United States"
43420,-83.12,41.35,"Fremont, Ohio 43420, United States"
43230,-82.87,40.02,"Columbus, Ohio 43230, United States"
45619,-82.48,38.42,"Chesapeake, West Virginia 45619, United States"
44202,-81.35,41.32,"Aurora, Ohio 44202, United States"
47250,-85.38,38.78,"Madison, Indiana 47250, United States"
48827,-84.65,42.51,"Eaton Rapids, Michigan 48827, United States"
44308,-81.52,41.08,"Akron, Ohio 44308, United States"
49071,-85.8,42.21,"Mattawan, Michigan 49071, United States"
43725,-81.59,40.03,"Cambridge, Ohio 43725, United States"
46201,-86.13,39.78,"Indianapolis, Indiana 46201, United States"
47404,-86.54,39.18,"Bloomington, Indiana 47404, United States"
43229,-82.99,40.09,"Columbus, Ohio 43229, United States"
44039,-82.02,41.39,"North Ridgeville, Ohio 44039, United States"
6 changes: 5 additions & 1 deletion web/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,20 @@

# production
/build
/deploy
/beta

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local
.eslintcache

npm-debug.log*
yarn-debug.log*
yarn-error.log*

public/config.js
public/config.js
public/devotions.json
10 changes: 10 additions & 0 deletions web/media/candle-original.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions web/media/candle.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading