diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 575659b2e05b434c2275a364e170a4d7ef81cfcb..9b34e92df1a57bd6622b801e4a5256a9b3abf48b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ update(maps.metager.de): - cd ~/.MetaGerMaps - composer install - npm install - - npm run dev + - npm run prod - cp ~/.env . - chmod -R 777 storage - chmod -R 777 bootstrap/cache diff --git a/config/tileserver.php b/config/tileserver.php index 66bc355ae96cb2b47affeeaf74f5b636d73c17b0..1a6cc8ae0f9c4ed20ac8ddcb4b619fc7fb19a21b 100644 --- a/config/tileserver.php +++ b/config/tileserver.php @@ -1,6 +1,6 @@ <?php return [ - 'TILESERVER_HOST'=> 'localhost', + 'TILESERVER_HOST'=> 'maps.metager.de', 'TILESERVER_PORT'=> 63825 ]; \ No newline at end of file diff --git a/resources/views/map.blade.php b/resources/views/map.blade.php index 753f9092f055a7e641b22a78a0d72bb96b8dcdda..dd5e9b02de33b9449ea4a9622ec6d6a7ab9da010 100644 --- a/resources/views/map.blade.php +++ b/resources/views/map.blade.php @@ -296,7 +296,6 @@ } </script> <script src="{{ mix('/js/modules.js') }}" type="text/javascript" defer></script> - <script src="{{ mix('/js/ol.js') }}" type="module" defer></script> <script src="{{ mix('js/map.js') }}" type="text/javascript" defer></script> </body> </html> diff --git a/webpack.mix.js b/webpack.mix.js index 4d057719d4dbffd043f0936f58cc8e98ed2f68d4..aa6e4902d8fe1a437f1b1d2b0bc4d997079f24ef 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -13,9 +13,9 @@ let mix = require("laravel-mix"); mix .js("resources/assets/js/modules.js", "public/js") - .scripts(["resources/assets/js/ol.js"], "public/js/ol.js") - .scripts( + .babel( [ + "resources/assets/js/ol.js", "resources/assets/js/md5.js", "resources/assets/js/jquery.min.js", "resources/assets/js/jquery-ui.min.js",