Merge pull request #482 from LibCrowds/dev

Dev

README.md

@@ -1,7 +1,6 @@
 # LibCrowds
 
 [![Greenkeeper badge](https://badges.greenkeeper.io/LibCrowds/libcrowds.svg)](https://greenkeeper.io/)
-
 [![Build Status](https://travis-ci.org/LibCrowds/libcrowds.svg?branch=master)](https://travis-ci.org/LibCrowds/libcrowds)
 [![DOI](https://zenodo.org/badge/92406558.svg)](https://zenodo.org/badge/latestdoi/92406558)
 

assets/style/main.scss

@@ -5,7 +5,6 @@
 
 @import
   '~bootstrap/scss/bootstrap',
-  '~bootstrap-vue/dist/bootstrap-vue',
   '~chartist/dist/scss/chartist',
   'partials/cards',
   'partials/charts',

components/modals/Leaderboard.vue

@@ -2,7 +2,6 @@
   <b-modal
     :id="modalId"
     title="Leaderboard"
-    hide-header-close
     ok-only>
     <b-table
       responsive

components/navbars/App.vue

@@ -16,7 +16,7 @@
     </span>
 
     <span class="app-navbar-right border-bottom" v-if="loggedIn">
-      <b-nav is-nav-bar right>
+      <b-navbar-nav right>
 
         <slot name="right"></slot>
 
@@ -71,12 +71,12 @@
           <div role="separator" class="dropdown-divider"></div>
           <b-dropdown-item v-on:click="signout">Sign Out</b-dropdown-item>
         </b-nav-item-dropdown>
-      </b-nav>
+      </b-navbar-nav>
 
       <!-- Sign in/sign up -->
     </span>
     <span class="app-navbar-right" v-else>
-      <b-nav id="sign-in-up" is-nav-bar right>
+      <b-navbar-nav id="sign-in-up" right>
         <b-nav-item
           exact
           :to="{
@@ -95,7 +95,7 @@
           }">
           Sign up
         </b-nav-item>
-      </b-nav>
+      </b-navbar-nav>
     </span>
   </b-navbar>
 </template>

components/navbars/Collection.vue

@@ -40,7 +40,7 @@
       <b-collapse is-nav id="main-nav-collapse" ref="sidebar">
 
         <!-- Main menu -->
-        <b-nav is-nav-bar>
+        <b-navbar-nav>
           <b-nav-item
             exact
             :to="{
@@ -90,9 +90,9 @@
             @click="toggleCollapsibleSidebar">
             Data
           </b-nav-item>
-        </b-nav>
+        </b-navbar-nav>
 
-        <b-nav is-nav-bar v-if="loggedIn">
+        <b-navbar-nav v-if="loggedIn">
 
           <announcements></announcements>
 
@@ -147,32 +147,30 @@
             <div role="separator" class="dropdown-divider"></div>
             <b-dropdown-item v-on:click="signout">Sign Out</b-dropdown-item>
           </b-nav-item-dropdown>
-        </b-nav>
+        </b-navbar-nav>
 
         <!-- Sign in/sign up -->
-        <b-nav is-nav-bar v-else>
-          <b-nav is-nav-bar>
-            <b-nav-item
-              exact
-              :to="{
-                name: 'account-signin',
-                query: {
-                  next: $route.path
-                }
-              }">
-              Sign in
-            </b-nav-item>
-            <b-nav-item
-              exact
-              class="nav-button"
-              :to="{
-                name: 'account-register'
-              }">
-              Sign up
-            </b-nav-item>
-          </b-nav>
+        <b-navbar-nav v-else>
+          <b-nav-item
+            exact
+            :to="{
+              name: 'account-signin',
+              query: {
+                next: $route.path
+              }
+            }">
+            Sign in
+          </b-nav-item>
+          <b-nav-item
+            exact
+            class="nav-button"
+            :to="{
+              name: 'account-register'
+            }">
+            Sign up
+          </b-nav-item>
+        </b-navbar-nav>
 
-        </b-nav>
       </b-collapse>
     </div>
   </b-navbar>

nuxt.config.js

@@ -26,10 +26,10 @@ const config = {
   ],
   build: {
     vendor: [
-      'bootstrap-vue',
       '~/plugins/filters.js',
       '~/plugins/libcrowds-viewer',
       '~/plugins/notifications',
+      'bootstrap-vue',
       'progressbar.js',
       'vue-awesome',
       'vue-chartist',
@@ -78,7 +78,6 @@ const config = {
     }
   },
   plugins: [
-    { src: '~/plugins/bootstrap-vue' },
     { src: '~/plugins/filters' },
     { src: '~/plugins/libcrowds-viewer', ssr: false },
     { src: '~/plugins/notifications', ssr: false },
@@ -98,7 +97,8 @@ const config = {
   modules: [
     '@nuxtjs/axios',
     '@nuxtjs/pwa',
-    '@nuxtjs/proxy'
+    '@nuxtjs/proxy',
+    ['bootstrap-vue/nuxt', { css: false }]
   ],
   axios: {
     baseURL: localConfig.pybossa.host,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "libcrowds",
-  "version": "1.0.0-beta.5",
+  "version": "1.0.0-beta.6",
   "description": "A Vue.js frontend for PYBOSSA.",
   "author": "Alex Mendes <[email protected]>",
   "private": true,
@@ -19,7 +19,7 @@
     "@nuxtjs/proxy": "^1.1.2",
     "@nuxtjs/pwa": "^1.0.2",
     "bootstrap": "4.0.0-beta.2",
-    "bootstrap-vue": "^1.0.0-beta.9",
+    "bootstrap-vue": "^1.0.2",
     "capitalize": "^1.0.0",
     "chartist-plugin-legend": "^0.6.2",
     "chartist-plugin-tooltips": "0.0.17",
@@ -32,11 +32,10 @@
     "git-rev-sync": "^1.9.1",
     "hamburgers": "^0.9.1",
     "izitoast": "^1.1.5",
-    "libcrowds-viewer": "^3.4.5",
+    "libcrowds-viewer": "^3.4.7",
     "lodash": "^4.17.4",
     "moment": "^2.19.1",
     "nuxt": "1.0.0-rc11",
-    "popper.js": "^1.12.5",
     "progressbar.js": "^1.0.1",
     "raven": "^2.2.1",
     "raven-js": "^3.19.1",