From 14f5fd9973683ae872e165d77ade56435eeff82d Mon Sep 17 00:00:00 2001
From: "rothwell.andy@gmail.com" <rothwell.andy@gmail.com>
Date: Thu, 7 Nov 2024 16:46:42 -0500
Subject: [PATCH] uses compiled vue3-pinboard

---
 .gitignore                                |  1 +
 package-lock.json                         | 36 ++++++++++++++++++++---
 package.json                              |  2 +-
 src/assets/mac-style.scss                 | 10 +++++++
 src/components/ExpandCollapseContent.vue  | 25 +++++-----------
 src/components/FridgeSiteCard.vue         | 10 +++----
 src/components/GeneralSiteCard.vue        |  4 +--
 src/components/NdsSchoolCard.vue          |  4 +--
 src/components/PhaSchoolCard.vue          |  4 +--
 src/components/PlaystreetsSchoolCard.vue  |  4 +--
 src/components/PprSchoolCard.vue          |  4 +--
 src/components/PublicBenefitsSiteCard.vue |  4 +--
 src/components/SeniorMealSiteCard.vue     |  4 +--
 src/components/SeniorMealSitePprCard.vue  |  4 +--
 src/components/customGreeting.vue         | 15 +++-------
 src/components/greetingSection.vue        |  4 +--
 src/main.js                               | 26 +++++++++-------
 src/util/is-mac.js                        |  3 ++
 18 files changed, 87 insertions(+), 77 deletions(-)
 create mode 100644 src/assets/mac-style.scss
 create mode 100644 src/util/is-mac.js

diff --git a/.gitignore b/.gitignore
index 8ee54e8..f486813 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ dist
 dist-ssr
 coverage
 *.local
+.env.development
 
 /cypress/videos/
 /cypress/screenshots/
diff --git a/package-lock.json b/package-lock.json
index bae464b..062118a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
       "dependencies": {
         "@fortawesome/pro-regular-svg-icons": "^6.6.0",
         "@phila/phila-ui-core": "^1.0.15",
-        "@phila/pinboard": "2.0.15",
+        "@phila/pinboard": "2.0.50",
         "unplugin-auto-import": "^0.18.3",
         "unplugin-vue-router": "^0.10.8"
       },
@@ -526,6 +526,11 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@creativebulma/bulma-tooltip": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@creativebulma/bulma-tooltip/-/bulma-tooltip-1.2.0.tgz",
+      "integrity": "sha512-ooImbeXEBxf77cttbzA7X5rC5aAWm9UsXIGViFOnsqB+6M944GkB28S5R4UWRqjFd2iW4zGEkEifAU+q43pt2w=="
+    },
     "node_modules/@esbuild/aix-ppc64": {
       "version": "0.21.5",
       "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
@@ -1620,6 +1625,27 @@
         "vue-imask": "^7.6.0"
       }
     },
+    "node_modules/@phila/phila-ui-checkbox": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/@phila/phila-ui-checkbox/-/phila-ui-checkbox-0.0.4.tgz",
+      "integrity": "sha512-4AqgNYwTW7Q/hCFcvP1kIH5GpakKu1G058aYjVSHyTo3mWQhhq6+BlORpbrFRZjKHhgROgIgsSm8slrvB92/2A==",
+      "dependencies": {
+        "@phila/phila-ui-core": "1.0.12",
+        "bulma": "^0.9.4",
+        "vue": "^3.3.8"
+      }
+    },
+    "node_modules/@phila/phila-ui-checkbox/node_modules/@phila/phila-ui-core": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/@phila/phila-ui-core/-/phila-ui-core-1.0.12.tgz",
+      "integrity": "sha512-HO1g6/Pn4MyQcn/3Ag1D84NWvSCTmsAjR/DrZ4BEdzFUmV6TaSpVCVHKx2dwsbCx7HnMpg94Fx/UV3FlUxb3yw==",
+      "dependencies": {
+        "bulma": "^0.9.4",
+        "bulma-checkradio": "^2.1.3",
+        "vue": "^3.3.8",
+        "vue-imask": "^7.6.0"
+      }
+    },
     "node_modules/@phila/phila-ui-core": {
       "version": "1.0.18",
       "resolved": "https://registry.npmjs.org/@phila/phila-ui-core/-/phila-ui-core-1.0.18.tgz",
@@ -1746,16 +1772,18 @@
       }
     },
     "node_modules/@phila/pinboard": {
-      "version": "2.0.15",
-      "resolved": "https://registry.npmjs.org/@phila/pinboard/-/pinboard-2.0.15.tgz",
-      "integrity": "sha512-tbkXcs9fCBI6n0kkzzB7rpEtaOxoolhd4oVydgdaYbDXTmO/2n4pI7kSJV8qdKlksrdHWQudVpOZW5zPW3X4HQ==",
+      "version": "2.0.50",
+      "resolved": "https://registry.npmjs.org/@phila/pinboard/-/pinboard-2.0.50.tgz",
+      "integrity": "sha512-Dem7CcGl+o9it89VGe9TXB07r1Jsn0y2Exdv/mVvXmlghVqyDcXFySEXfVWnx86UaY2Gv4Bu63cv3qhn7Bhn6w==",
       "dependencies": {
+        "@creativebulma/bulma-tooltip": "^1.2.0",
         "@fortawesome/fontawesome-pro": "^6.6.0",
         "@fortawesome/fontawesome-svg-core": "^6.6.0",
         "@fortawesome/free-solid-svg-icons": "^6.6.0",
         "@fortawesome/vue-fontawesome": "^3.0.6",
         "@phila/phila-ui-app-footer": "^0.0.7",
         "@phila/phila-ui-app-header": "^0.0.21",
+        "@phila/phila-ui-checkbox": "^0.0.4",
         "@phila/phila-ui-core": "^1.0.15",
         "@phila/phila-ui-dropdown": "^0.0.1",
         "@phila/phila-ui-lang-selector": "^0.0.7",
diff --git a/package.json b/package.json
index 943b79a..0778e35 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "@fortawesome/pro-regular-svg-icons": "^6.6.0",
     "@phila/phila-ui-core": "^1.0.15",
-    "@phila/pinboard": "2.0.15",
+    "@phila/pinboard": "2.0.50",
     "unplugin-auto-import": "^0.18.3",
     "unplugin-vue-router": "^0.10.8"
   },
diff --git a/src/assets/mac-style.scss b/src/assets/mac-style.scss
new file mode 100644
index 0000000..23ef01f
--- /dev/null
+++ b/src/assets/mac-style.scss
@@ -0,0 +1,10 @@
+
+::-webkit-scrollbar {
+  -webkit-appearance: none;
+  width: 7px;
+}
+::-webkit-scrollbar-thumb {
+  border-radius: 4px;
+  background-color: rgba(0,0,0,.5);
+  box-shadow: 0 0 1px rgba(255,255,255,.5);
+} 
\ No newline at end of file
diff --git a/src/components/ExpandCollapseContent.vue b/src/components/ExpandCollapseContent.vue
index d13fae9..598badc 100644
--- a/src/components/ExpandCollapseContent.vue
+++ b/src/components/ExpandCollapseContent.vue
@@ -1,9 +1,7 @@
 <script setup>
 
-import { useMainStore } from '@phila/pinboard/src/stores/MainStore.js';
-import { useConfigStore } from '@phila/pinboard/src/stores/ConfigStore.js';
 import { ref, computed, getCurrentInstance, onBeforeMount, onMounted, watch } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+// import { useRoute, useRouter } from 'vue-router';
 
 import useLocalSharedFunctions from '../composables/useLocalSharedFunctions.js';
 const { getPickupDetails, parseTimeRange, parseException } = useLocalSharedFunctions();
@@ -21,12 +19,7 @@ import GeneralSiteCard from './GeneralSiteCard.vue';
 import FridgeSiteCard from './FridgeSiteCard.vue';
 import PublicBenefitsSiteCard from './PublicBenefitsSiteCard.vue';
 
-// import PrintShareSection from '../../node_modules/@phila/pinboard/src/components/PrintShareSection';
-import PrintShareSection from '@phila/pinboard/src/components/PrintShareSection.vue';
-
-const MainStore = useMainStore();
-const ConfigStore = useConfigStore();
-const $config = ConfigStore.config;
+import $config from '../main.js';
 
 const props = defineProps({
   item: {
@@ -37,9 +30,9 @@ const props = defineProps({
   }
 });
 
-const isMobile = computed(() => {
-  return MainStore.isMobileDevice;
-});
+// const isMobile = computed(() => {
+//   return MainStore.isMobileDevice;
+// });
 
 const currentUnixDate = computed (() => {
   let currentYear = format(new Date(), 'yyyy');
@@ -237,11 +230,8 @@ const makeValidUrl = (url) => {
 
 <template>
   <div>
-    <div :class="isMobile ? 'main-content-mobile' : 'main-content'">
-      <print-share-section
-        :item="item"
-      />
-
+    <!-- <div :class="isMobile ? 'main-content-mobile' : 'main-content'"> -->
+    <div>
       <div class="columns">
         <div class="column is-6">
           <div
@@ -444,7 +434,6 @@ const makeValidUrl = (url) => {
 </template>
 
 <style lang="scss" scoped>
-// @import "../../node_modules/@phila/pinboard/src/assets/scss/expandCollapse.scss";
 
 .location-content {
   // font-size: 14px;
diff --git a/src/components/FridgeSiteCard.vue b/src/components/FridgeSiteCard.vue
index 0061abc..5d00579 100644
--- a/src/components/FridgeSiteCard.vue
+++ b/src/components/FridgeSiteCard.vue
@@ -1,9 +1,7 @@
 <script setup>
 
 import { computed } from 'vue';
-import { useConfigStore } from '../../node_modules/@phila/pinboard/src/stores/ConfigStore.js';
-const ConfigStore = useConfigStore();
-const $config = ConfigStore.config;
+import $config from '../main.js';
   
 const props = defineProps({
   item: {
@@ -15,15 +13,15 @@ const props = defineProps({
 });
 
 const subsections = computed(() => {
-  return this.$config.subsections;
+  return $config.subsections;
 });
 
 const section = computed(() => {
-  return this.subsections[this.$props.item.properties['category']];
+  return subsections[props.item.properties['category']];
 });
 
 const subsection = computed(() => {
-  return this.$props.item.properties.category;
+  return props.item.properties.category;
 });
 
 </script>
diff --git a/src/components/GeneralSiteCard.vue b/src/components/GeneralSiteCard.vue
index 7262dfe..9a29ca8 100644
--- a/src/components/GeneralSiteCard.vue
+++ b/src/components/GeneralSiteCard.vue
@@ -1,8 +1,6 @@
 <script setup>
 
-import { useConfigStore } from '../../node_modules/@phila/pinboard/src/stores/ConfigStore.js';
-const ConfigStore = useConfigStore();
-const $config = ConfigStore.config;
+import $config from '../main.js';
 
 import useLocalSharedFunctions from '../composables/useLocalSharedFunctions.js';
 const { parseException } = useLocalSharedFunctions();
diff --git a/src/components/NdsSchoolCard.vue b/src/components/NdsSchoolCard.vue
index e32e62b..53a1eaa 100644
--- a/src/components/NdsSchoolCard.vue
+++ b/src/components/NdsSchoolCard.vue
@@ -1,8 +1,6 @@
 <script setup>
 
-import { useConfigStore } from '../../node_modules/@phila/pinboard/src/stores/ConfigStore.js';
-const ConfigStore = useConfigStore();
-const $config = ConfigStore.config;
+import $config from '../main.js';
 import useLocalSharedFunctions from '../composables/useLocalSharedFunctions.js';
 const { parseException } = useLocalSharedFunctions();
 
diff --git a/src/components/PhaSchoolCard.vue b/src/components/PhaSchoolCard.vue
index a793743..a82f58a 100644
--- a/src/components/PhaSchoolCard.vue
+++ b/src/components/PhaSchoolCard.vue
@@ -1,8 +1,6 @@
 <script setup>
 
-import { useConfigStore } from '../../node_modules/@phila/pinboard/src/stores/ConfigStore.js';
-const ConfigStore = useConfigStore();
-const $config = ConfigStore.config;
+import $config from '../main.js';
 
 const props = defineProps({
   item: {
diff --git a/src/components/PlaystreetsSchoolCard.vue b/src/components/PlaystreetsSchoolCard.vue
index 33bab5e..d6b1a8b 100644
--- a/src/components/PlaystreetsSchoolCard.vue
+++ b/src/components/PlaystreetsSchoolCard.vue
@@ -1,8 +1,6 @@
 <script setup>
 
-import { useConfigStore } from '../../node_modules/@phila/pinboard/src/stores/ConfigStore.js';
-const ConfigStore = useConfigStore();
-const $config = ConfigStore.config;
+import $config from '../main.js';
 
 const props = defineProps({
   item: {
diff --git a/src/components/PprSchoolCard.vue b/src/components/PprSchoolCard.vue
index e8be9dd..583c4e6 100644
--- a/src/components/PprSchoolCard.vue
+++ b/src/components/PprSchoolCard.vue
@@ -1,8 +1,6 @@
 <script setup>
 
-import { useConfigStore } from '../../node_modules/@phila/pinboard/src/stores/ConfigStore.js';
-const ConfigStore = useConfigStore();
-const $config = ConfigStore.config;
+import $config from '../main.js';
 
 const props = defineProps({
   item: {
diff --git a/src/components/PublicBenefitsSiteCard.vue b/src/components/PublicBenefitsSiteCard.vue
index a49cf21..d5142f4 100644
--- a/src/components/PublicBenefitsSiteCard.vue
+++ b/src/components/PublicBenefitsSiteCard.vue
@@ -1,8 +1,6 @@
 <script setup>
 
-import { useConfigStore } from '../../node_modules/@phila/pinboard/src/stores/ConfigStore.js';
-const ConfigStore = useConfigStore();
-const $config = ConfigStore.config;
+import $config from '../main.js';
 
 import useLocalSharedFunctions from '../composables/useLocalSharedFunctions.js';
 const { parseException } = useLocalSharedFunctions();
diff --git a/src/components/SeniorMealSiteCard.vue b/src/components/SeniorMealSiteCard.vue
index f6a74d4..117f2dc 100644
--- a/src/components/SeniorMealSiteCard.vue
+++ b/src/components/SeniorMealSiteCard.vue
@@ -1,9 +1,7 @@
 <script setup>
 
 import { computed } from 'vue';
-import { useConfigStore } from '../../node_modules/@phila/pinboard/src/stores/ConfigStore.js';
-const ConfigStore = useConfigStore();
-const $config = ConfigStore.config;
+import $config from '../main.js';
 
 const props = defineProps({
   item: {
diff --git a/src/components/SeniorMealSitePprCard.vue b/src/components/SeniorMealSitePprCard.vue
index 47775a5..160adc5 100644
--- a/src/components/SeniorMealSitePprCard.vue
+++ b/src/components/SeniorMealSitePprCard.vue
@@ -1,8 +1,6 @@
 <script>
 
-import { useConfigStore } from '../../node_modules/@phila/pinboard/src/stores/ConfigStore.js';
-const ConfigStore = useConfigStore();
-const $config = ConfigStore.config;
+import $config from '../main.js';
 
 const props = defineProps({
   item: {
diff --git a/src/components/customGreeting.vue b/src/components/customGreeting.vue
index 04aa218..a24102f 100644
--- a/src/components/customGreeting.vue
+++ b/src/components/customGreeting.vue
@@ -1,16 +1,9 @@
 <script setup>
 
-import { useMainStore } from '../../node_modules/@phila/pinboard/src/stores/MainStore.js';
-import { useMapStore } from '../../node_modules/@phila/pinboard/src/stores/MapStore.js';
-import { useGeocodeStore } from '../../node_modules/@phila/pinboard/src/stores/GeocodeStore.js';
-import { useDataStore } from '../../node_modules/@phila/pinboard/src/stores/DataStore.js';
-import { useConfigStore } from '../../node_modules/@phila/pinboard/src/stores/ConfigStore.js';
-
-import { parse, format } from 'date-fns';
+// import { parse, format } from 'date-fns';
 import { onMounted, watch, ref, computed, defineEmits } from 'vue';
-const MainStore = useMainStore();
-const ConfigStore = useConfigStore();
-const $config = ConfigStore.config;
+
+import $config from '../main.js';
 
 const $emit = defineEmits(['view-list']);
 
@@ -95,7 +88,7 @@ watch(
     // let subsections = getCounts();
     subsections.value = getCounts();
     // $store.commit('setSubsections', subsections);
-    MainStore.subsections = subsections.value;
+    // MainStore.subsections = subsections.value;
   },
 );
 
diff --git a/src/components/greetingSection.vue b/src/components/greetingSection.vue
index 6cf7a2f..9904685 100644
--- a/src/components/greetingSection.vue
+++ b/src/components/greetingSection.vue
@@ -1,8 +1,6 @@
 <script setup>
 
-import { useConfigStore } from '../../node_modules/@phila/pinboard/src/stores/ConfigStore.js';
-const ConfigStore = useConfigStore();
-const $config = ConfigStore.config;
+import $config from '../main.js';
 import { getCurrentInstance } from 'vue';
 
 const props = defineProps({
diff --git a/src/main.js b/src/main.js
index c609f11..6b5be65 100644
--- a/src/main.js
+++ b/src/main.js
@@ -5,6 +5,11 @@
 // (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
 
+import isMac from './util/is-mac';
+if (isMac()) {
+  import('./assets/mac-style.scss')
+}
+
 // Font Awesome Icons
 import { library } from '@fortawesome/fontawesome-svg-core';
 import { faExclamationTriangle } from '@fortawesome/free-solid-svg-icons';
@@ -15,14 +20,13 @@ import { faTimes as farTimes } from '@fortawesome/pro-regular-svg-icons';
 import { faPlus as farPlus } from '@fortawesome/pro-regular-svg-icons';
 import { faMinus as farMinus } from '@fortawesome/pro-regular-svg-icons';
 import { markRaw } from 'vue';
-
-// library.add(faExclamationTriangle, faHandHoldingHeart);
-// library.add(faExclamationTriangle, faHandHoldingHeart, farTimes, farPlus, farMinus);
 library.add(faExclamationTriangle, faHandHoldingHeart, farAngleDown, farAngleUp, farTimes, farPlus, farMinus);
 
-// import pinboard
-import pinboard from '../node_modules/@phila/pinboard/src/main.js';
-if (import.meta.env.VITE_DEBUG) console.log('pinboard:', pinboard);
+import pinboard from '@phila/pinboard';
+// import pinboard from '../node_modules/@phila/pinboard/src/main.js';
+if (import.meta.env.VITE_DEBUG) console.log('test pinboard:', pinboard);
+
+import '../node_modules/@phila/pinboard/dist/style.css';
 
 // import greeting from './general/greeting';
 import legendControls from './general/legendControls';
@@ -47,9 +51,7 @@ const customComps = markRaw({
 import i18n from './i18n/i18n';
 // if (import.meta.env.VITE_DEBUG) console.log('main.js i18n:', i18n);
 
-// pinboard();
-pinboard({
-// export default {
+let $config = {
   i18n: i18n.i18n,
   publicPath: import.meta.env.VITE_PUBLICPATH,
   app: {
@@ -658,4 +660,8 @@ pinboard({
       'circle-stroke-color': 'white',
     },
   },
-});
+};
+
+pinboard($config);
+export default $config;
+
diff --git a/src/util/is-mac.js b/src/util/is-mac.js
new file mode 100644
index 0000000..6d185e8
--- /dev/null
+++ b/src/util/is-mac.js
@@ -0,0 +1,3 @@
+export default function () {
+  return /Macintosh/.test(navigator.userAgent);
+}
\ No newline at end of file