From b3caf1fb382a41d7ac726f867f8095000e22dba3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C5=91cze=20Bence?= <bence@pocze.ch>
Date: Fri, 12 Jun 2020 19:23:11 +0200
Subject: [PATCH] MAPG-28 adapt cssFiles and jsFiles to the new handler

---
 views/admin/map_editor.php | 19 ++++++++++++++-----
 views/game.php             | 12 +++++++++---
 views/login.php            |  6 +++++-
 views/maps.php             |  6 +++++-
 4 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/views/admin/map_editor.php b/views/admin/map_editor.php
index 46fc19d..cefbb24 100644
--- a/views/admin/map_editor.php
+++ b/views/admin/map_editor.php
@@ -1,4 +1,17 @@
-<?php $cssFiles = ['/static/node_modules/leaflet/dist/leaflet.css', '/static/css/map_editor.css', '/static/node_modules/leaflet.markercluster/dist/MarkerCluster.css', '/static/node_modules/leaflet.markercluster/dist/MarkerCluster.Default.css']; ?>
+<?php
+$cssFiles = [
+    'node_modules/leaflet/dist/leaflet.css',
+    'css/map_editor.css',
+    'node_modules/leaflet.markercluster/dist/MarkerCluster.css',
+    'node_modules/leaflet.markercluster/dist/MarkerCluster.Default.css'
+];
+$jsFiles = [
+    'node_modules/leaflet/dist/leaflet.js',
+    'node_modules/leaflet.markercluster/dist/leaflet.markercluster.js',
+    'https://maps.googleapis.com/maps/api/js?key=' . $_ENV['GOOGLE_MAPS_JS_API_KEY'],
+    'js/map_editor.js',
+];
+?>
 <?php require ROOT . '/views/templates/main_header.php'; ?>
 <div class="header small">
     <div class="grid">
@@ -67,8 +80,4 @@
     var mapBounds = <?= json_encode($bounds) ?>;
     var places = <?= json_encode($places, JSON_FORCE_OBJECT) ?>;
 </script>
-<script src="/static/node_modules/leaflet/dist/leaflet.js"></script>
-<script src="/static/node_modules/leaflet.markercluster/dist/leaflet.markercluster.js"></script>
-<script src="https://maps.googleapis.com/maps/api/js?key=<?= $_ENV['GOOGLE_MAPS_JS_API_KEY'] ?>"></script>
-<script src="/static/js/map_editor.js"></script>
 <?php require ROOT . '/views/templates/main_footer.php'; ?>
\ No newline at end of file
diff --git a/views/game.php b/views/game.php
index 8540a7f..e026764 100644
--- a/views/game.php
+++ b/views/game.php
@@ -1,4 +1,12 @@
-<?php $cssFiles = ['/static/css/game.css']; ?>
+<?php
+$cssFiles = [
+    'css/game.css'
+];
+$jsFiles = [
+    'https://maps.googleapis.com/maps/api/js?key=' . $_ENV['GOOGLE_MAPS_JS_API_KEY'],
+    'js/game.js',
+];
+?>
 <?php require ROOT . '/views/templates/main_header.php'; ?>
 <div class="header small">
     <div class="grid">
@@ -53,6 +61,4 @@
     var mapId = <?= $mapId ?>;
     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 ROOT . '/views/templates/main_footer.php'; ?>
\ No newline at end of file
diff --git a/views/login.php b/views/login.php
index 565e7aa..de040c1 100644
--- a/views/login.php
+++ b/views/login.php
@@ -1,3 +1,8 @@
+<?php
+$jsFiles = [
+    'js/login.js',
+];
+?>
 <?php require ROOT . '/views/templates/main_header.php'; ?>
 <?php require ROOT . '/views/templates/header.php'; ?>
 <div class="main">
@@ -13,5 +18,4 @@
         </form>
     </div>
 </div>
-<script src="/static/js/login.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 f7a8ba1..e438b5e 100644
--- a/views/maps.php
+++ b/views/maps.php
@@ -1,4 +1,8 @@
-<?php $cssFiles = ['/static/css/maps.css']; ?>
+<?php
+$cssFiles = [
+    'css/maps.css'
+];
+?>
 <?php require ROOT . '/views/templates/main_header.php'; ?>
 <?php require ROOT . '/views/templates/header.php'; ?>
 <div class="main">