From 665eb7e4d16560077a21cf17947b6ac30ed82d21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C5=91cze=20Bence?= <bence@pocze.ch>
Date: Sun, 31 May 2020 20:45:57 +0200
Subject: [PATCH] MAPG-86 adapt URLs in HTML and JS

---
 public/static/js/game.js        |  7 +++----
 views/game.php                  | 10 +++++-----
 views/maps.php                  | 13 ++++---------
 views/templates/main_header.php | 12 ++++++------
 4 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/public/static/js/game.js b/public/static/js/game.js
index 8ccb9b2..00f0489 100644
--- a/public/static/js/game.js
+++ b/public/static/js/game.js
@@ -53,7 +53,7 @@
                 Core.startNewRound();
             };
 
-            xhr.open('GET', 'position.json?map=' + mapId, true);
+            xhr.open('GET', '/game/' + mapId + '/position.json', true);
             xhr.send();
         },
 
@@ -135,7 +135,7 @@
                 Core.resetGame();
             };
 
-            xhr.open('GET', 'game.json?map=' + mapId, true);
+            xhr.open('GET', '/game/' + mapId + '/position.json', true);
             xhr.send();
         },
 
@@ -160,7 +160,6 @@
             document.getElementById('cover').style.visibility = 'visible';
 
             var data = new FormData();
-            data.append('guess', '1');
             data.append('lat', String(guessPosition.lat));
             data.append('lng', String(guessPosition.lng));
 
@@ -209,7 +208,7 @@
                 Core.panoId = this.response.panoId;
             };
 
-            xhr.open('POST', 'position.json?map=' + mapId, true);
+            xhr.open('POST', '/game/' + mapId + '/guess.json', true);
             xhr.send(data);
         },
 
diff --git a/views/game.php b/views/game.php
index 5732766..05f6157 100644
--- a/views/game.php
+++ b/views/game.php
@@ -1,9 +1,9 @@
-<?php require 'templates/main_header.php'; ?>
+<?php require ROOT . '/views/templates/main_header.php'; ?>
 <div class="header small">
     <div class="grid">
         <h1>
-            <a href="maps" title="Back to playable maps">
-                <?php require 'templates/icon.php'; ?>
+            <a href="/maps" title="Back to playable maps">
+                <?php require ROOT . '/views/templates/icon.php'; ?>
                 <span>MapGuesser</span>
             </a>
         </h1>
@@ -49,5 +49,5 @@
     var mapBounds = <?= json_encode($bounds) ?>;
 </script>
 <script src="https://maps.googleapis.com/maps/api/js?key=<?= $_ENV['GOOGLE_MAPS_JS_API_KEY'] ?>"></script>
-<script src="static/js/game.js"></script>
-<?php require 'templates/main_footer.php'; ?>
\ No newline at end of file
+<script src="/static/js/game.js"></script>
+<?php require ROOT . '/views/templates/main_footer.php'; ?>
\ No newline at end of file
diff --git a/views/maps.php b/views/maps.php
index d9cd188..1871506 100644
--- a/views/maps.php
+++ b/views/maps.php
@@ -1,10 +1,5 @@
-<?php require 'templates/main_header.php'; ?>
-<div class="header">
-    <h1>
-        <?php require 'templates/icon.php'; ?>
-        MapGuesser
-    </h1>
-</div>
+<?php require ROOT . '/views/templates/main_header.php'; ?>
+<?php require ROOT . '/views/templates/header.php'; ?>
 <div class="main">
     <h2>Playable maps</h2>
     <div class="mapContainer">
@@ -34,7 +29,7 @@
                     </div>
                     <p class="small justify marginTop"><?= $map['description'] ?></p>
                 </div>
-                <a class="button fullWidth" href="game?map=<?= $map['id']; ?>" title="Play map '<?= $map['name'] ?>'">Play this map</a>
+                <a class="button fullWidth" href="game/<?= $map['id']; ?>" title="Play map '<?= $map['name'] ?>'">Play this map</a>
             </div>
         <?php endforeach; ?>
         <?php if (count($maps) < 4): ?>
@@ -44,4 +39,4 @@
         <?php endif; ?>
     </div>
 </div>
-<?php require 'templates/main_footer.php'; ?>
\ No newline at end of file
+<?php require ROOT . '/views/templates/main_footer.php'; ?>
\ No newline at end of file
diff --git a/views/templates/main_header.php b/views/templates/main_header.php
index 30ccb9f..1615c46 100644
--- a/views/templates/main_header.php
+++ b/views/templates/main_header.php
@@ -4,14 +4,14 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>MapGuesser</title>
-    <link href="static/css/mapguesser.css" rel="stylesheet">
+    <link href="/static/css/mapguesser.css" rel="stylesheet">
     <link href="https://fonts.googleapis.com/css2?family=Roboto:wght@300;500&family=Roboto+Mono:wght@300;500&display=swap" rel="stylesheet">
-    <link rel="icon" type="image/png" sizes="192x192" href="static/img/favicon/192x192.png">
-    <link rel="icon" type="image/png" sizes="96x96" href="static/img/favicon/96x96.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="static/img/favicon/32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="static/img/favicon/16x16.png">
+    <link rel="icon" type="image/png" sizes="192x192" href="/static/img/favicon/192x192.png">
+    <link rel="icon" type="image/png" sizes="96x96" href="/static/img/favicon/96x96.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="/static/img/favicon/32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/static/img/favicon/16x16.png">
 </head>
 <body>
     <div id="loading">
-        <img src="static/img/loading.svg">
+        <img src="/static/img/loading.svg">
     </div>
\ No newline at end of file