Merge branch 'release/0.12.3'

changelog.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## Version 0.12.3 (2017-11-07)
+  - Add a link to the `colours.js` so the colour scheme can be changed
+
 ## Version 0.12.2 (2017-11-07)
   - Limit screen size of images in notes
 

public/assets/js/colours.js

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

public/assets/js/colours.js.map

@@ -1 +1 @@
-{"version":3,"sources":["webpack:///webpack/bootstrap 309be73619105250ffef","webpack:///colours.js"],"names":["__webpack_require__","moduleId","installedModules","exports","module","i","l","modules","call","m","c","d","name","getter","o","Object","defineProperty","configurable","enumerable","get","n","__esModule","object","property","prototype","hasOwnProperty","p","s","css","document","querySelector","getAttribute","split","pop","getElementById","value","form","childNodes","addEventListener","e","preventDefault","newCss","link","parts","push","setAttribute","join","formData","FormData","fetch","method","credentials","body","catch","error","console","warn"],"mappings":"mBAIA,SAAAA,oBAAAC,UAGA,GAAAC,iBAAAD,UACA,OAAAC,iBAAAD,UAAAE,QAGA,IAAAC,OAAAF,iBAAAD,WACAI,EAAAJ,SACAK,GAAA,EACAH,YAUA,OANAI,QAAAN,UAAAO,KAAAJ,OAAAD,QAAAC,OAAAA,OAAAD,QAAAH,qBAGAI,OAAAE,GAAA,EAGAF,OAAAD,QAvBA,IAAAD,oBA4BAF,oBAAAS,EAAAF,QAGAP,oBAAAU,EAAAR,iBAGAF,oBAAAW,EAAA,SAAAR,QAAAS,KAAAC,QACAb,oBAAAc,EAAAX,QAAAS,OACAG,OAAAC,eAAAb,QAAAS,MACAK,cAAA,EACAC,YAAA,EACAC,IAAAN,UAMAb,oBAAAoB,EAAA,SAAAhB,QACA,IAAAS,OAAAT,QAAAA,OAAAiB,WACA,WAA2B,OAAAjB,OAAA,SAC3B,WAAiC,OAAAA,QAEjC,OADAJ,oBAAAW,EAAAE,OAAA,IAAAA,QACAA,QAIAb,oBAAAc,EAAA,SAAAQ,OAAAC,UAAsD,OAAAR,OAAAS,UAAAC,eAAAjB,KAAAc,OAAAC,WAGtDvB,oBAAA0B,EAAA,GAGA1B,oBAAAA,oBAAA2B,EAAA,mEC3DA,IAEIC,IAFOC,SAASC,cAAc,iBAEnBC,aAAa,QAAQC,MAAM,KAAKC,MAG/CJ,SAASK,eAAe,sBAAsBC,MAAQP,IAGtD,IAAIQ,KAAOP,SAASK,eAAe,oBACzBE,KAAKC,WAAW,GACtBC,iBAAiB,QAAS,SAAUC,GACpCA,EAAEC,iBACF,IAAIC,OAASZ,SAASK,eAAe,sBAAsBC,MACvDO,KAAOb,SAASC,cAAc,iBAE9Ba,MADMD,KAAKX,aAAa,QACZC,MAAM,KACtBW,MAAMV,MACNU,MAAMC,KAAKH,QACXC,KAAKG,aAAa,OAAQF,MAAMG,KAAK,MACrC,IAAIC,SAAW,IAAIC,SAASZ,MAC5Ba,MAAM,yBACFC,OAAQ,OACRC,YAAa,cACbC,KAAML,WACPM,MAAM,SAAUC,OACfC,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// 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 \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 20);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 309be73619105250ffef","//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\n\n\n// WEBPACK FOOTER //\n// ./colours.js"]}
+{"version":3,"sources":["webpack:///webpack/bootstrap 9314bc4cbb6b06151377","webpack:///colours.js"],"names":["__webpack_require__","moduleId","installedModules","exports","module","i","l","modules","call","m","c","d","name","getter","o","Object","defineProperty","configurable","enumerable","get","n","__esModule","object","property","prototype","hasOwnProperty","p","s","css","document","querySelector","getAttribute","split","pop","getElementById","value","form","childNodes","addEventListener","e","preventDefault","newCss","link","parts","push","setAttribute","join","formData","FormData","fetch","method","credentials","body","catch","error","console","warn"],"mappings":"mBAIA,SAAAA,oBAAAC,UAGA,GAAAC,iBAAAD,UACA,OAAAC,iBAAAD,UAAAE,QAGA,IAAAC,OAAAF,iBAAAD,WACAI,EAAAJ,SACAK,GAAA,EACAH,YAUA,OANAI,QAAAN,UAAAO,KAAAJ,OAAAD,QAAAC,OAAAA,OAAAD,QAAAH,qBAGAI,OAAAE,GAAA,EAGAF,OAAAD,QAvBA,IAAAD,oBA4BAF,oBAAAS,EAAAF,QAGAP,oBAAAU,EAAAR,iBAGAF,oBAAAW,EAAA,SAAAR,QAAAS,KAAAC,QACAb,oBAAAc,EAAAX,QAAAS,OACAG,OAAAC,eAAAb,QAAAS,MACAK,cAAA,EACAC,YAAA,EACAC,IAAAN,UAMAb,oBAAAoB,EAAA,SAAAhB,QACA,IAAAS,OAAAT,QAAAA,OAAAiB,WACA,WAA2B,OAAAjB,OAAA,SAC3B,WAAiC,OAAAA,QAEjC,OADAJ,oBAAAW,EAAAE,OAAA,IAAAA,QACAA,QAIAb,oBAAAc,EAAA,SAAAQ,OAAAC,UAAsD,OAAAR,OAAAS,UAAAC,eAAAjB,KAAAc,OAAAC,WAGtDvB,oBAAA0B,EAAA,GAGA1B,oBAAAA,oBAAA2B,EAAA,iEC3DA,IAEIC,IAFOC,SAASC,cAAc,iBAEnBC,aAAa,QAAQC,MAAM,KAAKC,MAG/CJ,SAASK,eAAe,sBAAsBC,MAAQP,IAGtD,IAAIQ,KAAOP,SAASK,eAAe,oBACzBE,KAAKC,WAAW,GACtBC,iBAAiB,QAAS,SAAUC,GACpCA,EAAEC,iBACF,IAAIC,OAASZ,SAASK,eAAe,sBAAsBC,MACvDO,KAAOb,SAASC,cAAc,iBAE9Ba,MADMD,KAAKX,aAAa,QACZC,MAAM,KACtBW,MAAMV,MACNU,MAAMC,KAAKH,QACXC,KAAKG,aAAa,OAAQF,MAAMG,KAAK,MACrC,IAAIC,SAAW,IAAIC,SAASZ,MAC5Ba,MAAM,yBACFC,OAAQ,OACRC,YAAa,cACbC,KAAML,WACPM,MAAM,SAAUC,OACfC,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// 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 \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = 4);\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 9314bc4cbb6b06151377","//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\n\n\n// WEBPACK FOOTER //\n// ./colours.js"]}

public/assets/js/piwik.js

@@ -1,2 +1,2 @@
-!function(modules){function __webpack_require__(moduleId){if(installedModules[moduleId])return installedModules[moduleId].exports;var module=installedModules[moduleId]={i:moduleId,l:!1,exports:{}};return modules[moduleId].call(module.exports,module,module.exports,__webpack_require__),module.l=!0,module.exports}var installedModules={};__webpack_require__.m=modules,__webpack_require__.c=installedModules,__webpack_require__.d=function(exports,name,getter){__webpack_require__.o(exports,name)||Object.defineProperty(exports,name,{configurable:!1,enumerable:!0,get:getter})},__webpack_require__.n=function(module){var getter=module&&module.__esModule?function(){return module.default}:function(){return module};return __webpack_require__.d(getter,"a",getter),getter},__webpack_require__.o=function(object,property){return Object.prototype.hasOwnProperty.call(object,property)},__webpack_require__.p="",__webpack_require__(__webpack_require__.s=16)}({16:function(module,exports,__webpack_require__){"use strict";(function(process){var idSite=process.env.PIWIK_ID,piwikTrackingApiUrl=process.env.PIWIK_URL,_paq=_paq||[];_paq.push(["setTrackerUrl",piwikTrackingApiUrl]),_paq.push(["setSiteId",idSite]),_paq.push(["trackPageView"]),_paq.push(["enableLinkTracking"])}).call(exports,__webpack_require__(17))},17:function(module,exports){function defaultSetTimout(){throw new Error("setTimeout has not been defined")}function defaultClearTimeout(){throw new Error("clearTimeout has not been defined")}function runTimeout(fun){if(cachedSetTimeout===setTimeout)return setTimeout(fun,0);if((cachedSetTimeout===defaultSetTimout||!cachedSetTimeout)&&setTimeout)return cachedSetTimeout=setTimeout,setTimeout(fun,0);try{return cachedSetTimeout(fun,0)}catch(e){try{return cachedSetTimeout.call(null,fun,0)}catch(e){return cachedSetTimeout.call(this,fun,0)}}}function runClearTimeout(marker){if(cachedClearTimeout===clearTimeout)return clearTimeout(marker);if((cachedClearTimeout===defaultClearTimeout||!cachedClearTimeout)&&clearTimeout)return cachedClearTimeout=clearTimeout,clearTimeout(marker);try{return cachedClearTimeout(marker)}catch(e){try{return cachedClearTimeout.call(null,marker)}catch(e){return cachedClearTimeout.call(this,marker)}}}function cleanUpNextTick(){draining&&currentQueue&&(draining=!1,currentQueue.length?queue=currentQueue.concat(queue):queueIndex=-1,queue.length&&drainQueue())}function drainQueue(){if(!draining){var timeout=runTimeout(cleanUpNextTick);draining=!0;for(var len=queue.length;len;){for(currentQueue=queue,queue=[];++queueIndex<len;)currentQueue&&currentQueue[queueIndex].run();queueIndex=-1,len=queue.length}currentQueue=null,draining=!1,runClearTimeout(timeout)}}function Item(fun,array){this.fun=fun,this.array=array}function noop(){}var cachedSetTimeout,cachedClearTimeout,process=module.exports={};!function(){try{cachedSetTimeout="function"==typeof setTimeout?setTimeout:defaultSetTimout}catch(e){cachedSetTimeout=defaultSetTimout}try{cachedClearTimeout="function"==typeof clearTimeout?clearTimeout:defaultClearTimeout}catch(e){cachedClearTimeout=defaultClearTimeout}}();var currentQueue,queue=[],draining=!1,queueIndex=-1;process.nextTick=function(fun){var args=new Array(arguments.length-1);if(arguments.length>1)for(var i=1;i<arguments.length;i++)args[i-1]=arguments[i];queue.push(new Item(fun,args)),1!==queue.length||draining||runTimeout(drainQueue)},Item.prototype.run=function(){this.fun.apply(null,this.array)},process.title="browser",process.browser=!0,process.env={},process.argv=[],process.version="",process.versions={},process.on=noop,process.addListener=noop,process.once=noop,process.off=noop,process.removeListener=noop,process.removeAllListeners=noop,process.emit=noop,process.prependListener=noop,process.prependOnceListener=noop,process.listeners=function(name){return[]},process.binding=function(name){throw new Error("process.binding is not supported")},process.cwd=function(){return"/"},process.chdir=function(dir){throw new Error("process.chdir is not supported")},process.umask=function(){return 0}}});
+!function(modules){function __webpack_require__(moduleId){if(installedModules[moduleId])return installedModules[moduleId].exports;var module=installedModules[moduleId]={i:moduleId,l:!1,exports:{}};return modules[moduleId].call(module.exports,module,module.exports,__webpack_require__),module.l=!0,module.exports}var installedModules={};__webpack_require__.m=modules,__webpack_require__.c=installedModules,__webpack_require__.d=function(exports,name,getter){__webpack_require__.o(exports,name)||Object.defineProperty(exports,name,{configurable:!1,enumerable:!0,get:getter})},__webpack_require__.n=function(module){var getter=module&&module.__esModule?function(){return module.default}:function(){return module};return __webpack_require__.d(getter,"a",getter),getter},__webpack_require__.o=function(object,property){return Object.prototype.hasOwnProperty.call(object,property)},__webpack_require__.p="",__webpack_require__(__webpack_require__.s=7)}({7:function(module,exports,__webpack_require__){"use strict";var _paq=_paq||[];_paq.push(["setTrackerUrl","https://analytics.jmb.lv/piwik.php"]),_paq.push(["setSiteId","1"]),_paq.push(["trackPageView"]),_paq.push(["enableLinkTracking"])}});
 //# sourceMappingURL=piwik.js.map

resources/assets/es6/nearby-places.js

@@ -1,80 +0,0 @@
-//nearby-places.js
-
-import alertify from 'alertify.js';
-import addMap from './mapbox-utils';
-import parseLocation from './parse-location';
-import makeNewPlaceForm from './newplace-micropub';
-
-const makeOptionsForForm = (map, position, places = null) => {
-    //create the <select> element and give it a no location default
-    let selectElement = document.createElement('select');
-    selectElement.setAttribute('name', 'location');
-    let noLocationOption = document.createElement('option');
-    noLocationOption.setAttribute('selected', 'selected');
-    noLocationOption.setAttribute('value', 'no-location');
-    noLocationOption.appendChild(document.createTextNode('Don’t send location'));
-    selectElement.appendChild(noLocationOption);
-    let geoLocationOption = document.createElement('option');
-    geoLocationOption.setAttribute('id', 'option-coords');
-    geoLocationOption.setAttribute('value', 'geo:' + position.coords.latitude + ',' + position.coords.longitude);
-    geoLocationOption.dataset.latitude = position.coords.latitude;
-    geoLocationOption.dataset.longitude = position.coords.longitude;
-    geoLocationOption.appendChild(document.createTextNode('Send co-ordinates'));
-    selectElement.appendChild(geoLocationOption);
-    if (places != null) {
-        for (let place of places) {
-            let parsedCoords = parseLocation(place.location);
-            let option = document.createElement('option');
-            option.setAttribute('value', place.uri);
-            option.dataset.latitude = parsedCoords.latitude;
-            option.dataset.longitude = parsedCoords.longitude;
-            option.appendChild(document.createTextNode(place.name));
-            selectElement.appendChild(option);
-        }
-    }
-    //add an event listener
-    selectElement.addEventListener('change', function () {
-        if (selectElement.value !== 'no-location') {
-            let optionLatitude = selectElement[selectElement.selectedIndex].dataset.latitude;
-            let optionLongitude = selectElement[selectElement.selectedIndex].dataset.longitude;
-            map.flyTo({center: [optionLongitude, optionLatitude]});
-        }
-    });
-
-    return selectElement;
-};
-
-//position is output of navigator.geolocation call
-export default function addMapWithPlaces(div, position) {
-    fetch('/micropub/places?latitude=' + position.coords.latitude + '&longitude=' + position.coords.longitude + '&u=' + position.coords.accuracy, {
-        credentials: 'same-origin',
-        method: 'get'
-    }).then(function (response) {
-        if (response.ok) {
-            return response.json();
-        } else {
-            alertify.reset();
-            alertify.error('Non OK response');
-        }
-    }).then(function (json) {
-        if (json.error == true) {
-            alertify.reset();
-            alertify.error(json.error_description);
-        }
-        let places = null;
-        if (json.places.length > 0) {
-            places = json.places;
-        }
-        let map = addMap(div, position, places);
-        //create a containting div for flexbox styling purposes
-        let flexboxDiv = document.createElement('div');
-        let options = makeOptionsForForm(map, position, places);
-        flexboxDiv.appendChild(options);
-        let newPlaceForm = makeNewPlaceForm(map);
-        flexboxDiv.appendChild(newPlaceForm);
-        let form = document.querySelector('fieldset');
-        form.insertBefore(flexboxDiv, document.querySelector('.map'));
-    }).catch(function (error) {
-        console.error(error);
-    });
-}

resources/assets/es6/newnote-button.js

@@ -1,14 +0,0 @@
-//newnote-button.js
-
-import getLocation from './newnote-getlocation';
-
-export default function enableLocateButton(button) {
-    if ('geolocation' in navigator) {
-        if (button.addEventListener) {
-            //if we have javascript, event listeners and geolocation
-            //make the locate button clickable and add event
-            button.disabled = false;
-            button.addEventListener('click', getLocation);
-        }
-    }
-}

resources/assets/es6/newnote-getlocation.js

@@ -1,16 +0,0 @@
-//newnote-getlocation.js
-
-import addMapWithPlaces from './nearby-places';
-
-export default function getLocation() {
-    let container = document.querySelector('fieldset');
-    let mapDiv = document.createElement('div');
-    mapDiv.classList.add('map');
-    container.appendChild(mapDiv);
-    navigator.geolocation.getCurrentPosition(function (position) {
-        mapDiv.dataset.latitude = position.coords.latitude;
-        mapDiv.dataset.longitude = position.coords.longitude;
-        mapDiv.dataset.accuracy = position.coords.accuracy;
-        addMapWithPlaces(mapDiv, position);
-    });
-}

resources/assets/es6/newnote.js

@@ -1,8 +0,0 @@
-//newnote.js
-
-import enableLocateButton from './newnote-button';
-import persistFormData from './persist-form';
-
-let button = document.querySelector('#locate');
-enableLocateButton(button);
-persistFormData();

resources/assets/es6/newplace-micropub.js

@@ -1,116 +0,0 @@
-//newplace-micropub.js
-
-import submitNewPlace from './submit-place';
-
-export default function makeNewPlaceForm(map) {
-    //add a button to add a new place
-    let newLocationButton = document.createElement('button');
-    newLocationButton.setAttribute('type', 'button');
-    newLocationButton.setAttribute('id', 'create-new-place');
-    newLocationButton.appendChild(document.createTextNode('Create New Place?'));
-    //the event listener
-    newLocationButton.addEventListener('click', function() {
-        //add an icon
-        let latitude = map.getCenter().lat;
-        let longitude = map.getCenter().lng;
-        map.addSource('new-place', {
-            'type': 'geojson',
-            'data': {
-                'type': 'FeatureCollection',
-                'features': [
-                    {
-                        'type': 'Feature',
-                        'geometry': {
-                            'type': 'Point',
-                            'coordinates': [longitude, latitude]
-                        },
-                        'properties': {
-                            'title': '',
-                            'icon': 'circle'
-                        }
-                    }
-                ]
-            }
-        });
-        map.addLayer({
-            'id': 'new-place',
-            'type': 'symbol',
-            'source': 'new-place',
-            'layout': {
-                'icon-image': '{icon}-15',
-                'text-field': '{title}',
-                'text-offset': [0, 1]
-            }
-        });
-        //add the form elements
-        let newPlaceNameDiv = document.createElement('div');
-        let newPlaceNameLabel = document.createElement('label');
-        newPlaceNameLabel.setAttribute('for', 'place-name');
-        newPlaceNameLabel.classList.add('place-label');
-        newPlaceNameLabel.appendChild(document.createTextNode('Name:'));
-        let newPlaceNameInput = document.createElement('input');
-        newPlaceNameInput.setAttribute('placeholder', 'Name');
-        newPlaceNameInput.setAttribute('name', 'place-name');
-        newPlaceNameInput.setAttribute('id', 'place-name');
-        newPlaceNameInput.setAttribute('type', 'text');
-        newPlaceNameInput.addEventListener('keyup', function () {
-            let source = map.getSource('new-place');
-            source._data.features[0].properties.title = newPlaceNameInput.value;
-            map.getSource('new-place').setData(source._data);
-        });
-        newPlaceNameDiv.appendChild(newPlaceNameLabel);
-        newPlaceNameDiv.appendChild(newPlaceNameInput);
-        let newPlaceDescDiv = document.createElement('div');
-        let newPlaceDescLabel = document.createElement('label');
-        newPlaceDescLabel.setAttribute('for', 'place-description');
-        newPlaceDescLabel.classList.add('place-label');
-        newPlaceDescLabel.appendChild(document.createTextNode('Description:'));
-        let newPlaceDescInput = document.createElement('input');
-        newPlaceDescInput.setAttribute('placeholder', 'Description');
-        newPlaceDescInput.setAttribute('name', 'place-description');
-        newPlaceDescInput.setAttribute('id', 'place-description');
-        newPlaceDescInput.setAttribute('type', 'text');
-        newPlaceDescDiv.appendChild(newPlaceDescLabel);
-        newPlaceDescDiv.appendChild(newPlaceDescInput);
-        let newPlaceLatitudeDiv = document.createElement('div');
-        var newPlaceLatitudeLabel = document.createElement('label');
-        newPlaceLatitudeLabel.setAttribute('for', 'place-latitude');
-        newPlaceLatitudeLabel.classList.add('place-label');
-        newPlaceLatitudeLabel.appendChild(document.createTextNode('Latitude:'));
-        let newPlaceLatitudeInput = document.createElement('input');
-        newPlaceLatitudeInput.setAttribute('name', 'place-latitude');
-        newPlaceLatitudeInput.setAttribute('id', 'place-latitude');
-        newPlaceLatitudeInput.setAttribute('type', 'text');
-        newPlaceLatitudeInput.value = map.getCenter().lat;
-        newPlaceLatitudeDiv.appendChild(newPlaceLatitudeLabel);
-        newPlaceLatitudeDiv.appendChild(newPlaceLatitudeInput);
-        let newPlaceLongitudeDiv = document.createElement('div');
-        let newPlaceLongitudeLabel = document.createElement('label');
-        newPlaceLongitudeLabel.setAttribute('for', 'place-longitude');
-        newPlaceLongitudeLabel.classList.add('place-label');
-        newPlaceLongitudeLabel.appendChild(document.createTextNode('Longitude:'));
-        let newPlaceLongitudeInput = document.createElement('input');
-        newPlaceLongitudeInput.setAttribute('name', 'place-longitude');
-        newPlaceLongitudeInput.setAttribute('id', 'place-longitude');
-        newPlaceLongitudeInput.setAttribute('type', 'text');
-        newPlaceLongitudeInput.value = map.getCenter().lng;
-        newPlaceLongitudeDiv.appendChild(newPlaceLongitudeLabel);
-        newPlaceLongitudeDiv.appendChild(newPlaceLongitudeInput);
-        let newPlaceSubmit = document.createElement('button');
-        newPlaceSubmit.setAttribute('id', 'place-submit');
-        newPlaceSubmit.setAttribute('name', 'place-submit');
-        newPlaceSubmit.setAttribute('type', 'button');
-        newPlaceSubmit.appendChild(document.createTextNode('Submit New Place'));
-        newPlaceSubmit.addEventListener('click', function () {
-            submitNewPlace(map);
-        });
-        let form = document.querySelector('fieldset');
-        form.appendChild(newPlaceNameDiv);
-        form.appendChild(newPlaceDescDiv);
-        form.appendChild(newPlaceLatitudeDiv);
-        form.appendChild(newPlaceLongitudeDiv);
-        form.appendChild(newPlaceSubmit);
-    });
-
-    return newLocationButton;
-}

resources/views/master.blade.php

@@ -59,6 +59,7 @@
             <p>Built with love: <a href="/colophon">Colophon</a></p>
             <p><a href="https://indieweb.org"><img src="/assets/img/iwc.png" alt="Indie Web Camp logo" class="iwc-logo"></a></p>
         </footer>
+        <script src="/assets/js/colours.js" async defer></script>
         @if (config('app.piwik') === true)
         <!-- Piwik -->
         <script src="https://analytics.jmb.lv/piwik.js" async defer></script>

webpack.config.js

@@ -5,12 +5,11 @@ const config = {
   context: __dirname + '/resources/assets/es6',
   entry: {
     //app: './app.js',
+    colours: './colours.js',
     links: './links.js',
     maps: './maps.js',
-    newnote: './newnote.js',
     piwik: './piwik.js',
-    places: './places.js',
-    colours: './colours.js'
+    places: './places.js'
   },
   output: {
     path: __dirname + '/public/assets/js',