From 734b17d81ed95a4f62901269ea66cf4cead21d94 Mon Sep 17 00:00:00 2001 From: Benjamin Ssempala <86492979+BenjaminSsempala@users.noreply.github.com> Date: Thu, 30 Nov 2023 11:43:44 +0300 Subject: [PATCH 1/8] Update Android Versions --- mobile/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml index 26333be97c..6826842370 100644 --- a/mobile/pubspec.yaml +++ b/mobile/pubspec.yaml @@ -14,7 +14,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # android test -version: 2.0.26+20053 +version: 2.0.29+20054 environment: sdk: '>=3.0.0 <4.0.0' From 524139b4c46f7a41cf6990f18692ccd3f60de29c Mon Sep 17 00:00:00 2001 From: Samantha Date: Thu, 30 Nov 2023 12:41:09 +0300 Subject: [PATCH 2/8] updated Wandalen/wretry.action to v1.2.0 --- .github/workflows/deploy-frontends-to-staging.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/deploy-frontends-to-staging.yml b/.github/workflows/deploy-frontends-to-staging.yml index 4437ee2b20..632b418506 100644 --- a/.github/workflows/deploy-frontends-to-staging.yml +++ b/.github/workflows/deploy-frontends-to-staging.yml @@ -150,7 +150,7 @@ jobs: docker push ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/airqo-stage-platform-frontend:latest - name: Update corresponding helm values file(with retry) - uses: Wandalen/wretry.action@v1.0.36 # Retries action on fail + uses: Wandalen/wretry.action@v1.2.0 # Retries action on fail with: action: fjogeleit/yaml-update-action@main # Action to retry with: | @@ -301,7 +301,7 @@ jobs: docker push ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/airqo-stage-calibrate-app:latest - name: Update corresponding helm values file(with retry) - uses: Wandalen/wretry.action@v1.0.36 # Retries action on fail + uses: Wandalen/wretry.action@v1.2.0 # Retries action on fail with: action: fjogeleit/yaml-update-action@main # Action to retry with: | @@ -360,7 +360,7 @@ jobs: docker push ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/airqo-stage-next-platform:latest - name: Update corresponding helm values file(with retry) - uses: Wandalen/wretry.action@v1.0.36 # Retries action on fail + uses: Wandalen/wretry.action@v1.2.0 # Retries action on fail with: action: fjogeleit/yaml-update-action@main # Action to retry with: | @@ -408,7 +408,7 @@ jobs: docker push ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/airqo-stage-docs:${{ needs.image-tag.outputs.build_id }} - name: Update corresponding helm values file(with retry) - uses: Wandalen/wretry.action@v1.0.36 # Retries action on fail + uses: Wandalen/wretry.action@v1.2.0 # Retries action on fail with: action: fjogeleit/yaml-update-action@main # Action to retry with: | @@ -456,7 +456,7 @@ jobs: docker push ${{ env.REGISTRY_URL }}/${{ env.PROJECT_ID }}/airqo-stage-inventory:latest - name: Update corresponding helm values file(with retry) - uses: Wandalen/wretry.action@v1.0.36 # Retries action on fail + uses: Wandalen/wretry.action@v1.2.0 # Retries action on fail with: action: fjogeleit/yaml-update-action@main # Action to retry with: | From 31f9a3c0d003896cb973eeb2b72aacf97e5dd7e2 Mon Sep 17 00:00:00 2001 From: Samantha Date: Thu, 30 Nov 2023 12:43:53 +0300 Subject: [PATCH 3/8] netmanager trigger --- netmanager/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netmanager/README.md b/netmanager/README.md index 0481be602d..7034773543 100644 --- a/netmanager/README.md +++ b/netmanager/README.md @@ -1,4 +1,4 @@ -# Netmanager application +# Netmanager application. This application is used for monitoring, device registration, location registration. Can be accessed here: https://staging-platform.airqo.net/ and https://platform.airqo.net/ From 0dc4725a512fd594795604d8bee1f8838a9b1a49 Mon Sep 17 00:00:00 2001 From: Ochieng Paul Date: Thu, 30 Nov 2023 13:35:18 +0300 Subject: [PATCH 4/8] centered images on events details page --- website/frontend/styles/Events.scss | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/website/frontend/styles/Events.scss b/website/frontend/styles/Events.scss index b5701fbf9a..0587b5647d 100644 --- a/website/frontend/styles/Events.scss +++ b/website/frontend/styles/Events.scss @@ -285,7 +285,17 @@ margin: 0; color: $aq-black-1; text-align: justify; + img { + width: 100%; + height: auto; + object-fit: contain; + max-height: 400px; + max-width: 95%; + justify-self: center; + padding: 6px 0; + } } + a { color: $aq-blue-0; text-decoration: underline; From 72af9f4142480bcd9da727eb25b0e31ad1d2b2f4 Mon Sep 17 00:00:00 2001 From: Ochieng Paul Date: Thu, 30 Nov 2023 13:42:07 +0300 Subject: [PATCH 5/8] text change --- website/frontend/src/pages/CleanAir/EventDetails.js | 12 ++++++++---- website/frontend/src/pages/Events/Details.js | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/website/frontend/src/pages/CleanAir/EventDetails.js b/website/frontend/src/pages/CleanAir/EventDetails.js index d76b467261..34a1d06ad0 100644 --- a/website/frontend/src/pages/CleanAir/EventDetails.js +++ b/website/frontend/src/pages/CleanAir/EventDetails.js @@ -91,9 +91,13 @@ const EventDetails = () => {
- { - event.location_link !== null ? {event.location_name} : {event.location_name} - } + {event.location_link !== null ? ( + + {event.location_name} + + ) : ( + {event.location_name} + )}
) : ( @@ -130,7 +134,7 @@ const EventDetails = () => {
{event.program.length > 0 ? (
-

Schedule

+

Event Schedule

{event.program.map((program) => (
diff --git a/website/frontend/src/pages/Events/Details.js b/website/frontend/src/pages/Events/Details.js index 9641db1e36..36a6e11c52 100644 --- a/website/frontend/src/pages/Events/Details.js +++ b/website/frontend/src/pages/Events/Details.js @@ -131,7 +131,7 @@ const EventDetails = () => {
{event.program.length > 0 ? (
-

Event Program

+

Event Schedule

{event.program.map((program) => (
From c67cd7570b52fd0f0a46d6b578e30c7cf32d734f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 30 Nov 2023 14:18:07 +0300 Subject: [PATCH 6/8] Update netmanger staging image tag to stage-18a3168f-1701342472 --- k8s/netmanager/values-stage.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/netmanager/values-stage.yaml b/k8s/netmanager/values-stage.yaml index 588b6af06f..f7cbbf359e 100644 --- a/k8s/netmanager/values-stage.yaml +++ b/k8s/netmanager/values-stage.yaml @@ -1,7 +1,7 @@ replicaCount: 2 image: repository: eu.gcr.io/airqo-250220/airqo-stage-platform-frontend - tag: stage-8c929a00-1700487642 + tag: stage-18a3168f-1701342472 pullPolicy: Always imagePullSecrets: [] nameOverride: '' From d01eb9beb675f7e3d07b29aa6d3dea18582c6e3a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 30 Nov 2023 14:26:21 +0300 Subject: [PATCH 7/8] Update netmanger staging image tag to stage-c13151d2-1701342957 --- k8s/netmanager/values-stage.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/netmanager/values-stage.yaml b/k8s/netmanager/values-stage.yaml index f7cbbf359e..1e5994ba88 100644 --- a/k8s/netmanager/values-stage.yaml +++ b/k8s/netmanager/values-stage.yaml @@ -1,7 +1,7 @@ replicaCount: 2 image: repository: eu.gcr.io/airqo-250220/airqo-stage-platform-frontend - tag: stage-18a3168f-1701342472 + tag: stage-c13151d2-1701342957 pullPolicy: Always imagePullSecrets: [] nameOverride: '' From b2bef296988fd4807012993fc235778c49ad3d4c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 30 Nov 2023 20:52:39 +0300 Subject: [PATCH 8/8] Update analytics platform production image tag to prod-baca8404-1701366605 --- k8s/platform/values-prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/k8s/platform/values-prod.yaml b/k8s/platform/values-prod.yaml index 417f0a0667..25829136b4 100644 --- a/k8s/platform/values-prod.yaml +++ b/k8s/platform/values-prod.yaml @@ -2,7 +2,7 @@ replicaCount: 1 image: repository: eu.gcr.io/airqo-250220/airqo-next-platform pullPolicy: Always - tag: prod-cbcc2fb4-1700998461 + tag: prod-baca8404-1701366605 imagePullSecrets: [] nameOverride: '' fullnameOverride: ''