Merge branch 'KelvinTegelaar:main' into main

jchurchh · Sep 1, 2023 · 3ef9526 · 3ef9526
2 parents 0eccd24 + 106823e
commit 3ef9526
Show file tree

Hide file tree

Showing 65 changed files with 28,688 additions and 15,348 deletions.
diff --git a/.env b/.env
@@ -2,4 +2,4 @@ PORT=3000
 CHOKIDAR_USEPOLLING=true
 BROWSER=none
 GENERATE_SOURCEMAP=false
-WDS_SOCKET_PORT=0
+WDS_SOCKET_PORT=3000
diff --git a/.github/pull.yml b/.github/pull.yml
@@ -0,0 +1,11 @@
+version: "1"
+rules:
+  - base: main
+    upstream: KelvinTegelaar:main
+    mergeMethod: merge
+  - base: dev
+    upstream: KelvinTegelaar:dev
+    mergeMethod: none
+  - base: website
+    upstream: KelvinTegelaar:website
+    mergeMethod: merge
diff --git a/.vscode/cert.crt b/.vscode/cert.crt
diff --git a/.vscode/key.key b/.vscode/key.key
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -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"]
     }
   ]
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -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,

diff --git a/deployment/AzureDeploymentTemplate.json b/deployment/AzureDeploymentTemplate.json
@@ -36,7 +36,6 @@
     "funcAppName": "[toLower(concat(parameters('baseName'), variables('suffix')))]",
     "funcStorageName": "[tolower(concat(substring(parameters('baseName'), 0, min(length(parameters('baseName')),16)), 'stg', variables('suffix')))]",
     "serverFarmName": "[concat(substring(parameters('baseName'), 0, min(length(parameters('baseName')),14)), '-srv-', variables('suffix'))]",
-    "repoURL": "https://github.com/KelvinTegelaar/AzValidate.git",
     "uniqueResourceNameBase": "[toLower(concat(parameters('baseName'), variables('suffix')))]",
     "swaName": "[toLower(concat(parameters('baseName'), '-swa-', variables('suffix')))]"
   },

diff --git a/deployment/AzureDeploymentTemplate_regionoptions.json b/deployment/AzureDeploymentTemplate_regionoptions.json
@@ -36,7 +36,6 @@
     "funcAppName": "[toLower(concat(parameters('baseName'), variables('suffix')))]",
     "funcStorageName": "[tolower(concat(substring(parameters('baseName'), 0, min(length(parameters('baseName')),16)), 'stg', variables('suffix')))]",
     "serverFarmName": "[concat(substring(parameters('baseName'), 0, min(length(parameters('baseName')),14)), '-srv-', variables('suffix'))]",
-    "repoURL": "https://github.com/KelvinTegelaar/AzValidate.git",
     "uniqueResourceNameBase": "[toLower(concat(parameters('baseName'), variables('suffix')))]",
     "swaName": "[toLower(concat(parameters('baseName'), '-swa-', variables('suffix')))]"
   },

diff --git a/deployment/DevAzureDeploymentTemplate.json b/deployment/DevAzureDeploymentTemplate.json
@@ -64,7 +64,6 @@
     "funcAppName": "[toLower(concat(parameters('baseName'), variables('suffix')))]",
     "funcStorageName": "[tolower(concat(substring(parameters('baseName'), 0, min(length(parameters('baseName')),16)), 'stg', variables('suffix')))]",
     "serverFarmName": "[concat(substring(parameters('baseName'), 0, min(length(parameters('baseName')),14)), '-srv-', variables('suffix'))]",
-    "repoURL": "https://github.com/KelvinTegelaar/AzValidate.git",
     "uniqueResourceNameBase": "[toLower(concat(parameters('baseName'), variables('suffix')))]",
     "swaName": "[toLower(concat(parameters('baseName'), '-swa-', variables('suffix')))]"
   },

diff --git a/deployment/DevAzureDeploymentTemplate_regionoptions.json b/deployment/DevAzureDeploymentTemplate_regionoptions.json
@@ -64,7 +64,6 @@
     "funcAppName": "[toLower(concat(parameters('baseName'), variables('suffix')))]",
     "funcStorageName": "[tolower(concat(substring(parameters('baseName'), 0, min(length(parameters('baseName')),16)), 'stg', variables('suffix')))]",
     "serverFarmName": "[concat(substring(parameters('baseName'), 0, min(length(parameters('baseName')),14)), '-srv-', variables('suffix'))]",
-    "repoURL": "https://github.com/KelvinTegelaar/AzValidate.git",
     "uniqueResourceNameBase": "[toLower(concat(parameters('baseName'), variables('suffix')))]",
     "swaName": "[toLower(concat(parameters('baseName'), '-swa-', variables('suffix')))]"
   },