MAPG-180 declare CSS and JS files

views/admin/map_editor.php

@@ -1,19 +1,12 @@
-@extra
-<?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',
-];
-?>
-@endextra
+@css('node_modules/leaflet/dist/leaflet.css')
+@css('css/map_editor.css')
+@css('node_modules/leaflet.markercluster/dist/MarkerCluster.css')
+@css('node_modules/leaflet.markercluster/dist/MarkerCluster.Default.css')
+
+@js('node_modules/leaflet/dist/leaflet.js')
+@js('node_modules/leaflet.markercluster/dist/leaflet.markercluster.js')
+@js('https://maps.googleapis.com/maps/api/js?key=' . $_ENV['GOOGLE_MAPS_JS_API_KEY'])
+@js('js/map_editor.js')
 
 @extends('templates/layout_full')
 

views/game.php

@@ -1,14 +1,7 @@
-@extra
-<?php
-$cssFiles = [
-    'css/game.css'
-];
-$jsFiles = [
-    'https://maps.googleapis.com/maps/api/js?key=' . $_ENV['GOOGLE_MAPS_JS_API_KEY'],
-    'js/game.js',
-];
-?>
-@endextra
+@css('css/game.css')
+
+@js('https://maps.googleapis.com/maps/api/js?key=' . $_ENV['GOOGLE_MAPS_JS_API_KEY'])
+@js('js/game.js')
 
 @extends('templates/layout_full')
 

views/login/google_signup.php

@@ -1,10 +1,4 @@
-@extra
-<?php
-$jsFiles = [
-    'js/login/google_signup.js',
-];
-?>
-@endextra
+@js('js/login/google_signup.js')
 
 @extends('templates/layout_normal')
 

views/login/signup.php

@@ -1,10 +1,4 @@
-@extra
-<?php
-$jsFiles = [
-    'js/login/signup.js',
-];
-?>
-@endextra
+@js('js/login/signup.js')
 
 @extends('templates/layout_normal')
 

views/maps.php

@@ -1,16 +1,7 @@
-@extra
-<?php
-$cssFiles = [
-    'css/maps.css'
-];
-$jsFiles = [
-    'js/maps.js',
-];
-if ($isAdmin) {
-    $jsFiles[] = 'js/maps_admin.js';
-}
-?>
-@endextra
+@css('css/maps.css')
+@js('js/maps.js')
+TODO: condition!
+@js('js/maps_admin.js')
 
 @extends('templates/layout_normal')
 

views/templates/mapguesser.php

@@ -16,6 +16,7 @@
         <?php endforeach; ?>
     <?php endif; ?>
     <link href="https://fonts.googleapis.com/css2?family=Roboto:wght@300;500&display=swap" rel="stylesheet">
+    @yields('inlineCss')
     <link rel="icon" type="image/png" sizes="192x192" href="<?= $_ENV['STATIC_ROOT'] ?>/img/favicon/192x192.png?rev=<?= REVISION ?>">
     <link rel="icon" type="image/png" sizes="96x96" href="<?= $_ENV['STATIC_ROOT'] ?>/img/favicon/96x96.png?rev=<?= REVISION ?>">
     <link rel="icon" type="image/png" sizes="32x32" href="<?= $_ENV['STATIC_ROOT'] ?>/img/favicon/32x32.png?rev=<?= REVISION ?>">
@@ -62,6 +63,7 @@
             <script src="<?= $jsFile ?>"></script>
         <?php endforeach; ?>
     <?php endif; ?>
+    @yields('inlineJs')
     <?php if (!isset($_COOKIE['COOKIES_CONSENT'])): ?>
         <script>
             (function () {