diff --git a/package-lock.json b/package-lock.json index 4447267..ab377ed 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5480,6 +5480,51 @@ "webpack-merge": "^4.2.2" }, "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "optional": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "optional": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "optional": true + }, "ssri": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", @@ -5488,6 +5533,28 @@ "requires": { "minipass": "^3.1.1" } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.8.3", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz", + "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==", + "dev": true, + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + } } } }, @@ -19366,75 +19433,6 @@ } } }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.8.3", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz", - "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==", - "dev": true, - "optional": true, - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "optional": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "optional": true - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "vue-mapbox": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/vue-mapbox/-/vue-mapbox-0.4.1.tgz", diff --git a/src/components/ExpandCollapseContent.vue b/src/components/ExpandCollapseContent.vue index fe9dad3..b3c5a4a 100644 --- a/src/components/ExpandCollapseContent.vue +++ b/src/components/ExpandCollapseContent.vue @@ -19,14 +19,15 @@
- {{ item.attributes.PHONE }} + {{ $t('phone_org') }}: {{ transformPhone(item.attributes.PHONE) }}
+ {{ $t('phone_program') }}: {{ transformPhone(item.attributes.program_phone) }}
@@ -116,7 +117,6 @@
-
{{ $t('timeOffered') }}: {{ item.attributes.ProgramDirectoryStartTimeSelect }} - {{ item.attributes.ProgramDirectoryEndTimeSelect }}
- -

+

{{ $t('focusArea.plural') }}

@@ -203,7 +205,8 @@

{{ $t('details') }}

-
+
+
@@ -317,14 +320,14 @@ import { fr, vi, ru, es, enUS } from 'date-fns/locale'; import * as zh from 'date-fns/locale/zh-CN/index.js'; import SharedFunctions from '@phila/pinboard/src/components/mixins/SharedFunctions.vue'; -import { VueGoodTable } from 'vue-good-table'; +// import { VueGoodTable } from 'vue-good-table'; import PrintShareSection from '@phila/pinboard/src/components/PrintShareSection'; export default { name: 'ExpandCollapseContent', components: { - VueGoodTable, + // VueGoodTable, PrintShareSection, }, mixins: [ SharedFunctions ], @@ -567,6 +570,11 @@ export default { // console.log('ExpandCollapseContent.vue mounted, this.item.attributes.transit_subway.length:', this.item.attributes.transit_subway.length, 'this.item.attributes.transit_subway:', this.item.attributes.transit_subway); }, methods: { + transformPhone(phoneNumber) { + var s2 = (""+phoneNumber).replace(/\D/g, ''); + var m = s2.match(/^(\d{3})(\d{3})(\d{4})$/); + return (!m) ? null : "(" + m[1] + ") " + m[2] + "-" + m[3]; + }, getAges(item) { // console.log('getAges is running, item:', item); let options = [ 'isUnder5', 'is5to10', 'is11to13', 'is14to18', 'isAbove18' ]; diff --git a/src/data-sources/ost.js b/src/data-sources/ost.js index 3eaea83..3911c85 100644 --- a/src/data-sources/ost.js +++ b/src/data-sources/ost.js @@ -3,16 +3,17 @@ export default { type: 'http-get', dependent: 'none', resettable: false, + // url: 'https://stage.cityspan.com:8080/phillyost/service/getall', url: 'https://api.cityspan.com/phillyost/service/getall', options: { success: function(data) { console.log('ost.js success is running, data:', data); - let newData = { features: [] }; + let newData = { features: []}; for (let datum of data) { newData.features.push({ attributes: datum, latlng: [ datum.latitude, datum.longitude ], - }) + }); } return newData; }, diff --git a/src/i18n/en-us.js b/src/i18n/en-us.js index c4dccfd..ff7188c 100644 --- a/src/i18n/en-us.js +++ b/src/i18n/en-us.js @@ -8,6 +8,8 @@ export default { all: 'Search by address, zipcode, or program name', }, }, + phone_org: 'Organization Phone', + phone_program: 'Activity Phone', eligibility: 'Eligibility', pickupDetails: 'Pickup details', beforeYouGo: 'Before you go',