Merge remote-tracking branch 'upstream/staging' into Net-map-visuals

airqo-platform · Dec 1, 2023 · db4ec66 · db4ec66
2 parents fa34624 + b2bef29
commit db4ec66
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 14 deletions.
diff --git 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: |

diff --git 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-c13151d2-1701342957
   pullPolicy: Always
 imagePullSecrets: []
 nameOverride: ''

diff --git 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: ''

diff --git 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'

diff --git 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/
 

diff --git a/website/frontend/src/pages/CleanAir/EventDetails.js b/website/frontend/src/pages/CleanAir/EventDetails.js
@@ -91,9 +91,13 @@ const EventDetails = () => {
                         <div className="item">
                           <PlaceOutlined />
                           <span>
-                            {
-                              event.location_link !== null ? <a href={event.location_link} target='_blank'><span>{event.location_name}</span></a> : <span>{event.location_name}</span>
-                            }
+                            {event.location_link !== null ? (
+                              <a href={event.location_link} target="_blank">
+                                <span>{event.location_name}</span>
+                              </a>
+                            ) : (
+                              <span>{event.location_name}</span>
+                            )}
                           </span>
                         </div>
                       ) : (
@@ -130,7 +134,7 @@ const EventDetails = () => {
                     <div dangerouslySetInnerHTML={{ __html: event.html }} className="html"></div>
                     {event.program.length > 0 ? (
                       <div className="program">
-                        <h3>Schedule</h3>
+                        <h3>Event Schedule</h3>
                         {event.program.map((program) => (
                           <div key={program.id}>
                             <details>

diff --git a/website/frontend/src/pages/Events/Details.js b/website/frontend/src/pages/Events/Details.js
@@ -131,7 +131,7 @@ const EventDetails = () => {
                     <div dangerouslySetInnerHTML={{ __html: event.html }} className="html"></div>
                     {event.program.length > 0 ? (
                       <div className="program">
-                        <h3>Event Program</h3>
+                        <h3>Event Schedule</h3>
                         {event.program.map((program) => (
                           <div key={program.id}>
                             <details>

diff --git 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;