Merge pull request #46 from CityOfPhiladelphia/main

upgrades to pinboard 1.2.8
CityOfPhiladelphia · Nov 20, 2023 · 5b3a1a5 · 5b3a1a5
2 parents 75c6dcc + 18402bf
commit 5b3a1a5
Show file tree

Hide file tree

Showing 12 changed files with 1,258 additions and 1,184 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
     "@fortawesome/pro-light-svg-icons": "5.15.4",
     "@fortawesome/pro-regular-svg-icons": "5.15.4",
     "@fortawesome/pro-solid-svg-icons": "5.15.4",
-    "@phila/pinboard": "1.1.36",
+    "@phila/pinboard": "1.2.8",
     "bulma": "^0.9.1",
     "core-js": "^3.3.3",
     "vue": "^2.6.10"

diff --git a/public/error.html b/public/error.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="en">
+  <body>
+    <div class="error-message">
+      Please start at <a href="https://vote.phila.gov/ballot-drop-off/">https://vote.phila.gov/ballot-drop-off/</a>
+    </div>
+  </body>
+</html>
+
+<style>
+
+.error-message {
+  padding: 20px;
+  font-family: "Montserrat-SemiBold", "Montserrat SemiBold", "Montserrat", sans-serif;
+  font-weight: 650;
+  font-size: 20px;
+}
+
+</style>
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/images/location-crosshairs-solid.svg b/public/images/location-crosshairs-solid.svg
diff --git a/src/components/ExpandCollapseContent.vue b/src/components/ExpandCollapseContent.vue
@@ -1,6 +1,9 @@
 <template>
   <div :class="isMobile ? 'main-content-mobile' : 'main-content'">
-    <div class="columns">
+    <print-share-section
+      :item="item"
+    />
+    <div class="columns top-section">
       <div class="column is-6">
         <div
           v-if="item.street_address"
@@ -58,13 +61,16 @@ import ElectionOfficeCard from './ElectionOfficeCard.vue';
 import OfficialMobileBallotReturnCard from './OfficialMobileBallotReturnCard.vue';
 import OfficialBallotReturnDropBox from './OfficialBallotReturnDropBox.vue';
 
+import PrintShareSection from '@phila/pinboard/src/components/PrintShareSection';
+
 export default {
   name: 'ExpandCollapseContent',
   components: {
     // VerticalTableLight: () => import(/* webpackChunkName: "pvc_VerticalTable3CellsLight" */'@phila/vue-comps/src/components/VerticalTableLight.vue'),
     ElectionOfficeCard,
     OfficialMobileBallotReturnCard,
     OfficialBallotReturnDropBox,
+    PrintShareSection,
   },
   mixins: [ SharedFunctions ],
   props: {

diff --git a/src/components/customGreeting.vue b/src/components/customGreeting.vue
@@ -183,6 +183,8 @@ export default {
 
 <style lang="scss" scoped>
 
+@import "../../node_modules/@phila/pinboard/src/assets/scss/customGreeting.scss";
+
   .section-header {
     background-color: #0f4d90;
     font-size: 16px;

diff --git a/src/general/legendControls.js b/src/general/legendControls.js
@@ -28,7 +28,8 @@ export default {
         'width': '15px',
         'height': '15px',
         'font-size': '10px',
-        'background-color': '#0F4D90',
+        'background-color': '#a86518',
+        // 'background-color': '#9400c6',
       },
       'Official mail-in ballot drop boxes': {
         'border-color': 'black',

diff --git a/src/i18n/ch.js b/src/i18n/ch.js
@@ -47,6 +47,11 @@ export default {
   'Election office': '选举办公室',
   'Official mobile mail-in ballot return': '正式移動式郵寄选票投遞処',
   'Official mail-in ballot drop box': '官方邮寄选票投票箱',
+  categoryType: {
+    'Election office': '选举办公室',
+    'Official mobile mail-in ballot return': '正式移動式郵寄选票投遞処',
+    'Official mail-in ballot drop box': '官方邮寄选票投票箱',
+  },
   sections: {
     'Election office': {
       header: '选举办公室',

diff --git a/src/i18n/en-us.js b/src/i18n/en-us.js
@@ -50,6 +50,11 @@ 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',
+  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',
+  },
   sections: {
     'Election office': {
       header: 'Election offices',

diff --git a/src/i18n/es.js b/src/i18n/es.js
@@ -50,6 +50,11 @@ 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',
+  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',
+  },
   sections: {
     'Election office': {
       englishName: 'Election office',

diff --git a/src/main.js b/src/main.js
@@ -5,6 +5,7 @@
 // (we might not need to use axios with new vue async tools)
 // if that is not needed, we can move this info to main.js
 
+
 // turn off console logging in production
 if (process.env.NODE_ENV === 'production') {
   console.log = console.info = console.debug = console.error = function () {};
@@ -44,6 +45,7 @@ import i18n from './i18n/i18n';
 console.log('main.js i18n:', i18n);
 
 pinboard({
+  publicPath: process.env.VUE_APP_PUBLICPATH,
   i18n: i18n.i18n,
   alerts: {
     // modal: {
@@ -85,6 +87,11 @@ pinboard({
   gtag: {
     category: 'rf-voting',
   },
+  allowPrint: true,
+  showBuffers: true,
+  resetDataOnGeocode: true,
+  retractableRefine: false,
+  dropdownRefine: false,
   searchBar: {
     placeholder: 'Search by address',
     searchTypes: [
@@ -110,7 +117,8 @@ pinboard({
     'Election office': {
       title: 'Election offices',
       titleSingular: 'Election office',
-      color: '#0F4D90',
+      color: '#a86518',
+      // color: '#9400c6',
     },
     'Official mobile mail-in ballot return': {
       title: 'Official mobile mail-in ballot returns',
@@ -128,11 +136,13 @@ pinboard({
   markerType: 'circle-marker',
   circleMarkers:{
     circleColors: {
-      'Election office': '#0f4d90',
+      // 'Election office': '#9400c6',
+      'Election office': '#a86518',
       'Official mobile mail-in ballot return': '#721817',
       'Official mail-in ballot drop box': '#4F6D0A',
     },
-    weight: 0,
+    borderColor: 'white',
+    weight: 1,
     radius: 8,
     mobileRadius: 12,
     size: 16,