docstring_tokens
stringlengths 18
16.9k
| code_tokens
stringlengths 75
1.81M
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|
keep keep add keep keep keep | <mask> text,
<mask> install,
<mask> link,
<mask> };
<mask>
<mask> export default theme;
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> add chartColors: colors, </s> remove export { IconType } from 'Lib/theme/Icons';
</s> add export { IconType } from 'Common/ui/Icons'; </s> add import content from './Content.module.pcss';
import { colors } from './colors'; </s> add // TODO get languages and default locale from .twosky file </s> remove interfaces: { [key: string]: INetInterface };
</s> add interfaces: INetInterfaces; </s> remove export { TYPES, toCamel, capitalize, schemaParamParser };
</s> add export { TYPES, toCamel, capitalize, uncapitalize, schemaParamParser }; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/lib/theme/index.ts |
replace replace keep replace replace replace | <mask> import T from './Translator';
<mask> import { Locale } from './locales';
<mask>
<mask> export { messages, DatePickerLocale, Locale, DEFAULT_LOCALE, LANGUAGES, reactFormater } from './locales';
<mask> export type Translator = T<Locale>;
<mask> export default T;
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove import Translator, { DEFAULT_LOCALE, messages, Locale, reactFormater } from 'Localization';
</s> add import { Locale, DEFAULT_LOCALE, i18n } from 'Localization'; </s> remove import { makeAutoObservable, observable } from 'mobx';
</s> add import React from 'react';
import { makeAutoObservable, observable, action } from 'mobx';
import { translate } from '@adguard/translate'; </s> remove rootStore: Store;
</s> add rootStore: Store | InstallStore; </s> add import { Store as InstallStore } from 'Store/installStore'; </s> remove import { Store } from 'Store';
</s> add import { Store } from 'Store/installStore'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/localization/index.ts |
keep keep keep keep replace keep | <mask> "install_configure_macos": "<p>Click on Apple icon and go to System Preferences.</p><p>Click on Network.</p><p>Select the first connection in your list and click Advanced.</p><p>Select the DNS tab and enter your AdGuard Home server addresses.</p>",
<mask> "install_configure_android": "<p>From the Android Menu home screen, tap Settings.</p><p>Tap Wi-Fi on the menu. The screen listing all of the available networks will be shown (it is impossible to set custom DNS for mobile connection).</p><p>Long press the network you're connected to, and tap Modify Network.</p><p>On some devices, you may need to check the box for Advanced to see further settings. To adjust your Android DNS settings, you will need to switch the IP settings from DHCP to Static.</p><p>Change set DNS 1 and DNS 2 values to your AdGuard Home server addresses.</p>",
<mask> "install_configure_ios": "<p>From the home screen, tap Settings.</p><p>Choose Wi-Fi in the left menu (it is impossible to configure DNS for mobile networks).</p><p>Tap on the name of the currently active network.</p><p>In the DNS field enter your AdGuard Home server addresses.</p>",
<mask> "install_configure_adresses": "AdGuard Home addresses:",
<mask> "install_configure_dhcp": "You can't set a custom DNS server on some types of routers. In this case it may help if you set up <dhcp>AdGuard Home as a DHCP server</dhcp>. Otherwise, you should search for the manual on how to customize DNS servers for your particular router model."
<mask> }
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove * Description: undefined
</s> add * Description: Flags could be any combination of the following values, divided by the "|" character: "up", "broadcast", "loopback", "pointtopoint" and "multicast".
* </s> remove * Description: yes|no|error
</s> add * Description: The result of searching the other DHCP server.
* </s> add const additionalPropsOnly = additionalProperties && sortedSProps.length === 0;
</s> remove import NetInterface, { INetInterface } from './NetInterface';
</s> add import NetInterfaces, { INetInterfaces } from './NetInterfaces'; </s> remove lastUpdated: string;
</s> add last_updated: string; </s> add name?: string; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/localization/locales/en.json |
replace keep keep keep keep keep | <mask> import React from 'react';
<mask> import 'dayjs/locale/ru';
<mask>
<mask> import { PickerLocale } from 'antd/es/date-picker/generatePicker';
<mask> import ruPicker from 'antd/es/date-picker/locale/ru_RU';
<mask> import enPicker from 'antd/es/date-picker/locale/en_GB';
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove import { makeAutoObservable, observable } from 'mobx';
</s> add import React from 'react';
import { makeAutoObservable, observable, action } from 'mobx';
import { translate } from '@adguard/translate'; </s> add import cn from 'classnames'; </s> remove import { IconType } from 'Lib/theme/Icons';
</s> add import { IconType } from 'Common/ui/Icons'; </s> add import Login from './stores/Login';
import Dashboard from './stores/Dasnboard';
import System from './stores/System';
import GeneralSettings from './stores/GeneralSettings'; </s> add 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'; </s> add import AccessListResponse, { IAccessListResponse } from 'Entities/AccessListResponse';
import AccessSetRequest, { IAccessSetRequest } from 'Entities/AccessSetRequest'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/localization/locales/index.ts |
keep keep keep add keep keep keep keep keep keep | <mask> [Locale.ru]: ruLang,
<mask> [Locale.en]: enLang,
<mask> };
<mask>
<mask> export const DEFAULT_LOCALE = Locale.en;
<mask>
<mask> export const LANGUAGES: { code: Locale; name: string }[] = [
<mask> {
<mask> code: Locale.en,
<mask> name: 'English',
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove export const reactFormater = (data: (JSX.Element | string)[]) => {
if (data.every((d) => typeof d === 'string')) {
return data.join('');
}
return React.Children.toArray(data);
};
</s> add </s> remove const { properties: sProps, required } = this.schemas[sName];
</s> add const { properties: sProps, required, $ref, additionalProperties } = this.schemas[sName];
if ($ref) {
const temp = $ref.split('/');
const importSchemaName = `${temp[temp.length - 1]}`;
entityFile.addImportDeclaration({
defaultImport: importSchemaName,
moduleSpecifier: `./${importSchemaName}`,
namedImports: [`I${importSchemaName}`],
});
entityFile.addTypeAlias({
name: `I${sName}`,
type: `I${importSchemaName}`,
isExported: true,
})
entityFile.addStatements(`export default ${importSchemaName};`);
this.entities.push(entityFile);
return;
} </s> remove
</s> add if (additionalProperties) {
const [
pType, isArray, isClass, isImport, isAdditional
] = schemaParamParser(additionalProperties, this.openapi);
const type = `Record<string, ${pType}${isArray ? '[]' : ''}>`;
entityClass.addProperty({
name: additionalPropsOnly ? 'data' : `${uncapitalize(pType)}Data`,
isReadonly: true,
type: type,
});
} </s> remove lastUpdated: this._lastUpdated,
</s> add last_updated: this._last_updated, </s> add if (additionalPropsOnly) {
w.writeLine('return []')
return;
} </s> add if (additionalProperties) {
const [
pType, isArray, isClass, isImport, isAdditional
] = schemaParamParser(additionalProperties, this.openapi);
w.writeLine(`this.${additionalPropsOnly ? 'data' : `${uncapitalize(pType)}Data`} = Object.entries(props).reduce<Record<string, ${pType}>>((prev, [key, value]) => {`);
if (isClass) {
w.writeLine(` prev[key] = new ${pType}(value!);`);
} else {
w.writeLine(' prev[key] = value!;')
}
w.writeLine(' return prev;');
w.writeLine('}, {})');
return;
} | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/localization/locales/index.ts |
keep keep keep keep replace replace replace replace replace replace replace keep keep keep keep keep | <mask> };
<mask>
<mask> export const DEFAULT_LOCALE = Locale.en;
<mask>
<mask> export const reactFormater = (data: (JSX.Element | string)[]) => {
<mask> if (data.every((d) => typeof d === 'string')) {
<mask> return data.join('');
<mask> }
<mask> return React.Children.toArray(data);
<mask> };
<mask>
<mask> export const LANGUAGES: { code: Locale; name: string }[] = [
<mask> {
<mask> code: Locale.en,
<mask> name: 'English',
<mask> },
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> add // TODO get languages and default locale from .twosky file </s> remove const data: ITopArrayEntry = {
};
if (typeof this._domain_or_ip !== 'undefined') {
data.domain_or_ip = this._domain_or_ip;
}
return data;
</s> add return Object.entries(this.numberData).reduce<Record<string, number>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) </s> remove if (typeof props.domain_or_ip === 'number') {
this._domain_or_ip = props.domain_or_ip;
}
</s> add this.numberData = Object.entries(props).reduce<Record<string, number>>((prev, [key, value]) => {
prev[key] = value!;
return prev;
}, {}) </s> remove if (typeof props.key === 'string') {
this._key = props.key.trim();
}
</s> add this.data = Object.entries(props).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value!;
return prev;
}, {}) </s> remove const data: IUpstreamsConfigResponse = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) </s> remove const data: IClientsFindEntry = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, IClientFindSubEntry>>((prev, [key, value]) => {
prev[key] = value.serialize();
return prev;
}, {}) | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/localization/locales/index.ts |
keep keep keep keep replace keep keep keep keep keep | <mask> --gray300: #d8d8d8;
<mask> --gray400: #a4a4a4;
<mask> --gray700: #888888;
<mask> --gray900: #4d4d4d;
<mask> --black: #000000;
<mask> --green400: #67b279;
<mask> --green700: #4d995f;
<mask> --red400: #c23814;
<mask> --transition: 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
<mask> --font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Helvetica Neue", Arial, sans-serif;
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> add --text-selection: #e7efff;
--header-height: 48px; </s> add @text-selection-bg: #e7efff;
@layout-body-background: #f3f3f3;
@layout-header-background: #131313;
@menu-dark-submenu-bg: #131313; </s> remove ]
</s> add ],
"useDefineForClassFields": true </s> remove this._whois_info = props.whois_info.map((p) => new WhoisInfo(p));
</s> add this._whois_info = new WhoisInfo(props.whois_info); </s> remove const data: IClientsFindEntry = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, IClientFindSubEntry>>((prev, [key, value]) => {
prev[key] = value.serialize();
return prev;
}, {}) </s> add this.data = Object.entries(props).reduce<Record<string, ClientFindSubEntry>>((prev, [key, value]) => {
prev[key] = new ClientFindSubEntry(value!);
return prev;
}, {}) | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/main.pcss |
keep keep keep add keep keep keep keep | <mask> --black: #131313;
<mask> --green400: #67b279;
<mask> --green700: #4d995f;
<mask> --red400: #c23814;
<mask> --transition: 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
<mask> --font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Helvetica Neue", Arial, sans-serif;
<mask> --font-family-monospace: Monaco, Menlo, "Ubuntu Mono", Consolas, source-code-pro, monospace;
<mask> }
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove --black: #000000;
</s> add --black: #131313; </s> add @text-selection-bg: #e7efff;
@layout-body-background: #f3f3f3;
@layout-header-background: #131313;
@menu-dark-submenu-bg: #131313; </s> remove font-size: 14px;
</s> add font-size: 16px; </s> add &.gray {
color: var(--gray900);
&:hover,
&:focus {
color: var(--gray700);
}
&:active {
color: var(--gray700);
}
} </s> add this._disabled = props.disabled; </s> add import AccessListResponse, { IAccessListResponse } from 'Entities/AccessListResponse';
import AccessSetRequest, { IAccessSetRequest } from 'Entities/AccessSetRequest'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/main.pcss |
keep keep keep keep replace keep keep keep keep keep | <mask> --font-family-monospace: Monaco, Menlo, "Ubuntu Mono", Consolas, source-code-pro, monospace;
<mask> }
<mask>
<mask> body {
<mask> font-size: 14px;
<mask> color: var(--gray900);
<mask> }
<mask>
<mask> @custom-media --m-viewport (min-width: 768px);
<mask> @custom-media --l-viewport (min-width: 992px);
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> add ::selection {
background: var(--text-selection);
color: var(--black);
}
</s> add --text-selection: #e7efff;
--header-height: 48px; </s> add .code {
padding: 3px 5px;
font-size: 14px;
font-family: var(--font-family-monospace);
background-color: var(--gray300);
border-radius: 2px;
}
</s> add &.gray {
color: var(--gray900);
&:hover,
&:focus {
color: var(--gray700);
}
&:active {
color: var(--gray700);
}
} </s> remove .layout {
min-height: 100vh;
background-color: var(--gray100);
@media (--m-viewport) {
background-image: url('../../assets/img/install.png');
background-position: center 20px;
background-repeat: no-repeat;
background-size: 100%;
}
}
.container {
width: 100%;
max-width: 432px;
margin: 0 auto;
padding: 24px 16px 40px;
@media (--m-viewport) {
padding: 40px 16px;
}
}
</s> add </s> add import AccessListResponse, { IAccessListResponse } from 'Entities/AccessListResponse';
import AccessSetRequest, { IAccessSetRequest } from 'Entities/AccessSetRequest'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/main.pcss |
keep keep add keep keep keep | <mask> color: var(--gray900);
<mask> }
<mask>
<mask> @custom-media --m-viewport (min-width: 768px);
<mask> @custom-media --l-viewport (min-width: 992px);
<mask> @custom-media --xl-viewport (min-width: 1200px);
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove font-size: 14px;
</s> add font-size: 16px; </s> add &.gray {
color: var(--gray900);
&:hover,
&:focus {
color: var(--gray700);
}
&:active {
color: var(--gray700);
}
} </s> remove .layout {
min-height: 100vh;
background-color: var(--gray100);
@media (--m-viewport) {
background-image: url('../../assets/img/install.png');
background-position: center 20px;
background-repeat: no-repeat;
background-size: 100%;
}
}
.container {
width: 100%;
max-width: 432px;
margin: 0 auto;
padding: 24px 16px 40px;
@media (--m-viewport) {
padding: 40px 16px;
}
}
</s> add </s> add .code {
padding: 3px 5px;
font-size: 14px;
font-family: var(--font-family-monospace);
background-color: var(--gray300);
border-radius: 2px;
}
</s> add this._disabled = props.disabled; </s> add import AccessListResponse, { IAccessListResponse } from 'Entities/AccessListResponse';
import AccessSetRequest, { IAccessSetRequest } from 'Entities/AccessSetRequest'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/main.pcss |
keep add keep keep keep keep keep keep | <mask> import { createContext } from 'react';
<mask> import UI from './stores/ui';
<mask>
<mask> export class Store {
<mask> ui: UI;
<mask>
<mask> login: Login;
<mask>
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove import { makeAutoObservable, observable } from 'mobx';
</s> add import React from 'react';
import { makeAutoObservable, observable, action } from 'mobx';
import { translate } from '@adguard/translate'; </s> add import { Store as InstallStore } from 'Store/installStore'; </s> remove import Translator, { DEFAULT_LOCALE, messages, Locale, reactFormater } from 'Localization';
</s> add import { Locale, DEFAULT_LOCALE, i18n } from 'Localization'; </s> remove import { Store } from 'Store';
</s> add import { Store } from 'Store/installStore'; </s> remove rootStore: Store;
</s> add rootStore: Store | InstallStore; </s> add import cn from 'classnames'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/store/store.ts |
keep add keep keep keep keep keep keep | <mask> ui: UI;
<mask>
<mask> constructor() {
<mask> this.ui = new UI(this);
<mask> this.login = new Login(this);
<mask> this.dashboard = new Dashboard(this);
<mask> this.system = new System(this);
<mask> this.generalSettings = new GeneralSettings(this);
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> add this.login = new Login(this);
this.dashboard = new Dashboard(this);
this.system = new System(this);
this.generalSettings = new GeneralSettings(this);
}
init() {
this.dashboard.init();
this.system.init(); </s> remove this._interfaces = Object.keys(props.interfaces).reduce((prev, key) => {
return { ...prev, [key]: new NetInterface(props.interfaces[key])};
},{})
</s> add this._interfaces = new NetInterfaces(props.interfaces); </s> remove this._whois_info = props.whois_info.map((p) => new WhoisInfo(p));
</s> add this._whois_info = new WhoisInfo(props.whois_info); </s> remove intl = new Translator<Locale>(Locale.en, messages, DEFAULT_LOCALE, reactFormater);
</s> add intl = translate.createReactTranslator<any>(i18n(this.currentLang), React); </s> remove constructor(rootStore: Store) {
</s> add sidebarOpen = false;
constructor(rootStore: Store | InstallStore) { </s> add this.data = Object.entries(props).reduce<Record<string, ClientFindSubEntry>>((prev, [key, value]) => {
prev[key] = new ClientFindSubEntry(value!);
return prev;
}, {}) | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/store/store.ts |
keep add keep keep keep keep keep | <mask> constructor() {
<mask> this.ui = new UI(this);
<mask> }
<mask> }
<mask>
<mask> export const storeValue = new Store();
<mask>
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> add login: Login;
dashboard: Dashboard;
system: System;
generalSettings: GeneralSettings;
</s> remove this._whois_info = props.whois_info.map((p) => new WhoisInfo(p));
</s> add this._whois_info = new WhoisInfo(props.whois_info); </s> remove this._interfaces = Object.keys(props.interfaces).reduce((prev, key) => {
return { ...prev, [key]: new NetInterface(props.interfaces[key])};
},{})
</s> add this._interfaces = new NetInterfaces(props.interfaces); </s> add static async dhcpInterfaces(): Promise<INetInterfaces | Error> {
return await fetch(`/control/dhcp/interfaces`, {
method: 'GET',
}).then(async (res) => {
if (res.status === 200) {
return res.json();
} else {
return new Error(String(res.status));
}
})
}
</s> add readonly data: Record<string, ClientFindSubEntry>;
</s> remove const validate = {
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/store/store.ts |
keep keep keep keep replace keep keep keep keep keep | <mask> import { IInitialConfigurationBeta } from 'Entities/InitialConfigurationBeta';
<mask> import { errorChecker } from 'Helpers/apiErrors';
<mask> import { flow, makeAutoObservable } from 'mobx';
<mask>
<mask> import { Store } from 'Store';
<mask>
<mask> export default class Install {
<mask> rootStore: Store;
<mask>
<mask> addresses: AddressesInfoBeta | null;
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove import Translator, { DEFAULT_LOCALE, messages, Locale, reactFormater } from 'Localization';
</s> add import { Locale, DEFAULT_LOCALE, i18n } from 'Localization'; </s> add import { Store as InstallStore } from 'Store/installStore'; </s> remove import { makeAutoObservable, observable } from 'mobx';
</s> add import React from 'react';
import { makeAutoObservable, observable, action } from 'mobx';
import { translate } from '@adguard/translate'; </s> remove rootStore: Store;
</s> add rootStore: Store | InstallStore; </s> add import cn from 'classnames'; </s> remove import Icons from 'Lib/theme/Icons';
</s> add import Icons from 'Common/ui/Icons'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/store/stores/Install.ts |
replace keep replace keep keep keep keep keep | <mask> import { makeAutoObservable, observable } from 'mobx';
<mask>
<mask> import Translator, { DEFAULT_LOCALE, messages, Locale, reactFormater } from 'Localization';
<mask> import { Store } from 'Store';
<mask>
<mask> export default class UI {
<mask> rootStore: Store;
<mask>
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove rootStore: Store;
</s> add rootStore: Store | InstallStore; </s> add import { Store as InstallStore } from 'Store/installStore'; </s> remove import { Store } from 'Store';
</s> add import { Store } from 'Store/installStore'; </s> remove import T from './Translator';
import { Locale } from './locales';
</s> add import { Locale, DatePickerLocale, messages, DEFAULT_LOCALE, LANGUAGES } from './locales'; </s> add import Login from './stores/Login';
import Dashboard from './stores/Dasnboard';
import System from './stores/System';
import GeneralSettings from './stores/GeneralSettings'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/store/stores/ui.ts |
keep keep keep add keep keep keep keep | <mask> import { translate } from '@adguard/translate';
<mask>
<mask> import { Locale, DEFAULT_LOCALE, i18n } from 'Localization';
<mask> import { Store } from 'Store';
<mask>
<mask> export default class UI {
<mask> rootStore: Store | InstallStore;
<mask>
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove import Translator, { DEFAULT_LOCALE, messages, Locale, reactFormater } from 'Localization';
</s> add import { Locale, DEFAULT_LOCALE, i18n } from 'Localization'; </s> remove rootStore: Store;
</s> add rootStore: Store | InstallStore; </s> remove import { makeAutoObservable, observable } from 'mobx';
</s> add import React from 'react';
import { makeAutoObservable, observable, action } from 'mobx';
import { translate } from '@adguard/translate'; </s> remove import { Store } from 'Store';
</s> add import { Store } from 'Store/installStore'; </s> add import Login from './stores/Login';
import Dashboard from './stores/Dasnboard';
import System from './stores/System';
import GeneralSettings from './stores/GeneralSettings'; </s> remove import T from './Translator';
import { Locale } from './locales';
</s> add import { Locale, DatePickerLocale, messages, DEFAULT_LOCALE, LANGUAGES } from './locales'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/store/stores/ui.ts |
keep keep keep keep replace keep keep keep replace keep keep keep keep | <mask> import Translator, { DEFAULT_LOCALE, messages, Locale, reactFormater } from 'Localization';
<mask> import { Store } from 'Store';
<mask>
<mask> export default class UI {
<mask> rootStore: Store;
<mask>
<mask> currentLang = DEFAULT_LOCALE;
<mask>
<mask> intl = new Translator<Locale>(Locale.en, messages, DEFAULT_LOCALE, reactFormater);
<mask>
<mask> constructor(rootStore: Store) {
<mask> this.rootStore = rootStore;
<mask> makeAutoObservable(this, {
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove constructor(rootStore: Store) {
</s> add sidebarOpen = false;
constructor(rootStore: Store | InstallStore) { </s> remove import Translator, { DEFAULT_LOCALE, messages, Locale, reactFormater } from 'Localization';
</s> add import { Locale, DEFAULT_LOCALE, i18n } from 'Localization'; </s> remove import { makeAutoObservable, observable } from 'mobx';
</s> add import React from 'react';
import { makeAutoObservable, observable, action } from 'mobx';
import { translate } from '@adguard/translate'; </s> add import { Store as InstallStore } from 'Store/installStore'; </s> remove import T from './Translator';
import { Locale } from './locales';
</s> add import { Locale, DatePickerLocale, messages, DEFAULT_LOCALE, LANGUAGES } from './locales'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/store/stores/ui.ts |
keep keep keep keep replace keep keep keep keep keep | <mask> currentLang = DEFAULT_LOCALE;
<mask>
<mask> intl = new Translator<Locale>(Locale.en, messages, DEFAULT_LOCALE, reactFormater);
<mask>
<mask> constructor(rootStore: Store) {
<mask> this.rootStore = rootStore;
<mask> makeAutoObservable(this, {
<mask> intl: observable.struct,
<mask> rootStore: false,
<mask> });
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove intl = new Translator<Locale>(Locale.en, messages, DEFAULT_LOCALE, reactFormater);
</s> add intl = translate.createReactTranslator<any>(i18n(this.currentLang), React); </s> remove rootStore: Store;
</s> add rootStore: Store | InstallStore; </s> add sidebarOpen: observable,
toggleSidebar: action, </s> remove export { messages, DatePickerLocale, Locale, DEFAULT_LOCALE, LANGUAGES, reactFormater } from './locales';
export type Translator = T<Locale>;
export default T;
</s> add export { Locale, DatePickerLocale, messages, DEFAULT_LOCALE, LANGUAGES };
export const i18n = (lang: Locale) => ({
getMessage: (key: string) => messages[lang][key],
getUILanguage: () => lang,
getBaseMessage: (key: string) => messages[DEFAULT_LOCALE][key] || key,
getBaseUILanguage: () => DEFAULT_LOCALE,
}); </s> remove import T from './Translator';
import { Locale } from './locales';
</s> add import { Locale, DatePickerLocale, messages, DEFAULT_LOCALE, LANGUAGES } from './locales'; </s> remove import Translator, { DEFAULT_LOCALE, messages, Locale, reactFormater } from 'Localization';
</s> add import { Locale, DEFAULT_LOCALE, i18n } from 'Localization'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/store/stores/ui.ts |
keep keep add keep keep keep keep keep | <mask> makeAutoObservable(this, {
<mask> intl: observable.struct,
<mask> rootStore: false,
<mask> });
<mask> }
<mask>
<mask> updateLang = (lang: Locale) => {
<mask> this.currentLang = lang;
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove this.intl = this.intl.updateTranslator(lang);
</s> add this.intl = translate.createReactTranslator<any>(i18n(this.currentLang), React);
};
toggleSidebar = () => {
this.sidebarOpen = !this.sidebarOpen; </s> remove constructor(rootStore: Store) {
</s> add sidebarOpen = false;
constructor(rootStore: Store | InstallStore) { </s> remove intl = new Translator<Locale>(Locale.en, messages, DEFAULT_LOCALE, reactFormater);
</s> add intl = translate.createReactTranslator<any>(i18n(this.currentLang), React); </s> remove export { messages, DatePickerLocale, Locale, DEFAULT_LOCALE, LANGUAGES, reactFormater } from './locales';
export type Translator = T<Locale>;
export default T;
</s> add export { Locale, DatePickerLocale, messages, DEFAULT_LOCALE, LANGUAGES };
export const i18n = (lang: Locale) => ({
getMessage: (key: string) => messages[lang][key],
getUILanguage: () => lang,
getBaseMessage: (key: string) => messages[DEFAULT_LOCALE][key] || key,
getBaseUILanguage: () => DEFAULT_LOCALE,
}); </s> remove const validate = {
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] </s> remove const validate = {
};
const isError: string[] = [];
Object.keys(validate).forEach((key) => {
if (!(validate as any)[key]) {
isError.push(key);
}
});
return isError;
</s> add return [] | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/store/stores/ui.ts |
keep keep keep keep replace keep keep | <mask> }
<mask>
<mask> updateLang = (lang: Locale) => {
<mask> this.currentLang = lang;
<mask> this.intl = this.intl.updateTranslator(lang);
<mask> };
<mask> }
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> add sidebarOpen: observable,
toggleSidebar: action, </s> remove export { messages, DatePickerLocale, Locale, DEFAULT_LOCALE, LANGUAGES, reactFormater } from './locales';
export type Translator = T<Locale>;
export default T;
</s> add export { Locale, DatePickerLocale, messages, DEFAULT_LOCALE, LANGUAGES };
export const i18n = (lang: Locale) => ({
getMessage: (key: string) => messages[lang][key],
getUILanguage: () => lang,
getBaseMessage: (key: string) => messages[DEFAULT_LOCALE][key] || key,
getBaseUILanguage: () => DEFAULT_LOCALE,
}); </s> remove if (typeof props.domain_or_ip === 'number') {
this._domain_or_ip = props.domain_or_ip;
}
</s> add this.numberData = Object.entries(props).reduce<Record<string, number>>((prev, [key, value]) => {
prev[key] = value!;
return prev;
}, {}) </s> remove if (typeof props.key === 'string') {
this._key = props.key.trim();
}
</s> add this.data = Object.entries(props).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value!;
return prev;
}, {}) </s> remove const data: IUpstreamsConfigResponse = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, string>>((prev, [key, value]) => {
prev[key] = value;
return prev;
}, {}) </s> remove const data: IClientsFindEntry = {
};
return data;
</s> add return Object.entries(this.data).reduce<Record<string, IClientFindSubEntry>>((prev, [key, value]) => {
prev[key] = value.serialize();
return prev;
}, {}) | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/src/store/stores/ui.ts |
keep keep keep keep replace keep keep keep keep keep | <mask> "Hooks": ["lib/hooks"],
<mask> "Helpers/*": ["lib/helpers/*"],
<mask> "Lib/*": ["lib/*"],
<mask> "Localization": ["localization/index"],
<mask> "Routes": ["lib/routes"],
<mask> "Store": ["store/store"],
<mask> "Store/*": ["store/*"]
<mask> },
<mask> "types": [
<mask> "react",
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove ]
</s> add ],
"useDefineForClassFields": true </s> remove options: {
esModules: true,
}
</s> add </s> remove export const reactFormater = (data: (JSX.Element | string)[]) => {
if (data.every((d) => typeof d === 'string')) {
return data.join('');
}
return React.Children.toArray(data);
};
</s> add </s> remove options: {
esModules: true,
}
</s> add </s> add if (additionalProperties) {
const [
pType, isArray, isClass, isImport, isAdditional
] = schemaParamParser(additionalProperties, this.openapi);
w.writeLine(`this.${additionalPropsOnly ? 'data' : `${uncapitalize(pType)}Data`} = Object.entries(props).reduce<Record<string, ${pType}>>((prev, [key, value]) => {`);
if (isClass) {
w.writeLine(` prev[key] = new ${pType}(value!);`);
} else {
w.writeLine(' prev[key] = value!;')
}
w.writeLine(' return prev;');
w.writeLine('}, {})');
return;
} </s> remove "husky": {
"hooks": {
"pre-commit": "yarn lint"
}
},
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/tsconfig.json |
keep keep keep keep replace keep keep keep keep | <mask> "types": [
<mask> "react",
<mask> "react-dom",
<mask> "node"
<mask> ]
<mask> },
<mask> "include": ["src/**/*", "./declaration.d.ts"],
<mask> "exclude": ["./node_modules/**/*", "./scripts/generator/**/*"]
<mask> }
</s> Pull request #961: New client dashboard
Merge in DNS/adguard-home from new-client-dashboard to master
Squashed commit of the following:
commit 7bbd67c1e3d2af62b96bf41bb356cd6b784e473e
Merge: 113743a6 9cd9054c
Author: Vlad <[email protected]>
Date: Wed Feb 3 16:01:17 2021 +0300
Merge branch 'master' into new-client-dashboard
commit 113743a60665e40383d367dc17fa709dc54e4e2e
Author: Vlad <[email protected]>
Date: Wed Feb 3 15:45:16 2021 +0300
Remove unneded modal styles
commit 04f9d93a9ac17ee046f0d5bedfb2bf5a5e6c0a48
Author: Vlad <[email protected]>
Date: Wed Feb 3 14:19:56 2021 +0300
Consider comments
commit 78a96cd8fed8b3e03547e7e45724c23db295f67b
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:46:52 2021 +0300
Remove old params for MiniCssExtractPlugin
commit 40e5a9b2b1e04036deb70af17f2719eadd0c9c02
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:27:46 2021 +0300
Fix mobile version
commit 509cefc308f945b03cafa62bf48257490a0a4be1
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:56 2021 +0300
Remove unneeded imports
commit d192f39cd2503b8ec942f00ba78fca02cac9fa60
Author: Vlad <[email protected]>
Date: Mon Feb 1 18:20:13 2021 +0300
Finish first version of dashboard
commit f82429e53d334874ff7dd0641092ec83c66ab61c
Merge: fd91a0a3 3e0238aa
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:59 2021 +0300
Merge branch 'master' into new-client-dashboard
commit fd91a0a3d76c2a052a6548232b75d151d6065b88
Author: Vlad <[email protected]>
Date: Mon Feb 1 17:12:27 2021 +0300
wip
commit 237679965052d38acfcd6a72d24b2444cc5b3896
Author: Vlad <[email protected]>
Date: Fri Jan 29 11:18:10 2021 +0300
Finish general settings
commit 397a7e10efd34a8d31bb175a5a5a7158338388d4
Author: Vlad <[email protected]>
Date: Thu Jan 28 19:24:03 2021 +0300
Add General settings page
commit 486aaa6f3f9ad66f3a0dcfcccad9a32659767e90
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:05:16 2021 +0300
Remove husky
commit b895306c0655019ca56ce161e050d83b4e7f5ff1
Merge: a195f1f4 154c9c1c
Author: Vlad <[email protected]>
Date: Thu Jan 28 14:03:37 2021 +0300
Merge branch 'master' into new-client-dashboard
commit a195f1f4d46043d9c53dea08734733f9817b95a0
Merge: c45c5fe9 362f390f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 15:46:01 2021 +0300
wip
commit 362f390fd3dcfca75633a8d30a2e54c3c30b4f3d
Author: Vladislav Abdulmyanov <[email protected]>
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 <[email protected]>
Date: Wed Jan 27 14:13:52 2021 +0300
Merge branch 'new-client-dashboard' into 2554-setup-guide
commit 256f1056770c67339e93275ab6dc7aaf2c10da0b
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:10:45 2021 +0300
+ client: add DNS addresses to the setup guide
commit 0ecf91275a16ecc0dca23cae2ae209836fc622d2
Author: Ildar Kamalov <[email protected]>
Date: Wed Jan 27 14:00:12 2021 +0300
+ client: add setup guide tabs
commit 137b88e4253af5be32d542adbe74575ef74805c8
Author: Vlad <[email protected]>
Date: Thu Jan 21 19:17:58 2021 +0300
Add clients top
commit c3318e6932d87fdff5f22d76bee12b49f099129a
Merge: 2776276b 021eb22f
Author: Vlad <[email protected]>
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 <[email protected]>
Date: Thu Jan 21 19:15:53 2021 +0300
Add top client info
commit 021eb22ff877aec12eb7fab60147a2cc2ddd08b7
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 14:13:54 2021 +0300
Merge: client: add sidebar
Squashed commit of the following:
commit 6885ba953971e68602889fbb3219221f90265421
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:56:55 2021 +0300
add sidebar mask
commit f069bfe8cba2b31355e19a51ca00bf774ee9e560
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:03:47 2021 +0300
fix store
commit 77c8791002887ae022da07dc264d9010576e7bab
Merge: d0a6eff6 ea6d54d4
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 13:01:04 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit d0a6eff67fd74533d63f5d56382085e98ddbb702
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:47:32 2021 +0300
client: remove unused file
commit 9d2424477de85503fe41fa00cc1294cb0c0e7dfa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 12:39:13 2021 +0300
client: header
commit 9ddea19c136f15b184caa72d7e82738f7d4f3f1f
Merge: 797f1248 b694bb05
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:57:24 2021 +0300
Merge branch 'new-client-dashboard' into 2254-sidebar
commit 797f1248df5c1ef8e59c2a9999138f9e05a7adaa
Author: Ildar Kamalov <[email protected]>
Date: Thu Jan 21 10:51:57 2021 +0300
client: sidebar
... and 14 more commits </s> remove "Routes": ["lib/routes"],
</s> add "Paths": ["components/App/Routes/Paths"], </s> add if (additionalProperties) {
const [
pType, isArray, isClass, isImport, isAdditional
] = schemaParamParser(additionalProperties, this.openapi);
w.writeLine(`this.${additionalPropsOnly ? 'data' : `${uncapitalize(pType)}Data`} = Object.entries(props).reduce<Record<string, ${pType}>>((prev, [key, value]) => {`);
if (isClass) {
w.writeLine(` prev[key] = new ${pType}(value!);`);
} else {
w.writeLine(' prev[key] = value!;')
}
w.writeLine(' return prev;');
w.writeLine('}, {})');
return;
} </s> remove options: {
esModules: true,
}
</s> add </s> remove
</s> add if (additionalProperties) {
const [
pType, isArray, isClass, isImport, isAdditional
] = schemaParamParser(additionalProperties, this.openapi);
const type = `Record<string, ${pType}${isArray ? '[]' : ''}>`;
entityClass.addProperty({
name: additionalPropsOnly ? 'data' : `${uncapitalize(pType)}Data`,
isReadonly: true,
type: type,
});
} </s> add const additionalPropsOnly = additionalProperties && sortedSProps.length === 0;
</s> remove export const reactFormater = (data: (JSX.Element | string)[]) => {
if (data.every((d) => typeof d === 'string')) {
return data.join('');
}
return React.Children.toArray(data);
};
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0c127039cfa55d4cadfce20bcfa2c542840bd7ed | client2/tsconfig.json |
keep keep keep keep replace keep keep keep keep keep | <mask> <div className="services">
<mask> {SERVICES.map(service => (
<mask> <Field
<mask> key={service.id}
<mask> icon={service.id}
<mask> name={`blocked_services.${service.id}`}
<mask> type="checkbox"
<mask> component={renderServiceField}
<mask> placeholder={service.name}
<mask> disabled={useGlobalServices}
</s> + client: add prefix to the service icons </s> remove icon={service.id}
</s> add icon={`service_${service.id}`} </s> remove <symbol id="twitter" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_twitter" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="youtube" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_youtube" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="discord" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_discord" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="twitch" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_twitch" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="messenger" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_messenger" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> | https://github.com/AdguardTeam/AdGuardHome/commit/0c46a70d9a2ce41f8a5123a2f7ea1bad09031a04 | client/src/components/Settings/Clients/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> <div className="services">
<mask> {SERVICES.map(service => (
<mask> <Field
<mask> key={service.id}
<mask> icon={service.id}
<mask> name={`blocked_services.${service.id}`}
<mask> type="checkbox"
<mask> component={renderServiceField}
<mask> placeholder={service.name}
<mask> disabled={processing || processingSet}
</s> + client: add prefix to the service icons </s> remove icon={service.id}
</s> add icon={`service_${service.id}`} </s> remove <symbol id="twitter" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_twitter" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="youtube" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_youtube" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="discord" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_discord" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="twitch" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_twitch" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="messenger" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_messenger" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> | https://github.com/AdguardTeam/AdGuardHome/commit/0c46a70d9a2ce41f8a5123a2f7ea1bad09031a04 | client/src/components/Settings/Services/Form.js |
keep replace keep keep keep replace keep keep keep keep | <mask>
<mask> <symbol id="youtube" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
<mask> <path d="M19.695 4.04S15.348 3.2 12 3.2s-7.695.84-7.695.84L1.602 7.2v9.6l2.703 3.16s4.347.84 7.695.84 7.695-.84 7.695-.84l2.703-3.16V12 7.2zM9.602 15.68V8.32L16 12zm0 0"/><path d="M19.2 4a3.198 3.198 0 1 0 0 6.398c1.769 0 3.198-1.43 3.198-3.199C22.398 5.434 20.968 4 19.2 4zm0 9.602a3.198 3.198 0 1 0 0 6.398c1.769 0 3.198-1.434 3.198-3.2 0-1.769-1.43-3.198-3.199-3.198zM1.601 7.199c0 1.77 1.43 3.2 3.199 3.2 1.765 0 2.398-1.43 2.398-3.2C7.2 5.434 6.566 4 4.801 4 3.03 4 1.6 5.434 1.6 7.2zM4.8 13.602c-1.77 0-3.2 1.43-3.2 3.199A3.198 3.198 0 1 0 8 16.8c0-1.77-1.434-3.2-3.2-3.2zm0 0" />
<mask> </symbol>
<mask>
<mask> <symbol id="discord" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
<mask> <path d="M20.098 5.559C18.156 4 15.09 3.734 14.96 3.723a.493.493 0 0 0-.484.285c-.004.008-.172.504-.34.984 2.254.395 3.785 1.27 3.867 1.317a.8.8 0 1 1-.805 1.382C17.176 7.68 14.93 6.398 12 6.398c-2.93 0-5.176 1.282-5.2 1.293a.8.8 0 0 1-.805-1.383c.083-.046 1.622-.925 3.88-1.32-.172-.484-.348-.972-.352-.98a.487.487 0 0 0-.484-.285c-.129.011-3.195.273-5.16 1.855C2.852 6.528.8 12.074.8 16.871c0 .082.02.164.062.238 1.418 2.489 5.282 3.141 6.16 3.168h.016c.156 0 .3-.074.395-.199l.949-1.289c-2.086-.504-3.192-1.293-3.258-1.344a.799.799 0 0 1-.168-1.117.794.794 0 0 1 1.113-.172c.032.016 2.067 1.446 5.93 1.446 3.879 0 5.91-1.434 5.93-1.45a.8.8 0 0 1 .945 1.293c-.066.047-1.164.836-3.246 1.34l.937 1.293c.094.125.239.2.395.2h.016c.882-.028 4.742-.68 6.16-3.169a.477.477 0 0 0 .062-.242c0-4.793-2.05-10.34-3.101-11.308zM8.8 15.199c-.887 0-1.602-.894-1.602-2 0-1.105.715-2 1.602-2 .883 0 1.597.895 1.597 2 0 1.106-.714 2-1.597 2zm6.398 0c-.883 0-1.597-.894-1.597-2 0-1.105.714-2 1.597-2 .887 0 1.602.895 1.602 2 0 1.106-.715 2-1.602 2zm0 0"/>
<mask> </symbol>
<mask>
<mask> <symbol id="twitch" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> + client: add prefix to the service icons </s> remove <symbol id="twitch" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_twitch" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="ok" viewBox="0 0 96 96" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_ok" viewBox="0 0 96 96" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="steam" viewBox="0 0 22 22" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_steam" viewBox="0 0 22 22" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="vk" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_vk" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="messenger" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_messenger" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> | https://github.com/AdguardTeam/AdGuardHome/commit/0c46a70d9a2ce41f8a5123a2f7ea1bad09031a04 | client/src/components/ui/Icons.js |
keep keep replace keep keep keep replace | <mask> </symbol>
<mask>
<mask> <symbol id="twitch" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
<mask> <path d="M4.8 3.2L3.2 6.397V19.2h4v2.403h3.198l2.403-2.403H16l4.8-4.8v-11.2zm14.4 10.402L16.8 16H12l-2.398 2.398V16H6.398V4.8H19.2zm0 0" /><path d="M15.2 12.8h-1.598V7.2h1.597zm-3.2 0h-1.602V7.2H12zm0 0" />
<mask> </symbol>
<mask>
<mask> <symbol id="messenger" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> + client: add prefix to the service icons </s> remove <symbol id="discord" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_discord" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="whatsapp" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_whatsapp" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="snapchat" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_snapchat" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="facebook" viewBox="0 0 27 27" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_facebook" viewBox="0 0 27 27" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="instagram" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_instagram" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> | https://github.com/AdguardTeam/AdGuardHome/commit/0c46a70d9a2ce41f8a5123a2f7ea1bad09031a04 | client/src/components/ui/Icons.js |
keep replace keep keep keep replace keep | <mask>
<mask> <symbol id="snapchat" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
<mask> <path d="M12.176 4c.715 0 3.136.191 4.277 2.668.383.828.285 2.273.211 3.437l-.004.051c-.008.164-.02.32-.027.469.015.02.164.156.492.168.25-.012.54-.086.855-.23a.784.784 0 0 1 .57.008h.005c.254.09.422.261.425.44.004.173-.128.43-.789.68a2.694 2.694 0 0 1-.25.082c-.375.118-.945.293-1.117.692-.097.215-.066.48.09.785 0 .004.004.008.004.012.047.105 1.187 2.62 3.73 3.027.094.016.16.094.153.188a.24.24 0 0 1-.024.101c-.105.238-.578.574-2.234.824-.133.02-.188.188-.266.547-.03.13-.058.258-.101.39-.035.118-.11.173-.235.173h-.02a2.34 2.34 0 0 1-.37-.043 4.986 4.986 0 0 0-.996-.102c-.23 0-.473.02-.715.059-.496.078-.918.367-1.363.672-.653.445-1.32.902-2.364.902-.047 0-.09 0-.136-.004-.028.004-.055.004-.086.004-1.043 0-1.711-.457-2.36-.902-.445-.305-.867-.594-1.363-.672a4.533 4.533 0 0 0-.719-.059c-.418 0-.75.063-.992.106a2.02 2.02 0 0 1-.371.054c-.102 0-.211-.023-.258-.18-.039-.136-.07-.269-.101-.394-.075-.328-.125-.531-.266-.55-1.656-.247-2.129-.587-2.234-.825-.012-.035-.024-.066-.024-.101a.182.182 0 0 1 .156-.188c2.54-.406 3.68-2.922 3.727-3.031.004 0 .004-.004.004-.008.156-.305.187-.57.094-.79-.176-.398-.747-.57-1.122-.687a3.147 3.147 0 0 1-.25-.082c-.75-.289-.812-.582-.785-.734.051-.254.407-.434.692-.434a.49.49 0 0 1 .207.04c.336.152.64.23.906.23.363 0 .52-.148.54-.168-.009-.164-.02-.34-.032-.52-.074-1.164-.168-2.609.21-3.433 1.138-2.477 3.555-2.668 4.27-2.668L12.133 4h.043m0-1.602h-.043l-.313.008v-.004c-.953 0-4.187.262-5.722 3.598-.387.844-.45 1.887-.422 2.922-.922.02-2 .625-2.215 1.726-.082.407-.184 1.786 1.781 2.54.012.003.02.007.031.011-.39.559-1.113 1.34-2.168 1.508-.902.14-1.55.941-1.5 1.86.016.226.067.44.153.64.41.938 1.406 1.363 2.543 1.613a1.83 1.83 0 0 0 1.785 1.305c.246 0 .465-.043.66-.078a3.44 3.44 0 0 1 .703-.082c.149 0 .305.012.465.039.14.023.457.238.711.41.73.5 1.727 1.184 3.266 1.184h.101c.04 0 .078.004.121.004 1.532 0 2.528-.68 3.258-1.176.281-.192.582-.399.723-.422.156-.024.312-.04.46-.04.259 0 .458.032.696.075.266.05.477.074.668.074.852 0 1.543-.508 1.785-1.293 1.137-.25 2.129-.672 2.535-1.593.094-.22.149-.43.16-.649a1.783 1.783 0 0 0-1.496-1.871c-1.054-.168-1.78-.95-2.172-1.508l.036-.011c1.601-.618 1.824-1.645 1.816-2.204-.02-.855-.594-1.601-1.477-1.918a2.37 2.37 0 0 0-.777-.156c.027-1.015-.039-2.078-.422-2.914-1.539-3.336-4.773-3.598-5.73-3.598zm0 0" />
<mask> </symbol>
<mask>
<mask> <symbol id="twitter" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
<mask> <path d="M22.398 5.55a8.583 8.583 0 0 1-2.449.673 4.252 4.252 0 0 0 1.875-2.364 8.66 8.66 0 0 1-2.71 1.04A4.251 4.251 0 0 0 16 3.546a4.27 4.27 0 0 0-4.266 4.27c0 .335.036.66.11.972a12.126 12.126 0 0 1-8.797-4.46 4.259 4.259 0 0 0-.578 2.148c0 1.48.754 2.785 1.898 3.55a4.273 4.273 0 0 1-1.933-.535v.055a4.27 4.27 0 0 0 3.425 4.183c-.359.098-.734.149-1.125.149-.273 0-.543-.027-.804-.074a4.276 4.276 0 0 0 3.988 2.965 8.562 8.562 0 0 1-5.3 1.824 8.82 8.82 0 0 1-1.02-.059 12.088 12.088 0 0 0 6.543 1.918c7.851 0 12.14-6.504 12.14-12.144 0-.184-.004-.368-.011-.551a8.599 8.599 0 0 0 2.128-2.207zm0 0" />
</s> + client: add prefix to the service icons </s> remove <symbol id="messenger" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_messenger" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="instagram" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_instagram" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="whatsapp" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_whatsapp" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="twitch" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_twitch" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="discord" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_discord" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> | https://github.com/AdguardTeam/AdGuardHome/commit/0c46a70d9a2ce41f8a5123a2f7ea1bad09031a04 | client/src/components/ui/Icons.js |
keep keep keep replace keep keep keep replace keep | <mask> <path d="M22.398 5.55a8.583 8.583 0 0 1-2.449.673 4.252 4.252 0 0 0 1.875-2.364 8.66 8.66 0 0 1-2.71 1.04A4.251 4.251 0 0 0 16 3.546a4.27 4.27 0 0 0-4.266 4.27c0 .335.036.66.11.972a12.126 12.126 0 0 1-8.797-4.46 4.259 4.259 0 0 0-.578 2.148c0 1.48.754 2.785 1.898 3.55a4.273 4.273 0 0 1-1.933-.535v.055a4.27 4.27 0 0 0 3.425 4.183c-.359.098-.734.149-1.125.149-.273 0-.543-.027-.804-.074a4.276 4.276 0 0 0 3.988 2.965 8.562 8.562 0 0 1-5.3 1.824 8.82 8.82 0 0 1-1.02-.059 12.088 12.088 0 0 0 6.543 1.918c7.851 0 12.14-6.504 12.14-12.144 0-.184-.004-.368-.011-.551a8.599 8.599 0 0 0 2.128-2.207zm0 0" />
<mask> </symbol>
<mask>
<mask> <symbol id="instagram" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
<mask> <path d="M12 8.8A3.2 3.2 0 0 0 8.8 12a3.2 3.2 0 0 0 3.2 3.2 3.2 3.2 0 0 0 3.2-3.2A3.2 3.2 0 0 0 12 8.8zm0 0" /><path d="M16 2.398H8A5.609 5.609 0 0 0 2.398 8v8A5.609 5.609 0 0 0 8 21.602h8A5.609 5.609 0 0 0 21.602 16V8A5.609 5.609 0 0 0 16 2.398zm-4 14.403A4.805 4.805 0 0 1 7.2 12c0-2.648 2.152-4.8 4.8-4.8 2.648 0 4.8 2.152 4.8 4.8 0 2.648-2.152 4.8-4.8 4.8zm5.602-9.602a.799.799 0 1 1 0 0zm0 0" />
<mask> </symbol>
<mask>
<mask> <symbol id="whatsapp" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
<mask> <path d="M3.836 16.668l-1.352 4.934 5.047-1.329zm0 0" /><path d="M12 2.398C6.7 2.398 2.398 6.7 2.398 12c0 5.3 4.301 9.602 9.602 9.602 5.3 0 9.602-4.301 9.602-9.602 0-5.3-4.301-9.602-9.602-9.602zm4.738 12.915c-.195.554-1.168 1.093-1.601 1.128-.442.043-.852.2-2.856-.59-2.418-.953-3.945-3.433-4.062-3.593-.121-.156-.969-1.285-.969-2.453 0-1.172.613-1.746.828-1.985a.875.875 0 0 1 .637-.297c.156 0 .316 0 .453.004.172.004.36.016.535.41.215.47.676 1.645.735 1.766.058.117.101.262.019.418-.078.156-.121.254-.234.399-.121.136-.25.308-.36.41-.117.12-.242.25-.101.488.136.238.613 1.016 1.32 1.645.906.812 1.672 1.062 1.91 1.18.238.12.38.1.516-.06.14-.156.594-.69.754-.93.156-.237.316-.198.531-.12.219.078 1.39.656 1.629.773.238.121.394.18.453.278.063.097.063.574-.137 1.129zm0 0" />
</s> + client: add prefix to the service icons </s> remove <symbol id="twitter" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_twitter" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="snapchat" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_snapchat" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="facebook" viewBox="0 0 27 27" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_facebook" viewBox="0 0 27 27" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="ok" viewBox="0 0 96 96" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_ok" viewBox="0 0 96 96" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="messenger" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_messenger" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> | https://github.com/AdguardTeam/AdGuardHome/commit/0c46a70d9a2ce41f8a5123a2f7ea1bad09031a04 | client/src/components/ui/Icons.js |
keep keep replace keep keep keep replace keep keep keep keep | <mask> </symbol>
<mask>
<mask> <symbol id="facebook" viewBox="0 0 27 27" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
<mask> <path d="M12 0C5.371 0 0 5.371 0 12c0 6.016 4.434 10.984 10.207 11.852V15.18H7.238v-3.153h2.969V9.926c0-3.473 1.691-5 4.578-5 1.387 0 2.117.105 2.461.148v2.754h-1.969c-1.226 0-1.652 1.164-1.652 2.473v1.726h3.594l-.489 3.153h-3.105v8.699C19.48 23.082 24 18.074 24 12c0-6.629-5.371-12-12-12zm0 0" />
<mask> </symbol>
<mask>
<mask> <symbol id="netflix" viewBox="0 0 450 600" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
<mask> <path d="M83.5 72.814V512l17.432-2.865a955.35 955.35 0 0 1 88.604-10.312l13.965-.966V338.206L83.5 72.814z"/><path d="M308.5 0L308.5 172.328 428.5 438.914 428.5 0z"/><path d="M308.5 245.415l-10.87-24.149L198.03 0H83.501l168.12 371.813 57.024 126.112 8.852.566a955.65 955.65 0 0 1 93.572 10.644L428.5 512l-120-266.585z"/>
<mask> </symbol>
<mask>
<mask> <symbol id="vk" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> + client: add prefix to the service icons </s> remove <symbol id="vk" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_vk" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="whatsapp" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_whatsapp" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="twitch" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_twitch" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="messenger" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_messenger" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="ok" viewBox="0 0 96 96" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_ok" viewBox="0 0 96 96" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> | https://github.com/AdguardTeam/AdGuardHome/commit/0c46a70d9a2ce41f8a5123a2f7ea1bad09031a04 | client/src/components/ui/Icons.js |
keep replace keep keep keep replace keep keep | <mask>
<mask> <symbol id="vk" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
<mask> <path d="M12 .96C5.914.96.96 5.915.96 12c0 6.086 4.954 11.04 11.04 11.04 6.086 0 11.04-4.954 11.04-11.04C23.04 5.914 18.085.96 12 .96zm4.785 13.216c1.074.953 1.3 1.293 1.336 1.351.445.707-.492.793-.492.793h-1.98s-.481.004-.891-.27c-.672-.437-1.375-1.288-1.867-1.14-.414.125-.41.684-.41 1.16 0 .172-.149.25-.481.25h-.617c-1.086 0-2.262-.363-3.434-1.59-1.656-1.734-3.113-5.222-3.113-5.222s-.086-.176.008-.281c.105-.122.394-.106.394-.106h1.918s.18.031.309.125c.11.074.168.219.168.219s.32 1.062.734 1.742c.801 1.32 1.172 1.355 1.445 1.215.399-.207.266-1.617.266-1.617s.02-.602-.187-.871c-.16-.211-.465-.32-.598-.336-.11-.016.07-.203.3-.313.31-.137.727-.172 1.446-.164.563.004.723.04.941.09.665.152.5.555.5 1.969 0 .453-.062 1.09.278 1.3.148.09.652.204 1.55-1.257.43-.692.77-1.84.77-1.84s.067-.125.176-.188c.113-.066.11-.062.262-.062.152 0 1.683-.012 2.02-.012.335 0 .651-.004.702.191.078.282-.246 1.25-1.07 2.305-1.355 1.723-1.504 1.563-.383 2.559zm0 0" />
<mask> </symbol>
<mask>
<mask> <symbol id="ok" viewBox="0 0 96 96" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
<mask> <path d="M50 28c-3.313 0-6 2.688-6 6 0 3.313 2.688 6 6 6 3.313 0 6-2.688 6-6 0-3.313-2.688-6-6-6zm0 0" /><path d="M50 4C24.637 4 4 24.637 4 50s20.637 46 46 46 46-20.637 46-46S75.363 4 50 4zm0 16c7.73 0 14 6.27 14 14s-6.27 14-14 14-14-6.27-14-14 6.27-14 14-14zm14.828 49.172A3.999 3.999 0 0 1 62 76a3.987 3.987 0 0 1-2.828-1.172L50 65.656l-9.172 9.172a3.999 3.999 0 0 1-5.656 0 3.999 3.999 0 0 1 0-5.656l6.43-6.43c-1.836-.539-3.618-1.207-5.29-2.066A4.302 4.302 0 0 1 34 56.859c0-2.98 3.172-4.761 5.809-3.375A21.767 21.767 0 0 0 50 56c3.684 0 7.148-.91 10.191-2.516C62.828 52.098 66 53.88 66 56.86c0 1.602-.89 3.078-2.313 3.813-1.671.863-3.453 1.531-5.289 2.07zm0 0" />
<mask> </symbol>
</s> + client: add prefix to the service icons </s> remove <symbol id="steam" viewBox="0 0 22 22" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_steam" viewBox="0 0 22 22" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="netflix" viewBox="0 0 450 600" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_netflix" viewBox="0 0 450 600" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="discord" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_discord" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="twitch" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_twitch" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="whatsapp" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_whatsapp" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> | https://github.com/AdguardTeam/AdGuardHome/commit/0c46a70d9a2ce41f8a5123a2f7ea1bad09031a04 | client/src/components/ui/Icons.js |
keep keep keep keep replace keep keep keep replace keep | <mask> <symbol id="ok" viewBox="0 0 96 96" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
<mask> <path d="M50 28c-3.313 0-6 2.688-6 6 0 3.313 2.688 6 6 6 3.313 0 6-2.688 6-6 0-3.313-2.688-6-6-6zm0 0" /><path d="M50 4C24.637 4 4 24.637 4 50s20.637 46 46 46 46-20.637 46-46S75.363 4 50 4zm0 16c7.73 0 14 6.27 14 14s-6.27 14-14 14-14-6.27-14-14 6.27-14 14-14zm14.828 49.172A3.999 3.999 0 0 1 62 76a3.987 3.987 0 0 1-2.828-1.172L50 65.656l-9.172 9.172a3.999 3.999 0 0 1-5.656 0 3.999 3.999 0 0 1 0-5.656l6.43-6.43c-1.836-.539-3.618-1.207-5.29-2.066A4.302 4.302 0 0 1 34 56.859c0-2.98 3.172-4.761 5.809-3.375A21.767 21.767 0 0 0 50 56c3.684 0 7.148-.91 10.191-2.516C62.828 52.098 66 53.88 66 56.86c0 1.602-.89 3.078-2.313 3.813-1.671.863-3.453 1.531-5.289 2.07zm0 0" />
<mask> </symbol>
<mask>
<mask> <symbol id="steam" viewBox="0 0 22 22" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
<mask> <path d="M14.398 7.2a2.4 2.4 0 1 0 .003 4.799 2.4 2.4 0 0 0-.003-4.8zm0 0" fill="none" strokeWidth="1.6" stroke="currentColor" strokeMiterlimit="10"/><path d="M8 14c-.629 0-1.18.297-1.547.75l1.758.48c.426.114.68.555.562.98a.804.804 0 0 1-.984.563l-1.762-.48A1.998 1.998 0 0 0 10 16c0-1.105-.895-2-2-2zm0 0" /><path d="M19.2 3.2H4.8c-.886 0-1.6.714-1.6 1.6v9.063l2.027.551a3.213 3.213 0 0 1 2.289-1.566l2.136-2.567a4.799 4.799 0 1 1 4.066 4.066l-2.566 2.137A3.195 3.195 0 0 1 8 19.2 3.2 3.2 0 0 1 4.8 16c0-.016.005-.027.005-.043l-1.606-.437v3.68c0 .886.715 1.6 1.602 1.6h14.398c.887 0 1.602-.714 1.602-1.6V4.8c0-.886-.715-1.6-1.602-1.6zm0 0" />
<mask> </symbol>
<mask>
<mask> <symbol id="skype" viewBox="0 0 26 26" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
<mask> <path d="M23.363 14.387c.153-.739.23-1.5.23-2.266C23.594 5.883 18.45.805 12.122.805c-.594 0-1.191.047-1.781.136A6.891 6.891 0 0 0 6.852 0C3.074 0 0 3.035 0 6.762c0 1.144.293 2.27.852 3.265-.133.688-.2 1.391-.2 2.094 0 6.238 5.149 11.316 11.47 11.316.648 0 1.3-.054 1.94-.164.95.477 2.012.727 3.086.727C20.926 24 24 20.969 24 17.238c0-1.004-.215-1.96-.637-2.851zM17.758 17.3c-.508.707-1.258 1.27-2.23 1.668-.966.394-2.122.593-3.434.593-1.578 0-2.903-.273-3.934-.812a5.074 5.074 0 0 1-1.808-1.582c-.47-.664-.707-1.324-.707-1.961 0-.395.156-.738.457-1.023.304-.278.687-.418 1.148-.418.379 0 .703.109.969.332.254.21.469.523.644.93.192.437.407.808.633 1.1.211.282.524.52.918.704.399.188.938.281 1.598.281.91 0 1.652-.191 2.215-.57.546-.367.812-.813.812-1.352 0-.43-.14-.765-.422-1.027-.3-.277-.699-.492-1.176-.637-.5-.152-1.18-.32-2.015-.496-1.14-.238-2.11-.523-2.88-.847-.788-.332-1.425-.79-1.89-1.364-.472-.582-.71-1.312-.71-2.172 0-.816.253-1.554.75-2.191.488-.633 1.206-1.125 2.132-1.46.91-.333 1.996-.5 3.223-.5.98 0 1.844.108 2.566.331.723.223 1.336.524 1.813.89.484.376.843.774 1.07 1.188.227.418.344.832.344 1.235 0 .386-.153.738-.453 1.046-.297.31-.68.465-1.125.465-.41 0-.727-.097-.95-.289-.207-.18-.418-.46-.656-.863-.273-.516-.605-.918-.984-1.203-.371-.277-.989-.418-1.836-.418-.79 0-1.43.156-1.902.465-.461.293-.684.633-.684 1.039 0 .246.07.449.219.629.156.187.379.351.656.488.289.145.586.258.883.34.308.082.82.207 1.523.367.887.191 1.707.398 2.43.625.73.234 1.363.516 1.879.848.527.34.941.773 1.238 1.293.297.52.445 1.16.445 1.91a4.07 4.07 0 0 1-.77 2.418zm0 0"/>
</s> + client: add prefix to the service icons </s> remove <symbol id="ok" viewBox="0 0 96 96" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_ok" viewBox="0 0 96 96" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="vk" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_vk" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="mail_ru" viewBox="0 0 512 512" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_mail_ru" viewBox="0 0 512 512" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="discord" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_discord" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="youtube" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_youtube" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> | https://github.com/AdguardTeam/AdGuardHome/commit/0c46a70d9a2ce41f8a5123a2f7ea1bad09031a04 | client/src/components/ui/Icons.js |
keep keep keep keep replace keep keep keep keep keep | <mask> <symbol id="skype" viewBox="0 0 26 26" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
<mask> <path d="M23.363 14.387c.153-.739.23-1.5.23-2.266C23.594 5.883 18.45.805 12.122.805c-.594 0-1.191.047-1.781.136A6.891 6.891 0 0 0 6.852 0C3.074 0 0 3.035 0 6.762c0 1.144.293 2.27.852 3.265-.133.688-.2 1.391-.2 2.094 0 6.238 5.149 11.316 11.47 11.316.648 0 1.3-.054 1.94-.164.95.477 2.012.727 3.086.727C20.926 24 24 20.969 24 17.238c0-1.004-.215-1.96-.637-2.851zM17.758 17.3c-.508.707-1.258 1.27-2.23 1.668-.966.394-2.122.593-3.434.593-1.578 0-2.903-.273-3.934-.812a5.074 5.074 0 0 1-1.808-1.582c-.47-.664-.707-1.324-.707-1.961 0-.395.156-.738.457-1.023.304-.278.687-.418 1.148-.418.379 0 .703.109.969.332.254.21.469.523.644.93.192.437.407.808.633 1.1.211.282.524.52.918.704.399.188.938.281 1.598.281.91 0 1.652-.191 2.215-.57.546-.367.812-.813.812-1.352 0-.43-.14-.765-.422-1.027-.3-.277-.699-.492-1.176-.637-.5-.152-1.18-.32-2.015-.496-1.14-.238-2.11-.523-2.88-.847-.788-.332-1.425-.79-1.89-1.364-.472-.582-.71-1.312-.71-2.172 0-.816.253-1.554.75-2.191.488-.633 1.206-1.125 2.132-1.46.91-.333 1.996-.5 3.223-.5.98 0 1.844.108 2.566.331.723.223 1.336.524 1.813.89.484.376.843.774 1.07 1.188.227.418.344.832.344 1.235 0 .386-.153.738-.453 1.046-.297.31-.68.465-1.125.465-.41 0-.727-.097-.95-.289-.207-.18-.418-.46-.656-.863-.273-.516-.605-.918-.984-1.203-.371-.277-.989-.418-1.836-.418-.79 0-1.43.156-1.902.465-.461.293-.684.633-.684 1.039 0 .246.07.449.219.629.156.187.379.351.656.488.289.145.586.258.883.34.308.082.82.207 1.523.367.887.191 1.707.398 2.43.625.73.234 1.363.516 1.879.848.527.34.941.773 1.238 1.293.297.52.445 1.16.445 1.91a4.07 4.07 0 0 1-.77 2.418zm0 0"/>
<mask> </symbol>
<mask>
<mask> <symbol id="mail_ru" viewBox="0 0 512 512" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
<mask> <path d="M256 141.176c-63.306 0-114.809 51.503-114.809 114.809S192.694 370.795 256 370.795s114.809-51.503 114.809-114.809S319.306 141.176 256 141.176zm0 188.254c-40.498 0-73.445-32.947-73.445-73.445 0-40.498 32.947-73.445 73.445-73.445 40.499 0 73.445 32.947 73.445 73.445 0 40.498-32.946 73.445-73.445 73.445z"/><path d="M437.008 74.97C388.656 26.623 324.375 0 256 0h-.017C187.603.004 123.318 26.637 74.97 74.992 26.62 123.347-.005 187.637 0 256.017c.004 68.379 26.637 132.666 74.992 181.014C123.344 485.377 187.625 512.001 256 512h.017c55.945-.004 111.216-18.738 155.631-52.752 9.07-6.945 10.792-19.927 3.846-28.995-6.945-9.069-19.926-10.794-28.995-3.846-37.24 28.518-83.58 44.224-130.486 44.228h-.014c-57.324 0-111.224-22.324-151.761-62.856-40.542-40.536-62.871-94.435-62.875-151.766-.006-118.35 96.273-214.641 214.623-214.649H256c118.34 0 214.628 96.279 214.636 214.622v23.532c0 27.523-22.39 49.913-49.913 49.913-27.523 0-49.913-22.391-49.913-49.913v-23.532c0-11.422-9.259-20.682-20.682-20.682s-20.682 9.26-20.682 20.682v23.532c0 50.33 40.947 91.278 91.278 91.278S512 329.848 512 279.518v-23.534c-.005-68.38-26.638-132.666-74.992-181.014z"/>
<mask> </symbol>
<mask>
<mask> <symbol id="question" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
<mask> <circle cx="12" cy="12" r="10" /><path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3" /><line x1="12" y1="17" x2="12" y2="17" />
</s> + client: add prefix to the service icons </s> remove <symbol id="skype" viewBox="0 0 26 26" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_skype" viewBox="0 0 26 26" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="steam" viewBox="0 0 22 22" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_steam" viewBox="0 0 22 22" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="twitch" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_twitch" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="whatsapp" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_whatsapp" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="messenger" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_messenger" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> </s> remove <symbol id="discord" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
</s> add <symbol id="service_discord" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> | https://github.com/AdguardTeam/AdGuardHome/commit/0c46a70d9a2ce41f8a5123a2f7ea1bad09031a04 | client/src/components/ui/Icons.js |
keep keep keep keep replace replace keep keep keep keep keep | <mask> import PropTypes from 'prop-types';
<mask> import { Field, reduxForm } from 'redux-form';
<mask> import { Trans, withTranslation } from 'react-i18next';
<mask> import flow from 'lodash/flow';
<mask>
<mask> import { renderInputField, required, isValidPath } from '../../helpers/form';
<mask> import { FORM_NAME } from '../../helpers/constants';
<mask>
<mask> const Form = (props) => {
<mask> const {
<mask> t,
</s> Extract validation functions in the separate file </s> remove
import { renderInputField, required } from '../../helpers/form';
</s> add import { renderInputField } from '../../helpers/form';
import { validateRequiredValue } from '../../helpers/validators'; </s> remove
import {
renderInputField, required, domain, answer,
} from '../../../helpers/form';
</s> add import { renderInputField } from '../../../helpers/form';
import { validateAnswer, validateDomain, validateRequiredValue } from '../../../helpers/validators'; </s> remove
import {
renderInputField, ipv4, mac, required,
} from '../../../../helpers/form';
</s> add import { renderInputField } from '../../../../helpers/form';
import { validateIpv4, validateMac, validateRequiredValue } from '../../../../helpers/validators'; </s> remove
import {
renderInputField, required, ipv4, isPositive, toNumber,
} from '../../../helpers/form';
</s> add import { renderInputField, toNumber } from '../../../helpers/form'; </s> remove import {
biggerOrEqualZero,
maxValue,
renderInputField,
required,
toNumber,
} from '../../../../helpers/form';
import { FORM_NAME } from '../../../../helpers/constants';
</s> add import { renderInputField, toNumber } from '../../../../helpers/form';
import { validateBiggerOrEqualZeroValue, getMaxValueValidator, validateRequiredValue } from '../../../../helpers/validators';
import { FORM_NAME, SECONDS_IN_HOUR } from '../../../../helpers/constants'; </s> remove import {
renderInputField, required, validInstallPort, toNumber,
} from '../../helpers/form';
</s> add import { renderInputField, toNumber } from '../../helpers/form';
import { validateRequiredValue, validateInstallPort } from '../../helpers/validators'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/components/Filters/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> type="text"
<mask> component={renderInputField}
<mask> className="form-control"
<mask> placeholder={t('enter_name_hint')}
<mask> validate={[required]}
<mask> normalizeOnBlur={(data) => data.trim()}
<mask> />
<mask> </div>
<mask> <div className="form__group">
<mask> <Field
</s> Extract validation functions in the separate file </s> remove validate={[required, isValidPath]}
</s> add validate={[validateRequiredValue, validatePath]} </s> remove validate={[required, mac]}
</s> add validate={[validateRequiredValue, validateMac]} </s> remove validate={[required, ipv4]}
</s> add validate={[validateRequiredValue, validateIpv4]} </s> remove validate={[ipv4, required]}
</s> add validate={[validateIpv4, validateRequiredValue]} </s> remove validate={[ipv4, required]}
</s> add validate={[validateIpv4, validateRequiredValue]} </s> remove validate={[required]}
</s> add validate={[validateRequiredValue]} | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/components/Filters/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> type="text"
<mask> component={renderInputField}
<mask> className="form-control"
<mask> placeholder={t('enter_url_or_path_hint')}
<mask> validate={[required, isValidPath]}
<mask> normalizeOnBlur={(data) => data.trim()}
<mask> />
<mask> </div>
<mask> <div className="form__description">
<mask> {whitelist ? <Trans>enter_valid_allowlist</Trans>
</s> Extract validation functions in the separate file </s> remove validate={[required]}
</s> add validate={[validateRequiredValue]} </s> remove validate={[required, answer]}
</s> add validate={[validateRequiredValue, validateAnswer]} </s> remove validate={[required, mac]}
</s> add validate={[validateRequiredValue, validateMac]} </s> remove validate={[required, ipv4]}
</s> add validate={[validateRequiredValue, validateIpv4]} </s> remove validate={[required, domain]}
</s> add validate={[validateRequiredValue, validateDomain]} </s> remove validate={[required, biggerOrEqualZero]}
</s> add validate={[validateRequiredValue, validateBiggerOrEqualZeroValue]} | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/components/Filters/Form.js |
keep keep keep keep replace replace replace replace keep keep keep keep keep | <mask> import PropTypes from 'prop-types';
<mask> import { Field, reduxForm } from 'redux-form';
<mask> import { Trans, withTranslation } from 'react-i18next';
<mask> import flow from 'lodash/flow';
<mask>
<mask> import {
<mask> renderInputField, required, domain, answer,
<mask> } from '../../../helpers/form';
<mask> import { FORM_NAME } from '../../../helpers/constants';
<mask>
<mask> const Form = (props) => {
<mask> const {
<mask> t,
</s> Extract validation functions in the separate file </s> remove
import { renderInputField, required, isValidPath } from '../../helpers/form';
</s> add import { renderInputField } from '../../helpers/form';
import { validatePath, validateRequiredValue } from '../../helpers/validators'; </s> remove
import {
renderInputField, ipv4, mac, required,
} from '../../../../helpers/form';
</s> add import { renderInputField } from '../../../../helpers/form';
import { validateIpv4, validateMac, validateRequiredValue } from '../../../../helpers/validators'; </s> remove
import { renderInputField, required } from '../../helpers/form';
</s> add import { renderInputField } from '../../helpers/form';
import { validateRequiredValue } from '../../helpers/validators'; </s> remove
import {
renderInputField, required, ipv4, isPositive, toNumber,
} from '../../../helpers/form';
</s> add import { renderInputField, toNumber } from '../../../helpers/form'; </s> remove import {
biggerOrEqualZero,
maxValue,
renderInputField,
required,
toNumber,
} from '../../../../helpers/form';
import { FORM_NAME } from '../../../../helpers/constants';
</s> add import { renderInputField, toNumber } from '../../../../helpers/form';
import { validateBiggerOrEqualZeroValue, getMaxValueValidator, validateRequiredValue } from '../../../../helpers/validators';
import { FORM_NAME, SECONDS_IN_HOUR } from '../../../../helpers/constants'; </s> add import { validateIpv4, validateIsPositiveValue, validateRequiredValue } from '../../../helpers/validators'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/components/Filters/Rewrites/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> component={renderInputField}
<mask> type="text"
<mask> className="form-control"
<mask> placeholder={t('form_domain')}
<mask> validate={[required, domain]}
<mask> />
<mask> </div>
<mask>
<mask> <Trans>examples_title</Trans>:
<mask> <ol className="leading-loose">
</s> Extract validation functions in the separate file </s> remove validate={[required, answer]}
</s> add validate={[validateRequiredValue, validateAnswer]} </s> remove validate={[required, ipv4]}
</s> add validate={[validateRequiredValue, validateIpv4]} </s> remove validate={[required, mac]}
</s> add validate={[validateRequiredValue, validateMac]} </s> remove validate={[required, isValidPath]}
</s> add validate={[validateRequiredValue, validatePath]} </s> remove validate={[required, isPositive]}
</s> add validate={[validateRequiredValue, validateIsPositiveValue]} </s> remove validate={[ipv4, required]}
</s> add validate={[validateIpv4, validateRequiredValue]} | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/components/Filters/Rewrites/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> component={renderInputField}
<mask> type="text"
<mask> className="form-control"
<mask> placeholder={t('form_answer')}
<mask> validate={[required, answer]}
<mask> />
<mask> </div>
<mask> </div>
<mask>
<mask> <div className="modal-footer">
</s> Extract validation functions in the separate file </s> remove validate={[required, mac]}
</s> add validate={[validateRequiredValue, validateMac]} </s> remove validate={[required, ipv4]}
</s> add validate={[validateRequiredValue, validateIpv4]} </s> remove validate={[required, isValidPath]}
</s> add validate={[validateRequiredValue, validatePath]} </s> remove validate={[required, domain]}
</s> add validate={[validateRequiredValue, validateDomain]} </s> remove validate={[ipv4, required]}
</s> add validate={[validateIpv4, validateRequiredValue]} </s> remove validate={[ipv4, required]}
</s> add validate={[validateIpv4, validateRequiredValue]} | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/components/Filters/Rewrites/Form.js |
keep keep keep keep replace replace keep keep keep keep keep | <mask> import Tabs from '../../ui/Tabs';
<mask> import Examples from '../Dns/Upstream/Examples';
<mask> import { toggleAllServices } from '../../../helpers/helpers';
<mask> import {
<mask> required,
<mask> clientId,
<mask> renderInputField,
<mask> renderGroupField,
<mask> renderSelectField,
<mask> renderServiceField,
<mask> } from '../../../helpers/form';
</s> Extract validation functions in the separate file </s> add import { validateClientId, validateRequiredValue } from '../../../helpers/validators'; </s> remove port,
portTLS,
isSafePort,
</s> add </s> remove
import {
renderInputField, required, ipv4, isPositive, toNumber,
} from '../../../helpers/form';
</s> add import { renderInputField, toNumber } from '../../../helpers/form'; </s> remove
import {
renderInputField, required, domain, answer,
} from '../../../helpers/form';
</s> add import { renderInputField } from '../../../helpers/form';
import { validateAnswer, validateDomain, validateRequiredValue } from '../../../helpers/validators'; </s> remove required,
ipv4,
ipv6,
biggerOrEqualZero,
</s> add </s> remove import {
renderInputField, required, validInstallPort, toNumber,
} from '../../helpers/form';
</s> add import { renderInputField, toNumber } from '../../helpers/form';
import { validateRequiredValue, validateInstallPort } from '../../helpers/validators'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/components/Settings/Clients/Form.js |
keep keep add keep keep keep keep keep | <mask> renderSelectField,
<mask> renderServiceField,
<mask> } from '../../../helpers/form';
<mask> import { FORM_NAME, SERVICES } from '../../../helpers/constants';
<mask> import './Service.css';
<mask>
<mask> const settingsCheckboxes = [
<mask> {
</s> Extract validation functions in the separate file </s> remove required,
clientId,
</s> add </s> remove port,
portTLS,
isSafePort,
</s> add </s> remove
import {
renderInputField, required, domain, answer,
} from '../../../helpers/form';
</s> add import { renderInputField } from '../../../helpers/form';
import { validateAnswer, validateDomain, validateRequiredValue } from '../../../helpers/validators'; </s> remove
import {
renderInputField, required, ipv4, isPositive, toNumber,
} from '../../../helpers/form';
</s> add import { renderInputField, toNumber } from '../../../helpers/form'; </s> add import { validateIsSafePort, validatePort, validatePortTLS } from '../../../helpers/validators'; </s> add import { validateIpv4, validateIsPositiveValue, validateRequiredValue } from '../../../helpers/validators'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/components/Settings/Clients/Form.js |
keep keep keep keep replace keep keep keep keep replace | <mask> ];
<mask> const validate = (values) => {
<mask> const errors = {};
<mask> const { name, ids } = values;
<mask> errors.name = required(name);
<mask>
<mask> if (ids && ids.length) {
<mask> const idArrayErrors = [];
<mask> ids.forEach((id, idx) => {
<mask> idArrayErrors[idx] = required(id) || clientId(id);
</s> Extract validation functions in the separate file </s> remove // Validation functions
// If the value is valid, the validation function should return undefined.
// https://redux-form.com/6.6.3/examples/fieldlevelvalidation/
export const required = (value) => {
const formattedValue = typeof value === 'string' ? value.trim() : value;
if (formattedValue || formattedValue === 0 || (formattedValue && formattedValue.length !== 0)) {
return undefined;
}
return <Trans>form_error_required</Trans>;
};
export const maxValue = (maximum) => (value) => (value && value > maximum ? i18next.t('value_not_larger_than', { maximum }) : undefined);
export const ipv4 = (value) => {
if (value && !R_IPV4.test(value)) {
return <Trans>form_error_ip4_format</Trans>;
}
return undefined;
};
export const clientId = (value) => {
if (!value) {
return undefined;
}
const formattedValue = value ? value.trim() : value;
if (formattedValue && !(
R_IPV4.test(formattedValue)
|| R_IPV6.test(formattedValue)
|| R_MAC.test(formattedValue)
|| R_CIDR.test(formattedValue)
|| R_CIDR_IPV6.test(formattedValue)
)) {
return <Trans>form_error_client_id_format</Trans>;
}
return undefined;
};
export const ipv6 = (value) => {
if (value && !R_IPV6.test(value)) {
return <Trans>form_error_ip6_format</Trans>;
}
return undefined;
};
export const ip = (value) => {
if (value && !R_IPV4.test(value) && !R_IPV6.test(value)) {
return <Trans>form_error_ip_format</Trans>;
}
return undefined;
};
export const mac = (value) => {
if (value && !R_MAC.test(value)) {
return <Trans>form_error_mac_format</Trans>;
}
return undefined;
};
export const isPositive = (value) => {
if ((value || value === 0) && value <= 0) {
return <Trans>form_error_positive</Trans>;
}
return undefined;
};
export const biggerOrEqualZero = (value) => {
if (value < 0) {
return <Trans>form_error_negative</Trans>;
}
return false;
};
export const port = (value) => {
if ((value || value === 0) && (value < 80 || value > 65535)) {
return <Trans>form_error_port_range</Trans>;
}
return undefined;
};
export const validInstallPort = (value) => {
if (value < 1 || value > 65535) {
return <Trans>form_error_port</Trans>;
}
return undefined;
};
export const portTLS = (value) => {
if (value === 0) {
return undefined;
}
if (value && (value < 80 || value > 65535)) {
return <Trans>form_error_port_range</Trans>;
}
return undefined;
};
export const isSafePort = (value) => {
if (UNSAFE_PORTS.includes(value)) {
return <Trans>form_error_port_unsafe</Trans>;
}
return undefined;
};
export const domain = (value) => {
if (value && !R_HOST.test(value)) {
return <Trans>form_error_domain_format</Trans>;
}
return undefined;
};
export const answer = (value) => {
if (value && (!R_IPV4.test(value) && !R_IPV6.test(value) && !R_HOST.test(value))) {
return <Trans>form_error_answer_format</Trans>;
}
return undefined;
};
export const isValidUrl = (value) => {
if (value && !R_URL_REQUIRES_PROTOCOL.test(value)) {
return <Trans>form_error_url_format</Trans>;
}
return undefined;
};
</s> add /**
* @param value {string}
* @returns {*|number}
*/
export const toNumber = (value) => value && parseInt(value, 10); </s> remove
export const isValidPath = (value) => {
if (value && !isValidAbsolutePath(value) && !R_URL_REQUIRES_PROTOCOL.test(value)) {
return <Trans>form_error_url_or_path_format</Trans>;
}
return undefined;
};
export const toNumber = (value) => value && parseInt(value, 10);
</s> add </s> add import { validateIsSafePort, validatePort, validatePortTLS } from '../../../helpers/validators'; </s> remove Object.keys(fields).forEach((field) => change(field, fields[field]));
</s> add Object.keys(fields)
.forEach((field) => change(field, fields[field])); </s> add import { validateIpv4, validateIsPositiveValue, validateRequiredValue } from '../../../helpers/validators'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/components/Settings/Clients/Form.js |
keep keep keep keep replace replace replace replace keep keep keep keep keep | <mask> import PropTypes from 'prop-types';
<mask> import { Field, reduxForm, formValueSelector } from 'redux-form';
<mask> import { Trans, withTranslation } from 'react-i18next';
<mask> import flow from 'lodash/flow';
<mask>
<mask> import {
<mask> renderInputField, required, ipv4, isPositive, toNumber,
<mask> } from '../../../helpers/form';
<mask> import { FORM_NAME } from '../../../helpers/constants';
<mask>
<mask> const renderInterfaces = ((interfaces) => (
<mask> Object.keys(interfaces).map((item) => {
<mask> const option = interfaces[item];
</s> Extract validation functions in the separate file </s> add import { validateIpv4, validateIsPositiveValue, validateRequiredValue } from '../../../helpers/validators'; </s> remove
import {
renderInputField, required, domain, answer,
} from '../../../helpers/form';
</s> add import { renderInputField } from '../../../helpers/form';
import { validateAnswer, validateDomain, validateRequiredValue } from '../../../helpers/validators'; </s> remove
import {
renderInputField, ipv4, mac, required,
} from '../../../../helpers/form';
</s> add import { renderInputField } from '../../../../helpers/form';
import { validateIpv4, validateMac, validateRequiredValue } from '../../../../helpers/validators'; </s> remove
import { renderInputField, required, isValidPath } from '../../helpers/form';
</s> add import { renderInputField } from '../../helpers/form';
import { validatePath, validateRequiredValue } from '../../helpers/validators'; </s> remove
import { renderInputField, required } from '../../helpers/form';
</s> add import { renderInputField } from '../../helpers/form';
import { validateRequiredValue } from '../../helpers/validators'; </s> remove import {
biggerOrEqualZero,
maxValue,
renderInputField,
required,
toNumber,
} from '../../../../helpers/form';
import { FORM_NAME } from '../../../../helpers/constants';
</s> add import { renderInputField, toNumber } from '../../../../helpers/form';
import { validateBiggerOrEqualZeroValue, getMaxValueValidator, validateRequiredValue } from '../../../../helpers/validators';
import { FORM_NAME, SECONDS_IN_HOUR } from '../../../../helpers/constants'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/components/Settings/Dhcp/Form.js |
keep add keep keep keep keep keep | <mask> import { renderInputField, toNumber } from '../../../helpers/form';
<mask> import { FORM_NAME } from '../../../helpers/constants';
<mask>
<mask> const renderInterfaces = ((interfaces) => (
<mask> Object.keys(interfaces).map((item) => {
<mask> const option = interfaces[item];
<mask> const { name } = option;
</s> Extract validation functions in the separate file </s> remove
import {
renderInputField, required, ipv4, isPositive, toNumber,
} from '../../../helpers/form';
</s> add import { renderInputField, toNumber } from '../../../helpers/form'; </s> remove
import {
renderInputField, required, domain, answer,
} from '../../../helpers/form';
</s> add import { renderInputField } from '../../../helpers/form';
import { validateAnswer, validateDomain, validateRequiredValue } from '../../../helpers/validators'; </s> add import { validateIsSafePort, validatePort, validatePortTLS } from '../../../helpers/validators'; </s> remove port,
portTLS,
isSafePort,
</s> add </s> remove import {
renderInputField, required, validInstallPort, toNumber,
} from '../../helpers/form';
</s> add import { renderInputField, toNumber } from '../../helpers/form';
import { validateRequiredValue, validateInstallPort } from '../../helpers/validators'; </s> add import { validateClientId, validateRequiredValue } from '../../../helpers/validators'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/components/Settings/Dhcp/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> <Field
<mask> name="interface_name"
<mask> component="select"
<mask> className="form-control custom-select"
<mask> validate={[required]}
<mask> >
<mask> <option value="" disabled={enabled}>
<mask> {t('dhcp_interface_select')}
<mask> </option>
<mask> {renderInterfaces(interfaces)}
</s> Extract validation functions in the separate file </s> remove validate={[required]}
</s> add validate={[validateRequiredValue]} </s> remove validate={[required]}
</s> add validate={[validateRequiredValue]} </s> remove required,
maxValue3600,
</s> add validateRequiredValue,
validateMaxValue3600, </s> remove validate={[required]}
</s> add validate={[validateRequiredValue]} </s> remove validate={[required, ipv4]}
</s> add validate={[validateRequiredValue, validateIpv4]} </s> remove validate={[required, mac]}
</s> add validate={[validateRequiredValue, validateMac]} | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/components/Settings/Dhcp/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> component={renderInputField}
<mask> type="text"
<mask> className="form-control"
<mask> placeholder={t('dhcp_form_gateway_input')}
<mask> validate={[ipv4, required]}
<mask> />
<mask> </div>
<mask> <div className="form__group form__group--settings">
<mask> <label>{t('dhcp_form_subnet_input')}</label>
<mask> <Field
</s> Extract validation functions in the separate file </s> remove validate={[ipv4, required]}
</s> add validate={[validateIpv4, validateRequiredValue]} </s> remove validate={[ipv4, required]}
</s> add validate={[validateIpv4, validateRequiredValue]} </s> remove validate={[ipv4, required]}
</s> add validate={[validateIpv4, validateRequiredValue]} </s> remove validate={[required, biggerOrEqualZero]}
</s> add validate={[validateRequiredValue, validateBiggerOrEqualZeroValue]} </s> remove validate={[required]}
</s> add validate={[validateRequiredValue]} </s> remove validate={[required, mac]}
</s> add validate={[validateRequiredValue, validateMac]} | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/components/Settings/Dhcp/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> component={renderInputField}
<mask> type="text"
<mask> className="form-control"
<mask> placeholder={t('dhcp_form_subnet_input')}
<mask> validate={[ipv4, required]}
<mask> />
<mask> </div>
<mask> </div>
<mask> <div className="col-lg-6">
<mask> <div className="form__group form__group--settings">
</s> Extract validation functions in the separate file </s> remove validate={[ipv4, required]}
</s> add validate={[validateIpv4, validateRequiredValue]} </s> remove validate={[ipv4, required]}
</s> add validate={[validateIpv4, validateRequiredValue]} </s> remove validate={[ipv4, required]}
</s> add validate={[validateIpv4, validateRequiredValue]} </s> remove validate={[required, biggerOrEqualZero]}
</s> add validate={[validateRequiredValue, validateBiggerOrEqualZeroValue]} </s> remove validate={[required]}
</s> add validate={[validateRequiredValue]} </s> remove validate={[required, answer]}
</s> add validate={[validateRequiredValue, validateAnswer]} | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/components/Settings/Dhcp/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> component={renderInputField}
<mask> type="text"
<mask> className="form-control"
<mask> placeholder={t('dhcp_form_range_start')}
<mask> validate={[ipv4, required]}
<mask> />
<mask> </div>
<mask> <div className="col">
<mask> <Field
<mask> id="range_end"
</s> Extract validation functions in the separate file </s> remove validate={[ipv4, required]}
</s> add validate={[validateIpv4, validateRequiredValue]} </s> remove validate={[ipv4, required]}
</s> add validate={[validateIpv4, validateRequiredValue]} </s> remove validate={[ipv4, required]}
</s> add validate={[validateIpv4, validateRequiredValue]} </s> remove validate={[required, mac]}
</s> add validate={[validateRequiredValue, validateMac]} </s> remove validate={[required, ipv4]}
</s> add validate={[validateRequiredValue, validateIpv4]} </s> remove validate={[required]}
</s> add validate={[validateRequiredValue]} | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/components/Settings/Dhcp/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> component={renderInputField}
<mask> type="text"
<mask> className="form-control"
<mask> placeholder={t('dhcp_form_range_end')}
<mask> validate={[ipv4, required]}
<mask> />
<mask> </div>
<mask> </div>
<mask> </div>
<mask> <div className="form__group form__group--settings">
</s> Extract validation functions in the separate file </s> remove validate={[ipv4, required]}
</s> add validate={[validateIpv4, validateRequiredValue]} </s> remove validate={[ipv4, required]}
</s> add validate={[validateIpv4, validateRequiredValue]} </s> remove validate={[ipv4, required]}
</s> add validate={[validateIpv4, validateRequiredValue]} </s> remove validate={[required, biggerOrEqualZero]}
</s> add validate={[validateRequiredValue, validateBiggerOrEqualZeroValue]} </s> remove validate={[required]}
</s> add validate={[validateRequiredValue]} </s> remove validate={[required, answer]}
</s> add validate={[validateRequiredValue, validateAnswer]} | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/components/Settings/Dhcp/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> component={renderInputField}
<mask> type="number"
<mask> className="form-control"
<mask> placeholder={t('dhcp_form_lease_input')}
<mask> validate={[required, isPositive]}
<mask> normalize={toNumber}
<mask> />
<mask> </div>
<mask> </div>
<mask> </div>
</s> Extract validation functions in the separate file </s> remove validate={[validInstallPort, required]}
</s> add validate={[validateInstallPort, validateRequiredValue]} </s> remove validate={[validInstallPort, required]}
</s> add validate={[validateInstallPort, validateRequiredValue]} </s> remove validate={[required, biggerOrEqualZero]}
</s> add validate={[validateRequiredValue, validateBiggerOrEqualZeroValue]} </s> remove validate={[required, answer]}
</s> add validate={[validateRequiredValue, validateAnswer]} </s> remove validate={[portTLS]}
</s> add validate={[validatePortTLS]} </s> remove validate={[port, isSafePort]}
</s> add validate={[validatePort, validateIsSafePort]} | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/components/Settings/Dhcp/Form.js |
keep keep keep keep replace replace replace replace keep keep keep keep keep | <mask> import PropTypes from 'prop-types';
<mask> import { Field, reduxForm } from 'redux-form';
<mask> import { Trans, withTranslation } from 'react-i18next';
<mask> import flow from 'lodash/flow';
<mask>
<mask> import {
<mask> renderInputField, ipv4, mac, required,
<mask> } from '../../../../helpers/form';
<mask> import { FORM_NAME } from '../../../../helpers/constants';
<mask>
<mask> const Form = (props) => {
<mask> const {
<mask> t,
</s> Extract validation functions in the separate file </s> remove
import { renderInputField, required, isValidPath } from '../../helpers/form';
</s> add import { renderInputField } from '../../helpers/form';
import { validatePath, validateRequiredValue } from '../../helpers/validators'; </s> remove
import {
renderInputField, required, domain, answer,
} from '../../../helpers/form';
</s> add import { renderInputField } from '../../../helpers/form';
import { validateAnswer, validateDomain, validateRequiredValue } from '../../../helpers/validators'; </s> remove
import { renderInputField, required } from '../../helpers/form';
</s> add import { renderInputField } from '../../helpers/form';
import { validateRequiredValue } from '../../helpers/validators'; </s> remove
import {
renderInputField, required, ipv4, isPositive, toNumber,
} from '../../../helpers/form';
</s> add import { renderInputField, toNumber } from '../../../helpers/form'; </s> remove import {
biggerOrEqualZero,
maxValue,
renderInputField,
required,
toNumber,
} from '../../../../helpers/form';
import { FORM_NAME } from '../../../../helpers/constants';
</s> add import { renderInputField, toNumber } from '../../../../helpers/form';
import { validateBiggerOrEqualZeroValue, getMaxValueValidator, validateRequiredValue } from '../../../../helpers/validators';
import { FORM_NAME, SECONDS_IN_HOUR } from '../../../../helpers/constants'; </s> remove required,
ipv4,
ipv6,
biggerOrEqualZero,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/components/Settings/Dhcp/StaticLeases/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> component={renderInputField}
<mask> type="text"
<mask> className="form-control"
<mask> placeholder={t('form_enter_mac')}
<mask> validate={[required, mac]}
<mask> />
<mask> </div>
<mask> <div className="form__group">
<mask> <Field
<mask> id="ip"
</s> Extract validation functions in the separate file </s> remove validate={[required, ipv4]}
</s> add validate={[validateRequiredValue, validateIpv4]} </s> remove validate={[required]}
</s> add validate={[validateRequiredValue]} </s> remove validate={[required, answer]}
</s> add validate={[validateRequiredValue, validateAnswer]} </s> remove validate={[ipv4, required]}
</s> add validate={[validateIpv4, validateRequiredValue]} </s> remove validate={[ipv4, required]}
</s> add validate={[validateIpv4, validateRequiredValue]} </s> remove validate={[required, isValidPath]}
</s> add validate={[validateRequiredValue, validatePath]} | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/components/Settings/Dhcp/StaticLeases/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> component={renderInputField}
<mask> type="text"
<mask> className="form-control"
<mask> placeholder={t('form_enter_ip')}
<mask> validate={[required, ipv4]}
<mask> />
<mask> </div>
<mask> <div className="form__group">
<mask> <Field
<mask> id="hostname"
</s> Extract validation functions in the separate file </s> remove validate={[required, mac]}
</s> add validate={[validateRequiredValue, validateMac]} </s> remove validate={[required]}
</s> add validate={[validateRequiredValue]} </s> remove validate={[required, answer]}
</s> add validate={[validateRequiredValue, validateAnswer]} </s> remove validate={[ipv4, required]}
</s> add validate={[validateIpv4, validateRequiredValue]} </s> remove validate={[ipv4, required]}
</s> add validate={[validateIpv4, validateRequiredValue]} </s> remove validate={[required, isValidPath]}
</s> add validate={[validateRequiredValue, validatePath]} | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/components/Settings/Dhcp/StaticLeases/Form.js |
keep replace replace replace replace replace replace replace replace keep replace keep keep | <mask> import { shallowEqual, useSelector } from 'react-redux';
<mask> import {
<mask> biggerOrEqualZero,
<mask> maxValue,
<mask> renderInputField,
<mask> required,
<mask> toNumber,
<mask> } from '../../../../helpers/form';
<mask> import { FORM_NAME } from '../../../../helpers/constants';
<mask>
<mask> const maxValue3600 = maxValue(3600);
<mask>
<mask> const getInputFields = ({ required, maxValue3600 }) => [{
</s> Extract validation functions in the separate file </s> remove const getInputFields = ({ required, maxValue3600 }) => [{
</s> add const getInputFields = ({ validateRequiredValue, validateMaxValue3600 }) => [{ </s> remove required,
ipv4,
ipv6,
biggerOrEqualZero,
</s> add </s> remove
import {
renderInputField, ipv4, mac, required,
} from '../../../../helpers/form';
</s> add import { renderInputField } from '../../../../helpers/form';
import { validateIpv4, validateMac, validateRequiredValue } from '../../../../helpers/validators'; </s> add import {
validateBiggerOrEqualZeroValue, validateIpv4, validateIpv6, validateRequiredValue,
} from '../../../../helpers/validators'; </s> remove import {
renderInputField, required, validInstallPort, toNumber,
} from '../../helpers/form';
</s> add import { renderInputField, toNumber } from '../../helpers/form';
import { validateRequiredValue, validateInstallPort } from '../../helpers/validators'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/components/Settings/Dns/Cache/Form.js |
keep replace keep keep keep keep replace keep keep | <mask>
<mask> const getInputFields = ({ required, maxValue3600 }) => [{
<mask> name: 'cache_size',
<mask> title: 'cache_size',
<mask> description: 'cache_size_desc',
<mask> placeholder: 'enter_cache_size',
<mask> validate: required,
<mask> },
<mask> {
</s> Extract validation functions in the separate file </s> remove const maxValue3600 = maxValue(3600);
</s> add const validateMaxValue3600 = getMaxValueValidator(SECONDS_IN_HOUR); </s> remove max: 3600,
validate: maxValue3600,
</s> add max: SECONDS_IN_HOUR,
validate: validateMaxValue3600, </s> remove import {
biggerOrEqualZero,
maxValue,
renderInputField,
required,
toNumber,
} from '../../../../helpers/form';
import { FORM_NAME } from '../../../../helpers/constants';
</s> add import { renderInputField, toNumber } from '../../../../helpers/form';
import { validateBiggerOrEqualZeroValue, getMaxValueValidator, validateRequiredValue } from '../../../../helpers/validators';
import { FORM_NAME, SECONDS_IN_HOUR } from '../../../../helpers/constants'; </s> remove validateIp: ipv4,
</s> add validateIp: validateIpv4, </s> remove validateIp: ipv6,
</s> add validateIp: validateIpv6, | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/components/Settings/Dns/Cache/Form.js |
keep keep keep keep replace replace keep keep keep keep keep | <mask> name: 'cache_ttl_min',
<mask> title: 'cache_ttl_min_override',
<mask> description: 'cache_ttl_min_override_desc',
<mask> placeholder: 'enter_cache_ttl_min_override',
<mask> max: 3600,
<mask> validate: maxValue3600,
<mask> },
<mask> {
<mask> name: 'cache_ttl_max',
<mask> title: 'cache_ttl_max_override',
<mask> description: 'cache_ttl_max_override_desc',
</s> Extract validation functions in the separate file </s> remove validate: required,
</s> add validate: validateRequiredValue, </s> remove const getInputFields = ({ required, maxValue3600 }) => [{
</s> add const getInputFields = ({ validateRequiredValue, validateMaxValue3600 }) => [{ </s> remove validateIp: ipv4,
</s> add validateIp: validateIpv4, </s> remove const maxValue3600 = maxValue(3600);
</s> add const validateMaxValue3600 = getMaxValueValidator(SECONDS_IN_HOUR); </s> remove validateIp: ipv6,
</s> add validateIp: validateIpv6, </s> add import {
validateBiggerOrEqualZeroValue, validateIpv4, validateIpv6, validateRequiredValue,
} from '../../../../helpers/validators'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/components/Settings/Dns/Cache/Form.js |
keep keep keep keep replace replace keep keep keep keep keep | <mask>
<mask> const minExceedsMax = cache_ttl_min > cache_ttl_max;
<mask>
<mask> const INPUTS_FIELDS = getInputFields({
<mask> required,
<mask> maxValue3600,
<mask> });
<mask>
<mask> return <form onSubmit={handleSubmit}>
<mask> <div className="row">
<mask> {INPUTS_FIELDS.map(({
</s> Extract validation functions in the separate file </s> remove // Validation functions
// If the value is valid, the validation function should return undefined.
// https://redux-form.com/6.6.3/examples/fieldlevelvalidation/
export const required = (value) => {
const formattedValue = typeof value === 'string' ? value.trim() : value;
if (formattedValue || formattedValue === 0 || (formattedValue && formattedValue.length !== 0)) {
return undefined;
}
return <Trans>form_error_required</Trans>;
};
export const maxValue = (maximum) => (value) => (value && value > maximum ? i18next.t('value_not_larger_than', { maximum }) : undefined);
export const ipv4 = (value) => {
if (value && !R_IPV4.test(value)) {
return <Trans>form_error_ip4_format</Trans>;
}
return undefined;
};
export const clientId = (value) => {
if (!value) {
return undefined;
}
const formattedValue = value ? value.trim() : value;
if (formattedValue && !(
R_IPV4.test(formattedValue)
|| R_IPV6.test(formattedValue)
|| R_MAC.test(formattedValue)
|| R_CIDR.test(formattedValue)
|| R_CIDR_IPV6.test(formattedValue)
)) {
return <Trans>form_error_client_id_format</Trans>;
}
return undefined;
};
export const ipv6 = (value) => {
if (value && !R_IPV6.test(value)) {
return <Trans>form_error_ip6_format</Trans>;
}
return undefined;
};
export const ip = (value) => {
if (value && !R_IPV4.test(value) && !R_IPV6.test(value)) {
return <Trans>form_error_ip_format</Trans>;
}
return undefined;
};
export const mac = (value) => {
if (value && !R_MAC.test(value)) {
return <Trans>form_error_mac_format</Trans>;
}
return undefined;
};
export const isPositive = (value) => {
if ((value || value === 0) && value <= 0) {
return <Trans>form_error_positive</Trans>;
}
return undefined;
};
export const biggerOrEqualZero = (value) => {
if (value < 0) {
return <Trans>form_error_negative</Trans>;
}
return false;
};
export const port = (value) => {
if ((value || value === 0) && (value < 80 || value > 65535)) {
return <Trans>form_error_port_range</Trans>;
}
return undefined;
};
export const validInstallPort = (value) => {
if (value < 1 || value > 65535) {
return <Trans>form_error_port</Trans>;
}
return undefined;
};
export const portTLS = (value) => {
if (value === 0) {
return undefined;
}
if (value && (value < 80 || value > 65535)) {
return <Trans>form_error_port_range</Trans>;
}
return undefined;
};
export const isSafePort = (value) => {
if (UNSAFE_PORTS.includes(value)) {
return <Trans>form_error_port_unsafe</Trans>;
}
return undefined;
};
export const domain = (value) => {
if (value && !R_HOST.test(value)) {
return <Trans>form_error_domain_format</Trans>;
}
return undefined;
};
export const answer = (value) => {
if (value && (!R_IPV4.test(value) && !R_IPV6.test(value) && !R_HOST.test(value))) {
return <Trans>form_error_answer_format</Trans>;
}
return undefined;
};
export const isValidUrl = (value) => {
if (value && !R_URL_REQUIRES_PROTOCOL.test(value)) {
return <Trans>form_error_url_format</Trans>;
}
return undefined;
};
</s> add /**
* @param value {string}
* @returns {*|number}
*/
export const toNumber = (value) => value && parseInt(value, 10); </s> remove
export const isValidPath = (value) => {
if (value && !isValidAbsolutePath(value) && !R_URL_REQUIRES_PROTOCOL.test(value)) {
return <Trans>form_error_url_or_path_format</Trans>;
}
return undefined;
};
export const toNumber = (value) => value && parseInt(value, 10);
</s> add </s> remove validate={[required]}
</s> add validate={[validateRequiredValue]} </s> remove max: 3600,
validate: maxValue3600,
</s> add max: SECONDS_IN_HOUR,
validate: validateMaxValue3600, </s> remove idArrayErrors[idx] = required(id) || clientId(id);
</s> add idArrayErrors[idx] = validateRequiredValue(id) || validateClientId(id); </s> remove const getInputFields = ({ required, maxValue3600 }) => [{
</s> add const getInputFields = ({ validateRequiredValue, validateMaxValue3600 }) => [{ | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/components/Settings/Dns/Cache/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> placeholder={t(placeholder)}
<mask> disabled={processingSetConfig}
<mask> normalize={toNumber}
<mask> className="form-control"
<mask> validate={[biggerOrEqualZero].concat(validate || [])}
<mask> min={0}
<mask> max={max}
<mask> />
<mask> </div>
<mask> </div>
</s> Extract validation functions in the separate file </s> remove validate={[required, isPositive]}
</s> add validate={[validateRequiredValue, validateIsPositiveValue]} </s> remove validate={[validInstallPort, required]}
</s> add validate={[validateInstallPort, validateRequiredValue]} </s> remove validate={[validInstallPort, required]}
</s> add validate={[validateInstallPort, validateRequiredValue]} </s> remove validate={[required, biggerOrEqualZero]}
</s> add validate={[validateRequiredValue, validateBiggerOrEqualZeroValue]} </s> remove validate={[portTLS]}
</s> add validate={[validatePortTLS]} </s> remove validate={[port, isSafePort]}
</s> add validate={[validatePort, validateIsSafePort]} | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/components/Settings/Dns/Cache/Form.js |
keep keep keep keep replace replace replace replace keep keep keep keep keep | <mask> import {
<mask> renderInputField,
<mask> renderRadioField,
<mask> renderSelectField,
<mask> required,
<mask> ipv4,
<mask> ipv6,
<mask> biggerOrEqualZero,
<mask> toNumber,
<mask> } from '../../../../helpers/form';
<mask> import { BLOCKING_MODES, FORM_NAME } from '../../../../helpers/constants';
<mask>
<mask> const checkboxes = [{
</s> Extract validation functions in the separate file </s> add import {
validateBiggerOrEqualZeroValue, validateIpv4, validateIpv6, validateRequiredValue,
} from '../../../../helpers/validators'; </s> remove import {
biggerOrEqualZero,
maxValue,
renderInputField,
required,
toNumber,
} from '../../../../helpers/form';
import { FORM_NAME } from '../../../../helpers/constants';
</s> add import { renderInputField, toNumber } from '../../../../helpers/form';
import { validateBiggerOrEqualZeroValue, getMaxValueValidator, validateRequiredValue } from '../../../../helpers/validators';
import { FORM_NAME, SECONDS_IN_HOUR } from '../../../../helpers/constants'; </s> remove
import {
renderInputField, ipv4, mac, required,
} from '../../../../helpers/form';
</s> add import { renderInputField } from '../../../../helpers/form';
import { validateIpv4, validateMac, validateRequiredValue } from '../../../../helpers/validators'; </s> remove port,
portTLS,
isSafePort,
</s> add </s> remove const maxValue3600 = maxValue(3600);
</s> add const validateMaxValue3600 = getMaxValueValidator(SECONDS_IN_HOUR); </s> remove
import {
renderInputField, required, ipv4, isPositive, toNumber,
} from '../../../helpers/form';
</s> add import { renderInputField, toNumber } from '../../../helpers/form'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/components/Settings/Dns/Config/Form.js |
keep keep keep add keep keep keep keep | <mask> renderRadioField,
<mask> renderSelectField,
<mask> toNumber,
<mask> } from '../../../../helpers/form';
<mask> import { BLOCKING_MODES, FORM_NAME } from '../../../../helpers/constants';
<mask>
<mask> const checkboxes = [{
<mask> name: 'edns_cs_enabled',
</s> Extract validation functions in the separate file </s> remove required,
ipv4,
ipv6,
biggerOrEqualZero,
</s> add </s> remove const maxValue3600 = maxValue(3600);
</s> add const validateMaxValue3600 = getMaxValueValidator(SECONDS_IN_HOUR); </s> remove import {
biggerOrEqualZero,
maxValue,
renderInputField,
required,
toNumber,
} from '../../../../helpers/form';
import { FORM_NAME } from '../../../../helpers/constants';
</s> add import { renderInputField, toNumber } from '../../../../helpers/form';
import { validateBiggerOrEqualZeroValue, getMaxValueValidator, validateRequiredValue } from '../../../../helpers/validators';
import { FORM_NAME, SECONDS_IN_HOUR } from '../../../../helpers/constants'; </s> remove port,
portTLS,
isSafePort,
</s> add </s> remove
import {
renderInputField, ipv4, mac, required,
} from '../../../../helpers/form';
</s> add import { renderInputField } from '../../../../helpers/form';
import { validateIpv4, validateMac, validateRequiredValue } from '../../../../helpers/validators'; </s> remove const getInputFields = ({ required, maxValue3600 }) => [{
</s> add const getInputFields = ({ validateRequiredValue, validateMaxValue3600 }) => [{ | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/components/Settings/Dns/Config/Form.js |
keep keep replace keep keep keep keep replace keep keep keep keep | <mask> description: 'blocking_ipv4_desc',
<mask> name: 'blocking_ipv4',
<mask> validateIp: ipv4,
<mask> },
<mask> {
<mask> description: 'blocking_ipv6_desc',
<mask> name: 'blocking_ipv6',
<mask> validateIp: ipv6,
<mask> }];
<mask>
<mask> const getFields = (processing, t) => Object.values(BLOCKING_MODES)
<mask> .map((mode) => (
</s> Extract validation functions in the separate file </s> remove validate: required,
</s> add validate: validateRequiredValue, </s> remove max: 3600,
validate: maxValue3600,
</s> add max: SECONDS_IN_HOUR,
validate: validateMaxValue3600, </s> remove const maxValue3600 = maxValue(3600);
</s> add const validateMaxValue3600 = getMaxValueValidator(SECONDS_IN_HOUR); </s> remove const getInputFields = ({ required, maxValue3600 }) => [{
</s> add const getInputFields = ({ validateRequiredValue, validateMaxValue3600 }) => [{ </s> remove required,
ipv4,
ipv6,
biggerOrEqualZero,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/components/Settings/Dns/Config/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> component={renderInputField}
<mask> className="form-control"
<mask> placeholder={t('form_enter_rate_limit')}
<mask> normalize={toNumber}
<mask> validate={[required, biggerOrEqualZero]}
<mask> />
<mask> </div>
<mask> </div>
<mask> {checkboxes.map(({ name, placeholder, subtitle }) => <div className="col-12" key={name}>
<mask> <div className="form__group form__group--settings">
</s> Extract validation functions in the separate file </s> remove validate={[ipv4, required]}
</s> add validate={[validateIpv4, validateRequiredValue]} </s> remove validate={[ipv4, required]}
</s> add validate={[validateIpv4, validateRequiredValue]} </s> remove validate={[ipv4, required]}
</s> add validate={[validateIpv4, validateRequiredValue]} </s> remove validate={[required]}
</s> add validate={[validateRequiredValue]} </s> remove validate={[required, isPositive]}
</s> add validate={[validateRequiredValue, validateIsPositiveValue]} </s> remove validate={[required, answer]}
</s> add validate={[validateRequiredValue, validateAnswer]} | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/components/Settings/Dns/Config/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> name={name}
<mask> component={renderInputField}
<mask> className="form-control"
<mask> placeholder={t('form_enter_ip')}
<mask> validate={[validateIp, required]}
<mask> />
<mask> </div>
<mask> </div>)}
<mask> </Fragment>
<mask> )}
</s> Extract validation functions in the separate file </s> remove validate={[required, ipv4]}
</s> add validate={[validateRequiredValue, validateIpv4]} </s> remove validate={[validInstallPort, required]}
</s> add validate={[validateInstallPort, validateRequiredValue]} </s> remove validate={[validInstallPort, required]}
</s> add validate={[validateInstallPort, validateRequiredValue]} </s> remove validate={[ipv4, required]}
</s> add validate={[validateIpv4, validateRequiredValue]} </s> remove validate={[ipv4, required]}
</s> add validate={[validateIpv4, validateRequiredValue]} </s> remove validate={[ipv4, required]}
</s> add validate={[validateIpv4, validateRequiredValue]} | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/components/Settings/Dns/Config/Form.js |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> renderInputField,
<mask> renderSelectField,
<mask> renderRadioField,
<mask> toNumber,
<mask> port,
<mask> portTLS,
<mask> isSafePort,
<mask> } from '../../../helpers/form';
<mask> import i18n from '../../../i18n';
<mask> import KeyStatus from './KeyStatus';
<mask> import CertificateStatus from './CertificateStatus';
<mask> import { FORM_NAME } from '../../../helpers/constants';
</s> Extract validation functions in the separate file </s> add import { validateIsSafePort, validatePort, validatePortTLS } from '../../../helpers/validators'; </s> remove required,
ipv4,
ipv6,
biggerOrEqualZero,
</s> add </s> remove
import {
renderInputField, required, ipv4, isPositive, toNumber,
} from '../../../helpers/form';
</s> add import { renderInputField, toNumber } from '../../../helpers/form'; </s> add import {
validateBiggerOrEqualZeroValue, validateIpv4, validateIpv6, validateRequiredValue,
} from '../../../../helpers/validators'; </s> add import { validateClientId, validateRequiredValue } from '../../../helpers/validators'; </s> remove required,
clientId,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/components/Settings/Encryption/Form.js |
keep add keep keep keep keep keep keep | <mask> toNumber,
<mask> } from '../../../helpers/form';
<mask> import i18n from '../../../i18n';
<mask> import KeyStatus from './KeyStatus';
<mask> import CertificateStatus from './CertificateStatus';
<mask> import { FORM_NAME } from '../../../helpers/constants';
<mask>
<mask> const validate = (values) => {
</s> Extract validation functions in the separate file </s> remove port,
portTLS,
isSafePort,
</s> add </s> remove
import {
renderInputField, required, ipv4, isPositive, toNumber,
} from '../../../helpers/form';
</s> add import { renderInputField, toNumber } from '../../../helpers/form'; </s> remove
import {
renderInputField, required, domain, answer,
} from '../../../helpers/form';
</s> add import { renderInputField } from '../../../helpers/form';
import { validateAnswer, validateDomain, validateRequiredValue } from '../../../helpers/validators'; </s> add import { validateClientId, validateRequiredValue } from '../../../helpers/validators'; </s> add import { validateIpv4, validateIsPositiveValue, validateRequiredValue } from '../../../helpers/validators'; </s> remove import {
renderInputField, required, validInstallPort, toNumber,
} from '../../helpers/form';
</s> add import { renderInputField, toNumber } from '../../helpers/form';
import { validateRequiredValue, validateInstallPort } from '../../helpers/validators'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/components/Settings/Encryption/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> enabled: false,
<mask> };
<mask> // eslint-disable-next-line no-alert
<mask> if (window.confirm(t('encryption_reset'))) {
<mask> Object.keys(fields).forEach((field) => change(field, fields[field]));
<mask> setTlsConfig(fields);
<mask> }
<mask> };
<mask>
<mask> let Form = (props) => {
</s> Extract validation functions in the separate file </s> remove // Validation functions
// If the value is valid, the validation function should return undefined.
// https://redux-form.com/6.6.3/examples/fieldlevelvalidation/
export const required = (value) => {
const formattedValue = typeof value === 'string' ? value.trim() : value;
if (formattedValue || formattedValue === 0 || (formattedValue && formattedValue.length !== 0)) {
return undefined;
}
return <Trans>form_error_required</Trans>;
};
export const maxValue = (maximum) => (value) => (value && value > maximum ? i18next.t('value_not_larger_than', { maximum }) : undefined);
export const ipv4 = (value) => {
if (value && !R_IPV4.test(value)) {
return <Trans>form_error_ip4_format</Trans>;
}
return undefined;
};
export const clientId = (value) => {
if (!value) {
return undefined;
}
const formattedValue = value ? value.trim() : value;
if (formattedValue && !(
R_IPV4.test(formattedValue)
|| R_IPV6.test(formattedValue)
|| R_MAC.test(formattedValue)
|| R_CIDR.test(formattedValue)
|| R_CIDR_IPV6.test(formattedValue)
)) {
return <Trans>form_error_client_id_format</Trans>;
}
return undefined;
};
export const ipv6 = (value) => {
if (value && !R_IPV6.test(value)) {
return <Trans>form_error_ip6_format</Trans>;
}
return undefined;
};
export const ip = (value) => {
if (value && !R_IPV4.test(value) && !R_IPV6.test(value)) {
return <Trans>form_error_ip_format</Trans>;
}
return undefined;
};
export const mac = (value) => {
if (value && !R_MAC.test(value)) {
return <Trans>form_error_mac_format</Trans>;
}
return undefined;
};
export const isPositive = (value) => {
if ((value || value === 0) && value <= 0) {
return <Trans>form_error_positive</Trans>;
}
return undefined;
};
export const biggerOrEqualZero = (value) => {
if (value < 0) {
return <Trans>form_error_negative</Trans>;
}
return false;
};
export const port = (value) => {
if ((value || value === 0) && (value < 80 || value > 65535)) {
return <Trans>form_error_port_range</Trans>;
}
return undefined;
};
export const validInstallPort = (value) => {
if (value < 1 || value > 65535) {
return <Trans>form_error_port</Trans>;
}
return undefined;
};
export const portTLS = (value) => {
if (value === 0) {
return undefined;
}
if (value && (value < 80 || value > 65535)) {
return <Trans>form_error_port_range</Trans>;
}
return undefined;
};
export const isSafePort = (value) => {
if (UNSAFE_PORTS.includes(value)) {
return <Trans>form_error_port_unsafe</Trans>;
}
return undefined;
};
export const domain = (value) => {
if (value && !R_HOST.test(value)) {
return <Trans>form_error_domain_format</Trans>;
}
return undefined;
};
export const answer = (value) => {
if (value && (!R_IPV4.test(value) && !R_IPV6.test(value) && !R_HOST.test(value))) {
return <Trans>form_error_answer_format</Trans>;
}
return undefined;
};
export const isValidUrl = (value) => {
if (value && !R_URL_REQUIRES_PROTOCOL.test(value)) {
return <Trans>form_error_url_format</Trans>;
}
return undefined;
};
</s> add /**
* @param value {string}
* @returns {*|number}
*/
export const toNumber = (value) => value && parseInt(value, 10); </s> remove
export const isValidPath = (value) => {
if (value && !isValidAbsolutePath(value) && !R_URL_REQUIRES_PROTOCOL.test(value)) {
return <Trans>form_error_url_or_path_format</Trans>;
}
return undefined;
};
export const toNumber = (value) => value && parseInt(value, 10);
</s> add </s> remove
import { renderInputField, required, isValidPath } from '../../helpers/form';
</s> add import { renderInputField } from '../../helpers/form';
import { validatePath, validateRequiredValue } from '../../helpers/validators'; </s> remove
import { renderInputField, required } from '../../helpers/form';
</s> add import { renderInputField } from '../../helpers/form';
import { validateRequiredValue } from '../../helpers/validators'; </s> remove
import {
renderInputField, required, domain, answer,
} from '../../../helpers/form';
</s> add import { renderInputField } from '../../../helpers/form';
import { validateAnswer, validateDomain, validateRequiredValue } from '../../../helpers/validators'; </s> remove
import {
renderInputField, ipv4, mac, required,
} from '../../../../helpers/form';
</s> add import { renderInputField } from '../../../../helpers/form';
import { validateIpv4, validateMac, validateRequiredValue } from '../../../../helpers/validators'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/components/Settings/Encryption/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> component={renderInputField}
<mask> type="number"
<mask> className="form-control"
<mask> placeholder={t('encryption_https')}
<mask> validate={[port, isSafePort]}
<mask> normalize={toNumber}
<mask> onChange={handleChange}
<mask> disabled={!isEnabled}
<mask> />
<mask> <div className="form__desc">
</s> Extract validation functions in the separate file </s> remove validate={[portTLS]}
</s> add validate={[validatePortTLS]} </s> remove validate={[validInstallPort, required]}
</s> add validate={[validateInstallPort, validateRequiredValue]} </s> remove validate={[validInstallPort, required]}
</s> add validate={[validateInstallPort, validateRequiredValue]} </s> remove validate={[required, isPositive]}
</s> add validate={[validateRequiredValue, validateIsPositiveValue]} </s> remove validate={[required, biggerOrEqualZero]}
</s> add validate={[validateRequiredValue, validateBiggerOrEqualZeroValue]} </s> remove validate={[biggerOrEqualZero].concat(validate || [])}
</s> add validate={[validateBiggerOrEqualZeroValue].concat(validate || [])} | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/components/Settings/Encryption/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> component={renderInputField}
<mask> type="number"
<mask> className="form-control"
<mask> placeholder={t('encryption_dot')}
<mask> validate={[portTLS]}
<mask> normalize={toNumber}
<mask> onChange={handleChange}
<mask> disabled={!isEnabled}
<mask> />
<mask> <div className="form__desc">
</s> Extract validation functions in the separate file </s> remove validate={[port, isSafePort]}
</s> add validate={[validatePort, validateIsSafePort]} </s> remove validate={[validInstallPort, required]}
</s> add validate={[validateInstallPort, validateRequiredValue]} </s> remove validate={[validInstallPort, required]}
</s> add validate={[validateInstallPort, validateRequiredValue]} </s> remove validate={[required, isPositive]}
</s> add validate={[validateRequiredValue, validateIsPositiveValue]} </s> remove validate={[required, biggerOrEqualZero]}
</s> add validate={[validateRequiredValue, validateBiggerOrEqualZeroValue]} </s> remove validate={[biggerOrEqualZero].concat(validate || [])}
</s> add validate={[validateBiggerOrEqualZeroValue].concat(validate || [])} | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/components/Settings/Encryption/Form.js |
keep keep keep add | <mask> CACHE: 'cache',
<mask> };
<mask>
<mask> export const smallScreenSize = 767;
</s> Extract validation functions in the separate file </s> remove
export const isValidPath = (value) => {
if (value && !isValidAbsolutePath(value) && !R_URL_REQUIRES_PROTOCOL.test(value)) {
return <Trans>form_error_url_or_path_format</Trans>;
}
return undefined;
};
export const toNumber = (value) => value && parseInt(value, 10);
</s> add </s> remove // Validation functions
// If the value is valid, the validation function should return undefined.
// https://redux-form.com/6.6.3/examples/fieldlevelvalidation/
export const required = (value) => {
const formattedValue = typeof value === 'string' ? value.trim() : value;
if (formattedValue || formattedValue === 0 || (formattedValue && formattedValue.length !== 0)) {
return undefined;
}
return <Trans>form_error_required</Trans>;
};
export const maxValue = (maximum) => (value) => (value && value > maximum ? i18next.t('value_not_larger_than', { maximum }) : undefined);
export const ipv4 = (value) => {
if (value && !R_IPV4.test(value)) {
return <Trans>form_error_ip4_format</Trans>;
}
return undefined;
};
export const clientId = (value) => {
if (!value) {
return undefined;
}
const formattedValue = value ? value.trim() : value;
if (formattedValue && !(
R_IPV4.test(formattedValue)
|| R_IPV6.test(formattedValue)
|| R_MAC.test(formattedValue)
|| R_CIDR.test(formattedValue)
|| R_CIDR_IPV6.test(formattedValue)
)) {
return <Trans>form_error_client_id_format</Trans>;
}
return undefined;
};
export const ipv6 = (value) => {
if (value && !R_IPV6.test(value)) {
return <Trans>form_error_ip6_format</Trans>;
}
return undefined;
};
export const ip = (value) => {
if (value && !R_IPV4.test(value) && !R_IPV6.test(value)) {
return <Trans>form_error_ip_format</Trans>;
}
return undefined;
};
export const mac = (value) => {
if (value && !R_MAC.test(value)) {
return <Trans>form_error_mac_format</Trans>;
}
return undefined;
};
export const isPositive = (value) => {
if ((value || value === 0) && value <= 0) {
return <Trans>form_error_positive</Trans>;
}
return undefined;
};
export const biggerOrEqualZero = (value) => {
if (value < 0) {
return <Trans>form_error_negative</Trans>;
}
return false;
};
export const port = (value) => {
if ((value || value === 0) && (value < 80 || value > 65535)) {
return <Trans>form_error_port_range</Trans>;
}
return undefined;
};
export const validInstallPort = (value) => {
if (value < 1 || value > 65535) {
return <Trans>form_error_port</Trans>;
}
return undefined;
};
export const portTLS = (value) => {
if (value === 0) {
return undefined;
}
if (value && (value < 80 || value > 65535)) {
return <Trans>form_error_port_range</Trans>;
}
return undefined;
};
export const isSafePort = (value) => {
if (UNSAFE_PORTS.includes(value)) {
return <Trans>form_error_port_unsafe</Trans>;
}
return undefined;
};
export const domain = (value) => {
if (value && !R_HOST.test(value)) {
return <Trans>form_error_domain_format</Trans>;
}
return undefined;
};
export const answer = (value) => {
if (value && (!R_IPV4.test(value) && !R_IPV6.test(value) && !R_HOST.test(value))) {
return <Trans>form_error_answer_format</Trans>;
}
return undefined;
};
export const isValidUrl = (value) => {
if (value && !R_URL_REQUIRES_PROTOCOL.test(value)) {
return <Trans>form_error_url_format</Trans>;
}
return undefined;
};
</s> add /**
* @param value {string}
* @returns {*|number}
*/
export const toNumber = (value) => value && parseInt(value, 10); </s> remove Object.keys(fields).forEach((field) => change(field, fields[field]));
</s> add Object.keys(fields)
.forEach((field) => change(field, fields[field])); </s> add /**
* @param value {string}
* @returns {boolean}
*/ </s> add import { R_UNIX_ABSOLUTE_PATH, R_WIN_ABSOLUTE_PATH } from './constants'; </s> remove import i18next from 'i18next';
import {
R_IPV4, R_MAC, R_HOST, R_IPV6, R_CIDR, R_CIDR_IPV6,
UNSAFE_PORTS, R_URL_REQUIRES_PROTOCOL, R_WIN_ABSOLUTE_PATH, R_UNIX_ABSOLUTE_PATH,
} from './constants';
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/helpers/constants.js |
keep replace keep replace replace replace replace replace keep | <mask> import React, { Fragment } from 'react';
<mask> import { Trans } from 'react-i18next';
<mask> import PropTypes from 'prop-types';
<mask> import i18next from 'i18next';
<mask> import {
<mask> R_IPV4, R_MAC, R_HOST, R_IPV6, R_CIDR, R_CIDR_IPV6,
<mask> UNSAFE_PORTS, R_URL_REQUIRES_PROTOCOL, R_WIN_ABSOLUTE_PATH, R_UNIX_ABSOLUTE_PATH,
<mask> } from './constants';
<mask> import { createOnBlurHandler } from './helpers';
</s> Extract validation functions in the separate file </s> add import { R_UNIX_ABSOLUTE_PATH, R_WIN_ABSOLUTE_PATH } from './constants'; </s> remove
import { renderInputField, required, isValidPath } from '../../helpers/form';
</s> add import { renderInputField } from '../../helpers/form';
import { validatePath, validateRequiredValue } from '../../helpers/validators'; </s> remove
import { renderInputField, required } from '../../helpers/form';
</s> add import { renderInputField } from '../../helpers/form';
import { validateRequiredValue } from '../../helpers/validators'; </s> remove
import {
renderInputField, required, domain, answer,
} from '../../../helpers/form';
</s> add import { renderInputField } from '../../../helpers/form';
import { validateAnswer, validateDomain, validateRequiredValue } from '../../../helpers/validators'; </s> remove
import {
renderInputField, ipv4, mac, required,
} from '../../../../helpers/form';
</s> add import { renderInputField } from '../../../../helpers/form';
import { validateIpv4, validateMac, validateRequiredValue } from '../../../../helpers/validators'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/helpers/form.js |
keep keep add keep keep keep keep keep keep | <mask> import React, { Fragment } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { createOnBlurHandler } from './helpers';
<mask>
<mask> export const renderField = (props, elementType) => {
<mask> const {
<mask> input, id, className, placeholder, type, disabled, normalizeOnBlur,
<mask> autoComplete, meta: { touched, error }, min, max, step,
<mask> } = props;
</s> Extract validation functions in the separate file </s> remove import i18next from 'i18next';
import {
R_IPV4, R_MAC, R_HOST, R_IPV6, R_CIDR, R_CIDR_IPV6,
UNSAFE_PORTS, R_URL_REQUIRES_PROTOCOL, R_WIN_ABSOLUTE_PATH, R_UNIX_ABSOLUTE_PATH,
} from './constants';
</s> add </s> remove import { Trans } from 'react-i18next';
</s> add </s> remove
import { renderInputField, required, isValidPath } from '../../helpers/form';
</s> add import { renderInputField } from '../../helpers/form';
import { validatePath, validateRequiredValue } from '../../helpers/validators'; </s> remove
import { renderInputField, required } from '../../helpers/form';
</s> add import { renderInputField } from '../../helpers/form';
import { validateRequiredValue } from '../../helpers/validators'; </s> remove
import {
renderInputField, required, domain, answer,
} from '../../../helpers/form';
</s> add import { renderInputField } from '../../../helpers/form';
import { validateAnswer, validateDomain, validateRequiredValue } from '../../../helpers/validators'; </s> remove
import {
renderInputField, ipv4, mac, required,
} from '../../../../helpers/form';
</s> add import { renderInputField } from '../../../../helpers/form';
import { validateIpv4, validateMac, validateRequiredValue } from '../../../../helpers/validators'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/helpers/form.js |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> error: PropTypes.object,
<mask> }).isRequired,
<mask> };
<mask>
<mask> // Validation functions
<mask> // If the value is valid, the validation function should return undefined.
<mask> // https://redux-form.com/6.6.3/examples/fieldlevelvalidation/
<mask> export const required = (value) => {
<mask> const formattedValue = typeof value === 'string' ? value.trim() : value;
<mask> if (formattedValue || formattedValue === 0 || (formattedValue && formattedValue.length !== 0)) {
<mask> return undefined;
<mask> }
<mask> return <Trans>form_error_required</Trans>;
<mask> };
<mask>
<mask> export const maxValue = (maximum) => (value) => (value && value > maximum ? i18next.t('value_not_larger_than', { maximum }) : undefined);
<mask>
<mask> export const ipv4 = (value) => {
<mask> if (value && !R_IPV4.test(value)) {
<mask> return <Trans>form_error_ip4_format</Trans>;
<mask> }
<mask> return undefined;
<mask> };
<mask>
<mask> export const clientId = (value) => {
<mask> if (!value) {
<mask> return undefined;
<mask> }
<mask> const formattedValue = value ? value.trim() : value;
<mask> if (formattedValue && !(
<mask> R_IPV4.test(formattedValue)
<mask> || R_IPV6.test(formattedValue)
<mask> || R_MAC.test(formattedValue)
<mask> || R_CIDR.test(formattedValue)
<mask> || R_CIDR_IPV6.test(formattedValue)
<mask> )) {
<mask> return <Trans>form_error_client_id_format</Trans>;
<mask> }
<mask> return undefined;
<mask> };
<mask>
<mask> export const ipv6 = (value) => {
<mask> if (value && !R_IPV6.test(value)) {
<mask> return <Trans>form_error_ip6_format</Trans>;
<mask> }
<mask> return undefined;
<mask> };
<mask>
<mask> export const ip = (value) => {
<mask> if (value && !R_IPV4.test(value) && !R_IPV6.test(value)) {
<mask> return <Trans>form_error_ip_format</Trans>;
<mask> }
<mask> return undefined;
<mask> };
<mask>
<mask> export const mac = (value) => {
<mask> if (value && !R_MAC.test(value)) {
<mask> return <Trans>form_error_mac_format</Trans>;
<mask> }
<mask> return undefined;
<mask> };
<mask>
<mask> export const isPositive = (value) => {
<mask> if ((value || value === 0) && value <= 0) {
<mask> return <Trans>form_error_positive</Trans>;
<mask> }
<mask> return undefined;
<mask> };
<mask>
<mask> export const biggerOrEqualZero = (value) => {
<mask> if (value < 0) {
<mask> return <Trans>form_error_negative</Trans>;
<mask> }
<mask> return false;
<mask> };
<mask>
<mask> export const port = (value) => {
<mask> if ((value || value === 0) && (value < 80 || value > 65535)) {
<mask> return <Trans>form_error_port_range</Trans>;
<mask> }
<mask> return undefined;
<mask> };
<mask>
<mask> export const validInstallPort = (value) => {
<mask> if (value < 1 || value > 65535) {
<mask> return <Trans>form_error_port</Trans>;
<mask> }
<mask> return undefined;
<mask> };
<mask>
<mask> export const portTLS = (value) => {
<mask> if (value === 0) {
<mask> return undefined;
<mask> }
<mask> if (value && (value < 80 || value > 65535)) {
<mask> return <Trans>form_error_port_range</Trans>;
<mask> }
<mask> return undefined;
<mask> };
<mask>
<mask> export const isSafePort = (value) => {
<mask> if (UNSAFE_PORTS.includes(value)) {
<mask> return <Trans>form_error_port_unsafe</Trans>;
<mask> }
<mask> return undefined;
<mask> };
<mask>
<mask> export const domain = (value) => {
<mask> if (value && !R_HOST.test(value)) {
<mask> return <Trans>form_error_domain_format</Trans>;
<mask> }
<mask> return undefined;
<mask> };
<mask>
<mask> export const answer = (value) => {
<mask> if (value && (!R_IPV4.test(value) && !R_IPV6.test(value) && !R_HOST.test(value))) {
<mask> return <Trans>form_error_answer_format</Trans>;
<mask> }
<mask> return undefined;
<mask> };
<mask>
<mask> export const isValidUrl = (value) => {
<mask> if (value && !R_URL_REQUIRES_PROTOCOL.test(value)) {
<mask> return <Trans>form_error_url_format</Trans>;
<mask> }
<mask> return undefined;
<mask> };
<mask>
<mask> export const isValidAbsolutePath = (value) => R_WIN_ABSOLUTE_PATH.test(value)
<mask> || R_UNIX_ABSOLUTE_PATH.test(value);
<mask>
<mask> export const isValidPath = (value) => {
</s> Extract validation functions in the separate file </s> remove
export const isValidPath = (value) => {
if (value && !isValidAbsolutePath(value) && !R_URL_REQUIRES_PROTOCOL.test(value)) {
return <Trans>form_error_url_or_path_format</Trans>;
}
return undefined;
};
export const toNumber = (value) => value && parseInt(value, 10);
</s> add </s> add /**
* @param value {string}
* @returns {boolean}
*/ </s> remove idArrayErrors[idx] = required(id) || clientId(id);
</s> add idArrayErrors[idx] = validateRequiredValue(id) || validateClientId(id); </s> remove Object.keys(fields).forEach((field) => change(field, fields[field]));
</s> add Object.keys(fields)
.forEach((field) => change(field, fields[field])); </s> remove errors.name = required(name);
</s> add errors.name = validateRequiredValue(name); </s> remove required,
maxValue3600,
</s> add validateRequiredValue,
validateMaxValue3600, | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/helpers/form.js |
keep keep add keep keep | <mask> */
<mask> export const toNumber = (value) => value && parseInt(value, 10);
<mask>
<mask> export const isValidAbsolutePath = (value) => R_WIN_ABSOLUTE_PATH.test(value)
<mask> || R_UNIX_ABSOLUTE_PATH.test(value);
</s> Extract validation functions in the separate file </s> remove
export const isValidPath = (value) => {
if (value && !isValidAbsolutePath(value) && !R_URL_REQUIRES_PROTOCOL.test(value)) {
return <Trans>form_error_url_or_path_format</Trans>;
}
return undefined;
};
export const toNumber = (value) => value && parseInt(value, 10);
</s> add </s> remove // Validation functions
// If the value is valid, the validation function should return undefined.
// https://redux-form.com/6.6.3/examples/fieldlevelvalidation/
export const required = (value) => {
const formattedValue = typeof value === 'string' ? value.trim() : value;
if (formattedValue || formattedValue === 0 || (formattedValue && formattedValue.length !== 0)) {
return undefined;
}
return <Trans>form_error_required</Trans>;
};
export const maxValue = (maximum) => (value) => (value && value > maximum ? i18next.t('value_not_larger_than', { maximum }) : undefined);
export const ipv4 = (value) => {
if (value && !R_IPV4.test(value)) {
return <Trans>form_error_ip4_format</Trans>;
}
return undefined;
};
export const clientId = (value) => {
if (!value) {
return undefined;
}
const formattedValue = value ? value.trim() : value;
if (formattedValue && !(
R_IPV4.test(formattedValue)
|| R_IPV6.test(formattedValue)
|| R_MAC.test(formattedValue)
|| R_CIDR.test(formattedValue)
|| R_CIDR_IPV6.test(formattedValue)
)) {
return <Trans>form_error_client_id_format</Trans>;
}
return undefined;
};
export const ipv6 = (value) => {
if (value && !R_IPV6.test(value)) {
return <Trans>form_error_ip6_format</Trans>;
}
return undefined;
};
export const ip = (value) => {
if (value && !R_IPV4.test(value) && !R_IPV6.test(value)) {
return <Trans>form_error_ip_format</Trans>;
}
return undefined;
};
export const mac = (value) => {
if (value && !R_MAC.test(value)) {
return <Trans>form_error_mac_format</Trans>;
}
return undefined;
};
export const isPositive = (value) => {
if ((value || value === 0) && value <= 0) {
return <Trans>form_error_positive</Trans>;
}
return undefined;
};
export const biggerOrEqualZero = (value) => {
if (value < 0) {
return <Trans>form_error_negative</Trans>;
}
return false;
};
export const port = (value) => {
if ((value || value === 0) && (value < 80 || value > 65535)) {
return <Trans>form_error_port_range</Trans>;
}
return undefined;
};
export const validInstallPort = (value) => {
if (value < 1 || value > 65535) {
return <Trans>form_error_port</Trans>;
}
return undefined;
};
export const portTLS = (value) => {
if (value === 0) {
return undefined;
}
if (value && (value < 80 || value > 65535)) {
return <Trans>form_error_port_range</Trans>;
}
return undefined;
};
export const isSafePort = (value) => {
if (UNSAFE_PORTS.includes(value)) {
return <Trans>form_error_port_unsafe</Trans>;
}
return undefined;
};
export const domain = (value) => {
if (value && !R_HOST.test(value)) {
return <Trans>form_error_domain_format</Trans>;
}
return undefined;
};
export const answer = (value) => {
if (value && (!R_IPV4.test(value) && !R_IPV6.test(value) && !R_HOST.test(value))) {
return <Trans>form_error_answer_format</Trans>;
}
return undefined;
};
export const isValidUrl = (value) => {
if (value && !R_URL_REQUIRES_PROTOCOL.test(value)) {
return <Trans>form_error_url_format</Trans>;
}
return undefined;
};
</s> add /**
* @param value {string}
* @returns {*|number}
*/
export const toNumber = (value) => value && parseInt(value, 10); </s> add export const SECONDS_IN_HOUR = 60 * 60; </s> remove idArrayErrors[idx] = required(id) || clientId(id);
</s> add idArrayErrors[idx] = validateRequiredValue(id) || validateClientId(id); </s> remove errors.name = required(name);
</s> add errors.name = validateRequiredValue(name); </s> add import { R_UNIX_ABSOLUTE_PATH, R_WIN_ABSOLUTE_PATH } from './constants'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/helpers/form.js |
keep keep keep keep replace replace replace replace replace replace replace replace replace | <mask> };
<mask>
<mask> export const isValidAbsolutePath = (value) => R_WIN_ABSOLUTE_PATH.test(value)
<mask> || R_UNIX_ABSOLUTE_PATH.test(value);
<mask>
<mask> export const isValidPath = (value) => {
<mask> if (value && !isValidAbsolutePath(value) && !R_URL_REQUIRES_PROTOCOL.test(value)) {
<mask> return <Trans>form_error_url_or_path_format</Trans>;
<mask> }
<mask> return undefined;
<mask> };
<mask>
<mask> export const toNumber = (value) => value && parseInt(value, 10);
</s> Extract validation functions in the separate file </s> remove // Validation functions
// If the value is valid, the validation function should return undefined.
// https://redux-form.com/6.6.3/examples/fieldlevelvalidation/
export const required = (value) => {
const formattedValue = typeof value === 'string' ? value.trim() : value;
if (formattedValue || formattedValue === 0 || (formattedValue && formattedValue.length !== 0)) {
return undefined;
}
return <Trans>form_error_required</Trans>;
};
export const maxValue = (maximum) => (value) => (value && value > maximum ? i18next.t('value_not_larger_than', { maximum }) : undefined);
export const ipv4 = (value) => {
if (value && !R_IPV4.test(value)) {
return <Trans>form_error_ip4_format</Trans>;
}
return undefined;
};
export const clientId = (value) => {
if (!value) {
return undefined;
}
const formattedValue = value ? value.trim() : value;
if (formattedValue && !(
R_IPV4.test(formattedValue)
|| R_IPV6.test(formattedValue)
|| R_MAC.test(formattedValue)
|| R_CIDR.test(formattedValue)
|| R_CIDR_IPV6.test(formattedValue)
)) {
return <Trans>form_error_client_id_format</Trans>;
}
return undefined;
};
export const ipv6 = (value) => {
if (value && !R_IPV6.test(value)) {
return <Trans>form_error_ip6_format</Trans>;
}
return undefined;
};
export const ip = (value) => {
if (value && !R_IPV4.test(value) && !R_IPV6.test(value)) {
return <Trans>form_error_ip_format</Trans>;
}
return undefined;
};
export const mac = (value) => {
if (value && !R_MAC.test(value)) {
return <Trans>form_error_mac_format</Trans>;
}
return undefined;
};
export const isPositive = (value) => {
if ((value || value === 0) && value <= 0) {
return <Trans>form_error_positive</Trans>;
}
return undefined;
};
export const biggerOrEqualZero = (value) => {
if (value < 0) {
return <Trans>form_error_negative</Trans>;
}
return false;
};
export const port = (value) => {
if ((value || value === 0) && (value < 80 || value > 65535)) {
return <Trans>form_error_port_range</Trans>;
}
return undefined;
};
export const validInstallPort = (value) => {
if (value < 1 || value > 65535) {
return <Trans>form_error_port</Trans>;
}
return undefined;
};
export const portTLS = (value) => {
if (value === 0) {
return undefined;
}
if (value && (value < 80 || value > 65535)) {
return <Trans>form_error_port_range</Trans>;
}
return undefined;
};
export const isSafePort = (value) => {
if (UNSAFE_PORTS.includes(value)) {
return <Trans>form_error_port_unsafe</Trans>;
}
return undefined;
};
export const domain = (value) => {
if (value && !R_HOST.test(value)) {
return <Trans>form_error_domain_format</Trans>;
}
return undefined;
};
export const answer = (value) => {
if (value && (!R_IPV4.test(value) && !R_IPV6.test(value) && !R_HOST.test(value))) {
return <Trans>form_error_answer_format</Trans>;
}
return undefined;
};
export const isValidUrl = (value) => {
if (value && !R_URL_REQUIRES_PROTOCOL.test(value)) {
return <Trans>form_error_url_format</Trans>;
}
return undefined;
};
</s> add /**
* @param value {string}
* @returns {*|number}
*/
export const toNumber = (value) => value && parseInt(value, 10); </s> add /**
* @param value {string}
* @returns {boolean}
*/ </s> add export const SECONDS_IN_HOUR = 60 * 60; </s> remove idArrayErrors[idx] = required(id) || clientId(id);
</s> add idArrayErrors[idx] = validateRequiredValue(id) || validateClientId(id); </s> remove errors.name = required(name);
</s> add errors.name = validateRequiredValue(name); </s> remove Object.keys(fields).forEach((field) => change(field, fields[field]));
</s> add Object.keys(fields)
.forEach((field) => change(field, fields[field])); | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/helpers/form.js |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> import AddressList from './AddressList';
<mask>
<mask> import { getInterfaceIp } from '../../helpers/helpers';
<mask> import { ALL_INTERFACES_IP, FORM_NAME } from '../../helpers/constants';
<mask> import {
<mask> renderInputField, required, validInstallPort, toNumber,
<mask> } from '../../helpers/form';
<mask>
<mask> const STATIC_STATUS = {
<mask> ENABLED: 'yes',
<mask> DISABLED: 'no',
<mask> ERROR: 'error',
</s> Extract validation functions in the separate file </s> remove
import { renderInputField, required, isValidPath } from '../../helpers/form';
</s> add import { renderInputField } from '../../helpers/form';
import { validatePath, validateRequiredValue } from '../../helpers/validators'; </s> remove
import { renderInputField, required } from '../../helpers/form';
</s> add import { renderInputField } from '../../helpers/form';
import { validateRequiredValue } from '../../helpers/validators'; </s> remove
import {
renderInputField, required, ipv4, isPositive, toNumber,
} from '../../../helpers/form';
</s> add import { renderInputField, toNumber } from '../../../helpers/form'; </s> remove import {
biggerOrEqualZero,
maxValue,
renderInputField,
required,
toNumber,
} from '../../../../helpers/form';
import { FORM_NAME } from '../../../../helpers/constants';
</s> add import { renderInputField, toNumber } from '../../../../helpers/form';
import { validateBiggerOrEqualZeroValue, getMaxValueValidator, validateRequiredValue } from '../../../../helpers/validators';
import { FORM_NAME, SECONDS_IN_HOUR } from '../../../../helpers/constants'; </s> remove required,
ipv4,
ipv6,
biggerOrEqualZero,
</s> add </s> remove
import {
renderInputField, required, domain, answer,
} from '../../../helpers/form';
</s> add import { renderInputField } from '../../../helpers/form';
import { validateAnswer, validateDomain, validateRequiredValue } from '../../../helpers/validators'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/install/Setup/Settings.js |
keep keep keep keep replace keep keep keep keep keep | <mask> component={renderInputField}
<mask> type="number"
<mask> className="form-control"
<mask> placeholder="80"
<mask> validate={[validInstallPort, required]}
<mask> normalize={toNumber}
<mask> onChange={handleChange}
<mask> />
<mask> </div>
<mask> </div>
</s> Extract validation functions in the separate file </s> remove validate={[validInstallPort, required]}
</s> add validate={[validateInstallPort, validateRequiredValue]} </s> remove validate={[portTLS]}
</s> add validate={[validatePortTLS]} </s> remove validate={[port, isSafePort]}
</s> add validate={[validatePort, validateIsSafePort]} </s> remove validate={[required, isPositive]}
</s> add validate={[validateRequiredValue, validateIsPositiveValue]} </s> remove validate={[ipv4, required]}
</s> add validate={[validateIpv4, validateRequiredValue]} </s> remove validate={[ipv4, required]}
</s> add validate={[validateIpv4, validateRequiredValue]} | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/install/Setup/Settings.js |
keep keep keep keep replace keep keep keep keep keep | <mask> component={renderInputField}
<mask> type="number"
<mask> className="form-control"
<mask> placeholder="80"
<mask> validate={[validInstallPort, required]}
<mask> normalize={toNumber}
<mask> onChange={handleChange}
<mask> />
<mask> </div>
<mask> </div>
</s> Extract validation functions in the separate file | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/install/Setup/Settings.js |
keep keep keep keep replace replace keep keep keep keep keep | <mask> import PropTypes from 'prop-types';
<mask> import { Field, reduxForm } from 'redux-form';
<mask> import { Trans, withTranslation } from 'react-i18next';
<mask> import flow from 'lodash/flow';
<mask>
<mask> import { renderInputField, required } from '../../helpers/form';
<mask> import { FORM_NAME } from '../../helpers/constants';
<mask>
<mask> const Form = (props) => {
<mask> const {
<mask> handleSubmit, processing, invalid, t,
</s> Extract validation functions in the separate file </s> remove
import { renderInputField, required, isValidPath } from '../../helpers/form';
</s> add import { renderInputField } from '../../helpers/form';
import { validatePath, validateRequiredValue } from '../../helpers/validators'; </s> remove
import {
renderInputField, ipv4, mac, required,
} from '../../../../helpers/form';
</s> add import { renderInputField } from '../../../../helpers/form';
import { validateIpv4, validateMac, validateRequiredValue } from '../../../../helpers/validators'; </s> remove
import {
renderInputField, required, domain, answer,
} from '../../../helpers/form';
</s> add import { renderInputField } from '../../../helpers/form';
import { validateAnswer, validateDomain, validateRequiredValue } from '../../../helpers/validators'; </s> remove
import {
renderInputField, required, ipv4, isPositive, toNumber,
} from '../../../helpers/form';
</s> add import { renderInputField, toNumber } from '../../../helpers/form'; </s> remove import {
biggerOrEqualZero,
maxValue,
renderInputField,
required,
toNumber,
} from '../../../../helpers/form';
import { FORM_NAME } from '../../../../helpers/constants';
</s> add import { renderInputField, toNumber } from '../../../../helpers/form';
import { validateBiggerOrEqualZeroValue, getMaxValueValidator, validateRequiredValue } from '../../../../helpers/validators';
import { FORM_NAME, SECONDS_IN_HOUR } from '../../../../helpers/constants'; </s> remove import {
renderInputField, required, validInstallPort, toNumber,
} from '../../helpers/form';
</s> add import { renderInputField, toNumber } from '../../helpers/form';
import { validateRequiredValue, validateInstallPort } from '../../helpers/validators'; | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/login/Login/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> component={renderInputField}
<mask> placeholder={t('username_placeholder')}
<mask> autoComplete="username"
<mask> disabled={processing}
<mask> validate={[required]}
<mask> />
<mask> </div>
<mask> <div className="form__group form__group--settings">
<mask> <label className="form__label" htmlFor="password">
<mask> <Trans>password_label</Trans>
</s> Extract validation functions in the separate file </s> remove validate={[required]}
</s> add validate={[validateRequiredValue]} </s> remove validate={[ipv4, required]}
</s> add validate={[validateIpv4, validateRequiredValue]} </s> remove validate={[ipv4, required]}
</s> add validate={[validateIpv4, validateRequiredValue]} </s> remove validate={[ipv4, required]}
</s> add validate={[validateIpv4, validateRequiredValue]} </s> remove validate={[required, biggerOrEqualZero]}
</s> add validate={[validateRequiredValue, validateBiggerOrEqualZeroValue]} </s> remove validate={[required]}
</s> add validate={[validateRequiredValue]} | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/login/Login/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> component={renderInputField}
<mask> placeholder={t('password_placeholder')}
<mask> autoComplete="current-password"
<mask> disabled={processing}
<mask> validate={[required]}
<mask> />
<mask> </div>
<mask> <div className="form-footer">
<mask> <button
<mask> type="submit"
</s> Extract validation functions in the separate file </s> remove validate={[required]}
</s> add validate={[validateRequiredValue]} </s> remove validate={[required]}
</s> add validate={[validateRequiredValue]} </s> remove validate={[ipv4, required]}
</s> add validate={[validateIpv4, validateRequiredValue]} </s> remove validate={[ipv4, required]}
</s> add validate={[validateIpv4, validateRequiredValue]} </s> remove validate={[required, answer]}
</s> add validate={[validateRequiredValue, validateAnswer]} </s> remove validate={[required, biggerOrEqualZero]}
</s> add validate={[validateRequiredValue, validateBiggerOrEqualZeroValue]} | https://github.com/AdguardTeam/AdGuardHome/commit/0c4905fa2b412189cc7901d810d518337ca466c7 | client/src/login/Login/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> go 1.18
<mask>
<mask> require (
<mask> github.com/AdguardTeam/dnsproxy v0.44.0
<mask> github.com/AdguardTeam/golibs v0.10.9
<mask> github.com/AdguardTeam/urlfilter v0.16.0
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/ameshkov/dnscrypt/v2 v2.2.5
<mask> github.com/digineo/go-ipset/v2 v2.2.1
</s> Pull request: 3955-doh3
Updates #3955.
Squashed commit of the following:
commit acfd5ccc29ff03dfae1e51e52649acdf05042d9f
Merge: caeac6e5 61bd217e
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 18:00:37 2022 +0300
Merge branch 'master' into 3955-doh3
commit caeac6e5401bcaa95bba8d2b84a943b6c9a5898a
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:54:16 2022 +0300
all: fix server closing; imp docs
commit 87396141ff49d48ae54b4184559070e7885bccc7
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:33:39 2022 +0300
all: add doh3 support </s> remove github.com/AdguardTeam/dnsproxy v0.44.0 h1:JzIxEXF4OyJq4wZVHeZkM1af4VfuwcgrUzjgdBGljsE=
github.com/AdguardTeam/dnsproxy v0.44.0/go.mod h1:HsxYYW/bC8uo+4eX9pRW21hFD6gWZdrvcfBb1R6/AzU=
</s> add github.com/AdguardTeam/dnsproxy v0.45.2 h1:K9BXkQAfAKjrzbWbczpA2IA1owLe/edv0nG0e2+Esko=
github.com/AdguardTeam/dnsproxy v0.45.2/go.mod h1:h+0r4GDvHHY2Wu6r7oqva+O37h00KofYysfzy1TEXFE= </s> remove "encoding/json"
</s> add </s> add if web.conf.serveHTTP3 {
go web.mustStartHTTP3(addr)
}
log.Debug("web: starting https server") </s> add github.com/bluele/gcache v0.0.2 h1:WcbfdXICg7G/DGBh1PFfcirkWOQV+v077yF1pSy3DGw=
github.com/bluele/gcache v0.0.2/go.mod h1:m15KV+ECjptwSPxKhOhQoAFQVtUFjTVkc3H8o0t/fp0= </s> add github.com/bluele/gcache v0.0.2 // indirect </s> remove for !web.httpsServer.shutdown {
</s> add for !web.httpsServer.inShutdown { | https://github.com/AdguardTeam/AdGuardHome/commit/0cce420261b1e207e558f884d6c73cbec9d55f60 | go.mod |
keep keep keep keep replace keep keep keep keep keep | <mask> github.com/google/renameio v1.0.1
<mask> github.com/google/uuid v1.3.0
<mask> github.com/insomniacslk/dhcp v0.0.0-20220822114210-de18a9d48e84
<mask> github.com/kardianos/service v1.2.1
<mask> github.com/lucas-clemente/quic-go v0.29.0
<mask> github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118
<mask> github.com/mdlayher/netlink v1.6.0
<mask> // TODO(a.garipov): This package is deprecated; find a new one or use
<mask> // our own code for that. Perhaps, use gopacket.
<mask> github.com/mdlayher/raw v0.1.0
</s> Pull request: 3955-doh3
Updates #3955.
Squashed commit of the following:
commit acfd5ccc29ff03dfae1e51e52649acdf05042d9f
Merge: caeac6e5 61bd217e
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 18:00:37 2022 +0300
Merge branch 'master' into 3955-doh3
commit caeac6e5401bcaa95bba8d2b84a943b6c9a5898a
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:54:16 2022 +0300
all: fix server closing; imp docs
commit 87396141ff49d48ae54b4184559070e7885bccc7
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:33:39 2022 +0300
all: add doh3 support </s> remove github.com/lucas-clemente/quic-go v0.29.0 h1:Vw0mGTfmWqGzh4jx/kMymsIkFK6rErFVmg+t9RLrnZE=
github.com/lucas-clemente/quic-go v0.29.0/go.mod h1:CTcNfLYJS2UuRNB+zcNlgvkjBhxX6Hm3WUxxAQx2mgE=
</s> add github.com/lucas-clemente/quic-go v0.29.1 h1:Z+WMJ++qMLhvpFkRZA+jl3BTxUjm415YBmWanXB8zP0=
github.com/lucas-clemente/quic-go v0.29.1/go.mod h1:CTcNfLYJS2UuRNB+zcNlgvkjBhxX6Hm3WUxxAQx2mgE=
github.com/marten-seemann/qpack v0.2.1 h1:jvTsT/HpCn2UZJdP+UUB53FfUUgeOyG5K1ns0OJOGVs=
github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc= </s> remove conf *webConfig
forceHTTPS bool
httpServer *http.Server // HTTP module
httpsServer HTTPSServer // HTTPS module
</s> add conf *webConfig
// TODO(a.garipov): Refactor all these servers.
httpServer *http.Server
// httpServerBeta is a server for new client.
httpServerBeta *http.Server </s> remove // section from pctx and returns a non-nil res if at least one of canonnical
</s> add // section from pctx and returns a non-nil res if at least one of canonical </s> add github.com/marten-seemann/qpack v0.2.1 // indirect </s> remove // httpServerBeta is a server for new client.
httpServerBeta *http.Server
</s> add // httpsServer is the server that handles HTTPS traffic. If it is not nil,
// [Web.http3Server] must also not be nil.
httpsServer httpsServer
forceHTTPS bool </s> remove // CreateWeb - create module
func CreateWeb(conf *webConfig) *Web {
log.Info("Initialize web module")
</s> add // newWeb creates a new instance of the web UI and API server.
func newWeb(conf *webConfig) (w *Web) {
log.Info("web: initializing") | https://github.com/AdguardTeam/AdGuardHome/commit/0cce420261b1e207e558f884d6c73cbec9d55f60 | go.mod |
keep keep keep keep replace replace replace replace keep keep keep keep keep | <mask> github.com/miekg/dns v1.1.50
<mask> github.com/stretchr/testify v1.8.0
<mask> github.com/ti-mo/netfilter v0.4.0
<mask> go.etcd.io/bbolt v1.3.6
<mask> golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90
<mask> golang.org/x/exp v0.0.0-20220827204233-334a2380cb91
<mask> golang.org/x/net v0.0.0-20220906165146-f3363e06e74c
<mask> golang.org/x/sys v0.0.0-20220906135438-9e1f76180b77
<mask> gopkg.in/natefinch/lumberjack.v2 v2.0.0
<mask> gopkg.in/yaml.v3 v3.0.1
<mask> howett.net/plist v1.0.0
<mask> )
<mask>
</s> Pull request: 3955-doh3
Updates #3955.
Squashed commit of the following:
commit acfd5ccc29ff03dfae1e51e52649acdf05042d9f
Merge: caeac6e5 61bd217e
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 18:00:37 2022 +0300
Merge branch 'master' into 3955-doh3
commit caeac6e5401bcaa95bba8d2b84a943b6c9a5898a
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:54:16 2022 +0300
all: fix server closing; imp docs
commit 87396141ff49d48ae54b4184559070e7885bccc7
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:33:39 2022 +0300
all: add doh3 support </s> remove golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 h1:Y/gsMcFOcR+6S6f3YeMKl5g+dZMEWqcz5Czj/GWYbkM=
golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 h1:tnebWN09GYg9OLPss1KXj8txwZc6X6uMr6VFdcGNbHw=
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
</s> add golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be h1:fmw3UbQh+nxngCAHrDCCztao/kbYFnWjoqop8dHx05A=
golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/exp v0.0.0-20220929160808-de9c53c655b9 h1:lNtcVz/3bOstm7Vebox+5m3nLh/BYWnhmc3AhXOW6oI=
golang.org/x/exp v0.0.0-20220929160808-de9c53c655b9/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= </s> remove golang.org/x/sys v0.0.0-20220906135438-9e1f76180b77 h1:C1tElbkWrsSkn3IRl1GCW/gETw1TywWIPgwZtXTZbYg=
golang.org/x/sys v0.0.0-20220906135438-9e1f76180b77/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec h1:BkDtF2Ih9xZ7le9ndzTA7KJow28VbQW3odyk/8drmuI=
golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/net v0.0.0-20220906165146-f3363e06e74c h1:yKufUcDwucU5urd+50/Opbt4AYpqthk7wHpHok8f1lo=
golang.org/x/net v0.0.0-20220906165146-f3363e06e74c/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
</s> add golang.org/x/net v0.0.0-20220927171203-f486391704dc h1:FxpXZdoBqT8RjqTy6i1E8nXHhW21wK7ptQ/EPIGxzPQ=
golang.org/x/net v0.0.0-20220927171203-f486391704dc/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= </s> add golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> add golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= </s> remove golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9 h1:VtCrPQXM5Wo9l7XN64SjBMczl48j8mkP+2e3OhYlz+0=
golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
</s> add golang.org/x/mod v0.6.0-dev.0.20220922195421-2adab6b8c60e h1:WhB000cGjOfbJiedMGvJkMTclI18VD69w27k+sceql8=
golang.org/x/mod v0.6.0-dev.0.20220922195421-2adab6b8c60e/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= | https://github.com/AdguardTeam/AdGuardHome/commit/0cce420261b1e207e558f884d6c73cbec9d55f60 | go.mod |
keep add keep keep keep keep keep | <mask> github.com/ameshkov/dnsstamps v1.0.3 // indirect
<mask> github.com/beefsack/go-rate v0.0.0-20220214233405-116f4ca011a0 // indirect
<mask> github.com/davecgh/go-spew v1.1.1 // indirect
<mask> github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
<mask> github.com/golang/mock v1.6.0 // indirect
<mask> github.com/josharian/native v1.0.0 // indirect
<mask> github.com/marten-seemann/qpack v0.2.1 // indirect
</s> Pull request: 3955-doh3
Updates #3955.
Squashed commit of the following:
commit acfd5ccc29ff03dfae1e51e52649acdf05042d9f
Merge: caeac6e5 61bd217e
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 18:00:37 2022 +0300
Merge branch 'master' into 3955-doh3
commit caeac6e5401bcaa95bba8d2b84a943b6c9a5898a
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:54:16 2022 +0300
all: fix server closing; imp docs
commit 87396141ff49d48ae54b4184559070e7885bccc7
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:33:39 2022 +0300
all: add doh3 support </s> add github.com/marten-seemann/qpack v0.2.1 // indirect </s> remove golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9 // indirect
</s> add golang.org/x/mod v0.6.0-dev.0.20220922195421-2adab6b8c60e // indirect </s> add github.com/bluele/gcache v0.0.2 h1:WcbfdXICg7G/DGBh1PFfcirkWOQV+v077yF1pSy3DGw=
github.com/bluele/gcache v0.0.2/go.mod h1:m15KV+ECjptwSPxKhOhQoAFQVtUFjTVkc3H8o0t/fp0= </s> remove github.com/lucas-clemente/quic-go v0.29.0 h1:Vw0mGTfmWqGzh4jx/kMymsIkFK6rErFVmg+t9RLrnZE=
github.com/lucas-clemente/quic-go v0.29.0/go.mod h1:CTcNfLYJS2UuRNB+zcNlgvkjBhxX6Hm3WUxxAQx2mgE=
</s> add github.com/lucas-clemente/quic-go v0.29.1 h1:Z+WMJ++qMLhvpFkRZA+jl3BTxUjm415YBmWanXB8zP0=
github.com/lucas-clemente/quic-go v0.29.1/go.mod h1:CTcNfLYJS2UuRNB+zcNlgvkjBhxX6Hm3WUxxAQx2mgE=
github.com/marten-seemann/qpack v0.2.1 h1:jvTsT/HpCn2UZJdP+UUB53FfUUgeOyG5K1ns0OJOGVs=
github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc= </s> remove github.com/lucas-clemente/quic-go v0.29.0
</s> add github.com/lucas-clemente/quic-go v0.29.1 </s> remove github.com/AdguardTeam/dnsproxy v0.44.0
</s> add github.com/AdguardTeam/dnsproxy v0.45.2 | https://github.com/AdguardTeam/AdGuardHome/commit/0cce420261b1e207e558f884d6c73cbec9d55f60 | go.mod |
keep add keep keep keep keep keep | <mask> github.com/golang/mock v1.6.0 // indirect
<mask> github.com/josharian/native v1.0.0 // indirect
<mask> github.com/marten-seemann/qtls-go1-18 v0.1.2 // indirect
<mask> github.com/marten-seemann/qtls-go1-19 v0.1.0 // indirect
<mask> github.com/mdlayher/packet v1.0.0 // indirect
<mask> github.com/mdlayher/socket v0.2.3 // indirect
<mask> github.com/nxadm/tail v1.4.8 // indirect
</s> Pull request: 3955-doh3
Updates #3955.
Squashed commit of the following:
commit acfd5ccc29ff03dfae1e51e52649acdf05042d9f
Merge: caeac6e5 61bd217e
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 18:00:37 2022 +0300
Merge branch 'master' into 3955-doh3
commit caeac6e5401bcaa95bba8d2b84a943b6c9a5898a
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:54:16 2022 +0300
all: fix server closing; imp docs
commit 87396141ff49d48ae54b4184559070e7885bccc7
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:33:39 2022 +0300
all: add doh3 support </s> add github.com/bluele/gcache v0.0.2 // indirect </s> remove golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9 // indirect
</s> add golang.org/x/mod v0.6.0-dev.0.20220922195421-2adab6b8c60e // indirect </s> remove github.com/lucas-clemente/quic-go v0.29.0 h1:Vw0mGTfmWqGzh4jx/kMymsIkFK6rErFVmg+t9RLrnZE=
github.com/lucas-clemente/quic-go v0.29.0/go.mod h1:CTcNfLYJS2UuRNB+zcNlgvkjBhxX6Hm3WUxxAQx2mgE=
</s> add github.com/lucas-clemente/quic-go v0.29.1 h1:Z+WMJ++qMLhvpFkRZA+jl3BTxUjm415YBmWanXB8zP0=
github.com/lucas-clemente/quic-go v0.29.1/go.mod h1:CTcNfLYJS2UuRNB+zcNlgvkjBhxX6Hm3WUxxAQx2mgE=
github.com/marten-seemann/qpack v0.2.1 h1:jvTsT/HpCn2UZJdP+UUB53FfUUgeOyG5K1ns0OJOGVs=
github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc= </s> remove github.com/lucas-clemente/quic-go v0.29.0
</s> add github.com/lucas-clemente/quic-go v0.29.1 </s> remove golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91
golang.org/x/net v0.0.0-20220906165146-f3363e06e74c
golang.org/x/sys v0.0.0-20220906135438-9e1f76180b77
</s> add golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be
golang.org/x/exp v0.0.0-20220929160808-de9c53c655b9
golang.org/x/net v0.0.0-20220927171203-f486391704dc
golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec </s> add github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= | https://github.com/AdguardTeam/AdGuardHome/commit/0cce420261b1e207e558f884d6c73cbec9d55f60 | go.mod |
keep keep keep keep replace keep keep keep keep keep | <mask> github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
<mask> github.com/pkg/errors v0.9.1 // indirect
<mask> github.com/pmezard/go-difflib v1.0.0 // indirect
<mask> github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4 // indirect
<mask> golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9 // indirect
<mask> golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect
<mask> golang.org/x/text v0.3.7 // indirect
<mask> golang.org/x/tools v0.1.12 // indirect
<mask> gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
<mask> )
</s> Pull request: 3955-doh3
Updates #3955.
Squashed commit of the following:
commit acfd5ccc29ff03dfae1e51e52649acdf05042d9f
Merge: caeac6e5 61bd217e
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 18:00:37 2022 +0300
Merge branch 'master' into 3955-doh3
commit caeac6e5401bcaa95bba8d2b84a943b6c9a5898a
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:54:16 2022 +0300
all: fix server closing; imp docs
commit 87396141ff49d48ae54b4184559070e7885bccc7
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:33:39 2022 +0300
all: add doh3 support </s> add github.com/marten-seemann/qpack v0.2.1 // indirect </s> add github.com/bluele/gcache v0.0.2 // indirect </s> remove golang.org/x/net v0.0.0-20220906165146-f3363e06e74c h1:yKufUcDwucU5urd+50/Opbt4AYpqthk7wHpHok8f1lo=
golang.org/x/net v0.0.0-20220906165146-f3363e06e74c/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
</s> add golang.org/x/net v0.0.0-20220927171203-f486391704dc h1:FxpXZdoBqT8RjqTy6i1E8nXHhW21wK7ptQ/EPIGxzPQ=
golang.org/x/net v0.0.0-20220927171203-f486391704dc/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= </s> remove golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9 h1:VtCrPQXM5Wo9l7XN64SjBMczl48j8mkP+2e3OhYlz+0=
golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
</s> add golang.org/x/mod v0.6.0-dev.0.20220922195421-2adab6b8c60e h1:WhB000cGjOfbJiedMGvJkMTclI18VD69w27k+sceql8=
golang.org/x/mod v0.6.0-dev.0.20220922195421-2adab6b8c60e/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= </s> remove golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 h1:Y/gsMcFOcR+6S6f3YeMKl5g+dZMEWqcz5Czj/GWYbkM=
golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 h1:tnebWN09GYg9OLPss1KXj8txwZc6X6uMr6VFdcGNbHw=
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
</s> add golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be h1:fmw3UbQh+nxngCAHrDCCztao/kbYFnWjoqop8dHx05A=
golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/exp v0.0.0-20220929160808-de9c53c655b9 h1:lNtcVz/3bOstm7Vebox+5m3nLh/BYWnhmc3AhXOW6oI=
golang.org/x/exp v0.0.0-20220929160808-de9c53c655b9/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= </s> remove golang.org/x/sys v0.0.0-20220906135438-9e1f76180b77 h1:C1tElbkWrsSkn3IRl1GCW/gETw1TywWIPgwZtXTZbYg=
golang.org/x/sys v0.0.0-20220906135438-9e1f76180b77/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec h1:BkDtF2Ih9xZ7le9ndzTA7KJow28VbQW3odyk/8drmuI=
golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | https://github.com/AdguardTeam/AdGuardHome/commit/0cce420261b1e207e558f884d6c73cbec9d55f60 | go.mod |
replace replace keep keep keep keep keep | <mask> github.com/AdguardTeam/dnsproxy v0.44.0 h1:JzIxEXF4OyJq4wZVHeZkM1af4VfuwcgrUzjgdBGljsE=
<mask> github.com/AdguardTeam/dnsproxy v0.44.0/go.mod h1:HsxYYW/bC8uo+4eX9pRW21hFD6gWZdrvcfBb1R6/AzU=
<mask> github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.10.4/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw=
<mask> github.com/AdguardTeam/golibs v0.10.9 h1:F9oP2da0dQ9RQDM1lGR7LxUTfUWu8hEFOs4icwAkKM0=
<mask> github.com/AdguardTeam/golibs v0.10.9/go.mod h1:W+5rznZa1cSNSFt+gPS7f4Wytnr9fOrd5ZYqwadPw14=
<mask> github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU=
</s> Pull request: 3955-doh3
Updates #3955.
Squashed commit of the following:
commit acfd5ccc29ff03dfae1e51e52649acdf05042d9f
Merge: caeac6e5 61bd217e
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 18:00:37 2022 +0300
Merge branch 'master' into 3955-doh3
commit caeac6e5401bcaa95bba8d2b84a943b6c9a5898a
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:54:16 2022 +0300
all: fix server closing; imp docs
commit 87396141ff49d48ae54b4184559070e7885bccc7
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:33:39 2022 +0300
all: add doh3 support </s> remove github.com/AdguardTeam/dnsproxy v0.44.0
</s> add github.com/AdguardTeam/dnsproxy v0.45.2 </s> remove github.com/lucas-clemente/quic-go v0.29.0 h1:Vw0mGTfmWqGzh4jx/kMymsIkFK6rErFVmg+t9RLrnZE=
github.com/lucas-clemente/quic-go v0.29.0/go.mod h1:CTcNfLYJS2UuRNB+zcNlgvkjBhxX6Hm3WUxxAQx2mgE=
</s> add github.com/lucas-clemente/quic-go v0.29.1 h1:Z+WMJ++qMLhvpFkRZA+jl3BTxUjm415YBmWanXB8zP0=
github.com/lucas-clemente/quic-go v0.29.1/go.mod h1:CTcNfLYJS2UuRNB+zcNlgvkjBhxX6Hm3WUxxAQx2mgE=
github.com/marten-seemann/qpack v0.2.1 h1:jvTsT/HpCn2UZJdP+UUB53FfUUgeOyG5K1ns0OJOGVs=
github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc= </s> remove Bootstrap: config.DNS.BootstrapDNS,
Timeout: config.DNS.UpstreamTimeout.Duration,
</s> add Bootstrap: config.DNS.BootstrapDNS,
Timeout: config.DNS.UpstreamTimeout.Duration,
HTTPVersions: dnsforward.UpstreamHTTPVersions(config.DNS.UseHTTP3Upstreams), </s> remove assert.Equal(t, "application/json", w.Header().Get("Content-Type"))
</s> add cType := w.Header().Get(aghhttp.HdrNameContentType)
assert.Equal(t, aghhttp.HdrValApplicationJSON, cType) </s> add "github.com/AdguardTeam/AdGuardHome/internal/aghhttp" </s> remove jsonVal, err := json.Marshal(result)
if err != nil {
aghhttp.Error(
r,
w,
http.StatusInternalServerError,
"Unable to marshal status json: %s",
err,
)
return
}
w.Header().Set("Content-Type", "application/json")
_, err = w.Write(jsonVal)
if err != nil {
aghhttp.Error(r, w, http.StatusInternalServerError, "Couldn't write body: %s", err)
}
</s> add _ = aghhttp.WriteJSONResponse(w, r, result) | https://github.com/AdguardTeam/AdGuardHome/commit/0cce420261b1e207e558f884d6c73cbec9d55f60 | go.sum |
keep keep keep add keep keep keep keep | <mask> github.com/ameshkov/dnsstamps v1.0.3 h1:Srzik+J9mivH1alRACTbys2xOxs0lRH9qnTA7Y1OYVo=
<mask> github.com/ameshkov/dnsstamps v1.0.3/go.mod h1:Ii3eUu73dx4Vw5O4wjzmT5+lkCwovjzaEZZ4gKyIH5A=
<mask> github.com/beefsack/go-rate v0.0.0-20220214233405-116f4ca011a0 h1:0b2vaepXIfMsG++IsjHiI2p4bxALD1Y2nQKGMR5zDQM=
<mask> github.com/beefsack/go-rate v0.0.0-20220214233405-116f4ca011a0/go.mod h1:6YNgTHLutezwnBvyneBbwvB8C82y3dcoOj5EQJIdGXA=
<mask> github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
<mask> github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
<mask> github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
<mask> github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
</s> Pull request: 3955-doh3
Updates #3955.
Squashed commit of the following:
commit acfd5ccc29ff03dfae1e51e52649acdf05042d9f
Merge: caeac6e5 61bd217e
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 18:00:37 2022 +0300
Merge branch 'master' into 3955-doh3
commit caeac6e5401bcaa95bba8d2b84a943b6c9a5898a
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:54:16 2022 +0300
all: fix server closing; imp docs
commit 87396141ff49d48ae54b4184559070e7885bccc7
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:33:39 2022 +0300
all: add doh3 support </s> add github.com/bluele/gcache v0.0.2 // indirect </s> remove github.com/AdguardTeam/dnsproxy v0.44.0
</s> add github.com/AdguardTeam/dnsproxy v0.45.2 </s> remove github.com/lucas-clemente/quic-go v0.29.0 h1:Vw0mGTfmWqGzh4jx/kMymsIkFK6rErFVmg+t9RLrnZE=
github.com/lucas-clemente/quic-go v0.29.0/go.mod h1:CTcNfLYJS2UuRNB+zcNlgvkjBhxX6Hm3WUxxAQx2mgE=
</s> add github.com/lucas-clemente/quic-go v0.29.1 h1:Z+WMJ++qMLhvpFkRZA+jl3BTxUjm415YBmWanXB8zP0=
github.com/lucas-clemente/quic-go v0.29.1/go.mod h1:CTcNfLYJS2UuRNB+zcNlgvkjBhxX6Hm3WUxxAQx2mgE=
github.com/marten-seemann/qpack v0.2.1 h1:jvTsT/HpCn2UZJdP+UUB53FfUUgeOyG5K1ns0OJOGVs=
github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc= </s> remove Bootstrap: config.DNS.BootstrapDNS,
Timeout: config.DNS.UpstreamTimeout.Duration,
</s> add Bootstrap: config.DNS.BootstrapDNS,
Timeout: config.DNS.UpstreamTimeout.Duration,
HTTPVersions: dnsforward.UpstreamHTTPVersions(config.DNS.UseHTTP3Upstreams), </s> remove assert.Equal(t, "application/json", w.Header().Get("Content-Type"))
</s> add cType := w.Header().Get(aghhttp.HdrNameContentType)
assert.Equal(t, aghhttp.HdrValApplicationJSON, cType) </s> add "github.com/AdguardTeam/AdGuardHome/internal/aghhttp" | https://github.com/AdguardTeam/AdGuardHome/commit/0cce420261b1e207e558f884d6c73cbec9d55f60 | go.sum |
keep keep keep keep replace replace keep keep keep keep keep | <mask> github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
<mask> github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
<mask> github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
<mask> github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
<mask> github.com/lucas-clemente/quic-go v0.29.0 h1:Vw0mGTfmWqGzh4jx/kMymsIkFK6rErFVmg+t9RLrnZE=
<mask> github.com/lucas-clemente/quic-go v0.29.0/go.mod h1:CTcNfLYJS2UuRNB+zcNlgvkjBhxX6Hm3WUxxAQx2mgE=
<mask> github.com/marten-seemann/qtls-go1-18 v0.1.2 h1:JH6jmzbduz0ITVQ7ShevK10Av5+jBEKAHMntXmIV7kM=
<mask> github.com/marten-seemann/qtls-go1-18 v0.1.2/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
<mask> github.com/marten-seemann/qtls-go1-19 v0.1.0 h1:rLFKD/9mp/uq1SYGYuVZhm83wkmU95pK5df3GufyYYU=
<mask> github.com/marten-seemann/qtls-go1-19 v0.1.0/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI=
<mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7/go.mod h1:U6ZQobyTjI/tJyq2HG+i/dfSoFUt8/aZCM+GKtmFk/Y=
</s> Pull request: 3955-doh3
Updates #3955.
Squashed commit of the following:
commit acfd5ccc29ff03dfae1e51e52649acdf05042d9f
Merge: caeac6e5 61bd217e
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 18:00:37 2022 +0300
Merge branch 'master' into 3955-doh3
commit caeac6e5401bcaa95bba8d2b84a943b6c9a5898a
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:54:16 2022 +0300
all: fix server closing; imp docs
commit 87396141ff49d48ae54b4184559070e7885bccc7
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:33:39 2022 +0300
all: add doh3 support </s> add github.com/marten-seemann/qpack v0.2.1 // indirect </s> remove github.com/lucas-clemente/quic-go v0.29.0
</s> add github.com/lucas-clemente/quic-go v0.29.1 </s> remove github.com/AdguardTeam/dnsproxy v0.44.0 h1:JzIxEXF4OyJq4wZVHeZkM1af4VfuwcgrUzjgdBGljsE=
github.com/AdguardTeam/dnsproxy v0.44.0/go.mod h1:HsxYYW/bC8uo+4eX9pRW21hFD6gWZdrvcfBb1R6/AzU=
</s> add github.com/AdguardTeam/dnsproxy v0.45.2 h1:K9BXkQAfAKjrzbWbczpA2IA1owLe/edv0nG0e2+Esko=
github.com/AdguardTeam/dnsproxy v0.45.2/go.mod h1:h+0r4GDvHHY2Wu6r7oqva+O37h00KofYysfzy1TEXFE= </s> add github.com/bluele/gcache v0.0.2 h1:WcbfdXICg7G/DGBh1PFfcirkWOQV+v077yF1pSy3DGw=
github.com/bluele/gcache v0.0.2/go.mod h1:m15KV+ECjptwSPxKhOhQoAFQVtUFjTVkc3H8o0t/fp0= </s> remove log.Fatal(err)
</s> add log.Fatalf("web: https: %s", err) </s> remove &upstream.Options{Bootstrap: []string{}, Timeout: DefaultTimeout},
</s> add &upstream.Options{
Bootstrap: []string{},
Timeout: DefaultTimeout,
}, | https://github.com/AdguardTeam/AdGuardHome/commit/0cce420261b1e207e558f884d6c73cbec9d55f60 | go.sum |
keep keep add keep keep keep keep keep | <mask> github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
<mask> github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
<mask> github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
<mask> github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
<mask> github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
<mask> github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
<mask> github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
<mask> github.com/onsi/gomega v1.13.0 h1:7lLHu94wT9Ij0o6EWWclhu0aOh32VxhkwEJvzuWPeak=
</s> Pull request: 3955-doh3
Updates #3955.
Squashed commit of the following:
commit acfd5ccc29ff03dfae1e51e52649acdf05042d9f
Merge: caeac6e5 61bd217e
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 18:00:37 2022 +0300
Merge branch 'master' into 3955-doh3
commit caeac6e5401bcaa95bba8d2b84a943b6c9a5898a
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:54:16 2022 +0300
all: fix server closing; imp docs
commit 87396141ff49d48ae54b4184559070e7885bccc7
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:33:39 2022 +0300
all: add doh3 support </s> add github.com/marten-seemann/qpack v0.2.1 // indirect </s> remove log.Fatal(err)
</s> add log.Fatalf("web: https: %s", err) </s> add // UpstreamHTTPVersions returns the HTTP versions for upstream configuration
// depending on configuration.
func UpstreamHTTPVersions(http3 bool) (v []upstream.HTTPVersion) {
if !http3 {
return upstream.DefaultHTTPVersions
}
return []upstream.HTTPVersion{
upstream.HTTPVersion3,
upstream.HTTPVersion2,
upstream.HTTPVersion11,
}
}
</s> add httpVersions := UpstreamHTTPVersions(s.conf.UseHTTP3Upstreams) </s> remove Bootstrap: s.conf.BootstrapDNS,
Timeout: s.conf.UpstreamTimeout,
</s> add Bootstrap: s.conf.BootstrapDNS,
Timeout: s.conf.UpstreamTimeout,
HTTPVersions: httpVersions, </s> remove Bootstrap: s.conf.BootstrapDNS,
Timeout: s.conf.UpstreamTimeout,
</s> add Bootstrap: s.conf.BootstrapDNS,
Timeout: s.conf.UpstreamTimeout,
HTTPVersions: httpVersions, | https://github.com/AdguardTeam/AdGuardHome/commit/0cce420261b1e207e558f884d6c73cbec9d55f60 | go.sum |
keep keep keep keep replace replace replace replace keep keep keep keep replace replace keep keep keep | <mask> go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4=
<mask> golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
<mask> golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
<mask> golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 h1:Y/gsMcFOcR+6S6f3YeMKl5g+dZMEWqcz5Czj/GWYbkM=
<mask> golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
<mask> golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 h1:tnebWN09GYg9OLPss1KXj8txwZc6X6uMr6VFdcGNbHw=
<mask> golang.org/x/exp v0.0.0-20220827204233-334a2380cb91/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
<mask> golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
<mask> golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
<mask> golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
<mask> golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
<mask> golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9 h1:VtCrPQXM5Wo9l7XN64SjBMczl48j8mkP+2e3OhYlz+0=
<mask> golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
<mask> golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
<mask> golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
<mask> golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
</s> Pull request: 3955-doh3
Updates #3955.
Squashed commit of the following:
commit acfd5ccc29ff03dfae1e51e52649acdf05042d9f
Merge: caeac6e5 61bd217e
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 18:00:37 2022 +0300
Merge branch 'master' into 3955-doh3
commit caeac6e5401bcaa95bba8d2b84a943b6c9a5898a
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:54:16 2022 +0300
all: fix server closing; imp docs
commit 87396141ff49d48ae54b4184559070e7885bccc7
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:33:39 2022 +0300
all: add doh3 support </s> remove golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91
golang.org/x/net v0.0.0-20220906165146-f3363e06e74c
golang.org/x/sys v0.0.0-20220906135438-9e1f76180b77
</s> add golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be
golang.org/x/exp v0.0.0-20220929160808-de9c53c655b9
golang.org/x/net v0.0.0-20220927171203-f486391704dc
golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec </s> remove golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9 // indirect
</s> add golang.org/x/mod v0.6.0-dev.0.20220922195421-2adab6b8c60e // indirect </s> add golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= </s> remove golang.org/x/net v0.0.0-20220906165146-f3363e06e74c h1:yKufUcDwucU5urd+50/Opbt4AYpqthk7wHpHok8f1lo=
golang.org/x/net v0.0.0-20220906165146-f3363e06e74c/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
</s> add golang.org/x/net v0.0.0-20220927171203-f486391704dc h1:FxpXZdoBqT8RjqTy6i1E8nXHhW21wK7ptQ/EPIGxzPQ=
golang.org/x/net v0.0.0-20220927171203-f486391704dc/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= </s> remove golang.org/x/sys v0.0.0-20220906135438-9e1f76180b77 h1:C1tElbkWrsSkn3IRl1GCW/gETw1TywWIPgwZtXTZbYg=
golang.org/x/sys v0.0.0-20220906135438-9e1f76180b77/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec h1:BkDtF2Ih9xZ7le9ndzTA7KJow28VbQW3odyk/8drmuI=
golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | https://github.com/AdguardTeam/AdGuardHome/commit/0cce420261b1e207e558f884d6c73cbec9d55f60 | go.sum |
keep add keep keep keep keep keep keep | <mask> golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
<mask> golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
<mask> golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
<mask> golang.org/x/net v0.0.0-20201016165138-7b1cca2348c0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
<mask> golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
<mask> golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
<mask> golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
<mask> golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
</s> Pull request: 3955-doh3
Updates #3955.
Squashed commit of the following:
commit acfd5ccc29ff03dfae1e51e52649acdf05042d9f
Merge: caeac6e5 61bd217e
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 18:00:37 2022 +0300
Merge branch 'master' into 3955-doh3
commit caeac6e5401bcaa95bba8d2b84a943b6c9a5898a
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:54:16 2022 +0300
all: fix server closing; imp docs
commit 87396141ff49d48ae54b4184559070e7885bccc7
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:33:39 2022 +0300
all: add doh3 support </s> remove golang.org/x/net v0.0.0-20220906165146-f3363e06e74c h1:yKufUcDwucU5urd+50/Opbt4AYpqthk7wHpHok8f1lo=
golang.org/x/net v0.0.0-20220906165146-f3363e06e74c/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
</s> add golang.org/x/net v0.0.0-20220927171203-f486391704dc h1:FxpXZdoBqT8RjqTy6i1E8nXHhW21wK7ptQ/EPIGxzPQ=
golang.org/x/net v0.0.0-20220927171203-f486391704dc/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= </s> remove golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9 h1:VtCrPQXM5Wo9l7XN64SjBMczl48j8mkP+2e3OhYlz+0=
golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
</s> add golang.org/x/mod v0.6.0-dev.0.20220922195421-2adab6b8c60e h1:WhB000cGjOfbJiedMGvJkMTclI18VD69w27k+sceql8=
golang.org/x/mod v0.6.0-dev.0.20220922195421-2adab6b8c60e/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= </s> remove golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91
golang.org/x/net v0.0.0-20220906165146-f3363e06e74c
golang.org/x/sys v0.0.0-20220906135438-9e1f76180b77
</s> add golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be
golang.org/x/exp v0.0.0-20220929160808-de9c53c655b9
golang.org/x/net v0.0.0-20220927171203-f486391704dc
golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec </s> remove log.Fatal(err)
</s> add log.Fatalf("web: https: %s", err) </s> remove w.Header().Set("Content-Type", "application/json")
if err = json.NewEncoder(w).Encode(resp); err != nil {
aghhttp.Error(r, w, http.StatusInternalServerError, "json.Encoder: %s", err)
return
}
</s> add _ = aghhttp.WriteJSONResponse(w, r, resp) </s> add httpVersions := UpstreamHTTPVersions(s.conf.UseHTTP3Upstreams) | https://github.com/AdguardTeam/AdGuardHome/commit/0cce420261b1e207e558f884d6c73cbec9d55f60 | go.sum |
keep keep keep keep replace replace keep keep keep keep keep | <mask> golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
<mask> golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
<mask> golang.org/x/net v0.0.0-20210929193557-e81a3d93ecf6/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
<mask> golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
<mask> golang.org/x/net v0.0.0-20220906165146-f3363e06e74c h1:yKufUcDwucU5urd+50/Opbt4AYpqthk7wHpHok8f1lo=
<mask> golang.org/x/net v0.0.0-20220906165146-f3363e06e74c/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
<mask> golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
<mask> golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde h1:ejfdSekXMDxDLbRrJMwUk6KnSLZ2McaUCVcIKM+N6jc=
</s> Pull request: 3955-doh3
Updates #3955.
Squashed commit of the following:
commit acfd5ccc29ff03dfae1e51e52649acdf05042d9f
Merge: caeac6e5 61bd217e
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 18:00:37 2022 +0300
Merge branch 'master' into 3955-doh3
commit caeac6e5401bcaa95bba8d2b84a943b6c9a5898a
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:54:16 2022 +0300
all: fix server closing; imp docs
commit 87396141ff49d48ae54b4184559070e7885bccc7
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:33:39 2022 +0300
all: add doh3 support </s> add golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= </s> remove golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9 h1:VtCrPQXM5Wo9l7XN64SjBMczl48j8mkP+2e3OhYlz+0=
golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
</s> add golang.org/x/mod v0.6.0-dev.0.20220922195421-2adab6b8c60e h1:WhB000cGjOfbJiedMGvJkMTclI18VD69w27k+sceql8=
golang.org/x/mod v0.6.0-dev.0.20220922195421-2adab6b8c60e/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= </s> remove golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91
golang.org/x/net v0.0.0-20220906165146-f3363e06e74c
golang.org/x/sys v0.0.0-20220906135438-9e1f76180b77
</s> add golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be
golang.org/x/exp v0.0.0-20220929160808-de9c53c655b9
golang.org/x/net v0.0.0-20220927171203-f486391704dc
golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec </s> remove golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9 // indirect
</s> add golang.org/x/mod v0.6.0-dev.0.20220922195421-2adab6b8c60e // indirect </s> remove log.Fatal(err)
</s> add log.Fatalf("web: https: %s", err) </s> remove w.Header().Set("Content-Type", "application/json")
if err = json.NewEncoder(w).Encode(resp); err != nil {
aghhttp.Error(r, w, http.StatusInternalServerError, "json.Encoder: %s", err)
return
}
</s> add _ = aghhttp.WriteJSONResponse(w, r, resp) | https://github.com/AdguardTeam/AdGuardHome/commit/0cce420261b1e207e558f884d6c73cbec9d55f60 | go.sum |
keep add keep keep keep keep keep | <mask> golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20201017003518-b09fb700fbb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> Pull request: 3955-doh3
Updates #3955.
Squashed commit of the following:
commit acfd5ccc29ff03dfae1e51e52649acdf05042d9f
Merge: caeac6e5 61bd217e
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 18:00:37 2022 +0300
Merge branch 'master' into 3955-doh3
commit caeac6e5401bcaa95bba8d2b84a943b6c9a5898a
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:54:16 2022 +0300
all: fix server closing; imp docs
commit 87396141ff49d48ae54b4184559070e7885bccc7
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:33:39 2022 +0300
all: add doh3 support </s> remove golang.org/x/sys v0.0.0-20220906135438-9e1f76180b77 h1:C1tElbkWrsSkn3IRl1GCW/gETw1TywWIPgwZtXTZbYg=
golang.org/x/sys v0.0.0-20220906135438-9e1f76180b77/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec h1:BkDtF2Ih9xZ7le9ndzTA7KJow28VbQW3odyk/8drmuI=
golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91
golang.org/x/net v0.0.0-20220906165146-f3363e06e74c
golang.org/x/sys v0.0.0-20220906135438-9e1f76180b77
</s> add golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be
golang.org/x/exp v0.0.0-20220929160808-de9c53c655b9
golang.org/x/net v0.0.0-20220927171203-f486391704dc
golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec </s> remove log.Fatal(err)
</s> add log.Fatalf("web: https: %s", err) </s> remove w.Header().Set("Content-Type", "application/json")
if err = json.NewEncoder(w).Encode(resp); err != nil {
aghhttp.Error(r, w, http.StatusInternalServerError, "json.Encoder: %s", err)
return
}
</s> add _ = aghhttp.WriteJSONResponse(w, r, resp) </s> add // UpstreamHTTPVersions returns the HTTP versions for upstream configuration
// depending on configuration.
func UpstreamHTTPVersions(http3 bool) (v []upstream.HTTPVersion) {
if !http3 {
return upstream.DefaultHTTPVersions
}
return []upstream.HTTPVersion{
upstream.HTTPVersion3,
upstream.HTTPVersion2,
upstream.HTTPVersion11,
}
}
</s> add httpVersions := UpstreamHTTPVersions(s.conf.UseHTTP3Upstreams) | https://github.com/AdguardTeam/AdGuardHome/commit/0cce420261b1e207e558f884d6c73cbec9d55f60 | go.sum |
keep keep keep keep replace replace keep keep keep keep keep | <mask> golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20220906135438-9e1f76180b77 h1:C1tElbkWrsSkn3IRl1GCW/gETw1TywWIPgwZtXTZbYg=
<mask> golang.org/x/sys v0.0.0-20220906135438-9e1f76180b77/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
<mask> golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
<mask> golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
<mask> golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
</s> Pull request: 3955-doh3
Updates #3955.
Squashed commit of the following:
commit acfd5ccc29ff03dfae1e51e52649acdf05042d9f
Merge: caeac6e5 61bd217e
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 18:00:37 2022 +0300
Merge branch 'master' into 3955-doh3
commit caeac6e5401bcaa95bba8d2b84a943b6c9a5898a
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:54:16 2022 +0300
all: fix server closing; imp docs
commit 87396141ff49d48ae54b4184559070e7885bccc7
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:33:39 2022 +0300
all: add doh3 support </s> add golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= </s> remove golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91
golang.org/x/net v0.0.0-20220906165146-f3363e06e74c
golang.org/x/sys v0.0.0-20220906135438-9e1f76180b77
</s> add golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be
golang.org/x/exp v0.0.0-20220929160808-de9c53c655b9
golang.org/x/net v0.0.0-20220927171203-f486391704dc
golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec </s> remove golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9 // indirect
</s> add golang.org/x/mod v0.6.0-dev.0.20220922195421-2adab6b8c60e // indirect </s> remove golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9 h1:VtCrPQXM5Wo9l7XN64SjBMczl48j8mkP+2e3OhYlz+0=
golang.org/x/mod v0.6.0-dev.0.20220818022119-ed83ed61efb9/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
</s> add golang.org/x/mod v0.6.0-dev.0.20220922195421-2adab6b8c60e h1:WhB000cGjOfbJiedMGvJkMTclI18VD69w27k+sceql8=
golang.org/x/mod v0.6.0-dev.0.20220922195421-2adab6b8c60e/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= </s> remove golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 h1:Y/gsMcFOcR+6S6f3YeMKl5g+dZMEWqcz5Czj/GWYbkM=
golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 h1:tnebWN09GYg9OLPss1KXj8txwZc6X6uMr6VFdcGNbHw=
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
</s> add golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be h1:fmw3UbQh+nxngCAHrDCCztao/kbYFnWjoqop8dHx05A=
golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/exp v0.0.0-20220929160808-de9c53c655b9 h1:lNtcVz/3bOstm7Vebox+5m3nLh/BYWnhmc3AhXOW6oI=
golang.org/x/exp v0.0.0-20220929160808-de9c53c655b9/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= </s> remove log.Fatal(err)
</s> add log.Fatalf("web: https: %s", err) | https://github.com/AdguardTeam/AdGuardHome/commit/0cce420261b1e207e558f884d6c73cbec9d55f60 | go.sum |
keep keep keep keep replace replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> }
<mask> }
<mask>
<mask> func (s *Server) handleAccessList(w http.ResponseWriter, r *http.Request) {
<mask> j := s.accessListJSON()
<mask>
<mask> w.Header().Set("Content-Type", "application/json")
<mask> err := json.NewEncoder(w).Encode(j)
<mask> if err != nil {
<mask> aghhttp.Error(r, w, http.StatusInternalServerError, "encoding response: %s", err)
<mask>
<mask> return
<mask> }
<mask> }
<mask>
<mask> // validateAccessSet checks the internal accessListJSON lists. To search for
<mask> // duplicates, we cannot compare the new stringutil.Set and []string, because
<mask> // creating a set for a large array can be an unnecessary algorithmic complexity
</s> Pull request: 3955-doh3
Updates #3955.
Squashed commit of the following:
commit acfd5ccc29ff03dfae1e51e52649acdf05042d9f
Merge: caeac6e5 61bd217e
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 18:00:37 2022 +0300
Merge branch 'master' into 3955-doh3
commit caeac6e5401bcaa95bba8d2b84a943b6c9a5898a
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:54:16 2022 +0300
all: fix server closing; imp docs
commit 87396141ff49d48ae54b4184559070e7885bccc7
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:33:39 2022 +0300
all: add doh3 support </s> remove
pj.Name = u.Name
data, err := json.Marshal(pj)
if err != nil {
aghhttp.Error(r, w, http.StatusInternalServerError, "json.Marshal: %s", err)
return
</s> add resp := &profileJSON{
Name: u.Name, </s> remove jsonVal, err := json.Marshal(result)
if err != nil {
aghhttp.Error(
r,
w,
http.StatusInternalServerError,
"Unable to marshal status json: %s",
err,
)
return
}
w.Header().Set("Content-Type", "application/json")
_, err = w.Write(jsonVal)
if err != nil {
aghhttp.Error(r, w, http.StatusInternalServerError, "Couldn't write body: %s", err)
}
</s> add _ = aghhttp.WriteJSONResponse(w, r, result) </s> remove w.Header().Set("Content-Type", "application/json")
if err = json.NewEncoder(w).Encode(resp); err != nil {
aghhttp.Error(r, w, http.StatusInternalServerError, "json.Encoder: %s", err)
return
}
</s> add _ = aghhttp.WriteJSONResponse(w, r, resp) </s> remove aghhttp.Error(
r,
w,
http.StatusBadRequest,
"Failed to encode 'check_config' JSON data: %s",
err,
)
</s> add aghhttp.Error(r, w, http.StatusBadRequest, "encoding check_config: %s", err) </s> remove aghhttp.Error(
r,
w,
http.StatusBadRequest,
"Failed to encode 'check_config' JSON data: %s",
err,
)
</s> add aghhttp.Error(r, w, http.StatusBadRequest, "encoding configure: %s", err) </s> remove pj := profileJSON{}
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0cce420261b1e207e558f884d6c73cbec9d55f60 | internal/dnsforward/access.go |
keep keep add keep keep keep keep keep | <mask> // Register an HTTP handler
<mask> HTTPRegister aghhttp.RegisterFunc
<mask>
<mask> // ResolveClients signals if the RDNS should resolve clients' addresses.
<mask> ResolveClients bool
<mask>
<mask> // UsePrivateRDNS defines if the PTR requests for unknown addresses from
<mask> // locally-served networks should be resolved via private PTR resolvers.
</s> Pull request: 3955-doh3
Updates #3955.
Squashed commit of the following:
commit acfd5ccc29ff03dfae1e51e52649acdf05042d9f
Merge: caeac6e5 61bd217e
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 18:00:37 2022 +0300
Merge branch 'master' into 3955-doh3
commit caeac6e5401bcaa95bba8d2b84a943b6c9a5898a
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:54:16 2022 +0300
all: fix server closing; imp docs
commit 87396141ff49d48ae54b4184559070e7885bccc7
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:33:39 2022 +0300
all: add doh3 support </s> remove // LocalPTRResolvers is a slice of addresses to be used as upstreams for
// resolving PTR queries for local addresses.
LocalPTRResolvers []string
</s> add // ServeHTTP3 defines if HTTP/3 is be allowed for incoming requests.
ServeHTTP3 bool
// UseHTTP3Upstreams defines if HTTP/3 is be allowed for DNS-over-HTTPS
// upstreams.
UseHTTP3Upstreams bool </s> add // ServeHTTP3 defines if HTTP/3 is be allowed for incoming requests.
//
// TODO(a.garipov): Add to the UI when HTTP/3 support is no longer
// experimental.
ServeHTTP3 bool `yaml:"serve_http3"`
// UseHTTP3Upstreams defines if HTTP/3 is be allowed for DNS-over-HTTPS
// upstreams.
//
// TODO(a.garipov): Add to the UI when HTTP/3 support is no longer
// experimental.
UseHTTP3Upstreams bool `yaml:"use_http3_upstreams"` </s> remove conf *webConfig
forceHTTPS bool
httpServer *http.Server // HTTP module
httpsServer HTTPSServer // HTTPS module
</s> add conf *webConfig
// TODO(a.garipov): Refactor all these servers.
httpServer *http.Server
// httpServerBeta is a server for new client.
httpServerBeta *http.Server </s> remove // httpServerBeta is a server for new client.
httpServerBeta *http.Server
</s> add // httpsServer is the server that handles HTTPS traffic. If it is not nil,
// [Web.http3Server] must also not be nil.
httpsServer httpsServer
forceHTTPS bool </s> remove // section from pctx and returns a non-nil res if at least one of canonnical
</s> add // section from pctx and returns a non-nil res if at least one of canonical </s> remove // HTTPSServer - HTTPS Server
type HTTPSServer struct {
server *http.Server
cond *sync.Cond
condLock sync.Mutex
shutdown bool // if TRUE, don't restart the server
enabled bool
cert tls.Certificate
</s> add // httpsServer contains the data for the HTTPS server.
type httpsServer struct {
// server is the pre-HTTP/3 HTTPS server.
server *http.Server
// server3 is the HTTP/3 HTTPS server. If it is not nil,
// [httpsServer.server] must also be non-nil.
server3 *http3.Server
// TODO(a.garipov): Why is there a *sync.Cond here? Remove.
cond *sync.Cond
condLock sync.Mutex
cert tls.Certificate
inShutdown bool
enabled bool | https://github.com/AdguardTeam/AdGuardHome/commit/0cce420261b1e207e558f884d6c73cbec9d55f60 | internal/dnsforward/config.go |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> // UsePrivateRDNS defines if the PTR requests for unknown addresses from
<mask> // locally-served networks should be resolved via private PTR resolvers.
<mask> UsePrivateRDNS bool
<mask>
<mask> // LocalPTRResolvers is a slice of addresses to be used as upstreams for
<mask> // resolving PTR queries for local addresses.
<mask> LocalPTRResolvers []string
<mask> }
<mask>
<mask> // if any of ServerConfig values are zero, then default values from below are used
<mask> var defaultValues = ServerConfig{
<mask> UDPListenAddrs: []*net.UDPAddr{{Port: 53}},
</s> Pull request: 3955-doh3
Updates #3955.
Squashed commit of the following:
commit acfd5ccc29ff03dfae1e51e52649acdf05042d9f
Merge: caeac6e5 61bd217e
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 18:00:37 2022 +0300
Merge branch 'master' into 3955-doh3
commit caeac6e5401bcaa95bba8d2b84a943b6c9a5898a
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:54:16 2022 +0300
all: fix server closing; imp docs
commit 87396141ff49d48ae54b4184559070e7885bccc7
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:33:39 2022 +0300
all: add doh3 support </s> add // LocalPTRResolvers is a slice of addresses to be used as upstreams for
// resolving PTR queries for local addresses.
LocalPTRResolvers []string
</s> add // ServeHTTP3 defines if HTTP/3 is be allowed for incoming requests.
//
// TODO(a.garipov): Add to the UI when HTTP/3 support is no longer
// experimental.
ServeHTTP3 bool `yaml:"serve_http3"`
// UseHTTP3Upstreams defines if HTTP/3 is be allowed for DNS-over-HTTPS
// upstreams.
//
// TODO(a.garipov): Add to the UI when HTTP/3 support is no longer
// experimental.
UseHTTP3Upstreams bool `yaml:"use_http3_upstreams"` </s> remove // section from pctx and returns a non-nil res if at least one of canonnical
</s> add // section from pctx and returns a non-nil res if at least one of canonical </s> remove for !web.httpsServer.shutdown {
</s> add for !web.httpsServer.inShutdown { </s> remove // httpServerBeta is a server for new client.
httpServerBeta *http.Server
</s> add // httpsServer is the server that handles HTTPS traffic. If it is not nil,
// [Web.http3Server] must also not be nil.
httpsServer httpsServer
forceHTTPS bool </s> remove // HTTPSServer - HTTPS Server
type HTTPSServer struct {
server *http.Server
cond *sync.Cond
condLock sync.Mutex
shutdown bool // if TRUE, don't restart the server
enabled bool
cert tls.Certificate
</s> add // httpsServer contains the data for the HTTPS server.
type httpsServer struct {
// server is the pre-HTTP/3 HTTPS server.
server *http.Server
// server3 is the HTTP/3 HTTPS server. If it is not nil,
// [httpsServer.server] must also be non-nil.
server3 *http3.Server
// TODO(a.garipov): Why is there a *sync.Cond here? Remove.
cond *sync.Cond
condLock sync.Mutex
cert tls.Certificate
inShutdown bool
enabled bool | https://github.com/AdguardTeam/AdGuardHome/commit/0cce420261b1e207e558f884d6c73cbec9d55f60 | internal/dnsforward/config.go |
keep keep keep add keep keep keep keep keep | <mask> srvConf := s.conf
<mask> conf = proxy.Config{
<mask> UDPListenAddr: srvConf.UDPListenAddrs,
<mask> TCPListenAddr: srvConf.TCPListenAddrs,
<mask> Ratelimit: int(srvConf.Ratelimit),
<mask> RatelimitWhitelist: srvConf.RatelimitWhitelist,
<mask> RefuseAny: srvConf.RefuseAny,
<mask> TrustedProxies: srvConf.TrustedProxies,
<mask> CacheMinTTL: srvConf.CacheMinTTL,
</s> Pull request: 3955-doh3
Updates #3955.
Squashed commit of the following:
commit acfd5ccc29ff03dfae1e51e52649acdf05042d9f
Merge: caeac6e5 61bd217e
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 18:00:37 2022 +0300
Merge branch 'master' into 3955-doh3
commit caeac6e5401bcaa95bba8d2b84a943b6c9a5898a
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:54:16 2022 +0300
all: fix server closing; imp docs
commit 87396141ff49d48ae54b4184559070e7885bccc7
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:33:39 2022 +0300
all: add doh3 support </s> remove assert.Equal(t, "application/json", w.Header().Get("Content-Type"))
</s> add cType := w.Header().Get(aghhttp.HdrNameContentType)
assert.Equal(t, aghhttp.HdrValApplicationJSON, cType) </s> remove w := Web{}
w.conf = conf
</s> add w = &Web{
conf: conf,
} </s> remove // CreateWeb - create module
func CreateWeb(conf *webConfig) *Web {
log.Info("Initialize web module")
</s> add // newWeb creates a new instance of the web UI and API server.
func newWeb(conf *webConfig) (w *Web) {
log.Info("web: initializing") </s> remove conf *webConfig
forceHTTPS bool
httpServer *http.Server // HTTP module
httpsServer HTTPSServer // HTTPS module
</s> add conf *webConfig
// TODO(a.garipov): Refactor all these servers.
httpServer *http.Server
// httpServerBeta is a server for new client.
httpServerBeta *http.Server </s> remove Bootstrap: config.DNS.BootstrapDNS,
Timeout: config.DNS.UpstreamTimeout.Duration,
</s> add Bootstrap: config.DNS.BootstrapDNS,
Timeout: config.DNS.UpstreamTimeout.Duration,
HTTPVersions: dnsforward.UpstreamHTTPVersions(config.DNS.UseHTTP3Upstreams), </s> remove // Web - module object
</s> add // Web is the web UI and API server. | https://github.com/AdguardTeam/AdGuardHome/commit/0cce420261b1e207e558f884d6c73cbec9d55f60 | internal/dnsforward/config.go |
keep keep keep add keep keep keep keep keep keep | <mask> s.conf.UpstreamTimeout = DefaultTimeout
<mask> }
<mask> }
<mask>
<mask> // prepareUpstreamSettings - prepares upstream DNS server settings
<mask> func (s *Server) prepareUpstreamSettings() error {
<mask> // We're setting a customized set of RootCAs
<mask> // The reason is that Go default mechanism of loading TLS roots
<mask> // does not always work properly on some routers so we're
<mask> // loading roots manually and pass it here.
</s> Pull request: 3955-doh3
Updates #3955.
Squashed commit of the following:
commit acfd5ccc29ff03dfae1e51e52649acdf05042d9f
Merge: caeac6e5 61bd217e
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 18:00:37 2022 +0300
Merge branch 'master' into 3955-doh3
commit caeac6e5401bcaa95bba8d2b84a943b6c9a5898a
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:54:16 2022 +0300
all: fix server closing; imp docs
commit 87396141ff49d48ae54b4184559070e7885bccc7
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:33:39 2022 +0300
all: add doh3 support </s> remove var protocols = []string{"udp://", "tcp://", "tls://", "https://", "sdns://", "quic://"}
</s> add var protocols = []string{
"h3://",
"https://",
"quic://",
"sdns://",
"tcp://",
"tls://",
"udp://",
} </s> remove // section from pctx and returns a non-nil res if at least one of canonnical
</s> add // section from pctx and returns a non-nil res if at least one of canonical </s> remove // httpServerBeta is a server for new client.
httpServerBeta *http.Server
</s> add // httpsServer is the server that handles HTTPS traffic. If it is not nil,
// [Web.http3Server] must also not be nil.
httpsServer httpsServer
forceHTTPS bool </s> remove // CreateWeb - create module
func CreateWeb(conf *webConfig) *Web {
log.Info("Initialize web module")
</s> add // newWeb creates a new instance of the web UI and API server.
func newWeb(conf *webConfig) (w *Web) {
log.Info("web: initializing") </s> remove j := s.accessListJSON()
w.Header().Set("Content-Type", "application/json")
err := json.NewEncoder(w).Encode(j)
if err != nil {
aghhttp.Error(r, w, http.StatusInternalServerError, "encoding response: %s", err)
return
}
</s> add _ = aghhttp.WriteJSONResponse(w, r, s.accessListJSON()) </s> remove if err != nil {
const msgFmt = "shutting down http server %q: %s"
if errors.Is(err, context.Canceled) {
log.Debug(msgFmt, srv.Addr, err)
} else {
log.Error(msgFmt, srv.Addr, err)
}
</s> add if err == nil {
return
}
const msgFmt = "shutting down http server %q: %s"
if errors.Is(err, context.Canceled) {
log.Debug(msgFmt, srv.Addr, err)
} else {
log.Error(msgFmt, srv.Addr, err)
}
}
// shutdownSrv3 shuts srv down and prints error messages to the log.
//
// TODO(a.garipov): Think of a good way to merge with [shutdownSrv].
func shutdownSrv3(srv *http3.Server) {
defer log.OnPanic("")
if srv == nil {
return
}
err := srv.Close()
if err == nil {
return
}
const msgFmt = "shutting down http/3 server %q: %s"
if errors.Is(err, context.Canceled) {
log.Debug(msgFmt, srv.Addr, err)
} else {
log.Error(msgFmt, srv.Addr, err) | https://github.com/AdguardTeam/AdGuardHome/commit/0cce420261b1e207e558f884d6c73cbec9d55f60 | internal/dnsforward/config.go |
keep keep keep add keep keep keep keep keep keep | <mask> } else {
<mask> upstreams = s.conf.UpstreamDNS
<mask> }
<mask>
<mask> upstreams = stringutil.FilterOut(upstreams, IsCommentOrEmpty)
<mask> upstreamConfig, err := proxy.ParseUpstreamsConfig(
<mask> upstreams,
<mask> &upstream.Options{
<mask> Bootstrap: s.conf.BootstrapDNS,
<mask> Timeout: s.conf.UpstreamTimeout,
</s> Pull request: 3955-doh3
Updates #3955.
Squashed commit of the following:
commit acfd5ccc29ff03dfae1e51e52649acdf05042d9f
Merge: caeac6e5 61bd217e
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 18:00:37 2022 +0300
Merge branch 'master' into 3955-doh3
commit caeac6e5401bcaa95bba8d2b84a943b6c9a5898a
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:54:16 2022 +0300
all: fix server closing; imp docs
commit 87396141ff49d48ae54b4184559070e7885bccc7
Author: Ainar Garipov <[email protected]>
Date: Mon Oct 3 17:33:39 2022 +0300
all: add doh3 support </s> remove Bootstrap: s.conf.BootstrapDNS,
Timeout: s.conf.UpstreamTimeout,
</s> add Bootstrap: s.conf.BootstrapDNS,
Timeout: s.conf.UpstreamTimeout,
HTTPVersions: httpVersions, </s> remove &upstream.Options{Bootstrap: []string{}, Timeout: DefaultTimeout},
</s> add &upstream.Options{
Bootstrap: []string{},
Timeout: DefaultTimeout,
}, </s> remove Bootstrap: s.conf.BootstrapDNS,
Timeout: s.conf.UpstreamTimeout,
</s> add Bootstrap: s.conf.BootstrapDNS,
Timeout: s.conf.UpstreamTimeout,
HTTPVersions: httpVersions, </s> remove Bootstrap: config.DNS.BootstrapDNS,
Timeout: config.DNS.UpstreamTimeout.Duration,
</s> add Bootstrap: config.DNS.BootstrapDNS,
Timeout: config.DNS.UpstreamTimeout.Duration,
HTTPVersions: dnsforward.UpstreamHTTPVersions(config.DNS.UseHTTP3Upstreams), </s> remove if err != nil {
const msgFmt = "shutting down http server %q: %s"
if errors.Is(err, context.Canceled) {
log.Debug(msgFmt, srv.Addr, err)
} else {
log.Error(msgFmt, srv.Addr, err)
}
</s> add if err == nil {
return
}
const msgFmt = "shutting down http server %q: %s"
if errors.Is(err, context.Canceled) {
log.Debug(msgFmt, srv.Addr, err)
} else {
log.Error(msgFmt, srv.Addr, err)
}
}
// shutdownSrv3 shuts srv down and prints error messages to the log.
//
// TODO(a.garipov): Think of a good way to merge with [shutdownSrv].
func shutdownSrv3(srv *http3.Server) {
defer log.OnPanic("")
if srv == nil {
return
}
err := srv.Close()
if err == nil {
return
}
const msgFmt = "shutting down http/3 server %q: %s"
if errors.Is(err, context.Canceled) {
log.Debug(msgFmt, srv.Addr, err)
} else {
log.Error(msgFmt, srv.Addr, err) </s> remove if err != http.ErrServerClosed {
</s> add if !errors.Is(err, http.ErrServerClosed) { | https://github.com/AdguardTeam/AdGuardHome/commit/0cce420261b1e207e558f884d6c73cbec9d55f60 | internal/dnsforward/config.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.