Merge branch 'master' of github.com-simon:OneUptime/oneuptime

Monitor groups

.dockerignore

@@ -6,6 +6,7 @@ node_modules
 # dependencies
 /node_modules
 node_modules
+**/node_modules
 
 .idea
 # testing
@@ -53,4 +54,7 @@ tests/coverage
 
 settings.json
 
-GoSDK/tester/
+GoSDK/tester/
+
+Llama/Models/*
+

.eslintrc.json

@@ -45,7 +45,8 @@
         "workbox": true,
         "importScripts": true,
         "$TSFixMe": true,
-        "NodeJS": true
+        "NodeJS": true,
+        "JSX": true
     },
     "parser": "@typescript-eslint/parser",
     "rules": {
@@ -86,10 +87,11 @@
           ],
         // https://www.npmjs.com/package/eslint-plugin-unused-imports
         "no-unused-vars": "off",
-        "@typescript-eslint/no-unused-vars": "off",
+        "@typescript-eslint/no-unused-vars": ["error", {"argsIgnorePattern": "^_"}],
         "@typescript-eslint/no-extra-non-null-assertion": "error",
         "@typescript-eslint/no-floating-promises":"error",
         "@typescript-eslint/await-thenable":"error",
+        "@typescript-eslint/no-non-null-asserted-optional-chain": "error",
         "unused-imports/no-unused-imports": "error",
         "unused-imports/no-unused-vars": [
             "error",
@@ -177,11 +179,13 @@
                 "ignoreReadBeforeAssign": false
             }
         ],
-        "no-var": "error"
+        "no-var": "error",
+        "object-curly-spacing": ["error", "always"],
+        "no-unneeded-ternary": "error"
     },
     "settings": {
         "react": {
             "version": "18.1.0"
         }
     }
-}
+}

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,8 +1,8 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: ''
-labels: ''
+title: 'Bug: <Title of the issue>'
+labels: 'bug'
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,8 +1,8 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
-title: ''
-labels: ''
+title: 'Enhancement: <Title of the issue>'
+labels: 'enhancement'
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/request-for-test.md

@@ -1,7 +1,7 @@
 ---
 name: Request for Test
 about: 'Request more tests for product code in the platform. '
-title: Tests for [FIleName]
+title: Tests for [FileName]
 labels: 'write tests'
 assignees: ''
 

.github/pull_request_template.md

@@ -7,7 +7,7 @@
 - [ ] Please make sure all jobs pass before requesting a review. 
 - [ ] Put `closes #XXXX` in your comment to auto-close the issue that your PR fixes (if such).
 - [ ] Have you lint your code locally before submission?
-- [ ] Did you write tests where appropiate?
+- [ ] Did you write tests where appropriate?
 
 ### Related Issue?
 

.github/workflows/codeql-analysis.yml

@@ -40,7 +40,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/common-jobs.yaml

@@ -8,7 +8,21 @@ on:
       - 'release'
 
 jobs:
-  lint:
+  helm-lint:
+    runs-on: ubuntu-latest
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v2
+      - name: Install Helm
+        run: |
+          curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash
+      - name: Lint Helm Chart 
+        run: |
+          helm lint ./HelmChart/Public/oneuptime
+          
+  js-lint:
     runs-on: ubuntu-latest
     env:
       CI_PIPELINE_ID: ${{github.run_number}}

.github/workflows/compile.yml

@@ -39,6 +39,20 @@ jobs:
       - run: cd CommonServer && npm install
       - run: cd ApiReference && npm install && npm run compile
 
+  compile-link-shortener:
+    runs-on: ubuntu-latest
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 18.3.0
+      - run: cd Common && npm install
+      - run: cd Model && npm install
+      - run: cd CommonServer && npm install
+      - run: cd LinkShortener && npm install && npm run compile
+
   compile-common-server:
     runs-on: ubuntu-latest
     env:
@@ -91,6 +105,22 @@ jobs:
       - run: cd CommonServer && npm install
       - run: cd CommonUI && npm install --force
       - run: cd DashboardAPI && npm install && npm run compile
+  
+
+  compile-admin-dashboard:
+    runs-on: ubuntu-latest
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 18.3.0
+      - run: cd Common && npm install
+      - run: cd Model && npm install
+      - run: cd CommonServer && npm install
+      - run: cd CommonUI && npm install --force
+      - run: cd AdminDashboard && npm install && npm run compile
 
   compile-dashboard:
     runs-on: ubuntu-latest
@@ -121,20 +151,6 @@ jobs:
       - run: cd CommonServer && npm install
       - run: cd File && npm install && npm run compile
 
-  compile-helm-chart:
-    runs-on: ubuntu-latest
-    env:
-      CI_PIPELINE_ID: ${{github.run_number}}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-      - run: cd Common && npm install
-      - run: cd Model && npm install
-      - run: cd CommonServer && npm install
-      - run: cd HelmChart && npm install && npm run compile
-
   compile-home:
     runs-on: ubuntu-latest
     env:
@@ -177,20 +193,6 @@ jobs:
       - run: cd CommonServer && npm install
       - run: cd Integration && npm install && npm run compile
 
-  compile-licensing:
-    runs-on: ubuntu-latest
-    env:
-      CI_PIPELINE_ID: ${{github.run_number}}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-      - run: cd Common && npm install
-      - run: cd Model && npm install
-      - run: cd CommonServer && npm install
-      - run: cd Licensing && npm install && npm run compile
-
   compile-notification:
     runs-on: ubuntu-latest
     env:
@@ -232,7 +234,7 @@ jobs:
       - run: cd CommonServer && npm install
       - run: cd Probe && npm install && npm run compile
 
-  compile-probe-api:
+  compile-ingestor:
     runs-on: ubuntu-latest
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
@@ -244,7 +246,7 @@ jobs:
       - run: cd Common && npm install
       - run: cd Model && npm install
       - run: cd CommonServer && npm install
-      - run: cd ProbeAPI && npm install && npm run compile
+      - run: cd Ingestor && npm install && npm run compile
   
 
   compile-realtime:

.github/workflows/docker-build.yml

@@ -25,6 +25,36 @@ jobs:
       - name: build docker image
         run: sudo docker build -f ./Accounts/Dockerfile .
 
+  docker-build-link-shortener:
+    runs-on: ubuntu-latest
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+    steps:
+      - name: Checkout 
+        uses: actions/checkout@v2
+
+      - name: Preinstall 
+        run: npm run prerun
+      
+      # build image for accounts service
+      - name: build docker image
+        run: sudo docker build -f ./LinkShortener/Dockerfile .
+
+  docker-build-otel-collector:
+    runs-on: ubuntu-latest
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+    steps:
+      - name: Checkout 
+        uses: actions/checkout@v2
+
+      - name: Preinstall 
+        run: npm run prerun
+      
+      # build image for accounts service
+      - name: build docker image
+        run: sudo docker build -f ./OTelCollector/Dockerfile .
+
   docker-build-api-reference:
     runs-on: ubuntu-latest
     env:
@@ -56,6 +86,21 @@ jobs:
       - name: build docker image
         run: sudo docker build -f ./DashboardAPI/Dockerfile .
 
+  docker-build-admin-dashboard:
+    runs-on: ubuntu-latest
+    env:
+      CI_PIPELINE_ID: ${{github.run_number}}
+    steps:
+      - name: Checkout 
+        uses: actions/checkout@v2
+
+      - name: Preinstall 
+        run: npm run prerun
+
+      # build image for home
+      - name: build docker image
+        run: sudo docker build -f ./AdminDashboard/Dockerfile .
+
   docker-build-dashboard:
     runs-on: ubuntu-latest
     env:
@@ -101,20 +146,6 @@ jobs:
       - name: build docker image
         run: sudo docker build -f ./Haraka/Dockerfile .
 
-  docker-build-helm-chart:
-    runs-on: ubuntu-latest
-    env:
-      CI_PIPELINE_ID: ${{github.run_number}}
-    steps:
-      - name: Checkout 
-        uses: actions/checkout@v2
-
-      - name: Preinstall 
-        run: npm run prerun
-        
-      # build image for home
-      - name: build docker image
-        run: sudo docker build -f ./HelmChart/Dockerfile .
 
   docker-build-home:
     runs-on: ubuntu-latest
@@ -157,24 +188,10 @@ jobs:
       - name: Preinstall 
         run: npm run prerun
         
-      # build image for licensing
+      # build image for integrations
       - name: build docker image
         run: sudo docker build -f ./Integration/Dockerfile .
 
-  docker-build-licensing:
-    runs-on: ubuntu-latest
-    env:
-      CI_PIPELINE_ID: ${{github.run_number}}
-    steps:
-      - name: Checkout 
-        uses: actions/checkout@v2
-      
-      - name: Preinstall 
-        run: npm run prerun
-
-      # build image for licensing
-      - name: build docker image
-        run: sudo docker build -f ./Licensing/Dockerfile .
 
   docker-build-notification:
     runs-on: ubuntu-latest
@@ -191,20 +208,6 @@ jobs:
       - name: build docker image
         run: sudo docker build -f ./Notification/Dockerfile .
 
-  docker-build-nginx:
-    runs-on: ubuntu-latest
-    env:
-      CI_PIPELINE_ID: ${{github.run_number}}
-    steps:
-      - name: Checkout 
-        uses: actions/checkout@v2
-      
-      - name: Preinstall 
-        run: npm run prerun
-
-      # build image for mail service
-      - name: build docker image
-        run: sudo docker build -f ./Nginx/Dockerfile ./Nginx
 
   docker-build-probe:
     runs-on: ubuntu-latest
@@ -221,7 +224,7 @@ jobs:
       - name: build docker image
         run: sudo docker build -f ./Probe/Dockerfile .
 
-  docker-build-probe-api:
+  docker-build-ingestor:
     runs-on: ubuntu-latest
     env:
       CI_PIPELINE_ID: ${{github.run_number}}
@@ -234,7 +237,7 @@ jobs:
         
       # build image probe api
       - name: build docker image
-        run: sudo docker build -f ./ProbeAPI/Dockerfile .
+        run: sudo docker build -f ./Ingestor/Dockerfile .
 
   docker-build-realtime:
     runs-on: ubuntu-latest

.github/workflows/playwright.yml.skip

@@ -11,7 +11,7 @@ jobs:
     env:
       BASE_URL: http://localhost
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: actions/setup-node@v3
       with:
         node-version: 16

.github/workflows/test-release.yml

@@ -1,442 +0,0 @@
-name: Test Image Deploy to DockerHub
-
-on:
-  push:
-    branches:
-      - "master"
-
-jobs:
-
-  generate-build-number:
-    runs-on: ubuntu-latest
-    outputs:
-      build_number: ${{ steps.buildnumber.outputs.build_number }}
-    steps:
-    - name: Generate build number
-      id: buildnumber
-      uses: onyxmueller/build-tag-number@v1.0.2
-      with:
-        token: ${{secrets.github_token}}
-    - run: echo "Build number is ${{ steps.buildnumber.outputs.build_number }}"
-
-  test-server-test-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: "7.0.${{needs.generate-build-number.outputs.build_number}}"
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-     
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy accounts.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/test-server:$ONEUPTIME_VERSION-test --tag oneuptime/test-server:test --push -f ./TestServer/Dockerfile .
-
-  workflow-test-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: "7.0.${{needs.generate-build-number.outputs.build_number}}"
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-     
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy accounts.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/workflow:$ONEUPTIME_VERSION-test --tag oneuptime/workflow:test --push -f ./Workflow/Dockerfile .
-
-  workers-test-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: "7.0.${{needs.generate-build-number.outputs.build_number}}"
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-     
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy workers.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/workers:$ONEUPTIME_VERSION-test --tag oneuptime/workers:test --push -f ./Workers/Dockerfile .
-
-  status-page-test-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: "7.0.${{needs.generate-build-number.outputs.build_number}}"
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-     
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy status-page.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/status-page:$ONEUPTIME_VERSION-test --tag oneuptime/status-page:test --push -f ./StatusPage/Dockerfile .
-
-  realtime-test-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: "7.0.${{needs.generate-build-number.outputs.build_number}}"
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-     
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy realtime.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/realtime:$ONEUPTIME_VERSION-test --tag oneuptime/realtime:test --push -f ./Realtime/Dockerfile .
-      
-
-  probe-test-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: "7.0.${{needs.generate-build-number.outputs.build_number}}"
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-     
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy probe-api.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/probe:$ONEUPTIME_VERSION-test --tag oneuptime/probe:test --push -f ./Probe/Dockerfile .
-
-  probe-api-test-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: "7.0.${{needs.generate-build-number.outputs.build_number}}"
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-     
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy probe-api.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/probe-api:$ONEUPTIME_VERSION-test --tag oneuptime/probe-api:test --push -f ./ProbeAPI/Dockerfile .
-
-  nginx-test-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: "7.0.${{needs.generate-build-number.outputs.build_number}}"
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-     
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy accounts.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/nginx:$ONEUPTIME_VERSION-test --tag oneuptime/nginx:test --push -f ./Nginx/Dockerfile .
-      
-
-  notification-test-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: "7.0.${{needs.generate-build-number.outputs.build_number}}"
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy accounts.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/notification:$ONEUPTIME_VERSION-test --tag oneuptime/notification:test --push -f ./Notification/Dockerfile .
-      
-
-  licensing-test-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: "7.0.${{needs.generate-build-number.outputs.build_number}}"
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-     
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy accounts.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/licensing:$ONEUPTIME_VERSION-test --tag oneuptime/licensing:test --push -f ./Licensing/Dockerfile .
-
-  integrations-test-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: "7.0.${{needs.generate-build-number.outputs.build_number}}"
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-     
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy accounts.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/integrations:$ONEUPTIME_VERSION-test --tag oneuptime/integrations:test --push -f ./Integration/Dockerfile .
-      
-      
-
-
-  identity-test-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: "7.0.${{needs.generate-build-number.outputs.build_number}}"
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-     
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy accounts.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/identity:$ONEUPTIME_VERSION-test --tag oneuptime/identity:test --push -f ./Identity/Dockerfile .
-      
-
-  home-test-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: "7.0.${{needs.generate-build-number.outputs.build_number}}"
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-     
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy accounts.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/home:$ONEUPTIME_VERSION-test --tag oneuptime/home:test --push -f ./Home/Dockerfile .
-      
-
-  helm-chart-test-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: "7.0.${{needs.generate-build-number.outputs.build_number}}"
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-     
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy accounts.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/helm-chart:$ONEUPTIME_VERSION-test --tag oneuptime/helm-chart:test --push -f ./HelmChart/Dockerfile .
-      
-
-  haraka-test-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: "7.0.${{needs.generate-build-number.outputs.build_number}}"
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-     
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy accounts.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/haraka:$ONEUPTIME_VERSION-test --tag oneuptime/haraka:test --push -f ./Haraka/Dockerfile .
-
-  file-test-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: "7.0.${{needs.generate-build-number.outputs.build_number}}"
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy file.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/file:$ONEUPTIME_VERSION-test --tag oneuptime/file:test --push -f ./File/Dockerfile .
-      
-      
-
-  dashboard-test-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: "7.0.${{needs.generate-build-number.outputs.build_number}}"
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-     
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy dashboard-api.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/dashboard:$ONEUPTIME_VERSION-test --tag oneuptime/dashboard:test --push -f ./Dashboard/Dockerfile .
-      
-      
-
-
-  dashboard-api-test-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: "7.0.${{needs.generate-build-number.outputs.build_number}}"
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-     
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy dashboard-api.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/dashboard-api:$ONEUPTIME_VERSION-test --tag oneuptime/dashboard-api:test --push -f ./DashboardAPI/Dockerfile .
-      
-      
-
-
-  api-reference-test-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: "7.0.${{needs.generate-build-number.outputs.build_number}}"
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-     
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy api-reference.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/api-reference:$ONEUPTIME_VERSION-test --tag oneuptime/api-reference:test --push -f ./ApiReference/Dockerfile .
-      
-      
-      
-      
-
-
-  accounts-test-docker-image-deploy:
-    needs: generate-build-number
-    runs-on: ubuntu-latest
-    env:
-      DOCKERHUB_PASSWORD: ${{secrets.DOCKERHUB_PASSWORD}}
-      DOCKERHUB_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
-      ONEUPTIME_VERSION: "7.0.${{needs.generate-build-number.outputs.build_number}}"
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 18.3.0
-     
-      - run: npm run prerun
-      - run: sudo docker run --rm --privileged docker/binfmt:820fdd95a9972a5308930a2bdfb8573dd4447ad3
-        # Build and deploy accounts.
-      - run: sudo docker login --username $DOCKERHUB_USERNAME --password $DOCKERHUB_PASSWORD
-      - run: sudo docker buildx create --use
-      - run: sudo docker buildx build --platform linux/amd64,linux/arm64 --tag oneuptime/accounts:$ONEUPTIME_VERSION-test --tag oneuptime/accounts:test --push -f ./Accounts/Dockerfile .
-      
-      

.github/workflows/test.common-server.yaml

@@ -20,4 +20,4 @@ jobs:
       - run: cd Common && npm install
       - run: cd Model && npm install
       - run: cd CommonServer && bash test-setup.sh
-      - run: cd CommonServer && npm install && npm run test
+      - run: export $(grep -v '^#' config.env | xargs) && cd CommonServer && npm install && npm run test

.github/workflows/test.ingestor.yaml

@@ -1,4 +1,4 @@
-name: Probe Api Test
+name: Ingestor Test
 
 on:
   pull_request: 
@@ -17,5 +17,5 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: 18.3.0
-      - run: cd ProbeAPI && npm install && npm run test
+      - run: cd Ingestor && npm install && npm run test
   

.gitignore

@@ -69,12 +69,10 @@ secret.env
 config.env
 config.env.tmp
 config.env.temp
-docker-compose.yml
 logs.txt
 
 */Cert.crt
 */Key.key
-Nginx/default.conf
 
 Certs/StatusPageCerts/*.crt
 Certs/StatusPageCerts/*.key
@@ -85,3 +83,17 @@ Certs/ServerCerts/*.key
 Backups/*.backup
 Backups/*.sql
 Backups/*.tar
+
+.env
+
+Haraka/dkim/keys/private_base64.txt
+Haraka/dkim/keys/public_base64.txt
+
+.eslintcache
+
+HelmChart/Values/*.values.yaml
+
+Llama/Models/tokenizer*
+Llama/Models/llama*
+
+Llama/__pycache__/*

.vscode/launch.json

@@ -41,6 +41,34 @@
             "restart": true,
             "autoAttachChildProcesses": true
         },
+        {
+            "address": "127.0.0.1",
+            "localRoot": "${workspaceFolder}/ApiReference",
+            "name": "API Reference: Debug with Docker",
+            "port": 9178,
+            "remoteRoot": "/usr/src/app",
+            "request": "attach",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "type": "node",
+            "restart": true,
+            "autoAttachChildProcesses": true
+        },
+        {
+            "address": "127.0.0.1",
+            "localRoot": "${workspaceFolder}/LinkShortener",
+            "name": "Link Shortener: Debug with Docker",
+            "port": 9826,
+            "remoteRoot": "/usr/src/app",
+            "request": "attach",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "type": "node",
+            "restart": true,
+            "autoAttachChildProcesses": true
+        },
         {
             "address": "127.0.0.1",
             "localRoot": "${workspaceFolder}/TestServer",
@@ -58,7 +86,7 @@
         {
             "address": "127.0.0.1",
             "localRoot": "${workspaceFolder}/Probe",
-            "name": "Dashboard API: Debug with Docker",
+            "name": "Probe: Debug with Docker",
             "port": 9655,
             "remoteRoot": "/usr/src/app",
             "request": "attach",
@@ -71,8 +99,8 @@
         },
         {
             "address": "127.0.0.1",
-            "localRoot": "${workspaceFolder}/ProbeAPI",
-            "name": "Probe API: Debug with Docker",
+            "localRoot": "${workspaceFolder}/Ingestor",
+            "name": "Ingestor: Debug with Docker",
             "port": 9932,
             "remoteRoot": "/usr/src/app",
             "request": "attach",
@@ -97,20 +125,6 @@
             "restart": true,
             "autoAttachChildProcesses": true
         },
-        {
-            "address": "127.0.0.1",
-            "localRoot": "${workspaceFolder}/data-ingestor",
-            "name": "Data Ingestor: Debug with Docker",
-            "port": 9338,
-            "remoteRoot": "/usr/src/app",
-            "request": "attach",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
-            "type": "node",
-            "restart": true,
-            "autoAttachChildProcesses": true
-        },
         {
             "address": "127.0.0.1",
             "localRoot": "${workspaceFolder}/Notification",
@@ -169,7 +183,7 @@
         },
         {
             "address": "127.0.0.1",
-            "localRoot": "${workspaceFolder}/ProbeAPI",
+            "localRoot": "${workspaceFolder}/Ingestor",
             "name": "Probe API: Debug with Docker",
             "port": 9251,
             "remoteRoot": "/usr/src/app",
@@ -307,20 +321,6 @@
             "restart": true,
             "autoAttachChildProcesses": true
         },
-        {
-            "address": "127.0.0.1",
-            "localRoot": "${workspaceFolder}/probe",
-            "name": "Probe: Debug with Docker",
-            "port": 9238,
-            "remoteRoot": "/usr/src/app",
-            "request": "attach",
-            "skipFiles": [
-                "<node_internals>/**"
-            ],
-            "type": "node",
-            "restart": true,
-            "autoAttachChildProcesses": true
-        },
         {
             "name": "CommonServer: Debug Tests",
             "type": "node",

Accounts/.env

@@ -1 +0,0 @@
-PORT=3003

Accounts/.env.tpl

@@ -1 +0,0 @@
-PORT={{ .Env.ACCOUNTS_PORT }}

Accounts/Dockerfile.tpl

@@ -3,13 +3,20 @@
 #
 
 # Pull base image nodejs image.
-FROM node:18.13.0-alpine
+FROM node:current-alpine
 USER root
 RUN mkdir /tmp/npm &&  chmod 2777 /tmp/npm && chown 1000:1000 /tmp/npm && npm config set cache /tmp/npm --global
 
 
+ARG GIT_SHA
+ARG APP_VERSION
+
+ENV GIT_SHA=${GIT_SHA}
+ENV APP_VERSION=${APP_VERSION}
+
+
 # Install bash. 
-RUN apk update && apk add bash && apk add curl
+RUN apk add bash && apk add curl
 
 #Use bash shell by default
 SHELL ["/bin/bash", "-c"]
@@ -17,8 +24,6 @@ SHELL ["/bin/bash", "-c"]
 
 RUN mkdir /usr/src
 
-# Install common
-RUN mkdir /usr/src/Common
 WORKDIR /usr/src/Common
 COPY ./Common/package*.json /usr/src/Common/
 RUN npm install
@@ -26,8 +31,6 @@ COPY ./Common /usr/src/Common
 
 
 
-# Install Model
-RUN mkdir /usr/src/Model
 WORKDIR /usr/src/Model
 COPY ./Model/package*.json /usr/src/Model/
 RUN npm install
@@ -35,8 +38,6 @@ COPY ./Model /usr/src/Model
 
 
 
-# Install CommonServer
-RUN mkdir /usr/src/CommonServer
 WORKDIR /usr/src/CommonServer
 COPY ./CommonServer/package*.json /usr/src/CommonServer/
 RUN npm install
@@ -46,7 +47,7 @@ COPY ./CommonServer /usr/src/CommonServer
 
 
 # Install CommonUI
-RUN mkdir /usr/src/CommonUI
+
 WORKDIR /usr/src/CommonUI
 COPY ./CommonUI/package*.json /usr/src/CommonUI/
 RUN npm install --force
@@ -54,12 +55,10 @@ COPY ./CommonUI /usr/src/CommonUI
 
 
 
-#SET ENV Variables
+
 ENV PRODUCTION=true
 ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
 
-RUN mkdir /usr/src/app
-
 WORKDIR /usr/src/app
 
 # Install app dependencies
@@ -73,6 +72,8 @@ EXPOSE 3003
 
 
 {{ if eq .Env.ENVIRONMENT "development" }}
+RUN mkdir /usr/src/app/dev-env
+RUN touch /usr/src/app/dev-env/.env
 #Run the app
 CMD [ "npm", "run", "dev" ]
 {{ else }}

Accounts/Serve.ts

@@ -7,16 +7,21 @@ export const APP_NAME: string = 'accounts';
 
 const app: ExpressApplication = Express.getExpressApp();
 
-const init: Function = async (): Promise<void> => {
+const init: () => Promise<void> = async (): Promise<void> => {
     try {
         // init the app
         await App(APP_NAME, undefined, true);
     } catch (err) {
         logger.error('App Init Failed:');
         logger.error(err);
+        throw err;
     }
 };
 
-init();
+init().catch((err: Error) => {
+    logger.error(err);
+    logger.info('Exiting node process');
+    process.exit(1);
+});
 
 export default app;

Accounts/dev-env/README.md

@@ -0,0 +1 @@
+This is where env will be stored for the dev environment. This is where you will find the .env file when you exec into the container.

Accounts/nodemon.json

@@ -1,4 +1,4 @@
 {
     "watch": ["webpack.config.js"],
-    "exec": "export DEBUG=express:* && webpack-dev-server --port=3003 --mode=development"
+    "exec": "export DEBUG=express:* && printenv > /usr/src/app/dev-env/.env && echo 'HOST=localhost' >> /usr/src/app/dev-env/.env && echo 'USE_HTTPS=false' >> /usr/src/app/dev-env/.env && webpack-dev-server --port=3003 --mode=development"
 }

Accounts/package-lock.json

@@ -7,7 +7,6 @@
         "": {
             "name": "accounts",
             "version": "0.1.0",
-            "hasInstallScript": true,
             "dependencies": {
                 "Common": "file:../Common",
                 "CommonServer": "file:../CommonServer",
@@ -21,7 +20,8 @@
                 "react-router-dom": "^6.3.0",
                 "react-scripts": "5.0.1",
                 "the-new-css-reset": "^1.7.3",
-                "typescript": "^4.6.4"
+                "typescript": "^4.6.4",
+                "use-async-effect": "^2.2.7"
             },
             "devDependencies": {
                 "@testing-library/jest-dom": "^5.16.4",
@@ -57,11 +57,12 @@
                 "@types/uuid": "^8.3.4",
                 "axios": "^0.26.1",
                 "crypto-js": "^4.1.1",
+                "json5": "^2.2.3",
                 "moment": "^2.29.2",
                 "moment-timezone": "^0.5.40",
                 "nanoid": "^3.3.2",
                 "nanoid-dictionary": "^4.3.0",
-                "posthog-js": "^1.37.0",
+                "posthog-js": "^1.77.0",
                 "process": "^0.11.10",
                 "reflect-metadata": "^0.1.13",
                 "slugify": "^1.6.5",
@@ -69,7 +70,7 @@
                 "uuid": "^8.3.2"
             },
             "devDependencies": {
-                "@faker-js/faker": "^6.3.1",
+                "@faker-js/faker": "^8.0.2",
                 "@types/jest": "^27.5.2",
                 "@types/node": "^17.0.22",
                 "jest": "^27.5.1",
@@ -81,6 +82,7 @@
             "version": "1.0.0",
             "license": "MIT",
             "dependencies": {
+                "@clickhouse/client": "^0.2.1",
                 "@elastic/elasticsearch": "^8.1.0",
                 "@opentelemetry/api": "^1.1.0",
                 "@opentelemetry/auto-instrumentations-node": "^0.31.0",
@@ -88,27 +90,31 @@
                 "@types/ejs": "^3.1.1",
                 "@types/gridfs-stream": "^0.5.35",
                 "@types/json2csv": "^5.0.3",
+                "@types/markdown-it": "^12.2.3",
                 "@types/nodemailer": "^6.4.7",
                 "airtable": "^0.11.3",
                 "axios": "^1.3.3",
                 "bullmq": "^3.6.6",
                 "Common": "file:../Common",
                 "cors": "^2.8.5",
+                "cron-parser": "^4.8.1",
                 "dotenv": "^16.0.0",
                 "ejs": "^3.1.8",
                 "express": "^4.17.3",
                 "gridfs-stream": "^1.1.1",
                 "handlebars": "^4.7.7",
+                "ioredis": "^5.3.2",
                 "json2csv": "^5.0.7",
                 "jsonwebtoken": "^9.0.0",
+                "markdown-it": "^13.0.1",
                 "Model": "file:../Model",
                 "node-device-detector": "^2.0.0",
                 "nodemailer": "^6.7.3",
                 "nodemailer-express-handlebars": "^5.0.0",
                 "pg": "^8.7.3",
-                "redis": "^4.2.0",
                 "socket.io": "^4.4.1",
                 "stripe": "^10.17.0",
+                "twilio": "^4.13.0",
                 "typeorm": "^0.3.10",
                 "typeorm-extension": "^2.2.13",
                 "vm2": "^3.9.14",
@@ -283,9 +289,9 @@
             }
         },
         "node_modules/@babel/core/node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
             "bin": {
                 "semver": "bin/semver.js"
             }
@@ -316,9 +322,9 @@
             }
         },
         "node_modules/@babel/eslint-parser/node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
             "bin": {
                 "semver": "bin/semver.js"
             }
@@ -390,9 +396,9 @@
             }
         },
         "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
             "bin": {
                 "semver": "bin/semver.js"
             }
@@ -449,9 +455,9 @@
             }
         },
         "node_modules/@babel/helper-define-polyfill-provider/node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
             "bin": {
                 "semver": "bin/semver.js"
             }
@@ -1782,9 +1788,9 @@
             }
         },
         "node_modules/@babel/plugin-transform-runtime/node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
             "bin": {
                 "semver": "bin/semver.js"
             }
@@ -1994,9 +2000,9 @@
             }
         },
         "node_modules/@babel/preset-env/node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
             "bin": {
                 "semver": "bin/semver.js"
             }
@@ -4836,9 +4842,9 @@
             }
         },
         "node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
             "bin": {
                 "semver": "bin/semver.js"
             }
@@ -7060,9 +7066,9 @@
             }
         },
         "node_modules/eslint-plugin-jsx-a11y/node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
             "bin": {
                 "semver": "bin/semver.js"
             }
@@ -7134,9 +7140,9 @@
             }
         },
         "node_modules/eslint-plugin-react/node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
             "bin": {
                 "semver": "bin/semver.js"
             }
@@ -9150,9 +9156,9 @@
             }
         },
         "node_modules/istanbul-lib-instrument/node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
             "bin": {
                 "semver": "bin/semver.js"
             }
@@ -10430,9 +10436,9 @@
             }
         },
         "node_modules/make-dir/node_modules/semver": {
-            "version": "6.3.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-            "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+            "version": "6.3.1",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
             "bin": {
                 "semver": "bin/semver.js"
             }
@@ -10750,9 +10756,9 @@
             "integrity": "sha512-EJ3rzxL9pTWPjk5arA0s0dgXpnyiAbJDE6wHT62g7VsgrgQgmmZ+Ru++M1BFofncWja+Pnn3rEr3fieRySAdKQ=="
         },
         "node_modules/nodemon": {
-            "version": "2.0.20",
-            "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.20.tgz",
-            "integrity": "sha512-Km2mWHKKY5GzRg6i1j5OxOHQtuvVsgskLfigG25yTtbyfRGn/GNvIbRyOf1PSCKJ2aT/58TiuUsuOU5UToVViw==",
+            "version": "2.0.22",
+            "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.22.tgz",
+            "integrity": "sha512-B8YqaKMmyuCO7BowF1Z1/mkPqLk6cs/l63Ojtd6otKjMx47Dq1utxfRxcavH1I7VSaL8n5BUaoutadnsX3AAVQ==",
             "dev": true,
             "dependencies": {
                 "chokidar": "^3.5.2",
@@ -10796,9 +10802,9 @@
             }
         },
         "node_modules/nodemon/node_modules/semver": {
-            "version": "5.7.1",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-            "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+            "version": "5.7.2",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+            "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
             "dev": true,
             "bin": {
                 "semver": "bin/semver"
@@ -12886,9 +12892,9 @@
             }
         },
         "node_modules/react-app-rewired/node_modules/semver": {
-            "version": "5.7.1",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-            "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+            "version": "5.7.2",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+            "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
             "dev": true,
             "bin": {
                 "semver": "bin/semver"
@@ -13647,9 +13653,9 @@
             }
         },
         "node_modules/semver": {
-            "version": "7.3.8",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-            "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+            "version": "7.5.4",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+            "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
             "dependencies": {
                 "lru-cache": "^6.0.0"
             },
@@ -14647,9 +14653,9 @@
             }
         },
         "node_modules/tough-cookie": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz",
-            "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==",
+            "version": "4.1.3",
+            "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
+            "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
             "dependencies": {
                 "psl": "^1.1.33",
                 "punycode": "^2.1.1",
@@ -15011,6 +15017,14 @@
                 "requires-port": "^1.0.0"
             }
         },
+        "node_modules/use-async-effect": {
+            "version": "2.2.7",
+            "resolved": "https://registry.npmjs.org/use-async-effect/-/use-async-effect-2.2.7.tgz",
+            "integrity": "sha512-Vq94tKPyo/9Nok4LOapV0GoGgZPhbeDW/bP6bulLPV4+lIoftaBRBBbGjTbM+j5W1Bm2EkUHJgapeu5YnQvKEA==",
+            "peerDependencies": {
+                "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+            }
+        },
         "node_modules/util-deprecate": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -15645,9 +15659,9 @@
             "dev": true
         },
         "node_modules/word-wrap": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-            "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+            "version": "1.2.4",
+            "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
+            "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==",
             "engines": {
                 "node": ">=0.10.0"
             }
@@ -16135,9 +16149,9 @@
             },
             "dependencies": {
                 "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+                    "version": "6.3.1",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+                    "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
                 }
             }
         },
@@ -16157,9 +16171,9 @@
                     "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="
                 },
                 "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+                    "version": "6.3.1",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+                    "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
                 }
             }
         },
@@ -16214,9 +16228,9 @@
             },
             "dependencies": {
                 "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+                    "version": "6.3.1",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+                    "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
                 }
             }
         },
@@ -16257,9 +16271,9 @@
             },
             "dependencies": {
                 "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+                    "version": "6.3.1",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+                    "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
                 }
             }
         },
@@ -17120,9 +17134,9 @@
             },
             "dependencies": {
                 "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+                    "version": "6.3.1",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+                    "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
                 }
             }
         },
@@ -17277,9 +17291,9 @@
             },
             "dependencies": {
                 "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+                    "version": "6.3.1",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+                    "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
                 }
             }
         },
@@ -19339,9 +19353,9 @@
             },
             "dependencies": {
                 "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+                    "version": "6.3.1",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+                    "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
                 }
             }
         },
@@ -19839,7 +19853,7 @@
         "Common": {
             "version": "file:../Common",
             "requires": {
-                "@faker-js/faker": "^6.3.1",
+                "@faker-js/faker": "^8.0.2",
                 "@types/crypto-js": "^4.1.1",
                 "@types/jest": "^27.5.2",
                 "@types/nanoid-dictionary": "^4.2.0",
@@ -19848,11 +19862,12 @@
                 "axios": "^0.26.1",
                 "crypto-js": "^4.1.1",
                 "jest": "^27.5.1",
+                "json5": "^2.2.3",
                 "moment": "^2.29.2",
                 "moment-timezone": "^0.5.40",
                 "nanoid": "^3.3.2",
                 "nanoid-dictionary": "^4.3.0",
-                "posthog-js": "^1.37.0",
+                "posthog-js": "^1.77.0",
                 "process": "^0.11.10",
                 "reflect-metadata": "^0.1.13",
                 "slugify": "^1.6.5",
@@ -19879,6 +19894,7 @@
         "CommonServer": {
             "version": "file:../CommonServer",
             "requires": {
+                "@clickhouse/client": "^0.2.1",
                 "@elastic/elasticsearch": "^8.1.0",
                 "@faker-js/faker": "^6.3.1",
                 "@opentelemetry/api": "^1.1.0",
@@ -19891,6 +19907,7 @@
                 "@types/jest": "^27.4.1",
                 "@types/json2csv": "^5.0.3",
                 "@types/jsonwebtoken": "^8.5.9",
+                "@types/markdown-it": "^12.2.3",
                 "@types/node": "^17.0.22",
                 "@types/nodemailer": "^6.4.7",
                 "airtable": "^0.11.3",
@@ -19898,23 +19915,26 @@
                 "bullmq": "^3.6.6",
                 "Common": "file:../Common",
                 "cors": "^2.8.5",
+                "cron-parser": "^4.8.1",
                 "dotenv": "^16.0.0",
                 "ejs": "^3.1.8",
                 "express": "^4.17.3",
                 "gridfs-stream": "^1.1.1",
                 "handlebars": "^4.7.7",
+                "ioredis": "^5.3.2",
                 "jest": "^27.5.1",
                 "json2csv": "^5.0.7",
                 "jsonwebtoken": "^9.0.0",
+                "markdown-it": "^13.0.1",
                 "Model": "file:../Model",
                 "node-device-detector": "^2.0.0",
                 "nodemailer": "^6.7.3",
                 "nodemailer-express-handlebars": "^5.0.0",
                 "pg": "^8.7.3",
-                "redis": "^4.2.0",
                 "socket.io": "^4.4.1",
                 "stripe": "^10.17.0",
                 "ts-jest": "^27.1.4",
+                "twilio": "^4.13.0",
                 "typeorm": "^0.3.10",
                 "typeorm-extension": "^2.2.13",
                 "vm2": "^3.9.14",
@@ -21163,9 +21183,9 @@
                     }
                 },
                 "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+                    "version": "6.3.1",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+                    "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
                 }
             }
         },
@@ -21210,9 +21230,9 @@
                     }
                 },
                 "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+                    "version": "6.3.1",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+                    "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
                 }
             }
         },
@@ -22615,9 +22635,9 @@
             },
             "dependencies": {
                 "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+                    "version": "6.3.1",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+                    "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
                 }
             }
         },
@@ -23597,9 +23617,9 @@
             },
             "dependencies": {
                 "semver": {
-                    "version": "6.3.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+                    "version": "6.3.1",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+                    "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="
                 }
             }
         },
@@ -23846,9 +23866,9 @@
             "integrity": "sha512-EJ3rzxL9pTWPjk5arA0s0dgXpnyiAbJDE6wHT62g7VsgrgQgmmZ+Ru++M1BFofncWja+Pnn3rEr3fieRySAdKQ=="
         },
         "nodemon": {
-            "version": "2.0.20",
-            "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.20.tgz",
-            "integrity": "sha512-Km2mWHKKY5GzRg6i1j5OxOHQtuvVsgskLfigG25yTtbyfRGn/GNvIbRyOf1PSCKJ2aT/58TiuUsuOU5UToVViw==",
+            "version": "2.0.22",
+            "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.22.tgz",
+            "integrity": "sha512-B8YqaKMmyuCO7BowF1Z1/mkPqLk6cs/l63Ojtd6otKjMx47Dq1utxfRxcavH1I7VSaL8n5BUaoutadnsX3AAVQ==",
             "dev": true,
             "requires": {
                 "chokidar": "^3.5.2",
@@ -23879,9 +23899,9 @@
                     "dev": true
                 },
                 "semver": {
-                    "version": "5.7.1",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-                    "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+                    "version": "5.7.2",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+                    "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
                     "dev": true
                 },
                 "supports-color": {
@@ -25195,9 +25215,9 @@
             },
             "dependencies": {
                 "semver": {
-                    "version": "5.7.1",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-                    "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+                    "version": "5.7.2",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+                    "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
                     "dev": true
                 }
             }
@@ -25728,9 +25748,9 @@
             }
         },
         "semver": {
-            "version": "7.3.8",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-            "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+            "version": "7.5.4",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+            "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
             "requires": {
                 "lru-cache": "^6.0.0"
             }
@@ -26499,9 +26519,9 @@
             }
         },
         "tough-cookie": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.2.tgz",
-            "integrity": "sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==",
+            "version": "4.1.3",
+            "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
+            "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
             "requires": {
                 "psl": "^1.1.33",
                 "punycode": "^2.1.1",
@@ -26750,6 +26770,12 @@
                 "requires-port": "^1.0.0"
             }
         },
+        "use-async-effect": {
+            "version": "2.2.7",
+            "resolved": "https://registry.npmjs.org/use-async-effect/-/use-async-effect-2.2.7.tgz",
+            "integrity": "sha512-Vq94tKPyo/9Nok4LOapV0GoGgZPhbeDW/bP6bulLPV4+lIoftaBRBBbGjTbM+j5W1Bm2EkUHJgapeu5YnQvKEA==",
+            "requires": {}
+        },
         "util-deprecate": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -27202,9 +27228,9 @@
             "dev": true
         },
         "word-wrap": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-            "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
+            "version": "1.2.4",
+            "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.4.tgz",
+            "integrity": "sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA=="
         },
         "workbox-background-sync": {
             "version": "6.5.4",

Accounts/package.json

@@ -15,7 +15,8 @@
         "react-router-dom": "^6.3.0",
         "react-scripts": "5.0.1",
         "the-new-css-reset": "^1.7.3",
-        "typescript": "^4.6.4"
+        "typescript": "^4.6.4",
+        "use-async-effect": "^2.2.7"
     },
     "scripts": {
         "dev": "npx nodemon",

Accounts/public/index.html

@@ -5,14 +5,12 @@
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="theme-color" content="#000000" />
-  <meta name="description" content="Web site created using create-react-app" />
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
   <meta charSet='utf-8' />
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
   <meta name="theme-color" content="#000000">
   <meta name="slack-app-id" content="ACVBMTPJQ">
-  <meta name="description" content="This is the login page for OneUptime Dashboard">
-
+  <meta name="description" content="OneUptime — the complete open-source observability platform.">
 
   <!-- Google Tag Manager -->
   <script>(function (w, d, s, l, i) {
@@ -41,8 +39,8 @@
   <script src="/accounts/env.js"></script>
 
   <link rel="preconnect" href="https://fonts.googleapis.com">
-<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-<link href="https://fonts.googleapis.com/css2?family=Inter:wght@100;200;300;400;500;600;700;800;900&display=swap" rel="stylesheet">
+  <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+  <link href="https://fonts.googleapis.com/css2?family=Inter:wght@100;200;300;400;500;600;700;800;900&display=swap" rel="stylesheet">
     <style>
       * {
       font-family: Inter;
@@ -110,16 +108,7 @@
   <!-- End Google Tag Manager (noscript) -->
   <noscript>You need to enable JavaScript to run this app.</noscript>
   <div id="root"></div>
-  <!--
-      This HTML file is a template.
-      If you open it directly in the browser, you will see an empty page.
 
-      You can add webfonts, meta tags, or analytics to this file.
-      The build step will place the bundled scripts into the <body> tag.
-
-      To begin the development, run `npm start` or `yarn start`.
-    To create a production bundle, use `npm run build` or `yarn build`.
-    -->
   <script src="/accounts/dist/bundle.js"></script>
   <script>
     tailwind.config = {

Accounts/src/Footer.tsx

@@ -1,7 +1,7 @@
-import React, { FunctionComponent } from 'react';
+import React from 'react';
 import { Link } from 'react-router-dom';
 
-const Footer: FunctionComponent = () => {
+const Footer: () => JSX.Element = () => {
     return (
         <div className="footer">
             <p>

Accounts/src/Pages/ForgotPassword.tsx

@@ -1,4 +1,4 @@
-import React, { FunctionComponent, useState } from 'react';
+import React, { useState } from 'react';
 import ModelForm, { FormType } from 'CommonUI/src/Components/Forms/ModelForm';
 import User from 'Model/Models/User';
 import Route from 'Common/Types/API/Route';
@@ -8,7 +8,7 @@ import Link from 'CommonUI/src/Components/Link/Link';
 import { FORGOT_PASSWORD_API_URL } from '../Utils/ApiPaths';
 import URL from 'Common/Types/API/URL';
 
-const ForgotPassword: FunctionComponent = () => {
+const ForgotPassword: () => JSX.Element = () => {
     const apiUrl: URL = FORGOT_PASSWORD_API_URL;
 
     const [isSuccess, setIsSuccess] = useState<boolean>(false);
@@ -65,7 +65,7 @@ const ForgotPassword: FunctionComponent = () => {
                             formType={FormType.Create}
                             maxPrimaryButtonWidth={true}
                             footer={
-                                <div className="actions pointer text-center mt-4 underline-on-hover fw-semibold">
+                                <div className="actions pointer text-center mt-4 hover:underline fw-semibold">
                                     <p>
                                         <Link
                                             to={new Route('/accounts/login')}

Accounts/src/Pages/Login.tsx

@@ -1,4 +1,4 @@
-import React, { FunctionComponent, useState } from 'react';
+import React, { useState } from 'react';
 import User from 'Model/Models/User';
 import Route from 'Common/Types/API/Route';
 import FormFieldSchemaType from 'CommonUI/src/Components/Forms/Types/FormFieldSchemaType';
@@ -12,23 +12,29 @@ import LoginUtil from '../Utils/Login';
 import UserUtil from 'CommonUI/src/Utils/User';
 import Navigation from 'CommonUI/src/Utils/Navigation';
 import { DASHBOARD_URL } from 'CommonUI/src/Config';
+import Alert, { AlertType } from 'CommonUI/src/Components/Alerts/Alert';
+import UiAnalytics from 'CommonUI/src/Utils/Analytics';
 
-const LoginPage: FunctionComponent = () => {
+const LoginPage: () => JSX.Element = () => {
     const apiUrl: URL = LOGIN_API_URL;
 
     if (UserUtil.isLoggedIn()) {
         Navigation.navigate(DASHBOARD_URL);
     }
 
+    const showSsoMessage: boolean = Boolean(
+        Navigation.getQueryStringByName('sso')
+    );
+
     const [showSsoTip, setShowSSOTip] = useState<boolean>(false);
 
     return (
         <div className="flex min-h-full flex-col justify-center py-12 sm:px-6 lg:px-8">
-            <div className="sm:mx-auto sm:w-full sm:max-w-md">
+            <div className="">
                 <img
                     className="mx-auto h-12 w-auto"
                     src={OneUptimeLogo}
-                    alt="Your Company"
+                    alt="OneUptime"
                 />
                 <h2 className="mt-6 text-center text-2xl  tracking-tight text-gray-900">
                     Sign in to your account
@@ -39,6 +45,16 @@ const LoginPage: FunctionComponent = () => {
                 </p>
             </div>
 
+            {showSsoMessage && (
+                <div className="sm:mx-auto sm:w-full sm:max-w-md mt-8">
+                    {' '}
+                    <Alert
+                        type={AlertType.DANGER}
+                        title="You must be logged into OneUptime account to use single sign-on (SSO) for your project. Logging in to OneUptime account and single sign on (SSO) for your project are two separate steps. Please use the form below to log in to your OneUptime account before you use SSO."
+                    />{' '}
+                </div>
+            )}
+
             <div className="mt-8 sm:mx-auto sm:w-full sm:max-w-md">
                 <div className="bg-white py-8 px-4 shadow sm:rounded-lg sm:px-10">
                     <ModelForm<User>
@@ -74,13 +90,24 @@ const LoginPage: FunctionComponent = () => {
                         apiUrl={apiUrl}
                         formType={FormType.Create}
                         submitButtonText={'Login'}
-                        onSuccess={(value: JSONObject) => {
-                            LoginUtil.login(value);
+                        onSuccess={(
+                            value: User,
+                            miscData: JSONObject | undefined
+                        ) => {
+                            if (value && value.email) {
+                                UiAnalytics.userAuth(value.email);
+                                UiAnalytics.capture('accounts/login');
+                            }
+
+                            LoginUtil.login({
+                                user: value,
+                                token: miscData ? miscData['token'] : undefined,
+                            });
                         }}
                         maxPrimaryButtonWidth={true}
                         footer={
-                            <div className="actions pointer text-center mt-4 underline-on-hover fw-semibold">
-                                <p>
+                            <div className="actions pointer text-center mt-4 hover:underline fw-semibold">
+                                <div>
                                     {!showSsoTip && (
                                         <div
                                             onClick={() => {
@@ -101,13 +128,13 @@ const LoginPage: FunctionComponent = () => {
                                             your project.
                                         </div>
                                     )}
-                                </p>
+                                </div>
                             </div>
                         }
                     />
                 </div>
                 <div className="mt-10 text-center">
-                    <p className="text-muted mb-0 text-gray-500">
+                    <div className="text-muted mb-0 text-gray-500">
                         Don&apos;t have an account?{' '}
                         <Link
                             to={new Route('/accounts/register')}
@@ -115,7 +142,7 @@ const LoginPage: FunctionComponent = () => {
                         >
                             Register.
                         </Link>
-                    </p>
+                    </div>
                 </div>
             </div>
         </div>

Accounts/src/Pages/NotFound.tsx

@@ -1,6 +1,6 @@
-import React, { FunctionComponent } from 'react';
+import React from 'react';
 
-const LoginPage: FunctionComponent = () => {
+const LoginPage: () => JSX.Element = () => {
     return (
         <div className="flex min-h-full flex-col justify-center py-12 sm:px-6 lg:px-8">
             <div className="sm:mx-auto sm:w-full sm:max-w-md">

Accounts/src/Pages/Register.tsx

@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react';
+import React, { useState } from 'react';
 import ModelForm, { FormType } from 'CommonUI/src/Components/Forms/ModelForm';
 import User from 'Model/Models/User';
 import Link from 'CommonUI/src/Components/Link/Link';
@@ -9,24 +9,183 @@ import LoginUtil from '../Utils/Login';
 import { JSONObject } from 'Common/Types/JSON';
 import UserUtil from 'CommonUI/src/Utils/User';
 import Navigation from 'CommonUI/src/Utils/Navigation';
-import { DASHBOARD_URL } from 'CommonUI/src/Config';
+import { BILLING_ENABLED, DASHBOARD_URL } from 'CommonUI/src/Config';
 import URL from 'Common/Types/API/URL';
 import { SIGNUP_API_URL } from '../Utils/ApiPaths';
+import Fields from 'CommonUI/src/Components/Forms/Types/Fields';
+import Dictionary from 'Common/Types/Dictionary';
+import UiAnalytics from 'CommonUI/src/Utils/Analytics';
+import LocalStorage from 'CommonUI/src/Utils/LocalStorage';
+import Reseller from 'Model/Models/Reseller';
+import ModelAPI, { ListResult } from 'CommonUI/src/Utils/ModelAPI/ModelAPI';
+import BaseAPI from 'CommonUI/src/Utils/API/API';
+import ErrorMessage from 'CommonUI/src/Components/ErrorMessage/ErrorMessage';
+import PageLoader from 'CommonUI/src/Components/Loader/PageLoader';
+import useAsyncEffect from 'use-async-effect';
 
-const RegisterPage: FunctionComponent = () => {
+const RegisterPage: () => JSX.Element = () => {
     const apiUrl: URL = SIGNUP_API_URL;
 
+    const [initialValues, setInitialValues] = React.useState<JSONObject>({});
+
+    const [error, setError] = useState<string>('');
+
+    const [isLoading, setIsLoading] = React.useState<boolean>(false);
+
+    const [reseller, setResller] = React.useState<Reseller | undefined>(
+        undefined
+    );
+
     if (UserUtil.isLoggedIn()) {
         Navigation.navigate(DASHBOARD_URL);
     }
 
+    const fetchReseller: Function = async (
+        resellerId: string
+    ): Promise<void> => {
+        setIsLoading(true);
+
+        try {
+            const reseller: ListResult<Reseller> =
+                await ModelAPI.getList<Reseller>(
+                    Reseller,
+                    {
+                        resellerId: resellerId,
+                    },
+                    1,
+                    0,
+                    {
+                        hidePhoneNumberOnSignup: true,
+                    },
+                    {},
+                    {}
+                );
+
+            if (reseller.data.length > 0) {
+                setResller(reseller.data[0]);
+            }
+        } catch (err) {
+            setError(BaseAPI.getFriendlyMessage(err));
+        }
+
+        setIsLoading(false);
+    };
+
+    useAsyncEffect(async () => {
+        // if promo code is found, please save it in localstorage.
+        if (Navigation.getQueryStringByName('promoCode')) {
+            LocalStorage.setItem(
+                'promoCode',
+                Navigation.getQueryStringByName('promoCode')
+            );
+        }
+
+        if (Navigation.getQueryStringByName('email')) {
+            setInitialValues({
+                email: Navigation.getQueryStringByName('email'),
+            });
+        }
+
+        // if promo code is found, please save it in localstorage.
+        if (Navigation.getQueryStringByName('partnerId')) {
+            await fetchReseller(Navigation.getQueryStringByName('partnerId')!);
+        }
+    }, []);
+
+    let formFields: Fields<User> = [
+        {
+            field: {
+                email: true,
+            },
+            fieldType: FormFieldSchemaType.Email,
+            placeholder: 'jeff@example.com',
+            required: true,
+            disabled: Boolean(initialValues && initialValues['email']),
+            title: 'Email',
+        },
+        {
+            field: {
+                name: true,
+            },
+            fieldType: FormFieldSchemaType.Text,
+            placeholder: 'Jeff Smith',
+            required: true,
+            title: 'Full Name',
+        },
+    ];
+
+    if (BILLING_ENABLED) {
+        formFields = formFields.concat([
+            {
+                field: {
+                    companyName: true,
+                },
+                fieldType: FormFieldSchemaType.Text,
+                placeholder: 'Acme, Inc.',
+                required: true,
+                title: 'Company Name',
+            },
+        ]);
+
+        // If reseller wants to hide phone number on sign up, we hide it.
+        if (!reseller || !reseller.hidePhoneNumberOnSignup) {
+            formFields.push({
+                field: {
+                    companyPhoneNumber: true,
+                },
+                fieldType: FormFieldSchemaType.Phone,
+                required: true,
+                placeholder: '+11234567890',
+                title: 'Phone Number',
+            });
+        }
+    }
+
+    formFields = formFields.concat([
+        {
+            field: {
+                password: true,
+            },
+            fieldType: FormFieldSchemaType.Password,
+            validation: {
+                minLength: 6,
+            },
+            placeholder: 'Password',
+            title: 'Password',
+            required: true,
+        },
+        {
+            field: {
+                confirmPassword: true,
+            } as any,
+            validation: {
+                minLength: 6,
+                toMatchField: 'password',
+            },
+            fieldType: FormFieldSchemaType.Password,
+            placeholder: 'Confirm Password',
+            title: 'Confirm Password',
+            overrideFieldKey: 'confirmPassword',
+            required: true,
+            forceShow: true,
+        },
+    ]);
+
+    if (error) {
+        return <ErrorMessage error={error} />;
+    }
+
+    if (isLoading) {
+        return <PageLoader isVisible={true} />;
+    }
+
     return (
         <div className="flex min-h-full flex-col justify-center py-12 sm:px-6 lg:px-8">
             <div className="sm:mx-auto sm:w-full sm:max-w-md">
                 <img
                     className="mx-auto h-12 w-auto"
                     src={OneUptimeLogo}
-                    alt="Your Company"
+                    alt="OneUptime"
                 />
                 <h2 className="mt-6 text-center text-2xl  tracking-tight text-gray-900">
                     Create your OneUptime account
@@ -45,87 +204,48 @@ const RegisterPage: FunctionComponent = () => {
                     <ModelForm<User>
                         modelType={User}
                         id="register-form"
-                        showAsColumns={2}
+                        showAsColumns={reseller ? 1 : 2}
                         name="Register"
+                        initialValues={initialValues}
                         maxPrimaryButtonWidth={true}
-                        initialValues={{
-                            email: '',
-                            name: '',
-                            companyName: '',
-                            companyPhoneNumber: '',
-                            password: '',
-                            confirmPassword: '',
-                        }}
-                        fields={[
-                            {
-                                field: {
-                                    email: true,
-                                },
-                                fieldType: FormFieldSchemaType.Email,
-                                placeholder: 'jeff@example.com',
-                                required: true,
-                                title: 'Email',
-                            },
-                            {
-                                field: {
-                                    name: true,
-                                },
-                                fieldType: FormFieldSchemaType.Text,
-                                placeholder: 'Jeff Smith',
-                                required: true,
-                                title: 'Full Name',
-                            },
-                            {
-                                field: {
-                                    companyName: true,
-                                },
-                                fieldType: FormFieldSchemaType.Text,
-                                placeholder: 'Acme, Inc.',
-                                required: true,
-                                title: 'Company Name',
-                            },
-                            {
-                                field: {
-                                    companyPhoneNumber: true,
-                                },
-                                fieldType: FormFieldSchemaType.Phone,
-                                required: true,
-                                placeholder: '+11234567890',
-                                title: 'Phone Number',
-                            },
-                            {
-                                field: {
-                                    password: true,
-                                },
-                                fieldType: FormFieldSchemaType.Password,
-                                validation: {
-                                    minLength: 6,
-                                },
-                                placeholder: 'Password',
-                                title: 'Password',
-                                required: true,
-                            },
-                            {
-                                field: {
-                                    confirmPassword: true,
-                                },
-                                validation: {
-                                    minLength: 6,
-                                    toMatchField: 'password',
-                                },
-                                fieldType: FormFieldSchemaType.Password,
-                                placeholder: 'Confirm Password',
-                                title: 'Confirm Password',
-                                overideFieldKey: 'confirmPassword',
-                                required: true,
-                                forceShow: true,
-                            },
-                        ]}
+                        fields={formFields}
                         apiUrl={apiUrl}
+                        onBeforeCreate={(item: User): Promise<User> => {
+                            const utmParams: Dictionary<string> =
+                                UserUtil.getUtmParams();
+
+                            if (
+                                utmParams &&
+                                Object.keys(utmParams).length > 0
+                            ) {
+                                item.utmSource = utmParams['utmSource'] || '';
+                                item.utmMedium = utmParams['utmMedium'] || '';
+                                item.utmCampaign =
+                                    utmParams['utmCampaign'] || '';
+                                item.utmTerm = utmParams['utmTerm'] || '';
+                                item.utmContent = utmParams['utmContent'] || '';
+                                item.utmUrl = utmParams['utmUrl'] || '';
+
+                                UiAnalytics.capture('utm_event', utmParams);
+                            }
+
+                            return Promise.resolve(item);
+                        }}
                         formType={FormType.Create}
                         submitButtonText={'Sign Up'}
-                        onSuccess={(value: JSONObject) => {
-                            LoginUtil.login(value);
+                        onSuccess={(
+                            value: User,
+                            miscData: JSONObject | undefined
+                        ) => {
+                            if (value && value.email) {
+                                UiAnalytics.userAuth(value.email);
+                                UiAnalytics.capture('accounts/register');
+                            }
+
+                            LoginUtil.login({
+                                user: value,
+                                token: miscData ? miscData['token'] : undefined,
+                            });
                         }}
                     />
                 </div>

Accounts/src/Pages/ResetPassword.tsx

@@ -1,4 +1,4 @@
-import React, { FunctionComponent, useState } from 'react';
+import React, { useState } from 'react';
 import ModelForm, { FormType } from 'CommonUI/src/Components/Forms/ModelForm';
 import User from 'Model/Models/User';
 import Link from 'CommonUI/src/Components/Link/Link';
@@ -10,7 +10,7 @@ import URL from 'Common/Types/API/URL';
 import { RESET_PASSWORD_API_URL } from '../Utils/ApiPaths';
 import Navigation from 'CommonUI/src/Utils/Navigation';
 
-const RegisterPage: FunctionComponent = () => {
+const RegisterPage: () => JSX.Element = () => {
     const apiUrl: URL = RESET_PASSWORD_API_URL;
     const [isSuccess, setIsSuccess] = useState<boolean>(false);
 
@@ -47,20 +47,16 @@ const RegisterPage: FunctionComponent = () => {
                             modelType={User}
                             id="register-form"
                             name="Reset Password"
-                            onBeforeCreate={(item: User) => {
+                            onBeforeCreate={(item: User): Promise<User> => {
                                 item.resetPasswordToken =
                                     Navigation.getLastParam()
                                         ?.toString()
                                         .replace('/', '')
                                         .toString() || '';
-                                return item;
+                                return Promise.resolve(item);
                             }}
                             showAsColumns={1}
                             maxPrimaryButtonWidth={true}
-                            initialValues={{
-                                password: '',
-                                confirmPassword: '',
-                            }}
                             fields={[
                                 {
                                     field: {
@@ -85,7 +81,7 @@ const RegisterPage: FunctionComponent = () => {
                                     fieldType: FormFieldSchemaType.Password,
                                     placeholder: 'Confirm Password',
                                     title: 'Confirm Password',
-                                    overideFieldKey: 'confirmPassword',
+                                    overrideFieldKey: 'confirmPassword',
                                     required: true,
                                 },
                             ]}

Accounts/src/Pages/VerifyEmail.tsx

@@ -1,4 +1,4 @@
-import React, { FunctionComponent, useEffect, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import Route from 'Common/Types/API/Route';
 import OneUptimeLogo from 'CommonUI/src/Images/logos/OneUptimeSVG/3-transparent.svg';
 import Link from 'CommonUI/src/Components/Link/Link';
@@ -12,12 +12,12 @@ import ObjectID from 'Common/Types/ObjectID';
 import URL from 'Common/Types/API/URL';
 import API from 'CommonUI/src/Utils/API/API';
 
-const VerifyEmail: FunctionComponent = () => {
+const VerifyEmail: () => JSX.Element = () => {
     const apiUrl: URL = VERIFY_EMAIL_API_URL;
     const [error, setError] = useState<string>('');
     const [isLoading, setIsLoading] = useState<boolean>(true);
 
-    const init: Function = async (): Promise<void> => {
+    const init: () => Promise<void> = async (): Promise<void> => {
         // Ping an API here.
         setError('');
         setIsLoading(true);
@@ -82,7 +82,7 @@ const VerifyEmail: FunctionComponent = () => {
                                                     Your email is verified.
                                                 </h5>
                                                 <p className="text-muted mt-2 mb-0">
-                                                    Thank you for veryfing your
+                                                    Thank you for verifying your
                                                     email. You can now log in to
                                                     OneUptime.{' '}
                                                 </p>
@@ -109,7 +109,7 @@ const VerifyEmail: FunctionComponent = () => {
                                                             '/accounts/login'
                                                         )
                                                     }
-                                                    className="underline-on-hover text-primary fw-semibold"
+                                                    className="hover:underline text-primary fw-semibold"
                                                 >
                                                     Login.
                                                 </Link>

Accounts/src/Utils/Login.ts

@@ -15,12 +15,15 @@ export default abstract class LoginUtil {
             value['user'] as JSONObject,
             User
         ) as User;
-        const token: string = value['token'] as string;
 
-        UserUtil.setAccessToken(token);
         UserUtil.setEmail(user.email as Email);
         UserUtil.setUserId(user.id as ObjectID);
-        UserUtil.setName(user.name as Name);
+        UserUtil.setName(user.name || new Name(''));
+        UserUtil.setIsMasterAdmin(user.isMasterAdmin as boolean);
+
+        if (user.profilePictureId) {
+            UserUtil.setProfilePicId(user.profilePictureId);
+        }
 
         Analytics.userAuth(user.email!);
 

Accounts/webpack.config.js

@@ -7,13 +7,13 @@ const readEnvFile = (pathToFile) => {
 
     const parsed = dotenv.config({ path: pathToFile }).parsed;
 
-    const env = {};
+    const env = {
+    };
 
     for (const key in parsed) {
         env[key] = JSON.stringify(parsed[key]);
     }
 
-
     return env;
 }
 
@@ -38,9 +38,7 @@ module.exports = {
         new webpack.DefinePlugin({
             'process': {
                 'env': {
-                    ...readEnvFile('../Common/.env'),
-                    ...readEnvFile('../CommonUI/.env'),
-                    ...readEnvFile('./.env')
+                    ...readEnvFile('/usr/src/app/dev-env/.env')
                 }
             }
         }),

AdminDashboard/Dockerfile.tpl

@@ -3,13 +3,20 @@
 #
 
 # Pull base image nodejs image.
-FROM node:18.13.0-alpine
+FROM node:current-alpine
 USER root
 RUN mkdir /tmp/npm &&  chmod 2777 /tmp/npm && chown 1000:1000 /tmp/npm && npm config set cache /tmp/npm --global
 
 
+ARG GIT_SHA
+ARG APP_VERSION
+
+ENV GIT_SHA=${GIT_SHA}
+ENV APP_VERSION=${APP_VERSION}
+
+
 # Install bash. 
-RUN apk update && apk add bash && apk add curl
+RUN apk add bash && apk add curl
 
 #Use bash shell by default
 SHELL ["/bin/bash", "-c"]
@@ -17,16 +24,12 @@ SHELL ["/bin/bash", "-c"]
 
 RUN mkdir /usr/src
 
-# Install common
-RUN mkdir /usr/src/Common
 WORKDIR /usr/src/Common
 COPY ./Common/package*.json /usr/src/Common/
 RUN npm install
 COPY ./Common /usr/src/Common
 
 
-# Install Model
-RUN mkdir /usr/src/Model
 WORKDIR /usr/src/Model
 COPY ./Model/package*.json /usr/src/Model/
 RUN npm install
@@ -34,8 +37,6 @@ COPY ./Model /usr/src/Model
 
 
 
-# Install CommonServer
-RUN mkdir /usr/src/CommonServer
 WORKDIR /usr/src/CommonServer
 COPY ./CommonServer/package*.json /usr/src/CommonServer/
 RUN npm install
@@ -45,19 +46,17 @@ COPY ./CommonServer /usr/src/CommonServer
 
 
 # Install CommonUI
-RUN mkdir /usr/src/CommonUI
+
 WORKDIR /usr/src/CommonUI
 COPY ./CommonUI/package*.json /usr/src/CommonUI/
 RUN npm install --force
 COPY ./CommonUI /usr/src/CommonUI
 
 
-#SET ENV Variables
+
 ENV PRODUCTION=true
 ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
 
-RUN mkdir /usr/src/app
-
 WORKDIR /usr/src/app
 
 # Install app dependencies
@@ -65,12 +64,13 @@ COPY ./AdminDashboard/package*.json /usr/src/app/
 RUN npm install  
 
 # Expose ports.
-#   - 3005:  AdminDashboard
-EXPOSE 3005
-
+#   - 3158:  AdminDashboard
+EXPOSE 3158
 
 {{ if eq .Env.ENVIRONMENT "development" }}
 #Run the app
+RUN mkdir /usr/src/app/dev-env
+RUN touch /usr/src/app/dev-env/.env
 CMD [ "npm", "run", "dev" ]
 {{ else }}
 # Copy app source
@@ -80,4 +80,3 @@ RUN npm run build
 #Run the app
 CMD [ "npm", "start" ]
 {{ end }}
-

AdminDashboard/README.md

@@ -0,0 +1,46 @@
+# Getting Started with Create React App
+
+This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
+
+## Available Scripts
+
+In the project directory, you can run:
+
+### `npm start`
+
+Runs the app in the development mode.\
+Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
+
+The page will reload if you make edits.\
+You will also see any lint errors in the console.
+
+### `npm test`
+
+Launches the test runner in the interactive watch mode.\
+See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
+
+### `npm run build`
+
+Builds the app for production to the `build` folder.\
+It correctly bundles React in production mode and optimizes the build for the best performance.
+
+The build is minified and the filenames include the hashes.\
+Your app is ready to be deployed!
+
+See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
+
+### `npm run eject`
+
+**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
+
+If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
+
+Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
+
+You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
+
+## Learn More
+
+You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
+
+To learn React, check out the [React documentation](https://reactjs.org/).

AdminDashboard/Serve.ts

@@ -0,0 +1,26 @@
+import App from 'CommonServer/Utils/StartServer';
+import Express, { ExpressApplication } from 'CommonServer/Utils/Express';
+import logger from 'CommonServer/Utils/Logger';
+
+export const APP_NAME: string = 'admin';
+
+const app: ExpressApplication = Express.getExpressApp();
+
+const init: () => Promise<void> = async (): Promise<void> => {
+    try {
+        // init the app
+        await App(APP_NAME, undefined, true);
+    } catch (err) {
+        logger.error('App Init Failed:');
+        logger.error(err);
+        throw err;
+    }
+};
+
+init().catch((err: Error) => {
+    logger.error(err);
+    logger.info('Exiting node process');
+    process.exit(1);
+});
+
+export default app;

AdminDashboard/dev-env/README.md

@@ -0,0 +1 @@
+This is where env will be stored for the dev environment. This is where you will find the .env file when you exec into the container.

AdminDashboard/index.d.ts

@@ -0,0 +1,4 @@
+declare module '*.png';
+declare module '*.svg';
+declare module '*.jpg';
+declare module '*.gif';

AdminDashboard/nodemon.json

@@ -0,0 +1,4 @@
+{
+    "watch": ["webpack.config.js"],
+    "exec": "export DEBUG=express:* && printenv > /usr/src/app/dev-env/.env && echo 'HOST=localhost' >> /usr/src/app/dev-env/.env && echo 'USE_HTTPS=false' >> /usr/src/app/dev-env/.env && webpack-dev-server --port=3158 --mode=development"
+}

AdminDashboard/package.json

@@ -0,0 +1,71 @@
+{
+    "name": "admin-dashboard",
+    "version": "0.1.0",
+    "private": false,
+    "dependencies": {
+        "@headlessui/react": "^1.7.7",
+        "@heroicons/react": "^2.0.13",
+        "@stripe/react-stripe-js": "^1.15.0",
+        "@stripe/stripe-js": "^1.44.1",
+        "Common": "file:../Common",
+        "CommonServer": "file:../CommonServer",
+        "CommonUI": "file:../CommonUI",
+        "Model": "file:../Model",
+        "react": "^18.1.0",
+        "react-dnd": "^16.0.1",
+        "react-dnd-html5-backend": "^16.0.1",
+        "react-dom": "^18.1.0",
+        "react-icons": "^4.4.0",
+        "react-router": "^6.3.0",
+        "react-router-dom": "^6.3.0",
+        "reactflow": "^11.5.3",
+        "stripe": "^11.0.0",
+        "the-new-css-reset": "^1.7.3",
+        "typescript": "^4.6.4",
+        "use-async-effect": "^2.2.6"
+    },
+    "scripts": {
+        "dev": "npx nodemon",
+        "build": "webpack build --mode=production",
+        "test": "react-app-rewired test",
+        "eject": "webpack eject",
+        "compile": "tsc",
+        "start": "node --require ts-node/register Serve.ts",
+        "audit": "npm audit --audit-level=low",
+        "configure": "npx npm-force-resolutions || echo 'No package-lock.json file. Skipping force resolutions'",
+        "dep-check": "depcheck ./ --skip-missing=true'"
+    },
+    "browserslist": {
+        "production": [
+            ">0.2%",
+            "not dead",
+            "not op_mini all"
+        ],
+        "development": [
+            "last 1 chrome version",
+            "last 1 firefox version",
+            "last 1 safari version"
+        ]
+    },
+    "devDependencies": {
+        "@testing-library/jest-dom": "^5.16.4",
+        "@testing-library/react": "^13.2.0",
+        "@testing-library/user-event": "^13.5.0",
+        "@types/jest": "^27.5.1",
+        "@types/node": "^16.11.35",
+        "@types/react": "^18.0.9",
+        "@types/react-dom": "^18.0.4",
+        "@types/react-router-dom": "^5.3.3",
+        "css-loader": "^6.7.1",
+        "customize-cra": "^1.0.0",
+        "nodemon": "^2.0.20",
+        "react-app-rewired": "^2.2.1",
+        "sass": "^1.51.0",
+        "sass-loader": "^12.6.0",
+        "ts-loader": "^9.3.0",
+        "ts-node": "^10.9.1",
+        "webpack": "^5.76.0",
+        "webpack-cli": "^4.9.2",
+        "webpack-dev-server": "^4.9.0"
+    }
+}

AdminDashboard/public/assets/fonts/rw-widgets/rw-widgets.svg

@@ -0,0 +1,24 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Copyright (C) 2017 by original authors @ fontello.com</metadata>
+<defs>
+<font id="rw-widgets" horiz-adv-x="1000" >
+<font-face font-family="rw-widgets" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" />
+<missing-glyph horiz-adv-x="1000" />
+<glyph glyph-name="up-dir" unicode="&#xe800;" d="M571 171q0-14-10-25t-25-10h-500q-15 0-25 10t-11 25 11 26l250 250q10 10 25 10t25-10l250-250q10-11 10-26z" horiz-adv-x="571.4" />
+
+<glyph glyph-name="search" unicode="&#xe801;" d="M643 386q0 103-73 176t-177 74-177-74-73-176 73-177 177-73 177 73 73 177z m286-465q0-29-22-50t-50-21q-30 0-50 21l-191 191q-100-69-223-69-80 0-153 31t-125 84-84 125-31 153 31 152 84 126 125 84 153 31 153-31 125-84 84-126 31-152q0-123-69-223l191-191q21-21 21-51z" horiz-adv-x="928.6" />
+
+<glyph glyph-name="down-dir" unicode="&#xe803;" d="M571 457q0-14-10-25l-250-250q-11-11-25-11t-25 11l-250 250q-11 11-11 25t11 25 25 11h500q14 0 25-11t10-25z" horiz-adv-x="571.4" />
+
+<glyph glyph-name="calendar" unicode="&#xe804;" d="M71-79h161v161h-161v-161z m197 0h178v161h-178v-161z m-197 197h161v178h-161v-178z m197 0h178v178h-178v-178z m-197 214h161v161h-161v-161z m411-411h179v161h-179v-161z m-214 411h178v161h-178v-161z m428-411h161v161h-161v-161z m-214 197h179v178h-179v-178z m-196 482v161q0 7-6 12t-12 6h-36q-7 0-12-6t-6-12v-161q0-7 6-13t12-5h36q7 0 12 5t6 13z m410-482h161v178h-161v-178z m-214 214h179v161h-179v-161z m214 0h161v161h-161v-161z m18 268v161q0 7-5 12t-13 6h-35q-7 0-13-6t-5-12v-161q0-7 5-13t13-5h35q8 0 13 5t5 13z m215 36v-715q0-29-22-50t-50-21h-786q-29 0-50 21t-21 50v715q0 29 21 50t50 21h72v54q0 37 26 63t63 26h36q37 0 63-26t26-63v-54h214v54q0 37 27 63t63 26h35q37 0 64-26t26-63v-54h71q29 0 50-21t22-50z" horiz-adv-x="928.6" />
+
+<glyph glyph-name="clock" unicode="&#xe805;" d="M500 546v-250q0-7-5-12t-13-5h-178q-8 0-13 5t-5 12v36q0 8 5 13t13 5h125v196q0 8 5 13t12 5h36q8 0 13-5t5-13z m232-196q0 83-41 152t-110 111-152 41-153-41-110-111-41-152 41-152 110-111 153-41 152 41 110 111 41 152z m125 0q0-117-57-215t-156-156-215-58-216 58-155 156-58 215 58 215 155 156 216 58 215-58 156-156 57-215z" horiz-adv-x="857.1" />
+
+<glyph glyph-name="angle-left" unicode="&#xf104;" d="M350 546q0-7-6-12l-219-220 219-219q6-6 6-13t-6-13l-28-28q-5-5-12-5t-13 5l-260 261q-6 5-6 12t6 13l260 260q5 6 13 6t12-6l28-28q6-5 6-13z" horiz-adv-x="357.1" />
+
+<glyph glyph-name="angle-right" unicode="&#xf105;" d="M332 314q0-7-5-12l-261-261q-5-5-12-5t-13 5l-28 28q-6 6-6 13t6 13l219 219-219 220q-6 5-6 12t6 13l28 28q5 6 13 6t12-6l261-260q5-5 5-13z" horiz-adv-x="357.1" />
+</font>
+</defs>
+</svg>

AdminDashboard/public/assets/img/favicons/browserconfig.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square150x150logo src="/mstile-150x150.png"/>
+            <TileColor>#121212</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>

AdminDashboard/public/assets/img/favicons/html_code.html

@@ -0,0 +1,9 @@
+<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
+<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
+<link rel="icon" type="image/png" sizes="194x194" href="/favicon-194x194.png">
+<link rel="icon" type="image/png" sizes="192x192" href="/android-chrome-192x192.png">
+<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
+<link rel="manifest" href="/site.webmanifest">
+<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
+<meta name="msapplication-TileColor" content="#121212">
+<meta name="theme-color" content="#121212">

AdminDashboard/public/assets/img/favicons/safari-pinned-tab.svg

@@ -0,0 +1,31 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="700.000000pt" height="700.000000pt" viewBox="0 0 700.000000 700.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.14, written by Peter Selinger 2001-2017
+</metadata>
+<g transform="translate(0.000000,700.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M864 4667 c-7 -19 2 -1540 9 -1567 4 -13 9 -42 12 -63 14 -91 70
+-225 138 -331 28 -44 106 -121 162 -162 103 -73 173 -100 368 -144 72 -16 315
+-4 402 19 268 72 459 246 551 498 31 85 41 129 59 253 5 34 10 1314 6 1482
+l-1 27 -210 -1 c-208 0 -210 0 -211 -22 0 -11 -2 -340 -4 -731 -1 -390 -5
+-728 -9 -750 -29 -182 -125 -315 -258 -361 -74 -26 -252 -26 -325 -1 -135 47
+-231 205 -249 409 -4 45 -8 391 -8 768 l-1 685 -213 2 c-154 1 -215 -2 -218
+-10z"/>
+<path d="M3663 4169 c-125 -14 -257 -70 -354 -149 l-46 -38 -38 40 c-68 69
+-161 105 -294 114 l-87 6 -42 -154 c-23 -84 -45 -167 -48 -184 l-6 -31 50 5
+c62 5 118 -12 134 -41 9 -17 13 -257 14 -992 1 -533 2 -972 3 -975 0 -3 94 -5
+208 -5 l208 1 0 359 c1 198 4 361 8 362 4 2 35 -10 69 -26 114 -51 159 -62
+283 -66 169 -7 323 46 454 155 310 258 414 756 241 1161 -131 309 -435 493
+-757 458z m169 -412 c75 -34 140 -102 182 -191 46 -97 60 -163 59 -286 0 -251
+-105 -431 -280 -483 -57 -17 -157 -16 -221 2 -44 12 -139 66 -181 102 l-25 20
+0 357 -1 357 30 28 c50 47 114 88 168 107 75 27 193 21 269 -13z"/>
+<path d="M4932 4013 c-18 -6 -35 -13 -36 -15 -24 -27 -26 -83 -26 -688 l0
+-642 29 -29 29 -29 650 0 649 0 26 25 c13 14 26 36 28 48 3 12 4 303 4 647 -1
+587 -2 627 -19 653 -10 15 -30 30 -43 33 -49 13 -1255 10 -1291 -3z"/>
+</g>
+</svg>