Merge pull request #20 from CityOfPhiladelphia/main

uses pinboard 1.2.8
CityOfPhiladelphia · Nov 17, 2023 · 0eae31b · 0eae31b
2 parents d685f48 + 7f645bd
commit 0eae31b
Show file tree

Hide file tree

Showing 10 changed files with 3,591 additions and 16,308 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/.github/workflows/prod_push_to_s3.yml b/.github/workflows/prod_push_to_s3.yml
@@ -32,7 +32,7 @@ jobs:
     - name: Deploy to Prod s3, Set index headers, and Invalidate Cloudfront
       env:
         AWS_DEFAULT_REGION: 'us-east-1'
-        AWS_S3_BUCKET: phila-resource-finder-v2/oia/resource-finder/
+        AWS_S3_BUCKET: phila-resource-finder-v2/oia/resource-finder
         AWS_CLOUDFRONT_DISTRIBUTION: E2K2DCUMZ188JW
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

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.46",
+    "@phila/pinboard": "1.2.8",
     "bulma": "^0.9.1",
     "core-js": "^3.25.1",
     "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/oia/resource-finder/">https://www.phila.gov/oia/resource-finder/</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/customGreeting.vue b/src/components/customGreeting.vue
@@ -152,56 +152,8 @@ export default {
 };
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 
-  /* .greeting-section {
-    margin-bottom: 1rem;
-  } */
-
-  /* .custom-callout {
-    border-style: solid;
-    border-width: 1px;
-    padding: 10px;
-  } */
-
-  .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: 2rem;
-  }
-
-  /* .exclamation-holder {
-    padding: 1rem;
-    margin-bottom: 0px;
-  }
-
-  .fa-icon-class {
-    margin: 0 auto;
-    display: block;
-  }
-
-  .exclamation-details {
-    margin-left: 14px;
-  }
-
-  .mb-panel-topics-greeting {
-    padding-top: 20px;
-  } */
+@import "../../node_modules/@phila/pinboard/src/assets/scss/customGreeting.scss";
 
 </style>
diff --git a/src/main.js b/src/main.js
@@ -25,21 +25,17 @@ library.add(farAngleDown, farAngleUp, farTimes, farPlus, farMinus);
 // import pinboard
 import pinboard from '@phila/pinboard/src/main.js';
 
-// import greeting from './general/greeting';
-
 // data-sources
 import immigrant from './data-sources/immigrant';
-// var BASE_CONFIG_URL = 'https://cdn.jsdelivr.net/gh/cityofphiladelphia/mapboard-default-base-config@6126861722cee9384694742363d1661e771493b9/config.js';
 
 import customGreeting from './components/customGreeting.vue';
 const customComps = {
-  // 'expandCollapseContent': expandCollapseContent,
   'customGreeting': customGreeting,
 };
 
 
 pinboard({
-  // baseConfig: BASE_CONFIG_URL,
+  publicPath: process.env.VUE_APP_PUBLICPATH,
   app: {
     title: 'Resources for immigrants',
     subtitle: 'Find services and support for immigrants in Philadelphia',
@@ -50,10 +46,12 @@ pinboard({
   gtag: {
     category: 'rf-oia',
   },
+  printView: false,
+  allowPrint: true,
+  showBuffers: true,
   resetDataOnGeocode: true,
-  // addressInput: {
-  //   placeholder: 'Search by address or keyword',
-  // },
+  retractableRefine: false,
+  dropdownRefine: false,
   searchBar: {
     placeholder: 'Search by address or keyword',
     searchTypes: [
@@ -69,7 +67,6 @@ pinboard({
       keyword: 'Search by keyword',
     },
   },
-  // greeting,
   locationInfo: {
     siteName: 'organization_name',
   },
@@ -95,9 +92,6 @@ pinboard({
       include_units: true,
     },
   },
-  // footer: {
-  //   'aboutFinder': false,
-  // },
   footer: [
     {
       type: "native",
@@ -130,13 +124,26 @@ pinboard({
     // password: process.env.VUE_APP_CYCLOMEDIA_PASSWORD,
     // apiKey: process.env.VUE_APP_CYCLOMEDIA_API_KEY,
   },
-  markerType: 'pin-marker',
+  // markerType: 'pin-marker',
+  markerType: 'circle-marker',
+  circleMarkers: {
+    color: '#9400c6',
+    borderColor: 'white',
+    weight: 1,
+    radius: 8,
+    mobileRadius: 12,
+    size: 16,
+    mobileSize: 20,
+  },
   map: {
     type: 'mapbox',
     // tiles: 'hosted',
     containerClass: 'map-container',
     defaultBasemap: 'pwd',
     center: [ -75.163471, 39.953338 ],
+    minZoom: 11,
+    maxZoom: 25,
+    shouldInitialize: true,
     zoom: 12,
     geocodeZoom: 15,
     imagery: {
-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 @@