Merge pull request #9 from CityOfPhiladelphia/pinboard-features

Pinboard features
CityOfPhiladelphia · Nov 17, 2023 · 829aaf9 · 829aaf9
2 parents 5b71404 + b94caab
commit 829aaf9
Show file tree

Hide file tree

Showing 9 changed files with 1,158 additions and 1,185 deletions.
diff --git a/.github/workflows/dev_push_to_s3.yml b/.github/workflows/dev_push_to_s3.yml
@@ -6,7 +6,7 @@ name: dev Push to S3
 on:
   push:
     branches:
-      - main
+      - pinboard-features
 
 jobs:
   build:

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -14,7 +14,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.44",
+    "@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://www.phila.gov/obme/resources/">https://www.phila.gov/obme/resources/</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,10 @@
 <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.attributes.address"
@@ -114,9 +118,13 @@
 <script>
 
 import SharedFunctions from '@phila/pinboard/src/components/mixins/SharedFunctions.vue';
+import PrintShareSection from '@phila/pinboard/src/components/PrintShareSection';
 
 export default {
   name: 'ExpandCollapseContent',
+  components: {
+    PrintShareSection,
+  },
   mixins: [ SharedFunctions ],
   props: {
     item: {

diff --git a/src/components/customGreeting.vue b/src/components/customGreeting.vue
@@ -148,28 +148,8 @@ export default {
 };
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 
-  .container {
-    margin-bottom: 1rem;
-  }
-
-  .list-div {
-    margin-bottom: 1rem;
-  }
-
-  .open-list-button {
-    text-transform: uppercase;
-    background-color: #0f4d90;
-    color: #ffffff;
-    padding-left: 32px;
-    padding-right: 32px;
-    padding-top: 17px;
-    padding-bottom: 17px;
-  }
-
-  .custom-greeting {
-    padding: 1.5rem;
-  }
+@import "../../node_modules/@phila/pinboard/src/assets/scss/customGreeting.scss";
 
 </style>
diff --git a/src/main.js b/src/main.js
@@ -36,6 +36,7 @@ const customComps = {
 
 
 pinboard({
+  publicPath: process.env.VUE_APP_PUBLICPATH,
   app: {
     title: 'Resources for Black males',
     subtitle: 'Find a resource that helps Black men and boys in Philadelphia ',
@@ -44,7 +45,11 @@ pinboard({
   gtag: {
     category: 'rf-obme',
   },
+  allowPrint: true,
+  showBuffers: true,
   resetDataOnGeocode: true,
+  retractableRefine: false,
+  dropdownRefine: false,
   addressInput: {
     placeholder: 'Search by address or keyword',
   },
@@ -150,7 +155,17 @@ pinboard({
     // password: process.env.VUE_APP_CYCLOMEDIA_PASSWORD,
     // apiKey: process.env.VUE_APP_CYCLOMEDIA_API_KEY,
   },
-  markerType: 'pin-marker',
+  markerType: 'circle-marker',
+  circleMarkers: {
+    color: '#9400c6',
+    borderColor: 'white',
+    weight: 1,
+    radius: 8,
+    mobileRadius: 12,
+    size: 16,
+    mobileSize: 20,
+  },
+  // markerType: 'pin-marker',
   map: {
     type: 'mapbox',
     // tiles: 'hosted',
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ name: dev Push to S3 @@
     on:
       push:
         branches:
-          - main
+          - pinboard-features
     jobs:
       build:
@@ Expand Down @@