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/map_editor.css

@@ -7,10 +7,6 @@
     z-index: 1;
 }
 
-#jumpForm {
-    display: inline;
-}
-
 /* modify the cursor for the Leaflet map */
 .leaflet-container {
     cursor: crosshair;

public/static/js/map_editor.js

@@ -323,7 +323,7 @@
                 .on('click', function () {
                     MapEditor.select(this);
                 });
-    
+
             MapEditor.select(marker);
         }
     };
@@ -357,23 +357,23 @@
             }
         },
 
-        extractCoordinates: function(coordinatesStr) {
+        extractCoordinates: function (coordinatesStr) {
-            var coordinates = {valid: false, latlng: {lat: 0., lng: 0.}};
+            var coordinates = { valid: false, latlng: { lat: 0., lng: 0. } };
             var delimiters = [',', ' ', ';'];
 
             coordinatesStr = coordinatesStr.trim();
-            if(coordinatesStr.length == 0) {
+            if (coordinatesStr.length == 0) {
                 return coordinates;
             }
 
-            for(var delimiter of delimiters) {
+            for (var delimiter of delimiters) {
-                if(coordinatesStr.indexOf(delimiter) != -1) {
+                if (coordinatesStr.indexOf(delimiter) != -1) {
 
                     var coordinatesArr = coordinatesStr.split(delimiter);
                     coordinates.latlng.lat = parseFloat(coordinatesArr[0]);
                     coordinates.latlng.lng = parseFloat(coordinatesArr[1]);
 
-                    if( !isNaN(coordinates.latlng.lat) && !isNaN(coordinates.latlng.lng) ) {
+                    if (!isNaN(coordinates.latlng.lat) && !isNaN(coordinates.latlng.lng)) {
                         coordinates.valid = true;
                         return coordinates;
                     }
@@ -477,7 +477,7 @@
         var coordinatesStr = document.getElementById("jumpCoordinates").value;
         var coordinates = Util.extractCoordinates(coordinatesStr);
 
-        if(coordinates.valid) {
+        if (coordinates.valid) {
             MapEditor.placeMarker(coordinates.latlng);
         }
     };
@@ -487,10 +487,10 @@
         var coordinates = Util.extractCoordinates(coordinatesStr);
         var jumpButton = document.getElementById("jumpButton");
 
-        if(coordinates.valid) {
+        if (coordinates.valid) {
             jumpButton.disabled = false;
 
-            if(e.key == 'Enter') {
+            if (e.key == 'Enter') {
                 MapEditor.placeMarker(coordinates.latlng);
             }
         }

scripts/install.sh

@@ -16,7 +16,7 @@ echo "Installing Yarn packages..."
 (cd ${ROOT_DIR}/public/static && yarn install)
 
 echo "Installing MapGuesser DB..."
-mysql --host=${DB_HOST} --user=${DB_USER} --password=${DB_PASSWORD} ${DB_NAME} < ${ROOT_DIR}/db/mapguesser.sql
+mysql --host=${DB_HOST} --user=${DB_USER} --password=${DB_PASSWORD} ${DB_NAME} < ${ROOT_DIR}/database/mapguesser.sql
 
 echo "Migrating DB..."
 (cd ${ROOT_DIR} && ./mapg db:migrate)

src/Controller/GameController.php

@@ -92,6 +92,9 @@ class GameController
                 'rounds' => [],
                 'currentRound' => -1
             ]);
+        } else { // update the area of the map in the session in any case
+            $state['area'] = $map->getArea();
+            $session->set('state', $state);
         }
 
         return new JsonContent([

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