diff --git a/.eslintrc.json b/.eslintrc.json
index d357e31ef1..9bed5da602 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -19,7 +19,8 @@
 
         "react",
         "jsx-a11y",
-        "progress"
+        "progress",
+        "unused-imports"
     ],
     "extends": [
         "eslint:recommended",
@@ -53,7 +54,17 @@
             "error",
             "unix"
         ],
-        "no-unused-vars": "error",
+        "no-unused-vars": "off",
+    "unused-imports/no-unused-imports": "error",
+    "unused-imports/no-unused-vars": [
+      "error",
+      {
+        "vars": "all",
+        "varsIgnorePattern": "^_",
+        "args": "after-used",
+        "argsIgnorePattern": "^_"
+      }
+    ],
         "no-console": "error",
         "no-undef": "error",
         "no-empty": "error",
diff --git a/_test/performance-tracker/app.ts b/_test/performance-tracker/app.ts
index 646ea931c3..1ab1696d14 100644
--- a/_test/performance-tracker/app.ts
+++ b/_test/performance-tracker/app.ts
@@ -41,5 +41,5 @@ app.post('/post', async function (req: Request, res: Response) {
 })
 
 app.listen(4050, function () {
-    console.log("Server running on PORT: " + 4050)
+    logger.info("Server running on PORT: " + 4050)
 });
\ No newline at end of file
diff --git a/_test/script-monitor/scriptSandbox.test.ts b/_test/script-monitor/scriptSandbox.test.ts
index add6bcaed7..903dccf4c1 100644
--- a/_test/script-monitor/scriptSandbox.test.ts
+++ b/_test/script-monitor/scriptSandbox.test.ts
@@ -15,7 +15,7 @@ describe('ScriptMonitor V2', function () {
     before(function () {
 
       import express from "express"
-      const app = express();
+      const app = express.getExpressApp();
       app.get("/test", (req: Request, res: Response) => res.send("yipee!"));
       server = app.listen(5050);
     });
@@ -54,7 +54,7 @@ describe('ScriptMonitor V2', function () {
     it("should return false for error thrown in script", async function () {
       const someFunction = async (done: $TSFixMe) => {
         console.log('Error log');
-        console.error('Bad Error');
+        logger.error('Bad Error');
         throw new Error("Bad error");
       }
       const result = await runScript(someFunction.toString(), true);
diff --git a/_test/script-monitor/scriptSandbox.ts b/_test/script-monitor/scriptSandbox.ts
index 7f1fb8117e..e56349fa24 100644
--- a/_test/script-monitor/scriptSandbox.ts
+++ b/_test/script-monitor/scriptSandbox.ts
@@ -1,5 +1,5 @@
 import { join } from "path"
-import {performance} from 'perf_hooks'
+import { performance } from 'perf_hooks'
 
 import {
     isMainThread,
@@ -22,11 +22,11 @@ class ScriptMonitorError extends Error {
         super();
         this.message = message;
         this.errors = Array.isArray(errors)
-        ? errors.reduce(
-              (allErr, err) => [...allErr, err.message].join(','),
-              []
-          )
-        : (errors.message ?? errors);
+            ? errors.reduce(
+                (allErr, err) => [...allErr, err.message].join(','),
+                []
+            )
+            : (errors.message ?? errors);
     }
 }
 
@@ -37,7 +37,7 @@ const {
 } = runConfig;
 
 const runScript = async (functionCode: $TSFixMe, isCalled: $TSFixMe, options = { maxScriptRunTime, maxSyncStatementDuration }) => {
-    
+
 
     if (isMainThread) {
         // modifiable option in development mode only
@@ -65,7 +65,7 @@ const runScript = async (functionCode: $TSFixMe, isCalled: $TSFixMe, options = {
                         lastMessage = Date.now();
                         break;
                     }
-                    case 'log':{
+                    case 'log': {
                         consoleLogs.push(payload);
                         break;
                     }
@@ -100,8 +100,8 @@ const runScript = async (functionCode: $TSFixMe, isCalled: $TSFixMe, options = {
                         const message = statementTimeExceeded
                             ? `Max. synchronous statement execution time exceeded (${maxSyncStatementDuration}ms)`
                             : scriptTimeExceeded
-                            ? `Max. script execution time exceeded (${maxScriptRunTime}ms)`
-                            : 'Script was terminated';
+                                ? `Max. script execution time exceeded (${maxScriptRunTime}ms)`
+                                : 'Script was terminated';
                         resolve({
                             success: false,
                             message,
@@ -176,7 +176,7 @@ const runScript = async (functionCode: $TSFixMe, isCalled: $TSFixMe, options = {
         });
     } else {
         // worker_threads code
-        
+
         import { NodeVM } from 'vm2'
         const vm = new NodeVM({
             eval: false,
@@ -189,16 +189,16 @@ const runScript = async (functionCode: $TSFixMe, isCalled: $TSFixMe, options = {
             console: 'redirect',
         });
 
-        vm.on('console.log', (log: $TSFixMe) => {
-            parentPort.postMessage({type: 'log', payload: `[log]: ${log}`});
+        vm.on('logger.info', (log: $TSFixMe) => {
+            parentPort.postMessage({ type: 'log', payload: `[log]: ${log}` });
         });
 
-        vm.on('console.error', (error: $TSFixMe) => {
-            parentPort.postMessage({type: 'log', payload: `[error]: ${error}`});
+        vm.on('logger.error', (error: $TSFixMe) => {
+            parentPort.postMessage({ type: 'log', payload: `[error]: ${error}` });
         });
 
         vm.on('console.warn', (error: $TSFixMe) => {
-            parentPort.postMessage({type: 'log', payload: `[warn]: ${error}`});
+            parentPort.postMessage({ type: 'log', payload: `[warn]: ${error}` });
         });
 
         const scriptCompletedCallback = (err: $TSFixMe) => {
@@ -208,7 +208,7 @@ const runScript = async (functionCode: $TSFixMe, isCalled: $TSFixMe, options = {
         };
 
         const code = workerData.functionCode;
-        setInterval(() => parentPort.postMessage({type: 'ping'}), 500);
+        setInterval(() => parentPort.postMessage({ type: 'ping' }), 500);
         const sandboxFunction = await vm.run(
             `export default ${code}`,
             join(process.cwd(), 'node_modules')
diff --git a/_test/status-bubble/index.html b/_test/status-bubble/index.html
index b6b7c3d08e..d8eab38d7b 100644
--- a/_test/status-bubble/index.html
+++ b/_test/status-bubble/index.html
@@ -76,7 +76,7 @@
                 placeholderTitleDiv.className = 'text';
                 placeholderTitleDiv.innerHTML = statusMessage;
             })
-            .catch(err => console.error(err));
+            .catch(err => logger.error(err));
     }
     window.onload = function() {
         initializeBubble();
diff --git a/accounts/index.ts b/accounts/index.ts
index d3d96a3186..065f1b5caf 100755
--- a/accounts/index.ts
+++ b/accounts/index.ts
@@ -1,13 +1,9 @@
 import 'common-server/utils/env';
 import 'common-server/utils/process';
-
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import logger from 'common-server/utils/logger';
+import express, { Request, Response } from 'common-server/utils/express';
 import path from 'path';
-const app = express();
+const app = express.getExpressApp();
 
 import compression from 'compression';
 
@@ -79,6 +75,6 @@ app.get('/*', function (req: Request, res: Response) {
 });
 
 const PORT = process.env.PORT || 3003;
-// eslint-disable-next-line no-console
-console.log(`This project is running on port ${PORT}`);
+
+logger.info(`This project is running on port ${PORT}`);
 app.listen(PORT);
diff --git a/accounts/lighthouseWorker.ts b/accounts/lighthouseWorker.ts
index fb0c38a469..f00b0fedb3 100644
--- a/accounts/lighthouseWorker.ts
+++ b/accounts/lighthouseWorker.ts
@@ -1,4 +1,5 @@
 import lighthouse from 'lighthouse';
+import logger from 'common-server/utils/logger';
 import chromeLauncher from 'chrome-launcher';
 import ora from 'ora';
 
@@ -104,8 +105,7 @@ process.on('message', function (data) {
             return scores;
         })
         .catch(err => {
-            // eslint-disable-next-line no-console
-            console.log(err);
+            logger.info(err);
             process.exit(1);
         });
 });
diff --git a/accounts/src/config.tsx b/accounts/src/config.tsx
index bbfcd7da05..13cc2b2899 100755
--- a/accounts/src/config.tsx
+++ b/accounts/src/config.tsx
@@ -24,8 +24,8 @@ if (
     const address = window.location.host.includes('localhost:')
         ? 'localhost'
         : window.location.host.includes('0.0.0.0:')
-        ? '0.0.0.0'
-        : '127.0.0.1';
+            ? '0.0.0.0'
+            : '127.0.0.1';
     apiUrl = window.location.protocol + `//${address}:3002/api`;
     dashboardUrl = window.location.protocol + `//${address}:3000/dashboard`;
     adminDashboardUrl = window.location.protocol + `//${address}:3100/admin`;
@@ -178,7 +178,6 @@ export const Validate = {
         return false;
     },
 
-    //eslint-disable-next-line
     isValidBusinessEmail(email: $TSFixMe) {
         //return emaildomains.test(email);
         return true;
diff --git a/accounts/src/serviceWorker.ts b/accounts/src/serviceWorker.ts
index 00374f5a6a..690aacc1cd 100644
--- a/accounts/src/serviceWorker.ts
+++ b/accounts/src/serviceWorker.ts
@@ -96,7 +96,7 @@ function registerValidSW(swUrl: $TSFixMe, config: $TSFixMe) {
             };
         })
         .catch(error => {
-            // eslint-disable-next-line no-console
+            //eslint-disable-next-line no-console
             console.error('Error during service worker registration: ', error);
         });
 }
@@ -124,7 +124,7 @@ function checkValidServiceWorker(swUrl: $TSFixMe, config: $TSFixMe) {
             }
         })
         .catch(() => {
-            // eslint-disable-next-line no-console
+            //eslint-disable-next-line no-console
             console.log(
                 'No internet connection found. App is running in offline mode.'
             );
diff --git a/accounts/src/sw-build.ts b/accounts/src/sw-build.ts
index c380e72cd7..306e26c702 100644
--- a/accounts/src/sw-build.ts
+++ b/accounts/src/sw-build.ts
@@ -15,7 +15,7 @@ const buildSW = () => {
             return `${count} files will be precached, totaling ${size} bytes.`;
         })
         .catch(e => {
-            // eslint-disable-next-line no-console
+            //eslint-disable-next-line no-console
             console.error(e);
         });
 };
diff --git a/accounts/src/sw-template.ts b/accounts/src/sw-template.ts
index da21b9c0ac..c20edc0153 100644
--- a/accounts/src/sw-template.ts
+++ b/accounts/src/sw-template.ts
@@ -19,7 +19,7 @@ if ('function' === typeof importScripts) {
 
         precacheAndRoute(self.__WB_MANIFEST, { cleanUrls: false });
     } else {
-        // eslint-disable-next-line no-console
+        //eslint-disable-next-line no-console
         console.log('Workbox could not be loaded. No Offline support');
     }
 }
diff --git a/admin-dashboard/index.ts b/admin-dashboard/index.ts
index 2ab859e232..809dbb1c0a 100644
--- a/admin-dashboard/index.ts
+++ b/admin-dashboard/index.ts
@@ -1,29 +1,9 @@
-process.on('exit', () => {
-    // eslint-disable-next-line no-console
-    console.log('Shutting Shutdown');
-});
+import 'common-server/utils/env';
+import 'common-server/utils/process';
 
-process.on('unhandledRejection', err => {
-    // eslint-disable-next-line no-console
-    console.error('Unhandled rejection in process occurred');
-    // eslint-disable-next-line no-console
-    console.error(err);
-});
-
-process.on('uncaughtException', err => {
-    // eslint-disable-next-line no-console
-    console.error('Uncaught exception in process occurred');
-    // eslint-disable-next-line no-console
-    console.error(err);
-});
-
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 import path from 'path';
-const app = express();
+const app = express.getExpressApp();
 
 app.get(['/env.js', '/admin/env.js'], function (req: Request, res: Response) {
     const env = {
diff --git a/admin-dashboard/src/components/basic/UploadFile.tsx b/admin-dashboard/src/components/basic/UploadFile.tsx
index 2258670406..a3bb1ace1e 100644
--- a/admin-dashboard/src/components/basic/UploadFile.tsx
+++ b/admin-dashboard/src/components/basic/UploadFile.tsx
@@ -3,10 +3,8 @@ import PropTypes from 'prop-types';
 const UploadFile = ({
     fileInputKey,
 
-    //eslint-disable-next-line
     input: { value: omitValue, ...inputProps },
 
-    //eslint-disable-next-line
     meta: omitMeta,
 
     ...props
diff --git a/admin-dashboard/src/components/settings/smtp.tsx b/admin-dashboard/src/components/settings/smtp.tsx
index 4f2f03b03c..e6555648cd 100644
--- a/admin-dashboard/src/components/settings/smtp.tsx
+++ b/admin-dashboard/src/components/settings/smtp.tsx
@@ -99,7 +99,7 @@ const fields = [
     {
         key: 'smtp-secure',
         label: 'SMTP Secure',
-        // eslint-disable-next-line react/display-name, react/prop-types
+
         component: ({
             input: { value, onChange }
         }: $TSFixMe) => (
@@ -123,7 +123,7 @@ const emailEnableField = [
     {
         key: 'email-enabled',
         label: 'Enable Emails',
-        // eslint-disable-next-line react/display-name, react/prop-types
+
         component: ({
             input: { value, onChange }
         }: $TSFixMe) => (
@@ -145,7 +145,7 @@ const smtpOptions = [
     {
         key: 'internalSmtp',
         label: 'Enable internal SMTP server',
-        // eslint-disable-next-line react/display-name, react/prop-types
+
         component: ({
             input: { value, onChange }
         }: $TSFixMe) => (
@@ -167,7 +167,7 @@ const smtpOptions = [
     {
         key: 'customSmtp',
         label: 'Enable custom SMTP server',
-        // eslint-disable-next-line react/display-name, react/prop-types
+
         component: ({
             input: { value, onChange }
         }: $TSFixMe) => (
diff --git a/admin-dashboard/src/components/settings/sso/SsoModal.tsx b/admin-dashboard/src/components/settings/sso/SsoModal.tsx
index 0c2b1b7918..cffb5d2edc 100644
--- a/admin-dashboard/src/components/settings/sso/SsoModal.tsx
+++ b/admin-dashboard/src/components/settings/sso/SsoModal.tsx
@@ -43,7 +43,7 @@ const fields = [
         label: 'Enable SAML',
         description:
             'SAML is an industry standard SSO framework typically used by large enterprises for communicating identities across the internet.',
-        // eslint-disable-next-line react/display-name, react/prop-types
+
         component: ({
             input: { value, onChange }
         }: $TSFixMe) => (
@@ -328,7 +328,7 @@ class Component extends React.Component {
                                                                 }}
                                                                 autoFocus={
                                                                     field.key ===
-                                                                    'domain'
+                                                                        'domain'
                                                                         ? true
                                                                         : false
                                                                 }
diff --git a/admin-dashboard/src/components/settings/twilio.tsx b/admin-dashboard/src/components/settings/twilio.tsx
index dc90599ccd..44fe644f9a 100644
--- a/admin-dashboard/src/components/settings/twilio.tsx
+++ b/admin-dashboard/src/components/settings/twilio.tsx
@@ -42,7 +42,7 @@ const fields = [
     {
         key: 'call-enabled',
         label: 'Enable Call Alerts',
-        // eslint-disable-next-line react/display-name, react/prop-types
+
         component: ({
             input: { value, onChange }
         }: $TSFixMe) => (
@@ -62,7 +62,7 @@ const fields = [
     {
         key: 'sms-enabled',
         label: 'Enable SMS Alerts',
-        // eslint-disable-next-line react/display-name, react/prop-types
+
         component: ({
             input: { value, onChange }
         }: $TSFixMe) => (
diff --git a/admin-dashboard/src/pages/Settings.tsx b/admin-dashboard/src/pages/Settings.tsx
index ee4cc49dd0..eed6e9641b 100644
--- a/admin-dashboard/src/pages/Settings.tsx
+++ b/admin-dashboard/src/pages/Settings.tsx
@@ -1,7 +1,7 @@
 import React, { Fragment } from 'react';
 import PropTypes from 'prop-types';
 
-import SMTP from '../components/settings/smtp';
+import Smtp from '../components/settings/smtp';
 import Twilio from '../components/settings/twilio';
 import Sso from '../components/settings/sso';
 import SsoDefaultRoles from '../components/settings/ssoDefaultRoles';
@@ -10,11 +10,11 @@ import EmailLog from '../components/settings/emailLog';
 import CallLog from '../components/settings/callLog';
 import SmsLog from '../components/settings/smsLog';
 
-// eslint-disable-next-line react/display-name
+
 const getChild = (key: $TSFixMe) => {
     switch (key) {
         case '/admin/settings/smtp':
-            return <SMTP />; // eslint-disable-line react/jsx-pascal-case
+            return <Smtp />;
         case '/admin/settings/twilio':
             return <Twilio />;
         case '/admin/settings/sso':
diff --git a/api-docs/index.ts b/api-docs/index.ts
index b7a958ad55..7a56662712 100755
--- a/api-docs/index.ts
+++ b/api-docs/index.ts
@@ -1,28 +1,12 @@
-process.on('exit', () => {
-    // eslint-disable-next-line no-console
-    console.log('Shutting Shutdown');
-});
-
-process.on('unhandledRejection', err => {
-    // eslint-disable-next-line no-console
-    console.error('Unhandled rejection in process occurred');
-    // eslint-disable-next-line no-console
-    console.error(err);
-});
-
-process.on('uncaughtException', err => {
-    // eslint-disable-next-line no-console
-    console.error('Uncaught exception in process occurred');
-    // eslint-disable-next-line no-console
-    console.error(err);
-});
-
+import 'common-server/utils/env';
+import 'common-server/utils/process';
+import logger from 'common-server/utils/logger';
 import express, {
     Request,
     Response,
     NextFunction,
 } from 'common-server/utils/express';
-const app = express();
+const app = express.getExpressApp();
 import path from 'path';
 import version from './api/version';
 
@@ -31,25 +15,22 @@ import cors from 'cors';
 app.use(cors());
 
 process.on('exit', () => {
-    // eslint-disable-next-line no-console
-    console.log('Server Shutting Shutdown');
+    logger.info('Server Shutting Shutdown');
 });
 
 process.on('unhandledRejection', err => {
-    // eslint-disable-next-line no-console
-    console.error('Unhandled rejection in server process occurred');
-    // eslint-disable-next-line no-console
-    console.error(err);
+    logger.error('Unhandled rejection in server process occurred');
+
+    logger.error(err);
 });
 
 process.on('uncaughtException', err => {
-    // eslint-disable-next-line no-console
-    console.error('Uncaught exception in server process occurred');
-    // eslint-disable-next-line no-console
-    console.error(err);
+    logger.error('Uncaught exception in server process occurred');
+
+    logger.error(err);
 });
 
-app.use(function (req: Request, res: Response, next: $TSFixMe) {
+app.use((req: Request, res: Response, next: NextFunction) => {
     if (typeof req.body === 'string') {
         req.body = JSON.parse(req.body);
     }
@@ -90,8 +71,7 @@ app.get(['/', '/docs'], function (req: Request, res: Response) {
 });
 
 app.listen(app.get('port'), function () {
-    // eslint-disable-next-line no-console
-    console.log('API Reference started on PORT:' + app.get('port'));
+    logger.info('API Reference started on PORT:' + app.get('port'));
 });
 
 export default app;
diff --git a/application-scanner/index.ts b/application-scanner/index.ts
index e98658cc6a..84b5e081d9 100644
--- a/application-scanner/index.ts
+++ b/application-scanner/index.ts
@@ -1,12 +1,8 @@
 import 'common-server/utils/env';
 import 'common-server/utils/process';
 
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
-const app = express();
+import express, { Request, Response } from 'common-server/utils/express';
+const app = express.getExpressApp();
 
 import http from 'http';
 http.createServer(app);
@@ -57,7 +53,7 @@ cron.schedule('*/5 * * * *', () => {
 
 http.listen(app.get('port'), function () {
     // eslint-disable-next-line
-    console.log(
+    logger.info(
         `Application Scanner Started on port ${app.get(
             'port'
         )}. OneUptime API URL: ${config.serverUrl}`
diff --git a/application-scanner/utils/applicationService.ts b/application-scanner/utils/applicationService.ts
index ceab5c2cd6..53ff2f312e 100644
--- a/application-scanner/utils/applicationService.ts
+++ b/application-scanner/utils/applicationService.ts
@@ -1,4 +1,5 @@
 import crypto from 'crypto';
+import logger from 'common-server/utils/logger';
 import EncryptionKeys from './encryptionKeys';
 const algorithm = EncryptionKeys.algorithm;
 const key = EncryptionKeys.key;
@@ -87,8 +88,7 @@ export default {
             )[1];
 
             conn.on('ready', () => {
-                // eslint-disable-next-line no-console
-                console.log('SSH Client :: ready');
+                logger.info('SSH Client :: ready');
                 return new Promise((resolve, reject) => {
                     git(securityDir)
                         .silent(true)
diff --git a/backend/backend/api/accountStore.ts b/backend/backend/api/accountStore.ts
index 63870ea227..a8ad9cf07b 100644
--- a/backend/backend/api/accountStore.ts
+++ b/backend/backend/api/accountStore.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 import {
     sendErrorResponse,
     sendItemResponse,
diff --git a/backend/backend/api/alert.ts b/backend/backend/api/alert.ts
index d2a67eb905..01e28a4b99 100755
--- a/backend/backend/api/alert.ts
+++ b/backend/backend/api/alert.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 import alertService from '../services/alertService';
 import IncidentService from '../services/incidentService';
 import alertChargeService from '../services/alertChargeService';
diff --git a/backend/backend/api/apiStatus.ts b/backend/backend/api/apiStatus.ts
index 17ba275d39..3734e24862 100644
--- a/backend/backend/api/apiStatus.ts
+++ b/backend/backend/api/apiStatus.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 import {
     sendErrorResponse,
     sendItemResponse,
diff --git a/backend/backend/api/applicationLog.ts b/backend/backend/api/applicationLog.ts
index 22aa3b5105..146151c2c0 100644
--- a/backend/backend/api/applicationLog.ts
+++ b/backend/backend/api/applicationLog.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 import ApplicationLogService from '../services/applicationLogService';
 import UserService from '../services/userService';
 import ComponentService from '../services/componentService';
diff --git a/backend/backend/api/applicationScanner.ts b/backend/backend/api/applicationScanner.ts
index a23aa1ad53..c4711ad937 100644
--- a/backend/backend/api/applicationScanner.ts
+++ b/backend/backend/api/applicationScanner.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 import ApplicationSecurityService from '../services/applicationSecurityService';
 import ApplicationSecurityLogService from '../services//applicationSecurityLogService';
 const router = express.getRouter();
diff --git a/backend/backend/api/applicationSecurity.ts b/backend/backend/api/applicationSecurity.ts
index 14b3f6298a..5423790d9d 100644
--- a/backend/backend/api/applicationSecurity.ts
+++ b/backend/backend/api/applicationSecurity.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 const getUser = require('../middlewares/user').getUser;
 
 import { isAuthorized } from '../middlewares/authorization';
diff --git a/backend/backend/api/applicationSecurityLog.ts b/backend/backend/api/applicationSecurityLog.ts
index e7685293fd..82558577bf 100644
--- a/backend/backend/api/applicationSecurityLog.ts
+++ b/backend/backend/api/applicationSecurityLog.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 const getUser = require('../middlewares/user').getUser;
 
 import { isAuthorized } from '../middlewares/authorization';
diff --git a/backend/backend/api/auditLogs.ts b/backend/backend/api/auditLogs.ts
index bf1df3f6ed..3855562f5b 100755
--- a/backend/backend/api/auditLogs.ts
+++ b/backend/backend/api/auditLogs.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 const router = express.getRouter();
 
 import AuditLogsService from '../services/auditLogsService';
diff --git a/backend/backend/api/automatedScript.ts b/backend/backend/api/automatedScript.ts
index 273a5c5308..25a31eb7cc 100644
--- a/backend/backend/api/automatedScript.ts
+++ b/backend/backend/api/automatedScript.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 const router = express.getRouter();
 
 import AutomatedScriptService from '../services/automatedScriptService';
diff --git a/backend/backend/api/base.ts b/backend/backend/api/base.ts
index 4192fd02a7..221ebbc57a 100644
--- a/backend/backend/api/base.ts
+++ b/backend/backend/api/base.ts
@@ -1,4 +1,4 @@
-import { Request, Response } from 'common-server/utils/express';
+import { Request, Response, NextFunction } from 'common-server/utils/express';
 
 import {
     sendErrorResponse,
diff --git a/backend/backend/api/callLogs.ts b/backend/backend/api/callLogs.ts
index 908e01c684..28e7f736b3 100644
--- a/backend/backend/api/callLogs.ts
+++ b/backend/backend/api/callLogs.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 const router = express.getRouter();
 
 import CallLogsService from '../services/callLogsService';
diff --git a/backend/backend/api/callRouting.ts b/backend/backend/api/callRouting.ts
index 6d142a85f9..0b43eb549a 100644
--- a/backend/backend/api/callRouting.ts
+++ b/backend/backend/api/callRouting.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 
 import { fetchPhoneNumbers } from '../services/twilioService';
 import CallRoutingService from '../services/callRoutingService';
diff --git a/backend/backend/api/certificateStore.ts b/backend/backend/api/certificateStore.ts
index 87cf159a50..66c280669f 100644
--- a/backend/backend/api/certificateStore.ts
+++ b/backend/backend/api/certificateStore.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 import {
     sendErrorResponse,
     sendItemResponse,
diff --git a/backend/backend/api/component.ts b/backend/backend/api/component.ts
index d3d28f3022..7830bdf59a 100755
--- a/backend/backend/api/component.ts
+++ b/backend/backend/api/component.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 import UserService from '../services/userService';
 import ComponentService from '../services/componentService';
 import NotificationService from '../services/notificationService';
diff --git a/backend/backend/api/containerScanner.ts b/backend/backend/api/containerScanner.ts
index 801e415758..041310cce1 100644
--- a/backend/backend/api/containerScanner.ts
+++ b/backend/backend/api/containerScanner.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 const router = express.getRouter();
 import ContainerSecurityService from '../services/containerSecurityService';
 import ContainerSecurityLogService from '../services//containerSecurityLogService';
diff --git a/backend/backend/api/containerSecurity.ts b/backend/backend/api/containerSecurity.ts
index b444a62ed4..9e0b9d320b 100644
--- a/backend/backend/api/containerSecurity.ts
+++ b/backend/backend/api/containerSecurity.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 const getUser = require('../middlewares/user').getUser;
 
 import { isAuthorized } from '../middlewares/authorization';
diff --git a/backend/backend/api/containerSecurityLog.ts b/backend/backend/api/containerSecurityLog.ts
index a5d5715b42..054e7525bd 100644
--- a/backend/backend/api/containerSecurityLog.ts
+++ b/backend/backend/api/containerSecurityLog.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 const getUser = require('../middlewares/user').getUser;
 
 import { isAuthorized } from '../middlewares/authorization';
diff --git a/backend/backend/api/customField.ts b/backend/backend/api/customField.ts
index 451e772bc5..1f11c69da2 100644
--- a/backend/backend/api/customField.ts
+++ b/backend/backend/api/customField.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 
 import { isAuthorized } from '../middlewares/authorization';
 
diff --git a/backend/backend/api/defaultManager.ts b/backend/backend/api/defaultManager.ts
index 072108f992..31c08a9124 100644
--- a/backend/backend/api/defaultManager.ts
+++ b/backend/backend/api/defaultManager.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 import {
     sendErrorResponse,
     sendItemResponse,
diff --git a/backend/backend/api/dockerCredential.ts b/backend/backend/api/dockerCredential.ts
index 94ea403c78..7e2c232c3e 100644
--- a/backend/backend/api/dockerCredential.ts
+++ b/backend/backend/api/dockerCredential.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 const getUser = require('../middlewares/user').getUser;
 
 import { isAuthorized } from '../middlewares/authorization';
diff --git a/backend/backend/api/domainVerificationToken.ts b/backend/backend/api/domainVerificationToken.ts
index b603b2ea1c..20aaf8959a 100644
--- a/backend/backend/api/domainVerificationToken.ts
+++ b/backend/backend/api/domainVerificationToken.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 
 import psl from 'psl';
 
diff --git a/backend/backend/api/emailLogs.ts b/backend/backend/api/emailLogs.ts
index aadfc90e4e..87eed6f471 100644
--- a/backend/backend/api/emailLogs.ts
+++ b/backend/backend/api/emailLogs.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 const router = express.getRouter();
 
 import EmailLogsService from '../services/emailStatusService';
diff --git a/backend/backend/api/emailSmtp.ts b/backend/backend/api/emailSmtp.ts
index 518f340036..bcdec8d7cb 100755
--- a/backend/backend/api/emailSmtp.ts
+++ b/backend/backend/api/emailSmtp.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 import EmailSmtpService from '../services/emailSmtpService';
 import MailService from '../services/mailService';
 const router = express.getRouter();
diff --git a/backend/backend/api/emailTemplate.ts b/backend/backend/api/emailTemplate.ts
index 80b9c1541a..c27ff0c377 100755
--- a/backend/backend/api/emailTemplate.ts
+++ b/backend/backend/api/emailTemplate.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 import EmailTemplateService from '../services/emailTemplateService';
 
 const router = express.getRouter();
diff --git a/backend/backend/api/errorTracker.ts b/backend/backend/api/errorTracker.ts
index a387018cba..9476fedc2e 100644
--- a/backend/backend/api/errorTracker.ts
+++ b/backend/backend/api/errorTracker.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 
 const router = express.getRouter();
 const getUser = require('../middlewares/user').getUser;
diff --git a/backend/backend/api/feedback.ts b/backend/backend/api/feedback.ts
index 84842a6c8f..7ae7b8d09b 100755
--- a/backend/backend/api/feedback.ts
+++ b/backend/backend/api/feedback.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 
 const router = express.getRouter();
 import FeedbackService from '../services/feedbackService';
diff --git a/backend/backend/api/file.ts b/backend/backend/api/file.ts
index 7c07432372..6e9f8d0070 100755
--- a/backend/backend/api/file.ts
+++ b/backend/backend/api/file.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 
 const router = express.getRouter();
 import FileService from '../services/fileService';
diff --git a/backend/backend/api/gitCredential.ts b/backend/backend/api/gitCredential.ts
index a16d3a834c..58f8306af0 100644
--- a/backend/backend/api/gitCredential.ts
+++ b/backend/backend/api/gitCredential.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 const getUser = require('../middlewares/user').getUser;
 
 import { isAuthorized } from '../middlewares/authorization';
diff --git a/backend/backend/api/globalConfig.ts b/backend/backend/api/globalConfig.ts
index a284c87d5e..55db48b724 100644
--- a/backend/backend/api/globalConfig.ts
+++ b/backend/backend/api/globalConfig.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 
 const router = express.getRouter();
 import GlobalConfigService from '../services/globalConfigService';
diff --git a/backend/backend/api/groups.ts b/backend/backend/api/groups.ts
index 6ed8287120..e5b9f55f0d 100644
--- a/backend/backend/api/groups.ts
+++ b/backend/backend/api/groups.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 const getUser = require('../middlewares/user').getUser;
 
 import { isAuthorized } from '../middlewares/authorization';
diff --git a/backend/backend/api/incident.ts b/backend/backend/api/incident.ts
index f02e1bf997..e974961912 100755
--- a/backend/backend/api/incident.ts
+++ b/backend/backend/api/incident.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 import moment from 'moment';
 import Handlebars from 'handlebars';
 import IncidentService from '../services/incidentService';
diff --git a/backend/backend/api/incidentCommunicationSla.ts b/backend/backend/api/incidentCommunicationSla.ts
index fdbedfe532..e590eb781f 100644
--- a/backend/backend/api/incidentCommunicationSla.ts
+++ b/backend/backend/api/incidentCommunicationSla.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 const getUser = require('../middlewares/user').getUser;
 
 import { isAuthorized } from '../middlewares/authorization';
diff --git a/backend/backend/api/incidentNoteTemplate.ts b/backend/backend/api/incidentNoteTemplate.ts
index f3eaea4bb6..95a9f212bb 100644
--- a/backend/backend/api/incidentNoteTemplate.ts
+++ b/backend/backend/api/incidentNoteTemplate.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 const router = express.getRouter();
 const getUser = require('../middlewares/user').getUser;
 
diff --git a/backend/backend/api/incidentPriorities.ts b/backend/backend/api/incidentPriorities.ts
index 4de70471e5..428c048842 100644
--- a/backend/backend/api/incidentPriorities.ts
+++ b/backend/backend/api/incidentPriorities.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 const router = express.getRouter();
 const getUser = require('../middlewares/user').getUser;
 
diff --git a/backend/backend/api/incidentSettings.ts b/backend/backend/api/incidentSettings.ts
index 2cf6719e18..5ff4276e3b 100644
--- a/backend/backend/api/incidentSettings.ts
+++ b/backend/backend/api/incidentSettings.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 const router = express.getRouter();
 const getUser = require('../middlewares/user').getUser;
 
diff --git a/backend/backend/api/incomingHttpRequest.ts b/backend/backend/api/incomingHttpRequest.ts
index 10f07bfe7c..d6e591e929 100644
--- a/backend/backend/api/incomingHttpRequest.ts
+++ b/backend/backend/api/incomingHttpRequest.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 const router = express.getRouter();
 import ProbeService from '../services/probeService';
 import {
diff --git a/backend/backend/api/incomingRequest.ts b/backend/backend/api/incomingRequest.ts
index e2664c3a16..0c8f91e92d 100644
--- a/backend/backend/api/incomingRequest.ts
+++ b/backend/backend/api/incomingRequest.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 const getUser = require('../middlewares/user').getUser;
 
 import { isAuthorized } from '../middlewares/authorization';
diff --git a/backend/backend/api/invoice.ts b/backend/backend/api/invoice.ts
index bdcbe2b82f..4e5655b65e 100755
--- a/backend/backend/api/invoice.ts
+++ b/backend/backend/api/invoice.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 const router = express.getRouter();
 import InvoiceService from '../services/invoiceService';
 import { sendErrorResponse } from 'common-server/utils/response';
diff --git a/backend/backend/api/lead.ts b/backend/backend/api/lead.ts
index 5458903416..101b711705 100755
--- a/backend/backend/api/lead.ts
+++ b/backend/backend/api/lead.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 const router = express.getRouter();
 import LeadService from '../services/leadService';
 import {
diff --git a/backend/backend/api/lighthouse.ts b/backend/backend/api/lighthouse.ts
index 79d8186dbe..3aa2be4b8e 100644
--- a/backend/backend/api/lighthouse.ts
+++ b/backend/backend/api/lighthouse.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 import ProbeService from '../services/probeService';
 import MonitorService from '../services/monitorService';
 import LighthouseLogService from '../services/lighthouseLogService';
diff --git a/backend/backend/api/loginHistory.ts b/backend/backend/api/loginHistory.ts
index caf55be0e6..0502e33a6a 100644
--- a/backend/backend/api/loginHistory.ts
+++ b/backend/backend/api/loginHistory.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 import loginHistoryService from '../services/loginHistoryService';
 
 const router = express.getRouter();
diff --git a/backend/backend/api/monitor.ts b/backend/backend/api/monitor.ts
index cb7eacd3a0..b8042ac1ca 100755
--- a/backend/backend/api/monitor.ts
+++ b/backend/backend/api/monitor.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 import axios from 'axios';
 import UserService from '../services/userService';
 import MonitorService from '../services/monitorService';
diff --git a/backend/backend/api/monitorCriteria.ts b/backend/backend/api/monitorCriteria.ts
index 61912586cb..f7d0a70fe0 100644
--- a/backend/backend/api/monitorCriteria.ts
+++ b/backend/backend/api/monitorCriteria.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 const router = express.getRouter();
 
 const getUser = require('../middlewares/user').getUser;
diff --git a/backend/backend/api/monitorCustomField.ts b/backend/backend/api/monitorCustomField.ts
index 82ce3392cc..2cf6afba57 100644
--- a/backend/backend/api/monitorCustomField.ts
+++ b/backend/backend/api/monitorCustomField.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 
 import { isAuthorized } from '../middlewares/authorization';
 
diff --git a/backend/backend/api/monitorSla.ts b/backend/backend/api/monitorSla.ts
index 20b0cc89dd..e12e1649dd 100644
--- a/backend/backend/api/monitorSla.ts
+++ b/backend/backend/api/monitorSla.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 const getUser = require('../middlewares/user').getUser;
 
 import { isAuthorized } from '../middlewares/authorization';
diff --git a/backend/backend/api/notification.ts b/backend/backend/api/notification.ts
index a4755fffd4..56fca5ea4d 100755
--- a/backend/backend/api/notification.ts
+++ b/backend/backend/api/notification.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 
 const router = express.getRouter();
 import NotificationService from '../services/notificationService';
diff --git a/backend/backend/api/performanceTracker.ts b/backend/backend/api/performanceTracker.ts
index b2b36ae906..a3f3c66cda 100644
--- a/backend/backend/api/performanceTracker.ts
+++ b/backend/backend/api/performanceTracker.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 const router = express.getRouter();
 import NotificationService from '../services/notificationService';
 import ErrorService from 'common-server/utils/error';
diff --git a/backend/backend/api/performanceTrackerMetric.ts b/backend/backend/api/performanceTrackerMetric.ts
index 1699f9b3ce..b1ded3a0ba 100644
--- a/backend/backend/api/performanceTrackerMetric.ts
+++ b/backend/backend/api/performanceTrackerMetric.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 const router = express.getRouter();
 import PerformanceTrackerMetricService from '../services/performanceTrackerMetricService';
 import moment from 'moment';
diff --git a/backend/backend/api/probe.ts b/backend/backend/api/probe.ts
index 6ee19ba9e3..0539bf0d5d 100755
--- a/backend/backend/api/probe.ts
+++ b/backend/backend/api/probe.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 import ProbeService from '../services/probeService';
 import MonitorService from '../services/monitorService';
 import LighthouseLogService from '../services/lighthouseLogService';
diff --git a/backend/backend/api/project.ts b/backend/backend/api/project.ts
index 4c91d4f9f1..f13de0d246 100755
--- a/backend/backend/api/project.ts
+++ b/backend/backend/api/project.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 import ProjectService from '../services/projectService';
 
 const router = express.getRouter();
diff --git a/backend/backend/api/report.ts b/backend/backend/api/report.ts
index bbc99c3c55..7da4be48ab 100755
--- a/backend/backend/api/report.ts
+++ b/backend/backend/api/report.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 import ReportService from '../services/reportService';
 
 import { isAuthorized } from '../middlewares/authorization';
diff --git a/backend/backend/api/resourceCategory.ts b/backend/backend/api/resourceCategory.ts
index 6db187ecfa..baa796cd85 100755
--- a/backend/backend/api/resourceCategory.ts
+++ b/backend/backend/api/resourceCategory.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 
 const router = express.getRouter();
 
diff --git a/backend/backend/api/schedule.ts b/backend/backend/api/schedule.ts
index 112ef0af9b..6294c75d84 100755
--- a/backend/backend/api/schedule.ts
+++ b/backend/backend/api/schedule.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 import ScheduleService from '../services/scheduleService';
 const router = express.getRouter();
 const isUserAdmin = require('../middlewares/project').isUserAdmin;
diff --git a/backend/backend/api/scheduledEvent.ts b/backend/backend/api/scheduledEvent.ts
index f767bbecc0..533cf7b525 100755
--- a/backend/backend/api/scheduledEvent.ts
+++ b/backend/backend/api/scheduledEvent.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 const router = express.getRouter();
 
 import { isAuthorized } from '../middlewares/authorization';
@@ -785,8 +781,8 @@ router.get(
     async function (req, res) {
         try {
             const { eventId } = req.params;
-            // eslint-disable-next-line no-unused-vars
-            const { limit, skip, type } = req.query;
+
+            const { limit, skip } = req.query;
 
             const populate = [
                 { path: 'createdById', select: 'name' },
diff --git a/backend/backend/api/scriptRunner.ts b/backend/backend/api/scriptRunner.ts
index 20304675cd..92116868b5 100644
--- a/backend/backend/api/scriptRunner.ts
+++ b/backend/backend/api/scriptRunner.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 import {
     sendErrorResponse,
     sendItemResponse,
diff --git a/backend/backend/api/search.ts b/backend/backend/api/search.ts
index c731f77c75..ee3917d933 100644
--- a/backend/backend/api/search.ts
+++ b/backend/backend/api/search.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 import UserService from '../services/userService';
 import ComponentService from '../services/componentService';
 const getUser = require('../middlewares/user').getUser;
diff --git a/backend/backend/api/server.ts b/backend/backend/api/server.ts
index 273084d1c6..d6413ee86a 100755
--- a/backend/backend/api/server.ts
+++ b/backend/backend/api/server.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 const router = express.getRouter();
 
 import { IS_SAAS_SERVICE } from '../config/server';
diff --git a/backend/backend/api/siteManager.ts b/backend/backend/api/siteManager.ts
index 2f26bafdb6..d4e53454a0 100644
--- a/backend/backend/api/siteManager.ts
+++ b/backend/backend/api/siteManager.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 import {
     sendErrorResponse,
     sendItemResponse,
diff --git a/backend/backend/api/slack.ts b/backend/backend/api/slack.ts
index b648cb08d9..46e61ec27e 100755
--- a/backend/backend/api/slack.ts
+++ b/backend/backend/api/slack.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 
 import request from 'request';
 import IntegrationService from '../services/integrationService';
diff --git a/backend/backend/api/smsLogs.ts b/backend/backend/api/smsLogs.ts
index 0554c086ad..ee2189eefa 100644
--- a/backend/backend/api/smsLogs.ts
+++ b/backend/backend/api/smsLogs.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 const router = express.getRouter();
 
 import SmsLogsService from '../services/smsCountService';
diff --git a/backend/backend/api/smsSmtp.ts b/backend/backend/api/smsSmtp.ts
index 4cfd0f81c5..3554eaf0b8 100755
--- a/backend/backend/api/smsSmtp.ts
+++ b/backend/backend/api/smsSmtp.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 import SmsSmtpService from '../services/smsSmtpService';
 import TwilioService from '../services/twilioService';
 const router = express.getRouter();
diff --git a/backend/backend/api/smsTemplate.ts b/backend/backend/api/smsTemplate.ts
index 0eed195171..8b7ff4c423 100755
--- a/backend/backend/api/smsTemplate.ts
+++ b/backend/backend/api/smsTemplate.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 import SmsTemplateService from '../services/smsTemplateService';
 
 const router = express.getRouter();
diff --git a/backend/backend/api/ssl.ts b/backend/backend/api/ssl.ts
index 16ff840370..431d5c997a 100644
--- a/backend/backend/api/ssl.ts
+++ b/backend/backend/api/ssl.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 import {
     sendErrorResponse,
     sendItemResponse,
diff --git a/backend/backend/api/sso.ts b/backend/backend/api/sso.ts
index 74a27be531..7a58587826 100644
--- a/backend/backend/api/sso.ts
+++ b/backend/backend/api/sso.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 const router = express.getRouter();
 const getUser = require('../middlewares/user').getUser;
 const isUserMasterAdmin = require('../middlewares/user').isUserMasterAdmin;
diff --git a/backend/backend/api/ssoDefaultRoles.ts b/backend/backend/api/ssoDefaultRoles.ts
index 1480823bd1..2265d5365a 100644
--- a/backend/backend/api/ssoDefaultRoles.ts
+++ b/backend/backend/api/ssoDefaultRoles.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 const router = express.getRouter();
 const getUser = require('../middlewares/user').getUser;
 const isUserMasterAdmin = require('../middlewares/user').isUserMasterAdmin;
diff --git a/backend/backend/api/statusPage.ts b/backend/backend/api/statusPage.ts
index 0f9ac9a129..94851212fb 100755
--- a/backend/backend/api/statusPage.ts
+++ b/backend/backend/api/statusPage.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 import StatusPageService from '../services/statusPageService';
 import MonitorService from '../services/monitorService';
 import ProbeService from '../services/probeService';
@@ -1409,8 +1405,8 @@ router.get(
     checkUser,
     async function (req, res) {
         const { scheduledEventSlug } = req.params;
-        // eslint-disable-next-line no-unused-vars
-        const { skip, limit, type } = req.query;
+
+        const { skip, limit } = req.query;
 
         const scheduledEventId = await ScheduledEventService.findOneBy({
             query: { slug: scheduledEventSlug },
diff --git a/backend/backend/api/statusPageCategory.ts b/backend/backend/api/statusPageCategory.ts
index 8458f0869b..1bcddd4386 100644
--- a/backend/backend/api/statusPageCategory.ts
+++ b/backend/backend/api/statusPageCategory.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 const router = express.getRouter();
 
 import { isAuthorized } from '../middlewares/authorization';
diff --git a/backend/backend/api/stripe.ts b/backend/backend/api/stripe.ts
index a8d1628d85..ec0eeff062 100755
--- a/backend/backend/api/stripe.ts
+++ b/backend/backend/api/stripe.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 import StripeService from '../services/stripeService';
 import {
     sendErrorResponse,
diff --git a/backend/backend/api/subscriber.ts b/backend/backend/api/subscriber.ts
index 48526969eb..864f03de71 100755
--- a/backend/backend/api/subscriber.ts
+++ b/backend/backend/api/subscriber.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 const router = express.getRouter();
 
 import SubscriberService from '../services/subscriberService';
diff --git a/backend/backend/api/subscriberAlert.ts b/backend/backend/api/subscriberAlert.ts
index 73d4c08654..d0f7e22e1d 100755
--- a/backend/backend/api/subscriberAlert.ts
+++ b/backend/backend/api/subscriberAlert.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 import SubscriberAlertService from '../services/subscriberAlertService';
 import path from 'path';
 import fs from 'fs';
diff --git a/backend/backend/api/team.ts b/backend/backend/api/team.ts
index ef4042856d..3ec5e310ab 100755
--- a/backend/backend/api/team.ts
+++ b/backend/backend/api/team.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 
 const router = express.getRouter();
 import TeamService from '../services/teamService';
diff --git a/backend/backend/api/token.ts b/backend/backend/api/token.ts
index 9a1109edcd..605066f6ea 100755
--- a/backend/backend/api/token.ts
+++ b/backend/backend/api/token.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 
 const router = express.getRouter();
 import UserService from '../services/userService';
diff --git a/backend/backend/api/tutorial.ts b/backend/backend/api/tutorial.ts
index 47d527441e..6c72d26c56 100644
--- a/backend/backend/api/tutorial.ts
+++ b/backend/backend/api/tutorial.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 const router = express.getRouter();
 
 import UserService from '../services/userService';
diff --git a/backend/backend/api/twilio.ts b/backend/backend/api/twilio.ts
index 9ca8fcb4b1..f654c4815d 100755
--- a/backend/backend/api/twilio.ts
+++ b/backend/backend/api/twilio.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 import IncidentService from '../services/incidentService';
 import UserService from '../services/userService';
 const {
diff --git a/backend/backend/api/user.ts b/backend/backend/api/user.ts
index 8b4152c998..b035e0a636 100755
--- a/backend/backend/api/user.ts
+++ b/backend/backend/api/user.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 import UserService from '../services/userService';
 import ProjectService from '../services/projectService';
 const jwtSecretKey = process.env['JWT_SECRET'];
diff --git a/backend/backend/api/version.ts b/backend/backend/api/version.ts
index 2d61863ad3..fbd4f0d5d0 100644
--- a/backend/backend/api/version.ts
+++ b/backend/backend/api/version.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 const router = express.getRouter();
 
 import {
diff --git a/backend/backend/api/webHook.ts b/backend/backend/api/webHook.ts
index 290145058e..5dbcad0ffb 100755
--- a/backend/backend/api/webHook.ts
+++ b/backend/backend/api/webHook.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 import IntegrationService from '../services/integrationService';
 const getUser = require('../middlewares/user').getUser;
 const isUserAdmin = require('../middlewares/project').isUserAdmin;
diff --git a/backend/backend/api/zapier.ts b/backend/backend/api/zapier.ts
index ae4c64af06..a1f8ef5f22 100755
--- a/backend/backend/api/zapier.ts
+++ b/backend/backend/api/zapier.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 import ZapierService from '../services/zapierService';
 import MonitorService from '../services/monitorService';
 import ProjectService from '../services/projectService';
diff --git a/backend/backend/middlewares/api.ts b/backend/backend/middlewares/api.ts
index a3eccbc20d..f30690f53f 100755
--- a/backend/backend/middlewares/api.ts
+++ b/backend/backend/middlewares/api.ts
@@ -1,7 +1,7 @@
 import mongoose from '../config/db';
 import ProjectService from '../services/projectService';
 import { sendErrorResponse } from 'common-server/utils/response';
-
+import { Request, Response, NextFunction } from 'common-server/utils/express';
 const ObjectID = mongoose.Types.ObjectId;
 import MonitorService from '../services/monitorService';
 
diff --git a/backend/backend/middlewares/applicationLog.ts b/backend/backend/middlewares/applicationLog.ts
index 9e821cd724..f3033e11cb 100644
--- a/backend/backend/middlewares/applicationLog.ts
+++ b/backend/backend/middlewares/applicationLog.ts
@@ -1,4 +1,4 @@
-import { Request, Response } from 'common-server/utils/express';
+import { Request, Response, NextFunction } from 'common-server/utils/express';
 
 import ErrorService from 'common-server/utils/error';
 import ApplicationLogService from '../services/applicationLogService';
diff --git a/backend/backend/middlewares/applicationScannerAuthorization.ts b/backend/backend/middlewares/applicationScannerAuthorization.ts
index feef78b44a..03fada4012 100644
--- a/backend/backend/middlewares/applicationScannerAuthorization.ts
+++ b/backend/backend/middlewares/applicationScannerAuthorization.ts
@@ -1,6 +1,6 @@
 import ApplicationScannerService from '../services/applicationScannerService';
 import { sendErrorResponse } from 'common-server/utils/response';
-
+import { Request, Response, NextFunction } from 'common-server/utils/express';
 import ErrorService from 'common-server/utils/error';
 const CLUSTER_KEY = process.env.CLUSTER_KEY;
 export default {
diff --git a/backend/backend/middlewares/auditLogs.ts b/backend/backend/middlewares/auditLogs.ts
index 97f7f64a85..9b1332c03d 100644
--- a/backend/backend/middlewares/auditLogs.ts
+++ b/backend/backend/middlewares/auditLogs.ts
@@ -1,5 +1,5 @@
 import url from 'url';
-import { Request, Response } from 'common-server/utils/express';
+import { Request, Response, NextFunction } from 'common-server/utils/express';
 import _ from 'lodash';
 const isValidMongoObjectId = require('../config/db').Types.ObjectId.isValid;
 
@@ -14,7 +14,7 @@ import GlobalConfigService from '../services/globalConfigService';
 let shouldStoreLogs: $TSFixMe = null;
 
 export default {
-    log: async function (req: Request, res: Response, next: $TSFixMe) {
+    log: async function (req: Request, res: Response, next: NextFunction) {
         try {
             const blackListedRoutes = ['/audit-logs/'];
             const blackListedReqObjectPaths = ['body.password'];
diff --git a/backend/backend/middlewares/authorization.ts b/backend/backend/middlewares/authorization.ts
index 769e5817a3..f39331275a 100755
--- a/backend/backend/middlewares/authorization.ts
+++ b/backend/backend/middlewares/authorization.ts
@@ -1,4 +1,5 @@
 import apiMiddleware from './api';
+import { Request, Response, NextFunction } from 'common-server/utils/express';
 import { sendErrorResponse } from 'common-server/utils/response';
 
 const doesUserBelongToProject = require('./project').doesUserBelongToProject;
@@ -8,7 +9,7 @@ export default {
     // Params:
     // Param 1: req.headers -> {token}
     // Returns: 400: User is unauthorized since unauthorized token was present.
-    isAuthorized: function (req: Request, res: Response, next: $TSFixMe) {
+    isAuthorized: function (req: Request, res: Response, next: NextFunction) {
         const projectId = apiMiddleware.getProjectId(req);
 
         if (projectId) {
diff --git a/backend/backend/middlewares/clusterAuthorization.ts b/backend/backend/middlewares/clusterAuthorization.ts
index aae9010975..5865ae9709 100755
--- a/backend/backend/middlewares/clusterAuthorization.ts
+++ b/backend/backend/middlewares/clusterAuthorization.ts
@@ -1,4 +1,5 @@
 import { sendErrorResponse } from 'common-server/utils/response';
+import { Request, Response, NextFunction } from 'common-server/utils/express';
 
 export default {
     isAuthorizedAdmin: async function (
diff --git a/backend/backend/middlewares/containerScannerAuthorization.ts b/backend/backend/middlewares/containerScannerAuthorization.ts
index 4b89e7ab7d..fc6c1ea904 100644
--- a/backend/backend/middlewares/containerScannerAuthorization.ts
+++ b/backend/backend/middlewares/containerScannerAuthorization.ts
@@ -1,6 +1,6 @@
 import ContainerScannerService from '../services/containerScannerService';
 import { sendErrorResponse } from 'common-server/utils/response';
-
+import { Request, Response, NextFunction } from 'common-server/utils/express';
 import ErrorService from 'common-server/utils/error';
 const CLUSTER_KEY = process.env.CLUSTER_KEY;
 export default {
diff --git a/backend/backend/middlewares/errorTracker.ts b/backend/backend/middlewares/errorTracker.ts
index 491326d893..586de83a75 100644
--- a/backend/backend/middlewares/errorTracker.ts
+++ b/backend/backend/middlewares/errorTracker.ts
@@ -1,5 +1,5 @@
 import { sendErrorResponse } from 'common-server/utils/response';
-
+import { Request, Response, NextFunction } from 'common-server/utils/express';
 import ErrorService from 'common-server/utils/error';
 import ErrorTrackerService from '../services/errorTrackerService';
 
diff --git a/backend/backend/middlewares/ipHandler.ts b/backend/backend/middlewares/ipHandler.ts
index 6fef6b69c3..a2ea191709 100644
--- a/backend/backend/middlewares/ipHandler.ts
+++ b/backend/backend/middlewares/ipHandler.ts
@@ -1,11 +1,15 @@
 import StatusPageService from '../services/statusPageService';
 import { sendErrorResponse } from 'common-server/utils/response';
-
+import { Request, Response, NextFunction } from 'common-server/utils/express';
 import apiMiddleware from './api';
 import ipaddr from 'ipaddr.js';
 
 const _this = {
-    ipWhitelist: async function (req: Request, res: Response, next: $TSFixMe) {
+    ipWhitelist: async function (
+        req: Request,
+        res: Response,
+        next: NextFunction
+    ) {
         const statusPageSlug = apiMiddleware.getStatusPageSlug(req);
         const statusPageUrl = apiMiddleware.getStatusPageUrl(req);
         let statusPage;
diff --git a/backend/backend/middlewares/lighthouseAuthorization.ts b/backend/backend/middlewares/lighthouseAuthorization.ts
index 425ff4f9c7..46499f52a8 100644
--- a/backend/backend/middlewares/lighthouseAuthorization.ts
+++ b/backend/backend/middlewares/lighthouseAuthorization.ts
@@ -1,5 +1,5 @@
 import { sendErrorResponse } from 'common-server/utils/response';
-
+import { Request, Response, NextFunction } from 'common-server/utils/express';
 import ErrorService from 'common-server/utils/error';
 export default {
     isAuthorizedLighthouse: async function (
diff --git a/backend/backend/middlewares/performanceTracker.ts b/backend/backend/middlewares/performanceTracker.ts
index e099bc0ca2..68a7e58fde 100644
--- a/backend/backend/middlewares/performanceTracker.ts
+++ b/backend/backend/middlewares/performanceTracker.ts
@@ -1,7 +1,7 @@
 import ErrorService from 'common-server/utils/error';
 import PerformanceTrackerService from '../services/performanceTrackerService';
 import { sendErrorResponse } from 'common-server/utils/response';
-
+import { Request, Response, NextFunction } from 'common-server/utils/express';
 const _this = {
     isValidAPIKey: async function (
         req: Request,
diff --git a/backend/backend/middlewares/probeAuthorization.ts b/backend/backend/middlewares/probeAuthorization.ts
index e54ab5ba8e..aaace6051e 100755
--- a/backend/backend/middlewares/probeAuthorization.ts
+++ b/backend/backend/middlewares/probeAuthorization.ts
@@ -1,6 +1,6 @@
 import ProbeService from '../services/probeService';
 import { sendErrorResponse } from 'common-server/utils/response';
-
+import { Request, Response, NextFunction } from 'common-server/utils/express';
 import ErrorService from 'common-server/utils/error';
 const CLUSTER_KEY = process.env.CLUSTER_KEY;
 
diff --git a/backend/backend/middlewares/project.ts b/backend/backend/middlewares/project.ts
index 860556e109..6b2b579313 100755
--- a/backend/backend/middlewares/project.ts
+++ b/backend/backend/middlewares/project.ts
@@ -2,7 +2,7 @@ import ProjectService from '../services/projectService';
 import ErrorService from 'common-server/utils/error';
 import url from 'url';
 import { sendErrorResponse } from 'common-server/utils/response';
-
+import { Request, Response, NextFunction } from 'common-server/utils/express';
 import apiMiddleware from '../middlewares/api';
 
 export default {
@@ -104,7 +104,11 @@ export default {
     // Params:
     // Param 1: req.params-> {projectId}; req.user-> {id}
     // Returns: 400: You are not authorized to add member to project. Only admin can add.; 500: Server Error
-    isUserAdmin: async function (req: Request, res: Response, next: $TSFixMe) {
+    isUserAdmin: async function (
+        req: Request,
+        res: Response,
+        next: NextFunction
+    ) {
         try {
             const projectId = apiMiddleware.getProjectId(req);
 
@@ -172,7 +176,11 @@ export default {
         }
     },
 
-    isUserOwner: async function (req: Request, res: Response, next: $TSFixMe) {
+    isUserOwner: async function (
+        req: Request,
+        res: Response,
+        next: NextFunction
+    ) {
         try {
             // authorize if user is master-admin
             if (req.authorizationType === 'MASTER-ADMIN') {
@@ -220,7 +228,11 @@ export default {
         }
     },
 
-    getUserRole: async function (req: Request, res: Response, next: $TSFixMe) {
+    getUserRole: async function (
+        req: Request,
+        res: Response,
+        next: NextFunction
+    ) {
         try {
             const UserId = req.user ? req.user.id : null;
 
diff --git a/backend/backend/middlewares/serviceAuthorization.ts b/backend/backend/middlewares/serviceAuthorization.ts
index c0913035bd..5dc424ff66 100644
--- a/backend/backend/middlewares/serviceAuthorization.ts
+++ b/backend/backend/middlewares/serviceAuthorization.ts
@@ -1,5 +1,5 @@
 import { sendErrorResponse } from 'common-server/utils/response';
-
+import { Request, Response, NextFunction } from 'common-server/utils/express';
 import ErrorService from 'common-server/utils/error';
 const CLUSTER_KEY = process.env.CLUSTER_KEY;
 
diff --git a/backend/backend/middlewares/subProject.ts b/backend/backend/middlewares/subProject.ts
index 4c18ecb51c..eeeca4abda 100755
--- a/backend/backend/middlewares/subProject.ts
+++ b/backend/backend/middlewares/subProject.ts
@@ -1,7 +1,7 @@
 import ProjectService from '../services/projectService';
 import ErrorService from 'common-server/utils/error';
 import { sendErrorResponse } from 'common-server/utils/response';
-
+import { Request, Response, NextFunction } from 'common-server/utils/express';
 import url from 'url';
 
 export default {
diff --git a/backend/backend/middlewares/user.ts b/backend/backend/middlewares/user.ts
index ccd1f54728..254b6a9914 100755
--- a/backend/backend/middlewares/user.ts
+++ b/backend/backend/middlewares/user.ts
@@ -1,5 +1,5 @@
 const jwtSecretKey = process.env['JWT_SECRET'];
-
+import { Request, Response, NextFunction } from 'common-server/utils/express';
 import jwt from 'jsonwebtoken';
 import url from 'url';
 import UserService from '../services/userService';
@@ -17,7 +17,7 @@ const _this = {
     // Param 1: req.headers-> {token}
     // Returns: 400: User is unauthorized since unauthorized token was present.
 
-    getUser: async function (req: Request, res: Response, next: $TSFixMe) {
+    getUser: async function (req: Request, res: Response, next: NextFunction) {
         try {
             const projectId = apiMiddleware.getProjectId(req);
 
@@ -119,7 +119,7 @@ const _this = {
         }
     },
 
-    checkUser: function (req: Request, res: Response, next: $TSFixMe) {
+    checkUser: function (req: Request, res: Response, next: NextFunction) {
         try {
             const accessToken =
                 req.headers['authorization'] ||
diff --git a/backend/backend/services/componentService.ts b/backend/backend/services/componentService.ts
index f5c8d4e18b..a78d33ce89 100755
--- a/backend/backend/services/componentService.ts
+++ b/backend/backend/services/componentService.ts
@@ -311,7 +311,7 @@ export default {
             }
             const projectUsers = await TeamService.getTeamMembersBy({
                 parentProjectId: project._id,
-            }); // eslint-disable-next-line no-console
+            });
             const seats = await TeamService.getSeats(projectUsers);
             // check if project seats are more based on users in project or by count of components
             if (
diff --git a/backend/backend/services/paymentService.ts b/backend/backend/services/paymentService.ts
index 206d2a728f..7b59ed10bf 100755
--- a/backend/backend/services/paymentService.ts
+++ b/backend/backend/services/paymentService.ts
@@ -211,7 +211,7 @@ export default {
     //Param 2: user: User details
     //Returns: promise
 
-    createCustomer: async function (email, companyName) {
+    createCustomer: async function (email: string, companyName: string) {
         const customer = await stripe.customers.create({
             email: email,
             description: companyName,
@@ -219,8 +219,7 @@ export default {
         return customer.id;
     },
 
-    // eslint-disable-next-line no-unused-vars
-    addPayment: async function (customerId, stripeToken) {
+    addPayment: async function (customerId: string) {
         const card = await stripe.customers.createSource(customerId);
         return card;
     },
@@ -231,7 +230,11 @@ export default {
     //Param 2: stripeCustomerId: Stripe customer id.
     //Returns : promise
 
-    subscribePlan: async function (stripePlanId, stripeCustomerId, coupon) {
+    subscribePlan: async function (
+        stripePlanId: string,
+        stripeCustomerId: string,
+        coupon: string
+    ) {
         const items = [];
         items.push({
             plan: stripePlanId,
diff --git a/backend/backend/services/ssoService.ts b/backend/backend/services/ssoService.ts
index 534f5552c9..e669a18441 100644
--- a/backend/backend/services/ssoService.ts
+++ b/backend/backend/services/ssoService.ts
@@ -197,8 +197,8 @@ export default {
     // or the same email x times in the response
     getEmail: function (xml: $TSFixMe) {
         const stringifiedXml = String(xml);
-        // eslint-disable-next-line no-control-regex
-        const regex =
+
+        const regex = // eslint-disable-next-line no-control-regex
             /(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/gi;
 
         return stringifiedXml.match(regex)[0];
diff --git a/backend/backend/services/stripeService.ts b/backend/backend/services/stripeService.ts
index c59b78b53b..6f50e8b545 100755
--- a/backend/backend/services/stripeService.ts
+++ b/backend/backend/services/stripeService.ts
@@ -3,8 +3,7 @@ const Services = {
         customerId: $TSFixMe,
         subscriptionId: $TSFixMe
     ) {
-        // eslint-disable-next-line no-unused-vars
-        const [user, project] = await Promise.all([
+        const [, project] = await Promise.all([
             UserService.findOneBy({
                 query: { stripeCustomerId: customerId },
                 select: 'email name _id',
diff --git a/backend/index.ts b/backend/index.ts
index eac26dd33f..346064369f 100755
--- a/backend/index.ts
+++ b/backend/index.ts
@@ -10,7 +10,7 @@ import logger from 'common-server/utils/logger';
 
 import expressRequestId from 'express-request-id';
 
-const app = express();
+const app = express.getExpressApp();
 
 app.use(expressRequestId);
 
@@ -59,8 +59,8 @@ import { getProjectId } from './backend/middlewares/api';
 //     });
 //     global.redisClient = redisClient;
 // } catch (err) {
-//     // eslint-disable-next-line no-console
-//     console.log('redis error: ', err);
+//
+//     logger.info('redis error: ', err);
 // }
 
 global.io = io;
@@ -102,7 +102,7 @@ app.use(async function (req: Request, res: Response, next: NextFunction) {
     next();
 });
 
-app.use(function (req: Request, res: Response, next: NextFunction) {
+app.use((req: Request, res: Response, next: NextFunction) => {
     if (typeof req.body === 'string') {
         req.body = JSON.parse(req.body);
     }
@@ -494,8 +494,8 @@ mongoose.connection.on('connected', async () => {
                 notify: function (event, details) {
                     if ('error' === event) {
                         // `details` is an error object in this case
-                        // eslint-disable-next-line no-console
-                        console.error('Greenlock Notify: ', details);
+
+                        logger.error('Greenlock Notify: ', details);
                     }
                 },
                 challenges: {
@@ -515,7 +515,6 @@ mongoose.connection.on('connected', async () => {
             global.greenlock = greenlock;
         }
     } catch (error) {
-        // eslint-disable-next-line no-console
         ErrorService.log('GREENLOCK INIT ERROR: ', error);
     }
 });
diff --git a/backend/test/component.test.ts b/backend/test/component.test.ts
index c69fc006c6..9500a2a73e 100644
--- a/backend/test/component.test.ts
+++ b/backend/test/component.test.ts
@@ -381,7 +381,6 @@ describe('Component API', function () {
     });
 });
 
-// eslint-disable-next-line no-unused-vars
 let subProjectId: $TSFixMe,
     newUserToken: $TSFixMe,
     newUserId,
diff --git a/backend/test/data/log.ts b/backend/test/data/log.ts
index 4ba4e5eb59..35edc59726 100755
--- a/backend/test/data/log.ts
+++ b/backend/test/data/log.ts
@@ -1,4 +1,4 @@
 export default function (obj: $TSFixMe) {
     // eslint-disable-next-line
-    console.log(obj);
+    logger.info(obj);
 }
diff --git a/backend/test/enterprise.ts b/backend/test/enterprise.ts
index 6d4db4b9a3..146977dfb3 100644
--- a/backend/test/enterprise.ts
+++ b/backend/test/enterprise.ts
@@ -1,14 +1,8 @@
-try {
-    require('./enterpriseUser.test');
-    require('./enterpriseProject.test');
-    require('./enterpriseComponent.test');
-    require('./enterpriseMonitor.test');
-    require('./enterpriseAlert.test');
-    require('./enterpriseTeam.test');
-    require('./enterpriseDisableSignup.test');
-    require('./enterpriseIncidentAlerts.test');
-} catch (error) {
-    // eslint-disable-next-line no-console
-    console.error(error);
-    throw error;
-}
+import './enterpriseUser.test';
+import './enterpriseProject.test';
+import './enterpriseComponent.test';
+import './enterpriseMonitor.test';
+import './enterpriseAlert.test';
+import './enterpriseTeam.test';
+import './enterpriseDisableSignup.test';
+import './enterpriseIncidentAlerts.test';
diff --git a/backend/test/incident.test.ts b/backend/test/incident.test.ts
index fe36f97aef..9b7be239d9 100644
--- a/backend/test/incident.test.ts
+++ b/backend/test/incident.test.ts
@@ -690,7 +690,6 @@ describe('Incident API', function () {
     });
 });
 
-// eslint-disable-next-line no-unused-vars
 let subProjectId: $TSFixMe,
     newUserToken: $TSFixMe,
     subProjectIncidentId: $TSFixMe;
diff --git a/backend/test/index.ts b/backend/test/index.ts
index f4a9b90234..68ff68ffcb 100644
--- a/backend/test/index.ts
+++ b/backend/test/index.ts
@@ -1,61 +1,55 @@
-try {
-    require('./adminCredentials.test');
-    require('./alert.test');
-    require('./applicationLog.test');
-    // require('./applicationSecurity.test'); 1
-    require('./auditLogs.test');
-    require('./component.test');
-    // require('./containerSecurity.test'); 2
-    require('./customField.test');
-    require('./disableSignup.test');
-    // require('./dockerCredential.test'); 3
-    require('./emailAuthorization.test');
-    require('./emailLogs.test');
-    require('./emailSmtp.test');
-    require('./emailTemplate.test');
-    // require('./errorTracker.test'); 4
-    require('./feedback.test');
-    require('./gitCredential.test');
-    require('./globalConfig.test');
-    // require('./incident.test'); 5
-    // require('./incidentAlerts.test'); 6
-    require('./incidentCommunicationSla.test');
-    // require('./incidentPriority.test'); hmm
-    require('./incidentSettings.test');
-    require('./incomingHttpRequest.test');
-    require('./invoice.test');
-    require('./jwttoken.test');
-    // require('./lead.test'); 7
-    // require('./monitor.test'); 8
-    require('./monitorCriteria.test');
-    require('./monitorCustomField.test');
-    require('./monitorSla.test');
-    require('./notification.test');
-    // require('./probe.test'); 9
-    // require('./project.test'); ---
-    // require('./rateLimit.test'); 10
-    require('./reports.test');
-    // require('./resourceCategory.test'); 11
-    require('./schedule.test');
-    require('./scheduledEvent.test');
-    require('./scheduledEventNote.test');
-    require('./slack.test');
-    require('./smsTemplate.test');
-    // require('./sso.test');
-    // require('./ssoDefaultRoles.test');
-    // require('./statusPage.test');
-    // require('./stripe.test');
-    require('./subscriber.test');
-    // require('./subscriberAlert.test');
-    // require('./team.test');
-    // require('./tutorial.test');
-    // require('./twilio.test');
-    // require('./user.test');
-    // require('./version.test');
-    // require('./webhook.test');
-    // require('./zapier.test');
-} catch (error) {
-    // eslint-disable-next-line no-console
-    console.error(error);
-    throw error;
-}
+import './adminCredentials.test';
+import './alert.test';
+import './applicationLog.test';
+// import './applicationSecurity.test' 1
+import './auditLogs.test';
+import './component.test';
+// import './containerSecurity.test' 2
+import './customField.test';
+import './disableSignup.test';
+// import './dockerCredential.test' 3
+import './emailAuthorization.test';
+import './emailLogs.test';
+import './emailSmtp.test';
+import './emailTemplate.test';
+// import './errorTracker.test' 4
+import './feedback.test';
+import './gitCredential.test';
+import './globalConfig.test';
+// import './incident.test' 5
+// import './incidentAlerts.test' 6
+import './incidentCommunicationSla.test';
+// import './incidentPriority.test' hmm
+import './incidentSettings.test';
+import './incomingHttpRequest.test';
+import './invoice.test';
+import './jwttoken.test';
+// import './lead.test' 7
+// import './monitor.test' 8
+import './monitorCriteria.test';
+import './monitorCustomField.test';
+import './monitorSla.test';
+import './notification.test';
+// import './probe.test' 9
+// import './project.test' ---
+// import './rateLimit.test' 10
+import './reports.test';
+// import './resourceCategory.test' 11
+import './schedule.test';
+import './scheduledEvent.test';
+import './scheduledEventNote.test';
+import './slack.test';
+import './smsTemplate.test';
+// import './sso.test'
+// import './ssoDefaultRoles.test'
+// import './statusPage.test'
+// import './stripe.test'
+import './subscriber.test';
+// import './subscriberAlert.test'
+// import './team.test'
+// import './tutorial.test'
+// import './twilio.test'
+// import './user.test'
+// import './version.test'
+// import './webhook.test'
+// import './zapier.test'
diff --git a/backend/test/monitor.test.ts b/backend/test/monitor.test.ts
index 5f69477261..c4cb0de742 100755
--- a/backend/test/monitor.test.ts
+++ b/backend/test/monitor.test.ts
@@ -975,7 +975,6 @@ describe('Monitor API with resource Category', function () {
     });
 });
 
-// eslint-disable-next-line no-unused-vars
 let subProjectId: $TSFixMe,
     newUserToken: $TSFixMe,
     subProjectMonitorId: $TSFixMe;
diff --git a/backend/test/schedule.test.ts b/backend/test/schedule.test.ts
index d58f3a12a8..49443fc28f 100644
--- a/backend/test/schedule.test.ts
+++ b/backend/test/schedule.test.ts
@@ -166,7 +166,6 @@ describe('Schedule API', function () {
     });
 });
 
-// eslint-disable-next-line no-unused-vars
 let subProjectId: $TSFixMe,
     newUserToken: $TSFixMe,
     subProjectScheduleId: $TSFixMe;
diff --git a/backend/test/statusPage.test.ts b/backend/test/statusPage.test.ts
index ef1131182d..b195e08d70 100644
--- a/backend/test/statusPage.test.ts
+++ b/backend/test/statusPage.test.ts
@@ -920,7 +920,6 @@ describe('Status API', function () {
     });
 });
 
-// eslint-disable-next-line no-unused-vars
 let subProjectId: $TSFixMe,
     newUserToken: $TSFixMe,
     anotherUserToken: $TSFixMe,
diff --git a/backend/test/team.test.ts b/backend/test/team.test.ts
index 9245dda9e5..d382eda6c6 100644
--- a/backend/test/team.test.ts
+++ b/backend/test/team.test.ts
@@ -200,7 +200,6 @@ describe('Team API', function () {
     });
 });
 
-// eslint-disable-next-line no-unused-vars
 let subProjectId,
     newUserToken,
     subProjectTeamMemberId,
diff --git a/common-server/utils/process.ts b/common-server/utils/process.ts
index ff8a5c2e19..09b7cb15e9 100644
--- a/common-server/utils/process.ts
+++ b/common-server/utils/process.ts
@@ -1,14 +1,15 @@
 /* eslint-disable no-console */
+import logger from './logger';
 process.on('exit', () => {
-    console.log('Server Shutting Shutdown');
+    logger.info('Server Shutting Shutdown');
 });
 
 process.on('unhandledRejection', err => {
-    console.error('Unhandled rejection in server process occurred');
-    console.error(err);
+    logger.error('Unhandled rejection in server process occurred');
+    logger.error(err);
 });
 
 process.on('uncaughtException', err => {
-    console.error('Uncaught exception in server process occurred');
-    console.error(err);
+    logger.error('Uncaught exception in server process occurred');
+    logger.error(err);
 });
diff --git a/container-scanner/index.ts b/container-scanner/index.ts
index a1d2c5a4f1..fbd7ede451 100644
--- a/container-scanner/index.ts
+++ b/container-scanner/index.ts
@@ -1,12 +1,8 @@
 import 'common-server/utils/env';
 import 'common-server/utils/process';
 
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
-const app = express();
+import express, { Request, Response } from 'common-server/utils/express';
+const app = express.getExpressApp();
 
 import http from 'http';
 http.createServer(app);
@@ -55,7 +51,7 @@ cron.schedule('*/5 * * * *', () => {
 
 http.listen(app.get('port'), function () {
     // eslint-disable-next-line
-    console.log(
+    logger.info(
         `Container Scanner Started on port ${app.get(
             'port'
         )}. OneUptime API URL: ${config.serverUrl}`
diff --git a/dashboard/index.ts b/dashboard/index.ts
index bf9802343f..e618406267 100755
--- a/dashboard/index.ts
+++ b/dashboard/index.ts
@@ -1,50 +1,11 @@
-process.on('exit', () => {
-    // eslint-disable-next-line no-console
-    console.log('Shutting Shutdown');
-});
+import 'common-server/utils/env';
+import 'common-server/utils/process';
 
-process.on('unhandledRejection', err => {
-    // eslint-disable-next-line no-console
-    console.error('Unhandled rejection in process occurred');
-    // eslint-disable-next-line no-console
-    console.error(err);
-});
+import express, { Request, Response } from 'common-server/utils/express';
 
-process.on('uncaughtException', err => {
-    // eslint-disable-next-line no-console
-    console.error('Uncaught exception in process occurred');
-    // eslint-disable-next-line no-console
-    console.error(err);
-});
-
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
 import path from 'path';
-const app = express();
 
-import cors from 'cors';
-
-app.use(cors());
-
-app.use(function (req: Request, res: Response, next: $TSFixMe) {
-    if (typeof req.body === 'string') {
-        req.body = JSON.parse(req.body);
-    }
-    res.header('Access-Control-Allow-Credentials', 'true');
-    res.header('Access-Control-Allow-Origin', req.headers.origin);
-    res.header('Access-Control-Allow-Methods', 'GET,PUT,POST,DELETE,OPTIONS');
-    res.header(
-        'Access-Control-Allow-Headers',
-        'X-Requested-With, X-HTTP-Method-Override, Content-Type, Accept,Authorization'
-    );
-    if (req.get('host').includes('cluster.local')) {
-        return next();
-    }
-    return next();
-});
+const app = express.getExpressApp();
 
 app.get(
     ['/env.js', '/dashboard/env.js'],
@@ -175,8 +136,3 @@ app.use('/dashboard', express.static(path.join(__dirname, 'build')));
 app.get('/*', function (req: Request, res: Response) {
     res.sendFile(path.join(__dirname, 'build', 'index.html'));
 });
-
-const PORT = 3000;
-// eslint-disable-next-line no-console
-console.log(`This project is running on port ${PORT}`);
-app.listen(PORT);
diff --git a/dashboard/src/components/automationScript/NewScript.tsx b/dashboard/src/components/automationScript/NewScript.tsx
index ea63789295..9ce7e00045 100644
--- a/dashboard/src/components/automationScript/NewScript.tsx
+++ b/dashboard/src/components/automationScript/NewScript.tsx
@@ -20,7 +20,7 @@ import 'ace-builds/src-noconflict/theme-github';
 import DropDownMenu from '../basic/DropDownMenu';
 
 const defaultScript =
-    '// To inspect your script or add comments, use console.log\n\n' +
+    '// To inspect your script or add comments, use logger.info\n\n' +
     'async function (done) {\n' +
     '   // write any javascript here \n' +
     '   done();\n' +
@@ -119,16 +119,16 @@ class NewScript extends Component {
         const scheduleOption =
             schedules && schedules.length > 0
                 ? schedules.map((schedule: $TSFixMe) => ({
-                value: schedule._id,
-                label: schedule.name
-            }))
+                    value: schedule._id,
+                    label: schedule.name
+                }))
                 : [];
         const scriptOption =
             script && script.length > 0
                 ? script.map((s: $TSFixMe) => ({
-                value: s._id,
-                label: s.name
-            }))
+                    value: s._id,
+                    label: s.name
+                }))
                 : [];
         if (fields.length === 0) {
             fields.push();
@@ -137,13 +137,13 @@ class NewScript extends Component {
             {fields.map((field: $TSFixMe, index: $TSFixMe) => {
                 const optionObj =
                     successEventValues[index] &&
-                    successEventValues[index].type === 'callSchedule'
+                        successEventValues[index].type === 'callSchedule'
                         ? scheduleOption
                         : successEventValues[index] &&
-                          successEventValues[index].type ===
-                              'automatedScript'
-                        ? scriptOption
-                        : [];
+                            successEventValues[index].type ===
+                            'automatedScript'
+                            ? scriptOption
+                            : [];
 
                 return (
                     <div className="bs-a-script" key={index}>
@@ -267,16 +267,16 @@ class NewScript extends Component {
         const scheduleOption =
             schedules && schedules.length > 0
                 ? schedules.map((schedule: $TSFixMe) => ({
-                value: schedule._id,
-                label: schedule.name
-            }))
+                    value: schedule._id,
+                    label: schedule.name
+                }))
                 : [];
         const scriptOption =
             script && script.length > 0
                 ? script.map((s: $TSFixMe) => ({
-                value: s._id,
-                label: s.name
-            }))
+                    value: s._id,
+                    label: s.name
+                }))
                 : [];
         if (fields.length === 0) {
             fields.push();
@@ -285,13 +285,13 @@ class NewScript extends Component {
             {fields.map((field: $TSFixMe, index: $TSFixMe) => {
                 const optionObj =
                     failureEventValues[index] &&
-                    failureEventValues[index].type === 'callSchedule'
+                        failureEventValues[index].type === 'callSchedule'
                         ? scheduleOption
                         : failureEventValues[index] &&
-                          failureEventValues[index].type ===
-                              'automatedScript'
-                        ? scriptOption
-                        : [];
+                            failureEventValues[index].type ===
+                            'automatedScript'
+                            ? scriptOption
+                            : [];
 
                 return (
                     <div className="bs-a-script" key={index}>
@@ -502,104 +502,104 @@ class NewScript extends Component {
                                                         Script
                                                     </label>
                                                     <div className="bs-Fieldset-fields">
-                                                        // @ts-expect-error ts-migrate(2339) FIXME: Property 'type' does not exist on type 'Readonly<{... Remove this comment to see the full error message
-                                                        {this.state.type ===
+                                                        // @ts-expect-error ts-migrate(2339) FIXME: Property 'type' does not exist on type 'Readonly<{...Remove this comment to see the full error message
+                                                            {this.state.type ===
                                                             'JavaScript' && (
-                                                            <AceEditor
-                                                                placeholder="Enter script here"
-                                                                mode="javascript"
-                                                                theme="github"
-                                                                value={
-                                                                    this.state
-                                                                        // @ts-expect-error ts-migrate(2339) FIXME: Property 'script' does not exist on type 'Readonly... Remove this comment to see the full error message
-                                                                        .script
-                                                                }
-                                                                defaultValue={
-                                                                    defaultScript
-                                                                }
-                                                                style={{
-                                                                    backgroundColor:
-                                                                        '#fff',
-                                                                    borderRadius:
-                                                                        '4px',
-                                                                    boxShadow:
-                                                                        '0 0 0 1px rgba(50, 50, 93, 0.16), 0 0 0 1px rgba(50, 151, 211, 0), 0 0 0 2px rgba(50, 151, 211, 0), 0 1px 1px rgba(0, 0, 0, 0.08)',
-                                                                }}
-                                                                name={`automated-script`}
-                                                                // @ts-expect-error ts-migrate(2322) FIXME: Type '{ placeholder: string; mode: string; theme: ... Remove this comment to see the full error message
-                                                                id="automatedScript"
-                                                                editorProps={{
-                                                                    $blockScrolling: true,
-                                                                }}
-                                                                setOptions={{
-                                                                    enableBasicAutocompletion: true,
-                                                                    enableLiveAutocompletion: true,
-                                                                    enableSnippets: true,
-                                                                    showGutter: false,
-                                                                }}
-                                                                height="150px"
-                                                                highlightActiveLine={
-                                                                    true
-                                                                }
-                                                                onChange={
-                                                                    this
-                                                                        .setAutomatedScript
-                                                                }
-                                                                fontSize="14px"
-                                                                wrapEnabled={
-                                                                    true
-                                                                }
-                                                            />
-                                                        )}
-                                                        // @ts-expect-error ts-migrate(2339) FIXME: Property 'type' does not exist on type 'Readonly<{... Remove this comment to see the full error message
-                                                        {this.state.type ===
+                                                                <AceEditor
+                                                                    placeholder="Enter script here"
+                                                                    mode="javascript"
+                                                                    theme="github"
+                                                                    value={
+                                                                        this.state
+                                                                            // @ts-expect-error ts-migrate(2339) FIXME: Property 'script' does not exist on type 'Readonly... Remove this comment to see the full error message
+                                                                            .script
+                                                                    }
+                                                                    defaultValue={
+                                                                        defaultScript
+                                                                    }
+                                                                    style={{
+                                                                        backgroundColor:
+                                                                            '#fff',
+                                                                        borderRadius:
+                                                                            '4px',
+                                                                        boxShadow:
+                                                                            '0 0 0 1px rgba(50, 50, 93, 0.16), 0 0 0 1px rgba(50, 151, 211, 0), 0 0 0 2px rgba(50, 151, 211, 0), 0 1px 1px rgba(0, 0, 0, 0.08)',
+                                                                    }}
+                                                                    name={`automated-script`}
+                                                                    // @ts-expect-error ts-migrate(2322) FIXME: Type '{ placeholder: string; mode: string; theme: ... Remove this comment to see the full error message
+                                                                    id="automatedScript"
+                                                                    editorProps={{
+                                                                        $blockScrolling: true,
+                                                                    }}
+                                                                    setOptions={{
+                                                                        enableBasicAutocompletion: true,
+                                                                        enableLiveAutocompletion: true,
+                                                                        enableSnippets: true,
+                                                                        showGutter: false,
+                                                                    }}
+                                                                    height="150px"
+                                                                    highlightActiveLine={
+                                                                        true
+                                                                    }
+                                                                    onChange={
+                                                                        this
+                                                                            .setAutomatedScript
+                                                                    }
+                                                                    fontSize="14px"
+                                                                    wrapEnabled={
+                                                                        true
+                                                                    }
+                                                                />
+                                                            )}
+                                                            // @ts-expect-error ts-migrate(2339) FIXME: Property 'type' does not exist on type 'Readonly<{... Remove this comment to see the full error message
+                                                            {this.state.type ===
                                                             'Bash' && (
-                                                            <AceEditor
-                                                                placeholder="echo Hello World"
-                                                                mode="javascript"
-                                                                theme="github"
-                                                                value={
-                                                                    this.state
-                                                                        // @ts-expect-error ts-migrate(2339) FIXME: Property 'script' does not exist on type 'Readonly... Remove this comment to see the full error message
-                                                                        .script
-                                                                }
-                                                                defaultValue={
-                                                                    ''
-                                                                }
-                                                                style={{
-                                                                    backgroundColor:
-                                                                        '#fff',
-                                                                    borderRadius:
-                                                                        '4px',
-                                                                    boxShadow:
-                                                                        '0 0 0 1px rgba(50, 50, 93, 0.16), 0 0 0 1px rgba(50, 151, 211, 0), 0 0 0 2px rgba(50, 151, 211, 0), 0 1px 1px rgba(0, 0, 0, 0.08)',
-                                                                }}
-                                                                name={`automated-script`}
-                                                                // @ts-expect-error ts-migrate(2322) FIXME: Type '{ placeholder: string; mode: string; theme: ... Remove this comment to see the full error message
-                                                                id="automatedScript"
-                                                                editorProps={{
-                                                                    $blockScrolling: true,
-                                                                }}
-                                                                setOptions={{
-                                                                    enableBasicAutocompletion: true,
-                                                                    enableLiveAutocompletion: true,
-                                                                    enableSnippets: true,
-                                                                    showGutter: false,
-                                                                }}
-                                                                height="150px"
-                                                                highlightActiveLine={
-                                                                    true
-                                                                }
-                                                                onChange={
-                                                                    this
-                                                                        .setAutomatedScript
-                                                                }
-                                                                fontSize="14px"
-                                                                wrapEnabled={
-                                                                    true
-                                                                }
-                                                            />
-                                                        )}
+                                                                <AceEditor
+                                                                    placeholder="echo Hello World"
+                                                                    mode="javascript"
+                                                                    theme="github"
+                                                                    value={
+                                                                        this.state
+                                                                            // @ts-expect-error ts-migrate(2339) FIXME: Property 'script' does not exist on type 'Readonly... Remove this comment to see the full error message
+                                                                            .script
+                                                                    }
+                                                                    defaultValue={
+                                                                        ''
+                                                                    }
+                                                                    style={{
+                                                                        backgroundColor:
+                                                                            '#fff',
+                                                                        borderRadius:
+                                                                            '4px',
+                                                                        boxShadow:
+                                                                            '0 0 0 1px rgba(50, 50, 93, 0.16), 0 0 0 1px rgba(50, 151, 211, 0), 0 0 0 2px rgba(50, 151, 211, 0), 0 1px 1px rgba(0, 0, 0, 0.08)',
+                                                                    }}
+                                                                    name={`automated-script`}
+                                                                    // @ts-expect-error ts-migrate(2322) FIXME: Type '{ placeholder: string; mode: string; theme: ... Remove this comment to see the full error message
+                                                                    id="automatedScript"
+                                                                    editorProps={{
+                                                                        $blockScrolling: true,
+                                                                    }}
+                                                                    setOptions={{
+                                                                        enableBasicAutocompletion: true,
+                                                                        enableLiveAutocompletion: true,
+                                                                        enableSnippets: true,
+                                                                        showGutter: false,
+                                                                    }}
+                                                                    height="150px"
+                                                                    highlightActiveLine={
+                                                                        true
+                                                                    }
+                                                                    onChange={
+                                                                        this
+                                                                            .setAutomatedScript
+                                                                    }
+                                                                    fontSize="14px"
+                                                                    wrapEnabled={
+                                                                        true
+                                                                    }
+                                                                />
+                                                            )}
                                                     </div>
                                                 </div>
                                             </div>
diff --git a/dashboard/src/components/automationScript/UpdateScript.tsx b/dashboard/src/components/automationScript/UpdateScript.tsx
index 9e6d59f08d..3d3fff2391 100644
--- a/dashboard/src/components/automationScript/UpdateScript.tsx
+++ b/dashboard/src/components/automationScript/UpdateScript.tsx
@@ -21,7 +21,7 @@ import 'ace-builds/src-noconflict/theme-github';
 import DropDownMenu from '../basic/DropDownMenu';
 
 const defaultScript =
-    '// To inspect your script or add comments, use console.log\n\n' +
+    '// To inspect your script or add comments, use logger.info\n\n' +
     'async function (done) {\n' +
     '   // write any javascript here \n' +
     '   done();\n' +
@@ -125,18 +125,18 @@ class UpdateScript extends Component {
         const scheduleOption =
             schedules && schedules.length > 0
                 ? schedules.map((schedule: $TSFixMe) => ({
-                value: schedule._id,
-                label: schedule.name
-            }))
+                    value: schedule._id,
+                    label: schedule.name
+                }))
                 : [];
         const scriptOption =
             script && script.length > 0
                 ? script
-                      .filter((s: $TSFixMe) => s._id !== currentScript)
-                      .map((s: $TSFixMe) => ({
-                value: s._id,
-                label: s.name
-            }))
+                    .filter((s: $TSFixMe) => s._id !== currentScript)
+                    .map((s: $TSFixMe) => ({
+                        value: s._id,
+                        label: s.name
+                    }))
                 : [];
         if (fields.length === 0) {
             fields.push();
@@ -145,15 +145,15 @@ class UpdateScript extends Component {
             {fields.map((field: $TSFixMe, index: $TSFixMe) => {
                 const optionObj =
                     successEventValues &&
-                    successEventValues[index] &&
-                    successEventValues[index].type === 'callSchedule'
+                        successEventValues[index] &&
+                        successEventValues[index].type === 'callSchedule'
                         ? scheduleOption
                         : successEventValues &&
-                          successEventValues[index] &&
-                          successEventValues[index].type ===
-                              'automatedScript'
-                        ? scriptOption
-                        : [];
+                            successEventValues[index] &&
+                            successEventValues[index].type ===
+                            'automatedScript'
+                            ? scriptOption
+                            : [];
 
                 return (
                     <div className="bs-a-script" key={index}>
@@ -281,18 +281,18 @@ class UpdateScript extends Component {
         const scheduleOption =
             schedules && schedules.length > 0
                 ? schedules.map((schedule: $TSFixMe) => ({
-                value: schedule._id,
-                label: schedule.name
-            }))
+                    value: schedule._id,
+                    label: schedule.name
+                }))
                 : [];
         const scriptOption =
             script && script.length > 0
                 ? script
-                      .filter((s: $TSFixMe) => s._id !== currentScript)
-                      .map((s: $TSFixMe) => ({
-                value: s._id,
-                label: s.name
-            }))
+                    .filter((s: $TSFixMe) => s._id !== currentScript)
+                    .map((s: $TSFixMe) => ({
+                        value: s._id,
+                        label: s.name
+                    }))
                 : [];
         if (fields.length === 0) {
             fields.push();
@@ -301,15 +301,15 @@ class UpdateScript extends Component {
             {fields.map((field: $TSFixMe, index: $TSFixMe) => {
                 const optionObj =
                     failureEventValues &&
-                    failureEventValues[index] &&
-                    failureEventValues[index].type === 'callSchedule'
+                        failureEventValues[index] &&
+                        failureEventValues[index].type === 'callSchedule'
                         ? scheduleOption
                         : failureEventValues &&
-                          failureEventValues[index] &&
-                          failureEventValues[index].type ===
-                              'automatedScript'
-                        ? scriptOption
-                        : [];
+                            failureEventValues[index] &&
+                            failureEventValues[index].type ===
+                            'automatedScript'
+                            ? scriptOption
+                            : [];
 
                 return (
                     <div className="bs-a-script" key={index}>
@@ -523,104 +523,104 @@ class UpdateScript extends Component {
                                                         Script
                                                     </label>
                                                     <div className="bs-Fieldset-fields">
-                                                        // @ts-expect-error ts-migrate(2339) FIXME: Property 'type' does not exist on type 'Readonly<{... Remove this comment to see the full error message
-                                                        {this.state.type ===
+                                                        // @ts-expect-error ts-migrate(2339) FIXME: Property 'type' does not exist on type 'Readonly<{...Remove this comment to see the full error message
+                                                            {this.state.type ===
                                                             'JavaScript' && (
-                                                            <AceEditor
-                                                                placeholder="Enter script here"
-                                                                mode="javascript"
-                                                                theme="github"
-                                                                value={
-                                                                    this.state
-                                                                        // @ts-expect-error ts-migrate(2339) FIXME: Property 'script' does not exist on type 'Readonly... Remove this comment to see the full error message
-                                                                        .script
-                                                                }
-                                                                defaultValue={
-                                                                    defaultScript
-                                                                }
-                                                                style={{
-                                                                    backgroundColor:
-                                                                        '#fff',
-                                                                    borderRadius:
-                                                                        '4px',
-                                                                    boxShadow:
-                                                                        '0 0 0 1px rgba(50, 50, 93, 0.16), 0 0 0 1px rgba(50, 151, 211, 0), 0 0 0 2px rgba(50, 151, 211, 0), 0 1px 1px rgba(0, 0, 0, 0.08)',
-                                                                }}
-                                                                name={`automated-script`}
-                                                                // @ts-expect-error ts-migrate(2322) FIXME: Type '{ placeholder: string; mode: string; theme: ... Remove this comment to see the full error message
-                                                                id="automatedScript"
-                                                                editorProps={{
-                                                                    $blockScrolling: true,
-                                                                }}
-                                                                setOptions={{
-                                                                    enableBasicAutocompletion: true,
-                                                                    enableLiveAutocompletion: true,
-                                                                    enableSnippets: true,
-                                                                    showGutter: false,
-                                                                }}
-                                                                height="150px"
-                                                                highlightActiveLine={
-                                                                    true
-                                                                }
-                                                                onChange={
-                                                                    this
-                                                                        .setAutomatedScript
-                                                                }
-                                                                fontSize="14px"
-                                                                wrapEnabled={
-                                                                    true
-                                                                }
-                                                            />
-                                                        )}
-                                                        // @ts-expect-error ts-migrate(2339) FIXME: Property 'type' does not exist on type 'Readonly<{... Remove this comment to see the full error message
-                                                        {this.state.type ===
+                                                                <AceEditor
+                                                                    placeholder="Enter script here"
+                                                                    mode="javascript"
+                                                                    theme="github"
+                                                                    value={
+                                                                        this.state
+                                                                            // @ts-expect-error ts-migrate(2339) FIXME: Property 'script' does not exist on type 'Readonly... Remove this comment to see the full error message
+                                                                            .script
+                                                                    }
+                                                                    defaultValue={
+                                                                        defaultScript
+                                                                    }
+                                                                    style={{
+                                                                        backgroundColor:
+                                                                            '#fff',
+                                                                        borderRadius:
+                                                                            '4px',
+                                                                        boxShadow:
+                                                                            '0 0 0 1px rgba(50, 50, 93, 0.16), 0 0 0 1px rgba(50, 151, 211, 0), 0 0 0 2px rgba(50, 151, 211, 0), 0 1px 1px rgba(0, 0, 0, 0.08)',
+                                                                    }}
+                                                                    name={`automated-script`}
+                                                                    // @ts-expect-error ts-migrate(2322) FIXME: Type '{ placeholder: string; mode: string; theme: ... Remove this comment to see the full error message
+                                                                    id="automatedScript"
+                                                                    editorProps={{
+                                                                        $blockScrolling: true,
+                                                                    }}
+                                                                    setOptions={{
+                                                                        enableBasicAutocompletion: true,
+                                                                        enableLiveAutocompletion: true,
+                                                                        enableSnippets: true,
+                                                                        showGutter: false,
+                                                                    }}
+                                                                    height="150px"
+                                                                    highlightActiveLine={
+                                                                        true
+                                                                    }
+                                                                    onChange={
+                                                                        this
+                                                                            .setAutomatedScript
+                                                                    }
+                                                                    fontSize="14px"
+                                                                    wrapEnabled={
+                                                                        true
+                                                                    }
+                                                                />
+                                                            )}
+                                                            // @ts-expect-error ts-migrate(2339) FIXME: Property 'type' does not exist on type 'Readonly<{... Remove this comment to see the full error message
+                                                            {this.state.type ===
                                                             'Bash' && (
-                                                            <AceEditor
-                                                                placeholder="echo Hello World"
-                                                                mode="javascript"
-                                                                theme="github"
-                                                                value={
-                                                                    this.state
-                                                                        // @ts-expect-error ts-migrate(2339) FIXME: Property 'script' does not exist on type 'Readonly... Remove this comment to see the full error message
-                                                                        .script
-                                                                }
-                                                                defaultValue={
-                                                                    ''
-                                                                }
-                                                                style={{
-                                                                    backgroundColor:
-                                                                        '#fff',
-                                                                    borderRadius:
-                                                                        '4px',
-                                                                    boxShadow:
-                                                                        '0 0 0 1px rgba(50, 50, 93, 0.16), 0 0 0 1px rgba(50, 151, 211, 0), 0 0 0 2px rgba(50, 151, 211, 0), 0 1px 1px rgba(0, 0, 0, 0.08)',
-                                                                }}
-                                                                name={`automated-script`}
-                                                                // @ts-expect-error ts-migrate(2322) FIXME: Type '{ placeholder: string; mode: string; theme: ... Remove this comment to see the full error message
-                                                                id="automatedScript"
-                                                                editorProps={{
-                                                                    $blockScrolling: true,
-                                                                }}
-                                                                setOptions={{
-                                                                    enableBasicAutocompletion: true,
-                                                                    enableLiveAutocompletion: true,
-                                                                    enableSnippets: true,
-                                                                    showGutter: false,
-                                                                }}
-                                                                height="150px"
-                                                                highlightActiveLine={
-                                                                    true
-                                                                }
-                                                                onChange={
-                                                                    this
-                                                                        .setAutomatedScript
-                                                                }
-                                                                fontSize="14px"
-                                                                wrapEnabled={
-                                                                    true
-                                                                }
-                                                            />
-                                                        )}
+                                                                <AceEditor
+                                                                    placeholder="echo Hello World"
+                                                                    mode="javascript"
+                                                                    theme="github"
+                                                                    value={
+                                                                        this.state
+                                                                            // @ts-expect-error ts-migrate(2339) FIXME: Property 'script' does not exist on type 'Readonly... Remove this comment to see the full error message
+                                                                            .script
+                                                                    }
+                                                                    defaultValue={
+                                                                        ''
+                                                                    }
+                                                                    style={{
+                                                                        backgroundColor:
+                                                                            '#fff',
+                                                                        borderRadius:
+                                                                            '4px',
+                                                                        boxShadow:
+                                                                            '0 0 0 1px rgba(50, 50, 93, 0.16), 0 0 0 1px rgba(50, 151, 211, 0), 0 0 0 2px rgba(50, 151, 211, 0), 0 1px 1px rgba(0, 0, 0, 0.08)',
+                                                                    }}
+                                                                    name={`automated-script`}
+                                                                    // @ts-expect-error ts-migrate(2322) FIXME: Type '{ placeholder: string; mode: string; theme: ... Remove this comment to see the full error message
+                                                                    id="automatedScript"
+                                                                    editorProps={{
+                                                                        $blockScrolling: true,
+                                                                    }}
+                                                                    setOptions={{
+                                                                        enableBasicAutocompletion: true,
+                                                                        enableLiveAutocompletion: true,
+                                                                        enableSnippets: true,
+                                                                        showGutter: false,
+                                                                    }}
+                                                                    height="150px"
+                                                                    highlightActiveLine={
+                                                                        true
+                                                                    }
+                                                                    onChange={
+                                                                        this
+                                                                            .setAutomatedScript
+                                                                    }
+                                                                    fontSize="14px"
+                                                                    wrapEnabled={
+                                                                        true
+                                                                    }
+                                                                />
+                                                            )}
                                                     </div>
                                                 </div>
                                             </div>
diff --git a/dashboard/src/components/basic/UploadFile.tsx b/dashboard/src/components/basic/UploadFile.tsx
index 2258670406..a3bb1ace1e 100755
--- a/dashboard/src/components/basic/UploadFile.tsx
+++ b/dashboard/src/components/basic/UploadFile.tsx
@@ -3,10 +3,8 @@ import PropTypes from 'prop-types';
 const UploadFile = ({
     fileInputKey,
 
-    //eslint-disable-next-line
     input: { value: omitValue, ...inputProps },
 
-    //eslint-disable-next-line
     meta: omitMeta,
 
     ...props
diff --git a/dashboard/src/components/basic/WeekSelector.tsx b/dashboard/src/components/basic/WeekSelector.tsx
index 9e8a4833c8..4c4f4dda27 100644
--- a/dashboard/src/components/basic/WeekSelector.tsx
+++ b/dashboard/src/components/basic/WeekSelector.tsx
@@ -44,7 +44,7 @@ let WeekSelector = ({
             : invalidLabel;
     };
 
-    // eslint-disable-next-line react/display-name
+
     const renderWrappedWeekDay = (date: $TSFixMe, selectedDate: $TSFixMe, dayInCurrentMonth: $TSFixMe) => {
         const start = startOfWeek(selectedDate);
         const end = endOfWeek(selectedDate);
diff --git a/dashboard/src/components/domains/CreateDomain.tsx b/dashboard/src/components/domains/CreateDomain.tsx
index 1a4089cfbe..2863ccc29d 100644
--- a/dashboard/src/components/domains/CreateDomain.tsx
+++ b/dashboard/src/components/domains/CreateDomain.tsx
@@ -18,7 +18,7 @@ import {
     resetCreateProjectDomain,
 } from '../../actions/project';
 
-// eslint-disable-next-line no-unused-vars
+
 function validate(_values: $TSFixMe) {
     const error = undefined;
     return error;
diff --git a/dashboard/src/components/domains/EditDomain.tsx b/dashboard/src/components/domains/EditDomain.tsx
index b0c84295e9..bcb620c66f 100644
--- a/dashboard/src/components/domains/EditDomain.tsx
+++ b/dashboard/src/components/domains/EditDomain.tsx
@@ -18,7 +18,7 @@ import {
     resetUpdateProjectDomain,
 } from '../../actions/project';
 
-// eslint-disable-next-line no-unused-vars
+
 function validate(_values: $TSFixMe) {
     const error = undefined;
     return error;
diff --git a/dashboard/src/components/monitor/NewMonitor.tsx b/dashboard/src/components/monitor/NewMonitor.tsx
index 0f1ad7f738..d70913659d 100755
--- a/dashboard/src/components/monitor/NewMonitor.tsx
+++ b/dashboard/src/components/monitor/NewMonitor.tsx
@@ -13,7 +13,7 @@ import {
     change,
     isValid,
     FieldArray,
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module 'redu... Remove this comment to see the full error message
+    // @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module 'redu... Remove this comment to see the full error message
 } from 'redux-form';
 import {
     createMonitor,
@@ -71,7 +71,7 @@ import { fetchAutomatedScript } from '../../actions/automatedScript';
 const defaultScript =
     '// modules available - request, puppeteer, axios (We can add more later).' +
     ' e.g - const request = require("request")\n\n' +
-    '// To inspect your script or add comments, use console.log\n\n' +
+    '// To inspect your script or add comments, use logger.info\n\n' +
     'async function (done) {\n' +
     '   // write any javascript here \n' +
     '   done();\n' +
@@ -418,7 +418,7 @@ class NewMonitor extends Component {
                 return (
                     acc +
                     (criterion.id !== criterionItem.id &&
-                    criterion.type === criterionItem.type
+                        criterion.type === criterionItem.type
                         ? 1
                         : 0)
                 );
@@ -482,10 +482,10 @@ class NewMonitor extends Component {
             ? values[`type_${this.props.index}`]
             // @ts-expect-error ts-migrate(2339) FIXME: Property 'edit' does not exist on type 'Readonly<{... Remove this comment to see the full error message
             : this.props.edit
-            // @ts-expect-error ts-migrate(2339) FIXME: Property 'editMonitorProp' does not exist on type ... Remove this comment to see the full error message
-            ? this.props.editMonitorProp.type
-            // @ts-expect-error ts-migrate(2339) FIXME: Property 'type' does not exist on type 'Readonly<{... Remove this comment to see the full error message
-            : this.props.type;
+                // @ts-expect-error ts-migrate(2339) FIXME: Property 'editMonitorProp' does not exist on type ... Remove this comment to see the full error message
+                ? this.props.editMonitorProp.type
+                // @ts-expect-error ts-migrate(2339) FIXME: Property 'type' does not exist on type 'Readonly<{... Remove this comment to see the full error message
+                : this.props.type;
         // @ts-expect-error ts-migrate(2339) FIXME: Property 'resourceCategory' does not exist on type... Remove this comment to see the full error message
         postObj.resourceCategory =
             // @ts-expect-error ts-migrate(2339) FIXME: Property 'index' does not exist on type 'Readonly<... Remove this comment to see the full error message
@@ -622,10 +622,10 @@ class NewMonitor extends Component {
                     values[`criterion_${criterion.id}_schedules`];
                 const schedules = criterionSchedules
                     ? criterionSchedules
-                          .filter((scheduleObject: $TSFixMe) => {
-                              return Object.values(scheduleObject)[0] === true;
-                          })
-                          .map((scheduleObject: $TSFixMe) => Object.keys(scheduleObject)[0])
+                        .filter((scheduleObject: $TSFixMe) => {
+                            return Object.values(scheduleObject)[0] === true;
+                        })
+                        .map((scheduleObject: $TSFixMe) => Object.keys(scheduleObject)[0])
                     : [];
 
                 // @ts-expect-error ts-migrate(2339) FIXME: Property 'scheduleIds' does not exist on type '{}'... Remove this comment to see the full error message
@@ -1164,30 +1164,30 @@ class NewMonitor extends Component {
                             <div className="Box-root">
                                 <span className="Text-color--inherit Text-display--inline Text-fontSize--16 Text-fontWeight--medium Text-lineHeight--24 Text-typeface--base Text-wrap--wrap">
                                     <span>
-                                        // @ts-expect-error ts-migrate(2339) FIXME: Property 'edit' does not exist on type 'Readonly<{... Remove this comment to see the full error message
+                                        // @ts-expect-error ts-migrate(2339) FIXME: Property 'edit' does not exist on type 'Readonly<{...Remove this comment to see the full error message
                                         <ShouldRender if={!this.props.edit}>
                                             <span>New Monitor</span>
                                         </ShouldRender>
 
-                                        // @ts-expect-error ts-migrate(2339) FIXME: Property 'edit' does not exist on type 'Readonly<{... Remove this comment to see the full error message
+                                        // @ts-expect-error ts-migrate(2339) FIXME: Property 'edit' does not exist on type 'Readonly<{...Remove this comment to see the full error message
                                         <ShouldRender if={this.props.edit}>
                                             <span>
                                                 Edit Monitor
                                                 // @ts-expect-error ts-migrate(2339) FIXME: Property 'editMonitorProp' does not exist on type ... Remove this comment to see the full error message
                                                 {this.props.editMonitorProp &&
-                                                // @ts-expect-error ts-migrate(2339) FIXME: Property 'editMonitorProp' does not exist on type ... Remove this comment to see the full error message
-                                                this.props.editMonitorProp.name
+                                                    // @ts-expect-error ts-migrate(2339) FIXME: Property 'editMonitorProp' does not exist on type ... Remove this comment to see the full error message
+                                                    this.props.editMonitorProp.name
                                                     ? ' - ' +
-                                                      // @ts-expect-error ts-migrate(2339) FIXME: Property 'editMonitorProp' does not exist on type ... Remove this comment to see the full error message
-                                                      this.props.editMonitorProp
-                                                          .name
+                                                    // @ts-expect-error ts-migrate(2339) FIXME: Property 'editMonitorProp' does not exist on type ... Remove this comment to see the full error message
+                                                    this.props.editMonitorProp
+                                                        .name
                                                     : null}
                                             </span>
                                         </ShouldRender>
                                     </span>
                                 </span>
                                 <p>
-                                    // @ts-expect-error ts-migrate(2339) FIXME: Property 'edit' does not exist on type 'Readonly<{... Remove this comment to see the full error message
+                                    // @ts-expect-error ts-migrate(2339) FIXME: Property 'edit' does not exist on type 'Readonly<{...Remove this comment to see the full error message
                                     <ShouldRender if={!this.props.edit}>
                                         <span>
                                             Monitor any resources (Websites,
@@ -1196,14 +1196,14 @@ class NewMonitor extends Component {
                                             they do not behave the way you want.
                                         </span>
                                     </ShouldRender>
-                                    // @ts-expect-error ts-migrate(2339) FIXME: Property 'edit' does not exist on type 'Readonly<{... Remove this comment to see the full error message
+                                    // @ts-expect-error ts-migrate(2339) FIXME: Property 'edit' does not exist on type 'Readonly<{...Remove this comment to see the full error message
                                     <ShouldRender if={this.props.edit}>
                                         <span>
                                             Edit Name and URL of
                                             // @ts-expect-error ts-migrate(2339) FIXME: Property 'editMonitorProp' does not exist on type ... Remove this comment to see the full error message
                                             {this.props.editMonitorProp &&
-                                            // @ts-expect-error ts-migrate(2339) FIXME: Property 'editMonitorProp' does not exist on type ... Remove this comment to see the full error message
-                                            this.props.editMonitorProp.name
+                                                // @ts-expect-error ts-migrate(2339) FIXME: Property 'editMonitorProp' does not exist on type ... Remove this comment to see the full error message
+                                                this.props.editMonitorProp.name
                                                 // @ts-expect-error ts-migrate(2339) FIXME: Property 'editMonitorProp' does not exist on type ... Remove this comment to see the full error message
                                                 ? ` ${this.props.editMonitorProp.name}`
                                                 : ''}
@@ -1325,15 +1325,14 @@ class NewMonitor extends Component {
                                                                                     <div
                                                                                         className={`radio-field monitor-type-item Box-background--white`}
                                                                                         style={{
-                                                                                            border: `1px solid ${
-                                                                                                this
+                                                                                            border: `1px solid ${this
                                                                                                     .props
                                                                                                     // @ts-expect-error ts-migrate(2339) FIXME: Property 'type' does not exist on type 'Readonly<{... Remove this comment to see the full error message
                                                                                                     .type ===
-                                                                                                el.value
+                                                                                                    el.value
                                                                                                     ? 'black'
                                                                                                     : 'rgba(0,0,0,0.2)'
-                                                                                            }`,
+                                                                                                }`,
                                                                                         }}
                                                                                     >
                                                                                         <div className="radioButtonStyle">
@@ -1438,7 +1437,7 @@ class NewMonitor extends Component {
                                                 <ShouldRender
                                                     if={
                                                         type ===
-                                                            'server-monitor' &&
+                                                        'server-monitor' &&
                                                         // @ts-expect-error ts-migrate(2339) FIXME: Property 'edit' does not exist on type 'Readonly<{... Remove this comment to see the full error message
                                                         !this.props.edit
                                                     }
@@ -2045,12 +2044,11 @@ class NewMonitor extends Component {
                                                                 // @ts-expect-error ts-migrate(2339) FIXME: Property 'index' does not exist on type 'Readonly<... Remove this comment to see the full error message
                                                                 name={`url_${this.props.index}`}
                                                                 id="url"
-                                                                placeholder={`https://mywebsite.com${
-                                                                    type ===
-                                                                    'api'
+                                                                placeholder={`https://mywebsite.com${type ===
+                                                                        'api'
                                                                         ? '/api'
                                                                         : ''
-                                                                }`}
+                                                                    }`}
                                                                 disabled={
                                                                     requesting
                                                                 }
@@ -2086,12 +2084,11 @@ class NewMonitor extends Component {
                                                                 // @ts-expect-error ts-migrate(2339) FIXME: Property 'index' does not exist on type 'Readonly<... Remove this comment to see the full error message
                                                                 name={`url_${this.props.index}`}
                                                                 id="url"
-                                                                placeholder={`https://mywebsite.com${
-                                                                    type ===
-                                                                    'api'
+                                                                placeholder={`https://mywebsite.com${type ===
+                                                                        'api'
                                                                         ? '/api'
                                                                         : ''
-                                                                }`}
+                                                                    }`}
                                                                 disabled={
                                                                     requesting
                                                                 }
@@ -2288,7 +2285,7 @@ class NewMonitor extends Component {
                                                         false &&
                                                         resourceCategoryList &&
                                                         resourceCategoryList.length >
-                                                            0
+                                                        0
                                                     }
                                                 >
                                                     <div className="bs-ContentSection-content Box-root  Flex-flex Flex-alignItems--center Padding-horizontal--29 Padding-vertical--16">
@@ -2343,21 +2340,21 @@ class NewMonitor extends Component {
                                                                                 'Select resource category',
                                                                         },
                                                                         ...(resourceCategoryList &&
-                                                                        resourceCategoryList.length >
+                                                                            resourceCategoryList.length >
                                                                             0
                                                                             ? resourceCategoryList.map(
-                                                                                  (category: $TSFixMe) => ({
-                                                                                      value:
-                                                                                          category._id,
+                                                                                (category: $TSFixMe) => ({
+                                                                                    value:
+                                                                                        category._id,
 
-                                                                                      label:
-                                                                                          category.name
-                                                                                  })
-                                                                              )
+                                                                                    label:
+                                                                                        category.name
+                                                                                })
+                                                                            )
                                                                             : []),
                                                                     ]}
                                                                 />
-                                                                // @ts-expect-error ts-migrate(2322) FIXME: Type '{ children: Element; title: string; }' is no... Remove this comment to see the full error message
+                                                                // @ts-expect-error ts-migrate(2322) FIXME: Type '{children: Element; title: string; }' is no... Remove this comment to see the full error message
                                                                 <Tooltip title="Resource Category">
                                                                     <div>
                                                                         <p>
@@ -2402,7 +2399,7 @@ class NewMonitor extends Component {
                                                                     Call duties.
                                                                 </span>
 
-                                                                // @ts-expect-error ts-migrate(2322) FIXME: Type '{ children: Element; title: string; }' is no... Remove this comment to see the full error message
+                                                                // @ts-expect-error ts-migrate(2322) FIXME: Type '{children: Element; title: string; }' is no... Remove this comment to see the full error message
                                                                 <Tooltip title="Call Schedule">
                                                                     <div>
                                                                         <p>
@@ -2588,7 +2585,7 @@ class NewMonitor extends Component {
                                                                     />
                                                                 )}
 
-                                                                // @ts-expect-error ts-migrate(2322) FIXME: Type '{ children: Element; title: string; }' is no... Remove this comment to see the full error message
+                                                                // @ts-expect-error ts-migrate(2322) FIXME: Type '{children: Element; title: string; }' is no... Remove this comment to see the full error message
                                                                 <Tooltip title="Monitor SLA">
                                                                     <div>
                                                                         <p>
@@ -2706,7 +2703,7 @@ class NewMonitor extends Component {
                                                                     />
                                                                 )}
 
-                                                                // @ts-expect-error ts-migrate(2322) FIXME: Type '{ children: Element; title: string; }' is no... Remove this comment to see the full error message
+                                                                // @ts-expect-error ts-migrate(2322) FIXME: Type '{children: Element; title: string; }' is no... Remove this comment to see the full error message
                                                                 <Tooltip title="Incident Communication SLA">
                                                                     <div>
                                                                         <p>
@@ -2773,12 +2770,12 @@ class NewMonitor extends Component {
                                                         (type === 'api' ||
                                                             type === 'url' ||
                                                             type ===
-                                                                'server-monitor' ||
+                                                            'server-monitor' ||
                                                             type === 'script' ||
                                                             type ===
-                                                                'incomingHttpRequest' ||
+                                                            'incomingHttpRequest' ||
                                                             type ===
-                                                                'kubernetes' ||
+                                                            'kubernetes' ||
                                                             type === 'ip') &&
                                                         // @ts-expect-error ts-migrate(2339) FIXME: Property 'advance' does not exist on type 'Readonl... Remove this comment to see the full error message
                                                         !this.state.advance
@@ -2827,12 +2824,12 @@ class NewMonitor extends Component {
                                                         (type === 'api' ||
                                                             type === 'url' ||
                                                             type ===
-                                                                'server-monitor' ||
+                                                            'server-monitor' ||
                                                             type === 'script' ||
                                                             type ===
-                                                                'incomingHttpRequest' ||
+                                                            'incomingHttpRequest' ||
                                                             type ===
-                                                                'kubernetes' ||
+                                                            'kubernetes' ||
                                                             type === 'ip')
                                                     }
                                                 >
@@ -2861,11 +2858,11 @@ class NewMonitor extends Component {
                                                                 (criterion: $TSFixMe) => {
                                                                     if (
                                                                         criterionType.type ===
-                                                                            criterion.type &&
+                                                                        criterion.type &&
                                                                         type ===
-                                                                            'ip' &&
+                                                                        'ip' &&
                                                                         criterionType.type ===
-                                                                            'degraded'
+                                                                        'degraded'
                                                                     )
                                                                         return false;
                                                                     else {
@@ -2934,43 +2931,102 @@ class NewMonitor extends Component {
 
                                                                 {criteria.length ===
                                                                     0 && (
-                                                                    <div>
-                                                                        <div
-                                                                            className="bs-ContentSection Card-root Card-shadow--clear Padding-all--16 Margin-vertical--16"
-                                                                            style={{
-                                                                                borderRadius:
-                                                                                    '0',
-                                                                                boxShadow:
-                                                                                    'none',
-                                                                                display:
-                                                                                    'flex',
-                                                                                justifyContent:
-                                                                                    'space-between',
-                                                                                alignContent:
-                                                                                    'center',
-                                                                            }}
-                                                                        >
-                                                                            <div className="Margin-bottom--16">
-                                                                                <span
-                                                                                    style={{
-                                                                                        display:
-                                                                                            'inline-block',
-                                                                                        borderRadius:
-                                                                                            '2px',
-                                                                                        height:
-                                                                                            '8px',
-                                                                                        width:
-                                                                                            '8px',
-                                                                                        margin:
-                                                                                            '0 8px 1px 0',
-                                                                                        backgroundColor:
-                                                                                            criterionType.type ===
-                                                                                            'up'
-                                                                                                ? 'rgb(117, 211, 128)'
-                                                                                                : 'rgb(255, 222, 36)',
+                                                                        <div>
+                                                                            <div
+                                                                                className="bs-ContentSection Card-root Card-shadow--clear Padding-all--16 Margin-vertical--16"
+                                                                                style={{
+                                                                                    borderRadius:
+                                                                                        '0',
+                                                                                    boxShadow:
+                                                                                        'none',
+                                                                                    display:
+                                                                                        'flex',
+                                                                                    justifyContent:
+                                                                                        'space-between',
+                                                                                    alignContent:
+                                                                                        'center',
+                                                                                }}
+                                                                            >
+                                                                                <div className="Margin-bottom--16">
+                                                                                    <span
+                                                                                        style={{
+                                                                                            display:
+                                                                                                'inline-block',
+                                                                                            borderRadius:
+                                                                                                '2px',
+                                                                                            height:
+                                                                                                '8px',
+                                                                                            width:
+                                                                                                '8px',
+                                                                                            margin:
+                                                                                                '0 8px 1px 0',
+                                                                                            backgroundColor:
+                                                                                                criterionType.type ===
+                                                                                                    'up'
+                                                                                                    ? 'rgb(117, 211, 128)'
+                                                                                                    : 'rgb(255, 222, 36)',
+                                                                                        }}
+                                                                                    ></span>
+                                                                                    <span className="Text-fontSize--16 Text-fontWeight--medium">
+                                                                                        Monitor{' '}
+                                                                                        {`${criterionType.type
+                                                                                            .charAt(
+                                                                                                0
+                                                                                            )
+                                                                                            .toUpperCase() +
+                                                                                            criterionType.type.slice(
+                                                                                                1
+                                                                                            )}`}{' '}
+                                                                                        Criteria
+                                                                                    </span>
+                                                                                    <p>
+                                                                                        <span className="Margin-left--16">
+                                                                                            This
+                                                                                            is
+                                                                                            where
+                                                                                            you
+                                                                                            describe
+                                                                                            when
+                                                                                            your
+                                                                                            monitor
+                                                                                            is
+                                                                                            considered
+                                                                                            {` ${criterionType.type.toLowerCase()}`}
+                                                                                        </span>
+                                                                                    </p>
+                                                                                </div>
+                                                                                <button
+                                                                                    className="Button bs-ButtonLegacy ActionIconParent Margin-top--8"
+                                                                                    id="Add-Criteria-Button"
+                                                                                    type="button"
+                                                                                    onClick={() => {
+                                                                                        this.addCriterion(
+                                                                                            {
+                                                                                                type:
+                                                                                                    criterionType.type,
+                                                                                                id: uuidv4(),
+                                                                                            }
+                                                                                        );
                                                                                     }}
-                                                                                ></span>
-                                                                                <span className="Text-fontSize--16 Text-fontWeight--medium">
+                                                                                >
+                                                                                    <span className="bs-Button bs-FileUploadButton bs-Button--icon bs-Button--new">
+                                                                                        <span>
+                                                                                            {`Add ${criterionType.type[0].toUpperCase()}${criterionType.type
+                                                                                                .substr(
+                                                                                                    1
+                                                                                                )
+                                                                                                .toLocaleLowerCase()} Criteria`}
+                                                                                        </span>
+                                                                                    </span>
+                                                                                </button>
+                                                                            </div>
+                                                                            <div className="bs-ContentSection-content Box-root Box-background--offset  Padding-horizontal--8 Padding-vertical--16">
+                                                                                <p className="Flex-flex Flex-justifyContent--center Text-fontSize--15">
+                                                                                    You
+                                                                                    do
+                                                                                    not
+                                                                                    have
+                                                                                    any
                                                                                     Monitor{' '}
                                                                                     {`${criterionType.type
                                                                                         .charAt(
@@ -2980,75 +3036,16 @@ class NewMonitor extends Component {
                                                                                         criterionType.type.slice(
                                                                                             1
                                                                                         )}`}{' '}
-                                                                                    Criteria
-                                                                                </span>
-                                                                                <p>
-                                                                                    <span className="Margin-left--16">
-                                                                                        This
-                                                                                        is
-                                                                                        where
-                                                                                        you
-                                                                                        describe
-                                                                                        when
-                                                                                        your
-                                                                                        monitor
-                                                                                        is
-                                                                                        considered
-                                                                                        {` ${criterionType.type.toLowerCase()}`}
-                                                                                    </span>
+                                                                                    Criteria,
+                                                                                    feel
+                                                                                    free
+                                                                                    to
+                                                                                    add
+                                                                                    one
                                                                                 </p>
                                                                             </div>
-                                                                            <button
-                                                                                className="Button bs-ButtonLegacy ActionIconParent Margin-top--8"
-                                                                                id="Add-Criteria-Button"
-                                                                                type="button"
-                                                                                onClick={() => {
-                                                                                    this.addCriterion(
-                                                                                        {
-                                                                                            type:
-                                                                                                criterionType.type,
-                                                                                            id: uuidv4(),
-                                                                                        }
-                                                                                    );
-                                                                                }}
-                                                                            >
-                                                                                <span className="bs-Button bs-FileUploadButton bs-Button--icon bs-Button--new">
-                                                                                    <span>
-                                                                                        {`Add ${criterionType.type[0].toUpperCase()}${criterionType.type
-                                                                                            .substr(
-                                                                                                1
-                                                                                            )
-                                                                                            .toLocaleLowerCase()} Criteria`}
-                                                                                    </span>
-                                                                                </span>
-                                                                            </button>
                                                                         </div>
-                                                                        <div className="bs-ContentSection-content Box-root Box-background--offset  Padding-horizontal--8 Padding-vertical--16">
-                                                                            <p className="Flex-flex Flex-justifyContent--center Text-fontSize--15">
-                                                                                You
-                                                                                do
-                                                                                not
-                                                                                have
-                                                                                any
-                                                                                Monitor{' '}
-                                                                                {`${criterionType.type
-                                                                                    .charAt(
-                                                                                        0
-                                                                                    )
-                                                                                    .toUpperCase() +
-                                                                                    criterionType.type.slice(
-                                                                                        1
-                                                                                    )}`}{' '}
-                                                                                Criteria,
-                                                                                feel
-                                                                                free
-                                                                                to
-                                                                                add
-                                                                                one
-                                                                            </p>
-                                                                        </div>
-                                                                    </div>
-                                                                )}
+                                                                    )}
                                                             </div>
                                                         );
                                                     })}
@@ -3146,7 +3143,7 @@ class NewMonitor extends Component {
                                                     planCategory
                                                 ) ||
                                                 currentMonitorCount <
-                                                    monitorCount
+                                                monitorCount
                                             }
                                         >
                                             <ShouldRender
@@ -3264,8 +3261,8 @@ const mapStateToProps = (state: $TSFixMe, ownProps: $TSFixMe) => {
 
     const currentPlanId =
         state.project &&
-        state.project.currentProject &&
-        state.project.currentProject.stripePlanId
+            state.project.currentProject &&
+            state.project.currentProject.stripePlanId
             ? state.project.currentProject.stripePlanId
             : '';
 
diff --git a/dashboard/src/components/project/DeleteCaution.tsx b/dashboard/src/components/project/DeleteCaution.tsx
index 56cfacbf54..b4882a7d5a 100755
--- a/dashboard/src/components/project/DeleteCaution.tsx
+++ b/dashboard/src/components/project/DeleteCaution.tsx
@@ -61,7 +61,7 @@ class DeleteCaution extends Component {
             // @ts-expect-error ts-migrate(2339) FIXME: Property 'hideOnDelete' does not exist on type 'Re... Remove this comment to see the full error message
             hideOnDelete,
         } = this.props;
-        // eslint-disable-next-line no-console
+
 
         return (
             <form
diff --git a/dashboard/src/components/settings/SsoModal.tsx b/dashboard/src/components/settings/SsoModal.tsx
index c485be2a60..e78b567dbc 100644
--- a/dashboard/src/components/settings/SsoModal.tsx
+++ b/dashboard/src/components/settings/SsoModal.tsx
@@ -45,7 +45,7 @@ const fields = [
         label: 'Enable SAML',
         description:
             'SAML is an industry standard SSO framework typically used by large enterprises for communicating identities across the internet.',
-        // eslint-disable-next-line react/display-name, react/prop-types
+
         component: ({
             input: { value, onChange }
         }: $TSFixMe) => (
@@ -351,7 +351,7 @@ class Component extends React.Component {
                                                                         }}
                                                                         autoFocus={
                                                                             field.key ===
-                                                                            'domain'
+                                                                                'domain'
                                                                                 ? true
                                                                                 : false
                                                                         }
diff --git a/dashboard/src/components/status-page/AddMoreDomainModal.tsx b/dashboard/src/components/status-page/AddMoreDomainModal.tsx
index 0451a738d6..fbcb7e165c 100644
--- a/dashboard/src/components/status-page/AddMoreDomainModal.tsx
+++ b/dashboard/src/components/status-page/AddMoreDomainModal.tsx
@@ -20,7 +20,7 @@ import {
 import { createDomain } from '../../actions/domain';
 import { Validate } from '../../config';
 
-// eslint-disable-next-line no-unused-vars
+
 function validate(_values: $TSFixMe) {
     const error = undefined;
     return error;
diff --git a/dashboard/src/components/status-page/Basic.tsx b/dashboard/src/components/status-page/Basic.tsx
index a21b877b5b..131ab05e16 100755
--- a/dashboard/src/components/status-page/Basic.tsx
+++ b/dashboard/src/components/status-page/Basic.tsx
@@ -92,16 +92,16 @@ export class Branding extends Component {
                 resetFaviconCache();
                 reset();
             },
-            function() {}
+            function () { }
         );
     };
 
     render() {
         // @ts-expect-error ts-migrate(2339) FIXME: Property 'handleSubmit' does not exist on type 'Re... Remove this comment to see the full error message
         const { handleSubmit } = this.props;
-        // eslint-disable-next-line no-unused-vars
+
         let faviconImage = <span />;
-        // eslint-disable-next-line no-unused-vars
+
         let logoImage = <span />;
         // @ts-expect-error ts-migrate(2339) FIXME: Property 'logourl' does not exist on type 'Readonl... Remove this comment to see the full error message
         const logoUrl = this.props.logourl
@@ -109,22 +109,22 @@ export class Branding extends Component {
             ? this.props.logourl
             // @ts-expect-error ts-migrate(2339) FIXME: Property 'statusPage' does not exist on type 'Read... Remove this comment to see the full error message
             : this.props.statusPage.status &&
-              // @ts-expect-error ts-migrate(2339) FIXME: Property 'statusPage' does not exist on type 'Read... Remove this comment to see the full error message
-              this.props.statusPage.status.logoPath
-            // @ts-expect-error ts-migrate(2339) FIXME: Property 'statusPage' does not exist on type 'Read... Remove this comment to see the full error message
-            ? `${API_URL}/file/${this.props.statusPage.status.logoPath}`
-            : '';
+                // @ts-expect-error ts-migrate(2339) FIXME: Property 'statusPage' does not exist on type 'Read... Remove this comment to see the full error message
+                this.props.statusPage.status.logoPath
+                // @ts-expect-error ts-migrate(2339) FIXME: Property 'statusPage' does not exist on type 'Read... Remove this comment to see the full error message
+                ? `${API_URL}/file/${this.props.statusPage.status.logoPath}`
+                : '';
         // @ts-expect-error ts-migrate(2339) FIXME: Property 'faviconurl' does not exist on type 'Read... Remove this comment to see the full error message
         const faviconUrl = this.props.faviconurl
             // @ts-expect-error ts-migrate(2339) FIXME: Property 'faviconurl' does not exist on type 'Read... Remove this comment to see the full error message
             ? this.props.faviconurl
             // @ts-expect-error ts-migrate(2339) FIXME: Property 'statusPage' does not exist on type 'Read... Remove this comment to see the full error message
             : this.props.statusPage.status &&
-              // @ts-expect-error ts-migrate(2339) FIXME: Property 'statusPage' does not exist on type 'Read... Remove this comment to see the full error message
-              this.props.statusPage.status.faviconPath
-            // @ts-expect-error ts-migrate(2339) FIXME: Property 'statusPage' does not exist on type 'Read... Remove this comment to see the full error message
-            ? `${API_URL}/file/${this.props.statusPage.status.faviconPath}`
-            : '';
+                // @ts-expect-error ts-migrate(2339) FIXME: Property 'statusPage' does not exist on type 'Read... Remove this comment to see the full error message
+                this.props.statusPage.status.faviconPath
+                // @ts-expect-error ts-migrate(2339) FIXME: Property 'statusPage' does not exist on type 'Read... Remove this comment to see the full error message
+                ? `${API_URL}/file/${this.props.statusPage.status.faviconPath}`
+                : '';
         if (
             // @ts-expect-error ts-migrate(2339) FIXME: Property 'statusPage' does not exist on type 'Read... Remove this comment to see the full error message
             (this.props.statusPage &&
@@ -135,7 +135,7 @@ export class Branding extends Component {
             // @ts-expect-error ts-migrate(2339) FIXME: Property 'faviconurl' does not exist on type 'Read... Remove this comment to see the full error message
             this.props.faviconurl
         ) {
-            // eslint-disable-next-line no-unused-vars
+
             faviconImage = (
                 <img src={faviconUrl} alt="" className="image-small-circle" />
             );
@@ -150,7 +150,7 @@ export class Branding extends Component {
             // @ts-expect-error ts-migrate(2339) FIXME: Property 'faviconurl' does not exist on type 'Read... Remove this comment to see the full error message
             this.props.faviconurl
         ) {
-            // eslint-disable-next-line no-unused-vars
+
             logoImage = (
                 <img src={logoUrl} alt="" className="image-small-circle" />
             );
@@ -311,8 +311,8 @@ function mapStateToProps(state: $TSFixMe) {
         initialValues: {
             name:
                 state.statusPage &&
-                state.statusPage.status &&
-                state.statusPage.status.name
+                    state.statusPage.status &&
+                    state.statusPage.status.name
                     ? state.statusPage.status.name
                     : '',
         },
diff --git a/dashboard/src/components/status-page/EditMoreDomainModal.tsx b/dashboard/src/components/status-page/EditMoreDomainModal.tsx
index 5f106b77a3..a7966973d4 100644
--- a/dashboard/src/components/status-page/EditMoreDomainModal.tsx
+++ b/dashboard/src/components/status-page/EditMoreDomainModal.tsx
@@ -22,7 +22,7 @@ import {
 import { updateDomain } from '../../actions/domain';
 import { Validate } from '../../config';
 
-// eslint-disable-next-line no-unused-vars
+
 function validate(_values: $TSFixMe) {
     const error = undefined;
     return error;
diff --git a/dashboard/src/components/status-page/EmbeddedBubble.tsx b/dashboard/src/components/status-page/EmbeddedBubble.tsx
index f4142eb5c9..1cab059a16 100644
--- a/dashboard/src/components/status-page/EmbeddedBubble.tsx
+++ b/dashboard/src/components/status-page/EmbeddedBubble.tsx
@@ -100,7 +100,7 @@ const createScript = (url: $TSFixMe, css: $TSFixMe) => {
             placeholderTitleDiv.className = 'text';
             placeholderTitleDiv.innerHTML = statusMessage;
             })
-            .catch(err => console.error(err));
+            .catch(err => logger.error(err));
         };window.onload = function (){initializeBubble()};
         </script>`;
 };
diff --git a/dashboard/src/components/status-page/Setting.tsx b/dashboard/src/components/status-page/Setting.tsx
index bad3b8a0fe..e93b7389b9 100755
--- a/dashboard/src/components/status-page/Setting.tsx
+++ b/dashboard/src/components/status-page/Setting.tsx
@@ -19,7 +19,7 @@ import AddMoreDomainModal from './AddMoreDomainModal';
 import EditMoreDomainModal from './EditMoreDomainModal';
 
 //Client side validation
-// eslint-disable-next-line no-unused-vars
+
 function validate(_values: $TSFixMe) {
     const error = undefined;
     return error;
@@ -281,9 +281,9 @@ export class Setting extends Component {
                                                                 {IsAdminSubProject(
                                                                     subProject
                                                                 ) ||
-                                                                IsOwnerSubProject(
-                                                                    subProject
-                                                                ) ? (
+                                                                    IsOwnerSubProject(
+                                                                        subProject
+                                                                    ) ? (
                                                                     <div className="bs-Fieldset-row">
                                                                         <label
                                                                             className="bs-Fieldset-label"
@@ -456,7 +456,7 @@ export class Setting extends Component {
                                                                                             // @ts-expect-error ts-migrate(2339) FIXME: Property 'domains' does not exist on type 'Readonl... Remove this comment to see the full error message
                                                                                             .domains
                                                                                             .length >
-                                                                                            0
+                                                                                        0
                                                                                     }
                                                                                 >
                                                                                     <div
@@ -495,7 +495,7 @@ export class Setting extends Component {
                                                                                             // @ts-expect-error ts-migrate(2339) FIXME: Property 'domains' does not exist on type 'Readonl... Remove this comment to see the full error message
                                                                                             .domains
                                                                                             .length >
-                                                                                            0
+                                                                                        0
                                                                                     }
                                                                                 >
                                                                                     <div
@@ -539,10 +539,10 @@ export class Setting extends Component {
                                                                                 }}
                                                                             >
                                                                                 {domain &&
-                                                                                domain.domainVerificationToken &&
-                                                                                !domain
-                                                                                    .domainVerificationToken
-                                                                                    .verified ? (
+                                                                                    domain.domainVerificationToken &&
+                                                                                    !domain
+                                                                                        .domainVerificationToken
+                                                                                        .verified ? (
                                                                                     <div
                                                                                         className="Badge Box-root Flex-inlineFlex Flex-alignItems--center Padding-horizontal--8 Padding-vertical--2"
                                                                                         style={{
@@ -575,7 +575,7 @@ export class Setting extends Component {
                                                                                     </div>
                                                                                 )}
                                                                                 {domain &&
-                                                                                domain.enableHttps ? (
+                                                                                    domain.enableHttps ? (
                                                                                     <div className="Badge Box-root Flex-inlineFlex Flex-alignItems--center Padding-horizontal--8 Padding-vertical--2">
                                                                                         <span className="Badge-text Text-color--green Text-display--inline Text-fontSize--14 Text-fontWeight--bold Text-lineHeight--16 Text-wrap--noWrap">
                                                                                             HTTPS
@@ -712,8 +712,8 @@ const mapDispatchToProps = (dispatch: $TSFixMe) => {
 function mapStateToProps(state: $TSFixMe) {
     const domainsContainer =
         state.statusPage &&
-        state.statusPage.status &&
-        state.statusPage.status.domains
+            state.statusPage.status &&
+            state.statusPage.status.domains
             ? state.statusPage.status.domains
             : [];
 
@@ -727,8 +727,8 @@ function mapStateToProps(state: $TSFixMe) {
         currentProject: state.project.currentProject,
         domains:
             state.statusPage &&
-            state.statusPage.status &&
-            state.statusPage.status.domains
+                state.statusPage.status &&
+                state.statusPage.status.domains
                 ? state.statusPage.status.domains
                 : [],
         initialValues: {
diff --git a/dashboard/src/config.tsx b/dashboard/src/config.tsx
index 08482a106d..a44aa7a04b 100755
--- a/dashboard/src/config.tsx
+++ b/dashboard/src/config.tsx
@@ -31,8 +31,8 @@ if (isLocalhost) {
     const address = window.location.host.includes('localhost:')
         ? 'localhost'
         : window.location.host.includes('0.0.0.0:')
-        ? '0.0.0.0'
-        : '127.0.0.1';
+            ? '0.0.0.0'
+            : '127.0.0.1';
     apiUrl = window.location.protocol + `//${address}:3002/api`;
     dashboardUrl = window.location.protocol + `//${address}:3000/dashboard`;
     accountsUrl = window.location.protocol + `//${address}:3003/accounts`;
@@ -197,13 +197,11 @@ export const Validate = {
         return false;
     },
 
-    //eslint-disable-next-line
     isValidBusinessEmail(email: $TSFixMe) {
         //return emaildomains.test(email);
         return true;
     },
 
-    //eslint-disable-next-line
     isValidBusinessEmails(emails: $TSFixMe) {
         // let valid = true;
         // if (emails && emails.length > 0) {
@@ -283,8 +281,8 @@ export const ValidateField = {
                 ? undefined
                 : 'Please select a value'
             : value.length && value.trim() !== ''
-            ? undefined
-            : 'Please select a value'
+                ? undefined
+                : 'Please select a value'
         : 'Please select a value',
 
     maxValue10000: (value: $TSFixMe) => value && value.length && value < 10000
@@ -653,8 +651,8 @@ export function makeCriteria(val: $TSFixMe) {
             // @ts-expect-error ts-migrate(2339) FIXME: Property 'field1' does not exist on type '{}'.
             val3.field1 =
                 val[i].field1 &&
-                typeof val[i].field1 === 'string' &&
-                val[i].field1.indexOf(';')
+                    typeof val[i].field1 === 'string' &&
+                    val[i].field1.indexOf(';')
                     ? val[i].field1.replace(/;/g, '')
                     : val[i].field1;
         }
@@ -662,8 +660,8 @@ export function makeCriteria(val: $TSFixMe) {
             // @ts-expect-error ts-migrate(2339) FIXME: Property 'field2' does not exist on type '{}'.
             val3.field2 =
                 val[i].field2 &&
-                typeof val[i].field2 === 'string' &&
-                val[i].field2.indexOf(';')
+                    typeof val[i].field2 === 'string' &&
+                    val[i].field2.indexOf(';')
                     ? val[i].field2.replace(/;/g, '')
                     : val[i].field2;
         }
@@ -709,8 +707,8 @@ function innerCriteria(val: $TSFixMe, nestVal: $TSFixMe) {
                 // @ts-expect-error ts-migrate(2339) FIXME: Property 'field1' does not exist on type '{}'.
                 innerVal.field1 =
                     val.criteria[j].field1 &&
-                    typeof val.criteria[j].field1 === 'string' &&
-                    val.criteria[j].field1.indexOf(';')
+                        typeof val.criteria[j].field1 === 'string' &&
+                        val.criteria[j].field1.indexOf(';')
                         ? val.criteria[j].field1.replace(/;/g, '')
                         : val.criteria[j].field1;
             }
@@ -718,8 +716,8 @@ function innerCriteria(val: $TSFixMe, nestVal: $TSFixMe) {
                 // @ts-expect-error ts-migrate(2339) FIXME: Property 'field2' does not exist on type '{}'.
                 innerVal.field2 =
                     val.criteria[j].field2 &&
-                    typeof val.criteria[j].field2 === 'string' &&
-                    val.criteria[j].field2.indexOf(';')
+                        typeof val.criteria[j].field2 === 'string' &&
+                        val.criteria[j].field2.indexOf(';')
                         ? val.criteria[j].field2.replace(/;/g, '')
                         : val.criteria[j].field2;
             }
@@ -939,7 +937,7 @@ export function renderIfSubProjectAdmin(
         currentProject.users.length > 0 &&
         currentProject.users.filter(
             (user: $TSFixMe) => user.userId === userId &&
-            (user.role === 'Administrator' || user.role === 'Owner')
+                (user.role === 'Administrator' || user.role === 'Owner')
         ).length > 0
     ) {
         renderItems = true;
@@ -951,8 +949,8 @@ export function renderIfSubProjectAdmin(
                         subProject._id === subProjectId &&
                         subProject.users.filter(
                             (user: $TSFixMe) => user.userId === userId &&
-                            (user.role === 'Administrator' ||
-                                user.role === 'Owner')
+                                (user.role === 'Administrator' ||
+                                    user.role === 'Owner')
                         ).length > 0
                     ) {
                         renderItems = true;
@@ -965,8 +963,8 @@ export function renderIfSubProjectAdmin(
                         subProject.users.length > 0 &&
                         subProject.users.filter(
                             (user: $TSFixMe) => user.userId === userId &&
-                            (user.role === 'Administrator' ||
-                                user.role === 'Owner')
+                                (user.role === 'Administrator' ||
+                                    user.role === 'Owner')
                         ).length > 0
                     ) {
                         renderItems = true;
@@ -1044,10 +1042,10 @@ export const formatBytes = (a: $TSFixMe, b: $TSFixMe, c: $TSFixMe, d: $TSFixMe,
     return (
         formatDecimal(
             ((b = Math),
-            (c = b.log),
-            (d = 1e3),
-            (e = (c(value) / c(d)) | 0),
-            value / b.pow(d, e)),
+                (c = b.log),
+                (d = 1e3),
+                (e = (c(value) / c(d)) | 0),
+                value / b.pow(d, e)),
             decimalPlaces >= 0 ? decimalPlaces : 2,
             roundType
         ) +
@@ -1089,22 +1087,22 @@ export const getMonitorStatus = (incidents: $TSFixMe, logs: $TSFixMe, type: $TSF
         activeOfflineIncident && activeOfflineIncident.length > 0
             ? activeOfflineIncident[0]
             : activeDegradedIncident && activeDegradedIncident.length > 0
-            ? activeDegradedIncident[0]
-            : lastIncident;
+                ? activeDegradedIncident[0]
+                : lastIncident;
 
     const log = logs && logs.length > 0 ? logs[0] : null;
     const statusCompare =
         incident && log
             ? compareStatus(incident, log)
             : incident
-            ? !incident.resolved
-                ? incident.incidentType
-                : 'online'
-            : log
-            ? log.status
-            : type === 'server monitor'
-            ? 'No Data'
-            : 'online';
+                ? !incident.resolved
+                    ? incident.incidentType
+                    : 'online'
+                : log
+                    ? log.status
+                    : type === 'server monitor'
+                        ? 'No Data'
+                        : 'online';
 
     return statusCompare || 'online';
 };
@@ -1146,55 +1144,55 @@ export const filterProbeData = (monitor: $TSFixMe, probe: $TSFixMe, startDate: $
         monitorLogs && monitorLogs.length > 0
             ? probe
                 ? monitorLogs.filter((probeLogs: $TSFixMe) => {
-                      return (
-                          probeLogs._id === null || probeLogs._id === probe._id
-                      );
-                  })
+                    return (
+                        probeLogs._id === null || probeLogs._id === probe._id
+                    );
+                })
                 : monitorLogs
             : [];
     let logs =
         probesLog &&
-        probesLog[0] &&
-        probesLog[0].logs &&
-        probesLog[0].logs.length > 0
+            probesLog[0] &&
+            probesLog[0].logs &&
+            probesLog[0].logs.length > 0
             ? probesLog[0].logs
             : [];
     logs =
         logs && logs.length > 0
             ? logs.filter((log: $TSFixMe) => moment(new Date(log.createdAt)).isBetween(
-            start,
-            end,
-            'day',
-            '[]'
-        )
-              )
+                start,
+                end,
+                'day',
+                '[]'
+            )
+            )
             : [];
 
     const probesStatus =
         monitorStatuses && monitorStatuses.length > 0
             ? probe
                 ? monitorStatuses.filter((probeStatuses: $TSFixMe) => {
-                      return (
-                          probeStatuses._id === null ||
-                          probeStatuses._id === probe._id
-                      );
-                  })
+                    return (
+                        probeStatuses._id === null ||
+                        probeStatuses._id === probe._id
+                    );
+                })
                 : monitorStatuses
             : [];
     let statuses =
         probesStatus &&
-        probesStatus[0] &&
-        probesStatus[0].statuses &&
-        probesStatus[0].statuses.length > 0
+            probesStatus[0] &&
+            probesStatus[0].statuses &&
+            probesStatus[0].statuses.length > 0
             ? probesStatus[0].statuses
             : [];
     statuses =
         statuses && statuses.length > 0
             ? statuses.filter(
-                  (status: $TSFixMe) => moment(new Date(status.startTime)).isBefore(end) &&
-                  (status.endTime === null ||
-                      moment(new Date(status.endTime)).isAfter(start))
-              )
+                (status: $TSFixMe) => moment(new Date(status.startTime)).isBefore(end) &&
+                    (status.endTime === null ||
+                        moment(new Date(status.endTime)).isAfter(start))
+            )
             : [];
 
     return { logs, statuses };
@@ -1518,9 +1516,8 @@ import OneUptime from 'oneuptime'
 // constructor                    
 const logger = new OneUptime.Logger(
     '${apiUrl ? apiUrl : 'API_URL'}',
-    '${
-        applicationLog ? applicationLog._id : 'APPLICATION_LOG_ID'
-    }',                    
+    '${applicationLog ? applicationLog._id : 'APPLICATION_LOG_ID'
+                        }',                    
     '${applicationLog ? applicationLog.key : 'APPLICATION_LOG_KEY'}'
 );
                 
@@ -1590,9 +1587,8 @@ use OneUptime\\OneUptimeLogger;
 // constructor
 $logger = new OneUptimeLogger(                    
     '${apiUrl ? apiUrl : 'API_URL'}',
-    '${
-        applicationLog ? applicationLog._id : 'APPLICATION_LOG_ID'
-    }',                    
+    '${applicationLog ? applicationLog._id : 'APPLICATION_LOG_ID'
+                        }',                    
     '${applicationLog ? applicationLog.key : 'APPLICATION_LOG_KEY'}'
 );
                 
@@ -1666,12 +1662,10 @@ import java.io.IOException;
 // constructor                        
 OneUptimeLogger logger = new OneUptimeLogger(                        
     "${apiUrl ? apiUrl : 'API_URL'}",
-    "${
-        applicationLog ? applicationLog._id : 'APPLICATION_LOG_ID'
-    }",                    
-    "${
-        applicationLog ? applicationLog.key : 'APPLICATION_LOG_KEY'
-    }"                 
+    "${applicationLog ? applicationLog._id : 'APPLICATION_LOG_ID'
+                        }",                    
+    "${applicationLog ? applicationLog.key : 'APPLICATION_LOG_KEY'
+                        }"                 
 );
                         
 // Logging any object of a class                        
@@ -1736,12 +1730,10 @@ from oneuptime_sdk import logger
 // constructor                        
 oneuptimeLogger = logger.OneUptimeLogger(                        
     "${apiUrl ? apiUrl : 'API_URL'}",
-    "${
-        applicationLog ? applicationLog._id : 'APPLICATION_LOG_ID'
-    }",                    
-    "${
-        applicationLog ? applicationLog.key : 'APPLICATION_LOG_KEY'
-    }"                 
+    "${applicationLog ? applicationLog._id : 'APPLICATION_LOG_ID'
+                        }",                    
+    "${applicationLog ? applicationLog.key : 'APPLICATION_LOG_KEY'
+                        }"                 
 );
                             
 # Sending a string log to the server
@@ -1840,9 +1832,8 @@ require 'oneuptime'
 # constructor
 logger = OneUptimeLogger.new(                    
     '${apiUrl ? apiUrl : 'API_URL'}',
-    '${
-        applicationLog ? applicationLog._id : 'APPLICATION_LOG_ID'
-    }',                    
+    '${applicationLog ? applicationLog._id : 'APPLICATION_LOG_ID'
+                        }',                    
     '${applicationLog ? applicationLog.key : 'APPLICATION_LOG_KEY'}'
 );
                 
@@ -1917,12 +1908,10 @@ import (
 // constructor
 option = LoggerOptions{                    
     ApiUrl: '${apiUrl ? apiUrl : 'API_URL'}',
-    ApplicationLogId: '${
-        applicationLog ? applicationLog._id : 'APPLICATION_LOG_ID'
-    }',                    
-    ApplicationLogKey: '${
-        applicationLog ? applicationLog.key : 'APPLICATION_LOG_KEY'
-    }'
+    ApplicationLogId: '${applicationLog ? applicationLog._id : 'APPLICATION_LOG_ID'
+                        }',                    
+    ApplicationLogKey: '${applicationLog ? applicationLog.key : 'APPLICATION_LOG_KEY'
+                        }'
 }
 //initialization
 Init(option)
diff --git a/dashboard/src/serviceWorker.ts b/dashboard/src/serviceWorker.ts
index 439132adbf..b296d3fac5 100644
--- a/dashboard/src/serviceWorker.ts
+++ b/dashboard/src/serviceWorker.ts
@@ -110,7 +110,7 @@ function registerValidSW(swUrl: $TSFixMe, config: $TSFixMe) {
             };
         })
         .catch(error => {
-            // eslint-disable-next-line no-console
+            //eslint-disable-next-line no-console
             console.error(
                 'response Error during service worker registration: ',
                 error
@@ -141,8 +141,8 @@ function checkValidServiceWorker(swUrl: $TSFixMe, config: $TSFixMe) {
             }
         })
         .catch(err => {
-            // eslint-disable-next-line no-console
-            console.log(
+            //eslint-disable-next-line no-console
+            console.info(
                 'No internet connection found. App is running in offline mode.',
                 err
             );
diff --git a/dashboard/src/sw-build.ts b/dashboard/src/sw-build.ts
index f3e9cce834..5d22502246 100644
--- a/dashboard/src/sw-build.ts
+++ b/dashboard/src/sw-build.ts
@@ -15,7 +15,7 @@ const buildSW = () => {
             return `${count} files will be precached, totaling ${size} bytes.`;
         })
         .catch((e: $TSFixMe) => {
-            // eslint-disable-next-line no-console
+            //eslint-disable-next-line no-console
             console.error(e);
         });
 };
diff --git a/dashboard/src/sw-template.ts b/dashboard/src/sw-template.ts
index 6e4fd011ac..404bcff049 100644
--- a/dashboard/src/sw-template.ts
+++ b/dashboard/src/sw-template.ts
@@ -31,7 +31,7 @@ if ('function' === typeof importScripts) {
             });
         });
     } else {
-        // eslint-disable-next-line no-console
+        //eslint-disable-next-line no-console
         console.log('Workbox could not be loaded. No Offline support');
     }
 }
diff --git a/data-ingestor/api/probe.ts b/data-ingestor/api/probe.ts
index c9be6921dd..9600ef16d7 100755
--- a/data-ingestor/api/probe.ts
+++ b/data-ingestor/api/probe.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 import ProbeService from '../services/probeService';
 import MonitorService from '../services/monitorService';
 import LighthouseLogService from '../services/lighthouseLogService';
diff --git a/data-ingestor/index.ts b/data-ingestor/index.ts
index 9b74aaf8b3..c64c0bb88f 100644
--- a/data-ingestor/index.ts
+++ b/data-ingestor/index.ts
@@ -5,7 +5,8 @@ import express, {
     Response,
     NextFunction,
 } from 'common-server/utils/express';
-const app = express();
+import logger from 'common-server/utils/logger';
+const app = express.getExpressApp();
 
 import http from 'http';
 http.createServer(app);
@@ -26,11 +27,11 @@ function getMongoClient() {
 const client = getMongoClient();
 (async function () {
     try {
-        console.log('connecting to db');
+        logger.info('connecting to db');
         await client.connect();
-        console.log('connected to db');
+        logger.info('connected to db');
     } catch (error) {
-        console.log('connection error: ', error);
+        logger.error('connection error: ', error);
     }
 })();
 
@@ -40,7 +41,7 @@ global.db = client.db(databaseName);
 
 app.use(cors());
 
-app.use(function (req: Request, res: Response, next: NextFunction) {
+app.use((req: Request, res: Response, next: NextFunction) => {
     if (typeof req.body === 'string') {
         req.body = JSON.parse(req.body);
     }
@@ -69,7 +70,7 @@ const getActualRequestDurationInMilliseconds = start => {
     return (diff[0] * NS_PER_SEC + diff[1]) / NS_TO_MS;
 };
 
-app.use(function (req: Request, res: Response, next: NextFunction) {
+app.use((req: Request, res: Response, next: NextFunction) => {
     const current_datetime = new Date();
     const formatted_date =
         current_datetime.getFullYear() +
@@ -90,7 +91,7 @@ app.use(function (req: Request, res: Response, next: NextFunction) {
     const durationInMilliseconds =
         getActualRequestDurationInMilliseconds(start);
     const log = `[${formatted_date}] ${method}:${url} ${status} ${durationInMilliseconds.toLocaleString()} ms`;
-    console.log(log);
+    logger.info(log);
     return next();
 });
 
@@ -114,7 +115,7 @@ app.set('port', process.env.PORT || 3200);
 
 http.listen(app.get('port'), function () {
     // eslint-disable-next-line
-    console.log('data-ingestor server started on port ' + app.get('port'));
+    logger.info('data-ingestor server started on port ' + app.get('port'));
 });
 
 export default app;
diff --git a/data-ingestor/middlewares/probeAuthorization.ts b/data-ingestor/middlewares/probeAuthorization.ts
index d0946d7dcd..bae62912c1 100755
--- a/data-ingestor/middlewares/probeAuthorization.ts
+++ b/data-ingestor/middlewares/probeAuthorization.ts
@@ -2,7 +2,7 @@ import ProbeService from '../services/probeService';
 import { sendErrorResponse } from 'common-server/utils/response';
 
 import ErrorService from '../services/errorService';
-import { Request, Response } from 'common-server/utils/express';
+import { Request, Response, NextFunction } from 'common-server/utils/express';
 
 import { clusterKey as CLUSTER_KEY } from '../utils/config';
 
diff --git a/helm-chart/index.ts b/helm-chart/index.ts
index 63f7b8f05d..b206f0b9c0 100644
--- a/helm-chart/index.ts
+++ b/helm-chart/index.ts
@@ -1,28 +1,12 @@
-process.on('exit', () => {
-    // eslint-disable-next-line no-console
-    console.log('Shutting Shutdown');
-});
-
-process.on('unhandledRejection', err => {
-    // eslint-disable-next-line no-console
-    console.error('Unhandled rejection in process occurred');
-    // eslint-disable-next-line no-console
-    console.error(err);
-});
-
-process.on('uncaughtException', err => {
-    // eslint-disable-next-line no-console
-    console.error('Uncaught exception in process occurred');
-    // eslint-disable-next-line no-console
-    console.error(err);
-});
-
+import 'common-server/utils/env';
+import 'common-server/utils/process';
+import logger from 'common-server/utils/logger';
 import express, {
     Request,
     Response,
     NextFunction,
 } from 'common-server/utils/express';
-const app = express();
+const app = express.getExpressApp();
 import path from 'path';
 import version from './api/version';
 
@@ -30,7 +14,7 @@ import cors from 'cors';
 
 app.use(cors());
 
-app.use(function (req: Request, res: Response, next: $TSFixMe) {
+app.use((req: Request, res: Response, next: NextFunction) => {
     if (typeof req.body === 'string') {
         req.body = JSON.parse(req.body);
     }
@@ -65,8 +49,7 @@ app.use(
 app.get(['/chart/version', '/version'], version);
 
 app.listen(app.get('port'), function () {
-    // eslint-disable-next-line no-console
-    console.log('API Reference started on PORT:' + app.get('port'));
+    logger.info('API Reference started on PORT:' + app.get('port'));
 });
 
 export default app;
diff --git a/helm-chart/test/index.ts b/helm-chart/test/index.ts
index c8d584e29e..d422145c22 100644
--- a/helm-chart/test/index.ts
+++ b/helm-chart/test/index.ts
@@ -1,7 +1 @@
-try {
-    require('./version.test');
-} catch (error) {
-    // eslint-disable-next-line no-console
-    console.error(error);
-    throw error;
-}
+import './version.test';
diff --git a/home/index.ts b/home/index.ts
index eff175a3bb..5ae7acf2a6 100755
--- a/home/index.ts
+++ b/home/index.ts
@@ -1,28 +1,8 @@
-process.on('exit', () => {
-    // eslint-disable-next-line no-console
-    console.log('Shutting Shutdown');
-});
-
-process.on('unhandledRejection', err => {
-    // eslint-disable-next-line no-console
-    console.error('Unhandled rejection in process occurred');
-    // eslint-disable-next-line no-console
-    console.error(err);
-});
-
-process.on('uncaughtException', err => {
-    // eslint-disable-next-line no-console
-    console.error('Uncaught exception in process occurred');
-    // eslint-disable-next-line no-console
-    console.error(err);
-});
-
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
-const app = express();
+import 'common-server/utils/env';
+import 'common-server/utils/process';
+import logger from 'common-server/utils/logger';
+import express, { Request, Response } from 'common-server/utils/express';
+const app = express.getExpressApp();
 
 import bodyParser from 'body-parser';
 import path from 'path';
@@ -721,27 +701,37 @@ app.get('/compare/:product', function (req: Request, res: Response) {
 // minify default.js
 app.get('/js/default.js', async function (req: Request, res: Response) {
     res.setHeader('Content-Type', 'text/javascript');
-    //eslint-disable-next-line
     const [error, data] = await tryToCatch(minify, './public/js/default.js');
+
+    if (error) {
+        return res.status(500).send();
+    }
+
     res.send(data);
 });
 
 // minify
 app.get('/css/home.css', async function (req: Request, res: Response) {
     res.setHeader('Content-Type', 'text/css');
-    //eslint-disable-next-line
     const [error, data] = await tryToCatch(minify, './public/css/home.css');
+    if (error) {
+        return res.status(500).send();
+    }
     res.send(data);
 });
 
 // minify
 app.get('/css/comparision.css', async function (req: Request, res: Response) {
     res.setHeader('Content-Type', 'text/css');
-    //eslint-disable-next-line
     const [error, data] = await tryToCatch(
         minify,
         './public/css/comparision.css'
     );
+
+    if (error) {
+        return res.status(500).send();
+    }
+
     res.send(data);
 });
 
@@ -860,6 +850,5 @@ app.get('/*', function (req: Request, res: Response) {
 app.set('port', process.env.PORT || 1444);
 
 app.listen(app.get('port'), function () {
-    //eslint-disable-next-line
-    console.log('Server running on port : ' + app.get('port'));
+    logger.info('Server running on port : ' + app.get('port'));
 });
diff --git a/home/lighthouseWorker.ts b/home/lighthouseWorker.ts
index fb0c38a469..3f8b33dfc6 100644
--- a/home/lighthouseWorker.ts
+++ b/home/lighthouseWorker.ts
@@ -104,8 +104,8 @@ process.on('message', function (data) {
             return scores;
         })
         .catch(err => {
-            // eslint-disable-next-line no-console
-            console.log(err);
+            //eslint-disable-next-line no-console
+            console.error(err);
             process.exit(1);
         });
 });
diff --git a/home/public/js/amplitude.ts b/home/public/js/amplitude.ts
index 93562f70e5..c09fba59d0 100644
--- a/home/public/js/amplitude.ts
+++ b/home/public/js/amplitude.ts
@@ -1,44 +1,44 @@
 (function (e, t) {
-    
+
     var n = e.amplitude || { _q: [], _iq: {} }; var r = t.createElement("script")
         ; r.type = "text/javascript"
         ; r.integrity = "sha384-vYYnQ3LPdp/RkQjoKBTGSq0X5F73gXU3G2QopHaIfna0Ct1JRWzwrmEz115NzOta"
         ; r.crossOrigin = "anonymous"; r.async = true
         ; r.src = "https://cdn.amplitude.com/libs/amplitude-5.8.0-min.gz.js"
         ; r.onload = function () {
-            
+
             if (!e.amplitude.runQueuedFunctions) {
-                console.log("[Amplitude] Error: could not load SDK")
+                logger.info("[Amplitude] Error: could not load SDK")
             }
         }
-        
+
         ; var i = t.getElementsByTagName("script")[0]; i.parentNode.insertBefore(r, i)
         ; function s(e: $TSFixMe, t: $TSFixMe) {
-        e.prototype[t] = function () {
-            this._q.push([t].concat(Array.prototype.slice.call(arguments, 0))); return this
+            e.prototype[t] = function () {
+                this._q.push([t].concat(Array.prototype.slice.call(arguments, 0))); return this
+            }
         }
-        }
-    var o = function(this: $TSFixMe) { this._q = []; return this }
+    var o = function (this: $TSFixMe) { this._q = []; return this }
         ; var a = ["add", "append", "clearAll", "prepend", "set", "setOnce", "unset"]
-        ; for (var u = 0; u < a.length; u++) { s(o, a[u]) } n.Identify = o; var c = function(this: $TSFixMe) {
-        this._q = []
-            ; return this
+        ; for (var u = 0; u < a.length; u++) { s(o, a[u]) } n.Identify = o; var c = function (this: $TSFixMe) {
+            this._q = []
+                ; return this
         }
         ; var l = ["setProductId", "setQuantity", "setPrice", "setRevenueType", "setEventProperties"]
         ; for (var p = 0; p < l.length; p++) { s(c, l[p]) } n.Revenue = c
         ; var d = ["init", "logEvent", "logRevenue", "setUserId", "setUserProperties", "setOptOut", "setVersionName", "setDomain", "setDeviceId", "enableTracking", "setGlobalUserProperties", "identify", "clearUserProperties", "setGroup", "logRevenueV2", "regenerateDeviceId", "groupIdentify", "onInit", "logEventWithTimestamp", "logEventWithGroups", "setSessionId", "resetSessionId"]
         ; function v(e: $TSFixMe) {
             function t(t: $TSFixMe) {
-            e[t] = function () {
-                e._q.push([t].concat(Array.prototype.slice.call(arguments, 0)))
-            }
+                e[t] = function () {
+                    e._q.push([t].concat(Array.prototype.slice.call(arguments, 0)))
+                }
             }
             for (var n = 0; n < d.length; n++) { t(d[n]) }
         } v(n); n.getInstance = function (e: $TSFixMe) {
             e = (!e || e.length === 0 ? "$default_instance" : e).toLowerCase()
                 ; if (!n._iq.hasOwnProperty(e)) { n._iq[e] = { _q: [] }; v(n._iq[e]) } return n._iq[e]
         }
-        
+
         ; e.amplitude = n
 })(window, document);
 
diff --git a/home/public/js/crm.ts b/home/public/js/crm.ts
index 522db973b4..6a5b8bc53b 100755
--- a/home/public/js/crm.ts
+++ b/home/public/js/crm.ts
@@ -1,4 +1,3 @@
-//eslint-disable-next-line
 function openTab(evt: $TSFixMe, tabName: $TSFixMe) {
     // Declare all variables
     let i;
@@ -16,18 +15,17 @@ function openTab(evt: $TSFixMe, tabName: $TSFixMe) {
     }
 
     // Show the current tab, and add an "active" class to the link that opened the tab
-    
+
     document.getElementById(tabName).className += ' active';
     evt.currentTarget.className += ' active';
-    
+
     setTimeout(() => document.getElementById(tabName + '1').parentNode.click(), 200);
 }
-//eslint-disable-next-line
 function openTooltip(name: $TSFixMe) {
     // Declare all variables
     let i;
     const element = document.getElementById(name);
-    
+
     const elclass = element.className;
 
     const tooltip = document.getElementsByClassName('tooltiptext');
@@ -35,11 +33,11 @@ function openTooltip(name: $TSFixMe) {
         tooltip[i].className = tooltip[i].className.replace(' active', '');
     }
     if (elclass.indexOf('active') > -1) {
-        
+
         element.className = element.className.replace(' active', '');
     }
     else {
-        
+
         element.classList.add('active');
     }
 }
@@ -48,14 +46,14 @@ window.onload = function () {
     animateHTML().init();
     const tooltext = document.getElementsByClassName('tooltiptext');
     for (let i = 0; i < tooltext.length; i++) {
-        
+
         tooltext[i].onclick = function (e: $TSFixMe) {
             e.stopPropagation();
         }
     }
 
     document.getElementsByTagName('body')[0].onclick = function (e) {
-        
+
         if (e.target.className !== 'popover-dot' && e.target.className !== 'tooltiptext' && e.target.className !== 'tablinks active') {
             const tooltip = document.getElementsByClassName('tooltiptext');
             for (let i = 0; i < tooltip.length; i++) {
@@ -77,13 +75,13 @@ const animateHTML = function () {
         window.addEventListener('resize', init)
     }
     const _checkPosition = function () {
-        if(!elem){
+        if (!elem) {
             return;
         }
         const posFromTop = elem.getBoundingClientRect().top;
 
         if (posFromTop - windowHeight <= -400) {
-            
+
             document.getElementById('Statuspage1').parentNode.click();
             window.removeEventListener('scroll', _checkPosition);
             window.removeEventListener('resize', init);
diff --git a/home/public/js/default.ts b/home/public/js/default.ts
index 03c9efab26..656cb2b8e2 100755
--- a/home/public/js/default.ts
+++ b/home/public/js/default.ts
@@ -14,11 +14,11 @@ function readConfig(t: $TSFixMe) {
 }
 
 function globalNavDropdowns(this: $TSFixMe, t: $TSFixMe) {
-    if(!document.querySelector(t)){
+    if (!document.querySelector(t)) {
         return
     }
     var n = this;
-    this.container = document.querySelector(t), this.root = this.container.querySelector('.navRoot'), this.primaryNav = this.root.querySelector('.navSection.primary'), this.primaryNavItem = this.root.querySelector('.navSection.primary .rootLink:last-child'), this.secondaryNavItem = this.root.querySelector('.navSection.secondary .rootLink:first-child'), this.checkCollision(), window.addEventListener('load', this.checkCollision.bind(this)), window.addEventListener('resize', this.checkCollision.bind(this)), this.container.classList.add('noDropdownTransition'), this.dropdownBackground = this.container.querySelector('.dropdownBackground'), this.dropdownBackgroundAlt = this.container.querySelector('.alternateBackground'), this.dropdownContainer = this.container.querySelector('.dropdownContainer'), this.dropdownArrow = this.container.querySelector('.dropdownArrow'), this.dropdownRoots = Strut.queryArray('.hasDropdown', this.root), this.dropdownSections = Strut.queryArray('.dropdownSection', this.container).map(function(t) {
+    this.container = document.querySelector(t), this.root = this.container.querySelector('.navRoot'), this.primaryNav = this.root.querySelector('.navSection.primary'), this.primaryNavItem = this.root.querySelector('.navSection.primary .rootLink:last-child'), this.secondaryNavItem = this.root.querySelector('.navSection.secondary .rootLink:first-child'), this.checkCollision(), window.addEventListener('load', this.checkCollision.bind(this)), window.addEventListener('resize', this.checkCollision.bind(this)), this.container.classList.add('noDropdownTransition'), this.dropdownBackground = this.container.querySelector('.dropdownBackground'), this.dropdownBackgroundAlt = this.container.querySelector('.alternateBackground'), this.dropdownContainer = this.container.querySelector('.dropdownContainer'), this.dropdownArrow = this.container.querySelector('.dropdownArrow'), this.dropdownRoots = Strut.queryArray('.hasDropdown', this.root), this.dropdownSections = Strut.queryArray('.dropdownSection', this.container).map(function (t) {
         return {
             el: t,
             name: t.getAttribute('data-dropdown'),
@@ -34,40 +34,40 @@ function globalNavDropdowns(this: $TSFixMe, t: $TSFixMe) {
         enter: 'mouseenter',
         leave: 'mouseleave'
     };
-    this.dropdownRoots.forEach(function(t: $TSFixMe) {
-        t.addEventListener(e.end, function(e: $TSFixMe) {
+    this.dropdownRoots.forEach(function (t: $TSFixMe) {
+        t.addEventListener(e.end, function (e: $TSFixMe) {
             e.preventDefault(), e.stopPropagation(), n.toggleDropdown(t)
-        }), t.addEventListener(e.enter, function(e: $TSFixMe) {
+        }), t.addEventListener(e.enter, function (e: $TSFixMe) {
             'touch' != e.pointerType && (n.stopCloseTimeout(), n.openDropdown(t))
-        }), t.addEventListener(e.leave, function(t: $TSFixMe) {
+        }), t.addEventListener(e.leave, function (t: $TSFixMe) {
             'touch' != t.pointerType && n.startCloseTimeout()
         })
-    }), this.dropdownContainer.addEventListener(e.end, function(t: $TSFixMe) {
+    }), this.dropdownContainer.addEventListener(e.end, function (t: $TSFixMe) {
         t.stopPropagation()
-    }), this.dropdownContainer.addEventListener(e.enter, function(t: $TSFixMe) {
+    }), this.dropdownContainer.addEventListener(e.enter, function (t: $TSFixMe) {
         'touch' != t.pointerType && n.stopCloseTimeout()
-    }), this.dropdownContainer.addEventListener(e.leave, function(t: $TSFixMe) {
+    }), this.dropdownContainer.addEventListener(e.leave, function (t: $TSFixMe) {
         'touch' != t.pointerType && n.startCloseTimeout()
-    }), document.body.addEventListener(e.end, function() {
-        
+    }), document.body.addEventListener(e.end, function () {
+
         Strut.touch.isDragging || n.closeDropdown()
     })
 }
 
 function globalNavPopup(this: $TSFixMe, t: $TSFixMe) {
-    
-    if(!document.querySelector(t) || !document.querySelector(t).querySelector('.popup')){
+
+    if (!document.querySelector(t) || !document.querySelector(t).querySelector('.popup')) {
         return
     }
 
     var n = this,
-        
+
         e = Strut.touch.isSupported ? 'touchend' : 'click';
-    this.activeClass = 'globalPopupActive', this.root = document.querySelector(t), this.link = this.root.querySelector('.rootLink'), this.popup = this.root.querySelector('.popup'), this.closeButton = this.root.querySelector('.popupCloseButton'), this.link.addEventListener(e, function(t: $TSFixMe) {
+    this.activeClass = 'globalPopupActive', this.root = document.querySelector(t), this.link = this.root.querySelector('.rootLink'), this.popup = this.root.querySelector('.popup'), this.closeButton = this.root.querySelector('.popupCloseButton'), this.link.addEventListener(e, function (t: $TSFixMe) {
         t.stopPropagation(), n.togglePopup()
-    }), this.popup.addEventListener(e, function(t: $TSFixMe) {
+    }), this.popup.addEventListener(e, function (t: $TSFixMe) {
         t.stopPropagation()
-    }), this.popup.addEventListener('transitionend', function() {
+    }), this.popup.addEventListener('transitionend', function () {
         if (n.isOpening) {
             n.isOpening = !1;
             var t = n.popup.getBoundingClientRect().top + window.scrollY;
@@ -76,14 +76,14 @@ function globalNavPopup(this: $TSFixMe, t: $TSFixMe) {
                 n.popup.style.transform = 'translateY(' + e + 'px)'
             }
         }
-    }), this.closeButton && this.closeButton.addEventListener(e, function() {
+    }), this.closeButton && this.closeButton.addEventListener(e, function () {
         n.closeAllPopups()
-    }), document.body.addEventListener(e, function() {
-        
+    }), document.body.addEventListener(e, function () {
+
         Strut.touch.isDragging || n.closeAllPopups()
     }, !1)
 
-}! function() {
+} ! function () {
     function t() {
         e(), n()
     }
@@ -95,7 +95,7 @@ function globalNavPopup(this: $TSFixMe, t: $TSFixMe) {
     function e() {
         var t = new Date,
             n = a + '=ack';
-        
+
         t.setYear(t.getFullYear() + 10), n += ';expires=' + t.toGMTString(), n += ';domain=' + document.domain, document.cookie = n
     }
 
@@ -105,201 +105,201 @@ function globalNavPopup(this: $TSFixMe, t: $TSFixMe) {
     var o: $TSFixMe, r, a = 'cookie_banner_ack';
     document.addEventListener('DOMContentLoaded', i)
 }(),
-function() {
-    
-    window.$ && window.$.ajaxPrefilter && $(function() {
-        var t: $TSFixMe;
-        return t = function() {
-            var t, n;
-            
-            return t = $('form input[name=csrf-token]'), t.length > 0 ? t.attr('value') : (n = $('meta[name=csrf-token]'), n.length > 0 ? n.attr('content') : '')
-        
-        }, $.ajaxPrefilter(function(n: $TSFixMe, e: $TSFixMe, i: $TSFixMe) {
-            var o;
-            return o = t(), i.setRequestHeader('x-oneuptime-csrf-token', o)
-        });
-    })
-}.call(this);
+    function () {
+
+        window.$ && window.$.ajaxPrefilter && $(function () {
+            var t: $TSFixMe;
+            return t = function () {
+                var t, n;
+
+                return t = $('form input[name=csrf-token]'), t.length > 0 ? t.attr('value') : (n = $('meta[name=csrf-token]'), n.length > 0 ? n.attr('content') : '')
+
+            }, $.ajaxPrefilter(function (n: $TSFixMe, e: $TSFixMe, i: $TSFixMe) {
+                var o;
+                return o = t(), i.setRequestHeader('x-oneuptime-csrf-token', o)
+            });
+        })
+    }.call(this);
 var Strut = {
-    random: function(t: $TSFixMe, n: $TSFixMe) {
+    random: function (t: $TSFixMe, n: $TSFixMe) {
         return Math.random() * (n - t) + t
     },
-    arrayRandom: function(t: $TSFixMe) {
+    arrayRandom: function (t: $TSFixMe) {
         return t[Math.floor(Math.random() * t.length)]
     },
-    interpolate: function(t: $TSFixMe, n: $TSFixMe, e: $TSFixMe) {
+    interpolate: function (t: $TSFixMe, n: $TSFixMe, e: $TSFixMe) {
         return t * (1 - e) + n * e
     },
-    rangePosition: function(t: $TSFixMe, n: $TSFixMe, e: $TSFixMe) {
+    rangePosition: function (t: $TSFixMe, n: $TSFixMe, e: $TSFixMe) {
         return (e - t) / (n - t)
     },
-    clamp: function(t: $TSFixMe, n: $TSFixMe, e: $TSFixMe) {
+    clamp: function (t: $TSFixMe, n: $TSFixMe, e: $TSFixMe) {
         return Math.max(Math.min(t, e), n)
     },
-    queryArray: function(t: $TSFixMe, n: $TSFixMe) {
+    queryArray: function (t: $TSFixMe, n: $TSFixMe) {
         return n || (n = document.body), Array.prototype.slice.call(n.querySelectorAll(t))
     },
-    ready: function(t: $TSFixMe) {
+    ready: function (t: $TSFixMe) {
         'loading' !== document.readyState ? t() : document.addEventListener('DOMContentLoaded', t)
     }
 };
 
-Strut.isRetina = window.devicePixelRatio > 1.3, Strut.mobileViewportWidth = 670, Strut.isMobileViewport = window.innerWidth < Strut.mobileViewportWidth, window.addEventListener('resize', function() {
-        
-        Strut.isMobileViewport = window.innerWidth < Strut.mobileViewportWidth
-    
-    }), Strut.touch = {
-        isSupported: 'ontouchstart' in window || navigator.maxTouchPoints,
-        isDragging: !1
-    }, document.addEventListener('DOMContentLoaded', function() {
-        document.body.addEventListener('touchmove', function() {
-            
-            Strut.touch.isDragging = !0
-        }), document.body.addEventListener('touchstart', function() {
-            
-            Strut.touch.isDragging = !1
+Strut.isRetina = window.devicePixelRatio > 1.3, Strut.mobileViewportWidth = 670, Strut.isMobileViewport = window.innerWidth < Strut.mobileViewportWidth, window.addEventListener('resize', function () {
+
+    Strut.isMobileViewport = window.innerWidth < Strut.mobileViewportWidth
+
+}), Strut.touch = {
+    isSupported: 'ontouchstart' in window || navigator.maxTouchPoints,
+    isDragging: !1
+}, document.addEventListener('DOMContentLoaded', function () {
+    document.body.addEventListener('touchmove', function () {
+
+        Strut.touch.isDragging = !0
+    }), document.body.addEventListener('touchstart', function () {
+
+        Strut.touch.isDragging = !1
+    })
+
+}), Strut.load = {
+    images: function (t: $TSFixMe, n: $TSFixMe) {
+        'string' == typeof t && (t = [t]);
+        var e = -t.length;
+        t.forEach(function (t: $TSFixMe) {
+            var i = new Image;
+            i.src = t, i.onload = function () {
+                0 === ++e && n && n()
+            }
         })
-    
-    }), Strut.load = {
-        images: function(t: $TSFixMe, n: $TSFixMe) {
-            'string' == typeof t && (t = [t]);
-            var e = -t.length;
-            t.forEach(function(t: $TSFixMe) {
-                var i = new Image;
-                i.src = t, i.onload = function() {
-                    0 === ++e && n && n()
-                }
-            })
-        },
-        css: function(t: $TSFixMe, n: $TSFixMe) {
-            var e = document.createElement('link'),
-                i = window.readConfig('strut_files') || {},
-                o = i[t];
-            if (!o) throw new Error('CSS file "' + t + '" not found in strut_files config');
-            e.href = o, e.rel = 'stylesheet', document.head.appendChild(e), n && (e.onload = n)
-        },
-        js: function(t: $TSFixMe, n: $TSFixMe) {
-            var e = document.createElement('script'),
-                i = window.readConfig('strut_files') || {},
-                o = i[t];
-            if (!o) throw new Error('Javascript file "' + t + '" not found in strut_files config');
-            e.src = o, e.async = !1, document.head.appendChild(e), n && (e.onload = n)
+    },
+    css: function (t: $TSFixMe, n: $TSFixMe) {
+        var e = document.createElement('link'),
+            i = window.readConfig('strut_files') || {},
+            o = i[t];
+        if (!o) throw new Error('CSS file "' + t + '" not found in strut_files config');
+        e.href = o, e.rel = 'stylesheet', document.head.appendChild(e), n && (e.onload = n)
+    },
+    js: function (t: $TSFixMe, n: $TSFixMe) {
+        var e = document.createElement('script'),
+            i = window.readConfig('strut_files') || {},
+            o = i[t];
+        if (!o) throw new Error('Javascript file "' + t + '" not found in strut_files config');
+        e.src = o, e.async = !1, document.head.appendChild(e), n && (e.onload = n)
+    }
+
+}, Strut.supports = {
+    es6: function () {
+        try {
+            return new Function('(a = 0) => a'), !0
+        } catch (t) {
+            return !1
         }
-    
-    }, Strut.supports = {
-        es6: function() {
-            try {
-                return new Function('(a = 0) => a'), !0
-            } catch (t) {
-                return !1
-            }
-        }(),
-        pointerEvents: function() {
-            var t = document.createElement('a').style;
-            return t.cssText = 'pointer-events:auto', 'auto' === t.pointerEvents
-        }(),
-        positionSticky: Boolean(window.CSS && CSS.supports('(position: -webkit-sticky) or (position: sticky)')),
-        masks: function() {
-            return !/MSIE|Trident|Edge/i.test(navigator.userAgent);
-        }()
-    }, globalNavDropdowns.prototype.checkCollision = function() {
-        var t = this;
-        
-        if (!Strut.isMobileViewport)
-            if (1 == t.compact) {
-                var n = document.body.clientWidth,
-                    e = t.primaryNav.getBoundingClientRect();
-                e.left + e.width / 2 > n / 2 && (t.container.classList.remove('compact'), t.compact = !1)
-            } else {
-                var i = t.primaryNavItem.getBoundingClientRect(),
-                    o = t.secondaryNavItem.getBoundingClientRect();
-                i.right > o.left && (t.container.classList.add('compact'), t.compact = !0)
-            }
-    }, globalNavDropdowns.prototype.openDropdown = function(t: $TSFixMe) {
-        var n = this;
-        if (this.activeDropdown !== t) {
-            this.container.classList.add('overlayActive'), this.container.classList.add('dropdownActive'), this.activeDropdown = t, this.dropdownRoots.forEach(function(t: $TSFixMe) {
-                t.classList.remove('active')
-            }), t.classList.add('active');
-            var e, i, o, r = t.getAttribute('data-dropdown'),
-                a = 'left';
-            this.dropdownSections.forEach(function(t: $TSFixMe) {
-                t.el.classList.remove('active'), t.el.classList.remove('left'), t.el.classList.remove('right'), t.name == r ? (t.el.classList.add('active'), a = 'right', e = t.content.offsetWidth, i = t.content.offsetHeight, t.content.getAttribute('data-fixed') ? t.content.setAttribute('data-fixed', !0) : (t.content.style.width = e + 'px', t.content.style.height = i + 'px'), o = t.content) : t.el.classList.add(a)
-            });
-            var s = 380,
-                c = 400,
-                
-                d = e / s,
-                
-                l = i / c,
-                u = t.getBoundingClientRect(),
-                
-                p = u.left + u.width / 2 - e / 2;
-            p = Math.round(Math.max(p, 10)), clearTimeout(this.disableTransitionTimeout), this.enableTransitionTimeout = setTimeout(function() {
-                n.container.classList.remove('noDropdownTransition')
-            }, 50), this.dropdownBackground.style.transform = 'translateX(' + p + 'px) scaleX(' + d + ') scaleY(' + l + ')', this.dropdownContainer.style.transform = 'translateX(' + p + 'px)', this.dropdownContainer.style.width = e + 'px', this.dropdownContainer.style.height = i + 'px';
-            var w = Math.round(u.left + u.width / 2);
-            this.dropdownArrow.style.transform = 'translateX(' + w + 'px) rotate(45deg)';
-            
-            var f = o.children[0].offsetHeight / l;
-            
-            this.dropdownBackgroundAlt.style.transform = 'translateY(' + f + 'px)', window.siteAnalytics && window.siteAnalytics.trackGlobalNavDropdownOpen && window.siteAnalytics.trackGlobalNavDropdownOpen(r)
+    }(),
+    pointerEvents: function () {
+        var t = document.createElement('a').style;
+        return t.cssText = 'pointer-events:auto', 'auto' === t.pointerEvents
+    }(),
+    positionSticky: Boolean(window.CSS && CSS.supports('(position: -webkit-sticky) or (position: sticky)')),
+    masks: function () {
+        return !/MSIE|Trident|Edge/i.test(navigator.userAgent);
+    }()
+}, globalNavDropdowns.prototype.checkCollision = function () {
+    var t = this;
+
+    if (!Strut.isMobileViewport)
+        if (1 == t.compact) {
+            var n = document.body.clientWidth,
+                e = t.primaryNav.getBoundingClientRect();
+            e.left + e.width / 2 > n / 2 && (t.container.classList.remove('compact'), t.compact = !1)
+        } else {
+            var i = t.primaryNavItem.getBoundingClientRect(),
+                o = t.secondaryNavItem.getBoundingClientRect();
+            i.right > o.left && (t.container.classList.add('compact'), t.compact = !0)
         }
-    }, globalNavDropdowns.prototype.closeDropdown = function() {
-        var t = this;
-        this.activeDropdown && (this.dropdownRoots.forEach(function(t: $TSFixMe) {
+}, globalNavDropdowns.prototype.openDropdown = function (t: $TSFixMe) {
+    var n = this;
+    if (this.activeDropdown !== t) {
+        this.container.classList.add('overlayActive'), this.container.classList.add('dropdownActive'), this.activeDropdown = t, this.dropdownRoots.forEach(function (t: $TSFixMe) {
             t.classList.remove('active')
-        }), clearTimeout(this.enableTransitionTimeout), this.disableTransitionTimeout = setTimeout(function() {
-            t.container.classList.add('noDropdownTransition')
-        }, 50), this.container.classList.remove('overlayActive'), this.container.classList.remove('dropdownActive'), this.activeDropdown = undefined)
-    }, globalNavDropdowns.prototype.toggleDropdown = function(t: $TSFixMe) {
-        this.activeDropdown === t ? this.closeDropdown() : this.openDropdown(t)
-    }, globalNavDropdowns.prototype.startCloseTimeout = function() {
-        var t = this;
-        t.closeDropdownTimeout = setTimeout(function() {
-            t.closeDropdown()
-        }, 50)
-    }, globalNavDropdowns.prototype.stopCloseTimeout = function() {
-        var t = this;
-        clearTimeout(t.closeDropdownTimeout)
-    }, globalNavPopup.prototype.togglePopup = function() {
-        var t = this.root.classList.contains(this.activeClass);
-        this.closeAllPopups(!0), t || (this.root.classList.add(this.activeClass), this.isOpening = !0)
-    }, globalNavPopup.prototype.closeAllPopups = function() {
-        
-        for (var t = document.getElementsByClassName(this.activeClass), n = 0; n < t.length; n++) t[n].querySelector('.popup').style.transform = null, t[n].classList.remove(this.activeClass)
-    
-    }, Strut.supports.pointerEvents || Strut.load.css('v3/shared/navigation_ie10.html'), Strut.ready(function() {
-        
-        new globalNavDropdowns('.globalNav'), new globalNavPopup('.globalNav .navSection.mobile'), new globalNavPopup('.globalFooterNav .select.country'), new globalNavPopup('.globalFooterNav .select.language')
-    }),
-    function() {
-        
+        }), t.classList.add('active');
+        var e, i, o, r = t.getAttribute('data-dropdown'),
+            a = 'left';
+        this.dropdownSections.forEach(function (t: $TSFixMe) {
+            t.el.classList.remove('active'), t.el.classList.remove('left'), t.el.classList.remove('right'), t.name == r ? (t.el.classList.add('active'), a = 'right', e = t.content.offsetWidth, i = t.content.offsetHeight, t.content.getAttribute('data-fixed') ? t.content.setAttribute('data-fixed', !0) : (t.content.style.width = e + 'px', t.content.style.height = i + 'px'), o = t.content) : t.el.classList.add(a)
+        });
+        var s = 380,
+            c = 400,
+
+            d = e / s,
+
+            l = i / c,
+            u = t.getBoundingClientRect(),
+
+            p = u.left + u.width / 2 - e / 2;
+        p = Math.round(Math.max(p, 10)), clearTimeout(this.disableTransitionTimeout), this.enableTransitionTimeout = setTimeout(function () {
+            n.container.classList.remove('noDropdownTransition')
+        }, 50), this.dropdownBackground.style.transform = 'translateX(' + p + 'px) scaleX(' + d + ') scaleY(' + l + ')', this.dropdownContainer.style.transform = 'translateX(' + p + 'px)', this.dropdownContainer.style.width = e + 'px', this.dropdownContainer.style.height = i + 'px';
+        var w = Math.round(u.left + u.width / 2);
+        this.dropdownArrow.style.transform = 'translateX(' + w + 'px) rotate(45deg)';
+
+        var f = o.children[0].offsetHeight / l;
+
+        this.dropdownBackgroundAlt.style.transform = 'translateY(' + f + 'px)', window.siteAnalytics && window.siteAnalytics.trackGlobalNavDropdownOpen && window.siteAnalytics.trackGlobalNavDropdownOpen(r)
+    }
+}, globalNavDropdowns.prototype.closeDropdown = function () {
+    var t = this;
+    this.activeDropdown && (this.dropdownRoots.forEach(function (t: $TSFixMe) {
+        t.classList.remove('active')
+    }), clearTimeout(this.enableTransitionTimeout), this.disableTransitionTimeout = setTimeout(function () {
+        t.container.classList.add('noDropdownTransition')
+    }, 50), this.container.classList.remove('overlayActive'), this.container.classList.remove('dropdownActive'), this.activeDropdown = undefined)
+}, globalNavDropdowns.prototype.toggleDropdown = function (t: $TSFixMe) {
+    this.activeDropdown === t ? this.closeDropdown() : this.openDropdown(t)
+}, globalNavDropdowns.prototype.startCloseTimeout = function () {
+    var t = this;
+    t.closeDropdownTimeout = setTimeout(function () {
+        t.closeDropdown()
+    }, 50)
+}, globalNavDropdowns.prototype.stopCloseTimeout = function () {
+    var t = this;
+    clearTimeout(t.closeDropdownTimeout)
+}, globalNavPopup.prototype.togglePopup = function () {
+    var t = this.root.classList.contains(this.activeClass);
+    this.closeAllPopups(!0), t || (this.root.classList.add(this.activeClass), this.isOpening = !0)
+}, globalNavPopup.prototype.closeAllPopups = function () {
+
+    for (var t = document.getElementsByClassName(this.activeClass), n = 0; n < t.length; n++) t[n].querySelector('.popup').style.transform = null, t[n].classList.remove(this.activeClass)
+
+}, Strut.supports.pointerEvents || Strut.load.css('v3/shared/navigation_ie10.html'), Strut.ready(function () {
+
+    new globalNavDropdowns('.globalNav'), new globalNavPopup('.globalNav .navSection.mobile'), new globalNavPopup('.globalFooterNav .select.country'), new globalNavPopup('.globalFooterNav .select.language')
+}),
+    function () {
+
 
         function t() {
             var t = [].slice.call(arguments);
-            o() && console.log.apply(console, t)
+            o() && logger.info.apply(console, t)
         }
 
         function n() {
             var t = {},
                 n = document.getElementById('site-analytics-config');
-            
+
             return n && (t = JSON.parse(n.textContent)), t
         }
 
         function e() {
-            
+
             return n().generalAnalyticsConfig || {}
         }
 
         function i() {
-            
+
             return n().siteSpecificAnalyticsConfig || {}
         }
 
         function o() {
-            
+
             return !!window[b]
         }
 
@@ -326,30 +326,30 @@ Strut.isRetina = window.devicePixelRatio > 1.3, Strut.mobileViewportWidth = 670,
         function l(n: $TSFixMe, e: $TSFixMe, i: $TSFixMe) {
             u();
             var o = f(i);
-            
+
             window.Analytics[n](e, o), t('emit', n, e, o)
         }
 
         function u() {
-            
+
             A || (window.Analytics.configure(e()), A = !0, t('Sent config data'))
         }
 
         function p(n: $TSFixMe, e: $TSFixMe, i: $TSFixMe) {
-            
+
             S.push([n, e, i]), g(), t('enqueue', n, e, i)
         }
 
         function w() {
-            
-            t('Flushing event queue'), u(), S.forEach(function(this: $TSFixMe, t) {
+
+            t('Flushing event queue'), u(), S.forEach(function (this: $TSFixMe, t) {
                 l.apply(this, t)
             })
         }
 
         function f(t: $TSFixMe) {
             var n = e();
-            return Object.keys(t || {}).forEach(function(e) {
+            return Object.keys(t || {}).forEach(function (e) {
                 n[e] = t[e]
             }), n
         }
@@ -359,20 +359,20 @@ Strut.isRetina = window.devicePixelRatio > 1.3, Strut.mobileViewportWidth = 670,
         }
 
         function m() {
-            
+
             v = null, window.Analytics ? (w(), L = E) : (g(), t('Ready timer waiting ' + L + 'ms'))
         }
 
         function y(this: $TSFixMe, t: $TSFixMe) {
-            
+
             window.ga && window.ga.apply(this, t)
         }
 
         function h() {
-            
+
             window.siteAnalyticsUtil.analyticsConfigData || (g(), window.siteAnalyticsUtil.debugActive = o, window.siteAnalyticsUtil.emitAction = r, window.siteAnalyticsUtil.emitActionOnce = a, window.siteAnalyticsUtil.emitModal = s, window.siteAnalyticsUtil.emitViewed = c, window.siteAnalyticsUtil.siteAnalyticsConfig = i, window.siteAnalyticsUtil.sendToGoogleAnalytics = y, window.siteAnalyticsUtil.generalAnalyticsConfig = e)
         }
-        
+
         window.siteAnalytics = window.siteAnalytics || {}, window.siteAnalyticsUtil = window.siteAnalyticsUtil || {};
         var v: $TSFixMe, A = !1,
             b = 'SITE_ANALYTICS_DEBUG',
@@ -382,18 +382,18 @@ Strut.isRetina = window.devicePixelRatio > 1.3, Strut.mobileViewportWidth = 670,
             k = 1.3;
         h()
     }(),
-    function() {
+    function () {
         function t(t: $TSFixMe) {
             var e = n(t),
                 i = {};
-            
+
             return e.getAttribute(r) && (i.action = e.getAttribute(r)), e.getAttribute(s) && (i.modal = e.getAttribute(s)), e.getAttribute(a) && (i.params = {
                 source: e.getAttribute(a)
-            
+
             }), e.getAttribute(c) && (i.googleAnalyticsParams = JSON.parse(e.getAttribute(c))), i
         }
 
-        
+
         function n(t: $TSFixMe) {
             return t.getAttribute(r) || t.getAttribute(s) ? t : t.parentNode && 'BODY' !== t.tagName ? n(t.parentNode) : null
         }
@@ -404,12 +404,12 @@ Strut.isRetina = window.devicePixelRatio > 1.3, Strut.mobileViewportWidth = 670,
 
         function i(n: $TSFixMe) {
             var e = t(n);
-            
+
             e.modal && window.siteAnalyticsUtil.emitModal(e.modal, e.params), e.action && window.siteAnalyticsUtil.emitAction(e.action, e.params), e.googleAnalyticsParams && window.siteAnalyticsUtil.sendToGoogleAnalytics(e.googleAnalyticsParams)
         }
 
         function o() {
-            
+
             window.siteAnalytics.hasAnalyticsAttributes = e, window.siteAnalytics.trackByAttributes = i
         }
         var r = 'data-analytics-action',
@@ -418,13 +418,13 @@ Strut.isRetina = window.devicePixelRatio > 1.3, Strut.mobileViewportWidth = 670,
             c = 'data-analytics-ga';
         o()
     }(),
-    function() {
+    function () {
         function t(t: $TSFixMe) {
             return t.matches('form *')
         }
 
         function n(n: $TSFixMe) {
-            
+
             t(n.target) && window.siteAnalyticsUtil.emitAction(o, {
                 name: n.target.getAttribute('name'),
                 value: n.target.value
@@ -432,7 +432,7 @@ Strut.isRetina = window.devicePixelRatio > 1.3, Strut.mobileViewportWidth = 670,
         }
 
         function e(t: $TSFixMe) {
-            
+
             'FORM' === t.target.tagName && window.siteAnalyticsUtil.emitAction(r)
         }
 
@@ -443,36 +443,36 @@ Strut.isRetina = window.devicePixelRatio > 1.3, Strut.mobileViewportWidth = 670,
             r = 'form_submit';
         i()
     }(),
-    function() {
+    function () {
         function t(t: $TSFixMe) {
-            
+
             i[t] || (i[t] = !0, window.siteAnalyticsUtil.emitAction(e, {
                 dropdown: t
             }))
         }
 
         function n() {
-            
+
             window.siteAnalytics.trackGlobalNavDropdownOpen = t
         }
         var e = 'nav_dropdown_open',
             i = {};
         n()
     }(),
-    function() {
+    function () {
         function t() {
-            
+
             window.siteAnalyticsUtil.emitActionOnce(c)
         }
 
         function n() {
-            
+
             window.siteAnalyticsUtil.emitActionOnce(d)
         }
 
         function e(t: $TSFixMe) {
             var n = t.innerText.trim().toLowerCase();
-            
+
             f[n] || (f[n] = !0, window.siteAnalyticsUtil.emitAction(l, {
                 text: n
             }))
@@ -480,33 +480,33 @@ Strut.isRetina = window.devicePixelRatio > 1.3, Strut.mobileViewportWidth = 670,
 
         function i(t: $TSFixMe) {
             var n = t.innerText.trim().toLowerCase();
-            
+
             g[n] || (f[n] = !0, window.siteAnalyticsUtil.emitAction(u, {
                 text: n
             }))
         }
 
         function o(t: $TSFixMe) {
-            
+
             window.siteAnalyticsUtil.emitAction(p, {
                 category: t
             })
         }
 
         function r(t: $TSFixMe) {
-            
+
             window.siteAnalyticsUtil.emitAction(p, {
                 query: t
             })
         }
 
         function a() {
-            
+
             window.siteAnalyticsUtil.emitActionOnce(w)
         }
 
         function s() {
-            
+
             window.siteAnalytics.trackConnectRoutingDiagram = i, window.siteAnalytics.trackHomePageNotebook = e, window.siteAnalytics.trackRadarIcosahedron = t, window.siteAnalytics.trackRadarFraudChart = n, window.siteAnalytics.trackSigmaQueryCategory = o, window.siteAnalytics.trackSigmaQueryExample = r, window.siteAnalytics.trackSigmaPricingSlider = a
         }
         var c = 'radar_icosahedron',
@@ -519,7 +519,7 @@ Strut.isRetina = window.devicePixelRatio > 1.3, Strut.mobileViewportWidth = 670,
             g = {};
         s()
     }(),
-    function() {
+    function () {
         function t(t: $TSFixMe) {
             return !!t.getAttribute('href')
         }
@@ -539,17 +539,17 @@ Strut.isRetina = window.devicePixelRatio > 1.3, Strut.mobileViewportWidth = 670,
                 o = {
                     text: n(t.innerText)
                 };
-            
+
             window.siteAnalyticsUtil.emitAction(i, o)
         }
 
-        
+
         function o(t: $TSFixMe) {
             return 'A' === t.tagName ? t : t.parentNode ? o(t.parentNode) : null
         }
 
         function r(n: $TSFixMe) {
-            
+
             if (window.siteAnalytics.hasAnalyticsAttributes(n.target)) return void window.siteAnalytics.trackByAttributes(n.target);
             var e = o(n.target);
             e && t(e) && i(e)
@@ -563,31 +563,31 @@ Strut.isRetina = window.devicePixelRatio > 1.3, Strut.mobileViewportWidth = 670,
             d = 'pdf_link';
         a()
     }(),
-    function() {
+    function () {
         function t() {
             if (n()) {
-                
+
                 var t = window.siteAnalyticsUtil.generalAnalyticsConfig(),
                     e = document.documentElement.id;
-                
+
                 window.siteAnalyticsUtil.emitViewed(e, t)
             }
         }
 
         function n() {
-            
+
             return !!document.documentElement.id && !!window.siteAnalyticsUtil.siteAnalyticsConfig().trackPageViewed
         }
 
         function e() {
-            
+
             window.siteAnalytics.pageLoadTracking || (window.siteAnalytics.pageLoadTracking = {
                 trackPageView: t
             }, window.addEventListener('load', t))
         }
         e()
     }(),
-    function() {
+    function () {
         function t(t: $TSFixMe) {
             return i(d, t)
         }
@@ -602,7 +602,7 @@ Strut.isRetina = window.devicePixelRatio > 1.3, Strut.mobileViewportWidth = 670,
 
         function i(t: $TSFixMe, n: $TSFixMe) {
             var e = n;
-            
+
             'string' != typeof n && (e = r(n)), window.siteAnalyticsUtil.emitAction(t, {
                 video: e
             })
@@ -627,7 +627,7 @@ Strut.isRetina = window.devicePixelRatio > 1.3, Strut.mobileViewportWidth = 670,
         }
 
         function c() {
-            
+
             document.addEventListener('play', a, !0), document.addEventListener('ended', s, !0), window.siteAnalytics.trackVideoExpand = t, window.siteAnalytics.trackVideoPlay = n, window.siteAnalytics.trackVideoEnd = e
         }
         var d = 'video_expand',
@@ -636,4 +636,3 @@ Strut.isRetina = window.devicePixelRatio > 1.3, Strut.mobileViewportWidth = 670,
         c()
     }();
 
-    
\ No newline at end of file
diff --git a/home/public/js/switch.ts b/home/public/js/switch.ts
index 0d8244daa9..d371a10e5a 100755
--- a/home/public/js/switch.ts
+++ b/home/public/js/switch.ts
@@ -1,6 +1,8 @@
 /*eslint-disable*/
 
-!function(t,e){'object'==typeof exports&&'object'==typeof module?module.exports=e():'function'==typeof define&&define.amd?define([],e):'object'==typeof exports?exports.Switch=e():t.Switch=e()}(this,function(){return function(t){function e(o: $TSFixMe){if(n[o])return n[o].exports;var r=n[o]={exports:{},id:o,loaded:!1};return t[o].call(r.exports,r,r.exports,e),r.loaded=!0,r.exports}var n={};return e.m=t,e.c=n,e.p='',e(0)}([function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){function o(t: $TSFixMe){return t&&t.__esModule?t:{default:t}}Object.defineProperty(e,'__esModule',{value:!0});var r=n(1),i=o(r);e.default=i.default,t.exports=e.default},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){function o(t: $TSFixMe){return t&&t.__esModule?t:{default:t}}function r(this: $TSFixMe, t: $TSFixMe, e: $TSFixMe) {this._init(t,e)}function i(){}function c(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){S(t).add('switch','switch-'+(C.includes(e.size)?e.size:'default'),e.checked?j:M),h.call(n),a.call(n),l.call(n),f.call(n,n._options.disabled)}function s(t: $TSFixMe,e: $TSFixMe){t.setAttribute('tabindex',0),t.setAttribute('role','checkbox'),t.setAttribute('aria-checked',e.checked),t.setAttribute('aria-disabled',e.disabled)}function u(t: $TSFixMe,e: $TSFixMe){e.parentNode.insertBefore(t,e.nextSibling)}function a(this: $TSFixMe) {this._el.checked?(this._switch.style.boxShadow='inset 0 0 0 '+this._switch.clientHeight/1.8+'px '+this._options.onSwitchColor,this._switch.style.border='1px solid '+this._options.onSwitchColor,this._switch.style.transition='border 0.4s, box-shadow 0.4s, background-color 1.4s',this._switch.style.backgroundColor=this._options.onSwitchColor,this._jack.style.backgroundColor=this._options.onJackColor):(this._switch.style.boxShadow='inset 0 0 0 0  '+this._options.offSwitchColor,this._switch.style.border='1px solid '+O,this._switch.style.transition='border 0.4s, box-shadow 0.4s',this._switch.style.backgroundColor=this._options.offSwitchColor,this._jack.style.backgroundColor=this._options.offJackColor)}function f(this: $TSFixMe, t: $TSFixMe) {this._el.disabled=t,S(this._switch)[t?'add':'remove']('switch-disabled'),this._switch.setAttribute('aria-disabled',t)}function l(this: $TSFixMe) {var t=this._switch.clientWidth-this._jack.clientWidth;this._jack.style.left=this._el.checked?t+'px':0}function h(this: $TSFixMe) {this._options.showText&&(this._jack.innerHTML=this._el.checked?this._options.onText:this._options.offText)}function p(t: $TSFixMe,e: $TSFixMe){return e?((0,k.default)(e).forEach(function(n: $TSFixMe){t[n]=e[n]}),t):t;}function d(t: $TSFixMe,e: $TSFixMe){var n=!0,o=!1,r=void 0;try{for(var i: $TSFixMe,c=function(){var t=(0,g.default)(i.value,2),e=t[0],n=t[1];e=e.split(' '),function(t,e){n.addEventListener(t,T[e])}(e[0],e[1])},s=(0,m.default)(t);!(n=(i=s.next()).done);n=!0)c()}catch(t){o=!0,r=t}finally{try{!n&&s.return&&s.return()}finally{if(o)throw r}}}function v(t: $TSFixMe,e: $TSFixMe){var n=!0,o=!1,r=void 0;try{for(var i: $TSFixMe,c=function(){var t=(0,g.default)(i.value,2),e=t[0],n=t[1];e=e.split(' '),function(t,e){console.log(),n.removeEventListener(t,T[e])}(e[0],e[1])},s=(0,m.default)(t);!(n=(i=s.next()).done);n=!0)c()}catch(t){o=!0,r=t}finally{try{!n&&s.return&&s.return()}finally{if(o)throw r}}}Object.defineProperty(e,'__esModule',{value:!0});var y=n(2),g=o(y),_=n(55),m=o(_),w=n(59),k=o(w),x=n(63),b=o(x);n(83);var E=n(87),S=n(88),C=['default','large','small'],T={changeSwitchStateFromCheckbox:function(){this._switch._toggle(this.checked)},changeSwitchStateFromSwitch:function(){this._instance._options.disabled||this._instance._toggle()},changeSwitchStateFromKeyboard:function(t: $TSFixMe){var e=t.which||t.keyCode||0;this._instance._options.disabled||13===e&&this._instance._toggle()}},O='#dfdfdf',j='switch-on',M='switch-off';r.prototype._init=function(t: $TSFixMe,e: $TSFixMe){var n={size:'default',checked:void 0,onText:'Y',offText:'N',onSwitchColor:'#64BD63',offSwitchColor:'#fff',onJackColor:'#fff',offJackColor:'#fff',showText:!1,disabled:!1,onInit:i,beforeChange:i,onChange:i,beforeRemove:i,onRemove:i,beforeDestroy:i,onDestroy:i};if(t&&1===t.nodeType&&'checkbox'===t.type){if(t._switch)return t._switch;if(!(this instanceof r))return new r(t,e);this._el=t,this._el._switch=this,this._options=p(n,e),this._initElement(),this._initEvents(),this._options.onInit.call(this)}},r.prototype._initElement=function(){this._el.style.display='none',void 0!==this._options.checked?this._el.checked=Boolean(this._options.checked):this._options.checked=this._el.checked;var t=this._createSwitch();s(t,this._options),u(t,this._el),c(t,this._options,this),E.attach(t)},r.prototype._createSwitch=function(){return this._switch=document.createElement('span'),this._jack=document.createElement('small'),this._switch.appendChild(this._jack),this._switch._instance=this,this._switch},r.prototype._initEvents=function(){this._events=new b.default([['change changeSwitchStateFromCheckbox',this._el],['click changeSwitchStateFromSwitch',this._switch],['keypress changeSwitchStateFromKeyboard',this._switch]]),d(this._events,this)},r.prototype._toggle=function(t: $TSFixMe){this._options.beforeChange.call(this,this._el.checked),this._el.checked=void 0===t?!this._el.checked:t,this._options.onChange.call(this,this._el.checked);var e=this._el.checked?j:M,n=this._el.checked?M:j;this._switch.setAttribute('aria-checked',this._el.checked),S(this._switch).add(e).remove(n),l.call(this),h.call(this),a.call(this)},r.prototype.getChecked=function(){return this._el.checked},r.prototype.on=function(){this._toggle(!0)},r.prototype.off=function(){this._toggle(!1)},r.prototype.toggle=function(){this._toggle()},r.prototype.disable=function(){f.call(this,this._options.disabled=!0)},r.prototype.enable=function(){f.call(this,this._options.disabled=!1)},r.prototype.destroy=function(){this._options.beforeDestroy.call(this,this._el.checked),v(this._events,this),this._options.onDestroy.call(this)},r.prototype.remove=function(){this._options.beforeRemove.call(this,this._el.checked);try{this._el.setAttribute('style',this._el.getAttribute('style').replace(/\s*display:\s*none;/g,''))}catch(t){}this._switch.parentNode&&(this._switch.parentNode.removeChild(this._switch),this._options.onRemove.call(this))},e.default=r,t.exports=e.default},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){function o(t: $TSFixMe){return t&&t.__esModule?t:{default:t}}e.__esModule=!0;var r=n(3),i=o(r),c=n(55),s=o(c);e.default=function(){function t(t: $TSFixMe,e: $TSFixMe){var n=[],o=!0,r=!1,i=void 0;try{for(var c,u=(0,s.default)(t);!(o=(c=u.next()).done)&&(n.push(c.value),!e||n.length!==e);o=!0);}catch(t){r=!0,i=t}finally{try{!o&&u.return&&u.return()}finally{if(r)throw i}}return n}return function(e: $TSFixMe,n: $TSFixMe){if(Array.isArray(e))return e;if((0,i.default)(Object(e)))return t(e,n);throw new TypeError('Invalid attempt to destructure non-iterable instance')};}()},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){t.exports={default:n(4),__esModule:!0}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){n(5),n(51),t.exports=n(53)},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){n(6);for(var o=n(17),r=n(21),i=n(9),c=n(48)('toStringTag'),s=['NodeList','DOMTokenList','MediaList','StyleSheetList','CSSRuleList'],u=0;u<5;u++){var a=s[u],f=o[a],l=f&&f.prototype;l&&!l[c]&&r(l,c,a),i[a]=i.Array}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(7),r=n(8),i=n(9),c=n(10);t.exports=n(14)(Array,'Array',function(this: $TSFixMe, t: $TSFixMe, e: $TSFixMe) {this._t=c(t),this._i=0,this._k=e},function(this: $TSFixMe) {var t=this._t,e=this._k,n=this._i++;return!t||n>=t.length?(this._t=void 0,r(1)):'keys'==e?r(0,n):'values'==e?r(0,t[n]):r(0,[n,t[n]])},'values'),i.Arguments=i.Array,o('keys'),o('values'),o('entries')},function(t: $TSFixMe,e: $TSFixMe){t.exports=function(){}},function(t: $TSFixMe,e: $TSFixMe){t.exports=function(t: $TSFixMe,e: $TSFixMe){return{value:e,done:!!t}}},function(t: $TSFixMe,e: $TSFixMe){t.exports={}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(11),r=n(13);t.exports=function(t: $TSFixMe){return o(r(t))}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(12);t.exports=Object('z').propertyIsEnumerable(0)?Object:function(t: $TSFixMe){return'String'==o(t)?t.split(''):Object(t)}},function(t: $TSFixMe,e: $TSFixMe){var n={}.toString;t.exports=function(t: $TSFixMe){return n.call(t).slice(8,-1)}},function(t: $TSFixMe,e: $TSFixMe){t.exports=function(t: $TSFixMe){if(void 0==t)throw TypeError('Can\'t call method on  '+t);return t}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(15),r=n(16),i=n(31),c=n(21),s=n(32),u=n(9),a=n(33),f=n(47),l=n(49),h=n(48)('iterator'),p=!([].keys&&'next'in[].keys()),d='@@iterator',v='keys',y='values',g=function(this: $TSFixMe) {return this};t.exports=function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe,_: $TSFixMe,m: $TSFixMe,w: $TSFixMe,k: $TSFixMe){a(n,e,_);var x,b,E,S=function(t: $TSFixMe){if(!p&&t in j)return j[t];switch(t){case v:return function(this: $TSFixMe) {return new n(this,t)};case y:return function(this: $TSFixMe) {return new n(this,t)};}return function(this: $TSFixMe) {return new n(this,t)};},C=e+' Iterator',T=m==y,O=!1,j=t.prototype,M=j[h]||j[d]||m&&j[m],A=M||S(m),L=m?T?S('entries'):A:void 0,N='Array'==e?j.entries||M:M;if(N&&(E=l(N.call(new t)),E!==Object.prototype&&(f(E,C,!0),o||s(E,h)||c(E,h,g))),T&&M&&M.name!==y&&(O=!0,A=function(this: $TSFixMe) {return M.call(this)}),o&&!k||!p&&!O&&j[h]||c(j,h,A),u[e]=A,u[C]=g,m)if(x={values:T?A:S(y),keys:w?A:S(v),entries:L},k)for(b in x)b in j||i(j,b,x[b]);else r(r.P+r.F*(p||O),e,x);return x}},function(t: $TSFixMe,e: $TSFixMe){t.exports=!0},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(17),r=n(18),i=n(19),c=n(21),s='prototype',u=function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var a,f,l,h=t&u.F,p=t&u.G,d=t&u.S,v=t&u.P,y=t&u.B,g=t&u.W,_=p?r:r[e]||(r[e]={}),m=_[s],w=p?o:d?o[e]:(o[e]||{})[s];p&&(n=e);for(a in n)f=!h&&w&&void 0!==w[a],f&&a in _||(l=f?w[a]:n[a],_[a]=p&&'function'!=typeof w[a]?n[a]:y&&f?i(l,o):g&&w[a]==l?function(t){var e=function(this: $TSFixMe, e: $TSFixMe, n: $TSFixMe, o: $TSFixMe) {if(this instanceof t){switch(arguments.length){case 0:return new t;case 1:return new t(e);case 2:return new t(e,n)}return new t(e,n,o)}return t.apply(this,arguments)};return e[s]=t[s],e}(l):v&&'function'==typeof l?i(Function.call,l):l,v&&((_.virtual||(_.virtual={}))[a]=l,t&u.R&&m&&!m[a]&&c(m,a,l)))};u.F=1,u.G=2,u.S=4,u.P=8,u.B=16,u.W=32,u.U=64,u.R=128,t.exports=u},function(t: $TSFixMe,e: $TSFixMe){var n=t.exports='undefined'!=typeof window&&window.Math==Math?window:'undefined'!=typeof self&&self.Math==Math?self:Function('return this')();'number'==typeof __g&&(__g=n)},function(t: $TSFixMe,e: $TSFixMe){var n=t.exports={version:'2.4.0'};'number'==typeof __e&&(__e=n)},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(20);t.exports=function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){if(o(t),void 0===e)return t;switch(n){case 1:return function(n: $TSFixMe){return t.call(e,n)};case 2:return function(n: $TSFixMe,o: $TSFixMe){return t.call(e,n,o)};case 3:return function(n: $TSFixMe,o: $TSFixMe,r: $TSFixMe){return t.call(e,n,o,r)};}return function(){return t.apply(e,arguments)}}},function(t: $TSFixMe,e: $TSFixMe){t.exports=function(t: $TSFixMe){if('function'!=typeof t)throw TypeError(t+' is not a function!');return t}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(22),r=n(30);t.exports=n(26)?function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){return o.f(t,e,r(1,n))}:function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){return t[e]=n,t}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(23),r=n(25),i=n(29),c=Object.defineProperty;e.f=n(26)?Object.defineProperty:function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){if(o(t),e=i(e,!0),o(n),r)try{return c(t,e,n)}catch(t){}if('get'in n||'set'in n)throw TypeError('Accessors not supported!');return'value'in n&&(t[e]=n.value),t}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(24);t.exports=function(t: $TSFixMe){if(!o(t))throw TypeError(t+' is not an object!');return t}},function(t: $TSFixMe,e: $TSFixMe){t.exports=function(t: $TSFixMe){return'object'==typeof t?null!==t:'function'==typeof t}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){t.exports=!n(26)&&!n(27)(function(){return 7!=Object.defineProperty(n(28)('div'),'a',{get:function(){return 7}}).a})},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){t.exports=!n(27)(function(){return 7!=Object.defineProperty({},'a',{get:function(){return 7}}).a})},function(t: $TSFixMe,e: $TSFixMe){t.exports=function(t: $TSFixMe){try{return!!t()}catch(t){return!0}}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(24),r=n(17).document,i=o(r)&&o(r.createElement);t.exports=function(t: $TSFixMe){return i?r.createElement(t):{}}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(24);t.exports=function(t: $TSFixMe,e: $TSFixMe){if(!o(t))return t;var n,r;if(e&&'function'==typeof(n=t.toString)&&!o(r=n.call(t)))return r;if('function'==typeof(n=t.valueOf)&&!o(r=n.call(t)))return r;if(!e&&'function'==typeof(n=t.toString)&&!o(r=n.call(t)))return r;throw TypeError('Can\'t convert object to primitive value')}},function(t: $TSFixMe,e: $TSFixMe){t.exports=function(t: $TSFixMe,e: $TSFixMe){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){t.exports=n(21)},function(t: $TSFixMe,e: $TSFixMe){var n={}.hasOwnProperty;t.exports=function(t: $TSFixMe,e: $TSFixMe){return n.call(t,e)}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(34),r=n(30),i=n(47),c={};n(21)(c,n(48)('iterator'),function(this: $TSFixMe) {return this}),t.exports=function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){t.prototype=o(c,{next:r(1,n)}),i(t,e+' Iterator')}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(23),r=n(35),i=n(45),c=n(42)('IE_PROTO'),s=function(){},u='prototype',a=function(){var t,e=n(28)('iframe'),o=i.length,r='<',c='>';for(e.style.display='none',n(46).appendChild(e),e.src='javascript:',t=e.contentWindow.document,t.open(),t.write(r+'script'+c+'document.F=Object'+r+'/script'+c),t.close(),a=t.F;o--;)delete a[u][i[o]];return a()};t.exports=Object.create||function(t: $TSFixMe,e: $TSFixMe){var n;return null!==t?(s[u]=o(t),n=new s,s[u]=null,n[c]=t):n=a(),void 0===e?n:r(n,e)}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(22),r=n(23),i=n(36);t.exports=n(26)?Object.defineProperties:function(t: $TSFixMe,e: $TSFixMe){r(t);for(var n,c=i(e),s=c.length,u=0;s>u;)o.f(t,n=c[u++],e[n]);return t}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(37),r=n(45);t.exports=Object.keys||function(t: $TSFixMe){return o(t,r)}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(32),r=n(10),i=n(38)(!1),c=n(42)('IE_PROTO');t.exports=function(t: $TSFixMe,e: $TSFixMe){var n,s=r(t),u=0,a=[];for(n in s)n!=c&&o(s,n)&&a.push(n);for(;e.length>u;)o(s,n=e[u++])&&(~i(a,n)||a.push(n));return a}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(10),r=n(39),i=n(41);t.exports=function(t: $TSFixMe){return function(e: $TSFixMe,n: $TSFixMe,c: $TSFixMe){var s,u=o(e),a=r(u.length),f=i(c,a);if(t&&n!=n){for(;a>f;)if(s=u[f++],s!=s)return!0}else for(;a>f;f++)if((t||f in u)&&u[f]===n)return t||f||0;return!t&&-1};}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(40),r=Math.min;t.exports=function(t: $TSFixMe){return t>0?r(o(t),9007199254740991):0}},function(t: $TSFixMe,e: $TSFixMe){var n=Math.ceil,o=Math.floor;t.exports=function(t: $TSFixMe){return isNaN(t=+t)?0:(t>0?o:n)(t)}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(40),r=Math.max,i=Math.min;t.exports=function(t: $TSFixMe,e: $TSFixMe){return t=o(t),t<0?r(t+e,0):i(t,e)}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(43)('keys'),r=n(44);t.exports=function(t: $TSFixMe){return o[t]||(o[t]=r(t))}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(17),r='__core-js_shared__',i=o[r]||(o[r]={});t.exports=function(t: $TSFixMe){return i[t]||(i[t]={})}},function(t: $TSFixMe,e: $TSFixMe){var n=0,o=Math.random();t.exports=function(t: $TSFixMe){return'Symbol('.concat(void 0===t?'':t,')_',(++n+o).toString(36))}},function(t: $TSFixMe,e: $TSFixMe){t.exports='constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf'.split(',')},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){t.exports=n(17).document&&document.documentElement},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(22).f,r=n(32),i=n(48)('toStringTag');t.exports=function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){t&&!r(t=n?t:t.prototype,i)&&o(t,i,{configurable:!0,value:e})}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(43)('wks'),r=n(44),i=n(17).Symbol,c='function'==typeof i,s=t.exports=function(t: $TSFixMe){return o[t]||(o[t]=c&&i[t]||(c?i:r)('Symbol.'+t))};s.store=o},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(32),r=n(50),i=n(42)('IE_PROTO'),c=Object.prototype;t.exports=Object.getPrototypeOf||function(t: $TSFixMe){return t=r(t),o(t,i)?t[i]:'function'==typeof t.constructor&&t instanceof t.constructor?t.constructor.prototype:t instanceof Object?c:null}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(13);t.exports=function(t: $TSFixMe){return Object(o(t))}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(52)(!0);n(14)(String,'String',function(this: $TSFixMe, t: $TSFixMe) {this._t=String(t),this._i=0},function(this: $TSFixMe) {var t,e=this._t,n=this._i;return n>=e.length?{value:void 0,done:!0}:(t=o(e,n),this._i+=t.length,{value:t,done:!1})})},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(40),r=n(13);t.exports=function(t: $TSFixMe){return function(e: $TSFixMe,n: $TSFixMe){var i,c,s=String(r(e)),u=o(n),a=s.length;return u<0||u>=a?t?'':void 0:(i=s.charCodeAt(u),i<55296||i>56319||u+1===a||(c=s.charCodeAt(u+1))<56320||c>57343?t?s.charAt(u):i:t?s.slice(u,u+2):(i-55296<<10)+(c-56320)+65536)};}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(54),r=n(48)('iterator'),i=n(9);t.exports=n(18).isIterable=function(t: $TSFixMe){var e=Object(t);return void 0!==e[r]||'@@iterator'in e||i.hasOwnProperty(o(e))}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(12),r=n(48)('toStringTag'),i='Arguments'==o(function(){return arguments}()),c=function(t: $TSFixMe,e: $TSFixMe){try{return t[e]}catch(t){}};t.exports=function(t: $TSFixMe){var e,n,s;return void 0===t?'Undefined':null===t?'Null':'string'==typeof(n=c(e=Object(t),r))?n:i?o(e):'Object'==(s=o(e))&&'function'==typeof e.callee?'Arguments':s}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){t.exports={default:n(56),__esModule:!0}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){n(5),n(51),t.exports=n(57)},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(23),r=n(58);t.exports=n(18).getIterator=function(t: $TSFixMe){var e=r(t);if('function'!=typeof e)throw TypeError(t+' is not iterable!');return o(e.call(t))}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(54),r=n(48)('iterator'),i=n(9);t.exports=n(18).getIteratorMethod=function(t: $TSFixMe){if(void 0!=t)return t[r]||t['@@iterator']||i[o(t)]}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){t.exports={default:n(60),__esModule:!0}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){n(61),t.exports=n(18).Object.keys},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(50),r=n(36);n(62)('keys',function(){return function(t: $TSFixMe){return r(o(t))};})},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(16),r=n(18),i=n(27);t.exports=function(t: $TSFixMe,e: $TSFixMe){var n=(r.Object||{})[t]||Object[t],c={};c[t]=e(n),o(o.S+o.F*i(function(){n(1)}),'Object',c)}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){t.exports={default:n(64),__esModule:!0}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){n(65),n(51),n(5),n(66),n(80),t.exports=n(18).Map},function(t: $TSFixMe,e: $TSFixMe){},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(67);t.exports=n(75)('Map',function(t: $TSFixMe){return function(this: $TSFixMe) {return t(this,arguments.length>0?arguments[0]:void 0)};},{get:function(t: $TSFixMe){var e=o.getEntry(this,t);return e&&e.v},set:function(t: $TSFixMe,e: $TSFixMe){return o.def(this,0===t?0:t,e)}},o,!0)},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(22).f,r=n(34),i=n(68),c=n(19),s=n(69),u=n(13),a=n(70),f=n(14),l=n(8),h=n(73),p=n(26),d=n(74).fastKey,v=p?'_s':'size',y=function(t: $TSFixMe,e: $TSFixMe){var n,o=d(e);if('F'!==o)return t._i[o];for(n=t._f;n;n=n.n)if(n.k==e)return n};t.exports={getConstructor:function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe,f: $TSFixMe){var l=t(function(t: $TSFixMe,o: $TSFixMe){s(t,l,e,'_i'),t._i=r(null),t._f=void 0,t._l=void 0,t[v]=0,void 0!=o&&a(o,n,t[f],t)});return i(l.prototype,{clear:function(){for(var t=this,e=t._i,n=t._f;n;n=n.n)n.r=!0,n.p&&(n.p=n.p.n=void 0),delete e[n.i];t._f=t._l=void 0,t[v]=0},delete:function(t: $TSFixMe){var e=this,n=y(e,t);if(n){var o=n.n,r=n.p;delete e._i[n.i],n.r=!0,r&&(r.n=o),o&&(o.p=r),e._f==n&&(e._f=o),e._l==n&&(e._l=r),e[v]--}return!!n},forEach:function(t: $TSFixMe){s(this,l,'forEach');for(var e,n=c(t,arguments.length>1?arguments[1]:void 0,3);e=e?e.n:this._f;)for(n(e.v,e.k,this);e&&e.r;)e=e.p},has:function(t: $TSFixMe){return!!y(this,t)}}),p&&o(l.prototype,'size',{get:function(){return u(this[v])}}),l;},def:function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o,r,i=y(t,e);return i?i.v=n:(t._l=i={i:r=d(e,!0),k:e,v:n,p:o=t._l,n:void 0,r:!1},t._f||(t._f=i),o&&(o.n=i),t[v]++,'F'!==r&&(t._i[r]=i)),t},getEntry:y,setStrong:function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){f(t,e,function(this: $TSFixMe, t: $TSFixMe, e: $TSFixMe) {this._t=t,this._k=e,this._l=void 0},function(this: $TSFixMe) {for(var t=this,e=t._k,n=t._l;n&&n.r;)n=n.p;return t._t&&(t._l=n=n?n.n:t._t._f)?'keys'==e?l(0,n.k):'values'==e?l(0,n.v):l(0,[n.k,n.v]):(t._t=void 0,l(1))},n?'entries':'values',!n,!0),h(e)}}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(21);t.exports=function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){for(var r in e)n&&t[r]?t[r]=e[r]:o(t,r,e[r]);return t}},function(t: $TSFixMe,e: $TSFixMe){t.exports=function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe,o: $TSFixMe){if(!(t instanceof e)||void 0!==o&&o in t)throw TypeError(n+': incorrect invocation!');return t}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(19),r=n(71),i=n(72),c=n(23),s=n(39),u=n(58),a={},f={},e=t.exports=function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe,l: $TSFixMe,h: $TSFixMe){var p,d,v,y,g=h?function(){return t}:u(t),_=o(n,l,e?2:1),m=0;if('function'!=typeof g)throw TypeError(t+' is not iterable!');if(i(g)){for(p=s(t.length);p>m;m++)if(y=e?_(c(d=t[m])[0],d[1]):_(t[m]),y===a||y===f)return y}else for(v=g.call(t);!(d=v.next()).done;)if(y=r(v,_,d.value,e),y===a||y===f)return y};e.BREAK=a,e.RETURN=f},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(23);t.exports=function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe,r: $TSFixMe){try{return r?e(o(n)[0],n[1]):e(n)}catch(e){var i=t.return;throw (void 0!==i&&o(i.call(t)), e)}}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(9),r=n(48)('iterator'),i=Array.prototype;t.exports=function(t: $TSFixMe){return void 0!==t&&(o.Array===t||i[r]===t)}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(17),r=n(18),i=n(22),c=n(26),s=n(48)('species');t.exports=function(t: $TSFixMe){var e='function'==typeof r[t]?r[t]:o[t];c&&e&&!e[s]&&i.f(e,s,{configurable:!0,get:function(){return this}})}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(44)('meta'),r=n(24),i=n(32),c=n(22).f,s=0,u=Object.isExtensible||function(){return!0},a=!n(27)(function(){return u(Object.preventExtensions({}))}),f=function(t: $TSFixMe){c(t,o,{value:{i:'O'+ ++s,w:{}}})},l=function(t: $TSFixMe,e: $TSFixMe){if(!r(t))return'symbol'==typeof t?t:('string'==typeof t?'S':'P')+t;if(!i(t,o)){if(!u(t))return'F';if(!e)return'E';f(t)}return t[o].i},h=function(t: $TSFixMe,e: $TSFixMe){if(!i(t,o)){if(!u(t))return!0;if(!e)return!1;f(t)}return t[o].w},p=function(t: $TSFixMe){return a&&d.NEED&&u(t)&&!i(t,o)&&f(t),t},d=t.exports={KEY:o,NEED:!1,fastKey:l,getWeak:h,onFreeze:p}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(17),r=n(16),i=n(74),c=n(27),s=n(21),u=n(68),a=n(70),f=n(69),l=n(24),h=n(47),p=n(22).f,d=n(76)(0),v=n(26);t.exports=function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe,y: $TSFixMe,g: $TSFixMe,_: $TSFixMe){var m=o[t],w=m,k=g?'set':'add',x=w&&w.prototype,b={};return v&&'function'==typeof w&&(_||x.forEach&&!c(function(){(new w).entries().next()}))?(w=e(function(e: $TSFixMe,n: $TSFixMe){f(e,w,t,'_c'),e._c=new m,void 0!=n&&a(n,g,e[k],e)}),d('add,clear,delete,forEach,get,has,set,keys,values,entries,toJSON'.split(','),function(t: $TSFixMe){var e='add'==t||'set'==t;t in x&&(!_||'clear'!=t)&&s(w.prototype,t,function(this: $TSFixMe, n: $TSFixMe, o: $TSFixMe) {if(f(this,w,t),!e&&_&&!l(n))return'get'==t&&void 0;var r=this._c[t](0===n?0:n,o);return e?this:r})}),'size'in x&&p(w.prototype,'size',{get:function(){return this._c.size}})):(w=y.getConstructor(e,t,g,k),u(w.prototype,n),i.NEED=!0),h(w,t),b[t]=w,r(r.G+r.W+r.F,b),_||y.setStrong(w,t,g),w;}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(19),r=n(11),i=n(50),c=n(39),s=n(77);t.exports=function(t: $TSFixMe,e: $TSFixMe){var n=1==t,u=2==t,a=3==t,f=4==t,l=6==t,h=5==t||l,p=e||s;return function(e: $TSFixMe,s: $TSFixMe,d: $TSFixMe){for(var v,y,g=i(e),_=r(g),m=o(s,d,3),w=c(_.length),k=0,x=n?p(e,w):u?p(e,0):void 0;w>k;k++)if((h||k in _)&&(v=_[k],y=m(v,k,g),t))if(n)x[k]=y;else if(y)switch(t){case 3:return!0;case 5:return v;case 6:return k;case 2:x.push(v)}else if(f)return!1;return l?-1:a||f?f:x};}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(78);t.exports=function(t: $TSFixMe,e: $TSFixMe){return new(o(t))(e)}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(24),r=n(79),i=n(48)('species');t.exports=function(t: $TSFixMe){var e;return r(t)&&(e=t.constructor,'function'!=typeof e||e!==Array&&!r(e.prototype)||(e=void 0),o(e)&&(e=e[i],null===e&&(e=void 0))),void 0===e?Array:e}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(12);t.exports=Array.isArray||function(t: $TSFixMe){return'Array'==o(t)}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(16);o(o.P+o.R,'Map',{toJSON:n(81)('Map')})},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(54),r=n(82);t.exports=function(t: $TSFixMe){return function(this: $TSFixMe) {if(o(this)!=t)throw TypeError(t+'#toJSON isn\'t generic');return r(this)};}},function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o=n(70);t.exports=function(t: $TSFixMe,e: $TSFixMe){var n: $TSFixMe=[];return o(t,!1,n.push,n,e),n}},function(t: $TSFixMe,e: $TSFixMe){},,,,function(t: $TSFixMe,e: $TSFixMe,n: $TSFixMe){var o;!function(){/**
+!function (t, e) { 'object' == typeof exports && 'object' == typeof module ? module.exports = e() : 'function' == typeof define && define.amd ? define([], e) : 'object' == typeof exports ? exports.Switch = e() : t.Switch = e() }(this, function () {
+	return function (t) { function e(o: $TSFixMe) { if (n[o]) return n[o].exports; var r = n[o] = { exports: {}, id: o, loaded: !1 }; return t[o].call(r.exports, r, r.exports, e), r.loaded = !0, r.exports } var n = {}; return e.m = t, e.c = n, e.p = '', e(0) }([function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { function o(t: $TSFixMe) { return t && t.__esModule ? t : { default: t } } Object.defineProperty(e, '__esModule', { value: !0 }); var r = n(1), i = o(r); e.default = i.default, t.exports = e.default }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { function o(t: $TSFixMe) { return t && t.__esModule ? t : { default: t } } function r(this: $TSFixMe, t: $TSFixMe, e: $TSFixMe) { this._init(t, e) } function i() { } function c(t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { S(t).add('switch', 'switch-' + (C.includes(e.size) ? e.size : 'default'), e.checked ? j : M), h.call(n), a.call(n), l.call(n), f.call(n, n._options.disabled) } function s(t: $TSFixMe, e: $TSFixMe) { t.setAttribute('tabindex', 0), t.setAttribute('role', 'checkbox'), t.setAttribute('aria-checked', e.checked), t.setAttribute('aria-disabled', e.disabled) } function u(t: $TSFixMe, e: $TSFixMe) { e.parentNode.insertBefore(t, e.nextSibling) } function a(this: $TSFixMe) { this._el.checked ? (this._switch.style.boxShadow = 'inset 0 0 0 ' + this._switch.clientHeight / 1.8 + 'px ' + this._options.onSwitchColor, this._switch.style.border = '1px solid ' + this._options.onSwitchColor, this._switch.style.transition = 'border 0.4s, box-shadow 0.4s, background-color 1.4s', this._switch.style.backgroundColor = this._options.onSwitchColor, this._jack.style.backgroundColor = this._options.onJackColor) : (this._switch.style.boxShadow = 'inset 0 0 0 0  ' + this._options.offSwitchColor, this._switch.style.border = '1px solid ' + O, this._switch.style.transition = 'border 0.4s, box-shadow 0.4s', this._switch.style.backgroundColor = this._options.offSwitchColor, this._jack.style.backgroundColor = this._options.offJackColor) } function f(this: $TSFixMe, t: $TSFixMe) { this._el.disabled = t, S(this._switch)[t ? 'add' : 'remove']('switch-disabled'), this._switch.setAttribute('aria-disabled', t) } function l(this: $TSFixMe) { var t = this._switch.clientWidth - this._jack.clientWidth; this._jack.style.left = this._el.checked ? t + 'px' : 0 } function h(this: $TSFixMe) { this._options.showText && (this._jack.innerHTML = this._el.checked ? this._options.onText : this._options.offText) } function p(t: $TSFixMe, e: $TSFixMe) { return e ? ((0, k.default)(e).forEach(function (n: $TSFixMe) { t[n] = e[n] }), t) : t; } function d(t: $TSFixMe, e: $TSFixMe) { var n = !0, o = !1, r = void 0; try { for (var i: $TSFixMe, c = function () { var t = (0, g.default)(i.value, 2), e = t[0], n = t[1]; e = e.split(' '), function (t, e) { n.addEventListener(t, T[e]) }(e[0], e[1]) }, s = (0, m.default)(t); !(n = (i = s.next()).done); n = !0)c() } catch (t) { o = !0, r = t } finally { try { !n && s.return && s.return() } finally { if (o) throw r } } } function v(t: $TSFixMe, e: $TSFixMe) { var n = !0, o = !1, r = void 0; try { for (var i: $TSFixMe, c = function () { var t = (0, g.default)(i.value, 2), e = t[0], n = t[1]; e = e.split(' '), function (t, e) { logger.info(), n.removeEventListener(t, T[e]) }(e[0], e[1]) }, s = (0, m.default)(t); !(n = (i = s.next()).done); n = !0)c() } catch (t) { o = !0, r = t } finally { try { !n && s.return && s.return() } finally { if (o) throw r } } } Object.defineProperty(e, '__esModule', { value: !0 }); var y = n(2), g = o(y), _ = n(55), m = o(_), w = n(59), k = o(w), x = n(63), b = o(x); n(83); var E = n(87), S = n(88), C = ['default', 'large', 'small'], T = { changeSwitchStateFromCheckbox: function () { this._switch._toggle(this.checked) }, changeSwitchStateFromSwitch: function () { this._instance._options.disabled || this._instance._toggle() }, changeSwitchStateFromKeyboard: function (t: $TSFixMe) { var e = t.which || t.keyCode || 0; this._instance._options.disabled || 13 === e && this._instance._toggle() } }, O = '#dfdfdf', j = 'switch-on', M = 'switch-off'; r.prototype._init = function (t: $TSFixMe, e: $TSFixMe) { var n = { size: 'default', checked: void 0, onText: 'Y', offText: 'N', onSwitchColor: '#64BD63', offSwitchColor: '#fff', onJackColor: '#fff', offJackColor: '#fff', showText: !1, disabled: !1, onInit: i, beforeChange: i, onChange: i, beforeRemove: i, onRemove: i, beforeDestroy: i, onDestroy: i }; if (t && 1 === t.nodeType && 'checkbox' === t.type) { if (t._switch) return t._switch; if (!(this instanceof r)) return new r(t, e); this._el = t, this._el._switch = this, this._options = p(n, e), this._initElement(), this._initEvents(), this._options.onInit.call(this) } }, r.prototype._initElement = function () { this._el.style.display = 'none', void 0 !== this._options.checked ? this._el.checked = Boolean(this._options.checked) : this._options.checked = this._el.checked; var t = this._createSwitch(); s(t, this._options), u(t, this._el), c(t, this._options, this), E.attach(t) }, r.prototype._createSwitch = function () { return this._switch = document.createElement('span'), this._jack = document.createElement('small'), this._switch.appendChild(this._jack), this._switch._instance = this, this._switch }, r.prototype._initEvents = function () { this._events = new b.default([['change changeSwitchStateFromCheckbox', this._el], ['click changeSwitchStateFromSwitch', this._switch], ['keypress changeSwitchStateFromKeyboard', this._switch]]), d(this._events, this) }, r.prototype._toggle = function (t: $TSFixMe) { this._options.beforeChange.call(this, this._el.checked), this._el.checked = void 0 === t ? !this._el.checked : t, this._options.onChange.call(this, this._el.checked); var e = this._el.checked ? j : M, n = this._el.checked ? M : j; this._switch.setAttribute('aria-checked', this._el.checked), S(this._switch).add(e).remove(n), l.call(this), h.call(this), a.call(this) }, r.prototype.getChecked = function () { return this._el.checked }, r.prototype.on = function () { this._toggle(!0) }, r.prototype.off = function () { this._toggle(!1) }, r.prototype.toggle = function () { this._toggle() }, r.prototype.disable = function () { f.call(this, this._options.disabled = !0) }, r.prototype.enable = function () { f.call(this, this._options.disabled = !1) }, r.prototype.destroy = function () { this._options.beforeDestroy.call(this, this._el.checked), v(this._events, this), this._options.onDestroy.call(this) }, r.prototype.remove = function () { this._options.beforeRemove.call(this, this._el.checked); try { this._el.setAttribute('style', this._el.getAttribute('style').replace(/\s*display:\s*none;/g, '')) } catch (t) { } this._switch.parentNode && (this._switch.parentNode.removeChild(this._switch), this._options.onRemove.call(this)) }, e.default = r, t.exports = e.default }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { function o(t: $TSFixMe) { return t && t.__esModule ? t : { default: t } } e.__esModule = !0; var r = n(3), i = o(r), c = n(55), s = o(c); e.default = function () { function t(t: $TSFixMe, e: $TSFixMe) { var n = [], o = !0, r = !1, i = void 0; try { for (var c, u = (0, s.default)(t); !(o = (c = u.next()).done) && (n.push(c.value), !e || n.length !== e); o = !0); } catch (t) { r = !0, i = t } finally { try { !o && u.return && u.return() } finally { if (r) throw i } } return n } return function (e: $TSFixMe, n: $TSFixMe) { if (Array.isArray(e)) return e; if ((0, i.default)(Object(e))) return t(e, n); throw new TypeError('Invalid attempt to destructure non-iterable instance') }; }() }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { t.exports = { default: n(4), __esModule: !0 } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { n(5), n(51), t.exports = n(53) }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { n(6); for (var o = n(17), r = n(21), i = n(9), c = n(48)('toStringTag'), s = ['NodeList', 'DOMTokenList', 'MediaList', 'StyleSheetList', 'CSSRuleList'], u = 0; u < 5; u++) { var a = s[u], f = o[a], l = f && f.prototype; l && !l[c] && r(l, c, a), i[a] = i.Array } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(7), r = n(8), i = n(9), c = n(10); t.exports = n(14)(Array, 'Array', function (this: $TSFixMe, t: $TSFixMe, e: $TSFixMe) { this._t = c(t), this._i = 0, this._k = e }, function (this: $TSFixMe) { var t = this._t, e = this._k, n = this._i++; return !t || n >= t.length ? (this._t = void 0, r(1)) : 'keys' == e ? r(0, n) : 'values' == e ? r(0, t[n]) : r(0, [n, t[n]]) }, 'values'), i.Arguments = i.Array, o('keys'), o('values'), o('entries') }, function (t: $TSFixMe, e: $TSFixMe) { t.exports = function () { } }, function (t: $TSFixMe, e: $TSFixMe) { t.exports = function (t: $TSFixMe, e: $TSFixMe) { return { value: e, done: !!t } } }, function (t: $TSFixMe, e: $TSFixMe) { t.exports = {} }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(11), r = n(13); t.exports = function (t: $TSFixMe) { return o(r(t)) } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(12); t.exports = Object('z').propertyIsEnumerable(0) ? Object : function (t: $TSFixMe) { return 'String' == o(t) ? t.split('') : Object(t) } }, function (t: $TSFixMe, e: $TSFixMe) { var n = {}.toString; t.exports = function (t: $TSFixMe) { return n.call(t).slice(8, -1) } }, function (t: $TSFixMe, e: $TSFixMe) { t.exports = function (t: $TSFixMe) { if (void 0 == t) throw TypeError('Can\'t call method on  ' + t); return t } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(15), r = n(16), i = n(31), c = n(21), s = n(32), u = n(9), a = n(33), f = n(47), l = n(49), h = n(48)('iterator'), p = !([].keys && 'next' in [].keys()), d = '@@iterator', v = 'keys', y = 'values', g = function (this: $TSFixMe) { return this }; t.exports = function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe, _: $TSFixMe, m: $TSFixMe, w: $TSFixMe, k: $TSFixMe) { a(n, e, _); var x, b, E, S = function (t: $TSFixMe) { if (!p && t in j) return j[t]; switch (t) { case v: return function (this: $TSFixMe) { return new n(this, t) }; case y: return function (this: $TSFixMe) { return new n(this, t) }; }return function (this: $TSFixMe) { return new n(this, t) }; }, C = e + ' Iterator', T = m == y, O = !1, j = t.prototype, M = j[h] || j[d] || m && j[m], A = M || S(m), L = m ? T ? S('entries') : A : void 0, N = 'Array' == e ? j.entries || M : M; if (N && (E = l(N.call(new t)), E !== Object.prototype && (f(E, C, !0), o || s(E, h) || c(E, h, g))), T && M && M.name !== y && (O = !0, A = function (this: $TSFixMe) { return M.call(this) }), o && !k || !p && !O && j[h] || c(j, h, A), u[e] = A, u[C] = g, m) if (x = { values: T ? A : S(y), keys: w ? A : S(v), entries: L }, k) for (b in x) b in j || i(j, b, x[b]); else r(r.P + r.F * (p || O), e, x); return x } }, function (t: $TSFixMe, e: $TSFixMe) { t.exports = !0 }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(17), r = n(18), i = n(19), c = n(21), s = 'prototype', u = function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var a, f, l, h = t & u.F, p = t & u.G, d = t & u.S, v = t & u.P, y = t & u.B, g = t & u.W, _ = p ? r : r[e] || (r[e] = {}), m = _[s], w = p ? o : d ? o[e] : (o[e] || {})[s]; p && (n = e); for (a in n) f = !h && w && void 0 !== w[a], f && a in _ || (l = f ? w[a] : n[a], _[a] = p && 'function' != typeof w[a] ? n[a] : y && f ? i(l, o) : g && w[a] == l ? function (t) { var e = function (this: $TSFixMe, e: $TSFixMe, n: $TSFixMe, o: $TSFixMe) { if (this instanceof t) { switch (arguments.length) { case 0: return new t; case 1: return new t(e); case 2: return new t(e, n) }return new t(e, n, o) } return t.apply(this, arguments) }; return e[s] = t[s], e }(l) : v && 'function' == typeof l ? i(Function.call, l) : l, v && ((_.virtual || (_.virtual = {}))[a] = l, t & u.R && m && !m[a] && c(m, a, l))) }; u.F = 1, u.G = 2, u.S = 4, u.P = 8, u.B = 16, u.W = 32, u.U = 64, u.R = 128, t.exports = u }, function (t: $TSFixMe, e: $TSFixMe) { var n = t.exports = 'undefined' != typeof window && window.Math == Math ? window : 'undefined' != typeof self && self.Math == Math ? self : Function('return this')(); 'number' == typeof __g && (__g = n) }, function (t: $TSFixMe, e: $TSFixMe) { var n = t.exports = { version: '2.4.0' }; 'number' == typeof __e && (__e = n) }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(20); t.exports = function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { if (o(t), void 0 === e) return t; switch (n) { case 1: return function (n: $TSFixMe) { return t.call(e, n) }; case 2: return function (n: $TSFixMe, o: $TSFixMe) { return t.call(e, n, o) }; case 3: return function (n: $TSFixMe, o: $TSFixMe, r: $TSFixMe) { return t.call(e, n, o, r) }; }return function () { return t.apply(e, arguments) } } }, function (t: $TSFixMe, e: $TSFixMe) { t.exports = function (t: $TSFixMe) { if ('function' != typeof t) throw TypeError(t + ' is not a function!'); return t } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(22), r = n(30); t.exports = n(26) ? function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { return o.f(t, e, r(1, n)) } : function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { return t[e] = n, t } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(23), r = n(25), i = n(29), c = Object.defineProperty; e.f = n(26) ? Object.defineProperty : function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { if (o(t), e = i(e, !0), o(n), r) try { return c(t, e, n) } catch (t) { } if ('get' in n || 'set' in n) throw TypeError('Accessors not supported!'); return 'value' in n && (t[e] = n.value), t } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(24); t.exports = function (t: $TSFixMe) { if (!o(t)) throw TypeError(t + ' is not an object!'); return t } }, function (t: $TSFixMe, e: $TSFixMe) { t.exports = function (t: $TSFixMe) { return 'object' == typeof t ? null !== t : 'function' == typeof t } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { t.exports = !n(26) && !n(27)(function () { return 7 != Object.defineProperty(n(28)('div'), 'a', { get: function () { return 7 } }).a }) }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { t.exports = !n(27)(function () { return 7 != Object.defineProperty({}, 'a', { get: function () { return 7 } }).a }) }, function (t: $TSFixMe, e: $TSFixMe) { t.exports = function (t: $TSFixMe) { try { return !!t() } catch (t) { return !0 } } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(24), r = n(17).document, i = o(r) && o(r.createElement); t.exports = function (t: $TSFixMe) { return i ? r.createElement(t) : {} } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(24); t.exports = function (t: $TSFixMe, e: $TSFixMe) { if (!o(t)) return t; var n, r; if (e && 'function' == typeof (n = t.toString) && !o(r = n.call(t))) return r; if ('function' == typeof (n = t.valueOf) && !o(r = n.call(t))) return r; if (!e && 'function' == typeof (n = t.toString) && !o(r = n.call(t))) return r; throw TypeError('Can\'t convert object to primitive value') } }, function (t: $TSFixMe, e: $TSFixMe) { t.exports = function (t: $TSFixMe, e: $TSFixMe) { return { enumerable: !(1 & t), configurable: !(2 & t), writable: !(4 & t), value: e } } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { t.exports = n(21) }, function (t: $TSFixMe, e: $TSFixMe) { var n = {}.hasOwnProperty; t.exports = function (t: $TSFixMe, e: $TSFixMe) { return n.call(t, e) } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(34), r = n(30), i = n(47), c = {}; n(21)(c, n(48)('iterator'), function (this: $TSFixMe) { return this }), t.exports = function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { t.prototype = o(c, { next: r(1, n) }), i(t, e + ' Iterator') } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(23), r = n(35), i = n(45), c = n(42)('IE_PROTO'), s = function () { }, u = 'prototype', a = function () { var t, e = n(28)('iframe'), o = i.length, r = '<', c = '>'; for (e.style.display = 'none', n(46).appendChild(e), e.src = 'javascript:', t = e.contentWindow.document, t.open(), t.write(r + 'script' + c + 'document.F=Object' + r + '/script' + c), t.close(), a = t.F; o--;)delete a[u][i[o]]; return a() }; t.exports = Object.create || function (t: $TSFixMe, e: $TSFixMe) { var n; return null !== t ? (s[u] = o(t), n = new s, s[u] = null, n[c] = t) : n = a(), void 0 === e ? n : r(n, e) } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(22), r = n(23), i = n(36); t.exports = n(26) ? Object.defineProperties : function (t: $TSFixMe, e: $TSFixMe) { r(t); for (var n, c = i(e), s = c.length, u = 0; s > u;)o.f(t, n = c[u++], e[n]); return t } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(37), r = n(45); t.exports = Object.keys || function (t: $TSFixMe) { return o(t, r) } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(32), r = n(10), i = n(38)(!1), c = n(42)('IE_PROTO'); t.exports = function (t: $TSFixMe, e: $TSFixMe) { var n, s = r(t), u = 0, a = []; for (n in s) n != c && o(s, n) && a.push(n); for (; e.length > u;)o(s, n = e[u++]) && (~i(a, n) || a.push(n)); return a } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(10), r = n(39), i = n(41); t.exports = function (t: $TSFixMe) { return function (e: $TSFixMe, n: $TSFixMe, c: $TSFixMe) { var s, u = o(e), a = r(u.length), f = i(c, a); if (t && n != n) { for (; a > f;)if (s = u[f++], s != s) return !0 } else for (; a > f; f++)if ((t || f in u) && u[f] === n) return t || f || 0; return !t && -1 }; } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(40), r = Math.min; t.exports = function (t: $TSFixMe) { return t > 0 ? r(o(t), 9007199254740991) : 0 } }, function (t: $TSFixMe, e: $TSFixMe) { var n = Math.ceil, o = Math.floor; t.exports = function (t: $TSFixMe) { return isNaN(t = +t) ? 0 : (t > 0 ? o : n)(t) } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(40), r = Math.max, i = Math.min; t.exports = function (t: $TSFixMe, e: $TSFixMe) { return t = o(t), t < 0 ? r(t + e, 0) : i(t, e) } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(43)('keys'), r = n(44); t.exports = function (t: $TSFixMe) { return o[t] || (o[t] = r(t)) } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(17), r = '__core-js_shared__', i = o[r] || (o[r] = {}); t.exports = function (t: $TSFixMe) { return i[t] || (i[t] = {}) } }, function (t: $TSFixMe, e: $TSFixMe) { var n = 0, o = Math.random(); t.exports = function (t: $TSFixMe) { return 'Symbol('.concat(void 0 === t ? '' : t, ')_', (++n + o).toString(36)) } }, function (t: $TSFixMe, e: $TSFixMe) { t.exports = 'constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf'.split(',') }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { t.exports = n(17).document && document.documentElement }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(22).f, r = n(32), i = n(48)('toStringTag'); t.exports = function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { t && !r(t = n ? t : t.prototype, i) && o(t, i, { configurable: !0, value: e }) } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(43)('wks'), r = n(44), i = n(17).Symbol, c = 'function' == typeof i, s = t.exports = function (t: $TSFixMe) { return o[t] || (o[t] = c && i[t] || (c ? i : r)('Symbol.' + t)) }; s.store = o }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(32), r = n(50), i = n(42)('IE_PROTO'), c = Object.prototype; t.exports = Object.getPrototypeOf || function (t: $TSFixMe) { return t = r(t), o(t, i) ? t[i] : 'function' == typeof t.constructor && t instanceof t.constructor ? t.constructor.prototype : t instanceof Object ? c : null } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(13); t.exports = function (t: $TSFixMe) { return Object(o(t)) } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(52)(!0); n(14)(String, 'String', function (this: $TSFixMe, t: $TSFixMe) { this._t = String(t), this._i = 0 }, function (this: $TSFixMe) { var t, e = this._t, n = this._i; return n >= e.length ? { value: void 0, done: !0 } : (t = o(e, n), this._i += t.length, { value: t, done: !1 }) }) }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(40), r = n(13); t.exports = function (t: $TSFixMe) { return function (e: $TSFixMe, n: $TSFixMe) { var i, c, s = String(r(e)), u = o(n), a = s.length; return u < 0 || u >= a ? t ? '' : void 0 : (i = s.charCodeAt(u), i < 55296 || i > 56319 || u + 1 === a || (c = s.charCodeAt(u + 1)) < 56320 || c > 57343 ? t ? s.charAt(u) : i : t ? s.slice(u, u + 2) : (i - 55296 << 10) + (c - 56320) + 65536) }; } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(54), r = n(48)('iterator'), i = n(9); t.exports = n(18).isIterable = function (t: $TSFixMe) { var e = Object(t); return void 0 !== e[r] || '@@iterator' in e || i.hasOwnProperty(o(e)) } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(12), r = n(48)('toStringTag'), i = 'Arguments' == o(function () { return arguments }()), c = function (t: $TSFixMe, e: $TSFixMe) { try { return t[e] } catch (t) { } }; t.exports = function (t: $TSFixMe) { var e, n, s; return void 0 === t ? 'Undefined' : null === t ? 'Null' : 'string' == typeof (n = c(e = Object(t), r)) ? n : i ? o(e) : 'Object' == (s = o(e)) && 'function' == typeof e.callee ? 'Arguments' : s } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { t.exports = { default: n(56), __esModule: !0 } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { n(5), n(51), t.exports = n(57) }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(23), r = n(58); t.exports = n(18).getIterator = function (t: $TSFixMe) { var e = r(t); if ('function' != typeof e) throw TypeError(t + ' is not iterable!'); return o(e.call(t)) } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(54), r = n(48)('iterator'), i = n(9); t.exports = n(18).getIteratorMethod = function (t: $TSFixMe) { if (void 0 != t) return t[r] || t['@@iterator'] || i[o(t)] } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { t.exports = { default: n(60), __esModule: !0 } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { n(61), t.exports = n(18).Object.keys }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(50), r = n(36); n(62)('keys', function () { return function (t: $TSFixMe) { return r(o(t)) }; }) }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(16), r = n(18), i = n(27); t.exports = function (t: $TSFixMe, e: $TSFixMe) { var n = (r.Object || {})[t] || Object[t], c = {}; c[t] = e(n), o(o.S + o.F * i(function () { n(1) }), 'Object', c) } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { t.exports = { default: n(64), __esModule: !0 } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { n(65), n(51), n(5), n(66), n(80), t.exports = n(18).Map }, function (t: $TSFixMe, e: $TSFixMe) { }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(67); t.exports = n(75)('Map', function (t: $TSFixMe) { return function (this: $TSFixMe) { return t(this, arguments.length > 0 ? arguments[0] : void 0) }; }, { get: function (t: $TSFixMe) { var e = o.getEntry(this, t); return e && e.v }, set: function (t: $TSFixMe, e: $TSFixMe) { return o.def(this, 0 === t ? 0 : t, e) } }, o, !0) }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(22).f, r = n(34), i = n(68), c = n(19), s = n(69), u = n(13), a = n(70), f = n(14), l = n(8), h = n(73), p = n(26), d = n(74).fastKey, v = p ? '_s' : 'size', y = function (t: $TSFixMe, e: $TSFixMe) { var n, o = d(e); if ('F' !== o) return t._i[o]; for (n = t._f; n; n = n.n)if (n.k == e) return n }; t.exports = { getConstructor: function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe, f: $TSFixMe) { var l = t(function (t: $TSFixMe, o: $TSFixMe) { s(t, l, e, '_i'), t._i = r(null), t._f = void 0, t._l = void 0, t[v] = 0, void 0 != o && a(o, n, t[f], t) }); return i(l.prototype, { clear: function () { for (var t = this, e = t._i, n = t._f; n; n = n.n)n.r = !0, n.p && (n.p = n.p.n = void 0), delete e[n.i]; t._f = t._l = void 0, t[v] = 0 }, delete: function (t: $TSFixMe) { var e = this, n = y(e, t); if (n) { var o = n.n, r = n.p; delete e._i[n.i], n.r = !0, r && (r.n = o), o && (o.p = r), e._f == n && (e._f = o), e._l == n && (e._l = r), e[v]-- } return !!n }, forEach: function (t: $TSFixMe) { s(this, l, 'forEach'); for (var e, n = c(t, arguments.length > 1 ? arguments[1] : void 0, 3); e = e ? e.n : this._f;)for (n(e.v, e.k, this); e && e.r;)e = e.p }, has: function (t: $TSFixMe) { return !!y(this, t) } }), p && o(l.prototype, 'size', { get: function () { return u(this[v]) } }), l; }, def: function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o, r, i = y(t, e); return i ? i.v = n : (t._l = i = { i: r = d(e, !0), k: e, v: n, p: o = t._l, n: void 0, r: !1 }, t._f || (t._f = i), o && (o.n = i), t[v]++, 'F' !== r && (t._i[r] = i)), t }, getEntry: y, setStrong: function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { f(t, e, function (this: $TSFixMe, t: $TSFixMe, e: $TSFixMe) { this._t = t, this._k = e, this._l = void 0 }, function (this: $TSFixMe) { for (var t = this, e = t._k, n = t._l; n && n.r;)n = n.p; return t._t && (t._l = n = n ? n.n : t._t._f) ? 'keys' == e ? l(0, n.k) : 'values' == e ? l(0, n.v) : l(0, [n.k, n.v]) : (t._t = void 0, l(1)) }, n ? 'entries' : 'values', !n, !0), h(e) } } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(21); t.exports = function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { for (var r in e) n && t[r] ? t[r] = e[r] : o(t, r, e[r]); return t } }, function (t: $TSFixMe, e: $TSFixMe) { t.exports = function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe, o: $TSFixMe) { if (!(t instanceof e) || void 0 !== o && o in t) throw TypeError(n + ': incorrect invocation!'); return t } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(19), r = n(71), i = n(72), c = n(23), s = n(39), u = n(58), a = {}, f = {}, e = t.exports = function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe, l: $TSFixMe, h: $TSFixMe) { var p, d, v, y, g = h ? function () { return t } : u(t), _ = o(n, l, e ? 2 : 1), m = 0; if ('function' != typeof g) throw TypeError(t + ' is not iterable!'); if (i(g)) { for (p = s(t.length); p > m; m++)if (y = e ? _(c(d = t[m])[0], d[1]) : _(t[m]), y === a || y === f) return y } else for (v = g.call(t); !(d = v.next()).done;)if (y = r(v, _, d.value, e), y === a || y === f) return y }; e.BREAK = a, e.RETURN = f }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(23); t.exports = function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe, r: $TSFixMe) { try { return r ? e(o(n)[0], n[1]) : e(n) } catch (e) { var i = t.return; throw (void 0 !== i && o(i.call(t)), e) } } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(9), r = n(48)('iterator'), i = Array.prototype; t.exports = function (t: $TSFixMe) { return void 0 !== t && (o.Array === t || i[r] === t) } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(17), r = n(18), i = n(22), c = n(26), s = n(48)('species'); t.exports = function (t: $TSFixMe) { var e = 'function' == typeof r[t] ? r[t] : o[t]; c && e && !e[s] && i.f(e, s, { configurable: !0, get: function () { return this } }) } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(44)('meta'), r = n(24), i = n(32), c = n(22).f, s = 0, u = Object.isExtensible || function () { return !0 }, a = !n(27)(function () { return u(Object.preventExtensions({})) }), f = function (t: $TSFixMe) { c(t, o, { value: { i: 'O' + ++s, w: {} } }) }, l = function (t: $TSFixMe, e: $TSFixMe) { if (!r(t)) return 'symbol' == typeof t ? t : ('string' == typeof t ? 'S' : 'P') + t; if (!i(t, o)) { if (!u(t)) return 'F'; if (!e) return 'E'; f(t) } return t[o].i }, h = function (t: $TSFixMe, e: $TSFixMe) { if (!i(t, o)) { if (!u(t)) return !0; if (!e) return !1; f(t) } return t[o].w }, p = function (t: $TSFixMe) { return a && d.NEED && u(t) && !i(t, o) && f(t), t }, d = t.exports = { KEY: o, NEED: !1, fastKey: l, getWeak: h, onFreeze: p } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(17), r = n(16), i = n(74), c = n(27), s = n(21), u = n(68), a = n(70), f = n(69), l = n(24), h = n(47), p = n(22).f, d = n(76)(0), v = n(26); t.exports = function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe, y: $TSFixMe, g: $TSFixMe, _: $TSFixMe) { var m = o[t], w = m, k = g ? 'set' : 'add', x = w && w.prototype, b = {}; return v && 'function' == typeof w && (_ || x.forEach && !c(function () { (new w).entries().next() })) ? (w = e(function (e: $TSFixMe, n: $TSFixMe) { f(e, w, t, '_c'), e._c = new m, void 0 != n && a(n, g, e[k], e) }), d('add,clear,delete,forEach,get,has,set,keys,values,entries,toJSON'.split(','), function (t: $TSFixMe) { var e = 'add' == t || 'set' == t; t in x && (!_ || 'clear' != t) && s(w.prototype, t, function (this: $TSFixMe, n: $TSFixMe, o: $TSFixMe) { if (f(this, w, t), !e && _ && !l(n)) return 'get' == t && void 0; var r = this._c[t](0 === n ? 0 : n, o); return e ? this : r }) }), 'size' in x && p(w.prototype, 'size', { get: function () { return this._c.size } })) : (w = y.getConstructor(e, t, g, k), u(w.prototype, n), i.NEED = !0), h(w, t), b[t] = w, r(r.G + r.W + r.F, b), _ || y.setStrong(w, t, g), w; } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(19), r = n(11), i = n(50), c = n(39), s = n(77); t.exports = function (t: $TSFixMe, e: $TSFixMe) { var n = 1 == t, u = 2 == t, a = 3 == t, f = 4 == t, l = 6 == t, h = 5 == t || l, p = e || s; return function (e: $TSFixMe, s: $TSFixMe, d: $TSFixMe) { for (var v, y, g = i(e), _ = r(g), m = o(s, d, 3), w = c(_.length), k = 0, x = n ? p(e, w) : u ? p(e, 0) : void 0; w > k; k++)if ((h || k in _) && (v = _[k], y = m(v, k, g), t)) if (n) x[k] = y; else if (y) switch (t) { case 3: return !0; case 5: return v; case 6: return k; case 2: x.push(v) } else if (f) return !1; return l ? -1 : a || f ? f : x }; } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(78); t.exports = function (t: $TSFixMe, e: $TSFixMe) { return new (o(t))(e) } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(24), r = n(79), i = n(48)('species'); t.exports = function (t: $TSFixMe) { var e; return r(t) && (e = t.constructor, 'function' != typeof e || e !== Array && !r(e.prototype) || (e = void 0), o(e) && (e = e[i], null === e && (e = void 0))), void 0 === e ? Array : e } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(12); t.exports = Array.isArray || function (t: $TSFixMe) { return 'Array' == o(t) } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(16); o(o.P + o.R, 'Map', { toJSON: n(81)('Map') }) }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(54), r = n(82); t.exports = function (t: $TSFixMe) { return function (this: $TSFixMe) { if (o(this) != t) throw TypeError(t + '#toJSON isn\'t generic'); return r(this) }; } }, function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) { var o = n(70); t.exports = function (t: $TSFixMe, e: $TSFixMe) { var n: $TSFixMe = []; return o(t, !1, n.push, n, e), n } }, function (t: $TSFixMe, e: $TSFixMe) { }, , , , function (t: $TSFixMe, e: $TSFixMe, n: $TSFixMe) {
+		var o; !function () {/**
 		 * @preserve FastClick: polyfill to remove click delays on browsers with touch UIs.
 		 *
 		 * @codingstandard ftlabs-jsv2
@@ -8,4 +10,5 @@
 		 * @license MIT License (see LICENSE.txt)
 		 */
 
-function r(t,e){function n(t,e){return function(){return t.apply(e,arguments)}}var o;if(e=e||{},this.trackingClick=!1,this.trackingClickStart=0,this.targetElement=null,this.touchStartX=0,this.touchStartY=0,this.lastTouchIdentifier=0,this.touchBoundary=e.touchBoundary||10,this.layer=t,this.tapDelay=e.tapDelay||200,this.tapTimeout=e.tapTimeout||700,!r.notNeeded(t)){for(var i=['onMouse','onClick','onTouchStart','onTouchMove','onTouchEnd','onTouchCancel'],s=this,u=0,a=i.length;u<a;u++)s[i[u]]=n(s[i[u]],s);c&&(t.addEventListener('mouseover',this.onMouse,!0),t.addEventListener('mousedown',this.onMouse,!0),t.addEventListener('mouseup',this.onMouse,!0)),t.addEventListener('click',this.onClick,!0),t.addEventListener('touchstart',this.onTouchStart,!1),t.addEventListener('touchmove',this.onTouchMove,!1),t.addEventListener('touchend',this.onTouchEnd,!1),t.addEventListener('touchcancel',this.onTouchCancel,!1),Event.prototype.stopImmediatePropagation||(t.removeEventListener=function(e,n,o){var r=Node.prototype.removeEventListener;'click'===e?r.call(t,e,n.hijacked||n,o):r.call(t,e: $TSFixMe,n: $TSFixMe,o: $TSFixMe)},t.addEventListener=function(e,n,o){var r=Node.prototype.addEventListener;'click'===e?r.call(t,e,n.hijacked||(n.hijacked=function(t){t.propagationStopped||n(t)}),o):r.call(t,e,n,o)}),'function'==typeof t.onclick&&(o=t.onclick,t: $TSFixMe.addEventListener('click',function(t){o(t)},!1),t.onclick=null)}}var i=navigator.userAgent.indexOf('Windows Phone')>=0,c=navigator.userAgent.indexOf('Android')>0&&!i,s=/iP(ad|hone|od)/.test(navigator.userAgent)&&!i,u=s&&/OS 4_\d(_\d)?/.test(navigator.userAgent),a=s&&/OS [6-7]_\d/.test(navigator.userAgent),f=navigator.userAgent.indexOf('BB10')>0;r.prototype.needsClick=function(t){switch(t.nodeName.toLowerCase()){case'button':case'select':case'textarea':if(t.disabled)return!0;break;case'input':if(s&&'file'===t.type||t.disabled)return!0;break;case'label':case'iframe':case'video':return!0}return /\bneedsclick\b/.test(t.className);},r.prototype.needsFocus=function(t){switch(t.nodeName.toLowerCase()){case'textarea':return!0;case'select':return!c;case'input':switch(t.type){case'button':case'checkbox':case'file':case'image':case'radio':case'submit':return!1}return!t.disabled&&!t.readOnly;default:return /\bneedsfocus\b/.test(t.className);}},r.prototype.sendClick=function(t,e){var n,o;document.activeElement&&document.activeElement!==t&&document.activeElement.blur(),o=e.changedTouches[0],n=document.createEvent('MouseEvents'),n.initMouseEvent(this.determineEventType(t),!0,!0,window,1,o.screenX,o.screenY,o.clientX,o.clientY,!1,!1,!1,!1,0,null),n.forwardedTouchEvent=!0,t.dispatchEvent(n)},r.prototype.determineEventType=function(t){return c&&'select'===t.tagName.toLowerCase()?'mousedown':'click'},r.prototype.focus=function(t){var e;s&&t.setSelectionRange&&0!==t.type.indexOf('date')&&'time'!==t.type&&'month'!==t.type?(e=t.value.length,t.setSelectionRange(e,e)):t.focus()},r.prototype.updateScrollParent=function(t){var e,n;if(e=t.fastClickScrollParent,!e||!e.contains(t)){n=t;do{if(n.scrollHeight>n.offsetHeight){e=n,t.fastClickScrollParent=n;break}n=n.parentElement}while(n)}e&&(e.fastClickLastScrollTop=e.scrollTop)},r.prototype.getTargetElementFromEventTarget=function(t){return t.nodeType===Node.TEXT_NODE?t.parentNode:t},r.prototype.onTouchStart=function(t){var e,n,o;if(t.targetTouches.length>1)return!0;if(e=this.getTargetElementFromEventTarget(t.target),n=t.targetTouches[0],s){if(o=window.getSelection(),o.rangeCount&&!o.isCollapsed)return!0;if(!u){if(n.identifier&&n.identifier===this.lastTouchIdentifier)return t.preventDefault(),!1;this.lastTouchIdentifier=n.identifier,this.updateScrollParent(e)}}return this.trackingClick=!0,this.trackingClickStart=t.timeStamp,this.targetElement=e,this.touchStartX=n.pageX,this.touchStartY=n.pageY,t.timeStamp-this.lastClickTime<this.tapDelay&&t.preventDefault(),!0},r.prototype.touchHasMoved=function(t){var e=t.changedTouches[0],n=this.touchBoundary;return Math.abs(e.pageX-this.touchStartX)>n||Math.abs(e.pageY-this.touchStartY)>n: $TSFixMe;},r.prototype.onTouchMove=function(t){return!this.trackingClick||((this.targetElement!==this.getTargetElementFromEventTarget(t.target)||this.touchHasMoved(t))&&(this.trackingClick=!1,this.targetElement=null),!0)},r.prototype.findControl=function(t){return void 0!==t.control?t.control:t.htmlFor?document.getElementById(t.htmlFor):t.querySelector('button, input:not([type=hidden]), keygen, meter, output, progress, select, textarea')},r.prototype.onTouchEnd=function(t){var e,n,o,r,i,f=this.targetElement;if(!this.trackingClick)return!0;if(t.timeStamp-this.lastClickTime<this.tapDelay)return this.cancelNextClick=!0,!0;if(t.timeStamp-this.trackingClickStart>this.tapTimeout)return!0;if(this.cancelNextClick=!1,this.lastClickTime=t.timeStamp,n=this.trackingClickStart,this.trackingClick=!1,this.trackingClickStart=0,a&&(i=t.changedTouches[0],f=document.elementFromPoint(i.pageX-window.pageXOffset,i.pageY-window.pageYOffset)||f,f.fastClickScrollParent=this.targetElement.fastClickScrollParent),o=f.tagName.toLowerCase(),'label'===o){if(e=this.findControl(f)){if(this.focus(f),c)return!1;f=e}}else if(this.needsFocus(f))return t.timeStamp-n>100||s&&window.top!==window&&'input'===o?(this.targetElement=null,!1):(this.focus(f),this.sendClick(f,t),s&&'select'===o||(this.targetElement=null,t.preventDefault()),!1);return!(!s||u||(r=f.fastClickScrollParent,!r||r.fastClickLastScrollTop===r.scrollTop))||(this.needsClick(f)||(t.preventDefault(),this.sendClick(f,t)),!1)},r.prototype.onTouchCancel=function(){this.trackingClick=!1,this.targetElement=null},r.prototype.onMouse=function(t){return!this.targetElement||(!!t.forwardedTouchEvent||(!t.cancelable||(!(!this.needsClick(this.targetElement)||this.cancelNextClick)||(t.stopImmediatePropagation?t.stopImmediatePropagation():t.propagationStopped=!0,t.stopPropagation(),t.preventDefault(),!1))))},r.prototype.onClick=function(t){var e;return this.trackingClick?(this.targetElement=null,this.trackingClick=!1,!0):'submit'===t.target.type&&0===t.detail||(e=this.onMouse(t),e||(this.targetElement=null),e)},r.prototype.destroy=function(){var t=this.layer;c&&(t.removeEventListener('mouseover',this.onMouse,!0),t.removeEventListener('mousedown',this.onMouse,!0),t.removeEventListener('mouseup',this.onMouse,!0)),t.removeEventListener('click',this.onClick,!0),t.removeEventListener('touchstart',this.onTouchStart,!1),t.removeEventListener('touchmove',this.onTouchMove,!1),t.removeEventListener('touchend',this.onTouchEnd,!1),t.removeEventListener('touchcancel',this.onTouchCancel,!1)},r.notNeeded=function(t){var e,n,o,r;if('undefined'==typeof window.ontouchstart)return!0;if(n=+(/Chrome\/([0-9]+)/.exec(navigator.userAgent)||[,0])[1]){if(!c)return!0;if(e=document.querySelector('meta[name=viewport]')){if(e.content.indexOf('user-scalable=no')!==-1)return!0;if(n>31&&document.documentElement.scrollWidth<=window.outerWidth)return!0}}if(f&&(o=navigator.userAgent.match(/Version\/([0-9]*)\.([0-9]*)/),o[1]>=10&&o[2]>=3&&(e=document.querySelector('meta[name=viewport]')))){if(e.content.indexOf('user-scalable=no')!==-1)return!0;if(document.documentElement.scrollWidth<=window.outerWidth)return!0}return 'none'===t.style.msTouchAction||'manipulation'===t.style.touchAction||(r=+(/Firefox\/([0-9]+)/.exec(navigator.userAgent)||[,0])[1],!!(r>=27&&(e=document.querySelector('meta[name=viewport]'),e&&(e.content.indexOf('user-scalable=no')!==-1||document.documentElement.scrollWidth<=window.outerWidth)))||('none'===t.style.touchAction||'manipulation'===t.style.touchAction));},r.attach=function(t,e){return new r(t,e)},o=function(){return r}.call(e,n,e,t),!(void 0!==o&&(t.exports=o))}()},function(t,e,n){function o(t){if(!(this instanceof o))return new o(t);var e,n=i(t.className).split(/\s+/);for(this._elem=t,this.length=0,e=0;e<n.length;e+=1)n[e]&&c.push.call(this,n[e])}t.exports=o;var r=n(89),i=n(90),c=Array.prototype;o.prototype.add=function(){var t,e;for(e=0;e<arguments.length;e+=1)t=''+arguments[e],r(this,t)>=0||c.push.call(this,t);return this._elem.className=this.toString(),this},o.prototype.remove=function(){var t,e,n;for(n=0;n<arguments.length;n+=1)e=''+arguments[n],t=r(this,e),t<0||c.splice.call(this,t,1);return this._elem.className=this.toString(),this},o.prototype.contains=function(t){return t+='',r(this,t)>=0},o.prototype.toggle=function(t,e){return t+='',e===!0?this.add(t):e===!1?this.remove(t):this[this.contains(t)?'remove':'add'](t)},o.prototype.toString=function(){return c.join.call(this,' ')}},function(t,e){t.exports=function(t,e){if(t.indexOf)return t.indexOf(e);for(var n=0;n<t.length;++n)if(t[n: $TSFixMe]===e)return n;return-1}},function(t,e){function n(t){return t.replace(/^\s*|\s*$/g,'');}e=t.exports=n,e.left=function(t){return t.replace(/^\s*/,'');},e.right=function(t){return t.replace(/\s*$/,'');}}]);});
\ No newline at end of file
+			function r(t, e) { function n(t, e) { return function () { return t.apply(e, arguments) } } var o; if (e = e || {}, this.trackingClick = !1, this.trackingClickStart = 0, this.targetElement = null, this.touchStartX = 0, this.touchStartY = 0, this.lastTouchIdentifier = 0, this.touchBoundary = e.touchBoundary || 10, this.layer = t, this.tapDelay = e.tapDelay || 200, this.tapTimeout = e.tapTimeout || 700, !r.notNeeded(t)) { for (var i = ['onMouse', 'onClick', 'onTouchStart', 'onTouchMove', 'onTouchEnd', 'onTouchCancel'], s = this, u = 0, a = i.length; u < a; u++)s[i[u]] = n(s[i[u]], s); c && (t.addEventListener('mouseover', this.onMouse, !0), t.addEventListener('mousedown', this.onMouse, !0), t.addEventListener('mouseup', this.onMouse, !0)), t.addEventListener('click', this.onClick, !0), t.addEventListener('touchstart', this.onTouchStart, !1), t.addEventListener('touchmove', this.onTouchMove, !1), t.addEventListener('touchend', this.onTouchEnd, !1), t.addEventListener('touchcancel', this.onTouchCancel, !1), Event.prototype.stopImmediatePropagation || (t.removeEventListener = function (e, n, o) { var r = Node.prototype.removeEventListener; 'click' === e ? r.call(t, e, n.hijacked || n, o) : r.call(t, e: $TSFixMe, n: $TSFixMe, o: $TSFixMe) }, t.addEventListener = function (e, n, o) { var r = Node.prototype.addEventListener; 'click' === e ? r.call(t, e, n.hijacked || (n.hijacked = function (t) { t.propagationStopped || n(t) }), o) : r.call(t, e, n, o) }), 'function' == typeof t.onclick && (o = t.onclick, t: $TSFixMe.addEventListener('click', function (t) { o(t) }, !1), t.onclick = null)
+}}var i = navigator.userAgent.indexOf('Windows Phone') >= 0, c = navigator.userAgent.indexOf('Android') > 0 && !i, s = /iP(ad|hone|od)/.test(navigator.userAgent) && !i, u = s && /OS 4_\d(_\d)?/.test(navigator.userAgent), a = s && /OS [6-7]_\d/.test(navigator.userAgent), f = navigator.userAgent.indexOf('BB10') > 0; r.prototype.needsClick = function (t) { switch (t.nodeName.toLowerCase()) { case 'button': case 'select': case 'textarea': if (t.disabled) return !0; break; case 'input': if (s && 'file' === t.type || t.disabled) return !0; break; case 'label': case 'iframe': case 'video': return !0 }return /\bneedsclick\b/.test(t.className); }, r.prototype.needsFocus = function (t) { switch (t.nodeName.toLowerCase()) { case 'textarea': return !0; case 'select': return !c; case 'input': switch (t.type) { case 'button': case 'checkbox': case 'file': case 'image': case 'radio': case 'submit': return !1 }return !t.disabled && !t.readOnly; default: return /\bneedsfocus\b/.test(t.className); } }, r.prototype.sendClick = function (t, e) { var n, o; document.activeElement && document.activeElement !== t && document.activeElement.blur(), o = e.changedTouches[0], n = document.createEvent('MouseEvents'), n.initMouseEvent(this.determineEventType(t), !0, !0, window, 1, o.screenX, o.screenY, o.clientX, o.clientY, !1, !1, !1, !1, 0, null), n.forwardedTouchEvent = !0, t.dispatchEvent(n) }, r.prototype.determineEventType = function (t) { return c && 'select' === t.tagName.toLowerCase() ? 'mousedown' : 'click' }, r.prototype.focus = function (t) { var e; s && t.setSelectionRange && 0 !== t.type.indexOf('date') && 'time' !== t.type && 'month' !== t.type ? (e = t.value.length, t.setSelectionRange(e, e)) : t.focus() }, r.prototype.updateScrollParent = function (t) { var e, n; if (e = t.fastClickScrollParent, !e || !e.contains(t)) { n = t; do { if (n.scrollHeight > n.offsetHeight) { e = n, t.fastClickScrollParent = n; break } n = n.parentElement } while (n) } e && (e.fastClickLastScrollTop = e.scrollTop) }, r.prototype.getTargetElementFromEventTarget = function (t) { return t.nodeType === Node.TEXT_NODE ? t.parentNode : t }, r.prototype.onTouchStart = function (t) { var e, n, o; if (t.targetTouches.length > 1) return !0; if (e = this.getTargetElementFromEventTarget(t.target), n = t.targetTouches[0], s) { if (o = window.getSelection(), o.rangeCount && !o.isCollapsed) return !0; if (!u) { if (n.identifier && n.identifier === this.lastTouchIdentifier) return t.preventDefault(), !1; this.lastTouchIdentifier = n.identifier, this.updateScrollParent(e) } } return this.trackingClick = !0, this.trackingClickStart = t.timeStamp, this.targetElement = e, this.touchStartX = n.pageX, this.touchStartY = n.pageY, t.timeStamp - this.lastClickTime < this.tapDelay && t.preventDefault(), !0 }, r.prototype.touchHasMoved = function (t) { var e = t.changedTouches[0], n = this.touchBoundary; return Math.abs(e.pageX - this.touchStartX) > n || Math.abs(e.pageY - this.touchStartY) > n: $TSFixMe; }, r.prototype.onTouchMove = function (t) { return !this.trackingClick || ((this.targetElement !== this.getTargetElementFromEventTarget(t.target) || this.touchHasMoved(t)) && (this.trackingClick = !1, this.targetElement = null), !0) }, r.prototype.findControl = function (t) { return void 0 !== t.control ? t.control : t.htmlFor ? document.getElementById(t.htmlFor) : t.querySelector('button, input:not([type=hidden]), keygen, meter, output, progress, select, textarea') }, r.prototype.onTouchEnd = function (t) { var e, n, o, r, i, f = this.targetElement; if (!this.trackingClick) return !0; if (t.timeStamp - this.lastClickTime < this.tapDelay) return this.cancelNextClick = !0, !0; if (t.timeStamp - this.trackingClickStart > this.tapTimeout) return !0; if (this.cancelNextClick = !1, this.lastClickTime = t.timeStamp, n = this.trackingClickStart, this.trackingClick = !1, this.trackingClickStart = 0, a && (i = t.changedTouches[0], f = document.elementFromPoint(i.pageX - window.pageXOffset, i.pageY - window.pageYOffset) || f, f.fastClickScrollParent = this.targetElement.fastClickScrollParent), o = f.tagName.toLowerCase(), 'label' === o) { if (e = this.findControl(f)) { if (this.focus(f), c) return !1; f = e } } else if (this.needsFocus(f)) return t.timeStamp - n > 100 || s && window.top !== window && 'input' === o ? (this.targetElement = null, !1) : (this.focus(f), this.sendClick(f, t), s && 'select' === o || (this.targetElement = null, t.preventDefault()), !1); return !(!s || u || (r = f.fastClickScrollParent, !r || r.fastClickLastScrollTop === r.scrollTop)) || (this.needsClick(f) || (t.preventDefault(), this.sendClick(f, t)), !1) }, r.prototype.onTouchCancel = function () { this.trackingClick = !1, this.targetElement = null }, r.prototype.onMouse = function (t) { return !this.targetElement || (!!t.forwardedTouchEvent || (!t.cancelable || (!(!this.needsClick(this.targetElement) || this.cancelNextClick) || (t.stopImmediatePropagation ? t.stopImmediatePropagation() : t.propagationStopped = !0, t.stopPropagation(), t.preventDefault(), !1)))) }, r.prototype.onClick = function (t) { var e; return this.trackingClick ? (this.targetElement = null, this.trackingClick = !1, !0) : 'submit' === t.target.type && 0 === t.detail || (e = this.onMouse(t), e || (this.targetElement = null), e) }, r.prototype.destroy = function () { var t = this.layer; c && (t.removeEventListener('mouseover', this.onMouse, !0), t.removeEventListener('mousedown', this.onMouse, !0), t.removeEventListener('mouseup', this.onMouse, !0)), t.removeEventListener('click', this.onClick, !0), t.removeEventListener('touchstart', this.onTouchStart, !1), t.removeEventListener('touchmove', this.onTouchMove, !1), t.removeEventListener('touchend', this.onTouchEnd, !1), t.removeEventListener('touchcancel', this.onTouchCancel, !1) }, r.notNeeded = function (t) { var e, n, o, r; if ('undefined' == typeof window.ontouchstart) return !0; if (n = +(/Chrome\/([0-9]+)/.exec(navigator.userAgent) || [, 0])[1]) { if (!c) return !0; if (e = document.querySelector('meta[name=viewport]')) { if (e.content.indexOf('user-scalable=no') !== -1) return !0; if (n > 31 && document.documentElement.scrollWidth <= window.outerWidth) return !0 } } if (f && (o = navigator.userAgent.match(/Version\/([0-9]*)\.([0-9]*)/), o[1] >= 10 && o[2] >= 3 && (e = document.querySelector('meta[name=viewport]')))) { if (e.content.indexOf('user-scalable=no') !== -1) return !0; if (document.documentElement.scrollWidth <= window.outerWidth) return !0 } return 'none' === t.style.msTouchAction || 'manipulation' === t.style.touchAction || (r = +(/Firefox\/([0-9]+)/.exec(navigator.userAgent) || [, 0])[1], !!(r >= 27 && (e = document.querySelector('meta[name=viewport]'), e && (e.content.indexOf('user-scalable=no') !== -1 || document.documentElement.scrollWidth <= window.outerWidth))) || ('none' === t.style.touchAction || 'manipulation' === t.style.touchAction)); }, r.attach = function (t, e) { return new r(t, e) }, o = function () { return r }.call(e, n, e, t), !(void 0 !== o && (t.exports = o))}()}, function(t, e, n) { function o(t) { if (!(this instanceof o)) return new o(t); var e, n = i(t.className).split(/\s+/); for (this._elem = t, this.length = 0, e = 0; e < n.length; e += 1)n[e] && c.push.call(this, n[e]) } t.exports = o; var r = n(89), i = n(90), c = Array.prototype; o.prototype.add = function () { var t, e; for (e = 0; e < arguments.length; e += 1)t = '' + arguments[e], r(this, t) >= 0 || c.push.call(this, t); return this._elem.className = this.toString(), this }, o.prototype.remove = function () { var t, e, n; for (n = 0; n < arguments.length; n += 1)e = '' + arguments[n], t = r(this, e), t < 0 || c.splice.call(this, t, 1); return this._elem.className = this.toString(), this }, o.prototype.contains = function (t) { return t += '', r(this, t) >= 0 }, o.prototype.toggle = function (t, e) { return t += '', e === !0 ? this.add(t) : e === !1 ? this.remove(t) : this[this.contains(t) ? 'remove' : 'add'](t) }, o.prototype.toString = function () { return c.join.call(this, ' ') } }, function(t, e) { t.exports = function (t, e) { if (t.indexOf) return t.indexOf(e); for (var n = 0; n < t.length; ++n)if (t[n: $TSFixMe]=== e) return n; return -1 } }, function(t, e) { function n(t) { return t.replace(/^\s*|\s*$/g, ''); } e = t.exports = n, e.left = function (t) { return t.replace(/^\s*/, ''); }, e.right = function (t) { return t.replace(/\s*$/, ''); } }]);});
\ No newline at end of file
diff --git a/home/public/js/switchUrl.ts b/home/public/js/switchUrl.ts
index 9586ab16ad..b40b707d46 100755
--- a/home/public/js/switchUrl.ts
+++ b/home/public/js/switchUrl.ts
@@ -1,10 +1,9 @@
 
-let accountsUrl = window.location.origin+'/accounts';
-let backendUrl = window.location.hostname==='localhost'? 'http://localhost:3002': window.location.origin+'/api'
+let accountsUrl = window.location.origin + '/accounts';
+let backendUrl = window.location.hostname === 'localhost' ? 'http://localhost:3002' : window.location.origin + '/api'
 
 
-//eslint-disable-next-line
-function loginUrl(extra: $TSFixMe) {
+function loginUrl(extra: string) {
     if (extra) {
         window.location.href = `${accountsUrl}/login${extra}`;
     }
@@ -12,8 +11,8 @@ function loginUrl(extra: $TSFixMe) {
         window.location.href = `${accountsUrl}/login`;
     }
 }
-//eslint-disable-next-line
-function registerUrl(params: $TSFixMe) {
+
+function registerUrl(params: string) {
     if (params) {
         window.location.href = `${accountsUrl}/register${params}`;
     }
@@ -21,7 +20,6 @@ function registerUrl(params: $TSFixMe) {
         window.location.href = `${accountsUrl}/register`;
     }
 }
-//eslint-disable-next-line
 function formUrl() {
     return `${backendUrl}/lead/`;
 }
diff --git a/home/views/head.ejs b/home/views/head.ejs
index 79567b4a96..51c0bb1cb2 100755
--- a/home/views/head.ejs
+++ b/home/views/head.ejs
@@ -130,10 +130,10 @@
     if ('serviceWorker' in navigator) {
         navigator.serviceWorker.register('service-worker.js', { scope: '.' })
             .then(function (registration) {
-                console.log('Service Worker Registered');
+                logger.info('Service Worker Registered');
             })
             .catch(function (err) {
-                console.log('Error: Service Worker because Registered: ', err);
+                logger.info('Error: Service Worker because Registered: ', err);
             })
     }
 </script>
diff --git a/http-test-server/backend/api/settings.ts b/http-test-server/backend/api/settings.ts
index ecbdcee6b9..59665edb0a 100644
--- a/http-test-server/backend/api/settings.ts
+++ b/http-test-server/backend/api/settings.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 import http from 'http';
 
 const router = express.getRouter();
diff --git a/http-test-server/index.ts b/http-test-server/index.ts
index d42562bc53..b2afdd804c 100644
--- a/http-test-server/index.ts
+++ b/http-test-server/index.ts
@@ -1,28 +1,14 @@
-process.on('exit', () => {
-    // eslint-disable-next-line no-console
-    console.log('Shutting Shutdown');
-});
+import logger from 'common-server/utils/logger';
 
-process.on('unhandledRejection', err => {
-    // eslint-disable-next-line no-console
-    console.error('Unhandled rejection in process occurred');
-    // eslint-disable-next-line no-console
-    console.error(err);
-});
-
-process.on('uncaughtException', err => {
-    // eslint-disable-next-line no-console
-    console.error('Uncaught exception in process occurred');
-    // eslint-disable-next-line no-console
-    console.error(err);
-});
+import 'common-server/utils/env';
+import 'common-server/utils/process';
 
 import express, {
     Request,
     Response,
     NextFunction,
 } from 'common-server/utils/express';
-const app = express();
+const app = express.getExpressApp();
 import path from 'path';
 
 import bodyParser from 'body-parser';
@@ -41,7 +27,7 @@ global.httpServerResponse = {
     body: { status: 'ok' },
 };
 
-app.use('*', function (req: Request, res: Response, next: $TSFixMe) {
+app.use('*', function (req: Request, res: Response, next: NextFunction) {
     if (process.env && process.env.PRODUCTION) {
         res.set('Cache-Control', 'public, max-age=86400');
     } else res.set('Cache-Control', 'no-cache');
@@ -121,6 +107,5 @@ app.use('/*', function (req: Request, res: Response) {
 app.set('port', process.env.PORT || 3010);
 
 app.listen(app.get('port'), function () {
-    //eslint-disable-next-line
-    console.log('Server running on port : ' + app.get('port'));
+    logger.info('Server running on port : ' + app.get('port'));
 });
diff --git a/init-script/index.ts b/init-script/index.ts
index 2631aef71c..f1a014adb0 100644
--- a/init-script/index.ts
+++ b/init-script/index.ts
@@ -5,12 +5,8 @@ import fs from 'fs';
 import util from './util/db';
 import scripts from './scripts';
 
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
-const app = express();
+import express, { Request, Response } from 'common-server/utils/express';
+const app = express.getExpressApp();
 
 import { find, save, update, removeMany } from './util/db';
 
diff --git a/init-script/scripts/3.0.9327.ts b/init-script/scripts/3.0.9327.ts
index e31f8cbad1..9b576d795f 100644
--- a/init-script/scripts/3.0.9327.ts
+++ b/init-script/scripts/3.0.9327.ts
@@ -1,6 +1,8 @@
 import { find } from '../util/db';
 import payment from '../util/payment';
 import Stripe from 'stripe';
+import logger from 'common-server/utils/logger';
+
 const stripe = Stripe(payment.paymentPrivateKey);
 
 import { deleteApi } from '../util/api';
@@ -30,8 +32,7 @@ async function run() {
                         `project/${project._id}/initScript/deleteProject`
                     );
                 } catch (error) {
-                    // eslint-disable-next-line no-console
-                    console.log('** Init error: ', error);
+                    logger.info('** Init error: ', error);
                 }
             }
         }
diff --git a/js-sdk/src/cli/server-monitor/out/scripts/prettify/prettify.ts b/js-sdk/src/cli/server-monitor/out/scripts/prettify/prettify.ts
index bf5e6da064..7224b6a171 100644
--- a/js-sdk/src/cli/server-monitor/out/scripts/prettify/prettify.ts
+++ b/js-sdk/src/cli/server-monitor/out/scripts/prettify/prettify.ts
@@ -1,41 +1,95 @@
 
-var q=null;window.PR_SHOULD_USE_CONTINUATION=!0;
+var q = null; window.PR_SHOULD_USE_CONTINUATION = !0;
 
-(function(){function L(a: $TSFixMe){function m(a: $TSFixMe){var f=a.charCodeAt(0);if(f!==92)return f;var b=a.charAt(1);return(f=r[b])?f:"0"<=b&&b<="7"?parseInt(a.substring(1),8):b==="u"||b==="x"?parseInt(a.substring(2),16):a.charCodeAt(1)}function e(a: $TSFixMe){if(a<32)return(a<16?"\\x0":"\\x")+a.toString(16);a=String.fromCharCode(a);if(a==="\\"||a==="-"||a==="["||a==="]")a="\\"+a;return a}function h(a: $TSFixMe){for(var f=a.substring(1,a.length-1).match(/\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\[0-3][0-7]{0,2}|\\[0-7]{1,2}|\\[\S\s]|[^\\]/g),a=
-[],b=[],o=f[0]==="^",c=o?1:0,i=f.length;c<i;++c){var j=f[c];if(/\\[bdsw]/i.test(j))a.push(j);else{var j=m(j),d;c+2<i&&"-"===f[c+1]?(d=m(f[c+2]),c+=2):d=j;b.push([j,d]);d<65||j>122||(d<65||j>90||b.push([Math.max(65,j)|32,Math.min(d,90)|32]),d<97||j>122||b.push([Math.max(97,j)&-33,Math.min(d,122)&-33]))}}b.sort(function(a,f){return a[0]-f[0]||f[1]-a[1]});f=[];j=[NaN,NaN];for(c=0;c<b.length;++c)i=b[c],i[0]<=j[1]+1?j[1]=Math.max(j[1],i[1]):f.push(j=i);b=["["];o&&b.push("^");b.push.apply(b,a);for(c=0;c<
-f.length;++c)i=f[c],b.push(e(i[0])),i[1]>i[0]&&(i[1]+1>i[0]&&b.push("-"),b.push(e(i[1])));b.push("]");return b.join("")}function y(a: $TSFixMe){for(var f=a.source.match(/\[(?:[^\\\]]|\\[\S\s])*]|\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\\d+|\\[^\dux]|\(\?[!:=]|[()^]|[^()[\\^]+/g),b=f.length,d=[],c=0,i=0;c<b;++c){var j=f[c];j==="("?++i:"\\"===j.charAt(0)&&(j=+j.substring(1))&&j<=i&&(d[j]=-1)}for(c=1;c<d.length;++c)-1===d[c]&&(d[c]=++t);for(i=c=0;c<b;++c)j=f[c],j==="("?(++i,d[i]===void 0&&(f[c]="(?:")):"\\"===j.charAt(0)&&
-(j=+j.substring(1))&&j<=i&&(f[c]="\\"+d[i]);for(i=c=0;c<b;++c)"^"===f[c]&&"^"!==f[c+1]&&(f[c]="");if(a.ignoreCase&&s)for(c=0;c<b;++c)j=f[c],a=j.charAt(0),j.length>=2&&a==="["?f[c]=h(j):a!=="\\"&&(f[c]=j.replace(/[A-Za-z]/g,function(a: $TSFixMe){a=a.charCodeAt(0);return"["+String.fromCharCode(a&-33,a|32)+"]"}));return f.join("")}for(var t=0,s=!1,l=!1,p=0,d=a.length;p<d;++p){var g=a[p];if(g.ignoreCase)l=!0;else if(/[a-z]/i.test(g.source.replace(/\\u[\da-f]{4}|\\x[\da-f]{2}|\\[^UXux]/gi,""))){s=!0;l=!1;break}}for(var r=
-{b:8,t:9,n:10,v:11,f:12,r:13},n=[],p=0,d=a.length;p<d;++p){g=a[p];if(g.global||g.multiline)throw Error(""+g);n.push("(?:"+y(g)+")")}return RegExp(n.join("|"),l?"gi":"g")}function M(a: $TSFixMe){function m(a: $TSFixMe){switch(a.nodeType){case 1:if(e.test(a.className))break;for(var g=a.firstChild;g;g=g.nextSibling)m(g);g=a.nodeName;if("BR"===g||"LI"===g)h[s]="\n",t[s<<1]=y++,t[s++<<1|1]=a;break;case 3:case 4:g=a.nodeValue,g.length&&(g=p?g.replace(/\r\n?/g,"\n"):g.replace(/[\t\n\r ]+/g," "),h[s]=g,t[s<<1]=y,y+=g.length,
+(function () {
+    function L(a: $TSFixMe) {
+        function m(a: $TSFixMe) { var f = a.charCodeAt(0); if (f !== 92) return f; var b = a.charAt(1); return (f = r[b]) ? f : "0" <= b && b <= "7" ? parseInt(a.substring(1), 8) : b === "u" || b === "x" ? parseInt(a.substring(2), 16) : a.charCodeAt(1) } function e(a: $TSFixMe) { if (a < 32) return (a < 16 ? "\\x0" : "\\x") + a.toString(16); a = String.fromCharCode(a); if (a === "\\" || a === "-" || a === "[" || a === "]") a = "\\" + a; return a } function h(a: $TSFixMe) {
+            for (var f = a.substring(1, a.length - 1).match(/\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\[0-3][0-7]{0,2}|\\[0-7]{1,2}|\\[\S\s]|[^\\]/g), a =
+                [], b = [], o = f[0] === "^", c = o ? 1 : 0, i = f.length; c < i; ++c) { var j = f[c]; if (/\\[bdsw]/i.test(j)) a.push(j); else { var j = m(j), d; c + 2 < i && "-" === f[c + 1] ? (d = m(f[c + 2]), c += 2) : d = j; b.push([j, d]); d < 65 || j > 122 || (d < 65 || j > 90 || b.push([Math.max(65, j) | 32, Math.min(d, 90) | 32]), d < 97 || j > 122 || b.push([Math.max(97, j) & -33, Math.min(d, 122) & -33])) } } b.sort(function (a, f) { return a[0] - f[0] || f[1] - a[1] }); f = []; j = [NaN, NaN]; for (c = 0; c < b.length; ++c)i = b[c], i[0] <= j[1] + 1 ? j[1] = Math.max(j[1], i[1]) : f.push(j = i); b = ["["]; o && b.push("^"); b.push.apply(b, a); for (c = 0; c <
+                    f.length; ++c)i = f[c], b.push(e(i[0])), i[1] > i[0] && (i[1] + 1 > i[0] && b.push("-"), b.push(e(i[1]))); b.push("]"); return b.join("")
+        } function y(a: $TSFixMe) {
+            for (var f = a.source.match(/\[(?:[^\\\]]|\\[\S\s])*]|\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\\d+|\\[^\dux]|\(\?[!:=]|[()^]|[^()[\\^]+/g), b = f.length, d = [], c = 0, i = 0; c < b; ++c) { var j = f[c]; j === "(" ? ++i : "\\" === j.charAt(0) && (j = +j.substring(1)) && j <= i && (d[j] = -1) } for (c = 1; c < d.length; ++c)-1 === d[c] && (d[c] = ++t); for (i = c = 0; c < b; ++c)j = f[c], j === "(" ? (++i, d[i] === void 0 && (f[c] = "(?:")) : "\\" === j.charAt(0) &&
+                (j = +j.substring(1)) && j <= i && (f[c] = "\\" + d[i]); for (i = c = 0; c < b; ++c)"^" === f[c] && "^" !== f[c + 1] && (f[c] = ""); if (a.ignoreCase && s) for (c = 0; c < b; ++c)j = f[c], a = j.charAt(0), j.length >= 2 && a === "[" ? f[c] = h(j) : a !== "\\" && (f[c] = j.replace(/[A-Za-z]/g, function (a: $TSFixMe) { a = a.charCodeAt(0); return "[" + String.fromCharCode(a & -33, a | 32) + "]" })); return f.join("")
+        } for (var t = 0, s = !1, l = !1, p = 0, d = a.length; p < d; ++p) { var g = a[p]; if (g.ignoreCase) l = !0; else if (/[a-z]/i.test(g.source.replace(/\\u[\da-f]{4}|\\x[\da-f]{2}|\\[^UXux]/gi, ""))) { s = !0; l = !1; break } } for (var r =
+            { b: 8, t: 9, n: 10, v: 11, f: 12, r: 13 }, n = [], p = 0, d = a.length; p < d; ++p) { g = a[p]; if (g.global || g.multiline) throw Error("" + g); n.push("(?:" + y(g) + ")") } return RegExp(n.join("|"), l ? "gi" : "g")
+    } function M(a: $TSFixMe) {
+        function m(a: $TSFixMe) {
+            switch (a.nodeType) {
+                case 1: if (e.test(a.className)) break; for (var g = a.firstChild; g; g = g.nextSibling)m(g); g = a.nodeName; if ("BR" === g || "LI" === g) h[s] = "\n", t[s << 1] = y++, t[s++ << 1 | 1] = a; break; case 3: case 4: g = a.nodeValue, g.length && (g = p ? g.replace(/\r\n?/g, "\n") : g.replace(/[\t\n\r ]+/g, " "), h[s] = g, t[s << 1] = y, y += g.length,
 
-t[s++<<1|1]=a)}}var e=/(?:^|\s)nocode(?:\s|$)/,h: $TSFixMe=[],y=0,t: $TSFixMe=[],s=0,l;a.currentStyle?l=a.currentStyle.whiteSpace:window.getComputedStyle&&(l=document.defaultView.getComputedStyle(a,q).getPropertyValue("white-space"));var p=l&&"pre"===l.substring(0,3);m(a);return {a:h.join("").replace(/\n$/,""),c:t};}function B(a: $TSFixMe,m: $TSFixMe,e: $TSFixMe,h: $TSFixMe){m&&(a={a:m,d:a},e(a),h.push.apply(h,a.e))}function x(a: $TSFixMe,m: $TSFixMe){function e(a: $TSFixMe){for(var l=a.d,p=[l,"pln"],d=0,g=a.a.match(y)||[],r={},n=0,z=g.length;n<z;++n){var f=g[n],b=r[f],o=void 0,c;if(typeof b===
+                    t[s++ << 1 | 1] = a)
+            }
+        } var e = /(?:^|\s)nocode(?:\s|$)/, h: $TSFixMe = [], y = 0, t: $TSFixMe = [], s = 0, l; a.currentStyle ? l = a.currentStyle.whiteSpace : window.getComputedStyle && (l = document.defaultView.getComputedStyle(a, q).getPropertyValue("white-space")); var p = l && "pre" === l.substring(0, 3); m(a); return { a: h.join("").replace(/\n$/, ""), c: t };
+    } function B(a: $TSFixMe, m: $TSFixMe, e: $TSFixMe, h: $TSFixMe) { m && (a = { a: m, d: a }, e(a), h.push.apply(h, a.e)) } function x(a: $TSFixMe, m: $TSFixMe) {
+        function e(a: $TSFixMe) {
+            for (var l = a.d, p = [l, "pln"], d = 0, g = a.a.match(y) || [], r = {}, n = 0, z = g.length; n < z; ++n) {
+                var f = g[n], b = r[f], o = void 0, c; if (typeof b ===
 
-"string")c=!1;else{var i=h[f.charAt(0)];if(i)o=f.match(i[1]),b=i[0];else{for(c=0;c<t;++c)if(i=m[c],o=f.match(i[1])){b=i[0];break}o||(b="pln")}if((c=b.length>=5&&"lang-"===b.substring(0,5))&&!(o&&typeof o[1]==="string"))c=!1,b="src";c||(r[f]=b)}i=d;d+=f.length;if(c){c=o[1];var j=f.indexOf(c),k=j+c.length;o[2]&&(k=f.length-o[2].length,j=k-c.length);b=b.substring(5);B(l+i,f.substring(0,j),e,p);B(l+i+j,c,C(b,c),p);B(l+i+k,f.substring(k),e,p)}else p.push(l+i,b)}a.e=p}var h={},y: $TSFixMe;(function(){for(var e=a.concat(m),
+                    "string") c = !1; else { var i = h[f.charAt(0)]; if (i) o = f.match(i[1]), b = i[0]; else { for (c = 0; c < t; ++c)if (i = m[c], o = f.match(i[1])) { b = i[0]; break } o || (b = "pln") } if ((c = b.length >= 5 && "lang-" === b.substring(0, 5)) && !(o && typeof o[1] === "string")) c = !1, b = "src"; c || (r[f] = b) } i = d; d += f.length; if (c) { c = o[1]; var j = f.indexOf(c), k = j + c.length; o[2] && (k = f.length - o[2].length, j = k - c.length); b = b.substring(5); B(l + i, f.substring(0, j), e, p); B(l + i + j, c, C(b, c), p); B(l + i + k, f.substring(k), e, p) } else p.push(l + i, b)
+            } a.e = p
+        } var h = {}, y: $TSFixMe; (function () {
+            for (var e = a.concat(m),
 
-l=[],p={},d=0,g=e.length;d<g;++d){var r=e[d],n=r[3];if(n)for(var k=n.length;--k>=0;)h[n.charAt(k)]=r;r=r[1];n=""+r;p.hasOwnProperty(n)||(l.push(r),p[n]=q)}l.push(/[\S\s]/);y=L(l)})();var t=m.length;return e}function u(a: $TSFixMe){var m=[],e=[];a.tripleQuotedStrings?m.push(["str",/^(?:'''(?:[^'\\]|\\[\S\s]|''?(?=[^']))*(?:'''|$)|"""(?:[^"\\]|\\[\S\s]|""?(?=[^"]))*(?:"""|$)|'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$))/,q,"'\""]):a.multiLineStrings?m.push(["str",/^(?:'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$)|`(?:[^\\`]|\\[\S\s])*(?:`|$))/,
-q,"'\"`"]):m.push(["str",/^(?:'(?:[^\n\r'\\]|\\.)*(?:'|$)|"(?:[^\n\r"\\]|\\.)*(?:"|$))/,q,"\"'"]);a.verbatimStrings&&e.push(["str",/^@"(?:[^"]|"")*(?:"|$)/,q]);var h=a.hashComments;h&&(a.cStyleComments?(h>1?m.push(["com",/^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/,q,"#"]):m.push(["com",/^#(?:(?:define|elif|else|endif|error|ifdef|include|ifndef|line|pragma|undef|warning)\b|[^\n\r]*)/,q,"#"]),e.push(["str",/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h|[a-z]\w*)>/,q])):m.push(["com",/^#[^\n\r]*/,
-q,"#"]));a.cStyleComments&&(e.push(["com",/^\/\/[^\n\r]*/,q]),e.push(["com",/^\/\*[\S\s]*?(?:\*\/|$)/,q]));a.regexLiterals&&e.push(["lang-regex",/^(?:^^\.?|[!+-]|!=|!==|#|%|%=|&|&&|&&=|&=|\(|\*|\*=|\+=|,|-=|->|\/|\/=|:|::|;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|[?@[^]|\^=|\^\^|\^\^=|{|\||\|=|\|\||\|\|=|~|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\s*(\/(?=[^*/])(?:[^/[\\]|\\[\S\s]|\[(?:[^\\\]]|\\[\S\s])*(?:]|$))+\/)/]);(h=a.types)&&e.push(["typ",h]);a=(""+a.keywords).replace(/^ | $/g,
-"");a.length&&e.push(["kwd",RegExp("^(?:"+a.replace(/[\s,]+/g,"|")+")\\b"),q]);m.push(["pln",/^\s+/,q," \r\n\t\xa0"]);e.push(["lit",/^@[$_a-z][\w$@]*/i,q],["typ",/^(?:[@_]?[A-Z]+[a-z][\w$@]*|\w+_t\b)/,q],["pln",/^[$_a-z][\w$@]*/i,q],["lit",/^(?:0x[\da-f]+|(?:\d(?:_\d+)*\d*(?:\.\d*)?|\.\d\+)(?:e[+-]?\d+)?)[a-z]*/i,q,"0123456789"],["pln",/^\\[\S\s]?/,q],["pun",/^.[^\s\w"-$'./@\\`]*/,q]);return x(m,e)}function D(a: $TSFixMe,m: $TSFixMe){function e(a: $TSFixMe){switch(a.nodeType){case 1:if(k.test(a.className))break;if("BR"===a.nodeName)h(a),
-a.parentNode&&a.parentNode.removeChild(a);else for(a=a.firstChild;a;a=a.nextSibling)e(a);break;case 3:case 4:if(p){var b=a.nodeValue,d=b.match(t);if(d){var c=b.substring(0,d.index);a.nodeValue=c;(b=b.substring(d.index+d[0].length))&&a.parentNode.insertBefore(s.createTextNode(b),a.nextSibling);h(a);c||a.parentNode.removeChild(a)}}}}function h(a: $TSFixMe){function b(a: $TSFixMe,d: $TSFixMe){var e=d?a.cloneNode(!1):a,f=a.parentNode;if(f){var f=b(f,1),g=a.nextSibling;f.appendChild(e);for(var h=g;h;h=g)g=h.nextSibling,f.appendChild(h)}return e}
+                l = [], p = {}, d = 0, g = e.length; d < g; ++d) { var r = e[d], n = r[3]; if (n) for (var k = n.length; --k >= 0;)h[n.charAt(k)] = r; r = r[1]; n = "" + r; p.hasOwnProperty(n) || (l.push(r), p[n] = q) } l.push(/[\S\s]/); y = L(l)
+        })(); var t = m.length; return e
+    } function u(a: $TSFixMe) {
+        var m = [], e = []; a.tripleQuotedStrings ? m.push(["str", /^(?:'''(?:[^'\\]|\\[\S\s]|''?(?=[^']))*(?:'''|$)|"""(?:[^"\\]|\\[\S\s]|""?(?=[^"]))*(?:"""|$)|'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$))/, q, "'\""]) : a.multiLineStrings ? m.push(["str", /^(?:'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$)|`(?:[^\\`]|\\[\S\s])*(?:`|$))/,
+            q, "'\"`"]) : m.push(["str", /^(?:'(?:[^\n\r'\\]|\\.)*(?:'|$)|"(?:[^\n\r"\\]|\\.)*(?:"|$))/, q, "\"'"]); a.verbatimStrings && e.push(["str", /^@"(?:[^"]|"")*(?:"|$)/, q]); var h = a.hashComments; h && (a.cStyleComments ? (h > 1 ? m.push(["com", /^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/, q, "#"]) : m.push(["com", /^#(?:(?:define|elif|else|endif|error|ifdef|include|ifndef|line|pragma|undef|warning)\b|[^\n\r]*)/, q, "#"]), e.push(["str", /^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h|[a-z]\w*)>/, q])) : m.push(["com", /^#[^\n\r]*/,
+                q, "#"])); a.cStyleComments && (e.push(["com", /^\/\/[^\n\r]*/, q]), e.push(["com", /^\/\*[\S\s]*?(?:\*\/|$)/, q])); a.regexLiterals && e.push(["lang-regex", /^(?:^^\.?|[!+-]|!=|!==|#|%|%=|&|&&|&&=|&=|\(|\*|\*=|\+=|,|-=|->|\/|\/=|:|::|;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|[?@[^]|\^=|\^\^|\^\^=|{|\||\|=|\|\||\|\|=|~|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\s*(\/(?=[^*/])(?:[^/[\\]|\\[\S\s]|\[(?:[^\\\]]|\\[\S\s])*(?:]|$))+\/)/]); (h = a.types) && e.push(["typ", h]); a = ("" + a.keywords).replace(/^ | $/g,
+                    ""); a.length && e.push(["kwd", RegExp("^(?:" + a.replace(/[\s,]+/g, "|") + ")\\b"), q]); m.push(["pln", /^\s+/, q, " \r\n\t\xa0"]); e.push(["lit", /^@[$_a-z][\w$@]*/i, q], ["typ", /^(?:[@_]?[A-Z]+[a-z][\w$@]*|\w+_t\b)/, q], ["pln", /^[$_a-z][\w$@]*/i, q], ["lit", /^(?:0x[\da-f]+|(?:\d(?:_\d+)*\d*(?:\.\d*)?|\.\d\+)(?:e[+-]?\d+)?)[a-z]*/i, q, "0123456789"], ["pln", /^\\[\S\s]?/, q], ["pun", /^.[^\s\w"-$'./@\\`]*/, q]); return x(m, e)
+    } function D(a: $TSFixMe, m: $TSFixMe) {
+        function e(a: $TSFixMe) {
+            switch (a.nodeType) {
+                case 1: if (k.test(a.className)) break; if ("BR" === a.nodeName) h(a),
+                    a.parentNode && a.parentNode.removeChild(a); else for (a = a.firstChild; a; a = a.nextSibling)e(a); break; case 3: case 4: if (p) { var b = a.nodeValue, d = b.match(t); if (d) { var c = b.substring(0, d.index); a.nodeValue = c; (b = b.substring(d.index + d[0].length)) && a.parentNode.insertBefore(s.createTextNode(b), a.nextSibling); h(a); c || a.parentNode.removeChild(a) } }
+            }
+        } function h(a: $TSFixMe) {
+            function b(a: $TSFixMe, d: $TSFixMe) { var e = d ? a.cloneNode(!1) : a, f = a.parentNode; if (f) { var f = b(f, 1), g = a.nextSibling; f.appendChild(e); for (var h = g; h; h = g)g = h.nextSibling, f.appendChild(h) } return e }
 
-for(;!a.nextSibling;)if(a=a.parentNode,!a)return;for(var a=b(a.nextSibling,0),e;(e=a.parentNode)&&e.nodeType===1;)a=e;d.push(a)}var k=/(?:^|\s)nocode(?:\s|$)/,t=/\r\n?|\n/,s=a.ownerDocument,l;a.currentStyle?l=a.currentStyle.whiteSpace:window.getComputedStyle&&(l=s.defaultView.getComputedStyle(a,q).getPropertyValue("white-space"));var p=l&&"pre"===l.substring(0,3);for(l=s.createElement("LI");a.firstChild;)l.appendChild(a.firstChild);for(var d=[l],g=0;g<d.length;++g)e(d[g]);m===(m|0)&&d[0].setAttribute("value",
+            for (; !a.nextSibling;)if (a = a.parentNode, !a) return; for (var a = b(a.nextSibling, 0), e; (e = a.parentNode) && e.nodeType === 1;)a = e; d.push(a)
+        } var k = /(?:^|\s)nocode(?:\s|$)/, t = /\r\n?|\n/, s = a.ownerDocument, l; a.currentStyle ? l = a.currentStyle.whiteSpace : window.getComputedStyle && (l = s.defaultView.getComputedStyle(a, q).getPropertyValue("white-space")); var p = l && "pre" === l.substring(0, 3); for (l = s.createElement("LI"); a.firstChild;)l.appendChild(a.firstChild); for (var d = [l], g = 0; g < d.length; ++g)e(d[g]); m === (m | 0) && d[0].setAttribute("value",
 
-m);var r=s.createElement("OL");r.className="linenums";for(var n=Math.max(0,m-1|0)||0,g=0,z=d.length;g<z;++g)l=d[g],l.className="L"+(g+n)%10,l.firstChild||l.appendChild(s.createTextNode("\xa0")),r.appendChild(l);a.appendChild(r)}function k(a: $TSFixMe,m: $TSFixMe){for(var e=m.length;--e>=0;){var h=m[e];A.hasOwnProperty(h)?window.console&&console.warn("cannot override language handler %s",h):A[h]=a}}function C(a: $TSFixMe,m: $TSFixMe){if(!a||!A.hasOwnProperty(a))a=/^\s*</.test(m)?"default-markup":"default-code";return A[a]}function E(a: $TSFixMe){var m=
+            m); var r = s.createElement("OL"); r.className = "linenums"; for (var n = Math.max(0, m - 1 | 0) || 0, g = 0, z = d.length; g < z; ++g)l = d[g], l.className = "L" + (g + n) % 10, l.firstChild || l.appendChild(s.createTextNode("\xa0")), r.appendChild(l); a.appendChild(r)
+    } function k(a: $TSFixMe, m: $TSFixMe) { for (var e = m.length; --e >= 0;) { var h = m[e]; A.hasOwnProperty(h) ? window.console && console.warn("cannot override language handler %s", h) : A[h] = a } } function C(a: $TSFixMe, m: $TSFixMe) { if (!a || !A.hasOwnProperty(a)) a = /^\s*</.test(m) ? "default-markup" : "default-code"; return A[a] } function E(a: $TSFixMe) {
+        var m =
 
-a.g;try{var e=M(a.h),h=e.a;a.a=h;a.c=e.c;a.d=0;C(m,h)(a);var k=/\bMSIE\b/.test(navigator.userAgent),m=/\n/g,t=a.a,s=t.length,e=0,l=a.c,p=l.length,h=0,d=a.e,g=d.length,a=0;d[g]=s;var r,n;for(n=r=0;n<g;)d[n]!==d[n+2]?(d[r++]=d[n++],d[r++]=d[n++]):n+=2;g=r;for(n=r=0;n<g;){for(var z=d[n],f=d[n+1],b=n+2;b+2<=g&&d[b+1]===f;)b+=2;d[r++]=z;d[r++]=f;n=b}for(d.length=r;h<p;){var o=l[h+2]||s,c=d[a+2]||s,b=Math.min(o,c),i=l[h+1],j;if(i.nodeType!==1&&(j=t.substring(e,b))){k&&(j=j.replace(m,"\r"));i.nodeValue=
-j;var u=i.ownerDocument,v=u.createElement("SPAN");v.className=d[a+1];var x=i.parentNode;x.replaceChild(v,i);v.appendChild(i);e<o&&(l[h+1]=i=u.createTextNode(t.substring(b,o)),x.insertBefore(i,v.nextSibling))}e=b;e>=o&&(h+=2);e>=c&&(a+=2)}}catch(w){"console"in window&&console.log(w&&w.stack?w.stack:w)}}var v=["break,continue,do,else,for,if,return,while"],w=[[v,"auto,case,char,const,default,double,enum,extern,float,goto,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"],
-"catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"],F=[w,"alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,dynamic_cast,explicit,export,friend,inline,late_check,mutable,namespace,nullptr,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"],G=[w,"abstract,boolean,byte,extends,final,finally,implements,import,instanceof,null,native,package,strictfp,super,synchronized,throws,transient"],
+            a.g; try {
+                var e = M(a.h), h = e.a; a.a = h; a.c = e.c; a.d = 0; C(m, h)(a); var k = /\bMSIE\b/.test(navigator.userAgent), m = /\n/g, t = a.a, s = t.length, e = 0, l = a.c, p = l.length, h = 0, d = a.e, g = d.length, a = 0; d[g] = s; var r, n; for (n = r = 0; n < g;)d[n] !== d[n + 2] ? (d[r++] = d[n++], d[r++] = d[n++]) : n += 2; g = r; for (n = r = 0; n < g;) { for (var z = d[n], f = d[n + 1], b = n + 2; b + 2 <= g && d[b + 1] === f;)b += 2; d[r++] = z; d[r++] = f; n = b } for (d.length = r; h < p;) {
+                    var o = l[h + 2] || s, c = d[a + 2] || s, b = Math.min(o, c), i = l[h + 1], j; if (i.nodeType !== 1 && (j = t.substring(e, b))) {
+                        k && (j = j.replace(m, "\r")); i.nodeValue =
+                            j; var u = i.ownerDocument, v = u.createElement("SPAN"); v.className = d[a + 1]; var x = i.parentNode; x.replaceChild(v, i); v.appendChild(i); e < o && (l[h + 1] = i = u.createTextNode(t.substring(b, o)), x.insertBefore(i, v.nextSibling))
+                    } e = b; e >= o && (h += 2); e >= c && (a += 2)
+                }
+            } catch (w) { "console" in window && logger.info(w && w.stack ? w.stack : w) }
+    } var v = ["break,continue,do,else,for,if,return,while"], w = [[v, "auto,case,char,const,default,double,enum,extern,float,goto,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"],
+        "catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"], F = [w, "alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,dynamic_cast,explicit,export,friend,inline,late_check,mutable,namespace,nullptr,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"], G = [w, "abstract,boolean,byte,extends,final,finally,implements,import,instanceof,null,native,package,strictfp,super,synchronized,throws,transient"],
 
-H=[G,"as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,interface,internal,into,is,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var"],w=[w,"debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN"],I=[v,"and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"],
+        H = [G, "as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,interface,internal,into,is,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var"], w = [w, "debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN"], I = [v, "and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"],
 
-J=[v,"alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END"],v=[v,"case,done,elif,esac,eval,fi,function,in,local,set,then,until"],K=/^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)/,N=/\S/,O=u({keywords:[F,H,w,"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END"+
-I,J,v],hashComments:!0,cStyleComments:!0,multiLineStrings:!0,regexLiterals:!0}),A={};k(O,["default-code"]);k(x([],[["pln",/^[^<?]+/],["dec",/^<!\w[^>]*(?:>|$)/],["com",/^<\!--[\S\s]*?(?:--\>|$)/],["lang-",/^<\?([\S\s]+?)(?:\?>|$)/],["lang-",/^<%([\S\s]+?)(?:%>|$)/],["pun",/^(?:<[%?]|[%?]>)/],["lang-",/^<xmp\b[^>]*>([\S\s]+?)<\/xmp\b[^>]*>/i],["lang-js",/^<script\b[^>]*>([\S\s]*?)(<\/script\b[^>]*>)/i],["lang-css",/^<style\b[^>]*>([\S\s]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i]]),
-["default-markup","htm","html","mxml","xhtml","xml","xsl"]);k(x([["pln",/^\s+/,q," \t\r\n"],["atv",/^(?:"[^"]*"?|'[^']*'?)/,q,"\"'"]],[["tag",/^^<\/?[a-z](?:[\w-.:]*\w)?|\/?>$/i],["atn",/^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],["lang-uq.val",/^=\s*([^\s"'>]*(?:[^\s"'/>]|\/(?=\s)))/],["pun",/^[/<->]+/],["lang-js",/^on\w+\s*=\s*"([^"]+)"/i],["lang-js",/^on\w+\s*=\s*'([^']+)'/i],["lang-js",/^on\w+\s*=\s*([^\s"'>]+)/i],["lang-css",/^style\s*=\s*"([^"]+)"/i],["lang-css",/^style\s*=\s*'([^']+)'/i],["lang-css",
-/^style\s*=\s*([^\s"'>]+)/i]]),["in.tag"]);k(x([],[["atv",/^[\S\s]+/]]),["uq.val"]);k(u({keywords:F,hashComments:!0,cStyleComments:!0,types:K}),["c","cc","cpp","cxx","cyc","m"]);k(u({keywords:"null,true,false"}),["json"]);k(u({keywords:H,hashComments:!0,cStyleComments:!0,verbatimStrings:!0,types:K}),["cs"]);k(u({keywords:G,cStyleComments:!0}),["java"]);k(u({keywords:v,hashComments:!0,multiLineStrings:!0}),["bsh","csh","sh"]);k(u({keywords:I,hashComments:!0,multiLineStrings:!0,tripleQuotedStrings:!0}),
-["cv","py"]);k(u({keywords:"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END",hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["perl","pl","pm"]);k(u({keywords:J,hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["rb"]);k(u({keywords:w,cStyleComments:!0,regexLiterals:!0}),["js"]);k(u({keywords:"all,and,by,catch,class,else,extends,false,finally,for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,true,try,unless,until,when,while,yes",
+        J = [v, "alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END"], v = [v, "case,done,elif,esac,eval,fi,function,in,local,set,then,until"], K = /^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)/, N = /\S/, O = u({
+            keywords: [F, H, w, "caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END" +
+                I, J, v], hashComments: !0, cStyleComments: !0, multiLineStrings: !0, regexLiterals: !0
+        }), A = {}; k(O, ["default-code"]); k(x([], [["pln", /^[^<?]+/], ["dec", /^<!\w[^>]*(?:>|$)/], ["com", /^<\!--[\S\s]*?(?:--\>|$)/], ["lang-", /^<\?([\S\s]+?)(?:\?>|$)/], ["lang-", /^<%([\S\s]+?)(?:%>|$)/], ["pun", /^(?:<[%?]|[%?]>)/], ["lang-", /^<xmp\b[^>]*>([\S\s]+?)<\/xmp\b[^>]*>/i], ["lang-js", /^<script\b[^>]*>([\S\s]*?)(<\/script\b[^>]*>)/i], ["lang-css", /^<style\b[^>]*>([\S\s]*?)(<\/style\b[^>]*>)/i], ["lang-in.tag", /^(<\/?[a-z][^<>]*>)/i]]),
+            ["default-markup", "htm", "html", "mxml", "xhtml", "xml", "xsl"]); k(x([["pln", /^\s+/, q, " \t\r\n"], ["atv", /^(?:"[^"]*"?|'[^']*'?)/, q, "\"'"]], [["tag", /^^<\/?[a-z](?:[\w-.:]*\w)?|\/?>$/i], ["atn", /^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i], ["lang-uq.val", /^=\s*([^\s"'>]*(?:[^\s"'/>]|\/(?=\s)))/], ["pun", /^[/<->]+/], ["lang-js", /^on\w+\s*=\s*"([^"]+)"/i], ["lang-js", /^on\w+\s*=\s*'([^']+)'/i], ["lang-js", /^on\w+\s*=\s*([^\s"'>]+)/i], ["lang-css", /^style\s*=\s*"([^"]+)"/i], ["lang-css", /^style\s*=\s*'([^']+)'/i], ["lang-css",
+                /^style\s*=\s*([^\s"'>]+)/i]]), ["in.tag"]); k(x([], [["atv", /^[\S\s]+/]]), ["uq.val"]); k(u({ keywords: F, hashComments: !0, cStyleComments: !0, types: K }), ["c", "cc", "cpp", "cxx", "cyc", "m"]); k(u({ keywords: "null,true,false" }), ["json"]); k(u({ keywords: H, hashComments: !0, cStyleComments: !0, verbatimStrings: !0, types: K }), ["cs"]); k(u({ keywords: G, cStyleComments: !0 }), ["java"]); k(u({ keywords: v, hashComments: !0, multiLineStrings: !0 }), ["bsh", "csh", "sh"]); k(u({ keywords: I, hashComments: !0, multiLineStrings: !0, tripleQuotedStrings: !0 }),
+                    ["cv", "py"]); k(u({ keywords: "caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END", hashComments: !0, multiLineStrings: !0, regexLiterals: !0 }), ["perl", "pl", "pm"]); k(u({ keywords: J, hashComments: !0, multiLineStrings: !0, regexLiterals: !0 }), ["rb"]); k(u({ keywords: w, cStyleComments: !0, regexLiterals: !0 }), ["js"]); k(u({
+                        keywords: "all,and,by,catch,class,else,extends,false,finally,for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,true,try,unless,until,when,while,yes",
 
-hashComments:3,cStyleComments:!0,multilineStrings:!0,tripleQuotedStrings:!0,regexLiterals:!0}),["coffee"]);k(x([],[["str",/^[\S\s]+/]]),["regex"]);window.prettyPrintOne=function(a: $TSFixMe,m: $TSFixMe,e: $TSFixMe){var h=document.createElement("PRE");h.innerHTML=a;e&&D(h,e);E({g:m,i:e,h:h});return h.innerHTML};window.prettyPrint=function(a: $TSFixMe){function m(){for(var e=window.PR_SHOULD_USE_CONTINUATION?l.now()+250:Infinity;p<h.length&&l.now()<e;p++){var n=h[p],k=n.className;if(k.indexOf("prettyprint")>=0){var k=k.match(g),f,b;if(b=
+                        hashComments: 3, cStyleComments: !0, multilineStrings: !0, tripleQuotedStrings: !0, regexLiterals: !0
+                    }), ["coffee"]); k(x([], [["str", /^[\S\s]+/]]), ["regex"]); window.prettyPrintOne = function (a: $TSFixMe, m: $TSFixMe, e: $TSFixMe) { var h = document.createElement("PRE"); h.innerHTML = a; e && D(h, e); E({ g: m, i: e, h: h }); return h.innerHTML }; window.prettyPrint = function (a: $TSFixMe) {
+                        function m() {
+                            for (var e = window.PR_SHOULD_USE_CONTINUATION ? l.now() + 250 : Infinity; p < h.length && l.now() < e; p++) {
+                                var n = h[p], k = n.className; if (k.indexOf("prettyprint") >= 0) {
+                                    var k = k.match(g), f, b; if (b =
 
-!k){b=n;for(var o=void 0,c=b.firstChild;c;c=c.nextSibling)var i=c.nodeType,o=i===1?o?b:c:i===3?N.test(c.nodeValue)?b:o:o;b=(f=o===b?void 0:o)&&"CODE"===f.tagName}b&&(k=f.className.match(g));k&&(k=k[1]);b=!1;for(o=n.parentNode;o;o=o.parentNode)if((o.tagName==="pre"||o.tagName==="code"||o.tagName==="xmp")&&o.className&&o.className.indexOf("prettyprint")>=0){b=!0;break}b||((b=(b=n.className.match(/\blinenums\b(?::(\d+))?/))?b[1]&&b[1].length?+b[1]:!0:!1)&&D(n,b),d={g:k,h:n,i:b},E(d))}}p<h.length?setTimeout(m,
+                                        !k) { b = n; for (var o = void 0, c = b.firstChild; c; c = c.nextSibling)var i = c.nodeType, o = i === 1 ? o ? b : c : i === 3 ? N.test(c.nodeValue) ? b : o : o; b = (f = o === b ? void 0 : o) && "CODE" === f.tagName } b && (k = f.className.match(g)); k && (k = k[1]); b = !1; for (o = n.parentNode; o; o = o.parentNode)if ((o.tagName === "pre" || o.tagName === "code" || o.tagName === "xmp") && o.className && o.className.indexOf("prettyprint") >= 0) { b = !0; break } b || ((b = (b = n.className.match(/\blinenums\b(?::(\d+))?/)) ? b[1] && b[1].length ? +b[1] : !0 : !1) && D(n, b), d = { g: k, h: n, i: b }, E(d))
+                                }
+                            } p < h.length ? setTimeout(m,
 
-250):a&&a()}for(var e=[document.getElementsByTagName("pre"),document.getElementsByTagName("code"),document.getElementsByTagName("xmp")],h: $TSFixMe=[],k=0;k<e.length;++k)for(var t=0,s=e[k].length;t<s;++t)h.push(e[k][t]);var e=q,l=Date;l.now||(l={now:function(){return+new Date}});var p=0,d,g=/\blang(?:uage)?-([\w.]+)(?!\S)/;m()};window.PR={createSimpleLexer:x,registerLangHandler:k,sourceDecorator:u,PR_ATTRIB_NAME:"atn",PR_ATTRIB_VALUE:"atv",PR_COMMENT:"com",PR_DECLARATION:"dec",PR_KEYWORD:"kwd",PR_LITERAL:"lit",
-PR_NOCODE:"nocode",PR_PLAIN:"pln",PR_PUNCTUATION:"pun",PR_SOURCE:"src",PR_STRING:"str",PR_TAG:"tag",PR_TYPE:"typ"}})();
+                                250) : a && a()
+                        } for (var e = [document.getElementsByTagName("pre"), document.getElementsByTagName("code"), document.getElementsByTagName("xmp")], h: $TSFixMe = [], k = 0; k < e.length; ++k)for (var t = 0, s = e[k].length; t < s; ++t)h.push(e[k][t]); var e = q, l = Date; l.now || (l = { now: function () { return +new Date } }); var p = 0, d, g = /\blang(?:uage)?-([\w.]+)(?!\S)/; m()
+                    }; window.PR = {
+                        createSimpleLexer: x, registerLangHandler: k, sourceDecorator: u, PR_ATTRIB_NAME: "atn", PR_ATTRIB_VALUE: "atv", PR_COMMENT: "com", PR_DECLARATION: "dec", PR_KEYWORD: "kwd", PR_LITERAL: "lit",
+                        PR_NOCODE: "nocode", PR_PLAIN: "pln", PR_PUNCTUATION: "pun", PR_SOURCE: "src", PR_STRING: "str", PR_TAG: "tag", PR_TYPE: "typ"
+                    }
+})();
diff --git a/js-sdk/src/listener.ts b/js-sdk/src/listener.ts
index eaf4021fea..ab8f8f18f8 100644
--- a/js-sdk/src/listener.ts
+++ b/js-sdk/src/listener.ts
@@ -370,8 +370,8 @@ class OneUptimeListener {
         const attributes = [];
         const elementAtrributes = elem.attributes; // get all the attritubtes related to the element
         const excludedAttributes = ['class', 'value']; // exclude items that are nnot needed
-        // eslint-disable-next-line no-unused-vars
-        for (const [key, value] of Object.entries(elementAtrributes)) {
+
+        for (const [, value] of Object.entries(elementAtrributes)) {
             if (!excludedAttributes.includes(value.name)) {
                 // if each attribute doesnt exist in the excluded one, we get the value and make an object
 
diff --git a/js-sdk/src/tracker.ts b/js-sdk/src/tracker.ts
index c6859e103c..59891a3cb3 100644
--- a/js-sdk/src/tracker.ts
+++ b/js-sdk/src/tracker.ts
@@ -1,6 +1,5 @@
 import OneUptimeListener from './listener';
 import Util from './util';
-
 import { v4 as uuidv4 } from 'uuid';
 import axios from 'axios';
 
@@ -182,16 +181,15 @@ class ErrorTracker {
         process
             .on('uncaughtException', err => {
                 // display for the user
-                // eslint-disable-next-line no-console
-                console.log(`${err}`);
+                //eslint-disable-next-line no-console
+                console.info(`${err}`);
                 // any uncaught error
                 _this._manageErrorNode(err);
             })
             .on('unhandledRejection', err => {
                 // display this for the user
-
-                // eslint-disable-next-line no-console
-                console.log(`UnhandledPromiseRejectionWarning: ${err.stack}`);
+                //eslint-disable-next-line no-console
+                console.info(`UnhandledPromiseRejectionWarning: ${err.stack}`);
                 // any unhandled promise error
                 _this._manageErrorNode(err);
             });
diff --git a/licensing/index.ts b/licensing/index.ts
index 9b691aaaf2..e043454e02 100644
--- a/licensing/index.ts
+++ b/licensing/index.ts
@@ -3,7 +3,7 @@ import express, {
     Response,
     NextFunction,
 } from 'common-server/utils/express';
-const app = express();
+const app = express.getExpressApp();
 
 import 'common-server/utils/env';
 import 'common-server/utils/process';
@@ -20,7 +20,7 @@ import cors from 'cors';
 
 app.use(cors());
 
-app.use(function (req: Request, res: Response, next: NextFunction) {
+app.use((req: Request, res: Response, next: NextFunction) => {
     if (typeof req.body === 'string') {
         req.body = JSON.parse(req.body);
     }
@@ -52,7 +52,7 @@ app.set('port', process.env.PORT || 3004);
 
 const server = http.listen(app.get('port'), function () {
     // eslint-disable-next-line
-    console.log('Server Started on port ' + app.get('port'));
+    logger.info('Server Started on port ' + app.get('port'));
 });
 
 app.get(['/', '/license'], function (req: Request, res: Response) {
diff --git a/licensing/src/api/license.ts b/licensing/src/api/license.ts
index 544708e611..4f0b3db2d2 100644
--- a/licensing/src/api/license.ts
+++ b/licensing/src/api/license.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 const router = express.getRouter();
 import {
     sendErrorResponse,
diff --git a/licensing/test/index.ts b/licensing/test/index.ts
index 8d7d15790c..f613f8f277 100644
--- a/licensing/test/index.ts
+++ b/licensing/test/index.ts
@@ -1,7 +1 @@
-try {
-    require('./license.test');
-} catch (error) {
-    // eslint-disable-next-line no-console
-    console.error(error);
-    throw error;
-}
+import './license.test';
diff --git a/lighthouse-runner/index.ts b/lighthouse-runner/index.ts
index 0eb06e7b0b..00f4cca43a 100644
--- a/lighthouse-runner/index.ts
+++ b/lighthouse-runner/index.ts
@@ -1,11 +1,7 @@
 import 'common-server/utils/env';
 import 'common-server/utils/process';
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
-const app = express();
+import express, { Request, Response } from 'common-server/utils/express';
+const app = express.getExpressApp();
 
 import http from 'http';
 http.createServer(app);
@@ -54,7 +50,7 @@ cron.schedule('*/30 * * * *', () => {
 
 http.listen(app.get('port'), function () {
     // eslint-disable-next-line
-    console.log(
+    logger.info(
         `Lighthouse Started on port ${app.get('port')}. OneUptime API URL: ${
             config.serverUrl
         }`
diff --git a/oneuptime-acme-http-01/test.ts b/oneuptime-acme-http-01/test.ts
index 4f18a17217..dcf6bd6456 100755
--- a/oneuptime-acme-http-01/test.ts
+++ b/oneuptime-acme-http-01/test.ts
@@ -17,13 +17,13 @@ const challenger = Challenger.create({});
 tester
     .testRecord('http-01', record, challenger)
     .then(function () {
-        // eslint-disable-next-line no-console
+        //eslint-disable-next-line no-console
         console.info('PASS', record);
     })
 
     .catch(function (e) {
-        // eslint-disable-next-line no-console
+        //eslint-disable-next-line no-console
         console.error(e.message);
-        // eslint-disable-next-line no-console
+        //eslint-disable-next-line no-console
         console.error(e.stack);
     });
diff --git a/oneuptime-gl-manager/manager.ts b/oneuptime-gl-manager/manager.ts
index 93662def9c..8e80387ad6 100644
--- a/oneuptime-gl-manager/manager.ts
+++ b/oneuptime-gl-manager/manager.ts
@@ -2,7 +2,8 @@ import axios from 'axios';
 const BASE_URL = `${process.env.BACKEND_PROTOCOL}://${process.env.ONEUPTIME_HOST}`;
 
 const Manager = module.exports;
-// eslint-disable-next-line no-unused-vars
+
+//eslint-disable-next-line unused-imports/no-unused-vars
 Manager.create = function (opts: $TSFixMe) {
     const manager = {};
 
diff --git a/package-lock.json b/package-lock.json
index 021341e4e9..8b7f881ba0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -26,6 +26,7 @@
                 "eslint-plugin-prettier": "^4.0.0",
                 "eslint-plugin-react": "^7.29.4",
                 "eslint-plugin-react-hooks": "^4.3.0",
+                "eslint-plugin-unused-imports": "^2.0.0",
                 "husky": "^7.0.4",
                 "lint-staged": "^12.3.7",
                 "prettier": "^2.6.0"
@@ -1855,6 +1856,36 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
+        "node_modules/eslint-plugin-unused-imports": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-2.0.0.tgz",
+            "integrity": "sha512-3APeS/tQlTrFa167ThtP0Zm0vctjr4M44HMpeg1P4bK6wItarumq0Ma82xorMKdFsWpphQBlRPzw/pxiVELX1A==",
+            "dev": true,
+            "dependencies": {
+                "eslint-rule-composer": "^0.3.0"
+            },
+            "engines": {
+                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+            },
+            "peerDependencies": {
+                "@typescript-eslint/eslint-plugin": "^5.0.0",
+                "eslint": "^8.0.0"
+            },
+            "peerDependenciesMeta": {
+                "@typescript-eslint/eslint-plugin": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/eslint-rule-composer": {
+            "version": "0.3.0",
+            "resolved": "https://registry.npmjs.org/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz",
+            "integrity": "sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==",
+            "dev": true,
+            "engines": {
+                "node": ">=4.0.0"
+            }
+        },
         "node_modules/eslint-scope": {
             "version": "7.1.1",
             "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
@@ -5846,6 +5877,21 @@
             "dev": true,
             "requires": {}
         },
+        "eslint-plugin-unused-imports": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-2.0.0.tgz",
+            "integrity": "sha512-3APeS/tQlTrFa167ThtP0Zm0vctjr4M44HMpeg1P4bK6wItarumq0Ma82xorMKdFsWpphQBlRPzw/pxiVELX1A==",
+            "dev": true,
+            "requires": {
+                "eslint-rule-composer": "^0.3.0"
+            }
+        },
+        "eslint-rule-composer": {
+            "version": "0.3.0",
+            "resolved": "https://registry.npmjs.org/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz",
+            "integrity": "sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==",
+            "dev": true
+        },
         "eslint-scope": {
             "version": "7.1.1",
             "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
diff --git a/package.json b/package.json
index 83e3963223..9727c17c2e 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
         "eslint-plugin-prettier": "^4.0.0",
         "eslint-plugin-react": "^7.29.4",
         "eslint-plugin-react-hooks": "^4.3.0",
+        "eslint-plugin-unused-imports": "^2.0.0",
         "husky": "^7.0.4",
         "lint-staged": "^12.3.7",
         "prettier": "^2.6.0"
@@ -51,7 +52,8 @@
         "ci-docker-enterprise": "export NODE_ENV=ci && npm run remove-all-containers && docker-compose build && docker-compose --env-file=./docker-compose-enterprise-ci.env up -d",
         "ci-docker-saas": "export NODE_ENV=ci && npm run remove-all-containers && docker-compose build && docker-compose --env-file=./docker-compose-saas-ci.env up -d",
         "ci-docker-saas-init-script": "export NODE_ENV=ci && npm run remove-all-containers && docker-compose build init-script && docker compose --env-file=./docker-compose-saas-ci.env up -d init-script",
-        "ci-docker-enterprise-init-script": "export NODE_ENV=ci && npm run remove-all-containers && docker-compose build init-script && docker compose --env-file=./docker-compose-enterprise-ci.env up -d init-script"
+        "ci-docker-enterprise-init-script": "export NODE_ENV=ci && npm run remove-all-containers && docker-compose build init-script && docker compose --env-file=./docker-compose-enterprise-ci.env up -d init-script",
+        "prepare": "husky install"
     },
     "repository": {
         "type": "git",
@@ -63,20 +65,5 @@
     "bugs": {
         "url": "https://gitlab.com/oneuptime/app/issues"
     },
-    "homepage": "https://gitlab.com/oneuptime/app#readme",
-    "husky": {
-        "hooks": {
-            "pre-commit": "lint-staged"
-        }
-    },
-    "lint-staged": {
-        "./**/*.{json,yml,yaml,md}": [
-            "prettier --write --config .prettierrc.json",
-            "git add"
-        ],
-        "./**/*.{js}": [
-            "eslint -c .eslintrc.json --ignore-path .eslintignore --fix",
-            "git add"
-        ]
-    }
+    "homepage": "https://gitlab.com/oneuptime/app#readme"
 }
diff --git a/probe-api/api/probe.ts b/probe-api/api/probe.ts
index 31c72cbd96..dacdb40ba3 100755
--- a/probe-api/api/probe.ts
+++ b/probe-api/api/probe.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 import MonitorService from '../services/monitorService';
 const router = express.getRouter();
 import { isAuthorizedProbe } from '../middlewares/probeAuthorization';
diff --git a/probe-api/middlewares/probeAuthorization.ts b/probe-api/middlewares/probeAuthorization.ts
index 4701225588..444f9e655e 100755
--- a/probe-api/middlewares/probeAuthorization.ts
+++ b/probe-api/middlewares/probeAuthorization.ts
@@ -1,7 +1,7 @@
 import ProbeService from '../services/probeService';
 const sendErrorResponse = require('./response').sendErrorResponse;
 import ErrorService from '../services/errorService';
-import { Request, Response } from 'common-server/utils/express';
+import { Request, Response, NextFunction } from 'common-server/utils/express';
 import { clusterKey as CLUSTER_KEY } from '../utils/config';
 
 global.probes = {};
diff --git a/probe/index.ts b/probe/index.ts
index f2ac4ce96a..717ac12644 100755
--- a/probe/index.ts
+++ b/probe/index.ts
@@ -1,5 +1,3 @@
-const { NODE_ENV } = process.env;
-
 import asyncSleep from 'await-sleep';
 
 import 'common-server/utils/env';
@@ -14,7 +12,7 @@ const cronMinuteStartTime = Math.floor(Math.random() * 50);
 setTimeout(async () => {
     // keep monitoring in an infinate loop.
 
-    //eslint-disable-next-line
+    //eslint-disable-next-line no-constant-condition
     while (true) {
         try {
             await Main.runJob();
@@ -26,7 +24,6 @@ setTimeout(async () => {
     }
 }, cronMinuteStartTime * 1000);
 
-// eslint-disable-next-line no-console
-console.log(
+logger.info(
     `Probe with Probe Name ${config.probeName} and Probe Key ${config.probeKey}. OneUptime Probe API URL: ${config.probeApiUrl}`
 );
diff --git a/probe/utils/errorService.ts b/probe/utils/errorService.ts
index f7be060748..e142b99e91 100755
--- a/probe/utils/errorService.ts
+++ b/probe/utils/errorService.ts
@@ -1,10 +1,9 @@
 import winston from 'winston';
-
+import logger from 'common-server/utils/logger';
 export default {
     log: (functionName: $TSFixMe, error: $TSFixMe) => {
         error = error && error.message ? error.message : error;
-        //eslint-disable-next-line
-        console.error(error);
+        logger.error(error);
         winston.error(
             JSON.stringify(
                 {
diff --git a/realtime/api/realtime.ts b/realtime/api/realtime.ts
index 9c75e9cb4e..d3c0c1df7e 100644
--- a/realtime/api/realtime.ts
+++ b/realtime/api/realtime.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 const router = express.getRouter();
 import {
     sendErrorResponse,
diff --git a/realtime/index.ts b/realtime/index.ts
index de814892b6..3ceeb59d75 100644
--- a/realtime/index.ts
+++ b/realtime/index.ts
@@ -5,7 +5,7 @@ import express, {
     Response,
     NextFunction,
 } from 'common-server/utils/express';
-const app = express();
+const app = express.getExpressApp();
 
 import http from 'http';
 http.createServer(app);
@@ -74,7 +74,7 @@ io.sockets.on('connection', socket => {
 
 app.use(cors());
 
-app.use(function (req: Request, res: Response, next: NextFunction) {
+app.use((req: Request, res: Response, next: NextFunction) => {
     if (typeof req.body === 'string') {
         req.body = JSON.parse(req.body);
     }
@@ -114,7 +114,7 @@ app.set('port', process.env.PORT || 3300);
 
 http.listen(app.get('port'), function () {
     // eslint-disable-next-line
-    console.log('realtime server started on port ' + app.get('port'));
+    logger.info('realtime server started on port ' + app.get('port'));
 });
 
 export default app;
diff --git a/realtime/middlewares/serviceAuthorization.ts b/realtime/middlewares/serviceAuthorization.ts
index 4a70b8cf13..6912565c7d 100644
--- a/realtime/middlewares/serviceAuthorization.ts
+++ b/realtime/middlewares/serviceAuthorization.ts
@@ -1,6 +1,6 @@
 import ErrorService from '../services/errorService';
 import { clusterKey as CLUSTER_KEY } from '../utils/config';
-import { Request, Response } from 'common-server/utils/express';
+import { Request, Response, NextFunction } from 'common-server/utils/express';
 
 import { sendErrorResponse } from 'common-server/utils/response';
 
diff --git a/script-runner/api/script.ts b/script-runner/api/script.ts
index 77dc15a4ce..74735ea607 100644
--- a/script-runner/api/script.ts
+++ b/script-runner/api/script.ts
@@ -1,8 +1,4 @@
-import express, {
-    Request,
-    Response,
-    NextFunction,
-} from 'common-server/utils/express';
+import express, { Request, Response } from 'common-server/utils/express';
 
 import { sendErrorResponse, sendSuccessResponse } from '../utils/response';
 const router = express.getRouter();
diff --git a/script-runner/index.ts b/script-runner/index.ts
index d76a04e8f7..c9863d0daf 100644
--- a/script-runner/index.ts
+++ b/script-runner/index.ts
@@ -1,4 +1,3 @@
-const { NODE_ENV } = process.env;
 import 'common-server/utils/env';
 import 'common-server/utils/process';
 
@@ -7,7 +6,7 @@ import express, {
     Response,
     NextFunction,
 } from 'common-server/utils/express';
-const app = express();
+const app = express.getExpressApp();
 
 import http from 'http';
 http.createServer(app);
@@ -21,7 +20,7 @@ import main from './workers/main';
 
 app.use(cors());
 
-app.use(function (req: Request, res: Response, next: NextFunction) {
+app.use((req: Request, res: Response, next: NextFunction) => {
     if (typeof req.body === 'string') {
         req.body = JSON.parse(req.body);
     }
@@ -56,7 +55,7 @@ app.use('/script', require('./api/script'));
 
 http.listen(app.get('port'), function () {
     // eslint-disable-next-line
-    console.log('Script runner started on port ' + app.get('port'));
+    logger.info('Script runner started on port ' + app.get('port'));
 });
 const cronMinuteStartTime = Math.floor(Math.random() * 50);
 
diff --git a/script-runner/utils/scriptSandbox.ts b/script-runner/utils/scriptSandbox.ts
index 0326903415..de7ca60a8b 100644
--- a/script-runner/utils/scriptSandbox.ts
+++ b/script-runner/utils/scriptSandbox.ts
@@ -82,7 +82,7 @@ const run = async (
                 lastMessage = Date.now();
             });
             worker.on('exit', (exitCode: $TSFixMe) => {
-                // console.log('exitCode:::', exitCode);
+                // logger.info('exitCode:::', exitCode);
                 switch (exitCode) {
                     case 0:
                         resolve({
@@ -191,7 +191,7 @@ const run = async (
             console: 'redirect',
         });
 
-        vm.on('console.log', (log: $TSFixMe) => {
+        vm.on('logger.info', (log: $TSFixMe) => {
             parentPort.postMessage({
                 type: 'log',
                 payload: `[log]: ${
@@ -200,7 +200,7 @@ const run = async (
             });
         });
 
-        vm.on('console.error', (error: $TSFixMe) => {
+        vm.on('logger.error', (error: $TSFixMe) => {
             parentPort.postMessage({
                 type: 'log',
                 payload: `[error]: ${
diff --git a/status-page/index.ts b/status-page/index.ts
index 2423098ccb..4d84bbb932 100755
--- a/status-page/index.ts
+++ b/status-page/index.ts
@@ -3,8 +3,9 @@ import express, {
     Response,
     NextFunction,
 } from 'common-server/utils/express';
+import logger from 'common-server/utils/logger';
 import path from 'path';
-const app = express();
+const app = express.getExpressApp();
 
 import https from 'https';
 import http from 'http';
@@ -35,14 +36,12 @@ function getMongoClient() {
 const client = getMongoClient();
 (async function () {
     try {
-        // eslint-disable-next-line no-console
-        console.log('connecting to db');
+        logger.info('connecting to db');
         await client.connect();
-        // eslint-disable-next-line no-console
-        console.log('connected to db');
+
+        logger.info('connected to db');
     } catch (error) {
-        // eslint-disable-next-line no-console
-        console.log('connection error: ', error);
+        logger.info('connection error: ', error);
     }
 })();
 
@@ -178,7 +177,7 @@ async function handleCertificate(
     return certificate;
 }
 
-app.use('/', async function (req: Request, res: Response, next: $TSFixMe) {
+app.use('/', async function (req: Request, res: Response, next: NextFunction) {
     const host = req.hostname;
     if (
         host &&
@@ -213,8 +212,7 @@ app.use('/', async function (req: Request, res: Response, next: $TSFixMe) {
             return next();
         }
     } catch (error) {
-        // eslint-disable-next-line no-console
-        console.log('Error with fetch', error);
+        logger.info('Error with fetch', error);
         return next();
     }
 });
@@ -329,8 +327,7 @@ function countFreq(pat: $TSFixMe, txt: $TSFixMe) {
 (async function () {
     // create http server
     http.createServer(app).listen(3006, () =>
-        // eslint-disable-next-line no-console
-        console.log('Server running on port 3006')
+        logger.info('Server running on port 3006')
     );
 
     try {
@@ -500,13 +497,11 @@ function countFreq(pat: $TSFixMe, txt: $TSFixMe) {
         };
 
         https.createServer(options, app).listen(3007, () => {
-            // eslint-disable-next-line no-console
-            console.log('Server running on port 3007');
+            logger.info('Server running on port 3007');
         });
     } catch (e) {
-        // eslint-disable-next-line no-console
-        console.log('Unable to create HTTPS Server');
-        // eslint-disable-next-line no-console
-        console.log(e);
+        logger.info('Unable to create HTTPS Server');
+
+        logger.info(e);
     }
 })();
diff --git a/status-page/src/actions/status.ts b/status-page/src/actions/status.ts
index 556b4824af..05dc688128 100755
--- a/status-page/src/actions/status.ts
+++ b/status-page/src/actions/status.ts
@@ -861,7 +861,6 @@ export function fetchMonitorStatuses(
         dispatch(fetchMonitorStatusesRequest(monitorId));
 
         promise.then(
-            // eslint-disable-next-line no-unused-vars
             function (monitorStatuses) {
                 dispatch(
                     fetchMonitorStatusesSuccess({
diff --git a/status-page/src/components/MonitorInfo.tsx b/status-page/src/components/MonitorInfo.tsx
index 65d52b5243..6ebb755e22 100755
--- a/status-page/src/components/MonitorInfo.tsx
+++ b/status-page/src/components/MonitorInfo.tsx
@@ -12,10 +12,10 @@ import ShouldRender from './ShouldRender';
 
 function debounce(this: $TSFixMe, fn: $TSFixMe, ms: $TSFixMe) {
     let timer: $TSFixMe;
-    // eslint-disable-next-line no-unused-vars
+
     return (_: $TSFixMe) => {
         clearTimeout(timer);
-        // eslint-disable-next-line no-unused-vars
+
         timer = setTimeout(_ => {
             timer = null;
             fn.apply(this, arguments);
@@ -91,15 +91,15 @@ class MonitorInfo extends Component {
         const prevProbe =
             prevProps.probes && prevProps.probes.length > 0
                 ? prevProps.probes[
-                      prevProps.probes.length < 2 ? 0 : activeProbe
-                  ]
+                prevProps.probes.length < 2 ? 0 : activeProbe
+                ]
                 : null;
 
         if (
             prevProbe?._id !== currentProbe?._id ||
             JSON.stringify(prevProps.monitorStatus) !==
-                // @ts-expect-error ts-migrate(2339) FIXME: Property 'monitorStatus' does not exist on type 'R... Remove this comment to see the full error message
-                JSON.stringify(this.props.monitorStatus) ||
+            // @ts-expect-error ts-migrate(2339) FIXME: Property 'monitorStatus' does not exist on type 'R... Remove this comment to see the full error message
+            JSON.stringify(this.props.monitorStatus) ||
             prevProps.range !== range
         ) {
             // @ts-expect-error ts-migrate(2339) FIXME: Property 'theme' does not exist on type 'Readonly<... Remove this comment to see the full error message
@@ -116,9 +116,9 @@ class MonitorInfo extends Component {
                 currentProbe =
                     probes && probes.length > 0
                         ? probes.filter(
-                              (probe: $TSFixMe) => String(probe._id) ===
-                              String(monitorData.statuses[0]._id)
-                          )[0]
+                            (probe: $TSFixMe) => String(probe._id) ===
+                                String(monitorData.statuses[0]._id)
+                        )[0]
                         : null;
             }
 
@@ -190,8 +190,8 @@ class MonitorInfo extends Component {
         return status === 'online'
             ? onlineText
             : status === 'degraded'
-            ? degradedText
-            : offlineText;
+                ? degradedText
+                : offlineText;
     };
 
     checkOngoingEventMonitor = (events: $TSFixMe) => {
@@ -415,28 +415,28 @@ class MonitorInfo extends Component {
                                         (this.props.ongoing &&
                                             // @ts-expect-error ts-migrate(2339) FIXME: Property 'ongoing' does not exist on type 'Readonl... Remove this comment to see the full error message
                                             this.props.ongoing.length > 0) ||
-                                        // @ts-expect-error ts-migrate(2339) FIXME: Property 'font' does not exist on type '{ display:... Remove this comment to see the full error message
-                                        status.font === 'rgba(255, 222, 36, 1)'
+                                            // @ts-expect-error ts-migrate(2339) FIXME: Property 'font' does not exist on type '{ display:... Remove this comment to see the full error message
+                                            status.font === 'rgba(255, 222, 36, 1)'
                                             ? '#e39f48'
                                             // @ts-expect-error ts-migrate(2339) FIXME: Property 'font' does not exist on type '{ display:... Remove this comment to see the full error message
                                             : status.font ===
-                                              'rgba(108, 219, 86, 1)'
-                                            ? '#49c3b1'
-                                            // @ts-expect-error ts-migrate(2339) FIXME: Property 'font' does not exist on type '{ display:... Remove this comment to see the full error message
-                                            : status.font ===
-                                              'rgba(250, 109, 70, 1)'
-                                            ? '#FA6D46'
-                                            // @ts-expect-error ts-migrate(2339) FIXME: Property 'font' does not exist on type '{ display:... Remove this comment to see the full error message
-                                            : status.font,
+                                                'rgba(108, 219, 86, 1)'
+                                                ? '#49c3b1'
+                                                // @ts-expect-error ts-migrate(2339) FIXME: Property 'font' does not exist on type '{ display:... Remove this comment to see the full error message
+                                                : status.font ===
+                                                    'rgba(250, 109, 70, 1)'
+                                                    ? '#FA6D46'
+                                                    // @ts-expect-error ts-migrate(2339) FIXME: Property 'font' does not exist on type '{ display:... Remove this comment to see the full error message
+                                                    : status.font,
                                     textTransform: 'capitalize',
                                 }}
                             >
                                 // @ts-expect-error ts-migrate(2339) FIXME: Property 'ongoing' does not exist on type 'Readonl... Remove this comment to see the full error message
                                 {this.props.ongoing &&
-                                this.checkOngoingEventMonitor(
-                                    // @ts-expect-error ts-migrate(2339) FIXME: Property 'ongoing' does not exist on type 'Readonl... Remove this comment to see the full error message
-                                    this.props.ongoing
-                                )
+                                    this.checkOngoingEventMonitor(
+                                        // @ts-expect-error ts-migrate(2339) FIXME: Property 'ongoing' does not exist on type 'Readonl... Remove this comment to see the full error message
+                                        this.props.ongoing
+                                    )
                                     ? 'Ongoing Scheduled Event'
                                     : this.handleMonitorStatus(monitorStatus)}
                             </div>
@@ -489,7 +489,7 @@ class MonitorInfo extends Component {
                                         style={
                                             // @ts-expect-error ts-migrate(2339) FIXME: Property 'color' does not exist on type '{}'.
                                             subheading.color ===
-                                            'rgba(76, 76, 76, 1)'
+                                                'rgba(76, 76, 76, 1)'
                                                 ? { color: '#aaaaaa' }
                                                 : subheading
                                         }
@@ -500,7 +500,7 @@ class MonitorInfo extends Component {
                                         style={
                                             // @ts-expect-error ts-migrate(2339) FIXME: Property 'color' does not exist on type '{}'.
                                             subheading.color ===
-                                            'rgba(76, 76, 76, 1)'
+                                                'rgba(76, 76, 76, 1)'
                                                 ? { color: '#aaaaaa' }
                                                 : subheading
                                         }
@@ -518,10 +518,10 @@ class MonitorInfo extends Component {
                                                 style={
                                                     // @ts-expect-error ts-migrate(2339) FIXME: Property 'color' does not exist on type '{}'.
                                                     subheading.color ===
-                                                    'rgba(76, 76, 76, 1)'
+                                                        'rgba(76, 76, 76, 1)'
                                                         ? {
-                                                              color: '#aaaaaa',
-                                                          }
+                                                            color: '#aaaaaa',
+                                                        }
                                                         : subheading
                                                 }
                                             >
@@ -532,10 +532,10 @@ class MonitorInfo extends Component {
                                                 style={
                                                     // @ts-expect-error ts-migrate(2339) FIXME: Property 'color' does not exist on type '{}'.
                                                     subheading.color ===
-                                                    'rgba(76, 76, 76, 1)'
+                                                        'rgba(76, 76, 76, 1)'
                                                         ? {
-                                                              color: '#aaaaaa',
-                                                          }
+                                                            color: '#aaaaaa',
+                                                        }
                                                         : subheading
                                                 }
                                             >
@@ -548,7 +548,7 @@ class MonitorInfo extends Component {
                                         style={
                                             // @ts-expect-error ts-migrate(2339) FIXME: Property 'color' does not exist on type '{}'.
                                             subheading.color ===
-                                            'rgba(76, 76, 76, 1)'
+                                                'rgba(76, 76, 76, 1)'
                                                 ? { color: '#aaaaaa' }
                                                 : subheading
                                         }
@@ -563,7 +563,7 @@ class MonitorInfo extends Component {
                                         style={
                                             // @ts-expect-error ts-migrate(2339) FIXME: Property 'color' does not exist on type '{}'.
                                             subheading.color ===
-                                            'rgba(76, 76, 76, 1)'
+                                                'rgba(76, 76, 76, 1)'
                                                 ? { color: '#aaaaaa' }
                                                 : subheading
                                         }
diff --git a/tests/saas-tests/dashboard/StatusPage3.test.ts b/tests/saas-tests/dashboard/StatusPage3.test.ts
index 8139288fd5..1559330871 100644
--- a/tests/saas-tests/dashboard/StatusPage3.test.ts
+++ b/tests/saas-tests/dashboard/StatusPage3.test.ts
@@ -112,7 +112,7 @@ describe('Status Page', () => {
     test(
         'should create custom Javascript',
         async (done: $TSFixMe) => {
-            const javascript = `console.log('this is a js code');`;
+            const javascript = `logger.info('this is a js code');`;
             await gotoTheFirstStatusPage(page);
             await page.waitForNavigation({ waitUntil: 'load' });
 
diff --git a/types/tsfixme.d.ts b/types/tsfixme.d.ts
index 55422c7650..6f65a3bb2f 100644
--- a/types/tsfixme.d.ts
+++ b/types/tsfixme.d.ts
@@ -1,3 +1,3 @@
-/*eslint-disable no-unused-vars*/
-type $TSFixMe = any;
-type $TSFixMeFunction = (...args: any[]) => any;
+export type $TSFixMe = any;
+//eslint-disable-next-line unused-imports/no-unused-vars
+export type $TSFixMeFunction = (...args: any[]) => any;
diff --git a/zapier/triggers/resolved.ts b/zapier/triggers/resolved.ts
index 998a94a3f0..673ca6a584 100755
--- a/zapier/triggers/resolved.ts
+++ b/zapier/triggers/resolved.ts
@@ -14,7 +14,7 @@ const fallbackHook = (z: $TSFixMe, bundle: $TSFixMe) => {
 };
 
 const subscribeHook = (z: $TSFixMe, bundle: $TSFixMe) => {
-    z.console.log(bundle);
+    z.logger.info(bundle);
 
     // bundle.targetUrl has the Hook URL this app should call when an incident is resolved.
     const data = {