From 40ac9a6b6af87461073631f94d2c5010db4254cf Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Tue, 26 Sep 2017 02:49:43 +0100 Subject: [PATCH 001/103] Fix user profile title --- src/pages/account/Profile.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/account/Profile.vue b/src/pages/account/Profile.vue index f77f8382..b61f8db5 100644 --- a/src/pages/account/Profile.vue +++ b/src/pages/account/Profile.vue @@ -58,7 +58,7 @@ import ProjectContribButton from '@/components/buttons/ProjectContrib' export default { data: function () { return { - user: null, + user: {}, projects: [], tableFields: { name: { label: 'Name' }, @@ -98,6 +98,7 @@ export default { * The data. */ setData (data) { + console.log(data) this.user = data.user if (data.projects) { this.projects = data.projects From dc8300951b5851beac091c8648a0b3c24d033907 Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Fri, 29 Sep 2017 22:09:04 +0100 Subject: [PATCH 002/103] Change card-block to card-body --- src/components/category/ListChooser.vue | 2 +- src/components/collection/Card.vue | 2 +- src/components/presenters/Z3950.vue | 6 +++--- src/components/project/Card.vue | 4 ++-- src/components/user/FavouritesCard.vue | 13 ++++--------- src/components/user/ProfileCard.vue | 4 ++-- 6 files changed, 13 insertions(+), 18 deletions(-) diff --git a/src/components/category/ListChooser.vue b/src/components/category/ListChooser.vue index 1ff6fd18..02c9b05b 100644 --- a/src/components/category/ListChooser.vue +++ b/src/components/category/ListChooser.vue @@ -116,7 +116,7 @@ export default { } } - .card-block { + .card-body { display: flex; flex-direction: column; } diff --git a/src/components/collection/Card.vue b/src/components/collection/Card.vue index ed7d2830..65060ab0 100644 --- a/src/components/collection/Card.vue +++ b/src/components/collection/Card.vue @@ -15,7 +15,7 @@ class="collection-card-img" :style="{ backgroundImage: `url('${collectionConfig.bgImg}')` }"> -
+

{{ collectionConfig.name }}

diff --git a/src/components/presenters/Z3950.vue b/src/components/presenters/Z3950.vue index bd86baae..55e9e481 100644 --- a/src/components/presenters/Z3950.vue +++ b/src/components/presenters/Z3950.vue @@ -13,7 +13,7 @@
-
+
-
+
@@ -83,7 +83,7 @@
-
+
{{ selectedRecord.title }}

{{ selectedRecord.author }}

diff --git a/src/components/project/Card.vue b/src/components/project/Card.vue index 751f0533..a165cae9 100644 --- a/src/components/project/Card.vue +++ b/src/components/project/Card.vue @@ -16,7 +16,7 @@
-
+
+ class="card-body">

You haven't added any favourite tasks yet.

@@ -44,13 +44,6 @@ export default { }, methods: { - /** - * Get the favourites data. - */ - fetchFavourites () { - return pybossaApi.get(`/api/favorites`) - }, - /** * Load the image data. * @param {Array} favourites @@ -58,6 +51,7 @@ export default { */ getImageData (favourites) { return favourites.map((task) => { + console.log(task) if ('imgInfoUri' in task.info) { return this.getIiifImageData(task) } else if ('url_m' in task.info) { @@ -93,7 +87,8 @@ export default { }, mounted () { - this.fetchFavourites().then(r => { + pybossaApi.get(`/api/favorites`).then(r => { + console.log('OK', r.data) this.images = this.getImageData(r.data) this.loading = false }) diff --git a/src/components/user/ProfileCard.vue b/src/components/user/ProfileCard.vue index d682f724..40a6484d 100644 --- a/src/components/user/ProfileCard.vue +++ b/src/components/user/ProfileCard.vue @@ -8,7 +8,7 @@
-
+

{{ user.name }}

@@ -23,7 +23,7 @@
-
+
From ef438a3f91aa84f0c0260536288ec1d0a11c7e8e Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Fri, 29 Sep 2017 22:10:03 +0100 Subject: [PATCH 003/103] Change bg-faded to bg-light --- src/components/PreviewCard.vue | 2 +- src/components/category/ListChooser.vue | 2 +- src/components/project/SortingOptions.vue | 2 +- src/components/project/Thumbnail.vue | 2 +- src/layouts/FloatingTabs.vue | 2 +- src/pages/admin/Publications.vue | 2 +- src/pages/core/Landing.vue | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/components/PreviewCard.vue b/src/components/PreviewCard.vue index 11568f80..bb5817e5 100644 --- a/src/components/PreviewCard.vue +++ b/src/components/PreviewCard.vue @@ -78,7 +78,7 @@ export default { @import 'src/assets/style/main'; .preview-card { - @extend .bg-faded; + @extend .bg-light; * { &:not(:last-child) { diff --git a/src/components/category/ListChooser.vue b/src/components/category/ListChooser.vue index 02c9b05b..0224bf4b 100644 --- a/src/components/category/ListChooser.vue +++ b/src/components/category/ListChooser.vue @@ -90,7 +90,7 @@ export default { } .card-header { - @extend .bg-faded; + @extend .bg-light; text-align: center; padding: $list-group-item-padding-y $list-group-item-padding-x; } diff --git a/src/components/project/SortingOptions.vue b/src/components/project/SortingOptions.vue index 20ce813d..4c2343b4 100644 --- a/src/components/project/SortingOptions.vue +++ b/src/components/project/SortingOptions.vue @@ -92,7 +92,7 @@ export default { font-size: $font-size-sm; .card-header { - @extend .bg-faded; + @extend .bg-light; text-align: center; padding: $list-group-item-padding-y $list-group-item-padding-x; } diff --git a/src/components/project/Thumbnail.vue b/src/components/project/Thumbnail.vue index 59342b1c..f4ebf45c 100644 --- a/src/components/project/Thumbnail.vue +++ b/src/components/project/Thumbnail.vue @@ -65,7 +65,7 @@ export default { } .thumbnail-placeholder { - @extend .bg-faded; + @extend .bg-light; height: 100%; display: flex; align-items: center; diff --git a/src/layouts/FloatingTabs.vue b/src/layouts/FloatingTabs.vue index 7cf68265..90a0f6b2 100644 --- a/src/layouts/FloatingTabs.vue +++ b/src/layouts/FloatingTabs.vue @@ -104,7 +104,7 @@ export default { } &:nth-child(even) { - @extend .bg-faded; + @extend .bg-light; } @include media-breakpoint-up(md) { diff --git a/src/pages/admin/Publications.vue b/src/pages/admin/Publications.vue index 4bb2def3..2514303d 100644 --- a/src/pages/admin/Publications.vue +++ b/src/pages/admin/Publications.vue @@ -11,7 +11,7 @@
-
+

Contribute

@@ -110,7 +110,7 @@

+ class="bg-light">

Publications

From 645ea63228f5b5b38fd058c5262a064c7a59f399 Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Fri, 29 Sep 2017 22:14:47 +0100 Subject: [PATCH 004/103] Upgrade to bootstrap 4 beta --- package-lock.json | 12 ++++-------- package.json | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1ea8bb31..511bbc70 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1467,20 +1467,16 @@ } }, "bootstrap": { - "version": "4.0.0-alpha.6", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.0.0-alpha.6.tgz", - "integrity": "sha1-T1TdM6wN6sOyhAe8LffsYIhpycg=", - "requires": { - "jquery": "3.2.1", - "tether": "1.4.0" - } + "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-vue": { "version": "0.21.0", "resolved": "https://registry.npmjs.org/bootstrap-vue/-/bootstrap-vue-0.21.0.tgz", "integrity": "sha512-mKGPQfUz6GMxvnouBXhwPfY7wb/SmoGCHdhyyPRGRuFm/lCcO35EMRIWdZRwf+71FadYWMRQKadiVYCFhtMPFQ==", "requires": { - "bootstrap": "4.0.0-alpha.6", + "bootstrap": "4.0.0-beta", "tether": "1.4.0", "vue": "2.4.2" }, diff --git a/package.json b/package.json index 215364ed..3c4093d6 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ }, "dependencies": { "axios": "^0.16.1", - "bootstrap": "4.0.0-alpha.6", + "bootstrap": "4.0.0-beta", "bootstrap-vue": "^0.21.0", "chartist": "^0.11.0", "chartist-plugin-legend": "^0.6.2", From 3502df37b680d560933a02ebf7d4516968a230d6 Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Fri, 29 Sep 2017 22:17:04 +0100 Subject: [PATCH 005/103] Replace tether with popper --- package-lock.json | 10 +++++----- package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 511bbc70..8bba4ef1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10017,6 +10017,11 @@ "jquery": "3.2.1" } }, + "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==" + }, "postcss": { "version": "6.0.10", "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.10.tgz", @@ -12892,11 +12897,6 @@ "require-main-filename": "1.0.1" } }, - "tether": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/tether/-/tether-1.4.0.tgz", - "integrity": "sha1-D5+hcfdb9YSF2BSelHmdeudNHBo=" - }, "text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", diff --git a/package.json b/package.json index 3c4093d6..5aa8f043 100644 --- a/package.json +++ b/package.json @@ -34,12 +34,12 @@ "moment": "^2.18.1", "pluralize": "^7.0.0", "pnotify": "^3.2.1", + "popper.js": "^1.12.5", "progressbar.js": "^1.0.1", "raven-js": "^3.17.0", "scrollreveal": "^3.3.6", "spinkit": "^1.2.5", "sweetalert2": "^6.9.0", - "tether": "^1.4.0", "vue": "^2.4.2", "vue-analytics": "^4.2.2", "vue-awesome": "^2.3.1", From 7d6c5ee6a9980022fe0669a21aaccbe9224b8d8f Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Fri, 29 Sep 2017 22:18:39 +0100 Subject: [PATCH 006/103] Move to bootstrap-vue 1.0.0-beta.9 --- package-lock.json | 17 ++++------------- package.json | 2 +- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8bba4ef1..5a58fe7b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1472,20 +1472,11 @@ "integrity": "sha512-I/r3fYtUZr+rUNkh8HI+twxZ56p6ehNn27eA1XSebLVQKAJ2xZHnEvZrSR+UR2A/bONcd9gHC3xatVhQlH6R6w==" }, "bootstrap-vue": { - "version": "0.21.0", - "resolved": "https://registry.npmjs.org/bootstrap-vue/-/bootstrap-vue-0.21.0.tgz", - "integrity": "sha512-mKGPQfUz6GMxvnouBXhwPfY7wb/SmoGCHdhyyPRGRuFm/lCcO35EMRIWdZRwf+71FadYWMRQKadiVYCFhtMPFQ==", + "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==", "requires": { - "bootstrap": "4.0.0-beta", - "tether": "1.4.0", - "vue": "2.4.2" - }, - "dependencies": { - "tether": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/tether/-/tether-1.4.0.tgz", - "integrity": "sha1-D5+hcfdb9YSF2BSelHmdeudNHBo=" - } + "bootstrap": "4.0.0-beta" } }, "brace-expansion": { diff --git a/package.json b/package.json index 5aa8f043..98880648 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "dependencies": { "axios": "^0.16.1", "bootstrap": "4.0.0-beta", - "bootstrap-vue": "^0.21.0", + "bootstrap-vue": "^1.0.0-beta.9", "chartist": "^0.11.0", "chartist-plugin-legend": "^0.6.2", "chartist-plugin-tooltips": "0.0.17", From 977c379c6055805eba698f431db0a8af1ecd8867 Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Fri, 29 Sep 2017 22:25:37 +0100 Subject: [PATCH 007/103] Replace gray- with gray- --- src/assets/style/main.scss | 2 +- src/components/PreviewCard.vue | 4 ++-- src/components/collection/Card.vue | 8 ++++---- src/components/footers/AppFooter.vue | 6 +++--- src/components/footers/DashboardFooter.vue | 4 ++-- src/components/navs/AppNavbar.vue | 4 ++-- src/components/navs/CollectionNavbar.vue | 4 ++-- src/components/navs/DashboardSidenav.vue | 2 +- src/components/presenters/Z3950.vue | 2 +- src/components/project/Card.vue | 6 +++--- src/components/project/Thumbnail.vue | 2 +- src/components/publications/PublicationCard.vue | 4 ++-- src/layouts/FloatingTabs.vue | 2 +- src/pages/collection/Home.vue | 8 ++++---- src/pages/core/Landing.vue | 4 ++-- 15 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/assets/style/main.scss b/src/assets/style/main.scss index 95e5e57b..e3089b4d 100644 --- a/src/assets/style/main.scss +++ b/src/assets/style/main.scss @@ -18,7 +18,7 @@ $body-color: #26333F; $white: #FFFFFF; $gray: #404446; -$gray-light: #888888; +$gray-300: #888888; $black: #000000; $twitter: #00ACEE; $facebook: #3B5998; diff --git a/src/components/PreviewCard.vue b/src/components/PreviewCard.vue index bb5817e5..c8d72443 100644 --- a/src/components/PreviewCard.vue +++ b/src/components/PreviewCard.vue @@ -95,13 +95,13 @@ export default { font-family: $font-family-base; font-weight: 600; text-transform: uppercase; - color: $gray-dark; + color: $gray-600; } .info { font-size: $font-size-sm; font-style: italic; - color: $gray-light; + color: $gray-300; } } diff --git a/src/components/collection/Card.vue b/src/components/collection/Card.vue index 65060ab0..ac9cd4d3 100644 --- a/src/components/collection/Card.vue +++ b/src/components/collection/Card.vue @@ -88,8 +88,8 @@ export default { left: 0; right: 0; bottom: 0; - color: $gray-lighter; - background-color: rgba($gray-lighter, 0.4); + color: $gray-200; + background-color: rgba($gray-200, 0.4); opacity: 0; font-size: $font-size-lg; text-transform: uppercase; @@ -105,13 +105,13 @@ export default { font-family: $font-family-base; font-weight: 600; text-transform: uppercase; - color: $gray-dark; + color: $gray-600; } .card-footer { background-color: $white; border: none; - color: $gray-light; + color: $gray-300; display: flex; flex-direction: row; justify-content: flex-end; diff --git a/src/components/footers/AppFooter.vue b/src/components/footers/AppFooter.vue index 4fa56873..d3290fb9 100644 --- a/src/components/footers/AppFooter.vue +++ b/src/components/footers/AppFooter.vue @@ -126,9 +126,9 @@ export default { @import 'src/assets/style/main'; #collection-footer.footer { - background-color: darken($gray-dark, 5%); + background-color: darken($gray-600, 5%); letter-spacing: 0.8px; - color: $gray-light; + color: $gray-300; font-size: $font-size-sm; line-height: 2; @@ -151,7 +151,7 @@ export default { } a { - color: $gray-lighter; + color: $gray-200; } .brand-link { diff --git a/src/components/footers/DashboardFooter.vue b/src/components/footers/DashboardFooter.vue index 87d36a0d..856d948a 100644 --- a/src/components/footers/DashboardFooter.vue +++ b/src/components/footers/DashboardFooter.vue @@ -22,9 +22,9 @@ export default { @import 'src/assets/style/main'; #dashboard-footer { - color: $gray-light; + color: $gray-300; background: $white; font-size: $font-size-sm; - border-top: 1px solid $gray-lighter; + border-top: 1px solid $gray-200; } diff --git a/src/components/navs/AppNavbar.vue b/src/components/navs/AppNavbar.vue index 9f5b8762..8986b81d 100644 --- a/src/components/navs/AppNavbar.vue +++ b/src/components/navs/AppNavbar.vue @@ -149,7 +149,7 @@ export default { flex: 1 1 auto; display: flex; align-items: center; - border-bottom: 1px solid $gray-lighter; + border-bottom: 1px solid $gray-200; } .navbar-brand { @@ -173,7 +173,7 @@ export default { justify-content: center; flex-direction: column; padding: 0rem 1.25rem; - border-bottom: 1px solid $gray-lighter; + border-bottom: 1px solid $gray-200; height: 100%; white-space: nowrap; } diff --git a/src/components/navs/CollectionNavbar.vue b/src/components/navs/CollectionNavbar.vue index 54e954cd..9bbbc340 100644 --- a/src/components/navs/CollectionNavbar.vue +++ b/src/components/navs/CollectionNavbar.vue @@ -545,11 +545,11 @@ export default { &.navbar-light { background: $white; - border-bottom: 1px solid $gray-lighter; + border-bottom: 1px solid $gray-200; .nav-item.nav-button { transition: border-color 400ms; - border-color: $gray-light; + border-color: $gray-300; } } diff --git a/src/components/navs/DashboardSidenav.vue b/src/components/navs/DashboardSidenav.vue index 713d17b5..0013aac6 100644 --- a/src/components/navs/DashboardSidenav.vue +++ b/src/components/navs/DashboardSidenav.vue @@ -168,7 +168,7 @@ export default { background: transparent; align-items: center; justify-content: center; - border-bottom: 1px solid rgba($gray-lighter, 0.5); + border-bottom: 1px solid rgba($gray-200, 0.5); .brand { @extend .navbar-brand; diff --git a/src/components/presenters/Z3950.vue b/src/components/presenters/Z3950.vue index 55e9e481..9933c754 100644 --- a/src/components/presenters/Z3950.vue +++ b/src/components/presenters/Z3950.vue @@ -592,7 +592,7 @@ export default { align-self: flex-end; background: transparent; border: none; - color: lighten($gray-light, 15%); + color: lighten($gray-300, 15%); padding: 0; } diff --git a/src/components/project/Card.vue b/src/components/project/Card.vue index a165cae9..60e8c215 100644 --- a/src/components/project/Card.vue +++ b/src/components/project/Card.vue @@ -232,11 +232,11 @@ export default { .project-stats-btn { display: flex; - border-left: 1px solid $gray-lighter; - border-bottom: 1px solid $gray-lighter; + border-left: 1px solid $gray-200; + border-bottom: 1px solid $gray-200; border-top: 0; border-right: 0; - color: $gray-light; + color: $gray-300; font-size: $font-size-xs; text-transform: uppercase; diff --git a/src/components/project/Thumbnail.vue b/src/components/project/Thumbnail.vue index f4ebf45c..11bf562b 100644 --- a/src/components/project/Thumbnail.vue +++ b/src/components/project/Thumbnail.vue @@ -72,7 +72,7 @@ export default { justify-content: center; svg { - color: $gray-light; + color: $gray-300; } } } diff --git a/src/components/publications/PublicationCard.vue b/src/components/publications/PublicationCard.vue index 5f4bd583..c1d57cfe 100644 --- a/src/components/publications/PublicationCard.vue +++ b/src/components/publications/PublicationCard.vue @@ -75,13 +75,13 @@ export default { font-family: $font-family-base; font-weight: 600; text-transform: uppercase; - color: $gray-dark; + color: $gray-600; } .publication-created { font-size: $font-size-sm; font-style: italic; - color: $gray-light; + color: $gray-300; } .publication-body { diff --git a/src/layouts/FloatingTabs.vue b/src/layouts/FloatingTabs.vue index 90a0f6b2..22ce9d82 100644 --- a/src/layouts/FloatingTabs.vue +++ b/src/layouts/FloatingTabs.vue @@ -116,7 +116,7 @@ export default { .nav.nav-unstyled { overflow-x: auto; padding: $navbar-padding-y $navbar-padding-x; - background-color: rgba($gray-lighter, 0.85); + background-color: rgba($gray-200, 0.85); .nav-link { font-size: $font-size-sm; diff --git a/src/pages/collection/Home.vue b/src/pages/collection/Home.vue index 7fcd7c10..35079dae 100644 --- a/src/pages/collection/Home.vue +++ b/src/pages/collection/Home.vue @@ -417,7 +417,7 @@ export default { } #featured-projects { - color: $gray-dark; + color: $gray-600; background-image: url('../../assets/img/white-wall.png'); box-shadow: 0 0 3px rgba($black, 0.2); -webkit-box-shadow: 0 0 3px rgba($black, 0.2); @@ -429,7 +429,7 @@ export default { display:block; width: 12rem; height: 12rem; - background: $gray-lighter; + background: $gray-200; position: absolute; top: -1px; @@ -446,7 +446,7 @@ export default { height: 0; border-width: 2rem 6rem 4rem 6rem; border-style: solid; - border-color: $gray-lighter $gray-lighter transparent $gray-lighter; + border-color: $gray-200 $gray-200 transparent $gray-200; } } @@ -462,7 +462,7 @@ export default { } #top-users { - color: $gray-dark; + color: $gray-600; } #results { diff --git a/src/pages/core/Landing.vue b/src/pages/core/Landing.vue index fb4a9af3..ddc254b5 100644 --- a/src/pages/core/Landing.vue +++ b/src/pages/core/Landing.vue @@ -217,7 +217,7 @@ export default { pybossaApi.get('/announcements/').then(r => { this.publications = r.data.announcements }) - pybossaApi.get('/').then(r => { + pybossaApi.get('/').then(r => {font-size-h3 this.topUsers = r.data.top_users }) } @@ -275,7 +275,7 @@ export default { } #top-users { - color: $gray-dark; + color: $gray-600; } .stat-row { From 5a8465403c065da1b052e24c73025c579406cb41 Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Fri, 29 Sep 2017 22:27:42 +0100 Subject: [PATCH 008/103] Repace $spacer --- src/components/project/Card.vue | 2 +- src/components/user/ProfileCard.vue | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/project/Card.vue b/src/components/project/Card.vue index 60e8c215..a169acb6 100644 --- a/src/components/project/Card.vue +++ b/src/components/project/Card.vue @@ -142,7 +142,7 @@ export default { text-align: center; flex-direction: column; overflow-y: hidden; - margin-bottom: $spacer-y; + margin-bottom: $spacer; margin-left: auto; margin-right: auto; max-width: 300px; diff --git a/src/components/user/ProfileCard.vue b/src/components/user/ProfileCard.vue index 40a6484d..56649089 100644 --- a/src/components/user/ProfileCard.vue +++ b/src/components/user/ProfileCard.vue @@ -57,13 +57,13 @@ export default { .card.user-card { .avatar-background { text-align: center; - padding-top: $spacer-y* 2; - padding-left: $spacer-x * 2; - padding-right: $spacer-x * 2; + padding-top: $spacer * 2; + padding-left: $spacer * 2; + padding-right: $spacer * 2; background: linear-gradient(to bottom, rgba($brand-info, 0) 0%, - rgba($brand-info, 0) calc(50% + (#{$spacer-y} * 1)), - $white calc(50% + (#{$spacer-y} * 1)), $white 100% ), + rgba($brand-info, 0) calc(50% + (#{$spacer} * 1)), + $white calc(50% + (#{$spacer} * 1)), $white 100% ), url('../../assets/img/app-background.jpg'); background-size: cover; background-position: center center; From 8d53ff91c98ffe1cfc3810dd4431318f81de8cbc Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Fri, 29 Sep 2017 22:28:18 +0100 Subject: [PATCH 009/103] Fix accidental paste --- src/pages/core/Landing.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/core/Landing.vue b/src/pages/core/Landing.vue index ddc254b5..25897d98 100644 --- a/src/pages/core/Landing.vue +++ b/src/pages/core/Landing.vue @@ -217,7 +217,7 @@ export default { pybossaApi.get('/announcements/').then(r => { this.publications = r.data.announcements }) - pybossaApi.get('/').then(r => {font-size-h3 + pybossaApi.get('/').then(r => { this.topUsers = r.data.top_users }) } From ed03f1e44024d8f594f87c393d59abf9b4647c4e Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Fri, 29 Sep 2017 22:30:03 +0100 Subject: [PATCH 010/103] Change $font-size-h3 to h3-font-size --- src/components/navs/CollectionNavbar.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/navs/CollectionNavbar.vue b/src/components/navs/CollectionNavbar.vue index 9bbbc340..cca5828b 100644 --- a/src/components/navs/CollectionNavbar.vue +++ b/src/components/navs/CollectionNavbar.vue @@ -397,7 +397,7 @@ export default { margin-right: 1rem; @include media-breakpoint-up(sm) { - font-size: $font-size-h3; + font-size: $h3-font-size; } } From d91cdbcb139807ff5924993fbdb21c3f41f65d3f Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Fri, 29 Sep 2017 22:32:06 +0100 Subject: [PATCH 011/103] Remove $font-size-xs --- src/components/footers/AppFooter.vue | 2 +- src/components/project/Card.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/footers/AppFooter.vue b/src/components/footers/AppFooter.vue index d3290fb9..ef9be76a 100644 --- a/src/components/footers/AppFooter.vue +++ b/src/components/footers/AppFooter.vue @@ -159,7 +159,7 @@ export default { } #bg-img-attribution { - font-size: $font-size-xs; + font-size: 0.75rem; } } diff --git a/src/components/project/Card.vue b/src/components/project/Card.vue index a169acb6..eb734b73 100644 --- a/src/components/project/Card.vue +++ b/src/components/project/Card.vue @@ -237,7 +237,7 @@ export default { border-top: 0; border-right: 0; color: $gray-300; - font-size: $font-size-xs; + font-size: 0.75rem; text-transform: uppercase; svg { From 9fe3c02a28f632ecc6581d378eed8272ca67d0e3 Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Fri, 29 Sep 2017 22:33:06 +0100 Subject: [PATCH 012/103] Remove $nav-item-inline-spacer --- src/components/navs/CollectionNavbar.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/navs/CollectionNavbar.vue b/src/components/navs/CollectionNavbar.vue index cca5828b..9f2d2fc8 100644 --- a/src/components/navs/CollectionNavbar.vue +++ b/src/components/navs/CollectionNavbar.vue @@ -426,7 +426,7 @@ export default { .nav-item { font-size: $font-size-sm; - margin-left: calc(2 * #{$nav-item-inline-spacer}); + margin-left: calc(2 * #{$spacer}); margin-right: 0; position: relative; From ad6d80e9d880b87f7ef43e63e64238121cd664cf Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Fri, 29 Sep 2017 23:15:23 +0100 Subject: [PATCH 013/103] More gray fixes --- src/assets/style/main.scss | 14 +++++++++++--- src/components/PreviewCard.vue | 4 ++-- src/components/collection/Card.vue | 10 +++++----- src/components/footers/AppFooter.vue | 6 +++--- src/components/footers/DashboardFooter.vue | 4 ++-- src/components/navs/AppNavbar.vue | 4 ++-- src/components/navs/CollectionNavbar.vue | 4 ++-- src/components/navs/DashboardSidenav.vue | 2 +- src/components/presenters/Z3950.vue | 2 +- src/components/project/Card.vue | 6 +++--- src/components/project/Thumbnail.vue | 2 +- src/components/publications/PublicationCard.vue | 4 ++-- src/layouts/FloatingTabs.vue | 4 ++-- src/pages/collection/Home.vue | 8 ++++---- src/pages/core/Landing.vue | 2 +- 15 files changed, 42 insertions(+), 34 deletions(-) diff --git a/src/assets/style/main.scss b/src/assets/style/main.scss index e3089b4d..0fcf077a 100644 --- a/src/assets/style/main.scss +++ b/src/assets/style/main.scss @@ -14,11 +14,19 @@ $brand-info: #2589BD; $brand-warning: #E38D13; $brand-danger: #E4572E; $brand-inverse: #111111; -$body-color: #26333F; +$body-color: #202B35; + +$gray-1000: #1A1D21; +$gray-1100: #14171A; +$gray-1200: #0D1012; + +$grays: ( + "1000": $gray-1000, + "1100": $gray-1100, + "1200": $gray-1200 +); $white: #FFFFFF; -$gray: #404446; -$gray-300: #888888; $black: #000000; $twitter: #00ACEE; $facebook: #3B5998; diff --git a/src/components/PreviewCard.vue b/src/components/PreviewCard.vue index c8d72443..f3d032d9 100644 --- a/src/components/PreviewCard.vue +++ b/src/components/PreviewCard.vue @@ -95,13 +95,13 @@ export default { font-family: $font-family-base; font-weight: 600; text-transform: uppercase; - color: $gray-600; + color: $gray-1000; } .info { font-size: $font-size-sm; font-style: italic; - color: $gray-300; + color: $gray-600; } } diff --git a/src/components/collection/Card.vue b/src/components/collection/Card.vue index ac9cd4d3..b4ceff72 100644 --- a/src/components/collection/Card.vue +++ b/src/components/collection/Card.vue @@ -59,7 +59,7 @@ export default { border: none; a { - color: $gray; + color: $gray-800; @include hover-focus { text-decoration: none; @@ -88,8 +88,8 @@ export default { left: 0; right: 0; bottom: 0; - color: $gray-200; - background-color: rgba($gray-200, 0.4); + color: $gray-300; + background-color: rgba($gray-300, 0.4); opacity: 0; font-size: $font-size-lg; text-transform: uppercase; @@ -105,13 +105,13 @@ export default { font-family: $font-family-base; font-weight: 600; text-transform: uppercase; - color: $gray-600; + color: $gray-1000; } .card-footer { background-color: $white; border: none; - color: $gray-300; + color: $gray-600; display: flex; flex-direction: row; justify-content: flex-end; diff --git a/src/components/footers/AppFooter.vue b/src/components/footers/AppFooter.vue index ef9be76a..a6911f1d 100644 --- a/src/components/footers/AppFooter.vue +++ b/src/components/footers/AppFooter.vue @@ -126,9 +126,9 @@ export default { @import 'src/assets/style/main'; #collection-footer.footer { - background-color: darken($gray-600, 5%); + background-color: $gray-1000; letter-spacing: 0.8px; - color: $gray-300; + color: $gray-600; font-size: $font-size-sm; line-height: 2; @@ -151,7 +151,7 @@ export default { } a { - color: $gray-200; + color: $gray-300; } .brand-link { diff --git a/src/components/footers/DashboardFooter.vue b/src/components/footers/DashboardFooter.vue index 856d948a..5dae0a73 100644 --- a/src/components/footers/DashboardFooter.vue +++ b/src/components/footers/DashboardFooter.vue @@ -22,9 +22,9 @@ export default { @import 'src/assets/style/main'; #dashboard-footer { - color: $gray-300; + color: $gray-600; background: $white; font-size: $font-size-sm; - border-top: 1px solid $gray-200; + border-top: 1px solid $gray-300; } diff --git a/src/components/navs/AppNavbar.vue b/src/components/navs/AppNavbar.vue index 8986b81d..ac333fd9 100644 --- a/src/components/navs/AppNavbar.vue +++ b/src/components/navs/AppNavbar.vue @@ -149,7 +149,7 @@ export default { flex: 1 1 auto; display: flex; align-items: center; - border-bottom: 1px solid $gray-200; + border-bottom: 1px solid $gray-300; } .navbar-brand { @@ -173,7 +173,7 @@ export default { justify-content: center; flex-direction: column; padding: 0rem 1.25rem; - border-bottom: 1px solid $gray-200; + border-bottom: 1px solid $gray-300; height: 100%; white-space: nowrap; } diff --git a/src/components/navs/CollectionNavbar.vue b/src/components/navs/CollectionNavbar.vue index 9f2d2fc8..24659707 100644 --- a/src/components/navs/CollectionNavbar.vue +++ b/src/components/navs/CollectionNavbar.vue @@ -545,11 +545,11 @@ export default { &.navbar-light { background: $white; - border-bottom: 1px solid $gray-200; + border-bottom: 1px solid $gray-300; .nav-item.nav-button { transition: border-color 400ms; - border-color: $gray-300; + border-color: $gray-600; } } diff --git a/src/components/navs/DashboardSidenav.vue b/src/components/navs/DashboardSidenav.vue index 0013aac6..df0b52f2 100644 --- a/src/components/navs/DashboardSidenav.vue +++ b/src/components/navs/DashboardSidenav.vue @@ -168,7 +168,7 @@ export default { background: transparent; align-items: center; justify-content: center; - border-bottom: 1px solid rgba($gray-200, 0.5); + border-bottom: 1px solid rgba($gray-300, 0.5); .brand { @extend .navbar-brand; diff --git a/src/components/presenters/Z3950.vue b/src/components/presenters/Z3950.vue index 9933c754..16b18325 100644 --- a/src/components/presenters/Z3950.vue +++ b/src/components/presenters/Z3950.vue @@ -592,7 +592,7 @@ export default { align-self: flex-end; background: transparent; border: none; - color: lighten($gray-300, 15%); + color: $gray-400; padding: 0; } diff --git a/src/components/project/Card.vue b/src/components/project/Card.vue index eb734b73..49352374 100644 --- a/src/components/project/Card.vue +++ b/src/components/project/Card.vue @@ -232,11 +232,11 @@ export default { .project-stats-btn { display: flex; - border-left: 1px solid $gray-200; - border-bottom: 1px solid $gray-200; + border-left: 1px solid $gray-300; + border-bottom: 1px solid $gray-300; border-top: 0; border-right: 0; - color: $gray-300; + color: $gray-600; font-size: 0.75rem; text-transform: uppercase; diff --git a/src/components/project/Thumbnail.vue b/src/components/project/Thumbnail.vue index 11bf562b..2cf440a0 100644 --- a/src/components/project/Thumbnail.vue +++ b/src/components/project/Thumbnail.vue @@ -72,7 +72,7 @@ export default { justify-content: center; svg { - color: $gray-300; + color: $gray-600; } } } diff --git a/src/components/publications/PublicationCard.vue b/src/components/publications/PublicationCard.vue index c1d57cfe..7b3c67dd 100644 --- a/src/components/publications/PublicationCard.vue +++ b/src/components/publications/PublicationCard.vue @@ -75,13 +75,13 @@ export default { font-family: $font-family-base; font-weight: 600; text-transform: uppercase; - color: $gray-600; + color: $gray-1000; } .publication-created { font-size: $font-size-sm; font-style: italic; - color: $gray-300; + color: $gray-600; } .publication-body { diff --git a/src/layouts/FloatingTabs.vue b/src/layouts/FloatingTabs.vue index 22ce9d82..5567114e 100644 --- a/src/layouts/FloatingTabs.vue +++ b/src/layouts/FloatingTabs.vue @@ -116,13 +116,13 @@ export default { .nav.nav-unstyled { overflow-x: auto; padding: $navbar-padding-y $navbar-padding-x; - background-color: rgba($gray-200, 0.85); + background-color: rgba($gray-300, 0.85); .nav-link { font-size: $font-size-sm; transition: opacity 350ms ease; - color: lighten($gray, 15%); + color: $gray-600; display: none; @include media-breakpoint-up(sm) { diff --git a/src/pages/collection/Home.vue b/src/pages/collection/Home.vue index 35079dae..a287734b 100644 --- a/src/pages/collection/Home.vue +++ b/src/pages/collection/Home.vue @@ -417,7 +417,7 @@ export default { } #featured-projects { - color: $gray-600; + color: $gray-1000; background-image: url('../../assets/img/white-wall.png'); box-shadow: 0 0 3px rgba($black, 0.2); -webkit-box-shadow: 0 0 3px rgba($black, 0.2); @@ -429,7 +429,7 @@ export default { display:block; width: 12rem; height: 12rem; - background: $gray-200; + background: $gray-300; position: absolute; top: -1px; @@ -446,7 +446,7 @@ export default { height: 0; border-width: 2rem 6rem 4rem 6rem; border-style: solid; - border-color: $gray-200 $gray-200 transparent $gray-200; + border-color: $gray-300 $gray-300 transparent $gray-300; } } @@ -462,7 +462,7 @@ export default { } #top-users { - color: $gray-600; + color: $gray-1000; } #results { diff --git a/src/pages/core/Landing.vue b/src/pages/core/Landing.vue index 25897d98..6b5d5936 100644 --- a/src/pages/core/Landing.vue +++ b/src/pages/core/Landing.vue @@ -275,7 +275,7 @@ export default { } #top-users { - color: $gray-600; + color: $gray-1000; } .stat-row { From 261e56596284cf5e3b8e5b2b2e488ba4e8b2ccbb Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Fri, 29 Sep 2017 23:23:06 +0100 Subject: [PATCH 014/103] Rplace brand colors --- src/assets/style/main.scss | 37 ++++++++++++++---------- src/components/forms/CardForm.vue | 2 +- src/components/navs/AppNavbar.vue | 4 +-- src/components/navs/CollectionNavbar.vue | 10 +++---- src/components/navs/DashboardSidenav.vue | 4 +-- src/components/user/ProfileCard.vue | 4 +-- src/pages/core/Landing.vue | 8 ++--- 7 files changed, 37 insertions(+), 32 deletions(-) diff --git a/src/assets/style/main.scss b/src/assets/style/main.scss index 0fcf077a..2ffdb3b1 100644 --- a/src/assets/style/main.scss +++ b/src/assets/style/main.scss @@ -8,12 +8,17 @@ $headings-font-weight: 400; $line-height-base: 1.6; /* Colors */ -$brand-primary: #D00000; -$brand-success: #408E40; -$brand-info: #2589BD; -$brand-warning: #E38D13; -$brand-danger: #E4572E; -$brand-inverse: #111111; +$blue: #2589BD !default; +$indigo: #6610f2 !default; +$purple: #6f42c1 !default; +$pink: #e83e8c !default; +$red: #D00000 !default; +$orange: #E38D13 !default; +$yellow: #ffc107 !default; +$green: #408E40 !default; +$teal: #20c997 !default; +$cyan: #17a2b8 !default; + $body-color: #202B35; $gray-1000: #1A1D21; @@ -39,12 +44,12 @@ $link-hover-color: darken($link-color, 5%); $link-hover-decoration: underline; /* Components */ -$component-active-bg: $brand-info; +$component-active-bg: $blue; /* Buttons */ -$btn-secondary-color: $brand-inverse; +$btn-secondary-color: $gray-1100; $btn-secondary-bg: $white; -$btn-secondary-border: $brand-inverse; +$btn-secondary-border: $gray-1100; $btn-border-radius: 0px; $btn-border-radius-lg: 0px; $btn-border-radius-sm: 0px; @@ -61,8 +66,8 @@ $nav-pills-active-link-bg: transparent; /* Input */ $input-padding-x: 1.25rem; $input-padding-y: .75rem; -$input-border-focus: $brand-info; -$custom-select-focus-border-color: lighten($brand-info, 25%); +$input-border-focus: $blue; +$custom-select-focus-border-color: lighten($blue, 25%); /* Tables */ $table-cell-padding: .75rem 1.25rem; @@ -71,10 +76,10 @@ $table-bg-hover: darken($white, 5%); $table-border-color: rgba($black, .075); /* Pagination */ -$pagination-color: $brand-info; -$pagination-hover-color: darken($brand-info, 10%); -$pagination-active-bg: $brand-info; -$pagination-active-border: $brand-info; +$pagination-color: $blue; +$pagination-hover-color: darken($blue, 10%); +$pagination-active-bg: $blue; +$pagination-active-border: $blue; /* Cards */ $card-border-radius: 0px; @@ -112,7 +117,7 @@ $lg-path-fonts: '~lightgallery/src/fonts'; $lg-path-images: '~lightgallery/src/img'; /* SpinKit */ -$spinkit-spinner-color: $brand-info; +$spinkit-spinner-color: $blue; /* Chartist */ $ct-series-colors: diff --git a/src/components/forms/CardForm.vue b/src/components/forms/CardForm.vue index 9e7f87f7..c16bbe08 100644 --- a/src/components/forms/CardForm.vue +++ b/src/components/forms/CardForm.vue @@ -198,7 +198,7 @@ export default { } .errors { - color: $brand-danger; + color: $red; font-size: $font-size-sm; span { diff --git a/src/components/navs/AppNavbar.vue b/src/components/navs/AppNavbar.vue index ac333fd9..b854dea4 100644 --- a/src/components/navs/AppNavbar.vue +++ b/src/components/navs/AppNavbar.vue @@ -186,9 +186,9 @@ export default { } #btn-register { - background-color: $brand-success; + background-color: $green; font-weight: 400; - border-bottom: 1px solid $brand-success; + border-bottom: 1px solid $green; a { color: $white; diff --git a/src/components/navs/CollectionNavbar.vue b/src/components/navs/CollectionNavbar.vue index 24659707..09c2a599 100644 --- a/src/components/navs/CollectionNavbar.vue +++ b/src/components/navs/CollectionNavbar.vue @@ -437,7 +437,7 @@ export default { width: 100%; height: 2px; content: ''; - background-color: $brand-primary; + background-color: $red; opacity: 0; } @@ -456,7 +456,7 @@ export default { &:focus, &:hover, &.active { - color: $brand-primary; + color: $red; } } @@ -513,7 +513,7 @@ export default { .nav-item:not(.nav-button) .nav-link:focus, .nav-item:not(.nav-button) .nav-link:hover, .nav-item:not(.nav-button) .nav-link.active { - color: $brand-primary !important; + color: $red !important; background-color: transparent; } @@ -565,7 +565,7 @@ export default { z-index: 10; top: 0; left: 0; - background-color: $brand-inverse; + background-color: $gray-1100; overflow-x: hidden; overflow-y: auto; text-align: center; @@ -597,7 +597,7 @@ export default { color: $white; @include hover-focus { - color: $brand-primary; + color: $red; } } diff --git a/src/components/navs/DashboardSidenav.vue b/src/components/navs/DashboardSidenav.vue index df0b52f2..4e18de1f 100644 --- a/src/components/navs/DashboardSidenav.vue +++ b/src/components/navs/DashboardSidenav.vue @@ -70,8 +70,8 @@ export default { white-space: nowrap; z-index: 1; background: - linear-gradient(rgba($brand-info, 0.8), - rgba($brand-info, 0.8)), + linear-gradient(rgba($blue, 0.8), + rgba($blue, 0.8)), url('../../assets/img/app-background.jpg'); background-size: cover; background-position: center center; diff --git a/src/components/user/ProfileCard.vue b/src/components/user/ProfileCard.vue index 56649089..b209e635 100644 --- a/src/components/user/ProfileCard.vue +++ b/src/components/user/ProfileCard.vue @@ -61,8 +61,8 @@ export default { padding-left: $spacer * 2; padding-right: $spacer * 2; background: - linear-gradient(to bottom, rgba($brand-info, 0) 0%, - rgba($brand-info, 0) calc(50% + (#{$spacer} * 1)), + linear-gradient(to bottom, rgba($blue, 0) 0%, + rgba($blue, 0) calc(50% + (#{$spacer} * 1)), $white calc(50% + (#{$spacer} * 1)), $white 100% ), url('../../assets/img/app-background.jpg'); background-size: cover; diff --git a/src/pages/core/Landing.vue b/src/pages/core/Landing.vue index 6b5d5936..44016a33 100644 --- a/src/pages/core/Landing.vue +++ b/src/pages/core/Landing.vue @@ -6,7 +6,7 @@

{{ siteConfig.tagline }}

-
+
{{ stats.n_published_projects }}

Projects

@@ -298,17 +298,17 @@ export default { justify-content: center; &:nth-child(1) { - border-color: rgba($brand-success, 0.8); + border-color: rgba($green, 0.8); border-bottom-color: transparent; } &:nth-child(2) { - border-color: rgba($brand-info, 0.8); + border-color: rgba($blue, 0.8); border-bottom-color: transparent; } &:nth-child(3) { - border-color: rgba($brand-warning, 0.8); + border-color: rgba($purple, 0.8); border-bottom-color: transparent; } From ffef33c4e92963bf43a3f5217ffa44ce55e447d2 Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Fri, 29 Sep 2017 23:27:05 +0100 Subject: [PATCH 015/103] Fix button outline-light hover --- src/pages/collection/Home.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/pages/collection/Home.vue b/src/pages/collection/Home.vue index a287734b..c49bd29c 100644 --- a/src/pages/collection/Home.vue +++ b/src/pages/collection/Home.vue @@ -144,7 +144,7 @@
+
Projects
-
+
Help
  • diff --git a/src/components/navs/AppNavbar.vue b/src/components/navs/AppNavbar.vue index b854dea4..6ee31a2f 100644 --- a/src/components/navs/AppNavbar.vue +++ b/src/components/navs/AppNavbar.vue @@ -7,7 +7,7 @@ diff --git a/src/components/project/Card.vue b/src/components/project/Card.vue index 49352374..b7984d7d 100644 --- a/src/components/project/Card.vue +++ b/src/components/project/Card.vue @@ -32,7 +32,7 @@
    Stats @@ -61,7 +61,7 @@ Stats diff --git a/src/pages/account/Signin.vue b/src/pages/account/Signin.vue index 5cf2acf2..76cfb10e 100644 --- a/src/pages/account/Signin.vue +++ b/src/pages/account/Signin.vue @@ -23,7 +23,7 @@ variant="facebook" @click="redirect('facebook')"> - Facebook + Facebook
    @@ -33,7 +33,7 @@ variant="googleplus" @click="redirect('google')"> - Google + Google
@@ -43,7 +43,7 @@ variant="twitter" @click="redirect('twitter')"> - Twitter + Twitter
diff --git a/src/pages/admin/Publications.vue b/src/pages/admin/Publications.vue index 2514303d..a61f00d3 100644 --- a/src/pages/admin/Publications.vue +++ b/src/pages/admin/Publications.vue @@ -9,7 +9,7 @@ @success="refreshCurrentPublications">
-
+
diff --git a/src/pages/collection/Contribute.vue b/src/pages/collection/Contribute.vue index 9e3ef78b..fa20c427 100644 --- a/src/pages/collection/Contribute.vue +++ b/src/pages/collection/Contribute.vue @@ -34,7 +34,7 @@ + class="mt-3 d-none d-xl-block text-center">
@@ -99,12 +99,12 @@ There are no projects to display.

- + Use the list on the left of the screen to choose another {{ collectionConfig.terminology.category }}, or the sorting options to display any completed projects. - + Use the list above to choose another {{ collectionConfig.terminology.category }}. diff --git a/src/pages/collection/Home.vue b/src/pages/collection/Home.vue index c49bd29c..36053e50 100644 --- a/src/pages/collection/Home.vue +++ b/src/pages/collection/Home.vue @@ -10,11 +10,11 @@ v-html="siteConfig.logo" v-if="siteConfig.logo">

- -

+ +

{{ collectionConfig.name }}

- +

{{ collectionConfig.tagline }} @@ -84,7 +84,7 @@ Choose from some of our current favourites.

-
+
diff --git a/src/pages/core/Landing.vue b/src/pages/core/Landing.vue index 44016a33..8a734a94 100644 --- a/src/pages/core/Landing.vue +++ b/src/pages/core/Landing.vue @@ -3,9 +3,9 @@
- +

{{ siteConfig.tagline }}

-
+
{{ stats.n_published_projects }} @@ -64,7 +64,7 @@ Get Started
-
+
Wreath
From 39bec1f26c24277af8f94ab9f0bb1a36ef6807d3 Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Fri, 29 Sep 2017 23:44:02 +0100 Subject: [PATCH 017/103] Rearrange landing page stats --- src/pages/core/Landing.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pages/core/Landing.vue b/src/pages/core/Landing.vue index 8a734a94..1a593a56 100644 --- a/src/pages/core/Landing.vue +++ b/src/pages/core/Landing.vue @@ -6,11 +6,6 @@

{{ siteConfig.tagline }}

-
- {{ stats.n_published_projects }} - -

Projects

-
{{ stats.n_total_users }} @@ -21,6 +16,11 @@

Contributions

+
+ {{ stats.n_published_projects }} + +

Projects

+
@@ -308,7 +308,7 @@ export default { } &:nth-child(3) { - border-color: rgba($purple, 0.8); + border-color: rgba($orange, 0.8); border-bottom-color: transparent; } From 4b03192b133bcc4e84aa8cfbf38dc406ec39f305 Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Fri, 29 Sep 2017 23:56:20 +0100 Subject: [PATCH 018/103] Remove secondary buttons --- src/assets/style/main.scss | 3 --- src/components/forms/CardForm.vue | 2 +- src/components/presenters/Z3950.vue | 2 +- src/components/project/Card.vue | 4 ++-- src/pages/account/Newsletter.vue | 2 +- src/pages/admin/Categories.vue | 2 +- src/pages/collection/Home.vue | 3 ++- 7 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/assets/style/main.scss b/src/assets/style/main.scss index 2ffdb3b1..369fddf2 100644 --- a/src/assets/style/main.scss +++ b/src/assets/style/main.scss @@ -47,9 +47,6 @@ $link-hover-decoration: underline; $component-active-bg: $blue; /* Buttons */ -$btn-secondary-color: $gray-1100; -$btn-secondary-bg: $white; -$btn-secondary-border: $gray-1100; $btn-border-radius: 0px; $btn-border-radius-lg: 0px; $btn-border-radius-sm: 0px; diff --git a/src/components/forms/CardForm.vue b/src/components/forms/CardForm.vue index c16bbe08..6a021a9b 100644 --- a/src/components/forms/CardForm.vue +++ b/src/components/forms/CardForm.vue @@ -38,7 +38,7 @@ Cancel diff --git a/src/components/presenters/Z3950.vue b/src/components/presenters/Z3950.vue index 16b18325..93a3cd5a 100644 --- a/src/components/presenters/Z3950.vue +++ b/src/components/presenters/Z3950.vue @@ -114,7 +114,7 @@
Skip / Not Found diff --git a/src/components/project/Card.vue b/src/components/project/Card.vue index b7984d7d..f8c7b7f5 100644 --- a/src/components/project/Card.vue +++ b/src/components/project/Card.vue @@ -33,7 +33,7 @@ + variant="info"> Stats @@ -62,7 +62,7 @@ block v-b-modal="statsModalId" class="d-lg-none mb-1" - variant="secondary"> + variant="info"> Stats
No thanks diff --git a/src/pages/admin/Categories.vue b/src/pages/admin/Categories.vue index cf3276cd..d5895677 100644 --- a/src/pages/admin/Categories.vue +++ b/src/pages/admin/Categories.vue @@ -32,7 +32,7 @@ - - - - - - - -
diff --git a/src/components/user/Avatar.vue b/src/components/user/Avatar.vue index 29299134..88e5cca2 100644 --- a/src/components/user/Avatar.vue +++ b/src/components/user/Avatar.vue @@ -1,20 +1,27 @@ - - From 20e0e5c1a6b4509d471e4883526923fa30d1cdcc Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Sun, 1 Oct 2017 12:07:16 +0100 Subject: [PATCH 056/103] Use data var for collectionName --- src/layouts/CollectionBase.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/layouts/CollectionBase.vue b/src/layouts/CollectionBase.vue index ebac541a..1c8ae485 100644 --- a/src/layouts/CollectionBase.vue +++ b/src/layouts/CollectionBase.vue @@ -21,6 +21,12 @@ import CollectionNavbar from '@/components/navs/CollectionNavbar' import AppFooter from '@/components/footers/AppFooter' export default { + data: function () { + return { + collectionName: this.$route.params.collectionname + } + }, + metaInfo () { return { titleTemplate: `%s - ${this.collectionConfig.name} | ${siteConfig.brand}`, @@ -58,7 +64,7 @@ export default { } }, collectionConfig: function () { - return siteConfig.collections[this.$route.params.collectionname] + return siteConfig.collections[this.collectionName] } } } From 580f8f521eeb05b2b375e05cced16b5e31ac3d9d Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Sun, 1 Oct 2017 13:32:34 +0100 Subject: [PATCH 057/103] Remove broken native flag --- src/components/category/ListChooser.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/category/ListChooser.vue b/src/components/category/ListChooser.vue index 94f537a2..451491fc 100644 --- a/src/components/category/ListChooser.vue +++ b/src/components/category/ListChooser.vue @@ -10,7 +10,7 @@ action v-b-toggle="`catlistitem-${category.id}`" :active="activeCategory === category" - @click.native="changeCategory(category)"> + @click="changeCategory(category)"> {{ category.name }} Date: Sun, 1 Oct 2017 14:33:59 +0100 Subject: [PATCH 058/103] Improve open project table styles --- src/components/category/ListChooser.vue | 2 +- src/pages/account/Projects.vue | 32 ++++++++++++++++++------- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/src/components/category/ListChooser.vue b/src/components/category/ListChooser.vue index 451491fc..511e31e0 100644 --- a/src/components/category/ListChooser.vue +++ b/src/components/category/ListChooser.vue @@ -82,7 +82,7 @@ export default { #category-list-chooser { font-size: $font-size-sm; - max-height: 200px; + max-height: 250px; overflow-y: auto; @include media-breakpoint-up(xl) { diff --git a/src/pages/account/Projects.vue b/src/pages/account/Projects.vue index 7fd3c903..bf58f7e1 100644 --- a/src/pages/account/Projects.vue +++ b/src/pages/account/Projects.vue @@ -1,17 +1,18 @@ @@ -168,6 +169,8 @@ export default { From 1f6778669e2eb8b37197c63fe8d8a8d890bf62b8 Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Sun, 1 Oct 2017 15:04:25 +0100 Subject: [PATCH 059/103] Update nested list choosers --- src/components/category/ListChooser.vue | 23 +++++--- src/pages/account/Projects.vue | 13 +---- src/pages/admin/Featured.vue | 71 ++++++++++++------------- 3 files changed, 52 insertions(+), 55 deletions(-) diff --git a/src/components/category/ListChooser.vue b/src/components/category/ListChooser.vue index 511e31e0..5180c2bf 100644 --- a/src/components/category/ListChooser.vue +++ b/src/components/category/ListChooser.vue @@ -85,8 +85,23 @@ export default { max-height: 250px; overflow-y: auto; - @include media-breakpoint-up(xl) { - max-height: 100%; + &.nested-left { + border-top: none; + border-right: none; + border-left: none; + } + + @each $breakpoint in map-keys($grid-breakpoints) { + @include media-breakpoint-up($breakpoint) { + $infix: breakpoint-infix($breakpoint, $grid-breakpoints); + + &.nested#{$infix} { + height: 100%; + max-height: 100%; + border-right: 1px solid $border-color; + border-bottom: none; + } + } } .card-header { @@ -104,10 +119,6 @@ export default { &:first-child { border-top: none; } - - &:last-child { - border-bottom: none; - } } .category-description { diff --git a/src/pages/account/Projects.vue b/src/pages/account/Projects.vue index bf58f7e1..a87d285f 100644 --- a/src/pages/account/Projects.vue +++ b/src/pages/account/Projects.vue @@ -6,7 +6,7 @@ @@ -181,16 +181,5 @@ export default { .fade-leave-to { opacity: 0; } - - .open-project-chooser { - border-right: none; - border-left: none; - - @include media-breakpoint-up(lg) { - border-right: 1px solid $border-color; - border-top: none; - border-bottom: none; - } - } } diff --git a/src/pages/admin/Featured.vue b/src/pages/admin/Featured.vue index 2dfee6f4..444ef9c2 100644 --- a/src/pages/admin/Featured.vue +++ b/src/pages/admin/Featured.vue @@ -1,49 +1,46 @@ From d5ee7c4fe3f717aebb0ad13f176903307e12b6da Mon Sep 17 00:00:00 2001 From: Alexander Mendes Date: Wed, 4 Oct 2017 14:37:20 +0100 Subject: [PATCH 078/103] Add status prop to project contrib button --- src/components/buttons/ProjectContrib.vue | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/components/buttons/ProjectContrib.vue b/src/components/buttons/ProjectContrib.vue index d889ef12..dfc4380b 100644 --- a/src/components/buttons/ProjectContrib.vue +++ b/src/components/buttons/ProjectContrib.vue @@ -31,6 +31,20 @@ export default { block: { type: Boolean, default: true + }, + status: { + type: String, + default: 'can_contribute', + validator: value => { + const valid = [ + 'completed', + 'draft', + 'publish', + 'can_contribute', + 'cannot_contribute' + ] + return value in valid + } } } } From fc1e0443ac7174b619d00a6cccfa552a9cf4b06c Mon Sep 17 00:00:00 2001 From: Alexander Mendes Date: Wed, 4 Oct 2017 14:45:48 +0100 Subject: [PATCH 079/103] Fix parseSubfields for z3950 presenter --- src/components/presenters/Z3950.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/presenters/Z3950.vue b/src/components/presenters/Z3950.vue index 2e5e4252..a87b60ec 100644 --- a/src/components/presenters/Z3950.vue +++ b/src/components/presenters/Z3950.vue @@ -386,7 +386,7 @@ export default { return this.parseSubfield(sf) }).join(' ') + ' ' } else if (code !== '6') { - if (!codes || codes.indexOf(code)) { + if (!codes || codes.indexOf(code) > -1) { res = subfield[code] + ' ' } } From 7142bc6b767b98dbb840fbbd5f6ea3bdca185c04 Mon Sep 17 00:00:00 2001 From: Alexander Mendes Date: Thu, 5 Oct 2017 12:22:20 +0100 Subject: [PATCH 080/103] Update libcrowsd viewer --- package-lock.json | 914 +--------------------------------------------- package.json | 2 +- 2 files changed, 8 insertions(+), 908 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7f0d6a53..53d08a4b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1986,7 +1986,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", @@ -4749,905 +4748,6 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true }, - "fsevents": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz", - "integrity": "sha512-Sn44E5wQW4bTHXvQmvSHwqbuiXtduD6Rrjm2ZtUEGbyrig+nUH3t/QD4M4/ZXViY556TBpRgZkHLDx3JxPwxiw==", - "dev": true, - "optional": true, - "requires": { - "nan": "2.7.0", - "node-pre-gyp": "0.6.36" - }, - "dependencies": { - "abbrev": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "optional": true - }, - "ajv": { - "version": "4.11.8", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "co": "4.6.0", - "json-stable-stringify": "1.0.1" - } - }, - "ansi-regex": { - "version": "2.1.1", - "bundled": true, - "dev": true - }, - "aproba": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "are-we-there-yet": { - "version": "1.1.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "delegates": "1.0.0", - "readable-stream": "2.2.9" - } - }, - "asn1": { - "version": "0.2.3", - "bundled": true, - "dev": true, - "optional": true - }, - "assert-plus": { - "version": "0.2.0", - "bundled": true, - "dev": true, - "optional": true - }, - "asynckit": { - "version": "0.4.0", - "bundled": true, - "dev": true, - "optional": true - }, - "aws-sign2": { - "version": "0.6.0", - "bundled": true, - "dev": true, - "optional": true - }, - "aws4": { - "version": "1.6.0", - "bundled": true, - "dev": true, - "optional": true - }, - "balanced-match": { - "version": "0.4.2", - "bundled": true, - "dev": true - }, - "bcrypt-pbkdf": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "tweetnacl": "0.14.5" - } - }, - "block-stream": { - "version": "0.0.9", - "bundled": true, - "dev": true, - "requires": { - "inherits": "2.0.3" - } - }, - "boom": { - "version": "2.10.1", - "bundled": true, - "dev": true, - "requires": { - "hoek": "2.16.3" - } - }, - "brace-expansion": { - "version": "1.1.7", - "bundled": true, - "dev": true, - "requires": { - "balanced-match": "0.4.2", - "concat-map": "0.0.1" - } - }, - "buffer-shims": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "caseless": { - "version": "0.12.0", - "bundled": true, - "dev": true, - "optional": true - }, - "co": { - "version": "4.6.0", - "bundled": true, - "dev": true, - "optional": true - }, - "code-point-at": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "combined-stream": { - "version": "1.0.5", - "bundled": true, - "dev": true, - "requires": { - "delayed-stream": "1.0.0" - } - }, - "concat-map": { - "version": "0.0.1", - "bundled": true, - "dev": true - }, - "console-control-strings": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "core-util-is": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "cryptiles": { - "version": "2.0.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "boom": "2.10.1" - } - }, - "dashdash": { - "version": "1.14.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "assert-plus": "1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "debug": { - "version": "2.6.8", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ms": "2.0.0" - } - }, - "deep-extend": { - "version": "0.4.2", - "bundled": true, - "dev": true, - "optional": true - }, - "delayed-stream": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "delegates": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "ecc-jsbn": { - "version": "0.1.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "jsbn": "0.1.1" - } - }, - "extend": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "extsprintf": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "forever-agent": { - "version": "0.6.1", - "bundled": true, - "dev": true, - "optional": true - }, - "form-data": { - "version": "2.1.4", - "bundled": true, - "dev": 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, - "dev": true - }, - "fstream": { - "version": "1.0.11", - "bundled": true, - "dev": 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, - "dev": true, - "optional": true, - "requires": { - "fstream": "1.0.11", - "inherits": "2.0.3", - "minimatch": "3.0.4" - } - }, - "gauge": { - "version": "2.7.4", - "bundled": true, - "dev": 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, - "dev": true, - "optional": true, - "requires": { - "assert-plus": "1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "glob": { - "version": "7.1.2", - "bundled": true, - "dev": 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, - "dev": true - }, - "har-schema": { - "version": "1.0.5", - "bundled": true, - "dev": true, - "optional": true - }, - "har-validator": { - "version": "4.2.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ajv": "4.11.8", - "har-schema": "1.0.5" - } - }, - "has-unicode": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "hawk": { - "version": "3.1.3", - "bundled": true, - "dev": 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, - "dev": true - }, - "http-signature": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "assert-plus": "0.2.0", - "jsprim": "1.4.0", - "sshpk": "1.13.0" - } - }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "dev": true, - "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" - } - }, - "inherits": { - "version": "2.0.3", - "bundled": true, - "dev": true - }, - "ini": { - "version": "1.3.4", - "bundled": true, - "dev": true, - "optional": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "number-is-nan": "1.0.1" - } - }, - "is-typedarray": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "isarray": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "isstream": { - "version": "0.1.2", - "bundled": true, - "dev": true, - "optional": true - }, - "jodid25519": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "jsbn": "0.1.1" - } - }, - "jsbn": { - "version": "0.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "json-schema": { - "version": "0.2.3", - "bundled": true, - "dev": true, - "optional": true - }, - "json-stable-stringify": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "jsonify": "0.0.0" - } - }, - "json-stringify-safe": { - "version": "5.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "jsonify": { - "version": "0.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "jsprim": { - "version": "1.4.0", - "bundled": true, - "dev": 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, - "dev": true, - "optional": true - } - } - }, - "mime-db": { - "version": "1.27.0", - "bundled": true, - "dev": true - }, - "mime-types": { - "version": "2.1.15", - "bundled": true, - "dev": true, - "requires": { - "mime-db": "1.27.0" - } - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "dev": true, - "requires": { - "brace-expansion": "1.1.7" - } - }, - "minimist": { - "version": "0.0.8", - "bundled": true, - "dev": true - }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, - "dev": true, - "requires": { - "minimist": "0.0.8" - } - }, - "ms": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "node-pre-gyp": { - "version": "0.6.36", - "bundled": true, - "dev": 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, - "dev": true, - "optional": true, - "requires": { - "abbrev": "1.1.0", - "osenv": "0.1.4" - } - }, - "npmlog": { - "version": "4.1.0", - "bundled": true, - "dev": 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, - "dev": true - }, - "oauth-sign": { - "version": "0.8.2", - "bundled": true, - "dev": true, - "optional": true - }, - "object-assign": { - "version": "4.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "once": { - "version": "1.4.0", - "bundled": true, - "dev": true, - "requires": { - "wrappy": "1.0.2" - } - }, - "os-homedir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "os-tmpdir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "osenv": { - "version": "0.1.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "performance-now": { - "version": "0.2.0", - "bundled": true, - "dev": true, - "optional": true - }, - "process-nextick-args": { - "version": "1.0.7", - "bundled": true, - "dev": true - }, - "punycode": { - "version": "1.4.1", - "bundled": true, - "dev": true, - "optional": true - }, - "qs": { - "version": "6.4.0", - "bundled": true, - "dev": true, - "optional": true - }, - "rc": { - "version": "1.2.1", - "bundled": true, - "dev": 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, - "dev": true, - "optional": true - } - } - }, - "readable-stream": { - "version": "2.2.9", - "bundled": true, - "dev": 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, - "dev": 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, - "dev": true, - "requires": { - "glob": "7.1.2" - } - }, - "safe-buffer": { - "version": "5.0.1", - "bundled": true, - "dev": true - }, - "semver": { - "version": "5.3.0", - "bundled": true, - "dev": true, - "optional": true - }, - "set-blocking": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "sntp": { - "version": "1.0.9", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "hoek": "2.16.3" - } - }, - "sshpk": { - "version": "1.13.0", - "bundled": true, - "dev": 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, - "dev": true, - "optional": true - } - } - }, - "string_decoder": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "requires": { - "safe-buffer": "5.0.1" - } - }, - "string-width": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" - } - }, - "stringstream": { - "version": "0.0.5", - "bundled": true, - "dev": true, - "optional": true - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "tar": { - "version": "2.2.1", - "bundled": true, - "dev": true, - "requires": { - "block-stream": "0.0.9", - "fstream": "1.0.11", - "inherits": "2.0.3" - } - }, - "tar-pack": { - "version": "3.4.0", - "bundled": true, - "dev": 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, - "dev": true, - "optional": true, - "requires": { - "punycode": "1.4.1" - } - }, - "tunnel-agent": { - "version": "0.6.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safe-buffer": "5.0.1" - } - }, - "tweetnacl": { - "version": "0.14.5", - "bundled": true, - "dev": true, - "optional": true - }, - "uid-number": { - "version": "0.0.6", - "bundled": true, - "dev": true, - "optional": true - }, - "util-deprecate": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "uuid": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "verror": { - "version": "1.3.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "extsprintf": "1.0.2" - } - }, - "wide-align": { - "version": "1.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "string-width": "1.0.2" - } - }, - "wrappy": { - "version": "1.0.2", - "bundled": true, - "dev": true - } - } - }, "fstream": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", @@ -7982,9 +7082,9 @@ } }, "libcrowds-viewer": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/libcrowds-viewer/-/libcrowds-viewer-3.2.0.tgz", - "integrity": "sha512-w1IPhW2aqxnhtYlz6K+63FptBTC32DWJv03B/fP3cAHPXATSj69q3hP2WVzpw0KMN6DZwt5fB8cMpXp+dYl6hw==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/libcrowds-viewer/-/libcrowds-viewer-3.2.1.tgz", + "integrity": "sha512-UAxalsLwjEtk0tE/g2YphQiH2viT5ohzmID6lAIIDpjEOOt/cc1c+S48DK92fgc3z/dGK+Mnzz1pRSFDfWHTiw==", "requires": { "clipboard": "1.7.1", "es6-object-assign": "1.1.0", @@ -7993,7 +7093,7 @@ "marked": "0.3.6", "normalize.css": "7.0.0", "notyf": "2.0.1", - "openseadragon": "2.3.0", + "openseadragon": "2.3.1", "uuid": "3.1.0", "vue": "2.4.2", "vue-awesome": "2.3.3", @@ -9402,9 +8502,9 @@ "dev": true }, "openseadragon": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/openseadragon/-/openseadragon-2.3.0.tgz", - "integrity": "sha1-iZ/j3lQ/9R1+Ftu7g//6ByCjshE=" + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/openseadragon/-/openseadragon-2.3.1.tgz", + "integrity": "sha1-79z+4Z2LPEbQDX992nh8cFf2g2Q=" }, "opn": { "version": "5.1.0", diff --git a/package.json b/package.json index 01ae1aae..8a06ad30 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "jump.js": "^1.0.2", "leaflet": "^1.2.0", "leaflet.markercluster": "^1.0.6", - "libcrowds-viewer": "^3.2.0", + "libcrowds-viewer": "^3.2.1", "lodash": "^4.17.4", "marked": "^0.3.6", "moment": "^2.18.1", From 6fe8446ac2c72fd8e815e7aaa5e1d070c885a11e Mon Sep 17 00:00:00 2001 From: Alexander Mendes Date: Thu, 5 Oct 2017 15:29:43 +0100 Subject: [PATCH 081/103] Add webhook URL to project settings form --- src/pages/project/ProjectSettings.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/pages/project/ProjectSettings.vue b/src/pages/project/ProjectSettings.vue index 1be59623..19e34fcb 100644 --- a/src/pages/project/ProjectSettings.vue +++ b/src/pages/project/ProjectSettings.vue @@ -55,6 +55,12 @@ export default { type: 'textArea', rows: 2, placeholder: 'Short description shown on the project cards' + }, + { + model: 'webhook', + label: 'Webhook URL', + type: 'input', + inputType: 'text' } ] } From 13e3d962f860e9722c746037a59489684d4edb58 Mon Sep 17 00:00:00 2001 From: Alexander Mendes Date: Thu, 5 Oct 2017 15:55:13 +0100 Subject: [PATCH 082/103] Add missing fields to project settings form --- src/pages/project/ProjectSettings.vue | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/pages/project/ProjectSettings.vue b/src/pages/project/ProjectSettings.vue index 19e34fcb..024a4146 100644 --- a/src/pages/project/ProjectSettings.vue +++ b/src/pages/project/ProjectSettings.vue @@ -61,6 +61,22 @@ export default { label: 'Webhook URL', type: 'input', inputType: 'text' + }, + { + model: 'allow_anonymous_contributors', + label: 'Allow anonymous contributors', + type: 'checkbox' + }, + { + model: 'protect', + label: 'Require a password', + type: 'checkbox' + }, + { + model: 'pasword', + label: 'Password', + type: 'input', + inputType: 'text' } ] } From f69ffb6fa05ea7079d2309e300fc71b2491d65ce Mon Sep 17 00:00:00 2001 From: Alexander Mendes Date: Thu, 5 Oct 2017 17:20:47 +0100 Subject: [PATCH 083/103] Use toggles rather than checkboxes --- src/pages/project/ProjectSettings.vue | 39 +++++++++++++++++---------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/src/pages/project/ProjectSettings.vue b/src/pages/project/ProjectSettings.vue index 024a4146..a7417005 100644 --- a/src/pages/project/ProjectSettings.vue +++ b/src/pages/project/ProjectSettings.vue @@ -2,8 +2,25 @@ + :form="form"> +
+ + + +
+
+ + + +
@@ -62,16 +79,6 @@ export default { type: 'input', inputType: 'text' }, - { - model: 'allow_anonymous_contributors', - label: 'Allow anonymous contributors', - type: 'checkbox' - }, - { - model: 'protect', - label: 'Require a password', - type: 'checkbox' - }, { model: 'pasword', label: 'Password', @@ -97,9 +104,13 @@ export default { /** * Redirect the user on form submit success. + * @param {String} key + * The model key. + * @param {Object} evt + * The event. */ - onSuccess (data) { - console.log(data) + updateModelBoolean (key, evt) { + this.model[key] = evt.value } }, From 2495fbabedce3ad32b34374efdf4b7097524f38f Mon Sep 17 00:00:00 2001 From: Alexander Mendes Date: Thu, 5 Oct 2017 18:10:05 +0100 Subject: [PATCH 084/103] Use cookies to track participation and modify notifications --- src/main.js | 2 ++ src/pages/collection/Presenter.vue | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/src/main.js b/src/main.js index e9f124db..6218c53d 100644 --- a/src/main.js +++ b/src/main.js @@ -9,6 +9,7 @@ import VueFormGenerator from 'vue-form-generator' import VueImages from 'vue-images' import VueAnalytics from 'vue-analytics' import VueProgressBar from 'vue-progressbar' +import VueCookie from 'vue-cookie' import Icon from 'vue-awesome/components/Icon' import LibcrowdsViewer from 'libcrowds-viewer' import ToggleButton from 'vue-js-toggle-button' @@ -34,6 +35,7 @@ Vue.use(VueFormGenerator) Vue.use(ToggleButton) Vue.use(LibcrowdsViewer) Vue.use(VueProgressBar) +Vue.use(VueCookie) Vue.component('v-gravatar', VueGravatar) Vue.component('v-images', VueImages) diff --git a/src/pages/collection/Presenter.vue b/src/pages/collection/Presenter.vue index 9d1ecfe3..f43f5fdb 100644 --- a/src/pages/collection/Presenter.vue +++ b/src/pages/collection/Presenter.vue @@ -184,6 +184,8 @@ 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,6 +194,20 @@ export default { pybossaApi.post(`/api/taskrun`, taskrun).then(r => { this.removeTask(taskId) this.loadTasks() + if (hasParticipated === 'true') { + this.$store.dispatch('NOTIFY', { + msg: 'Answer saved, thank you!', + type: 'success' + }) + } else { + 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' }) }) } }, From 5f2568e8a9cbea6aa4ca276eb4175464a0181fe1 Mon Sep 17 00:00:00 2001 From: Alexander Mendes Date: Thu, 5 Oct 2017 18:18:45 +0100 Subject: [PATCH 085/103] Update libcrowds viewer presenter z-index --- src/components/presenters/LibcrowdsViewer.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/presenters/LibcrowdsViewer.vue b/src/components/presenters/LibcrowdsViewer.vue index fc287330..8442b017 100644 --- a/src/components/presenters/LibcrowdsViewer.vue +++ b/src/components/presenters/LibcrowdsViewer.vue @@ -121,7 +121,7 @@ export default { top: 0; left: 0; bottom: 0; - z-index: 9999999; + z-index: 1040; background-color: #000; width: 100%; height: 100%; From aa0124183385ef129900ac049692ac8289d7e3a6 Mon Sep 17 00:00:00 2001 From: Alexander Mendes Date: Thu, 5 Oct 2017 18:58:22 +0100 Subject: [PATCH 086/103] Position presenter notifications on the bottom left --- src/components/Notifications.vue | 13 ++++++++++--- src/pages/collection/Presenter.vue | 3 ++- src/store/index.js | 8 +++++--- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/components/Notifications.vue b/src/components/Notifications.vue index 165668f1..590b7e19 100644 --- a/src/components/Notifications.vue +++ b/src/components/Notifications.vue @@ -22,18 +22,18 @@ export default { methods: { notify (n) { + const position = n.position || 'topright' const title = n.type ? capitalize(n.type) : 'Info' const opts = { title: title, text: n.msg, type: n.type || 'info', hide: true, - width: '400px', delay: 2500, mobile: { styling: true }, - addclass: 'p-sm-4', + addclass: `stack-${position}`, after_close: () => { store.commit('DELETE_ITEM', 'notification') }, @@ -54,6 +54,7 @@ export default { default: break } + console.log(opts) /* eslint-disable no-new */ new PNotify(opts) @@ -68,8 +69,14 @@ export default { @import '~pnotify/src/pnotify.brighttheme'; @import '~pnotify/src/pnotify.nonblock'; -.ui-pnotify .ui-pnotify-text { +.ui-pnotify { + .ui-pnotify-text { word-wrap: break-word; + } + + &.stack-bottomleft { + top: auto; + } } .ui-pnotify-title { diff --git a/src/pages/collection/Presenter.vue b/src/pages/collection/Presenter.vue index f43f5fdb..5194ecbc 100644 --- a/src/pages/collection/Presenter.vue +++ b/src/pages/collection/Presenter.vue @@ -197,7 +197,8 @@ export default { if (hasParticipated === 'true') { this.$store.dispatch('NOTIFY', { msg: 'Answer saved, thank you!', - type: 'success' + type: 'success', + position: 'bottomleft' }) } else { swal({ diff --git a/src/store/index.js b/src/store/index.js index 1075c84d..ccd90185 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -48,9 +48,11 @@ const store = new Vuex.Store({ NOTIFY: ({ commit, state }, notification) => { // Avoid repeated notifications - if (state.notification !== null && - notification.type === state.notification.type && - notification.msg === state.notification.msg) { + if ( + state.notification !== null && + notification.type === state.notification.type && + notification.msg === state.notification.msg + ) { return } commit('SET_ITEM', { key: 'notification', value: notification }) From 9746c9c058c7715f1c61c9b2d6d03f2b5e0981d5 Mon Sep 17 00:00:00 2001 From: Alexander Mendes Date: Thu, 5 Oct 2017 19:02:40 +0100 Subject: [PATCH 087/103] Add task liked notifications --- src/components/presenters/LibcrowdsViewer.vue | 2 +- src/components/presenters/Z3950.vue | 2 +- src/pages/collection/Presenter.vue | 14 +++++++++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/components/presenters/LibcrowdsViewer.vue b/src/components/presenters/LibcrowdsViewer.vue index 8442b017..4792cf6a 100644 --- a/src/components/presenters/LibcrowdsViewer.vue +++ b/src/components/presenters/LibcrowdsViewer.vue @@ -100,7 +100,7 @@ export default { * The task data. */ onTaskLiked (taskData) { - this.$emit('liked', taskData.id, taskData.liked) + this.$emit('taskliked', taskData.id, taskData.liked) }, /** diff --git a/src/components/presenters/Z3950.vue b/src/components/presenters/Z3950.vue index a87b60ec..27d0d183 100644 --- a/src/components/presenters/Z3950.vue +++ b/src/components/presenters/Z3950.vue @@ -511,7 +511,7 @@ export default { * The task. */ onTaskLiked (task) { - this.$emit('liked', task.id, task.liked) + this.$emit('taskliked', task.id, task.liked) }, /** diff --git a/src/pages/collection/Presenter.vue b/src/pages/collection/Presenter.vue index 5194ecbc..c879961f 100644 --- a/src/pages/collection/Presenter.vue +++ b/src/pages/collection/Presenter.vue @@ -8,7 +8,7 @@ :currentUser="currentUser" :collectionConfig="collectionConfig" @submit="onSubmit" - @taskLiked="onTaskLiked"> + @taskliked="onTaskLiked">
@@ -153,11 +153,19 @@ export default { onTaskLiked (taskId, liked) { if (liked) { pybossaApi.post(`/api/favorites`, { task_id: taskId }).then(() => { - // TODO: feedback + this.$store.dispatch('NOTIFY', { + msg: 'Added to favourites', + type: 'info', + position: 'bottomleft' + }) }) } else { pybossaApi.delete(`/api/favorites/${taskId}`).then(() => { - // TODO: feedback + this.$store.dispatch('NOTIFY', { + msg: 'Removed from favourites', + type: 'info', + position: 'bottomleft' + }) }) } }, From 1afeaf78b6432def2f3f637b3fe64c1e52346466 Mon Sep 17 00:00:00 2001 From: Alexander Mendes Date: Thu, 5 Oct 2017 19:14:59 +0100 Subject: [PATCH 088/103] Reset after submission --- src/components/presenters/Z3950.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/presenters/Z3950.vue b/src/components/presenters/Z3950.vue index 27d0d183..4a82156b 100644 --- a/src/components/presenters/Z3950.vue +++ b/src/components/presenters/Z3950.vue @@ -521,6 +521,7 @@ export default { */ submit (answer) { this.$emit('submit', this.project.id, this.currentTask.id, answer) + this.reset() }, /** From 1afcbb7cdce63270a6a24a3fdcedf2467e2efdb1 Mon Sep 17 00:00:00 2001 From: Alexander Mendes Date: Thu, 5 Oct 2017 19:20:55 +0100 Subject: [PATCH 089/103] Add vue-cookie --- package-lock.json | 13 +++++++++++++ package.json | 1 + 2 files changed, 14 insertions(+) diff --git a/package-lock.json b/package-lock.json index 53d08a4b..4cd6bf6d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12059,6 +12059,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", @@ -12594,6 +12599,14 @@ "integrity": "sha512-wgI/SKRozqADIeMGN16PXiHBa/cnRD7JcuYt7P4JHcMIMc2BdUw02pQ+EQmsui0tN2kRVZGwZ8h4Yb2Vbf4w0w==", "dev": true }, + "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.0.0", "resolved": "https://registry.npmjs.org/vue-form-generator/-/vue-form-generator-2.0.0.tgz", diff --git a/package.json b/package.json index 8a06ad30..42f9796a 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ "vue-analytics": "^4.2.2", "vue-awesome": "^2.3.1", "vue-chartist": "^2.1.0", + "vue-cookie": "^1.1.4", "vue-form-generator": "^2.0.0", "vue-gravatar": "^1.1.3", "vue-images": "^1.0.10", From 6bf1f36521012423ff73474a11fe083794f03f49 Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Fri, 6 Oct 2017 10:01:33 +0100 Subject: [PATCH 090/103] Remove action column from user profile --- src/pages/account/Profile.vue | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/pages/account/Profile.vue b/src/pages/account/Profile.vue index b071b140..57d78008 100644 --- a/src/pages/account/Profile.vue +++ b/src/pages/account/Profile.vue @@ -45,8 +45,6 @@ - @@ -74,8 +72,7 @@ export default { tableFields: { name: { label: 'Name' }, n_volunteers: { label: 'Volunteers' }, - overall_progress: { label: 'Progress' }, - action: { label: 'Action' } + overall_progress: { label: 'Progress' } } } }, From 0a47a1e5b0ca3c0f575e4e886fcf6ca5bd0c6175 Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Fri, 6 Oct 2017 10:06:41 +0100 Subject: [PATCH 091/103] Update package lock --- package-lock.json | 900 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 900 insertions(+) diff --git a/package-lock.json b/package-lock.json index 4cd6bf6d..d43cb281 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1986,6 +1986,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", @@ -4748,6 +4749,905 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true }, + "fsevents": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz", + "integrity": "sha512-Sn44E5wQW4bTHXvQmvSHwqbuiXtduD6Rrjm2ZtUEGbyrig+nUH3t/QD4M4/ZXViY556TBpRgZkHLDx3JxPwxiw==", + "dev": true, + "optional": true, + "requires": { + "nan": "2.7.0", + "node-pre-gyp": "0.6.36" + }, + "dependencies": { + "abbrev": { + "version": "1.1.0", + "bundled": true, + "dev": true, + "optional": true + }, + "ajv": { + "version": "4.11.8", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "co": "4.6.0", + "json-stable-stringify": "1.0.1" + } + }, + "ansi-regex": { + "version": "2.1.1", + "bundled": true, + "dev": true + }, + "aproba": { + "version": "1.1.1", + "bundled": true, + "dev": true, + "optional": true + }, + "are-we-there-yet": { + "version": "1.1.4", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "delegates": "1.0.0", + "readable-stream": "2.2.9" + } + }, + "asn1": { + "version": "0.2.3", + "bundled": true, + "dev": true, + "optional": true + }, + "assert-plus": { + "version": "0.2.0", + "bundled": true, + "dev": true, + "optional": true + }, + "asynckit": { + "version": "0.4.0", + "bundled": true, + "dev": true, + "optional": true + }, + "aws-sign2": { + "version": "0.6.0", + "bundled": true, + "dev": true, + "optional": true + }, + "aws4": { + "version": "1.6.0", + "bundled": true, + "dev": true, + "optional": true + }, + "balanced-match": { + "version": "0.4.2", + "bundled": true, + "dev": true + }, + "bcrypt-pbkdf": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "tweetnacl": "0.14.5" + } + }, + "block-stream": { + "version": "0.0.9", + "bundled": true, + "dev": true, + "requires": { + "inherits": "2.0.3" + } + }, + "boom": { + "version": "2.10.1", + "bundled": true, + "dev": true, + "requires": { + "hoek": "2.16.3" + } + }, + "brace-expansion": { + "version": "1.1.7", + "bundled": true, + "dev": true, + "requires": { + "balanced-match": "0.4.2", + "concat-map": "0.0.1" + } + }, + "buffer-shims": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "caseless": { + "version": "0.12.0", + "bundled": true, + "dev": true, + "optional": true + }, + "co": { + "version": "4.6.0", + "bundled": true, + "dev": true, + "optional": true + }, + "code-point-at": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "combined-stream": { + "version": "1.0.5", + "bundled": true, + "dev": true, + "requires": { + "delayed-stream": "1.0.0" + } + }, + "concat-map": { + "version": "0.0.1", + "bundled": true, + "dev": true + }, + "console-control-strings": { + "version": "1.1.0", + "bundled": true, + "dev": true + }, + "core-util-is": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "cryptiles": { + "version": "2.0.5", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "boom": "2.10.1" + } + }, + "dashdash": { + "version": "1.14.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "assert-plus": "1.0.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + } + } + }, + "debug": { + "version": "2.6.8", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "ms": "2.0.0" + } + }, + "deep-extend": { + "version": "0.4.2", + "bundled": true, + "dev": true, + "optional": true + }, + "delayed-stream": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "delegates": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "ecc-jsbn": { + "version": "0.1.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "jsbn": "0.1.1" + } + }, + "extend": { + "version": "3.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "extsprintf": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "forever-agent": { + "version": "0.6.1", + "bundled": true, + "dev": true, + "optional": true + }, + "form-data": { + "version": "2.1.4", + "bundled": true, + "dev": 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, + "dev": true + }, + "fstream": { + "version": "1.0.11", + "bundled": true, + "dev": 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, + "dev": true, + "optional": true, + "requires": { + "fstream": "1.0.11", + "inherits": "2.0.3", + "minimatch": "3.0.4" + } + }, + "gauge": { + "version": "2.7.4", + "bundled": true, + "dev": 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, + "dev": true, + "optional": true, + "requires": { + "assert-plus": "1.0.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + } + } + }, + "glob": { + "version": "7.1.2", + "bundled": true, + "dev": 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, + "dev": true + }, + "har-schema": { + "version": "1.0.5", + "bundled": true, + "dev": true, + "optional": true + }, + "har-validator": { + "version": "4.2.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "ajv": "4.11.8", + "har-schema": "1.0.5" + } + }, + "has-unicode": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "hawk": { + "version": "3.1.3", + "bundled": true, + "dev": 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, + "dev": true + }, + "http-signature": { + "version": "1.1.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "assert-plus": "0.2.0", + "jsprim": "1.4.0", + "sshpk": "1.13.0" + } + }, + "inflight": { + "version": "1.0.6", + "bundled": true, + "dev": true, + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + } + }, + "inherits": { + "version": "2.0.3", + "bundled": true, + "dev": true + }, + "ini": { + "version": "1.3.4", + "bundled": true, + "dev": true, + "optional": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "number-is-nan": "1.0.1" + } + }, + "is-typedarray": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "isarray": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, + "isstream": { + "version": "0.1.2", + "bundled": true, + "dev": true, + "optional": true + }, + "jodid25519": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "jsbn": "0.1.1" + } + }, + "jsbn": { + "version": "0.1.1", + "bundled": true, + "dev": true, + "optional": true + }, + "json-schema": { + "version": "0.2.3", + "bundled": true, + "dev": true, + "optional": true + }, + "json-stable-stringify": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "jsonify": "0.0.0" + } + }, + "json-stringify-safe": { + "version": "5.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "jsonify": { + "version": "0.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "jsprim": { + "version": "1.4.0", + "bundled": true, + "dev": 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, + "dev": true, + "optional": true + } + } + }, + "mime-db": { + "version": "1.27.0", + "bundled": true, + "dev": true + }, + "mime-types": { + "version": "2.1.15", + "bundled": true, + "dev": true, + "requires": { + "mime-db": "1.27.0" + } + }, + "minimatch": { + "version": "3.0.4", + "bundled": true, + "dev": true, + "requires": { + "brace-expansion": "1.1.7" + } + }, + "minimist": { + "version": "0.0.8", + "bundled": true, + "dev": true + }, + "mkdirp": { + "version": "0.5.1", + "bundled": true, + "dev": true, + "requires": { + "minimist": "0.0.8" + } + }, + "ms": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "node-pre-gyp": { + "version": "0.6.36", + "bundled": true, + "dev": 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, + "dev": true, + "optional": true, + "requires": { + "abbrev": "1.1.0", + "osenv": "0.1.4" + } + }, + "npmlog": { + "version": "4.1.0", + "bundled": true, + "dev": 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, + "dev": true + }, + "oauth-sign": { + "version": "0.8.2", + "bundled": true, + "dev": true, + "optional": true + }, + "object-assign": { + "version": "4.1.1", + "bundled": true, + "dev": true, + "optional": true + }, + "once": { + "version": "1.4.0", + "bundled": true, + "dev": true, + "requires": { + "wrappy": "1.0.2" + } + }, + "os-homedir": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "os-tmpdir": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "osenv": { + "version": "0.1.4", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, + "performance-now": { + "version": "0.2.0", + "bundled": true, + "dev": true, + "optional": true + }, + "process-nextick-args": { + "version": "1.0.7", + "bundled": true, + "dev": true + }, + "punycode": { + "version": "1.4.1", + "bundled": true, + "dev": true, + "optional": true + }, + "qs": { + "version": "6.4.0", + "bundled": true, + "dev": true, + "optional": true + }, + "rc": { + "version": "1.2.1", + "bundled": true, + "dev": 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, + "dev": true, + "optional": true + } + } + }, + "readable-stream": { + "version": "2.2.9", + "bundled": true, + "dev": 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, + "dev": 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, + "dev": true, + "requires": { + "glob": "7.1.2" + } + }, + "safe-buffer": { + "version": "5.0.1", + "bundled": true, + "dev": true + }, + "semver": { + "version": "5.3.0", + "bundled": true, + "dev": true, + "optional": true + }, + "set-blocking": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "signal-exit": { + "version": "3.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "sntp": { + "version": "1.0.9", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "hoek": "2.16.3" + } + }, + "sshpk": { + "version": "1.13.0", + "bundled": true, + "dev": 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, + "dev": true, + "optional": true + } + } + }, + "string_decoder": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "requires": { + "safe-buffer": "5.0.1" + } + }, + "string-width": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + }, + "stringstream": { + "version": "0.0.5", + "bundled": true, + "dev": true, + "optional": true + }, + "strip-ansi": { + "version": "3.0.1", + "bundled": true, + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, + "strip-json-comments": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "tar": { + "version": "2.2.1", + "bundled": true, + "dev": true, + "requires": { + "block-stream": "0.0.9", + "fstream": "1.0.11", + "inherits": "2.0.3" + } + }, + "tar-pack": { + "version": "3.4.0", + "bundled": true, + "dev": 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, + "dev": true, + "optional": true, + "requires": { + "punycode": "1.4.1" + } + }, + "tunnel-agent": { + "version": "0.6.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "safe-buffer": "5.0.1" + } + }, + "tweetnacl": { + "version": "0.14.5", + "bundled": true, + "dev": true, + "optional": true + }, + "uid-number": { + "version": "0.0.6", + "bundled": true, + "dev": true, + "optional": true + }, + "util-deprecate": { + "version": "1.0.2", + "bundled": true, + "dev": true + }, + "uuid": { + "version": "3.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "verror": { + "version": "1.3.6", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "extsprintf": "1.0.2" + } + }, + "wide-align": { + "version": "1.1.2", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "string-width": "1.0.2" + } + }, + "wrappy": { + "version": "1.0.2", + "bundled": true, + "dev": true + } + } + }, "fstream": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", From 4a9439ecf6299e4b74de7fc94d558ddfc0f17057 Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Fri, 6 Oct 2017 10:06:50 +0100 Subject: [PATCH 092/103] Remove column from user profile --- src/pages/account/Profile.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/pages/account/Profile.vue b/src/pages/account/Profile.vue index 57d78008..5dbd1c42 100644 --- a/src/pages/account/Profile.vue +++ b/src/pages/account/Profile.vue @@ -50,8 +50,6 @@
- -
From 60e9703869964bbd687119de7fcd8674345b7cce Mon Sep 17 00:00:00 2001 From: Alex Mendes Date: Fri, 6 Oct 2017 11:12:37 +0100 Subject: [PATCH 093/103] Remove favourites card --- src/pages/account/Profile.vue | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/pages/account/Profile.vue b/src/pages/account/Profile.vue index 5dbd1c42..eda4a5db 100644 --- a/src/pages/account/Profile.vue +++ b/src/pages/account/Profile.vue @@ -29,12 +29,6 @@
- - - - -
@@ -58,7 +51,6 @@ import isEmpty from 'lodash/isEmpty' import pybossaApi from '@/api/pybossa' import UserProfileCard from '@/components/user/ProfileCard' -import UserFavouritesCard from '@/components/user/FavouritesCard' import ProjectContribButton from '@/components/buttons/ProjectContrib' import Loading from '@/components/Loading' @@ -69,8 +61,14 @@ export default { projects: [], tableFields: { name: { label: 'Name' }, - n_volunteers: { label: 'Volunteers' }, - overall_progress: { label: 'Progress' } + n_volunteers: { + label: 'Volunteers', + class: 'text-center' + }, + overall_progress: { + label: 'Progress', + class: 'text-center' + } } } }, @@ -83,7 +81,6 @@ export default { components: { UserProfileCard, - UserFavouritesCard, ProjectContribButton, Loading }, From b5c631b53c335aa8277c98bf1db8e155ca3d869f Mon Sep 17 00:00:00 2001 From: Alexander Mendes Date: Mon, 9 Oct 2017 10:50:38 +0100 Subject: [PATCH 094/103] Update libcrowds-viewer --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 42f9796a..1c64f80e 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "jump.js": "^1.0.2", "leaflet": "^1.2.0", "leaflet.markercluster": "^1.0.6", - "libcrowds-viewer": "^3.2.1", + "libcrowds-viewer": "^3.3.0", "lodash": "^4.17.4", "marked": "^0.3.6", "moment": "^2.18.1", From 2e185b9e4e32b23da85e19007f5af1836934a401 Mon Sep 17 00:00:00 2001 From: Alexander Mendes Date: Mon, 9 Oct 2017 10:51:18 +0100 Subject: [PATCH 095/103] Add show-help-on-mount to libcrowds-viewer --- src/components/presenters/LibcrowdsViewer.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/presenters/LibcrowdsViewer.vue b/src/components/presenters/LibcrowdsViewer.vue index 4792cf6a..be43fcec 100644 --- a/src/components/presenters/LibcrowdsViewer.vue +++ b/src/components/presenters/LibcrowdsViewer.vue @@ -9,6 +9,7 @@ :message-bus="messageBus" :browsable="false" :selections-editable="false" + show-help-on-mount @submit="onSubmit" @taskliked="onTaskLiked"> From 5b7374bec8ba8bde083b2a696d56789383b977cb Mon Sep 17 00:00:00 2001 From: Alexander Mendes Date: Mon, 9 Oct 2017 10:52:01 +0100 Subject: [PATCH 096/103] Remove broken message bus --- src/components/presenters/LibcrowdsViewer.vue | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/components/presenters/LibcrowdsViewer.vue b/src/components/presenters/LibcrowdsViewer.vue index be43fcec..02974931 100644 --- a/src/components/presenters/LibcrowdsViewer.vue +++ b/src/components/presenters/LibcrowdsViewer.vue @@ -6,7 +6,6 @@ :buttons="buttons" :taskOpts="taskOpts" :navigation="navigation" - :message-bus="messageBus" :browsable="false" :selections-editable="false" show-help-on-mount @@ -18,17 +17,10 @@