Skip to content

Commit

Permalink
fixes 'drop box' space issue, uses pinboard 2.1.14
Browse files Browse the repository at this point in the history
ajrothwell committed Jan 23, 2025
1 parent 37b65e8 commit d964572
Showing 14 changed files with 51 additions and 51 deletions.
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion src/components/ExpandCollapseContent.vue
Original file line number Diff line number Diff line change
@@ -67,7 +67,7 @@ const section = computed(() => {
:item="item"
/>
<official-ballot-return-drop-box
v-if="section === 'Official mail-in ballot drop box' || section === 'Mail-in ballot drop box (temporarily closed)'"
v-if="section === 'Official mail-in ballot dropbox' || section === 'Mail-in ballot dropbox (temporarily closed)'"
:item="item"
/>
</div>
2 changes: 1 addition & 1 deletion src/components/OfficialBallotReturnDropBox.vue
Original file line number Diff line number Diff line change
@@ -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
}
}
2 changes: 1 addition & 1 deletion src/data-sources/dev.json
Original file line number Diff line number Diff line change
@@ -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",
2 changes: 1 addition & 1 deletion src/data-sources/voting-sites.js
Original file line number Diff line number Diff line change
@@ -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",
},
},
};
4 changes: 2 additions & 2 deletions src/general/legendControl.js
Original file line number Diff line number Diff line change
@@ -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',
12 changes: 6 additions & 6 deletions src/i18n/ch.js
Original file line number Diff line number Diff line change
@@ -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 或发送电子邮件至 <a href="mailto:vote{'@'}phila.gov">vote{'@'}phila.gov</a>.`,
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 或发送电子邮件至 <a href="mailto:vote{'@'}phila.gov">vote{'@'}phila.gov</a>.`,
14 changes: 7 additions & 7 deletions src/i18n/en-us.js
Original file line number Diff line number Diff line change
@@ -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 <a href="mailto:vote{'@'}phila.gov">vote{'@'}phila.gov</a>. \
If a dropbox is full, not functioning, or is damaged in any way, call (215) 686-3469 or email <a href="mailto:vote{'@'}phila.gov">vote{'@'}phila.gov</a>. \
`,
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 <a href="mailto:vote{'@'}phila.gov">vote{'@'}phila.gov</a>. \
If a dropbox is full, not functioning, or is damaged in any way, call (215) 686-3469 or email <a href="mailto:vote{'@'}phila.gov">vote{'@'}phila.gov</a>. \
`,
h2: '',
dates: '',
12 changes: 6 additions & 6 deletions src/i18n/es.js
Original file line number Diff line number Diff line change
@@ -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 <a href="mailto:vote{'@'}phila.gov">vote{'@'}phila.gov</a>.`,
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 <a href="mailto:vote{'@'}phila.gov">vote{'@'}phila.gov</a>.`,
6 changes: 3 additions & 3 deletions src/i18n/fr.js
Original file line number Diff line number Diff line change
@@ -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 à <a href="mailto:vote@phila.gov">vote@phila.gov</a>.',
},
8 changes: 4 additions & 4 deletions src/i18n/ru.js
Original file line number Diff line number Diff line change
@@ -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 <a href="mailto:vote@phila.gov">vote@phila.gov</a>.',
p1: 'If a dropbox is full, not functioning, or is damaged in any way, call (215) 686-3469 or email <a href="mailto:vote@phila.gov">vote@phila.gov</a>.',
},
},
beforeYouGo: 'Прежде чем вы пойдете',
6 changes: 3 additions & 3 deletions src/i18n/vi.js
Original file line number Diff line number Diff line change
@@ -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 <a href="mailto:vote@phila.gov">vote@phila.gov</a>.',
},
22 changes: 11 additions & 11 deletions src/main.js
Original file line number Diff line number Diff line change
@@ -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'
],

0 comments on commit d964572

Please sign in to comment.