diff --git a/package-lock.json b/package-lock.json
index a0d77ef..1171b17 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,6 +8,7 @@
       "name": "assistantapps.webtool",
       "version": "0.4.10",
       "dependencies": {
+        "@assistantapps/assistantapps.api.client": "^0.0.24",
         "@leecheuk/react-google-login": "^5.4.1",
         "@pathofdev/react-tag-input": "^1.0.7",
         "axios": "^1.1.3",
@@ -28,7 +29,7 @@
         "redux": "^4.2.0",
         "semantic-ui-css": "^2.5.0",
         "semantic-ui-react": "^2.1.3",
-        "sweetalert2": "^11.7.1",
+        "sweetalert2": "^11.6.0",
         "wouter": "^2.8.0-alpha.2"
       },
       "devDependencies": {
@@ -56,6 +57,18 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/@assistantapps/assistantapps.api.client": {
+      "version": "0.0.24",
+      "resolved": "https://registry.npmjs.org/@assistantapps/assistantapps.api.client/-/assistantapps.api.client-0.0.24.tgz",
+      "integrity": "sha512-AHrNOhWYXfWv9BpprIfcX1pEp3atj7Yamu+LIGWk50+McrIkRsCbFs6RfzT6FRfit6EJ/NdA87EQ28zTVZ5hyA==",
+      "dependencies": {
+        "@microsoft/signalr": "^7.0.5",
+        "dayjs": "^1.11.7"
+      },
+      "engines": {
+        "node": ">=18.0"
+      }
+    },
     "node_modules/@babel/code-frame": {
       "version": "7.18.6",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
@@ -3020,6 +3033,18 @@
       "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
       "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="
     },
+    "node_modules/@microsoft/signalr": {
+      "version": "7.0.14",
+      "resolved": "https://registry.npmjs.org/@microsoft/signalr/-/signalr-7.0.14.tgz",
+      "integrity": "sha512-dnS7gSJF5LxByZwJaj82+F1K755ya7ttPT+JnSeCBef3sL8p8FBkHePXphK8NSuOquIb7vsphXWa28A+L2SPpw==",
+      "dependencies": {
+        "abort-controller": "^3.0.0",
+        "eventsource": "^2.0.2",
+        "fetch-cookie": "^2.0.3",
+        "node-fetch": "^2.6.7",
+        "ws": "^7.4.5"
+      }
+    },
     "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
       "version": "5.1.1-v1",
       "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
@@ -3561,40 +3586,31 @@
         "@types/node": "*"
       }
     },
-    "node_modules/@types/d3-array": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.0.4.tgz",
-      "integrity": "sha512-nwvEkG9vYOc0Ic7G7kwgviY4AQlTfYGIZ0fqB7CQHXGyYM6nO7kJh5EguSNA3jfh4rq7Sb7eMVq8isuvg2/miQ=="
-    },
     "node_modules/@types/d3-color": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.0.tgz",
-      "integrity": "sha512-HKuicPHJuvPgCD+np6Se9MQvS6OCbJmOjGvylzMJRlDwUXjKTTXs6Pwgk79O09Vj/ho3u1ofXnhFOaEWWPrlwA=="
-    },
-    "node_modules/@types/d3-ease": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.0.tgz",
-      "integrity": "sha512-aMo4eaAOijJjA6uU+GIeW018dvy9+oH5Y2VPPzjjfxevvGQ/oRDs+tfYC9b50Q4BygRR8yE2QCLsrT0WtAVseA=="
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-2.0.3.tgz",
+      "integrity": "sha512-+0EtEjBfKEDtH9Rk3u3kLOUXM5F+iZK+WvASPb0MhIZl8J8NUvGeZRwKCXl+P3HkYx5TdU4YtcibpqHkSR9n7w=="
     },
     "node_modules/@types/d3-interpolate": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
-      "integrity": "sha512-jx5leotSeac3jr0RePOH1KdR9rISG91QIE4Q2PYTu4OymLTZfA3SrnURSLzKH48HmXVUru50b8nje4E79oQSQw==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-2.0.2.tgz",
+      "integrity": "sha512-lElyqlUfIPyWG/cD475vl6msPL4aMU7eJvx1//Q177L8mdXoVPFl1djIESF2FKnc0NyaHvQlJpWwKJYwAhUoCw==",
       "dependencies": {
-        "@types/d3-color": "*"
+        "@types/d3-color": "^2"
       }
     },
     "node_modules/@types/d3-path": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-1.0.9.tgz",
-      "integrity": "sha512-NaIeSIBiFgSC6IGUBjZWcscUJEq7vpVu7KthHN8eieTV9d9MqkSOZLH4chq1PmcKy06PNe3axLeKmRIyxJ+PZQ=="
+      "integrity": "sha512-NaIeSIBiFgSC6IGUBjZWcscUJEq7vpVu7KthHN8eieTV9d9MqkSOZLH4chq1PmcKy06PNe3axLeKmRIyxJ+PZQ==",
+      "dev": true
     },
     "node_modules/@types/d3-scale": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.3.tgz",
-      "integrity": "sha512-PATBiMCpvHJSMtZAMEhc2WyL+hnzarKzI6wAHYjhsonjWJYGq5BXTzQjv4l8m2jO183/4wZ90rKvSeT7o72xNQ==",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-3.3.2.tgz",
+      "integrity": "sha512-gGqr7x1ost9px3FvIfUMi5XA/F/yAf4UkUDtdQhpH92XCT0Oa7zkkRzY61gPVJq+DxpHn/btouw5ohWkbBsCzQ==",
       "dependencies": {
-        "@types/d3-time": "*"
+        "@types/d3-time": "^2"
       }
     },
     "node_modules/@types/d3-shape": {
@@ -3607,14 +3623,9 @@
       }
     },
     "node_modules/@types/d3-time": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.0.tgz",
-      "integrity": "sha512-sZLCdHvBUcNby1cB6Fd3ZBrABbjz3v1Vm90nysCQ6Vt7vd6e/h9Lt7SiJUoEX0l4Dzc7P5llKyhqSi1ycSf1Hg=="
-    },
-    "node_modules/@types/d3-timer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.0.tgz",
-      "integrity": "sha512-HNB/9GHqu7Fo8AQiugyJbv6ZxYz58wef0esl4Mv828w1ZKpAshw/uFWVDUcIB9KKFeFKoxS3cHY07FFgtTRZ1g=="
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-2.1.1.tgz",
+      "integrity": "sha512-9MVYlmIgmRR31C5b4FVSWtuMmBHh2mOWQYfl7XAYOa8dsnb7iEmUmRSWSFgXFtkjxO65d7hTUHQC+RhR/9IWFg=="
     },
     "node_modules/@types/eslint": {
       "version": "8.4.6",
@@ -4270,6 +4281,17 @@
       "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
       "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA=="
     },
+    "node_modules/abort-controller": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
+      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
+      "dependencies": {
+        "event-target-shim": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=6.5"
+      }
+    },
     "node_modules/accepts": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
@@ -6042,113 +6064,70 @@
       "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw=="
     },
     "node_modules/d3-array": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.2.tgz",
-      "integrity": "sha512-yEEyEAbDrF8C6Ob2myOBLjwBLck1Z89jMGFee0oPsn95GqjerpaOA4ch+vc2l0FNFFwMD5N7OCSEN5eAlsUbgQ==",
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz",
+      "integrity": "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==",
       "dependencies": {
-        "internmap": "1 - 2"
-      },
-      "engines": {
-        "node": ">=12"
+        "internmap": "^1.0.0"
       }
     },
     "node_modules/d3-color": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz",
-      "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==",
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/d3-ease": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz",
-      "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==",
-      "engines": {
-        "node": ">=12"
-      }
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-2.0.0.tgz",
+      "integrity": "sha512-SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ=="
     },
     "node_modules/d3-format": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz",
-      "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==",
-      "engines": {
-        "node": ">=12"
-      }
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-2.0.0.tgz",
+      "integrity": "sha512-Ab3S6XuE/Q+flY96HXT0jOXcM4EAClYFnRGY5zsjRGNy6qCYrQsMffs7cV5Q9xejb35zxW5hf/guKw34kvIKsA=="
     },
     "node_modules/d3-interpolate": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
-      "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-2.0.1.tgz",
+      "integrity": "sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ==",
       "dependencies": {
-        "d3-color": "1 - 3"
-      },
-      "engines": {
-        "node": ">=12"
+        "d3-color": "1 - 2"
       }
     },
     "node_modules/d3-path": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz",
-      "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==",
-      "engines": {
-        "node": ">=12"
-      }
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-2.0.0.tgz",
+      "integrity": "sha512-ZwZQxKhBnv9yHaiWd6ZU4x5BtCQ7pXszEV9CU6kRgwIQVQGLMv1oiL4M+MK/n79sYzsj+gcgpPQSctJUsLN7fA=="
     },
     "node_modules/d3-scale": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz",
-      "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.3.0.tgz",
+      "integrity": "sha512-1JGp44NQCt5d1g+Yy+GeOnZP7xHo0ii8zsQp6PGzd+C1/dl0KGsp9A7Mxwp+1D1o4unbTTxVdU/ZOIEBoeZPbQ==",
       "dependencies": {
-        "d3-array": "2.10.0 - 3",
-        "d3-format": "1 - 3",
-        "d3-interpolate": "1.2.0 - 3",
-        "d3-time": "2.1.1 - 3",
-        "d3-time-format": "2 - 4"
-      },
-      "engines": {
-        "node": ">=12"
+        "d3-array": "^2.3.0",
+        "d3-format": "1 - 2",
+        "d3-interpolate": "1.2.0 - 2",
+        "d3-time": "^2.1.1",
+        "d3-time-format": "2 - 3"
       }
     },
     "node_modules/d3-shape": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz",
-      "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-2.1.0.tgz",
+      "integrity": "sha512-PnjUqfM2PpskbSLTJvAzp2Wv4CZsnAgTfcVRTwW03QR3MkXF8Uo7B1y/lWkAsmbKwuecto++4NlsYcvYpXpTHA==",
       "dependencies": {
-        "d3-path": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=12"
+        "d3-path": "1 - 2"
       }
     },
     "node_modules/d3-time": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz",
-      "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-2.1.1.tgz",
+      "integrity": "sha512-/eIQe/eR4kCQwq7yxi7z4c6qEXf2IYGcjoWB5OOQy4Tq9Uv39/947qlDcN2TLkiTzQWzvnsuYPB9TrWaNfipKQ==",
       "dependencies": {
-        "d3-array": "2 - 3"
-      },
-      "engines": {
-        "node": ">=12"
+        "d3-array": "2"
       }
     },
     "node_modules/d3-time-format": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz",
-      "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz",
+      "integrity": "sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag==",
       "dependencies": {
-        "d3-time": "1 - 3"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/d3-timer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz",
-      "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==",
-      "engines": {
-        "node": ">=12"
+        "d3-time": "1 - 2"
       }
     },
     "node_modules/damerau-levenshtein": {
@@ -6169,6 +6148,11 @@
         "node": ">=10"
       }
     },
+    "node_modules/dayjs": {
+      "version": "1.11.10",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz",
+      "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ=="
+    },
     "node_modules/debug": {
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -7454,6 +7438,14 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/event-target-shim": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
+      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/eventemitter3": {
       "version": "4.0.7",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
@@ -7467,6 +7459,14 @@
         "node": ">=0.8.x"
       }
     },
+    "node_modules/eventsource": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-2.0.2.tgz",
+      "integrity": "sha512-IzUmBGPR3+oUG9dUeXynyNmf91/3zUSJg1lCktzKw47OXuhco54U3r9B7O4XX+Rb1Itm9OZ2b0RkTs10bICOxA==",
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/execa": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
@@ -7653,6 +7653,15 @@
         "bser": "2.1.1"
       }
     },
+    "node_modules/fetch-cookie": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fetch-cookie/-/fetch-cookie-2.1.0.tgz",
+      "integrity": "sha512-39+cZRbWfbibmj22R2Jy6dmTbAWC+oqun1f1FzQaNurkPDUP4C38jpeZbiXCR88RKRVDp8UcDrbFXkNhN+NjYg==",
+      "dependencies": {
+        "set-cookie-parser": "^2.4.8",
+        "tough-cookie": "^4.0.0"
+      }
+    },
     "node_modules/file-entry-cache": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
@@ -8747,12 +8756,9 @@
       }
     },
     "node_modules/internmap": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
-      "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==",
-      "engines": {
-        "node": ">=12"
-      }
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/internmap/-/internmap-1.0.1.tgz",
+      "integrity": "sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw=="
     },
     "node_modules/ipaddr.js": {
       "version": "2.0.1",
@@ -11229,9 +11235,9 @@
       "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="
     },
     "node_modules/json5": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
+      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
       "bin": {
         "json5": "lib/cli.js"
       },
@@ -11354,9 +11360,9 @@
       }
     },
     "node_modules/loader-utils": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
-      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
+      "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
       "dependencies": {
         "big.js": "^5.2.2",
         "emojis-list": "^3.0.0",
@@ -11764,6 +11770,44 @@
         "tslib": "^2.0.3"
       }
     },
+    "node_modules/node-fetch": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/node-fetch/node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+    },
+    "node_modules/node-fetch/node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+    },
+    "node_modules/node-fetch/node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
     "node_modules/node-forge": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
@@ -13915,9 +13959,9 @@
       }
     },
     "node_modules/react-dev-utils/node_modules/loader-utils": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz",
-      "integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.0.tgz",
+      "integrity": "sha512-HVl9ZqccQihZ7JM85dco1MvO9G+ONvxoGa9rkhzFsneGLKSUg1gJf9bWzhRhcvm2qChhWpebQhP44qxjKIUCaQ==",
       "engines": {
         "node": ">= 12.13.0"
       }
@@ -14243,19 +14287,24 @@
       }
     },
     "node_modules/recharts": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/recharts/-/recharts-2.3.2.tgz",
-      "integrity": "sha512-2II30fGzKaypHfHNQNUhCfiLMxrOS/gF0WFahDIEFgXtJkVEe2DpZWFfEfAn+RU3B7/h2V/B05Bwmqq3rTXwLw==",
+      "version": "2.1.15",
+      "resolved": "https://registry.npmjs.org/recharts/-/recharts-2.1.15.tgz",
+      "integrity": "sha512-16VMAvrsdqkEe7sT9uyJ1F+OZzrC6+5eW+pVSU04SVO6O5Nr5lY78h/uKMjsZJTN0nfOfgV7YfHZcivtqgPU9g==",
       "dependencies": {
+        "@types/d3-interpolate": "^2.0.0",
+        "@types/d3-scale": "^3.0.0",
+        "@types/d3-shape": "^2.0.0",
         "classnames": "^2.2.5",
+        "d3-interpolate": "^2.0.0",
+        "d3-scale": "^3.0.0",
+        "d3-shape": "^2.0.0",
         "eventemitter3": "^4.0.1",
         "lodash": "^4.17.19",
         "react-is": "^16.10.2",
         "react-resize-detector": "^7.1.2",
         "react-smooth": "^2.0.1",
         "recharts-scale": "^0.4.4",
-        "reduce-css-calc": "^2.1.8",
-        "victory-vendor": "^36.6.8"
+        "reduce-css-calc": "^2.1.8"
       },
       "engines": {
         "node": ">=12"
@@ -14274,15 +14323,39 @@
         "decimal.js-light": "^2.4.1"
       }
     },
+    "node_modules/recharts/node_modules/@types/d3-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-2.0.2.tgz",
+      "integrity": "sha512-3YHpvDw9LzONaJzejXLOwZ3LqwwkoXb9LI2YN7Hbd6pkGo5nIlJ09ul4bQhBN4hQZJKmUpX8HkVqbzgUKY48cg=="
+    },
+    "node_modules/recharts/node_modules/@types/d3-shape": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-2.1.3.tgz",
+      "integrity": "sha512-HAhCel3wP93kh4/rq+7atLdybcESZ5bRHDEZUojClyZWsRuEMo3A52NGYJSh48SxfxEU6RZIVbZL2YFZ2OAlzQ==",
+      "dependencies": {
+        "@types/d3-path": "^2"
+      }
+    },
     "node_modules/recursive-readdir": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz",
-      "integrity": "sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz",
+      "integrity": "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==",
       "dependencies": {
-        "minimatch": "^3.0.5"
+        "minimatch": "3.0.4"
       },
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/recursive-readdir/node_modules/minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
       }
     },
     "node_modules/reduce-css-calc": {
@@ -15006,6 +15079,11 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/set-cookie-parser": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.6.0.tgz",
+      "integrity": "sha512-RVnVQxTXuerk653XfuliOxBP81Sf0+qfQE73LIYKcyMYHG94AuH0kgrQpRDuTZnSmjpysHmzxJXKNfa6PjFhyQ=="
+    },
     "node_modules/setprototypeof": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
@@ -15546,12 +15624,12 @@
       }
     },
     "node_modules/sweetalert2": {
-      "version": "11.7.1",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.1.tgz",
-      "integrity": "sha512-+1bnkbqBl64FnZmi3g4SzAi4F3pL3S2jF1YQvrysv4GbgizfeFqGkJopxR3FnV/eJm6w2SQ2oAmCxSIBjgP/ag==",
+      "version": "11.6.0",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.6.0.tgz",
+      "integrity": "sha512-OX0KKF5n1pNV8KH2T74WBM7735Rn+6YU0jEvEto4B0C7nu9keV7YgBxQ+nClUibyFKYr1Y2HkLtmBaXm/s8esg==",
       "funding": {
         "type": "individual",
-        "url": "https://github.com/sponsors/limonte"
+        "url": "https://sweetalert2.github.io/#donations"
       }
     },
     "node_modules/symbol-tree": {
@@ -15827,9 +15905,9 @@
       }
     },
     "node_modules/tsconfig-paths/node_modules/json5": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
       "dependencies": {
         "minimist": "^1.2.0"
       },
@@ -16133,35 +16211,6 @@
         "node": ">= 0.8"
       }
     },
-    "node_modules/victory-vendor": {
-      "version": "36.6.8",
-      "resolved": "https://registry.npmjs.org/victory-vendor/-/victory-vendor-36.6.8.tgz",
-      "integrity": "sha512-H3kyQ+2zgjMPvbPqAl7Vwm2FD5dU7/4bCTQakFQnpIsfDljeOMDojRsrmJfwh4oAlNnWhpAf+mbAoLh8u7dwyQ==",
-      "dependencies": {
-        "@types/d3-array": "^3.0.3",
-        "@types/d3-ease": "^3.0.0",
-        "@types/d3-interpolate": "^3.0.1",
-        "@types/d3-scale": "^4.0.2",
-        "@types/d3-shape": "^3.1.0",
-        "@types/d3-time": "^3.0.0",
-        "@types/d3-timer": "^3.0.0",
-        "d3-array": "^3.1.6",
-        "d3-ease": "^3.0.1",
-        "d3-interpolate": "^3.0.1",
-        "d3-scale": "^4.0.2",
-        "d3-shape": "^3.1.0",
-        "d3-time": "^3.0.0",
-        "d3-timer": "^3.0.1"
-      }
-    },
-    "node_modules/victory-vendor/node_modules/@types/d3-shape": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.1.tgz",
-      "integrity": "sha512-6Uh86YFF7LGg4PQkuO2oG6EMBRLuW9cbavUW46zkIO5kuS2PfTqo2o9SkgtQzguBHbLgNnU90UNsITpsX1My+A==",
-      "dependencies": {
-        "@types/d3-path": "*"
-      }
-    },
     "node_modules/w3c-hr-time": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
@@ -17103,6 +17152,15 @@
         "@jridgewell/trace-mapping": "^0.3.9"
       }
     },
+    "@assistantapps/assistantapps.api.client": {
+      "version": "0.0.24",
+      "resolved": "https://registry.npmjs.org/@assistantapps/assistantapps.api.client/-/assistantapps.api.client-0.0.24.tgz",
+      "integrity": "sha512-AHrNOhWYXfWv9BpprIfcX1pEp3atj7Yamu+LIGWk50+McrIkRsCbFs6RfzT6FRfit6EJ/NdA87EQ28zTVZ5hyA==",
+      "requires": {
+        "@microsoft/signalr": "^7.0.5",
+        "dayjs": "^1.11.7"
+      }
+    },
     "@babel/code-frame": {
       "version": "7.18.6",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz",
@@ -19095,6 +19153,18 @@
       "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
       "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="
     },
+    "@microsoft/signalr": {
+      "version": "7.0.14",
+      "resolved": "https://registry.npmjs.org/@microsoft/signalr/-/signalr-7.0.14.tgz",
+      "integrity": "sha512-dnS7gSJF5LxByZwJaj82+F1K755ya7ttPT+JnSeCBef3sL8p8FBkHePXphK8NSuOquIb7vsphXWa28A+L2SPpw==",
+      "requires": {
+        "abort-controller": "^3.0.0",
+        "eventsource": "^2.0.2",
+        "fetch-cookie": "^2.0.3",
+        "node-fetch": "^2.6.7",
+        "ws": "^7.4.5"
+      }
+    },
     "@nicolo-ribaudo/eslint-scope-5-internals": {
       "version": "5.1.1-v1",
       "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
@@ -19452,40 +19522,31 @@
         "@types/node": "*"
       }
     },
-    "@types/d3-array": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.0.4.tgz",
-      "integrity": "sha512-nwvEkG9vYOc0Ic7G7kwgviY4AQlTfYGIZ0fqB7CQHXGyYM6nO7kJh5EguSNA3jfh4rq7Sb7eMVq8isuvg2/miQ=="
-    },
     "@types/d3-color": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.0.tgz",
-      "integrity": "sha512-HKuicPHJuvPgCD+np6Se9MQvS6OCbJmOjGvylzMJRlDwUXjKTTXs6Pwgk79O09Vj/ho3u1ofXnhFOaEWWPrlwA=="
-    },
-    "@types/d3-ease": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.0.tgz",
-      "integrity": "sha512-aMo4eaAOijJjA6uU+GIeW018dvy9+oH5Y2VPPzjjfxevvGQ/oRDs+tfYC9b50Q4BygRR8yE2QCLsrT0WtAVseA=="
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-2.0.3.tgz",
+      "integrity": "sha512-+0EtEjBfKEDtH9Rk3u3kLOUXM5F+iZK+WvASPb0MhIZl8J8NUvGeZRwKCXl+P3HkYx5TdU4YtcibpqHkSR9n7w=="
     },
     "@types/d3-interpolate": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
-      "integrity": "sha512-jx5leotSeac3jr0RePOH1KdR9rISG91QIE4Q2PYTu4OymLTZfA3SrnURSLzKH48HmXVUru50b8nje4E79oQSQw==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-2.0.2.tgz",
+      "integrity": "sha512-lElyqlUfIPyWG/cD475vl6msPL4aMU7eJvx1//Q177L8mdXoVPFl1djIESF2FKnc0NyaHvQlJpWwKJYwAhUoCw==",
       "requires": {
-        "@types/d3-color": "*"
+        "@types/d3-color": "^2"
       }
     },
     "@types/d3-path": {
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-1.0.9.tgz",
-      "integrity": "sha512-NaIeSIBiFgSC6IGUBjZWcscUJEq7vpVu7KthHN8eieTV9d9MqkSOZLH4chq1PmcKy06PNe3axLeKmRIyxJ+PZQ=="
+      "integrity": "sha512-NaIeSIBiFgSC6IGUBjZWcscUJEq7vpVu7KthHN8eieTV9d9MqkSOZLH4chq1PmcKy06PNe3axLeKmRIyxJ+PZQ==",
+      "dev": true
     },
     "@types/d3-scale": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.3.tgz",
-      "integrity": "sha512-PATBiMCpvHJSMtZAMEhc2WyL+hnzarKzI6wAHYjhsonjWJYGq5BXTzQjv4l8m2jO183/4wZ90rKvSeT7o72xNQ==",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-3.3.2.tgz",
+      "integrity": "sha512-gGqr7x1ost9px3FvIfUMi5XA/F/yAf4UkUDtdQhpH92XCT0Oa7zkkRzY61gPVJq+DxpHn/btouw5ohWkbBsCzQ==",
       "requires": {
-        "@types/d3-time": "*"
+        "@types/d3-time": "^2"
       }
     },
     "@types/d3-shape": {
@@ -19498,14 +19559,9 @@
       }
     },
     "@types/d3-time": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.0.tgz",
-      "integrity": "sha512-sZLCdHvBUcNby1cB6Fd3ZBrABbjz3v1Vm90nysCQ6Vt7vd6e/h9Lt7SiJUoEX0l4Dzc7P5llKyhqSi1ycSf1Hg=="
-    },
-    "@types/d3-timer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.0.tgz",
-      "integrity": "sha512-HNB/9GHqu7Fo8AQiugyJbv6ZxYz58wef0esl4Mv828w1ZKpAshw/uFWVDUcIB9KKFeFKoxS3cHY07FFgtTRZ1g=="
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-2.1.1.tgz",
+      "integrity": "sha512-9MVYlmIgmRR31C5b4FVSWtuMmBHh2mOWQYfl7XAYOa8dsnb7iEmUmRSWSFgXFtkjxO65d7hTUHQC+RhR/9IWFg=="
     },
     "@types/eslint": {
       "version": "8.4.6",
@@ -20058,6 +20114,14 @@
       "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
       "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA=="
     },
+    "abort-controller": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
+      "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
+      "requires": {
+        "event-target-shim": "^5.0.0"
+      }
+    },
     "accepts": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
@@ -21346,82 +21410,72 @@
       "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw=="
     },
     "d3-array": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.2.tgz",
-      "integrity": "sha512-yEEyEAbDrF8C6Ob2myOBLjwBLck1Z89jMGFee0oPsn95GqjerpaOA4ch+vc2l0FNFFwMD5N7OCSEN5eAlsUbgQ==",
+      "version": "2.12.1",
+      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz",
+      "integrity": "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==",
       "requires": {
-        "internmap": "1 - 2"
+        "internmap": "^1.0.0"
       }
     },
     "d3-color": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz",
-      "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA=="
-    },
-    "d3-ease": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz",
-      "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-2.0.0.tgz",
+      "integrity": "sha512-SPXi0TSKPD4g9tw0NMZFnR95XVgUZiBH+uUTqQuDu1OsE2zomHU7ho0FISciaPvosimixwHFl3WHLGabv6dDgQ=="
     },
     "d3-format": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz",
-      "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-2.0.0.tgz",
+      "integrity": "sha512-Ab3S6XuE/Q+flY96HXT0jOXcM4EAClYFnRGY5zsjRGNy6qCYrQsMffs7cV5Q9xejb35zxW5hf/guKw34kvIKsA=="
     },
     "d3-interpolate": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
-      "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-2.0.1.tgz",
+      "integrity": "sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ==",
       "requires": {
-        "d3-color": "1 - 3"
+        "d3-color": "1 - 2"
       }
     },
     "d3-path": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz",
-      "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-2.0.0.tgz",
+      "integrity": "sha512-ZwZQxKhBnv9yHaiWd6ZU4x5BtCQ7pXszEV9CU6kRgwIQVQGLMv1oiL4M+MK/n79sYzsj+gcgpPQSctJUsLN7fA=="
     },
     "d3-scale": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz",
-      "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.3.0.tgz",
+      "integrity": "sha512-1JGp44NQCt5d1g+Yy+GeOnZP7xHo0ii8zsQp6PGzd+C1/dl0KGsp9A7Mxwp+1D1o4unbTTxVdU/ZOIEBoeZPbQ==",
       "requires": {
-        "d3-array": "2.10.0 - 3",
-        "d3-format": "1 - 3",
-        "d3-interpolate": "1.2.0 - 3",
-        "d3-time": "2.1.1 - 3",
-        "d3-time-format": "2 - 4"
+        "d3-array": "^2.3.0",
+        "d3-format": "1 - 2",
+        "d3-interpolate": "1.2.0 - 2",
+        "d3-time": "^2.1.1",
+        "d3-time-format": "2 - 3"
       }
     },
     "d3-shape": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz",
-      "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-2.1.0.tgz",
+      "integrity": "sha512-PnjUqfM2PpskbSLTJvAzp2Wv4CZsnAgTfcVRTwW03QR3MkXF8Uo7B1y/lWkAsmbKwuecto++4NlsYcvYpXpTHA==",
       "requires": {
-        "d3-path": "^3.1.0"
+        "d3-path": "1 - 2"
       }
     },
     "d3-time": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz",
-      "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-2.1.1.tgz",
+      "integrity": "sha512-/eIQe/eR4kCQwq7yxi7z4c6qEXf2IYGcjoWB5OOQy4Tq9Uv39/947qlDcN2TLkiTzQWzvnsuYPB9TrWaNfipKQ==",
       "requires": {
-        "d3-array": "2 - 3"
+        "d3-array": "2"
       }
     },
     "d3-time-format": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz",
-      "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz",
+      "integrity": "sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag==",
       "requires": {
-        "d3-time": "1 - 3"
+        "d3-time": "1 - 2"
       }
     },
-    "d3-timer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz",
-      "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA=="
-    },
     "damerau-levenshtein": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz",
@@ -21437,6 +21491,11 @@
         "whatwg-url": "^8.0.0"
       }
     },
+    "dayjs": {
+      "version": "1.11.10",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz",
+      "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ=="
+    },
     "debug": {
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -22368,6 +22427,11 @@
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
       "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="
     },
+    "event-target-shim": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
+      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="
+    },
     "eventemitter3": {
       "version": "4.0.7",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
@@ -22378,6 +22442,11 @@
       "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
       "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q=="
     },
+    "eventsource": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-2.0.2.tgz",
+      "integrity": "sha512-IzUmBGPR3+oUG9dUeXynyNmf91/3zUSJg1lCktzKw47OXuhco54U3r9B7O4XX+Rb1Itm9OZ2b0RkTs10bICOxA=="
+    },
     "execa": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
@@ -22544,6 +22613,15 @@
         "bser": "2.1.1"
       }
     },
+    "fetch-cookie": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fetch-cookie/-/fetch-cookie-2.1.0.tgz",
+      "integrity": "sha512-39+cZRbWfbibmj22R2Jy6dmTbAWC+oqun1f1FzQaNurkPDUP4C38jpeZbiXCR88RKRVDp8UcDrbFXkNhN+NjYg==",
+      "requires": {
+        "set-cookie-parser": "^2.4.8",
+        "tough-cookie": "^4.0.0"
+      }
+    },
     "file-entry-cache": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
@@ -23321,9 +23399,9 @@
       }
     },
     "internmap": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
-      "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg=="
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/internmap/-/internmap-1.0.1.tgz",
+      "integrity": "sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw=="
     },
     "ipaddr.js": {
       "version": "2.0.1",
@@ -25117,9 +25195,9 @@
       "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="
     },
     "json5": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
+      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="
     },
     "jsonfile": {
       "version": "6.1.0",
@@ -25207,9 +25285,9 @@
       "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg=="
     },
     "loader-utils": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
-      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
+      "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
       "requires": {
         "big.js": "^5.2.2",
         "emojis-list": "^3.0.0",
@@ -25514,6 +25592,35 @@
         "tslib": "^2.0.3"
       }
     },
+    "node-fetch": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+      "requires": {
+        "whatwg-url": "^5.0.0"
+      },
+      "dependencies": {
+        "tr46": {
+          "version": "0.0.3",
+          "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+          "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+        },
+        "webidl-conversions": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+          "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
+        },
+        "whatwg-url": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+          "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+          "requires": {
+            "tr46": "~0.0.3",
+            "webidl-conversions": "^3.0.0"
+          }
+        }
+      }
+    },
     "node-forge": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
@@ -26872,9 +26979,9 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
         },
         "loader-utils": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz",
-          "integrity": "sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw=="
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.0.tgz",
+          "integrity": "sha512-HVl9ZqccQihZ7JM85dco1MvO9G+ONvxoGa9rkhzFsneGLKSUg1gJf9bWzhRhcvm2qChhWpebQhP44qxjKIUCaQ=="
         },
         "supports-color": {
           "version": "7.2.0",
@@ -27108,19 +27215,39 @@
       }
     },
     "recharts": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/recharts/-/recharts-2.3.2.tgz",
-      "integrity": "sha512-2II30fGzKaypHfHNQNUhCfiLMxrOS/gF0WFahDIEFgXtJkVEe2DpZWFfEfAn+RU3B7/h2V/B05Bwmqq3rTXwLw==",
+      "version": "2.1.15",
+      "resolved": "https://registry.npmjs.org/recharts/-/recharts-2.1.15.tgz",
+      "integrity": "sha512-16VMAvrsdqkEe7sT9uyJ1F+OZzrC6+5eW+pVSU04SVO6O5Nr5lY78h/uKMjsZJTN0nfOfgV7YfHZcivtqgPU9g==",
       "requires": {
+        "@types/d3-interpolate": "^2.0.0",
+        "@types/d3-scale": "^3.0.0",
+        "@types/d3-shape": "^2.0.0",
         "classnames": "^2.2.5",
+        "d3-interpolate": "^2.0.0",
+        "d3-scale": "^3.0.0",
+        "d3-shape": "^2.0.0",
         "eventemitter3": "^4.0.1",
         "lodash": "^4.17.19",
         "react-is": "^16.10.2",
         "react-resize-detector": "^7.1.2",
         "react-smooth": "^2.0.1",
         "recharts-scale": "^0.4.4",
-        "reduce-css-calc": "^2.1.8",
-        "victory-vendor": "^36.6.8"
+        "reduce-css-calc": "^2.1.8"
+      },
+      "dependencies": {
+        "@types/d3-path": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-2.0.2.tgz",
+          "integrity": "sha512-3YHpvDw9LzONaJzejXLOwZ3LqwwkoXb9LI2YN7Hbd6pkGo5nIlJ09ul4bQhBN4hQZJKmUpX8HkVqbzgUKY48cg=="
+        },
+        "@types/d3-shape": {
+          "version": "2.1.3",
+          "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-2.1.3.tgz",
+          "integrity": "sha512-HAhCel3wP93kh4/rq+7atLdybcESZ5bRHDEZUojClyZWsRuEMo3A52NGYJSh48SxfxEU6RZIVbZL2YFZ2OAlzQ==",
+          "requires": {
+            "@types/d3-path": "^2"
+          }
+        }
       }
     },
     "recharts-scale": {
@@ -27132,11 +27259,21 @@
       }
     },
     "recursive-readdir": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.3.tgz",
-      "integrity": "sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz",
+      "integrity": "sha512-nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg==",
       "requires": {
-        "minimatch": "^3.0.5"
+        "minimatch": "3.0.4"
+      },
+      "dependencies": {
+        "minimatch": {
+          "version": "3.0.4",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+          "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+          "requires": {
+            "brace-expansion": "^1.1.7"
+          }
+        }
       }
     },
     "reduce-css-calc": {
@@ -27664,6 +27801,11 @@
         "send": "0.18.0"
       }
     },
+    "set-cookie-parser": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.6.0.tgz",
+      "integrity": "sha512-RVnVQxTXuerk653XfuliOxBP81Sf0+qfQE73LIYKcyMYHG94AuH0kgrQpRDuTZnSmjpysHmzxJXKNfa6PjFhyQ=="
+    },
     "setprototypeof": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
@@ -28086,9 +28228,9 @@
       }
     },
     "sweetalert2": {
-      "version": "11.7.1",
-      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.7.1.tgz",
-      "integrity": "sha512-+1bnkbqBl64FnZmi3g4SzAi4F3pL3S2jF1YQvrysv4GbgizfeFqGkJopxR3FnV/eJm6w2SQ2oAmCxSIBjgP/ag=="
+      "version": "11.6.0",
+      "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.6.0.tgz",
+      "integrity": "sha512-OX0KKF5n1pNV8KH2T74WBM7735Rn+6YU0jEvEto4B0C7nu9keV7YgBxQ+nClUibyFKYr1Y2HkLtmBaXm/s8esg=="
     },
     "symbol-tree": {
       "version": "3.2.4",
@@ -28289,9 +28431,9 @@
       },
       "dependencies": {
         "json5": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
           "requires": {
             "minimist": "^1.2.0"
           }
@@ -28504,37 +28646,6 @@
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
       "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="
     },
-    "victory-vendor": {
-      "version": "36.6.8",
-      "resolved": "https://registry.npmjs.org/victory-vendor/-/victory-vendor-36.6.8.tgz",
-      "integrity": "sha512-H3kyQ+2zgjMPvbPqAl7Vwm2FD5dU7/4bCTQakFQnpIsfDljeOMDojRsrmJfwh4oAlNnWhpAf+mbAoLh8u7dwyQ==",
-      "requires": {
-        "@types/d3-array": "^3.0.3",
-        "@types/d3-ease": "^3.0.0",
-        "@types/d3-interpolate": "^3.0.1",
-        "@types/d3-scale": "^4.0.2",
-        "@types/d3-shape": "^3.1.0",
-        "@types/d3-time": "^3.0.0",
-        "@types/d3-timer": "^3.0.0",
-        "d3-array": "^3.1.6",
-        "d3-ease": "^3.0.1",
-        "d3-interpolate": "^3.0.1",
-        "d3-scale": "^4.0.2",
-        "d3-shape": "^3.1.0",
-        "d3-time": "^3.0.0",
-        "d3-timer": "^3.0.1"
-      },
-      "dependencies": {
-        "@types/d3-shape": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.1.tgz",
-          "integrity": "sha512-6Uh86YFF7LGg4PQkuO2oG6EMBRLuW9cbavUW46zkIO5kuS2PfTqo2o9SkgtQzguBHbLgNnU90UNsITpsX1My+A==",
-          "requires": {
-            "@types/d3-path": "*"
-          }
-        }
-      }
-    },
     "w3c-hr-time": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
diff --git a/package.json b/package.json
index 0b4f627..0272bba 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "assistantapps.webtool",
-  "version": "0.4.11",
+  "version": "0.4.10",
   "private": true,
   "scripts": {
     "start": "react-scripts start",
@@ -9,6 +9,7 @@
     "eject": "react-scripts eject"
   },
   "dependencies": {
+    "@assistantapps/assistantapps.api.client": "^0.0.24",
     "@leecheuk/react-google-login": "^5.4.1",
     "@pathofdev/react-tag-input": "^1.0.7",
     "axios": "^1.1.3",
@@ -29,7 +30,7 @@
     "redux": "^4.2.0",
     "semantic-ui-css": "^2.5.0",
     "semantic-ui-react": "^2.1.3",
-    "sweetalert2": "^11.7.1",
+    "sweetalert2": "^11.6.0",
     "wouter": "^2.8.0-alpha.2"
   },
   "eslintConfig": {
@@ -59,4 +60,4 @@
     "sass": "^1.55.0",
     "typescript": "^4.8.4"
   }
-}
\ No newline at end of file
+}
diff --git a/public/assets/img/screenshots/DKM1.png b/public/assets/img/screenshots/DKM1.png
new file mode 100644
index 0000000..289e777
Binary files /dev/null and b/public/assets/img/screenshots/DKM1.png differ
diff --git a/public/assets/img/screenshots/DKM2.png b/public/assets/img/screenshots/DKM2.png
new file mode 100644
index 0000000..8fdfd96
Binary files /dev/null and b/public/assets/img/screenshots/DKM2.png differ
diff --git a/src/components/common/error.tsx b/src/components/common/error.tsx
index 4af75bf..23d92e4 100644
--- a/src/components/common/error.tsx
+++ b/src/components/common/error.tsx
@@ -13,6 +13,7 @@ export const Error: React.FC<IProps> = (props: IProps) => {
                         className="error"
                         alt="error"
                     />
+                    <h3>{props.message}</h3>
                 </div>
             </div>
         </div>
diff --git a/src/components/common/header/header.tsx b/src/components/common/header/header.tsx
index 0b5d0bf..2b6772e 100644
--- a/src/components/common/header/header.tsx
+++ b/src/components/common/header/header.tsx
@@ -8,11 +8,6 @@ import './header.scss';
 import { Icon } from 'semantic-ui-react';
 import { home, stats, translation } from '../../../constants/route';
 
-interface IState {
-	isOpen: boolean;
-	links: Array<any>;
-}
-
 interface IProps { }
 
 export const Header: React.FC<IProps> = (props: IProps) => {
diff --git a/src/components/dialog/loginDialog.tsx b/src/components/dialog/loginDialog.tsx
index c285d80..d427b76 100644
--- a/src/components/dialog/loginDialog.tsx
+++ b/src/components/dialog/loginDialog.tsx
@@ -4,13 +4,13 @@ import { connect } from 'react-redux';
 import { GoogleLoginButton } from "react-social-login-buttons";
 import { Icon, Modal } from 'semantic-ui-react';
 import Swal from 'sweetalert2';
-import { OAuthProviderType } from '../../contracts/generated/Enum/oAuthProviderType';
-import { OAuthUserViewModel } from '../../contracts/generated/ViewModel/oAuthUserViewModel';
+
 import { ILoginProps } from '../../contracts/login';
 import { errorDialog } from '../../helper/dialogHelper';
 import { DependencyInjectionContext } from '../../integration/dependencyInjection';
 import { ConditionalToolTip } from '../common/conditionalTooltip';
 import { mapDispatchToProps, mapStateToProps } from './loginDialog.redux';
+import { OAuthProviderType, OAuthUserViewModel } from '@assistantapps/assistantapps.api.client';
 
 interface IProps {
     isLoading?: boolean;
@@ -133,6 +133,7 @@ export const LoginDialogUnconnected: React.FC<IProps> = (props: IProps) => {
             style={{
                 backgroundColor: 'red',
             }}
+            theme="dark"
             buttonText="Login"
             onSuccess={responseGoogle(OAuthProviderType.google)}
             onFailure={oAuthLoginFailure}
diff --git a/src/components/guide/userGuideTile.tsx b/src/components/guide/userGuideTile.tsx
index 25962d8..ffcf175 100644
--- a/src/components/guide/userGuideTile.tsx
+++ b/src/components/guide/userGuideTile.tsx
@@ -1,9 +1,9 @@
 import classNames from 'classnames';
 import React, { ReactNode } from 'react';
 import { Card, Icon, Label } from 'semantic-ui-react';
-import { AdminApprovalStatus } from '../../contracts/generated/Enum/adminApprovalStatus';
-import { GuideSearchResultViewModel } from '../../contracts/generated/ViewModel/Guide/guideSearchResultViewModel';
+
 import { friendlyDate } from '../../helper/dateHelper';
+import { AdminApprovalStatus, GuideSearchResultViewModel } from '@assistantapps/assistantapps.api.client';
 
 interface IUserGuideTileProps {
     item: GuideSearchResultViewModel;
diff --git a/src/components/screenshotSlider/screenshotSlider.tsx b/src/components/screenshotSlider/screenshotSlider.tsx
index 6d4396c..8d3458a 100644
--- a/src/components/screenshotSlider/screenshotSlider.tsx
+++ b/src/components/screenshotSlider/screenshotSlider.tsx
@@ -21,6 +21,8 @@ export const ScreenshotSlider: React.FC<IProps> = (props: IProps) => {
         'SMS1',
         'SMS2',
         'SMS3',
+        'DKM1',
+        'DKM2',
     ];
 
     const [index, setIndex] = useState<number>(0);
diff --git a/src/components/translationGraphs/numberOfTranslationsPerLanguage.tsx b/src/components/translationGraphs/numberOfTranslationsPerLanguage.tsx
index 4df8de1..45efe78 100644
--- a/src/components/translationGraphs/numberOfTranslationsPerLanguage.tsx
+++ b/src/components/translationGraphs/numberOfTranslationsPerLanguage.tsx
@@ -3,9 +3,6 @@ import { Bar, BarChart, CartesianGrid, Cell, Label, ResponsiveContainer, Tooltip
 import { Menu } from 'semantic-ui-react';
 import { NetworkState } from '../../constants/networkState';
 import { DropDownWithIcon } from '../../contracts/dropdown/dropDownWithIcon';
-import { AppViewModel } from '../../contracts/generated/ViewModel/appViewModel';
-import { TranslationGetGraphViewModel } from '../../contracts/generated/ViewModel/Translation/translationGetGraphViewModel';
-import { TranslationsPerLanguageGraphViewModel } from '../../contracts/generated/ViewModel/Translation/translationsPerLanguageGraphViewModel';
 import { IDependencyInjection, withServices } from '../../integration/dependencyInjection';
 import { appDetailsToAppDropDownMapper } from '../../mapper/appDetailsMapper';
 import { getColourFromLanguageCode } from '../../mapper/languageColourMapper';
@@ -14,6 +11,7 @@ import { DropDown } from '../common/dropDown/dropDown';
 import { TooltipWithFlag } from '../common/graph/tooltipWithFlag';
 import { FlagAxisTick, SteppedAxisTick } from '../common/graph/xAxis';
 import { SmallLoading } from '../common/loading';
+import { AppViewModel, TranslationGetGraphViewModel, TranslationsPerLanguageGraphViewModel } from '@assistantapps/assistantapps.api.client';
 
 interface IWithDepInj {
     assistantAppsApiService: AssistantAppsApiService;
@@ -61,7 +59,7 @@ export class NumberOfTranslationsPerLanguageGraphUnconnected extends React.Compo
     }
 
     fetchAppData = async () => {
-        var appsResult = await this.props.assistantAppsApiService.getApps();
+        const appsResult = await this.props.assistantAppsApiService.getApps();
         if (!appsResult.isSuccess) {
             this.setState(() => {
                 return {
@@ -81,7 +79,7 @@ export class NumberOfTranslationsPerLanguageGraphUnconnected extends React.Compo
     }
 
     fetchGraphData = async (searchObj: TranslationGetGraphViewModel) => {
-        var appsResult = await this.props.assistantAppsApiService.getTranslationsPerLangGraphData(searchObj);
+        const appsResult = await this.props.assistantAppsApiService.getTranslationsPerLangGraphData(searchObj);
         if (!appsResult.isSuccess) {
             this.setState(() => {
                 return {
diff --git a/src/components/translationImages/translationImages.tsx b/src/components/translationImages/translationImages.tsx
index 7eaf5b1..31ae930 100644
--- a/src/components/translationImages/translationImages.tsx
+++ b/src/components/translationImages/translationImages.tsx
@@ -2,10 +2,10 @@ import React from 'react';
 import Lightbox from 'react-18-image-lightbox';
 import { Segment } from 'semantic-ui-react';
 import { NetworkState } from '../../constants/networkState';
-import { TranslationImageViewModel } from '../../contracts/generated/ViewModel/Translation/translationImageViewModel';
 import { IDependencyInjection, withServices } from '../../integration/dependencyInjection';
 import { AssistantAppsApiService } from '../../services/api/AssistantAppsApiService';
 import { SmallLoading } from '../common/loading';
+import { TranslationImageViewModel } from '@assistantapps/assistantapps.api.client';
 
 interface IWithDepInj {
     assistantAppsApiService: AssistantAppsApiService;
@@ -58,7 +58,7 @@ export class TranslationImagesUnconnected extends React.Component<IProps, IState
             return;
         }
 
-        var imagesResult = await this.props.assistantAppsApiService.getTranslationImages(this.props.translationKeyGuid);
+        const imagesResult = await this.props.assistantAppsApiService.getTranslationImages(this.props.translationKeyGuid);
         if (!imagesResult.isSuccess) {
             this.setState(() => {
                 return {
diff --git a/src/components/translationSearch/translationSearch.tsx b/src/components/translationSearch/translationSearch.tsx
index c6885a7..3c393f9 100644
--- a/src/components/translationSearch/translationSearch.tsx
+++ b/src/components/translationSearch/translationSearch.tsx
@@ -3,12 +3,10 @@ import React from 'react';
 import Swal from 'sweetalert2';
 import { Button, Icon, Popup } from 'semantic-ui-react';
 import Autosuggest, { InputProps } from 'react-autosuggest';
+import { TranslationKeySearchDropdownViewModel, TranslationKeyViewModel } from '@assistantapps/assistantapps.api.client';
 
 import { Error } from '../../components/common/error';
 import { NetworkState } from '../../constants/networkState';
-import { TranslationKeyViewModel } from '../../contracts/generated/ViewModel/Translation/translationKeyViewModel';
-import { TranslationKeySearchDropdownViewModel } from '../../contracts/generated/ViewModel/Translation/translationKeySearchDropdownViewModel';
-
 import './translationSearch.scss';
 
 interface IProps {
diff --git a/src/components/translationVote/translationVoteContainer.tsx b/src/components/translationVote/translationVoteContainer.tsx
index 5232ed1..9d2b1b7 100644
--- a/src/components/translationVote/translationVoteContainer.tsx
+++ b/src/components/translationVote/translationVoteContainer.tsx
@@ -1,15 +1,12 @@
+import { TranslationKeyViewModel, TranslationReportAddViewModel, TranslationSubmissionViewModel, TranslationSubmissionWithVotesViewModel } from '@assistantapps/assistantapps.api.client';
 import React from 'react';
 import Swal from 'sweetalert2';
 import { NetworkState } from '../../constants/networkState';
-import { TranslationKeyViewModel } from '../../contracts/generated/ViewModel/Translation/translationKeyViewModel';
-import { TranslationSubmissionViewModel } from '../../contracts/generated/ViewModel/Translation/translationSubmissionViewModel';
-import { TranslationSubmissionWithVotesViewModel } from '../../contracts/generated/ViewModel/Translation/translationSubmissionWithVotesViewModel';
-import { TranslationReportAddViewModel } from '../../contracts/generated/ViewModel/Translation/translationReportAddViewModel';
 import { Result } from '../../contracts/results/ResultWithValue';
+import { IDependencyInjection, withServices } from '../../integration/dependencyInjection';
 import { StorageService } from '../../services/StorageService';
-import { TranslationVotePresenter } from './translationVotePresenter';
 import { AssistantAppsApiService } from '../../services/api/AssistantAppsApiService';
-import { IDependencyInjection, withServices } from '../../integration/dependencyInjection';
+import { TranslationVotePresenter } from './translationVotePresenter';
 
 interface IWithDepInj {
     assistantAppsApiService: AssistantAppsApiService;
@@ -70,7 +67,7 @@ export class TranslationVoteContainerUnconnected extends React.Component<IProps,
             }
         });
 
-        var translationVotesResult = await this.props.assistantAppsApiService.getSubmittedTranslations(this.props.currentTranslation.guid, this.props.languageGuid);
+        const translationVotesResult = await this.props.assistantAppsApiService.getSubmittedTranslations(this.props.currentTranslation.guid, this.props.languageGuid);
         if (!translationVotesResult.isSuccess) {
             this.setState(() => {
                 return {
@@ -113,7 +110,7 @@ export class TranslationVoteContainerUnconnected extends React.Component<IProps,
             })
             return;
         }
-        var apiResult = await apiFunc();
+        const apiResult = await apiFunc();
         if (!apiResult.isSuccess) {
             this.setState(() => {
                 return {
@@ -136,12 +133,12 @@ export class TranslationVoteContainerUnconnected extends React.Component<IProps,
                 status: NetworkState.Loading
             }
         });
-        var voteObj: TranslationSubmissionViewModel = {
+        const voteObj: TranslationSubmissionViewModel = {
             translationKeyGuid: this.props.currentTranslation.guid,
             languageGuid: this.props.languageGuid,
             text: this.state.translation,
         }
-        var transResult = await this.props.assistantAppsApiService.submitTranslation(voteObj);
+        const transResult = await this.props.assistantAppsApiService.submitTranslation(voteObj);
         if (!transResult.isSuccess) {
             if (transResult.statusCode != null && transResult.statusCode === 409) {
                 Swal.fire({
@@ -202,7 +199,7 @@ export class TranslationVoteContainerUnconnected extends React.Component<IProps,
                 status: NetworkState.Loading
             }
         });
-        var reportObj: TranslationReportAddViewModel = {
+        const reportObj: TranslationReportAddViewModel = {
             translationGuid: badTrans.guid,
             translationKey: this.props.currentTranslation.key,
             offendingText: badTrans.text,
@@ -210,7 +207,7 @@ export class TranslationVoteContainerUnconnected extends React.Component<IProps,
             languageGuid: this.props.languageGuid,
             additionalMessage: additionalText as string,
         }
-        var reportResult = await this.props.assistantAppsApiService.reportTranslation(reportObj);
+        const reportResult = await this.props.assistantAppsApiService.reportTranslation(reportObj);
         if (!reportResult.isSuccess) {
             this.setState(() => {
                 return {
diff --git a/src/components/translationVote/translationVoteItem.tsx b/src/components/translationVote/translationVoteItem.tsx
index 4e8a5cd..fc31e33 100644
--- a/src/components/translationVote/translationVoteItem.tsx
+++ b/src/components/translationVote/translationVoteItem.tsx
@@ -1,6 +1,6 @@
-import React from 'react';
+import { TranslationSubmissionWithVotesViewModel } from '@assistantapps/assistantapps.api.client';
+import React, { useState } from 'react';
 import { Button, Icon, Label, List, Popup } from 'semantic-ui-react';
-import { TranslationSubmissionWithVotesViewModel } from '../../contracts/generated/ViewModel/Translation/translationSubmissionWithVotesViewModel';
 import './_translationVoteItem.scss';
 
 
@@ -14,38 +14,42 @@ interface IProps {
 }
 
 export const TranslationVoteItem: React.FC<IProps> = (props: IProps) => {
+    const [isPopupOpen, setPopupOpen] = useState<boolean>(false);
+
     const numMaxChars = 20;
     let translationTextIsLarge = false;
 
-    var translationText = props.details.text;
+    let translationText = props.details.text;
     const numTextChars = props.details.text.length;
     if (numTextChars > numMaxChars) {
         translationText = props.details.text.substring(0, numMaxChars) + '...';
         translationTextIsLarge = true;
     }
-    var username = props.details.username;
+    let username = props.details.username;
     const numUsernameChars = props.details.text.length;
     if (numUsernameChars > numMaxChars) {
         username = props.details.username.substring(0, numMaxChars) + '...';
     }
 
-    var popupContent = 'Translator: ' + username;
+    let popupContent = 'Translator: ' + username;
     if (translationTextIsLarge) {
         popupContent = props.details.text + ' - Translated by: ' + props.details.username;
     }
 
     const renderIcon = (localProps: IProps) => {
-        var options = [];
-        var subOptions = [];
+        const options = [];
+        const subOptions = [];
 
         if (localProps.onEdit != null) {
-            const onEdit = localProps.onEdit;
             subOptions.push(
                 {
                     guid: `edit-${localProps.details.guid}`,
                     component: (
                         <Label key={`edit-${localProps.details.guid}`}
-                            onClick={() => onEdit(localProps.details.text)}
+                            onClick={() => {
+                                setPopupOpen(false);
+                                localProps?.onEdit?.(localProps.details.text);
+                            }}
                             basic color="grey" className="pointer noselect">
                             <Icon name="edit" />
                             <span>Edit</span>
@@ -74,7 +78,11 @@ export const TranslationVoteItem: React.FC<IProps> = (props: IProps) => {
                 {
                     guid: `report-${localProps.details.guid}`,
                     component: (
-                        <Label key={`report-${localProps.details.guid}`} onClick={() => localProps.onReport(localProps.details)}
+                        <Label key={`report-${localProps.details.guid}`}
+                            onClick={() => {
+                                setPopupOpen(false);
+                                localProps.onReport(localProps.details);
+                            }}
                             basic color="red" className="pointer noselect" >
                             <Icon name="announcement" />
                             <span>Report</span>
@@ -84,12 +92,12 @@ export const TranslationVoteItem: React.FC<IProps> = (props: IProps) => {
             );
         }
 
-        const additionalCss = props.details.isCurentVote ? 'notAllowed' : '';
+        const additionalCss = props.details.isCurentVote ? 'notAllowed no-radius' : 'no-radius';
         const localOnClick = props.details.isCurentVote ? () => null : props.onClick;
         if (!localProps.isCopyTextMode) {
             options.push(
                 <Label key={`vote-${localProps.details.guid}`} onClick={localOnClick} className={additionalCss}
-                    basic pointing='left' color={localProps.details.isCurentVote ? 'green' : undefined} >
+                    basic pointing='left' color={localProps.details.isCurentVote ? 'blue' : undefined} >
                     {
                         localProps.details.isCurentVote && <Icon name="check" />
                     }
@@ -116,7 +124,11 @@ export const TranslationVoteItem: React.FC<IProps> = (props: IProps) => {
                         <Label basic>
                             <Icon name="ellipsis vertical" className="m-0" />
                         </Label>
-                    }>
+                    }
+                    open={isPopupOpen}
+                    onOpen={() => setPopupOpen(true)}
+                    onClose={() => setPopupOpen(false)}
+                >
                     <List>
                         {
                             subOptions.map((item: any) => {
diff --git a/src/components/translationVote/translationVotePresenter.tsx b/src/components/translationVote/translationVotePresenter.tsx
index a651f9b..82d718c 100644
--- a/src/components/translationVote/translationVotePresenter.tsx
+++ b/src/components/translationVote/translationVotePresenter.tsx
@@ -1,9 +1,8 @@
+import { TranslationKeyViewModel, TranslationSubmissionWithVotesViewModel } from '@assistantapps/assistantapps.api.client';
 import classNames from 'classnames';
 import React from 'react';
 import { Form, Placeholder, Segment, TextArea, TextAreaProps } from 'semantic-ui-react';
 import { NetworkState } from '../../constants/networkState';
-import { TranslationKeyViewModel } from '../../contracts/generated/ViewModel/Translation/translationKeyViewModel';
-import { TranslationSubmissionWithVotesViewModel } from '../../contracts/generated/ViewModel/Translation/translationSubmissionWithVotesViewModel';
 import { ConditionalToolTip } from '../common/conditionalTooltip';
 import { TranslationVoteItem } from './translationVoteItem';
 
@@ -66,7 +65,7 @@ export const TranslationVotePresenter: React.FC<IProps> = (props: IProps) => {
                 <div className={classNames('col-12', { inVisible: showOwnSubmissionTextBox })}>
                     <p>Submissions from previous Translators</p>
                     {
-                        props.voteOptions.map((voteOpt: TranslationSubmissionWithVotesViewModel) => {
+                        (Array.isArray(props.voteOptions) ? props.voteOptions : []).map((voteOpt: TranslationSubmissionWithVotesViewModel) => {
                             return (
                                 <TranslationVoteItem
                                     key={voteOpt.guid}
diff --git a/src/constants/dropDown.ts b/src/constants/dropDown.ts
new file mode 100644
index 0000000..aaebc5f
--- /dev/null
+++ b/src/constants/dropDown.ts
@@ -0,0 +1,17 @@
+import { AdminApprovalStatus } from "@assistantapps/assistantapps.api.client";
+import { addSpacesForEnum, capitalizeFirstLetter } from "../helper/stringHelper";
+
+export const AdminAprovalStatusOptions = Object.values(AdminApprovalStatus)
+    .filter((value) => typeof value === "string")
+    .map(v => v.toString())
+    .map((value) => ({
+        value,
+        key: value,
+        text: capitalizeFirstLetter(addSpacesForEnum(value))
+    }));
+
+export const DefaultAdminAprovalStatusSelection = [
+    AdminApprovalStatus.pending,
+    AdminApprovalStatus.inReview,
+    AdminApprovalStatus.approved,
+]
\ No newline at end of file
diff --git a/src/contracts/generated/Enum/adminApprovalStatus.ts b/src/contracts/generated/Enum/adminApprovalStatus.ts
deleted file mode 100644
index fb99ba6..0000000
--- a/src/contracts/generated/Enum/adminApprovalStatus.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Auto Generated */
-
-export enum AdminApprovalStatus {
-    pending,
-    inReview,
-    denied,
-    approved,
-    cancelled,
-}
diff --git a/src/contracts/generated/Enum/appRatingType.ts b/src/contracts/generated/Enum/appRatingType.ts
deleted file mode 100644
index 3c68aa4..0000000
--- a/src/contracts/generated/Enum/appRatingType.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Auto Generated */
-
-export enum AppRatingType {
-    all,
-    googlePlayStore,
-    appleAppStore,
-}
diff --git a/src/contracts/generated/Enum/appType.ts b/src/contracts/generated/Enum/appType.ts
deleted file mode 100644
index d80248a..0000000
--- a/src/contracts/generated/Enum/appType.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/* Auto Generated */
-
-export enum AppType {
-    unknown,
-    nms,
-    sms,
-    hyt,
-}
diff --git a/src/contracts/generated/Enum/cacheType.ts b/src/contracts/generated/Enum/cacheType.ts
deleted file mode 100644
index 5939e73..0000000
--- a/src/contracts/generated/Enum/cacheType.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Auto Generated */
-
-export enum CacheType {
-    patreons,
-    dashboard,
-    dashboardLoggedIn,
-    guideSearch,
-    donation,
-    version,
-    guideContent,
-    appReview,
-    steamNews,
-    steamBranches,
-    emojiLeaderboard,
-    kurtBlogRss,
-    kurtIsLive,
-    teamMembers,
-    translators,
-    translatorLeaderboard,
-}
diff --git a/src/contracts/generated/Enum/coinbaseEventType.ts b/src/contracts/generated/Enum/coinbaseEventType.ts
deleted file mode 100644
index 76a951b..0000000
--- a/src/contracts/generated/Enum/coinbaseEventType.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Auto Generated */
-
-export enum CoinbaseEventType {
-    unknown,
-    chargeCreationPending,
-    chargeCreated,
-    chargeFailed,
-    chargeConfirmed,
-}
diff --git a/src/contracts/generated/Enum/dashboardItemType.ts b/src/contracts/generated/Enum/dashboardItemType.ts
deleted file mode 100644
index 8f210cf..0000000
--- a/src/contracts/generated/Enum/dashboardItemType.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Auto Generated */
-
-export enum DashboardItemType {
-    numberOfApps = 0,
-    numberOfTranslationKeys = 1,
-    numberOfTranslationKeysPerApp = 2,
-    numberOfTranslationSubmissions = 3,
-    numberOfTranslationVotes = 4,
-    numberOfSupportedLanguages = 5,
-    numberOfDonations = 6,
-    totalDonationAmount = 7,
-    numberOfLiveGuides = 8,
-    numberOfLiveGuidesPerApp = 9,
-    numberOfGuidesPending = 10,
-    numberOfGuidesInReview = 11,
-}
diff --git a/src/contracts/generated/Enum/donationType.ts b/src/contracts/generated/Enum/donationType.ts
deleted file mode 100644
index 881028f..0000000
--- a/src/contracts/generated/Enum/donationType.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/* Auto Generated */
-
-export enum DonationType {
-    unknown,
-    paypal,
-    braveRewards,
-    buyMeACoffee,
-    koFi,
-    patreon,
-    googlePay,
-    applePay,
-}
diff --git a/src/contracts/generated/Enum/guideSectionItemType.ts b/src/contracts/generated/Enum/guideSectionItemType.ts
deleted file mode 100644
index 7e8d91a..0000000
--- a/src/contracts/generated/Enum/guideSectionItemType.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Auto Generated */
-
-export enum GuideSectionItemType {
-    text,
-    link,
-    image,
-    markdown,
-    table,
-}
diff --git a/src/contracts/generated/Enum/oAuthProviderType.ts b/src/contracts/generated/Enum/oAuthProviderType.ts
deleted file mode 100644
index 44ced7c..0000000
--- a/src/contracts/generated/Enum/oAuthProviderType.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Auto Generated */
-
-export enum OAuthProviderType {
-    unknown,
-    google,
-}
diff --git a/src/contracts/generated/Enum/permissionType.ts b/src/contracts/generated/Enum/permissionType.ts
deleted file mode 100644
index baca157..0000000
--- a/src/contracts/generated/Enum/permissionType.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Auto Generated */
-
-export enum PermissionType {
-    none,
-    usersView,
-    usersManage,
-    userPermissionsView,
-    userPermissionsManage,
-    appView,
-    appManage,
-    translationView,
-    translationManage,
-    translationKeyView,
-    translationKeyManage,
-    hangfireDashboardView,
-    hangfireDashboardManage,
-    languageView,
-    languageManage,
-    cacheView,
-    cacheManage,
-    guideSubmissionView,
-    guideSubmissionManage,
-    versionView,
-    versionManage,
-    donationView,
-    donationManage,
-    steamBranchManage,
-    teamMemberView,
-    teamMemberManage,
-    translationReportView,
-    translationReportManage,
-}
diff --git a/src/contracts/generated/Enum/platformType.ts b/src/contracts/generated/Enum/platformType.ts
deleted file mode 100644
index 91a24eb..0000000
--- a/src/contracts/generated/Enum/platformType.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/* Auto Generated */
-
-export enum PlatformType {
-    android,
-    iOS,
-    web,
-    api,
-}
diff --git a/src/contracts/generated/Enum/redisCacheType.ts b/src/contracts/generated/Enum/redisCacheType.ts
deleted file mode 100644
index c751fa7..0000000
--- a/src/contracts/generated/Enum/redisCacheType.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* Auto Generated */
-
-export enum RedisCacheType {
-    appRatingSummary,
-    appRatingGooglePlay,
-    appRatingAppleAppStore,
-    patreonList,
-    steamNews,
-    steamBranches,
-    twitchAuthToken,
-}
diff --git a/src/contracts/generated/Enum/requestBodyMapperType.ts b/src/contracts/generated/Enum/requestBodyMapperType.ts
deleted file mode 100644
index 9d9857a..0000000
--- a/src/contracts/generated/Enum/requestBodyMapperType.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Auto Generated */
-
-export enum RequestBodyMapperType {
-    unknown,
-    guide,
-    version,
-}
diff --git a/src/contracts/generated/Enum/signalRServerType.ts b/src/contracts/generated/Enum/signalRServerType.ts
deleted file mode 100644
index 3688f75..0000000
--- a/src/contracts/generated/Enum/signalRServerType.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-/* Auto Generated */
-
-export enum SignalRServerType {
-    oAuthComplete,
-}
diff --git a/src/contracts/generated/Enum/sortDirection.ts b/src/contracts/generated/Enum/sortDirection.ts
deleted file mode 100644
index f607970..0000000
--- a/src/contracts/generated/Enum/sortDirection.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Auto Generated */
-
-export enum SortDirection {
-    none,
-    asc,
-    desc,
-}
diff --git a/src/contracts/generated/Enum/translationReportStatus.ts b/src/contracts/generated/Enum/translationReportStatus.ts
deleted file mode 100644
index 573545b..0000000
--- a/src/contracts/generated/Enum/translationReportStatus.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Auto Generated */
-
-export enum TranslationReportStatus {
-    pending,
-    closed,
-    resolved,
-}
diff --git a/src/contracts/generated/Enum/userActivityActionType.ts b/src/contracts/generated/Enum/userActivityActionType.ts
deleted file mode 100644
index 4a1fe0b..0000000
--- a/src/contracts/generated/Enum/userActivityActionType.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Auto Generated */
-
-export enum UserActivityActionType {
-    unknown,
-    create,
-    read,
-    update,
-    delete,
-}
diff --git a/src/contracts/generated/Hub/submitEmote.ts b/src/contracts/generated/Hub/submitEmote.ts
deleted file mode 100644
index 7d94ccf..0000000
--- a/src/contracts/generated/Hub/submitEmote.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Auto Generated */
-
-export interface SubmitEmote {
-    emote: number;
-    captcha: string;
-}
diff --git a/src/contracts/generated/ViewModel/Auth/patreonOAuthRequestViewModel.ts b/src/contracts/generated/ViewModel/Auth/patreonOAuthRequestViewModel.ts
deleted file mode 100644
index 2dd9d0f..0000000
--- a/src/contracts/generated/ViewModel/Auth/patreonOAuthRequestViewModel.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-/* Auto Generated */
-
-export interface PatreonOAuthRequestViewModel {
-    uniqueIdentifier: string;
-}
diff --git a/src/contracts/generated/ViewModel/Auth/patreonOAuthResponseViewModel.ts b/src/contracts/generated/ViewModel/Auth/patreonOAuthResponseViewModel.ts
deleted file mode 100644
index 5f60505..0000000
--- a/src/contracts/generated/ViewModel/Auth/patreonOAuthResponseViewModel.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Auto Generated */
-
-export interface PatreonOAuthResponseViewModel {
-    loginFailed: boolean;
-    belongsToAssistantAppsCampaign: boolean;
-    errorMessage: string;
-}
diff --git a/src/contracts/generated/ViewModel/AzureDevOps/azureDevOpsBuildViewModel.ts b/src/contracts/generated/ViewModel/AzureDevOps/azureDevOpsBuildViewModel.ts
deleted file mode 100644
index 9b1998f..0000000
--- a/src/contracts/generated/ViewModel/AzureDevOps/azureDevOpsBuildViewModel.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Auto Generated */
-
-export interface AzureDevOpsBuildViewModel {
-    buildDefinitionId: number;
-    buildDefinitionNumber: number;
-    buildName: string;
-    requestedFor: string;
-    requestedForImageUrl: string;
-    status: string;
-    queueTime?: Date;
-    buildTime: number;
-    reason: string;
-    buildNumber: string;
-    result: string;
-    lastChangedBy: string;
-    lastChangedByImageUrl: string;
-}
diff --git a/src/contracts/generated/ViewModel/AzureDevOps/azureDevOpsReleaseViewModel.ts b/src/contracts/generated/ViewModel/AzureDevOps/azureDevOpsReleaseViewModel.ts
deleted file mode 100644
index 96f2422..0000000
--- a/src/contracts/generated/ViewModel/AzureDevOps/azureDevOpsReleaseViewModel.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Auto Generated */
-
-export interface AzureDevOpsReleaseViewModel {
-    id: number;
-    name: string;
-    description: string;
-    createdOn?: Date;
-    modifiedOn?: Date;
-}
diff --git a/src/contracts/generated/ViewModel/Emote/streamEmoteFromUserViewModel.ts b/src/contracts/generated/ViewModel/Emote/streamEmoteFromUserViewModel.ts
deleted file mode 100644
index b33d016..0000000
--- a/src/contracts/generated/ViewModel/Emote/streamEmoteFromUserViewModel.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Auto Generated */
-
-export interface StreamEmoteFromUserViewModel {
-    emoteId: number;
-    userId: string;
-    username: string;
-}
diff --git a/src/contracts/generated/ViewModel/Emote/streamEmoteViewModel.ts b/src/contracts/generated/ViewModel/Emote/streamEmoteViewModel.ts
deleted file mode 100644
index 3feb819..0000000
--- a/src/contracts/generated/ViewModel/Emote/streamEmoteViewModel.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Auto Generated */
-
-export interface StreamEmoteViewModel {
-    captcha: string;
-    emote: number;
-}
diff --git a/src/contracts/generated/ViewModel/Guide/addOrEditGuideViewModel.ts b/src/contracts/generated/ViewModel/Guide/addOrEditGuideViewModel.ts
deleted file mode 100644
index 2b775b9..0000000
--- a/src/contracts/generated/ViewModel/Guide/addOrEditGuideViewModel.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/* Auto Generated */
-
-export interface AddOrEditGuideViewModel {
-    appGuid: string;
-    title: string;
-    subTitle: string;
-    showCreatedByUser: boolean;
-    languageCode: string;
-    minutes: number;
-    tags: any[];
-    sections: any[];
-    updatedGuideDetails: boolean;
-}
diff --git a/src/contracts/generated/ViewModel/Guide/guideContentViewModel.ts b/src/contracts/generated/ViewModel/Guide/guideContentViewModel.ts
deleted file mode 100644
index d58378f..0000000
--- a/src/contracts/generated/ViewModel/Guide/guideContentViewModel.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Auto Generated */
-
-import { AdminApprovalStatus } from "./../../Enum/adminApprovalStatus";
-
-export interface GuideContentViewModel {
-    guid: string;
-    title: string;
-    subTitle: string;
-    likes: number;
-    views: number;
-    showCreatedByUser: boolean;
-    userGuid: string;
-    userName: string;
-    appGuid: string;
-    languageCode: string;
-    minutes: number;
-    tags: any[];
-    originalGuideGuid: string;
-    translatorGuid?: string;
-    status: AdminApprovalStatus;
-    dateCreated: Date;
-    sections: any[];
-}
diff --git a/src/contracts/generated/ViewModel/Guide/guideSearchResultViewModel.ts b/src/contracts/generated/ViewModel/Guide/guideSearchResultViewModel.ts
deleted file mode 100644
index bf83f71..0000000
--- a/src/contracts/generated/ViewModel/Guide/guideSearchResultViewModel.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Auto Generated */
-
-import { AdminApprovalStatus } from "./../../Enum/adminApprovalStatus";
-
-export interface GuideSearchResultViewModel {
-    guid: string;
-    guideDetailGuid: string;
-    title: string;
-    subTitle: string;
-    showCreatedByUser: boolean;
-    userGuid: string;
-    userName: string;
-    translatorGuid: string;
-    translatorName: string;
-    minutes: number;
-    tags: any[];
-    status: AdminApprovalStatus;
-    languageCode: string;
-    version: number;
-    dateCreated: Date;
-}
diff --git a/src/contracts/generated/ViewModel/Guide/guideSearchViewModel.ts b/src/contracts/generated/ViewModel/Guide/guideSearchViewModel.ts
deleted file mode 100644
index 9b75d79..0000000
--- a/src/contracts/generated/ViewModel/Guide/guideSearchViewModel.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Auto Generated */
-
-import { SortDirection } from "./../../Enum/sortDirection";
-
-export interface GuideSearchViewModel {
-    appGuid: string;
-    tag: string;
-    name: string;
-    orderByName: SortDirection;
-    orderByDate: SortDirection;
-    orderByViews: SortDirection;
-    orderByLikes: SortDirection;
-    page: number;
-    languageCode: string;
-}
diff --git a/src/contracts/generated/ViewModel/Guide/guideSectionItemViewModel.ts b/src/contracts/generated/ViewModel/Guide/guideSectionItemViewModel.ts
deleted file mode 100644
index 885454b..0000000
--- a/src/contracts/generated/ViewModel/Guide/guideSectionItemViewModel.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/* Auto Generated */
-
-import { GuideSectionItemType } from "./../../Enum/guideSectionItemType";
-
-export interface GuideSectionItemViewModel {
-    guid: string;
-    type: GuideSectionItemType;
-    content: string;
-    additionalContent: string;
-    tableColumnNames: any[];
-    tableData: any[];
-    sortOrder: number;
-}
diff --git a/src/contracts/generated/ViewModel/Guide/guideSectionViewModel.ts b/src/contracts/generated/ViewModel/Guide/guideSectionViewModel.ts
deleted file mode 100644
index 99fdc3f..0000000
--- a/src/contracts/generated/ViewModel/Guide/guideSectionViewModel.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/* Auto Generated */
-
-export interface GuideSectionViewModel {
-    guid: string;
-    heading: string;
-    sortOrder: number;
-    items: any[];
-}
diff --git a/src/contracts/generated/ViewModel/Steam/steamBranchItemViewModel.ts b/src/contracts/generated/ViewModel/Steam/steamBranchItemViewModel.ts
deleted file mode 100644
index 3f333ad..0000000
--- a/src/contracts/generated/ViewModel/Steam/steamBranchItemViewModel.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Auto Generated */
-
-export interface SteamBranchItemViewModel {
-    name: string;
-    buildId: string;
-    lastUpdate: Date;
-}
diff --git a/src/contracts/generated/ViewModel/Steam/steamNewsItemViewModel.ts b/src/contracts/generated/ViewModel/Steam/steamNewsItemViewModel.ts
deleted file mode 100644
index e649e51..0000000
--- a/src/contracts/generated/ViewModel/Steam/steamNewsItemViewModel.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/* Auto Generated */
-
-export interface SteamNewsItemViewModel {
-    name: string;
-    date: Date;
-    link: string;
-    image: string;
-    shortDescription: string;
-    videoLink: string;
-    upVotes: number;
-    downVotes: number;
-    commentCount: number;
-}
diff --git a/src/contracts/generated/ViewModel/Translation/translationGetGraphViewModel.ts b/src/contracts/generated/ViewModel/Translation/translationGetGraphViewModel.ts
deleted file mode 100644
index 66a5048..0000000
--- a/src/contracts/generated/ViewModel/Translation/translationGetGraphViewModel.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-/* Auto Generated */
-
-export interface TranslationGetGraphViewModel {
-    appGuidList: any[];
-}
diff --git a/src/contracts/generated/ViewModel/Translation/translationImageViewModel.ts b/src/contracts/generated/ViewModel/Translation/translationImageViewModel.ts
deleted file mode 100644
index 5057d76..0000000
--- a/src/contracts/generated/ViewModel/Translation/translationImageViewModel.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Auto Generated */
-
-export interface TranslationImageViewModel {
-    guid: string;
-    imagePath: string;
-}
diff --git a/src/contracts/generated/ViewModel/Translation/translationKeySearchDropdownViewModel.ts b/src/contracts/generated/ViewModel/Translation/translationKeySearchDropdownViewModel.ts
deleted file mode 100644
index 9881dfd..0000000
--- a/src/contracts/generated/ViewModel/Translation/translationKeySearchDropdownViewModel.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/* Auto Generated */
-
-export interface TranslationKeySearchDropdownViewModel {
-    guid: string;
-    key: string;
-    value: string;
-    translation: string;
-}
diff --git a/src/contracts/generated/ViewModel/Translation/translationKeyViewModel.ts b/src/contracts/generated/ViewModel/Translation/translationKeyViewModel.ts
deleted file mode 100644
index c8b1402..0000000
--- a/src/contracts/generated/ViewModel/Translation/translationKeyViewModel.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* Auto Generated */
-
-export interface TranslationKeyViewModel {
-    guid: string;
-    key: string;
-    appGuids: any[];
-    meta: string;
-    original: string;
-    sortOrder: number;
-    isTranslatable: boolean;
-}
diff --git a/src/contracts/generated/ViewModel/Translation/translationReportAddViewModel.ts b/src/contracts/generated/ViewModel/Translation/translationReportAddViewModel.ts
deleted file mode 100644
index a3700ff..0000000
--- a/src/contracts/generated/ViewModel/Translation/translationReportAddViewModel.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Auto Generated */
-
-export interface TranslationReportAddViewModel {
-    translationKey: string;
-    translationGuid: string;
-    languageGuid: string;
-    origText: string;
-    offendingText: string;
-    additionalMessage: string;
-}
diff --git a/src/contracts/generated/ViewModel/Translation/translationReportViewModel.ts b/src/contracts/generated/ViewModel/Translation/translationReportViewModel.ts
deleted file mode 100644
index 452de3d..0000000
--- a/src/contracts/generated/ViewModel/Translation/translationReportViewModel.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Auto Generated */
-
-import { TranslationReportStatus } from "./../../Enum/translationReportStatus";
-
-export interface TranslationReportViewModel {
-    guid: string;
-    userGuid: string;
-    translationGuid: string;
-    languageGuid: string;
-    reporterGuid: string;
-    reason: string;
-    dateEdited: Date;
-    dateSubmitted: Date;
-    status: TranslationReportStatus;
-}
diff --git a/src/contracts/generated/ViewModel/Translation/translationSearchViewModel.ts b/src/contracts/generated/ViewModel/Translation/translationSearchViewModel.ts
deleted file mode 100644
index 6fcb721..0000000
--- a/src/contracts/generated/ViewModel/Translation/translationSearchViewModel.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Auto Generated */
-
-export interface TranslationSearchViewModel {
-    appGuidList: any[];
-    languageGuid?: string;
-    showOnlyUntranslated: boolean;
-}
diff --git a/src/contracts/generated/ViewModel/Translation/translationSubmissionViewModel.ts b/src/contracts/generated/ViewModel/Translation/translationSubmissionViewModel.ts
deleted file mode 100644
index befcf8b..0000000
--- a/src/contracts/generated/ViewModel/Translation/translationSubmissionViewModel.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Auto Generated */
-
-export interface TranslationSubmissionViewModel {
-    translationKeyGuid: string;
-    languageGuid: string;
-    text: string;
-}
diff --git a/src/contracts/generated/ViewModel/Translation/translationSubmissionWithVotesViewModel.ts b/src/contracts/generated/ViewModel/Translation/translationSubmissionWithVotesViewModel.ts
deleted file mode 100644
index 10e015f..0000000
--- a/src/contracts/generated/ViewModel/Translation/translationSubmissionWithVotesViewModel.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* Auto Generated */
-
-import { TranslationSubmissionViewModel } from "./translationSubmissionViewModel";
-
-export interface TranslationSubmissionWithVotesViewModel extends TranslationSubmissionViewModel {
-    guid: string;
-    username: string;
-    votes: number;
-    isCurentVote: boolean;
-    belongsToUser: boolean;
-}
diff --git a/src/contracts/generated/ViewModel/Translation/translationSubmittedDetailSearchViewModel.ts b/src/contracts/generated/ViewModel/Translation/translationSubmittedDetailSearchViewModel.ts
deleted file mode 100644
index 03aafe6..0000000
--- a/src/contracts/generated/ViewModel/Translation/translationSubmittedDetailSearchViewModel.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Auto Generated */
-
-export interface TranslationSubmittedDetailSearchViewModel {
-    searchText: string;
-    page: number;
-}
diff --git a/src/contracts/generated/ViewModel/Translation/translationSubmittedDetailViewModel.ts b/src/contracts/generated/ViewModel/Translation/translationSubmittedDetailViewModel.ts
deleted file mode 100644
index fd604d2..0000000
--- a/src/contracts/generated/ViewModel/Translation/translationSubmittedDetailViewModel.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/* Auto Generated */
-
-export interface TranslationSubmittedDetailViewModel {
-    guid: string;
-    userGuid: string;
-    username: string;
-    email: string;
-    transKey: string;
-    original: string;
-    text: string;
-    dateSubmitted: Date;
-    language: string;
-    countryCode: string;
-}
diff --git a/src/contracts/generated/ViewModel/Translation/translationViewModel.ts b/src/contracts/generated/ViewModel/Translation/translationViewModel.ts
deleted file mode 100644
index 540cab3..0000000
--- a/src/contracts/generated/ViewModel/Translation/translationViewModel.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* Auto Generated */
-
-export interface TranslationViewModel {
-    guid: string;
-    translationKeyGuid: string;
-    languageGuid: string;
-    text: string;
-    userGuid: string;
-    dateSubmitted: Date;
-}
diff --git a/src/contracts/generated/ViewModel/Translation/translationVoteViewModel.ts b/src/contracts/generated/ViewModel/Translation/translationVoteViewModel.ts
deleted file mode 100644
index 13b448a..0000000
--- a/src/contracts/generated/ViewModel/Translation/translationVoteViewModel.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Auto Generated */
-
-export interface TranslationVoteViewModel {
-    guid: string;
-    userGuid: string;
-    translationGuid: string;
-}
diff --git a/src/contracts/generated/ViewModel/Translation/translationsPerLanguageGraphViewModel.ts b/src/contracts/generated/ViewModel/Translation/translationsPerLanguageGraphViewModel.ts
deleted file mode 100644
index fad6ec7..0000000
--- a/src/contracts/generated/ViewModel/Translation/translationsPerLanguageGraphViewModel.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/* Auto Generated */
-
-export interface TranslationsPerLanguageGraphViewModel {
-    guid: string;
-    name: string;
-    languageCode: string;
-    countryCode: string;
-    localeKey: string;
-    numTranslations: number;
-    percentage: number;
-    sortOrder: number;
-}
diff --git a/src/contracts/generated/ViewModel/Translation/translatorLeaderboardItemViewModel.ts b/src/contracts/generated/ViewModel/Translation/translatorLeaderboardItemViewModel.ts
deleted file mode 100644
index a48cfae..0000000
--- a/src/contracts/generated/ViewModel/Translation/translatorLeaderboardItemViewModel.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Auto Generated */
-
-export interface TranslatorLeaderboardItemViewModel {
-    username: string;
-    profileImageUrl: string;
-    numTranslations: number;
-    numVotes: number;
-    total: number;
-}
diff --git a/src/contracts/generated/ViewModel/Translation/translatorSearchViewModel.ts b/src/contracts/generated/ViewModel/Translation/translatorSearchViewModel.ts
deleted file mode 100644
index 0fa034f..0000000
--- a/src/contracts/generated/ViewModel/Translation/translatorSearchViewModel.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Auto Generated */
-
-export interface TranslatorSearchViewModel {
-    appGuid: string;
-    languageGuid: string;
-    page: number;
-}
diff --git a/src/contracts/generated/ViewModel/User/userActivityViewModel.ts b/src/contracts/generated/ViewModel/User/userActivityViewModel.ts
deleted file mode 100644
index b3a063d..0000000
--- a/src/contracts/generated/ViewModel/User/userActivityViewModel.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* Auto Generated */
-
-import { UserActivityActionType } from "./../../Enum/userActivityActionType";
-
-export interface UserActivityViewModel {
-    username: string;
-    ipAddress: string;
-    description: string;
-    action: UserActivityActionType;
-    actionDate: Date;
-}
diff --git a/src/contracts/generated/ViewModel/User/userSearchViewModel.ts b/src/contracts/generated/ViewModel/User/userSearchViewModel.ts
deleted file mode 100644
index 07422a8..0000000
--- a/src/contracts/generated/ViewModel/User/userSearchViewModel.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Auto Generated */
-
-export interface UserSearchViewModel {
-    searchText: string;
-    page: number;
-}
diff --git a/src/contracts/generated/ViewModel/User/userViewModel.ts b/src/contracts/generated/ViewModel/User/userViewModel.ts
deleted file mode 100644
index 9955618..0000000
--- a/src/contracts/generated/ViewModel/User/userViewModel.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Auto Generated */
-
-export interface UserViewModel {
-    guid: string;
-    profileImageUrl: string;
-    username: string;
-    joinDate: Date;
-    isAdmin: boolean;
-}
diff --git a/src/contracts/generated/ViewModel/Version/versionSearchViewModel.ts b/src/contracts/generated/ViewModel/Version/versionSearchViewModel.ts
deleted file mode 100644
index 805cee1..0000000
--- a/src/contracts/generated/ViewModel/Version/versionSearchViewModel.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/* Auto Generated */
-
-export interface VersionSearchViewModel {
-    appGuid: string;
-    platforms: any[];
-    languageCode: string;
-    page: number;
-}
diff --git a/src/contracts/generated/ViewModel/Version/versionViewModel.ts b/src/contracts/generated/ViewModel/Version/versionViewModel.ts
deleted file mode 100644
index 24eee17..0000000
--- a/src/contracts/generated/ViewModel/Version/versionViewModel.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* Auto Generated */
-
-export interface VersionViewModel {
-    guid: string;
-    appGuid: string;
-    markdown: string;
-    buildName: string;
-    buildNumber: number;
-    platforms: any[];
-    activeDate: Date;
-}
diff --git a/src/contracts/generated/ViewModel/appRatingViewModel.ts b/src/contracts/generated/ViewModel/appRatingViewModel.ts
deleted file mode 100644
index bc39e55..0000000
--- a/src/contracts/generated/ViewModel/appRatingViewModel.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/* Auto Generated */
-
-import { AppType } from "./../Enum/appType";
-import { AppRatingType } from "./../Enum/appRatingType";
-
-export interface AppRatingViewModel {
-    app: AppType;
-    type: AppRatingType;
-    numberOfReviews: number;
-    allScore: number;
-    version: string;
-}
diff --git a/src/contracts/generated/ViewModel/appViewModel.ts b/src/contracts/generated/ViewModel/appViewModel.ts
deleted file mode 100644
index 9c8ec79..0000000
--- a/src/contracts/generated/ViewModel/appViewModel.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* Auto Generated */
-
-export interface AppViewModel {
-    guid: string;
-    name: string;
-    gameName: string;
-    iconUrl: string;
-    logoUrl: string;
-    isVisible: boolean;
-    sortOrder: number;
-}
diff --git a/src/contracts/generated/ViewModel/coinbaseChargeDto.ts b/src/contracts/generated/ViewModel/coinbaseChargeDto.ts
deleted file mode 100644
index b26a878..0000000
--- a/src/contracts/generated/ViewModel/coinbaseChargeDto.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Auto Generated */
-
-import { CoinbaseEventType } from "./../Enum/coinbaseEventType";
-
-export interface CoinbaseChargeDto {
-    userGuid: string;
-    type: CoinbaseEventType;
-    hostedUrl: string;
-    expiresAt: any;
-    bitcoinCode: string;
-    bitcoinCashCode: string;
-    daiCode: string;
-    ethereumCode: string;
-    liteCoinCode: string;
-    usdCoinCode: string;
-}
diff --git a/src/contracts/generated/ViewModel/contactFormViewModel.ts b/src/contracts/generated/ViewModel/contactFormViewModel.ts
deleted file mode 100644
index 1bf1759..0000000
--- a/src/contracts/generated/ViewModel/contactFormViewModel.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/* Auto Generated */
-
-export interface ContactFormViewModel {
-    name: string;
-    email: string;
-    message: string;
-    captcha: string;
-}
diff --git a/src/contracts/generated/ViewModel/dashboardItemViewModel.ts b/src/contracts/generated/ViewModel/dashboardItemViewModel.ts
deleted file mode 100644
index bbd56d5..0000000
--- a/src/contracts/generated/ViewModel/dashboardItemViewModel.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Auto Generated */
-
-import { DashboardItemType } from "./../Enum/dashboardItemType";
-
-export interface DashboardItemViewModel {
-    type: DashboardItemType;
-    name: string;
-    value: string;
-}
diff --git a/src/contracts/generated/ViewModel/donationSearchViewModel.ts b/src/contracts/generated/ViewModel/donationSearchViewModel.ts
deleted file mode 100644
index 429451d..0000000
--- a/src/contracts/generated/ViewModel/donationSearchViewModel.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Auto Generated */
-
-export interface DonationSearchViewModel {
-    page: number;
-    types: any[];
-    searchText: string;
-    startDate?: Date;
-    endDate?: Date;
-}
diff --git a/src/contracts/generated/ViewModel/donationViewModel.ts b/src/contracts/generated/ViewModel/donationViewModel.ts
deleted file mode 100644
index 3602bd2..0000000
--- a/src/contracts/generated/ViewModel/donationViewModel.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Auto Generated */
-
-import { DonationType } from "./../Enum/donationType";
-
-export interface DonationViewModel {
-    guid: string;
-    userGuid?: string;
-    username: string;
-    email: string;
-    type: DonationType;
-    amount?: number;
-    currency: string;
-    actualAmount?: number;
-    isHidden?: boolean;
-    date: Date;
-}
diff --git a/src/contracts/generated/ViewModel/languageViewModel.ts b/src/contracts/generated/ViewModel/languageViewModel.ts
deleted file mode 100644
index d45601c..0000000
--- a/src/contracts/generated/ViewModel/languageViewModel.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* Auto Generated */
-
-export interface LanguageViewModel {
-    guid: string;
-    name: string;
-    languageCode: string;
-    countryCode: string;
-    translationKeyGuid: string;
-    sortOrder: number;
-    isVisible: boolean;
-}
diff --git a/src/contracts/generated/ViewModel/oAuthUserViewModel.ts b/src/contracts/generated/ViewModel/oAuthUserViewModel.ts
deleted file mode 100644
index a12c61b..0000000
--- a/src/contracts/generated/ViewModel/oAuthUserViewModel.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/* Auto Generated */
-
-import { OAuthProviderType } from "./../Enum/oAuthProviderType";
-
-export interface OAuthUserViewModel {
-    oAuthType: OAuthProviderType;
-    accessToken: string;
-    tokenId: string;
-    profileUrl: string;
-    username: string;
-    email: string;
-}
diff --git a/src/contracts/generated/ViewModel/patreonViewModel.ts b/src/contracts/generated/ViewModel/patreonViewModel.ts
deleted file mode 100644
index 8e55b0a..0000000
--- a/src/contracts/generated/ViewModel/patreonViewModel.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/* Auto Generated */
-
-export interface PatreonViewModel {
-    name: string;
-    imageUrl: string;
-    thumbnailUrl: string;
-    url: string;
-}
diff --git a/src/contracts/generated/ViewModel/teamMemberViewModel.ts b/src/contracts/generated/ViewModel/teamMemberViewModel.ts
deleted file mode 100644
index e81caf8..0000000
--- a/src/contracts/generated/ViewModel/teamMemberViewModel.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* Auto Generated */
-
-export interface TeamMemberViewModel {
-    guid: string;
-    name: string;
-    role: string;
-    imageUrl: string;
-    linkUrl: string;
-    linkName: string;
-    sortOrder: number;
-}
diff --git a/src/contracts/generated/ViewModel/uploadedImageViewModel.ts b/src/contracts/generated/ViewModel/uploadedImageViewModel.ts
deleted file mode 100644
index 353531c..0000000
--- a/src/contracts/generated/ViewModel/uploadedImageViewModel.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Auto Generated */
-
-export interface UploadedImageViewModel {
-    guid: string;
-    url: string;
-    blurHash: string;
-}
diff --git a/src/contracts/generated/ViewModel/webhookMessageViewModel.ts b/src/contracts/generated/ViewModel/webhookMessageViewModel.ts
deleted file mode 100644
index 8ef3e95..0000000
--- a/src/contracts/generated/ViewModel/webhookMessageViewModel.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Auto Generated */
-
-export interface WebhookMessageViewModel {
-    guid: string;
-    url: string;
-    message: string;
-    hashIdentifier: string;
-    sentDate: Date;
-}
diff --git a/src/helper/nameHelper.ts b/src/helper/nameHelper.ts
index b0330be..ee0b51d 100644
--- a/src/helper/nameHelper.ts
+++ b/src/helper/nameHelper.ts
@@ -5,5 +5,8 @@ export const getAppNameFromImage = (currentImage: string): string => {
     if (currentImage.includes('SMS')) {
         return 'Assistant for Scrap Mechanic';
     }
+    if (currentImage.includes('DKM')) {
+        return 'Assistant for Dinkum';
+    }
     return 'Assistant for No Man\'s Sky';
 }
\ No newline at end of file
diff --git a/src/helper/stringHelper.ts b/src/helper/stringHelper.ts
new file mode 100644
index 0000000..840ef26
--- /dev/null
+++ b/src/helper/stringHelper.ts
@@ -0,0 +1,24 @@
+const capitalizeAlphabet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+
+export const capitalizeFirstLetter = (orig: string) => {
+    if (orig.length === 0) return orig;
+    return [orig[0].toUpperCase(), ...(orig as any).slice(1, orig.length)].join('');
+}
+
+export const lowercaseFirstLetter = (orig: string) => {
+    if (orig.length === 0) return orig;
+    return [orig[0].toLowerCase(), ...(orig as any).slice(1, orig.length)].join('');
+}
+
+export const addSpacesForEnum = (orig: string) => {
+    if (orig.length === 0) return orig;
+    let result = '';
+
+    for (const char of orig) {
+        if (capitalizeAlphabet.includes(char)) {
+            result += ' ';
+        }
+        result += char;
+    }
+    return result;
+}
\ No newline at end of file
diff --git a/src/index.scss b/src/index.scss
index e545111..a27dbfe 100644
--- a/src/index.scss
+++ b/src/index.scss
@@ -1,4 +1,5 @@
 @import "./scss/favison.scss";
+@import "./scss/custom/custom.scss";
 
 :root {
     // AssistantApps WebComponents
@@ -31,4 +32,4 @@ body {
 // code {
 //   font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
 //     monospace;
-// }
+// }
\ No newline at end of file
diff --git a/src/index.tsx b/src/index.tsx
index 80730a0..b6623ce 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -19,9 +19,9 @@ import { reducer } from './redux';
 import * as serviceWorker from './serviceWorker';
 
 import './index.scss';
+import './reactTag.scss';
 import 'react-18-image-lightbox/style.css';
 import 'semantic-ui-css/semantic.min.css';
-import "@pathofdev/react-tag-input/build/index.css";
 import 'react-lazy-load-image-component/src/effects/blur.css';
 
 type CustomElement<T> = Partial<T & DOMAttributes<T> & { children: any }>;
diff --git a/src/mapper/appDetailsMapper.ts b/src/mapper/appDetailsMapper.ts
index eba0ae6..e79aa80 100644
--- a/src/mapper/appDetailsMapper.ts
+++ b/src/mapper/appDetailsMapper.ts
@@ -1,6 +1,6 @@
+import { AppViewModel } from '@assistantapps/assistantapps.api.client';
 import { PublishedAppsDetailsType } from '../constants/appDetails';
 import { DropDownWithIcon } from '../contracts/dropdown/dropDownWithIcon';
-import { AppViewModel } from '../contracts/generated/ViewModel/appViewModel';
 
 export const appDetailsConstantToDropDownMapper = (publishedAppsDetail: PublishedAppsDetailsType) => {
     if (!publishedAppsDetail.publiclyVisible) return null;
diff --git a/src/mapper/languageDetailsMapper.ts b/src/mapper/languageDetailsMapper.ts
index 9c218fe..d8cb9e4 100644
--- a/src/mapper/languageDetailsMapper.ts
+++ b/src/mapper/languageDetailsMapper.ts
@@ -1,5 +1,5 @@
+import { LanguageViewModel } from '@assistantapps/assistantapps.api.client';
 import { DropDownWithIcon } from '../contracts/dropdown/dropDownWithIcon';
-import { LanguageViewModel } from '../contracts/generated/ViewModel/languageViewModel';
 import { getImageUrlFromCountryCode } from '../helper/countryCodeHelper';
 
 export const languageDetailsToTranslationLanguageDropDownMapper = (appDetails: Array<LanguageViewModel>): Array<DropDownWithIcon> => {
diff --git a/src/pages/guide/createGuidePage.tsx b/src/pages/guide/createGuidePage.tsx
index 33dc205..2dd05f4 100644
--- a/src/pages/guide/createGuidePage.tsx
+++ b/src/pages/guide/createGuidePage.tsx
@@ -1,8 +1,9 @@
+import { AddOrEditGuideViewModel, GuideSectionItemType, GuideSectionItemViewModel, GuideSectionViewModel } from '@assistantapps/assistantapps.api.client';
 import classNames from 'classnames';
 import React, { useContext, useEffect, useState } from 'react';
 import { connect } from 'react-redux';
-import { useLocation, useRoute } from "wouter";
 import { Form, Input, InputOnChangeData } from 'semantic-ui-react';
+import { useLocation, useRoute } from "wouter";
 import { SmallBanner } from '../../components/common/banner/banner';
 import { ConditionalToolTip } from '../../components/common/conditionalTooltip';
 import { DropDown } from '../../components/common/dropDown/dropDown';
@@ -15,10 +16,6 @@ import { AddImageSection, AddLinkSection, AddMarkdownSection, AddTextSection } f
 import { NetworkState } from '../../constants/networkState';
 import { editGuide, guides } from '../../constants/route';
 import { DropDownWithIcon } from '../../contracts/dropdown/dropDownWithIcon';
-import { GuideSectionItemType } from '../../contracts/generated/Enum/guideSectionItemType';
-import { AddOrEditGuideViewModel } from '../../contracts/generated/ViewModel/Guide/addOrEditGuideViewModel';
-import { GuideSectionItemViewModel } from '../../contracts/generated/ViewModel/Guide/guideSectionItemViewModel';
-import { GuideSectionViewModel } from '../../contracts/generated/ViewModel/Guide/guideSectionViewModel';
 import { errorDialog, getStringDialog, successDialog } from '../../helper/dialogHelper';
 import { newGuid } from '../../helper/guidHelper';
 import { DependencyInjectionContext } from '../../integration/dependencyInjection';
@@ -199,7 +196,7 @@ export const CreateGuidePageUnconnected: React.FC<IProps> = (props: IProps) => {
                 setSubmissionStatus(NetworkState.Error);
                 return;
             }
-            successDialog('Success', 'Your guide has been editted!');
+            successDialog('Success', 'Your guide has been edited!');
         }
         setSubmissionStatus(NetworkState.Success);
         setLocation(guides);
@@ -249,7 +246,7 @@ export const CreateGuidePageUnconnected: React.FC<IProps> = (props: IProps) => {
             }
             <div className="container">
                 <div className="row full pt3 pb1">
-                    <div className="col-12 col-md-6">
+                    <div className="col-12 col-md-6 custom-drop-down">
                         <Form>
                             <Form.Field >
                                 <label>Please select App you would like to create a guide for</label>
@@ -267,7 +264,7 @@ export const CreateGuidePageUnconnected: React.FC<IProps> = (props: IProps) => {
                                 : <p>Error loading apps, please refresh the page or contact us</p>
                         }
                     </div>
-                    <div className="col-12 col-md-6 custom-drop-down pt1 pt-md-0">
+                    <div className="col-12 col-md-6 custom-drop-down lang pt1 pt-md-0">
                         <Form>
                             <Form.Field >
                                 <label>Please select the language your guide will be written in</label>
diff --git a/src/pages/guide/createGuideSectionItems.tsx b/src/pages/guide/createGuideSectionItems.tsx
index 5c4e606..60507e3 100644
--- a/src/pages/guide/createGuideSectionItems.tsx
+++ b/src/pages/guide/createGuideSectionItems.tsx
@@ -1,7 +1,5 @@
-import React, { } from 'react';
-import { AddOrEditGuideViewModel } from '../../contracts/generated/ViewModel/Guide/addOrEditGuideViewModel';
-import { GuideSectionItemViewModel } from '../../contracts/generated/ViewModel/Guide/guideSectionItemViewModel';
-import { GuideSectionViewModel } from '../../contracts/generated/ViewModel/Guide/guideSectionViewModel';
+import { AddOrEditGuideViewModel, GuideSectionItemViewModel, GuideSectionViewModel } from '@assistantapps/assistantapps.api.client';
+import React from 'react';
 import { SectionItem } from './guideComponents';
 
 
diff --git a/src/pages/guide/createGuideSections.tsx b/src/pages/guide/createGuideSections.tsx
index fc6d0c2..2a82bf0 100644
--- a/src/pages/guide/createGuideSections.tsx
+++ b/src/pages/guide/createGuideSections.tsx
@@ -1,7 +1,6 @@
-import React, { } from 'react';
+import { AddOrEditGuideViewModel, GuideSectionViewModel } from '@assistantapps/assistantapps.api.client';
+import React from 'react';
 import { Icon, Popup } from 'semantic-ui-react';
-import { AddOrEditGuideViewModel } from '../../contracts/generated/ViewModel/Guide/addOrEditGuideViewModel';
-import { GuideSectionViewModel } from '../../contracts/generated/ViewModel/Guide/guideSectionViewModel';
 import { getStringDialog } from '../../helper/dialogHelper';
 import { CreateGuideSectionItems } from './createGuideSectionItems';
 import { ActionButtons } from './guideComponents';
diff --git a/src/pages/guide/guidListPage.Redux.ts b/src/pages/guide/guidListPage.Redux.ts
index 374663b..27bb468 100644
--- a/src/pages/guide/guidListPage.Redux.ts
+++ b/src/pages/guide/guidListPage.Redux.ts
@@ -1,9 +1,10 @@
 import { State } from '../../redux/state';
-import { getUserGuid } from '../../redux/modules/common/selector';
+import { getUserGuid, getUserName } from '../../redux/modules/common/selector';
 
 export const mapStateToProps = (state: State) => {
     return {
         userGuid: getUserGuid(state),
+        userName: getUserName(state),
     };
 };
 
diff --git a/src/pages/guide/guideComponents.tsx b/src/pages/guide/guideComponents.tsx
index 6c7923e..145e061 100644
--- a/src/pages/guide/guideComponents.tsx
+++ b/src/pages/guide/guideComponents.tsx
@@ -1,9 +1,8 @@
+import { GuideSectionItemType, GuideSectionItemViewModel } from '@assistantapps/assistantapps.api.client';
 import React, { useState } from 'react';
 import { Form, Icon, Label } from 'semantic-ui-react';
-import { GuideSectionItemType } from '../../contracts/generated/Enum/guideSectionItemType';
-import { GuideSectionItemViewModel } from '../../contracts/generated/ViewModel/Guide/guideSectionItemViewModel';
-import { MarkdownRenderer } from '../../components/common/markdown';
 import { LazyLoadImage } from '../../components/common/lazyLoadImage/lazyLoadImage';
+import { MarkdownRenderer } from '../../components/common/markdown';
 
 interface ISectionItemProps {
     index: number;
diff --git a/src/pages/guide/guideListPage.tsx b/src/pages/guide/guideListPage.tsx
index 8a013f5..3bfd5e3 100644
--- a/src/pages/guide/guideListPage.tsx
+++ b/src/pages/guide/guideListPage.tsx
@@ -1,41 +1,51 @@
 import React, { useContext, useEffect, useState } from 'react';
 import { connect } from 'react-redux';
+import { Button, Dropdown, Form, Icon, Input } from 'semantic-ui-react';
 import { useLocation } from 'wouter';
 import { SmallBanner } from '../../components/common/banner/banner';
 import { Error } from '../../components/common/error';
-import { Loading, SmallLoading } from '../../components/common/loading';
+import { SmallLoading } from '../../components/common/loading';
 import { LoginRequired } from '../../components/common/loginRequired';
 import { CreateUserGuideTile, UserGuideTile } from '../../components/guide/userGuideTile';
+import { AdminAprovalStatusOptions, DefaultAdminAprovalStatusSelection } from '../../constants/dropDown';
 import { NetworkState } from '../../constants/networkState';
 import { createGuide, editGuide, editGuideParam } from '../../constants/route';
-import { GuideSearchResultViewModel } from '../../contracts/generated/ViewModel/Guide/guideSearchResultViewModel';
 import { PaginationWithValue } from '../../contracts/pagination/paginationWithValue';
 import { anyObject } from '../../helper/typescriptHacks';
 import { DependencyInjectionContext } from '../../integration/dependencyInjection';
 import { mapStateToProps } from './guidListPage.Redux';
+import { AdminApprovalStatus, GuideSearchResultViewModel } from '@assistantapps/assistantapps.api.client';
 
 interface IFromRedux {
     userGuid: string;
+    userName: string;
 }
 
 interface IProps extends IFromRedux { }
 
+const defaultSelection = AdminAprovalStatusOptions.filter(opt => DefaultAdminAprovalStatusSelection.map(sel => AdminApprovalStatus[sel]).includes(opt.value)).map(opt => opt.value)
+
 export const GuideListPageUnconnected: React.FC<IProps> = (props: IProps) => {
     const [, setLocation] = useLocation();
     const services = useContext(DependencyInjectionContext);
     const [fetchStatus, setFetchStatus] = useState<NetworkState>(NetworkState.Pending);
     const [guidePagination, setGuidePagination] = useState<PaginationWithValue<Array<GuideSearchResultViewModel>>>(anyObject);
+    const [aprovalSelection, setAprovalSelection] = useState<Array<string>>(defaultSelection);
 
     useEffect(() => {
         const isNotLoggedIn = props.userGuid == null || props.userGuid.length < 1;
         if (isNotLoggedIn) return;
+
+        if (fetchStatus === NetworkState.Loading) return;
         fetchUserGuides();
         // eslint-disable-next-line
-    }, [props.userGuid])
+    }, [props.userGuid]);
 
-    const fetchUserGuides = async () => {
+    const fetchUserGuides = async (localAprovalSelection?: Array<string>) => {
+        setFetchStatus(NetworkState.Loading);
         const searchParams: any = {
             page: 1,
+            approvalStatusesToShow: localAprovalSelection ?? aprovalSelection,
         }
         const guidesResult = await services.assistantAppsApiService.getGuidesForUser(searchParams);
         if (guidesResult.isSuccess === false) {
@@ -100,12 +110,44 @@ export const GuideListPageUnconnected: React.FC<IProps> = (props: IProps) => {
             {banner}
             <div className="container">
                 <div className="row full pt3 pb3">
+                    <div className="col-12 col-md-12 mb-3">
+                        <Form>
+                            <Form.Group>
+                                <Form.Field width="6" className="pt1">
+                                    <label>Guides for:</label>
+                                    <Input className="noselect" value={props.userName} disabled />
+                                </Form.Field>
+                                <Form.Field width="9" className="pt1">
+                                    <label>Filter</label>
+                                    <Dropdown
+                                        placeholder="All"
+                                        fluid
+                                        multiple
+                                        search
+                                        selection
+                                        value={(aprovalSelection ?? [])}
+                                        onChange={(_, { value }: any) => {
+                                            setAprovalSelection(value);
+                                            fetchUserGuides(value);
+                                        }}
+                                        options={AdminAprovalStatusOptions}
+                                    />
+                                </Form.Field>
+                                <Form.Field width="1" className="pt1">
+                                    <label>&nbsp;</label>
+                                    <Button icon onClick={() => {
+                                        setAprovalSelection(defaultSelection);
+                                        fetchUserGuides(defaultSelection);
+                                    }}>
+                                        <Icon name='refresh' />
+                                    </Button>
+                                </Form.Field>
+                            </Form.Group>
+                        </Form>
+                    </div>
                     {renderPageContent()}
                 </div>
             </div>
-            {
-                (fetchStatus === NetworkState.Loading) && <Loading />
-            }
         </div>
     );
 };
diff --git a/src/pages/guide/translateGuidePage.tsx b/src/pages/guide/translateGuidePage.tsx
index d2852f0..2e5e17e 100644
--- a/src/pages/guide/translateGuidePage.tsx
+++ b/src/pages/guide/translateGuidePage.tsx
@@ -1,3 +1,4 @@
+import { AddOrEditGuideViewModel, GuideSectionItemViewModel, GuideSectionViewModel } from '@assistantapps/assistantapps.api.client';
 import classNames from 'classnames';
 import React, { useContext, useEffect, useState } from 'react';
 import { connect } from 'react-redux';
@@ -11,15 +12,12 @@ import { LoginRequired } from '../../components/common/loginRequired';
 import { TagsFormInput } from '../../components/common/tagComponent';
 import { NetworkState } from '../../constants/networkState';
 import { DropDownWithIcon } from '../../contracts/dropdown/dropDownWithIcon';
-import { AddOrEditGuideViewModel } from '../../contracts/generated/ViewModel/Guide/addOrEditGuideViewModel';
-import { GuideSectionItemViewModel } from '../../contracts/generated/ViewModel/Guide/guideSectionItemViewModel';
-import { GuideSectionViewModel } from '../../contracts/generated/ViewModel/Guide/guideSectionViewModel';
 import { getStringDialog, successDialog } from '../../helper/dialogHelper';
 import { DependencyInjectionContext } from '../../integration/dependencyInjection';
 import { appDetailsToAppDropDownMapper } from '../../mapper/appDetailsMapper';
 import { languageDetailsToTranslationLanguageDropDownMapper } from '../../mapper/languageDetailsMapper';
-import { ActionButtons, SectionItem } from './guideComponents';
 import { mapStateToProps } from './guidListPage.Redux';
+import { ActionButtons, SectionItem } from './guideComponents';
 
 interface IFromRedux {
     userGuid: string;
@@ -60,7 +58,7 @@ export const TranslateGuidePageUnconnected: React.FC<IProps> = (props: IProps) =
     }, [props.userGuid]);
 
     const fetchAppData = async () => {
-        var appsResult = await services.assistantAppsApiService.getApps();
+        const appsResult = await services.assistantAppsApiService.getApps();
         if (!appsResult.isSuccess) {
             setAppStatus(NetworkState.Error);
             return;
@@ -70,7 +68,7 @@ export const TranslateGuidePageUnconnected: React.FC<IProps> = (props: IProps) =
     }
 
     const fetchLanguageData = async () => {
-        var langResult = await services.assistantAppsApiService.getLanguages();
+        const langResult = await services.assistantAppsApiService.getLanguages();
         if (!langResult.isSuccess) {
             setLangStatus(NetworkState.Error);
             return;
diff --git a/src/pages/translation/translationComponents.tsx b/src/pages/translation/translationComponents.tsx
index 7cd91e4..e458cc7 100644
--- a/src/pages/translation/translationComponents.tsx
+++ b/src/pages/translation/translationComponents.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { Placeholder, Segment } from 'semantic-ui-react';
 import { TranslationImages } from '../../components/translationImages/translationImages';
 import { NetworkState } from '../../constants/networkState';
-import { TranslationKeyViewModel } from '../../contracts/generated/ViewModel/Translation/translationKeyViewModel';
+import { TranslationKeyViewModel } from '@assistantapps/assistantapps.api.client';
 
 interface IProps {
     translationKeyStatus: NetworkState;
diff --git a/src/pages/translation/translationContainer.tsx b/src/pages/translation/translationContainer.tsx
index 304e1f7..921723b 100644
--- a/src/pages/translation/translationContainer.tsx
+++ b/src/pages/translation/translationContainer.tsx
@@ -1,11 +1,7 @@
+import { AppViewModel, LanguageViewModel, TranslationKeySearchDropdownViewModel, TranslationKeyViewModel, TranslationSearchViewModel } from '@assistantapps/assistantapps.api.client';
 import React from 'react';
 import { connect } from 'react-redux';
 import { NetworkState } from '../../constants/networkState';
-import { AppViewModel } from '../../contracts/generated/ViewModel/appViewModel';
-import { LanguageViewModel } from '../../contracts/generated/ViewModel/languageViewModel';
-import { TranslationKeySearchDropdownViewModel } from '../../contracts/generated/ViewModel/Translation/translationKeySearchDropdownViewModel';
-import { TranslationKeyViewModel } from '../../contracts/generated/ViewModel/Translation/translationKeyViewModel';
-import { TranslationSearchViewModel } from '../../contracts/generated/ViewModel/Translation/translationSearchViewModel';
 import { IDependencyInjection, withServices } from '../../integration/dependencyInjection';
 import { appDetailsToAppDropDownMapper } from '../../mapper/appDetailsMapper';
 import { languageDetailsToTranslationLanguageDropDownMapper } from '../../mapper/languageDetailsMapper';
@@ -87,7 +83,7 @@ export class TranslationContainerUnconnected extends React.Component<IProps, ISt
     }
 
     fetchLanguageData = async () => {
-        var langResult = await this.props.assistantAppsApiService.getLanguages();
+        const langResult = await this.props.assistantAppsApiService.getLanguages();
         if (!langResult.isSuccess) {
             this.setState(() => {
                 return {
@@ -110,12 +106,12 @@ export class TranslationContainerUnconnected extends React.Component<IProps, ISt
                 translationKeyStatus: NetworkState.Loading
             }
         });
-        var searchObj: TranslationSearchViewModel = {
+        const searchObj: TranslationSearchViewModel = {
             appGuidList: this.state.selectedApps,
             languageGuid: this.state.selectedLanguage,
             showOnlyUntranslated: onlyUntranslated,
         }
-        var transKeyResult = await this.props.assistantAppsApiService.getTranslationKeys(searchObj);
+        const transKeyResult = await this.props.assistantAppsApiService.getTranslationKeys(searchObj);
         if (!transKeyResult.isSuccess) {
             this.setState(() => {
                 return {
@@ -139,12 +135,12 @@ export class TranslationContainerUnconnected extends React.Component<IProps, ISt
                 translationKeyDropdownStatus: NetworkState.Loading
             }
         });
-        var searchObj: TranslationSearchViewModel = {
+        const searchObj: TranslationSearchViewModel = {
             appGuidList: this.state.selectedApps,
             languageGuid: this.state.selectedLanguage,
             showOnlyUntranslated: onlyUntranslated,
         }
-        var transKeySearchDropDownResult = await this.props.assistantAppsApiService.getTranslationKeysSearchDropdown(searchObj);
+        const transKeySearchDropDownResult = await this.props.assistantAppsApiService.getTranslationKeysSearchDropdown(searchObj);
         if (!transKeySearchDropDownResult.isSuccess) {
             this.setState(() => {
                 return {
diff --git a/src/pages/translation/translationPresenter.tsx b/src/pages/translation/translationPresenter.tsx
index de72daa..3615d25 100644
--- a/src/pages/translation/translationPresenter.tsx
+++ b/src/pages/translation/translationPresenter.tsx
@@ -1,3 +1,4 @@
+import { TranslationKeySearchDropdownViewModel, TranslationKeyViewModel } from '@assistantapps/assistantapps.api.client';
 import classNames from 'classnames';
 import React from 'react';
 import { Icon, Pagination, PaginationProps } from 'semantic-ui-react';
@@ -11,8 +12,6 @@ import { TranslationSearch } from '../../components/translationSearch/translatio
 import { TranslationVoteContainer } from '../../components/translationVote/translationVoteContainer';
 import { NetworkState } from '../../constants/networkState';
 import { DropDownWithIcon } from '../../contracts/dropdown/dropDownWithIcon';
-import { TranslationKeySearchDropdownViewModel } from '../../contracts/generated/ViewModel/Translation/translationKeySearchDropdownViewModel';
-import { TranslationKeyViewModel } from '../../contracts/generated/ViewModel/Translation/translationKeyViewModel';
 import { MainTranslationPanel } from './translationComponents';
 
 interface IProps {
@@ -101,7 +100,7 @@ export const TranslationPresenter: React.FC<IProps> = (props: IProps) => {
             {banner}
             <div className="container">
                 <div className="row full pt3 pb1">
-                    <div className="col-12 col-md-6">
+                    <div className="col-12 col-md-6 custom-drop-down">
                         <label>Please select Apps you would like to translate for</label>
                         {
                             (props.appStatus !== NetworkState.Error)
@@ -110,12 +109,12 @@ export const TranslationPresenter: React.FC<IProps> = (props: IProps) => {
                                     options={props.appDropDowns}
                                     multiple={true}
                                     isLoading={props.appStatus === NetworkState.Loading}
-                                    onChange={(apps: any) => props.setApps(apps)}
+                                    onChange={(apps: any) => props.setApps(Array.isArray(apps) ? apps : [apps])}
                                 />
                                 : <p>Error loading apps, please refresh the page or contact us</p>
                         }
                     </div>
-                    <div className="col-12 col-md-6 custom-drop-down pt1 pt-md-0">
+                    <div className="col-12 col-md-6 custom-drop-down lang pt1 pt-md-0">
                         <label>Please select a language</label>
                         {
                             (props.langStatus !== NetworkState.Error)
diff --git a/src/reactTag.scss b/src/reactTag.scss
new file mode 100644
index 0000000..9adcfdc
--- /dev/null
+++ b/src/reactTag.scss
@@ -0,0 +1,98 @@
+.react-tag-input {
+    box-sizing: border-box;
+    position: relative;
+    width: 100%;
+    height: auto;
+    min-height: 2.375em;
+    padding: 0.1875em 0.375em;
+    overflow-y: auto;
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    font-size: 1rem;
+    background: #fff;
+    color: #333;
+    border: 1px solid #e1e1e1;
+    border-radius: 3px;
+}
+.react-tag-input * {
+    box-sizing: border-box;
+}
+.react-tag-input > * {
+    margin: 0.1875em;
+}
+.react-tag-input__input {
+    width: auto;
+    flex-grow: 1;
+    height: 1.875em;
+    padding: 0 0 0 0.1875em;
+    margin: 0 0.1875em;
+    font-size: 1em;
+    line-height: 1;
+    background: transparent;
+    color: #333;
+    border: none;
+    border-radius: 3px;
+    outline: 0;
+    box-shadow: none;
+    -webkit-appearance: none;
+}
+.react-tag-input__input::placeholder,
+.react-tag-input__input:-moz-placeholder,
+.react-tag-input__input:-ms-input-placeholder,
+.react-tag-input__input::-moz-placeholder,
+.react-tag-input__input::-webkit-input-placeholder {
+    color: #333;
+}
+.react-tag-input__input:focus {
+    border: none;
+}
+.react-tag-input__tag {
+    position: relative;
+    display: flex;
+    align-items: center;
+    font-size: 0.85em;
+    line-height: 1;
+    background: #e1e1e1;
+    border-radius: 3px;
+}
+.react-tag-input__tag__content {
+    outline: 0;
+    border: none;
+    white-space: nowrap;
+    padding: 0 0.46875em;
+}
+.react-tag-input__tag__remove {
+    position: relative;
+    height: 2em;
+    width: 2em;
+    font-size: 0.85em;
+    cursor: pointer;
+    background: #d4d4d4;
+    border-top-right-radius: 3px;
+    border-bottom-right-radius: 3px;
+}
+.react-tag-input__tag__remove:before,
+.react-tag-input__tag__remove:after {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    content: " ";
+    height: 0.9em;
+    width: 0.15em;
+    background-color: #333;
+}
+.react-tag-input__tag__remove:before {
+    transform: translateX(-50%) translateY(-50%) rotate(45deg);
+}
+.react-tag-input__tag__remove:after {
+    transform: translateX(-50%) translateY(-50%) rotate(-45deg);
+}
+.react-tag-input__tag__remove-readonly {
+    width: 0;
+}
+.react-tag-input__tag__remove-readonly:before,
+.react-tag-input__tag__remove-readonly:after {
+    content: "";
+    width: 0;
+} /*# sourceMappingURL=index.css.map */
diff --git a/src/scss/custom/_custom.scss b/src/scss/custom/_custom.scss
index 9f561d3..6fcbc42 100644
--- a/src/scss/custom/_custom.scss
+++ b/src/scss/custom/_custom.scss
@@ -1,4 +1,5 @@
 @import "../variables";
+@import "dark";
 @import "oauth";
 @import "buttons";
 @import "dropdown";
diff --git a/src/scss/custom/_dark.scss b/src/scss/custom/_dark.scss
new file mode 100644
index 0000000..99d5369
--- /dev/null
+++ b/src/scss/custom/_dark.scss
@@ -0,0 +1,173 @@
+$bgColour: #20201e;
+$borderColour: #0c0c0c;
+$widgetColour: #3b3b38;
+$focusColour: #4b4b4a;
+$focusDarkColour: darken($focusColour, 10%);
+$textColour: rgb(219, 219, 219);
+
+body.dark {
+    background: $bgColour !important;
+    color: $textColour !important;
+
+    .ui.form .field>label {
+        color: $textColour;
+        font-size: 1em;
+    }
+
+    .ui.menu {
+        background: $focusDarkColour;
+        border: 1px solid $focusDarkColour;
+    }
+
+    .ui.pagination.menu .item {
+        &:before {
+            background-color: $focusDarkColour;
+        }
+
+        &.active {
+            background-color: $focusDarkColour !important;
+        }
+    }
+
+    .ui.basic.label,
+    .ui.selection.dropdown,
+    .react-tag-input,
+    .react-tag-input__input,
+    .ui.selection.active.dropdown .menu,
+    .ui.icon.button,
+    .ui.menu .item,
+    .ui.popup,
+    .ui.popup:before {
+        color: $textColour !important;
+        background: $widgetColour !important;
+
+        &:hover {
+            border-color: $borderColour !important;
+        }
+    }
+
+    .ui.dropdown .menu .item,
+    .ui.dropdown,
+    .ui.card>.content>.header,
+    .ui.cards>.card>.content>.header {
+        color: $textColour;
+    }
+
+    .ui.selection.active.dropdown .menu {
+        border-color: $borderColour;
+    }
+
+    .ui.selection.dropdown .menu>.item {
+        border-top: 1px solid $focusDarkColour;
+    }
+
+    .ui.placeholder.segment,
+    .card {
+        background: $focusDarkColour;
+    }
+
+    .ui.selection.dropdown {
+        border: 1px solid $borderColour;
+    }
+
+    .ui.fluid.multiple.selection.dropdown .ui.label,
+    .ui.basic.label {
+        color: $textColour;
+        background: $focusColour;
+    }
+
+    .ui.labeled.button.vote-opt {
+        .ui.basic.label {
+            background: lighten($focusColour, 10%) !important;
+
+            &.no-radius {
+                border-radius: 0;
+            }
+
+            &.blue {
+                background-color: #3591ad !important;
+            }
+        }
+    }
+
+    .react-tag-input {
+        border: none;
+    }
+
+    .react-tag-input__tag,
+    .react-tag-input__tag__remove {
+        color: $textColour;
+        background: $focusColour;
+
+        :after,
+        :before {
+            background-color: red;
+        }
+    }
+
+    .ui.placeholder {
+        background-color: #4e4e4e;
+        background-image: linear-gradient(to right, rgba(255, 255, 255, .08) 0, rgba(255, 255, 255, .15) 15%, rgba(255, 255, 255, .08) 30%);
+    }
+
+    .ui.placeholder,
+    .ui.placeholder .image.header:after,
+    .ui.placeholder .line,
+    .ui.placeholder .line:after,
+    .ui.placeholder>:before {
+        background-color: $bgColour;
+    }
+
+    .ui.form,
+    .ui.input {
+
+        input:not([type]),
+        input[type=date],
+        input[type=datetime-local],
+        input[type=email],
+        input[type=file],
+        input[type=number],
+        input[type=password],
+        input[type=search],
+        input[type=tel],
+        input[type=text],
+        input[type=time],
+        input[type=url],
+        textarea {
+            color: $textColour;
+            background: $widgetColour;
+
+            &:focus {
+                color: $textColour;
+                background: $focusColour;
+            }
+        }
+    }
+
+    .button.disabled {
+        border-color: #616161;
+        background: #777777;
+    }
+
+    .guide-page {
+
+        .ui.card.guide {
+
+            .meta {
+                color: rgba(255, 255, 255, .4)
+            }
+
+            .content>.description {
+                color: rgba(255, 255, 255, .68)
+            }
+
+            .description.guide-status.approved>span {
+                color: lightgreen;
+            }
+
+            .description.guide-status.pending>span {
+                color: lightblue;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/scss/custom/_dropdown.scss b/src/scss/custom/_dropdown.scss
index 3777f00..c9fbff3 100644
--- a/src/scss/custom/_dropdown.scss
+++ b/src/scss/custom/_dropdown.scss
@@ -4,17 +4,26 @@
     .ui.dropdown .menu>.item>img,
     .ui.dropdown>.text>.image,
     .ui.dropdown>.text>img {
-
         max-width: 3em;
     }
 
-    .ui.dropdown>.text {
-        display: inline;
-    }
-
     .ui.multiple.dropdown>.label {
         margin-top: 0;
         margin-left: 0;
         margin-bottom: 0;
     }
+
+    img.ui.image {
+        border-radius: 4px;
+    }
+
+    &.lang {
+        .ui.dropdown>.text {
+            display: inline;
+        }
+
+        img.ui.image {
+            border-radius: 0;
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/scss/custom/_guide.scss b/src/scss/custom/_guide.scss
index d23da84..10fcc35 100644
--- a/src/scss/custom/_guide.scss
+++ b/src/scss/custom/_guide.scss
@@ -3,6 +3,11 @@
     .card.guide {
         .content .header {
             position: relative;
+            padding-right: 2em;
+
+            text-overflow: ellipsis;
+            overflow: hidden;
+            white-space: nowrap;
         }
 
         .card-body {
@@ -47,6 +52,7 @@
 
         img {
             max-height: 400px;
+            border-radius: 0.5em;
         }
     }
 
diff --git a/src/scss/favison.scss b/src/scss/favison.scss
index bf82008..0d2da9c 100644
--- a/src/scss/favison.scss
+++ b/src/scss/favison.scss
@@ -96,6 +96,4 @@ Table of Content:
 @import "footer";
 /*---------------------------------------------------- */
 
-/*----------------------------------------------------*/
-@import "custom/custom";
-/*---------------------------------------------------- */
\ No newline at end of file
+/*----------------------------------------------------*/
\ No newline at end of file
diff --git a/src/services/api/AssistantAppsApiService.ts b/src/services/api/AssistantAppsApiService.ts
index fb7611e..158e83c 100644
--- a/src/services/api/AssistantAppsApiService.ts
+++ b/src/services/api/AssistantAppsApiService.ts
@@ -1,70 +1,51 @@
+import { AssistantAppsApiService as aaApi, AddOrEditGuideViewModel, AppViewModel, GuideContentViewModel, GuideSearchResultViewModel, GuideSearchViewModel, IUserLogin, LanguageViewModel, OAuthUserViewModel, TranslationGetGraphViewModel, TranslationImageViewModel, TranslationKeySearchDropdownViewModel, TranslationKeyViewModel, TranslationReportAddViewModel, TranslationSearchViewModel, TranslationsPerLanguageGraphViewModel, TranslationSubmissionViewModel, TranslationSubmissionWithVotesViewModel, TranslationVoteViewModel, TranslatorLeaderboardItemViewModel } from '@assistantapps/assistantapps.api.client';
 import * as apiEndpoints from '../../constants/apiEndpoints';
 import * as storageType from '../../constants/storageType';
-import { AppViewModel } from '../../contracts/generated/ViewModel/appViewModel';
-import { getExpiryDateUtc } from '../../helper/dateHelper';
-import { GuideSearchResultViewModel } from '../../contracts/generated/ViewModel/Guide/guideSearchResultViewModel';
-import { GuideSearchViewModel } from '../../contracts/generated/ViewModel/Guide/guideSearchViewModel';
-import { LanguageViewModel } from '../../contracts/generated/ViewModel/languageViewModel';
-import { OAuthUserViewModel } from '../../contracts/generated/ViewModel/oAuthUserViewModel';
-import { TranslationGetGraphViewModel } from '../../contracts/generated/ViewModel/Translation/translationGetGraphViewModel';
-import { TranslationImageViewModel } from '../../contracts/generated/ViewModel/Translation/translationImageViewModel';
-import { TranslationKeySearchDropdownViewModel } from '../../contracts/generated/ViewModel/Translation/translationKeySearchDropdownViewModel';
-import { TranslationKeyViewModel } from '../../contracts/generated/ViewModel/Translation/translationKeyViewModel';
-import { TranslationSearchViewModel } from '../../contracts/generated/ViewModel/Translation/translationSearchViewModel';
-import { TranslationsPerLanguageGraphViewModel } from '../../contracts/generated/ViewModel/Translation/translationsPerLanguageGraphViewModel';
-import { TranslationSubmissionViewModel } from '../../contracts/generated/ViewModel/Translation/translationSubmissionViewModel';
-import { TranslationSubmissionWithVotesViewModel } from '../../contracts/generated/ViewModel/Translation/translationSubmissionWithVotesViewModel';
-import { TranslationVoteViewModel } from '../../contracts/generated/ViewModel/Translation/translationVoteViewModel';
 import { ILoginProps } from '../../contracts/login';
 import { PaginationWithValue } from '../../contracts/pagination/paginationWithValue';
 import { Result, ResultWithValue } from '../../contracts/results/ResultWithValue';
+import { getExpiryDateUtc } from '../../helper/dateHelper';
 import { BaseApiService } from './../BaseApiService';
 import { StorageService } from './../StorageService';
-import { AddOrEditGuideViewModel } from '../../contracts/generated/ViewModel/Guide/addOrEditGuideViewModel';
-import { GuideContentViewModel } from '../../contracts/generated/ViewModel/Guide/guideContentViewModel';
-import { TranslatorLeaderboardItemViewModel } from '../../contracts/generated/ViewModel/Translation/translatorLeaderboardItemViewModel';
-import { TranslationReportAddViewModel } from '../../contracts/generated/ViewModel/Translation/translationReportAddViewModel';
 
 export class AssistantAppsApiService extends BaseApiService {
-    // Base
-    getApps = (): Promise<ResultWithValue<Array<AppViewModel>>> =>
-        this.get<Array<AppViewModel>>(apiEndpoints.app);
-    getLanguages = (): Promise<ResultWithValue<Array<LanguageViewModel>>> =>
-        this.get<Array<LanguageViewModel>>(apiEndpoints.language);
-
-    // Translations
-    getTranslationKeys = (searchObj: TranslationSearchViewModel): Promise<ResultWithValue<Array<TranslationKeyViewModel>>> =>
-        this.post<Array<TranslationKeyViewModel>>(apiEndpoints.translationKeySearch, searchObj);
-
-    getTranslationKeysSearchDropdown = (searchObj: TranslationSearchViewModel): Promise<ResultWithValue<Array<TranslationKeySearchDropdownViewModel>>> =>
-        this.post<Array<TranslationKeySearchDropdownViewModel>>(apiEndpoints.translationKeySearchDropdown, searchObj);
-
-    getTranslationImages = (translationKeyGuid: string): Promise<ResultWithValue<Array<TranslationImageViewModel>>> =>
-        this.get<Array<TranslationImageViewModel>>(`${apiEndpoints.translationKeyImages}/${translationKeyGuid}`);
+    private _api: aaApi;
 
-    getTranslationVotes = (translationKeyGuid: string): Promise<ResultWithValue<Array<TranslationVoteViewModel>>> =>
-        this.get<Array<TranslationVoteViewModel>>(`${apiEndpoints.translationVotes}/${translationKeyGuid}`);
+    constructor() {
+        super();
 
-    getSubmittedTranslations = (translationKeyGuid: string, languageGuid: string): Promise<ResultWithValue<Array<TranslationSubmissionWithVotesViewModel>>> =>
-        this.get<Array<TranslationSubmissionWithVotesViewModel>>(`${apiEndpoints.translation}/${translationKeyGuid}/${languageGuid}`);
+        const storageServ = new StorageService();
+        const tokenFromStorage = storageServ.get<string>(storageType.token);
+        this._api = new aaApi({
+            url: window.config.apiUrl,
+            authToken: (tokenFromStorage.isSuccess) ? tokenFromStorage.value : undefined,
+        });
+    }
 
-    submitTranslation = (data: TranslationSubmissionViewModel): Promise<Result> =>
-        this.post(apiEndpoints.translation, data);
+    // Base
+    getApps = (): Promise<ResultWithValue<Array<AppViewModel>>> => this._api.app.readAll();
+    getLanguages = (): Promise<ResultWithValue<Array<LanguageViewModel>>> => this._api.language.readAll();
 
-    deleteTranslation = (guid: string): Promise<Result> =>
-        this.delete(`${apiEndpoints.translation}/${guid}`);
+    // Translations
+    submitTranslation = (data: TranslationSubmissionViewModel): Promise<Result> => this._api.translation.create(data);
+    deleteTranslation = (guid: string): Promise<Result> => this._api.translation.del(guid);
+    getTranslationsPerLangGraphData = (data: TranslationGetGraphViewModel): Promise<ResultWithValue<Array<TranslationsPerLanguageGraphViewModel>>> => this._api.translation.createSearchPerLanguage(data);
 
-    selectTranslationVote = (data: TranslationVoteViewModel): Promise<Result> =>
-        this.post(apiEndpoints.translationVotes, data);
+    // Translations
+    getTranslationKeys = (searchObj: TranslationSearchViewModel): Promise<ResultWithValue<Array<TranslationKeyViewModel>>> => this._api.translationKey.createSearch(searchObj);
+    getTranslationKeysSearchDropdown = (searchObj: TranslationSearchViewModel): Promise<ResultWithValue<Array<TranslationKeySearchDropdownViewModel>>> => this._api.translationKey.createSearchDropdown(searchObj);
+    getSubmittedTranslations = (translationKeyGuid: string, languageGuid: string): Promise<ResultWithValue<Array<TranslationSubmissionWithVotesViewModel>>> => this._api.translation.readForLang(translationKeyGuid, languageGuid);
 
-    reportTranslation = (data: TranslationReportAddViewModel): Promise<Result> =>
-        this.post(apiEndpoints.translationReports, data);
+    // Translation Images
+    getTranslationImages = (translationKeyGuid: string): Promise<ResultWithValue<Array<TranslationImageViewModel>>> => this._api.translationImage.readAll(translationKeyGuid);
 
-    getTranslationsPerLangGraphData = (data: TranslationGetGraphViewModel): Promise<ResultWithValue<Array<TranslationsPerLanguageGraphViewModel>>> =>
-        this.post(apiEndpoints.translationsPerLangGraph, data);
+    // Translation Votes
+    getTranslationVotes = (translationKeyGuid: string): Promise<ResultWithValue<Array<TranslationVoteViewModel>>> => this._api.translationVote.readForTansKeyGuid(translationKeyGuid);
+    selectTranslationVote = (data: TranslationVoteViewModel): Promise<Result> => this._api.translationVote.create(data);
 
-    getTranslators = (data: any): Promise<ResultWithValue<Array<TranslatorLeaderboardItemViewModel>>> =>
-        this.post(apiEndpoints.translatorLeaderboard, data);
+    // Translation Reports
+    reportTranslation = (data: TranslationReportAddViewModel): Promise<Result> => this._api.translationReport.create(data);
+    getTranslators = (data: any): Promise<ResultWithValue<Array<TranslatorLeaderboardItemViewModel>>> => this._api.translationStat.readAll(data);
 
 
     // Guides
@@ -74,8 +55,8 @@ export class AssistantAppsApiService extends BaseApiService {
         this.get(apiEndpoints.guide.getGuideById.replace(apiEndpoints.guideParam.getGuideById, id));
     submitGuide = (newGuide: AddOrEditGuideViewModel): Promise<Result> =>
         this.post(apiEndpoints.guide.submitGuide, newGuide);
-    editGuide = (guid: string, edittedGuide: AddOrEditGuideViewModel): Promise<Result> =>
-        this.post(apiEndpoints.guide.editGuide.replace(apiEndpoints.guideParam.editGuide, guid), edittedGuide);
+    editGuide = (guid: string, editedGuide: AddOrEditGuideViewModel): Promise<Result> =>
+        this.post(apiEndpoints.guide.editGuide.replace(apiEndpoints.guideParam.editGuide, guid), editedGuide);
     deleteGuide = (guid: string): Promise<Result> =>
         this.delete(apiEndpoints.guide.deleteGuide.replace(apiEndpoints.guideParam.deleteGuide, guid));
 
@@ -85,19 +66,28 @@ export class AssistantAppsApiService extends BaseApiService {
         let userGuid = '';
         let timeTillExpiry = 0;
         let expiryDate = new Date();
-        const apiResult = await this.post(apiEndpoints.authUrl, oAuthObj, (headers) => {
-            const token = headers.token;
-            timeTillExpiry = headers.tokenexpiry;
-            userGuid = headers.userguid;
-
-            this.setInterceptors(token);
-            expiryDate = getExpiryDateUtc(timeTillExpiry);
-
-            const storageServ = new StorageService();
-            storageServ.set(storageType.token, token, expiryDate);
-            storageServ.set(storageType.userGuid, userGuid, expiryDate);
-            storageServ.set(storageType.userName, oAuthObj.username, expiryDate);
-        });
+        const apiResult = await this._api.account.loginWithGoogleAuth(
+            oAuthObj,
+            (userAcc: IUserLogin) => {
+                const token = userAcc.token;
+                timeTillExpiry = parseInt(userAcc.tokenExpiry);
+                userGuid = userAcc.userGuid;
+
+                this.setInterceptors(token);
+                expiryDate = getExpiryDateUtc(timeTillExpiry);
+
+                const storageServ = new StorageService();
+                storageServ.set(storageType.token, token, expiryDate);
+                storageServ.set(storageType.userGuid, userGuid, expiryDate);
+                storageServ.set(storageType.userName, oAuthObj.username, expiryDate);
+
+
+                this._api = new aaApi({
+                    url: window.config.apiUrl,
+                    authToken: userAcc.token,
+                })
+            },
+        );
 
         const loginData: ILoginProps = {
             userGuid: userGuid,
diff --git a/src/utils.ts b/src/utils.ts
index 4ec3b09..ec8e499 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -1,9 +1,9 @@
 export const getJSON = (url: string, callback: any) => {
-    var xhr = new XMLHttpRequest();
+    const xhr = new XMLHttpRequest();
     xhr.open('GET', url, true);
     xhr.responseType = 'json';
     xhr.onload = function () {
-        var status = xhr.status;
+        const status = xhr.status;
         if (status === 200) {
             callback(true, xhr.response);
         } else {