Merge in DNS/adguard-home from ADG-8368-typescript-node-18 to master Squashed commit of the following: commit daa288ae0d76178af24595cc807055902e6f09ab Merge:4c89cf7201085d59a6Author: Igor Lobanov <bniwredyc@gmail.com> Date: Mon Jun 10 17:22:20 2024 +0200 merge commit4c89cf7209Author: Ildar Kamalov <ik@adguard.com> Date: Thu Jun 6 13:27:18 2024 +0300 remove install from initial state commitb943f2011fAuthor: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 23:10:55 2024 +0200 frontend production build fix commitcd1be2d66dAuthor: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 20:23:14 2024 +0200 production build quickfix commit7b8ac01fc2Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jun 5 19:57:31 2024 +0300 all: upd node docker commit02afed66d5Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 18:23:12 2024 +0200 changelog fixes commit9c0f736f0cMerge:62c4fbf1ee04775c4fAuthor: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 18:18:29 2024 +0200 merge commit62c4fbf1e3Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 16:22:22 2024 +0200 empty line in changelog commit76b1e44a93Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 16:20:37 2024 +0200 changelog commitf783e90040Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 16:19:13 2024 +0200 filters.js -> filters.ts commit3d4ce6554cAuthor: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 16:18:03 2024 +0200 generated file removed commite35ba58f2aAuthor: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 15:45:21 2024 +0200 rollback unwanted changes commit1f30d4216dAuthor: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 15:27:36 2024 +0200 review fix commit6cd4e44f07Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 11:55:39 2024 +0200 missing generated file restoresd commit2ab738b303Author: Igor Lobanov <bniwredyc@gmail.com> Date: Wed Jun 5 11:40:32 2024 +0200 Frontend rewritten in TypeScript, added Node 18 support
238 lines
6.3 KiB
TypeScript
238 lines
6.3 KiB
TypeScript
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 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, THEMES } from '../../helpers/constants';
|
|
|
|
import { getLogsUrlParams, setHtmlLangAttr, setUITheme } from '../../helpers/helpers';
|
|
|
|
import Header from '../Header';
|
|
|
|
import { changeLanguage, getDnsStatus, getTimerStatus } 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';
|
|
import ProtectionTimer from '../ProtectionTimer';
|
|
import { RootState } from '../../initialState';
|
|
|
|
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 App = () => {
|
|
const dispatch = useDispatch();
|
|
const { language, isCoreRunning, isUpdateAvailable, processing, theme } = useSelector<
|
|
RootState,
|
|
RootState['dashboard']
|
|
>((state) => state.dashboard, shallowEqual);
|
|
|
|
const { processing: processingEncryption } = useSelector<RootState, RootState['encryption']>(
|
|
(state) => state.encryption,
|
|
shallowEqual,
|
|
);
|
|
|
|
const updateAvailable = isCoreRunning && isUpdateAvailable;
|
|
|
|
useEffect(() => {
|
|
dispatch(getDnsStatus());
|
|
|
|
const handleVisibilityChange = () => {
|
|
if (document.visibilityState === 'visible') {
|
|
dispatch(getTimerStatus());
|
|
}
|
|
};
|
|
|
|
document.addEventListener('visibilitychange', handleVisibilityChange);
|
|
|
|
return () => {
|
|
document.removeEventListener('visibilitychange', handleVisibilityChange);
|
|
};
|
|
}, []);
|
|
|
|
const setLanguage = () => {
|
|
if (!processing) {
|
|
if (language) {
|
|
i18n.changeLanguage(language);
|
|
setHtmlLangAttr(language);
|
|
}
|
|
}
|
|
|
|
i18n.on('languageChanged', (lang) => {
|
|
dispatch(changeLanguage(lang));
|
|
});
|
|
};
|
|
|
|
useEffect(() => {
|
|
setLanguage();
|
|
}, [language]);
|
|
|
|
const handleAutoTheme = (e: any, accountTheme: any) => {
|
|
if (accountTheme !== THEMES.auto) {
|
|
return;
|
|
}
|
|
|
|
if (e.matches) {
|
|
setUITheme(THEMES.dark);
|
|
} else {
|
|
setUITheme(THEMES.light);
|
|
}
|
|
};
|
|
|
|
useEffect(() => {
|
|
if (theme !== THEMES.auto) {
|
|
setUITheme(theme);
|
|
|
|
return;
|
|
}
|
|
|
|
const colorSchemeMedia = window.matchMedia('(prefers-color-scheme: dark)');
|
|
setUITheme(theme);
|
|
|
|
if (colorSchemeMedia.addEventListener !== undefined) {
|
|
colorSchemeMedia.addEventListener('change', (e) => {
|
|
handleAutoTheme(e, theme);
|
|
});
|
|
} else {
|
|
// Deprecated addListener for older versions of Safari.
|
|
colorSchemeMedia.addListener((e) => {
|
|
handleAutoTheme(e, theme);
|
|
});
|
|
}
|
|
}, [theme]);
|
|
|
|
const reloadPage = () => {
|
|
window.location.reload();
|
|
};
|
|
|
|
return (
|
|
<HashRouter hashType="noslash">
|
|
{updateAvailable && (
|
|
<>
|
|
<UpdateTopline />
|
|
|
|
<UpdateOverlay />
|
|
</>
|
|
)}
|
|
|
|
{!processingEncryption && <EncryptionTopline />}
|
|
|
|
<LoadingBar className="loading-bar" updateTime={1000} />
|
|
|
|
<Header />
|
|
|
|
<ProtectionTimer />
|
|
|
|
<div className="container container--wrap pb-5 pt-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((route, index) => (
|
|
<Route key={index} exact={route.exact} path={route.path} component={route.component} />
|
|
))}
|
|
</div>
|
|
|
|
<Footer />
|
|
|
|
<Toasts />
|
|
|
|
<Icons />
|
|
</HashRouter>
|
|
);
|
|
};
|
|
|
|
export default hot(App);
|