From 2dad5fc07a06e20807634d6cc6130f80ffd7446e Mon Sep 17 00:00:00 2001 From: xyzroe Date: Wed, 8 May 2024 12:12:38 +0300 Subject: [PATCH] 20240508 Web UI: - Adjust mobile view of CC2652 role selection card - Move mode selection card to page bottom Build and deploy: - Make manifests for tags not versions - Add release info in TG message --- .github/workflows/build_fw.yml | 47 +++++---- src/websrc/css/custom.css | 19 ++++ src/websrc/html/PAGE_ZIGBEE.html | 174 +++++++++++++++---------------- 3 files changed, 131 insertions(+), 109 deletions(-) diff --git a/.github/workflows/build_fw.yml b/.github/workflows/build_fw.yml index 5d13f6a..a77d4a9 100644 --- a/.github/workflows/build_fw.yml +++ b/.github/workflows/build_fw.yml @@ -66,6 +66,9 @@ jobs: echo "releaseMessage<> $GITHUB_ENV printf "%s\n" "$fullCommitMessage" >> $GITHUB_ENV echo "EOF" >> $GITHUB_ENV + echo "commitMessage<> $GITHUB_ENV + printf "%s\n" "$commitMessage" >> $GITHUB_ENV + echo "EOF" >> $GITHUB_ENV env: GITHUB_REF: ${{ github.ref }} @@ -74,14 +77,14 @@ jobs: cat << EOF > manifest.json { "name": "XZG Firmware", - "version": "${{ steps.get_version.outputs.version }}", + "version": "${{ steps.get_tag.outputs.tag }}", "builds": [ { "chipFamily": "ESP32", "improv": false, "parts": [ { - "path": "https://raw.githubusercontent.com/${{ github.repository }}/releases/${{ steps.get_version.outputs.version }}/XZG_${{ steps.get_version.outputs.version }}.full.bin", + "path": "https://raw.githubusercontent.com/${{ github.repository }}/releases/${{ steps.get_tag.outputs.tag }}/XZG_${{ steps.get_version.outputs.version }}.full.bin", "offset": 0 } ] @@ -101,18 +104,6 @@ jobs: bin/XZG_${{ steps.get_version.outputs.version }}.ota.bin bin/XZG_${{ steps.get_version.outputs.version }}.full.bin - - name: Send Telegram Notification about release - run: | - curl -s -X POST "https://api.telegram.org/bot${{ secrets.TELEGRAM_BOT_TOKEN }}/sendMessage" \ - -d chat_id="${{ secrets.TELEGRAM_CHAT_ID }}" \ - -d parse_mode="MarkdownV2" \ - -d message_thread_id=14 \ - -d text="[${{ steps.get_tag.outputs.tag }}](https://github.com/${{ github.repository }}/releases/tag/${{ steps.get_tag.outputs.tag }})" \ - -d link_preview_options='{ - "show_above_text": true, - "prefer_large_media": false - }' - - name: Checkout releases branch uses: actions/checkout@v3 with: @@ -121,9 +112,9 @@ jobs: - name: Copy files to releases directory run: | - mkdir -p releases/${{ steps.get_version.outputs.version }} - cp ./bin/XZG_${{ steps.get_version.outputs.version }}.full.bin releases/${{ steps.get_version.outputs.version }}/ - cp manifest.json releases/${{ steps.get_version.outputs.version }}/ + mkdir -p releases/${{ steps.get_tag.outputs.tag }} + cp ./bin/XZG_${{ steps.get_version.outputs.version }}.full.bin releases/${{ steps.get_tag.outputs.tag }}/ + cp manifest.json releases/${{ steps.get_tag.outputs.tag }}/ echo "Files copied to releases directory." - name: Commit and push files to releases branch @@ -132,5 +123,23 @@ jobs: git config --local user.email "action@github.com" git config --local user.name "GitHub Action" git add . - git commit -m "Add firmware and manifest for version ${{ steps.get_version.outputs.version }}" - git push origin releases \ No newline at end of file + git commit -m "Add firmware and manifest for version ${{ steps.get_tag.outputs.tag }}" + git push origin releases + + - name: Send Telegram Notification about release + run: | + escaped_tag=$(echo "${{ steps.get_tag.outputs.tag }}" | sed -E 's/([._*[\]()~`>#+-=|{}.!])/\\\1/g') + + escaped_commit_message=$(echo "${{ env.commitMessage }}" | sed -E 's/([._*[\]()~`>#+-=|{}.!])/\\\1/g') + + message_text="[${escaped_tag}](https://github.com/${{ github.repository }}/releases/tag/${escaped_tag})\n\n${escaped_commit_message}" + + curl -s -X POST "https://api.telegram.org/bot${{ secrets.TELEGRAM_BOT_TOKEN }}/sendMessage" \ + -d chat_id="${{ secrets.TELEGRAM_CHAT_ID }}" \ + -d parse_mode="MarkdownV2" \ + -d message_thread_id=14 \ + -d text="[${{ steps.get_tag.outputs.tag }}](https://github.com/${{ github.repository }}/releases/tag/${escaped_tag})" \ + -d link_preview_options='{ + "show_above_text": true, + "prefer_large_media": true + }' \ No newline at end of file diff --git a/src/websrc/css/custom.css b/src/websrc/css/custom.css index 368e468..c46578a 100644 --- a/src/websrc/css/custom.css +++ b/src/websrc/css/custom.css @@ -571,6 +571,8 @@ body { --coordinator-color: 255, 0, 0; --default-opacity: 0.25; --selected-opacity: 1.0; + margin: 0 auto !important; + max-width: 700px !important; } .selectable-card { @@ -602,6 +604,23 @@ body { font-weight: bolder; } +@media (max-width: 768px) { + .card-label { + font-size: 1em; + } + + .large-icon { + width: 2em; + height: 2em; + } +} + +@media (max-width: 576px) { + .card-label { + font-size: 0.7em; + } +} + .selectable-card.selected, .selectable-card:hover { border: 3px solid var(--text-color) !important; } diff --git a/src/websrc/html/PAGE_ZIGBEE.html b/src/websrc/html/PAGE_ZIGBEE.html index 5b10f66..b6b1d03 100644 --- a/src/websrc/html/PAGE_ZIGBEE.html +++ b/src/websrc/html/PAGE_ZIGBEE.html @@ -1,4 +1,85 @@
+
+
+
+ + + +
+
+
+
+
+ + + + + +
+
+
+
+
+
+
+
+
+
+ + + +
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ +
+
+
+
+
@@ -12,7 +93,7 @@
-
+
@@ -22,8 +103,7 @@
-
-
+
@@ -33,8 +113,7 @@
-
-
+
@@ -110,90 +189,5 @@ console.error(error); }); } - - - -
-
-
- - - -
-
-
-
-
- - - - - -
-
-
-
-
-
-
-
-
-
- - - -
-
-
-
-
- - -
-
-
-
- - -
-
-
-
- -
-
-
-
-
-
\ No newline at end of file