From c3b4f2f92a6054d2362ee74d3619c3ae76f7291a Mon Sep 17 00:00:00 2001 From: "rothwell.andy@gmail.com" Date: Wed, 8 Jan 2025 14:28:20 -0500 Subject: [PATCH] uses @phila/pinboard 2.0.100, uses new caching push --- .github/workflows/testing_cache_and_push.yml | 53 ++++++++++++ .github/workflows/testing_push_to_s3.yml | 2 +- package-lock.json | 86 ++++++++++---------- package.json | 14 ++-- src/main.js | 10 --- 5 files changed, 104 insertions(+), 61 deletions(-) create mode 100644 .github/workflows/testing_cache_and_push.yml diff --git a/.github/workflows/testing_cache_and_push.yml b/.github/workflows/testing_cache_and_push.yml new file mode 100644 index 0000000..cd67935 --- /dev/null +++ b/.github/workflows/testing_cache_and_push.yml @@ -0,0 +1,53 @@ +name: Caching with npm + +on: + push: + branches: + - vue3-pinboard + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - name: Cache node modules + id: cache-npm + uses: actions/cache@v3 + env: + cache-name: cache-node-modules + with: + # npm cache files are stored in `~/.npm` on Linux/macOS + path: ~/.npm + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-build-${{ env.cache-name }}- + ${{ runner.os }}-build- + ${{ runner.os }}- + + - if: ${{ steps.cache-npm.outputs.cache-hit != 'true' }} + name: List the state of node modules + continue-on-error: true + run: npm list + + - name: Install dependencies + run: | + printf "@fortawesome:registry=https://npm.fontawesome.com/\n//npm.fontawesome.com/:_authToken=${FONTAWESOME_NPM_AUTH_TOKEN}" >> ~/.npmrc + npm ci + npm list + env: + FONTAWESOME_NPM_AUTH_TOKEN: ${{ secrets.FA_AUTH_TOKEN }} + + - name: Build + run: npm run build:testing + + - name: Deploy to Dev s3, Set index headers + env: + AWS_DEFAULT_REGION: 'us-east-1' + AWS_S3_BUCKET: phila-resource-finder-v2/testing/obme/resources/ + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + run: | + aws s3 sync dist s3://$AWS_S3_BUCKET --region us-east-1 --delete + aws s3 cp s3://$AWS_S3_BUCKET s3://$AWS_S3_BUCKET --recursive --exclude "*" --include "*.html" --metadata-directive REPLACE --acl public-read --cache-control max-age=0,no-cache,no-store,must-revalidate,proxy-revalidate,public --expires "0" --content-type "text/html; charset=utf-8" + \ No newline at end of file diff --git a/.github/workflows/testing_push_to_s3.yml b/.github/workflows/testing_push_to_s3.yml index ff3636d..103c015 100644 --- a/.github/workflows/testing_push_to_s3.yml +++ b/.github/workflows/testing_push_to_s3.yml @@ -6,7 +6,7 @@ name: testing Push to S3 on: push: branches: - - vue3-pinboard + - vue3-pinboard_x jobs: build: diff --git a/package-lock.json b/package-lock.json index 26c1eee..cb9217a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,14 +8,14 @@ "name": "obme-finder", "version": "0.0.1", "dependencies": { - "@fortawesome/fontawesome-svg-core": "^6.7.1", - "@fortawesome/free-regular-svg-icons": "^6.6.0", - "@fortawesome/free-solid-svg-icons": "^6.6.0", - "@fortawesome/pro-light-svg-icons": "^6.6.0", - "@fortawesome/pro-regular-svg-icons": "^6.6.0", - "@fortawesome/pro-solid-svg-icons": "^6.6.0", + "@fortawesome/fontawesome-svg-core": "^6.7.2", + "@fortawesome/free-regular-svg-icons": "^6.7.2", + "@fortawesome/free-solid-svg-icons": "^6.7.2", + "@fortawesome/pro-light-svg-icons": "^6.7.2", + "@fortawesome/pro-regular-svg-icons": "^6.7.2", + "@fortawesome/pro-solid-svg-icons": "^6.7.2", "@phila/phila-ui-core": "^1.0.18", - "@phila/pinboard": "^2.0.96", + "@phila/pinboard": "^2.0.100", "unplugin-auto-import": "^0.18.3", "unplugin-vue-router": "^0.10.8" }, @@ -1023,82 +1023,82 @@ } }, "node_modules/@fortawesome/fontawesome-common-types": { - "version": "6.7.1", - "resolved": "https://npm.fontawesome.com/@fortawesome/fontawesome-common-types/-/6.7.1/fontawesome-common-types-6.7.1.tgz", - "integrity": "sha512-gbDz3TwRrIPT3i0cDfujhshnXO9z03IT1UKRIVi/VEjpNHtSBIP2o5XSm+e816FzzCFEzAxPw09Z13n20PaQJQ==", + "version": "6.7.2", + "resolved": "https://npm.fontawesome.com/@fortawesome/fontawesome-common-types/-/6.7.2/fontawesome-common-types-6.7.2.tgz", + "integrity": "sha512-Zs+YeHUC5fkt7Mg1l6XTniei3k4bwG/yo3iFUtZWd/pMx9g3fdvkSK9E0FOC+++phXOka78uJcYb8JaFkW52Xg==", "engines": { "node": ">=6" } }, "node_modules/@fortawesome/fontawesome-pro": { - "version": "6.7.1", - "resolved": "https://npm.fontawesome.com/@fortawesome/fontawesome-pro/-/6.7.1/fontawesome-pro-6.7.1.tgz", - "integrity": "sha512-PHm5vlwc721UVNyVr89O8r4EEANEdQifYrcnFa90zAiWbsX4aIMwAT6lLA4nfYOOLS3gRjnzl0HIAG1Ghyyy/g==", + "version": "6.7.2", + "resolved": "https://npm.fontawesome.com/@fortawesome/fontawesome-pro/-/6.7.2/fontawesome-pro-6.7.2.tgz", + "integrity": "sha512-5ZocZMRSZ0ECojDoRMJji6jHTq4ymc4LaaKrYCY55Lir2GxFRBrsm27r2sKQWjIkaVYZ3tbgjMeXb3aFbSo0Vw==", "engines": { "node": ">=6" } }, "node_modules/@fortawesome/fontawesome-svg-core": { - "version": "6.7.1", - "resolved": "https://npm.fontawesome.com/@fortawesome/fontawesome-svg-core/-/6.7.1/fontawesome-svg-core-6.7.1.tgz", - "integrity": "sha512-8dBIHbfsKlCk2jHQ9PoRBg2Z+4TwyE3vZICSnoDlnsHA6SiMlTwfmW6yX0lHsRmWJugkeb92sA0hZdkXJhuz+g==", + "version": "6.7.2", + "resolved": "https://npm.fontawesome.com/@fortawesome/fontawesome-svg-core/-/6.7.2/fontawesome-svg-core-6.7.2.tgz", + "integrity": "sha512-yxtOBWDrdi5DD5o1pmVdq3WMCvnobT0LU6R8RyyVXPvFRd2o79/0NCuQoCjNTeZz9EzA9xS3JxNWfv54RIHFEA==", "dependencies": { - "@fortawesome/fontawesome-common-types": "6.7.1" + "@fortawesome/fontawesome-common-types": "6.7.2" }, "engines": { "node": ">=6" } }, "node_modules/@fortawesome/free-regular-svg-icons": { - "version": "6.7.1", - "resolved": "https://npm.fontawesome.com/@fortawesome/free-regular-svg-icons/-/6.7.1/free-regular-svg-icons-6.7.1.tgz", - "integrity": "sha512-e13cp+bAx716RZOTQ59DhqikAgETA9u1qTBHO3e3jMQQ+4H/N1NC1ZVeFYt1V0m+Th68BrEL1/X6XplISutbXg==", + "version": "6.7.2", + "resolved": "https://npm.fontawesome.com/@fortawesome/free-regular-svg-icons/-/6.7.2/free-regular-svg-icons-6.7.2.tgz", + "integrity": "sha512-7Z/ur0gvCMW8G93dXIQOkQqHo2M5HLhYrRVC0//fakJXxcF1VmMPsxnG6Ee8qEylA8b8Q3peQXWMNZ62lYF28g==", "dependencies": { - "@fortawesome/fontawesome-common-types": "6.7.1" + "@fortawesome/fontawesome-common-types": "6.7.2" }, "engines": { "node": ">=6" } }, "node_modules/@fortawesome/free-solid-svg-icons": { - "version": "6.7.1", - "resolved": "https://npm.fontawesome.com/@fortawesome/free-solid-svg-icons/-/6.7.1/free-solid-svg-icons-6.7.1.tgz", - "integrity": "sha512-BTKc0b0mgjWZ2UDKVgmwaE0qt0cZs6ITcDgjrti5f/ki7aF5zs+N91V6hitGo3TItCFtnKg6cUVGdTmBFICFRg==", + "version": "6.7.2", + "resolved": "https://npm.fontawesome.com/@fortawesome/free-solid-svg-icons/-/6.7.2/free-solid-svg-icons-6.7.2.tgz", + "integrity": "sha512-GsBrnOzU8uj0LECDfD5zomZJIjrPhIlWU82AHwa2s40FKH+kcxQaBvBo3Z4TxyZHIyX8XTDxsyA33/Vx9eFuQA==", "dependencies": { - "@fortawesome/fontawesome-common-types": "6.7.1" + "@fortawesome/fontawesome-common-types": "6.7.2" }, "engines": { "node": ">=6" } }, "node_modules/@fortawesome/pro-light-svg-icons": { - "version": "6.7.1", - "resolved": "https://npm.fontawesome.com/@fortawesome/pro-light-svg-icons/-/6.7.1/pro-light-svg-icons-6.7.1.tgz", - "integrity": "sha512-kG54DxnvwllajpJDaL+GJw2tlFHQo01BmHT14yOvgM6PNQ1mT1efNmGehNxvSx6CDuMHDSgS1neyut7q3it6dQ==", + "version": "6.7.2", + "resolved": "https://npm.fontawesome.com/@fortawesome/pro-light-svg-icons/-/6.7.2/pro-light-svg-icons-6.7.2.tgz", + "integrity": "sha512-LeUnJCKlVG0oQwTW3oADJq3rkmnSDTg95RWdP46dCQ8pXOaw/8wzhN0XzZ2s/MqE48FNAX7E/XEqs0qMnrTZDA==", "dependencies": { - "@fortawesome/fontawesome-common-types": "6.7.1" + "@fortawesome/fontawesome-common-types": "6.7.2" }, "engines": { "node": ">=6" } }, "node_modules/@fortawesome/pro-regular-svg-icons": { - "version": "6.7.1", - "resolved": "https://npm.fontawesome.com/@fortawesome/pro-regular-svg-icons/-/6.7.1/pro-regular-svg-icons-6.7.1.tgz", - "integrity": "sha512-P9De393pkvCAMYvS26US91a2eOJmWzawCsTJnXnFKwQeAjTvpo8fWOxSQ+391/dBQg0zLy9cMFmBzvVL4s+xxw==", + "version": "6.7.2", + "resolved": "https://npm.fontawesome.com/@fortawesome/pro-regular-svg-icons/-/6.7.2/pro-regular-svg-icons-6.7.2.tgz", + "integrity": "sha512-cJolK4K/s56mHAqOyno24SmjviHqSqG9ZfckBKCpWjJlgDexi61EfET5wWbmmEot6/BqasFjw9S6tudFQUL/PQ==", "dependencies": { - "@fortawesome/fontawesome-common-types": "6.7.1" + "@fortawesome/fontawesome-common-types": "6.7.2" }, "engines": { "node": ">=6" } }, "node_modules/@fortawesome/pro-solid-svg-icons": { - "version": "6.7.1", - "resolved": "https://npm.fontawesome.com/@fortawesome/pro-solid-svg-icons/-/6.7.1/pro-solid-svg-icons-6.7.1.tgz", - "integrity": "sha512-YMehuODXC+puZRJigjfB+hwCeiUsfEfiDXJV0W1iSbrqX9xBbDl0Ovbnai3EUlwIVWpgfoWew6Cx207wwVAEnA==", + "version": "6.7.2", + "resolved": "https://npm.fontawesome.com/@fortawesome/pro-solid-svg-icons/-/6.7.2/pro-solid-svg-icons-6.7.2.tgz", + "integrity": "sha512-SY2aP8d7uBlg1rNYznA9w9SVnnQhu3x/C7CCKQYcOGOC1YtPPHgIJhxKGbSzm6RkeJs1HVEfAkORX3J0XB5K9Q==", "dependencies": { - "@fortawesome/fontawesome-common-types": "6.7.1" + "@fortawesome/fontawesome-common-types": "6.7.2" }, "engines": { "node": ">=6" @@ -1858,14 +1858,14 @@ } }, "node_modules/@phila/pinboard": { - "version": "2.0.96", - "resolved": "https://registry.npmjs.org/@phila/pinboard/-/pinboard-2.0.96.tgz", - "integrity": "sha512-el83/M7bZ4Qi+e28Wk+sVZXZuyWTiY2LZDWuM1tkPbxv/cUJg4WNraysIeKHMI1djSPnReWyUSjTHhpwwlpu7w==", + "version": "2.0.100", + "resolved": "https://registry.npmjs.org/@phila/pinboard/-/pinboard-2.0.100.tgz", + "integrity": "sha512-Erh6vJgk7nrCmPuHA77z4WrRHkAMG9Z1DqK4etE9jetiEO15oslGYzzDyTVLhbAjjBda/IhKkTmjHwD2o+vyFw==", "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/fontawesome-pro": "6.7.2", + "@fortawesome/fontawesome-svg-core": "6.7.2", + "@fortawesome/free-solid-svg-icons": "6.7.2", "@fortawesome/vue-fontawesome": "^3.0.6", "@phila/phila-ui-app-footer": "^0.0.14", "@phila/phila-ui-app-header": "^0.0.24", diff --git a/package.json b/package.json index 33f756b..094c9c6 100644 --- a/package.json +++ b/package.json @@ -11,14 +11,14 @@ "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs --fix --ignore-path .gitignore" }, "dependencies": { - "@fortawesome/fontawesome-svg-core": "^6.7.1", - "@fortawesome/free-regular-svg-icons": "^6.6.0", - "@fortawesome/free-solid-svg-icons": "^6.6.0", - "@fortawesome/pro-light-svg-icons": "^6.6.0", - "@fortawesome/pro-regular-svg-icons": "^6.6.0", - "@fortawesome/pro-solid-svg-icons": "^6.6.0", + "@fortawesome/fontawesome-svg-core": "^6.7.2", + "@fortawesome/free-regular-svg-icons": "^6.7.2", + "@fortawesome/free-solid-svg-icons": "^6.7.2", + "@fortawesome/pro-light-svg-icons": "^6.7.2", + "@fortawesome/pro-regular-svg-icons": "^6.7.2", + "@fortawesome/pro-solid-svg-icons": "^6.7.2", "@phila/phila-ui-core": "^1.0.18", - "@phila/pinboard": "^2.0.96", + "@phila/pinboard": "^2.0.100", "unplugin-auto-import": "^0.18.3", "unplugin-vue-router": "^0.10.8" }, diff --git a/src/main.js b/src/main.js index e9ce416..faea9f4 100644 --- a/src/main.js +++ b/src/main.js @@ -120,16 +120,6 @@ let $config = { include_units: true, }, }, - cyclomedia: { - enabled: false, - // measurementAllowed: false, - // popoutAble: true, - // recordingsUrl: 'https://atlas.cyclomedia.com/Recordings/wfs', - // username: process.env.VUE_APP_CYCLOMEDIA_USERNAME, - // password: process.env.VUE_APP_CYCLOMEDIA_PASSWORD, - // apiKey: process.env.VUE_APP_CYCLOMEDIA_API_KEY, - }, - markerType: 'circle-marker', mapLayer: { id: 'resources', source: 'resources',