added date

var/www/dragonx.is/halving/halving.js

@@ -1,24 +1,28 @@
+const blockHalving = 3500000;
+let blocksLeft = document.getElementById("blocksLeft");
+
 let time_seconds = 0;
 let seconds = 0;
 let days = 0;
 let hours = 0;
 let minutes = 0;
-const blockHalving = 3500000;
-let blocksLeft = document.getElementById("blocksLeft");
 
+// Load mining info from JSON in explorer.dragonx.is/api dir
 async function loadMiningInfo() {
 	const response = await fetch(
-		"https://explorer.dragonx.is/api/getmininginfo.json"
+		"../../explorer.dragonx.is/api/getmininginfo.json"
 	);
+
 	const miningInfo = await response.json();
 
 	let height = miningInfo.blocks;
-	// TODO: support all block heights like an OG
 	if (height < blockHalving) {
 		let blocks_left = blockHalving - miningInfo.blocks;
 		blocksLeft.innerHTML = blocks_left;
 		time_seconds = parseInt(blocks_left * 36, 10);
 	}
+
+	// Calculate Countdown Timer
 	seconds = time_seconds;
 	days = Math.floor(seconds / (3600 * 24));
 	seconds -= days * 3600 * 24;
@@ -27,6 +31,19 @@ async function loadMiningInfo() {
 	minutes = Math.floor(seconds / 60);
 	seconds -= minutes * 60;
 	count(time_seconds);
+
+	// Calculate Halving Date
+	const halvingDate = new Date(Date.now() + time_seconds * 1000);
+	let tomorrow = new Date();
+	tomorrow.setHours(hours);
+	tomorrow.setMinutes(minutes);
+	tomorrow.setSeconds(seconds);
+	const dateHalving = document.getElementById("dateHalving");
+	dateHalving.innerHTML =
+		"Halving on " +
+		halvingDate.toLocaleDateString() +
+		" at " +
+		halvingDate.toLocaleTimeString();
 }
 loadMiningInfo();
 
@@ -52,9 +69,8 @@ function count(time_seconds) {
 	const countHours = document.getElementById("countHours");
 	const countSeconds = document.getElementById("countSeconds");
 	const countMinutes = document.getElementById("countMinutes");
-
 	const textDays = document.getElementById("textDays");
-	const contDays = document.getElementById("containerDays");
+	const containerDays = document.getElementById("containerDays");
 
 	if (days > 1) {
 		countDays.innerHTML = days;
@@ -69,24 +85,10 @@ function count(time_seconds) {
 		countSeconds.innerHTML = seconds;
 		textDays.innerHTML = "day";
 	} else {
-		contDays.style.display = "none";
+		containerDays.style.display = "none";
 		countDays.innerHTML = "";
 		countHours.innerHTML = hours;
 		countMinutes.innerHTML = minutes;
 		countSeconds.innerHTML = seconds;
 	}
-
-	// var today = new Date();
-	// // this uses milliseconds
-	// const dafuq = new Date(Date.now() + time_seconds * 1000);
-	// var tomorrow = new Date();
-	// tomorrow.setHours(hrs);
-	// tomorrow.setMinutes(mnts);
-	// tomorrow.setSeconds(seconds);
-	// var timeStamp = tomorrow.setDate(today.getDate() + days);
-	// ts = new Date(timeStamp);
-	// //$('#date_halving').html(ts.toLocaleDateString() + " " + ts.toLocaleTimeString());
-	// $("#date_halving").html(
-	// 	dafuq.toLocaleDateString() + " " + dafuq.toLocaleTimeString()
-	// );
 }

var/www/dragonx.is/halving/index.html

@@ -5,7 +5,8 @@
 	<meta charset="UTF-8" />
 	<meta http-equiv="X-UA-Compatible" content="IE=edge" />
 	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
-	<link rel="stylesheet" href="style.css" />
+	<meta http-equiv="refresh" content="36; URL=./">
+	<link rel="stylesheet" href="../style.css" />
 	<link rel="icon" type="image/x-icon" href="../logo_dragonx.ico">
 	<title>DragonX - Halving</title>
 </head>
@@ -94,6 +95,7 @@
 				<h3>seconds</h3>
 			</div>
 		</div>
+		<h3 id="dateHalving">#</h3>
 		<div class="blocks-left">
 			<h3 id="blocksLeft">#</h3>
 			<h3>blocks left until next halving</h3>