public/AdGuardHome
1
0
Fork 0
mirror of https://git.vectorsigma.ru/public/AdGuardHome.git synced 2026-08-03 21:59:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pull request 2452: ADG-10295 add encryption settings page

Browse Source 
Squashed commit of the following:

commit e841e3a0b4
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Aug 26 15:49:58 2025 +0300

    fix todo

commit cf251e209b
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Aug 26 15:48:31 2025 +0300

    fix lint issue

commit c47e8216ec
Merge: f754d7cd9 0e3692f9a
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Aug 26 15:38:36 2025 +0300

    Merge branch 'ADG-10291' into ADG-10295

commit f754d7cd97
Merge: d56ea7d8a febcc6814
Author: Ildar Kamalov <ik@adguard.com>
Date:   Fri Aug 22 18:26:15 2025 +0300

    Merge branch 'ADG-10291' into ADG-10295

commit d56ea7d8a6
Author: Ildar Kamalov <ik@adguard.com>
Date:   Thu Aug 21 16:34:47 2025 +0300

    fix form validation

commit a5fee78963
Author: Ildar Kamalov <ik@adguard.com>
Date:   Wed Aug 20 17:59:53 2025 +0300

    fix form

commit a2da460426
Merge: cff3f4588 ebfa5230a
Author: Ildar Kamalov <ik@adguard.com>
Date:   Fri Aug 15 17:30:28 2025 +0300

    Merge branch 'ADG-10291' into ADG-10295

commit cff3f45883
Author: Ildar Kamalov <ik@adguard.com>
Date:   Wed Aug 13 19:28:46 2025 +0300

    ADG-10295 add encryption settings page

commit 3f6d759b7f
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Aug 12 16:40:31 2025 +0300

    fix placeholder

commit 507631ab71
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Aug 12 16:15:57 2025 +0300

    use batch

commit e495a5585c
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Aug 12 16:13:13 2025 +0300

    review fix

commit 2ba671b408
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Aug 12 10:45:00 2025 +0300

    fix

commit 6f696238a0
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Aug 11 18:38:28 2025 +0300

    fix language change

commit 8206f3f885
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Aug 11 14:54:58 2025 +0300

    fix custom radio

commit 0920a51c4a
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Aug 11 14:30:26 2025 +0300

    fix

commit c7ca1e8eaf
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Aug 11 14:25:16 2025 +0300

    fix ids

commit 7ecd6426d9
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Aug 11 13:56:29 2025 +0300

    fix constant import

commit 246f1277b8
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Aug 11 13:46:11 2025 +0300

    fix version

commit 0224f567e6
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Aug 11 13:34:29 2025 +0300

    fix version

commit 75c9caffbd
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Aug 11 13:14:01 2025 +0300

    lint fix

commit d0cf6ad5ab
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Aug 11 12:40:49 2025 +0300

    lint fix

commit 87eb68e519
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Aug 11 12:06:35 2025 +0300

    use npm

commit 7df7d60ec9
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Aug 11 11:23:00 2025 +0300

    rm unused

commit c285ea978a
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Aug 11 10:42:39 2025 +0300

    fix

commit d00f1e12b3
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Aug 11 09:43:35 2025 +0300

    fix

... and 2 more commits
This commit is contained in:
Ildar Kamalov
2025-08-26 16:01:14 +03:00
parent 0e3692f9a0
commit be27c06481
36 changed files with 1246 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/companiesdb/download.sh
View File

@@ -6,7 +6,7 @@ set -e -f -u -x
# for this database is https://github.com/AdguardTeam/companiesdb.
#
trackers_url='https://raw.githubusercontent.com/AdguardTeam/companiesdb/main/dist/trackers.json'
# TODO: Update output path to './client_v2/src/helpers/trackers/trackers.json' for new frontend migration
# TODO(ik): Update output path to './client_v2/src/helpers/trackers/trackers.json' for new frontend migration
output='./client/src/helpers/trackers/trackers.json'
readonly trackers_url output

10
scripts/translations/main.go
View File

@@ -25,13 +25,12 @@ import (
"github.com/AdguardTeam/golibs/osutil"
)
// TODO(ik): Update localesDir and srcDir to "./client_v2/src/" for new frontend migration
const (
twoskyConfFile = "./.twosky.json"
// TODO: Update localesDir to "./client_v2/src/__locales" for new frontend migration
localesDir = "./client/src/__locales"
defaultBaseFile = "en.json"
defaultProjectID = "home"
// TODO: Update srcDir to "./client_v2/src" for new frontend migration
srcDir = "./client/src"
twoskyURI = "https://twosky.int.agrd.dev/api/v1"
@@ -79,8 +78,7 @@ func main() {
usage("")
}
// TODO: Support multiple projects in .twosky.json - add PROJECT_ID env var to select between 'home' and 'home_v2'
// TODO: Modify readTwoskyConfig() to return all configs and add selectProject() function
// TODO(ik): Support multiple projects in .twosky.json - add PROJECT_ID env var to select between 'home' and 'home_v2'
conf := errors.Must(readTwoskyConfig())
var cli *twoskyClient
@@ -110,7 +108,7 @@ func main() {
// usage prints usage. If addStr is not empty print addStr and exit with code
// 1, otherwise exit with code 0.
func usage(addStr string) {
// TODO: Add PROJECT_ID environment variable documentation when multi-project support is implemented
// TODO(ik): Add PROJECT_ID environment variable documentation when multi-project support is implemented
const usageStr = `Usage: go run main.go <command> [<args>]
Commands:
help
@@ -166,7 +164,7 @@ func readTwoskyConfig() (t *twoskyConfig, err error) {
return nil, fmt.Errorf("%q is empty", twoskyConfFile)
}
// TODO: Currently only uses first project - modify to support project selection
// TODO(ik): Currently only uses first project - modify to support project selection
conf := tsc[0]
for _, lang := range conf.Languages {

2
scripts/vetted-filters/main.go
View File

@@ -95,7 +95,7 @@ func main() {
errors.Check(enc.Encode(aghFlt))
// TODO: Update output path to "client_v2/src/helpers/filters/filters.ts" for new frontend migration
// TODO(ik): Update output path to "client_v2/src/helpers/filters/filters.ts" for new frontend migration
err = maybe.WriteFile("client/src/helpers/filters/filters.ts", buf.Bytes(), 0o644)
errors.Check(err)
}