From 5368972b999320e7773517deb3111c8353f5d8e6 Mon Sep 17 00:00:00 2001 From: lseeger Date: Wed, 13 Nov 2024 20:30:02 +0100 Subject: [PATCH 1/7] modified idea for intellij and added github action to publish on github pages on push on main --- .github/workflows/publish-to-gh-pages.yml | 22 ++++++++++++++++++++++ .gitignore | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/publish-to-gh-pages.yml diff --git a/.github/workflows/publish-to-gh-pages.yml b/.github/workflows/publish-to-gh-pages.yml new file mode 100644 index 0000000..e1f166c --- /dev/null +++ b/.github/workflows/publish-to-gh-pages.yml @@ -0,0 +1,22 @@ +name: Publish to Github Pages +run-name: ${{github.actor}} is deploying to Github Pages +on: + push: + branches: + - master +permissions: + contents: write +jobs: + build-and-deploy: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Install and Build + run: | + npm ci + npm run build + - name: Deploy 🚀 + uses: JamesIves/github-pages-deploy-action@v4 + with: + folder: build \ No newline at end of file diff --git a/.gitignore b/.gitignore index 3b27005..6f9dc03 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,7 @@ /node_modules /.pnp .pnp.js - +.idea # testing /coverage From 36686600d7664b2f54ae46179acf7458465ce2a6 Mon Sep 17 00:00:00 2001 From: lseeger Date: Wed, 13 Nov 2024 20:35:33 +0100 Subject: [PATCH 2/7] test changed icon size for github pages --- src/components/OwnLocationMarker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/OwnLocationMarker.js b/src/components/OwnLocationMarker.js index 4d1b1c0..eed4d9e 100644 --- a/src/components/OwnLocationMarker.js +++ b/src/components/OwnLocationMarker.js @@ -12,7 +12,7 @@ import { colors } from './MarkerToggles'; const OwnLocationMarker = () => { var myIcon = L.divIcon({ className: 'ownLocationMarker', - iconSize: [20, 20], + iconSize: [30, 20], html: renderToString(
Date: Wed, 13 Nov 2024 20:42:53 +0100 Subject: [PATCH 3/7] changed parameter to test --- .github/workflows/publish-to-gh-pages.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/publish-to-gh-pages.yml b/.github/workflows/publish-to-gh-pages.yml index e1f166c..f208a79 100644 --- a/.github/workflows/publish-to-gh-pages.yml +++ b/.github/workflows/publish-to-gh-pages.yml @@ -1,9 +1,6 @@ name: Publish to Github Pages run-name: ${{github.actor}} is deploying to Github Pages -on: - push: - branches: - - master +on: [push] permissions: contents: write jobs: From 655ab5f85d53a126455385a4dd9d2486f82a3a52 Mon Sep 17 00:00:00 2001 From: lseeger Date: Wed, 13 Nov 2024 20:43:41 +0100 Subject: [PATCH 4/7] changed npm isntall --- .github/workflows/publish-to-gh-pages.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-to-gh-pages.yml b/.github/workflows/publish-to-gh-pages.yml index f208a79..457e730 100644 --- a/.github/workflows/publish-to-gh-pages.yml +++ b/.github/workflows/publish-to-gh-pages.yml @@ -11,7 +11,7 @@ jobs: uses: actions/checkout@v4 - name: Install and Build run: | - npm ci + npm install npm run build - name: Deploy 🚀 uses: JamesIves/github-pages-deploy-action@v4 From 7bbdb6d13bd3b74299c60ad059661dba37a338e6 Mon Sep 17 00:00:00 2001 From: lseeger Date: Wed, 13 Nov 2024 20:49:21 +0100 Subject: [PATCH 5/7] changed to yrn --- .github/workflows/publish-to-gh-pages.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish-to-gh-pages.yml b/.github/workflows/publish-to-gh-pages.yml index 457e730..9accb22 100644 --- a/.github/workflows/publish-to-gh-pages.yml +++ b/.github/workflows/publish-to-gh-pages.yml @@ -11,9 +11,13 @@ jobs: uses: actions/checkout@v4 - name: Install and Build run: | - npm install - npm run build + yarn + yarn run scrape-leipzig-statistik + yarn run transform-leipzig-statistik + yarn run scrape-swimming-pools + yarn run transform-leipzig-parks + yarn run predeploy - name: Deploy 🚀 uses: JamesIves/github-pages-deploy-action@v4 with: - folder: build \ No newline at end of file + folder: build From 26905e6fb5e8abd1cf9c9337983f827e108d7d3a Mon Sep 17 00:00:00 2001 From: lseeger Date: Wed, 13 Nov 2024 20:58:00 +0100 Subject: [PATCH 6/7] removed scrapping scripts --- .github/workflows/publish-to-gh-pages.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/publish-to-gh-pages.yml b/.github/workflows/publish-to-gh-pages.yml index 9accb22..4c22acb 100644 --- a/.github/workflows/publish-to-gh-pages.yml +++ b/.github/workflows/publish-to-gh-pages.yml @@ -12,10 +12,6 @@ jobs: - name: Install and Build run: | yarn - yarn run scrape-leipzig-statistik - yarn run transform-leipzig-statistik - yarn run scrape-swimming-pools - yarn run transform-leipzig-parks yarn run predeploy - name: Deploy 🚀 uses: JamesIves/github-pages-deploy-action@v4 From f3d6d3ca428691bcf09097ad9c12966cacb46b75 Mon Sep 17 00:00:00 2001 From: lseeger Date: Wed, 13 Nov 2024 21:06:02 +0100 Subject: [PATCH 7/7] adjusted github action for deployment on original repository --- .github/workflows/publish-to-gh-pages.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish-to-gh-pages.yml b/.github/workflows/publish-to-gh-pages.yml index 4c22acb..3becd67 100644 --- a/.github/workflows/publish-to-gh-pages.yml +++ b/.github/workflows/publish-to-gh-pages.yml @@ -1,6 +1,9 @@ name: Publish to Github Pages run-name: ${{github.actor}} is deploying to Github Pages -on: [push] +on: + push: + branches: + - main permissions: contents: write jobs: @@ -17,3 +20,4 @@ jobs: uses: JamesIves/github-pages-deploy-action@v4 with: folder: build + repository_name: https://github.com/CodeforLeipzig/leipzigmaps.git