From 1ab9e12f2c4112dbac784b9efc470262a550a9ea Mon Sep 17 00:00:00 2001 From: Alexander Date: Fri, 29 Oct 2021 13:04:47 +0300 Subject: [PATCH] Updated react ui. --- src/react/src/components/CronJob/Edit/EditCronJob.jsx | 1 - .../src/components/DNSRecord/Edit/EditDNSRecord.jsx | 1 - .../DomainNameSystem/Edit/EditDomainNameSystem.jsx | 2 +- .../InternetProtocol/Edit/EditInternetProtocol.jsx | 1 - src/react/src/components/Mail/Add/AddMail.jsx | 1 - src/react/src/components/Mail/Edit/EditMail.jsx | 1 - .../components/MailAccount/Edit/EditMailAccount.jsx | 1 - src/react/src/components/Package/Edit/EditPackage.jsx | 1 - src/react/src/components/User/Add/AddUser.jsx | 1 - src/react/src/components/User/Edit/EditUser.jsx | 1 - src/react/src/components/WebDomain/Edit/EditWeb.jsx | 1 - src/react/src/containers/App/App.js | 11 +++++++---- .../src/containers/MailAccounts/MailAccounts.jsx | 1 - 13 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/react/src/components/CronJob/Edit/EditCronJob.jsx b/src/react/src/components/CronJob/Edit/EditCronJob.jsx index 376832fd7..4c081c26a 100644 --- a/src/react/src/components/CronJob/Edit/EditCronJob.jsx +++ b/src/react/src/components/CronJob/Edit/EditCronJob.jsx @@ -13,7 +13,6 @@ import QS from 'qs'; import './EditCronJob.scss'; import { Helmet } from 'react-helmet'; -import { checkAuthHandler } from 'src/actions/Session/sessionActions'; import { refreshCounters } from 'src/actions/MenuCounters/menuCounterActions'; import HtmlParser from 'react-html-parser'; diff --git a/src/react/src/components/DNSRecord/Edit/EditDNSRecord.jsx b/src/react/src/components/DNSRecord/Edit/EditDNSRecord.jsx index 46647a7d0..114ba65d7 100644 --- a/src/react/src/components/DNSRecord/Edit/EditDNSRecord.jsx +++ b/src/react/src/components/DNSRecord/Edit/EditDNSRecord.jsx @@ -11,7 +11,6 @@ import { useHistory } from 'react-router-dom'; import { useDispatch, useSelector } from 'react-redux'; import QS from 'qs'; import { Helmet } from 'react-helmet'; -import { checkAuthHandler } from 'src/actions/Session/sessionActions'; import { refreshCounters } from 'src/actions/MenuCounters/menuCounterActions'; import HtmlParser from 'react-html-parser'; diff --git a/src/react/src/components/DomainNameSystem/Edit/EditDomainNameSystem.jsx b/src/react/src/components/DomainNameSystem/Edit/EditDomainNameSystem.jsx index 98916e6d0..3a957a84c 100644 --- a/src/react/src/components/DomainNameSystem/Edit/EditDomainNameSystem.jsx +++ b/src/react/src/components/DomainNameSystem/Edit/EditDomainNameSystem.jsx @@ -13,7 +13,7 @@ import QS from 'qs'; import './EditDomainNameSystem.scss'; import { Helmet } from 'react-helmet'; -import { checkAuthHandler } from 'src/actions/Session/sessionActions'; +import { andler } from 'src/actions/Session/sessionActions'; import { refreshCounters } from 'src/actions/MenuCounters/menuCounterActions'; import HtmlParser from 'react-html-parser'; diff --git a/src/react/src/components/InternetProtocol/Edit/EditInternetProtocol.jsx b/src/react/src/components/InternetProtocol/Edit/EditInternetProtocol.jsx index 7c3fd217e..d65557cc7 100644 --- a/src/react/src/components/InternetProtocol/Edit/EditInternetProtocol.jsx +++ b/src/react/src/components/InternetProtocol/Edit/EditInternetProtocol.jsx @@ -15,7 +15,6 @@ import QS from 'qs'; import './EditInternetProtocol.scss'; import { Helmet } from 'react-helmet'; -import { checkAuthHandler } from 'src/actions/Session/sessionActions'; import { refreshCounters } from 'src/actions/MenuCounters/menuCounterActions'; import HtmlParser from 'react-html-parser'; diff --git a/src/react/src/components/Mail/Add/AddMail.jsx b/src/react/src/components/Mail/Add/AddMail.jsx index f0740f804..92378a714 100644 --- a/src/react/src/components/Mail/Add/AddMail.jsx +++ b/src/react/src/components/Mail/Add/AddMail.jsx @@ -11,7 +11,6 @@ import { useDispatch, useSelector } from 'react-redux'; import './AddMail.scss' import { Helmet } from 'react-helmet'; -import { checkAuthHandler } from 'src/actions/Session/sessionActions'; import { refreshCounters } from 'src/actions/MenuCounters/menuCounterActions'; import HtmlParser from 'react-html-parser'; diff --git a/src/react/src/components/Mail/Edit/EditMail.jsx b/src/react/src/components/Mail/Edit/EditMail.jsx index 6f6f1333b..9a3181cdd 100644 --- a/src/react/src/components/Mail/Edit/EditMail.jsx +++ b/src/react/src/components/Mail/Edit/EditMail.jsx @@ -13,7 +13,6 @@ import QS from 'qs'; import './EditMail.scss'; import { Helmet } from 'react-helmet'; -import { checkAuthHandler } from 'src/actions/Session/sessionActions'; import { refreshCounters } from 'src/actions/MenuCounters/menuCounterActions'; import HtmlParser from 'react-html-parser'; diff --git a/src/react/src/components/MailAccount/Edit/EditMailAccount.jsx b/src/react/src/components/MailAccount/Edit/EditMailAccount.jsx index 49c0f9e89..8ba0e35c4 100644 --- a/src/react/src/components/MailAccount/Edit/EditMailAccount.jsx +++ b/src/react/src/components/MailAccount/Edit/EditMailAccount.jsx @@ -15,7 +15,6 @@ import { useHistory } from 'react-router-dom'; import Spinner from '../../Spinner/Spinner'; import { useDispatch, useSelector } from 'react-redux'; import { Helmet } from 'react-helmet'; -import { checkAuthHandler } from 'src/actions/Session/sessionActions'; import { refreshCounters } from 'src/actions/MenuCounters/menuCounterActions'; import HtmlParser from 'react-html-parser'; diff --git a/src/react/src/components/Package/Edit/EditPackage.jsx b/src/react/src/components/Package/Edit/EditPackage.jsx index 2780ba9b1..4f2eb4f33 100644 --- a/src/react/src/components/Package/Edit/EditPackage.jsx +++ b/src/react/src/components/Package/Edit/EditPackage.jsx @@ -16,7 +16,6 @@ import QS from 'qs'; import './EditPackage.scss'; import { Helmet } from 'react-helmet'; -import { checkAuthHandler } from 'src/actions/Session/sessionActions'; import { refreshCounters } from 'src/actions/MenuCounters/menuCounterActions'; import HtmlParser from 'react-html-parser'; diff --git a/src/react/src/components/User/Add/AddUser.jsx b/src/react/src/components/User/Add/AddUser.jsx index f438f1f74..dea878f92 100644 --- a/src/react/src/components/User/Add/AddUser.jsx +++ b/src/react/src/components/User/Add/AddUser.jsx @@ -13,7 +13,6 @@ import { useDispatch, useSelector } from 'react-redux'; import './AddUser.scss'; import { Helmet } from 'react-helmet'; -import { checkAuthHandler } from 'src/actions/Session/sessionActions'; import { refreshCounters } from 'src/actions/MenuCounters/menuCounterActions'; import HtmlParser from 'react-html-parser'; diff --git a/src/react/src/components/User/Edit/EditUser.jsx b/src/react/src/components/User/Edit/EditUser.jsx index b021f4b7b..4f41fe7c8 100644 --- a/src/react/src/components/User/Edit/EditUser.jsx +++ b/src/react/src/components/User/Edit/EditUser.jsx @@ -15,7 +15,6 @@ import QS from 'qs'; import './EditUser.scss'; import { Helmet } from 'react-helmet'; -import { checkAuthHandler } from 'src/actions/Session/sessionActions'; import { refreshCounters } from 'src/actions/MenuCounters/menuCounterActions'; import HtmlParser from 'react-html-parser'; diff --git a/src/react/src/components/WebDomain/Edit/EditWeb.jsx b/src/react/src/components/WebDomain/Edit/EditWeb.jsx index fb947efd5..113d60077 100644 --- a/src/react/src/components/WebDomain/Edit/EditWeb.jsx +++ b/src/react/src/components/WebDomain/Edit/EditWeb.jsx @@ -18,7 +18,6 @@ import QS from 'qs'; import './EditWeb.scss'; import TextArea from '../../ControlPanel/AddItemLayout/Form/TextArea/TextArea'; import { Helmet } from 'react-helmet'; -import { checkAuthHandler } from 'src/actions/Session/sessionActions'; import { refreshCounters } from 'src/actions/MenuCounters/menuCounterActions'; import HtmlParser from 'react-html-parser'; diff --git a/src/react/src/containers/App/App.js b/src/react/src/containers/App/App.js index c5e00d48d..3be606931 100755 --- a/src/react/src/containers/App/App.js +++ b/src/react/src/containers/App/App.js @@ -11,7 +11,6 @@ import ControlPanelContent from '../ControlPanelContent/ControlPanelContent'; import WebLogs from '../WebLogs/WebLogs'; import LoginForm from 'src/components/Login/LoginForm'; import { useDispatch, useSelector } from 'react-redux'; -import { setAuthToken } from 'src/utils/token'; import { checkAuthHandler } from 'src/actions/Session/sessionActions'; import ServiceInfo from 'src/containers/ServiceInfo'; import ForgotPassword from 'src/components/ForgotPassword'; @@ -70,9 +69,13 @@ const App = () => { useEffect(() => { if (!Object.entries(session.i18n).length) { - dispatch(checkAuthHandler()).then(token => { - setLoading(false); - }); + dispatch(checkAuthHandler()) + .then(token => { + setLoading(false); + }, (error) => { + console.error(error); + return history.push('/login'); + }); } }, [dispatch, history, session]); diff --git a/src/react/src/containers/MailAccounts/MailAccounts.jsx b/src/react/src/containers/MailAccounts/MailAccounts.jsx index a1b6f3ba4..aa279be85 100644 --- a/src/react/src/containers/MailAccounts/MailAccounts.jsx +++ b/src/react/src/containers/MailAccounts/MailAccounts.jsx @@ -17,7 +17,6 @@ import { Link } from 'react-router-dom'; import './MailAccounts.scss'; import { Helmet } from 'react-helmet'; -import { checkAuthHandler } from 'src/actions/Session/sessionActions'; import { refreshCounters } from 'src/actions/MenuCounters/menuCounterActions'; export default function MailAccounts(props) {