From 3c0ec26180ff6367154fc0744781aa617ece7623 Mon Sep 17 00:00:00 2001
From: Minecon724 <git@m724.eu>
Date: Fri, 11 Oct 2024 15:46:52 +0200
Subject: [PATCH] some optimizations

---
 src/calculator/index.html |  21 ++-----
 src/index.html            | 112 ++++++++++++++++----------------------
 src/map/index.html        |   1 +
 src/map/map.js            |   2 +-
 src/style.css             |  19 +++++++
 5 files changed, 74 insertions(+), 81 deletions(-)
 create mode 100644 src/style.css
diff --git a/src/calculator/index.html b/src/calculator/index.html
index 6eaa8f3..5763218 100644
--- a/src/calculator/index.html
+++ b/src/calculator/index.html
@@ -1,19 +1,10 @@
 <!DOCTYPE html>
 <html lang="en">
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1" />
-<title>dn724</title>
-
-<script src="./script.js" defer></script>
-
-<style>
-    html {
-        background: black;
-        color: white;
-    }
-</style>
-
-<input type="number" min="0" placeholder="your ASN" oninput="calculate(this)">
-<p>Port: <span id="result"></span></p>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <script src="./script.js" defer></script>
+    <title>dn724</title>
 
+    <input type="number" min="0" placeholder="your ASN" oninput="calculate(this)">
+    <p>Port: <span id="result"></span></p>
 </html>
\ No newline at end of file
diff --git a/src/index.html b/src/index.html
index 56ff672..130fb5d 100644
--- a/src/index.html
+++ b/src/index.html
@@ -1,70 +1,52 @@
 <!DOCTYPE html>
 <html lang="en">
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <title>dn724</title>
+    <head>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <link rel="stylesheet" href="style.css">
+        <title>dn724</title>
+    </head>
 
-    <style>
-        html {
-            font-size: large;
-        }
-        body {
-            margin: 0 auto;
-            padding-right: 20px; /* make it look aligned */
-            max-width: calc(100vw - 40px);
-            word-wrap: break-word;
-            width: fit-content;
-        }
-        ul {
-            margin-bottom: 1.4em;
-        }
-        p {
-            line-height: 0.6em;
-        }
-        .sel {
-            user-select: all;
-        }
-    </style>
-
-    <h2>AS4242420129</h2>
-
-    <p>Open for peering in:</p>
-    <ul>
-        <li>Warsaw, Poland</li>
-        <li>Rome. Italy</li>
-        <li>Nuremberg, Germany</li>
-        <li>Netherlands, Amsterdam</li>
-    </ul>
-
-    <p>Peering requirements</p>
-    <ul>
-        <li>sane latency</li>
-        <li>one peering per one node</li>
-        <li>WireGuard, link local peering</li>
-        <li>If your node is not in the same country and you plan on getting one in that country, please don't peer</li>
-        <li>I can make an exception for you in most cases</li>
-    </ul>
-
-    <p>How to</p>
-    <ul>
-        <li><a href="https://git.m724.eu/Minecon724/dn42-info/src/branch/master/nodes.md">Nodes with details</a></li>
-        <li>Port is last 5 digits of your ASN (2xxx), unless</li>
-        <li>your ASN is not 424242xxxx, then <a href="./calculator">use this</a></li>
-    </ul>
-
-    <p>Contact</p>
-    <ul>
-        <li><a class=sel href="mailto:dn42@m724.eu">dn42@m724.eu</a>, <a href="https://lfs.m724.eu/dn724_0x2A78FF14_public.asc">GPG</a></li>
-        <li>Telegram: <a class=sel href="https://t.me/minecon724">@minecon724</a></li>
-        <li>Discord: <span class=sel>minecon724</span></li>
-        <li>Session: <span class=sel>05293535c0f0b5ae76a663f3f875582590edd77abd72ab9b12f3acbe4bb078aa49</span></li>
-    </ul>
-
-    <p>Other</p>
-    <ul>
-        <li><a href="./map">Network map</a> (uses thunderforest.com API)</li>
-        <li><a href="./services.html">Services</a></li>
-        <li><a href="https://git.m724.eu/Minecon724/dn42-info">Source code</a></li>
-    </ul>    
+    <body>
+        <h2>AS4242420129</h2>
 
+        <p>Open for peering in:</p>
+        <ul>
+            <li>Warsaw, Poland</li>
+            <li>Rome. Italy</li>
+            <li>Nuremberg, Germany</li>
+            <li>Netherlands, Amsterdam</li>
+        </ul>
+    
+        <p>Peering requirements</p>
+        <ul>
+            <li>sane latency</li>
+            <li>one peering per one node</li>
+            <li>WireGuard, link local peering</li>
+            <li>If your node is not in the same country and you plan on getting one in that country, please don't peer</li>
+            <li>I can make an exception for you in most cases</li>
+        </ul>
+    
+        <p>How to</p>
+        <ul>
+            <li><a href="https://git.m724.eu/Minecon724/dn42-info/src/branch/master/nodes.md">Nodes with details</a></li>
+            <li>Port is last 5 digits of your ASN (2xxx), unless</li>
+            <li>your ASN is not 424242xxxx, then <a href="./calculator">use this</a></li>
+        </ul>
+    
+        <p>Contact</p>
+        <ul>
+            <li><a class=sel href="mailto:dn42@m724.eu">dn42@m724.eu</a>, <a href="https://lfs.m724.eu/dn724_0x2A78FF14_public.asc">GPG</a></li>
+            <li>Telegram: <a class=sel href="https://t.me/minecon724">@minecon724</a></li>
+            <li>Discord: <span class=sel>minecon724</span></li>
+            <li>Session: <span class=sel>05293535c0f0b5ae76a663f3f875582590edd77abd72ab9b12f3acbe4bb078aa49</span></li>
+        </ul>
+    
+        <p>Other</p>
+        <ul>
+            <li><a href="./map">Node map</a></li>
+            <li><a href="./services.html">Services</a></li>
+            <li><a href="https://git.m724.eu/Minecon724/dn42-info">Source code</a></li>
+        </ul>
+    </body>
 </html>
\ No newline at end of file
diff --git a/src/map/index.html b/src/map/index.html
index 27bc498..9a82e09 100644
--- a/src/map/index.html
+++ b/src/map/index.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
     <head>
+        <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         <script type=module src="./map.js"></script>
         <link rel="stylesheet" href="./style.css" />
diff --git a/src/map/map.js b/src/map/map.js
index 07d4e33..51ebff9 100644
--- a/src/map/map.js
+++ b/src/map/map.js
@@ -14,7 +14,7 @@ var map = L.map('map', {
 	maxZoom: 10
 }).setView([50,18], 5);
 
-L.tileLayer('https://{s}.tile.thunderforest.com/spinal-map/{z}/{x}/{y}.png?apikey={apikey}', {
+L.tileLayer('https://tforwarder.b-cdn.net/spinal-map/{z}/{x}/{y}.png?apikey={apikey}', {
 	attribution: '&copy; <a href="http://www.thunderforest.com/">Thunderforest</a>, &copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
 	apikey: 'db5ae1f5778a448ca662554581f283c5',
 }).addTo(map);
diff --git a/src/style.css b/src/style.css
new file mode 100644
index 0000000..58b53df
--- /dev/null
+++ b/src/style.css
@@ -0,0 +1,19 @@
+html {
+    font-size: large;
+}
+body {
+    margin: 0 auto;
+    padding-right: 20px; /* make it look aligned */
+    max-width: calc(100vw - 40px);
+    word-wrap: break-word;
+    width: fit-content;
+}
+ul {
+    margin-bottom: 1.4em;
+}
+p {
+    line-height: 0.6em;
+}
+.sel {
+    user-select: all;
+}
\ No newline at end of file
