From a806fc043c756785e6c88776cebbfcb2fba01eea Mon Sep 17 00:00:00 2001
From: TheClashFruit <clash.fruit123@gmail.com>
Date: Mon, 18 Sep 2023 18:10:55 +0200
Subject: [PATCH] feat: add map

---
 template/includes/head.twig | 23 ++++++++++++++++++++++
 template/map.twig           | 38 ++++++++++++++++++-------------------
 util/Database.php           |  4 ++--
 3 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/template/includes/head.twig b/template/includes/head.twig
index 8fafa7b..40a3bbd 100644
--- a/template/includes/head.twig
+++ b/template/includes/head.twig
@@ -6,6 +6,29 @@
     <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
   
     <title>Clyde's Real Survival SMP &bull; {{ pageTitle }}</title>
+    
+    {% if pageTitle == 'Map' %}
+      <link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css"/>
+      <script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"></script>
+
+      <style>
+        #map { height: 100vh; }
+
+        #homeLink {
+          position: absolute;
+          top: 16px;
+          left: 16px;
+          padding: 8px 16px;
+          z-index: 400;
+            
+          background-color: #fff;
+          border-radius: 32px;
+            
+          text-decoration: none;
+          color: #000;
+        }
+      </style>
+    {% endif %}
   
     <link rel="icon"       href="/favicon.ico">
     <link rel="stylesheet" href="/css/style.min.css">
diff --git a/template/map.twig b/template/map.twig
index 9469ead..d44c624 100644
--- a/template/map.twig
+++ b/template/map.twig
@@ -1,24 +1,24 @@
 {% include 'includes/head.twig' with {'pageTitle': 'Map'} %}
 
-<div class="pageHero" id="hero">
-  <div class="blurFiler">
-    <div class="container">
-      <h1>Clyde's Real Survival SMP</h1>
-    
-      <div class="serverInfo">
-        Online: <label>0</label> / <label>20</label>
-      </div>
-    </div>
-  </div>
-</div>
+<div id="map"></div>
+<a id="homeLink" href="/">Go Home</a>
 
-{% include 'includes/nav.twig' with {'page': 'map',} %}
-    
-<main class="pageContent" id="content">
-  <div class="container">
-    <p>⚒️ Under Construction</p>
-  </div>
-</main>
+<script>
+  let map = L.map('map', { 
+      zoomControl: false, 
+      scrollWheelZoom: false,
+      doubleClickZoom: false,
+  }).setView([-36.3, -41.3], 4);
+
+  L.tileLayer('https://cdn.theclashfruit.me/crss/map/tile_{x}x{y}y.png', {
+    attribution: '&copy; <a href="https://crss.blurryface.xyz/">CRSS</a> players',
+    noWrap: true
+  }).addTo(map);
+
+
+  L.marker([-36.3, -41.3])
+   .addTo(map)
+   .bindPopup('Spawn Town in Republic of Panorama');
+</script>
 
-{% include 'includes/footer.twig' %}
 {% include 'includes/foot.twig' %}
\ No newline at end of file
diff --git a/util/Database.php b/util/Database.php
index 6378aa6..94580aa 100644
--- a/util/Database.php
+++ b/util/Database.php
@@ -24,7 +24,7 @@
       $stmt->execute();
     }
     
-    function getUserRecordFromUsername($username): bool|array|null {
+    function getUserRecordFromUsername($username): array | null {
       $sql = 'SELECT * FROM users WHERE username = ?';
       
       $stmt = $this->conn->prepare($sql);
@@ -41,7 +41,7 @@
       }
     }
     
-    function getUserRecordFromId($id): bool|array|null {
+    function getUserRecordFromId($id): array | null {
       $sql = 'SELECT * FROM users WHERE id = ?';
       
       $stmt = $this->conn->prepare($sql);