Merge pull request #437 from LibCrowds/dev

v1.0.0-beta.4

.babelrc

@@ -6,17 +6,22 @@
         "browsers": ["> 1%", "last 2 versions", "not ie <= 8"]
       }
     }],
-    "stage-2"
+    "stage-2",
+    "backpack-core/babel"
   ],
-  "plugins": [ "transform-runtime"],
+  "plugins": ["transform-runtime"],
   "env": {
-    "test": {
-      "presets": ["env", "stage-2"],
+    "testing": {
+      "presets": [
+        "env",
+        "stage-2",
+        "backpack-core/babel"
+      ],
       "plugins": [
         ["module-resolver", {
-          "root": ["./src"],
           "alias": {
-            "@": "./src"
+            "~": "./",
+            "@": "./"
           }
         }]
       ]

.eslintrc.js

@@ -1,5 +1,3 @@
-// http://eslint.org/docs/user-guide/configuring
-
 module.exports = {
   root: true,
   parser: 'babel-eslint',
@@ -8,20 +6,23 @@ module.exports = {
   },
   env: {
     browser: true,
+    node: true,
+    'jest/globals': true
   },
-  // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
   extends: 'standard',
   // required to lint *.vue files
   plugins: [
-    'html'
+    'html',
+    'jest'
   ],
   // add your custom rules here
-  'rules': {
+  rules: {
     // allow paren-less arrow functions
     'arrow-parens': 0,
     // allow async-await
     'generator-star-spacing': 0,
     // allow debugger during development
     'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
-  }
+  },
+  globals: {}
 }

.gitignore

@@ -1,13 +1,27 @@
-.DS_Store
-node_modules/
-dist/
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
+# dependencies
+node_modules
+
+# logs
+npm-debug.log
+
+# Nuxt build
+.nuxt
+
+# Nuxt generate
+dist
+
+# Backpack build
+build
+
+# Coverage
 test/unit/coverage
-test/e2e/reports
-selenium-debug.log
-src/siteConfig.js
-src/custom/*
-deploy-key
+
+# Config
+local.config.js
+
+# docs
 _book/*
+
+# PWA
+sw.*
+workbox-*

.travis.yml

@@ -1,5 +1,7 @@
 sudo: required
 
+dist: trusty
+
 language: node_js
 
 node_js:
@@ -12,12 +14,8 @@ before_install:
 install:
 - npm install
 
-before_script:
-- cp src/siteConfig.js.tmpl src/siteConfig.js
-
 script:
-- npm run lint
-- npm run unit
+- npm run test
 
 after_success:
 - bash bin/deploy.sh

LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2017 
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

README.md

@@ -1,12 +1,25 @@
-# vue-pybossa-frontend
+# LibCrowds
 
-[![Build Status](https://travis-ci.org/LibCrowds/vue-pybossa-frontend.svg?branch=master)](https://travis-ci.org/LibCrowds/vue-pybossa-frontend)
+[![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)
 
-> A Vue.js frontend for PyBossa (>=2.7.2).
+> A Vue.js frontend for PyBossa (>=2.8.0).
 
-Configurable PyBossa frontend with a microsite-based structure; as used by LibCrowds:
+The LibCrowds package is a Vue.js UI that communicates with a PYBOSSA backend to present crowdsourcing projects using a microsite-based structure.
 
-[![Example of vue-pybossa-frontend](./docs/assets/site-homepage.png?raw=true "Example of vue-pybossa-frontend")](https://www.libcrowds.com)
+[![The LibCrowds website](./docs/assets/site-homepage.png?raw=true "The LibCrowds website")](https://www.libcrowds.com)
 
-[**Read the documentation**](https://libcrowds.gitbooks.io/vue-pybossa-frontend/content/)
+## Build Setup
+
+``` bash
+# install dependencies
+$ npm install
+
+# serve with hot reload at localhost:3000
+$ npm run dev
+
+# build for production and launch server
+$ npm start
+```
+
+[**Read the documentation**](https://libcrowds.gitbooks.io/libcrowds/content/)

assets/style/main.scss

@@ -0,0 +1,16 @@
+@import url(https://fonts.googleapis.com/css?family=Varela+Round:300,400,700);
+@import url(https://fonts.googleapis.com/css?family=Roboto:300,400,700);
+
+@import 'settings';
+
+@import
+  '~bootstrap/scss/bootstrap',
+  '~bootstrap-vue/dist/bootstrap-vue',
+  '~chartist/dist/scss/chartist',
+  'partials/cards',
+  'partials/charts',
+  'partials/images',
+  'partials/modals',
+  'partials/tables',
+  'partials/labels'
+;

src/assets/style/partials/_cards.scss → assets/style/partials/_cards.scss

@@ -1,10 +1,10 @@
 .card {
-  .card-body {
-    overflow-y: auto;
-  }
-
   .card-header {
     font-family: $headings-font-family;
     background-color: $white;
   }
+
+  .tab-content.card-body {
+    padding: 0;
+  }
 }

assets/style/partials/_images.scss

@@ -0,0 +1,9 @@
+.placeholder {
+  height: 100%;
+  width: 100%;
+  background-color: $gray-100;
+  color: $gray-600;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}

assets/style/partials/_labels.scss

@@ -0,0 +1,14 @@
+label {
+  &.label-muted {
+    font-weight: 300;
+    font-size: $font-size-sm;
+    color: $gray-600;
+    margin: 1.25rem 0 .625rem;
+  }
+
+  &.toggle-label {
+    font-family: $font-family-base;
+    font-weight: 400;
+    font-size: $font-size-sm;
+  }
+}

assets/style/partials/_tables.scss

@@ -0,0 +1,34 @@
+.table {
+  display: table;
+  font-size: $font-size-sm;
+  margin-bottom: 0;
+  background-color: $white;
+  border: $table-border-width solid $table-border-color;
+  overflow-y: auto;
+
+  th {
+    font-weight: 400;
+    text-transform: uppercase;
+    color: $text-muted;
+    border-top: none;
+  }
+
+  td {
+    vertical-align: middle;
+  }
+
+  .markdown {
+    h1, h2, h3, h4, h5, h6 {
+      font-family: $font-family-base;
+      margin-bottom: 5px;
+      font-size: $font-size-sm;
+      text-transform: uppercase;
+      font-weight: 600;
+    }
+
+    p {
+      margin: 0;
+      margin-bottom: 5px;
+    }
+  }
+}

src/assets/style/main.scss → assets/style/settings.scss

@@ -1,11 +1,9 @@
-@import url(https://fonts.googleapis.com/css?family=Varela+Round:300,400,700);
-@import url(https://fonts.googleapis.com/css?family=Roboto:300,400,700);
-
 /* Text */
 $headings-font-family:             'Varela Round', sans-serif;
 $font-family-base:                 'Roboto', sans-serif;
 $headings-font-weight:             400;
 $line-height-base:                 1.6;
+$font-size-xs:                     0.75rem;
 
 /* Colors */
 $blue:                             #2589BD !default;
@@ -52,8 +50,10 @@ $btn-border-radius-sm:             0px;
 /* Navbars */
 $navbar-light-color:               rgba($black, .7);
 $app-navbar-height:                50px;
+$collection-navbar-height:         65px;
 $navbar-dark-color:                $white;
 $navbar-dark-toggler-border-color: transparent;
+$sidebar-width:                    250px;
 
 /* Tables */
 $table-cell-padding:               .75rem 1.25rem;
@@ -93,11 +93,8 @@ $hamburger-types:                  (collapse, arrow);
 $fa-font-path:                     '~font-awesome/fonts';
 
 /* Light Gallery */
-$lg-path-fonts:                    '~lightgallery/src/fonts';
-$lg-path-images:                   '~lightgallery/src/img';
-
-/* SpinKit */
-$spinkit-spinner-color:            $blue;
+$lg-path-fonts:                    '@/lightgallery/src/fonts';
+$lg-path-images:                   '@/lightgallery/src/img';
 
 /* Chartist */
 $ct-series-colors:
@@ -119,13 +116,7 @@ $ct-series-colors:
 ;
 
 @import
-  '~bootstrap/scss/bootstrap',
-  '~bootstrap-vue/dist/bootstrap-vue.css',
-  '~sweetalert2/dist/sweetalert2.css',
-  '~chartist/dist/scss/chartist',
-  '~chartist-plugin-tooltips/dist/chartist-plugin-tooltip',
-  'partials/modals',
-  'partials/tables',
-  'partials/cards',
-  'partials/charts'
+  '~bootstrap/scss/functions',
+  '~bootstrap/scss/variables',
+  '~bootstrap/scss/mixins'
 ;

backpack.config.js

@@ -0,0 +1,6 @@
+module.exports = {
+  webpack: (config, options, webpack) => {
+    config.entry.main = './server/index.js'
+    return config
+  }
+}

bin/README.md

@@ -1,7 +1,7 @@
 # Deployments
 
-We're running a continuous deployment process to push vue-pybossa-frontend
-updates out to all specified LibCrowds servers.
+We're running a continuous deployment process to push LibCrowds
+updates out to all specified servers.
 
 Here are some notes to help configure a new server:
 

bin/configure.sh

@@ -3,7 +3,7 @@
 SETTINGS="https://github.com/LibCrowds/libcrowds-frontend-settings"
 
 # Configure site
-rm src/siteConfig.js
-rm -rf src/custom/*/
-git clone $SETTINGS src/custom/settings
-echo "module.exports = require('@/custom/settings/siteConfig.js')" >> src/siteConfig.js
+rm local.config.js
+rm -rf custom/*/
+git clone $SETTINGS custom/settings
+echo "module.exports = require('./custom/settings/siteConfig.js')" >> local.config.js

bin/deploy.sh

@@ -5,9 +5,6 @@ STAGING='dev.libcrowds.com'
 
 if [ "${TRAVIS_BRANCH}" == "master" -a "$TRAVIS_PULL_REQUEST" = "false" ] || [ "${TRAVIS_BRANCH}" == "dev" -a "$TRAVIS_PULL_REQUEST" = "false" ] ; then
 
-  # Configure
-  bin/configure.sh
-
   # Build
   npm run build
 
@@ -26,7 +23,7 @@ if [ "${TRAVIS_BRANCH}" == "master" -a "$TRAVIS_PULL_REQUEST" = "false" ] || [ "
 
   git config user.name "Alex Mendes"
   git config user.email "[email protected]"
-  git add dist/*
+  git add .nuxt/dist/*
   git commit -m "Deployment"
 
   # Set up permissions
@@ -44,5 +41,5 @@ if [ "${TRAVIS_BRANCH}" == "master" -a "$TRAVIS_PULL_REQUEST" = "false" ] || [ "
   # Deploy
   git push -f deploy master
 else
-  echo "Not deploying as this is not the master or the development branch"
+  echo "Not deploying as this is not the master or development branch"
 fi