From 48a026ffacff27b128e86a2bb784fc88342d1079 Mon Sep 17 00:00:00 2001 From: JEMcats Date: Sat, 13 Sep 2025 16:35:25 -0400 Subject: [PATCH 01/12] update pull request template to have extra clear instructions --- .github/PULL_REQUEST_TEMPLATE.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index e9c4877..a3b00eb 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -2,6 +2,8 @@ Thank you for contributing to our project! Please refrain from deleting any text from this template, unless specifically instructed to do so. + +Checkboxes are filled by doing: [x] --> ## Breaking Change @@ -31,6 +33,7 @@ If your PR requires multiple options, consider splitting it into multiple PRs to - This PR addresses or resolves issue: From 72cd5a401e8ab95bb851586651fc303dc8fe8aad Mon Sep 17 00:00:00 2001 From: JEMcats Date: Sat, 13 Sep 2025 16:39:31 -0400 Subject: [PATCH 02/12] update release workflow to add webglass to the github release --- .github/workflows/publish.yml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d6b5b03..34514f4 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -49,7 +49,23 @@ jobs: -H "Content-Type: application/json" \ -d "$(jq -n --arg tag "$tag" --arg title "$title" --arg description "$description" \ '{tag_name: $tag, target_commitish: "main", name: $title, body: $description, draft: false, prerelease: false}')" \ - https://api.github.com/repos/JEMcats-Software/WebGlass/releases + https://api.github.com/repos/JEMcats-Software/WebGlass/releases --output release.json + + upload_url=$(jq -r '.upload_url' release.json | sed "s/{?name,label}//") + echo "UPLOAD_URL=$upload_url" >> $GITHUB_ENV + + - name: Upload WebGlass.js to Release + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + UPLOAD_URL: ${{ env.UPLOAD_URL }} + TITLE: ${{ github.event.inputs.title }} + run: | + upload_url="${UPLOAD_URL}?name=WebGlass-${TITLE}.js" + curl -X POST \ + -H "Authorization: token $GITHUB_TOKEN" \ + -H "Content-Type: application/octet-stream" \ + --data-binary @WebGlass.js \ + "$upload_url" upload-to-s3: runs-on: ubuntu-latest From 80d8c2cd16b391c06009321378d66d1ad95e9991 Mon Sep 17 00:00:00 2001 From: JEMcats Date: Sat, 13 Sep 2025 16:42:32 -0400 Subject: [PATCH 03/12] update release workflow to set javascript files in s3 to text/javascript --- .github/workflows/publish.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 34514f4..42042d1 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -102,11 +102,11 @@ jobs: # Sync contents to S3 bucket while excluding .github folder - name: Sync to S3 run: | - aws s3 cp WebGlass.js s3://cdn.jemcats.software/WebGlass/${{ github.event.inputs.tag }}/WebGlass.js - aws s3 cp WebGlass.min.js s3://cdn.jemcats.software/WebGlass/${{ github.event.inputs.tag }}/WebGlass.min.js - aws s3 cp demo/ s3://jemcats.software/github_pages/WebGlass/ --recursive + aws s3 cp WebGlass.js s3://cdn.jemcats.software/WebGlass/${{ github.event.inputs.tag }}/WebGlass.js --content-type "text/javascript" + aws s3 cp WebGlass.min.js s3://cdn.jemcats.software/WebGlass/${{ github.event.inputs.tag }}/WebGlass.min.js --content-type "text/javascript" + aws s3 cp demo/ s3://jemcats.software/github_pages/WebGlass/ --recursive - name: Clear and Publish Latest to S3 run: | aws s3 rm s3://cdn.jemcats.software/WebGlass/latest/ --recursive - aws s3 cp s3://cdn.jemcats.software/WebGlass/${{ github.event.inputs.tag }}/ s3://cdn.jemcats.software/WebGlass/latest/ --recursive \ No newline at end of file + aws s3 cp s3://cdn.jemcats.software/WebGlass/${{ github.event.inputs.tag }}/ s3://cdn.jemcats.software/WebGlass/latest/ --recursive --content-type "text/javascript" --exclude "*" --include "*.js" \ No newline at end of file From 259a474cffb82e7f637fbebea5823cf3e41b7db4 Mon Sep 17 00:00:00 2001 From: JEMcats Date: Sat, 13 Sep 2025 16:51:53 -0400 Subject: [PATCH 04/12] minor readme changes --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2eb0a0a..c9e80aa 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ Fork the ```dev``` branch. Make changes. -Open pull request. +Open pull request (PLEASE FILL OUT THE QUESTIONS!). ## License This project is licensed under the GPL-3.0 license. From 9ac4c9927e836d6c7addf4b08bd6787179c25b00 Mon Sep 17 00:00:00 2001 From: Erik Mattheis Date: Sat, 13 Sep 2025 15:53:18 -0400 Subject: [PATCH 05/12] bring element to front when dragged --- demo/index.html | 128 ++++++++++++++++++++++++++++-------------------- 1 file changed, 74 insertions(+), 54 deletions(-) diff --git a/demo/index.html b/demo/index.html index 4d76048..d42e847 100644 --- a/demo/index.html +++ b/demo/index.html @@ -54,61 +54,9 @@ line-height: 1.6; } - - - - -
-
-
-
-
-
- - - - - - - -

- Lorem ipsum, dolor sit amet consectetur adipisicing elit. Temporibus - ullam, saepe eos maiores, et recusandae quis incidunt, corrupti atque - eum ab fugiat? Recusandae illum iure, voluptate accusamus minus maxime - rem? Doloremque sint repudiandae unde quos ipsa alias, repellat nulla - recusandae quisquam commodi aliquid iusto, suscipit quidem et ratione - deleniti nisi nemo deserunt! Fuga dignissimos ea aspernatur, excepturi - voluptatem rerum quas. Consectetur consequuntur reprehenderit illum quod - alias commodi aliquam temporibus adipisci, atque sequi ducimus dolor - laboriosam expedita debitis nulla maxime nesciunt praesentium. Illum - labore molestiae necessitatibus quae voluptates illo a magnam. Dolorum - eveniet pariatur, ipsam veritatis libero sed consectetur reiciendis - laudantium aut quo maxime accusamus natus unde culpa architecto - repellendus, rem, iure ducimus! Corrupti corporis recusandae commodi - earum. Laudantium, nihil harum. Sequi ab, voluptate officiis quam et - accusantium fugiat laudantium odio ad! Perspiciatis voluptatum, illum - aut aliquid, tempore animi harum laboriosam sapiente commodi doloribus - rem laborum sequi, temporibus ab dolorum repellat! -

- - + + + + +
+
+
+
+
+
+ + + + + + + +

+ Lorem ipsum, dolor sit amet consectetur adipisicing elit. Temporibus + ullam, saepe eos maiores, et recusandae quis incidunt, corrupti atque + eum ab fugiat? Recusandae illum iure, voluptate accusamus minus maxime + rem? Doloremque sint repudiandae unde quos ipsa alias, repellat nulla + recusandae quisquam commodi aliquid iusto, suscipit quidem et ratione + deleniti nisi nemo deserunt! Fuga dignissimos ea aspernatur, excepturi + voluptatem rerum quas. Consectetur consequuntur reprehenderit illum quod + alias commodi aliquam temporibus adipisci, atque sequi ducimus dolor + laboriosam expedita debitis nulla maxime nesciunt praesentium. Illum + labore molestiae necessitatibus quae voluptates illo a magnam. Dolorum + eveniet pariatur, ipsam veritatis libero sed consectetur reiciendis + laudantium aut quo maxime accusamus natus unde culpa architecto + repellendus, rem, iure ducimus! Corrupti corporis recusandae commodi + earum. Laudantium, nihil harum. Sequi ab, voluptate officiis quam et + accusantium fugiat laudantium odio ad! Perspiciatis voluptatum, illum + aut aliquid, tempore animi harum laboriosam sapiente commodi doloribus + rem laborum sequi, temporibus ab dolorum repellat! +

+ + + - \ No newline at end of file + From 1ee53b6132c84d52046c26db0122bcccf083a7a9 Mon Sep 17 00:00:00 2001 From: JEMcats Date: Sat, 13 Sep 2025 16:35:25 -0400 Subject: [PATCH 06/12] update pull request template to have extra clear instructions --- .github/PULL_REQUEST_TEMPLATE.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index e9c4877..a3b00eb 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -2,6 +2,8 @@ Thank you for contributing to our project! Please refrain from deleting any text from this template, unless specifically instructed to do so. + +Checkboxes are filled by doing: [x] --> ## Breaking Change @@ -31,6 +33,7 @@ If your PR requires multiple options, consider splitting it into multiple PRs to - This PR addresses or resolves issue: From 4fee09877eb299d0404d5223c977f32d16355bd0 Mon Sep 17 00:00:00 2001 From: JEMcats Date: Sat, 13 Sep 2025 16:39:31 -0400 Subject: [PATCH 07/12] update release workflow to add webglass to the github release --- .github/workflows/publish.yml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d6b5b03..34514f4 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -49,7 +49,23 @@ jobs: -H "Content-Type: application/json" \ -d "$(jq -n --arg tag "$tag" --arg title "$title" --arg description "$description" \ '{tag_name: $tag, target_commitish: "main", name: $title, body: $description, draft: false, prerelease: false}')" \ - https://api.github.com/repos/JEMcats-Software/WebGlass/releases + https://api.github.com/repos/JEMcats-Software/WebGlass/releases --output release.json + + upload_url=$(jq -r '.upload_url' release.json | sed "s/{?name,label}//") + echo "UPLOAD_URL=$upload_url" >> $GITHUB_ENV + + - name: Upload WebGlass.js to Release + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + UPLOAD_URL: ${{ env.UPLOAD_URL }} + TITLE: ${{ github.event.inputs.title }} + run: | + upload_url="${UPLOAD_URL}?name=WebGlass-${TITLE}.js" + curl -X POST \ + -H "Authorization: token $GITHUB_TOKEN" \ + -H "Content-Type: application/octet-stream" \ + --data-binary @WebGlass.js \ + "$upload_url" upload-to-s3: runs-on: ubuntu-latest From 8a767498df58a32e24871533f5e9ba3f704911bb Mon Sep 17 00:00:00 2001 From: JEMcats Date: Sat, 13 Sep 2025 16:42:32 -0400 Subject: [PATCH 08/12] update release workflow to set javascript files in s3 to text/javascript --- .github/workflows/publish.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 34514f4..42042d1 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -102,11 +102,11 @@ jobs: # Sync contents to S3 bucket while excluding .github folder - name: Sync to S3 run: | - aws s3 cp WebGlass.js s3://cdn.jemcats.software/WebGlass/${{ github.event.inputs.tag }}/WebGlass.js - aws s3 cp WebGlass.min.js s3://cdn.jemcats.software/WebGlass/${{ github.event.inputs.tag }}/WebGlass.min.js - aws s3 cp demo/ s3://jemcats.software/github_pages/WebGlass/ --recursive + aws s3 cp WebGlass.js s3://cdn.jemcats.software/WebGlass/${{ github.event.inputs.tag }}/WebGlass.js --content-type "text/javascript" + aws s3 cp WebGlass.min.js s3://cdn.jemcats.software/WebGlass/${{ github.event.inputs.tag }}/WebGlass.min.js --content-type "text/javascript" + aws s3 cp demo/ s3://jemcats.software/github_pages/WebGlass/ --recursive - name: Clear and Publish Latest to S3 run: | aws s3 rm s3://cdn.jemcats.software/WebGlass/latest/ --recursive - aws s3 cp s3://cdn.jemcats.software/WebGlass/${{ github.event.inputs.tag }}/ s3://cdn.jemcats.software/WebGlass/latest/ --recursive \ No newline at end of file + aws s3 cp s3://cdn.jemcats.software/WebGlass/${{ github.event.inputs.tag }}/ s3://cdn.jemcats.software/WebGlass/latest/ --recursive --content-type "text/javascript" --exclude "*" --include "*.js" \ No newline at end of file From 3d674a5535f24edcc3d5a4a25a9e703fcd95854f Mon Sep 17 00:00:00 2001 From: JEMcats Date: Sat, 13 Sep 2025 16:51:53 -0400 Subject: [PATCH 09/12] minor readme changes --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2eb0a0a..c9e80aa 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ Fork the ```dev``` branch. Make changes. -Open pull request. +Open pull request (PLEASE FILL OUT THE QUESTIONS!). ## License This project is licensed under the GPL-3.0 license. From e68741789466a9166cbca11a98291b42977f563f Mon Sep 17 00:00:00 2001 From: Erik Mattheis Date: Sat, 13 Sep 2025 15:53:18 -0400 Subject: [PATCH 10/12] bring element to front when dragged --- demo/index.html | 128 ++++++++++++++++++++++++++++-------------------- 1 file changed, 74 insertions(+), 54 deletions(-) diff --git a/demo/index.html b/demo/index.html index 4d76048..d42e847 100644 --- a/demo/index.html +++ b/demo/index.html @@ -54,61 +54,9 @@ line-height: 1.6; } - - - - -
-
-
-
-
-
- - - - - - - -

- Lorem ipsum, dolor sit amet consectetur adipisicing elit. Temporibus - ullam, saepe eos maiores, et recusandae quis incidunt, corrupti atque - eum ab fugiat? Recusandae illum iure, voluptate accusamus minus maxime - rem? Doloremque sint repudiandae unde quos ipsa alias, repellat nulla - recusandae quisquam commodi aliquid iusto, suscipit quidem et ratione - deleniti nisi nemo deserunt! Fuga dignissimos ea aspernatur, excepturi - voluptatem rerum quas. Consectetur consequuntur reprehenderit illum quod - alias commodi aliquam temporibus adipisci, atque sequi ducimus dolor - laboriosam expedita debitis nulla maxime nesciunt praesentium. Illum - labore molestiae necessitatibus quae voluptates illo a magnam. Dolorum - eveniet pariatur, ipsam veritatis libero sed consectetur reiciendis - laudantium aut quo maxime accusamus natus unde culpa architecto - repellendus, rem, iure ducimus! Corrupti corporis recusandae commodi - earum. Laudantium, nihil harum. Sequi ab, voluptate officiis quam et - accusantium fugiat laudantium odio ad! Perspiciatis voluptatum, illum - aut aliquid, tempore animi harum laboriosam sapiente commodi doloribus - rem laborum sequi, temporibus ab dolorum repellat! -

- - + + + + +
+
+
+
+
+
+ + + + + + + +

+ Lorem ipsum, dolor sit amet consectetur adipisicing elit. Temporibus + ullam, saepe eos maiores, et recusandae quis incidunt, corrupti atque + eum ab fugiat? Recusandae illum iure, voluptate accusamus minus maxime + rem? Doloremque sint repudiandae unde quos ipsa alias, repellat nulla + recusandae quisquam commodi aliquid iusto, suscipit quidem et ratione + deleniti nisi nemo deserunt! Fuga dignissimos ea aspernatur, excepturi + voluptatem rerum quas. Consectetur consequuntur reprehenderit illum quod + alias commodi aliquam temporibus adipisci, atque sequi ducimus dolor + laboriosam expedita debitis nulla maxime nesciunt praesentium. Illum + labore molestiae necessitatibus quae voluptates illo a magnam. Dolorum + eveniet pariatur, ipsam veritatis libero sed consectetur reiciendis + laudantium aut quo maxime accusamus natus unde culpa architecto + repellendus, rem, iure ducimus! Corrupti corporis recusandae commodi + earum. Laudantium, nihil harum. Sequi ab, voluptate officiis quam et + accusantium fugiat laudantium odio ad! Perspiciatis voluptatum, illum + aut aliquid, tempore animi harum laboriosam sapiente commodi doloribus + rem laborum sequi, temporibus ab dolorum repellat! +

+ + + - \ No newline at end of file + From 17999b71748d4b0d7f62619717e720865b97481c Mon Sep 17 00:00:00 2001 From: JEMcats Date: Sun, 14 Sep 2025 11:17:44 -0400 Subject: [PATCH 11/12] release notes ready for v1.0.2 --- release_descriptions/v1.0.2.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 release_descriptions/v1.0.2.md diff --git a/release_descriptions/v1.0.2.md b/release_descriptions/v1.0.2.md new file mode 100644 index 0000000..5daf738 --- /dev/null +++ b/release_descriptions/v1.0.2.md @@ -0,0 +1,11 @@ +# v1.0.2 +This release brings new functionality to demo page: +- Bring element to front on drag in demo +- Minor changes to documentation/README +- Better CodeQL handling +- Update publishing workflow + +## Contributers +- [emattheis](https://github.com/emattheis) + +**Full Changelog**: https://github.com/JEMcats-Software/WebGlass/compare/v1.0.1...v1.0.2 \ No newline at end of file From e9e189faa8431366195f2c3a11fe012946104953 Mon Sep 17 00:00:00 2001 From: JEMcats Date: Sun, 14 Sep 2025 11:19:36 -0400 Subject: [PATCH 12/12] update pull request template --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index a3b00eb..587d139 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -23,7 +23,7 @@ Classify the nature of your PR change. Please select only one option! If your PR requires multiple options, consider splitting it into multiple PRs to facilitate a more efficient and expedited code review process. --> - +- [ ] Demo Functionality (code that only affects the demo HTML page) - [ ] Bugfix (non-breaking change that resolves an issue) - [ ] New Feature (which introduces functionality to an existing function) - [ ] New Function (a new way to do something, for example make a pane of glass)