diff --git a/package-lock.json b/package-lock.json
index f5225c5..78f5431 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,7 +15,7 @@
"@fortawesome/pro-regular-svg-icons": "^6.7.2",
"@fortawesome/pro-solid-svg-icons": "^6.7.2",
"@phila/phila-ui-core": "^1.0.18",
- "@phila/pinboard": "2.1.9",
+ "@phila/pinboard": "2.1.14",
"unplugin-auto-import": "^0.18.3",
"unplugin-vue-router": "^0.10.8",
"vue-i18n": "^11.0.1"
@@ -1859,9 +1859,9 @@
}
},
"node_modules/@phila/pinboard": {
- "version": "2.1.9",
- "resolved": "https://registry.npmjs.org/@phila/pinboard/-/pinboard-2.1.9.tgz",
- "integrity": "sha512-/byx6ngRApvIT1CYxFF90QSUZWcZFZKJCYl0BGo8TAunvwEiddL5rhY53aHSyEy7Ii1PC3DK/OtirnacB+zZ9w==",
+ "version": "2.1.14",
+ "resolved": "https://registry.npmjs.org/@phila/pinboard/-/pinboard-2.1.14.tgz",
+ "integrity": "sha512-B3htT8DBZ1KyqZJIKMKJ1aNMemDTG3Ef7XIvaIzkYz2jRk7nuLUgQVAfisY0kwdffO88i6sFMs7+YFJNumyHpw==",
"dependencies": {
"@creativebulma/bulma-tooltip": "^1.2.0",
"@fortawesome/fontawesome-pro": "6.7.2",
diff --git a/package.json b/package.json
index 3a7ffae..5adf384 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
"@fortawesome/pro-regular-svg-icons": "^6.7.2",
"@fortawesome/pro-solid-svg-icons": "^6.7.2",
"@phila/phila-ui-core": "^1.0.18",
- "@phila/pinboard": "2.1.9",
+ "@phila/pinboard": "2.1.14",
"unplugin-auto-import": "^0.18.3",
"unplugin-vue-router": "^0.10.8",
"vue-i18n": "^11.0.1"
diff --git a/src/components/ExpandCollapseContent.vue b/src/components/ExpandCollapseContent.vue
index a02d8d3..b8d0cca 100644
--- a/src/components/ExpandCollapseContent.vue
+++ b/src/components/ExpandCollapseContent.vue
@@ -67,7 +67,7 @@ const section = computed(() => {
:item="item"
/>
diff --git a/src/components/OfficialBallotReturnDropBox.vue b/src/components/OfficialBallotReturnDropBox.vue
index cf8ecb6..5f161a6 100644
--- a/src/components/OfficialBallotReturnDropBox.vue
+++ b/src/components/OfficialBallotReturnDropBox.vue
@@ -101,7 +101,7 @@ const arrayFields = computed(() => {
}
}
if (field === 'site_type') {
- if (item[field] === 'Official mail-in ballot drop box') {
+ if (item[field] === 'Official mail-in ballot dropbox') {
values.push('details.ballotDropoff'); //TODO: check this
}
}
diff --git a/src/data-sources/dev.json b/src/data-sources/dev.json
index 85e5cf4..0f88720 100644
--- a/src/data-sources/dev.json
+++ b/src/data-sources/dev.json
@@ -175,7 +175,7 @@
"site_name": "Eastern State Penitentiary",
"street_address": "2027 Fairmount Ave.",
"phone_number": null,
- "site_type": "Official mail-in ballot drop box",
+ "site_type": "Official mail-in ballot dropbox",
"site_access": null,
"site_approved": "TRUE",
"temporary_closure": "FALSE",
diff --git a/src/data-sources/voting-sites.js b/src/data-sources/voting-sites.js
index c1c2da2..6888d9b 100644
--- a/src/data-sources/voting-sites.js
+++ b/src/data-sources/voting-sites.js
@@ -6,7 +6,7 @@ export default {
url: 'https://phl.carto.com:443/api/v2/sql',
options: {
params: {
- q: "select * from voting_sites where temporary_closure = 'FALSE' and site_approved = 'TRUE' order by site_type desc",
+ q: "select * from voting_sites_staging where site_approved = 'TRUE' order by site_type desc",
},
},
};
diff --git a/src/general/legendControl.js b/src/general/legendControl.js
index 943710a..f0307dc 100644
--- a/src/general/legendControl.js
+++ b/src/general/legendControl.js
@@ -14,7 +14,7 @@ export default {
'font-size': '12px',
'background-color': '#a86518',
},
- 'Official mail-in ballot drop boxes': {
+ 'Official mail-in ballot dropboxes': {
'border-color': 'black',
'border-style': 'solid',
'border-weight': '0px',
@@ -32,7 +32,7 @@ export default {
'font-size': '12px',
'background-color': '#721817',
},
- 'Mail-in ballot drop box (temporarily closed)': {
+ 'Mail-in ballot dropbox (temporarily closed)': {
'border-color': 'black',
'border-style': 'solid',
'border-weight': '0px',
diff --git a/src/i18n/ch.js b/src/i18n/ch.js
index e9c7ebf..f06e7c9 100644
--- a/src/i18n/ch.js
+++ b/src/i18n/ch.js
@@ -46,12 +46,12 @@ export default {
},
'Election office': '选举办公室',
'Official mobile mail-in ballot return': '正式移動式郵寄选票投遞処',
- 'Official mail-in ballot drop box': '官方邮寄选票投票箱',
+ 'Official mail-in ballot dropbox': '官方邮寄选票投票箱',
categoryType: {
'Election office': '选举办公室',
'Official mobile mail-in ballot return': '正式移動式郵寄选票投遞処',
- 'Official mail-in ballot drop box': '官方邮寄选票投票箱',
- 'Mail-in ballot drop box (temporarily closed)': '邮寄投票箱（暂时关闭）',
+ 'Official mail-in ballot dropbox': '官方邮寄选票投票箱',
+ 'Mail-in ballot dropbox (temporarily closed)': '邮寄投票箱（暂时关闭）',
},
sections: {
'Election office': {
@@ -87,16 +87,16 @@ export default {
callout1: '這不是一個固定的獨立投遞箱。投遞時間有限。',
callout2: '',
},
- 'Official mail-in ballot drop box': {
+ 'Official mail-in ballot dropbox': {
header: '官方邮寄选票投票箱',
- englishName: 'Official mail-in ballot drop box',
+ englishName: 'Official mail-in ballot dropbox',
p1: `如果投票箱满了、故障或以任何形式损坏，请致电 (215) 686-3469 或发送电子邮件至 vote{'@'}phila.gov.`,
h2: '',
dates: '',
callout1: '投票箱将于选举当日晚8点准时关闭。',
callout2: '',
},
- 'Mail-in ballot drop box (temporarily closed)': {
+ 'Mail-in ballot dropbox (temporarily closed)': {
header: '邮寄投票箱（暂时关闭）',
englishName: 'Mail-in ballot dropbox (temporarily closed)',
p1: `如果投票箱满了、故障或以任何形式损坏，请致电 (215) 686-3469 或发送电子邮件至 vote{'@'}phila.gov.`,
diff --git a/src/i18n/en-us.js b/src/i18n/en-us.js
index c491d3b..2f6994f 100644
--- a/src/i18n/en-us.js
+++ b/src/i18n/en-us.js
@@ -49,12 +49,12 @@ 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',
+ 'Official mail-in ballot dropbox': 'Official mail-in ballot dropboxes',
categoryType: {
'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 (temporarily closed)': 'Mail-in ballot drop box (temporarily closed)',
+ 'Official mail-in ballot dropbox': 'Official mail-in ballot dropboxes',
+ 'Mail-in ballot dropbox (temporarily closed)': 'Mail-in ballot dropbox (temporarily closed)',
},
sections: {
'Election office': {
@@ -92,22 +92,22 @@ export default {
callout1: 'This is not a fixed, stand-alone dropbox. Limited hours only.',
callout2: '',
},
- 'Official mail-in ballot drop box': {
+ 'Official mail-in ballot dropbox': {
header: 'Official mail-in ballot dropboxes',
englishName: 'Official mail-in ballot dropbox',
p1: `\
- If a drop box is full, not functioning, or is damaged in any way, call (215) 686-3469 or email vote{'@'}phila.gov. \
+ If a dropbox 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: '',
},
- 'Mail-in ballot drop box (temporarily closed)': {
+ 'Mail-in ballot dropbox (temporarily closed)': {
header: 'Mail-in ballot dropboxes (temporarily closed)',
englishName: 'Mail-in ballot dropbox (temporarily closed)',
p1: `\
- If a drop box is full, not functioning, or is damaged in any way, call (215) 686-3469 or email vote{'@'}phila.gov. \
+ If a dropbox is full, not functioning, or is damaged in any way, call (215) 686-3469 or email vote{'@'}phila.gov. \
`,
h2: '',
dates: '',
diff --git a/src/i18n/es.js b/src/i18n/es.js
index 8ca924e..d26b53b 100644
--- a/src/i18n/es.js
+++ b/src/i18n/es.js
@@ -49,12 +49,12 @@ export default {
},
'Election office': 'Oficina Electoral',
'Official mobile mail-in ballot return': 'Sitio oficial para devolver boletas',
- 'Official mail-in ballot drop box': 'Buzón oficial de la votación por correo',
+ 'Official mail-in ballot dropbox': 'Buzón oficial de la votación por correo',
categoryType: {
'Election office': 'Oficina Electoral',
'Official mobile mail-in ballot return': 'Sitio oficial para devolver boletas',
- 'Official mail-in ballot drop box': 'Buzón oficial de la votación por correo',
- 'Mail-in ballot drop box (temporarily closed)': 'Buzón de boletas por correo (cerrado temporalmente)',
+ 'Official mail-in ballot dropbox': 'Buzón oficial de la votación por correo',
+ 'Mail-in ballot dropbox (temporarily closed)': 'Buzón de boletas por correo (cerrado temporalmente)',
},
sections: {
'Election office': {
@@ -90,16 +90,16 @@ export default {
callout2: '',
dates: '',
},
- 'Official mail-in ballot drop box': {
+ 'Official mail-in ballot dropbox': {
header: 'Buzón oficial de la votación por correo',
- englishName: 'Official mail-in ballot drop box',
+ englishName: 'Official mail-in ballot dropbox',
p1: `Si un buzón está lleno, no funciona, o está dañado de alguna manera, llame al (215) 686-3469 o envíe un correo electrónico a vote{'@'}phila.gov.`,
h2: '',
callout2: '',
dates: '',
callout1: 'El día de las elecciones, los buzones se cerrarán con llave exactamente a las 8 p.m.',
},
- 'Mail-in ballot drop box (temporarily closed)': {
+ 'Mail-in ballot dropbox (temporarily closed)': {
header: 'Buzón de boletas por correo (cerrado temporalmente)',
englishName: 'Mail-in ballot dropbox (temporarily closed)',
p1: `Si un buzón está lleno, no funciona, o está dañado de alguna manera, llame al (215) 686-3469 o envíe un correo electrónico a vote{'@'}phila.gov.`,
diff --git a/src/i18n/fr.js b/src/i18n/fr.js
index 23ce253..09270ca 100644
--- a/src/i18n/fr.js
+++ b/src/i18n/fr.js
@@ -44,7 +44,7 @@ export default {
},
'Election office': 'Bureau de vote ',
'Official mobile mail-in ballot return': 'Lieu officiel de dépôt de bulletins',
- 'Official mail-in ballot drop box': 'Boîte de dépôt officielle des bulletins de vote par correspondance ',
+ 'Official mail-in ballot dropbox': 'Boîte de dépôt officielle des bulletins de vote par correspondance ',
sections: {
'Election office': {
header: 'Bureau de vote ',
@@ -80,9 +80,9 @@ export default {
callout1: 'Il ne s’agit pas d’une urne fixe et autonome. Les heures d’ouverture sont limitées.',
callout2: '',
},
- 'Official mail-in ballot drop box': {
+ 'Official mail-in ballot dropbox': {
header: 'Boîte de dépôt officielle des bulletins de vote par correspondance ',
- englishName: 'Official mail-in ballot drop box',
+ englishName: 'Official mail-in ballot dropbox',
callout1: 'Le jour du scrutin, les urnes seront verrouillées à 20 heures précises.',
p1: 'Si une boîte de dépôt est pleine, si elle ne fonctionne pas ou si elle est endommagée, appelez le (215) 686-3469 ou envoyez un email à vote@phila.gov.',
},
diff --git a/src/i18n/ru.js b/src/i18n/ru.js
index 8cf6f07..0176559 100644
--- a/src/i18n/ru.js
+++ b/src/i18n/ru.js
@@ -43,7 +43,7 @@ export default {
},
'Election office': 'Офис избирательного бюро ',
'Official mobile mail-in ballot return': 'Официальный пункт возврата бюллетеней',
- 'Official mail-in ballot drop box': 'Официальный ящик для приема бюллетеней для голосования по почте',
+ 'Official mail-in ballot dropbox': 'Официальный ящик для приема бюллетеней для голосования по почте',
sections: {
'Election office': {
header: 'Офис избирательного бюро',
@@ -80,11 +80,11 @@ export default {
callout1: 'Это не стационарная, автономная урна для голосования. Часы работы ограничены.',
callout2: '',
},
- 'Official mail-in ballot drop box': {
+ 'Official mail-in ballot dropbox': {
header: 'Официальный ящик для приема бюллетеней для голосования по почте',
- englishName: 'Official mail-in ballot drop box',
+ englishName: 'Official mail-in ballot dropbox',
callout1:'В день выборов избирательные урны будут закрыты ровно в 20:00.',
- p1: 'If a drop box is full, not functioning, or is damaged in any way, call (215) 686-3469 or email vote@phila.gov.',
+ p1: 'If a dropbox is full, not functioning, or is damaged in any way, call (215) 686-3469 or email vote@phila.gov.',
},
},
beforeYouGo: 'Прежде чем вы пойдете',
diff --git a/src/i18n/vi.js b/src/i18n/vi.js
index d26631e..6e560c1 100644
--- a/src/i18n/vi.js
+++ b/src/i18n/vi.js
@@ -44,7 +44,7 @@ export default {
},
'Election office': 'Văn phòng bầu cử',
'Official mobile mail-in ballot return': 'Thùng bỏ phiếu qua đường bưu điện chính thức',
- 'Official mail-in ballot drop box': 'Thùng bỏ phiếu qua đường bưu điện chính thức ',
+ 'Official mail-in ballot dropbox': 'Thùng bỏ phiếu qua đường bưu điện chính thức ',
sections: {
'Election office': {
header: 'Văn phòng bầu cử ',
@@ -82,9 +82,9 @@ export default {
callout2: '',
},
- 'Official mail-in ballot drop box': {
+ 'Official mail-in ballot dropbox': {
header: 'Thùng bỏ phiếu qua đường bưu điện chính thức',
- englishName: 'Official mail-in ballot drop box',
+ englishName: 'Official mail-in ballot dropbox',
callout1: 'Vào Ngày bầu cử, các hòm phiếu sẽ được khóa vào đúng 8 giờ tối.',
p1: 'Nếu thùng bỏ phiếu đầy, không hoạt động, hoặc bị hư hỏng ở bất kỳ hình thức nào, hãy gọi số (215) 686-3469 hoặc gửi email đến vote@phila.gov.',
},
diff --git a/src/main.js b/src/main.js
index bbe6489..ce73aba 100644
--- a/src/main.js
+++ b/src/main.js
@@ -26,11 +26,11 @@ import { faMinus as farMinus } from '@fortawesome/pro-regular-svg-icons/faMinus'
library.add(faExclamationTriangle, faBuilding, faUserMd, faCircle, faExternalLinkAlt,farAngleUp, farAngleDown, farTimes, farPlus, farMinus );
// use these if running off unlinked package
-import pinboard from '@phila/pinboard';
-import '../node_modules/@phila/pinboard/dist/style.css';
+// import pinboard from '@phila/pinboard';
+// import '../node_modules/@phila/pinboard/dist/style.css';
// OR
// use this if running off linked package
-// import pinboard from '../node_modules/@phila/pinboard/src/main.js';
+import pinboard from '../node_modules/@phila/pinboard/src/main.js';
import legendControl from './general/legendControl';
@@ -99,14 +99,14 @@ let $config = {
titleSingular: 'Official mobile mail-in ballot return',
color: '#721817',
},
- 'Official mail-in ballot drop box': {
- title: 'Official mail-in ballot drop boxes',
- titleSingular: 'Official mail-in ballot drop box',
+ 'Official mail-in ballot dropbox': {
+ title: 'Official mail-in ballot dropboxes',
+ titleSingular: 'Official mail-in ballot dropbox',
color: '#4F6D0A',
},
- 'Mail-in ballot drop box (temporarily closed)': {
- title: 'Mail-in ballot drop boxes (temporarily closed)',
- titleSingular: 'Mail-in ballot drop box (temporarily closed)',
+ 'Mail-in ballot dropbox (temporarily closed)': {
+ title: 'Mail-in ballot dropboxes (temporarily closed)',
+ titleSingular: 'Mail-in ballot dropbox (temporarily closed)',
color: '#a1a1a1',
},
@@ -128,9 +128,9 @@ let $config = {
'#a86518',
'Official mobile mail-in ballot return',
'#721817',
- 'Official mail-in ballot drop box',
+ 'Official mail-in ballot dropbox',
'#4F6D0A',
- 'Mail-in ballot drop box (temporarily closed)',
+ 'Mail-in ballot dropbox (temporarily closed)',
'#a1a1a1',
/* other */ '#000000'
],