Merge pull request #473 from LibCrowds/greenkeeper/initial

Update dependencies to enable Greenkeeper 🌴
LibCrowds · Nov 7, 2017 · 9f77d0c · 9f77d0c
2 parents 345a30a + 04e678e
commit 9f77d0c
Show file tree

Hide file tree

Showing 66 changed files with 2,765 additions and 2,368 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,21 +1,24 @@
 sudo: required
-
 dist: trusty
-
 language: node_js
-
 node_js:
-- '7'
-
+- '8'
 before_install:
+# Remove hte line below once node 9 moves to LTS (and so does this repo)
+- npm install -g npm@5
+- npm install -g greenkeeper-lockfile@1
+# Deploy key used to push to the server
 - openssl aes-256-cbc -K $encrypted_1cd83addbd20_key -iv $encrypted_1cd83addbd20_iv
   -in deploy-key.enc -out deploy-key -d
-
 install:
 - npm install
-
+before_script:
+- greenkeeper-lockfile-upload
 script:
 - npm run test
-
 after_success:
 - bash bin/deploy.sh
+env:
+  global:
+    # GH_TOKEN used for greenkeeper-lockfile
+    secure: iMLVTgpiRtJ0OmJwJmAPEnvPCRTxM9UXxLR1HQHHhhJRLpWWUH89wmiNqpk8qnfwL+IWxkgquuY9RyQYhGINwMfswsBdP8eIVu1iWg0qwGhbdhfiV3CiMm7rxDz02WoqyOcdpm2RHRGo8Hd1YJ2avJn5TBtkqlYDhNO14wBSAmNp55KMrHqC6wAtAR2V/SASiO6zLrm0yrE/K6kkjRjpe8TY6VdTfuK3EnUDA4HjJZqcC0131214IAVcYxLplTJVrb2qBPwHOyqyQxV2S6eWIJthEQ4Qr1aTVpPAbDbLEbJdxbU3VkA0Jiz8acB3f3yN/DmHVHO4585WepJVIw+oWm4rKbfSHCyR2CENMNF/Hkyw4UtyYwsQTHlR5fF2+QyIbsO4f0fAC3poK3AIg1OanwEgaN5TWti2ed/Hy88ODRkxrH+tynhDVSMA00KdgZ82JGFQ/Rp1AdCvJWWx0eWsXg/Xxzbs2M9zIFzeu57a6onXla743tOtdcH0qu7EdOnUfg2dXiied/+xLak1dJlOHu1dhgLcRxs9aBzE0LBWswpO9v9Mi8HA067NvCy0e8bcQHWHJQ0zLHYDqIg9rLnr8lq+d1T+IwgqMx7dHvxlXM1u6o17Li3WdV7//McwzeSIl/UEKKRGICTI/D0vQOQhZhnlw0jMfd6xqyUtRJxNRoE=
diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 # LibCrowds
 
+[![Greenkeeper badge](https://badges.greenkeeper.io/LibCrowds/libcrowds.svg)](https://greenkeeper.io/)
+
 [![Build Status](https://travis-ci.org/LibCrowds/libcrowds.svg?branch=master)](https://travis-ci.org/LibCrowds/libcrowds)
 [![DOI](https://zenodo.org/badge/92406558.svg)](https://zenodo.org/badge/latestdoi/92406558)
 

diff --git a/assets/style/partials/_transitions.scss b/assets/style/partials/_transitions.scss
@@ -22,3 +22,14 @@
   transform: translateY(20px);
   opacity: 0;
 }
+
+.slide-in-enter-active,
+.slide-in-leave-active {
+  transition: opacity 350ms ease-in;
+}
+
+.slide-in-enter,
+.slide-in-leave-to {
+  opacity: 0;
+}
+
diff --git a/components/avatars/Small.vue b/components/avatars/Small.vue
@@ -0,0 +1,75 @@
+<template>
+  <div class="small-avatar">
+    <img
+      v-if="src"
+      :src="src"
+      size
+      class="img-fluid rounded-circle"
+      :onerror="info = null">
+    </img>
+    <div
+      v-else
+      class="img-fluid rounded-circle placeholder">
+      <icon name="question"></icon>
+    </div>
+  </div>
+</template>
+
+<script>
+import localConfig from '@/local.config'
+import 'vue-awesome/icons/picture-o'
+
+export default {
+  data () {
+    return {
+      info: this.domainObject.info
+    }
+  },
+
+  props: {
+    domainObject: {
+      type: Object,
+      required: true
+    }
+  },
+
+  computed: {
+    src () {
+      const host = localConfig.pybossa.host
+      if (!this.info) {
+        return null
+      } else if (this.info.avatar_url) {
+        return host + this.info.avatar_url
+      } else if (this.info.thumbnail_url) {
+        return host + this.info.thumbnail_url
+      } else if (this.info.media_url) {
+        return host + this.info.media_url
+      }
+      return null
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+@import '~assets/style/settings';
+
+.small-avatar {
+  overflow: hidden;
+  max-width: 3rem;
+  max-height: 3rem;
+  min-width: 3rem;
+  min-height: 3rem;
+
+  &>* {
+    max-width: 3rem;
+    max-height: 3rem;
+    min-width: 3rem;
+    min-height: 3rem;
+  }
+
+  .placeholder {
+    border: 1px solid $gray-300;
+  }
+}
+</style>
diff --git a/components/cards/Project.vue b/components/cards/Project.vue
@@ -3,6 +3,7 @@
     no-body
     class="project-card">
     <nuxt-link
+      :event="linkEvent"
       :to="{
         name: 'collection-short_name-projects-id-presenter',
         params: {
@@ -21,6 +22,7 @@
     <div class="card-body project-details p-0">
       <div class="card-title mb-0">
         <nuxt-link
+          :event="linkEvent"
           :to="{
             name: 'collection-short_name-projects-id-presenter',
             params: {
@@ -58,7 +60,7 @@
           {{ collection.info.terminology.task | pluralize(project.n_tasks) }}
         </span>
         <span class="card-stat text-muted mb-2 mb-lg-0">
-          <icon name="users"></icon> {{ project.n_volunteers | intComma }}
+          <icon name="users"></icon>Join {{ project.n_volunteers | intComma }}
           {{ 'volunteer' | pluralize(project.n_volunteers) }}
         </span>
         <div class="footer-buttons">
@@ -121,6 +123,12 @@ export default {
     ProjectAvatar
   },
 
+  computed: {
+    linkEvent () {
+      return this.project.overall_progress < 100 ? 'click' : null
+    }
+  },
+
   mounted () {
     if (process.browser) {
       const bar = new ProgressBar.Line(`#${this.progressBarId}`, {

diff --git a/components/footers/App.vue b/components/footers/App.vue
@@ -54,6 +54,9 @@
       <section class="d-none d-lg-block">
         <h5 class="list-title">Help</h5>
         <ul class="list-unstyled">
+          <li class="list-item" v-if="localConfig.docs">
+            <a :href="localConfig.docs" target="_blank">Docs</a>
+          </li>
           <li class="list-item">
             <nuxt-link
               :to="{

diff --git a/components/forms/PybossaForm.vue b/components/forms/PybossaForm.vue
@@ -153,6 +153,11 @@ export default {
       if (!valid) {
         this.alert = 'Please correct the errors'
         this.status = 'error'
+        this.notify({
+          type: 'warn',
+          title: 'Invalid form data',
+          message: this.alert
+        })
       }
       return valid
     },
@@ -194,6 +199,12 @@ export default {
           return
         } else if (r.data.status === 'success') {
           this.handleSuccess(r.data)
+        } else if (typeof r.data.status === 'undefined') {
+          this.notify({
+            type: 'success',
+            title: 'Success',
+            message: ''
+          })
         }
         this.flash(r.data)
       }).catch(err => {

diff --git a/components/navbars/App.vue b/components/navbars/App.vue
@@ -18,6 +18,8 @@
     <span class="app-navbar-right border-bottom" v-if="loggedIn">
       <b-nav is-nav-bar right>
 
+        <slot name="right"></slot>
+
         <!-- Hide on small screens until the new menu is in place -->
         <announcements class="d-none d-lg-block"></announcements>
 
@@ -48,13 +50,19 @@
             <div role="separator" class="dropdown-divider"></div>
             <b-dropdown-item
               :to="{
-                name: 'project-open'
+                name: 'admin-project-open'
               }">
               Project Admin
             </b-dropdown-item>
             <b-dropdown-item
               :to="{
-                name: 'admin-dashboard'
+                name: 'admin-collection'
+              }">
+              Collection Admin
+            </b-dropdown-item>
+            <b-dropdown-item
+              :to="{
+                name: 'admin-site-dashboard'
               }">
               Site Admin
             </b-dropdown-item>
@@ -174,6 +182,7 @@ export default {
     display: flex;
     align-items: center;
     border-bottom: 1px solid $gray-300;
+    padding: 0 0.75rem;
   }
 
   .app-navbar-right {
@@ -206,8 +215,10 @@ export default {
   .nav-item {
     padding: 0 0.75rem;
     color: inherit;
+    display: inline-block;
 
     @include media-breakpoint-up(sm) {
+      display: block;
       padding: 0 1.25rem;
     }
 
@@ -241,7 +252,11 @@ export default {
   }
 
   .dropdown {
-    padding: 0 1.75rem;
+    padding: 0 0.75rem;
+
+    @include media-breakpoint-up(sm) {
+      padding: 0 1.75rem;
+    }
   }
 
   .dropdown-menu {

diff --git a/components/navbars/Collection.vue b/components/navbars/Collection.vue
@@ -125,13 +125,19 @@
               <div role="separator" class="dropdown-divider"></div>
               <b-dropdown-item
                 :to="{
-                  name: 'project-open'
+                  name: 'admin-project-open'
                 }">
                 Project Admin
               </b-dropdown-item>
+              <b-dropdown-item
+              :to="{
+                name: 'admin-collection'
+              }">
+              Collection Admin
+              </b-dropdown-item>
               <b-dropdown-item
                 :to="{
-                  name: 'admin-dashboard'
+                  name: 'admin-site-dashboard'
                 }"
                 @click="toggleCollapsibleSidebar">
                 Site Admin