mirror of
https://git.vectorsigma.ru/public/AdGuardHome.git
synced 2026-08-04 00:39:24 +00:00
Merge in DNS/adguard-home from new-client-dashboard to master Squashed commit of the following: commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e Merge: 113743a69cd9054cAuthor: Vlad <v.abdulmyanov@adguard.com> Date: Wed Feb 3 16:01:17 2021 +0300 Merge branch 'master' into new-client-dashboard commit 113743a60665e40383d367dc17fa709dc54e4e2e Author: Vlad <v.abdulmyanov@adguard.com> Date: Wed Feb 3 15:45:16 2021 +0300 Remove unneded modal styles commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48 Author: Vlad <v.abdulmyanov@adguard.com> Date: Wed Feb 3 14:19:56 2021 +0300 Consider comments commit 78a96cd8fed8b3e03547e7e45724c23db295f67b Author: Vlad <v.abdulmyanov@adguard.com> Date: Mon Feb 1 18:46:52 2021 +0300 Remove old params for MiniCssExtractPlugin commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02 Author: Vlad <v.abdulmyanov@adguard.com> Date: Mon Feb 1 18:27:46 2021 +0300 Fix mobile version commit 509cefc308f945b03cafa62bf48257490a0a4be1 Author: Vlad <v.abdulmyanov@adguard.com> Date: Mon Feb 1 18:20:56 2021 +0300 Remove unneeded imports commit d192f39cd2503b8ec942f00ba78fca02cac9fa60 Author: Vlad <v.abdulmyanov@adguard.com> Date: Mon Feb 1 18:20:13 2021 +0300 Finish first version of dashboard commit f82429e53d334874ff7dd0641092ec83c66ab61c Merge: fd91a0a33e0238aaAuthor: Vlad <v.abdulmyanov@adguard.com> Date: Mon Feb 1 17:12:59 2021 +0300 Merge branch 'master' into new-client-dashboard commit fd91a0a3d76c2a052a6548232b75d151d6065b88 Author: Vlad <v.abdulmyanov@adguard.com> Date: Mon Feb 1 17:12:27 2021 +0300 wip commit 237679965052d38acfcd6a72d24b2444cc5b3896 Author: Vlad <v.abdulmyanov@adguard.com> Date: Fri Jan 29 11:18:10 2021 +0300 Finish general settings commit 397a7e10efd34a8d31bb175a5a5a7158338388d4 Author: Vlad <v.abdulmyanov@adguard.com> Date: Thu Jan 28 19:24:03 2021 +0300 Add General settings page commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90 Author: Vlad <v.abdulmyanov@adguard.com> Date: Thu Jan 28 14:05:16 2021 +0300 Remove husky commit b895306c0655019ca56ce161e050d83b4e7f5ff1 Merge: a195f1f4154c9c1cAuthor: Vlad <v.abdulmyanov@adguard.com> Date: Thu Jan 28 14:03:37 2021 +0300 Merge branch 'master' into new-client-dashboard commit a195f1f4d46043d9c53dea08734733f9817b95a0 Merge: c45c5fe9 362f390f Author: Vlad <v.abdulmyanov@adguard.com> Date: Wed Jan 27 15:46:18 2021 +0300 Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard commit c45c5fe92e6c5c852bec8f512dc46b4cd513156c Author: Vlad <v.abdulmyanov@adguard.com> Date: Wed Jan 27 15:46:01 2021 +0300 wip commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com> Date: Wed Jan 27 15:45:12 2021 +0300 Pull request #949: + client: add setup guide page Merge in DNS/adguard-home from 2554-setup-guide to new-client-dashboard Squashed commit of the following: commit c240d52e9e5d90429f2018fde808f4d04ccec138 Merge: 256f1056 137b88e4 Author: Ildar Kamalov <ik@adguard.com> Date: Wed Jan 27 14:13:52 2021 +0300 Merge branch 'new-client-dashboard' into 2554-setup-guide commit 256f1056770c67339e93275ab6dc7aaf2c10da0b Author: Ildar Kamalov <ik@adguard.com> Date: Wed Jan 27 14:10:45 2021 +0300 + client: add DNS addresses to the setup guide commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2 Author: Ildar Kamalov <ik@adguard.com> Date: Wed Jan 27 14:00:12 2021 +0300 + client: add setup guide tabs commit 137b88e4253af5be32d542adbe74575ef74805c8 Author: Vlad <v.abdulmyanov@adguard.com> Date: Thu Jan 21 19:17:58 2021 +0300 Add clients top commit c3318e6932d87fdff5f22d76bee12b49f099129a Merge: 2776276b 021eb22f Author: Vlad <v.abdulmyanov@adguard.com> Date: Thu Jan 21 19:15:57 2021 +0300 Merge branch 'new-client-dashboard' of ssh://bit.adguard.com:7999/dns/adguard-home into new-client-dashboard commit 2776276b2e6dc026e1326b02c388fcf7d48d47ff Author: Vlad <v.abdulmyanov@adguard.com> Date: Thu Jan 21 19:15:53 2021 +0300 Add top client info commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7 Author: Ildar Kamalov <ik@adguard.com> Date: Thu Jan 21 14:13:54 2021 +0300 Merge: client: add sidebar Squashed commit of the following: commit 6885ba953971e68602889fbb3219221f90265421 Author: Ildar Kamalov <ik@adguard.com> Date: Thu Jan 21 13:56:55 2021 +0300 add sidebar mask commit f069bfe8cba2b31355e19a51ca00bf774ee9e560 Author: Ildar Kamalov <ik@adguard.com> Date: Thu Jan 21 13:03:47 2021 +0300 fix store commit 77c8791002887ae022da07dc264d9010576e7bab Merge: d0a6eff6 ea6d54d4 Author: Ildar Kamalov <ik@adguard.com> Date: Thu Jan 21 13:01:04 2021 +0300 Merge branch 'new-client-dashboard' into 2254-sidebar commit d0a6eff67fd74533d63f5d56382085e98ddbb702 Author: Ildar Kamalov <ik@adguard.com> Date: Thu Jan 21 12:47:32 2021 +0300 client: remove unused file commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa Author: Ildar Kamalov <ik@adguard.com> Date: Thu Jan 21 12:39:13 2021 +0300 client: header commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f Merge: 797f1248 b694bb05 Author: Ildar Kamalov <ik@adguard.com> Date: Thu Jan 21 10:57:24 2021 +0300 Merge branch 'new-client-dashboard' into 2254-sidebar commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa Author: Ildar Kamalov <ik@adguard.com> Date: Thu Jan 21 10:51:57 2021 +0300 client: sidebar ... and 14 more commits
143 lines
6.3 KiB
TypeScript
143 lines
6.3 KiB
TypeScript
import React, { FC, useContext } from 'react';
|
|
import { Tabs, Grid } from 'antd';
|
|
import cn from 'classnames';
|
|
import { FormikHelpers } from 'formik';
|
|
|
|
import { DHCP_LINK } from 'Consts/common';
|
|
import { danger, externalLink, p } from 'Common/formating';
|
|
import { DEFAULT_DNS_PORT, DEFAULT_IP_ADDRESS, DEFAULT_IP_PORT } from 'Consts/install';
|
|
import Store from 'Store/installStore';
|
|
import theme from 'Lib/theme';
|
|
|
|
import { FormValues } from '../../Install';
|
|
import StepButtons from '../StepButtons';
|
|
|
|
const { useBreakpoint } = Grid;
|
|
const { TabPane } = Tabs;
|
|
|
|
interface ConfigureDevicesProps {
|
|
values: FormValues;
|
|
setFieldValue: FormikHelpers<FormValues>['setFieldValue'];
|
|
}
|
|
|
|
const ConfigureDevices: FC<ConfigureDevicesProps> = ({
|
|
values, setFieldValue,
|
|
}) => {
|
|
const { ui: { intl }, install: { addresses } } = useContext(Store);
|
|
const screens = useBreakpoint();
|
|
const tabsPosition = screens.md ? 'left' : 'top';
|
|
|
|
const allIps = addresses?.interfaces.reduce<string[]>((all, data) => {
|
|
const { ipAddresses } = data;
|
|
if (ipAddresses) {
|
|
all.push(...ipAddresses);
|
|
}
|
|
return all;
|
|
}, [] as string[]);
|
|
|
|
const { web: { ip: webIp }, dns: { ip: dnsIp } } = values;
|
|
const selectedWebIps = webIp.length === 1 && webIp[0] === DEFAULT_IP_ADDRESS
|
|
? allIps : webIp;
|
|
const selectedDnsIps = dnsIp.length === 1 && dnsIp[0] === DEFAULT_IP_ADDRESS
|
|
? allIps : dnsIp;
|
|
|
|
return (
|
|
<>
|
|
<div className={theme.install.title}>
|
|
{intl.getMessage('install_configure_title')}
|
|
</div>
|
|
<div className={cn(theme.install.text, theme.install.text_block)}>
|
|
{intl.getMessage('install_configure_danger_notice', { danger })}
|
|
</div>
|
|
|
|
<Tabs defaultActiveKey="1" tabPosition={tabsPosition} className={theme.install.tabs}>
|
|
<TabPane tab={intl.getMessage('router')} key="1">
|
|
<div className={theme.install.subtitle}>
|
|
{intl.getMessage('install_configure_how_to_title', { value: intl.getMessage('router') })}
|
|
</div>
|
|
<div className={cn(theme.install.text, theme.install.text_base)}>
|
|
{intl.getMessage('install_configure_router', { p })}
|
|
</div>
|
|
</TabPane>
|
|
<TabPane tab="Windows" key="2">
|
|
<div className={theme.install.subtitle}>
|
|
{intl.getMessage('install_configure_how_to_title', { value: 'Windows' })}
|
|
</div>
|
|
<div className={cn(theme.install.text, theme.install.text_base)}>
|
|
{intl.getMessage('install_configure_windows', { p })}
|
|
</div>
|
|
</TabPane>
|
|
<TabPane tab="macOS" key="3">
|
|
<div className={theme.install.subtitle}>
|
|
{intl.getMessage('install_configure_how_to_title', { value: 'macOS' })}
|
|
</div>
|
|
<div className={cn(theme.install.text, theme.install.text_base)}>
|
|
{intl.getMessage('install_configure_macos', { p })}
|
|
</div>
|
|
</TabPane>
|
|
<TabPane tab="Linux" key="4">
|
|
<div className={theme.install.subtitle}>
|
|
{intl.getMessage('install_configure_how_to_title', { value: 'Linux' })}
|
|
</div>
|
|
<div className={cn(theme.install.text, theme.install.text_base)}>
|
|
{/* TODO: add linux setup */}
|
|
{intl.getMessage('install_configure_router', { p })}
|
|
</div>
|
|
</TabPane>
|
|
<TabPane tab="Android" key="5">
|
|
<div className={theme.install.subtitle}>
|
|
{intl.getMessage('install_configure_how_to_title', { value: 'Android' })}
|
|
</div>
|
|
<div className={cn(theme.install.text, theme.install.text_base)}>
|
|
{intl.getMessage('install_configure_android', { p })}
|
|
</div>
|
|
</TabPane>
|
|
<TabPane tab="iOS" key="6">
|
|
<div className={theme.install.subtitle}>
|
|
{intl.getMessage('install_configure_how_to_title', { value: 'iOS' })}
|
|
</div>
|
|
<div className={cn(theme.install.text, theme.install.text_base)}>
|
|
{intl.getMessage('install_configure_ios', { p })}
|
|
</div>
|
|
</TabPane>
|
|
</Tabs>
|
|
|
|
<div className={theme.install.subtitle}>
|
|
{intl.getMessage('install_configure_adresses')}
|
|
</div>
|
|
<div className={cn(theme.install.text, theme.install.text_block)}>
|
|
<div className={cn(theme.install.text, theme.install.text_base)}>
|
|
{intl.getMessage('install_admin_interface_title')}
|
|
</div>
|
|
<div className={cn(theme.install.text, theme.install.text_base)}>
|
|
{selectedWebIps?.map((ip) => (
|
|
<div key={ip} className={theme.install.ip}>
|
|
{ip}{values.web.port !== DEFAULT_IP_PORT && `:${values.web.port}`}
|
|
</div>
|
|
))}
|
|
</div>
|
|
<div className={cn(theme.install.text, theme.install.text_base)}>
|
|
{intl.getMessage('install_dns_server_title')}
|
|
</div>
|
|
<div className={cn(theme.install.text, theme.install.text_base)}>
|
|
{selectedDnsIps?.map((ip) => (
|
|
<div key={ip} className={theme.install.ip}>
|
|
{ip}{values.dns.port !== DEFAULT_DNS_PORT && `:${values.dns.port}`}
|
|
</div>
|
|
))}
|
|
</div>
|
|
</div>
|
|
<div className={cn(theme.install.text, theme.install.text_base)}>
|
|
{intl.getMessage('install_configure_dhcp', { dhcp: externalLink(DHCP_LINK) })}
|
|
</div>
|
|
<StepButtons
|
|
setFieldValue={setFieldValue}
|
|
currentStep={4}
|
|
values={values}
|
|
/>
|
|
</>
|
|
);
|
|
};
|
|
|
|
export default ConfigureDevices;
|