Merge in DNS/adguard-home from 1898-hide-private-key to master Squashed commit of the following: commit 542569bbc098541f8e191cc5c1e5509a65fe2c5f Merge: a07d715f756c7064Author: Dmitriy Seregin <d.seregin@adguard.com> Date: Fri Aug 27 13:29:15 2021 +0300 Merge branch 'master' into 1898-hide-private-key commit a07d715f0f0932fdad4ec3f1e1a265b43809e21b Author: Dmitriy Seregin <d.seregin@adguard.com> Date: Thu Aug 26 19:45:39 2021 +0300 fix bug commit 9f2b70719a24aab827c2dc300fc94bf2202527a7 Author: Dmitriy Seregin <d.seregin@adguard.com> Date: Thu Aug 26 19:07:17 2021 +0300 fixes commit e79f0e620844531a737fff5a88f5c2cffc403f51 Author: Dmitriy Seregin <d.seregin@adguard.com> Date: Thu Aug 26 18:35:32 2021 +0300 more documentation to god of documentation commit 47790964ed05f50c075f6b6497b1517b0d974bea Author: Dmitriy Seregin <d.seregin@adguard.com> Date: Thu Aug 26 18:23:08 2021 +0300 changed var named && fixed description commit d35de5a34eafb3ffbd1148982dd31735a2000377 Author: Dmitriy Seregin <d.seregin@adguard.com> Date: Thu Aug 26 18:11:13 2021 +0300 revert locales commit 514ab1a5d90039bf9aad1389dd0ed966fd1a7e65 Merge: 5d9b992a16092e8bAuthor: Dmitriy Seregin <d.seregin@adguard.com> Date: Thu Aug 26 14:41:27 2021 +0300 Merge branch 'master' into 1898-hide-private-key commit 5d9b992a236dec276a46a035509da6938a7da7bf Author: Dmitriy Seregin <d.seregin@adguard.com> Date: Thu Aug 26 14:41:13 2021 +0300 here we go again commit 2e7b30df5f19953f4e055394083be62b23028ad6 Author: Dmitriy Seregin <d.seregin@adguard.com> Date: Fri Aug 20 17:11:49 2021 +0300 update deps commit 5e58c3e22a77c42f321deb9707f34f031b345d75 Author: Dmitriy Seregin <d.seregin@adguard.com> Date: Fri Aug 20 17:10:19 2021 +0300 small fix commit c2096377de0a8ecf4f36567322ad9171c5fb5ab2 Author: Dmitriy Seregin <d.seregin@adguard.com> Date: Fri Aug 20 17:07:45 2021 +0300 fixes && updated translations commit ada2d4784e6288b1740b8564b6ffc1ef8f0dcf68 Merge: dc5ce072550b1798Author: Dmitriy Seregin <d.seregin@adguard.com> Date: Fri Aug 20 13:17:34 2021 +0300 Merge branch 'master' into 1898-hide-private-key commit dc5ce0721b5c095ed79f2a302ad90d9616785f93 Author: Dmitriy Seregin <d.seregin@adguard.com> Date: Fri Aug 13 20:12:18 2021 +0300 tls: hide saved private key If private key saved as a string, then hide it from the answer to UI
176 lines
4.8 KiB
JavaScript
176 lines
4.8 KiB
JavaScript
import React, { useEffect } from 'react';
|
|
import { HashRouter, Route } from 'react-router-dom';
|
|
import LoadingBar from 'react-redux-loading-bar';
|
|
import { hot } from 'react-hot-loader/root';
|
|
|
|
import 'react-table/react-table.css';
|
|
import '../ui/Tabler.css';
|
|
import '../ui/ReactTable.css';
|
|
import './index.css';
|
|
|
|
import { shallowEqual, useDispatch, useSelector } from 'react-redux';
|
|
|
|
import propTypes from 'prop-types';
|
|
import Toasts from '../Toasts';
|
|
import Footer from '../ui/Footer';
|
|
import Status from '../ui/Status';
|
|
import UpdateTopline from '../ui/UpdateTopline';
|
|
import UpdateOverlay from '../ui/UpdateOverlay';
|
|
import EncryptionTopline from '../ui/EncryptionTopline';
|
|
import Icons from '../ui/Icons';
|
|
import i18n from '../../i18n';
|
|
import Loading from '../ui/Loading';
|
|
import { FILTERS_URLS, MENU_URLS, SETTINGS_URLS } from '../../helpers/constants';
|
|
import { getLogsUrlParams, setHtmlLangAttr } from '../../helpers/helpers';
|
|
import Header from '../Header';
|
|
import { changeLanguage, getDnsStatus } from '../../actions';
|
|
|
|
import Dashboard from '../../containers/Dashboard';
|
|
import SetupGuide from '../../containers/SetupGuide';
|
|
import Settings from '../../containers/Settings';
|
|
import Dns from '../../containers/Dns';
|
|
import Encryption from '../../containers/Encryption';
|
|
import Dhcp from '../Settings/Dhcp';
|
|
import Clients from '../../containers/Clients';
|
|
import DnsBlocklist from '../../containers/DnsBlocklist';
|
|
import DnsAllowlist from '../../containers/DnsAllowlist';
|
|
import DnsRewrites from '../../containers/DnsRewrites';
|
|
import CustomRules from '../../containers/CustomRules';
|
|
import Services from '../Filters/Services';
|
|
import Logs from '../Logs';
|
|
|
|
const ROUTES = [
|
|
{
|
|
path: MENU_URLS.root,
|
|
component: Dashboard,
|
|
exact: true,
|
|
},
|
|
{
|
|
path: [`${MENU_URLS.logs}${getLogsUrlParams(':search?', ':response_status?')}`, MENU_URLS.logs],
|
|
component: Logs,
|
|
},
|
|
{
|
|
path: MENU_URLS.guide,
|
|
component: SetupGuide,
|
|
},
|
|
{
|
|
path: SETTINGS_URLS.settings,
|
|
component: Settings,
|
|
},
|
|
{
|
|
path: SETTINGS_URLS.dns,
|
|
component: Dns,
|
|
},
|
|
{
|
|
path: SETTINGS_URLS.encryption,
|
|
component: Encryption,
|
|
},
|
|
{
|
|
path: SETTINGS_URLS.dhcp,
|
|
component: Dhcp,
|
|
},
|
|
{
|
|
path: SETTINGS_URLS.clients,
|
|
component: Clients,
|
|
},
|
|
{
|
|
path: FILTERS_URLS.dns_blocklists,
|
|
component: DnsBlocklist,
|
|
},
|
|
{
|
|
path: FILTERS_URLS.dns_allowlists,
|
|
component: DnsAllowlist,
|
|
},
|
|
{
|
|
path: FILTERS_URLS.dns_rewrites,
|
|
component: DnsRewrites,
|
|
},
|
|
{
|
|
path: FILTERS_URLS.custom_rules,
|
|
component: CustomRules,
|
|
},
|
|
{
|
|
path: FILTERS_URLS.blocked_services,
|
|
component: Services,
|
|
},
|
|
];
|
|
|
|
const renderRoute = ({ path, component, exact }, idx) => <Route
|
|
key={idx}
|
|
exact={exact}
|
|
path={path}
|
|
component={component}
|
|
/>;
|
|
|
|
const App = () => {
|
|
const dispatch = useDispatch();
|
|
const {
|
|
language,
|
|
isCoreRunning,
|
|
isUpdateAvailable,
|
|
processing,
|
|
} = useSelector((state) => state.dashboard, shallowEqual);
|
|
|
|
const { processing: processingEncryption } = useSelector((
|
|
state,
|
|
) => state.encryption, shallowEqual);
|
|
|
|
const updateAvailable = isCoreRunning && isUpdateAvailable;
|
|
|
|
useEffect(() => {
|
|
dispatch(getDnsStatus());
|
|
}, []);
|
|
|
|
const setLanguage = () => {
|
|
if (!processing) {
|
|
if (language) {
|
|
i18n.changeLanguage(language);
|
|
setHtmlLangAttr(language);
|
|
}
|
|
}
|
|
|
|
i18n.on('languageChanged', (lang) => {
|
|
dispatch(changeLanguage(lang));
|
|
});
|
|
};
|
|
|
|
useEffect(() => {
|
|
setLanguage();
|
|
}, [language]);
|
|
|
|
const reloadPage = () => {
|
|
window.location.reload();
|
|
};
|
|
|
|
return <HashRouter hashType="noslash">
|
|
{updateAvailable && <>
|
|
<UpdateTopline />
|
|
<UpdateOverlay />
|
|
</>}
|
|
{!processingEncryption && <EncryptionTopline />}
|
|
<LoadingBar className="loading-bar" updateTime={1000} />
|
|
<Header />
|
|
<div className="container container--wrap pb-5">
|
|
{processing && <Loading />}
|
|
{!isCoreRunning && <div className="row row-cards">
|
|
<div className="col-lg-12">
|
|
<Status reloadPage={reloadPage} message="dns_start" />
|
|
<Loading />
|
|
</div>
|
|
</div>}
|
|
{!processing && isCoreRunning && ROUTES.map(renderRoute)}
|
|
</div>
|
|
<Footer />
|
|
<Toasts />
|
|
<Icons />
|
|
</HashRouter>;
|
|
};
|
|
|
|
renderRoute.propTypes = {
|
|
path: propTypes.oneOfType([propTypes.string, propTypes.arrayOf(propTypes.string)]).isRequired,
|
|
component: propTypes.element.isRequired,
|
|
exact: propTypes.bool,
|
|
};
|
|
|
|
export default hot(App);
|