Merge pull request 'fix typo' (#29) from feature/modify-author into develop

Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/29

multi/package.json

@@ -8,6 +8,6 @@
         "ws": "^7.4.4"
     },
     "scripts": {},
-    "author": "Pőcze Bence <bence@pocze.ch>",
+    "author": "Pőcze Bence and The MapGuesser Contributors <bence@pocze.ch>",
     "license": "GNU AGPL 3.0"
 }

public/static/css/game.css

@@ -149,48 +149,15 @@
     color: #701919;
 }
 
-#navigation {
-    position: absolute;
-    z-index: 2;
-}
-
-#navigation .navigationItem {
-    margin-top: 10px;
-    opacity: 70%;
-}
-
-#navigation .navigationItem:hover {
-    opacity: 100%;
-}
-
-#navigation span {
-    position: absolute;
-}
-
-#navigation .circleBackground {
-    width: 100%;
-    height: 100%;
-    opacity: 50%;
-}
-
-#navigation .navigationIcon {
-    width: 75%;
-    height: 75%;
-    margin: auto;
-    margin-top: 50%;
-    transform: translateY(-50%);
-    -ms-transform: translateY(-50%);
-}
-
 @media screen and (max-width: 599px) {
     #mapName {
         display: none;
     }
     #showGuessButtonContainer {
         position: absolute;
-        left: 60px;
+        left: 20px;
         bottom: 30px;
-        right: 60px;
+        right: 20px;
         z-index: 2;
     }
     #guess {
@@ -205,14 +172,6 @@
     #scoreBarBase {
         width: 100%;
     }
-    #navigation {
-        bottom: 25px;
-        left: 5px;
-        width: 45px;
-    }
-    #navigation .navigationItem {
-        height: 45px;
-    }
 }
 
 @media screen and (min-width: 600px) {
@@ -256,14 +215,6 @@
     #scoreBarBase {
         width: 60%;
     }
-    #navigation {
-        bottom: 50px;
-        left: 20px;
-        width: 60px;
-    }
-    #navigation .navigationItem {
-        height: 60px;
-    }
     @media screen and (max-height: 424px) {
         #guess {
             top: 10px;
@@ -278,13 +229,5 @@
             right: 20px;
             bottom: 30px;
         }
-        #navigation {
-            bottom: 30px;
-            left: 10px;
-            width: 45px;
-        }
-        #navigation .navigationItem {
-            height: 45px;
-        }
     }
 }

public/static/img/circle_background.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 16 16">
-  <circle cx="50%" cy="50%" r="50%" fill="black" />
-</svg>

public/static/img/compass.svg

@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
-  <polygon id="needleNorth" points="50,0 33,50 66,50" style="fill:red;stroke:black;stroke-width:1" />
-  <polygon id="needleSouth" points="50,100 33,50 66,50" style="fill:white;stroke:black;stroke-width:1" />
-  Sorry, your browser does not support inline SVG.
-</svg>

public/static/img/house-fill.svg

@@ -1,5 +0,0 @@
-<!-- Original image: Copyright (c) 2019 The Bootstrap Authors. License can be found in 'USED_SOFTWARE' in section 'Bootstrap Icons'. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" fill="#3183ce" viewBox="0 0 16 16">
-  <path fill-rule="evenodd" d="m8 3.293 6 6V13.5a1.5 1.5 0 0 1-1.5 1.5h-9A1.5 1.5 0 0 1 2 13.5V9.293l6-6zm5-.793V6l-2-2V2.5a.5.5 0 0 1 .5-.5h1a.5.5 0 0 1 .5.5z"/>
-  <path fill-rule="evenodd" d="M7.293 1.5a1 1 0 0 1 1.414 0l6.647 6.646a.5.5 0 0 1-.708.708L8 2.207 1.354 8.854a.5.5 0 1 1-.708-.708L7.293 1.5z"/>
-</svg>

public/static/js/game.js

@@ -379,13 +379,6 @@
             document.getElementById('currentRound').innerHTML = String(Game.rounds.length) + '/' + String(Game.NUMBER_OF_ROUNDS);
 
             Game.loadPano(Game.panoId, Game.pov);
-
-            // needs to be set visible after the show guess map hid it in mobile view
-            document.getElementById("navigation").style.visibility = 'visible';
-
-            // update the compass
-            const heading = Game.panorama.getPov().heading;
-            document.getElementById("compass").style.transform = "rotate(" + heading + "deg)";
         },
 
         handleErrorResponse: function (error) {
@@ -862,9 +855,6 @@
 
     Game.panorama.addListener('pov_changed', function () {
         Game.rewriteGoogleLink();
-
-        const heading = Game.panorama.getPov().heading;
-        document.getElementById("compass").style.transform = "rotate(" + heading + "deg)";
     });
 
     if (COOKIES_CONSENT) {
@@ -874,13 +864,11 @@
     document.getElementById('showGuessButton').onclick = function () {
         this.style.visibility = 'hidden';
         document.getElementById('guess').style.visibility = 'visible';
-        document.getElementById('navigation').style.visibility = 'hidden';
     }
 
     document.getElementById('closeGuessButton').onclick = function () {
         document.getElementById('showGuessButton').style.visibility = null;
         document.getElementById('guess').style.visibility = null;
-        document.getElementById('navigation').style.visibility = 'visible';
     }
 
     document.getElementById('guessButton').onclick = function () {
@@ -948,8 +936,4 @@
             }
         });
     }
-
-    document.getElementById('returnToStart').onclick = function () {
-        Game.loadPano(Game.panoId, Game.pov);
-    }
 })();

views/game.php

@@ -59,24 +59,6 @@
             <button id="startNewGameButton" class="fullWidth">Play this map again</button>
         </div>
     </div>
-    <div id="navigation">
-        <div id="compass" class="navigationItem">
-            <span>
-                <img src="<?= $_ENV['STATIC_ROOT'] ?>/img/circle_background.svg?rev=<?= REVISION ?>" alt="Circle Background" class="circleBackground" />
-            </span>
-            <span>
-                <img src="<?= $_ENV['STATIC_ROOT'] ?>/img/compass.svg?rev=<?= REVISION ?>" alt="compass icon" class="navigationIcon" />
-            </span>
-        </div>
-        <div id="returnToStart" class="navigationItem">
-            <span>
-                <img src="<?= $_ENV['STATIC_ROOT'] ?>/img/circle_background.svg?rev=<?= REVISION ?>" alt="Circle Background" class="circleBackground" />
-            </span>
-            <span>
-                <img src="<?= $_ENV['STATIC_ROOT'] ?>/img/house-fill.svg?rev=<?= REVISION ?>" alt="Return to Start icon" class="navigationIcon" />
-            </span>
-        </div>
-    </div>
 @endsection
 
 @section(pageScript)

views/templates/layout_normal.php

@@ -29,6 +29,6 @@
 </main>
 <footer>
     <p><span class="bold"><?= $_ENV['APP_NAME'] ?></span> <?= str_replace('Release_', '', VERSION) ?></p><!--
- --><p>&copy; Pőcze Bence <?= (new DateTime(REVISION_DATE))->format('Y') ?></p>
+ --><p>&copy; The MapGuesser Contributors <?= (new DateTime(REVISION_DATE))->format('Y') ?></p>
 </footer>
 @endsection