Merge branch 'release/0.16.4'

app/Http/Middleware/CSPHeader.php

@@ -47,7 +47,8 @@ p.typekit.net; \
 font-src 'self' \
 https://fonts.gstatic.com \
 use.typekit.net \
-fonts.typekit.net; \
+fonts.typekit.net \
+data:; \
 connect-src 'self' \
 https://api.mapbox.com \
 https://*.tiles.mapbox.com \
@@ -55,7 +56,6 @@ performance.typekit.net \
 data: blob:; \
 worker-src 'self' blob:; \
 frame-src 'self' https://www.youtube.com blob:; \
-child-src 'self' blob:; \
 upgrade-insecure-requests; \
 block-all-mixed-content; \
 report-to csp-endpoint; \

changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Version 0.16.4
+  - Improve CSP headers
+  - Fix the map style menu in mapbox maps
+
 ## Version 0.16.3 (2018-04-12)
   - Improve JSON feed conformance
 

composer.json

@@ -34,7 +34,7 @@
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "~3.0",
-        "codedungeon/phpunit-result-printer": "^0.12.0",
+        "codedungeon/phpunit-result-printer": "^0.14.0",
         "filp/whoops": "~2.0",
         "fzaninotto/faker": "~1.4",
         "jakub-onderka/php-parallel-lint": "^1.0.0",

composer.lock

@@ -1,23 +1,23 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "4127c4d74e7fbc79a541790fb5ea9d73",
+    "content-hash": "5e37bcec0043b7e6fe14b16f9602255f",
     "packages": [
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.54.2",
+            "version": "3.54.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "17c2c7a47f54161d23b9a943b1c36600051cb93c"
+                "reference": "6642a13df7ddcccf19e66c744c5bfae5b61e9e85"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/17c2c7a47f54161d23b9a943b1c36600051cb93c",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/6642a13df7ddcccf19e66c744c5bfae5b61e9e85",
-                "reference": "17c2c7a47f54161d23b9a943b1c36600051cb93c",
+                "reference": "6642a13df7ddcccf19e66c744c5bfae5b61e9e85",
                 "shasum": ""
             },
             "require": {
@@ -84,7 +84,7 @@
                 "s3",
                 "sdk"
             ],
-            "time": "2018-04-06T18:01:00+00:00"
+            "time": "2018-04-10T22:11:31+00:00"
         },
         {
             "name": "bosnadev/database",
@@ -698,16 +698,16 @@
         },
         {
             "name": "doctrine/dbal",
-            "version": "v2.7.0",
+            "version": "v2.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "f76bf5ef631cec551a86c2291fc749534febebf1"
+                "reference": "11037b4352c008373561dc6fc836834eed80c3b5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/f76bf5ef631cec551a86c2291fc749534febebf1",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/11037b4352c008373561dc6fc836834eed80c3b5",
-                "reference": "f76bf5ef631cec551a86c2291fc749534febebf1",
+                "reference": "11037b4352c008373561dc6fc836834eed80c3b5",
                 "shasum": ""
             },
             "require": {
@@ -769,7 +769,7 @@
                 "persistence",
                 "queryobject"
             ],
-            "time": "2018-04-01T23:33:17+00:00"
+            "time": "2018-04-07T18:44:18+00:00"
         },
         {
             "name": "doctrine/inflector",
@@ -943,16 +943,16 @@
         },
         {
             "name": "egulias/email-validator",
-            "version": "2.1.3",
+            "version": "2.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/egulias/EmailValidator.git",
-                "reference": "1bec00a10039b823cc94eef4eddd47dcd3b2ca04"
+                "reference": "8790f594151ca6a2010c6218e09d96df67173ad3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/1bec00a10039b823cc94eef4eddd47dcd3b2ca04",
+                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/8790f594151ca6a2010c6218e09d96df67173ad3",
-                "reference": "1bec00a10039b823cc94eef4eddd47dcd3b2ca04",
+                "reference": "8790f594151ca6a2010c6218e09d96df67173ad3",
                 "shasum": ""
             },
             "require": {
@@ -961,7 +961,7 @@
             },
             "require-dev": {
                 "dominicsayers/isemail": "dev-master",
-                "phpunit/phpunit": "^4.8.35",
+                "phpunit/phpunit": "^4.8.35||^5.7||^6.0",
                 "satooshi/php-coveralls": "^1.0.1"
             },
             "suggest": {
@@ -996,7 +996,7 @@
                 "validation",
                 "validator"
             ],
-            "time": "2017-11-15T23:40:40+00:00"
+            "time": "2018-04-10T10:11:19+00:00"
         },
         {
             "name": "erusev/parsedown",
@@ -1945,16 +1945,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v5.6.15",
+            "version": "v5.6.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "baa42cf6bdd942523fafece21ec16a1843c6db0f"
+                "reference": "fcdbc791bc3e113ada38ab0a1147141fb9ec2b16"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/baa42cf6bdd942523fafece21ec16a1843c6db0f",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/fcdbc791bc3e113ada38ab0a1147141fb9ec2b16",
-                "reference": "baa42cf6bdd942523fafece21ec16a1843c6db0f",
+                "reference": "fcdbc791bc3e113ada38ab0a1147141fb9ec2b16",
                 "shasum": ""
             },
             "require": {
@@ -2019,6 +2019,7 @@
                 "aws/aws-sdk-php": "~3.0",
                 "doctrine/dbal": "~2.6",
                 "filp/whoops": "^2.1.4",
+                "league/flysystem-cached-adapter": "~1.0",
                 "mockery/mockery": "~1.0",
                 "moontoast/math": "^1.1",
                 "orchestra/testbench-core": "3.6.*",
@@ -2037,7 +2038,7 @@
                 "guzzlehttp/guzzle": "Required to use the Mailgun and Mandrill mail drivers and the ping methods on schedules (~6.0).",
                 "laravel/tinker": "Required to use the tinker console command (~1.0).",
                 "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (~1.0).",
-                "league/flysystem-cached-adapter": "Required to use Flysystem caching (~1.0).",
+                "league/flysystem-cached-adapter": "Required to use the Flysystem cache (~1.0).",
                 "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~1.0).",
                 "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (~1.0).",
                 "nexmo/client": "Required to use the Nexmo transport (~1.0).",
@@ -2079,7 +2080,7 @@
                 "framework",
                 "laravel"
             ],
-            "time": "2018-03-30T13:29:58+00:00"
+            "time": "2018-04-09T16:07:04+00:00"
         },
         {
             "name": "laravel/horizon",
@@ -3537,20 +3538,20 @@
         },
         {
             "name": "spatie/browsershot",
-            "version": "3.19.0",
+            "version": "3.20.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/browsershot.git",
-                "reference": "3830660e63dd74617fd9db6c192b89f897f21d49"
+                "reference": "d5abc3b88c1a3ff0f45dc09eb15681b132b7e971"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/browsershot/zipball/3830660e63dd74617fd9db6c192b89f897f21d49",
+                "url": "https://api.github.com/repos/spatie/browsershot/zipball/d5abc3b88c1a3ff0f45dc09eb15681b132b7e971",
-                "reference": "3830660e63dd74617fd9db6c192b89f897f21d49",
+                "reference": "d5abc3b88c1a3ff0f45dc09eb15681b132b7e971",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0",
+                "php": "^7.1",
                 "spatie/image": "^1.4",
                 "spatie/temporary-directory": "^1.1",
                 "symfony/process": "^3.0|^4.0"
@@ -3589,20 +3590,20 @@
                 "screenshot",
                 "webpage"
             ],
-            "time": "2018-04-03T09:56:43+00:00"
+            "time": "2018-04-12T11:13:06+00:00"
         },
         {
             "name": "spatie/image",
-            "version": "1.4.1",
+            "version": "1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/image.git",
-                "reference": "9ac824e02ae9ebcb6a74160d6dd9ab73a42f0e4f"
+                "reference": "2ff09d9eafbeccc71f29ee7a9eb6169a856df75e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/image/zipball/9ac824e02ae9ebcb6a74160d6dd9ab73a42f0e4f",
+                "url": "https://api.github.com/repos/spatie/image/zipball/2ff09d9eafbeccc71f29ee7a9eb6169a856df75e",
-                "reference": "9ac824e02ae9ebcb6a74160d6dd9ab73a42f0e4f",
+                "reference": "2ff09d9eafbeccc71f29ee7a9eb6169a856df75e",
                 "shasum": ""
             },
             "require": {
@@ -3613,6 +3614,7 @@
                 "symfony/process": "^3.0|^4.0"
             },
             "require-dev": {
+                "larapack/dd": "^1.1",
                 "phpunit/phpunit": "^6.0|^7.0",
                 "symfony/var-dumper": "^3.2"
             },
@@ -3640,7 +3642,7 @@
                 "image",
                 "spatie"
             ],
-            "time": "2018-02-08T09:09:05+00:00"
+            "time": "2018-04-13T11:53:18+00:00"
         },
         {
             "name": "spatie/image-optimizer",
@@ -3693,23 +3695,23 @@
         },
         {
             "name": "spatie/temporary-directory",
-            "version": "1.1.3",
+            "version": "1.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/temporary-directory.git",
-                "reference": "e3da5b7a00c6610bc0b18480815fe09adf73383b"
+                "reference": "5e1799fa2297363ebfb4df296fea90afbd4ef9b7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/temporary-directory/zipball/e3da5b7a00c6610bc0b18480815fe09adf73383b",
+                "url": "https://api.github.com/repos/spatie/temporary-directory/zipball/5e1799fa2297363ebfb4df296fea90afbd4ef9b7",
-                "reference": "e3da5b7a00c6610bc0b18480815fe09adf73383b",
+                "reference": "5e1799fa2297363ebfb4df296fea90afbd4ef9b7",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "5.*"
+                "phpunit/phpunit": "^6.3"
             },
             "type": "library",
             "autoload": {
@@ -3735,7 +3737,7 @@
                 "spatie",
                 "temporary-directory"
             ],
-            "time": "2017-09-11T08:51:13+00:00"
+            "time": "2018-04-12T09:34:43+00:00"
         },
         {
             "name": "swiftmailer/swiftmailer",
@@ -4897,16 +4899,16 @@
         },
         {
             "name": "codedungeon/phpunit-result-printer",
-            "version": "0.12.2",
+            "version": "0.14.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mikeerickson/phpunit-pretty-result-printer.git",
-                "reference": "a3f8ba9e716f0e8818b6d01040002888ecc00cb3"
+                "reference": "fe0624ebe81a6dcc4441ace455b419b590cbb51e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mikeerickson/phpunit-pretty-result-printer/zipball/a3f8ba9e716f0e8818b6d01040002888ecc00cb3",
+                "url": "https://api.github.com/repos/mikeerickson/phpunit-pretty-result-printer/zipball/fe0624ebe81a6dcc4441ace455b419b590cbb51e",
-                "reference": "a3f8ba9e716f0e8818b6d01040002888ecc00cb3",
+                "reference": "fe0624ebe81a6dcc4441ace455b419b590cbb51e",
                 "shasum": ""
             },
             "require": {
@@ -4916,7 +4918,7 @@
                 "symfony/yaml": "^2.7|^3.0|^4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": ">=7.1",
+                "phpunit/phpunit": "7.1.1",
                 "spatie/phpunit-watcher": "^1.5"
             },
             "type": "library",
@@ -4944,7 +4946,7 @@
                 "result-printer",
                 "testing"
             ],
-            "time": "2018-04-06T23:59:42+00:00"
+            "time": "2018-04-08T17:45:48+00:00"
         },
         {
             "name": "doctrine/instantiator",
@@ -6181,16 +6183,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "7.1.1",
+            "version": "7.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "f7fe5127889519e421600fe0feeb113a5e210f20"
+                "reference": "a7834993ddbf4b0ed2c3b2dc1f3b1d093ef910a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f7fe5127889519e421600fe0feeb113a5e210f20",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a7834993ddbf4b0ed2c3b2dc1f3b1d093ef910a9",
-                "reference": "f7fe5127889519e421600fe0feeb113a5e210f20",
+                "reference": "a7834993ddbf4b0ed2c3b2dc1f3b1d093ef910a9",
                 "shasum": ""
             },
             "require": {
@@ -6208,7 +6210,7 @@
                 "phpunit/php-file-iterator": "^1.4.3",
                 "phpunit/php-text-template": "^1.2.1",
                 "phpunit/php-timer": "^2.0",
-                "phpunit/phpunit-mock-objects": "^6.1",
+                "phpunit/phpunit-mock-objects": "^6.1.1",
                 "sebastian/comparator": "^2.1",
                 "sebastian/diff": "^3.0",
                 "sebastian/environment": "^3.1",
@@ -6257,20 +6259,20 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2018-04-06T12:39:30+00:00"
+            "time": "2018-04-13T02:28:50+00:00"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
-            "version": "6.1.0",
+            "version": "6.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "3f5ca97eee66a07951d018f6726017629c85c86d"
+                "reference": "70c740bde8fd9ea9ea295be1cd875dd7b267e157"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/3f5ca97eee66a07951d018f6726017629c85c86d",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/70c740bde8fd9ea9ea295be1cd875dd7b267e157",
-                "reference": "3f5ca97eee66a07951d018f6726017629c85c86d",
+                "reference": "70c740bde8fd9ea9ea295be1cd875dd7b267e157",
                 "shasum": ""
             },
             "require": {
@@ -6313,7 +6315,7 @@
                 "mock",
                 "xunit"
             ],
-            "time": "2018-04-06T08:14:40+00:00"
+            "time": "2018-04-11T04:50:36+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",

database/seeds/NotesTableSeeder.php

@@ -27,6 +27,13 @@ class NotesTableSeeder extends Seeder
         $noteWithPlace->place()->associate($place);
         $noteWithPlace->save();
         sleep(1);
+        $noteWithPlaceTwo = Note::create([
+            'note' => 'It’s really good',
+        ]);
+        $place = Place::find(1);
+        $noteWithPlaceTwo->place()->associate($place);
+        $noteWithPlaceTwo->save();
+        sleep(1);
         $noteWithContact = Note::create([
             'note' => 'Hi @tantek'
         ]);

package.json

@@ -7,38 +7,38 @@
     "dependencies": {
         "a11y.css": "^4.5.0",
         "alertify.js": "^1.0.12",
-        "mapbox-gl": "^0.44.1",
+        "mapbox-gl": "^0.44.2",
-        "marked": "^0.3.17",
+        "marked": "^0.3.19",
         "normalize.css": "^8.0.0"
     },
     "devDependencies": {
-        "@babel/core": "^7.0.0-beta.40",
+        "@babel/core": "^7.0.0-beta.44",
-        "@babel/preset-env": "^7.0.0-beta.40",
+        "@babel/preset-env": "^7.0.0-beta.44",
-        "ajv": "^6.2.0",
+        "ajv": "^6.4.0",
         "ajv-keywords": "^3.1.0",
-        "autoprefixer": "^8.0.0",
+        "autoprefixer": "^8.2.0",
         "babel-cli": "^6.26.0",
         "babel-loader": "^8.0.0-beta.2",
         "babel-preset-env": "^1.6.1",
         "babel-runtime": "^6.26.0",
         "dotenv-webpack": "^1.5.5",
-        "eslint": "^4.18.1",
+        "eslint": "^4.19.1",
         "eslint-config-standard": "^11.0.0",
-        "eslint-plugin-import": "^2.9.0",
+        "eslint-plugin-import": "^2.11.0",
         "eslint-plugin-node": "^6.0.1",
-        "eslint-plugin-promise": "^3.6.0",
+        "eslint-plugin-promise": "^3.7.0",
         "eslint-plugin-standard": "^3.0.1",
-        "husky": "^0.15.0-rc.8",
+        "husky": "^0.15.0-rc.13",
-        "lint-staged": "^7.0.0",
+        "lint-staged": "^7.0.4",
         "postcss-cli": "^5.0.0",
         "postcss-sass": "^0.3.0",
         "pre-commit": "^1.1.3",
         "source-list-map": "^2.0.0",
-        "stylelint": "^9.1.1",
+        "stylelint": "^9.2.0",
         "stylelint-config-standard": "^18.2.0",
-        "uglify-js": "^3.3.12",
+        "uglify-js": "^3.3.21",
-        "webpack": "^4.0.1",
+        "webpack": "^4.5.0",
-        "webpack-cli": "^2.0.9",
+        "webpack-cli": "^2.0.14",
         "webpack-sources": "^1.1.0"
     },
     "scripts": {

public/assets/js/a11y.js

@@ -1,2 +1,2 @@
-!function(e){var t={};function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{configurable:!1,enumerable:!0,get:r})},n.r=function(e){Object.defineProperty(e,"__esModule",{value:!0})},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=10)}({10:function(e,t){function n(){var e=document.querySelectorAll("link[rel=stylesheet]"),t=!1,n=!0,r=!1,o=void 0;try{for(var u,c=e[Symbol.iterator]();!(n=(u=c.next()).done);n=!0){"/assets/frontend/a11y.css/a11y-en.css"==u.value.attributes.href.nodeValue&&(t=!0)}}catch(e){r=!0,o=e}finally{try{n||null==c.return||c.return()}finally{if(r)throw o}}return t}document.querySelector('input[name="a11y.css"]').addEventListener("change",function(){this.checked?function(){if(0==n()){var e=document.createElement("link");e.setAttribute("rel","stylesheet"),e.setAttribute("href","/assets/frontend/a11y.css/a11y-en.css");var t=document.querySelector("head");t.appendChild(e)}}():function(){if(1==n()){var e=document.querySelector('link[href="/assets/frontend/a11y.css/a11y-en.css"]'),t=document.querySelector("head");t.removeChild(e)}}()})}});
+!function(e){var t={};function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{configurable:!1,enumerable:!0,get:r})},n.r=function(e){Object.defineProperty(e,"__esModule",{value:!0})},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="",n(n.s=10)}({10:function(e,t,n){"use strict";function r(){var e=document.querySelectorAll("link[rel=stylesheet]"),t=!1,n=!0,r=!1,o=void 0;try{for(var u,c=e[Symbol.iterator]();!(n=(u=c.next()).done);n=!0)"/assets/frontend/a11y.css/a11y-en.css"==u.value.attributes.href.nodeValue&&(t=!0)}catch(e){r=!0,o=e}finally{try{n||null==c.return||c.return()}finally{if(r)throw o}}return t}document.querySelector('input[name="a11y.css"]').addEventListener("change",function(){this.checked?function(){if(0==r()){var e=document.createElement("link");e.setAttribute("rel","stylesheet"),e.setAttribute("href","/assets/frontend/a11y.css/a11y-en.css"),document.querySelector("head").appendChild(e)}}():function(){if(1==r()){var e=document.querySelector('link[href="/assets/frontend/a11y.css/a11y-en.css"]');document.querySelector("head").removeChild(e)}}()})}});
 //# sourceMappingURL=a11y.js.map

public/assets/js/colours.js

@@ -1,2 +1,2 @@
-!function(e){var t={};function r(o){if(t[o])return t[o].exports;var n=t[o]={i:o,l:!1,exports:{}};return e[o].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.m=e,r.c=t,r.d=function(e,t,o){r.o(e,t)||Object.defineProperty(e,t,{configurable:!1,enumerable:!0,get:o})},r.r=function(e){Object.defineProperty(e,"__esModule",{value:!0})},r.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(t,"a",t),t},r.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},r.p="",r(r.s=9)}({9:function(e,t){var r=document.querySelector("#colourScheme").getAttribute("href").split("/").pop();document.getElementById("colourSchemeSelect").value=r;var o=document.getElementById("colourSchemeForm");o.childNodes[5].addEventListener("click",function(e){e.preventDefault();var t=document.getElementById("colourSchemeSelect").value,r=document.querySelector("#colourScheme"),n=r.getAttribute("href").split("/");n.pop(),n.push(t),r.setAttribute("href",n.join("/"));var c=new FormData(o);fetch("/update-colour-scheme",{method:"POST",credentials:"same-origin",body:c}).catch(function(e){console.warn(e)})})}});
+!function(e){var t={};function r(o){if(t[o])return t[o].exports;var n=t[o]={i:o,l:!1,exports:{}};return e[o].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.m=e,r.c=t,r.d=function(e,t,o){r.o(e,t)||Object.defineProperty(e,t,{configurable:!1,enumerable:!0,get:o})},r.r=function(e){Object.defineProperty(e,"__esModule",{value:!0})},r.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(t,"a",t),t},r.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},r.p="",r(r.s=9)}({9:function(e,t,r){"use strict";var o=document.querySelector("#colourScheme").getAttribute("href").split("/").pop();document.getElementById("colourSchemeSelect").value=o;var n=document.getElementById("colourSchemeForm");n.childNodes[5].addEventListener("click",function(e){e.preventDefault();var t=document.getElementById("colourSchemeSelect").value,r=document.querySelector("#colourScheme"),o=r.getAttribute("href").split("/");o.pop(),o.push(t),r.setAttribute("href",o.join("/"));var c=new FormData(n);fetch("/update-colour-scheme",{method:"POST",credentials:"same-origin",body:c}).catch(function(e){console.warn(e)})})}});
 //# sourceMappingURL=colours.js.map

public/assets/js/colours.js.map

@@ -1 +1 @@
-{"version":3,"sources":["webpack:///webpack/bootstrap","webpack:///./colours.js"],"names":["installedModules","__webpack_require__","moduleId","exports","module","i","l","modules","call","m","c","d","name","getter","o","Object","defineProperty","configurable","enumerable","get","r","value","n","__esModule","object","property","prototype","hasOwnProperty","p","s","css","document","querySelector","getAttribute","split","pop","getElementById","form","childNodes","addEventListener","e","preventDefault","newCss","link","parts","push","setAttribute","join","formData","FormData","fetch","method","credentials","body","catch","error","console","warn"],"mappings":"aACA,IAAAA,KAGA,SAAAC,EAAAC,GAGA,GAAAF,EAAAE,GACA,OAAAF,EAAAE,GAAAC,QAGA,IAAAC,EAAAJ,EAAAE,IACAG,EAAAH,EACAI,GAAA,EACAH,YAUA,OANAI,EAAAL,GAAAM,KAAAJ,EAAAD,QAAAC,IAAAD,QAAAF,GAGAG,EAAAE,GAAA,EAGAF,EAAAD,QAKAF,EAAAQ,EAAAF,EAGAN,EAAAS,EAAAV,EAGAC,EAAAU,EAAA,SAAAR,EAAAS,EAAAC,GACAZ,EAAAa,EAAAX,EAAAS,IACAG,OAAAC,eAAAb,EAAAS,GACAK,cAAA,EACAC,YAAA,EACAC,IAAAN,KAMAZ,EAAAmB,EAAA,SAAAjB,GACAY,OAAAC,eAAAb,EAAA,cAAiDkB,OAAA,KAIjDpB,EAAAqB,EAAA,SAAAlB,GACA,IAAAS,EAAAT,KAAAmB,WACA,WAA2B,OAAAnB,EAAA,SAC3B,WAAiC,OAAAA,GAEjC,OADAH,EAAAU,EAAAE,EAAA,IAAAA,GACAA,GAIAZ,EAAAa,EAAA,SAAAU,EAAAC,GAAsD,OAAAV,OAAAW,UAAAC,eAAAnB,KAAAgB,EAAAC,IAGtDxB,EAAA2B,EAAA,GAIA3B,IAAA4B,EAAA,qBCjEA,IAEIC,EAFOC,SAASC,cAAc,iBAEnBC,aAAa,QAAQC,MAAM,KAAKC,MAG/CJ,SAASK,eAAe,sBAAsBf,MAAQS,EAGtD,IAAIO,EAAON,SAASK,eAAe,oBACzBC,EAAKC,WAAW,GACtBC,iBAAiB,QAAS,SAAUC,GACpCA,EAAEC,iBACF,IAAIC,EAASX,SAASK,eAAe,sBAAsBf,MACvDsB,EAAOZ,SAASC,cAAc,iBAE9BY,EADMD,EAAKV,aAAa,QACZC,MAAM,KACtBU,EAAMT,MACNS,EAAMC,KAAKH,GACXC,EAAKG,aAAa,OAAQF,EAAMG,KAAK,MACrC,IAAIC,EAAW,IAAIC,SAASZ,GAC5Ba,MAAM,yBACFC,OAAQ,OACRC,YAAa,cACbC,KAAML,IACPM,MAAM,SAAUC,GACfC,QAAQC,KAAKF","file":"colours.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// define __esModule on exports\n \t__webpack_require__.r = function(exports) {\n \t\tObject.defineProperty(exports, '__esModule', { value: true });\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 9);\n","//colours.js\n\nlet link = document.querySelector('#colourScheme');\n\nlet css = link.getAttribute('href').split('/').pop();\n\n// update selected item in colour scheme list\ndocument.getElementById('colourSchemeSelect').value = css;\n\n// fix form\nlet form = document.getElementById('colourSchemeForm');\nlet btn = form.childNodes[5];\nbtn.addEventListener('click', function (e) {\n    e.preventDefault();\n    let newCss = document.getElementById('colourSchemeSelect').value;\n    let link = document.querySelector('#colourScheme');\n    let css = link.getAttribute('href');\n    let parts = css.split('/');\n    parts.pop();\n    parts.push(newCss);\n    link.setAttribute('href', parts.join('/'));\n    let formData = new FormData(form);\n    fetch('/update-colour-scheme', {\n        method: 'POST',\n        credentials: 'same-origin',\n        body: formData\n    }).catch(function (error) {\n        console.warn(error);\n    });\n});\n"],"sourceRoot":""}
+{"version":3,"sources":["webpack:///webpack/bootstrap","webpack:///colours.js"],"names":["installedModules","__webpack_require__","moduleId","exports","module","i","l","modules","call","m","c","d","name","getter","o","Object","defineProperty","configurable","enumerable","get","r","value","n","__esModule","default","object","property","prototype","hasOwnProperty","p","s","9","e","t","css","document","querySelector","getAttribute","split","pop","getElementById","form","childNodes","addEventListener","preventDefault","newCss","link","parts","push","setAttribute","join","formData","FormData","fetch","method","credentials","body","catch","error","console","warn"],"mappings":"aACA,IAAAA,EAAAA,GAGA,SAAAC,EAAAC,GAGA,GAAAF,EAAAE,GACA,OAAAF,EAAAE,GAAAC,QAGA,IAAAC,EAAAJ,EAAAE,GAAAA,CACAG,EAAAH,EACAI,GAAAA,EACAH,QAAAA,IAUA,OANAI,EAAAL,GAAAM,KAAAJ,EAAAD,QAAAC,EAAAA,EAAAD,QAAAF,GAGAG,EAAAE,GAAAA,EAGAF,EAAAD,QAKAF,EAAAQ,EAAAF,EAGAN,EAAAS,EAAAV,EAGAC,EAAAU,EAAA,SAAAR,EAAAS,EAAAC,GACAZ,EAAAa,EAAAX,EAAAS,IACAG,OAAAC,eAAAb,EAAAS,EAAAA,CACAK,cAAAA,EACAC,YAAAA,EACAC,IAAAN,KAMAZ,EAAAmB,EAAA,SAAAjB,GACAY,OAAAC,eAAAb,EAAA,aAAA,CAAiDkB,OAAAA,KAIjDpB,EAAAqB,EAAA,SAAAlB,GACA,IAAAS,EAAAT,GAAAA,EAAAmB,WACA,WAA2B,OAAAnB,EAAAoB,SAC3B,WAAiC,OAAApB,GAEjC,OADAH,EAAAU,EAAAE,EAAA,IAAAA,GACAA,GAIAZ,EAAAa,EAAA,SAAAW,EAAAC,GAAsD,OAAAX,OAAAY,UAAAC,eAAApB,KAAAiB,EAAAC,IAGtDzB,EAAA4B,EAAA,GAIA5B,EAAAA,EAAA6B,EAAA,IAAA,CAAAC,EAAA,SAAAC,EAAAC,EAAAb,GAAA,aCjEA,IAEIc,EAFOC,SAASC,cAAc,iBAEnBC,aAAa,QAAQC,MAAM,KAAKC,MAG/CJ,SAASK,eAAe,sBAAsBnB,MAAQa,EAGtD,IAAIO,EAAON,SAASK,eAAe,oBACzBC,EAAKC,WAAW,GACtBC,iBAAiB,QAAS,SAAUX,GACpCA,EAAEY,iBACF,IAAIC,EAASV,SAASK,eAAe,sBAAsBnB,MACvDyB,EAAOX,SAASC,cAAc,iBAE9BW,EADMD,EAAKT,aAAa,QACZC,MAAM,KACtBS,EAAMR,MACNQ,EAAMC,KAAKH,GACXC,EAAKG,aAAa,OAAQF,EAAMG,KAAK,MACrC,IAAIC,EAAW,IAAIC,SAASX,GAC5BY,MAAM,wBAAA,CACFC,OAAQ,OACRC,YAAa,cACbC,KAAML,IACPM,MAAM,SAAUC,GACfC,QAAQC,KAAKF","file":"public/assets/js/colours.js.map","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// define __esModule on exports\n \t__webpack_require__.r = function(exports) {\n \t\tObject.defineProperty(exports, '__esModule', { value: true });\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 9);\n","//colours.js\n\nlet link = document.querySelector('#colourScheme');\n\nlet css = link.getAttribute('href').split('/').pop();\n\n// update selected item in colour scheme list\ndocument.getElementById('colourSchemeSelect').value = css;\n\n// fix form\nlet form = document.getElementById('colourSchemeForm');\nlet btn = form.childNodes[5];\nbtn.addEventListener('click', function (e) {\n    e.preventDefault();\n    let newCss = document.getElementById('colourSchemeSelect').value;\n    let link = document.querySelector('#colourScheme');\n    let css = link.getAttribute('href');\n    let parts = css.split('/');\n    parts.pop();\n    parts.push(newCss);\n    link.setAttribute('href', parts.join('/'));\n    let formData = new FormData(form);\n    fetch('/update-colour-scheme', {\n        method: 'POST',\n        credentials: 'same-origin',\n        body: formData\n    }).catch(function (error) {\n        console.warn(error);\n    });\n});\n"]}

public/assets/js/links.js

@@ -1,2 +1,2 @@
-!function(t){var e={};function r(n){if(e[n])return e[n].exports;var o=e[n]={i:n,l:!1,exports:{}};return t[n].call(o.exports,o,o.exports,r),o.l=!0,o.exports}r.m=t,r.c=e,r.d=function(t,e,n){r.o(t,e)||Object.defineProperty(t,e,{configurable:!1,enumerable:!0,get:n})},r.r=function(t){Object.defineProperty(t,"__esModule",{value:!0})},r.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return r.d(e,"a",e),e},r.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},r.p="",r(r.s=8)}({8:function(t,e){var r=/watch\?v=([A-Za-z0-9\-_]+)\b/,n=/https:\/\/play\.spotify\.com\/(.*)\b/,o=document.querySelectorAll(".e-content"),a=!0,u=!1,c=void 0;try{for(var i,l=o[Symbol.iterator]();!(a=(i=l.next()).done);a=!0){var s=i.value,d=s.textContent.match(r);if(d){var f=document.createElement("div");f.classList.add("container");var p=document.createElement("iframe");p.classList.add("youtube"),p.setAttribute("src","https://www.youtube.com/embed/"+d[1]),p.setAttribute("frameborder",0),p.setAttribute("allowfullscreen","true"),f.appendChild(p),s.appendChild(f)}var m=s.textContent.match(n);if(m){var b=m[1].replace("/",":"),y=document.createElement("iframe");y.classList.add("spotify"),y.setAttribute("src","https://embed.spotify.com/?uri=spotify:"+b),y.setAttribute("frameborder",0),y.setAttribute("allowtransparency","true"),s.appendChild(y)}}}catch(t){u=!0,c=t}finally{try{a||null==l.return||l.return()}finally{if(u)throw c}}}});
+!function(t){var e={};function r(n){if(e[n])return e[n].exports;var o=e[n]={i:n,l:!1,exports:{}};return t[n].call(o.exports,o,o.exports,r),o.l=!0,o.exports}r.m=t,r.c=e,r.d=function(t,e,n){r.o(t,e)||Object.defineProperty(t,e,{configurable:!1,enumerable:!0,get:n})},r.r=function(t){Object.defineProperty(t,"__esModule",{value:!0})},r.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return r.d(e,"a",e),e},r.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},r.p="",r(r.s=8)}({8:function(t,e,r){"use strict";var n=/watch\?v=([A-Za-z0-9\-_]+)\b/,o=/https:\/\/play\.spotify\.com\/(.*)\b/,a=document.querySelectorAll(".e-content"),u=!0,c=!1,i=void 0;try{for(var l,s=a[Symbol.iterator]();!(u=(l=s.next()).done);u=!0){var d=l.value,f=d.textContent.match(n);if(f){var p=document.createElement("div");p.classList.add("container");var m=document.createElement("iframe");m.classList.add("youtube"),m.setAttribute("src","https://www.youtube.com/embed/"+f[1]),m.setAttribute("frameborder",0),m.setAttribute("allowfullscreen","true"),p.appendChild(m),d.appendChild(p)}var b=d.textContent.match(o);if(b){var y=b[1].replace("/",":"),v=document.createElement("iframe");v.classList.add("spotify"),v.setAttribute("src","https://embed.spotify.com/?uri=spotify:"+y),v.setAttribute("frameborder",0),v.setAttribute("allowtransparency","true"),d.appendChild(v)}}}catch(t){c=!0,i=t}finally{try{u||null==s.return||s.return()}finally{if(c)throw i}}}});
 //# sourceMappingURL=links.js.map

public/assets/js/piwik.js

@@ -1,2 +1,2 @@
-!function(e){var t={};function r(n){if(t[n])return t[n].exports;var u=t[n]={i:n,l:!1,exports:{}};return e[n].call(u.exports,u,u.exports,r),u.l=!0,u.exports}r.m=e,r.c=t,r.d=function(e,t,n){r.o(e,t)||Object.defineProperty(e,t,{configurable:!1,enumerable:!0,get:n})},r.r=function(e){Object.defineProperty(e,"__esModule",{value:!0})},r.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(t,"a",t),t},r.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},r.p="",r(r.s=6)}({6:function(e,t){var r=r||[];r.push(["setTrackerUrl","https://analytics.jmb.lv/piwik.php"]),r.push(["setSiteId","1"]),r.push(["trackPageView"]),r.push(["enableLinkTracking"])}});
+!function(e){var t={};function r(n){if(t[n])return t[n].exports;var u=t[n]={i:n,l:!1,exports:{}};return e[n].call(u.exports,u,u.exports,r),u.l=!0,u.exports}r.m=e,r.c=t,r.d=function(e,t,n){r.o(e,t)||Object.defineProperty(e,t,{configurable:!1,enumerable:!0,get:n})},r.r=function(e){Object.defineProperty(e,"__esModule",{value:!0})},r.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(t,"a",t),t},r.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},r.p="",r(r.s=6)}({6:function(e,t,r){"use strict";var n=n||[];n.push(["setTrackerUrl","https://analytics.jmb.lv/piwik.php"]),n.push(["setSiteId","1"]),n.push(["trackPageView"]),n.push(["enableLinkTracking"])}});
 //# sourceMappingURL=piwik.js.map

public/assets/js/piwik.js.map

@@ -1 +1 @@
-{"version":3,"sources":["webpack:///webpack/bootstrap","webpack:///./piwik.js"],"names":["installedModules","__webpack_require__","moduleId","exports","module","i","l","modules","call","m","c","d","name","getter","o","Object","defineProperty","configurable","enumerable","get","r","value","n","__esModule","object","property","prototype","hasOwnProperty","p","s","_paq","push"],"mappings":"aACA,IAAAA,KAGA,SAAAC,EAAAC,GAGA,GAAAF,EAAAE,GACA,OAAAF,EAAAE,GAAAC,QAGA,IAAAC,EAAAJ,EAAAE,IACAG,EAAAH,EACAI,GAAA,EACAH,YAUA,OANAI,EAAAL,GAAAM,KAAAJ,EAAAD,QAAAC,IAAAD,QAAAF,GAGAG,EAAAE,GAAA,EAGAF,EAAAD,QAKAF,EAAAQ,EAAAF,EAGAN,EAAAS,EAAAV,EAGAC,EAAAU,EAAA,SAAAR,EAAAS,EAAAC,GACAZ,EAAAa,EAAAX,EAAAS,IACAG,OAAAC,eAAAb,EAAAS,GACAK,cAAA,EACAC,YAAA,EACAC,IAAAN,KAMAZ,EAAAmB,EAAA,SAAAjB,GACAY,OAAAC,eAAAb,EAAA,cAAiDkB,OAAA,KAIjDpB,EAAAqB,EAAA,SAAAlB,GACA,IAAAS,EAAAT,KAAAmB,WACA,WAA2B,OAAAnB,EAAA,SAC3B,WAAiC,OAAAA,GAEjC,OADAH,EAAAU,EAAAE,EAAA,IAAAA,GACAA,GAIAZ,EAAAa,EAAA,SAAAU,EAAAC,GAAsD,OAAAV,OAAAW,UAAAC,eAAAnB,KAAAgB,EAAAC,IAGtDxB,EAAA2B,EAAA,GAIA3B,IAAA4B,EAAA,qBChEA,IAGIC,EAAOA,MAEXA,EAAKC,MAAM,gBAJe,uCAK1BD,EAAKC,MAAM,YANE,MAObD,EAAKC,MAAM,kBACXD,EAAKC,MAAM","file":"piwik.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// define __esModule on exports\n \t__webpack_require__.r = function(exports) {\n \t\tObject.defineProperty(exports, '__esModule', { value: true });\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 6);\n","/* global process */\n\n// Piwik in its own js file to allow usage with a CSP policy\nvar idSite = process.env.PIWIK_ID;\nvar piwikTrackingApiUrl = process.env.PIWIK_URL;\n\nvar _paq = _paq || [];\n// tracker methods like \"setCustomDimension\" should be called before \"trackPageView\"\n_paq.push(['setTrackerUrl', piwikTrackingApiUrl]);\n_paq.push(['setSiteId', idSite]);\n_paq.push(['trackPageView']);\n_paq.push(['enableLinkTracking']);\n"],"sourceRoot":""}
+{"version":3,"sources":["webpack:///webpack/bootstrap","webpack:///piwik.js"],"names":["installedModules","__webpack_require__","moduleId","exports","module","i","l","modules","call","m","c","d","name","getter","o","Object","defineProperty","configurable","enumerable","get","r","value","n","__esModule","default","object","property","prototype","hasOwnProperty","p","s","6","e","t","_paq","push"],"mappings":"aACA,IAAAA,EAAAA,GAGA,SAAAC,EAAAC,GAGA,GAAAF,EAAAE,GACA,OAAAF,EAAAE,GAAAC,QAGA,IAAAC,EAAAJ,EAAAE,GAAAA,CACAG,EAAAH,EACAI,GAAAA,EACAH,QAAAA,IAUA,OANAI,EAAAL,GAAAM,KAAAJ,EAAAD,QAAAC,EAAAA,EAAAD,QAAAF,GAGAG,EAAAE,GAAAA,EAGAF,EAAAD,QAKAF,EAAAQ,EAAAF,EAGAN,EAAAS,EAAAV,EAGAC,EAAAU,EAAA,SAAAR,EAAAS,EAAAC,GACAZ,EAAAa,EAAAX,EAAAS,IACAG,OAAAC,eAAAb,EAAAS,EAAAA,CACAK,cAAAA,EACAC,YAAAA,EACAC,IAAAN,KAMAZ,EAAAmB,EAAA,SAAAjB,GACAY,OAAAC,eAAAb,EAAA,aAAA,CAAiDkB,OAAAA,KAIjDpB,EAAAqB,EAAA,SAAAlB,GACA,IAAAS,EAAAT,GAAAA,EAAAmB,WACA,WAA2B,OAAAnB,EAAAoB,SAC3B,WAAiC,OAAApB,GAEjC,OADAH,EAAAU,EAAAE,EAAA,IAAAA,GACAA,GAIAZ,EAAAa,EAAA,SAAAW,EAAAC,GAAsD,OAAAX,OAAAY,UAAAC,eAAApB,KAAAiB,EAAAC,IAGtDzB,EAAA4B,EAAA,GAIA5B,EAAAA,EAAA6B,EAAA,IAAA,CAAAC,EAAA,SAAAC,EAAAC,EAAAb,GAAA,aChEA,IAGIc,EAAOA,GAAAA,GAEXA,EAAKC,KAAAA,CAAM,gBAJe,uCAK1BD,EAAKC,KAAAA,CAAM,YANE,MAObD,EAAKC,KAAAA,CAAM,kBACXD,EAAKC,KAAAA,CAAM","file":"public/assets/js/piwik.js.map","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// define __esModule on exports\n \t__webpack_require__.r = function(exports) {\n \t\tObject.defineProperty(exports, '__esModule', { value: true });\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"\";\n\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 6);\n","/* global process */\n\n// Piwik in its own js file to allow usage with a CSP policy\nvar idSite = process.env.PIWIK_ID;\nvar piwikTrackingApiUrl = process.env.PIWIK_URL;\n\nvar _paq = _paq || [];\n// tracker methods like \"setCustomDimension\" should be called before \"trackPageView\"\n_paq.push(['setTrackerUrl', piwikTrackingApiUrl]);\n_paq.push(['setSiteId', idSite]);\n_paq.push(['trackPageView']);\n_paq.push(['enableLinkTracking']);\n"]}

resources/assets/es6/mapbox-utils.js

@@ -5,17 +5,24 @@ import selectPlaceInForm from './select-place';
 
 mapboxgl.accessToken = 'pk.eyJ1Ijoiam9ubnliYXJuZXMiLCJhIjoiY2l2cDhjYW04MDAwcjJ0cG1uZnhqcm82ayJ9.qA2zeVA-nsoMh9IFrd5KQw';
 
-//define some functions to be used in the default function.
+// Define some functions to be used in the default function.
 const titlecase = (string) => {
     return string.split('-').map(([first,...rest]) => first.toUpperCase() + rest.join('').toLowerCase()).join(' ');
 };
 
+// Get the ID for the map, i.e. get the u-url of the containing note.
+const getId = (map) => {
+    let href = map._container.parentNode.querySelector('.u-url').getAttribute('href');
+    return href.substr(href.lastIndexOf('/') + 1);
+};
+
 const addMapTypeOption = (map, menu, option, checked = false) => {
     let div = document.createElement('div');
     let input = document.createElement('input');
-    input.setAttribute('id', option);
+    let id = option + getId(map);
+    input.setAttribute('id', id);
     input.setAttribute('type', 'radio');
-    input.setAttribute('name', 'toggle');
+    input.setAttribute('name', 'map' + getId(map));
     input.setAttribute('value', option);
     if (checked == true) {
         input.setAttribute('checked', 'checked');
@@ -40,7 +47,7 @@ const addMapTypeOption = (map, menu, option, checked = false) => {
         });
     });
     let label = document.createElement('label');
-    label.setAttribute('for', option);
+    label.setAttribute('for', option + getId(map));
     label.appendChild(document.createTextNode(titlecase(option)));
     div.appendChild(input);
     div.appendChild(label);
@@ -59,7 +66,7 @@ const makeMapMenu = (map) => {
     return mapMenu;
 };
 
-//the main function
+// The main function.
 export default function addMap(div, position = null, places = null) {
     let data;
     let dataLatitude = div.dataset.latitude;

resources/assets/es6/maps.js

@@ -3,6 +3,6 @@ import addMap from './mapbox-utils';
 
 let mapDivs = document.querySelectorAll('.map');
 
-for (var div of mapDivs) {
+for (let div of mapDivs) {
     addMap(div);
 }