From 1531f9d63d4abfa88c26ae302855e1e9b863f87b Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Tue, 31 Oct 2017 14:47:32 +0000 Subject: [PATCH 01/38] Update docs --- docs/README.md | 4 ++-- docs/SUMMARY.md | 14 +++++++------- docs/administration.md | 4 +--- docs/configuration.md | 31 ++++++++++++++----------------- docs/development.md | 30 +++++++++++------------------- 5 files changed, 35 insertions(+), 48 deletions(-) diff --git a/docs/README.md b/docs/README.md index 1cf1fd2f..fe3774c8 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,4 +1,4 @@ -# {{ brand }} +# {{ book.brand }} [![Build Status](https://travis-ci.org/LibCrowds/libcrowds.svg?branch=master)](https://travis-ci.org/LibCrowds/libcrowds) [![DOI](https://zenodo.org/badge/92406558.svg)](https://zenodo.org/badge/latestdoi/92406558) @@ -13,5 +13,5 @@ The application comprises a set of core webpages, including a homepage and an ad To get started, you might find some of these links useful: -- Want to create a project? Check out the [Projects](projects) section. +- Want to create a project? Check out the [Projects](projects.md) section. - Installing the LibCrowds UI? See [Development](development.md). diff --git a/docs/SUMMARY.md b/docs/SUMMARY.md index 046b07a0..0a23f5ca 100644 --- a/docs/SUMMARY.md +++ b/docs/SUMMARY.md @@ -1,13 +1,13 @@ * [Introduction](README.md) * [Development](development.md) - * [Installation](README.md#installation) - * [Configuration](README.md#configuration) - * [Building](README.md#building) - * [Testing](README.md#testing) + * [Installation](development.md#installing) + * [Configuration](development.md#configuring) + * [Building](development.md#building) + * [Testing](development.md#testing) + * [Documenting](development.md#documenting) * [Configuration](configuration.md) - * [Directory Structure](configuration.md#directory-structure) - * [Site Configuration](configuration.md#site-configuration) - * [Microsite Configuration](configuration.md#microsite-configuration) + * [PYBOSSA](configuration.md#configuring-pybossa) + * [LibCrowds](configuration.md#configuring-libcrowds) * [Administration](administration.md) * [Featured Projects](administration.md#featured-projects) * [Categories](administration.md#categories) diff --git a/docs/administration.md b/docs/administration.md index ebfa16ee..a90ac336 100644 --- a/docs/administration.md +++ b/docs/administration.md @@ -1,8 +1,6 @@ # Administration -Administration settings can be accessed by admin users via the main navigation bar. - -![Admin menu](./assets/admin-menu.png?raw=true) +Administrators can access these settings via the main navigation bar. ## Featured Projects diff --git a/docs/configuration.md b/docs/configuration.md index e6457b0a..772e317a 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -1,8 +1,10 @@ # Configuration +This section describes the core configuration settings required to run an instance of {{ book.brand }}. + ## Configuring PYBOSSA -You will need to change a few things in your PYBOSSA settings file for the frontend to work correctly: +You will need to change a few things in your PYBOSSA settings file: ``` python # To allow requests from the frontend (modify origins according to your environment) @@ -53,7 +55,7 @@ The settings above are all required for the application to run correctly. ## Configuring LibCrowds -The configuration settings below are applied to the core interface. +To use the settings template: ```bash # Copy the template @@ -62,7 +64,7 @@ cp local.config.js.tmpl local.config.js ### analytics -[Google Analytics](https://analytics.google.com) can be added to the site via the `analytics` property. +Add [Google Analytics](https://analytics.google.com). ```js config.analytics = { @@ -72,7 +74,7 @@ config.analytics = { ### brand -The `brand` will appear throughout your site. +Establish the brand. ```js config.brand: 'My Brand' @@ -80,7 +82,7 @@ config.brand: 'My Brand' ### company -The `company` responsible for the site. +Specify the company responsible for the site. ```js config.company: 'My Company' @@ -88,7 +90,7 @@ config.company: 'My Company' ### contact -The `contact` information will appear in the site footer. +Specify contact information. ```js config.contact = { @@ -99,7 +101,7 @@ config.contact = { ### description -The `description` will appear on the site homepage and form its meta description. +Describe the overall purpose of the site. ```js config.description: 'My SEO optimised meta description' @@ -107,7 +109,7 @@ config.description: 'My SEO optimised meta description' ### githubUrl -The `githubUrl` will appear in the site footer. +Provide a GitHub link that relates to the site. ```js config.githubUrl = 'https://github.com/github' @@ -115,8 +117,7 @@ config.githubUrl = 'https://github.com/github' ### mapbox -[Mapbox](https://www.mapbox.com/) is used to present any maps present on the site and can be configured via the `mapbox` property. - +Use [Mapbox](https://www.mapbox.com/) to present any maps present on the site. ```js config.mapbox = { id: 'mapbox.streets', @@ -126,7 +127,7 @@ config.mapbox = { ### pybossa -The `host` and used for all PYBOSSA API calls. +Set the connection details for all PYBOSSA API calls. ```js config.pybossa = { @@ -136,7 +137,7 @@ config.pybossa = { ### sentry -[Sentry](https://sentry.io/) error tracking can be enabled via the `sentry` property. +Enable [Sentry](https://sentry.io/) error tracking. ```js config.sentry = { @@ -146,13 +147,9 @@ config.sentry = { } ``` -{% hint style='info' %} -The LibCrowds release and commit running on the server when the error was thrown will be appended automatically. -{% endhint %} - ### tagline -The `tagline` will appear on the site homepage. +Add an inspiring tagline. ```js config.tagline: 'My inspiring tagline' diff --git a/docs/development.md b/docs/development.md index e7ffea88..4a42413b 100644 --- a/docs/development.md +++ b/docs/development.md @@ -1,6 +1,6 @@ # Development -{{ book.brand }} is fundamentally a Vue.js Server-Side Rendered (SSR) [Progressive Web App (PWA)](https://developers.google.com/web/progressive-web-apps/) that communicates with a [PYBOSSA](https://github.com/Scifabric/pybossa) backend. +{{ book.brand }} is fundamentally a Vue.js Server-Side Rendered (SSR) UI that communicates with a [PYBOSSA](https://github.com/Scifabric/pybossa) backend. ## Installation @@ -11,41 +11,37 @@ Install [Node.js >=8.0.0](https://nodejs.org/en/), then: npm install ``` -Install and run a PYBOSSA server, according to the [PYBOSSA documentation](http://docs.pybossa.com/en/latest/). +You will also need to install an instance of [PYBOSSA](http://docs.pybossa.com/). ## Configuration -To run the server with default settings you can make a copy of the template settings file: +To run {{ book.brand }} with default settings: ``` bash cp local.config.js.tmpl local.config.js ``` -See the [Configuration](configuration.md) section for full details of how to use this file to configure the site. +See the [Configuration](configuration.md) section for full details of how to edit this file. ## Building -To build locally: - ``` bash # build for production with minification npm run build -# build for production and view the bundle analyzer report -npm run build --report +# run in production +npm start -# serve with hot reload at 127.0.0.1:3000 +# serve for development with hot reload at 127.0.0.1:8080 npm run dev ``` {% hint style='danger' %} -Note that for cookies to be read properly you must access the website at http://127.0.0.1:8080, rather than http://localhost:8080. +For cookies to be read properly you must access the website at http://127.0.0.1:8080, rather than http://localhost:8080. {% endhint %} ## Testing -To run tests: - ``` bash # run lint npm lint @@ -57,16 +53,12 @@ npm unit npm test ``` -{% hint style='tip' %} -The **npm unit** command accepts any of the [Jest CLI options](https://facebook.github.io/jest/docs/en/cli.html#options) by prefixing them with an extra **--** (e.g. npm run unit -- --coverage) -{% endhint %} +## Documenting -## Documentation - -To build the documentation: +To build and serve this documentation locally: ``` bash -# install documentation dependencies +# install dependencies gitbook install # serve at 127.0.0.1:4000 From 712a3ae20c21d818f14f8f0182fae9612f8f6c74 Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Tue, 31 Oct 2017 15:02:46 +0000 Subject: [PATCH 02/38] Try fixing package conflict --- package-lock.json | 15 ++++++++++++--- package.json | 3 ++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5dd19112..63d9e769 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7957,6 +7957,15 @@ "requires": { "ms": "2.0.0" } + }, + "vue-template-compiler": { + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.4.4.tgz", + "integrity": "sha512-XdHsNi8Z5WqwuFl/Z5eLKgE2DOEEOdMk1aA459uSgvwyy+pjKLBlQWsUpAtoR6o6Wmpujw6NtinAUGuqSTituQ==", + "requires": { + "de-indent": "1.0.2", + "he": "1.1.1" + } } } }, @@ -12728,9 +12737,9 @@ } }, "vue-template-compiler": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.4.4.tgz", - "integrity": "sha512-XdHsNi8Z5WqwuFl/Z5eLKgE2DOEEOdMk1aA459uSgvwyy+pjKLBlQWsUpAtoR6o6Wmpujw6NtinAUGuqSTituQ==", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.5.2.tgz", + "integrity": "sha512-FtbqBWvEANPZaeRo09VKEF7tET4kPMtJYqwsy/Nm1fdr1zIcwcTI7CXqeraXMviczho5IjtxZ6Fab1Enm4rHmA==", "requires": { "de-indent": "1.0.2", "he": "1.1.1" diff --git a/package.json b/package.json index d6ae77f1..685b696d 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,8 @@ "vue-progress": "^0.2.1", "vue-scrollto": "^2.7.8", "vue-simplemde": "^0.4.6", - "vue-sweetalert": "^0.1.18" + "vue-sweetalert": "^0.1.18", + "vue-template-compiler": "2.5.2" }, "devDependencies": { "axios-mock-adapter": "^1.9.0", From c5e801e786f67c0419a9e809c5cec3f2c8f64569 Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Tue, 31 Oct 2017 15:17:21 +0000 Subject: [PATCH 03/38] Update package --- nuxt.config.js | 5 ---- package-lock.json | 74 ++++++++++++----------------------------------- package.json | 9 ++---- 3 files changed, 21 insertions(+), 67 deletions(-) diff --git a/nuxt.config.js b/nuxt.config.js index bd0b5d0d..a1e318cf 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -60,11 +60,6 @@ const config = { ] } - config.module.rules.push({ - test: /\.svg$/, - loader: 'svg-inline-loader' - }) - config.module.rules.push({ test: /\.md$/, use: [ diff --git a/package-lock.json b/package-lock.json index 63d9e769..703bb9d9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6636,15 +6636,15 @@ } }, "jest-vue-preprocessor": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/jest-vue-preprocessor/-/jest-vue-preprocessor-1.2.0.tgz", - "integrity": "sha512-fXnvxM0buCiiU3tFO7AzolfFNoZgSFV4BYaIIHNtZn31hZ5ChtqzqPf7QCjRHakxVGuo2aKlWb54VoAM+fUDMQ==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/jest-vue-preprocessor/-/jest-vue-preprocessor-1.3.1.tgz", + "integrity": "sha512-bl3ECo9IFt+idx9WAVy6fdj7p2u5wWr7G4NSEXHEwnV0TFRKKUcDjK7XF3kXdeUJ2Sa3uGqqjS0o1ZIvLZyKqQ==", "dev": true, "requires": { "babel-plugin-transform-runtime": "6.23.0", "find-babel-config": "1.1.0", - "typescript": "2.4.2", - "vue-property-decorator": "5.1.1" + "typescript": "2.5.3", + "vue-property-decorator": "6.0.0" } }, "jimp": { @@ -7539,12 +7539,6 @@ } } }, - "mockdate": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/mockdate/-/mockdate-2.0.2.tgz", - "integrity": "sha1-WuDA6vj+I+AJzQH5iJtCxPY0rxI=", - "dev": true - }, "moment": { "version": "2.19.1", "resolved": "https://registry.npmjs.org/moment/-/moment-2.19.1.tgz", @@ -11569,12 +11563,6 @@ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" }, - "simple-html-tokenizer": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/simple-html-tokenizer/-/simple-html-tokenizer-0.1.1.tgz", - "integrity": "sha1-BcLuxXn//+FFoDCsJs/qYbmA+r4=", - "dev": true - }, "simple-swizzle": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", @@ -11852,31 +11840,6 @@ "has-flag": "2.0.0" } }, - "svg-inline-loader": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/svg-inline-loader/-/svg-inline-loader-0.8.0.tgz", - "integrity": "sha512-rynplY2eXFrdNomL1FvyTFQlP+dx0WqbzHglmNtA9M4IHRC3no2aPAl3ny9lUpJzFzFMZfWRK5YIclNU+FRePA==", - "dev": true, - "requires": { - "loader-utils": "0.2.17", - "object-assign": "4.1.1", - "simple-html-tokenizer": "0.1.1" - }, - "dependencies": { - "loader-utils": { - "version": "0.2.17", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", - "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", - "dev": true, - "requires": { - "big.js": "3.2.0", - "emojis-list": "2.1.0", - "json5": "0.5.1", - "object-assign": "4.1.1" - } - } - } - }, "svg-tags": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz", @@ -12221,9 +12184,9 @@ "dev": true }, "typescript": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.4.2.tgz", - "integrity": "sha1-+DlfhdRZJ2BnyYiqQYN6j4KHCEQ=", + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.5.3.tgz", + "integrity": "sha512-ptLSQs2S4QuS6/OD1eAKG+S5G8QQtrU5RT32JULdZQtM1L3WTi34Wsu48Yndzi8xsObRAB9RPt/KhA9wlpEF6w==", "dev": true }, "typo-js": { @@ -12532,9 +12495,9 @@ } }, "vue-class-component": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/vue-class-component/-/vue-class-component-5.0.2.tgz", - "integrity": "sha512-wgI/SKRozqADIeMGN16PXiHBa/cnRD7JcuYt7P4JHcMIMc2BdUw02pQ+EQmsui0tN2kRVZGwZ8h4Yb2Vbf4w0w==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/vue-class-component/-/vue-class-component-6.0.0.tgz", + "integrity": "sha512-3XS48fRq8NoTg/SgGOoHc50xiwgIkaee3/eyFcHl5BlzU5EW4phN3q5yh8aLdJ3vzcW1jxdiEyI6davLq+VJ0w==", "dev": true }, "vue-clickaway": { @@ -12642,13 +12605,13 @@ } }, "vue-property-decorator": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/vue-property-decorator/-/vue-property-decorator-5.1.1.tgz", - "integrity": "sha1-jTslWBWN5riuixWcoxD3DsJK1L4=", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/vue-property-decorator/-/vue-property-decorator-6.0.0.tgz", + "integrity": "sha1-u2UbKTVC4x2w0k829LAlDvCNhRU=", "dev": true, "requires": { "reflect-metadata": "0.1.10", - "vue-class-component": "5.0.2" + "vue-class-component": "6.0.0" } }, "vue-router": { @@ -12746,10 +12709,9 @@ } }, "vue-template-es2015-compiler": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.5.3.tgz", - "integrity": "sha512-j3TBDtjqz7pC9XUzeSeqF5oekqPahxyUHsdG+kZKDH/V/DTexq5inYdLGstnqCUljoLC9LTj3H/5hmyToeSd1A==", - "dev": true + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.6.0.tgz", + "integrity": "sha512-x3LV3wdmmERhVCYy3quqA57NJW7F3i6faas++pJQWtknWT+n7k30F4TVdHvCLn48peTJFRvCpxs3UuFPqgeELg==" }, "vue-test-utils": { "version": "1.0.0-beta.2", diff --git a/package.json b/package.json index 685b696d..8a54eafc 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,6 @@ "izitoast": "^1.1.5", "libcrowds-viewer": "^3.3.2", "lodash": "^4.17.4", - "lru-cache": "^4.1.1", "moment": "^2.19.1", "nuxt": "1.0.0-rc11", "popper.js": "^1.12.5", @@ -57,7 +56,8 @@ "vue-scrollto": "^2.7.8", "vue-simplemde": "^0.4.6", "vue-sweetalert": "^0.1.18", - "vue-template-compiler": "2.5.2" + "vue-template-compiler": "^2.5.2", + "vue-template-es2015-compiler": "^1.6.0" }, "devDependencies": { "axios-mock-adapter": "^1.9.0", @@ -89,16 +89,13 @@ "html-loader": "^0.5.1", "jest": "^21.2.1", "jest-serializer-html": "^4.0.0", - "jest-vue-preprocessor": "~1.2.0", + "jest-vue-preprocessor": "~1.3.0", "jsdom": "^11.3.0", "markdown-loader": "^2.0.1", - "mockdate": "^2.0.2", "node-sass": "^4.5.3", "regenerator-runtime": "^0.11.0", "sass-loader": "^6.0.6", "shelljs": "^0.7.8", - "svg-inline-loader": "^0.8.0", - "vue-template-es2015-compiler": "~1.5.3", "vue-test-utils": "^1.0.0-beta.2", "webpack-node-externals": "^1.6.0" }, From 3a7db705a6275c662c55addeb689d0d215f9821b Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Tue, 31 Oct 2017 16:14:06 +0000 Subject: [PATCH 04/38] Throw actual errors rather than new objects --- components/InfiniteLoad.vue | 4 +- components/cards/Favourites.vue | 2 +- components/forms/ImageUpload.vue | 2 +- components/modals/Data.vue | 2 +- components/modals/ProjectStats.vue | 2 +- components/presenters/Z3950.vue | 2 +- mixins/fetchCollectionById.js | 4 +- mixins/fetchCollectionByName.js | 4 +- mixins/fetchProjectAndCollection.js | 4 +- mixins/fetchProjectByName.js | 4 +- mixins/loadCollectionFeatured.js | 2 +- nuxt.config.js | 5 + package-lock.json | 1430 +++++++++-------- package.json | 3 +- pages/account/_name/index.vue | 2 +- pages/account/_name/settings/api.vue | 2 +- pages/account/_name/settings/avatar.vue | 2 +- pages/account/_name/settings/profile.vue | 2 +- pages/account/_name/settings/security.vue | 2 +- pages/account/newsletter.vue | 2 +- pages/account/password/forgotten.vue | 2 +- pages/account/password/reset.vue | 2 +- pages/account/register.vue | 2 +- pages/account/signin.vue | 2 +- pages/admin/announcements/_id/update.vue | 4 +- pages/admin/collections/_id/update.vue | 2 +- pages/admin/collections/index.vue | 2 +- pages/admin/collections/new.vue | 2 +- pages/admin/featured.vue | 2 +- pages/admin/users.vue | 6 +- .../projects/_id/_presenter.vue/index.vue | 10 +- pages/index.vue | 2 +- pages/project/_short_name/collection.vue | 2 +- pages/project/_short_name/settings.vue | 2 +- pages/project/_short_name/tags.vue | 2 +- pages/project/_short_name/thumbnail.vue | 2 +- store/actions.js | 2 - 37 files changed, 845 insertions(+), 685 deletions(-) diff --git a/components/InfiniteLoad.vue b/components/InfiniteLoad.vue index 35a7f9e7..9e89522b 100644 --- a/components/InfiniteLoad.vue +++ b/components/InfiniteLoad.vue @@ -60,7 +60,7 @@ export default { this.$emit('input', this.value.concat(data)) $state.loaded() } catch (err) { - this.$nuxt.error({ statusCode: err.statusCode, message: err.message }) + this.$nuxt.error(err) } }, @@ -112,7 +112,7 @@ export default { items = items.concat(enrichedData) } catch (err) { - this.$nuxt.error({ statusCode: err.statusCode, message: err.message }) + this.$nuxt.error(err) break } } diff --git a/components/cards/Favourites.vue b/components/cards/Favourites.vue index d36669d0..9b86bb89 100644 --- a/components/cards/Favourites.vue +++ b/components/cards/Favourites.vue @@ -73,7 +73,7 @@ export default { this.$axios.$get('/api/favorites').then(data => { this.images = this.getImageData(data) }).catch(err => { - this.$nuxt.error({ statusCode: err.statusCode, message: err.message }) + this.$nuxt.error(err) }) } } diff --git a/components/forms/ImageUpload.vue b/components/forms/ImageUpload.vue index 4bd990f9..5abf8942 100644 --- a/components/forms/ImageUpload.vue +++ b/components/forms/ImageUpload.vue @@ -146,7 +146,7 @@ export default { type: 'success' }) }).catch(err => { - this.$nuxt.error({ statusCode: err.statusCode, message: err.message }) + this.$nuxt.error(err) }).then(() => { this.processing = false }) diff --git a/components/modals/Data.vue b/components/modals/Data.vue index 812aacfa..456c6338 100644 --- a/components/modals/Data.vue +++ b/components/modals/Data.vue @@ -83,7 +83,7 @@ export default { }).then(data => { exportFile(data, `${this.project.short_name}_${type}`, 'zip') }).catch(err => { - this.$nuxt.error({ statusCode: err.statusCode, message: err.message }) + this.$nuxt.error(err) }) } } diff --git a/components/modals/ProjectStats.vue b/components/modals/ProjectStats.vue index 8cc3af4d..d810a273 100644 --- a/components/modals/ProjectStats.vue +++ b/components/modals/ProjectStats.vue @@ -98,7 +98,7 @@ export default { this.userStats = data.userStats || {} this.projectStats = data.projectStats || {} }).catch(err => { - this.$nuxt.error({ statusCode: err.statusCode, message: err.message }) + this.$nuxt.error(err) }) } }, diff --git a/components/presenters/Z3950.vue b/components/presenters/Z3950.vue index 3ad2f580..57074f76 100644 --- a/components/presenters/Z3950.vue +++ b/components/presenters/Z3950.vue @@ -361,7 +361,7 @@ export default { } this.processing = false }).catch(err => { - this.$nuxt.error({ statusCode: err.statusCode, message: err.message }) + this.$nuxt.error(err) }) }, diff --git a/mixins/fetchCollectionById.js b/mixins/fetchCollectionById.js index 1ee5d164..358423e9 100644 --- a/mixins/fetchCollectionById.js +++ b/mixins/fetchCollectionById.js @@ -8,13 +8,13 @@ export const fetchCollectionById = { fetch ({ params, app, error, store }) { return app.$axios.$get(`/api/category/${params.id}`).then(data => { if (isEmpty(data)) { - error({ statusCode: 404, message: 'Page not found' }) + error(new Error({ statusCode: 404 })) return } setCollectionDefaults(data) store.dispatch('UPDATE_CURRENT_COLLECTION', data) }).catch(err => { - error({ statusCode: err.statusCode, message: err.message }) + error(err) }) } } diff --git a/mixins/fetchCollectionByName.js b/mixins/fetchCollectionByName.js index c3066b02..38929acb 100644 --- a/mixins/fetchCollectionByName.js +++ b/mixins/fetchCollectionByName.js @@ -11,13 +11,13 @@ export const fetchCollectionByName = { } }).then(data => { if (!data || data.length !== 1) { - error({ statusCode: 404, message: 'Page not found' }) + error(new Error({ statusCode: 404 })) return } setCollectionDefaults(data[0]) store.dispatch('UPDATE_CURRENT_COLLECTION', data[0]) }).catch(err => { - error({ statusCode: err.statusCode, message: err.message }) + error(err) }) } } diff --git a/mixins/fetchProjectAndCollection.js b/mixins/fetchProjectAndCollection.js index ddd9354f..4996d8a9 100644 --- a/mixins/fetchProjectAndCollection.js +++ b/mixins/fetchProjectAndCollection.js @@ -12,7 +12,7 @@ export const fetchProjectAndCollection = { } }).then(data => { if (!data || data.length !== 1) { - error({ statusCode: 404, message: 'Page not found' }) + error(new Error({ statusCode: 404 })) } else { store.dispatch('UPDATE_CURRENT_PROJECT', data[0]) return app.$axios.$get(`/api/category/${data[0].category_id}`) @@ -21,7 +21,7 @@ export const fetchProjectAndCollection = { setCollectionDefaults(data) store.dispatch('UPDATE_CURRENT_COLLECTION', data) }).catch(err => { - error({ statusCode: err.statusCode, message: err.message }) + error(err) }) } } diff --git a/mixins/fetchProjectByName.js b/mixins/fetchProjectByName.js index 9763428b..8ff70fe8 100644 --- a/mixins/fetchProjectByName.js +++ b/mixins/fetchProjectByName.js @@ -10,12 +10,12 @@ export const fetchProjectByName = { } }).then(data => { if (!data || data.length !== 1) { - error({ statusCode: 404, message: 'Page not found' }) + error(new Error({ statusCode: 404 })) return } store.dispatch('UPDATE_CURRENT_PROJECT', data[0]) }).catch(err => { - error({ statusCode: err.statusCode, message: err.message }) + error(err) }) } } diff --git a/mixins/loadCollectionFeatured.js b/mixins/loadCollectionFeatured.js index ed40faae..c7836891 100644 --- a/mixins/loadCollectionFeatured.js +++ b/mixins/loadCollectionFeatured.js @@ -28,7 +28,7 @@ export const loadCollectionFeatured = { return merge(data[idx], project) }) }).catch(err => { - this.$nuxt.error({ statusCode: err.statusCode, message: err.message }) + this.$nuxt.error(err) }) } } diff --git a/nuxt.config.js b/nuxt.config.js index a1e318cf..fe7cbf42 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -67,6 +67,11 @@ const config = { 'markdown-loader' ] }) + }, + postcss: { + plugins: { + 'postcss-custom-properties': false + } } }, plugins: [ diff --git a/package-lock.json b/package-lock.json index 703bb9d9..a4352e33 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,19 +10,9 @@ "integrity": "sha512-qjdcQRmsZz7hqsmGfBsAPA5+1egCa79U46uznVc0ZY12kdEU5HiqtHsBOUd1JYBww474woGG72DXvBiUgkfX1g==", "requires": { "axios": "0.16.2", - "chalk": "2.1.0", + "chalk": "2.3.0", "debug": "3.1.0", "whatwg-url": "6.3.0" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "requires": { - "ms": "2.0.0" - } - } } }, "@nuxtjs/google-analytics": { @@ -38,26 +28,6 @@ "fs-extra": "3.0.1", "hash-sum": "1.0.2", "jimp": "0.2.28" - }, - "dependencies": { - "fs-extra": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz", - "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=", - "requires": { - "graceful-fs": "4.1.11", - "jsonfile": "3.0.1", - "universalify": "0.1.1" - } - }, - "jsonfile": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz", - "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=", - "requires": { - "graceful-fs": "4.1.11" - } - } } }, "@nuxtjs/manifest": { @@ -111,9 +81,9 @@ } }, "@types/node": { - "version": "6.0.89", - "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.89.tgz", - "integrity": "sha512-Z/67L97+6H1qJiEEHSN1SQapkWjDss1D90rAnFcQ6UxKkah9juzotK5UNEP1bDv/0lJ3NAQTnVfc/JWdgCGruA==", + "version": "6.0.90", + "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.90.tgz", + "integrity": "sha512-tXoGRVdi7wZX7P1VWoV9Wfk0uYDOAHdEYXAttuWgSrN76Q32wQlSrMX0Rgyv3RTEaQY2ZLQrzYHVM2e8rfo8sA==", "dev": true }, "abab": { @@ -138,9 +108,9 @@ } }, "acorn": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.2.tgz", - "integrity": "sha512-o96FZLJBPY1lvTuJylGA9Bk3t/GKPPJG8H0ydQQl01crzwJgspa4AEIq/pVTXigmK0PHVQhiAtn8WMBLL9D2WA==" + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.2.1.tgz", + "integrity": "sha512-jG0u7c4Ly+3QkkW18V+NRDN+4bWHdln30NL1ZL2AvFZZmQe/BfopYCtghCKKVBUSetZ4QKcyA0pY6/4Gw8Pv8w==" }, "acorn-dynamic-import": { "version": "2.0.2", @@ -158,12 +128,20 @@ } }, "acorn-globals": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.0.0.tgz", - "integrity": "sha512-0ih/qJVrAalX7TjjAnQdz8u+I1QOnLvLq+9zkyqcczObOii07ukuUSd5mTgVDukhqikAs+gqTm6cMd8VFwTrwA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-3.1.0.tgz", + "integrity": "sha1-/YJw9x+7SZawBPqIDuXUZXOnMb8=", "dev": true, "requires": { - "acorn": "5.1.2" + "acorn": "4.0.13" + }, + "dependencies": { + "acorn": { + "version": "4.0.13", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz", + "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=", + "dev": true + } } }, "acorn-jsx": { @@ -184,20 +162,20 @@ } }, "ajv": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.3.tgz", - "integrity": "sha1-wG9Zh3jETGsWGrr+NGa4GtGBTtI=", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.3.0.tgz", + "integrity": "sha1-RBT/dKUIecII7l/cgm4ywwNUnto=", "requires": { "co": "4.6.0", "fast-deep-equal": "1.0.0", - "json-schema-traverse": "0.3.1", - "json-stable-stringify": "1.0.1" + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.3.1" } }, "ajv-keywords": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.0.tgz", - "integrity": "sha1-opbhf3v658HOT34N5T0pyzIWLfA=" + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz", + "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=" }, "align-text": { "version": "0.1.4", @@ -356,9 +334,9 @@ "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=" }, "asn1.js": { - "version": "4.9.1", - "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz", - "integrity": "sha1-SLokC0WpKA6UdImQull9IWYX/UA=", + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.0.tgz", + "integrity": "sha512-MRQhVc216mWuR9FUJLvnbKNBnmVAWB2mxyuYP3hkSQJ+7QAzTHBVN88ZGMrPIZw5NbQ1z1thZOGM83SF4PBf9Q==", "requires": { "bn.js": "4.11.8", "inherits": "2.0.3", @@ -415,12 +393,12 @@ "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" }, "autoprefixer": { - "version": "7.1.5", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.1.5.tgz", - "integrity": "sha512-sMN453qIm8Z+tunzYWW+Y490wWkICHhCYm/VohLjjl+N7ARSFuF5au7E6tr7oEbeeXj8mNjpSw2kxjJaO6YCOw==", + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.1.6.tgz", + "integrity": "sha512-C9yv/UF3X+eJTi/zvfxuyfxmLibYrntpF3qoJYrMeQwgUJOZrZvpJiMG2FMQ3qnhWtF/be4pYONBBw95ZGe3vA==", "requires": { - "browserslist": "2.5.1", - "caniuse-lite": "1.0.30000745", + "browserslist": "2.6.1", + "caniuse-lite": "1.0.30000756", "normalize-range": "0.1.2", "num2fraction": "1.2.2", "postcss": "6.0.13", @@ -443,7 +421,7 @@ "integrity": "sha1-uk+S8XFn37q0CYN4VFS5rBScPG0=", "requires": { "follow-redirects": "1.2.5", - "is-buffer": "1.1.5" + "is-buffer": "1.1.6" } }, "axios-mock-adapter": { @@ -552,9 +530,19 @@ "lodash": "4.17.4", "minimatch": "3.0.4", "path-is-absolute": "1.0.1", - "private": "0.1.7", + "private": "0.1.8", "slash": "1.0.0", "source-map": "0.5.7" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + } } }, "babel-eslint": { @@ -781,7 +769,7 @@ "dev": true, "requires": { "find-up": "2.1.0", - "istanbul-lib-instrument": "1.8.0", + "istanbul-lib-instrument": "1.9.1", "test-exclude": "4.1.1" } }, @@ -829,7 +817,7 @@ "requires": { "find-babel-config": "1.1.0", "glob": "7.1.2", - "resolve": "1.4.0" + "resolve": "1.5.0" } }, "babel-plugin-syntax-async-functions": { @@ -1219,14 +1207,14 @@ "babel-plugin-transform-object-rest-spread": "6.26.0", "babel-plugin-transform-regenerator": "6.26.0", "babel-plugin-transform-runtime": "6.23.0", - "babel-preset-env": "1.6.0", + "babel-preset-env": "1.6.1", "babel-runtime": "6.26.0" } }, "babel-preset-env": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.6.0.tgz", - "integrity": "sha512-OVgtQRuOZKckrILgMA5rvctvFZPv72Gua9Rt006AiPoB0DJKGN07UmaQA+qRrYgK71MVct8fFhT0EyNWYorVew==", + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.6.1.tgz", + "integrity": "sha512-W6VIyA6Ch9ePMI7VptNn2wBM6dbG0eSz25HEiL40nQXCsXGTGZSTZu1Iap+cj3Q0S5a7T9+529l/5Bkvd+afNA==", "requires": { "babel-plugin-check-es2015-constants": "6.22.0", "babel-plugin-syntax-trailing-function-commas": "6.22.0", @@ -1255,7 +1243,7 @@ "babel-plugin-transform-es2015-unicode-regex": "6.24.1", "babel-plugin-transform-exponentiation-operator": "6.24.1", "babel-plugin-transform-regenerator": "6.26.0", - "browserslist": "2.5.1", + "browserslist": "2.6.1", "invariant": "2.2.2", "semver": "5.4.1" } @@ -1346,7 +1334,7 @@ "babel-plugin-syntax-dynamic-import": "6.18.0", "babel-plugin-transform-object-rest-spread": "6.26.0", "babel-plugin-transform-runtime": "6.23.0", - "babel-preset-env": "1.6.0", + "babel-preset-env": "1.6.1", "babel-preset-vue": "1.2.1", "babel-runtime": "6.26.0" } @@ -1400,6 +1388,16 @@ "globals": "9.18.0", "invariant": "2.2.2", "lodash": "4.17.4" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + } } }, "babel-types": { @@ -1432,7 +1430,7 @@ "nodemon": "1.12.1", "ramda": "0.23.0", "source-map-support": "0.4.18", - "webpack": "3.6.0", + "webpack": "3.8.1", "webpack-node-externals": "1.6.0" } }, @@ -1522,25 +1520,18 @@ "resolved": "https://registry.npmjs.org/bootstrap-vue/-/bootstrap-vue-1.0.0-beta.9.tgz", "integrity": "sha512-0wYWRebZROB+IXpatXgr/pUsiZ7ZUl/uJmc3bpIKlsi9sciE7wIdjV9PhdHnqoipU0kYylHfdcHimOHl5aIbjA==", "requires": { - "bootstrap": "4.0.0-beta" - }, - "dependencies": { - "bootstrap": { - "version": "4.0.0-beta", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.0.0-beta.tgz", - "integrity": "sha512-I/r3fYtUZr+rUNkh8HI+twxZ56p6ehNn27eA1XSebLVQKAJ2xZHnEvZrSR+UR2A/bONcd9gHC3xatVhQlH6R6w==" - } + "bootstrap": "4.0.0-beta.2" } }, "boxen": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.2.1.tgz", - "integrity": "sha1-DxHn/jRO25OXl3/BPt5/ZNlWSB0=", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.2.2.tgz", + "integrity": "sha1-Px1AMsMP/qnUsCwyLq8up0HcvOU=", "dev": true, "requires": { "ansi-align": "2.0.0", "camelcase": "4.1.0", - "chalk": "2.1.0", + "chalk": "2.3.0", "cli-boxes": "1.0.0", "string-width": "2.1.1", "term-size": "1.2.0", @@ -1597,9 +1588,9 @@ } }, "browserify-aes": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.8.tgz", - "integrity": "sha512-WYCMOT/PtGTlpOKFht0YJFYcPy6pLCR98CtWfzK13zoynLlBMvAdEMSRGmgnJCw2M2j/5qxBkinZQFobieM8dQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.1.1.tgz", + "integrity": "sha512-UGnTYAnB2a3YuYKIRy1/4FB2HdM866E0qC46JXvVTYKlBlZlnvfpSfY6OKfXZAkv70eJ2a1SqzpAo5CRhZGDFg==", "requires": { "buffer-xor": "1.0.3", "cipher-base": "1.0.4", @@ -1614,7 +1605,7 @@ "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz", "integrity": "sha1-mYgkSHS/XtTijalWZtzWasj8Njo=", "requires": { - "browserify-aes": "1.0.8", + "browserify-aes": "1.1.1", "browserify-des": "1.0.0", "evp_bytestokey": "1.0.3" } @@ -1661,12 +1652,12 @@ } }, "browserslist": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.5.1.tgz", - "integrity": "sha512-jAvM2ku7YDJ+leAq3bFH1DE0Ylw+F+EQDq4GkqZfgPEqpWYw9ofQH85uKSB9r3Tv7XDbfqVtE+sdvKJW7IlPJA==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.6.1.tgz", + "integrity": "sha512-HBZwVT7ciQB9KlXM3AUMQbnQXtHWPsEUKQTiS0BEFfY5bOrMl94ORaqQD1GyuTGh69ZmYeue9QBqiw219e09eQ==", "requires": { - "caniuse-lite": "1.0.30000745", - "electron-to-chromium": "1.3.24" + "caniuse-lite": "1.0.30000756", + "electron-to-chromium": "1.3.27" } }, "bser": { @@ -1766,7 +1757,7 @@ "integrity": "sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=", "requires": { "browserslist": "1.7.7", - "caniuse-db": "1.0.30000746", + "caniuse-db": "1.0.30000756", "lodash.memoize": "4.1.2", "lodash.uniq": "4.5.0" }, @@ -1776,21 +1767,21 @@ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz", "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", "requires": { - "caniuse-db": "1.0.30000746", - "electron-to-chromium": "1.3.24" + "caniuse-db": "1.0.30000756", + "electron-to-chromium": "1.3.27" } } } }, "caniuse-db": { - "version": "1.0.30000746", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000746.tgz", - "integrity": "sha1-UBCYxm9fu/Y0wC8lUIsF6ICZEPQ=" + "version": "1.0.30000756", + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000756.tgz", + "integrity": "sha1-6TimuZFjDzDSJj3TRYvrZdNiJos=" }, "caniuse-lite": { - "version": "1.0.30000745", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000745.tgz", - "integrity": "sha1-INb+3hFXpJNRM1ApRvx+DmuIDaU=" + "version": "1.0.30000756", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000756.tgz", + "integrity": "sha1-PacBwVIbn6uHAExt58l/pH2+qtI=" }, "capitalize": { "version": "1.0.0", @@ -1818,13 +1809,13 @@ } }, "chalk": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz", - "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==", + "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.4.0" + "supports-color": "4.5.0" } }, "charenc": { @@ -1861,6 +1852,21 @@ "is-glob": "2.0.1", "path-is-absolute": "1.0.1", "readdirp": "2.1.0" + }, + "dependencies": { + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" + }, + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "requires": { + "is-extglob": "1.0.0" + } + } } }, "ci-info": { @@ -2001,7 +2007,7 @@ "resolved": "https://registry.npmjs.org/coa/-/coa-1.0.4.tgz", "integrity": "sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=", "requires": { - "q": "1.5.0" + "q": "1.5.1" } }, "coalescy": { @@ -2100,9 +2106,9 @@ "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=" }, "compressible": { - "version": "2.0.11", - "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.11.tgz", - "integrity": "sha1-FnGKdd4oPtjmBAQWJaIGRYZ5fYo=", + "version": "2.0.12", + "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.12.tgz", + "integrity": "sha1-xZpcmdt2dn6YdlAOJx72OzSTvWY=", "requires": { "mime-db": "1.30.0" } @@ -2114,11 +2120,21 @@ "requires": { "accepts": "1.3.4", "bytes": "3.0.0", - "compressible": "2.0.11", + "compressible": "2.0.12", "debug": "2.6.9", "on-headers": "1.0.1", "safe-buffer": "5.1.1", "vary": "1.1.2" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + } } }, "concat-map": { @@ -2145,7 +2161,7 @@ "requires": { "dot-prop": "4.2.0", "graceful-fs": "4.1.11", - "make-dir": "1.0.0", + "make-dir": "1.1.0", "unique-string": "1.0.0", "write-file-atomic": "2.3.0", "xdg-basedir": "3.0.0" @@ -2160,6 +2176,21 @@ "finalhandler": "1.0.6", "parseurl": "1.3.2", "utils-merge": "1.0.1" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=" + } } }, "console-browserify": { @@ -2206,9 +2237,9 @@ "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==" }, "content-type-parser": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/content-type-parser/-/content-type-parser-1.0.1.tgz", - "integrity": "sha1-w+VpiMU8ZRJ/tG1AMqOpACRv3JQ=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/content-type-parser/-/content-type-parser-1.0.2.tgz", + "integrity": "sha512-lM4l4CnMEwOLHAHr/P6MEZwZFPJFtAAKgL6pogbXmVZggIqXhdB6RbBtPOTsw2FcXwYhehRGERJmRrjOiIB8pQ==", "dev": true }, "convert-source-map": { @@ -2253,6 +2284,13 @@ "os-homedir": "1.0.2", "parse-json": "2.2.0", "require-from-string": "1.2.1" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" + } } }, "crc": { @@ -2303,14 +2341,14 @@ } }, "croppie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/croppie/-/croppie-2.5.0.tgz", - "integrity": "sha512-15t25/EsHw1wrWF7FMWrzradchP1jO+6Qo7aA027SNqzG1AsqsTxQE7UHnMy2kSfMfwm4pCmezg6r8h/7p923A==" + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/croppie/-/croppie-2.5.1.tgz", + "integrity": "sha512-8QsuDg2/vGlNutBH2hcnxm4rZUpMe50HQFpU1q0MDetD1uT4qHHkS485e+u7wvCQflJjfBxBsWlQ9grGMOsmxg==" }, "cross-env": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.0.5.tgz", - "integrity": "sha1-Q4PTZNlmCHPdGFs5ivO/717//vM=", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.1.1.tgz", + "integrity": "sha512-Wtvr+z0Z06KO1JxjfRRsPC+df7biIOiuV4iZ73cThjFGkH+ULBZq1MkBdywEcJC4cTDbO6c8IjgRjfswx3YTBA==", "requires": { "cross-spawn": "5.1.0", "is-windows": "1.0.1" @@ -2387,14 +2425,6 @@ "version": "0.1.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.1.0.tgz", "integrity": "sha1-tQS9BYabOSWd0MXvw12EMXbczEo=" - }, - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "requires": { - "ms": "2.0.0" - } } } }, @@ -2572,7 +2602,7 @@ "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=", "requires": { "browserslist": "1.7.7", - "caniuse-db": "1.0.30000746", + "caniuse-db": "1.0.30000756", "normalize-range": "0.1.2", "num2fraction": "1.2.2", "postcss": "5.2.18", @@ -2584,8 +2614,8 @@ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz", "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", "requires": { - "caniuse-db": "1.0.30000746", - "electron-to-chromium": "1.3.24" + "caniuse-db": "1.0.30000756", + "electron-to-chromium": "1.3.27" } }, "chalk": { @@ -2657,6 +2687,11 @@ "cssom": "0.3.2" } }, + "cuint": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/cuint/-/cuint-0.2.2.tgz", + "integrity": "sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=" + }, "currently-unhandled": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", @@ -2671,7 +2706,7 @@ "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz", "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", "requires": { - "es5-ext": "0.10.31" + "es5-ext": "0.10.35" } }, "dashdash": { @@ -2693,9 +2728,9 @@ "integrity": "sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=" }, "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", "requires": { "ms": "2.0.0" } @@ -2997,9 +3032,9 @@ "integrity": "sha1-zIcsFoiArjxxiXYv1f/ACJbJUYo=" }, "electron-to-chromium": { - "version": "1.3.24", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.24.tgz", - "integrity": "sha1-m3uIuwXOufoBahd4M8wt3jiPIbY=" + "version": "1.3.27", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz", + "integrity": "sha1-eOy4o5kGYYe7N07t412ccFZagD0=" }, "elliptic": { "version": "6.4.0", @@ -3081,21 +3116,21 @@ } }, "es5-ext": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.31.tgz", - "integrity": "sha1-e7k4yVp/G59ygJLcCcQe3MOY7v4=", + "version": "0.10.35", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.35.tgz", + "integrity": "sha1-GO6FjOajxFx9eekcFfzKnsVoSU8=", "requires": { - "es6-iterator": "2.0.1", + "es6-iterator": "2.0.3", "es6-symbol": "3.1.1" } }, "es6-iterator": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz", - "integrity": "sha1-jjGcnwRTv1ddN0lAplWSDlnKVRI=", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", + "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", "requires": { "d": "1.0.0", - "es5-ext": "0.10.31", + "es5-ext": "0.10.35", "es6-symbol": "3.1.1" } }, @@ -3105,8 +3140,8 @@ "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=", "requires": { "d": "1.0.0", - "es5-ext": "0.10.31", - "es6-iterator": "2.0.1", + "es5-ext": "0.10.35", + "es6-iterator": "2.0.3", "es6-set": "0.1.5", "es6-symbol": "3.1.1", "event-emitter": "0.3.5" @@ -3118,9 +3153,9 @@ "integrity": "sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw=" }, "es6-promise": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz", - "integrity": "sha512-OaU1hHjgJf+b0NzsxCg7NdIYERD6Hy/PEmFLTjw+b65scuisG3Kt4QoTvJ66BBkPZ581gr0kpoVzKnxniM8nng==" + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz", + "integrity": "sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM=" }, "es6-set": { "version": "0.1.5", @@ -3128,8 +3163,8 @@ "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=", "requires": { "d": "1.0.0", - "es5-ext": "0.10.31", - "es6-iterator": "2.0.1", + "es5-ext": "0.10.35", + "es6-iterator": "2.0.3", "es6-symbol": "3.1.1", "event-emitter": "0.3.5" } @@ -3140,7 +3175,7 @@ "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", "requires": { "d": "1.0.0", - "es5-ext": "0.10.31" + "es5-ext": "0.10.35" } }, "es6-templates": { @@ -3159,8 +3194,8 @@ "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=", "requires": { "d": "1.0.0", - "es5-ext": "0.10.31", - "es6-iterator": "2.0.1", + "es5-ext": "0.10.35", + "es6-iterator": "2.0.3", "es6-symbol": "3.1.1" } }, @@ -3207,14 +3242,14 @@ } }, "eslint": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.8.0.tgz", - "integrity": "sha1-Ip7w41Tg5h2DfHqA/fuoJeGZgV4=", + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.10.0.tgz", + "integrity": "sha512-MMVl8P/dYUFZEvolL8PYt7qc5LNdS2lwheq9BYa5Y07FblhcZqFyaUqlS8TW5QITGex21tV4Lk0a3fK8lsJIkA==", "dev": true, "requires": { - "ajv": "5.2.3", + "ajv": "5.3.0", "babel-code-frame": "6.26.0", - "chalk": "2.1.0", + "chalk": "2.3.0", "concat-stream": "1.6.0", "cross-spawn": "5.1.0", "debug": "3.1.0", @@ -3228,7 +3263,7 @@ "functional-red-black-tree": "1.0.1", "glob": "7.1.2", "globals": "9.18.0", - "ignore": "3.3.5", + "ignore": "3.3.7", "imurmurhash": "0.1.4", "inquirer": "3.0.6", "is-resolvable": "1.0.0", @@ -3257,15 +3292,6 @@ "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", "dev": true }, - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, "esprima": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", @@ -3337,6 +3363,12 @@ "supports-color": "2.0.0" } }, + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + }, "supports-color": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", @@ -3352,7 +3384,18 @@ "dev": true, "requires": { "debug": "2.6.9", - "resolve": "1.4.0" + "resolve": "1.5.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + } } }, "eslint-loader": { @@ -3364,7 +3407,7 @@ "loader-fs-cache": "1.0.1", "loader-utils": "1.1.0", "object-assign": "4.1.1", - "object-hash": "1.1.8", + "object-hash": "1.2.0", "rimraf": "2.6.2" } }, @@ -3378,6 +3421,15 @@ "pkg-dir": "1.0.0" }, "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, "find-up": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", @@ -3444,9 +3496,9 @@ } }, "eslint-plugin-import": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.7.0.tgz", - "integrity": "sha512-HGYmpU9f/zJaQiKNQOVfHUh2oLWW3STBrCgH0sHTX1xtsxYlH1zjLh8FlQGEIdZSdTbUMaV36WaZ6ImXkenGxQ==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.8.0.tgz", + "integrity": "sha512-Rf7dfKJxZ16QuTgVv1OYNxkZcsu/hULFnC+e+w0Gzi6jMC3guQoWQgxYxc54IDRinlb6/0v5z/PxxIKmVctN+g==", "dev": true, "requires": { "builtin-modules": "1.1.1", @@ -3461,6 +3513,15 @@ "read-pkg-up": "2.0.0" }, "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, "doctrine": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz", @@ -3480,14 +3541,14 @@ "dev": true }, "eslint-plugin-node": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-5.2.0.tgz", - "integrity": "sha512-N9FLFwknT5LhRhjz1lmHguNss/MCwkrLCS4CjqqTZZTJaUhLRfDNK3zxSHL/Il3Aa0Mw+xY3T1gtsJrUNoJy8Q==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-5.2.1.tgz", + "integrity": "sha512-xhPXrh0Vl/b7870uEbaumb2Q+LxaEcOQ3kS1jtIXanBAwpMre1l5q/l2l/hESYJGEFKuI78bp6Uw50hlpr7B+g==", "dev": true, "requires": { - "ignore": "3.3.5", + "ignore": "3.3.7", "minimatch": "3.0.4", - "resolve": "1.4.0", + "resolve": "1.5.0", "semver": "5.3.0" }, "dependencies": { @@ -3500,9 +3561,9 @@ } }, "eslint-plugin-promise": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-3.5.0.tgz", - "integrity": "sha1-ePu2/+BHIBYnVp6FpsU3OvKmj8o=", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-3.6.0.tgz", + "integrity": "sha512-YQzM6TLTlApAr7Li8vWKR+K3WghjwKcYzY0d2roWap4SLK+kzuagJX/leTetIDWsFcTFnKNJXWupDCD6aZkP2Q==", "dev": true }, "eslint-plugin-standard": { @@ -3527,7 +3588,7 @@ "integrity": "sha1-DJiLirRttTEAoZVK5LqZXd0n2H4=", "dev": true, "requires": { - "acorn": "5.1.2", + "acorn": "5.2.1", "acorn-jsx": "3.0.1" } }, @@ -3575,7 +3636,7 @@ "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", "requires": { "d": "1.0.0", - "es5-ext": "0.10.31" + "es5-ext": "0.10.35" } }, "event-stream": { @@ -3705,89 +3766,18 @@ "vary": "1.1.2" }, "dependencies": { - "finalhandler": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.6.tgz", - "integrity": "sha1-AHrqM9Gk0+QgF/YkhIrVjSEvgU8=", - "requires": { - "debug": "2.6.9", - "encodeurl": "1.0.1", - "escape-html": "1.0.3", - "on-finished": "2.3.0", - "parseurl": "1.3.2", - "statuses": "1.3.1", - "unpipe": "1.0.0" - } - }, - "ipaddr.js": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.4.0.tgz", - "integrity": "sha1-KWrKh4qCGBbluF0KKFqZvP9FgvA=" - }, - "mime": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz", - "integrity": "sha1-EV+eO2s9rylZmDyzjxSaLUDrXVM=" - }, - "proxy-addr": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.5.tgz", - "integrity": "sha1-ccDuOxAt4/IC87ZPYI0XP8uhqRg=", + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "requires": { - "forwarded": "0.1.2", - "ipaddr.js": "1.4.0" + "ms": "2.0.0" } }, "qs": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.0.tgz", "integrity": "sha512-fjVFjW9yhqMhVGwRExCXLhJKrLlkYSaxNWdyc9rmHlrVZbk35YHH312dFd7191uQeXkI3mKLZTIbSvIeFwFemg==" - }, - "send": { - "version": "0.15.6", - "resolved": "https://registry.npmjs.org/send/-/send-0.15.6.tgz", - "integrity": "sha1-IPI6nJJbdiq4JwX+L52yUqzkfjQ=", - "requires": { - "debug": "2.6.9", - "depd": "1.1.1", - "destroy": "1.0.4", - "encodeurl": "1.0.1", - "escape-html": "1.0.3", - "etag": "1.8.1", - "fresh": "0.5.2", - "http-errors": "1.6.2", - "mime": "1.3.4", - "ms": "2.0.0", - "on-finished": "2.3.0", - "range-parser": "1.2.0", - "statuses": "1.3.1" - } - }, - "serve-static": { - "version": "1.12.6", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.12.6.tgz", - "integrity": "sha1-uXN3P2NEmTTaVOW+ul4x2fQhFXc=", - "requires": { - "encodeurl": "1.0.1", - "escape-html": "1.0.3", - "parseurl": "1.3.2", - "send": "0.15.6" - } - }, - "setprototypeof": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz", - "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=" - }, - "statuses": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz", - "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=" - }, - "utils-merge": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz", - "integrity": "sha1-ApT7kiu5N1FTVBxPcJYjHyh8ivg=" } } }, @@ -3805,6 +3795,21 @@ "parseurl": "1.3.2", "uid-safe": "2.1.5", "utils-merge": "1.0.1" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=" + } } }, "extend": { @@ -3818,7 +3823,7 @@ "integrity": "sha512-Msjo64WT5W+NhOpQXh0nOHm+n0RfU1QUwDnKYvJ8dEJ8zlwLrqXNTv5mSUTJpepf41PDJGyhueTw2vNZW+Fr/w==", "requires": { "iconv-lite": "0.4.19", - "jschardet": "1.5.1", + "jschardet": "1.6.0", "tmp": "0.0.33" } }, @@ -3828,12 +3833,19 @@ "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", "requires": { "is-extglob": "1.0.0" + }, + "dependencies": { + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" + } } }, "extract-text-webpack-plugin": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.1.tgz", - "integrity": "sha512-zv0/Cg2mU8uMzeQQ3oyfJvZU4Iv/GbQYUIr/HU+8pZetT/0W3xj6XAbxoG4gsp8SbnYcFd4BOsCAZPl9NvplPw==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz", + "integrity": "sha512-bt/LZ4m5Rqt/Crl2HiKuAl/oqg0psx1tsTLkvWbJen1CtD+fftkZhMaQ9HOtY2gWsl2Wq+sABmMVi9z3DhKWQQ==", "requires": { "async": "2.5.0", "loader-utils": "1.1.0", @@ -3851,6 +3863,11 @@ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz", "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=" }, + "fast-json-stable-stringify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", + "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=" + }, "fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", @@ -3923,9 +3940,9 @@ } }, "filesize": { - "version": "3.5.10", - "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.5.10.tgz", - "integrity": "sha1-/I+iPdtO+eXgq24eZPZ5okpWdh8=" + "version": "3.5.11", + "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.5.11.tgz", + "integrity": "sha512-ZH7loueKBoDb7yG9esn1U+fgq7BzlzW6NRi5/rMdxIZ05dj7GFD/Xc5rq2CDt5Yq86CyfSYVyx4242QQNZbx1g==" }, "fill-range": { "version": "2.2.3", @@ -3953,10 +3970,13 @@ "unpipe": "1.0.0" }, "dependencies": { - "statuses": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz", - "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=" + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } } } }, @@ -3976,7 +3996,7 @@ "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", "requires": { "commondir": "1.0.1", - "make-dir": "1.0.0", + "make-dir": "1.1.0", "pkg-dir": "2.0.0" } }, @@ -4011,6 +4031,16 @@ "integrity": "sha512-lMhwQTryFbG+wYsAIEKC1Kf5IGDlVNnONRogIBllh7LLoV7pNIxW0z9fhjRar9NBql+hd2Y49KboVVNxf6GEfg==", "requires": { "debug": "2.6.9" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + } } }, "for-each": { @@ -4105,12 +4135,12 @@ "dev": true }, "fs-extra": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.2.tgz", - "integrity": "sha1-+RcExT0bRh+JNFKwwwfZmXZHq2s=", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz", + "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=", "requires": { "graceful-fs": "4.1.11", - "jsonfile": "4.0.0", + "jsonfile": "3.0.1", "universalify": "0.1.1" } }, @@ -5046,6 +5076,21 @@ "requires": { "glob-parent": "2.0.0", "is-glob": "2.0.1" + }, + "dependencies": { + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" + }, + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "requires": { + "is-extglob": "1.0.0" + } + } } }, "glob-parent": { @@ -5054,6 +5099,21 @@ "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", "requires": { "is-glob": "2.0.1" + }, + "dependencies": { + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" + }, + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "requires": { + "is-extglob": "1.0.0" + } + } } }, "global": { @@ -5063,13 +5123,6 @@ "requires": { "min-document": "2.19.0", "process": "0.5.2" - }, - "dependencies": { - "process": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/process/-/process-0.5.2.tgz", - "integrity": "sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8=" - } } }, "global-dirs": { @@ -5171,9 +5224,9 @@ "integrity": "sha512-9r5OdIJFzhQCb37gHrmL8cbT5xgIySkY9HtyYLK+yZd1uYhoZ1h53iXXq5yk3+OO/OwEw3wlx3VawhfW1rwQuA==" }, "handlebars": { - "version": "4.0.10", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.10.tgz", - "integrity": "sha1-PTDHGLCaPZbyPqTMH0A8TTup/08=", + "version": "4.0.11", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz", + "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", "dev": true, "requires": { "async": "1.5.2", @@ -5243,7 +5296,7 @@ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", "requires": { - "ajv": "5.2.3", + "ajv": "5.3.0", "har-schema": "2.0.0" } }, @@ -5304,7 +5357,7 @@ "boom": "4.3.1", "cryptiles": "3.1.2", "hoek": "4.2.0", - "sntp": "2.0.2" + "sntp": "2.1.0" } }, "he": { @@ -5352,12 +5405,12 @@ "integrity": "sha1-ZouTd26q5V696POtRkswekljYl4=" }, "html-encoding-sniffer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.1.tgz", - "integrity": "sha1-eb96eF6klf5mFl5zQVPzY/9UN9o=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz", + "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==", "dev": true, "requires": { - "whatwg-encoding": "1.0.1" + "whatwg-encoding": "1.0.3" } }, "html-entities": { @@ -5373,15 +5426,15 @@ "requires": { "es6-templates": "0.2.3", "fastparse": "1.1.1", - "html-minifier": "3.5.5", + "html-minifier": "3.5.6", "loader-utils": "1.1.0", "object-assign": "4.1.1" } }, "html-minifier": { - "version": "3.5.5", - "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.5.tgz", - "integrity": "sha512-g+1+NBycQI0fGnggd52JM8TRUweG7+9W2wrtjGitMAqc4G7maweAHvVAAjz9veHseIH3tYKE2lk2USGSoewIrQ==", + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.6.tgz", + "integrity": "sha512-88FjtKrlak2XjczhxrBomgzV4jmGzM3UnHRBScRkJcmcRum0kb+IwhVAETJ8AVp7j0p3xugjSaw9L+RmI5/QOA==", "requires": { "camel-case": "3.0.0", "clean-css": "4.1.9", @@ -5390,7 +5443,7 @@ "ncname": "1.0.0", "param-case": "2.1.1", "relateurl": "0.2.7", - "uglify-js": "3.1.3" + "uglify-js": "3.1.6" } }, "html-tags": { @@ -5404,7 +5457,7 @@ "integrity": "sha1-f5xCG36pHsRg9WUn1430hO51N9U=", "requires": { "bluebird": "3.5.1", - "html-minifier": "3.5.5", + "html-minifier": "3.5.6", "loader-utils": "0.2.17", "lodash": "4.17.4", "pretty-error": "2.1.1", @@ -5474,14 +5527,7 @@ "depd": "1.1.1", "inherits": "2.0.3", "setprototypeof": "1.0.3", - "statuses": "1.4.0" - }, - "dependencies": { - "setprototypeof": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz", - "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=" - } + "statuses": "1.3.1" } }, "http-proxy": { @@ -5502,21 +5548,6 @@ "is-glob": "3.1.0", "lodash": "4.17.4", "micromatch": "2.3.11" - }, - "dependencies": { - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" - }, - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "requires": { - "is-extglob": "2.1.1" - } - } } }, "http-signature": { @@ -5558,9 +5589,9 @@ "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=" }, "ignore": { - "version": "3.3.5", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.5.tgz", - "integrity": "sha512-JLH93mL8amZQhh/p6mfQgVBH3M6epNq3DfsXsTSuSrInVjwyYlFE1nv2AgfRCC8PoOhM0jwQ5v8s9LgbK7yGDw==", + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz", + "integrity": "sha512-YGG3ejvBNHRqu0559EOxxNFihD0AjpvHlC/pdGKd3X3ofe+CoJkYazwNJYTNebqpPKN+VVQbh4ZFn1DivMNuHA==", "dev": true }, "ignore-by-default": { @@ -5693,6 +5724,11 @@ "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-1.0.3.tgz", "integrity": "sha1-3FiQdvZZ9BnCIgOaMzFvHHOH7/0=" }, + "ipaddr.js": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.4.0.tgz", + "integrity": "sha1-KWrKh4qCGBbluF0KKFqZvP9FgvA=" + }, "is-absolute-url": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz", @@ -5712,9 +5748,9 @@ } }, "is-buffer": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz", - "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw=" + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" }, "is-builtin-module": { "version": "1.0.0", @@ -5757,9 +5793,9 @@ "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=" }, "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" }, "is-finite": { "version": "1.0.2", @@ -5780,11 +5816,11 @@ "integrity": "sha1-Es+5i2W1fdPRk6MSH19uL0N2ArU=" }, "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", "requires": { - "is-extglob": "1.0.0" + "is-extglob": "2.1.1" } }, "is-installed-globally": { @@ -5957,19 +5993,19 @@ "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" }, "istanbul-api": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-1.1.14.tgz", - "integrity": "sha1-JbxXAffGgMD//5E95G42GaOm5oA=", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-1.2.1.tgz", + "integrity": "sha512-oFCwXvd65amgaPCzqrR+a2XjanS1MvpXN6l/MlMUTv6uiA1NOgGX+I0uyq8Lg3GDxsxPsaP1049krz3hIJ5+KA==", "dev": true, "requires": { "async": "2.5.0", "fileset": "2.0.3", "istanbul-lib-coverage": "1.1.1", - "istanbul-lib-hook": "1.0.7", - "istanbul-lib-instrument": "1.8.0", - "istanbul-lib-report": "1.1.1", - "istanbul-lib-source-maps": "1.2.1", - "istanbul-reports": "1.1.2", + "istanbul-lib-hook": "1.1.0", + "istanbul-lib-instrument": "1.9.1", + "istanbul-lib-report": "1.1.2", + "istanbul-lib-source-maps": "1.2.2", + "istanbul-reports": "1.1.3", "js-yaml": "3.7.0", "mkdirp": "0.5.1", "once": "1.4.0" @@ -5982,18 +6018,18 @@ "dev": true }, "istanbul-lib-hook": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-1.0.7.tgz", - "integrity": "sha512-3U2HB9y1ZV9UmFlE12Fx+nPtFqIymzrqCksrXujm3NVbAZIJg/RfYgO1XiIa0mbmxTjWpVEVlkIZJ25xVIAfkQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-1.1.0.tgz", + "integrity": "sha512-U3qEgwVDUerZ0bt8cfl3dSP3S6opBoOtk3ROO5f2EfBr/SRiD9FQqzwaZBqFORu8W7O0EXpai+k7kxHK13beRg==", "dev": true, "requires": { "append-transform": "0.4.0" } }, "istanbul-lib-instrument": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.8.0.tgz", - "integrity": "sha1-ZvbJQhzJ7EcE928tsIS6kHiitTI=", + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.9.1.tgz", + "integrity": "sha512-RQmXeQ7sphar7k7O1wTNzVczF9igKpaeGQAG9qR2L+BS4DCJNTI9nytRmIVYevwO0bbq+2CXvJmYDuz0gMrywA==", "dev": true, "requires": { "babel-generator": "6.26.0", @@ -6006,9 +6042,9 @@ } }, "istanbul-lib-report": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz", - "integrity": "sha512-tvF+YmCmH4thnez6JFX06ujIA19WPa9YUiwjc1uALF2cv5dmE3It8b5I8Ob7FHJ70H9Y5yF+TDkVa/mcADuw1Q==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-1.1.2.tgz", + "integrity": "sha512-UTv4VGx+HZivJQwAo1wnRwe1KTvFpfi/NYwN7DcsrdzMXwpRT/Yb6r4SBPoHWj4VuQPakR32g4PUUeyKkdDkBA==", "dev": true, "requires": { "istanbul-lib-coverage": "1.1.1", @@ -6035,12 +6071,12 @@ } }, "istanbul-lib-source-maps": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.1.tgz", - "integrity": "sha512-mukVvSXCn9JQvdJl8wP/iPhqig0MRtuWuD4ZNKo6vB2Ik//AmhAKe3QnPN02dmkRe3lTudFk3rzoHhwU4hb94w==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.2.tgz", + "integrity": "sha512-8BfdqSfEdtip7/wo1RnrvLpHVEd8zMZEDmOFEnpC6dg0vXflHt9nvoAyQUzig2uMSXfF2OBEYBV3CVjIL9JvaQ==", "dev": true, "requires": { - "debug": "2.6.9", + "debug": "3.1.0", "istanbul-lib-coverage": "1.1.1", "mkdirp": "0.5.1", "rimraf": "2.6.2", @@ -6048,12 +6084,12 @@ } }, "istanbul-reports": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-1.1.2.tgz", - "integrity": "sha1-D7Lj9qqZIr085F0F2KtNXo4HvU8=", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-1.1.3.tgz", + "integrity": "sha512-ZEelkHh8hrZNI5xDaKwPMFwDsUf5wIEI2bXAFGp1e6deR2mnEKBPhLJEgr4ZBt8Gi6Mj38E/C8kcy9XLggVO2Q==", "dev": true, "requires": { - "handlebars": "4.0.10" + "handlebars": "4.0.11" } }, "izitoast": { @@ -6143,14 +6179,14 @@ "dev": true, "requires": { "ansi-escapes": "3.0.0", - "chalk": "2.1.0", + "chalk": "2.3.0", "glob": "7.1.2", "graceful-fs": "4.1.11", "is-ci": "1.0.10", - "istanbul-api": "1.1.14", + "istanbul-api": "1.2.1", "istanbul-lib-coverage": "1.1.1", - "istanbul-lib-instrument": "1.8.0", - "istanbul-lib-source-maps": "1.2.1", + "istanbul-lib-instrument": "1.9.1", + "istanbul-lib-source-maps": "1.2.2", "jest-changed-files": "21.2.0", "jest-config": "21.2.1", "jest-environment-jsdom": "21.2.1", @@ -6169,7 +6205,7 @@ "string-length": "2.0.0", "strip-ansi": "4.0.0", "which": "1.3.0", - "worker-farm": "1.5.0", + "worker-farm": "1.5.1", "yargs": "9.0.1" } }, @@ -6230,7 +6266,7 @@ "integrity": "sha512-fJru5HtlD/5l2o25eY9xT0doK3t2dlglrqoGpbktduyoI0T5CwuB++2YfoNZCrgZipTwPuAGonYv0q7+8yDc/A==", "dev": true, "requires": { - "chalk": "2.1.0", + "chalk": "2.3.0", "glob": "7.1.2", "jest-environment-jsdom": "21.2.1", "jest-environment-node": "21.2.1", @@ -6249,7 +6285,7 @@ "integrity": "sha512-E5fu6r7PvvPr5qAWE1RaUwIh/k6Zx/3OOkZ4rk5dBJkEWRrUuSgbMt2EO8IUTPTd6DOqU3LW6uTIwX5FRvXoFA==", "dev": true, "requires": { - "chalk": "2.1.0", + "chalk": "2.3.0", "diff": "3.4.0", "jest-get-type": "21.2.0", "pretty-format": "21.2.1" @@ -6278,15 +6314,6 @@ "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=", "dev": true }, - "acorn-globals": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-3.1.0.tgz", - "integrity": "sha1-/YJw9x+7SZawBPqIDuXUZXOnMb8=", - "dev": true, - "requires": { - "acorn": "4.0.13" - } - }, "jsdom": { "version": "9.12.0", "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-9.12.0.tgz", @@ -6297,29 +6324,23 @@ "acorn": "4.0.13", "acorn-globals": "3.1.0", "array-equal": "1.0.0", - "content-type-parser": "1.0.1", + "content-type-parser": "1.0.2", "cssom": "0.3.2", "cssstyle": "0.2.37", "escodegen": "1.9.0", - "html-encoding-sniffer": "1.0.1", - "nwmatcher": "1.4.2", + "html-encoding-sniffer": "1.0.2", + "nwmatcher": "1.4.3", "parse5": "1.5.1", "request": "2.83.0", "sax": "1.2.4", "symbol-tree": "3.2.2", "tough-cookie": "2.3.3", "webidl-conversions": "4.0.2", - "whatwg-encoding": "1.0.1", + "whatwg-encoding": "1.0.3", "whatwg-url": "4.8.0", "xml-name-validator": "2.0.1" } }, - "parse5": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz", - "integrity": "sha1-m387DeMr543CQBsXVzzK8Pb1nZQ=", - "dev": true - }, "tr46": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", @@ -6373,7 +6394,7 @@ "jest-docblock": "21.2.0", "micromatch": "2.3.11", "sane": "2.2.0", - "worker-farm": "1.5.0" + "worker-farm": "1.5.1" } }, "jest-jasmine2": { @@ -6382,7 +6403,7 @@ "integrity": "sha512-lw8FXXIEekD+jYNlStfgNsUHpfMWhWWCgHV7n0B7mA/vendH7vBFs8xybjQsDzJSduptBZJHqQX9SMssya9+3A==", "dev": true, "requires": { - "chalk": "2.1.0", + "chalk": "2.3.0", "expect": "21.2.1", "graceful-fs": "4.1.11", "jest-diff": "21.2.1", @@ -6398,7 +6419,7 @@ "integrity": "sha512-kn56My+sekD43dwQPrXBl9Zn9tAqwoy25xxe7/iY4u+mG8P3ALj5IK7MLHZ4Mi3xW7uWVCjGY8cm4PqgbsqMCg==", "dev": true, "requires": { - "chalk": "2.1.0", + "chalk": "2.3.0", "jest-get-type": "21.2.0", "pretty-format": "21.2.1" } @@ -6409,7 +6430,7 @@ "integrity": "sha512-EbC1X2n0t9IdeMECJn2BOg7buOGivCvVNjqKMXTzQOu7uIfLml+keUfCALDh8o4rbtndIeyGU8/BKfoTr/LVDQ==", "dev": true, "requires": { - "chalk": "2.1.0", + "chalk": "2.3.0", "micromatch": "2.3.11", "slash": "1.0.0" } @@ -6433,7 +6454,7 @@ "dev": true, "requires": { "browser-resolve": "1.11.2", - "chalk": "2.1.0", + "chalk": "2.3.0", "is-builtin-module": "1.0.0" } }, @@ -6461,7 +6482,7 @@ "jest-util": "21.2.1", "pify": "3.0.0", "throat": "4.1.0", - "worker-farm": "1.5.0" + "worker-farm": "1.5.1" } }, "jest-runtime": { @@ -6473,7 +6494,7 @@ "babel-core": "6.26.0", "babel-jest": "21.2.0", "babel-plugin-istanbul": "4.1.5", - "chalk": "2.1.0", + "chalk": "2.3.0", "convert-source-map": "1.5.0", "graceful-fs": "4.1.11", "jest-config": "21.2.1", @@ -6578,9 +6599,9 @@ } }, "jest-serializer-html": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jest-serializer-html/-/jest-serializer-html-4.0.0.tgz", - "integrity": "sha1-vvxA0rNmkA9KeHfgZEE+hgaaHhY=", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/jest-serializer-html/-/jest-serializer-html-4.0.1.tgz", + "integrity": "sha1-+eBAIq3Qe44D2lrTBVgfEATY9+g=", "dev": true, "requires": { "diffable-html": "2.1.0" @@ -6592,7 +6613,7 @@ "integrity": "sha512-bpaeBnDpdqaRTzN8tWg0DqOTo2DvD3StOemxn67CUd1p1Po+BUpvePAp44jdJ7Pxcjfg+42o4NHw1SxdCA2rvg==", "dev": true, "requires": { - "chalk": "2.1.0", + "chalk": "2.3.0", "jest-diff": "21.2.1", "jest-matcher-utils": "21.2.1", "mkdirp": "0.5.1", @@ -6607,7 +6628,7 @@ "dev": true, "requires": { "callsites": "2.0.0", - "chalk": "2.1.0", + "chalk": "2.3.0", "graceful-fs": "4.1.11", "jest-message-util": "21.2.1", "jest-mock": "21.2.0", @@ -6629,7 +6650,7 @@ "integrity": "sha512-k4HLI1rZQjlU+EC682RlQ6oZvLrE5SCh3brseQc24vbZTxzT/k/3urar5QMCVgjadmSO7lECeGdc6YxnM3yEGg==", "dev": true, "requires": { - "chalk": "2.1.0", + "chalk": "2.3.0", "jest-get-type": "21.2.0", "leven": "2.1.0", "pretty-format": "21.2.1" @@ -6668,13 +6689,6 @@ "stream-to-buffer": "0.1.0", "tinycolor2": "1.4.1", "url-regex": "3.2.0" - }, - "dependencies": { - "es6-promise": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz", - "integrity": "sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM=" - } } }, "jpeg-js": { @@ -6708,9 +6722,9 @@ "optional": true }, "jschardet": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-1.5.1.tgz", - "integrity": "sha512-vE2hT1D0HLZCLLclfBSfkfTTedhVj0fubHpJBHKwwUWX0nSbhPAfk+SG9rTX95BYNmau8rGFfCeaT6T5OW1C2A==" + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-1.6.0.tgz", + "integrity": "sha512-xYuhvQ7I9PDJIGBWev9xm0+SMSed3ZDBAmvVjbFR1ZRLAF+vlXcQu6cRI9uAlj81rzikElRVteehwV7DuX2ZmQ==" }, "jsdom": { "version": "11.3.0", @@ -6719,16 +6733,16 @@ "dev": true, "requires": { "abab": "1.0.4", - "acorn": "5.1.2", - "acorn-globals": "4.0.0", + "acorn": "5.2.1", + "acorn-globals": "4.1.0", "array-equal": "1.0.0", - "content-type-parser": "1.0.1", + "content-type-parser": "1.0.2", "cssom": "0.3.2", "cssstyle": "0.2.37", "domexception": "1.0.0", "escodegen": "1.9.0", - "html-encoding-sniffer": "1.0.1", - "nwmatcher": "1.4.2", + "html-encoding-sniffer": "1.0.2", + "nwmatcher": "1.4.3", "parse5": "3.0.2", "pn": "1.0.0", "request": "2.83.0", @@ -6737,9 +6751,29 @@ "symbol-tree": "3.2.2", "tough-cookie": "2.3.3", "webidl-conversions": "4.0.2", - "whatwg-encoding": "1.0.1", + "whatwg-encoding": "1.0.3", "whatwg-url": "6.3.0", "xml-name-validator": "2.0.1" + }, + "dependencies": { + "acorn-globals": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.1.0.tgz", + "integrity": "sha512-KjZwU26uG3u6eZcfGbTULzFcsoz6pegNKtHPksZPOUsiKo5bUmiBPa38FuHZ/Eun+XYh/JCCkS9AS3Lu4McQOQ==", + "dev": true, + "requires": { + "acorn": "5.2.1" + } + }, + "parse5": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.2.tgz", + "integrity": "sha1-Be/1fw70V3+xRKefi5qWemzERRA=", + "dev": true, + "requires": { + "@types/node": "6.0.90" + } + } } }, "jsesc": { @@ -6766,6 +6800,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", + "dev": true, "requires": { "jsonify": "0.0.0" } @@ -6781,9 +6816,9 @@ "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=" }, "jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz", + "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=", "requires": { "graceful-fs": "4.1.11" } @@ -6791,7 +6826,8 @@ "jsonify": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", - "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=" + "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=", + "dev": true }, "jsprim": { "version": "1.4.1", @@ -6809,7 +6845,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "1.1.5" + "is-buffer": "1.1.6" } }, "latest-version": { @@ -6864,9 +6900,16 @@ "notyf": "2.0.1", "openseadragon": "2.3.1", "uuid": "3.1.0", - "vue": "2.4.4", + "vue": "2.5.2", "vue-awesome": "2.3.3", "vue-form-generator": "2.1.1" + }, + "dependencies": { + "es6-promise": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz", + "integrity": "sha512-OaU1hHjgJf+b0NzsxCg7NdIYERD6Hy/PEmFLTjw+b65scuisG3Kt4QoTvJ66BBkPZ581gr0kpoVzKnxniM8nng==" + } } }, "load-bmfont": { @@ -7201,18 +7244,11 @@ "integrity": "sha1-WQTcU3w57G2+/q6QIycTX6hRHxI=" }, "make-dir": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.0.0.tgz", - "integrity": "sha1-l6ARdR6R3YfPre9Ygy67BJNt6Xg=", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.1.0.tgz", + "integrity": "sha512-0Pkui4wLJ7rxvmfUvs87skoEaxmu0hCUApF8nonzpl7q//FWp9zu8W61Scz4sd/kUiqDxvUhtoam2efDyiBzcA==", "requires": { - "pify": "2.3.0" - }, - "dependencies": { - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" - } + "pify": "3.0.0" } }, "makeerror": { @@ -7263,7 +7299,7 @@ "requires": { "charenc": "0.0.2", "crypt": "0.0.2", - "is-buffer": "1.1.5" + "is-buffer": "1.1.6" } }, "md5.js": { @@ -7349,6 +7385,12 @@ "strip-bom": "2.0.0" } }, + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + }, "path-exists": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", @@ -7441,6 +7483,21 @@ "object.omit": "2.0.1", "parse-glob": "3.0.4", "regex-cache": "0.4.4" + }, + "dependencies": { + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" + }, + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "requires": { + "is-extglob": "1.0.0" + } + } } }, "miller-rabin": { @@ -7502,9 +7559,9 @@ } }, "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" }, "mixin-object": { "version": "2.0.1", @@ -7530,13 +7587,6 @@ "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "requires": { "minimist": "0.0.8" - }, - "dependencies": { - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" - } } }, "moment": { @@ -7674,6 +7724,16 @@ "vm-browserify": "0.0.4" }, "dependencies": { + "process": { + "version": "0.11.10", + "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", + "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=" + }, + "punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + }, "string_decoder": { "version": "0.10.31", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", @@ -7780,11 +7840,14 @@ "update-notifier": "2.3.0" }, "dependencies": { - "es6-promise": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz", - "integrity": "sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM=", - "dev": true + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } } } }, @@ -7887,12 +7950,12 @@ "requires": { "@nuxtjs/youch": "3.0.2", "ansi-html": "0.0.7", - "autoprefixer": "7.1.5", + "autoprefixer": "7.1.6", "babel-core": "6.26.0", "babel-loader": "7.1.2", "babel-preset-es2015": "6.24.1", "babel-preset-vue-app": "1.3.1", - "chalk": "2.1.0", + "chalk": "2.3.0", "chokidar": "1.7.0", "clone": "2.1.1", "compression": "1.7.1", @@ -7901,14 +7964,14 @@ "debug": "3.1.0", "es6-promise": "4.1.1", "etag": "1.8.1", - "extract-text-webpack-plugin": "3.0.1", + "extract-text-webpack-plugin": "3.0.2", "file-loader": "0.11.2", "fresh": "0.5.2", "friendly-errors-webpack-plugin": "1.6.1", "fs-extra": "4.0.2", "glob": "7.1.2", "hash-sum": "1.0.2", - "html-minifier": "3.5.5", + "html-minifier": "3.5.6", "html-webpack-plugin": "2.30.1", "lodash": "4.17.4", "lru-cache": "4.1.1", @@ -7924,7 +7987,7 @@ "pretty-error": "2.1.1", "progress-bar-webpack-plugin": "1.10.0", "serialize-javascript": "1.4.0", - "serve-static": "1.13.1", + "serve-static": "1.12.6", "server-destroy": "1.0.1", "source-map": "0.5.7", "source-map-support": "0.4.18", @@ -7937,19 +8000,88 @@ "vue-server-renderer": "2.4.4", "vue-template-compiler": "2.4.4", "vuex": "2.5.0", - "webpack": "3.6.0", + "webpack": "3.8.1", "webpack-bundle-analyzer": "2.9.0", "webpack-dev-middleware": "1.12.0", "webpack-hot-middleware": "2.20.0", "webpack-node-externals": "1.6.0" }, "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" + }, + "es6-promise": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz", + "integrity": "sha512-OaU1hHjgJf+b0NzsxCg7NdIYERD6Hy/PEmFLTjw+b65scuisG3Kt4QoTvJ66BBkPZ581gr0kpoVzKnxniM8nng==" + }, + "fs-extra": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.2.tgz", + "integrity": "sha1-+RcExT0bRh+JNFKwwwfZmXZHq2s=", "requires": { - "ms": "2.0.0" + "graceful-fs": "4.1.11", + "jsonfile": "4.0.0", + "universalify": "0.1.1" + } + }, + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "requires": { + "graceful-fs": "4.1.11" + } + }, + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" + }, + "vue": { + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/vue/-/vue-2.4.4.tgz", + "integrity": "sha512-PCiRmc8ZT1DD5+BN8QUAmnkBefcCLfZVSuhc1u7iu5JoPrSHyyk/+4nehm7k2xVMi8+RFLk5WIHAN14UKF0txw==" + }, + "vue-server-renderer": { + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/vue-server-renderer/-/vue-server-renderer-2.4.4.tgz", + "integrity": "sha512-qSaNqInt4bJLsIFBU7fNgSTvpYzWJWe+zUkbSdKaFhMGhI/GNFUghK4VZX3ETvBNX51DYa4kEmZgSVZ70xWdxQ==", + "requires": { + "chalk": "1.1.3", + "hash-sum": "1.0.2", + "he": "1.1.1", + "lodash.template": "4.4.0", + "lodash.uniq": "4.5.0", + "resolve": "1.5.0", + "serialize-javascript": "1.4.0", + "source-map": "0.5.6" + }, + "dependencies": { + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "requires": { + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" + } + }, + "source-map": { + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", + "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=" + } } }, "vue-template-compiler": { @@ -7964,9 +8096,9 @@ } }, "nwmatcher": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.2.tgz", - "integrity": "sha512-QMkCGQFYp5p+zwU3INntLmz1HMfSx9dMVJMYKmE1yuSf/22Wjo6VPFa405mCLUuQn9lbQvH2DZN9lt10ZNvtAg==", + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.3.tgz", + "integrity": "sha512-IKdSTiDWCarf2JTS5e9e2+5tPZGdkRJ79XjYV0pzK8Q9BpsFyBq1RGKxzs7Q8UBushGw7m6TzVKz6fcY99iSWw==", "dev": true }, "oauth-sign": { @@ -7980,9 +8112,9 @@ "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" }, "object-hash": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-1.1.8.tgz", - "integrity": "sha1-KKZZz5h9lqTavnhgKJ87UybEoDw=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-1.2.0.tgz", + "integrity": "sha512-smRWXzkvxw72VquyZ0wggySl7PFUtoDhvhpdwgESXxUrH7vVhhp9asfup1+rVLrhsl7L45Ee1Q/l5R2Ul4MwUg==", "dev": true }, "object-keys": { @@ -8073,6 +8205,11 @@ "supports-color": "2.0.0" } }, + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" + }, "supports-color": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", @@ -8105,16 +8242,8 @@ "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", "dev": true, "requires": { - "minimist": "0.0.10", + "minimist": "0.0.8", "wordwrap": "0.0.2" - }, - "dependencies": { - "minimist": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", - "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", - "dev": true - } } }, "optionator": { @@ -8239,8 +8368,8 @@ "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz", "integrity": "sha1-N8T5t+06tlx0gXtfJICTf7+XxxI=", "requires": { - "asn1.js": "4.9.1", - "browserify-aes": "1.0.8", + "asn1.js": "4.10.0", + "browserify-aes": "1.1.1", "create-hash": "1.1.3", "evp_bytestokey": "1.0.3", "pbkdf2": "3.0.14" @@ -8274,6 +8403,21 @@ "is-dotfile": "1.0.3", "is-extglob": "1.0.0", "is-glob": "2.0.1" + }, + "dependencies": { + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" + }, + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "requires": { + "is-extglob": "1.0.0" + } + } } }, "parse-headers": { @@ -8294,13 +8438,10 @@ } }, "parse5": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.2.tgz", - "integrity": "sha1-Be/1fw70V3+xRKefi5qWemzERRA=", - "dev": true, - "requires": { - "@types/node": "6.0.89" - } + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz", + "integrity": "sha1-m387DeMr543CQBsXVzzK8Pb1nZQ=", + "dev": true }, "parseurl": { "version": "1.3.2", @@ -8415,7 +8556,7 @@ "resolved": "https://registry.npmjs.org/pixrem/-/pixrem-4.0.1.tgz", "integrity": "sha1-LaSh3m7EQjxfw3lOkwuB1EkOxoY=", "requires": { - "browserslist": "2.5.1", + "browserslist": "2.6.1", "postcss": "6.0.13", "reduce-css-calc": "1.3.0" } @@ -8455,18 +8596,18 @@ "integrity": "sha1-H1cwwYnJSTO4G+2iqy+OKFUmOo8=" }, "popper.js": { - "version": "1.12.5", - "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.12.5.tgz", - "integrity": "sha512-6R2eXIy1xYukMNutoD+y/Gj0IpjEQhivyZonm5Vz0Fp8jdc7kvheKCvpM/t+PxqKb7VbLVnvPVEdTyslEb7f6w==" + "version": "1.12.6", + "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.12.6.tgz", + "integrity": "sha512-wZlMkIJM1hFcM9F7nSrRCbKKfkH0kk/GrCoj3EUoKU8kx9xPtvnOZNHKsQOM12+xqbYv2HeBWI8Y8pxb6vmnRQ==" }, "postcss": { "version": "6.0.13", "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.13.tgz", "integrity": "sha512-nHsrD1PPTMSJDfU+osVsLtPkSP9YGeoOz4FDLN4r1DW4N5vqL1J+gACzTQHsfwIiWG/0/nV4yCzjTMo1zD8U1g==", "requires": { - "chalk": "2.1.0", + "chalk": "2.3.0", "source-map": "0.6.1", - "supports-color": "4.4.0" + "supports-color": "4.5.0" }, "dependencies": { "source-map": { @@ -8827,9 +8968,9 @@ "resolved": "https://registry.npmjs.org/postcss-cssnext/-/postcss-cssnext-3.0.2.tgz", "integrity": "sha512-jA6kGdcUMZqLUgw6MdpyNWGFhk0LIITVhC/jTnLRZLoXSTR88qT2cFOn3LbY06udt1PVdTCHDG3plBjxVKf8BQ==", "requires": { - "autoprefixer": "7.1.5", + "autoprefixer": "7.1.6", "caniuse-api": "2.0.0", - "chalk": "2.1.0", + "chalk": "2.3.0", "pixrem": "4.0.1", "pleeease-filters": "4.0.0", "postcss": "6.0.13", @@ -8865,8 +9006,8 @@ "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-2.0.0.tgz", "integrity": "sha1-sd21pZZrFvSNxJmERNS7xsfZ2DQ=", "requires": { - "browserslist": "2.5.1", - "caniuse-lite": "1.0.30000745", + "browserslist": "2.6.1", + "caniuse-lite": "1.0.30000756", "lodash.memoize": "4.1.2", "lodash.uniq": "4.5.0" } @@ -9305,7 +9446,7 @@ "postcss": "6.0.13", "postcss-value-parser": "3.3.0", "read-cache": "1.0.0", - "resolve": "1.4.0" + "resolve": "1.5.0" } }, "postcss-initial": { @@ -9510,8 +9651,8 @@ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz", "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", "requires": { - "caniuse-db": "1.0.30000746", - "electron-to-chromium": "1.3.24" + "caniuse-db": "1.0.30000756", + "electron-to-chromium": "1.3.27" } }, "chalk": { @@ -10517,14 +10658,14 @@ } }, "private": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/private/-/private-0.1.7.tgz", - "integrity": "sha1-aM5eih7woju1cMwoU3tTMqumPvE=" + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", + "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==" }, "process": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=" + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/process/-/process-0.5.2.tgz", + "integrity": "sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8=" }, "process-nextick-args": { "version": "1.0.7", @@ -10578,6 +10719,15 @@ "shifty": "1.5.4" } }, + "proxy-addr": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.5.tgz", + "integrity": "sha1-ccDuOxAt4/IC87ZPYI0XP8uhqRg=", + "requires": { + "forwarded": "0.1.2", + "ipaddr.js": "1.4.0" + } + }, "prr": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz", @@ -10610,14 +10760,14 @@ } }, "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz", + "integrity": "sha1-X4Y+3Im5bbCQdLrXlHvwkFbKTn0=" }, "q": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz", - "integrity": "sha1-3QG6ydBtMObyGa7LglPunr3DCPE=" + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", + "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=" }, "qs": { "version": "6.5.1", @@ -10676,7 +10826,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { - "is-buffer": "1.1.5" + "is-buffer": "1.1.6" } } } @@ -10686,7 +10836,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", "requires": { - "is-buffer": "1.1.5" + "is-buffer": "1.1.6" } } } @@ -10734,15 +10884,23 @@ "integrity": "sha512-E01uqSgP4JJIZNCaug2rV8g3JcIabLP09POLJ6wpM0oWftfnjqIWHYipUuscltCjQAxsPV3FFnMkW22/93qgig==" }, "rc": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz", - "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.2.tgz", + "integrity": "sha1-2M6ctX6NZNnHut2YdsfDTL48cHc=", "dev": true, "requires": { "deep-extend": "0.4.2", "ini": "1.3.4", "minimist": "1.2.0", "strip-json-comments": "2.0.1" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + } } }, "read-cache": { @@ -10817,7 +10975,7 @@ "requires": { "ast-types": "0.9.6", "esprima": "3.1.3", - "private": "0.1.7", + "private": "0.1.8", "source-map": "0.5.7" }, "dependencies": { @@ -10834,7 +10992,7 @@ "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", "requires": { - "resolve": "1.4.0" + "resolve": "1.5.0" } }, "redent": { @@ -10902,7 +11060,7 @@ "requires": { "babel-runtime": "6.26.0", "babel-types": "6.26.0", - "private": "0.1.7" + "private": "0.1.8" } }, "regex-cache": { @@ -10929,7 +11087,7 @@ "integrity": "sha1-+w0yie4Nmtosu1KvXf5mywcNMAY=", "dev": true, "requires": { - "rc": "1.2.1", + "rc": "1.2.2", "safe-buffer": "5.1.1" } }, @@ -10939,7 +11097,7 @@ "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=", "dev": true, "requires": { - "rc": "1.2.1" + "rc": "1.2.2" } }, "regjsgen": { @@ -11089,9 +11247,9 @@ "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=" }, "resolve": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz", - "integrity": "sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz", + "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==", "requires": { "path-parse": "1.0.5" } @@ -11179,6 +11337,14 @@ "minimist": "1.2.0", "walker": "1.0.7", "watch": "0.18.0" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + } } }, "sass-graph": { @@ -11379,7 +11545,7 @@ "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz", "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=", "requires": { - "ajv": "5.2.3" + "ajv": "5.3.0" } }, "scss-tokenizer": { @@ -11423,9 +11589,9 @@ } }, "send": { - "version": "0.16.1", - "resolved": "https://registry.npmjs.org/send/-/send-0.16.1.tgz", - "integrity": "sha512-ElCLJdJIKPk6ux/Hocwhk7NFHpI3pVm/IZOYWqUmoxcgeyM+MpxHHKhb8QmlJDX1pU6WrgaHBkVNm73Sv7uc2A==", + "version": "0.15.6", + "resolved": "https://registry.npmjs.org/send/-/send-0.15.6.tgz", + "integrity": "sha1-IPI6nJJbdiq4JwX+L52yUqzkfjQ=", "requires": { "debug": "2.6.9", "depd": "1.1.1", @@ -11435,17 +11601,25 @@ "etag": "1.8.1", "fresh": "0.5.2", "http-errors": "1.6.2", - "mime": "1.4.1", + "mime": "1.3.4", "ms": "2.0.0", "on-finished": "2.3.0", "range-parser": "1.2.0", "statuses": "1.3.1" }, "dependencies": { - "statuses": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz", - "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=" + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "mime": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz", + "integrity": "sha1-EV+eO2s9rylZmDyzjxSaLUDrXVM=" } } }, @@ -11455,14 +11629,14 @@ "integrity": "sha1-fJWFFNtqwkQ6irwGLcn3iGp/YAU=" }, "serve-static": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.1.tgz", - "integrity": "sha512-hSMUZrsPa/I09VYFJwa627JJkNs0NrfL1Uzuup+GqHfToR2KcsXFymXSV90hoyw3M+msjFuQly+YzIH/q0MGlQ==", + "version": "1.12.6", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.12.6.tgz", + "integrity": "sha1-uXN3P2NEmTTaVOW+ul4x2fQhFXc=", "requires": { "encodeurl": "1.0.1", "escape-html": "1.0.3", "parseurl": "1.3.2", - "send": "0.16.1" + "send": "0.15.6" } }, "server-destroy": { @@ -11485,6 +11659,11 @@ "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" }, + "setprototypeof": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz", + "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=" + }, "sha.js": { "version": "2.4.9", "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.9.tgz", @@ -11512,7 +11691,7 @@ "integrity": "sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU=", "dev": true, "requires": { - "is-buffer": "1.1.5" + "is-buffer": "1.1.6" } }, "lazy-cache": { @@ -11596,9 +11775,9 @@ } }, "sntp": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.0.2.tgz", - "integrity": "sha1-UGQRDwr4X3z9t9a2ekACjOUrSys=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz", + "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==", "requires": { "hoek": "4.2.0" } @@ -11687,9 +11866,9 @@ "integrity": "sha512-to7oADIniaYwS3MhtCa/sQhrxidCCQiF/qp4/m5iN3ipf0Y7Xlri0f6eG29r08aL7JYl8n32AF3Q5GYBZ7K8vw==" }, "statuses": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz", - "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==" + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz", + "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=" }, "stdout-stream": { "version": "1.4.0", @@ -11833,9 +12012,9 @@ "dev": true }, "supports-color": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz", - "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", "requires": { "has-flag": "2.0.0" } @@ -11860,9 +12039,9 @@ } }, "sweetalert2": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-6.11.0.tgz", - "integrity": "sha512-h4KKff2Il725clZSI13tpU/HaIbvgCG6eNB2kKuNueuFme4eLrTC8orv8LLK6Occ8J3BAW5Zj+XIcz4QGUqqXw==" + "version": "6.11.4", + "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-6.11.4.tgz", + "integrity": "sha512-ZwJv8UbyyHVkJmEkVXaOTkItBTZYUYgZ9XpgAIaxJLZ/SabqnpDIQT2PpOb/2qpKc7Rxs0Je/IaGi/NZh0/JPg==" }, "symbol-tree": { "version": "3.2.2", @@ -11876,9 +12055,9 @@ "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==", "dev": true, "requires": { - "ajv": "5.2.3", - "ajv-keywords": "2.1.0", - "chalk": "2.1.0", + "ajv": "5.3.0", + "ajv-keywords": "2.1.1", + "chalk": "2.3.0", "lodash": "4.17.4", "slice-ansi": "1.0.0", "string-width": "2.1.1" @@ -12101,6 +12280,13 @@ "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=", "requires": { "punycode": "1.4.1" + }, + "dependencies": { + "punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + } } }, "tr46": { @@ -12109,13 +12295,6 @@ "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=", "requires": { "punycode": "2.1.0" - }, - "dependencies": { - "punycode": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz", - "integrity": "sha1-X4Y+3Im5bbCQdLrXlHvwkFbKTn0=" - } } }, "trim": { @@ -12195,12 +12374,19 @@ "integrity": "sha1-VNjrx5SfGngQkItgAsaEFSbJnVo=" }, "uglify-js": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.3.tgz", - "integrity": "sha512-5ZUOgufCHjN2mBBLfz63UtWTP6va2sSzBpNCM+/iqI6RnPzEhANmB0EKiKBYdQbc3v7KeomXJ2DJx0Xq9gvUvA==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.6.tgz", + "integrity": "sha512-/rseyxEKEVMBo8279lqpoJgD6C/i/CIi+9TJDvWmb+Xo6mqMKwjA8Io3IMHlcXQzj99feR6zrN8m3wqqvm/nYA==", "requires": { "commander": "2.11.0", - "source-map": "0.5.7" + "source-map": "0.6.1" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + } } }, "uglify-to-browserify": { @@ -12319,8 +12505,8 @@ "integrity": "sha1-TognpruRUUCrCTVZ1wFOPruDdFE=", "dev": true, "requires": { - "boxen": "1.2.1", - "chalk": "2.1.0", + "boxen": "1.2.2", + "chalk": "2.3.0", "configstore": "3.1.1", "import-lazy": "2.1.0", "is-installed-globally": "0.1.0", @@ -12416,9 +12602,9 @@ "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=" }, "utils-merge": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=" + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz", + "integrity": "sha1-ApT7kiu5N1FTVBxPcJYjHyh8ivg=" }, "uuid": { "version": "3.1.0", @@ -12477,9 +12663,9 @@ } }, "vue": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/vue/-/vue-2.4.4.tgz", - "integrity": "sha512-PCiRmc8ZT1DD5+BN8QUAmnkBefcCLfZVSuhc1u7iu5JoPrSHyyk/+4nehm7k2xVMi8+RFLk5WIHAN14UKF0txw==" + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.2.tgz", + "integrity": "sha512-Au9rf8fPkBulFHfZ406UaQDd1jH9fqGRIM+0IHilrXnJ/0TeeMH4SBkNxWf2dGevl2S3aVeu0E/WklEv0/msag==" }, "vue-awesome": { "version": "2.3.3", @@ -12549,7 +12735,7 @@ "postcss-load-config": "1.2.0", "postcss-selector-parser": "2.2.3", "prettier": "1.7.4", - "resolve": "1.4.0", + "resolve": "1.5.0", "source-map": "0.6.1", "vue-hot-reload-api": "2.2.0", "vue-style-loader": "3.0.3", @@ -12560,11 +12746,6 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - }, - "vue-template-es2015-compiler": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.6.0.tgz", - "integrity": "sha512-x3LV3wdmmERhVCYy3quqA57NJW7F3i6faas++pJQWtknWT+n7k30F4TVdHvCLn48peTJFRvCpxs3UuFPqgeELg==" } } }, @@ -12587,9 +12768,9 @@ } }, "vue-multiselect": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/vue-multiselect/-/vue-multiselect-2.0.3.tgz", - "integrity": "sha1-vsWPhFhgIvgsKjFpvhuGn22XFfw=" + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/vue-multiselect/-/vue-multiselect-2.0.6.tgz", + "integrity": "sha1-fKgObFPbQeQUv3ama5N33fRlnr0=" }, "vue-notifications": { "version": "0.9.0", @@ -12620,24 +12801,24 @@ "integrity": "sha512-MC4jacHBhTPKtmcfzvaj2N7g6jgJ/Z/eIjZdt+yUaUOM1iKC0OUIlO/xCtz6OZFFTNUJs/1YNro2GN/lE+nOXA==" }, "vue-scrollto": { - "version": "2.7.8", - "resolved": "https://registry.npmjs.org/vue-scrollto/-/vue-scrollto-2.7.8.tgz", - "integrity": "sha512-8nHyD7cICpmI4w0QJ16IbUawrkwHRkihG1NArhFrPHu2Em9C8L8dbIi3coiEfnIpDDPj2JsVVPKXFBKNHpFVwQ==", + "version": "2.7.9", + "resolved": "https://registry.npmjs.org/vue-scrollto/-/vue-scrollto-2.7.9.tgz", + "integrity": "sha512-O1pRQwrz8WCTVgMQ9Edo0D/cjTNrEAApI62+5iRRh5FNbgAKB27eHjl0OWZ8Q7m10sSfGSQLqOXIIr4Sl4Jncw==", "requires": { "bezier-easing": "2.0.3" } }, "vue-server-renderer": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/vue-server-renderer/-/vue-server-renderer-2.4.4.tgz", - "integrity": "sha512-qSaNqInt4bJLsIFBU7fNgSTvpYzWJWe+zUkbSdKaFhMGhI/GNFUghK4VZX3ETvBNX51DYa4kEmZgSVZ70xWdxQ==", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/vue-server-renderer/-/vue-server-renderer-2.5.2.tgz", + "integrity": "sha512-JEjAhH5dLJv4wQfCA6PbblY41LsCpSrVlpPgc+/aRWMms6znUIj/rlN66ypDMeNpMIv5mjraW77oc3kdfB1mJw==", "requires": { "chalk": "1.1.3", "hash-sum": "1.0.2", "he": "1.1.1", "lodash.template": "4.4.0", "lodash.uniq": "4.5.0", - "resolve": "1.4.0", + "resolve": "1.5.0", "serialize-javascript": "1.4.0", "source-map": "0.5.6" }, @@ -12695,8 +12876,8 @@ "integrity": "sha1-nA7TtfMYtLpHZNSwe58x72r8U+s=", "requires": { "babel-runtime": "6.26.0", - "sweetalert2": "6.11.0", - "vue": "2.4.4" + "sweetalert2": "6.11.4", + "vue": "2.5.2" } }, "vue-template-compiler": { @@ -12714,9 +12895,9 @@ "integrity": "sha512-x3LV3wdmmERhVCYy3quqA57NJW7F3i6faas++pJQWtknWT+n7k30F4TVdHvCLn48peTJFRvCpxs3UuFPqgeELg==" }, "vue-test-utils": { - "version": "1.0.0-beta.2", - "resolved": "https://registry.npmjs.org/vue-test-utils/-/vue-test-utils-1.0.0-beta.2.tgz", - "integrity": "sha512-92BO5hdT5lJ+lA6SAIJV4QlQ/YfUGweJKBaCW6yGgxew2le8VECQd78Fxx5PUqgZqRHp/O96p5u0X4YJTJEdnQ==", + "version": "1.0.0-beta.4", + "resolved": "https://registry.npmjs.org/vue-test-utils/-/vue-test-utils-1.0.0-beta.4.tgz", + "integrity": "sha512-/jTjTRobUoEi1xtFlRyQ0YhtCZSSyITjgjipdQdND6YNjzOE+DyzVuHPoFxMwn1RLCkKJwx3rm1lz0pzHI+9wA==", "dev": true, "requires": { "lodash": "4.17.4" @@ -12744,6 +12925,14 @@ "requires": { "exec-sh": "0.2.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=", + "dev": true + } } }, "watchpack": { @@ -12762,14 +12951,14 @@ "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==" }, "webpack": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.6.0.tgz", - "integrity": "sha512-OsHT3D0W0KmPPh60tC7asNnOmST6bKTiR90UyEdT9QYoaJ4OYN4Gg7WK1k3VxHK07ZoiYWPsKvlS/gAjwL/vRA==", + "version": "3.8.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.8.1.tgz", + "integrity": "sha512-5ZXLWWsMqHKFr5y0N3Eo5IIisxeEeRAajNq4mELb/WELOR7srdbQk2N5XiyNy2A/AgvlR3AmeBCZJW8lHrolbw==", "requires": { - "acorn": "5.1.2", + "acorn": "5.2.1", "acorn-dynamic-import": "2.0.2", - "ajv": "5.2.3", - "ajv-keywords": "2.1.0", + "ajv": "5.3.0", + "ajv-keywords": "2.1.1", "async": "2.5.0", "enhanced-resolve": "3.4.1", "escope": "3.6.0", @@ -12782,7 +12971,7 @@ "mkdirp": "0.5.1", "node-libs-browser": "2.0.0", "source-map": "0.5.7", - "supports-color": "4.4.0", + "supports-color": "4.5.0", "tapable": "0.2.8", "uglifyjs-webpack-plugin": "0.4.6", "watchpack": "1.4.0", @@ -12795,12 +12984,12 @@ "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.9.0.tgz", "integrity": "sha1-tYvDTMMLJ//brz0AvyerpvopxuM=", "requires": { - "acorn": "5.1.2", + "acorn": "5.2.1", "chalk": "1.1.3", "commander": "2.11.0", "ejs": "2.5.7", "express": "4.15.5", - "filesize": "3.5.10", + "filesize": "3.5.11", "gzip-size": "3.0.0", "lodash": "4.17.4", "mkdirp": "0.5.1", @@ -12870,20 +13059,12 @@ } }, "whatwg-encoding": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.1.tgz", - "integrity": "sha1-PGxFGhmO567FWx7GHQkgxngBpfQ=", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.3.tgz", + "integrity": "sha512-jLBwwKUhi8WtBfsMQlL4bUUcT8sMkAtQinscJAe/M4KHCkHuUJAF6vuB0tueNIw4c8ziO6AkRmgY+jL3a0iiPw==", "dev": true, "requires": { - "iconv-lite": "0.4.13" - }, - "dependencies": { - "iconv-lite": { - "version": "0.4.13", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz", - "integrity": "sha1-H4irpKsLFQjoMSrMOTRfNumS4vI=", - "dev": true - } + "iconv-lite": "0.4.19" } }, "whatwg-url": { @@ -13016,24 +13197,6 @@ "supports-color": "2.0.0" } }, - "fs-extra": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz", - "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=", - "requires": { - "graceful-fs": "4.1.11", - "jsonfile": "3.0.1", - "universalify": "0.1.1" - } - }, - "jsonfile": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz", - "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=", - "requires": { - "graceful-fs": "4.1.11" - } - }, "supports-color": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", @@ -13047,9 +13210,9 @@ "integrity": "sha512-Ujeln0sacz330kQQSxupakzI4bwr2B+MpxZI3CF3ku4f5YXzEy4dkd/fG1p9oo8Ib2iDEQPfII3MV0o4szILqw==" }, "worker-farm": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.5.0.tgz", - "integrity": "sha512-DHRiUggxtbruaTwnLDm2/BRDKZIoOYvrgYUj5Bam4fU6Gtvc0FaEyoswFPBjMXAweGW2H4BDNIpy//1yXXuaqQ==", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.5.1.tgz", + "integrity": "sha512-T5NH6Wqsd8MwGD4AK8BBllUy6LmHaqjEOyo/YIUEegZui6/v5Bqde//3jwyE3PGiGYMmWi06exFBi5LNhhPFNw==", "dev": true, "requires": { "errno": "0.1.4", @@ -13184,13 +13347,6 @@ "integrity": "sha1-m76b6JYUKXbfo0wGGy0GjEPTDeA=", "requires": { "cuint": "0.2.2" - }, - "dependencies": { - "cuint": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/cuint/-/cuint-0.2.2.tgz", - "integrity": "sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=" - } } }, "y18n": { diff --git a/package.json b/package.json index 8a54eafc..c5e7ef13 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,8 @@ "vue-scrollto": "^2.7.8", "vue-simplemde": "^0.4.6", "vue-sweetalert": "^0.1.18", - "vue-template-compiler": "^2.5.2", + "vue-server-renderer": "~2.5.2", + "vue-template-compiler": "~2.5.2", "vue-template-es2015-compiler": "^1.6.0" }, "devDependencies": { diff --git a/pages/account/_name/index.vue b/pages/account/_name/index.vue index c11321fc..de89f345 100644 --- a/pages/account/_name/index.vue +++ b/pages/account/_name/index.vue @@ -71,7 +71,7 @@ export default { projects: data.projects || data.projects_contrib } }).catch(err => { - error({ statusCode: err.statusCode, message: err.message }) + error(err) }) }, diff --git a/pages/account/_name/settings/api.vue b/pages/account/_name/settings/api.vue index 7cdcc7ff..3fae70f6 100644 --- a/pages/account/_name/settings/api.vue +++ b/pages/account/_name/settings/api.vue @@ -20,7 +20,7 @@ export default { csrf: data.form.csrf } }).catch(err => { - error({ statusCode: err.statusCode, message: err.message }) + error(err) }) }, diff --git a/pages/account/_name/settings/avatar.vue b/pages/account/_name/settings/avatar.vue index 35883ed4..3d24989d 100644 --- a/pages/account/_name/settings/avatar.vue +++ b/pages/account/_name/settings/avatar.vue @@ -30,7 +30,7 @@ export default { } } }).catch(err => { - error({ statusCode: err.statusCode, message: err.message }) + error(err) }) }, diff --git a/pages/account/_name/settings/profile.vue b/pages/account/_name/settings/profile.vue index 39d4482b..cbb3dd6c 100644 --- a/pages/account/_name/settings/profile.vue +++ b/pages/account/_name/settings/profile.vue @@ -47,7 +47,7 @@ export default { } } }).catch(err => { - error({ statusCode: err.statusCode, message: err.message }) + error(err) }) }, diff --git a/pages/account/_name/settings/security.vue b/pages/account/_name/settings/security.vue index 0600e1ab..eeb4459a 100644 --- a/pages/account/_name/settings/security.vue +++ b/pages/account/_name/settings/security.vue @@ -46,7 +46,7 @@ export default { } } }).catch(err => { - error({ statusCode: err.statusCode, message: err.message }) + error(err) }) }, diff --git a/pages/account/newsletter.vue b/pages/account/newsletter.vue index cd3e8ee0..e368445b 100644 --- a/pages/account/newsletter.vue +++ b/pages/account/newsletter.vue @@ -63,7 +63,7 @@ export default { }).then(data => { this.$router.push({ path: next }) }).catch(err => { - this.$nuxt.error({ statusCode: err.statusCode, message: err.message }) + this.$nuxt.error(err) }) } } diff --git a/pages/account/password/forgotten.vue b/pages/account/password/forgotten.vue index 299f8aa5..b1685b2b 100644 --- a/pages/account/password/forgotten.vue +++ b/pages/account/password/forgotten.vue @@ -39,7 +39,7 @@ export default { } } }).catch(err => { - error({ statusCode: err.statusCode, message: err.message }) + error(err) }) }, diff --git a/pages/account/password/reset.vue b/pages/account/password/reset.vue index 83457196..7d36d4ec 100644 --- a/pages/account/password/reset.vue +++ b/pages/account/password/reset.vue @@ -47,7 +47,7 @@ export default { } } }).catch(err => { - error({ statusCode: err.statusCode, message: err.message }) + error(err) }) }, diff --git a/pages/account/register.vue b/pages/account/register.vue index 5c07cb20..17fefccb 100644 --- a/pages/account/register.vue +++ b/pages/account/register.vue @@ -120,7 +120,7 @@ export default { auth: signinData.auth } }).catch(err => { - this.$nuxt.error({ statusCode: err.statusCode, message: err.message }) + this.$nuxt.error(err) }) }, diff --git a/pages/account/signin.vue b/pages/account/signin.vue index f3e30c7c..2e89ee47 100644 --- a/pages/account/signin.vue +++ b/pages/account/signin.vue @@ -84,7 +84,7 @@ export default { } } }).catch(err => { - error({ statusCode: err.statusCode, message: err.message }) + error(err) }) }, diff --git a/pages/admin/announcements/_id/update.vue b/pages/admin/announcements/_id/update.vue index b2021aa2..32ff53ba 100644 --- a/pages/admin/announcements/_id/update.vue +++ b/pages/admin/announcements/_id/update.vue @@ -108,7 +108,7 @@ export default { } } }).catch(err => { - error({ statusCode: err.statusCode, message: err.message }) + error(err) }) }, @@ -149,7 +149,7 @@ export default { : 'Announcement unpublished' }) }).catch(err => { - this.$nuxt.error({ statusCode: err.statusCode, message: err.message }) + this.$nuxt.error(err) }) } } diff --git a/pages/admin/collections/_id/update.vue b/pages/admin/collections/_id/update.vue index 89e2a90f..af19598a 100644 --- a/pages/admin/collections/_id/update.vue +++ b/pages/admin/collections/_id/update.vue @@ -512,7 +512,7 @@ export default { }) }).catch(err => { this.collection.info.published = !this.collection.info.published - this.$nuxt.error({ statusCode: err.statusCode, message: err.message }) + this.$nuxt.error(err) }) } } diff --git a/pages/admin/collections/index.vue b/pages/admin/collections/index.vue index e4de6a9f..0b81233f 100644 --- a/pages/admin/collections/index.vue +++ b/pages/admin/collections/index.vue @@ -108,7 +108,7 @@ export default { nProjects: data.n_projects_per_category } }).catch(err => { - error({ statusCode: err.statusCode, message: err.message }) + error(err) }) }, diff --git a/pages/admin/collections/new.vue b/pages/admin/collections/new.vue index ddf16b4f..15b9c2cb 100644 --- a/pages/admin/collections/new.vue +++ b/pages/admin/collections/new.vue @@ -93,7 +93,7 @@ export default { nProjects: data.n_projects_per_category } }).catch(err => { - error({ statusCode: err.statusCode, message: err.message }) + error(err) }) }, diff --git a/pages/admin/featured.vue b/pages/admin/featured.vue index d2fe806a..c89acbfc 100644 --- a/pages/admin/featured.vue +++ b/pages/admin/featured.vue @@ -103,7 +103,7 @@ export default { : 'Project removed from featured' }) }).catch(err => { - this.$nuxt.error({ statusCode: err.statusCode, message: err.message }) + this.$nuxt.error(err) }) } }, diff --git a/pages/admin/users.vue b/pages/admin/users.vue index 2907ac17..867c4a71 100644 --- a/pages/admin/users.vue +++ b/pages/admin/users.vue @@ -158,7 +158,7 @@ export default { } } }).catch(err => { - error({ statusCode: err.statusCode, message: err.message }) + error(err) }) }, @@ -193,7 +193,7 @@ export default { }).then(data => { user.admin = !user.admin }).catch(err => { - this.$nuxt.error({ statusCode: err.statusCode, message: err.message }) + this.$nuxt.error(err) }) }, @@ -219,7 +219,7 @@ export default { }).then(data => { exportFile(data, 'user_data', format) }).catch(err => { - this.$nuxt.error({ statusCode: err.statusCode, message: err.message }) + this.$nuxt.error(err) }) } } diff --git a/pages/collection/_short_name/projects/_id/_presenter.vue/index.vue b/pages/collection/_short_name/projects/_id/_presenter.vue/index.vue index d656ef1c..e936b892 100644 --- a/pages/collection/_short_name/projects/_id/_presenter.vue/index.vue +++ b/pages/collection/_short_name/projects/_id/_presenter.vue/index.vue @@ -39,7 +39,7 @@ export default { project: data } }).catch(err => { - error({ statusCode: err.statusCode, message: err.message }) + error(err) }) }, @@ -97,7 +97,7 @@ export default { this.tasks = this.tasks.concat(loadedTasks) } }).catch(err => { - this.$nuxt.error({ statusCode: err.statusCode, message: err.message }) + this.$nuxt.error(err) }) }, @@ -144,7 +144,7 @@ export default { type: 'success' }) }).catch(err => { - this.$nuxt.error({ statusCode: err.statusCode, message: err.message }) + this.$nuxt.error(err) }) } else { this.$axios.$delete(`/api/favorite/${taskId}`).then(() => { @@ -154,7 +154,7 @@ export default { type: 'success' }) }).catch(err => { - this.$nuxt.error({ statusCode: err.statusCode, message: err.message }) + this.$nuxt.error(err) }) } }, @@ -209,7 +209,7 @@ export default { } this.$cookie.set(cookieName, true, { expires: '1Y' }) }).catch(err => { - this.$nuxt.error({ statusCode: err.statusCode, message: err.message }) + this.$nuxt.error(err) }) } }, diff --git a/pages/index.vue b/pages/index.vue index 77aa8516..95e6c08a 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -158,7 +158,7 @@ export default { top10Users: leaderboardData.top_users.slice(0, 10) } }).catch(err => { - error({ statusCode: err.statusCode, message: err.message }) + error(err) }) }, diff --git a/pages/project/_short_name/collection.vue b/pages/project/_short_name/collection.vue index aa0ddbe8..ed21e3ce 100644 --- a/pages/project/_short_name/collection.vue +++ b/pages/project/_short_name/collection.vue @@ -91,7 +91,7 @@ export default { }) this.$store.dispatch('UPDATE_CURRENT_PROJECT', data) }).catch(err => { - this.$nuxt.error({ statusCode: err.statusCode, message: err.message }) + this.$nuxt.error(err) }) } } diff --git a/pages/project/_short_name/settings.vue b/pages/project/_short_name/settings.vue index e954f3fb..60188c97 100644 --- a/pages/project/_short_name/settings.vue +++ b/pages/project/_short_name/settings.vue @@ -92,7 +92,7 @@ export default { } } }).catch(err => { - error({ statusCode: err.statusCode, message: err.message }) + error(err) }) }, diff --git a/pages/project/_short_name/tags.vue b/pages/project/_short_name/tags.vue index aa80fe5e..92a93491 100644 --- a/pages/project/_short_name/tags.vue +++ b/pages/project/_short_name/tags.vue @@ -116,7 +116,7 @@ export default { info: this.project.info }) } catch (err) { - this.$nuxt.error({ statusCode: err.statusCode, message: err.message }) + this.$nuxt.error(err) } finally { this.processing = false } diff --git a/pages/project/_short_name/thumbnail.vue b/pages/project/_short_name/thumbnail.vue index a6a9e3e4..7fb7d692 100644 --- a/pages/project/_short_name/thumbnail.vue +++ b/pages/project/_short_name/thumbnail.vue @@ -35,7 +35,7 @@ export default { } } }).catch(err => { - error({ statusCode: err.statusCode, message: err.message }) + error(err) }) }, diff --git a/store/actions.js b/store/actions.js index d8081353..45d251e9 100644 --- a/store/actions.js +++ b/store/actions.js @@ -47,8 +47,6 @@ export default { commit('SET_ITEM', { key: 'collection', value: data[0] }) - }).catch(err => { - throw new Error({ statusCode: err.statusCode, message: err.message }) }) }, From 91d2a3e7684ff2938c26197aafe55ab05d35b14f Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Tue, 31 Oct 2017 16:44:28 +0000 Subject: [PATCH 05/38] Pin packages --- package-lock.json | 103 ++++++++++++++-------------------------------- package.json | 11 +++-- 2 files changed, 37 insertions(+), 77 deletions(-) diff --git a/package-lock.json b/package-lock.json index a4352e33..87caa85b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6657,15 +6657,15 @@ } }, "jest-vue-preprocessor": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/jest-vue-preprocessor/-/jest-vue-preprocessor-1.3.1.tgz", - "integrity": "sha512-bl3ECo9IFt+idx9WAVy6fdj7p2u5wWr7G4NSEXHEwnV0TFRKKUcDjK7XF3kXdeUJ2Sa3uGqqjS0o1ZIvLZyKqQ==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/jest-vue-preprocessor/-/jest-vue-preprocessor-1.2.0.tgz", + "integrity": "sha512-fXnvxM0buCiiU3tFO7AzolfFNoZgSFV4BYaIIHNtZn31hZ5ChtqzqPf7QCjRHakxVGuo2aKlWb54VoAM+fUDMQ==", "dev": true, "requires": { "babel-plugin-transform-runtime": "6.23.0", "find-babel-config": "1.1.0", - "typescript": "2.5.3", - "vue-property-decorator": "6.0.0" + "typescript": "2.4.2", + "vue-property-decorator": "5.1.1" } }, "jimp": { @@ -7944,9 +7944,9 @@ "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" }, "nuxt": { - "version": "1.0.0-rc11", - "resolved": "https://registry.npmjs.org/nuxt/-/nuxt-1.0.0-rc11.tgz", - "integrity": "sha512-Ozhet9O7gkEgEVOdVjyYCAnZ4vS3rg8CdWq1JsplXF8DRGQ+MpeN7Ch5TgMRY/gfp8GpIHcnCAuLG9OaR9WZJA==", + "version": "1.0.0-rc10", + "resolved": "https://registry.npmjs.org/nuxt/-/nuxt-1.0.0-rc10.tgz", + "integrity": "sha512-WasbXsxd7drIv6AuzLcFXO5YEriqLf/OIaZeoXawoJ2HmcImV/0Yovlz0nwl6xraoK5xCmO2hd0h1oogVrEKDQ==", "requires": { "@nuxtjs/youch": "3.0.2", "ansi-html": "0.0.7", @@ -12363,9 +12363,9 @@ "dev": true }, "typescript": { - "version": "2.5.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.5.3.tgz", - "integrity": "sha512-ptLSQs2S4QuS6/OD1eAKG+S5G8QQtrU5RT32JULdZQtM1L3WTi34Wsu48Yndzi8xsObRAB9RPt/KhA9wlpEF6w==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.4.2.tgz", + "integrity": "sha1-+DlfhdRZJ2BnyYiqQYN6j4KHCEQ=", "dev": true }, "typo-js": { @@ -12681,9 +12681,9 @@ } }, "vue-class-component": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/vue-class-component/-/vue-class-component-6.0.0.tgz", - "integrity": "sha512-3XS48fRq8NoTg/SgGOoHc50xiwgIkaee3/eyFcHl5BlzU5EW4phN3q5yh8aLdJ3vzcW1jxdiEyI6davLq+VJ0w==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/vue-class-component/-/vue-class-component-5.0.2.tgz", + "integrity": "sha512-wgI/SKRozqADIeMGN16PXiHBa/cnRD7JcuYt7P4JHcMIMc2BdUw02pQ+EQmsui0tN2kRVZGwZ8h4Yb2Vbf4w0w==", "dev": true }, "vue-clickaway": { @@ -12746,6 +12746,11 @@ "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + }, + "vue-template-es2015-compiler": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.6.0.tgz", + "integrity": "sha512-x3LV3wdmmERhVCYy3quqA57NJW7F3i6faas++pJQWtknWT+n7k30F4TVdHvCLn48peTJFRvCpxs3UuFPqgeELg==" } } }, @@ -12786,13 +12791,13 @@ } }, "vue-property-decorator": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/vue-property-decorator/-/vue-property-decorator-6.0.0.tgz", - "integrity": "sha1-u2UbKTVC4x2w0k829LAlDvCNhRU=", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/vue-property-decorator/-/vue-property-decorator-5.1.1.tgz", + "integrity": "sha1-jTslWBWN5riuixWcoxD3DsJK1L4=", "dev": true, "requires": { "reflect-metadata": "0.1.10", - "vue-class-component": "6.0.0" + "vue-class-component": "5.0.2" } }, "vue-router": { @@ -12808,50 +12813,6 @@ "bezier-easing": "2.0.3" } }, - "vue-server-renderer": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/vue-server-renderer/-/vue-server-renderer-2.5.2.tgz", - "integrity": "sha512-JEjAhH5dLJv4wQfCA6PbblY41LsCpSrVlpPgc+/aRWMms6znUIj/rlN66ypDMeNpMIv5mjraW77oc3kdfB1mJw==", - "requires": { - "chalk": "1.1.3", - "hash-sum": "1.0.2", - "he": "1.1.1", - "lodash.template": "4.4.0", - "lodash.uniq": "4.5.0", - "resolve": "1.5.0", - "serialize-javascript": "1.4.0", - "source-map": "0.5.6" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - } - }, - "source-map": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", - "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=" - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" - } - } - }, "vue-simplemde": { "version": "0.4.6", "resolved": "https://registry.npmjs.org/vue-simplemde/-/vue-simplemde-0.4.6.tgz", @@ -12881,23 +12842,23 @@ } }, "vue-template-compiler": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.5.2.tgz", - "integrity": "sha512-FtbqBWvEANPZaeRo09VKEF7tET4kPMtJYqwsy/Nm1fdr1zIcwcTI7CXqeraXMviczho5IjtxZ6Fab1Enm4rHmA==", + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.4.4.tgz", + "integrity": "sha512-XdHsNi8Z5WqwuFl/Z5eLKgE2DOEEOdMk1aA459uSgvwyy+pjKLBlQWsUpAtoR6o6Wmpujw6NtinAUGuqSTituQ==", "requires": { "de-indent": "1.0.2", "he": "1.1.1" } }, "vue-template-es2015-compiler": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.6.0.tgz", - "integrity": "sha512-x3LV3wdmmERhVCYy3quqA57NJW7F3i6faas++pJQWtknWT+n7k30F4TVdHvCLn48peTJFRvCpxs3UuFPqgeELg==" + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.5.3.tgz", + "integrity": "sha512-j3TBDtjqz7pC9XUzeSeqF5oekqPahxyUHsdG+kZKDH/V/DTexq5inYdLGstnqCUljoLC9LTj3H/5hmyToeSd1A==" }, "vue-test-utils": { - "version": "1.0.0-beta.4", - "resolved": "https://registry.npmjs.org/vue-test-utils/-/vue-test-utils-1.0.0-beta.4.tgz", - "integrity": "sha512-/jTjTRobUoEi1xtFlRyQ0YhtCZSSyITjgjipdQdND6YNjzOE+DyzVuHPoFxMwn1RLCkKJwx3rm1lz0pzHI+9wA==", + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/vue-test-utils/-/vue-test-utils-1.0.0-beta.2.tgz", + "integrity": "sha512-92BO5hdT5lJ+lA6SAIJV4QlQ/YfUGweJKBaCW6yGgxew2le8VECQd78Fxx5PUqgZqRHp/O96p5u0X4YJTJEdnQ==", "dev": true, "requires": { "lodash": "4.17.4" diff --git a/package.json b/package.json index c5e7ef13..5e1441be 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "libcrowds-viewer": "^3.3.2", "lodash": "^4.17.4", "moment": "^2.19.1", - "nuxt": "1.0.0-rc11", + "nuxt": "1.0.0-rc10", "popper.js": "^1.12.5", "progressbar.js": "^1.0.1", "raven": "^2.2.1", @@ -56,9 +56,8 @@ "vue-scrollto": "^2.7.8", "vue-simplemde": "^0.4.6", "vue-sweetalert": "^0.1.18", - "vue-server-renderer": "~2.5.2", - "vue-template-compiler": "~2.5.2", - "vue-template-es2015-compiler": "^1.6.0" + "vue-template-compiler": "^2.4.4", + "vue-template-es2015-compiler": "~1.5.0" }, "devDependencies": { "axios-mock-adapter": "^1.9.0", @@ -90,14 +89,14 @@ "html-loader": "^0.5.1", "jest": "^21.2.1", "jest-serializer-html": "^4.0.0", - "jest-vue-preprocessor": "~1.3.0", + "jest-vue-preprocessor": "~1.2.0", "jsdom": "^11.3.0", "markdown-loader": "^2.0.1", "node-sass": "^4.5.3", "regenerator-runtime": "^0.11.0", "sass-loader": "^6.0.6", "shelljs": "^0.7.8", - "vue-test-utils": "^1.0.0-beta.2", + "vue-test-utils": "1.0.0-beta.2", "webpack-node-externals": "^1.6.0" }, "jest": { From e7004a98fc4aad15c296dac16ef06d861d2cdc4c Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Tue, 31 Oct 2017 16:44:40 +0000 Subject: [PATCH 06/38] Remove unused build step --- nuxt.config.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/nuxt.config.js b/nuxt.config.js index fe7cbf42..a1e318cf 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -67,11 +67,6 @@ const config = { 'markdown-loader' ] }) - }, - postcss: { - plugins: { - 'postcss-custom-properties': false - } } }, plugins: [ From 41ab4ef2fdcf5f69bcec0547b5391275074583ca Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Tue, 31 Oct 2017 18:16:17 +0000 Subject: [PATCH 07/38] Move to last read time for announcements --- components/lists/Announcements.vue | 9 +++++---- store/actions.js | 3 +-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/lists/Announcements.vue b/components/lists/Announcements.vue index eb4ba362..8e1fcceb 100644 --- a/components/lists/Announcements.vue +++ b/components/lists/Announcements.vue @@ -92,16 +92,17 @@ export default { return this.$store.state.lastAnnouncement }, - lastReadId () { - const userAnnouncements = this.currentUser.info.announcements || {} - return userAnnouncements['last_read'] || 0 + lastRead () { + const annoucements = this.currentUser.info.announcements || {} + return annoucements.last_read }, hasUnread () { if (this.noAnnouncements) { return false } - return this.lastReadId < this.lastAnnouncement.id + const last = Date.parse(this.lastAnnouncement.created) + return !this.lastRead || Date.parse(this.lastRead) < last } }, diff --git a/store/actions.js b/store/actions.js index 45d251e9..9b4441c3 100644 --- a/store/actions.js +++ b/store/actions.js @@ -81,8 +81,7 @@ export default { UPDATE_LAST_READ: ({ state, dispatch }, axios) => { const announcements = state.currentUser.info.announcements || {} - announcements.last_read = state.lastAnnouncement.id - state.currentUser.info.announcements = announcements + announcements['last_read'] = state.lastAnnouncement.created return axios.$put(`/api/user/${state.currentUser.id}`, { info: state.currentUser.info }).then(data => { From 0ae3564db359f7e27a821815183921d92166426e Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Tue, 31 Oct 2017 18:22:16 +0000 Subject: [PATCH 08/38] Update last announcement when one is published --- pages/admin/announcements/_id/update.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/pages/admin/announcements/_id/update.vue b/pages/admin/announcements/_id/update.vue index 32ff53ba..4a972c5b 100644 --- a/pages/admin/announcements/_id/update.vue +++ b/pages/admin/announcements/_id/update.vue @@ -148,6 +148,7 @@ export default { ? 'Announcement published' : 'Announcement unpublished' }) + this.$store.dispatch('UPDATE_LAST_ANNOUNCEMENT', this.$axios) }).catch(err => { this.$nuxt.error(err) }) From a10cce89cf872efe834de010128190ecfef2dd6c Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Wed, 1 Nov 2017 23:38:41 +0000 Subject: [PATCH 09/38] Don't attempt to proxy cookie headers (#449) --- middleware/auth.js | 2 -- utils/auth.js | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/middleware/auth.js b/middleware/auth.js index b2c78600..c6277944 100644 --- a/middleware/auth.js +++ b/middleware/auth.js @@ -1,4 +1,3 @@ -import axios from 'axios' import { updateSession } from '@/utils/auth' /** @@ -11,7 +10,6 @@ export default function ({ isServer, store, req, app }) { let update = false if (isServer && req) { - axios.defaults.headers.common.cookie = req.headers.cookie update = updateSession(currentUser, req.headers.cookie) } else { update = updateSession(currentUser, document.cookie) diff --git a/utils/auth.js b/utils/auth.js index 46d36f76..99e0d936 100644 --- a/utils/auth.js +++ b/utils/auth.js @@ -6,6 +6,10 @@ * The document cookie string. */ export const updateSession = (user, cookieStr) => { + if (!cookieStr) { + return true + } + const allCookies = cookieStr.split(';') let hasSession = false let sessionName = null From 893fa6334b9ed8f77ba21f7da99bd24787273448 Mon Sep 17 00:00:00 2001 From: Alexander Mendes Date: Thu, 2 Nov 2017 11:37:26 +0000 Subject: [PATCH 10/38] Delete old component --- src/components/buttons/ProjectContrib.vue | 58 ----------------------- 1 file changed, 58 deletions(-) delete mode 100644 src/components/buttons/ProjectContrib.vue diff --git a/src/components/buttons/ProjectContrib.vue b/src/components/buttons/ProjectContrib.vue deleted file mode 100644 index 130fff87..00000000 --- a/src/components/buttons/ProjectContrib.vue +++ /dev/null @@ -1,58 +0,0 @@ - - - From a4d19431dd87e9259473354de3abfb7077b98a72 Mon Sep 17 00:00:00 2001 From: Alexander Mendes Date: Thu, 2 Nov 2017 11:40:30 +0000 Subject: [PATCH 11/38] Add share text to libcrowds viewer (#444) --- components/presenters/LibcrowdsViewer.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/components/presenters/LibcrowdsViewer.vue b/components/presenters/LibcrowdsViewer.vue index 6b2be2a3..512aa411 100644 --- a/components/presenters/LibcrowdsViewer.vue +++ b/components/presenters/LibcrowdsViewer.vue @@ -42,6 +42,9 @@ export default { if (!isEmpty(this.currentUser) && task.fav_user_ids) { opts.liked = task.fav_user_ids.indexOf(this.currentUser.id) > -1 } + opts.shareText = 'Copy the link to bookmark, share on social media ' + + ' or [discuss this playbill on our forum]' + + '(https://community.libcrowds.com/d/11-spotted-on-in-the-spotlight).' return opts }) }, From f8fb4e1397606a1a152ec717a9ca94c54d5091b5 Mon Sep 17 00:00:00 2001 From: Alexander Mendes Date: Thu, 2 Nov 2017 11:51:22 +0000 Subject: [PATCH 12/38] Update LibCrowds Viewer (#447, #406, #452, ) --- package-lock.json | 802 +--------------------------------------------- package.json | 2 +- 2 files changed, 6 insertions(+), 798 deletions(-) diff --git a/package-lock.json b/package-lock.json index 87caa85b..3d2bb95b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1845,7 +1845,6 @@ "requires": { "anymatch": "1.3.2", "async-each": "1.0.1", - "fsevents": "1.1.2", "glob-parent": "2.0.0", "inherits": "2.0.3", "is-binary-path": "1.0.1", @@ -4155,791 +4154,6 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, - "fsevents": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz", - "integrity": "sha512-Sn44E5wQW4bTHXvQmvSHwqbuiXtduD6Rrjm2ZtUEGbyrig+nUH3t/QD4M4/ZXViY556TBpRgZkHLDx3JxPwxiw==", - "optional": true, - "requires": { - "nan": "2.7.0", - "node-pre-gyp": "0.6.36" - }, - "dependencies": { - "abbrev": { - "version": "1.1.0", - "bundled": true, - "optional": true - }, - "ajv": { - "version": "4.11.8", - "bundled": true, - "optional": true, - "requires": { - "co": "4.6.0", - "json-stable-stringify": "1.0.1" - } - }, - "ansi-regex": { - "version": "2.1.1", - "bundled": true - }, - "aproba": { - "version": "1.1.1", - "bundled": true, - "optional": true - }, - "are-we-there-yet": { - "version": "1.1.4", - "bundled": true, - "optional": true, - "requires": { - "delegates": "1.0.0", - "readable-stream": "2.2.9" - } - }, - "asn1": { - "version": "0.2.3", - "bundled": true, - "optional": true - }, - "assert-plus": { - "version": "0.2.0", - "bundled": true, - "optional": true - }, - "asynckit": { - "version": "0.4.0", - "bundled": true, - "optional": true - }, - "aws-sign2": { - "version": "0.6.0", - "bundled": true, - "optional": true - }, - "aws4": { - "version": "1.6.0", - "bundled": true, - "optional": true - }, - "balanced-match": { - "version": "0.4.2", - "bundled": true - }, - "bcrypt-pbkdf": { - "version": "1.0.1", - "bundled": true, - "optional": true, - "requires": { - "tweetnacl": "0.14.5" - } - }, - "block-stream": { - "version": "0.0.9", - "bundled": true, - "requires": { - "inherits": "2.0.3" - } - }, - "boom": { - "version": "2.10.1", - "bundled": true, - "requires": { - "hoek": "2.16.3" - } - }, - "brace-expansion": { - "version": "1.1.7", - "bundled": true, - "requires": { - "balanced-match": "0.4.2", - "concat-map": "0.0.1" - } - }, - "buffer-shims": { - "version": "1.0.0", - "bundled": true - }, - "caseless": { - "version": "0.12.0", - "bundled": true, - "optional": true - }, - "co": { - "version": "4.6.0", - "bundled": true, - "optional": true - }, - "code-point-at": { - "version": "1.1.0", - "bundled": true - }, - "combined-stream": { - "version": "1.0.5", - "bundled": true, - "requires": { - "delayed-stream": "1.0.0" - } - }, - "concat-map": { - "version": "0.0.1", - "bundled": true - }, - "console-control-strings": { - "version": "1.1.0", - "bundled": true - }, - "core-util-is": { - "version": "1.0.2", - "bundled": true - }, - "cryptiles": { - "version": "2.0.5", - "bundled": true, - "optional": true, - "requires": { - "boom": "2.10.1" - } - }, - "dashdash": { - "version": "1.14.1", - "bundled": true, - "optional": true, - "requires": { - "assert-plus": "1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true, - "optional": true - } - } - }, - "debug": { - "version": "2.6.8", - "bundled": true, - "optional": true, - "requires": { - "ms": "2.0.0" - } - }, - "deep-extend": { - "version": "0.4.2", - "bundled": true, - "optional": true - }, - "delayed-stream": { - "version": "1.0.0", - "bundled": true - }, - "delegates": { - "version": "1.0.0", - "bundled": true, - "optional": true - }, - "ecc-jsbn": { - "version": "0.1.1", - "bundled": true, - "optional": true, - "requires": { - "jsbn": "0.1.1" - } - }, - "extend": { - "version": "3.0.1", - "bundled": true, - "optional": true - }, - "extsprintf": { - "version": "1.0.2", - "bundled": true - }, - "forever-agent": { - "version": "0.6.1", - "bundled": true, - "optional": true - }, - "form-data": { - "version": "2.1.4", - "bundled": true, - "optional": true, - "requires": { - "asynckit": "0.4.0", - "combined-stream": "1.0.5", - "mime-types": "2.1.15" - } - }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true - }, - "fstream": { - "version": "1.0.11", - "bundled": true, - "requires": { - "graceful-fs": "4.1.11", - "inherits": "2.0.3", - "mkdirp": "0.5.1", - "rimraf": "2.6.1" - } - }, - "fstream-ignore": { - "version": "1.0.5", - "bundled": true, - "optional": true, - "requires": { - "fstream": "1.0.11", - "inherits": "2.0.3", - "minimatch": "3.0.4" - } - }, - "gauge": { - "version": "2.7.4", - "bundled": true, - "optional": true, - "requires": { - "aproba": "1.1.1", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.2" - } - }, - "getpass": { - "version": "0.1.7", - "bundled": true, - "optional": true, - "requires": { - "assert-plus": "1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true, - "optional": true - } - } - }, - "glob": { - "version": "7.1.2", - "bundled": true, - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "graceful-fs": { - "version": "4.1.11", - "bundled": true - }, - "har-schema": { - "version": "1.0.5", - "bundled": true, - "optional": true - }, - "har-validator": { - "version": "4.2.1", - "bundled": true, - "optional": true, - "requires": { - "ajv": "4.11.8", - "har-schema": "1.0.5" - } - }, - "has-unicode": { - "version": "2.0.1", - "bundled": true, - "optional": true - }, - "hawk": { - "version": "3.1.3", - "bundled": true, - "optional": true, - "requires": { - "boom": "2.10.1", - "cryptiles": "2.0.5", - "hoek": "2.16.3", - "sntp": "1.0.9" - } - }, - "hoek": { - "version": "2.16.3", - "bundled": true - }, - "http-signature": { - "version": "1.1.1", - "bundled": true, - "optional": true, - "requires": { - "assert-plus": "0.2.0", - "jsprim": "1.4.0", - "sshpk": "1.13.0" - } - }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" - } - }, - "inherits": { - "version": "2.0.3", - "bundled": true - }, - "ini": { - "version": "1.3.4", - "bundled": true, - "optional": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "requires": { - "number-is-nan": "1.0.1" - } - }, - "is-typedarray": { - "version": "1.0.0", - "bundled": true, - "optional": true - }, - "isarray": { - "version": "1.0.0", - "bundled": true - }, - "isstream": { - "version": "0.1.2", - "bundled": true, - "optional": true - }, - "jodid25519": { - "version": "1.0.2", - "bundled": true, - "optional": true, - "requires": { - "jsbn": "0.1.1" - } - }, - "jsbn": { - "version": "0.1.1", - "bundled": true, - "optional": true - }, - "json-schema": { - "version": "0.2.3", - "bundled": true, - "optional": true - }, - "json-stable-stringify": { - "version": "1.0.1", - "bundled": true, - "optional": true, - "requires": { - "jsonify": "0.0.0" - } - }, - "json-stringify-safe": { - "version": "5.0.1", - "bundled": true, - "optional": true - }, - "jsonify": { - "version": "0.0.0", - "bundled": true, - "optional": true - }, - "jsprim": { - "version": "1.4.0", - "bundled": true, - "optional": true, - "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.0.2", - "json-schema": "0.2.3", - "verror": "1.3.6" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true, - "optional": true - } - } - }, - "mime-db": { - "version": "1.27.0", - "bundled": true - }, - "mime-types": { - "version": "2.1.15", - "bundled": true, - "requires": { - "mime-db": "1.27.0" - } - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "requires": { - "brace-expansion": "1.1.7" - } - }, - "minimist": { - "version": "0.0.8", - "bundled": true - }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, - "requires": { - "minimist": "0.0.8" - } - }, - "ms": { - "version": "2.0.0", - "bundled": true, - "optional": true - }, - "node-pre-gyp": { - "version": "0.6.36", - "bundled": true, - "optional": true, - "requires": { - "mkdirp": "0.5.1", - "nopt": "4.0.1", - "npmlog": "4.1.0", - "rc": "1.2.1", - "request": "2.81.0", - "rimraf": "2.6.1", - "semver": "5.3.0", - "tar": "2.2.1", - "tar-pack": "3.4.0" - } - }, - "nopt": { - "version": "4.0.1", - "bundled": true, - "optional": true, - "requires": { - "abbrev": "1.1.0", - "osenv": "0.1.4" - } - }, - "npmlog": { - "version": "4.1.0", - "bundled": true, - "optional": true, - "requires": { - "are-we-there-yet": "1.1.4", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true - }, - "oauth-sign": { - "version": "0.8.2", - "bundled": true, - "optional": true - }, - "object-assign": { - "version": "4.1.1", - "bundled": true, - "optional": true - }, - "once": { - "version": "1.4.0", - "bundled": true, - "requires": { - "wrappy": "1.0.2" - } - }, - "os-homedir": { - "version": "1.0.2", - "bundled": true, - "optional": true - }, - "os-tmpdir": { - "version": "1.0.2", - "bundled": true, - "optional": true - }, - "osenv": { - "version": "0.1.4", - "bundled": true, - "optional": true, - "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true - }, - "performance-now": { - "version": "0.2.0", - "bundled": true, - "optional": true - }, - "process-nextick-args": { - "version": "1.0.7", - "bundled": true - }, - "punycode": { - "version": "1.4.1", - "bundled": true, - "optional": true - }, - "qs": { - "version": "6.4.0", - "bundled": true, - "optional": true - }, - "rc": { - "version": "1.2.1", - "bundled": true, - "optional": true, - "requires": { - "deep-extend": "0.4.2", - "ini": "1.3.4", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "bundled": true, - "optional": true - } - } - }, - "readable-stream": { - "version": "2.2.9", - "bundled": true, - "requires": { - "buffer-shims": "1.0.0", - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "string_decoder": "1.0.1", - "util-deprecate": "1.0.2" - } - }, - "request": { - "version": "2.81.0", - "bundled": true, - "optional": true, - "requires": { - "aws-sign2": "0.6.0", - "aws4": "1.6.0", - "caseless": "0.12.0", - "combined-stream": "1.0.5", - "extend": "3.0.1", - "forever-agent": "0.6.1", - "form-data": "2.1.4", - "har-validator": "4.2.1", - "hawk": "3.1.3", - "http-signature": "1.1.1", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.15", - "oauth-sign": "0.8.2", - "performance-now": "0.2.0", - "qs": "6.4.0", - "safe-buffer": "5.0.1", - "stringstream": "0.0.5", - "tough-cookie": "2.3.2", - "tunnel-agent": "0.6.0", - "uuid": "3.0.1" - } - }, - "rimraf": { - "version": "2.6.1", - "bundled": true, - "requires": { - "glob": "7.1.2" - } - }, - "safe-buffer": { - "version": "5.0.1", - "bundled": true - }, - "semver": { - "version": "5.3.0", - "bundled": true, - "optional": true - }, - "set-blocking": { - "version": "2.0.0", - "bundled": true, - "optional": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true, - "optional": true - }, - "sntp": { - "version": "1.0.9", - "bundled": true, - "optional": true, - "requires": { - "hoek": "2.16.3" - } - }, - "sshpk": { - "version": "1.13.0", - "bundled": true, - "optional": true, - "requires": { - "asn1": "0.2.3", - "assert-plus": "1.0.0", - "bcrypt-pbkdf": "1.0.1", - "dashdash": "1.14.1", - "ecc-jsbn": "0.1.1", - "getpass": "0.1.7", - "jodid25519": "1.0.2", - "jsbn": "0.1.1", - "tweetnacl": "0.14.5" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true, - "optional": true - } - } - }, - "string-width": { - "version": "1.0.2", - "bundled": true, - "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" - } - }, - "string_decoder": { - "version": "1.0.1", - "bundled": true, - "requires": { - "safe-buffer": "5.0.1" - } - }, - "stringstream": { - "version": "0.0.5", - "bundled": true, - "optional": true - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "bundled": true, - "optional": true - }, - "tar": { - "version": "2.2.1", - "bundled": true, - "requires": { - "block-stream": "0.0.9", - "fstream": "1.0.11", - "inherits": "2.0.3" - } - }, - "tar-pack": { - "version": "3.4.0", - "bundled": true, - "optional": true, - "requires": { - "debug": "2.6.8", - "fstream": "1.0.11", - "fstream-ignore": "1.0.5", - "once": "1.4.0", - "readable-stream": "2.2.9", - "rimraf": "2.6.1", - "tar": "2.2.1", - "uid-number": "0.0.6" - } - }, - "tough-cookie": { - "version": "2.3.2", - "bundled": true, - "optional": true, - "requires": { - "punycode": "1.4.1" - } - }, - "tunnel-agent": { - "version": "0.6.0", - "bundled": true, - "optional": true, - "requires": { - "safe-buffer": "5.0.1" - } - }, - "tweetnacl": { - "version": "0.14.5", - "bundled": true, - "optional": true - }, - "uid-number": { - "version": "0.0.6", - "bundled": true, - "optional": true - }, - "util-deprecate": { - "version": "1.0.2", - "bundled": true - }, - "uuid": { - "version": "3.0.1", - "bundled": true, - "optional": true - }, - "verror": { - "version": "1.3.6", - "bundled": true, - "optional": true, - "requires": { - "extsprintf": "1.0.2" - } - }, - "wide-align": { - "version": "1.1.2", - "bundled": true, - "optional": true, - "requires": { - "string-width": "1.0.2" - } - }, - "wrappy": { - "version": "1.0.2", - "bundled": true - } - } - }, "fstream": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", @@ -6887,9 +6101,9 @@ } }, "libcrowds-viewer": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/libcrowds-viewer/-/libcrowds-viewer-3.3.2.tgz", - "integrity": "sha512-mXEREj7S/BDO0AsM56S0rP291pXSnjA2cGBmjy2nuXqNWm+bkHepypHLges8KFZwHJLjWywGALozVgzCGSBDUA==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/libcrowds-viewer/-/libcrowds-viewer-3.4.0.tgz", + "integrity": "sha512-VfNEh0xf3RAbfMYnO+UMQu5OGkedkAbU/BFM0IaE6MFg2qaCXQBnlTwSR9doOpiJ4ktBMf0RtjWCEcTTE3JBUg==", "requires": { "clipboard": "1.7.1", "es6-object-assign": "1.1.0", @@ -6897,7 +6111,6 @@ "hint.css": "2.5.0", "marked": "0.3.6", "normalize.css": "7.0.0", - "notyf": "2.0.1", "openseadragon": "2.3.1", "uuid": "3.1.0", "vue": "2.5.2", @@ -7612,7 +6825,8 @@ "nan": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz", - "integrity": "sha1-2Vv3IeyHfgjbJ27T/G63j5CDrUY=" + "integrity": "sha1-2Vv3IeyHfgjbJ27T/G63j5CDrUY=", + "dev": true }, "natural-compare": { "version": "1.4.0", @@ -7900,11 +7114,6 @@ "resolved": "https://registry.npmjs.org/normalize.css/-/normalize.css-7.0.0.tgz", "integrity": "sha1-q/sd2CRwZ04DIrU86xqvQSk45L8=" }, - "notyf": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/notyf/-/notyf-2.0.1.tgz", - "integrity": "sha1-DLq0jpyYUYBdcLpXWJEUXAhAoyw=" - }, "npm-run-path": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", @@ -11332,7 +10541,6 @@ "anymatch": "1.3.2", "exec-sh": "0.2.1", "fb-watchman": "2.0.0", - "fsevents": "1.1.2", "minimatch": "3.0.4", "minimist": "1.2.0", "walker": "1.0.7", diff --git a/package.json b/package.json index 5e1441be..5db0c414 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "git-rev-sync": "^1.9.1", "hamburgers": "^0.9.1", "izitoast": "^1.1.5", - "libcrowds-viewer": "^3.3.2", + "libcrowds-viewer": "^3.4.0", "lodash": "^4.17.4", "moment": "^2.19.1", "nuxt": "1.0.0-rc10", From 69c9df217140b590404eeb6b7305cfe55a468140 Mon Sep 17 00:00:00 2001 From: Alexander Mendes Date: Thu, 2 Nov 2017 11:56:28 +0000 Subject: [PATCH 13/38] Update dependencies --- package-lock.json | 26 +++++++++++++------------- package.json | 3 ++- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3d2bb95b..043baef3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6113,7 +6113,7 @@ "normalize.css": "7.0.0", "openseadragon": "2.3.1", "uuid": "3.1.0", - "vue": "2.5.2", + "vue": "2.4.4", "vue-awesome": "2.3.3", "vue-form-generator": "2.1.1" }, @@ -11141,6 +11141,14 @@ "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=" }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "requires": { + "safe-buffer": "5.1.1" + } + }, "string-length": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz", @@ -11173,14 +11181,6 @@ } } }, - "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", - "requires": { - "safe-buffer": "5.1.1" - } - }, "stringstream": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", @@ -11871,9 +11871,9 @@ } }, "vue": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.2.tgz", - "integrity": "sha512-Au9rf8fPkBulFHfZ406UaQDd1jH9fqGRIM+0IHilrXnJ/0TeeMH4SBkNxWf2dGevl2S3aVeu0E/WklEv0/msag==" + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/vue/-/vue-2.4.4.tgz", + "integrity": "sha512-PCiRmc8ZT1DD5+BN8QUAmnkBefcCLfZVSuhc1u7iu5JoPrSHyyk/+4nehm7k2xVMi8+RFLk5WIHAN14UKF0txw==" }, "vue-awesome": { "version": "2.3.3", @@ -12046,7 +12046,7 @@ "requires": { "babel-runtime": "6.26.0", "sweetalert2": "6.11.4", - "vue": "2.5.2" + "vue": "2.4.4" } }, "vue-template-compiler": { diff --git a/package.json b/package.json index 5db0c414..ddecb01f 100644 --- a/package.json +++ b/package.json @@ -42,6 +42,7 @@ "raven-js": "^3.19.1", "source-map-support": "^0.4.15", "sweetalert2": "^6.11.0", + "vue": "~2.4.4", "vue-awesome": "^2.3.3", "vue-chartist": "^2.1.1", "vue-clickaway": "^2.1.0", @@ -56,7 +57,7 @@ "vue-scrollto": "^2.7.8", "vue-simplemde": "^0.4.6", "vue-sweetalert": "^0.1.18", - "vue-template-compiler": "^2.4.4", + "vue-template-compiler": "~2.4.4", "vue-template-es2015-compiler": "~1.5.0" }, "devDependencies": { From 2f6155475c8fb48b5b37c8111ec2baa46dca0967 Mon Sep 17 00:00:00 2001 From: Alexander Mendes Date: Thu, 2 Nov 2017 12:33:56 +0000 Subject: [PATCH 14/38] Update package lock --- package-lock.json | 154 +++++++++++++++++++++------------------------- 1 file changed, 70 insertions(+), 84 deletions(-) diff --git a/package-lock.json b/package-lock.json index 043baef3..b8a235cc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -334,9 +334,9 @@ "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=" }, "asn1.js": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.0.tgz", - "integrity": "sha512-MRQhVc216mWuR9FUJLvnbKNBnmVAWB2mxyuYP3hkSQJ+7QAzTHBVN88ZGMrPIZw5NbQ1z1thZOGM83SF4PBf9Q==", + "version": "4.9.2", + "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.2.tgz", + "integrity": "sha512-b/OsSjvWEo8Pi8H0zsDd2P6Uqo2TK2pH8gNLSJtNLM2Db0v2QaAZ0pBQJXVjAn4gBuugeVDr7s63ZogpUIwWDg==", "requires": { "bn.js": "4.11.8", "inherits": "2.0.3", @@ -398,7 +398,7 @@ "integrity": "sha512-C9yv/UF3X+eJTi/zvfxuyfxmLibYrntpF3qoJYrMeQwgUJOZrZvpJiMG2FMQ3qnhWtF/be4pYONBBw95ZGe3vA==", "requires": { "browserslist": "2.6.1", - "caniuse-lite": "1.0.30000756", + "caniuse-lite": "1.0.30000757", "normalize-range": "0.1.2", "num2fraction": "1.2.2", "postcss": "6.0.13", @@ -1656,7 +1656,7 @@ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.6.1.tgz", "integrity": "sha512-HBZwVT7ciQB9KlXM3AUMQbnQXtHWPsEUKQTiS0BEFfY5bOrMl94ORaqQD1GyuTGh69ZmYeue9QBqiw219e09eQ==", "requires": { - "caniuse-lite": "1.0.30000756", + "caniuse-lite": "1.0.30000757", "electron-to-chromium": "1.3.27" } }, @@ -1757,7 +1757,7 @@ "integrity": "sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=", "requires": { "browserslist": "1.7.7", - "caniuse-db": "1.0.30000756", + "caniuse-db": "1.0.30000757", "lodash.memoize": "4.1.2", "lodash.uniq": "4.5.0" }, @@ -1767,21 +1767,21 @@ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz", "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", "requires": { - "caniuse-db": "1.0.30000756", + "caniuse-db": "1.0.30000757", "electron-to-chromium": "1.3.27" } } } }, "caniuse-db": { - "version": "1.0.30000756", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000756.tgz", - "integrity": "sha1-6TimuZFjDzDSJj3TRYvrZdNiJos=" + "version": "1.0.30000757", + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000757.tgz", + "integrity": "sha1-+iOjgyE9hX9KHmo77hezJmhQTL8=" }, "caniuse-lite": { - "version": "1.0.30000756", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000756.tgz", - "integrity": "sha1-PacBwVIbn6uHAExt58l/pH2+qtI=" + "version": "1.0.30000757", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000757.tgz", + "integrity": "sha1-geO8ApcooDKTNQGZTvedscIRWeM=" }, "capitalize": { "version": "1.0.0", @@ -2601,7 +2601,7 @@ "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=", "requires": { "browserslist": "1.7.7", - "caniuse-db": "1.0.30000756", + "caniuse-db": "1.0.30000757", "normalize-range": "0.1.2", "num2fraction": "1.2.2", "postcss": "5.2.18", @@ -2613,7 +2613,7 @@ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz", "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", "requires": { - "caniuse-db": "1.0.30000756", + "caniuse-db": "1.0.30000757", "electron-to-chromium": "1.3.27" } }, @@ -7216,11 +7216,6 @@ "webpack-node-externals": "1.6.0" }, "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" - }, "es6-promise": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz", @@ -7248,59 +7243,6 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" - }, - "vue": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/vue/-/vue-2.4.4.tgz", - "integrity": "sha512-PCiRmc8ZT1DD5+BN8QUAmnkBefcCLfZVSuhc1u7iu5JoPrSHyyk/+4nehm7k2xVMi8+RFLk5WIHAN14UKF0txw==" - }, - "vue-server-renderer": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/vue-server-renderer/-/vue-server-renderer-2.4.4.tgz", - "integrity": "sha512-qSaNqInt4bJLsIFBU7fNgSTvpYzWJWe+zUkbSdKaFhMGhI/GNFUghK4VZX3ETvBNX51DYa4kEmZgSVZ70xWdxQ==", - "requires": { - "chalk": "1.1.3", - "hash-sum": "1.0.2", - "he": "1.1.1", - "lodash.template": "4.4.0", - "lodash.uniq": "4.5.0", - "resolve": "1.5.0", - "serialize-javascript": "1.4.0", - "source-map": "0.5.6" - }, - "dependencies": { - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - } - }, - "source-map": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", - "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=" - } - } - }, - "vue-template-compiler": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.4.4.tgz", - "integrity": "sha512-XdHsNi8Z5WqwuFl/Z5eLKgE2DOEEOdMk1aA459uSgvwyy+pjKLBlQWsUpAtoR6o6Wmpujw6NtinAUGuqSTituQ==", - "requires": { - "de-indent": "1.0.2", - "he": "1.1.1" - } } } }, @@ -7577,7 +7519,7 @@ "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz", "integrity": "sha1-N8T5t+06tlx0gXtfJICTf7+XxxI=", "requires": { - "asn1.js": "4.10.0", + "asn1.js": "4.9.2", "browserify-aes": "1.1.1", "create-hash": "1.1.3", "evp_bytestokey": "1.0.3", @@ -8216,7 +8158,7 @@ "integrity": "sha1-sd21pZZrFvSNxJmERNS7xsfZ2DQ=", "requires": { "browserslist": "2.6.1", - "caniuse-lite": "1.0.30000756", + "caniuse-lite": "1.0.30000757", "lodash.memoize": "4.1.2", "lodash.uniq": "4.5.0" } @@ -8860,7 +8802,7 @@ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz", "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", "requires": { - "caniuse-db": "1.0.30000756", + "caniuse-db": "1.0.30000757", "electron-to-chromium": "1.3.27" } }, @@ -11141,14 +11083,6 @@ "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=" }, - "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", - "requires": { - "safe-buffer": "5.1.1" - } - }, "string-length": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz", @@ -11181,6 +11115,14 @@ } } }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "requires": { + "safe-buffer": "5.1.1" + } + }, "stringstream": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", @@ -12021,6 +11963,50 @@ "bezier-easing": "2.0.3" } }, + "vue-server-renderer": { + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/vue-server-renderer/-/vue-server-renderer-2.4.4.tgz", + "integrity": "sha512-qSaNqInt4bJLsIFBU7fNgSTvpYzWJWe+zUkbSdKaFhMGhI/GNFUghK4VZX3ETvBNX51DYa4kEmZgSVZ70xWdxQ==", + "requires": { + "chalk": "1.1.3", + "hash-sum": "1.0.2", + "he": "1.1.1", + "lodash.template": "4.4.0", + "lodash.uniq": "4.5.0", + "resolve": "1.5.0", + "serialize-javascript": "1.4.0", + "source-map": "0.5.6" + }, + "dependencies": { + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" + }, + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "requires": { + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" + } + }, + "source-map": { + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", + "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=" + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" + } + } + }, "vue-simplemde": { "version": "0.4.6", "resolved": "https://registry.npmjs.org/vue-simplemde/-/vue-simplemde-0.4.6.tgz", From 15578dd30766dd448b3622bfb42f8bd859ee854d Mon Sep 17 00:00:00 2001 From: Alexander Mendes Date: Thu, 2 Nov 2017 12:36:32 +0000 Subject: [PATCH 15/38] Add es6-promise which doesn't get picked up via nuxt --- package-lock.json | 19 ++++++++++++++++--- package.json | 1 + 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index b8a235cc..5c205491 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3152,9 +3152,9 @@ "integrity": "sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw=" }, "es6-promise": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz", - "integrity": "sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM=" + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz", + "integrity": "sha512-OaU1hHjgJf+b0NzsxCg7NdIYERD6Hy/PEmFLTjw+b65scuisG3Kt4QoTvJ66BBkPZ581gr0kpoVzKnxniM8nng==" }, "es6-set": { "version": "0.1.5", @@ -5903,6 +5903,13 @@ "stream-to-buffer": "0.1.0", "tinycolor2": "1.4.1", "url-regex": "3.2.0" + }, + "dependencies": { + "es6-promise": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz", + "integrity": "sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM=" + } } }, "jpeg-js": { @@ -7062,6 +7069,12 @@ "requires": { "ms": "2.0.0" } + }, + "es6-promise": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz", + "integrity": "sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM=", + "dev": true } } }, diff --git a/package.json b/package.json index ddecb01f..6f7c5977 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "cookieconsent": "^3.0.4", "croppie": "^2.5.0", "cross-env": "^5.0.1", + "es6-promise": "^4.1.1", "express": "~4.15.3", "express-session": "^1.15.6", "file-saver": "^1.3.3", From 7ded429fb801a73dad503f35ea6a3aaae3b1b8cb Mon Sep 17 00:00:00 2001 From: Alexander Mendes Date: Thu, 2 Nov 2017 12:47:22 +0000 Subject: [PATCH 16/38] Version bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6f7c5977..40b025b2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "libcrowds", - "version": "1.0.0-beta.4", + "version": "1.0.0-beta.5", "description": "A Vue.js frontend for PYBOSSA.", "author": "Alex Mendes ", "private": true, From 44037b71bdd3df02a6c289af41cf74d7de7bc701 Mon Sep 17 00:00:00 2001 From: Alexander Mendes Date: Thu, 2 Nov 2017 19:24:56 +0000 Subject: [PATCH 17/38] Upgrade LibCrowds Viewer --- nuxt.config.js | 3 ++- package-lock.json | 16 ++++------------ package.json | 2 +- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/nuxt.config.js b/nuxt.config.js index a1e318cf..6efdd1a9 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -21,7 +21,8 @@ const config = { 'cookieconsent/build/cookieconsent.min.css', 'izitoast/dist/css/iziToast.min.css', 'vue-multiselect/dist/vue-multiselect.min.css', - 'simplemde/dist/simplemde.min.css' + 'simplemde/dist/simplemde.min.css', + 'libcrowds-viewer/dist/scss/main.scss' ], build: { vendor: [ diff --git a/package-lock.json b/package-lock.json index 5c205491..3d8209ca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "libcrowds", - "version": "1.0.0-beta.4", + "version": "1.0.0-beta.5", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -6108,9 +6108,9 @@ } }, "libcrowds-viewer": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/libcrowds-viewer/-/libcrowds-viewer-3.4.0.tgz", - "integrity": "sha512-VfNEh0xf3RAbfMYnO+UMQu5OGkedkAbU/BFM0IaE6MFg2qaCXQBnlTwSR9doOpiJ4ktBMf0RtjWCEcTTE3JBUg==", + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/libcrowds-viewer/-/libcrowds-viewer-3.4.1.tgz", + "integrity": "sha512-qRAejdZfqD2kSCA8l/Xd70Ph6NJKnMnZPlvdyiYyO/27drZ3Ovf7lH0zbWJHkbjVnFsBtk86XQpYYdT5Q51EKg==", "requires": { "clipboard": "1.7.1", "es6-object-assign": "1.1.0", @@ -6120,16 +6120,8 @@ "normalize.css": "7.0.0", "openseadragon": "2.3.1", "uuid": "3.1.0", - "vue": "2.4.4", "vue-awesome": "2.3.3", "vue-form-generator": "2.1.1" - }, - "dependencies": { - "es6-promise": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz", - "integrity": "sha512-OaU1hHjgJf+b0NzsxCg7NdIYERD6Hy/PEmFLTjw+b65scuisG3Kt4QoTvJ66BBkPZ581gr0kpoVzKnxniM8nng==" - } } }, "load-bmfont": { diff --git a/package.json b/package.json index 40b025b2..4f3dc5dd 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "git-rev-sync": "^1.9.1", "hamburgers": "^0.9.1", "izitoast": "^1.1.5", - "libcrowds-viewer": "^3.4.0", + "libcrowds-viewer": "~3.4.1", "lodash": "^4.17.4", "moment": "^2.19.1", "nuxt": "1.0.0-rc10", From beaa253d82e0207477178fe669ec92b6013b8fcf Mon Sep 17 00:00:00 2001 From: Alexander Mendes Date: Thu, 2 Nov 2017 19:43:54 +0000 Subject: [PATCH 18/38] Add exact to all nav items (close #441) --- components/navbars/App.vue | 2 ++ components/navbars/Collection.vue | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/components/navbars/App.vue b/components/navbars/App.vue index 4675bba5..93d56c96 100644 --- a/components/navbars/App.vue +++ b/components/navbars/App.vue @@ -73,6 +73,7 @@ Discuss @@ -77,6 +80,7 @@ Results --> Date: Thu, 2 Nov 2017 20:07:29 +0000 Subject: [PATCH 21/38] Add vue cookie --- nuxt.config.js | 2 ++ package-lock.json | 13 +++++++++++++ package.json | 1 + plugins/vue-cookie.js | 4 ++++ 4 files changed, 20 insertions(+) create mode 100644 plugins/vue-cookie.js diff --git a/nuxt.config.js b/nuxt.config.js index 6efdd1a9..928a1f32 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -31,6 +31,7 @@ const config = { 'vue-awesome', 'vue-chartist', 'vue-clickaway', + 'vue-cookie', 'vue-form-generator', 'vue-gravatar', 'vue-js-toggle-button', @@ -78,6 +79,7 @@ const config = { { src: '~/plugins/vue-awesome' }, { src: '~/plugins/vue-chartist', ssr: false }, { src: '~/plugins/vue-clickaway', ssr: false }, + { src: '~/plugins/vue-cookie', ssr: false }, { src: '~/plugins/vue-form-generator' }, { src: '~/plugins/vue-gravatar' }, { src: '~/plugins/vue-infinite-loading', ssr: false }, diff --git a/package-lock.json b/package-lock.json index 3d8209ca..77595370 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11381,6 +11381,11 @@ "setimmediate": "1.0.5" } }, + "tiny-cookie": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/tiny-cookie/-/tiny-cookie-1.0.1.tgz", + "integrity": "sha1-dTeGB5xkKjw9CyrMrWAPjeEZrCo=" + }, "tiny-emitter": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.0.2.tgz", @@ -11849,6 +11854,14 @@ "loose-envify": "1.3.1" } }, + "vue-cookie": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/vue-cookie/-/vue-cookie-1.1.4.tgz", + "integrity": "sha1-uLRtESvan5Oi9HAXwu1SgtIGT9o=", + "requires": { + "tiny-cookie": "1.0.1" + } + }, "vue-form-generator": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/vue-form-generator/-/vue-form-generator-2.1.1.tgz", diff --git a/package.json b/package.json index 4f3dc5dd..81022a3e 100644 --- a/package.json +++ b/package.json @@ -47,6 +47,7 @@ "vue-awesome": "^2.3.3", "vue-chartist": "^2.1.1", "vue-clickaway": "^2.1.0", + "vue-cookie": "^1.1.4", "vue-form-generator": "^2.1.1", "vue-gravatar": "^1.1.3", "vue-infinite-loading": "^2.2.1", diff --git a/plugins/vue-cookie.js b/plugins/vue-cookie.js new file mode 100644 index 00000000..ad6b8acc --- /dev/null +++ b/plugins/vue-cookie.js @@ -0,0 +1,4 @@ +import Vue from 'vue' +import VueCookie from 'vue-cookie' + +Vue.use(VueCookie) From ac4b117d8568695223f5118ec8bae125cc0ba774 Mon Sep 17 00:00:00 2001 From: Alexander Mendes Date: Thu, 2 Nov 2017 20:08:42 +0000 Subject: [PATCH 22/38] Add vue cookie (should fix #455) --- nuxt.config.js | 2 ++ package-lock.json | 13 +++++++++++++ package.json | 1 + plugins/vue-cookie.js | 4 ++++ 4 files changed, 20 insertions(+) create mode 100644 plugins/vue-cookie.js diff --git a/nuxt.config.js b/nuxt.config.js index 6efdd1a9..928a1f32 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -31,6 +31,7 @@ const config = { 'vue-awesome', 'vue-chartist', 'vue-clickaway', + 'vue-cookie', 'vue-form-generator', 'vue-gravatar', 'vue-js-toggle-button', @@ -78,6 +79,7 @@ const config = { { src: '~/plugins/vue-awesome' }, { src: '~/plugins/vue-chartist', ssr: false }, { src: '~/plugins/vue-clickaway', ssr: false }, + { src: '~/plugins/vue-cookie', ssr: false }, { src: '~/plugins/vue-form-generator' }, { src: '~/plugins/vue-gravatar' }, { src: '~/plugins/vue-infinite-loading', ssr: false }, diff --git a/package-lock.json b/package-lock.json index 3d8209ca..77595370 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11381,6 +11381,11 @@ "setimmediate": "1.0.5" } }, + "tiny-cookie": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/tiny-cookie/-/tiny-cookie-1.0.1.tgz", + "integrity": "sha1-dTeGB5xkKjw9CyrMrWAPjeEZrCo=" + }, "tiny-emitter": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.0.2.tgz", @@ -11849,6 +11854,14 @@ "loose-envify": "1.3.1" } }, + "vue-cookie": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/vue-cookie/-/vue-cookie-1.1.4.tgz", + "integrity": "sha1-uLRtESvan5Oi9HAXwu1SgtIGT9o=", + "requires": { + "tiny-cookie": "1.0.1" + } + }, "vue-form-generator": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/vue-form-generator/-/vue-form-generator-2.1.1.tgz", diff --git a/package.json b/package.json index 4f3dc5dd..81022a3e 100644 --- a/package.json +++ b/package.json @@ -47,6 +47,7 @@ "vue-awesome": "^2.3.3", "vue-chartist": "^2.1.1", "vue-clickaway": "^2.1.0", + "vue-cookie": "^1.1.4", "vue-form-generator": "^2.1.1", "vue-gravatar": "^1.1.3", "vue-infinite-loading": "^2.2.1", diff --git a/plugins/vue-cookie.js b/plugins/vue-cookie.js new file mode 100644 index 00000000..ad6b8acc --- /dev/null +++ b/plugins/vue-cookie.js @@ -0,0 +1,4 @@ +import Vue from 'vue' +import VueCookie from 'vue-cookie' + +Vue.use(VueCookie) From 04a779432612ec99e01d36af91a47506c42f42d7 Mon Sep 17 00:00:00 2001 From: Alexander Mendes Date: Thu, 2 Nov 2017 20:13:33 +0000 Subject: [PATCH 23/38] Fix method call --- .../_short_name/projects/_id/_presenter.vue/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/collection/_short_name/projects/_id/_presenter.vue/index.vue b/pages/collection/_short_name/projects/_id/_presenter.vue/index.vue index fc1bb9ab..fee67a30 100644 --- a/pages/collection/_short_name/projects/_id/_presenter.vue/index.vue +++ b/pages/collection/_short_name/projects/_id/_presenter.vue/index.vue @@ -190,7 +190,7 @@ export default { this.$axios.$post(`/api/taskrun`, taskrun).then(data => { this.removeTask(taskId) if (this.tasks.length < 10) { - this.loadNewTasks() + this.loadTasks() } if (hasParticipated === 'true') { this.notify({ From d2e62ce158ad9bd7025f06922fc2a63da62efcd7 Mon Sep 17 00:00:00 2001 From: Alexander Mendes Date: Thu, 2 Nov 2017 20:16:31 +0000 Subject: [PATCH 24/38] Fix notification messages in the viewer (close #443) --- .../_short_name/projects/_id/_presenter.vue/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pages/collection/_short_name/projects/_id/_presenter.vue/index.vue b/pages/collection/_short_name/projects/_id/_presenter.vue/index.vue index fee67a30..ac79004a 100644 --- a/pages/collection/_short_name/projects/_id/_presenter.vue/index.vue +++ b/pages/collection/_short_name/projects/_id/_presenter.vue/index.vue @@ -139,7 +139,7 @@ export default { }).then(() => { this.notify({ title: 'Success', - text: 'Removed from favourites', + message: 'Removed from favourites', type: 'success' }) }).catch(err => { @@ -149,7 +149,7 @@ export default { this.$axios.$delete(`/api/favorite/${taskId}`).then(() => { this.notify({ title: 'Success', - text: 'Added to favourites', + message: 'Added to favourites', type: 'success' }) }).catch(err => { @@ -195,7 +195,7 @@ export default { if (hasParticipated === 'true') { this.notify({ title: 'Answer saved', - text: 'Thank you for your contribution!', + message: 'Thank you for your contribution!', type: 'success' }) } else { From eaa0b6622cc2856d9fc14cb7636d52108229ecbc Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Thu, 2 Nov 2017 21:22:46 +0000 Subject: [PATCH 25/38] Remove spell checker from markdown editors (#454) --- pages/admin/collections/_id/update.vue | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pages/admin/collections/_id/update.vue b/pages/admin/collections/_id/update.vue index af19598a..f40f26dc 100644 --- a/pages/admin/collections/_id/update.vue +++ b/pages/admin/collections/_id/update.vue @@ -67,7 +67,8 @@ About page + v-model="collection.info.content.about" + :configs="markdownConfig">
@@ -75,7 +76,8 @@ Contribute page + v-model="collection.info.content.contribute" + :configs="markdownConfig">
@@ -83,7 +85,8 @@ Data page + v-model="collection.info.content.data" + :configs="markdownConfig">
@@ -171,6 +174,9 @@ export default { label: 'Actions', class: 'text-center' } + }, + markdownConfig: { + spellChecker: false } } }, From 978e33ac2a48f39aeff40d7f69ee3312d7eda592 Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Thu, 2 Nov 2017 21:26:28 +0000 Subject: [PATCH 26/38] Fix collapsing sidebar toggle (close #453) --- components/navbars/Collection.vue | 14 +- package-lock.json | 790 +++++++++++++++++++++++++++++- 2 files changed, 795 insertions(+), 9 deletions(-) diff --git a/components/navbars/Collection.vue b/components/navbars/Collection.vue index 06d62cd6..216a4e21 100644 --- a/components/navbars/Collection.vue +++ b/components/navbars/Collection.vue @@ -49,7 +49,7 @@ short_name: collection.short_name } }" - @click.native="toggleCollapsibleSidebar"> + @click="toggleCollapsibleSidebar"> About + @click="toggleCollapsibleSidebar"> Contribute + @click="toggleCollapsibleSidebar"> Results --> + @click="toggleCollapsibleSidebar"> Data @@ -108,7 +108,7 @@ name: currentUser.name } }" - @click.native="toggleCollapsibleSidebar">Profile + @click="toggleCollapsibleSidebar">Profile Settings + @click="toggleCollapsibleSidebar">Settings @@ -136,7 +136,7 @@ :to="{ name: 'admin-dashboard' }" - @click.native="toggleCollapsibleSidebar"> + @click="toggleCollapsibleSidebar"> Site Admin diff --git a/package-lock.json b/package-lock.json index 77595370..36c42109 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1845,6 +1845,7 @@ "requires": { "anymatch": "1.3.2", "async-each": "1.0.1", + "fsevents": "1.1.2", "glob-parent": "2.0.0", "inherits": "2.0.3", "is-binary-path": "1.0.1", @@ -4154,6 +4155,791 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, + "fsevents": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz", + "integrity": "sha512-Sn44E5wQW4bTHXvQmvSHwqbuiXtduD6Rrjm2ZtUEGbyrig+nUH3t/QD4M4/ZXViY556TBpRgZkHLDx3JxPwxiw==", + "optional": true, + "requires": { + "nan": "2.7.0", + "node-pre-gyp": "0.6.36" + }, + "dependencies": { + "abbrev": { + "version": "1.1.0", + "bundled": true, + "optional": true + }, + "ajv": { + "version": "4.11.8", + "bundled": true, + "optional": true, + "requires": { + "co": "4.6.0", + "json-stable-stringify": "1.0.1" + } + }, + "ansi-regex": { + "version": "2.1.1", + "bundled": true + }, + "aproba": { + "version": "1.1.1", + "bundled": true, + "optional": true + }, + "are-we-there-yet": { + "version": "1.1.4", + "bundled": true, + "optional": true, + "requires": { + "delegates": "1.0.0", + "readable-stream": "2.2.9" + } + }, + "asn1": { + "version": "0.2.3", + "bundled": true, + "optional": true + }, + "assert-plus": { + "version": "0.2.0", + "bundled": true, + "optional": true + }, + "asynckit": { + "version": "0.4.0", + "bundled": true, + "optional": true + }, + "aws-sign2": { + "version": "0.6.0", + "bundled": true, + "optional": true + }, + "aws4": { + "version": "1.6.0", + "bundled": true, + "optional": true + }, + "balanced-match": { + "version": "0.4.2", + "bundled": true + }, + "bcrypt-pbkdf": { + "version": "1.0.1", + "bundled": true, + "optional": true, + "requires": { + "tweetnacl": "0.14.5" + } + }, + "block-stream": { + "version": "0.0.9", + "bundled": true, + "requires": { + "inherits": "2.0.3" + } + }, + "boom": { + "version": "2.10.1", + "bundled": true, + "requires": { + "hoek": "2.16.3" + } + }, + "brace-expansion": { + "version": "1.1.7", + "bundled": true, + "requires": { + "balanced-match": "0.4.2", + "concat-map": "0.0.1" + } + }, + "buffer-shims": { + "version": "1.0.0", + "bundled": true + }, + "caseless": { + "version": "0.12.0", + "bundled": true, + "optional": true + }, + "co": { + "version": "4.6.0", + "bundled": true, + "optional": true + }, + "code-point-at": { + "version": "1.1.0", + "bundled": true + }, + "combined-stream": { + "version": "1.0.5", + "bundled": true, + "requires": { + "delayed-stream": "1.0.0" + } + }, + "concat-map": { + "version": "0.0.1", + "bundled": true + }, + "console-control-strings": { + "version": "1.1.0", + "bundled": true + }, + "core-util-is": { + "version": "1.0.2", + "bundled": true + }, + "cryptiles": { + "version": "2.0.5", + "bundled": true, + "optional": true, + "requires": { + "boom": "2.10.1" + } + }, + "dashdash": { + "version": "1.14.1", + "bundled": true, + "optional": true, + "requires": { + "assert-plus": "1.0.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "bundled": true, + "optional": true + } + } + }, + "debug": { + "version": "2.6.8", + "bundled": true, + "optional": true, + "requires": { + "ms": "2.0.0" + } + }, + "deep-extend": { + "version": "0.4.2", + "bundled": true, + "optional": true + }, + "delayed-stream": { + "version": "1.0.0", + "bundled": true + }, + "delegates": { + "version": "1.0.0", + "bundled": true, + "optional": true + }, + "ecc-jsbn": { + "version": "0.1.1", + "bundled": true, + "optional": true, + "requires": { + "jsbn": "0.1.1" + } + }, + "extend": { + "version": "3.0.1", + "bundled": true, + "optional": true + }, + "extsprintf": { + "version": "1.0.2", + "bundled": true + }, + "forever-agent": { + "version": "0.6.1", + "bundled": true, + "optional": true + }, + "form-data": { + "version": "2.1.4", + "bundled": true, + "optional": true, + "requires": { + "asynckit": "0.4.0", + "combined-stream": "1.0.5", + "mime-types": "2.1.15" + } + }, + "fs.realpath": { + "version": "1.0.0", + "bundled": true + }, + "fstream": { + "version": "1.0.11", + "bundled": true, + "requires": { + "graceful-fs": "4.1.11", + "inherits": "2.0.3", + "mkdirp": "0.5.1", + "rimraf": "2.6.1" + } + }, + "fstream-ignore": { + "version": "1.0.5", + "bundled": true, + "optional": true, + "requires": { + "fstream": "1.0.11", + "inherits": "2.0.3", + "minimatch": "3.0.4" + } + }, + "gauge": { + "version": "2.7.4", + "bundled": true, + "optional": true, + "requires": { + "aproba": "1.1.1", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.2" + } + }, + "getpass": { + "version": "0.1.7", + "bundled": true, + "optional": true, + "requires": { + "assert-plus": "1.0.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "bundled": true, + "optional": true + } + } + }, + "glob": { + "version": "7.1.2", + "bundled": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "graceful-fs": { + "version": "4.1.11", + "bundled": true + }, + "har-schema": { + "version": "1.0.5", + "bundled": true, + "optional": true + }, + "har-validator": { + "version": "4.2.1", + "bundled": true, + "optional": true, + "requires": { + "ajv": "4.11.8", + "har-schema": "1.0.5" + } + }, + "has-unicode": { + "version": "2.0.1", + "bundled": true, + "optional": true + }, + "hawk": { + "version": "3.1.3", + "bundled": true, + "optional": true, + "requires": { + "boom": "2.10.1", + "cryptiles": "2.0.5", + "hoek": "2.16.3", + "sntp": "1.0.9" + } + }, + "hoek": { + "version": "2.16.3", + "bundled": true + }, + "http-signature": { + "version": "1.1.1", + "bundled": true, + "optional": true, + "requires": { + "assert-plus": "0.2.0", + "jsprim": "1.4.0", + "sshpk": "1.13.0" + } + }, + "inflight": { + "version": "1.0.6", + "bundled": true, + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + } + }, + "inherits": { + "version": "2.0.3", + "bundled": true + }, + "ini": { + "version": "1.3.4", + "bundled": true, + "optional": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "bundled": true, + "requires": { + "number-is-nan": "1.0.1" + } + }, + "is-typedarray": { + "version": "1.0.0", + "bundled": true, + "optional": true + }, + "isarray": { + "version": "1.0.0", + "bundled": true + }, + "isstream": { + "version": "0.1.2", + "bundled": true, + "optional": true + }, + "jodid25519": { + "version": "1.0.2", + "bundled": true, + "optional": true, + "requires": { + "jsbn": "0.1.1" + } + }, + "jsbn": { + "version": "0.1.1", + "bundled": true, + "optional": true + }, + "json-schema": { + "version": "0.2.3", + "bundled": true, + "optional": true + }, + "json-stable-stringify": { + "version": "1.0.1", + "bundled": true, + "optional": true, + "requires": { + "jsonify": "0.0.0" + } + }, + "json-stringify-safe": { + "version": "5.0.1", + "bundled": true, + "optional": true + }, + "jsonify": { + "version": "0.0.0", + "bundled": true, + "optional": true + }, + "jsprim": { + "version": "1.4.0", + "bundled": true, + "optional": true, + "requires": { + "assert-plus": "1.0.0", + "extsprintf": "1.0.2", + "json-schema": "0.2.3", + "verror": "1.3.6" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "bundled": true, + "optional": true + } + } + }, + "mime-db": { + "version": "1.27.0", + "bundled": true + }, + "mime-types": { + "version": "2.1.15", + "bundled": true, + "requires": { + "mime-db": "1.27.0" + } + }, + "minimatch": { + "version": "3.0.4", + "bundled": true, + "requires": { + "brace-expansion": "1.1.7" + } + }, + "minimist": { + "version": "0.0.8", + "bundled": true + }, + "mkdirp": { + "version": "0.5.1", + "bundled": true, + "requires": { + "minimist": "0.0.8" + } + }, + "ms": { + "version": "2.0.0", + "bundled": true, + "optional": true + }, + "node-pre-gyp": { + "version": "0.6.36", + "bundled": true, + "optional": true, + "requires": { + "mkdirp": "0.5.1", + "nopt": "4.0.1", + "npmlog": "4.1.0", + "rc": "1.2.1", + "request": "2.81.0", + "rimraf": "2.6.1", + "semver": "5.3.0", + "tar": "2.2.1", + "tar-pack": "3.4.0" + } + }, + "nopt": { + "version": "4.0.1", + "bundled": true, + "optional": true, + "requires": { + "abbrev": "1.1.0", + "osenv": "0.1.4" + } + }, + "npmlog": { + "version": "4.1.0", + "bundled": true, + "optional": true, + "requires": { + "are-we-there-yet": "1.1.4", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" + } + }, + "number-is-nan": { + "version": "1.0.1", + "bundled": true + }, + "oauth-sign": { + "version": "0.8.2", + "bundled": true, + "optional": true + }, + "object-assign": { + "version": "4.1.1", + "bundled": true, + "optional": true + }, + "once": { + "version": "1.4.0", + "bundled": true, + "requires": { + "wrappy": "1.0.2" + } + }, + "os-homedir": { + "version": "1.0.2", + "bundled": true, + "optional": true + }, + "os-tmpdir": { + "version": "1.0.2", + "bundled": true, + "optional": true + }, + "osenv": { + "version": "0.1.4", + "bundled": true, + "optional": true, + "requires": { + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "bundled": true + }, + "performance-now": { + "version": "0.2.0", + "bundled": true, + "optional": true + }, + "process-nextick-args": { + "version": "1.0.7", + "bundled": true + }, + "punycode": { + "version": "1.4.1", + "bundled": true, + "optional": true + }, + "qs": { + "version": "6.4.0", + "bundled": true, + "optional": true + }, + "rc": { + "version": "1.2.1", + "bundled": true, + "optional": true, + "requires": { + "deep-extend": "0.4.2", + "ini": "1.3.4", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "bundled": true, + "optional": true + } + } + }, + "readable-stream": { + "version": "2.2.9", + "bundled": true, + "requires": { + "buffer-shims": "1.0.0", + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "string_decoder": "1.0.1", + "util-deprecate": "1.0.2" + } + }, + "request": { + "version": "2.81.0", + "bundled": true, + "optional": true, + "requires": { + "aws-sign2": "0.6.0", + "aws4": "1.6.0", + "caseless": "0.12.0", + "combined-stream": "1.0.5", + "extend": "3.0.1", + "forever-agent": "0.6.1", + "form-data": "2.1.4", + "har-validator": "4.2.1", + "hawk": "3.1.3", + "http-signature": "1.1.1", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.15", + "oauth-sign": "0.8.2", + "performance-now": "0.2.0", + "qs": "6.4.0", + "safe-buffer": "5.0.1", + "stringstream": "0.0.5", + "tough-cookie": "2.3.2", + "tunnel-agent": "0.6.0", + "uuid": "3.0.1" + } + }, + "rimraf": { + "version": "2.6.1", + "bundled": true, + "requires": { + "glob": "7.1.2" + } + }, + "safe-buffer": { + "version": "5.0.1", + "bundled": true + }, + "semver": { + "version": "5.3.0", + "bundled": true, + "optional": true + }, + "set-blocking": { + "version": "2.0.0", + "bundled": true, + "optional": true + }, + "signal-exit": { + "version": "3.0.2", + "bundled": true, + "optional": true + }, + "sntp": { + "version": "1.0.9", + "bundled": true, + "optional": true, + "requires": { + "hoek": "2.16.3" + } + }, + "sshpk": { + "version": "1.13.0", + "bundled": true, + "optional": true, + "requires": { + "asn1": "0.2.3", + "assert-plus": "1.0.0", + "bcrypt-pbkdf": "1.0.1", + "dashdash": "1.14.1", + "ecc-jsbn": "0.1.1", + "getpass": "0.1.7", + "jodid25519": "1.0.2", + "jsbn": "0.1.1", + "tweetnacl": "0.14.5" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "bundled": true, + "optional": true + } + } + }, + "string-width": { + "version": "1.0.2", + "bundled": true, + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + }, + "string_decoder": { + "version": "1.0.1", + "bundled": true, + "requires": { + "safe-buffer": "5.0.1" + } + }, + "stringstream": { + "version": "0.0.5", + "bundled": true, + "optional": true + }, + "strip-ansi": { + "version": "3.0.1", + "bundled": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, + "strip-json-comments": { + "version": "2.0.1", + "bundled": true, + "optional": true + }, + "tar": { + "version": "2.2.1", + "bundled": true, + "requires": { + "block-stream": "0.0.9", + "fstream": "1.0.11", + "inherits": "2.0.3" + } + }, + "tar-pack": { + "version": "3.4.0", + "bundled": true, + "optional": true, + "requires": { + "debug": "2.6.8", + "fstream": "1.0.11", + "fstream-ignore": "1.0.5", + "once": "1.4.0", + "readable-stream": "2.2.9", + "rimraf": "2.6.1", + "tar": "2.2.1", + "uid-number": "0.0.6" + } + }, + "tough-cookie": { + "version": "2.3.2", + "bundled": true, + "optional": true, + "requires": { + "punycode": "1.4.1" + } + }, + "tunnel-agent": { + "version": "0.6.0", + "bundled": true, + "optional": true, + "requires": { + "safe-buffer": "5.0.1" + } + }, + "tweetnacl": { + "version": "0.14.5", + "bundled": true, + "optional": true + }, + "uid-number": { + "version": "0.0.6", + "bundled": true, + "optional": true + }, + "util-deprecate": { + "version": "1.0.2", + "bundled": true + }, + "uuid": { + "version": "3.0.1", + "bundled": true, + "optional": true + }, + "verror": { + "version": "1.3.6", + "bundled": true, + "optional": true, + "requires": { + "extsprintf": "1.0.2" + } + }, + "wide-align": { + "version": "1.1.2", + "bundled": true, + "optional": true, + "requires": { + "string-width": "1.0.2" + } + }, + "wrappy": { + "version": "1.0.2", + "bundled": true + } + } + }, "fstream": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", @@ -6824,8 +7610,7 @@ "nan": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz", - "integrity": "sha1-2Vv3IeyHfgjbJ27T/G63j5CDrUY=", - "dev": true + "integrity": "sha1-2Vv3IeyHfgjbJ27T/G63j5CDrUY=" }, "natural-compare": { "version": "1.4.0", @@ -10488,6 +11273,7 @@ "anymatch": "1.3.2", "exec-sh": "0.2.1", "fb-watchman": "2.0.0", + "fsevents": "1.1.2", "minimatch": "3.0.4", "minimist": "1.2.0", "walker": "1.0.7", From 91ebb70865e37007dceea2aeabbfad7d0def877e Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Thu, 2 Nov 2017 22:44:30 +0000 Subject: [PATCH 27/38] Add some transitions --- assets/style/main.scss | 3 +- assets/style/partials/_transitions.scss | 24 +++++++++ components/presenters/LibcrowdsViewer.vue | 1 - components/presenters/Z3950.vue | 10 ---- layouts/bases/Dashboard.vue | 20 ++----- layouts/collection-tabs.vue | 54 +++++++------------ .../collection/_short_name/projects/index.vue | 18 +++---- 7 files changed, 55 insertions(+), 75 deletions(-) create mode 100644 assets/style/partials/_transitions.scss diff --git a/assets/style/main.scss b/assets/style/main.scss index 72306377..c5c858c1 100644 --- a/assets/style/main.scss +++ b/assets/style/main.scss @@ -12,5 +12,6 @@ 'partials/images', 'partials/modals', 'partials/tables', - 'partials/labels' + 'partials/labels', + 'partials/transitions' ; diff --git a/assets/style/partials/_transitions.scss b/assets/style/partials/_transitions.scss new file mode 100644 index 00000000..e01d0fba --- /dev/null +++ b/assets/style/partials/_transitions.scss @@ -0,0 +1,24 @@ +.fade-enter-active, +.fade-leave-active { + transition: opacity 350ms ease-in; +} + +.fade-enter, +.fade-leave-to { + opacity: 0; +} + +.fade-up-enter-active { + transition: all .3s ease; +} + +.fade-up-leave-active { + transition: all .8s cubic-bezier(1.0, 0.5, 0.8, 1.0); +} + +.fade-up-enter, +.fade-up-leave-to { + -webkit-transform: translateY(20px); + transform: translateY(20px); + opacity: 0; +} diff --git a/components/presenters/LibcrowdsViewer.vue b/components/presenters/LibcrowdsViewer.vue index 512aa411..0a298389 100644 --- a/components/presenters/LibcrowdsViewer.vue +++ b/components/presenters/LibcrowdsViewer.vue @@ -85,7 +85,6 @@ export default { diff --git a/layouts/collection-tabs.vue b/layouts/collection-tabs.vue index 869e51c7..bde5a485 100644 --- a/layouts/collection-tabs.vue +++ b/layouts/collection-tabs.vue @@ -1,28 +1,25 @@ @@ -68,7 +65,7 @@ export default { background-attachment: fixed; min-height: 100vh; - #content { + &>main { background-color: $white; h1, h2, h3 { @@ -80,7 +77,6 @@ export default { border-top: 1px solid $gray-300; } - transition: opacity 600ms; padding: 2rem 2.5rem; @include media-breakpoint-up(md) { @@ -119,17 +115,5 @@ export default { } } } - - .fade-enter-active, - .fade-leave-active { - transition: opacity 300ms ease; - } - - .fade-enter .nav-link, - .fade-enter section, - .fade-leave-to .nav-link, - .fade-leave-to section { - opacity: 0; - } } diff --git a/pages/collection/_short_name/projects/index.vue b/pages/collection/_short_name/projects/index.vue index 7af54661..b18e957a 100644 --- a/pages/collection/_short_name/projects/index.vue +++ b/pages/collection/_short_name/projects/index.vue @@ -24,7 +24,6 @@ - - + class="list-unstyled d-none d-lg-block" + name="fade-up">
    • -     + +     - @@ -181,12 +182,5 @@ export default { .project-card { transition: all 500ms ease; } - - .v-enter, - .v-leave-to { - -webkit-transform: translateY(20px); - transform: translateY(20px); - opacity: 0; - } } From 0ee06672bb78fd337b36610048d084c86f1600ae Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Thu, 2 Nov 2017 22:54:13 +0000 Subject: [PATCH 28/38] Update dashboard sidenav to use nav items --- components/navbars/Dashboard.vue | 105 +++++++++++++++---------------- 1 file changed, 49 insertions(+), 56 deletions(-) diff --git a/components/navbars/Dashboard.vue b/components/navbars/Dashboard.vue index f94cac6e..612c5be1 100644 --- a/components/navbars/Dashboard.vue +++ b/components/navbars/Dashboard.vue @@ -10,18 +10,14 @@ {{ localConfig.brand }} - + + + {{ item.label }} + + @@ -74,6 +70,45 @@ export default { font-size: $font-size-xs; text-transform: uppercase; + .brand-wrapper { + display: none; + height: $app-navbar-height; + background: transparent; + align-items: center; + justify-content: center; + border-bottom: 1px solid rgba($gray-300, 0.5); + min-height: $app-navbar-height; + + .brand { + margin: 0; + color: $white; + + @include hover-focus { + color: $white; + } + } + } + + .nav-item { + border: none; + background-color: transparent; + padding: 0rem; + + .nav-link { + padding: 0.75rem 1.25rem; + width: 100%; + color: $white; + display: block; + + &:hover, + &:focus, + &.active { + text-decoration: none; + background-color: rgba($blue, 0.45); + } + } + } + &.side { max-height: 100%; height: 100%; @@ -88,7 +123,7 @@ export default { display: flex; } - .list-group-item { + .nav-item { margin: calc(#{$list-group-item-padding-x} - #{$list-group-item-padding-y}) 0; font-weight: 400; @@ -116,7 +151,7 @@ export default { } &.top { - .list-group-item { + .nav-item { flex-direction: row; margin: 0 calc(#{$list-group-item-padding-x} - #{$list-group-item-padding-y}); } @@ -130,48 +165,6 @@ export default { display: flex; } } - - .list-group-item { - border: none; - background-color: transparent; - padding: 0rem; - - a { - padding: 0.75rem 1.25rem; - width: 100%; - color: $white; - display: block; - } - - &:hover, - &:focus, - &.nuxt-link-active { - background-color: rgba($blue, 0.45); - - a { - text-decoration: none; - } - } - } - - .brand-wrapper { - display: none; - height: $app-navbar-height; - background: transparent; - align-items: center; - justify-content: center; - border-bottom: 1px solid rgba($gray-300, 0.5); - min-height: $app-navbar-height; - - .brand { - margin: 0; - color: $white; - - @include hover-focus { - color: $white; - } - } - } } } From ebcb936df00f31beec1794054fe778f09175bfae Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Thu, 2 Nov 2017 22:56:25 +0000 Subject: [PATCH 29/38] Fix transition-group tag --- pages/collection/_short_name/projects/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/collection/_short_name/projects/index.vue b/pages/collection/_short_name/projects/index.vue index b18e957a..df51335f 100644 --- a/pages/collection/_short_name/projects/index.vue +++ b/pages/collection/_short_name/projects/index.vue @@ -44,7 +44,7 @@ - @@ -54,7 +54,7 @@ :project="project"> - + Date: Thu, 2 Nov 2017 23:23:31 +0000 Subject: [PATCH 30/38] Show different notifications depending on user progress (#405) --- .../projects/_id/_presenter.vue/index.vue | 69 ++++++++++++++----- 1 file changed, 52 insertions(+), 17 deletions(-) diff --git a/pages/collection/_short_name/projects/_id/_presenter.vue/index.vue b/pages/collection/_short_name/projects/_id/_presenter.vue/index.vue index ac79004a..d290345c 100644 --- a/pages/collection/_short_name/projects/_id/_presenter.vue/index.vue +++ b/pages/collection/_short_name/projects/_id/_presenter.vue/index.vue @@ -66,6 +66,10 @@ export default { 'z3950': Z3950Presenter } return presenters[this.collection.info.presenter] + }, + + currentUser () { + return this.$store.state.currentUser } }, @@ -170,6 +174,53 @@ export default { } }, + /** + * Show notifications depending on user progress. + */ + trackUserProgress () { + const url = `/api/project/${this.project.short_name}/userprogress` + const signinUrl = this.$router.resolve({ + name: 'account-signin', + query: { + next: this.$route.path + } + }).href + const signupUrl = this.$router.resolve({ + name: 'account-signup', + query: { + next: this.$route.path + } + }).href + + this.$axios.$get(url).then((data) => { + if (data.done > 5 && isEmpty(this.currentUser)) { + this.$swal({ + type: 'info', + title: 'Thank you!', + html: `Your answer has been saved. +
    + Did you know that you can also + sign up or + sign in + to track your contributions?` + }) + } else if (data.done === 1) { + this.$swal({ + type: 'success', + title: 'Thank you!', + html: 'Your contribution has been saved successfully and will ' + + 'directly help enable future research.', + }) + } else { + this.notify({ + title: 'Answer saved', + message: 'Thank you for your contribution!', + type: 'success' + }) + } + }) + }, + /** * Handle the submit event. * @param {String|Number} projectId @@ -180,8 +231,6 @@ export default { * The answer data. */ onSubmit (projectId, taskId, answer) { - const cookieName = `${this.project.short_name}_participated` - const hasParticipated = this.$cookie.get(cookieName) const taskrun = JSON.stringify({ 'project_id': projectId, 'task_id': taskId, @@ -192,21 +241,7 @@ export default { if (this.tasks.length < 10) { this.loadTasks() } - if (hasParticipated === 'true') { - this.notify({ - title: 'Answer saved', - message: 'Thank you for your contribution!', - type: 'success' - }) - } else { - this.$swal({ - title: 'Thank you!', - html: 'Your contribution has been saved successfully and will ' + - 'directly help enable future research.', - type: 'success' - }) - } - this.$cookie.set(cookieName, true, { expires: '1Y' }) + this.trackUserProgress() }).catch(err => { this.$nuxt.error(err) }) From a7c4bd551bbb7a50b3ad596d69762bcffdbbb225 Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Thu, 2 Nov 2017 23:24:02 +0000 Subject: [PATCH 31/38] Show different notifications depending on user progress (#405) --- .../projects/_id/_presenter.vue/index.vue | 69 ++++++++++++++----- 1 file changed, 52 insertions(+), 17 deletions(-) diff --git a/pages/collection/_short_name/projects/_id/_presenter.vue/index.vue b/pages/collection/_short_name/projects/_id/_presenter.vue/index.vue index ac79004a..e22f47ac 100644 --- a/pages/collection/_short_name/projects/_id/_presenter.vue/index.vue +++ b/pages/collection/_short_name/projects/_id/_presenter.vue/index.vue @@ -66,6 +66,10 @@ export default { 'z3950': Z3950Presenter } return presenters[this.collection.info.presenter] + }, + + currentUser () { + return this.$store.state.currentUser } }, @@ -170,6 +174,53 @@ export default { } }, + /** + * Show notifications depending on user progress. + */ + trackUserProgress () { + const url = `/api/project/${this.project.short_name}/userprogress` + const signinUrl = this.$router.resolve({ + name: 'account-signin', + query: { + next: this.$route.path + } + }).href + const signupUrl = this.$router.resolve({ + name: 'account-signup', + query: { + next: this.$route.path + } + }).href + + this.$axios.$get(url).then((data) => { + if (data.done === 5 && isEmpty(this.currentUser)) { + this.$swal({ + type: 'info', + title: 'Thank you!', + html: `Your answer has been saved. +
    + Did you know that you can also + sign up or + sign in + to track your contributions?` + }) + } else if (data.done === 1) { + this.$swal({ + type: 'success', + title: 'Thank you!', + html: 'Your contribution has been saved successfully and will ' + + 'directly help enable future research.', + }) + } else { + this.notify({ + title: 'Answer saved', + message: 'Thank you for your contribution!', + type: 'success' + }) + } + }) + }, + /** * Handle the submit event. * @param {String|Number} projectId @@ -180,8 +231,6 @@ export default { * The answer data. */ onSubmit (projectId, taskId, answer) { - const cookieName = `${this.project.short_name}_participated` - const hasParticipated = this.$cookie.get(cookieName) const taskrun = JSON.stringify({ 'project_id': projectId, 'task_id': taskId, @@ -192,21 +241,7 @@ export default { if (this.tasks.length < 10) { this.loadTasks() } - if (hasParticipated === 'true') { - this.notify({ - title: 'Answer saved', - message: 'Thank you for your contribution!', - type: 'success' - }) - } else { - this.$swal({ - title: 'Thank you!', - html: 'Your contribution has been saved successfully and will ' + - 'directly help enable future research.', - type: 'success' - }) - } - this.$cookie.set(cookieName, true, { expires: '1Y' }) + this.trackUserProgress() }).catch(err => { this.$nuxt.error(err) }) From 720a5ad46b8d1716d5469fbc63d7a0f2f28ea1ae Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Thu, 2 Nov 2017 23:25:26 +0000 Subject: [PATCH 32/38] Fix merge conflict --- .../_short_name/projects/_id/_presenter.vue/index.vue | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pages/collection/_short_name/projects/_id/_presenter.vue/index.vue b/pages/collection/_short_name/projects/_id/_presenter.vue/index.vue index 6ed567d9..e22f47ac 100644 --- a/pages/collection/_short_name/projects/_id/_presenter.vue/index.vue +++ b/pages/collection/_short_name/projects/_id/_presenter.vue/index.vue @@ -193,11 +193,7 @@ export default { }).href this.$axios.$get(url).then((data) => { -<<<<<<< HEAD if (data.done === 5 && isEmpty(this.currentUser)) { -======= - if (data.done > 5 && isEmpty(this.currentUser)) { ->>>>>>> 457d6d79ce6f146b437bc4177bcd50735cd9b1c1 this.$swal({ type: 'info', title: 'Thank you!', From 7cbe0594a0e26e077951b2ad4fe2870d2d2fa40d Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Thu, 2 Nov 2017 23:28:41 +0000 Subject: [PATCH 33/38] Remove trailing comma --- .../_short_name/projects/_id/_presenter.vue/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/collection/_short_name/projects/_id/_presenter.vue/index.vue b/pages/collection/_short_name/projects/_id/_presenter.vue/index.vue index e22f47ac..e5997a63 100644 --- a/pages/collection/_short_name/projects/_id/_presenter.vue/index.vue +++ b/pages/collection/_short_name/projects/_id/_presenter.vue/index.vue @@ -209,7 +209,7 @@ export default { type: 'success', title: 'Thank you!', html: 'Your contribution has been saved successfully and will ' + - 'directly help enable future research.', + 'directly help enable future research.' }) } else { this.notify({ From 3ac43cd71c8b56eded450c6c33a2f75383a2c9d5 Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Sun, 5 Nov 2017 16:03:37 +0000 Subject: [PATCH 34/38] Update libcrowds viewer --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 36c42109..18af8fff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6894,9 +6894,9 @@ } }, "libcrowds-viewer": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/libcrowds-viewer/-/libcrowds-viewer-3.4.1.tgz", - "integrity": "sha512-qRAejdZfqD2kSCA8l/Xd70Ph6NJKnMnZPlvdyiYyO/27drZ3Ovf7lH0zbWJHkbjVnFsBtk86XQpYYdT5Q51EKg==", + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/libcrowds-viewer/-/libcrowds-viewer-3.4.3.tgz", + "integrity": "sha512-9XdkOhXZWrIiPuMLJJVGlLvCDpQvvpugnGDEYPDdnm3Mdc9PB/HQ8oQKvyViyIfbZL34KubTAWAMHkKNAmvwjA==", "requires": { "clipboard": "1.7.1", "es6-object-assign": "1.1.0", diff --git a/package.json b/package.json index 81022a3e..937d68e9 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "git-rev-sync": "^1.9.1", "hamburgers": "^0.9.1", "izitoast": "^1.1.5", - "libcrowds-viewer": "~3.4.1", + "libcrowds-viewer": "~3.4.3", "lodash": "^4.17.4", "moment": "^2.19.1", "nuxt": "1.0.0-rc10", From 7e7626d4bd39896f0bf7de4b21c832b7ec954d19 Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Sun, 5 Nov 2017 16:14:30 +0000 Subject: [PATCH 35/38] Fix account register route --- .../_short_name/projects/_id/_presenter.vue/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/collection/_short_name/projects/_id/_presenter.vue/index.vue b/pages/collection/_short_name/projects/_id/_presenter.vue/index.vue index e5997a63..fc091c5a 100644 --- a/pages/collection/_short_name/projects/_id/_presenter.vue/index.vue +++ b/pages/collection/_short_name/projects/_id/_presenter.vue/index.vue @@ -186,7 +186,7 @@ export default { } }).href const signupUrl = this.$router.resolve({ - name: 'account-signup', + name: 'account-register', query: { next: this.$route.path } From e4c4a6aa7db47a3c9750c340c89f76831bb608ab Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Sun, 5 Nov 2017 17:28:59 +0000 Subject: [PATCH 36/38] Update libcrowds viewer --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 18af8fff..05cb95fa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6894,9 +6894,9 @@ } }, "libcrowds-viewer": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/libcrowds-viewer/-/libcrowds-viewer-3.4.3.tgz", - "integrity": "sha512-9XdkOhXZWrIiPuMLJJVGlLvCDpQvvpugnGDEYPDdnm3Mdc9PB/HQ8oQKvyViyIfbZL34KubTAWAMHkKNAmvwjA==", + "version": "3.4.4", + "resolved": "https://registry.npmjs.org/libcrowds-viewer/-/libcrowds-viewer-3.4.4.tgz", + "integrity": "sha512-NULT+toG2/mYpLqmghlNYncklNJ0D5EMmVH/uU85JTKHP3/n76CAVKqtZZBMRiQh+X1RNtTXR4C7ja/gxzogQg==", "requires": { "clipboard": "1.7.1", "es6-object-assign": "1.1.0", diff --git a/package.json b/package.json index 937d68e9..908ecd30 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "git-rev-sync": "^1.9.1", "hamburgers": "^0.9.1", "izitoast": "^1.1.5", - "libcrowds-viewer": "~3.4.3", + "libcrowds-viewer": "~3.4.4", "lodash": "^4.17.4", "moment": "^2.19.1", "nuxt": "1.0.0-rc10", From 77972ee7ed9cc948f5fd495d4a9b7b68a1d35fbc Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Sun, 5 Nov 2017 17:59:42 +0000 Subject: [PATCH 37/38] Don't show completed projects (#440) --- pages/collection/_short_name/projects/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/pages/collection/_short_name/projects/index.vue b/pages/collection/_short_name/projects/index.vue index df51335f..9d803d91 100644 --- a/pages/collection/_short_name/projects/index.vue +++ b/pages/collection/_short_name/projects/index.vue @@ -50,6 +50,7 @@ name="fade-up">
  • From 8ec71f1acbf392fe4fd1acf4174cb4e64ac81366 Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Sun, 5 Nov 2017 19:05:37 +0000 Subject: [PATCH 38/38] Fix tests --- .babelrc | 5 +- components/navbars/App.vue | 7 +- components/navbars/Collection.vue | 7 +- test/fixtures/routes.js | 4 +- .../__snapshots__/projectContrib.spec.js.snap | 16 +- .../components/buttons/projectContrib.spec.js | 19 +-- .../charts/__snapshots__/bar.spec.js.snap | 7 +- .../charts/__snapshots__/line.spec.js.snap | 7 +- .../charts/__snapshots__/pie.spec.js.snap | 7 +- .../navbars/__snapshots__/app.spec.js.snap | 17 +- .../__snapshots__/collection.spec.js.snap | 145 +++++++++--------- .../__snapshots__/dashboard.spec.js.snap | 52 ++++--- .../unit/specs/components/navbars/app.spec.js | 2 +- .../components/navbars/collection.spec.js | 3 +- .../components/navbars/dashboard.spec.js | 2 +- utils/auth.js | 6 +- 16 files changed, 137 insertions(+), 169 deletions(-) diff --git a/.babelrc b/.babelrc index 092b0081..934375b6 100644 --- a/.babelrc +++ b/.babelrc @@ -19,9 +19,10 @@ ], "plugins": [ ["module-resolver", { + "root": ["./"], "alias": { - "~": "./", - "@": "./" + "~": ".", + "@": "." } }] ] diff --git a/components/navbars/App.vue b/components/navbars/App.vue index 93d56c96..27b76016 100644 --- a/components/navbars/App.vue +++ b/components/navbars/App.vue @@ -48,12 +48,9 @@ - Projects Admin + Project Admin - Projects Admin + Project Admin - Contribute - - -`; - -exports[`ProjectContrib button is disabled when status is completed 1`] = ` +exports[`ProjectContrib button is disabled when project is completed 1`] = ` { }) }) - it('is disabled when status is completed', () => { + it('is disabled when project is completed', () => { + let completedProject = { + overall_progress: 100 + } wrapper.setProps({ - status: 'completed', - shortname: 'my_project' - }) - const renderer = require('vue-server-renderer').createRenderer() - renderer.renderToString(wrapper.vm, (err, str) => { - expect(str).toMatchSnapshot() - }) - }) - - it('is disabled when status is cannot_completed', () => { - wrapper.setProps({ - status: 'cannot_contribute', - shortname: 'my_project' + project: completedProject }) const renderer = require('vue-server-renderer').createRenderer() renderer.renderToString(wrapper.vm, (err, str) => { diff --git a/test/unit/specs/components/charts/__snapshots__/bar.spec.js.snap b/test/unit/specs/components/charts/__snapshots__/bar.spec.js.snap index 4a20bf20..9389835a 100644 --- a/test/unit/specs/components/charts/__snapshots__/bar.spec.js.snap +++ b/test/unit/specs/components/charts/__snapshots__/bar.spec.js.snap @@ -11,11 +11,8 @@ exports[`Bar chart renders correctly 1`] = `
    - - +
    +
    diff --git a/test/unit/specs/components/charts/__snapshots__/line.spec.js.snap b/test/unit/specs/components/charts/__snapshots__/line.spec.js.snap index d30efd26..72943e3e 100644 --- a/test/unit/specs/components/charts/__snapshots__/line.spec.js.snap +++ b/test/unit/specs/components/charts/__snapshots__/line.spec.js.snap @@ -11,11 +11,8 @@ exports[`Line chart renders correctly 1`] = `
    - - +
    +
    diff --git a/test/unit/specs/components/charts/__snapshots__/pie.spec.js.snap b/test/unit/specs/components/charts/__snapshots__/pie.spec.js.snap index 2dae709c..17421e8f 100644 --- a/test/unit/specs/components/charts/__snapshots__/pie.spec.js.snap +++ b/test/unit/specs/components/charts/__snapshots__/pie.spec.js.snap @@ -11,11 +11,8 @@ exports[`Pie chart renders correctly 1`] = `
    - - +
    +
    diff --git a/test/unit/specs/components/navbars/__snapshots__/app.spec.js.snap b/test/unit/specs/components/navbars/__snapshots__/app.spec.js.snap index c35f3b15..30ed711d 100644 --- a/test/unit/specs/components/navbars/__snapshots__/app.spec.js.snap +++ b/test/unit/specs/components/navbars/__snapshots__/app.spec.js.snap @@ -25,7 +25,7 @@ exports[`App navbar renders correctly when signed in as admin 1`] = ` >     -
  • - Profile - - - Open Project + Project Admin - - - - Admin + Site Admin diff --git a/test/unit/specs/components/navbars/app.spec.js b/test/unit/specs/components/navbars/app.spec.js index 5435a69c..d244f77c 100644 --- a/test/unit/specs/components/navbars/app.spec.js +++ b/test/unit/specs/components/navbars/app.spec.js @@ -5,7 +5,7 @@ import BootstrapVue from 'bootstrap-vue' import pbTestResponses from '@/test/fixtures/pybossaTestResponses.json' import { mount, createLocalVue } from 'vue-test-utils' import AppNavbar from '@/components/navbars/App' -import { routes } from '@/test/fixtures/routes.js' +import { routes } from '@/test/fixtures/routes' describe('App navbar', () => { let localVue = null diff --git a/test/unit/specs/components/navbars/collection.spec.js b/test/unit/specs/components/navbars/collection.spec.js index 6329b71f..1f73463f 100644 --- a/test/unit/specs/components/navbars/collection.spec.js +++ b/test/unit/specs/components/navbars/collection.spec.js @@ -2,7 +2,7 @@ import Vuex from 'vuex' import VueRouter from 'vue-router' import BootstrapVue from 'bootstrap-vue' -import { routes } from '@/test/fixtures/routes.js' +import { routes } from '@/test/fixtures/routes' import collection from '@/test/fixtures/collection.json' import pbTestResponses from '@/test/fixtures/pybossaTestResponses.json' import { mount, createLocalVue } from 'vue-test-utils' @@ -30,7 +30,6 @@ describe('Collection navbar', () => { }) it('renders correctly when signed out', () => { - console.log(collection) wrapper = mount(CollectionNavbar, { localVue, router, diff --git a/test/unit/specs/components/navbars/dashboard.spec.js b/test/unit/specs/components/navbars/dashboard.spec.js index 5144cf51..56360591 100644 --- a/test/unit/specs/components/navbars/dashboard.spec.js +++ b/test/unit/specs/components/navbars/dashboard.spec.js @@ -1,7 +1,7 @@ import VueRouter from 'vue-router' import BootstrapVue from 'bootstrap-vue' -import { routes } from '@/test/fixtures/routes.js' +import { routes } from '@/test/fixtures/routes' import { mount, createLocalVue } from 'vue-test-utils' import DashboardNavbar from '@/components/navbars/Dashboard' diff --git a/utils/auth.js b/utils/auth.js index 99e0d936..5676043d 100644 --- a/utils/auth.js +++ b/utils/auth.js @@ -6,11 +6,11 @@ * The document cookie string. */ export const updateSession = (user, cookieStr) => { - if (!cookieStr) { - return true + let allCookies = [] + if (cookieStr) { + allCookies = cookieStr.split(';') } - const allCookies = cookieStr.split(';') let hasSession = false let sessionName = null