diff --git a/graphql/schema.graphql b/graphql/schema.graphql index db494f7..fee52cf 100644 --- a/graphql/schema.graphql +++ b/graphql/schema.graphql @@ -14,7 +14,12 @@ type Building { significance: String, recommendation: String, latitude: Float, - longitude: Float + longitude: Float, + featured_image: String, + second_image: String, + third_image: String, + fourth_image: String, + fifth_image: String } type Query { diff --git a/helpers/createDataObj.js b/helpers/createDataObj.js index 6d0b70b..11de3d5 100644 --- a/helpers/createDataObj.js +++ b/helpers/createDataObj.js @@ -5,7 +5,7 @@ const createDataObj = (data) => { street_name: item['Street Name'], postcode: item['Post Code'], ward: item['Ward'], - conservation_area: item['Conservation Area'], + conservation_area: item['Conservation Area'], date_built_actual: item['Date Built (actual)'], date_built_estimate: item['Date Built (estimated/ unconfirmed)'], architectural_style: item['Architectural Style'], @@ -16,12 +16,14 @@ const createDataObj = (data) => { significance: item['Significance Statement'], recommendation: item['Recommendation'], latitude: item['Latitude'], - longitude: item['Longitude'] + longitude: item['Longitude'], + featured_image: item['Featured Image'], + second_image: item['Second Image'], + third_image: item['Third Image'], + fourth_image: item['Fourth Image'], + fifth_image: item['Fifth Image'] }; }); } module.exports = createDataObj; - - - diff --git a/models/islington.js b/models/islington.js index 971ebd5..2262a1f 100644 --- a/models/islington.js +++ b/models/islington.js @@ -28,7 +28,12 @@ const islingtonSchema = new Schema({ significance: String, recommendation: String, latitude: Number, - longitude: Number + longitude: Number, + featured_image: String, + second_image: String, + third_image: String, + fourth_image: String, + fifth_image: String }); const Islington = mongoose.model("Islington", islingtonSchema); diff --git a/package-lock.json b/package-lock.json index d9cc677..89f3b8b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -84,7 +84,7 @@ "abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", + "integrity": "sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg=", "dev": true }, "accepts": { @@ -253,10 +253,15 @@ "color-convert": "1.9.1" } }, + "any-promise": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-0.1.0.tgz", + "integrity": "sha1-gwtoCqflbzNFHUsEnzvYBESY7ic=" + }, "anymatch": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", - "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", + "integrity": "sha1-VT3Lj5HjyImEXf26NMd3IbkLnXo=", "requires": { "micromatch": "2.3.11", "normalize-path": "2.1.1" @@ -388,7 +393,7 @@ "arr-flatten": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==" + "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=" }, "array-equal": { "version": "1.0.0", @@ -508,6 +513,21 @@ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" }, + "author-regex": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/author-regex/-/author-regex-0.2.1.tgz", + "integrity": "sha1-i976rGBlqTF5m+wH7u9RuUDgjzw=" + }, + "authors-to-markdown": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/authors-to-markdown/-/authors-to-markdown-0.1.0.tgz", + "integrity": "sha1-ozgAZCiacl9AzRUhRMIfqjf9Fis=", + "requires": { + "is-blank": "1.1.0", + "normalize-url": "1.9.1", + "parse-author": "0.2.2" + } + }, "autoprefixer": { "version": "7.1.6", "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.1.6.tgz", @@ -1881,6 +1901,83 @@ "readdirp": "2.1.0" } }, + "chokidar-cli": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/chokidar-cli/-/chokidar-cli-1.2.0.tgz", + "integrity": "sha1-jn9YRCJzGCAYvhho5Twir2WiGUg=", + "requires": { + "anymatch": "1.3.2", + "bluebird": "2.11.0", + "chokidar": "1.7.0", + "lodash": "3.10.1", + "shell-quote": "1.6.1", + "yargs": "3.32.0" + }, + "dependencies": { + "bluebird": { + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz", + "integrity": "sha1-U0uQM8AiyVecVro7Plpcqvu2UOE=" + }, + "camelcase": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", + "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=" + }, + "cliui": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", + "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", + "requires": { + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wrap-ansi": "2.1.0" + } + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "requires": { + "number-is-nan": "1.0.1" + } + }, + "lodash": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", + "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=" + }, + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + }, + "window-size": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz", + "integrity": "sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=" + }, + "yargs": { + "version": "3.32.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz", + "integrity": "sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=", + "requires": { + "camelcase": "2.1.1", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "os-locale": "1.4.0", + "string-width": "1.0.2", + "window-size": "0.1.4", + "y18n": "3.2.1" + } + } + } + }, "ci-info": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.1.2.tgz", @@ -1908,6 +2005,28 @@ "chalk": "1.1.3" } }, + "class-repeat": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/class-repeat/-/class-repeat-1.0.2.tgz", + "integrity": "sha512-Waqktb/IbBVtQCZI8Esj3zWEetYEJDRN3J0D4TkH/H+ybHLM3Ma6BGk8lrssAtvjBUS3hFnaqVXAyaGHtLefYw==", + "requires": { + "css-selector-tokenizer": "0.5.4", + "get-css-classes": "1.1.0", + "has-class-selector": "1.0.0", + "is-present": "1.0.0" + }, + "dependencies": { + "css-selector-tokenizer": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.5.4.tgz", + "integrity": "sha1-E5uv00o1/QwUKEhwSeBpnm9qLCE=", + "requires": { + "cssesc": "0.1.0", + "fastparse": "1.1.1" + } + } + } + }, "clean-css": { "version": "4.1.9", "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.9.tgz", @@ -1994,7 +2113,7 @@ "color-convert": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz", - "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", + "integrity": "sha1-wSYRB66y8pTr/+ye2eytUppgl+0=", "requires": { "color-name": "1.1.3" } @@ -2040,6 +2159,11 @@ "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==" }, + "comment-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/comment-regex/-/comment-regex-1.0.0.tgz", + "integrity": "sha1-fdcCaMg2SKnEzBm/Ry1S5k9jkY0=" + }, "commondir": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", @@ -2248,6 +2372,28 @@ "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" }, + "copy-files": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/copy-files/-/copy-files-0.1.0.tgz", + "integrity": "sha1-+jg4XcBH74gZPBxhtqJTqKQn8RY=", + "requires": { + "async": "0.9.2", + "lodash": "2.4.2", + "mkdirp": "0.5.1" + }, + "dependencies": { + "async": { + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz", + "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=" + }, + "lodash": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz", + "integrity": "sha1-+t2DS5aDBz2hebPq5tnA0VBT9z4=" + } + } + }, "core-js": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", @@ -2372,6 +2518,22 @@ "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=", "dev": true }, + "css-color-converter": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/css-color-converter/-/css-color-converter-1.1.0.tgz", + "integrity": "sha1-wufZPC6WyK2Msax6Hy5J2AUq3jY=", + "requires": { + "color-convert": "0.5.3", + "color-name": "1.1.3" + }, + "dependencies": { + "color-convert": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz", + "integrity": "sha1-vbbGnOZg+t/+CwAHzER+G59ygr0=" + } + } + }, "css-color-names": { "version": "0.0.4", "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz", @@ -2429,6 +2591,51 @@ } } }, + "css-mqpacker": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/css-mqpacker/-/css-mqpacker-5.0.1.tgz", + "integrity": "sha1-by1iJSYj/Xwzpo4biNwTcMiFkh4=", + "requires": { + "minimist": "1.2.0", + "postcss": "5.2.18" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=" + }, + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" + }, + "postcss": { + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "requires": { + "has-flag": "1.0.0" + } + } + } + }, "css-select": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", @@ -2462,6 +2669,45 @@ } } }, + "css-shorthand-expand": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/css-shorthand-expand/-/css-shorthand-expand-1.1.0.tgz", + "integrity": "sha1-EC9yhsvTI3VDC1hJ1OL+o6oh6mQ=", + "requires": { + "css-color-names": "0.0.1", + "css-url-regex": "0.0.1", + "hex-color-regex": "1.1.0", + "hsl-regex": "1.0.0", + "hsla-regex": "1.0.0", + "map-obj": "1.0.1", + "repeat-element": "1.1.2", + "rgb-regex": "1.0.1", + "rgba-regex": "1.0.0", + "xtend": "4.0.1" + }, + "dependencies": { + "css-color-names": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.1.tgz", + "integrity": "sha1-XQVI+iVkVu3kqaDCrHqxnT6xrYE=" + } + } + }, + "css-shorthand-properties": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/css-shorthand-properties/-/css-shorthand-properties-1.1.0.tgz", + "integrity": "sha512-0Pg/e2U0NgT6Chw1TUe3D2ZTOOO3JFzlDV+bN3hxR8T0RDjnwzmx5WhuYUA0GHYWlPYAYi2/Ac0e8oqgerHDQw==" + }, + "css-unit-converter": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/css-unit-converter/-/css-unit-converter-1.1.1.tgz", + "integrity": "sha1-2bkoGtz9jO2TW9urqDeGiX9k6ZY=" + }, + "css-url-regex": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/css-url-regex/-/css-url-regex-0.0.1.tgz", + "integrity": "sha1-4Fr4xsKQ1FHvFjK0VepcgbSxOVw=" + }, "css-what": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.0.tgz", @@ -2590,6 +2836,66 @@ "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.2.tgz", "integrity": "sha1-uANhcMefB6kP8vFuIihAJ6JDhIs=" }, + "cssstats": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cssstats/-/cssstats-3.1.0.tgz", + "integrity": "sha512-zLG+H8tyLITS5uYUu8MVtS0wUU7XhV1298CgF62wWLm/xfJIbbE7WlrIfXtgLWk929/cfrCidSkCpYJrlqsJ/g==", + "requires": { + "bytes": "2.5.0", + "css-selector-tokenizer": "0.7.0", + "css-shorthand-expand": "1.1.0", + "gzip-size": "3.0.0", + "has-class-selector": "1.0.0", + "has-element-selector": "1.0.0", + "has-id-selector": "1.0.0", + "has-pseudo-class": "1.0.1", + "has-pseudo-element": "1.0.0", + "is-blank": "1.1.0", + "is-css-shorthand": "1.0.1", + "is-present": "1.0.0", + "is-vendor-prefixed": "0.0.1", + "lodash": "4.17.4", + "postcss": "5.2.18", + "postcss-safe-parser": "2.0.1", + "specificity": "0.3.2" + }, + "dependencies": { + "bytes": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.5.0.tgz", + "integrity": "sha1-TJQj6i0lLCcMQbK97+/5u2tiwGo=" + }, + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=" + }, + "postcss": { + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "requires": { + "has-flag": "1.0.0" + } + } + } + }, "cssstyle": { "version": "0.2.37", "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz", @@ -2630,7 +2936,7 @@ "date-fns": { "version": "1.29.0", "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.29.0.tgz", - "integrity": "sha512-lbTXWZ6M20cWH8N9S6afb0SBm6tMk+uUg6z3MqHPKE9atmsY3kJkTm8vKe93izJ2B2+q5MV990sM2CHgtAZaOw==", + "integrity": "sha1-EuYJzcuTUScxHQTTMzTilgoqVOY=", "dev": true }, "date-now": { @@ -2651,6 +2957,11 @@ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" }, + "dedent": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", + "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=" + }, "deep-equal": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz", @@ -2734,6 +3045,22 @@ "repeating": "2.0.1" } }, + "detect-newline": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-1.0.3.tgz", + "integrity": "sha1-6XsQA4d9cMCa8a81v63/Fo3kkg0=", + "requires": { + "get-stdin": "4.0.1", + "minimist": "1.2.0" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" + } + } + }, "detect-node": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.3.tgz", @@ -3615,6 +3942,11 @@ "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=" }, + "extend-options": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/extend-options/-/extend-options-0.0.1.tgz", + "integrity": "sha1-6TyDMSQ4wTVl5k7Cts6GqYKd0Xs=" + }, "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", @@ -3752,6 +4084,11 @@ "object-assign": "4.1.1" } }, + "file-exists": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/file-exists/-/file-exists-2.0.0.tgz", + "integrity": "sha1-okFQZlFQ5i1VvFRJKB2I0rCBDco=" + }, "file-loader": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.5.tgz", @@ -3829,6 +4166,27 @@ "locate-path": "2.0.0" } }, + "findup": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/findup/-/findup-0.1.5.tgz", + "integrity": "sha1-itkpozk7rGJ5V6fl3kYjsGsOLOs=", + "requires": { + "colors": "0.6.2", + "commander": "2.1.0" + }, + "dependencies": { + "colors": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz", + "integrity": "sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w=" + }, + "commander": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz", + "integrity": "sha1-0SG7roYNmZKj1Re6lvVliOR8Z4E=" + } + } + }, "flat-cache": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz", @@ -4826,6 +5184,11 @@ "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=" }, + "gather-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/gather-stream/-/gather-stream-1.0.0.tgz", + "integrity": "sha1-szmUr0V6gRVwDUEPMXczy+egkEs=" + }, "geojson-area": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/geojson-area/-/geojson-area-0.1.0.tgz", @@ -4869,6 +5232,26 @@ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=" }, + "get-css-classes": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/get-css-classes/-/get-css-classes-1.1.0.tgz", + "integrity": "sha1-W0Tqihks7OdWfARXRjOpKqRJF7M=", + "requires": { + "css-selector-tokenizer": "0.5.4", + "lodash": "4.17.4" + }, + "dependencies": { + "css-selector-tokenizer": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.5.4.tgz", + "integrity": "sha1-E5uv00o1/QwUKEhwSeBpnm9qLCE=", + "requires": { + "cssesc": "0.1.0", + "fastparse": "1.1.1" + } + } + } + }, "get-stdin": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", @@ -5156,16 +5539,61 @@ "ansi-regex": "2.1.1" } }, + "has-class-selector": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-class-selector/-/has-class-selector-1.0.0.tgz", + "integrity": "sha1-p79Rvs3C133/JQkgPtafNEUODC0=" + }, "has-color": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz", "integrity": "sha1-ZxRKUmDDT8PMpnfQQdr1L+e3iy8=" }, + "has-element-selector": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-element-selector/-/has-element-selector-1.0.0.tgz", + "integrity": "sha1-JohCJeEjQ36N+WBMATWB0p0ZC5c=", + "requires": { + "css-selector-tokenizer": "0.5.4" + }, + "dependencies": { + "css-selector-tokenizer": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.5.4.tgz", + "integrity": "sha1-E5uv00o1/QwUKEhwSeBpnm9qLCE=", + "requires": { + "cssesc": "0.1.0", + "fastparse": "1.1.1" + } + } + } + }, "has-flag": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=" }, + "has-id-selector": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-id-selector/-/has-id-selector-1.0.0.tgz", + "integrity": "sha1-1BtC6SKFhub+xWZyjOszqucay0U=" + }, + "has-pseudo-class": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-pseudo-class/-/has-pseudo-class-1.0.1.tgz", + "integrity": "sha1-Bj7cjp9ZRpdq9P9OuzLDMNVW4Ac=", + "requires": { + "pseudo-classes": "0.0.1" + } + }, + "has-pseudo-element": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-pseudo-element/-/has-pseudo-element-1.0.0.tgz", + "integrity": "sha1-NMoZEgHAFDcJ9CtLc/HcY7dg8D8=", + "requires": { + "pseudo-elements": "1.0.0" + } + }, "hash-base": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz", @@ -5199,6 +5627,11 @@ "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=" }, + "hex-color-regex": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz", + "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==" + }, "hmac-drbg": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", @@ -5257,9 +5690,19 @@ "wbuf": "1.7.2" } }, - "html-comment-regex": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.1.tgz", + "hsl-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz", + "integrity": "sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4=" + }, + "hsla-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz", + "integrity": "sha1-wc56MWjIxmFAM6S194d/OyJfnDg=" + }, + "html-comment-regex": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.1.tgz", "integrity": "sha1-ZouTd26q5V696POtRkswekljYl4=" }, "html-encoding-sniffer": { @@ -5470,6 +5913,75 @@ "integrity": "sha1-SMptcvbGo68Aqa1K5odr44ieKwk=", "dev": true }, + "immutable-css": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/immutable-css/-/immutable-css-1.1.2.tgz", + "integrity": "sha1-RBUWYyKpPVAPrPJoocf5Bw/0YYo=", + "requires": { + "extend-options": "0.0.1", + "file-exists": "0.1.1", + "get-css-classes": "1.1.0", + "glob": "5.0.15", + "has-class-selector": "1.0.0", + "is-css": "1.0.0", + "meow": "3.7.0", + "postcss": "5.2.18", + "specificity": "0.1.6" + }, + "dependencies": { + "file-exists": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/file-exists/-/file-exists-0.1.1.tgz", + "integrity": "sha1-mT0//7W0nRH+/Mj0XCNVAnRAgDw=" + }, + "glob": { + "version": "5.0.15", + "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", + "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", + "requires": { + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=" + }, + "postcss": { + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + }, + "specificity": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/specificity/-/specificity-0.1.6.tgz", + "integrity": "sha1-qlAQSPluaUhd3JXvn3pbd/ASMqo=" + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "requires": { + "has-flag": "1.0.0" + } + } + } + }, "import-lazy": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", @@ -5627,10 +6139,19 @@ "binary-extensions": "1.11.0" } }, + "is-blank": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-blank/-/is-blank-1.1.0.tgz", + "integrity": "sha1-knTdvUY2PLdnB1w4XUq4jGpk3Bc=", + "requires": { + "is-empty": "0.0.1", + "is-whitespace": "0.3.0" + } + }, "is-buffer": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" + "integrity": "sha1-76ouqdqg16suoTqXsritUf776L4=" }, "is-builtin-module": { "version": "1.0.0", @@ -5653,6 +6174,19 @@ "ci-info": "1.1.2" } }, + "is-css": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-css/-/is-css-1.0.0.tgz", + "integrity": "sha1-nE7hEQaR4Kffnl5qp4Frrj1SbTg=" + }, + "is-css-shorthand": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-css-shorthand/-/is-css-shorthand-1.0.1.tgz", + "integrity": "sha1-MPldAyEGBf7f3RKOU9rEpEN6kzw=", + "requires": { + "css-shorthand-properties": "1.1.0" + } + }, "is-date-object": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz", @@ -5668,6 +6202,11 @@ "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=" }, + "is-empty": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/is-empty/-/is-empty-0.0.1.tgz", + "integrity": "sha1-Cf3D1kndpZaRVsCFOpt2vXgcWjM=" + }, "is-equal-shallow": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", @@ -5766,6 +6305,25 @@ "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=" }, + "is-present": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-present/-/is-present-1.0.0.tgz", + "integrity": "sha1-Kcm46ObnhqWUwpL8cjmqJL5wuAw=", + "requires": { + "is-blank": "1.0.0" + }, + "dependencies": { + "is-blank": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-blank/-/is-blank-1.0.0.tgz", + "integrity": "sha1-YOOb60H5LDsnrLtQKcsPKfmD7mc=", + "requires": { + "is-empty": "0.0.1", + "is-whitespace": "0.3.0" + } + } + } + }, "is-primitive": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", @@ -5835,6 +6393,19 @@ "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=" }, + "is-vendor-prefixed": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/is-vendor-prefixed/-/is-vendor-prefixed-0.0.1.tgz", + "integrity": "sha1-Bc8NhTxidNf7K/htU+EHgguca0Q=", + "requires": { + "vendor-prefixes": "0.0.1" + } + }, + "is-whitespace": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/is-whitespace/-/is-whitespace-0.3.0.tgz", + "integrity": "sha1-Fjnssb4DauxppUy7QBz77XEUq38=" + }, "is-windows": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.1.tgz", @@ -6759,7 +7330,7 @@ "lru-cache": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", - "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", + "integrity": "sha1-Yi4y6CSItJJ5EUpPns9F581rulU=", "requires": { "pseudomap": "1.0.2", "yallist": "2.1.2" @@ -6781,7 +7352,7 @@ "make-dir": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz", - "integrity": "sha512-0Pkui4wLJ7rxvmfUvs87skoEaxmu0hCUApF8nonzpl7q//FWp9zu8W61Scz4sd/kUiqDxvUhtoam2efDyiBzcA==", + "integrity": "sha1-GbQ2n+SMEW9Twq+VrRAsDjnoXVE=", "requires": { "pify": "3.0.0" }, @@ -7007,7 +7578,7 @@ "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", "requires": { "brace-expansion": "1.1.8" } @@ -8015,6 +8586,14 @@ "pbkdf2": "3.0.14" } }, + "parse-author": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/parse-author/-/parse-author-0.2.2.tgz", + "integrity": "sha1-MC0bjkxmUZ0cRd2VED0zKMRJjv0=", + "requires": { + "author-regex": "0.2.1" + } + }, "parse-glob": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", @@ -8124,6 +8703,59 @@ "sha.js": "2.4.9" } }, + "perfectionist": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/perfectionist/-/perfectionist-2.4.0.tgz", + "integrity": "sha1-wUetNxThJkZ/F2QSnuct+GHUfqA=", + "requires": { + "comment-regex": "1.0.0", + "defined": "1.0.0", + "minimist": "1.2.0", + "postcss": "5.2.18", + "postcss-scss": "0.3.1", + "postcss-value-parser": "3.3.0", + "read-file-stdin": "0.2.1", + "string.prototype.repeat": "0.2.0", + "vendors": "1.0.1", + "write-file-stdout": "0.0.2" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=" + }, + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" + }, + "postcss": { + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "requires": { + "has-flag": "1.0.0" + } + } + } + }, "performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", @@ -8240,16 +8872,185 @@ } } }, - "postcss-colormin": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-2.2.2.tgz", - "integrity": "sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks=", + "postcss-class-repeat": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/postcss-class-repeat/-/postcss-class-repeat-0.1.1.tgz", + "integrity": "sha512-0+G/JGaxsJP+a1+epFQ/XCCe9fnpr04Iq0LVp0/9DEZPcP66a/nIECgFDjwNLSOYiDnEv8p4SoWGiMqkzFd5uA==", + "requires": { + "class-repeat": "1.0.2", + "has-class-selector": "1.0.0", + "is-present": "1.0.0", + "postcss": "5.2.18" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=" + }, + "postcss": { + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "postcss-colormin": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-2.2.2.tgz", + "integrity": "sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks=", + "requires": { + "colormin": "1.1.2", + "postcss": "5.2.18", + "postcss-value-parser": "3.3.0" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=" + }, + "postcss": { + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "postcss-conditionals": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/postcss-conditionals/-/postcss-conditionals-2.1.0.tgz", + "integrity": "sha1-TR9iqlQEWM56t3n3FlaQHI+Okpo=", + "requires": { + "css-color-converter": "1.1.0", + "css-unit-converter": "1.1.1", + "postcss": "5.2.18" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=" + }, + "postcss": { + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "postcss-convert-values": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz", + "integrity": "sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=", + "requires": { + "postcss": "5.2.18", + "postcss-value-parser": "3.3.0" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=" + }, + "postcss": { + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "postcss-css-variables": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/postcss-css-variables/-/postcss-css-variables-0.7.0.tgz", + "integrity": "sha1-SqWO6zyFmm8JCQE6sXvspWZSh/0=", "requires": { - "colormin": "1.1.2", - "postcss": "5.2.18", - "postcss-value-parser": "3.3.0" + "escape-string-regexp": "1.0.5", + "extend": "2.0.1", + "postcss": "5.2.18" }, "dependencies": { + "extend": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend/-/extend-2.0.1.tgz", + "integrity": "sha1-HugBBonnOV/5RIJByYZSvHWagmA=" + }, "has-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", @@ -8281,13 +9082,12 @@ } } }, - "postcss-convert-values": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz", - "integrity": "sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=", + "postcss-custom-media": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-5.0.1.tgz", + "integrity": "sha1-E40loYS/LrVN4S1VpsAcMKnYvYE=", "requires": { - "postcss": "5.2.18", - "postcss-value-parser": "3.3.0" + "postcss": "5.2.18" }, "dependencies": { "has-flag": { @@ -8565,6 +9365,50 @@ "postcss": "6.0.14" } }, + "postcss-import": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-9.1.0.tgz", + "integrity": "sha1-lf6YdqHnmvSfvcNYnwH+WqfMHoA=", + "requires": { + "object-assign": "4.1.1", + "postcss": "5.2.18", + "postcss-value-parser": "3.3.0", + "promise-each": "2.2.0", + "read-cache": "1.0.0", + "resolve": "1.5.0" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=" + }, + "postcss": { + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "requires": { + "has-flag": "1.0.0" + } + } + } + }, "postcss-load-config": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-1.2.0.tgz", @@ -9183,6 +10027,92 @@ } } }, + "postcss-rtl": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/postcss-rtl/-/postcss-rtl-1.1.3.tgz", + "integrity": "sha512-vKYVnkyzN9v9LE+YM55SzbWML07sXXqM+DEwyx92325pPywsPjdqd9OeGVVg7UeZRbxQTzLclXQuaRGLcoOPww==", + "requires": { + "rtlcss": "2.2.1" + } + }, + "postcss-safe-parser": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-2.0.1.tgz", + "integrity": "sha1-Oz0cS0OiTDlC4vC+eWE4KzSLOxM=", + "requires": { + "postcss": "5.2.18" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=" + }, + "postcss": { + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "postcss-scss": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-0.3.1.tgz", + "integrity": "sha1-ZcYQ2OKn7g5isYNbcbiHBzSBbks=", + "requires": { + "postcss": "5.2.18" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=" + }, + "postcss": { + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "requires": { + "has-flag": "1.0.0" + } + } + } + }, "postcss-selector-parser": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz", @@ -9388,6 +10318,14 @@ "asap": "2.0.6" } }, + "promise-each": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/promise-each/-/promise-each-2.2.0.tgz", + "integrity": "sha1-M1MXTv8mlEgQN+BOAfd6oPttG2A=", + "requires": { + "any-promise": "0.1.0" + } + }, "prop-types": { "version": "15.6.0", "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz", @@ -9426,6 +10364,16 @@ "event-stream": "3.3.4" } }, + "pseudo-classes": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/pseudo-classes/-/pseudo-classes-0.0.1.tgz", + "integrity": "sha1-3smD2Upo0D3f3vPwfESvn2wiOls=" + }, + "pseudo-elements": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/pseudo-elements/-/pseudo-elements-1.0.0.tgz", + "integrity": "sha1-S+YMvNhJlpKh1yz90+WDnautFhg=" + }, "pseudomap": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", @@ -9515,7 +10463,7 @@ "randomatic": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", - "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==", + "integrity": "sha1-x6vpzIuHwLqodrGf3oP9RkeX44w=", "requires": { "is-number": "3.0.0", "kind-of": "4.0.0" @@ -9749,6 +10697,22 @@ "readable-stream": "2.2.7" } }, + "read-cache": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", + "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=", + "requires": { + "pify": "2.3.0" + } + }, + "read-file-stdin": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/read-file-stdin/-/read-file-stdin-0.2.1.tgz", + "integrity": "sha1-JezP86FTtoCa+ssj7hU4fbng7mE=", + "requires": { + "gather-stream": "1.0.0" + } + }, "read-pkg": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", @@ -9894,7 +10858,7 @@ "regex-cache": { "version": "0.4.4", "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz", - "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", + "integrity": "sha1-db3FiioUls7EihKDW8VMjVYjNt0=", "requires": { "is-equal-shallow": "0.1.3" } @@ -10126,6 +11090,16 @@ "signal-exit": "3.0.2" } }, + "rgb-regex": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz", + "integrity": "sha1-wODWiC3w4jviVKR16O3UGRX+rrE=" + }, + "rgba-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz", + "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=" + }, "right-align": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", @@ -10151,6 +11125,30 @@ "inherits": "2.0.3" } }, + "rtlcss": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/rtlcss/-/rtlcss-2.2.1.tgz", + "integrity": "sha512-JjQ5DlrmwiItAjlmhoxrJq5ihgZcE0wMFxt7S17bIrt4Lw0WwKKFk+viRhvodB/0falyG/5fiO043ZDh6/aqTw==", + "requires": { + "chalk": "2.3.0", + "findup": "0.1.5", + "mkdirp": "0.5.1", + "postcss": "6.0.14", + "strip-json-comments": "2.0.1" + }, + "dependencies": { + "chalk": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", + "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", + "requires": { + "ansi-styles": "3.2.0", + "escape-string-regexp": "1.0.5", + "supports-color": "4.5.0" + } + } + } + }, "run-async": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz", @@ -10395,6 +11393,14 @@ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" }, + "single-trailing-newline": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/single-trailing-newline/-/single-trailing-newline-1.0.0.tgz", + "integrity": "sha1-gfCtKtZFGBlFyAlSpcFBSZLulmQ=", + "requires": { + "detect-newline": "1.0.3" + } + }, "slash": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", @@ -10582,6 +11588,11 @@ } } }, + "specificity": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/specificity/-/specificity-0.3.2.tgz", + "integrity": "sha512-Nc/QN/A425Qog7j9aHmwOrlwX2e7pNI47ciwxwy4jOlvbbMHkNNJchit+FX+UjF3IAdiaaV5BKeWuDUnws6G1A==" + }, "split": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz", @@ -10820,7 +11831,7 @@ "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=", "requires": { "is-fullwidth-code-point": "2.0.0", "strip-ansi": "4.0.0" @@ -10841,6 +11852,11 @@ } } }, + "string.prototype.repeat": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-0.2.0.tgz", + "integrity": "sha1-q6Nt4I3O5qWjN9SbLqHaGyj8Ds8=" + }, "string_decoder": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", @@ -11034,6 +12050,105 @@ "request": "2.83.0" } }, + "tachyons": { + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/tachyons/-/tachyons-4.9.0.tgz", + "integrity": "sha512-bq40Dxl0Q9LFcFsoU4BmTlR4Y9Ta/9AClAhmKhBBdXN0isup9dXtYmFIJGYHz2EOVOf/gO/FONEH0BDa/iNYkg==" + }, + "tachyons-build-css": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/tachyons-build-css/-/tachyons-build-css-1.6.0.tgz", + "integrity": "sha512-z8Svwtiuma8B1+rMa9F+tWdgzFXS8WqFk5EtI3tZC006EqVvwbIaCQwbMYmkEmb1PFDKHJO5ZganQiwKO/Zmag==", + "requires": { + "autoprefixer": "6.7.7", + "css-mqpacker": "5.0.1", + "cssnano": "3.10.0", + "perfectionist": "2.4.0", + "postcss": "5.2.18", + "postcss-class-repeat": "0.1.1", + "postcss-conditionals": "2.1.0", + "postcss-css-variables": "0.7.0", + "postcss-custom-media": "5.0.1", + "postcss-discard-comments": "2.0.4", + "postcss-import": "9.1.0", + "postcss-rtl": "1.1.3" + }, + "dependencies": { + "autoprefixer": { + "version": "6.7.7", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz", + "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=", + "requires": { + "browserslist": "1.7.7", + "caniuse-db": "1.0.30000769", + "normalize-range": "0.1.2", + "num2fraction": "1.2.2", + "postcss": "5.2.18", + "postcss-value-parser": "3.3.0" + } + }, + "browserslist": { + "version": "1.7.7", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz", + "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", + "requires": { + "caniuse-db": "1.0.30000769", + "electron-to-chromium": "1.3.27" + } + }, + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=" + }, + "postcss": { + "version": "5.2.18", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", + "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", + "requires": { + "chalk": "1.1.3", + "js-base64": "2.3.2", + "source-map": "0.5.7", + "supports-color": "3.2.3" + } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "tachyons-cli": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/tachyons-cli/-/tachyons-cli-1.2.0.tgz", + "integrity": "sha512-gyXr96VZ3DbC4jXlnxS7Faq5z30kz0N1K4RwgmNQDTlHHD5/TUPvuBE+MpcsDHfe7ShNPmnSM1awiVelRJLocQ==", + "requires": { + "authors-to-markdown": "0.1.0", + "chalk": "1.1.3", + "copy-files": "0.1.0", + "css-mqpacker": "5.0.1", + "cssstats": "3.1.0", + "dedent": "0.7.0", + "file-exists": "2.0.0", + "immutable-css": "1.1.2", + "is-blank": "1.1.0", + "is-present": "1.0.0", + "lodash": "4.17.4", + "meow": "3.7.0", + "mkdirp": "0.5.1", + "single-trailing-newline": "1.0.0", + "tachyons-build-css": "1.6.0" + } + }, "tapable": { "version": "0.2.8", "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.8.tgz", @@ -11148,7 +12263,7 @@ "touch": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz", - "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==", + "integrity": "sha1-/jZfX3XsntTlaCXgu3bSSrdK+Ds=", "dev": true, "requires": { "nopt": "1.0.10" @@ -11170,7 +12285,7 @@ "tree-kill": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.0.tgz", - "integrity": "sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==", + "integrity": "sha1-WEZ4Yje0I5AU8F2xVrZDIS1MbzY=", "dev": true }, "trim-newlines": { @@ -11507,6 +12622,11 @@ "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" }, + "vendor-prefixes": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/vendor-prefixes/-/vendor-prefixes-0.0.1.tgz", + "integrity": "sha1-mLQ2f4y3CZIw78IOBA9UrtAY0G0=" + }, "vendors": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.1.tgz", @@ -11993,7 +13113,7 @@ "which": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", - "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", + "integrity": "sha1-/wS9/AEO5UfXgL7DjhrBwnd9JTo=", "requires": { "isexe": "2.0.0" } @@ -12102,6 +13222,11 @@ "slide": "1.1.6" } }, + "write-file-stdout": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/write-file-stdout/-/write-file-stdout-0.0.2.tgz", + "integrity": "sha1-wlLXx8WxtAKJdjDjRTx7/mkNnKE=" + }, "xdg-basedir": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz", diff --git a/package.json b/package.json index 0074086..38b1344 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,9 @@ "start:front": "NODE_PATH=src/ react-scripts start", "build": "NODE_PATH=src/ react-scripts build", "eject": "react-scripts eject", - "start:dev": "concurrently \"npm run start:back\" \"npm run start:front\"" + "start:dev": "concurrently \"npm run start:back\" \"npm run start:front\"", + "build-css": "tachyons src/css/app.css > src/index.css --minify", + "watch-css": "chokidar src/css/app.css -c 'npm run build-css'" }, "repository": { "type": "git", @@ -36,6 +38,7 @@ "apollo-client": "^2.0.3", "apollo-client-preset": "^1.0.3", "apollo-link-http": "^1.2.0", + "chokidar-cli": "^1.2.0", "express": "^4.16.2", "express-graphql": "^0.6.11", "graphql": "^0.11.7", @@ -47,7 +50,9 @@ "react-dom": "^16.1.1", "react-mapbox-gl": "^2.8.0", "react-scripts": "1.0.17", - "tabletop": "^1.5.2" + "tabletop": "^1.5.2", + "tachyons": "^4.9.0", + "tachyons-cli": "^1.2.0" }, "devDependencies": { "concurrently": "^3.5.0", diff --git a/src/App.js b/src/App.js index 1e1b7e4..d744509 100644 --- a/src/App.js +++ b/src/App.js @@ -45,12 +45,20 @@ class App extends Component { } render() { - return
- - -
; + console.log(this.state.buildings) + return ( +
+
+ +
+
+ {/* logic here to display either list view or detailed view*/} + +
+
+ ); } } @@ -73,6 +81,11 @@ const query = gql` recommendation latitude longitude + featured_image + second_image + third_image + fourth_image + fifth_image } } `; diff --git a/src/BuildingDetails.js b/src/BuildingDetails.js index a1ed803..9349a84 100644 --- a/src/BuildingDetails.js +++ b/src/BuildingDetails.js @@ -2,7 +2,7 @@ import React from 'react'; const BuildingDetails = ({ building }) => { - const { + const { street_number, street_name, postcode, @@ -18,7 +18,13 @@ const BuildingDetails = ({ building }) => { significance, recommendation, latitude, - longitude } = building + longitude, + featured_image, + second_image, + third_image, + fourth_image, + fifth_image + } = building return (
@@ -37,6 +43,11 @@ const BuildingDetails = ({ building }) => {
{ date_local_listing }
{ significance }
{ recommendation }
+ + + + +
); }; diff --git a/src/Map.js b/src/Map.js index c8e72c4..d7d5266 100644 --- a/src/Map.js +++ b/src/Map.js @@ -15,11 +15,11 @@ class Map extends Component { render() { const { buildings, handleBuildingDetails, mapCenter, mapZoom } = this.props; return ( -