mirror of
https://github.com/OneUptime/oneuptime.git
synced 2026-04-06 00:32:12 +02:00
Merge branch 'master' into issue/50-common-types-api-test
This commit is contained in:
Simon Larsen
GitHub
21
.github/workflows/compile.alert.yaml
vendored
Normal file
21
.github/workflows/compile.alert.yaml
vendored
Normal file
@@ -0,0 +1,21 @@
|
||||
name: Compile Alert
|
||||
|
||||
on:
|
||||
push:
|
||||
branches-ignore:
|
||||
- 'hotfix-*'
|
||||
- 'release'
|
||||
- 'staging-release'
|
||||
|
||||
jobs:
|
||||
test:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/setup-node@v2
|
||||
with:
|
||||
check-latest: true
|
||||
- run: cd Common && npm install
|
||||
- run: cd CommonServer && npm install
|
||||
- run: cd Alert && npm install && npm run compile
|
||||
|
||||
2
.github/workflows/compile.api-docs.yaml
vendored
2
.github/workflows/compile.api-docs.yaml
vendored
@@ -8,7 +8,7 @@ on:
|
||||
- 'staging-release'
|
||||
|
||||
jobs:
|
||||
test:
|
||||
compile:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
|
||||
2
.github/workflows/compile.common-server.yaml
vendored
2
.github/workflows/compile.common-server.yaml
vendored
@@ -8,7 +8,7 @@ on:
|
||||
- 'staging-release'
|
||||
|
||||
jobs:
|
||||
test:
|
||||
compile:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
|
||||
20
.github/workflows/compile.common-ui.yaml
vendored
Normal file
20
.github/workflows/compile.common-ui.yaml
vendored
Normal file
@@ -0,0 +1,20 @@
|
||||
name: Compile UI Common
|
||||
|
||||
on:
|
||||
push:
|
||||
branches-ignore:
|
||||
- 'hotfix-*'
|
||||
- 'release'
|
||||
- 'staging-release'
|
||||
|
||||
jobs:
|
||||
compile:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/setup-node@v2
|
||||
with:
|
||||
check-latest: true
|
||||
- run: cd Common && npm install
|
||||
- run: cd CommonUI && npm install && npm run compile
|
||||
|
||||
2
.github/workflows/compile.common.yaml
vendored
2
.github/workflows/compile.common.yaml
vendored
@@ -8,7 +8,7 @@ on:
|
||||
- 'staging-release'
|
||||
|
||||
jobs:
|
||||
test:
|
||||
compile:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
|
||||
2
.github/workflows/compile.helmchart.yaml
vendored
2
.github/workflows/compile.helmchart.yaml
vendored
@@ -8,7 +8,7 @@ on:
|
||||
- 'staging-release'
|
||||
|
||||
jobs:
|
||||
test:
|
||||
compile:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
|
||||
2
.github/workflows/compile.home.yaml
vendored
2
.github/workflows/compile.home.yaml
vendored
@@ -8,7 +8,7 @@ on:
|
||||
- 'staging-release'
|
||||
|
||||
jobs:
|
||||
test:
|
||||
compile:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
|
||||
21
.github/workflows/compile.identity.yaml
vendored
Normal file
21
.github/workflows/compile.identity.yaml
vendored
Normal file
@@ -0,0 +1,21 @@
|
||||
name: Compile Identity
|
||||
|
||||
on:
|
||||
push:
|
||||
branches-ignore:
|
||||
- 'hotfix-*'
|
||||
- 'release'
|
||||
- 'staging-release'
|
||||
|
||||
jobs:
|
||||
compile:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/setup-node@v2
|
||||
with:
|
||||
check-latest: true
|
||||
- run: cd Common && npm install
|
||||
- run: cd CommonServer && npm install
|
||||
- run: cd Identity && npm install && npm run compile
|
||||
|
||||
21
.github/workflows/compile.integration.yaml
vendored
Normal file
21
.github/workflows/compile.integration.yaml
vendored
Normal file
@@ -0,0 +1,21 @@
|
||||
name: Compile Integration
|
||||
|
||||
on:
|
||||
push:
|
||||
branches-ignore:
|
||||
- 'hotfix-*'
|
||||
- 'release'
|
||||
- 'staging-release'
|
||||
|
||||
jobs:
|
||||
test:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/setup-node@v2
|
||||
with:
|
||||
check-latest: true
|
||||
- run: cd Common && npm install
|
||||
- run: cd CommonServer && npm install
|
||||
- run: cd Integration && npm install && npm run compile
|
||||
|
||||
20
.github/workflows/docker-build.alert.yaml
vendored
Normal file
20
.github/workflows/docker-build.alert.yaml
vendored
Normal file
@@ -0,0 +1,20 @@
|
||||
name: Mail Docker Build
|
||||
|
||||
on:
|
||||
push:
|
||||
branches-ignore:
|
||||
- 'hotfix-*'
|
||||
- 'release'
|
||||
- 'staging-release'
|
||||
|
||||
jobs:
|
||||
# define job to build docker image
|
||||
docker-build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
|
||||
# build image for mail service
|
||||
- name: build docker image
|
||||
run: npm run build-ci mail
|
||||
19
.github/workflows/docker-build.apidocs.yml
vendored
Normal file
19
.github/workflows/docker-build.apidocs.yml
vendored
Normal file
@@ -0,0 +1,19 @@
|
||||
name: ApiDocs Docker Build
|
||||
on:
|
||||
push:
|
||||
branches-ignore:
|
||||
- 'hotfix-*'
|
||||
- 'release'
|
||||
- 'staging-release'
|
||||
|
||||
jobs:
|
||||
# define jobs to build docker imag
|
||||
docker-build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
|
||||
# build image for home
|
||||
- name: build docker image
|
||||
run: npm run build-ci api-docs
|
||||
4
.github/workflows/docker-build.haraka.yaml
vendored
4
.github/workflows/docker-build.haraka.yaml
vendored
@@ -1,4 +1,4 @@
|
||||
name: haraka docker-build workflow
|
||||
name: Haraka Docker Build
|
||||
|
||||
on:
|
||||
push:
|
||||
@@ -9,7 +9,7 @@ on:
|
||||
|
||||
jobs:
|
||||
# define job to build docker image
|
||||
haraka-docker-build:
|
||||
docker-build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
|
||||
20
.github/workflows/docker-build.helm.yml
vendored
Normal file
20
.github/workflows/docker-build.helm.yml
vendored
Normal file
@@ -0,0 +1,20 @@
|
||||
name: HelmChart Docker Build
|
||||
|
||||
on:
|
||||
push:
|
||||
branches-ignore:
|
||||
- 'hotfix-*'
|
||||
- 'release'
|
||||
- 'staging-release'
|
||||
|
||||
jobs:
|
||||
# define jobs to build docker imag
|
||||
docker-build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
|
||||
# build image for home
|
||||
- name: build docker image
|
||||
run: npm run build-ci helmchart
|
||||
4
.github/workflows/docker-build.home.yaml
vendored
4
.github/workflows/docker-build.home.yaml
vendored
@@ -1,4 +1,4 @@
|
||||
name: Home docker-build workflow
|
||||
name: Home Docker Build
|
||||
|
||||
on:
|
||||
push:
|
||||
@@ -9,7 +9,7 @@ on:
|
||||
|
||||
jobs:
|
||||
# define jobs to build docker imag
|
||||
home-docker-build:
|
||||
docker-build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
|
||||
20
.github/workflows/docker-build.identity.yaml
vendored
Normal file
20
.github/workflows/docker-build.identity.yaml
vendored
Normal file
@@ -0,0 +1,20 @@
|
||||
name: Identity Docker Build
|
||||
|
||||
on:
|
||||
push:
|
||||
branches-ignore:
|
||||
- 'hotfix-*'
|
||||
- 'release'
|
||||
- 'staging-release'
|
||||
|
||||
jobs:
|
||||
# define job to build docker image
|
||||
docker-build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
|
||||
# build image for licensing
|
||||
- name: build docker image
|
||||
run: npm run build-ci identity
|
||||
20
.github/workflows/docker-build.integration.yaml
vendored
Normal file
20
.github/workflows/docker-build.integration.yaml
vendored
Normal file
@@ -0,0 +1,20 @@
|
||||
name: Integration Docker Build
|
||||
|
||||
on:
|
||||
push:
|
||||
branches-ignore:
|
||||
- 'hotfix-*'
|
||||
- 'release'
|
||||
- 'staging-release'
|
||||
|
||||
jobs:
|
||||
# define job to build docker image
|
||||
docker-build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
|
||||
# build image for licensing
|
||||
- name: build docker image
|
||||
run: npm run build-ci integration
|
||||
@@ -1,4 +1,4 @@
|
||||
name: Licensing docker-build workflow
|
||||
name: Licensing Docker Build
|
||||
|
||||
on:
|
||||
push:
|
||||
@@ -9,7 +9,7 @@ on:
|
||||
|
||||
jobs:
|
||||
# define job to build docker image
|
||||
licensing-docker-build:
|
||||
docker-build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
|
||||
4
.github/workflows/docker-build.mail.yaml
vendored
4
.github/workflows/docker-build.mail.yaml
vendored
@@ -1,4 +1,4 @@
|
||||
name: Mail docker-build workflow
|
||||
name: Mail Docker Build
|
||||
|
||||
on:
|
||||
push:
|
||||
@@ -9,7 +9,7 @@ on:
|
||||
|
||||
jobs:
|
||||
# define job to build docker image
|
||||
mail-docker-build:
|
||||
docker-build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
name: Probe-api docker-build workflow
|
||||
name: Probe-api Docker Build
|
||||
|
||||
on:
|
||||
push:
|
||||
@@ -9,7 +9,7 @@ on:
|
||||
|
||||
jobs:
|
||||
# define job to build docker image
|
||||
probe-api-docker-build:
|
||||
docker-build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
|
||||
20
.github/workflows/github-build.realtime.yaml
vendored
Normal file
20
.github/workflows/github-build.realtime.yaml
vendored
Normal file
@@ -0,0 +1,20 @@
|
||||
name: Realtime Docker Build
|
||||
|
||||
on:
|
||||
push:
|
||||
branches-ignore:
|
||||
- 'hotfix-*'
|
||||
- 'release'
|
||||
- 'staging-release'
|
||||
|
||||
jobs:
|
||||
# define jobs to build docker imag
|
||||
docker-build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
|
||||
# build image for home
|
||||
- name: build docker image
|
||||
run: npm run build-ci realtime
|
||||
@@ -4,7 +4,7 @@ on:
|
||||
pull_request:
|
||||
|
||||
jobs:
|
||||
auto-merge:
|
||||
merge:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
|
||||
36
.vscode/launch.json
vendored
36
.vscode/launch.json
vendored
@@ -70,6 +70,42 @@
|
||||
],
|
||||
"type": "pwa-node"
|
||||
},
|
||||
{
|
||||
"address": "0.0.0.0",
|
||||
"localRoot": "${workspaceFolder}/Identity",
|
||||
"name": "Identity: Debug with Docker",
|
||||
"port": 9132,
|
||||
"remoteRoot": "/usr/src/app",
|
||||
"request": "attach",
|
||||
"skipFiles": [
|
||||
"<node_internals>/**"
|
||||
],
|
||||
"type": "pwa-node"
|
||||
},
|
||||
{
|
||||
"address": "0.0.0.0",
|
||||
"localRoot": "${workspaceFolder}/Alert",
|
||||
"name": "Alert: Debug with Docker",
|
||||
"port": 9133,
|
||||
"remoteRoot": "/usr/src/app",
|
||||
"request": "attach",
|
||||
"skipFiles": [
|
||||
"<node_internals>/**"
|
||||
],
|
||||
"type": "pwa-node"
|
||||
},
|
||||
{
|
||||
"address": "0.0.0.0",
|
||||
"localRoot": "${workspaceFolder}/Alert",
|
||||
"name": "Integration: Debug with Docker",
|
||||
"port": 9134,
|
||||
"remoteRoot": "/usr/src/app",
|
||||
"request": "attach",
|
||||
"skipFiles": [
|
||||
"<node_internals>/**"
|
||||
],
|
||||
"type": "pwa-node"
|
||||
},
|
||||
{
|
||||
"address": "0.0.0.0",
|
||||
"localRoot": "${workspaceFolder}/licensing",
|
||||
|
||||
11199
Accounts/package-lock.json
generated
11199
Accounts/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -1,57 +1,52 @@
|
||||
{
|
||||
"name": "oneuptime-accounts",
|
||||
"version": "3.0.0",
|
||||
"private": true,
|
||||
"private": false,
|
||||
"homepage": "/",
|
||||
"type": "module",
|
||||
"dependencies": {
|
||||
"@loadable/component": "^5.15.2",
|
||||
"@stripe/react-stripe-js": "^1.7.0",
|
||||
"@stripe/stripe-js": "^1.25.0",
|
||||
"@stripe/react-stripe-js": "^1.7.2",
|
||||
"@stripe/stripe-js": "^1.29.0",
|
||||
"@types/compression": "^1.7.2",
|
||||
"@types/react-dom": "^17.0.14",
|
||||
"@types/react-redux": "^7.1.23",
|
||||
"@types/react-dom": "^17.0.2",
|
||||
"@types/react-redux": "^7.1.24",
|
||||
"@types/react-router-redux": "^5.0.21",
|
||||
"@types/redux-form": "^8.3.3",
|
||||
"@types/redux-form": "^8.3.5",
|
||||
"@types/redux-logger": "^3.0.9",
|
||||
"amplitude-js": "^8.17.0",
|
||||
"axios": "^0.26.1",
|
||||
"axios": "^0.27.2",
|
||||
"card-validator": "^8.1.1",
|
||||
"cli-table": "^0.3.11",
|
||||
"Common": "file:../Common",
|
||||
"CommonServer": "file:../CommonServer",
|
||||
"CommonUI": "file:../CommonUI",
|
||||
"compression": "^1.7.4",
|
||||
"express": "^4.17.3",
|
||||
"express": "^4.18.1",
|
||||
"faker": "^6.6.6",
|
||||
"file-saver": "^2.0.5",
|
||||
"history": "^5.3.0",
|
||||
"jest": "^27.5.1",
|
||||
"jest": "^28.1.0",
|
||||
"prop-types": "^15.8.1",
|
||||
"puppeteer": "^13.5.1",
|
||||
"puppeteer": "^13.7.0",
|
||||
"query-string": "^7.1.1",
|
||||
"react": "^17.0.2",
|
||||
"react-awesome-reveal": "^3.8.1",
|
||||
"react-dom": "^17.0.2",
|
||||
"react-frontload": "^2.0.0",
|
||||
"react-ga": "^3.3.0",
|
||||
"react-redux": "^7.2.6",
|
||||
"react-router-dom": "^6.2.2",
|
||||
"react-redux": "^8.0.1",
|
||||
"react-router-dom": "^6.3.0",
|
||||
"react-router-redux": "^4.0.8",
|
||||
"react-scripts": "^5.0.0",
|
||||
"redux": "^4.1.2",
|
||||
"redux-form": "^8.3.8",
|
||||
"redux-logger": "^3.0.6",
|
||||
"redux-thunk": "^2.4.1",
|
||||
"react-scripts": "^5.0.1",
|
||||
"sane-email-validation": "^3.0.1",
|
||||
"universal-cookie": "^4.0.4",
|
||||
"uuid": "^8.3.2",
|
||||
"valid-url": "^1.0.9",
|
||||
"workbox-build": "^6.5.1"
|
||||
"workbox-build": "^6.5.3"
|
||||
},
|
||||
"scripts": {
|
||||
"dev": "PORT=3003 react-scripts --openssl-legacy-provider start",
|
||||
"build": "react-scripts --openssl-legacy-provider build && npm run build-sw",
|
||||
"dev": "PORT=3003 react-scripts start",
|
||||
"build": "react-scripts build && npm run build-sw",
|
||||
"build-sw": "node ./src/sw-build.js",
|
||||
"compile": "tsc",
|
||||
"test": "jest --forceExit --runInBand ./src/test/*.test.js",
|
||||
@@ -65,7 +60,7 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"chrome-launcher": "^0.15.0",
|
||||
"commander": "^9.1.0",
|
||||
"commander": "^9.2.0",
|
||||
"depcheck": "^1.4.3",
|
||||
"lighthouse": "^9.5.0",
|
||||
"npm-force-resolutions": "0.0.10",
|
||||
|
||||
@@ -9166,7 +9166,7 @@ html .modal-dialog-view .modal_overlay {
|
||||
.modal-dialog-view div.modal div.modal-content div.arrow {
|
||||
height: 16px;
|
||||
margin-bottom: 15px;
|
||||
background: url('merch/modal/arrow-eff2ff05526fbdf74fb6560dc6713935.png') 50%
|
||||
background: url('merch/Modal/arrow-eff2ff05526fbdf74fb6560dc6713935.png') 50%
|
||||
0 no-repeat;
|
||||
}
|
||||
.modal-dialog-view div.modal div.modal-content form p {
|
||||
@@ -14715,7 +14715,7 @@ div.is-pre-order div.checkbox-field-view label.default-label {
|
||||
.account-settings-view div.arrow {
|
||||
height: 16px;
|
||||
margin-bottom: 15px;
|
||||
background: url('merch/modal/arrow-eff2ff05526fbdf74fb6560dc6713935.png') 50%
|
||||
background: url('merch/Modal/arrow-eff2ff05526fbdf74fb6560dc6713935.png') 50%
|
||||
0 no-repeat;
|
||||
}
|
||||
.account-settings-view form p {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
import BackendAPI from 'CommonUI/src/utils/api/backend';
|
||||
import BackendAPI from 'CommonUI/src/Utils/API/Backend';
|
||||
import { Dispatch } from 'redux';
|
||||
import Route from 'Common/Types/api/route';
|
||||
import * as types from '../constants/changePassword';
|
||||
import ErrorPayload from 'CommonUI/src/payload-types/error';
|
||||
import ErrorPayload from 'CommonUI/src/PayloadTypes/error';
|
||||
|
||||
export const changePasswordRequest: Function = (promise: $TSFixMe): void => {
|
||||
return {
|
||||
@@ -7,7 +7,7 @@ import { getQueryVar } from '../config';
|
||||
import { resendToken } from './resendToken';
|
||||
import Cookies from 'universal-cookie';
|
||||
import store from '../store';
|
||||
import ErrorPayload from 'CommonUI/src/payload-types/error';
|
||||
import ErrorPayload from 'CommonUI/src/PayloadTypes/error';
|
||||
/*
|
||||
* There are three possible states for our login
|
||||
* Process and we need actions for each of them
|
||||
@@ -5,7 +5,7 @@ import * as types from '../constants/register';
|
||||
import Route from 'Common/Types/api/route';
|
||||
import { IS_SAAS_SERVICE } from '../config';
|
||||
import Cookies from 'universal-cookie';
|
||||
import ErrorPayload from 'CommonUI/src/payload-types/error';
|
||||
import ErrorPayload from 'CommonUI/src/PayloadTypes/error';
|
||||
|
||||
/*
|
||||
* There are three possible states for our login
|
||||
@@ -2,7 +2,7 @@ import BackendAPI from 'CommonUI/src/utils/api/backend';
|
||||
import { Dispatch } from 'redux';
|
||||
import * as types from '../constants/resendToken';
|
||||
import Route from 'Common/Types/api/route';
|
||||
import ErrorPayload from 'CommonUI/src/payload-types/error';
|
||||
import ErrorPayload from 'CommonUI/src/PayloadTypes/error';
|
||||
|
||||
export const resendTokenRequest: Function = (promise: $TSFixMe): void => {
|
||||
return {
|
||||
@@ -2,7 +2,7 @@ import BackendAPI from 'CommonUI/src/utils/api/backend';
|
||||
import { Dispatch } from 'redux';
|
||||
import * as types from '../constants/resetPassword';
|
||||
import Route from 'Common/Types/api/route';
|
||||
import ErrorPayload from 'CommonUI/src/payload-types/error';
|
||||
import ErrorPayload from 'CommonUI/src/PayloadTypes/error';
|
||||
|
||||
/*
|
||||
* There are three possible states for our resetPassword
|
||||
@@ -9,8 +9,8 @@ import { Fade } from 'react-awesome-reveal';
|
||||
import { RenderField } from '../basic/RenderField';
|
||||
import { PricingPlan, Validate, env } from '../../config';
|
||||
import { ButtonSpinner } from '../basic/Loader.js';
|
||||
import { openModal, closeModal } from 'CommonUI/actions/modal';
|
||||
import ExtraCharge from '../modals/ExtraCharge';
|
||||
import { openModal, closeModal } from 'CommonUI/actions/Modal';
|
||||
import ExtraCharge from '../Modals/ExtraCharge';
|
||||
|
||||
|
||||
import { v4 as uuidv4 } from 'uuid';
|
||||
@@ -21,7 +21,6 @@ import {
|
||||
injectStripe,
|
||||
StripeProvider,
|
||||
Elements,
|
||||
|
||||
} from '@stripe/react-stripe-js';
|
||||
import {
|
||||
addCard,
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
export const companySize: $TSFixMe = [
|
||||
{ name: '1-10', code: '1-10' },
|
||||
{ name: '11-50', code: '11-50' },
|
||||
{ name: '51-200', code: '51-200' },
|
||||
{ name: '200-1000', code: '200-1000' },
|
||||
{ name: '1000+', code: '1000+' },
|
||||
];
|
||||
@@ -1,245 +0,0 @@
|
||||
export const countries: $TSFixMe = [
|
||||
{ name: 'Afghanistan', code: 'AF' },
|
||||
{ name: 'Åland Islands', code: 'AX' },
|
||||
{ name: 'Albania', code: 'AL' },
|
||||
{ name: 'Algeria', code: 'DZ' },
|
||||
{ name: 'American Samoa', code: 'AS' },
|
||||
{ name: 'Andorra', code: 'AD' },
|
||||
{ name: 'Angola', code: 'AO' },
|
||||
{ name: 'Anguilla', code: 'AI' },
|
||||
{ name: 'Antarctica', code: 'AQ' },
|
||||
{ name: 'Antigua and Barbuda', code: 'AG' },
|
||||
{ name: 'Argentina', code: 'AR' },
|
||||
{ name: 'Armenia', code: 'AM' },
|
||||
{ name: 'Aruba', code: 'AW' },
|
||||
{ name: 'Australia', code: 'AU' },
|
||||
{ name: 'Austria', code: 'AT' },
|
||||
{ name: 'Azerbaijan', code: 'AZ' },
|
||||
{ name: 'Bahamas', code: 'BS' },
|
||||
{ name: 'Bahrain', code: 'BH' },
|
||||
{ name: 'Bangladesh', code: 'BD' },
|
||||
{ name: 'Barbados', code: 'BB' },
|
||||
{ name: 'Belarus', code: 'BY' },
|
||||
{ name: 'Belgium', code: 'BE' },
|
||||
{ name: 'Belize', code: 'BZ' },
|
||||
{ name: 'Benin', code: 'BJ' },
|
||||
{ name: 'Bermuda', code: 'BM' },
|
||||
{ name: 'Bhutan', code: 'BT' },
|
||||
{ name: 'Bolivia', code: 'BO' },
|
||||
{ name: 'Bosnia and Herzegovina', code: 'BA' },
|
||||
{ name: 'Botswana', code: 'BW' },
|
||||
{ name: 'Bouvet Island', code: 'BV' },
|
||||
{ name: 'Brazil', code: 'BR' },
|
||||
{ name: 'British Indian Ocean Territory', code: 'IO' },
|
||||
{ name: 'Brunei Darussalam', code: 'BN' },
|
||||
{ name: 'Bulgaria', code: 'BG' },
|
||||
{ name: 'Burkina Faso', code: 'BF' },
|
||||
{ name: 'Burundi', code: 'BI' },
|
||||
{ name: 'Cambodia', code: 'KH' },
|
||||
{ name: 'Cameroon', code: 'CM' },
|
||||
{ name: 'Canada', code: 'CA' },
|
||||
{ name: 'Cape Verde', code: 'CV' },
|
||||
{ name: 'Cayman Islands', code: 'KY' },
|
||||
{ name: 'Central African Republic', code: 'CF' },
|
||||
{ name: 'Chad', code: 'TD' },
|
||||
{ name: 'Chile', code: 'CL' },
|
||||
{ name: 'China', code: 'CN' },
|
||||
{ name: 'Christmas Island', code: 'CX' },
|
||||
{ name: 'Cocos (Keeling) Islands', code: 'CC' },
|
||||
{ name: 'Colombia', code: 'CO' },
|
||||
{ name: 'Comoros', code: 'KM' },
|
||||
{ name: 'Congo', code: 'CG' },
|
||||
{ name: 'Congo, The Democratic Republic of the', code: 'CD' },
|
||||
{ name: 'Cook Islands', code: 'CK' },
|
||||
{ name: 'Costa Rica', code: 'CR' },
|
||||
{ name: "Cote d'Ivoire", code: 'CI' },
|
||||
{ name: 'Croatia', code: 'HR' },
|
||||
{ name: 'Cuba', code: 'CU' },
|
||||
{ name: 'Cyprus', code: 'CY' },
|
||||
{ name: 'Czech Republic', code: 'CZ' },
|
||||
{ name: 'Denmark', code: 'DK' },
|
||||
{ name: 'Djibouti', code: 'DJ' },
|
||||
{ name: 'Dominica', code: 'DM' },
|
||||
{ name: 'Dominican Republic', code: 'DO' },
|
||||
{ name: 'Ecuador', code: 'EC' },
|
||||
{ name: 'Egypt', code: 'EG' },
|
||||
{ name: 'El Salvador', code: 'SV' },
|
||||
{ name: 'Equatorial Guinea', code: 'GQ' },
|
||||
{ name: 'Eritrea', code: 'ER' },
|
||||
{ name: 'Estonia', code: 'EE' },
|
||||
{ name: 'Ethiopia', code: 'ET' },
|
||||
{ name: 'Falkland Islands (Malvinas)', code: 'FK' },
|
||||
{ name: 'Faroe Islands', code: 'FO' },
|
||||
{ name: 'Fiji', code: 'FJ' },
|
||||
{ name: 'Finland', code: 'FI' },
|
||||
{ name: 'France', code: 'FR' },
|
||||
{ name: 'French Guiana', code: 'GF' },
|
||||
{ name: 'French Polynesia', code: 'PF' },
|
||||
{ name: 'French Southern Territories', code: 'TF' },
|
||||
{ name: 'Gabon', code: 'GA' },
|
||||
{ name: 'Gambia', code: 'GM' },
|
||||
{ name: 'Georgia', code: 'GE' },
|
||||
{ name: 'Germany', code: 'DE' },
|
||||
{ name: 'Ghana', code: 'GH' },
|
||||
{ name: 'Gibraltar', code: 'GI' },
|
||||
{ name: 'Greece', code: 'GR' },
|
||||
{ name: 'Greenland', code: 'GL' },
|
||||
{ name: 'Grenada', code: 'GD' },
|
||||
{ name: 'Guadeloupe', code: 'GP' },
|
||||
{ name: 'Guam', code: 'GU' },
|
||||
{ name: 'Guatemala', code: 'GT' },
|
||||
{ name: 'Guernsey', code: 'GG' },
|
||||
{ name: 'Guinea', code: 'GN' },
|
||||
{ name: 'Guinea-Bissau', code: 'GW' },
|
||||
{ name: 'Guyana', code: 'GY' },
|
||||
{ name: 'Haiti', code: 'HT' },
|
||||
{ name: 'Heard Island and Mcdonald Islands', code: 'HM' },
|
||||
{ name: 'Holy See (Vatican City State)', code: 'VA' },
|
||||
{ name: 'Honduras', code: 'HN' },
|
||||
{ name: 'Hong Kong', code: 'HK' },
|
||||
{ name: 'Hungary', code: 'HU' },
|
||||
{ name: 'Iceland', code: 'IS' },
|
||||
{ name: 'India', code: 'IN' },
|
||||
{ name: 'Indonesia', code: 'ID' },
|
||||
{ name: 'Iran, Islamic Republic Of', code: 'IR' },
|
||||
{ name: 'Iraq', code: 'IQ' },
|
||||
{ name: 'Ireland', code: 'IE' },
|
||||
{ name: 'Isle of Man', code: 'IM' },
|
||||
{ name: 'Israel', code: 'IL' },
|
||||
{ name: 'Italy', code: 'IT' },
|
||||
{ name: 'Jamaica', code: 'JM' },
|
||||
{ name: 'Japan', code: 'JP' },
|
||||
{ name: 'Jersey', code: 'JE' },
|
||||
{ name: 'Jordan', code: 'JO' },
|
||||
{ name: 'Kazakhstan', code: 'KZ' },
|
||||
{ name: 'Kenya', code: 'KE' },
|
||||
{ name: 'Kiribati', code: 'KI' },
|
||||
{ name: "Korea, Democratic People's Republic of", code: 'KP' },
|
||||
{ name: 'Korea, Republic of', code: 'KR' },
|
||||
{ name: 'Kuwait', code: 'KW' },
|
||||
{ name: 'Kyrgyzstan', code: 'KG' },
|
||||
{ name: "Lao People's Democratic Republic", code: 'LA' },
|
||||
{ name: 'Latvia', code: 'LV' },
|
||||
{ name: 'Lebanon', code: 'LB' },
|
||||
{ name: 'Lesotho', code: 'LS' },
|
||||
{ name: 'Liberia', code: 'LR' },
|
||||
{ name: 'Libyan Arab Jamahiriya', code: 'LY' },
|
||||
{ name: 'Liechtenstein', code: 'LI' },
|
||||
{ name: 'Lithuania', code: 'LT' },
|
||||
{ name: 'Luxembourg', code: 'LU' },
|
||||
{ name: 'Macao', code: 'MO' },
|
||||
{ name: 'Macedonia, The Former Yugoslav Republic of', code: 'MK' },
|
||||
{ name: 'Madagascar', code: 'MG' },
|
||||
{ name: 'Malawi', code: 'MW' },
|
||||
{ name: 'Malaysia', code: 'MY' },
|
||||
{ name: 'Maldives', code: 'MV' },
|
||||
{ name: 'Mali', code: 'ML' },
|
||||
{ name: 'Malta', code: 'MT' },
|
||||
{ name: 'Marshall Islands', code: 'MH' },
|
||||
{ name: 'Martinique', code: 'MQ' },
|
||||
{ name: 'Mauritania', code: 'MR' },
|
||||
{ name: 'Mauritius', code: 'MU' },
|
||||
{ name: 'Mayotte', code: 'YT' },
|
||||
{ name: 'Mexico', code: 'MX' },
|
||||
{ name: 'Micronesia, Federated States of', code: 'FM' },
|
||||
{ name: 'Moldova, Republic of', code: 'MD' },
|
||||
{ name: 'Monaco', code: 'MC' },
|
||||
{ name: 'Mongolia', code: 'MN' },
|
||||
{ name: 'Montserrat', code: 'MS' },
|
||||
{ name: 'Morocco', code: 'MA' },
|
||||
{ name: 'Mozambique', code: 'MZ' },
|
||||
{ name: 'Myanmar', code: 'MM' },
|
||||
{ name: 'Namibia', code: 'NA' },
|
||||
{ name: 'Nauru', code: 'NR' },
|
||||
{ name: 'Nepal', code: 'NP' },
|
||||
{ name: 'Netherlands', code: 'NL' },
|
||||
{ name: 'Netherlands Antilles', code: 'AN' },
|
||||
{ name: 'New Caledonia', code: 'NC' },
|
||||
{ name: 'New Zealand', code: 'NZ' },
|
||||
{ name: 'Nicaragua', code: 'NI' },
|
||||
{ name: 'Niger', code: 'NE' },
|
||||
{ name: 'Nigeria', code: 'NG' },
|
||||
{ name: 'Niue', code: 'NU' },
|
||||
{ name: 'Norfolk Island', code: 'NF' },
|
||||
{ name: 'Northern Mariana Islands', code: 'MP' },
|
||||
{ name: 'Norway', code: 'NO' },
|
||||
{ name: 'Oman', code: 'OM' },
|
||||
{ name: 'Pakistan', code: 'PK' },
|
||||
{ name: 'Palau', code: 'PW' },
|
||||
{ name: 'Palestinian Territory, Occupied', code: 'PS' },
|
||||
{ name: 'Panama', code: 'PA' },
|
||||
{ name: 'Papua New Guinea', code: 'PG' },
|
||||
{ name: 'Paraguay', code: 'PY' },
|
||||
{ name: 'Peru', code: 'PE' },
|
||||
{ name: 'Philippines', code: 'PH' },
|
||||
{ name: 'Pitcairn', code: 'PN' },
|
||||
{ name: 'Poland', code: 'PL' },
|
||||
{ name: 'Portugal', code: 'PT' },
|
||||
{ name: 'Puerto Rico', code: 'PR' },
|
||||
{ name: 'Qatar', code: 'QA' },
|
||||
{ name: 'Reunion', code: 'RE' },
|
||||
{ name: 'Romania', code: 'RO' },
|
||||
{ name: 'Russian Federation', code: 'RU' },
|
||||
{ name: 'RWANDA', code: 'RW' },
|
||||
{ name: 'Saint Helena', code: 'SH' },
|
||||
{ name: 'Saint Kitts and Nevis', code: 'KN' },
|
||||
{ name: 'Saint Lucia', code: 'LC' },
|
||||
{ name: 'Saint Pierre and Miquelon', code: 'PM' },
|
||||
{ name: 'Saint Vincent and the Grenadines', code: 'VC' },
|
||||
{ name: 'Samoa', code: 'WS' },
|
||||
{ name: 'San Marino', code: 'SM' },
|
||||
{ name: 'Sao Tome and Principe', code: 'ST' },
|
||||
{ name: 'Saudi Arabia', code: 'SA' },
|
||||
{ name: 'Senegal', code: 'SN' },
|
||||
{ name: 'Serbia and Montenegro', code: 'CS' },
|
||||
{ name: 'Seychelles', code: 'SC' },
|
||||
{ name: 'Sierra Leone', code: 'SL' },
|
||||
{ name: 'Singapore', code: 'SG' },
|
||||
{ name: 'Slovakia', code: 'SK' },
|
||||
{ name: 'Slovenia', code: 'SI' },
|
||||
{ name: 'Solomon Islands', code: 'SB' },
|
||||
{ name: 'Somalia', code: 'SO' },
|
||||
{ name: 'South Africa', code: 'ZA' },
|
||||
{ name: 'South Georgia and the South Sandwich Islands', code: 'GS' },
|
||||
{ name: 'Spain', code: 'ES' },
|
||||
{ name: 'Sri Lanka', code: 'LK' },
|
||||
{ name: 'Sudan', code: 'SD' },
|
||||
{ name: 'Suriname', code: 'SR' },
|
||||
{ name: 'Svalbard and Jan Mayen', code: 'SJ' },
|
||||
{ name: 'Swaziland', code: 'SZ' },
|
||||
{ name: 'Sweden', code: 'SE' },
|
||||
{ name: 'Switzerland', code: 'CH' },
|
||||
{ name: 'Syrian Arab Republic', code: 'SY' },
|
||||
{ name: 'Taiwan, Province of China', code: 'TW' },
|
||||
{ name: 'Tajikistan', code: 'TJ' },
|
||||
{ name: 'Tanzania, United Republic of', code: 'TZ' },
|
||||
{ name: 'Thailand', code: 'TH' },
|
||||
{ name: 'Timor-Leste', code: 'TL' },
|
||||
{ name: 'Togo', code: 'TG' },
|
||||
{ name: 'Tokelau', code: 'TK' },
|
||||
{ name: 'Tonga', code: 'TO' },
|
||||
{ name: 'Trinidad and Tobago', code: 'TT' },
|
||||
{ name: 'Tunisia', code: 'TN' },
|
||||
{ name: 'Turkey', code: 'TR' },
|
||||
{ name: 'Turkmenistan', code: 'TM' },
|
||||
{ name: 'Turks and Caicos Islands', code: 'TC' },
|
||||
{ name: 'Tuvalu', code: 'TV' },
|
||||
{ name: 'Uganda', code: 'UG' },
|
||||
{ name: 'Ukraine', code: 'UA' },
|
||||
{ name: 'United Arab Emirates', code: 'AE' },
|
||||
{ name: 'United Kingdom', code: 'GB' },
|
||||
{ name: 'United States', code: 'US' },
|
||||
{ name: 'United States Minor Outlying Islands', code: 'UM' },
|
||||
{ name: 'Uruguay', code: 'UY' },
|
||||
{ name: 'Uzbekistan', code: 'UZ' },
|
||||
{ name: 'Vanuatu', code: 'VU' },
|
||||
{ name: 'Venezuela', code: 'VE' },
|
||||
{ name: 'Viet Nam', code: 'VN' },
|
||||
{ name: 'Virgin Islands, British', code: 'VG' },
|
||||
{ name: 'Virgin Islands, U.S.', code: 'VI' },
|
||||
{ name: 'Wallis and Futuna', code: 'WF' },
|
||||
{ name: 'Western Sahara', code: 'EH' },
|
||||
{ name: 'Yemen', code: 'YE' },
|
||||
{ name: 'Zambia', code: 'ZM' },
|
||||
{ name: 'Zimbabwe', code: 'ZW' },
|
||||
];
|
||||
@@ -1,7 +1,7 @@
|
||||
import PropTypes from 'prop-types';
|
||||
import React from 'react';
|
||||
import { connect } from 'react-redux';
|
||||
import { closeModal } from 'CommonUI/actions/modal';
|
||||
import { closeModal } from 'CommonUI/actions/Modal';
|
||||
import { bindActionCreators, Dispatch } from 'redux';
|
||||
|
||||
interface ExtraChargeProps {
|
||||
|
||||
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
|
||||
import { bindActionCreators, Dispatch } from 'redux';
|
||||
import { connect } from 'react-redux';
|
||||
import Modal from '../components/Modal';
|
||||
import { closeModal } from '../actions/modal';
|
||||
import { closeModal } from '../actions/Modal';
|
||||
|
||||
interface ModalsProps {
|
||||
modals: unknown[];
|
||||
|
||||
@@ -11,6 +11,7 @@ import './index.css';
|
||||
if (!isApiServer) {
|
||||
ReactGA.initialize('UA-115085157-1');
|
||||
}
|
||||
|
||||
const target: $TSFixMe = document.getElementById('root');
|
||||
|
||||
render(
|
||||
7
Accounts/src/Reducers/ChangePassword.ts
Executable file
7
Accounts/src/Reducers/ChangePassword.ts
Executable file
@@ -0,0 +1,7 @@
|
||||
import ApiBase from 'CommonUI/src/Reducers/ApiBase';
|
||||
|
||||
export default class ChangePassword extends ApiBase {
|
||||
public constructor() {
|
||||
super('ChangePassword');
|
||||
}
|
||||
}
|
||||
25
Accounts/src/Reducers/Index.ts
Executable file
25
Accounts/src/Reducers/Index.ts
Executable file
@@ -0,0 +1,25 @@
|
||||
import { combineReducers } from 'redux';
|
||||
import Action from 'CommonUI/src/Types/Action';
|
||||
import { routerReducer } from 'react-router-redux';
|
||||
import Login from './Login';
|
||||
import Register from './Register';
|
||||
import { RootState } from '../store';
|
||||
import Modal from 'CommonUI/src/Reducers/Modal';
|
||||
import ResetPassword from './ResetPassword';
|
||||
import ChangePassword from './ChangePassword';
|
||||
import ResendToken from './ResendVerifyEmail';
|
||||
|
||||
export default (state: RootState, action: Action): void => {
|
||||
if (action.type === 'CLEAR_STORE') {
|
||||
state = undefined;
|
||||
}
|
||||
return combineReducers({
|
||||
Routing: routerReducer,
|
||||
Modal: Modal,
|
||||
Login: new Login().getReducer(),
|
||||
Register: new Register().getReducer(),
|
||||
ResetPassword: new ResetPassword().getReducer(),
|
||||
ChangePassword: new ChangePassword().getReducer(),
|
||||
ResendToken: new ResendToken().getReducer(),
|
||||
})(state, action);
|
||||
};
|
||||
7
Accounts/src/Reducers/Login.ts
Executable file
7
Accounts/src/Reducers/Login.ts
Executable file
@@ -0,0 +1,7 @@
|
||||
import ApiBase from 'CommonUI/src/Reducers/ApiBase';
|
||||
|
||||
export default class ChangePassword extends ApiBase {
|
||||
public constructor() {
|
||||
super('Login');
|
||||
}
|
||||
}
|
||||
7
Accounts/src/Reducers/Register.ts
Executable file
7
Accounts/src/Reducers/Register.ts
Executable file
@@ -0,0 +1,7 @@
|
||||
import ApiBase from 'CommonUI/src/Reducers/ApiBase';
|
||||
|
||||
export default class ChangePassword extends ApiBase {
|
||||
public constructor() {
|
||||
super('Register');
|
||||
}
|
||||
}
|
||||
7
Accounts/src/Reducers/ResendVerifyEmail.ts
Executable file
7
Accounts/src/Reducers/ResendVerifyEmail.ts
Executable file
@@ -0,0 +1,7 @@
|
||||
import ApiBase from 'CommonUI/src/Reducers/ApiBase';
|
||||
|
||||
export default class ResendVerifyEmail extends ApiBase {
|
||||
public constructor() {
|
||||
super('ResendVerifyEmail');
|
||||
}
|
||||
}
|
||||
7
Accounts/src/Reducers/ResetPassword.ts
Executable file
7
Accounts/src/Reducers/ResetPassword.ts
Executable file
@@ -0,0 +1,7 @@
|
||||
import ApiBase from 'CommonUI/src/Reducers/ApiBase';
|
||||
|
||||
export default class ResetPassword extends ApiBase {
|
||||
public constructor() {
|
||||
super('ResetPassword');
|
||||
}
|
||||
}
|
||||
@@ -1,48 +0,0 @@
|
||||
import * as types from '../constants/changePassword';
|
||||
|
||||
/*
|
||||
* The auth reducer. The starting state sets authentication
|
||||
* Based on a token being in local storage. In a real app,
|
||||
* We would also want a util to check if the token is expired.
|
||||
*/
|
||||
|
||||
import Action from 'CommonUI/src/types/action';
|
||||
|
||||
const initialState: $TSFixMe = {
|
||||
requesting: false,
|
||||
error: null,
|
||||
success: false,
|
||||
};
|
||||
|
||||
export default function register(
|
||||
state: $TSFixMe = initialState,
|
||||
action: Action
|
||||
): void {
|
||||
switch (action.type) {
|
||||
case types.CHANGEPASSWORD_REQUEST:
|
||||
return Object.assign({}, state, {
|
||||
requesting: true,
|
||||
error: null,
|
||||
});
|
||||
|
||||
case types.CHANGEPASSWORD_SUCCESS:
|
||||
return Object.assign({}, state, {
|
||||
requesting: false,
|
||||
success: true,
|
||||
error: null,
|
||||
});
|
||||
|
||||
case types.CHANGEPASSWORD_FAILED:
|
||||
return Object.assign({}, state, {
|
||||
requesting: false,
|
||||
success: false,
|
||||
error: action.payload,
|
||||
});
|
||||
|
||||
case types.RESET_CHANGEPASSWORD:
|
||||
return Object.assign({}, state, initialState);
|
||||
|
||||
default:
|
||||
return state;
|
||||
}
|
||||
}
|
||||
@@ -1,29 +0,0 @@
|
||||
import { combineReducers } from 'redux';
|
||||
import Action from 'CommonUI/src/types/action';
|
||||
import { routerReducer } from 'react-router-redux';
|
||||
import login from './login';
|
||||
import register from './register';
|
||||
import { RootState } from '../store';
|
||||
import { reducer as formReducer } from 'redux-form';
|
||||
import modal from 'CommonUI/src/reducers/modal';
|
||||
import resetPassword from './resetPassword';
|
||||
import changePassword from './changePassword';
|
||||
import resendToken from './resendToken';
|
||||
|
||||
const appReducer: $TSFixMe = combineReducers({
|
||||
routing: routerReducer,
|
||||
login,
|
||||
register,
|
||||
form: formReducer,
|
||||
modal,
|
||||
resetPassword,
|
||||
changePassword,
|
||||
resendToken,
|
||||
});
|
||||
|
||||
export default (state: RootState, action: Action): void => {
|
||||
if (action.type === 'CLEAR_STORE') {
|
||||
state = undefined;
|
||||
}
|
||||
return appReducer(state, action);
|
||||
};
|
||||
@@ -1,211 +0,0 @@
|
||||
import {
|
||||
LOGIN_REQUEST,
|
||||
LOGIN_SUCCESS,
|
||||
LOGIN_FAILED,
|
||||
RESET_LOGIN,
|
||||
SAVE_STATUS_PAGE,
|
||||
CHANGE_LOGIN,
|
||||
AUTH_VERIFICATION_FAILED,
|
||||
AUTH_VERIFICATION_REQUEST,
|
||||
AUTH_VERIFICATION_SUCCESS,
|
||||
RESET_AUTH_VERIFICATION,
|
||||
BACKUP_CODE_VERIFICATION_FAILED,
|
||||
BACKUP_CODE_VERIFICATION_REQUEST,
|
||||
BACKUP_CODE_VERIFICATION_SUCCESS,
|
||||
RESET_BACKUP_CODE_VERIFICATION,
|
||||
MASTER_ADMIN_EXISTS_REQUEST,
|
||||
MASTER_ADMIN_EXISTS_FAILED,
|
||||
MASTER_ADMIN_EXISTS_SUCCESS,
|
||||
RESET_MASTER_ADMIN_EXISTS,
|
||||
LOGIN_STATE,
|
||||
} from '../constants/login';
|
||||
|
||||
/*
|
||||
* The auth reducer. The starting state sets authentication
|
||||
* Based on a token being in local storage. In a real app,
|
||||
* We would also want a util to check if the token is expired.
|
||||
*/
|
||||
|
||||
import Action from 'CommonUI/src/types/action';
|
||||
|
||||
const initialState: $TSFixMe = {
|
||||
requesting: false,
|
||||
user: {},
|
||||
error: null,
|
||||
success: false,
|
||||
statusPageLogin: false,
|
||||
statusPageURL: null,
|
||||
authToken: {
|
||||
requesting: false,
|
||||
error: null,
|
||||
success: false,
|
||||
},
|
||||
backupCode: {
|
||||
requesting: false,
|
||||
error: null,
|
||||
success: false,
|
||||
},
|
||||
masterAdmin: {
|
||||
exists: null,
|
||||
requesting: false,
|
||||
error: null,
|
||||
success: false,
|
||||
},
|
||||
loginMethod: 'standard',
|
||||
};
|
||||
|
||||
export default function register(
|
||||
state: $TSFixMe = initialState,
|
||||
action: Action
|
||||
): void {
|
||||
switch (action.type) {
|
||||
case CHANGE_LOGIN:
|
||||
return Object.assign({}, state, {
|
||||
loginMethod: action.payload,
|
||||
});
|
||||
case LOGIN_REQUEST:
|
||||
return Object.assign({}, state, {
|
||||
requesting: true,
|
||||
error: null,
|
||||
});
|
||||
case LOGIN_SUCCESS:
|
||||
return Object.assign({}, state, {
|
||||
requesting: false,
|
||||
success: true,
|
||||
error: null,
|
||||
user: action.payload,
|
||||
});
|
||||
case LOGIN_FAILED:
|
||||
return Object.assign({}, state, {
|
||||
requesting: false,
|
||||
success: false,
|
||||
error: action.payload,
|
||||
});
|
||||
case LOGIN_STATE:
|
||||
return Object.assign({}, state, {
|
||||
requesting: false,
|
||||
success: false,
|
||||
error: state.error,
|
||||
user: action.payload,
|
||||
});
|
||||
case RESET_LOGIN:
|
||||
return Object.assign({}, state, initialState);
|
||||
|
||||
case MASTER_ADMIN_EXISTS_REQUEST:
|
||||
return Object.assign({}, state, {
|
||||
masterAdmin: {
|
||||
...state.masterAdmin,
|
||||
requesting: true,
|
||||
error: null,
|
||||
},
|
||||
});
|
||||
|
||||
case MASTER_ADMIN_EXISTS_SUCCESS:
|
||||
return Object.assign({}, state, {
|
||||
masterAdmin: {
|
||||
requesting: false,
|
||||
success: true,
|
||||
error: null,
|
||||
exists: action.payload.result,
|
||||
},
|
||||
});
|
||||
|
||||
case MASTER_ADMIN_EXISTS_FAILED:
|
||||
return Object.assign({}, state, {
|
||||
masterAdmin: {
|
||||
...state.masterAdmin,
|
||||
requesting: false,
|
||||
success: false,
|
||||
error: action.payload,
|
||||
},
|
||||
});
|
||||
|
||||
case RESET_MASTER_ADMIN_EXISTS:
|
||||
return Object.assign({}, state, {
|
||||
masterAdmin: initialState.masterAdmin,
|
||||
});
|
||||
|
||||
case AUTH_VERIFICATION_REQUEST:
|
||||
return Object.assign({}, state, {
|
||||
...initialState,
|
||||
authToken: {
|
||||
...initialState.authToken,
|
||||
requesting: true,
|
||||
error: null,
|
||||
success: true,
|
||||
},
|
||||
user: { ...state.user },
|
||||
});
|
||||
case AUTH_VERIFICATION_SUCCESS:
|
||||
return Object.assign({}, state, {
|
||||
...initialState,
|
||||
authToken: {
|
||||
...initialState.authToken,
|
||||
requesting: false,
|
||||
error: null,
|
||||
success: true,
|
||||
},
|
||||
});
|
||||
case AUTH_VERIFICATION_FAILED:
|
||||
return Object.assign({}, state, {
|
||||
...initialState,
|
||||
authToken: {
|
||||
...initialState.authToken,
|
||||
requesting: false,
|
||||
error: action.payload,
|
||||
success: false,
|
||||
},
|
||||
user: { ...state.user },
|
||||
});
|
||||
|
||||
case RESET_AUTH_VERIFICATION:
|
||||
return Object.assign({}, state, initialState);
|
||||
|
||||
// Use back up code to login a user
|
||||
|
||||
case BACKUP_CODE_VERIFICATION_REQUEST:
|
||||
return Object.assign({}, state, {
|
||||
...initialState,
|
||||
backupCode: {
|
||||
...initialState.backupCode,
|
||||
requesting: true,
|
||||
error: null,
|
||||
success: true,
|
||||
},
|
||||
user: { ...state.user },
|
||||
});
|
||||
case BACKUP_CODE_VERIFICATION_SUCCESS:
|
||||
return Object.assign({}, state, {
|
||||
...initialState,
|
||||
backupCode: {
|
||||
...initialState.backupCode,
|
||||
requesting: false,
|
||||
error: null,
|
||||
success: true,
|
||||
},
|
||||
});
|
||||
case BACKUP_CODE_VERIFICATION_FAILED:
|
||||
return Object.assign({}, state, {
|
||||
...initialState,
|
||||
backupCode: {
|
||||
...initialState.backupCode,
|
||||
requesting: false,
|
||||
error: action.payload,
|
||||
success: false,
|
||||
},
|
||||
user: { ...state.user },
|
||||
});
|
||||
|
||||
case RESET_BACKUP_CODE_VERIFICATION:
|
||||
return Object.assign({}, state, initialState);
|
||||
|
||||
case SAVE_STATUS_PAGE:
|
||||
return Object.assign({}, state, {
|
||||
statusPageLogin: action.payload.isStatusPageLogin,
|
||||
statusPageURL: action.payload.statusPageURL,
|
||||
});
|
||||
|
||||
default:
|
||||
return state;
|
||||
}
|
||||
}
|
||||
@@ -1,205 +0,0 @@
|
||||
import {
|
||||
SIGNUP_SUCCESS,
|
||||
SIGNUP_FAILED,
|
||||
SIGNUP_STEP_INC,
|
||||
SIGNUP_STEP_DEC,
|
||||
SIGNUP_REQUEST,
|
||||
RESET_SIGNUP,
|
||||
SAVE_CARD_STATE,
|
||||
SAVE_USER_STATE,
|
||||
SAVE_COMPANY_STATE,
|
||||
IS_USER_INVITED_FAILED,
|
||||
IS_USER_INVITED_REQUEST,
|
||||
IS_USER_INVITED_RESET,
|
||||
IS_USER_INVITED_SUCCESS,
|
||||
SKIP_CARD_STEP,
|
||||
ADD_CARD_REQUEST,
|
||||
ADD_CARD_SUCCESS,
|
||||
ADD_CARD_FAILED,
|
||||
SAVE_PLAN_ID,
|
||||
GET_EMAIL_FROM_TOKEN,
|
||||
} from '../constants/register.js';
|
||||
|
||||
// The register state reducer.
|
||||
import Action from 'CommonUI/src/types/action';
|
||||
|
||||
const initialState: $TSFixMe = {
|
||||
addCard: {
|
||||
requesting: false,
|
||||
error: null,
|
||||
success: false,
|
||||
card: {},
|
||||
},
|
||||
requesting: false,
|
||||
step: 1,
|
||||
user: {},
|
||||
card: {},
|
||||
company: {},
|
||||
error: null,
|
||||
success: false,
|
||||
planId: null,
|
||||
isUserInvited: {
|
||||
requesting: false,
|
||||
isUserInvited: null,
|
||||
error: null,
|
||||
success: false,
|
||||
},
|
||||
email: null,
|
||||
};
|
||||
|
||||
export default function register(
|
||||
state: $TSFixMe = initialState,
|
||||
action: Action
|
||||
): void {
|
||||
let incCount: $TSFixMe, decCount: $TSFixMe, stage: $TSFixMe;
|
||||
switch (action.type) {
|
||||
case SIGNUP_REQUEST:
|
||||
return Object.assign({}, state, {
|
||||
requesting: true,
|
||||
error: null,
|
||||
});
|
||||
case SIGNUP_SUCCESS:
|
||||
state.user.cardRegistered = action.payload.cardRegistered;
|
||||
return Object.assign({}, state, {
|
||||
requesting: false,
|
||||
success: true,
|
||||
error: null,
|
||||
user: { ...state.user },
|
||||
});
|
||||
case SIGNUP_FAILED:
|
||||
return Object.assign({}, state, {
|
||||
requesting: false,
|
||||
isAuthenticated: false,
|
||||
error: action.payload,
|
||||
isUserInvited: {
|
||||
...state.isUserInvited,
|
||||
requesting: false,
|
||||
},
|
||||
});
|
||||
|
||||
case SIGNUP_STEP_INC:
|
||||
incCount = state.step + 1;
|
||||
|
||||
return Object.assign({}, state, {
|
||||
step: incCount,
|
||||
error: null,
|
||||
});
|
||||
|
||||
case SKIP_CARD_STEP:
|
||||
stage = 3;
|
||||
|
||||
return Object.assign({}, state, {
|
||||
step: stage,
|
||||
error: null,
|
||||
});
|
||||
|
||||
case SIGNUP_STEP_DEC:
|
||||
decCount = state.step - 1;
|
||||
|
||||
return Object.assign({}, state, {
|
||||
step: decCount,
|
||||
error: null,
|
||||
});
|
||||
case SAVE_USER_STATE:
|
||||
return Object.assign({}, state, {
|
||||
user: action.payload,
|
||||
});
|
||||
case SAVE_CARD_STATE:
|
||||
return Object.assign({}, state, {
|
||||
card: action.payload,
|
||||
});
|
||||
case SAVE_COMPANY_STATE:
|
||||
return Object.assign({}, state, {
|
||||
company: action.payload,
|
||||
});
|
||||
|
||||
case RESET_SIGNUP:
|
||||
return Object.assign({}, state, initialState);
|
||||
|
||||
case IS_USER_INVITED_FAILED:
|
||||
return Object.assign({}, state, {
|
||||
isUserInvited: {
|
||||
requesting: false,
|
||||
isUserInvited: null,
|
||||
error: action.payload,
|
||||
success: false,
|
||||
},
|
||||
});
|
||||
case IS_USER_INVITED_REQUEST:
|
||||
return Object.assign({}, state, {
|
||||
isUserInvited: {
|
||||
requesting: true,
|
||||
isUserInvited: null,
|
||||
error: null,
|
||||
success: false,
|
||||
},
|
||||
});
|
||||
|
||||
case IS_USER_INVITED_SUCCESS:
|
||||
return Object.assign({}, state, {
|
||||
...state,
|
||||
isUserInvited: {
|
||||
requesting: false,
|
||||
isUserInvited: action.payload,
|
||||
error: null,
|
||||
success: false,
|
||||
},
|
||||
});
|
||||
|
||||
case IS_USER_INVITED_RESET:
|
||||
return Object.assign({}, state, {
|
||||
...state,
|
||||
isUserInvited: {
|
||||
requesting: false,
|
||||
isUserInvited: null,
|
||||
error: null,
|
||||
success: false,
|
||||
},
|
||||
});
|
||||
case ADD_CARD_REQUEST:
|
||||
return Object.assign({}, state, {
|
||||
...state,
|
||||
addCard: {
|
||||
...state.addCard,
|
||||
requesting: true,
|
||||
},
|
||||
});
|
||||
|
||||
case ADD_CARD_SUCCESS:
|
||||
return Object.assign({}, state, {
|
||||
...state,
|
||||
addCard: {
|
||||
requesting: false,
|
||||
error: null,
|
||||
success: true,
|
||||
card: action.payload,
|
||||
},
|
||||
});
|
||||
|
||||
case ADD_CARD_FAILED:
|
||||
return Object.assign({}, state, {
|
||||
...state,
|
||||
addCard: {
|
||||
requesting: false,
|
||||
success: false,
|
||||
error: action.payload,
|
||||
},
|
||||
});
|
||||
case SAVE_PLAN_ID:
|
||||
return Object.assign({}, state, {
|
||||
planId: action.payload,
|
||||
});
|
||||
|
||||
case GET_EMAIL_FROM_TOKEN:
|
||||
return Object.assign({}, state, {
|
||||
...state,
|
||||
email:
|
||||
action.payload && action.payload.token
|
||||
? { email: action.payload.token.userId.email }
|
||||
: null,
|
||||
});
|
||||
|
||||
default:
|
||||
return state;
|
||||
}
|
||||
}
|
||||
@@ -1,47 +0,0 @@
|
||||
import {
|
||||
RESENDTOKEN_FAILED,
|
||||
RESENDTOKEN_REQUEST,
|
||||
RESENDTOKEN_SUCCESS,
|
||||
RESENDTOKEN_RESET,
|
||||
} from '../constants/resendToken';
|
||||
|
||||
import Action from 'CommonUI/src/types/action';
|
||||
|
||||
const initialState: $TSFixMe = {
|
||||
requesting: false,
|
||||
error: null,
|
||||
success: false,
|
||||
};
|
||||
|
||||
export default function register(
|
||||
state: $TSFixMe = initialState,
|
||||
action: Action
|
||||
): void {
|
||||
switch (action.type) {
|
||||
case RESENDTOKEN_REQUEST:
|
||||
return Object.assign({}, state, {
|
||||
...state,
|
||||
requesting: true,
|
||||
});
|
||||
case RESENDTOKEN_SUCCESS:
|
||||
return Object.assign({}, state, {
|
||||
requesting: false,
|
||||
success: true,
|
||||
error: null,
|
||||
});
|
||||
case RESENDTOKEN_FAILED:
|
||||
return Object.assign({}, state, {
|
||||
requesting: false,
|
||||
success: false,
|
||||
error: action.payload,
|
||||
});
|
||||
case RESENDTOKEN_RESET:
|
||||
return Object.assign({}, state, {
|
||||
requesting: false,
|
||||
success: false,
|
||||
error: null,
|
||||
});
|
||||
default:
|
||||
return state;
|
||||
}
|
||||
}
|
||||
@@ -1,51 +0,0 @@
|
||||
import {
|
||||
PASSWORDRESET_REQUEST,
|
||||
PASSWORDRESET_SUCCESS,
|
||||
PASSWORDRESET_FAILED,
|
||||
RESET_PASSWORDRESET,
|
||||
} from '../constants/resetPassword';
|
||||
|
||||
/*
|
||||
* The auth reducer. The starting state sets authentication
|
||||
* Based on a token being in local storage. In a real app,
|
||||
* We would also want a util to check if the token is expired.
|
||||
*/
|
||||
|
||||
import Action from 'CommonUI/src/types/action';
|
||||
|
||||
const initialState: $TSFixMe = {
|
||||
requesting: false,
|
||||
error: null,
|
||||
success: false,
|
||||
};
|
||||
|
||||
export default function register(
|
||||
state: $TSFixMe = initialState,
|
||||
action: Action
|
||||
): void {
|
||||
switch (action.type) {
|
||||
case PASSWORDRESET_REQUEST:
|
||||
return Object.assign({}, state, {
|
||||
requesting: true,
|
||||
error: null,
|
||||
});
|
||||
case PASSWORDRESET_SUCCESS:
|
||||
return Object.assign({}, state, {
|
||||
requesting: false,
|
||||
success: true,
|
||||
error: null,
|
||||
});
|
||||
case PASSWORDRESET_FAILED:
|
||||
return Object.assign({}, state, {
|
||||
requesting: false,
|
||||
success: false,
|
||||
error: action.payload,
|
||||
});
|
||||
|
||||
case RESET_PASSWORDRESET:
|
||||
return Object.assign({}, state, initialState);
|
||||
|
||||
default:
|
||||
return state;
|
||||
}
|
||||
}
|
||||
6
AdminDashboard/package-lock.json
generated
6
AdminDashboard/package-lock.json
generated
@@ -37,7 +37,7 @@
|
||||
"react-router-redux": "^4.0.8",
|
||||
"card-validator": "^8.1.1",
|
||||
"express": "^4.17.3",
|
||||
"react": "^17.0.2",
|
||||
"react": "^18.1.0",
|
||||
"redux-form": "^8.3.8",
|
||||
"Common": "file:../Common",
|
||||
"prop-types": "^15.8.1"
|
||||
@@ -15368,7 +15368,7 @@
|
||||
"@fortawesome/free-regular-svg-icons": "^6.1.0",
|
||||
"@fortawesome/free-solid-svg-icons": "^6.1.0",
|
||||
"@fortawesome/react-fontawesome": "^0.1.18",
|
||||
"react": "^17.0.2"
|
||||
"react": "^18.1.0"
|
||||
}
|
||||
},
|
||||
"node_modules/jest-resolve/node_modules/has-flag": {
|
||||
@@ -20417,7 +20417,7 @@
|
||||
"@fortawesome/free-regular-svg-icons": "^6.1.0",
|
||||
"@fortawesome/free-solid-svg-icons": "^6.1.0",
|
||||
"@fortawesome/react-fontawesome": "^0.1.18",
|
||||
"react": "^17.0.2"
|
||||
"react": "^18.1.0"
|
||||
}
|
||||
},
|
||||
"commondir": {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "oneuptime-AdminDashboard",
|
||||
"name": "admin-dashboard",
|
||||
"version": "3.0.0",
|
||||
"private": true,
|
||||
"private": false,
|
||||
"type": "module",
|
||||
"dependencies": {
|
||||
"CommonServer": "file:../CommonServer",
|
||||
@@ -18,7 +18,7 @@
|
||||
"jest": "^27.5.1",
|
||||
"moment": "^2.29.1",
|
||||
"prop-types": "^15.8.1",
|
||||
"react": "^17.0.2",
|
||||
"react": "^18.1.0",
|
||||
"react-click-outside": "github:tj/react-click-outside",
|
||||
"react-dom": "^17.0.2",
|
||||
"react-json-view": "^1.21.3",
|
||||
|
||||
@@ -9200,7 +9200,7 @@ html .modal-dialog-view .modal_overlay {
|
||||
.modal-dialog-view div.modal div.modal-content div.arrow {
|
||||
height: 16px;
|
||||
margin-bottom: 15px;
|
||||
background: url('merch/modal/arrow-eff2ff05526fbdf74fb6560dc6713935.png') 50%
|
||||
background: url('merch/Modal/arrow-eff2ff05526fbdf74fb6560dc6713935.png') 50%
|
||||
0 no-repeat;
|
||||
}
|
||||
.modal-dialog-view div.modal div.modal-content form p {
|
||||
@@ -14749,7 +14749,7 @@ div.is-pre-order div.checkbox-field-view label.default-label {
|
||||
.account-settings-view div.arrow {
|
||||
height: 16px;
|
||||
margin-bottom: 15px;
|
||||
background: url('merch/modal/arrow-eff2ff05526fbdf74fb6560dc6713935.png') 50%
|
||||
background: url('merch/Modal/arrow-eff2ff05526fbdf74fb6560dc6713935.png') 50%
|
||||
0 no-repeat;
|
||||
}
|
||||
.account-settings-view form p {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import * as types from '../constants/modal';
|
||||
import * as types from '../constants/Modal';
|
||||
|
||||
export const openModal: Function = (obj: $TSFixMe): void => {
|
||||
return {
|
||||
|
||||
@@ -5,7 +5,7 @@ import { connect } from 'react-redux';
|
||||
|
||||
import { v4 as uuidv4 } from 'uuid';
|
||||
import { ListLoader } from '../basic/Loader';
|
||||
import { openModal, closeModal } from 'CommonUI/actions/modal';
|
||||
import { openModal, closeModal } from 'CommonUI/actions/Modal';
|
||||
import AuditLogsJsonViewModal from './AuditLogsJsonViewModal';
|
||||
import DeleteConfirmationModal from './DeleteConfirmationModal';
|
||||
import ShouldRender from '../basic/ShouldRender';
|
||||
|
||||
@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
|
||||
|
||||
import ClickOutside from 'react-click-outside';
|
||||
import ShouldRender from '../basic/ShouldRender';
|
||||
import { closeModal } from 'CommonUI/actions/modal';
|
||||
import { closeModal } from 'CommonUI/actions/Modal';
|
||||
import { deleteAuditLogs } from '../../actions/auditLogs';
|
||||
import { FormLoader } from '../basic/Loader';
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ import { v4 as uuidv4 } from 'uuid';
|
||||
import moment from 'moment';
|
||||
|
||||
import { ListLoader } from '../basic/Loader';
|
||||
import { openModal, closeModal } from 'CommonUI/actions/modal';
|
||||
import { openModal, closeModal } from 'CommonUI/actions/Modal';
|
||||
import CallLogsContentViewModal from './CallLogsContentViewModal';
|
||||
import CallLogsErrorViewModal from './CallLogsErrorViewModal';
|
||||
import DeleteConfirmationModal from './DeleteConfirmationModal';
|
||||
|
||||
@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
|
||||
|
||||
import ClickOutside from 'react-click-outside';
|
||||
import ShouldRender from '../basic/ShouldRender';
|
||||
import { closeModal } from 'CommonUI/actions/modal';
|
||||
import { closeModal } from 'CommonUI/actions/Modal';
|
||||
import { deleteCallLogs } from '../../actions/callLogs';
|
||||
import { FormLoader } from '../basic/Loader';
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ import { fetchLicense } from '../actions/license';
|
||||
import { IS_SAAS_SERVICE, IS_THIRD_PARTY_BILLING } from '../config';
|
||||
import { fetchSettings } from '../actions/settings';
|
||||
import AlertPanel from './basic/AlertPanel';
|
||||
import { closeModal } from '../actions/modal';
|
||||
import { closeModal } from '../actions/Modal';
|
||||
import { loadDashboard } from '../actions/dashboard';
|
||||
|
||||
export class DashboardApp extends Component<ComponentProps>{
|
||||
|
||||
@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
|
||||
|
||||
import ClickOutside from 'react-click-outside';
|
||||
import ShouldRender from '../basic/ShouldRender';
|
||||
import { closeModal } from 'CommonUI/actions/modal';
|
||||
import { closeModal } from 'CommonUI/actions/Modal';
|
||||
import { deleteEmailLogs } from '../../actions/emailLogs';
|
||||
import { FormLoader } from '../basic/Loader';
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ import { v4 as uuidv4 } from 'uuid';
|
||||
import ShouldRender from '../basic/ShouldRender';
|
||||
|
||||
import { ListLoader } from '../basic/Loader';
|
||||
import { openModal, closeModal } from 'CommonUI/actions/modal';
|
||||
import { openModal, closeModal } from 'CommonUI/actions/Modal';
|
||||
import EmailLogsContentViewModal from './EmailLogsContentViewModal';
|
||||
import EmailLogsErrorViewModal from './EmailLogsErrorViewModal';
|
||||
import DeleteConfirmationModal from './DeleteConfirmationModal';
|
||||
|
||||
@@ -4,7 +4,7 @@ import { connect } from 'react-redux';
|
||||
import PropTypes, { string } from 'prop-types';
|
||||
|
||||
import ClickOutside from 'react-click-outside';
|
||||
import { closeModal } from 'CommonUI/actions/modal';
|
||||
import { closeModal } from 'CommonUI/actions/Modal';
|
||||
|
||||
class MessageBox extends Component<ComponentProps> {
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ import { bindActionCreators, Dispatch } from 'redux';
|
||||
import { connect } from 'react-redux';
|
||||
import NavItem from './SideNavItem';
|
||||
import { allRoutes, groups } from '../../routes';
|
||||
import { openModal, closeModal } from 'CommonUI/actions/modal';
|
||||
import { openModal, closeModal } from 'CommonUI/actions/Modal';
|
||||
import { closeSideNav } from '../../actions/page';
|
||||
|
||||
import ClickOutside from 'react-click-outside';
|
||||
|
||||
@@ -6,7 +6,7 @@ import { connect } from 'react-redux';
|
||||
import ClickOutside from 'react-click-outside';
|
||||
import { Spinner } from '../basic/Loader';
|
||||
import ShouldRender from '../basic/ShouldRender';
|
||||
import { closeModal } from 'CommonUI/actions/modal';
|
||||
import { closeModal } from 'CommonUI/actions/Modal';
|
||||
import { deleteProbe } from '../../actions/probe';
|
||||
|
||||
class ProbeDeleteModal extends Component<ComponentProps> {
|
||||
|
||||
@@ -6,7 +6,7 @@ import moment from 'moment';
|
||||
import { ListLoader, FormLoader } from '../basic/Loader';
|
||||
import ProbeStatus from './ProbeStatus';
|
||||
import ShouldRender from '../basic/ShouldRender';
|
||||
import { openModal, closeModal } from 'CommonUI/actions/modal';
|
||||
import { openModal, closeModal } from 'CommonUI/actions/Modal';
|
||||
import { updateProbe } from '../../actions/probe';
|
||||
import ProbeDeleteModal from './ProbeDeleteModal';
|
||||
|
||||
|
||||
@@ -7,8 +7,8 @@ import { hideProfileMenu } from '../../actions/profile';
|
||||
import { logoutUser } from '../../actions/logout';
|
||||
|
||||
import { v4 as uuidv4 } from 'uuid';
|
||||
import About from '../modals/About';
|
||||
import { openModal, closeModal } from 'CommonUI/actions/modal';
|
||||
import About from '../Modals/About';
|
||||
import { openModal, closeModal } from 'CommonUI/actions/Modal';
|
||||
|
||||
export class ProfileMenu extends Component<ComponentProps>{
|
||||
public static displayName = '';
|
||||
|
||||
@@ -4,7 +4,7 @@ import ClickOutside from 'react-click-outside';
|
||||
import PropTypes from 'prop-types';
|
||||
import { connect } from 'react-redux';
|
||||
import { bindActionCreators, Dispatch } from 'redux';
|
||||
import { closeModal } from 'CommonUI/actions/modal';
|
||||
import { closeModal } from 'CommonUI/actions/Modal';
|
||||
import { FormLoader } from '../basic/Loader';
|
||||
import {
|
||||
deleteProjectDomain,
|
||||
|
||||
@@ -9,11 +9,11 @@ import ShouldRender from '../basic/ShouldRender';
|
||||
import { updateBalance } from '../../actions/project';
|
||||
import { RenderField } from '../basic/RenderField';
|
||||
import PropTypes from 'prop-types';
|
||||
import { openModal } from 'CommonUI/actions/modal';
|
||||
import MessageBox from '../modals/MessageBox';
|
||||
import { openModal } from 'CommonUI/actions/Modal';
|
||||
import MessageBox from '../Modals/MessageBox';
|
||||
|
||||
import { v4 as uuidv4 } from 'uuid';
|
||||
import ConfirmBalanceTopUp from '../modals/ConfirmBalanceTopUp';
|
||||
import ConfirmBalanceTopUp from '../Modals/ConfirmBalanceTopUp';
|
||||
import DataPathHoC from '../DataPathHoC';
|
||||
|
||||
function validate(value: $TSFixMe) {
|
||||
|
||||
@@ -8,7 +8,7 @@ import { FormLoader } from '../basic/Loader';
|
||||
import ShouldRender from '../basic/ShouldRender';
|
||||
import { blockProject } from '../../actions/project';
|
||||
import ProjectBlockModal from './ProjectBlockModal';
|
||||
import { openModal, closeModal } from 'CommonUI/actions/modal';
|
||||
import { openModal, closeModal } from 'CommonUI/actions/Modal';
|
||||
|
||||
export class ProjectBlockBox extends Component<ComponentProps>{
|
||||
public static displayName = '';
|
||||
|
||||
@@ -8,7 +8,7 @@ import { FormLoader } from '../basic/Loader';
|
||||
import ShouldRender from '../basic/ShouldRender';
|
||||
import { deleteProject } from '../../actions/project';
|
||||
import ProjectDeleteModal from './ProjectDeleteModal';
|
||||
import { openModal, closeModal } from 'CommonUI/actions/modal';
|
||||
import { openModal, closeModal } from 'CommonUI/actions/Modal';
|
||||
|
||||
export class ProjectDeleteBox extends Component<ComponentProps>{
|
||||
public static displayName = '';
|
||||
|
||||
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
|
||||
import { fetchProjectDomains } from '../../actions/project';
|
||||
import { connect } from 'react-redux';
|
||||
import { bindActionCreators, Dispatch } from 'redux';
|
||||
import { openModal } from 'CommonUI/actions/modal';
|
||||
import { openModal } from 'CommonUI/actions/Modal';
|
||||
import DeleteDomain from './DeleteDomain';
|
||||
import DataPathHoC from '../DataPathHoC';
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ import { connect } from 'react-redux';
|
||||
import { bindActionCreators, Dispatch } from 'redux';
|
||||
|
||||
import ClickOutside from 'react-click-outside';
|
||||
import { closeModal } from 'CommonUI/actions/modal';
|
||||
import { closeModal } from 'CommonUI/actions/Modal';
|
||||
import { resetTeamDelete } from '../../actions/project';
|
||||
import ShouldRender from '../basic/ShouldRender';
|
||||
import { FormLoader } from '../basic/Loader';
|
||||
|
||||
@@ -5,7 +5,7 @@ import { FormLoader } from '../basic/Loader';
|
||||
import ShouldRender from '../basic/ShouldRender';
|
||||
import { bindActionCreators, Dispatch } from 'redux';
|
||||
import PropTypes from 'prop-types';
|
||||
import { closeModal } from 'CommonUI/actions/modal';
|
||||
import { closeModal } from 'CommonUI/actions/Modal';
|
||||
import { connect } from 'react-redux';
|
||||
import {
|
||||
resetProjectDomain,
|
||||
|
||||
@@ -5,7 +5,7 @@ import { bindActionCreators, Dispatch } from 'redux';
|
||||
import { FormLoader } from '../basic/Loader';
|
||||
import ShouldRender from '../basic/ShouldRender';
|
||||
import { restoreProject } from '../../actions/project';
|
||||
import { openModal, closeModal } from 'CommonUI/actions/modal';
|
||||
import { openModal, closeModal } from 'CommonUI/actions/Modal';
|
||||
|
||||
export class ProjectRestoreBox extends Component<ComponentProps>{
|
||||
public static displayName = '';
|
||||
|
||||
@@ -5,7 +5,7 @@ import { bindActionCreators, Dispatch } from 'redux';
|
||||
import { FormLoader } from '../basic/Loader';
|
||||
import ShouldRender from '../basic/ShouldRender';
|
||||
import { unblockProject } from '../../actions/project';
|
||||
import { openModal, closeModal } from 'CommonUI/actions/modal';
|
||||
import { openModal, closeModal } from 'CommonUI/actions/Modal';
|
||||
|
||||
export class ProjectUnblockBox extends Component<ComponentProps>{
|
||||
public static displayName = '';
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import React, { Component } from 'react';
|
||||
|
||||
import ClickOutside from 'react-click-outside';
|
||||
import { closeModal } from 'CommonUI/actions/modal';
|
||||
import { closeModal } from 'CommonUI/actions/Modal';
|
||||
import PropTypes from 'prop-types';
|
||||
import { connect } from 'react-redux';
|
||||
import { bindActionCreators, Dispatch } from 'redux';
|
||||
|
||||
@@ -19,7 +19,7 @@ import ShouldRender from '../basic/ShouldRender';
|
||||
import PropTypes from 'prop-types';
|
||||
import { Validate } from '../../config';
|
||||
import DataPathHoC from '../DataPathHoC';
|
||||
import MessageBox from '../modals/MessageBox';
|
||||
import MessageBox from '../Modals/MessageBox';
|
||||
import formatEmails from '../../utils/formatEmails';
|
||||
|
||||
function validate(values: $TSFixMe) {
|
||||
|
||||
@@ -8,7 +8,7 @@ import moment from 'moment';
|
||||
import { history, RootState } from '../../store';
|
||||
|
||||
import { v4 as uuidv4 } from 'uuid';
|
||||
import { openModal, closeModal } from 'CommonUI/actions/modal';
|
||||
import { openModal, closeModal } from 'CommonUI/actions/Modal';
|
||||
import {
|
||||
teamDelete,
|
||||
resetTeamDelete,
|
||||
|
||||
@@ -4,7 +4,7 @@ import { FormLoader } from '../basic/Loader';
|
||||
import ShouldRender from '../basic/ShouldRender';
|
||||
|
||||
import ClickOutside from 'react-click-outside';
|
||||
import { closeModal } from 'CommonUI/actions/modal';
|
||||
import { closeModal } from 'CommonUI/actions/Modal';
|
||||
import { bindActionCreators, Dispatch } from 'redux';
|
||||
import PropTypes from 'prop-types';
|
||||
import {
|
||||
|
||||
@@ -10,7 +10,7 @@ import { Validate, IS_INTERNAL_SMTP_DEPLOYED } from '../../config';
|
||||
import { FormLoader } from '../basic/Loader';
|
||||
import PropTypes from 'prop-types';
|
||||
import { fetchSettings, saveSettings, testSmtp } from '../../actions/settings';
|
||||
import { openModal, closeModal } from 'CommonUI/actions/modal';
|
||||
import { openModal, closeModal } from 'CommonUI/actions/Modal';
|
||||
import SmtpTestModal from './smtpTestModal';
|
||||
import MessageModal from './MessageModal';
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ import { v4 as uuidv4 } from 'uuid';
|
||||
import { fetchSsos, deleteSso, fetchSso } from '../../actions/sso';
|
||||
import { fetchSsoDefaultRoles } from '../../actions/ssoDefaultRoles';
|
||||
import moment from 'moment';
|
||||
import { openModal } from 'CommonUI/actions/modal';
|
||||
import { openModal } from 'CommonUI/actions/Modal';
|
||||
import SsoDeleteModal from './sso/SsoDeleteModal';
|
||||
import { SsoAddModal, SsoUpdateModal } from './sso/SsoModal';
|
||||
import ShouldRender from '../basic/ShouldRender';
|
||||
|
||||
@@ -8,7 +8,7 @@ import Button from './ssoDefaultRoles/Button';
|
||||
import BoxHeader from './ssoDefaultRoles/BoxHeader';
|
||||
import BoxFooter from './ssoDefaultRoles/BoxFooter';
|
||||
import Table from './ssoDefaultRoles/Table';
|
||||
import { openModal } from 'CommonUI/actions/modal';
|
||||
import { openModal } from 'CommonUI/actions/Modal';
|
||||
import { CreateDefaultRoleModal } from './ssoDefaultRoles/DefaultRoleModal';
|
||||
|
||||
class Box extends Component<ComponentProps> {
|
||||
|
||||
@@ -6,7 +6,7 @@ import {
|
||||
} from '../../../actions/ssoDefaultRoles';
|
||||
import { connect } from 'react-redux';
|
||||
import { bindActionCreators, Dispatch } from 'redux';
|
||||
import { openModal } from '../../../actions/modal';
|
||||
import { openModal } from '../../../actions/Modal';
|
||||
import RoleDeleteModal from './RoleDeleteModal';
|
||||
import { UpdateDefaultRoleModal } from './DefaultRoleModal';
|
||||
import PropTypes from 'prop-types';
|
||||
|
||||
@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
|
||||
|
||||
import ClickOutside from 'react-click-outside';
|
||||
import ShouldRender from '../basic/ShouldRender';
|
||||
import { closeModal } from 'CommonUI/actions/modal';
|
||||
import { closeModal } from 'CommonUI/actions/Modal';
|
||||
import { deleteSmsLogs } from '../../actions/smsLogs';
|
||||
import { FormLoader } from '../basic/Loader';
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ import { v4 as uuidv4 } from 'uuid';
|
||||
import moment from 'moment';
|
||||
|
||||
import { ListLoader } from '../basic/Loader';
|
||||
import { openModal, closeModal } from 'CommonUI/actions/modal';
|
||||
import { openModal, closeModal } from 'CommonUI/actions/Modal';
|
||||
import DeleteConfirmationModal from './DeleteConfirmationModal';
|
||||
import SmsLogsContentViewModal from './SmsLogsContentViewModal';
|
||||
import SmsLogsErrorViewModal from './SmsLogsErrorViewModal';
|
||||
|
||||
@@ -8,7 +8,7 @@ import { FormLoader } from '../basic/Loader';
|
||||
import ShouldRender from '../basic/ShouldRender';
|
||||
import { enableAdminMode } from '../../actions/user';
|
||||
import UserAdminModeEnableModal from './UserAdminModeEnableModal';
|
||||
import { openModal, closeModal } from 'CommonUI/actions/modal';
|
||||
import { openModal, closeModal } from 'CommonUI/actions/Modal';
|
||||
|
||||
export class UserAdminModeEnableBox extends Component<ComponentProps>{
|
||||
public static displayName = '';
|
||||
|
||||
@@ -8,7 +8,7 @@ import { FormLoader } from '../basic/Loader';
|
||||
import ShouldRender from '../basic/ShouldRender';
|
||||
import { blockUser } from '../../actions/user';
|
||||
import UserBlockModal from './UserBlockModal';
|
||||
import { openModal, closeModal } from 'CommonUI/actions/modal';
|
||||
import { openModal, closeModal } from 'CommonUI/actions/Modal';
|
||||
|
||||
export class UserBlockBox extends Component<ComponentProps>{
|
||||
public static displayName = '';
|
||||
|
||||
@@ -8,7 +8,7 @@ import { FormLoader } from '../basic/Loader';
|
||||
import ShouldRender from '../basic/ShouldRender';
|
||||
import { deleteUser } from '../../actions/user';
|
||||
import UserDeleteModal from './UserDeleteModal';
|
||||
import { openModal, closeModal } from 'CommonUI/actions/modal';
|
||||
import { openModal, closeModal } from 'CommonUI/actions/Modal';
|
||||
|
||||
export class UserDeleteBox extends Component<ComponentProps>{
|
||||
public static displayName = '';
|
||||
|
||||
@@ -5,7 +5,7 @@ import { bindActionCreators, Dispatch } from 'redux';
|
||||
import { FormLoader } from '../basic/Loader';
|
||||
import ShouldRender from '../basic/ShouldRender';
|
||||
import { restoreUser } from '../../actions/user';
|
||||
import { openModal, closeModal } from 'CommonUI/actions/modal';
|
||||
import { openModal, closeModal } from 'CommonUI/actions/Modal';
|
||||
|
||||
export class UserRestoreBox extends Component<ComponentProps>{
|
||||
public static displayName = '';
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user