From fff23cf3b91409c0beb763af50a5d9ab75af38a7 Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Tue, 7 Nov 2017 23:00:14 +0000 Subject: [PATCH 1/9] Remove whitespace --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 350fc9af..a2454f3d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ # LibCrowds [![Greenkeeper badge](https://badges.greenkeeper.io/LibCrowds/libcrowds.svg)](https://greenkeeper.io/) - [![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) From a7e8f9aa9ba33095af55e5e076256a0f0bb9850c Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Wed, 8 Nov 2017 00:04:01 +0000 Subject: [PATCH 2/9] Update bootstrap vue (#471) --- package-lock.json | 811 +++++++++++++++++++++++++++++++++++++++++++++- package.json | 3 +- 2 files changed, 806 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3130991d..63519ddc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1676,11 +1676,14 @@ "integrity": "sha512-DzGtdTlKbrMoGMpz0LigKSqJ+MgtFKxA791PU/q062OlRG0HybNZcTLH7rpDAmLS66Y3esN9yzKHLLbqa5UR3w==" }, "bootstrap-vue": { - "version": "1.0.0-beta.9", - "resolved": "https://registry.npmjs.org/bootstrap-vue/-/bootstrap-vue-1.0.0-beta.9.tgz", - "integrity": "sha512-0wYWRebZROB+IXpatXgr/pUsiZ7ZUl/uJmc3bpIKlsi9sciE7wIdjV9PhdHnqoipU0kYylHfdcHimOHl5aIbjA==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bootstrap-vue/-/bootstrap-vue-1.0.2.tgz", + "integrity": "sha512-jDvCyXsjUTx6mDqrgaM9ZtsBiH6gJ1wCo4FmRr8/Ne03G3qSepKpzuk7rXouzVsSMBXU3mRx/i4UowmRCUW8lg==", "requires": { - "bootstrap": "4.0.0-beta.2" + "lodash.startcase": "4.4.0", + "opencollective": "1.0.3", + "popper.js": "1.12.6", + "vue-functional-data-merge": "1.0.6" } }, "boxen": { @@ -2005,6 +2008,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", @@ -4279,6 +4283,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", @@ -6517,6 +7306,11 @@ "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=" }, + "lodash.startcase": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.startcase/-/lodash.startcase-4.4.0.tgz", + "integrity": "sha1-lDbjTtJgk+1/+uGTYUQ1CRXZrdg=" + }, "lodash.tail": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz", @@ -6967,8 +7761,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", @@ -10640,6 +11433,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", @@ -12013,6 +12807,11 @@ "resolved": "https://registry.npmjs.org/vue-form-generator/-/vue-form-generator-2.1.1.tgz", "integrity": "sha1-D1dFIAXC0xD75UXKK/MBU1YvTyg=" }, + "vue-functional-data-merge": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/vue-functional-data-merge/-/vue-functional-data-merge-1.0.6.tgz", + "integrity": "sha512-wzUHcvLBiVJcDais1HdmFObi2VagMB5jd/dZuacDO0GCdHURxkvPrReaAyAhW/+g29j5gRu0QKP1DH7CaBRwmQ==" + }, "vue-gravatar": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/vue-gravatar/-/vue-gravatar-1.1.3.tgz", diff --git a/package.json b/package.json index 53383991..2f204f4d 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "@nuxtjs/proxy": "^1.1.2", "@nuxtjs/pwa": "^1.0.2", "bootstrap": "4.0.0-beta.2", - "bootstrap-vue": "^1.0.0-beta.9", + "bootstrap-vue": "^1.0.2", "capitalize": "^1.0.0", "chartist-plugin-legend": "^0.6.2", "chartist-plugin-tooltips": "0.0.17", @@ -36,7 +36,6 @@ "lodash": "^4.17.4", "moment": "^2.19.1", "nuxt": "1.0.0-rc11", - "popper.js": "^1.12.5", "progressbar.js": "^1.0.1", "raven": "^2.2.1", "raven-js": "^3.19.1", From e9ba7a977398b6b14d2e9d0da5093809c7662629 Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Wed, 8 Nov 2017 00:12:02 +0000 Subject: [PATCH 3/9] Remove deprecated is-navbar-nav tags --- components/navbars/App.vue | 8 ++--- components/navbars/Collection.vue | 50 +++++++++++++++---------------- 2 files changed, 28 insertions(+), 30 deletions(-) diff --git a/components/navbars/App.vue b/components/navbars/App.vue index 1979cfe4..77610223 100644 --- a/components/navbars/App.vue +++ b/components/navbars/App.vue @@ -16,7 +16,7 @@ - + @@ -71,12 +71,12 @@ Sign Out - + - + Sign up - + diff --git a/components/navbars/Collection.vue b/components/navbars/Collection.vue index 68bd49f7..2943e452 100644 --- a/components/navbars/Collection.vue +++ b/components/navbars/Collection.vue @@ -40,7 +40,7 @@ - + Data - + - + @@ -147,32 +147,30 @@ Sign Out - + - - - - Sign in - - - Sign up - - + + + Sign in + + + Sign up + + - From b932bcc14b2bb4f2f682a602dbdbeec05285f3c8 Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Wed, 8 Nov 2017 00:18:53 +0000 Subject: [PATCH 4/9] Use bootstrap vue nuxt module --- assets/style/main.scss | 1 - nuxt.config.js | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/assets/style/main.scss b/assets/style/main.scss index c5c858c1..29171476 100644 --- a/assets/style/main.scss +++ b/assets/style/main.scss @@ -5,7 +5,6 @@ @import '~bootstrap/scss/bootstrap', - '~bootstrap-vue/dist/bootstrap-vue', '~chartist/dist/scss/chartist', 'partials/cards', 'partials/charts', diff --git a/nuxt.config.js b/nuxt.config.js index 8ef15b13..9d92606f 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -26,7 +26,6 @@ const config = { ], build: { vendor: [ - 'bootstrap-vue', '~/plugins/filters.js', '~/plugins/libcrowds-viewer', '~/plugins/notifications', @@ -78,7 +77,6 @@ const config = { } }, plugins: [ - { src: '~/plugins/bootstrap-vue' }, { src: '~/plugins/filters' }, { src: '~/plugins/libcrowds-viewer', ssr: false }, { src: '~/plugins/notifications', ssr: false }, @@ -98,7 +96,8 @@ const config = { modules: [ '@nuxtjs/axios', '@nuxtjs/pwa', - '@nuxtjs/proxy' + '@nuxtjs/proxy', + ['bootstrap-vue/nuxt', { css: false }] ], axios: { baseURL: localConfig.pybossa.host, From d7659b90ff5e6279c02d5a380def4fb83055978f Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Wed, 8 Nov 2017 00:26:19 +0000 Subject: [PATCH 5/9] Include bootstrap vue in vendor bundle --- nuxt.config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/nuxt.config.js b/nuxt.config.js index 9d92606f..523968e3 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -29,6 +29,7 @@ const config = { '~/plugins/filters.js', '~/plugins/libcrowds-viewer', '~/plugins/notifications', + 'bootstrap-vue', 'progressbar.js', 'vue-awesome', 'vue-chartist', From 3039e2e4e195c823c6bc95541d17f83c0788f5ee Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Wed, 8 Nov 2017 00:26:32 +0000 Subject: [PATCH 6/9] Remove old bootstrap vue plugin --- plugins/bootstrap-vue.js | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 plugins/bootstrap-vue.js diff --git a/plugins/bootstrap-vue.js b/plugins/bootstrap-vue.js deleted file mode 100644 index 5734e917..00000000 --- a/plugins/bootstrap-vue.js +++ /dev/null @@ -1,4 +0,0 @@ -import Vue from 'vue' -import BootstrapVue from 'bootstrap-vue' - -Vue.use(BootstrapVue) From 04ef871411c6f6b4d776c325dbf8bb38fe57f848 Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Wed, 8 Nov 2017 00:32:01 +0000 Subject: [PATCH 7/9] Update tests --- test/fixtures/routes.js | 140 +++++++++++------- .../__snapshots__/projectContrib.spec.js.snap | 1 - .../navbars/__snapshots__/app.spec.js.snap | 12 +- .../__snapshots__/collection.spec.js.snap | 55 +++---- 4 files changed, 114 insertions(+), 94 deletions(-) diff --git a/test/fixtures/routes.js b/test/fixtures/routes.js index 4d9fc6c6..a8a74d41 100644 --- a/test/fixtures/routes.js +++ b/test/fixtures/routes.js @@ -5,9 +5,9 @@ export const routes = [ name: 'index' }, { - path: '/admin/site/collections', + path: '/help/tos', component: jest.fn(), - name: 'admin-site-collections' + name: 'help-tos' }, { path: '/help/privacy', @@ -15,14 +15,9 @@ export const routes = [ name: 'help-privacy' }, { - path: '/admin/site/dashboard', - component: jest.fn(), - name: 'admin-site-dashboard' - }, - { - path: '/account/signin', + path: '/help/cookies', component: jest.fn(), - name: 'account-signin' + name: 'help-cookies' }, { path: '/account/newsletter', @@ -30,49 +25,49 @@ export const routes = [ name: 'account-newsletter' }, { - path: '/account/register', + path: '/admin/collection', component: jest.fn(), - name: 'account-register' + name: 'admin-collection' }, { - path: '/admin/site/featured', + path: '/help/api', component: jest.fn(), - name: 'admin-site-featured' + name: 'help-api' }, { - path: '/admin/site/announcements', + path: '/account/signin', component: jest.fn(), - name: 'admin-site-announcements' + name: 'account-signin' }, { - path: '/help/tos', + path: '/account/register', component: jest.fn(), - name: 'help-tos' + name: 'account-register' }, { - path: '/admin/site/jobs', + path: '/admin/project/open', component: jest.fn(), - name: 'admin-site-jobs' + name: 'admin-project-open' }, { - path: '/help/api', + path: '/admin/site/users', component: jest.fn(), - name: 'help-api' + name: 'admin-site-users' }, { - path: '/admin/site/users', + path: '/admin/site/jobs', component: jest.fn(), - name: 'admin-site-users' + name: 'admin-site-jobs' }, { - path: '/help/cookies', + path: '/admin/site/dashboard', component: jest.fn(), - name: 'help-cookies' + name: 'admin-site-dashboard' }, { - path: '/admin/site/announcements/new', + path: '/admin/collection/new', component: jest.fn(), - name: 'admin-site-announcements-new' + name: 'admin-collection-new' }, { path: '/account/password/reset', @@ -80,14 +75,19 @@ export const routes = [ name: 'account-password-reset' }, { - path: '/admin/site/collections/new', + path: '/account/password/forgotten', component: jest.fn(), - name: 'admin-site-collections-new' + name: 'account-password-forgotten' }, { - path: '/account/password/forgotten', + path: '/admin/site/announcements', component: jest.fn(), - name: 'account-password-forgotten' + name: 'admin-site-announcements' + }, + { + path: '/admin/site/announcements/new', + component: jest.fn(), + name: 'admin-site-announcements-new' }, { path: '/admin/site/announcements/:id/update', @@ -95,24 +95,24 @@ export const routes = [ name: 'admin-site-announcements-id-update' }, { - path: '/admin/site/collections/:id/update', + path: '/admin/project/:short_name?/tags', component: jest.fn(), - name: 'admin-site-collections-id-update' + name: 'admin-project-short_name-tags' }, { - path: '/account/:name?', + path: '/admin/project/:short_name?/collection', component: jest.fn(), - name: 'account-name' + name: 'admin-project-short_name-collection' }, { - path: '/collection/:short_name?', + path: '/admin/project/:short_name?/settings', component: jest.fn(), - name: 'collection-short_name' + name: 'admin-project-short_name-settings' }, { - path: '/collection/:short_name?/projects', + path: '/admin/collection/:short_name/settings', component: jest.fn(), - name: 'collection-short_name-projects' + name: 'admin-collection-short_name-settings' }, { path: '/admin/project/:short_name?/thumbnail', @@ -120,24 +120,39 @@ export const routes = [ name: 'admin-project-short_name-thumbnail' }, { - path: '/admin/project/:short_name?/tags', + path: '/admin/collection/:short_name/content', component: jest.fn(), - name: 'admin-project-short_name-tags' + name: 'admin-collection-short_name-content' }, { - path: '/admin/project/:short_name?/settings', + path: '/admin/collection/:short_name/delete', component: jest.fn(), - name: 'admin-project-short_name-settings' + name: 'admin-collection-short_name-delete' }, { - path: '/admin/project/open', + path: '/admin/collection/:short_name/tags', component: jest.fn(), - name: 'admin-project-open' + name: 'admin-collection-short_name-tags' }, { - path: '/account/:name?/announcements', + path: '/admin/collection/:short_name/terminology', component: jest.fn(), - name: 'account-name-announcements' + name: 'admin-collection-short_name-terminology' + }, + { + path: '/admin/collection/:short_name/featured', + component: jest.fn(), + name: 'admin-collection-short_name-featured' + }, + { + path: '/collection/:short_name?', + component: jest.fn(), + name: 'collection-short_name' + }, + { + path: '/account/:name?', + component: jest.fn(), + name: 'account-name' }, { path: '/collection/:short_name?/about', @@ -145,33 +160,48 @@ export const routes = [ name: 'collection-short_name-about' }, { - path: '/collection/:short_name?/data', + path: '/collection/:short_name?/projects', component: jest.fn(), - name: 'collection-short_name-data' + name: 'collection-short_name-projects' }, { - path: '/account/:name?/settings/avatar', + path: '/account/:name?/announcements', component: jest.fn(), - name: 'account-name-settings-avatar' + name: 'account-name-announcements' }, { - path: '/account/:name?/settings/api', + path: '/collection/:short_name?/data', component: jest.fn(), - name: 'account-name-settings-api' + name: 'collection-short_name-data' }, { path: '/account/:name?/settings/profile', component: jest.fn(), name: 'account-name-settings-profile' }, + { + path: '/account/:name?/settings/avatar', + component: jest.fn(), + name: 'account-name-settings-avatar' + }, { path: '/account/:name?/settings/security', component: jest.fn(), name: 'account-name-settings-security' }, { - path: '/collection/:short_name?/projects/:id', + path: '/account/:name?/settings/api', + component: jest.fn(), + name: 'account-name-settings-api' + }, + { + path: '/collection/:short_name?/projects/:id/:presenter.vue?', + component: jest.fn(), + name: 'collection-short_name-projects-id-presenter.vue' + }, + { + path: '/collection/:short_name?/projects/:id/:presenter?', component: jest.fn(), - name: 'collection-short_name-projects-id' + name: 'collection-short_name-projects-id-presenter' } ] diff --git a/test/unit/specs/components/buttons/__snapshots__/projectContrib.spec.js.snap b/test/unit/specs/components/buttons/__snapshots__/projectContrib.spec.js.snap index 1eecc332..f3e932b5 100644 --- a/test/unit/specs/components/buttons/__snapshots__/projectContrib.spec.js.snap +++ b/test/unit/specs/components/buttons/__snapshots__/projectContrib.spec.js.snap @@ -4,7 +4,6 @@ exports[`ProjectContrib button is active by default 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 b08d3b0d..94bf5ea7 100644 --- a/test/unit/specs/components/navbars/__snapshots__/app.spec.js.snap +++ b/test/unit/specs/components/navbars/__snapshots__/app.spec.js.snap @@ -18,7 +18,7 @@ exports[`App navbar renders correctly when signed in as admin 1`] = `