Fix some UI issues, rename DNS->Home

This commit is contained in:
Andrey Meshkov 2018-10-14 17:49:07 +03:00
parent e356540872
commit e67695df8b
12 changed files with 21 additions and 19 deletions

2
.gitignore vendored
View File

@ -1,4 +1,6 @@
.DS_Store
.vscode .vscode
debug
/AdguardDNS /AdguardDNS
/AdguardDNS.yaml /AdguardDNS.yaml
/build/ /build/

2
app.go
View File

@ -18,7 +18,7 @@ import (
var VersionString = "undefined" var VersionString = "undefined"
func main() { func main() {
log.Printf("AdGuard DNS web interface backend, version %s\n", VersionString) log.Printf("AdGuard Home web interface backend, version %s\n", VersionString)
box := packr.NewBox("build/static") box := packr.NewBox("build/static")
{ {
executable, err := os.Executable() executable, err := os.Executable()

View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000"> <meta name="theme-color" content="#000000">
<link rel="shortcut icon" href="https://adguard.com/img/favicons/favicon.ico"> <link rel="shortcut icon" href="https://adguard.com/img/favicons/favicon.ico">
<title>AdGuard DNS</title> <title>AdGuard Home</title>
</head> </head>
<body> <body>
<noscript> <noscript>

View File

@ -44,7 +44,7 @@ export default class UserRules extends Component {
domain and all its subdomains domain and all its subdomains
</li> </li>
<li> <li>
<code>127.0.0.1 example.org</code> - AdGuard DNS will now return <code>127.0.0.1 example.org</code> - AdGuard Home will now return
127.0.0.1 address for the example.org domain (but not its subdomains). 127.0.0.1 address for the example.org domain (but not its subdomains).
</li> </li>
<li> <li>

View File

@ -74,7 +74,7 @@ class Filters extends Component {
<div className="col-md-12"> <div className="col-md-12">
<Card <Card
title="Filters and hosts blocklists" title="Filters and hosts blocklists"
subtitle="AdGuard DNS understands basic adblock rules and hosts files syntax." subtitle="AdGuard Home understands basic adblock rules and hosts files syntax."
> >
<ReactTable <ReactTable
data={filters} data={filters}

View File

@ -17,17 +17,17 @@ export default class Settings extends Component {
safebrowsing: { safebrowsing: {
enabled: false, enabled: false,
title: 'Use AdGuard browsing security web service', title: 'Use AdGuard browsing security web service',
subtitle: 'AdGuard DNS will check if domain is blacklisted by the browsing security web service. It will use privacy-friendly lookup API to perform the check: only a short prefix of the domain name SHA256 hash is sent to the server.', subtitle: 'AdGuard Home will check if domain is blacklisted by the browsing security web service. It will use privacy-friendly lookup API to perform the check: only a short prefix of the domain name SHA256 hash is sent to the server.',
}, },
parental: { parental: {
enabled: false, enabled: false,
title: 'Use AdGuard parental control web service', title: 'Use AdGuard parental control web service',
subtitle: 'AdGuard DNS will check if domain contains adult materials. It uses the same privacy-friendly API as the browsing security web service.', subtitle: 'AdGuard Home will check if domain contains adult materials. It uses the same privacy-friendly API as the browsing security web service.',
}, },
safesearch: { safesearch: {
enabled: false, enabled: false,
title: 'Enforce safe search', title: 'Enforce safe search',
subtitle: 'AdGuard DNS can enforce safe search in the following search engines: Google, Bing, Yandex.', subtitle: 'AdGuard Home can enforce safe search in the following search engines: Google, Bing, Yandex.',
}, },
}; };

View File

@ -10,9 +10,12 @@ class Footer extends Component {
return ( return (
<footer className="footer"> <footer className="footer">
<div className="container"> <div className="container">
<div className="row align-items-center flex-row-reverse"> <div className="row align-items-center flex-row">
<div className="col-12 col-lg-auto ml-lg-auto"> <div className="col-12 col-lg-auto mt-3 mt-lg-0 text-center">
<div className="row align-items-center justify-content-center"> <div className="row align-items-center justify-content-center">
<div className="col-auto">
Copyright © {this.getYear()} <a href="https://adguard.com/">AdGuard</a>
</div>
<div className="col-auto"> <div className="col-auto">
<ul className="list-inline text-center mb-0"> <ul className="list-inline text-center mb-0">
<li className="list-inline-item"> <li className="list-inline-item">
@ -27,9 +30,6 @@ class Footer extends Component {
</div> </div>
</div> </div>
</div> </div>
<div className="col-12 col-lg-auto mt-3 mt-lg-0 text-center">
Copyright © {this.getYear()} <a href="https://adguard.com/">AdGuard</a>.
</div>
</div> </div>
</div> </div>
</footer> </footer>

View File

@ -15,7 +15,7 @@ class Popover extends Component {
<div className="popover__body"> <div className="popover__body">
<div className="popover__list"> <div className="popover__list">
<div className="popover__list-title"> <div className="popover__list-title">
This domain belongs to a known tracker. This domain belongs to the Whotracksme database.
</div> </div>
<div className="popover__list-item"> <div className="popover__list-item">
Name: <strong>{data.name}</strong> Name: <strong>{data.name}</strong>

View File

@ -7,10 +7,10 @@ const Status = props => (
<div className="status"> <div className="status">
<Card bodyType="card-body card-body--status"> <Card bodyType="card-body card-body--status">
<div className="h4 font-weight-light mb-4"> <div className="h4 font-weight-light mb-4">
You are currently not using AdGuard DNS You are currently not using AdGuard Home
</div> </div>
<button className="btn btn-success" onClick={props.handleStatusChange}> <button className="btn btn-success" onClick={props.handleStatusChange}>
Enable AdGuard DNS Enable AdGuard Home
</button> </button>
</Card> </Card>
</div> </div>

View File

@ -29,7 +29,7 @@
| Description | Value | | Description | Value |
| -------------- | ------------ | | -------------- | ------------ |
| Version of AdGuard DNS server:| (e.g. v1.0) | Version of AdGuard Home server:| (e.g. v1.0)
| How did you setup DNS configuration:| (System/Router/IoT) | How did you setup DNS configuration:| (System/Router/IoT)
| If it's a router or IoT, please write device model:| (e.g. Raspberry Pi 3 Model B) | If it's a router or IoT, please write device model:| (e.g. Raspberry Pi 3 Model B)
| Operating system and version:| (e.g. Ubuntu 18.04.1) | Operating system and version:| (e.g. Ubuntu 18.04.1)

View File

@ -1,7 +1,7 @@
swagger: '2.0' swagger: '2.0'
info: info:
title: 'AdGuard DNS' title: 'AdGuard Home'
description: 'Control AdGuard DNS server with this API' description: 'Control AdGuard Home server with this API'
version: 0.0.0 version: 0.0.0
basePath: /control basePath: /control
schemes: schemes: