Merge branch 'staging' into Dan-web

airqo-platform · Oct 6, 2024 · bfa93b3 · bfa93b3
2 parents 027b124 + ddc0a31
commit bfa93b3
Show file tree

Hide file tree

Showing 261 changed files with 14,286 additions and 9,383 deletions.
diff --git a/k8s/netmanager/values-prod.yaml b/k8s/netmanager/values-prod.yaml
@@ -1,7 +1,7 @@
 replicaCount: 2
 image:
  repository: eu.gcr.io/airqo-250220/airqo-platform-frontend
- tag: prod-4770366b-1721841921
+ tag: prod-a24ae61f-1726211961
  pullPolicy: Always
 imagePullSecrets: []
 nameOverride: ''

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-6f4d43b3-1721841723
+ tag: stage-d7da525f-1728122207
  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-29899157-1722200211
+ tag: prod-a24ae61f-1726211961
 imagePullSecrets: []
 nameOverride: ''
 fullnameOverride: ''

diff --git a/k8s/platform/values-stage.yaml b/k8s/platform/values-stage.yaml
@@ -2,7 +2,7 @@ replicaCount: 1
 image:
  repository: eu.gcr.io/airqo-250220/airqo-stage-next-platform
  pullPolicy: Always
- tag: stage-4a9da990-1722273715
+ tag: stage-6add04b2-1726203903
 imagePullSecrets: []
 nameOverride: ''
 fullnameOverride: ''

diff --git a/k8s/reports/values-prod.yaml b/k8s/reports/values-prod.yaml
@@ -1,7 +1,7 @@
 replicaCount: 2
 image:
  repository: eu.gcr.io/airqo-250220/airqo-reports
- tag: prod-cf408352-1721511527
+ tag: prod-e4b5ed0f-1723122147
  pullPolicy: Always
 imagePullSecrets: []
 nameOverride: ''

diff --git a/k8s/reports/values-stage.yaml b/k8s/reports/values-stage.yaml
@@ -1,7 +1,7 @@
 replicaCount: 2
 image:
  repository: eu.gcr.io/airqo-250220/airqo-stage-reports
- tag: stage-b457df10-1722358730
+ tag: stage-3e13e1ec-1723122016
  pullPolicy: Always
 imagePullSecrets: []
 nameOverride: ''

diff --git a/mobile/android/fastlane/release_notes.txt b/mobile/android/fastlane/release_notes.txt
@@ -1,2 +1,3 @@
+Pidgin Translations
 Bug Fixes
 Performance enhancements
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.1.2+20057
+version: 2.1.3+20058
 
 environment:
  sdk: '>=3.0.0 <4.0.0'
@@ -31,7 +31,7 @@ dependencies:
  http: ^0.13.6
  cached_network_image: ^3.2.3
  geolocator: ^10.1.0
- flutter_local_notifications: ^16.1.0
+ flutter_local_notifications: ^17.2.2
  path_provider: ^2.0.15
  animations: ^2.0.7
  provider: ^6.0.5

diff --git a/netmanager/.env.sample b/netmanager/.env.sample
@@ -17,4 +17,5 @@ REACT_APP_MAPBOX_TOKEN=pk.ey123abc
 REACT_APP_JIRA_KEY=abcdef
 NODE_PATH=src/
 PORT=5000
-REACT_APP_GOOGLE_ANALYTICS_TOKEN=G-HJTULVGQ8W
+REACT_APP_GOOGLE_ANALYTICS_TOKEN=
+REACT_APP_MAP_PREVIEW=
diff --git a/netmanager/README.md b/netmanager/README.md
@@ -7,7 +7,7 @@ This application is used for monitoring, device registration, location registrat
 `npm` Is our package manager of choice here.. Check out setup instructions [here](https://nodejs.org/dist/) if you don't have it installed already. <br/><br/>
 **Note: This project is currently using node version 14.**
 
-To run the app, enter the project directory, <br/>
+To run the app, enter the project directory accordingly, <br/>
 
 **a) Add the `.env` file**
 

diff --git a/netmanager/src/AppRoutes.js b/netmanager/src/AppRoutes.js
@@ -56,9 +56,8 @@ const TeamsView = lazy(() => import('./views/pages/Teams/TeamsView'));
 const SimRegistry = lazy(() => import('./views/components/SIM/SimRegistry'));
 const UserStats = lazy(() => import('./views/pages/UserStats/UserStats'));
 const ClientActivation = lazy(() => import('./views/pages/clients'));
-const FaultDetection = lazy(() =>
- import('./views/components/DataDisplay/DeviceManagement/ManagementFaults')
-);
+const DeployDevice = lazy(() => import('./views/pages/DeployDevice'));
+
 
 const AppRoutes = ({ auth, logoutUser }) => {
  useJiraHelpDesk();
@@ -182,6 +181,12 @@ const AppRoutes = ({ auth, logoutUser }) => {
  component={ExportDownloads}
  layout={MainLayout}
  />
+ <PrivateRoute
+ exact
+ path="/deploy-device"
+ component={DeployDevice}
+ layout={MainLayout}
+ />
  <PrivateRoute exact path="/registry" component={Devices} layout={MainLayout} />
  <PrivateRoute exact path="/logs" component={Logs} layout={MainLayout} />
  <PrivateRoute exact path="/cohorts" component={CohortsRegistry} layout={MainLayout} />

diff --git a/netmanager/src/assets/scss/index.scss b/netmanager/src/assets/scss/index.scss
@@ -2,6 +2,7 @@
  box-sizing: border-box;
  margin: 0;
  padding: 0;
+ -webkit-overflow-scrolling: touch;
 }
 
 html {
@@ -27,7 +28,7 @@ a {
  margin: 10px auto;
  max-width: 300px;
  padding: 20px 12px 10px 20px;
- font: 13px "Lucida Sans Unicode", "Lucida Grande", sans-serif;
+ font: 13px 'Lucida Sans Unicode', 'Lucida Grande', sans-serif;
 }
 .form-style-graph li {
  padding: 0;
@@ -41,10 +42,10 @@ a {
  display: block;
  font-weight: bold;
 }
-.form-style-graph input[type="date"],
-.form-style-graph input[type="search"],
-.form-style-graph input[type="time"],
-.form-style-graph input[type="input"],
+.form-style-graph input[type='date'],
+.form-style-graph input[type='search'],
+.form-style-graph input[type='time'],
+.form-style-graph input[type='input'],
 select {
  box-sizing: border-box;
  -webkit-box-sizing: border-box;
@@ -53,9 +54,9 @@ select {
  padding: 7px;
  margin: 0px;
 }
-.form-style-graph input[type="date"]:focus,
-.form-style-graph input[type="search"]:focus,
-.form-style-graph input[type="time"]:focus,
+.form-style-graph input[type='date']:focus,
+.form-style-graph input[type='search']:focus,
+.form-style-graph input[type='time']:focus,
 .form-style-graph select:focus {
  -moz-box-shadow: 0 0 8px #88d5e9;
  -webkit-box-shadow: 0 0 8px #88d5e9;
@@ -74,15 +75,15 @@ select {
  border: none;
  color: #fff;
 }
-.form-style-graph input[type="submit"],
-.form-style-graph input[type="button"] {
+.form-style-graph input[type='submit'],
+.form-style-graph input[type='button'] {
  background: #4b99ad;
  padding: 8px 15px 8px 15px;
  border: none;
  color: #fff;
 }
-.form-style-graph input[type="submit"]:hover,
-.form-style-graph input[type="button"]:hover {
+.form-style-graph input[type='submit']:hover,
+.form-style-graph input[type='button']:hover {
  background: #4691a4;
  box-shadow: none;
  -moz-box-shadow: none;
@@ -174,7 +175,7 @@ select {
  // min-width: 12%;
  box-shadow: 0 5px 20px rgba(0, 0, 0, 0.15);
  padding: 5px 10px;
- font-family: "Open Sans", sans-serif;
+ font-family: 'Open Sans', sans-serif;
  font-weight: 300;
  color: #000;
  border-radius: 5px;
@@ -201,7 +202,7 @@ select {
 }
 
 .filter__p {
- font-family: "Open Sans", sans-serif;
+ font-family: 'Open Sans', sans-serif;
  font-size: 12px;
 }
 

diff --git a/netmanager/src/config/urls/deviceRegistry.js b/netmanager/src/config/urls/deviceRegistry.js
@@ -6,6 +6,8 @@ const BASE_DEVICE_REGISTRY_URL_V2 = "https://staging-platform.airqo.net/api/v2";
 
 export const ACTIVITY_URI = `${BASE_DEVICE_REGISTRY_URL_V2}/devices/activities`;
 
+export const BATCH_DEPLOY_DEVICE_URI = `${BASE_DEVICE_REGISTRY_URL_V2}/devices/activities/deploy/batch`;
+
 export const REGISTER_DEVICE_URI = `${BASE_DEVICE_REGISTRY_URL_V2}/devices`;
 
 export const ALL_DEVICES_URI = `${BASE_DEVICE_REGISTRY_URL_V2}/devices`;

diff --git a/netmanager/src/index.css b/netmanager/src/index.css
@@ -3,6 +3,7 @@
  box-sizing: border-box;
  margin: 0;
  padding: 0;
+ -webkit-overflow-scrolling: touch;
 }
 
 /* html {
@@ -19,6 +20,7 @@ body {
  'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
  -webkit-font-smoothing: antialiased;
  -moz-osx-font-smoothing: grayscale;
+ -webkit-overflow-scrolling: touch;
 }
 
 a {

diff --git a/netmanager/src/views/apis/deviceRegistry.js b/netmanager/src/views/apis/deviceRegistry.js
@@ -20,7 +20,8 @@ import {
  UPDATE_DEVICE_HOST,
  SEND_DEVICE_HOST_MONEY,
  GET_TRANSACTION_HISTORY,
- GET_MAP_READING_URI
+ GET_MAP_READING_URI,
+ BATCH_DEPLOY_DEVICE_URI
 } from 'config/urls/deviceRegistry';
 import { DEVICE_MAINTENANCE_LOG_URI } from 'config/urls/deviceMonitoring';
 import { DEVICE_RECENT_FEEDS } from 'config/urls/dataManagement';
@@ -363,3 +364,9 @@ export const getTransactionDetails = async (id) => {
  .then((response) => response.data)
  .catch((error) => error.response.data);
 };
+
+export const batchDeployDevicesApi = async (deployData) => {
+ return createAxiosInstance()
+ .post(BATCH_DEPLOY_DEVICE_URI, deployData)
+ .then((response) => response.data);
+};