Merge pull request #1692 from KelvinTegelaar/dev

Dev to release

Author: KelvinTegelaar

.env

@@ -2,4 +2,4 @@ PORT=3000
 CHOKIDAR_USEPOLLING=true
 BROWSER=none
 GENERATE_SOURCEMAP=false
-WDS_SOCKET_PORT=0
+WDS_SOCKET_PORT=3000

.vscode/cert.crt

@@ -9,39 +9,30 @@
       "cwd": "${file}"
     },
     {
-      "command": "npm run start-api",
-      "name": "Run emulator",
+      "command": "npm run start-swa",
+      "name": "Run Emulator",
       "request": "launch",
       "type": "node-terminal"
     },
     {
       "command": "npm start",
-      "name": "Run frontend",
+      "name": "Run Frontend",
       "request": "launch",
       "type": "node-terminal",
-      "preLaunchTask": "RunAllTasks",
+      "preLaunchTask": "Run All Tasks",
       "resolveSourceMapLocations": ["${workspaceFolder}/**", "!**/node_modules/**"]
     },
     {
-      "name": "Launch Edge",
+      "type": "chrome",
       "request": "launch",
-      "type": "pwa-msedge",
-      "url": "https://localhost:4280",
-      "webRoot": "${workspaceFolder}"
-    },
-    {
-      "name": "Attach to Edge",
-      "port": 9222,
-      "request": "attach",
-      "type": "pwa-msedge",
-      "urlFilter": "https://localhost:4280/*",
-      "webRoot": "${workspaceFolder}"
+      "name": "Launch Chrome Debugger",
+      "url": "http://localhost:4280"
     }
   ],
   "compounds": [
     {
       "name": "Launch it all 🚀",
-      "configurations": ["Run frontend", "Run emulator"]
+      "configurations": ["Run Frontend", "Run Emulator"]
     }
   ]
 }

.vscode/key.key

@@ -2,13 +2,13 @@
   "version": "2.0.0",
   "tasks": [
     {
-      "label": "RunAllTasks",
-      "dependsOn": ["RunAPI", "RunAzurite"]
+      "label": "Run All Tasks",
+      "dependsOn": ["Run API", "Run Azurite"]
     },
     {
-      "label": "RunAzurite",
+      "label": "Run Azurite",
       "type": "shell",
-      "command": "azurite",
+      "command": "azurite --location ../",
       "isBackground": true,
       "problemMatcher": {
         "pattern": [
@@ -27,7 +27,7 @@
       }
     },
     {
-      "label": "RunAPI",
+      "label": "Run API",
       "type": "shell",
       "command": "func start --verbose",
       "isBackground": true,

.vscode/launch.json

@@ -21,7 +21,7 @@
     "test": "react-scripts test",
     "test:cov": "npm test -- --coverage --watchAll=false",
     "test:debug": "react-scripts --inspect-brk test --runInBand",
-    "start-api": "swa start --ssl --ssl-cert ./.vscode/cert.crt --ssl-key ./.vscode/key.key --swa-config-location .vscode http://localhost:3000 --api-location http://localhost:7071",
+    "start-swa": "swa start --swa-config-location .vscode http://127.0.0.1:3000 --api-location http://localhost:7071",
     "prepare": "husky install"
   },
   "config": {
@@ -92,13 +92,13 @@
     "prettier": "2.4.1",
     "react-scripts": "^5.0.0",
     "redux-immutable-state-invariant": "^2.1.0",
-    "sass": "^1.44",
+    "sass": "^1.64.2",
     "stylelint": "^14.3.0",
     "stylelint-config-sass-guidelines": "^9.0.1",
     "stylelint-order": "^5.0.0"
   },
   "engines": {
-    "node": "16",
+    "node": "18",
     "npm": ">=7"
   }
 }

.vscode/tasks.json

@@ -1 +1 @@
-3.8.0
+4.0.0

package-lock.json

@@ -129,7 +129,7 @@ const _nav = [
       },
       {
         component: CNavItem,
-        name: 'Scheduled Alerts',
+        name: 'Alerts Configuration',
         to: '/tenant/administration/alertsqueue',
       },
       {
@@ -156,6 +156,11 @@ const _nav = [
         name: 'Application Approval',
         to: '/tenant/administration/appapproval',
       },
+      {
+        component: CNavItem,
+        name: 'Geo IP Lookup',
+        to: '/tenant/tools/geoiplookup',
+      },
       {
         component: CNavItem,
         name: 'Tenant Lookup',