diff --git a/.github/workflows/dev_push_to_s3.yml b/.github/workflows/dev_push_to_s3.yml index 9ad38ef..ae48b95 100644 --- a/.github/workflows/dev_push_to_s3.yml +++ b/.github/workflows/dev_push_to_s3.yml @@ -6,7 +6,7 @@ name: dev Push to S3 on: push: branches: - - main + - dev/gray-out-sites_x jobs: build: diff --git a/src/components/ExpandCollapseContent.vue b/src/components/ExpandCollapseContent.vue index 7176e8e..43b699e 100644 --- a/src/components/ExpandCollapseContent.vue +++ b/src/components/ExpandCollapseContent.vue @@ -48,7 +48,7 @@ :item="item" /> diff --git a/src/data-sources/voting-sites-dev.js b/src/data-sources/voting-sites-dev.js index afa0623..f3d949e 100644 --- a/src/data-sources/voting-sites-dev.js +++ b/src/data-sources/voting-sites-dev.js @@ -3,10 +3,10 @@ export default { type: 'http-get', dependent: 'none', resettable: false, - url: 'https://phl.carto.com/api/v2/sql?q=select+*+from+voting_sites_staging', + url: 'https://phl.carto.com/api/v2/sql', //?q=select+*+from+voting_sites_staging', options: { - // params: { - // q: "select * from voting_sites where temporary_closure = 'FALSE'", - // }, + params: { + q: "select * from voting_sites_staging where temporary_closure = 'FALSE' order by site_type desc", + }, }, }; diff --git a/src/general/legendControls.js b/src/general/legendControls.js index 19f09a2..2b67dc7 100644 --- a/src/general/legendControls.js +++ b/src/general/legendControls.js @@ -40,6 +40,15 @@ export default { 'font-size': '10px', 'background-color': '#4F6D0A', }, + 'Mail-in ballot drop box (not open for special election)': { + 'border-color': 'black', + 'border-style': 'solid', + 'border-weight': '0px', + 'width': '15px', + 'height': '15px', + 'font-size': '10px', + 'background-color': '#a1a1a1', + }, 'Official mobile mail-in ballot return': { 'border-color': 'black', 'border-style': 'solid', diff --git a/src/i18n/en-us.js b/src/i18n/en-us.js index db9da30..b437d04 100644 --- a/src/i18n/en-us.js +++ b/src/i18n/en-us.js @@ -54,6 +54,7 @@ export default { 'Election office': 'Election offices', 'Official mobile mail-in ballot return': 'Official mobile mail-in ballot return', 'Official mail-in ballot drop box': 'Official mail-in ballot dropboxes', + 'Mail-in ballot drop box (not open for special election)': 'Mail-in ballot drop box (not open for special election)', }, sections: { 'Election office': { @@ -102,6 +103,17 @@ export default { callout1: 'On Election Day, dropboxes will be locked at precisely 8 p.m.', callout2: '', }, + 'Mail-in ballot drop box (not open for special election)': { + header: 'Mail-in ballot dropboxes (not open for special election)', + englishName: 'Mail-in ballot dropbox (not open for special election)', + p1: '\ + If a drop box is full, not functioning, or is damaged in any way, call (215) 686-3469 or email vote@phila.gov. \ + ', + h2: '', + dates: '', + callout1: 'On Election Day, dropboxes will be locked at precisely 8 p.m.', + callout2: '', + }, }, beforeYouGo: 'Before you go', checkSite: 'Eligibility requirements and testing hours vary by site. Be sure to check site details to arrange for testing.', diff --git a/src/main.js b/src/main.js index a0a8a07..ba8cc19 100644 --- a/src/main.js +++ b/src/main.js @@ -33,6 +33,7 @@ import legendControls from './general/legendControls'; // data-sources import votingSites from './data-sources/voting-sites'; +// import votingSites from './data-sources/voting-sites-dev'; import expandCollapseContent from './components/ExpandCollapseContent.vue'; import customGreeting from './components/customGreeting.vue'; @@ -105,6 +106,11 @@ pinboard({ }, }, customComps, + // hiddenRefine: { + // Type: function(item) { + // return item.site_type !== 'Official mobile mail-in ballot return'; + // }, + // }, refine: { type: 'categoryField_value', value: function(item) { @@ -130,6 +136,11 @@ pinboard({ titleSingular: 'Official mail-in ballot drop box', color: '#4F6D0A', }, + 'Mail-in ballot drop box (not open for special election)': { + title: 'Mail-in ballot drop boxes (not open for special election)', + titleSingular: 'Mail-in ballot drop box (not open for special election)', + color: '#a1a1a1', + }, }, legendControls, @@ -140,6 +151,7 @@ pinboard({ 'Election office': '#a86518', 'Official mobile mail-in ballot return': '#721817', 'Official mail-in ballot drop box': '#4F6D0A', + 'Mail-in ballot drop box (not open for special election)': '#a1a1a1', }, borderColor: 'white', weight: 1,