Skip to content

Commit

Permalink
Get current config at init
Browse files Browse the repository at this point in the history
  • Loading branch information
toolsprods committed Oct 15, 2019
1 parent 19571aa commit 8d7f1c2
Show file tree
Hide file tree
Showing 9 changed files with 338 additions and 155 deletions.
6 changes: 1 addition & 5 deletions add-on/background.js
@@ -1,5 +1 @@
console.log('DNS over HTTPS ready!');


// TODO: Check if default
//var sending = browser.runtime.sendNativeMessage("com.elevenpaths.easydoh", "init");
console.log("DNS over HTTPS ready!");
2 changes: 1 addition & 1 deletion add-on/manifest.json
@@ -1,7 +1,7 @@
{
"manifest_version": 2,
"name": "EasyDoH",
"version": "1.0.1",
"version": "1.1.0",

"description": "Easy DNS over HTTPS setting",
"icons": {
Expand Down
66 changes: 9 additions & 57 deletions add-on/popup/css/style.css
@@ -1,69 +1,21 @@
* {
margin: 0;
padding: 0;
font-family: Sans, Arial, Verdana;
}

html, body {
html,
body {
width: 100%;
background: #e5e5e5;
text-align: center;
}

body {
padding: 10px;
box-sizing: border-box;
font-family: Sans, Arial, Verdana;
}

h1 {
font-size: 20px;
text-align: center;
margin: 10px 0;
color: rgb(145,145,145);
}

h2 {
font-size: 16px;
text-align: center;
margin: 10px 0;
color: rgb(169,169,169);
}

img {
vertical-align: top;
}

.select-title {
padding: 5px;
}

.hidden {
display: none;
}

.error-content p,
.reboot p{
font-size: 14px;
color: rgb(236,67,91);
}

select, button {
font-size: 14px;
color: rgb(145, 145, 145);
}

select,
button {
margin: 10px 0;
border:none;
padding: 5px 10px;
border-radius: 5px;
background:#d1d2d2;
border:1px solid #ccc;
font-size: 14px;
}

button:hover {
background: #f3f2f2;
#messages p {
font-size: 14px;
color: rgb(236, 67, 91);
}

.footer-11p {
margin-top: 5px;
}
26 changes: 26 additions & 0 deletions add-on/popup/doh.json
@@ -0,0 +1,26 @@
{
"default": {
"name": "Default",
"url": "https://mozilla.cloudflare-dns.com/dns-query"
},
"cloudflare": {
"name": "Cloudflare",
"url": "https://cloudflare-dns.com/dns-query"
},
"google-rfc": {
"name": "Google RFC 8484",
"url": "https://dns.google/dns-query"
},
"google-json": {
"name": "Google JSON API",
"url": "https://dns.google/resolve"
},
"secure-dns": {
"name": "Secure DNS EU",
"url": "https://doh.securedns.eu/dns-query"
},
"quad9": {
"name": "Quad 9",
"url": "https://dns.quad9.net/dns-query"
}
}
112 changes: 66 additions & 46 deletions add-on/popup/index.html
@@ -1,50 +1,70 @@
<!DOCTYPE html>

<html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta
name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no"
/>

<head>
<meta charset="utf-8">
<link rel="stylesheet" href="css/bootstrap.min.css" />
<link rel="stylesheet" href="css/style.css" />
</head>
<link rel="stylesheet" href="css/bootstrap.min.css" />
<link rel="stylesheet" href="css/style.css" />
</head>

<body>
<img src="img/easydoh.png" alt='elevenpaths' height='42'>
<h1>DNS over HTTPS</h1>
<div id="popup-content">
<div class="select-title">Mode</div>
<select id="mode-select" class="custom-select" name="trr-mode">
<option value="0">Default (No DoH)</option>
<option value="1" selected>Fastest: DoH or Regular DNS</option>
<option value="2">DoH and DNS if it fails</option>
<option value="3">DoH only</option>
<option value="4">DoH testing</option>
</select>
<br>
<div class="select-title">Server</div>
<select id="list-select" class="custom-select" name="dns-servers">
<option value="cloudflare" selected>Cloudflare</option>
<option value="google-rfc">Google RFC 8484</option>
<option value="google-json">Google JSON API</option>
<option value="secure-dns">Secure DNS EU</option>
<option value="quad9">Quad 9</option>
</select>
</br>
<button id="change-content" type="button" class="btn btn-outline-primary">Apply</button>
</div>
<div id="error-content" class="hidden error-content">
<p>Addon not detected.</p>
<p>Check if it is in the right path or download and install it from <a href="https://easydoh.e-paths.com/download.html">here</a>.</p>
</div>
<div id="reboot" class="hidden reboot">
<p>Restart the browser to apply changes<br>EasyDoH will show Cloudfare configuration by default,<br>but your configuration wil be shown in TRR about:config</p>
</div>
<div class="footer-11p">
Powered by <a href="https://elevenpaths.com" target="_blank"><img src="img/elevenpaths.png" alt='elevenpaths' height='18'></a>; 2019
</div>
<script src="js/script.js"></script>
<script src="js/jquery-3.4.1.min.js"></script>
<script src="js/bootstrap.bundle.min.js"></script>
</body>

</html>
<body class="p-2 text-center">
<img src="img/easydoh.png" alt="elevenpaths" height="42" />
<h1 class="mt-2">DNS over HTTPS</h1>
<div id="popup-content">
<form class="text-center my-2">
<div class="form-group">
<label for="modeInput">Mode</label>
<select id="modeInput" class="custom-select" name="trr-mode">
<option value="0">Default (No DoH)</option>
<option value="1" selected>Fastest: DoH or Regular DNS</option>
<option value="2">DoH and DNS if it fails</option>
<option value="3">DoH only</option>
<option value="4">DoH testing</option>
</select>
</div>
<div class="form-group">
<label for="serverInput">Server</label>
<select id="serverInput" class="custom-select" name="dns-servers">
</select>
<input
id="serverManualInput"
class="form-control my-2 d-none"
placeholder="DNS here..."
/>
</div>
<div class="pb-2">
<button
id="change-content"
type="button"
class="btn btn-outline-primary"
>
Apply
</button>
<button id="reset" type="button" class="btn btn-outline-primary">
Reset
</button>
</div>
</form>
</div>
<div id="messages" class="d-none"></div>
<div class="mt-2">
Powered by
<a href="https://elevenpaths.com" target="_blank"
><img
class="mb-2"
src="img/elevenpaths.png"
alt="elevenpaths"
height="18"/></a
>; 2019
</div>
<script src="js/jquery-3.4.1.min.js"></script>
<script src="js/bootstrap.bundle.min.js"></script>
<script src="js/validator.min.js"></script>
<script src="js/script.js"></script>
</body>
</html>

0 comments on commit 8d7f1c2

Please sign in to comment.