From d06a6d93350602ec0fe14210e142fb20f75dd781 Mon Sep 17 00:00:00 2001
From: thetek <80534748+thetek42@users.noreply.github.com>
Date: Sun, 4 Apr 2021 15:39:32 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=BD=20adapt=20to=20api=20changes=20(#7?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ✏️ fix typo

* 👽 adapt to ui changes

* 📦 compile html

* 📦 compile jhtml
---
 ui/html/index.html        |  2 +-
 ui/html/index.js          | 51 ++++++++++++++++++++-------------------
 ui/jhtml-compat/index.js  | 51 ++++++++++++++++++++-------------------
 ui/jhtml-compat/index.php |  2 +-
 ui/raw/index.js           | 51 ++++++++++++++++++++-------------------
 ui/raw/index.pug          |  2 +-
 6 files changed, 81 insertions(+), 78 deletions(-)

diff --git a/ui/html/index.html b/ui/html/index.html
index b789f1c..a2b496c 100644
--- a/ui/html/index.html
+++ b/ui/html/index.html
@@ -6,4 +6,4 @@
 <meta content="utf-8" http-equiv="encoding">
 <script src="index.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/feather-icons/dist/feather.min.js"></script>
-<div id="header"><button><i data-feather="globe"></i></button><button><i data-feather="sun"></i></button></div><div id="title"><h1>dns-watch<span>.org</span></h1></div><div id="search"><div id="searchbar"><div class="buttonspacer"></div><input id="dnswatch-search" type="text" placeholder="Search..." autofocus="autofocus"/><button id="dnswatch-search-submit"><i data-feather="search"></i></button><button id="help"><i data-feather="help-circle"></i></button></div><small>Try "gnu.org", "wikipedia.com", "s.to" or your own website!</small><div id="loadani"><div id="spinner"></div><span>loading...</span></div><div id="invaliddomain"><i data-feather="x"></i><span>invalid domain.</span></div></div><div id="results"></div><script src="feather.js"></script>
+<div id="header"><button><i data-feather="globe"></i></button><button><i data-feather="sun"></i></button></div><div id="title"><h1>dns-watch<span>.org</span></h1></div><div id="search"><div id="searchbar"><div class="buttonspacer"></div><input id="dnswatch-search" type="text" placeholder="Search..." autofocus="autofocus"/><button id="dnswatch-search-submit"><i data-feather="search"></i></button><button id="help"><i data-feather="help-circle"></i></button></div><small>Try "gnu.org", "wikipedia.org", "s.to" or your own website!</small><div id="loadani"><div id="spinner"></div><span>loading...</span></div><div id="invaliddomain"><i data-feather="x"></i><span>invalid domain.</span></div></div><div id="results"></div><script src="feather.js"></script>
diff --git a/ui/html/index.js b/ui/html/index.js
index 26cf36d..c4d709c 100644
--- a/ui/html/index.js
+++ b/ui/html/index.js
@@ -26,46 +26,47 @@ function dnswatch_search() {
 	request.onload = function() {
 		if (request.status >= 200 && request.status < 400) {
 			var response = JSON.parse(this.response);
-			//console.log(response);
 
 			// TODO: CLEAN UP THIS MESS OF TABLE GENERATION CODE
 
 			if (response['type'] == 'success') {   // success
 
 				var table = '<table>\n';
-				//// reference dns
-				// status
-				table += '<tr>\n';
-				table += '<td class="status ref">\n';
-				table += `<i data-feather="${ response["data"]["reference"]["found"] ? "check" : "x" }"></i>\n`;
-				table += '</td>\n';
-				// provider
-				table += '<td class="icon">\n';
-				table += `<img class="uncolored-svg" src="../svg/${ response["data"]["reference"]["nameserver"] }.svg">\n`;
-				table += '</td>\n'
-				// name and address
-				table += `<td class="name">${ response["data"]["reference"]["name"] }<small>${ response["data"]["reference"]["address"] }</small></td>\n`;
-				// reference info
-				table += '<td class="desc ref">reference</td>\n';
-				// help button
-				table += '<td class="help">\n';
-				table += '<button><i data-feather="help-circle"></i></button>\n';
-				table += '</td>\n';
-				table += '</tr>\n'
 
-				if (response['data']['reference']['found']) {   // only if reference confirms
+				//// reference dns
+				response['data']['reference'].forEach(i => {
+					// status
+					table += '<tr>\n';
+					table += '<td class="status ref">\n';
+					table += `<i data-feather="${ i["status"] ? "check" : "x" }"></i>\n`;
+					table += '</td>\n';
+					// provider
+					table += '<td class="icon">\n';
+					table += `<img class="uncolored-svg" src="${ i["icon"] }">\n`;
+					table += '</td>\n'
+					// name and address
+					table += `<td class="name">${ i["name"] }<small>${ i["address"] }</small></td>\n`;
+					// reference info
+					table += '<td class="desc ref">reference</td>\n';
+					// help button
+					table += '<td class="help">\n';
+					table += '<button><i data-feather="help-circle"></i></button>\n';
+					table += '</td>\n';
+					table += '</tr>\n'
+				});
+
+				if (response['data']['found']) {   // only if reference confirms
 					table += '<tr></tr>\n';   // spacer
 					//// search rows
 					response['data']['search'].forEach(i => {
-						//console.log(i);
 						table += '<tr>\n';
 						// status
-						table += `<td class="status ${ i["matching"] ? "check" : "cross" }">\n`;
-						table += `<i data-feather="${ i["matching"] ? "check" : "x" }"></i>\n`;
+						table += `<td class="status ${ i["status"] ? "check" : "cross" }">\n`;
+						table += `<i data-feather="${ i["status"] ? "check" : "x" }"></i>\n`;
 						table += '</td>\n';
 						// provider icon
 						table += '<td class="icon">\n';
-						table += `<img class="uncolored-svg" src="../svg/${ i["nameserver"] }.svg">\n`;
+						table += `<img class="uncolored-svg" src="${ i["icon"] }">\n`;
 						table += '</td>\n';
 						// name and address
 						table += `<td class="name">${ i["name"] }<small>${ i["address"] }</small></td>\n`;
diff --git a/ui/jhtml-compat/index.js b/ui/jhtml-compat/index.js
index 30e2e8c..fafaaeb 100644
--- a/ui/jhtml-compat/index.js
+++ b/ui/jhtml-compat/index.js
@@ -27,46 +27,47 @@ function dnswatch_search() {
 	request.onload = function() {
 		if (request.status >= 200 && request.status < 400) {
 			var response = JSON.parse(this.response);
-			//console.log(response);
 
 			// TODO: CLEAN UP THIS MESS OF TABLE GENERATION CODE
 
 			if (response['type'] == 'success') {   // success
 
 				var table = '<table>\n';
-				//// reference dns
-				// status
-				table += '<tr>\n';
-				table += '<td class="status ref">\n';
-				table += `<i data-feather="${ response["data"]["reference"]["found"] ? "check" : "x" }"></i>\n`;
-				table += '</td>\n';
-				// provider
-				table += '<td class="icon">\n';
-				table += `<img class="uncolored-svg" src="../svg/${ response["data"]["reference"]["nameserver"] }.svg">\n`;
-				table += '</td>\n'
-				// name and address
-				table += `<td class="name">${ response["data"]["reference"]["name"] }<small>${ response["data"]["reference"]["address"] }</small></td>\n`;
-				// reference info
-				table += '<td class="desc ref">reference</td>\n';
-				// help button
-				table += '<td class="help">\n';
-				table += '<button><i data-feather="help-circle"></i></button>\n';
-				table += '</td>\n';
-				table += '</tr>\n'
 
-				if (response['data']['reference']['found']) {   // only if reference confirms
+				//// reference dns
+				response['data']['reference'].forEach(i => {
+					// status
+					table += '<tr>\n';
+					table += '<td class="status ref">\n';
+					table += `<i data-feather="${ i["status"] ? "check" : "x" }"></i>\n`;
+					table += '</td>\n';
+					// provider
+					table += '<td class="icon">\n';
+					table += `<img class="uncolored-svg" src="${ i["icon"] }">\n`;
+					table += '</td>\n'
+					// name and address
+					table += `<td class="name">${ i["name"] }<small>${ i["address"] }</small></td>\n`;
+					// reference info
+					table += '<td class="desc ref">reference</td>\n';
+					// help button
+					table += '<td class="help">\n';
+					table += '<button><i data-feather="help-circle"></i></button>\n';
+					table += '</td>\n';
+					table += '</tr>\n'
+				});
+
+				if (response['data']['found']) {   // only if reference confirms
 					table += '<tr></tr>\n';   // spacer
 					//// search rows
 					response['data']['search'].forEach(i => {
-						//console.log(i);
 						table += '<tr>\n';
 						// status
-						table += `<td class="status ${ i["matching"] ? "check" : "cross" }">\n`;
-						table += `<i data-feather="${ i["matching"] ? "check" : "x" }"></i>\n`;
+						table += `<td class="status ${ i["status"] ? "check" : "cross" }">\n`;
+						table += `<i data-feather="${ i["status"] ? "check" : "x" }"></i>\n`;
 						table += '</td>\n';
 						// provider icon
 						table += '<td class="icon">\n';
-						table += `<img class="uncolored-svg" src="../svg/${ i["nameserver"] }.svg">\n`;
+						table += `<img class="uncolored-svg" src="${ i["icon"] }">\n`;
 						table += '</td>\n';
 						// name and address
 						table += `<td class="name">${ i["name"] }<small>${ i["address"] }</small></td>\n`;
diff --git a/ui/jhtml-compat/index.php b/ui/jhtml-compat/index.php
index 127306e..161b38c 100644
--- a/ui/jhtml-compat/index.php
+++ b/ui/jhtml-compat/index.php
@@ -5,4 +5,4 @@
 *js("///index.js")
 *js("https://cdn.jsdelivr.net/npm/feather-icons/dist/feather.min.js")
 *postjs("///feather.js")
-<div id="header"><button><i data-feather="globe"></i></button><button><i data-feather="sun"></i></button></div><div id="title"><h1>dns-watch<span>.org</span></h1></div><div id="search"><div id="searchbar"><div class="buttonspacer"></div><input id="dnswatch-search" type="text" placeholder="Search..." autofocus="autofocus"/><button id="dnswatch-search-submit"><i data-feather="search"></i></button><button id="help"><i data-feather="help-circle"></i></button></div><small>Try "gnu.org", "wikipedia.com", "s.to" or your own website!</small><div id="loadani"><div id="spinner"></div><span>loading...</span></div><div id="invaliddomain"><i data-feather="x"></i><span>invalid domain.</span></div></div><div id="results"></div>
\ No newline at end of file
+<div id="header"><button><i data-feather="globe"></i></button><button><i data-feather="sun"></i></button></div><div id="title"><h1>dns-watch<span>.org</span></h1></div><div id="search"><div id="searchbar"><div class="buttonspacer"></div><input id="dnswatch-search" type="text" placeholder="Search..." autofocus="autofocus"/><button id="dnswatch-search-submit"><i data-feather="search"></i></button><button id="help"><i data-feather="help-circle"></i></button></div><small>Try "gnu.org", "wikipedia.org", "s.to" or your own website!</small><div id="loadani"><div id="spinner"></div><span>loading...</span></div><div id="invaliddomain"><i data-feather="x"></i><span>invalid domain.</span></div></div><div id="results"></div>
\ No newline at end of file
diff --git a/ui/raw/index.js b/ui/raw/index.js
index 26cf36d..c4d709c 100644
--- a/ui/raw/index.js
+++ b/ui/raw/index.js
@@ -26,46 +26,47 @@ function dnswatch_search() {
 	request.onload = function() {
 		if (request.status >= 200 && request.status < 400) {
 			var response = JSON.parse(this.response);
-			//console.log(response);
 
 			// TODO: CLEAN UP THIS MESS OF TABLE GENERATION CODE
 
 			if (response['type'] == 'success') {   // success
 
 				var table = '<table>\n';
-				//// reference dns
-				// status
-				table += '<tr>\n';
-				table += '<td class="status ref">\n';
-				table += `<i data-feather="${ response["data"]["reference"]["found"] ? "check" : "x" }"></i>\n`;
-				table += '</td>\n';
-				// provider
-				table += '<td class="icon">\n';
-				table += `<img class="uncolored-svg" src="../svg/${ response["data"]["reference"]["nameserver"] }.svg">\n`;
-				table += '</td>\n'
-				// name and address
-				table += `<td class="name">${ response["data"]["reference"]["name"] }<small>${ response["data"]["reference"]["address"] }</small></td>\n`;
-				// reference info
-				table += '<td class="desc ref">reference</td>\n';
-				// help button
-				table += '<td class="help">\n';
-				table += '<button><i data-feather="help-circle"></i></button>\n';
-				table += '</td>\n';
-				table += '</tr>\n'
 
-				if (response['data']['reference']['found']) {   // only if reference confirms
+				//// reference dns
+				response['data']['reference'].forEach(i => {
+					// status
+					table += '<tr>\n';
+					table += '<td class="status ref">\n';
+					table += `<i data-feather="${ i["status"] ? "check" : "x" }"></i>\n`;
+					table += '</td>\n';
+					// provider
+					table += '<td class="icon">\n';
+					table += `<img class="uncolored-svg" src="${ i["icon"] }">\n`;
+					table += '</td>\n'
+					// name and address
+					table += `<td class="name">${ i["name"] }<small>${ i["address"] }</small></td>\n`;
+					// reference info
+					table += '<td class="desc ref">reference</td>\n';
+					// help button
+					table += '<td class="help">\n';
+					table += '<button><i data-feather="help-circle"></i></button>\n';
+					table += '</td>\n';
+					table += '</tr>\n'
+				});
+
+				if (response['data']['found']) {   // only if reference confirms
 					table += '<tr></tr>\n';   // spacer
 					//// search rows
 					response['data']['search'].forEach(i => {
-						//console.log(i);
 						table += '<tr>\n';
 						// status
-						table += `<td class="status ${ i["matching"] ? "check" : "cross" }">\n`;
-						table += `<i data-feather="${ i["matching"] ? "check" : "x" }"></i>\n`;
+						table += `<td class="status ${ i["status"] ? "check" : "cross" }">\n`;
+						table += `<i data-feather="${ i["status"] ? "check" : "x" }"></i>\n`;
 						table += '</td>\n';
 						// provider icon
 						table += '<td class="icon">\n';
-						table += `<img class="uncolored-svg" src="../svg/${ i["nameserver"] }.svg">\n`;
+						table += `<img class="uncolored-svg" src="${ i["icon"] }">\n`;
 						table += '</td>\n';
 						// name and address
 						table += `<td class="name">${ i["name"] }<small>${ i["address"] }</small></td>\n`;
diff --git a/ui/raw/index.pug b/ui/raw/index.pug
index 10440e5..8e1c1ec 100644
--- a/ui/raw/index.pug
+++ b/ui/raw/index.pug
@@ -11,7 +11,7 @@
 		input#dnswatch-search( type='text' placeholder='Search...' autofocus )
 		button#dnswatch-search-submit: i( data-feather='search' )
 		button#help: i( data-feather='help-circle' )
-	small Try "gnu.org", "wikipedia.com", "s.to" or your own website!
+	small Try "gnu.org", "wikipedia.org", "s.to" or your own website!
 	#loadani
 		#spinner
 		span loading...