From d8d6141d3536665d98f84b5d187e8f67dc5bf961 Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Tue, 30 Oct 2018 13:33:26 +0100
Subject: [PATCH 001/213] Updated role config with method for extracting role
 names

---
 config/shared/role.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/config/shared/role.js b/config/shared/role.js
index a4333a0f2..32ab7b352 100644
--- a/config/shared/role.js
+++ b/config/shared/role.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const isPlainObject = require('lodash/isPlainObject');
 const values = require('lodash/values');
 
 const userRoles = { USER: 'USER', ADMIN: 'ADMIN', INTEGRATION: 'INTEGRATION' };
@@ -12,5 +13,9 @@ module.exports = {
   user: userRoles,
   course: courseRoles,
   userRoleRegex,
-  courseRoleRegex
+  courseRoleRegex,
+  getRoleNames(type) {
+    const roles = this[type];
+    return isPlainObject(roles) ? values(roles) : [];
+  }
 };

From 090aae4422c3ea3cb2ebbd5231542bf4f3f8283c Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Tue, 30 Oct 2018 13:34:09 +0100
Subject: [PATCH 002/213] Added backend logic for upserting and deleting users

---
 server/user/index.js           |  7 +++++--
 server/user/user.controller.js | 26 ++++++++++++++++++++------
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/server/user/index.js b/server/user/index.js
index efe8b1b11..4577bca84 100644
--- a/server/user/index.js
+++ b/server/user/index.js
@@ -1,14 +1,17 @@
 'use strict';
 
+const { authorize } = require('../shared/auth/mw');
 const ctrl = require('./user.controller');
 const model = require('./user.model');
 const router = require('express-promise-router')();
 
 router
   .post('/users/login', ctrl.login)
-  .get('/users', ctrl.index)
+  .get('/users', authorize(), ctrl.index)
+  .post('/users', authorize(), ctrl.upsert)
   .post('/users/forgotPassword', ctrl.forgotPassword)
-  .post('/users/resetPassword', ctrl.resetPassword);
+  .post('/users/resetPassword', ctrl.resetPassword)
+  .delete('/users/:id', ctrl.remove);
 
 module.exports = {
   model,
diff --git a/server/user/user.controller.js b/server/user/user.controller.js
index 5a41ed03f..cefe0cf1e 100644
--- a/server/user/user.controller.js
+++ b/server/user/user.controller.js
@@ -1,13 +1,25 @@
 'use strict';
 
 const { createError, validationError } = require('../shared/error/helpers');
-const { NOT_FOUND } = require('http-status-codes');
+const { NO_CONTENT, NOT_FOUND } = require('http-status-codes');
+const { role } = require('../../config/shared');
 const { User } = require('../shared/database');
 
-function index(req, res) {
-  const attributes = ['id', 'email', 'role'];
-  return User.findAll({ attributes })
-    .then(users => res.json({ data: users }));
+function index({ query: { roleType } }, res) {
+  let options = { attributes: ['id', 'email', 'role'], raw: true };
+  if (roleType) options.where = { role: { $in: role.getRoleNames(roleType) } };
+  return User.findAll(options).then(data => res.json({ data }));
+}
+
+function upsert({ body: { email, role } }, res) {
+  return User.findOne({ where: { email }, paranoid: false })
+    .then(user => user ? user.update({ role }) : User.invite({ email, role }))
+    .then(user => user.deletedAt ? user.restore() : user)
+    .then(data => res.json({ data }));
+}
+
+function remove({ params: { id } }, res) {
+  return User.destroy({ where: { id } }).then(() => res.sendStatus(NO_CONTENT));
 }
 
 function forgotPassword({ body }, res) {
@@ -18,7 +30,7 @@ function forgotPassword({ body }, res) {
     .then(() => res.end());
 }
 
-function resetPassword({ body, params }, res) {
+function resetPassword({ body }, res) {
   const { password, token } = body;
   return User.find({ where: { token } })
     .then(user => user || createError(NOT_FOUND, 'Invalid token'))
@@ -46,6 +58,8 @@ function login({ body }, res) {
 
 module.exports = {
   index,
+  upsert,
+  remove,
   forgotPassword,
   resetPassword,
   login

From 913d4d5b34ce6d62373fcf11ca930af251446d64 Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Tue, 30 Oct 2018 13:41:23 +0100
Subject: [PATCH 003/213] Added UI for listing, upserting and removing users

---
 client/api/system.js                          |  21 ++++
 .../system-user-management/AddSystemUser.vue  |  86 +++++++++++++++
 .../system-user-management/SystemUser.vue     |  53 +++++++++
 .../system-user-management/index.vue          | 104 ++++++++++++++++++
 4 files changed, 264 insertions(+)
 create mode 100644 client/api/system.js
 create mode 100644 client/components/system-user-management/AddSystemUser.vue
 create mode 100644 client/components/system-user-management/SystemUser.vue
 create mode 100644 client/components/system-user-management/index.vue

diff --git a/client/api/system.js b/client/api/system.js
new file mode 100644
index 000000000..6870015d9
--- /dev/null
+++ b/client/api/system.js
@@ -0,0 +1,21 @@
+import request from './request';
+
+function getUsers() {
+  const options = { params: { roleType: 'user' } };
+  return request.get('/users', options).then(({ data: { data } }) => data);
+}
+
+function upsertUser(email, data) {
+  const body = { email, ...data };
+  return request.post('/users', body).then(({ data: { data } }) => data);
+}
+
+function removeUser(id) {
+  return request.delete(`/users/${id}`);
+}
+
+module.exports = {
+  getUsers,
+  upsertUser,
+  removeUser
+};
diff --git a/client/components/system-user-management/AddSystemUser.vue b/client/components/system-user-management/AddSystemUser.vue
new file mode 100644
index 000000000..8b02a1a15
--- /dev/null
+++ b/client/components/system-user-management/AddSystemUser.vue
@@ -0,0 +1,86 @@
+<template>
+  <form @submit.prevent="addUser" novalidate>
+    <div class="row">
+      <div class="col-md-7">
+        <input
+          v-validate="'email'"
+          v-model="email"
+          data-vv-delay="0"
+          class="form-control"
+          type="email"
+          name="email"
+          placeholder="Email"/>
+        <div class="email-error">{{ vErrors.first('email') }}</div>
+      </div>
+      <div class="col-lg-4 col-md-3">
+        <multiselect
+          :value="role"
+          :options="roles"
+          :searchable="false"
+          :allowEmpty="false"
+          :trackBy="null"
+          :label="null"
+          @input="newRole => (role = newRole)"
+          placeholder="Select role"
+          class="role-select"/>
+      </div>
+      <div class="col-lg-1 col-md-2">
+        <button
+          :disabled="disableInvite"
+          type="submit"
+          class="btn btn-primary btn-block">
+          Invite
+        </button>
+      </div>
+    </div>
+  </form>
+</template>
+
+<script>
+import { withValidation } from 'utils/validation';
+import Multiselect from '../common/Select';
+
+export default {
+  name: 'add-system-user',
+  mixins: [withValidation()],
+  props: {
+    defaultRole: { type: String, required: true },
+    roles: { type: Array, required: true }
+  },
+  data() {
+    return {
+      email: '',
+      role: ''
+    };
+  },
+  computed: {
+    disableInvite() {
+      return !this.email.trim().length || this.vErrors.has('email');
+    }
+  },
+  methods: {
+    addUser() {
+      const { email, role } = this;
+      this.$emit('add', email, { role });
+      this.reset();
+    },
+    reset() {
+      Object.assign(this, { email: '', role: this.defaultRole });
+    }
+  },
+  mounted() {
+    this.reset();
+  },
+  components: {
+    Multiselect
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.email-error {
+  padding: 3px 0;
+  color: #a94442;
+  text-align: left;
+}
+</style>
diff --git a/client/components/system-user-management/SystemUser.vue b/client/components/system-user-management/SystemUser.vue
new file mode 100644
index 000000000..469ef0176
--- /dev/null
+++ b/client/components/system-user-management/SystemUser.vue
@@ -0,0 +1,53 @@
+<template>
+  <tr class="system-user-row">
+    <td class="email-cell">{{ email }}</td>
+    <td>
+      <multiselect
+        :value="role"
+        :options="roles"
+        :disabled="!canChangeRole"
+        :searchable="false"
+        :allowEmpty="false"
+        :trackBy="null"
+        :label="null"
+        @input="role => $emit('update', { role })"
+        placeholder="Select new role">
+      </multiselect>
+    </td>
+    <td class="text-center">
+      <button @click="$emit('delete')" type="button" class="btn btn-link">
+        <span class="mdi mdi-close"></span>
+      </button>
+    </td>
+  </tr>
+</template>
+
+<script>
+import Multiselect from '../common/Select';
+
+export default {
+  name: 'system-user',
+  props: {
+    email: { type: String, required: true },
+    role: { type: String, required: true },
+    roles: { type: Array, required: true }
+  },
+  data() {
+    return { selectedRole: this.role };
+  },
+  computed: {
+    canChangeRole() {
+      return this.roles.includes(this.role);
+    }
+  },
+  components: {
+    Multiselect
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.system-user-row td {
+  vertical-align: middle;
+}
+</style>
diff --git a/client/components/system-user-management/index.vue b/client/components/system-user-management/index.vue
new file mode 100644
index 000000000..f83a21de6
--- /dev/null
+++ b/client/components/system-user-management/index.vue
@@ -0,0 +1,104 @@
+<template>
+  <div class="system-users-container">
+    <h2>System user management</h2>
+    <loader v-if="showLoader"></loader>
+    <div v-else class="system-users">
+      <add-system-user v-bind="{ defaultRole, roles }" @add="upsertUser"/>
+      <table class="table table-striped table-hover">
+        <thead>
+          <tr>
+            <th>User</th>
+            <th class="role-column">Role</th>
+            <th class="text-center remove-column">Remove from system</th>
+          </tr>
+        </thead>
+        <tbody>
+          <system-user
+            v-for="{ id, email, role } in users"
+            v-bind="{ id, email, role, roles }"
+            :key="id"
+            @update="data => upsertUser(email, data)"
+            @delete="removeUser(id)">
+          </system-user>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getUsers, upsertUser, removeUser } from '../../api/system';
+import { role } from 'shared';
+import AddSystemUser from './AddSystemUser';
+import Loader from '../common/Loader';
+import omit from 'lodash/omit';
+import SystemUser from './SystemUser';
+
+export default {
+  name: 'system-user-management',
+  data() {
+    return {
+      showLoader: true,
+      users: []
+    };
+  },
+  computed: {
+    defaultRole() {
+      return role.user.USER;
+    },
+    roles() {
+      return Object.values(omit(role.user, role.user.INTEGRATION));
+    }
+  },
+  methods: {
+    upsertUser(email, data) {
+      return upsertUser(email, data).then(userData => {
+        let user = this.users.find(it => it.email === email);
+        return user ? Object.assign(user, userData) : this.users.unshift(userData);
+      });
+    },
+    removeUser(id) {
+      return removeUser(id).then(() => {
+        this.users = this.users.filter(user => user.id !== id);
+      });
+    }
+  },
+  created() {
+    getUsers().then(users => Object.assign(this, { users, showLoader: false }));
+  },
+  components: {
+    AddSystemUser,
+    Loader,
+    SystemUser
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.system-users-container {
+  padding: 60px 60px 20px;
+}
+
+h2 {
+  margin: 0 0 20px;
+  padding: 0;
+  color: #444;
+  font-size: 18px;
+  text-align: left;
+}
+
+.system-users {
+  padding: 30px 30px 10px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4);
+  background-color: white;
+
+  .table {
+    margin-top: 30px;
+    text-align: left;
+  }
+}
+
+.role-column, .remove-column {
+  width: 300px;
+}
+</style>

From e3ac8fefaf381c8e50da243651a8104cc91c0423 Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Tue, 30 Oct 2018 13:41:54 +0100
Subject: [PATCH 004/213] Added client side routing for system user management

---
 client/components/common/Navbar.vue |  9 +++++++--
 client/router.js                    | 12 ++++++++----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/client/components/common/Navbar.vue b/client/components/common/Navbar.vue
index 11091217a..8abfd2956 100644
--- a/client/components/common/Navbar.vue
+++ b/client/components/common/Navbar.vue
@@ -9,7 +9,7 @@
       </div>
       <router-link
         v-if="course"
-        :to="{ name: 'course', params: { courseId: course.id }}"
+        :to="{ name: 'course', params: { courseId: course.id } }"
         class="course-title">
         <span class="navbar-acronym">
           <span>{{ courseAcronym }}</span>
@@ -23,6 +23,11 @@
             <span class="icon mdi mdi-menu-down"></span>
           </a>
           <ul class="dropdown-menu">
+            <li v-if="isAdmin">
+              <router-link :to="{ name: 'system-user-management' }">
+                System user management
+              </router-link>
+            </li>
             <li><a @click="logout" href="#">Log out</a></li>
           </ul>
         </li>
@@ -44,7 +49,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['user']),
+    ...mapGetters(['user', 'isAdmin']),
     ...mapGetters(['course'], 'course'),
     courseAcronym() {
       return this.course ? getAcronym(this.course.name) : null;
diff --git a/client/router.js b/client/router.js
index 7f8de109d..106fe493e 100644
--- a/client/router.js
+++ b/client/router.js
@@ -13,6 +13,7 @@ import General from './components/course/Settings/General';
 import Login from './components/auth/Login';
 import Outline from './components/course/Outline';
 import ResetPassword from './components/auth/ResetPassword';
+import SystemUserManagement from './components/system-user-management';
 import TreeView from './components/course/TreeView';
 import UserManagement from './components/course/Settings/UserManagement';
 
@@ -32,9 +33,12 @@ let router = new Router({
       path: '',
       name: 'course',
       component: Outline
+    }, {
+      path: 'editor/:activityId',
+      name: 'editor',
+      component: Editor
     }, {
       path: 'settings',
-      name: 'course-settings',
       component: CourseSettings,
       children: [{
         path: '',
@@ -55,9 +59,9 @@ let router = new Router({
       component: TreeView
     }]
   }, {
-    path: '/course/:courseId/editor/:activityId',
-    name: 'editor',
-    component: Editor,
+    path: '/system-users',
+    name: 'system-user-management',
+    component: SystemUserManagement,
     meta: { auth: true }
   }, {
     path: '/',

From b96b8b630243badb90d1f9e8965bd29603c16601 Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Tue, 30 Oct 2018 15:52:24 +0100
Subject: [PATCH 005/213] Renamed disableInvite to isDisabled

---
 client/components/system-user-management/AddSystemUser.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/components/system-user-management/AddSystemUser.vue b/client/components/system-user-management/AddSystemUser.vue
index 8b02a1a15..88911acdd 100644
--- a/client/components/system-user-management/AddSystemUser.vue
+++ b/client/components/system-user-management/AddSystemUser.vue
@@ -26,7 +26,7 @@
       </div>
       <div class="col-lg-1 col-md-2">
         <button
-          :disabled="disableInvite"
+          :disabled="isDisabled"
           type="submit"
           class="btn btn-primary btn-block">
           Invite
@@ -54,7 +54,7 @@ export default {
     };
   },
   computed: {
-    disableInvite() {
+    isDisabled() {
       return !this.email.trim().length || this.vErrors.has('email');
     }
   },

From f540fb1b58f75245d289df0b9c2b8215b76a8cb2 Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Wed, 31 Oct 2018 10:00:35 +0100
Subject: [PATCH 006/213] Fixed vue router warning and removed unused computed
 prop

---
 client/components/course/index.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/components/course/index.vue b/client/components/course/index.vue
index 7544ed1d1..e8fdbb1bf 100644
--- a/client/components/course/index.vue
+++ b/client/components/course/index.vue
@@ -3,7 +3,7 @@
     <ul class="nav nav-tabs">
       <!-- TODO: Create component for nav tabs -->
       <li :class="{ active: $route.name === 'course' }">
-        <router-link :to="{ name: 'course' }">Outline</router-link>
+        <router-link :to="{ name: 'course', params: { courseId } }">Outline</router-link>
       </li>
       <li :class="{ active: $route.name === 'tree-view' }">
         <router-link :to="{ name: 'tree-view' }">Tree View</router-link>
@@ -38,10 +38,10 @@ export default {
   computed: {
     ...mapGetters(['course', 'activities', 'activity'], 'course'),
     ...mapGetters(['isAdmin', 'isCourseAdmin']),
-    showSettings() {
-      return this.isAdmin || this.isCourseAdmin;
+    courseId() {
+      return this.$route.params.courseId;
     },
-    showDetails() {
+    showSettings() {
       return this.isAdmin || this.isCourseAdmin;
     }
   },
@@ -55,7 +55,7 @@ export default {
     ...mapMutations({ setupTesApi: 'setBaseUrl' }, 'tes')
   },
   created() {
-    const { courseId } = this.$route.params;
+    const { courseId } = this;
     const existingSelection = this.activity && this.activity.courseId === courseId;
     if (!existingSelection) this.resetActivityFocus();
     // TODO: Do this better!

From 9102a831d88f39c8de67257adcb65348f418350a Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Wed, 31 Oct 2018 12:55:21 +0100
Subject: [PATCH 007/213] Refactored how options are sent to the multiselect

---
 .../system-user-management/AddSystemUser.vue       | 11 +++--------
 .../system-user-management/SystemUser.vue          | 14 ++++++--------
 client/components/system-user-management/index.vue |  8 ++++++--
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/client/components/system-user-management/AddSystemUser.vue b/client/components/system-user-management/AddSystemUser.vue
index 88911acdd..37b1df3f1 100644
--- a/client/components/system-user-management/AddSystemUser.vue
+++ b/client/components/system-user-management/AddSystemUser.vue
@@ -18,8 +18,6 @@
           :options="roles"
           :searchable="false"
           :allowEmpty="false"
-          :trackBy="null"
-          :label="null"
           @input="newRole => (role = newRole)"
           placeholder="Select role"
           class="role-select"/>
@@ -44,14 +42,11 @@ export default {
   name: 'add-system-user',
   mixins: [withValidation()],
   props: {
-    defaultRole: { type: String, required: true },
+    defaultRole: { type: Object, required: true },
     roles: { type: Array, required: true }
   },
   data() {
-    return {
-      email: '',
-      role: ''
-    };
+    return { email: '', role: {} };
   },
   computed: {
     isDisabled() {
@@ -61,7 +56,7 @@ export default {
   methods: {
     addUser() {
       const { email, role } = this;
-      this.$emit('add', email, { role });
+      this.$emit('add', email, { role: role.value });
       this.reset();
     },
     reset() {
diff --git a/client/components/system-user-management/SystemUser.vue b/client/components/system-user-management/SystemUser.vue
index 469ef0176..e787d5174 100644
--- a/client/components/system-user-management/SystemUser.vue
+++ b/client/components/system-user-management/SystemUser.vue
@@ -3,14 +3,12 @@
     <td class="email-cell">{{ email }}</td>
     <td>
       <multiselect
-        :value="role"
+        :value="selectedRole"
         :options="roles"
         :disabled="!canChangeRole"
         :searchable="false"
         :allowEmpty="false"
-        :trackBy="null"
-        :label="null"
-        @input="role => $emit('update', { role })"
+        @input="({ value: role }) => $emit('update', { role })"
         placeholder="Select new role">
       </multiselect>
     </td>
@@ -32,12 +30,12 @@ export default {
     role: { type: String, required: true },
     roles: { type: Array, required: true }
   },
-  data() {
-    return { selectedRole: this.role };
-  },
   computed: {
+    selectedRole() {
+      return { label: this.role, value: this.role };
+    },
     canChangeRole() {
-      return this.roles.includes(this.role);
+      return this.roles.find(it => it.value === this.role);
     }
   },
   components: {
diff --git a/client/components/system-user-management/index.vue b/client/components/system-user-management/index.vue
index f83a21de6..89cb4351e 100644
--- a/client/components/system-user-management/index.vue
+++ b/client/components/system-user-management/index.vue
@@ -31,9 +31,12 @@ import { getUsers, upsertUser, removeUser } from '../../api/system';
 import { role } from 'shared';
 import AddSystemUser from './AddSystemUser';
 import Loader from '../common/Loader';
+import map from 'lodash/map';
 import omit from 'lodash/omit';
 import SystemUser from './SystemUser';
 
+const { INTEGRATION, USER } = role.user;
+
 export default {
   name: 'system-user-management',
   data() {
@@ -44,10 +47,11 @@ export default {
   },
   computed: {
     defaultRole() {
-      return role.user.USER;
+      return this.roles.find(it => it.value === USER);
     },
     roles() {
-      return Object.values(omit(role.user, role.user.INTEGRATION));
+      const { user: roles } = role;
+      return map(omit(roles, INTEGRATION), it => ({ label: it, value: it }));
     }
   },
   methods: {

From d0ec6f60d07f7518761dfb524c81aec0f0aeec0b Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Wed, 31 Oct 2018 12:55:46 +0100
Subject: [PATCH 008/213] Minor refactor

---
 .../course/Outline/InsertActivity/CreateActivity.vue          | 3 ++-
 .../components/editor/teaching-elements/Assessment/index.vue  | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/client/components/course/Outline/InsertActivity/CreateActivity.vue b/client/components/course/Outline/InsertActivity/CreateActivity.vue
index cf62e75fd..d60cfe8b6 100644
--- a/client/components/course/Outline/InsertActivity/CreateActivity.vue
+++ b/client/components/course/Outline/InsertActivity/CreateActivity.vue
@@ -18,9 +18,10 @@
       v-model="level"
       :options="supportedLevels"
       :searchable="false"
-      trackBy="type"
       data-vv-value-path="type"
       data-vv-delay="0"
+      trackBy="type"
+      name="type"
       class="type-select">
     </multiselect>
     <div class="actions">
diff --git a/client/components/editor/teaching-elements/Assessment/index.vue b/client/components/editor/teaching-elements/Assessment/index.vue
index 82970da60..1ca9b7e6b 100644
--- a/client/components/editor/teaching-elements/Assessment/index.vue
+++ b/client/components/editor/teaching-elements/Assessment/index.vue
@@ -10,11 +10,11 @@
             :options="examObjectives"
             :searchable="true"
             :disabled="!isEditing || !examObjectives.length"
-            :trackBy="'id'"
             :customLabel="it => it.data ? it.data.name : ''"
             :placeholder="examObjectiveLabel"
             :showReset="isEditing"
-            @input="onObjectiveSelected">
+            @input="onObjectiveSelected"
+            trackBy="id">
           </multiselect>
         </div>
       </div>

From d355c0cf61a79e2041514aba25ab6f66fbfb5cfd Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Wed, 31 Oct 2018 13:07:14 +0100
Subject: [PATCH 009/213] Replaced mounted with created in AddSystemUser
 component

---
 client/components/system-user-management/AddSystemUser.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/components/system-user-management/AddSystemUser.vue b/client/components/system-user-management/AddSystemUser.vue
index 37b1df3f1..036a6bed1 100644
--- a/client/components/system-user-management/AddSystemUser.vue
+++ b/client/components/system-user-management/AddSystemUser.vue
@@ -63,7 +63,7 @@ export default {
       Object.assign(this, { email: '', role: this.defaultRole });
     }
   },
-  mounted() {
+  created() {
     this.reset();
   },
   components: {

From 66d5153773540ac18f23e49f5d6de8cae6dc1c49 Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Wed, 31 Oct 2018 13:15:21 +0100
Subject: [PATCH 010/213] Minor clean up

---
 client/components/system-user-management/index.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/client/components/system-user-management/index.vue b/client/components/system-user-management/index.vue
index 89cb4351e..6747e06a6 100644
--- a/client/components/system-user-management/index.vue
+++ b/client/components/system-user-management/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="system-users-container">
     <h2>System user management</h2>
-    <loader v-if="showLoader"></loader>
+    <loader v-if="showLoader"/>
     <div v-else class="system-users">
       <add-system-user v-bind="{ defaultRole, roles }" @add="upsertUser"/>
       <table class="table table-striped table-hover">
@@ -18,8 +18,7 @@
             v-bind="{ id, email, role, roles }"
             :key="id"
             @update="data => upsertUser(email, data)"
-            @delete="removeUser(id)">
-          </system-user>
+            @delete="removeUser(id)"/>
         </tbody>
       </table>
     </div>

From cd7ece1d9400708071d25c5fdefb50875edf6d3d Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Mon, 19 Nov 2018 10:17:14 +0100
Subject: [PATCH 011/213] Added extractData helper to system api

---
 client/api/system.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/api/system.js b/client/api/system.js
index 6870015d9..37416a01f 100644
--- a/client/api/system.js
+++ b/client/api/system.js
@@ -1,13 +1,15 @@
 import request from './request';
 
+const extractData = res => res.data.data;
+
 function getUsers() {
   const options = { params: { roleType: 'user' } };
-  return request.get('/users', options).then(({ data: { data } }) => data);
+  return request.get('/users', options).then(extractData);
 }
 
 function upsertUser(email, data) {
   const body = { email, ...data };
-  return request.post('/users', body).then(({ data: { data } }) => data);
+  return request.post('/users', body).then(extractData);
 }
 
 function removeUser(id) {

From bc3c7e7cafe70870a5a89a33e14365b0e9889198 Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Mon, 19 Nov 2018 10:23:58 +0100
Subject: [PATCH 012/213] Change course route to use props instead of
 $route.params

---
 client/components/course/index.vue | 6 +++---
 client/router.js                   | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/client/components/course/index.vue b/client/components/course/index.vue
index e8fdbb1bf..dda391490 100644
--- a/client/components/course/index.vue
+++ b/client/components/course/index.vue
@@ -30,6 +30,9 @@ import Promise from 'bluebird';
 import sortBy from 'lodash/sortBy';
 
 export default {
+  props: {
+    courseId: { type: String, required: true }
+  },
   data() {
     return {
       showLoader: true
@@ -38,9 +41,6 @@ export default {
   computed: {
     ...mapGetters(['course', 'activities', 'activity'], 'course'),
     ...mapGetters(['isAdmin', 'isCourseAdmin']),
-    courseId() {
-      return this.$route.params.courseId;
-    },
     showSettings() {
       return this.isAdmin || this.isCourseAdmin;
     }
diff --git a/client/router.js b/client/router.js
index 106fe493e..239eb6694 100644
--- a/client/router.js
+++ b/client/router.js
@@ -28,6 +28,7 @@ let router = new Router({
   }, {
     path: '/course/:courseId',
     component: Course,
+    props: true,
     meta: { auth: true },
     children: [{
       path: '',

From f77367ded129d6a343fed0cd5ed881e65a33e8a2 Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Mon, 19 Nov 2018 10:26:09 +0100
Subject: [PATCH 013/213] Moved trim to v-model

---
 client/components/system-user-management/AddSystemUser.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/components/system-user-management/AddSystemUser.vue b/client/components/system-user-management/AddSystemUser.vue
index 036a6bed1..d37f06304 100644
--- a/client/components/system-user-management/AddSystemUser.vue
+++ b/client/components/system-user-management/AddSystemUser.vue
@@ -4,7 +4,7 @@
       <div class="col-md-7">
         <input
           v-validate="'email'"
-          v-model="email"
+          v-model.trim="email"
           data-vv-delay="0"
           class="form-control"
           type="email"
@@ -50,7 +50,7 @@ export default {
   },
   computed: {
     isDisabled() {
-      return !this.email.trim().length || this.vErrors.has('email');
+      return !this.email.length || this.vErrors.has('email');
     }
   },
   methods: {

From 740b4355b84b5a3eb68243324bf009d2c8b8c43e Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Mon, 19 Nov 2018 10:33:24 +0100
Subject: [PATCH 014/213] Wrapped email and role in AddSystemUser component
 with context object

---
 .../system-user-management/AddSystemUser.vue    | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/client/components/system-user-management/AddSystemUser.vue b/client/components/system-user-management/AddSystemUser.vue
index d37f06304..089bd5499 100644
--- a/client/components/system-user-management/AddSystemUser.vue
+++ b/client/components/system-user-management/AddSystemUser.vue
@@ -4,7 +4,7 @@
       <div class="col-md-7">
         <input
           v-validate="'email'"
-          v-model.trim="email"
+          v-model.trim="context.email"
           data-vv-delay="0"
           class="form-control"
           type="email"
@@ -14,7 +14,7 @@
       </div>
       <div class="col-lg-4 col-md-3">
         <multiselect
-          :value="role"
+          :value="context.role"
           :options="roles"
           :searchable="false"
           :allowEmpty="false"
@@ -46,26 +46,25 @@ export default {
     roles: { type: Array, required: true }
   },
   data() {
-    return { email: '', role: {} };
+    return {
+      context: { email: '', role: this.defaultRole }
+    };
   },
   computed: {
     isDisabled() {
-      return !this.email.length || this.vErrors.has('email');
+      return !this.context.email.length || this.vErrors.has('email');
     }
   },
   methods: {
     addUser() {
-      const { email, role } = this;
+      const { email, role } = this.context;
       this.$emit('add', email, { role: role.value });
       this.reset();
     },
     reset() {
-      Object.assign(this, { email: '', role: this.defaultRole });
+      this.context = { email: '', role: this.defaultRole };
     }
   },
-  created() {
-    this.reset();
-  },
   components: {
     Multiselect
   }

From 2ed34686014164a83c3625416af635fe1af19c96 Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Mon, 19 Nov 2018 10:35:02 +0100
Subject: [PATCH 015/213] Renamed system-users route to settings/users

---
 client/router.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/router.js b/client/router.js
index 239eb6694..b21596d68 100644
--- a/client/router.js
+++ b/client/router.js
@@ -60,7 +60,7 @@ let router = new Router({
       component: TreeView
     }]
   }, {
-    path: '/system-users',
+    path: '/settings/users',
     name: 'system-user-management',
     component: SystemUserManagement,
     meta: { auth: true }

From ee1fc9b5110ecfebe1b1636dd4b12a0b3db1587c Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Mon, 19 Nov 2018 10:40:32 +0100
Subject: [PATCH 016/213] Refactored the way roles in are accessed in
 config/shared/role.js

---
 config/shared/role.js | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/config/shared/role.js b/config/shared/role.js
index 32ab7b352..eae73bb18 100644
--- a/config/shared/role.js
+++ b/config/shared/role.js
@@ -1,21 +1,18 @@
 'use strict';
 
-const isPlainObject = require('lodash/isPlainObject');
 const values = require('lodash/values');
 
-const userRoles = { USER: 'USER', ADMIN: 'ADMIN', INTEGRATION: 'INTEGRATION' };
-const courseRoles = { ADMIN: 'COURSE_ADMIN', AUTHOR: 'COURSE_AUTHOR' };
+const role = {
+  user: { USER: 'USER', ADMIN: 'ADMIN', INTEGRATION: 'INTEGRATION' },
+  course: { ADMIN: 'COURSE_ADMIN', AUTHOR: 'COURSE_AUTHOR' }
+};
 
-const userRoleRegex = new RegExp(`^(${values(userRoles).join('|')})$`);
-const courseRoleRegex = new RegExp(`^(${values(courseRoles).join('|')})$`);
+const userRoleRegex = new RegExp(`^(${values(role.user).join('|')})$`);
+const courseRoleRegex = new RegExp(`^(${values(role.course).join('|')})$`);
 
 module.exports = {
-  user: userRoles,
-  course: courseRoles,
+  ...role,
   userRoleRegex,
   courseRoleRegex,
-  getRoleNames(type) {
-    const roles = this[type];
-    return isPlainObject(roles) ? values(roles) : [];
-  }
+  getRoleNames: type => values(role[type] || {})
 };

From 81ea94b16b2e7109f63d9e52d247ecdf853473d2 Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Mon, 19 Nov 2018 10:40:59 +0100
Subject: [PATCH 017/213] Extraced default authentication in user router

---
 server/user/index.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/server/user/index.js b/server/user/index.js
index 4577bca84..a3a5cf2d2 100644
--- a/server/user/index.js
+++ b/server/user/index.js
@@ -5,13 +5,15 @@ const ctrl = require('./user.controller');
 const model = require('./user.model');
 const router = require('express-promise-router')();
 
+const defaultAuth = authorize();
+
 router
   .post('/users/login', ctrl.login)
-  .get('/users', authorize(), ctrl.index)
-  .post('/users', authorize(), ctrl.upsert)
+  .get('/users', defaultAuth, ctrl.index)
+  .post('/users', defaultAuth, ctrl.upsert)
   .post('/users/forgotPassword', ctrl.forgotPassword)
   .post('/users/resetPassword', ctrl.resetPassword)
-  .delete('/users/:id', ctrl.remove);
+  .delete('/users/:id', defaultAuth, ctrl.remove);
 
 module.exports = {
   model,

From b6e28893c970d3d669bb49ca346c4f57abfa5f31 Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Mon, 19 Nov 2018 11:10:09 +0100
Subject: [PATCH 018/213] Moved fetching users by role to User scope

---
 server/user/user.controller.js |  8 ++++----
 server/user/user.model.js      | 21 +++++++++++++++------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/server/user/user.controller.js b/server/user/user.controller.js
index cefe0cf1e..d92c4ac6c 100644
--- a/server/user/user.controller.js
+++ b/server/user/user.controller.js
@@ -2,13 +2,13 @@
 
 const { createError, validationError } = require('../shared/error/helpers');
 const { NO_CONTENT, NOT_FOUND } = require('http-status-codes');
-const { role } = require('../../config/shared');
 const { User } = require('../shared/database');
 
 function index({ query: { roleType } }, res) {
-  let options = { attributes: ['id', 'email', 'role'], raw: true };
-  if (roleType) options.where = { role: { $in: role.getRoleNames(roleType) } };
-  return User.findAll(options).then(data => res.json({ data }));
+  let options = { attributes: ['id', 'email', 'role'] };
+  return User.scope({ method: ['withRoleType', roleType] })
+    .findAll(options)
+    .then(data => res.json({ data }));
 }
 
 function upsert({ body: { email, role } }, res) {
diff --git a/server/user/user.model.js b/server/user/user.model.js
index ff54cad6c..3474020f8 100644
--- a/server/user/user.model.js
+++ b/server/user/user.model.js
@@ -5,14 +5,15 @@ const jwt = require('jsonwebtoken');
 const mail = require('../shared/mail');
 const { Model } = require('sequelize');
 const Promise = require('bluebird');
-const { user: Role } = require('../../config/shared').role;
+const { role } = require('../../config/shared');
+
+const { user: { ADMIN, USER, INTEGRATION } } = role;
 
 const bcrypt = Promise.promisifyAll(require('bcryptjs'));
 const AUTH_SECRET = process.env.AUTH_JWT_SECRET;
 
 class User extends Model {
-  static fields(DataTypes) {
-    const { DATE, ENUM, STRING, VIRTUAL } = DataTypes;
+  static fields({ DATE, ENUM, STRING, VIRTUAL }) {
     return {
       email: {
         type: STRING,
@@ -27,8 +28,8 @@ class User extends Model {
         validate: { notEmpty: true, len: [5, 100] }
       },
       role: {
-        type: ENUM(Role.ADMIN, Role.USER, Role.INTEGRATION),
-        defaultValue: Role.USER
+        type: ENUM(ADMIN, USER, INTEGRATION),
+        defaultValue: USER
       },
       profile: {
         type: VIRTUAL,
@@ -97,6 +98,14 @@ class User extends Model {
     };
   }
 
+  static scopes() {
+    return {
+      withRoleType(type) {
+        return type && { where: { role: { $in: role.getRoleNames(type) } } };
+      }
+    };
+  }
+
   static invite(user) {
     return this.create(user).then(user => {
       user.token = user.createToken({ expiresIn: '5 days' });
@@ -106,7 +115,7 @@ class User extends Model {
   }
 
   isAdmin() {
-    return this.role === Role.ADMIN || this.role === Role.INTEGRATION;
+    return this.role === ADMIN || this.role === INTEGRATION;
   }
 
   authenticate(password) {

From 92148d73af05f5f2d6e708a32f07704bcc8ad867 Mon Sep 17 00:00:00 2001
From: rkusan00 <renato.kusanovic@gmail.com>
Date: Fri, 22 Mar 2019 13:43:37 +0100
Subject: [PATCH 019/213] Added option to preview perspective in LMS

---
 .env.example                                  |   5 +-
 client/api/preview.js                         |   8 +
 .../structure/ContentContainers/Container.vue |  13 ++
 config/server/index.js                        |   4 +-
 package-lock.json                             | 186 +++++++++++++++---
 package.json                                  |   1 +
 server/activity/activity.controller.js        |  14 +-
 server/activity/index.js                      |   3 +-
 server/shared/publishing/helpers.js           |   3 +-
 9 files changed, 206 insertions(+), 31 deletions(-)
 create mode 100644 client/api/preview.js

diff --git a/.env.example b/.env.example
index 903b944ff..0494b09e7 100644
--- a/.env.example
+++ b/.env.example
@@ -51,9 +51,8 @@ STORAGE_BUCKET=
 # Disabling default schema won't work if custom schema does not exist.
 ENABLE_DEFAULT_SCHEMA=1
 
-# String template that will be interpolated on the client using two route params,
-# repositoryId and activityId.
-PREVIEW_URL=https://myserver.com/repository/{repositoryId}/activity/{activityId}
+# LMS perspective preview route
+PREVIEW_URL=https://boutique.localhost/api/v1/preview/
 
 # Terminal (forcefully enable color)
 FORCE_COLOR=1
diff --git a/client/api/preview.js b/client/api/preview.js
new file mode 100644
index 000000000..78b671c1a
--- /dev/null
+++ b/client/api/preview.js
@@ -0,0 +1,8 @@
+import request from './request';
+
+function createPreview(courseId, activityId) {
+  return request.get(`courses/${courseId}/activities/${activityId}/preview`)
+    .then(res => res.data.location);
+}
+
+export default { createPreview };
diff --git a/client/components/editor/structure/ContentContainers/Container.vue b/client/components/editor/structure/ContentContainers/Container.vue
index 32ef60f39..ac481b92c 100644
--- a/client/components/editor/structure/ContentContainers/Container.vue
+++ b/client/components/editor/structure/ContentContainers/Container.vue
@@ -1,6 +1,13 @@
 <template>
   <div>
     <div class="actions">
+      <button
+        @click="previewContainer"
+        class="btn btn-default btn-material pull-left"
+        type="button">
+        <span class="mdi mdi-eye"></span>
+        Preview {{ name }}
+      </button>
       <button
         @click="deleteContainer"
         class="btn btn-default btn-material pull-right"
@@ -36,6 +43,7 @@ import { mapActions, mapGetters } from 'vuex-module';
 import sortBy from 'lodash/sortBy';
 import TeachingElement from '../../TeachingElement';
 import TesList from '../TesList';
+import api from '@/api/preview';
 
 export default {
   name: 'content-container',
@@ -61,6 +69,11 @@ export default {
       const context = { items, newPosition, isFirstChild };
       this.reorderElements({ element, context });
     },
+    previewContainer() {
+      const { courseId, id } = this.container;
+      return api.createPreview(courseId, id)
+        .then(location => window.open(location));
+    },
     deleteContainer() {
       this.$emit('delete');
     }
diff --git a/config/server/index.js b/config/server/index.js
index 5b73f5960..b85ad0397 100644
--- a/config/server/index.js
+++ b/config/server/index.js
@@ -7,6 +7,7 @@ const hostname = resolveHostname();
 const protocol = resolveProtocol(hostname);
 const port = resolvePort();
 const origin = resolveOrigin(hostname, protocol, port);
+const previewUrl = process.env.PREVIEW_URL;
 
 module.exports = {
   protocol,
@@ -14,7 +15,8 @@ module.exports = {
   port,
   origin,
   auth: require('./auth'),
-  storage: require('./storage')
+  storage: require('./storage'),
+  previewUrl
 };
 
 // Legacy config support
diff --git a/package-lock.json b/package-lock.json
index fc7860bbc..5bdea6b44 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1582,6 +1582,11 @@
       "integrity": "sha512-5yqBjV6yZzrJBYVG6ASAbhRhAQMjEu1nYDPJFbpPDcfNxEvsO+QwIxFq3ABQwH0iq59nI62v8VtxEc/z+jDFOg==",
       "dev": true
     },
+    "@sindresorhus/is": {
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
+      "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="
+    },
     "@snyk/dep-graph": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.4.0.tgz",
@@ -1598,6 +1603,14 @@
       "resolved": "https://registry.npmjs.org/@snyk/gemfile/-/gemfile-1.2.0.tgz",
       "integrity": "sha512-nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA=="
     },
+    "@szmarczak/http-timer": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz",
+      "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==",
+      "requires": {
+        "defer-to-connect": "^1.0.1"
+      }
+    },
     "@types/geojson": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-1.0.6.tgz",
@@ -3302,6 +3315,30 @@
         "schema-utils": "^0.4.2"
       }
     },
+    "cacheable-request": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.0.0.tgz",
+      "integrity": "sha512-2N7AmszH/WPPpl5Z3XMw1HAP+8d+xugnKQAeKvxFZ/04dbT/CAznqwbl+7eSr3HkwdepNwtb2yx3CAMQWvG01Q==",
+      "requires": {
+        "clone-response": "^1.0.2",
+        "get-stream": "^4.0.0",
+        "http-cache-semantics": "^4.0.0",
+        "keyv": "^3.0.0",
+        "lowercase-keys": "^1.0.1",
+        "normalize-url": "^3.1.0",
+        "responselike": "^1.0.2"
+      },
+      "dependencies": {
+        "get-stream": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        }
+      }
+    },
     "call-me-maybe": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
@@ -3736,6 +3773,14 @@
         "is-supported-regexp-flag": "^1.0.0"
       }
     },
+    "clone-response": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
+      "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
+      "requires": {
+        "mimic-response": "^1.0.0"
+      }
+    },
     "cls-bluebird": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/cls-bluebird/-/cls-bluebird-2.1.0.tgz",
@@ -4939,6 +4984,14 @@
       "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
       "dev": true
     },
+    "decompress-response": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
+      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
+      "requires": {
+        "mimic-response": "^1.0.0"
+      }
+    },
     "deep-eql": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
@@ -5041,6 +5094,11 @@
         }
       }
     },
+    "defer-to-connect": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.0.2.tgz",
+      "integrity": "sha512-k09hcQcTDY+cwgiwa6PYKLm3jlagNzQ+RSvhjzESOGOx+MNOuXkxTfEvPrO1IOQ81tArCFYQgi631clB70RpQw=="
+    },
     "define-properties": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
@@ -7951,21 +8009,31 @@
       }
     },
     "got": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
-      "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
-      "requires": {
-        "create-error-class": "^3.0.0",
+      "version": "9.6.0",
+      "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
+      "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==",
+      "requires": {
+        "@sindresorhus/is": "^0.14.0",
+        "@szmarczak/http-timer": "^1.1.2",
+        "cacheable-request": "^6.0.0",
+        "decompress-response": "^3.3.0",
         "duplexer3": "^0.1.4",
-        "get-stream": "^3.0.0",
-        "is-redirect": "^1.0.0",
-        "is-retry-allowed": "^1.0.0",
-        "is-stream": "^1.0.0",
-        "lowercase-keys": "^1.0.0",
-        "safe-buffer": "^5.0.1",
-        "timed-out": "^4.0.0",
-        "unzip-response": "^2.0.1",
-        "url-parse-lax": "^1.0.0"
+        "get-stream": "^4.1.0",
+        "lowercase-keys": "^1.0.1",
+        "mimic-response": "^1.0.1",
+        "p-cancelable": "^1.0.0",
+        "to-readable-stream": "^1.0.0",
+        "url-parse-lax": "^3.0.0"
+      },
+      "dependencies": {
+        "get-stream": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        }
       }
     },
     "graceful-fs": {
@@ -8353,6 +8421,11 @@
         }
       }
     },
+    "http-cache-semantics": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz",
+      "integrity": "sha512-TcIMG3qeVLgDr1TEd2XvHaTnMPwYQUQMIBLy+5pLSDKYFc7UIqj39w8EGzZkaxoLv/l2K8HaI0t5AVA+YYgUew=="
+    },
     "http-deceiver": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
@@ -9846,6 +9919,11 @@
       "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
       "dev": true
     },
+    "json-buffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
+      "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg="
+    },
     "json-parse-better-errors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
@@ -10005,6 +10083,14 @@
         "safe-buffer": "^5.0.1"
       }
     },
+    "keyv": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
+      "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==",
+      "requires": {
+        "json-buffer": "3.0.0"
+      }
+    },
     "killable": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
@@ -10725,6 +10811,11 @@
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
       "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
     },
+    "mimic-response": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
+      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="
+    },
     "min-document": {
       "version": "2.19.0",
       "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
@@ -11484,8 +11575,7 @@
     "normalize-url": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz",
-      "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==",
-      "dev": true
+      "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg=="
     },
     "npm-run-path": {
       "version": "2.0.2",
@@ -11783,6 +11873,11 @@
       "resolved": "https://registry.npmjs.org/over/-/over-0.0.5.tgz",
       "integrity": "sha1-8phS5w/X4l82DgE6jsRMgq7bVwg="
     },
+    "p-cancelable": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
+      "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="
+    },
     "p-defer": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
@@ -11880,10 +11975,41 @@
         "semver": "^5.1.0"
       },
       "dependencies": {
+        "got": {
+          "version": "6.7.1",
+          "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz",
+          "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
+          "requires": {
+            "create-error-class": "^3.0.0",
+            "duplexer3": "^0.1.4",
+            "get-stream": "^3.0.0",
+            "is-redirect": "^1.0.0",
+            "is-retry-allowed": "^1.0.0",
+            "is-stream": "^1.0.0",
+            "lowercase-keys": "^1.0.0",
+            "safe-buffer": "^5.0.1",
+            "timed-out": "^4.0.0",
+            "unzip-response": "^2.0.1",
+            "url-parse-lax": "^1.0.0"
+          }
+        },
+        "prepend-http": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
+          "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw="
+        },
         "semver": {
           "version": "5.6.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
           "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="
+        },
+        "url-parse-lax": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
+          "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
+          "requires": {
+            "prepend-http": "^1.0.1"
+          }
         }
       }
     },
@@ -14712,9 +14838,9 @@
       "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
     },
     "prepend-http": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz",
-      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
+      "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc="
     },
     "prettier": {
       "version": "1.16.3",
@@ -14921,7 +15047,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
       "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
       "requires": {
         "end-of-stream": "^1.1.0",
         "once": "^1.3.1"
@@ -15581,6 +15706,14 @@
       "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
       "dev": true
     },
+    "responselike": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
+      "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
+      "requires": {
+        "lowercase-keys": "^1.0.0"
+      }
+    },
     "restore-cursor": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
@@ -18575,6 +18708,11 @@
         "to-space-case": "^1.0.0"
       }
     },
+    "to-readable-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
+      "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q=="
+    },
     "to-regex": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
@@ -19252,11 +19390,11 @@
       }
     },
     "url-parse-lax": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz",
-      "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
+      "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
       "requires": {
-        "prepend-http": "^1.0.1"
+        "prepend-http": "^2.0.0"
       }
     },
     "url-polyfill": {
diff --git a/package.json b/package.json
index 1763541f5..c8ea47e45 100644
--- a/package.json
+++ b/package.json
@@ -69,6 +69,7 @@
     "fecha": "^2.3.0",
     "file-type": "^7.5.0",
     "focus-trap": "^2.3.1",
+    "got": "^9.6.0",
     "hash-obj": "^1.0.0",
     "helmet": "^3.12.0",
     "hls.js": "^0.10.1",
diff --git a/server/activity/activity.controller.js b/server/activity/activity.controller.js
index 2222f4a7f..556ec129b 100644
--- a/server/activity/activity.controller.js
+++ b/server/activity/activity.controller.js
@@ -1,11 +1,14 @@
 'use strict';
 
 const { Activity } = require('../shared/database');
+const { fetchContainer } = require('../shared/publishing/helpers');
 const { getOutlineLevels } = require('../../config/shared/activities');
+const { previewUrl } = require('../../config/server');
 const find = require('lodash/find');
 const get = require('lodash/get');
 const pick = require('lodash/pick');
 const publishingService = require('../shared/publishing/publishing.service');
+const request = require('got');
 
 function create({ course, body, params, user }, res) {
   const outlineConfig = find(getOutlineLevels(course.schema), { type: body.type });
@@ -59,6 +62,14 @@ function clone({ activity, body }, res) {
   });
 }
 
+function getPreview({ activity }, res) {
+  return fetchContainer(activity)
+    .then(data => request.post(previewUrl, { json: true, body: data }))
+    .then(resp => res.json({
+      location: `${new URL(resp.body.data.url, previewUrl)}`
+    }));
+}
+
 module.exports = {
   create,
   show,
@@ -67,5 +78,6 @@ module.exports = {
   remove,
   reorder,
   clone,
-  publish
+  publish,
+  getPreview
 };
diff --git a/server/activity/index.js b/server/activity/index.js
index 5db1d66e2..5f44eb001 100644
--- a/server/activity/index.js
+++ b/server/activity/index.js
@@ -19,7 +19,8 @@ router
   .delete('/courses/:courseId/activities/:activityId', ctrl.remove)
   .post('/courses/:courseId/activities/:activityId/reorder', ctrl.reorder)
   .post('/courses/:courseId/activities/:activityId/clone', ctrl.clone)
-  .get('/courses/:courseId/activities/:activityId/publish', ctrl.publish);
+  .get('/courses/:courseId/activities/:activityId/publish', ctrl.publish)
+  .get('/courses/:courseId/activities/:activityId/preview', ctrl.getPreview);
 
 function getActivity(req, res) {
   return Activity.findById(req.params.activityId, { paranoid: false })
diff --git a/server/shared/publishing/helpers.js b/server/shared/publishing/helpers.js
index c2c84ed5e..d19f7d684 100644
--- a/server/shared/publishing/helpers.js
+++ b/server/shared/publishing/helpers.js
@@ -261,5 +261,6 @@ function mapRelationships(relationships, activity) {
 module.exports = {
   publishActivity,
   unpublishActivity,
-  publishRepositoryDetails
+  publishRepositoryDetails,
+  fetchContainer
 };

From 79fd58253f8e6835b260d3409e8f0dcf8f366908 Mon Sep 17 00:00:00 2001
From: Luka Saric <rpg.ari7@gmail.com>
Date: Fri, 10 May 2019 16:37:30 +0200
Subject: [PATCH 020/213] Switched from promise router to async errors

---
 package-lock.json                       | 13 ++++---------
 package.json                            |  2 +-
 server/activity/index.js                |  6 +++---
 server/app.js                           |  1 +
 server/comment/index.js                 | 10 +++++-----
 server/course/index.js                  | 12 ++++++------
 server/revision/index.js                |  6 +++---
 server/router.js                        |  2 +-
 server/shared/storage/storage.router.js |  2 +-
 server/teaching-element/index.js        |  2 +-
 server/user/index.js                    |  2 +-
 11 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 181cb617f..ea909b4d8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6490,15 +6490,10 @@
         }
       }
     },
-    "express-promise-router": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/express-promise-router/-/express-promise-router-1.1.1.tgz",
-      "integrity": "sha1-Vqw5SMJ8gJvzK9EpSOFHOnYQ32k=",
-      "requires": {
-        "bluebird": "^3.4.1",
-        "lodash": "^4.13.1",
-        "methods": "^1.0.0"
-      }
+    "express-async-errors": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/express-async-errors/-/express-async-errors-3.1.1.tgz",
+      "integrity": "sha512-h6aK1da4tpqWSbyCa3FxB/V6Ehd4EEB15zyQq9qe75OZBp0krinNKuH4rAY+S/U/2I36vdLAUFSjQJ+TFmODng=="
     },
     "extend": {
       "version": "3.0.2",
diff --git a/package.json b/package.json
index 9d3013cc8..c3af0510a 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
     "event-source-polyfill": "^0.0.12",
     "exceljs": "^1.6.0",
     "express": "^4.14.0",
-    "express-promise-router": "^1.1.1",
+    "express-async-errors": "^3.1.1",
     "fecha": "^2.3.0",
     "file-type": "^7.5.0",
     "focus-trap": "^2.3.1",
diff --git a/server/activity/index.js b/server/activity/index.js
index 8bb190e48..38378806f 100644
--- a/server/activity/index.js
+++ b/server/activity/index.js
@@ -6,7 +6,7 @@ const ctrl = require('./activity.controller');
 const model = require('./activity.model');
 const { NOT_FOUND } = require('http-status-codes');
 const processListQuery = require('../shared/util/processListQuery');
-const router = require('express-promise-router')();
+const router = require('express').Router();
 
 const processQuery = processListQuery({ order: [['position']] });
 
@@ -21,12 +21,12 @@ router
   .post('/courses/:courseId/activities/:activityId/clone', ctrl.clone)
   .get('/courses/:courseId/activities/:activityId/publish', ctrl.publish);
 
-function getActivity(req, res) {
+function getActivity(req, _res, next) {
   return Activity.findByPk(req.params.activityId, { paranoid: false })
     .then(activity => activity || createError(NOT_FOUND, 'Activity not found'))
     .then(activity => {
       req.activity = activity;
-      return Promise.resolve('next');
+      next();
     });
 }
 
diff --git a/server/app.js b/server/app.js
index 6f8ce6a21..870d5362a 100644
--- a/server/app.js
+++ b/server/app.js
@@ -7,6 +7,7 @@ const helmet = require('helmet');
 const origin = require('./shared/origin');
 const passport = require('passport');
 const path = require('path');
+require('express-async-errors');
 
 // Setup authentication before instantiating the main app router.
 // eslint-disable-next-line no-unused-vars
diff --git a/server/comment/index.js b/server/comment/index.js
index 92a8d1f93..488c82c8e 100644
--- a/server/comment/index.js
+++ b/server/comment/index.js
@@ -8,7 +8,7 @@ const { FORBIDDEN, NOT_FOUND } = require('http-status-codes');
 const model = require('./comment.model');
 const processQuery = require('../shared/util/processListQuery');
 const { middleware: sse } = require('../shared/util/sse');
-const router = require('express-promise-router')();
+const router = require('express').Router();
 const { User } = require('../shared/database');
 
 const defaultListQuery = {
@@ -30,19 +30,19 @@ router
   .patch(canEdit, ctrl.patch)
   .delete(canEdit, ctrl.remove);
 
-function getComment(req, res) {
+function getComment(req, _res, next) {
   const include = [{ model: User, as: 'author', attributes: ['id', 'email'] }];
   return Comment.findByPk(req.params.commentId, { paranoid: false, include })
     .then(comment => comment || createError(NOT_FOUND, 'Comment not found'))
     .then(comment => {
       req.comment = comment;
-      return Promise.resolve('next');
+      next();
     });
 }
 
-function canEdit({ user, comment }) {
+function canEdit({ user, comment }, _res, next) {
   if (user.id !== comment.authorId) return createError(FORBIDDEN, 'Forbidden');
-  return Promise.resolve('next');
+  next();
 }
 
 module.exports = {
diff --git a/server/course/index.js b/server/course/index.js
index 586dff977..67c46c697 100644
--- a/server/course/index.js
+++ b/server/course/index.js
@@ -6,7 +6,7 @@ const { createError } = require('../shared/error/helpers');
 const { NOT_FOUND, UNAUTHORIZED } = require('http-status-codes');
 const ctrl = require('./course.controller');
 const processQuery = require('../shared/util/processListQuery')();
-const router = require('express-promise-router')();
+const router = require('express').Router();
 
 router
   .use('/courses/:id*', getCourse)
@@ -23,23 +23,23 @@ router
   .delete('/courses/:id/users/:userId', ctrl.removeUser)
   .get('/courses/:id/contentInventory', ctrl.exportContentInventory);
 
-function getCourse(req, res) {
+function getCourse(req, _res, next) {
   return Course.findByPk(req.params.id, { paranoid: false })
     .then(course => course || createError(NOT_FOUND, 'Course not found'))
     .then(course => {
       req.course = course;
-      return Promise.resolve('next');
+      next();
     });
 }
 
-function hasAccess(req, res) {
+function hasAccess(req, _res, next) {
   const { user, course } = req;
-  if (user.isAdmin()) return Promise.resolve('next');
+  if (user.isAdmin()) return next();
   return course.getUser(user)
     .then(user => user || createError(UNAUTHORIZED, 'Access restricted'))
     .then(user => {
       req.courseRole = user.courseUser.role;
-      return Promise.resolve('next');
+      next();
     });
 }
 
diff --git a/server/revision/index.js b/server/revision/index.js
index 414893299..4f1b04bfb 100644
--- a/server/revision/index.js
+++ b/server/revision/index.js
@@ -4,19 +4,19 @@ const { createError } = require('../shared/error/helpers');
 const { NOT_FOUND } = require('http-status-codes');
 const { Revision, User } = require('../shared/database');
 const ctrl = require('./revision.controller');
-const router = require('express-promise-router')();
+const router = require('express').Router();
 
 router.use('/courses/:id/revisions/:revisionId*', getRevision);
 router.get('/courses/:id/revisions', ctrl.index);
 router.get('/courses/:id/revisions/:revisionId', ctrl.resolve);
 
-function getRevision(req, res) {
+function getRevision(req, _res, next) {
   const include = [{ model: User, attributes: ['id', 'email'] }];
   return Revision.findByPk(req.params.revisionId, { include })
     .then(revision => revision || createError(NOT_FOUND, 'Revision not found'))
     .then(revision => {
       req.revision = revision;
-      return Promise.resolve('next');
+      next();
     });
 }
 
diff --git a/server/router.js b/server/router.js
index 762236166..6a7871d5e 100644
--- a/server/router.js
+++ b/server/router.js
@@ -28,7 +28,7 @@ router.use('/', userRouter);
 
 module.exports = router;
 
-function processBody(req, res, next) {
+function processBody(req, _res, next) {
   const { body } = req;
   if (body && body.email) body.email = body.email.toLowerCase();
   next();
diff --git a/server/shared/storage/storage.router.js b/server/shared/storage/storage.router.js
index 6758a9572..0688952c1 100644
--- a/server/shared/storage/storage.router.js
+++ b/server/shared/storage/storage.router.js
@@ -2,7 +2,7 @@
 
 const ctrl = require('./storage.controller');
 const multer = require('multer');
-const router = require('express-promise-router')();
+const router = require('express').Router();
 
 const upload = multer({ storage: multer.memoryStorage() });
 
diff --git a/server/teaching-element/index.js b/server/teaching-element/index.js
index 30f0dc525..22c0e6923 100644
--- a/server/teaching-element/index.js
+++ b/server/teaching-element/index.js
@@ -3,7 +3,7 @@
 const ctrl = require('./te.controller');
 const model = require('./te.model');
 const processQuery = require('../shared/util/processListQuery')();
-const router = require('express-promise-router')();
+const router = require('express').Router();
 
 router
   .route('/courses/:courseId/tes')
diff --git a/server/user/index.js b/server/user/index.js
index d505f85be..94e922771 100644
--- a/server/user/index.js
+++ b/server/user/index.js
@@ -3,7 +3,7 @@
 const auth = require('passport').authenticate('jwt');
 const ctrl = require('./user.controller');
 const model = require('./user.model');
-const router = require('express-promise-router')();
+const router = require('express').Router();
 
 router
   // Public routes:

From 269092d64dade79fb4f92792bd3eda0fff2c9817 Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Wed, 22 May 2019 17:40:49 +0200
Subject: [PATCH 021/213] Updated system user management:

- extracted course user management component to be a common component
- removed previous system user management implementation
- added a numer params parser
- merged user update and restore
- removed integration user from list
---
 client/components/SystemUserManagement.vue    |  66 +++++++++++
 client/components/common/ProgressDialog.vue   |   7 +-
 .../UserManagement/AddUser.vue                |  10 +-
 .../UserManagement/UserList.vue               |  36 +-----
 .../common/UserManagement/index.vue           |  43 +++++++
 .../course/Settings/CourseUserManagement.vue  |  57 ++++++++++
 .../course/Settings/UserManagement/index.vue  |  35 ------
 client/components/course/Settings/index.vue   |  12 +-
 client/components/course/index.vue            |   2 +-
 .../system-user-management/AddSystemUser.vue  |  80 -------------
 .../system-user-management/SystemUser.vue     |  51 ---------
 .../system-user-management/index.vue          | 107 ------------------
 client/router.js                              |  10 +-
 client/utils/paramsParser.js                  |   5 +
 server/user/user.controller.js                |   6 +-
 15 files changed, 202 insertions(+), 325 deletions(-)
 create mode 100644 client/components/SystemUserManagement.vue
 rename client/components/{course/Settings => common}/UserManagement/AddUser.vue (76%)
 rename client/components/{course/Settings => common}/UserManagement/UserList.vue (53%)
 create mode 100644 client/components/common/UserManagement/index.vue
 create mode 100644 client/components/course/Settings/CourseUserManagement.vue
 delete mode 100644 client/components/course/Settings/UserManagement/index.vue
 delete mode 100644 client/components/system-user-management/AddSystemUser.vue
 delete mode 100644 client/components/system-user-management/SystemUser.vue
 delete mode 100644 client/components/system-user-management/index.vue
 create mode 100644 client/utils/paramsParser.js

diff --git a/client/components/SystemUserManagement.vue b/client/components/SystemUserManagement.vue
new file mode 100644
index 000000000..8823d547a
--- /dev/null
+++ b/client/components/SystemUserManagement.vue
@@ -0,0 +1,66 @@
+<template>
+  <v-container>
+    <v-layout>
+      <v-flex>
+        <user-management
+          :users="users"
+          :roles="roles"
+          :isLoading="isLoading"
+          @upsert="upsert"
+          @remove="remove"/>
+      </v-flex>
+    </v-layout>
+  </v-container>
+</template>
+
+<script>
+import api from '@/api/system';
+import debounce from 'lodash/debounce';
+import map from 'lodash/map';
+import omit from 'lodash/omit';
+import { role } from 'shared';
+import { title as titleCase } from 'to-case';
+import UserManagement from 'components/common/UserManagement';
+
+export default {
+  data() {
+    return {
+      isLoading: true,
+      users: []
+    };
+  },
+  computed: {
+    roles() {
+      const { user: roles } = role;
+      const userRoles = omit(roles, role.user.INTEGRATION);
+      return map(userRoles, value => ({ text: titleCase(value), value }));
+    }
+  },
+  methods: {
+    upsert(email, role) {
+      debounce(this.upsertUser, 500)(email, { role });
+    },
+    upsertUser(email, data) {
+      this.isLoading = true;
+      return api.upsertUser(email, data).then(userData => {
+        this.isLoading = false;
+        const user = this.users.find(it => it.id === userData.id);
+        return user ? Object.assign(user, userData) : this.users.unshift(userData);
+      });
+    },
+    remove({ id }) {
+      this.isLoading = true;
+      api.removeUser(id).then(() => {
+        this.isLoading = false;
+        this.users = this.users.filter(user => user.id !== id);
+      });
+    }
+  },
+  created() {
+    api.getUsers().then(users => Object.assign(this, { users, isLoading: false }));
+  },
+  components: {
+    UserManagement
+  }
+};
+</script>
diff --git a/client/components/common/ProgressDialog.vue b/client/components/common/ProgressDialog.vue
index bbe3ac875..63ac95819 100644
--- a/client/components/common/ProgressDialog.vue
+++ b/client/components/common/ProgressDialog.vue
@@ -7,7 +7,11 @@
       <v-card color="blue-grey darken-3" dark>
         <v-card-text>
           Please wait...
-          <v-progress-linear :value="status" color="white" class="mb-0"/>
+          <v-progress-linear
+            :indeterminate="indeterminate"
+            :value="status"
+            color="white"
+            class="mb-0"/>
         </v-card-text>
       </v-card>
     </v-dialog>
@@ -18,6 +22,7 @@
 export default {
   props: {
     show: { type: Boolean, default: false },
+    indeterminate: { type: Boolean, default: false },
     status: { type: Number, default: 0 }
   }
 };
diff --git a/client/components/course/Settings/UserManagement/AddUser.vue b/client/components/common/UserManagement/AddUser.vue
similarity index 76%
rename from client/components/course/Settings/UserManagement/AddUser.vue
rename to client/components/common/UserManagement/AddUser.vue
index befbc7d02..da8a74707 100644
--- a/client/components/course/Settings/UserManagement/AddUser.vue
+++ b/client/components/common/UserManagement/AddUser.vue
@@ -32,7 +32,6 @@
 </template>
 
 <script>
-import { mapActions } from 'vuex-module';
 import { withValidation } from 'utils/validation';
 
 export default {
@@ -47,15 +46,10 @@ export default {
     };
   },
   methods: {
-    ...mapActions(['upsertUser'], 'course'),
     addUser() {
       const { email, role } = this;
-      const { courseId } = this.$route.params;
-      this.$validator.validateAll().then(async isValid => {
-        if (!isValid) return;
-        await this.upsertUser({ courseId, email, role });
-        this.email = '';
-        this.$nextTick(() => this.$validator.reset());
+      this.$validator.validateAll().then(isValid => {
+        if (isValid) return this.$emit('upsert', email, role);
       });
     }
   }
diff --git a/client/components/course/Settings/UserManagement/UserList.vue b/client/components/common/UserManagement/UserList.vue
similarity index 53%
rename from client/components/course/Settings/UserManagement/UserList.vue
rename to client/components/common/UserManagement/UserList.vue
index 63e52dc6e..0597dd03c 100644
--- a/client/components/course/Settings/UserManagement/UserList.vue
+++ b/client/components/common/UserManagement/UserList.vue
@@ -2,7 +2,6 @@
   <v-data-table
     :headers="headers"
     :items="users"
-    :loading="isLoading"
     no-data-text="No assigned users."
     hide-actions>
     <template v-slot:items="{ item }">
@@ -16,14 +15,14 @@
       </td>
       <td class="role-select">
         <v-select
-          :value="item.courseRole"
+          :value="item[roleType]"
           :items="roles"
-          @change="role => changeRole(item.email, role)"
+          @change="role => $emit('upsert', item.email, role)"
           icon/>
       </td>
       <td class="actions">
         <v-btn color="blue-grey" icon flat small>
-          <v-icon @click="remove(item)">mdi-delete</v-icon>
+          <v-icon @click="$emit('remove', item)">mdi-delete</v-icon>
         </v-btn>
       </td>
     </template>
@@ -31,39 +30,16 @@
 </template>
 
 <script>
-import { mapActions, mapGetters } from 'vuex-module';
-import debounce from 'lodash/debounce';
-
 export default {
   props: {
-    roles: { type: Array, required: true }
-  },
-  data() {
-    return { isLoading: true };
+    users: { type: Array, required: true },
+    roles: { type: Array, required: true },
+    roleType: { type: String, default: 'role' }
   },
   computed: {
-    ...mapGetters(['users'], 'course'),
     headers() {
       return ['User', 'Role', ''].map(text => ({ text, sortable: false }));
     }
-  },
-  methods: {
-    ...mapActions(['getUsers', 'upsertUser', 'removeUser'], 'course'),
-    fetchUsers() {
-      this.isLoading = true;
-      return this.getUsers().then(() => (this.isLoading = false));
-    },
-    changeRole(email, role) {
-      const { courseId } = this.$route.params;
-      debounce(this.upsertUser, 500)({ courseId, email, role });
-    },
-    remove(user) {
-      const { courseId } = this.$route.params;
-      this.removeUser({ userId: user.id, courseId });
-    }
-  },
-  created() {
-    this.fetchUsers();
   }
 };
 </script>
diff --git a/client/components/common/UserManagement/index.vue b/client/components/common/UserManagement/index.vue
new file mode 100644
index 000000000..8cc0bc06e
--- /dev/null
+++ b/client/components/common/UserManagement/index.vue
@@ -0,0 +1,43 @@
+<template>
+  <v-card class="settings elevation-2">
+    <progress-dialog :show="isLoading" :indeterminate="true"/>
+    <add-user :roles="roles" @upsert="upsert"/>
+    <user-list
+      v-bind="$attrs"
+      :users="users"
+      :roles="roles"
+      @upsert="upsert"
+      @remove="data => $emit('remove', data)"/>
+  </v-card>
+</template>
+
+<script>
+import AddUser from './AddUser';
+import ProgressDialog from 'components/common/ProgressDialog';
+import UserList from './UserList';
+
+export default {
+  inheritAttrs: false,
+  props: {
+    users: { type: Array, required: true },
+    roles: { type: Array, required: true },
+    isLoading: { type: Boolean, default: false }
+  },
+  methods: {
+    upsert(...data) {
+      return this.$emit('upsert', ...data);
+    }
+  },
+  components: {
+    AddUser,
+    ProgressDialog,
+    UserList
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.settings {
+  padding: 30px 30px 10px;
+}
+</style>
diff --git a/client/components/course/Settings/CourseUserManagement.vue b/client/components/course/Settings/CourseUserManagement.vue
new file mode 100644
index 000000000..818443fb2
--- /dev/null
+++ b/client/components/course/Settings/CourseUserManagement.vue
@@ -0,0 +1,57 @@
+<template>
+  <user-management
+    :users="users"
+    :roles="roles"
+    :isLoading="isLoading"
+    @upsert="upsert"
+    @remove="remove"
+    roleType="courseRole"/>
+</template>
+
+<script>
+import debounce from 'lodash/debounce';
+import map from 'lodash/map';
+import { mapActions, mapGetters } from 'vuex-module';
+import { role } from 'shared';
+import { title as titleCase } from 'to-case';
+import UserManagement from 'components/common/UserManagement';
+
+export default {
+  props: {
+    courseId: { type: Number, required: true }
+  },
+  data() {
+    return {
+      isLoading: true
+    };
+  },
+  computed: {
+    ...mapGetters(['users'], 'course'),
+    roles() {
+      return map(role.course, it => ({
+        text: titleCase(it.replace('COURSE', '')),
+        value: it
+      }));
+    }
+  },
+  methods: {
+    ...mapActions(['getUsers', 'upsertUser', 'removeUser'], 'course'),
+    upsert: debounce(function (email, role) {
+      const { courseId } = this;
+      this.isLoading = true;
+      this.upsertUser({ email, role, courseId }).then(() => (this.isLoading = false));
+    }, 500),
+    remove({ id: userId }) {
+      const { courseId } = this;
+      this.isLoading = true;
+      this.removeUser({ userId, courseId }).then(() => (this.isLoading = false));
+    }
+  },
+  created() {
+    this.getUsers().then(() => (this.isLoading = false));
+  },
+  components: {
+    UserManagement
+  }
+};
+</script>
diff --git a/client/components/course/Settings/UserManagement/index.vue b/client/components/course/Settings/UserManagement/index.vue
deleted file mode 100644
index f433ca785..000000000
--- a/client/components/course/Settings/UserManagement/index.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-<template>
-  <v-card class="settings elevation-2">
-    <add-user :roles="roles"/>
-    <user-list :roles="roles"/>
-  </v-card>
-</template>
-
-<script>
-import AddUser from './AddUser';
-import map from 'lodash/map';
-import { role } from 'shared';
-import { title as titleCase } from 'to-case';
-import UserList from './UserList';
-
-export default {
-  computed: {
-    roles() {
-      return map(role.course, it => ({
-        text: titleCase(it.replace('COURSE', '')),
-        value: it
-      }));
-    }
-  },
-  components: {
-    AddUser,
-    UserList
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-.settings {
-  padding: 30px 30px 10px;
-}
-</style>
diff --git a/client/components/course/Settings/index.vue b/client/components/course/Settings/index.vue
index 4ecb0eac3..7fe6968c1 100644
--- a/client/components/course/Settings/index.vue
+++ b/client/components/course/Settings/index.vue
@@ -7,7 +7,7 @@
           @action="onActionClick"/>
       </v-card>
       <v-flex ml-4>
-        <router-view></router-view>
+        <router-view/>
       </v-flex>
     </v-layout>
     <clone-modal
@@ -37,16 +37,16 @@
 
 <script>
 import { mapActions, mapGetters } from 'vuex-module';
-import api from '../../../api/course';
+import api from '@/api/course';
 import CloneModal from './CloneModal';
+import CourseUserManagement from './CourseUserManagement';
 import EventBus from 'EventBus';
 import General from './General';
 import JSZip from 'jszip';
-import ProgressDialog from '@/components/common/ProgressDialog';
+import ProgressDialog from 'components/common/ProgressDialog';
 import publishMixin from 'components/common/mixins/publish';
 import saveAs from 'save-as';
 import Sidebar from './Sidebar';
-import UserManagement from './UserManagement';
 
 const appChannel = EventBus.channel('app');
 
@@ -95,10 +95,10 @@ export default {
   },
   components: {
     CloneModal,
+    CourseUserManagement,
     General,
     ProgressDialog,
-    Sidebar,
-    UserManagement
+    Sidebar
   }
 };
 </script>
diff --git a/client/components/course/index.vue b/client/components/course/index.vue
index aa8b8c323..0fff44990 100644
--- a/client/components/course/index.vue
+++ b/client/components/course/index.vue
@@ -33,7 +33,7 @@ const tabs = [
 
 export default {
   props: {
-    courseId: { type: String, required: true }
+    courseId: { type: Number, required: true }
   },
   data() {
     return {
diff --git a/client/components/system-user-management/AddSystemUser.vue b/client/components/system-user-management/AddSystemUser.vue
deleted file mode 100644
index 089bd5499..000000000
--- a/client/components/system-user-management/AddSystemUser.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<template>
-  <form @submit.prevent="addUser" novalidate>
-    <div class="row">
-      <div class="col-md-7">
-        <input
-          v-validate="'email'"
-          v-model.trim="context.email"
-          data-vv-delay="0"
-          class="form-control"
-          type="email"
-          name="email"
-          placeholder="Email"/>
-        <div class="email-error">{{ vErrors.first('email') }}</div>
-      </div>
-      <div class="col-lg-4 col-md-3">
-        <multiselect
-          :value="context.role"
-          :options="roles"
-          :searchable="false"
-          :allowEmpty="false"
-          @input="newRole => (role = newRole)"
-          placeholder="Select role"
-          class="role-select"/>
-      </div>
-      <div class="col-lg-1 col-md-2">
-        <button
-          :disabled="isDisabled"
-          type="submit"
-          class="btn btn-primary btn-block">
-          Invite
-        </button>
-      </div>
-    </div>
-  </form>
-</template>
-
-<script>
-import { withValidation } from 'utils/validation';
-import Multiselect from '../common/Select';
-
-export default {
-  name: 'add-system-user',
-  mixins: [withValidation()],
-  props: {
-    defaultRole: { type: Object, required: true },
-    roles: { type: Array, required: true }
-  },
-  data() {
-    return {
-      context: { email: '', role: this.defaultRole }
-    };
-  },
-  computed: {
-    isDisabled() {
-      return !this.context.email.length || this.vErrors.has('email');
-    }
-  },
-  methods: {
-    addUser() {
-      const { email, role } = this.context;
-      this.$emit('add', email, { role: role.value });
-      this.reset();
-    },
-    reset() {
-      this.context = { email: '', role: this.defaultRole };
-    }
-  },
-  components: {
-    Multiselect
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-.email-error {
-  padding: 3px 0;
-  color: #a94442;
-  text-align: left;
-}
-</style>
diff --git a/client/components/system-user-management/SystemUser.vue b/client/components/system-user-management/SystemUser.vue
deleted file mode 100644
index e787d5174..000000000
--- a/client/components/system-user-management/SystemUser.vue
+++ /dev/null
@@ -1,51 +0,0 @@
-<template>
-  <tr class="system-user-row">
-    <td class="email-cell">{{ email }}</td>
-    <td>
-      <multiselect
-        :value="selectedRole"
-        :options="roles"
-        :disabled="!canChangeRole"
-        :searchable="false"
-        :allowEmpty="false"
-        @input="({ value: role }) => $emit('update', { role })"
-        placeholder="Select new role">
-      </multiselect>
-    </td>
-    <td class="text-center">
-      <button @click="$emit('delete')" type="button" class="btn btn-link">
-        <span class="mdi mdi-close"></span>
-      </button>
-    </td>
-  </tr>
-</template>
-
-<script>
-import Multiselect from '../common/Select';
-
-export default {
-  name: 'system-user',
-  props: {
-    email: { type: String, required: true },
-    role: { type: String, required: true },
-    roles: { type: Array, required: true }
-  },
-  computed: {
-    selectedRole() {
-      return { label: this.role, value: this.role };
-    },
-    canChangeRole() {
-      return this.roles.find(it => it.value === this.role);
-    }
-  },
-  components: {
-    Multiselect
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-.system-user-row td {
-  vertical-align: middle;
-}
-</style>
diff --git a/client/components/system-user-management/index.vue b/client/components/system-user-management/index.vue
deleted file mode 100644
index 44629810b..000000000
--- a/client/components/system-user-management/index.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
-  <div class="system-users-container">
-    <h2>System user management</h2>
-    <loader v-if="showLoader"/>
-    <div v-else class="system-users">
-      <add-system-user v-bind="{ defaultRole, roles }" @add="upsertUser"/>
-      <table class="table table-striped table-hover">
-        <thead>
-          <tr>
-            <th>User</th>
-            <th class="role-column">Role</th>
-            <th class="text-center remove-column">Remove from system</th>
-          </tr>
-        </thead>
-        <tbody>
-          <system-user
-            v-for="{ id, email, role } in users"
-            v-bind="{ id, email, role, roles }"
-            :key="id"
-            @update="data => upsertUser(email, data)"
-            @delete="removeUser(id)"/>
-        </tbody>
-      </table>
-    </div>
-  </div>
-</template>
-
-<script>
-import api from 'client/api/system';
-import { role } from 'shared';
-import AddSystemUser from './AddSystemUser';
-import Loader from '../common/Loader';
-import map from 'lodash/map';
-import omit from 'lodash/omit';
-import SystemUser from './SystemUser';
-
-const { INTEGRATION, USER } = role.user;
-
-export default {
-  name: 'system-user-management',
-  data() {
-    return {
-      showLoader: true,
-      users: []
-    };
-  },
-  computed: {
-    defaultRole() {
-      return this.roles.find(it => it.value === USER);
-    },
-    roles() {
-      const { user: roles } = role;
-      return map(omit(roles, INTEGRATION), it => ({ label: it, value: it }));
-    }
-  },
-  methods: {
-    upsertUser(email, data) {
-      return api.upsertUser(email, data).then(userData => {
-        let user = this.users.find(it => it.email === email);
-        return user ? Object.assign(user, userData) : this.users.unshift(userData);
-      });
-    },
-    removeUser(id) {
-      return api.removeUser(id).then(() => {
-        this.users = this.users.filter(user => user.id !== id);
-      });
-    }
-  },
-  created() {
-    api.getUsers().then(users => Object.assign(this, { users, showLoader: false }));
-  },
-  components: {
-    AddSystemUser,
-    Loader,
-    SystemUser
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-.system-users-container {
-  padding: 60px 60px 20px;
-}
-
-h2 {
-  margin: 0 0 20px;
-  padding: 0;
-  color: #444;
-  font-size: 18px;
-  text-align: left;
-}
-
-.system-users {
-  padding: 30px 30px 10px;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4);
-  background-color: white;
-
-  .table {
-    margin-top: 30px;
-    text-align: left;
-  }
-}
-
-.role-column, .remove-column {
-  width: 300px;
-}
-</style>
diff --git a/client/router.js b/client/router.js
index b21596d68..0fbd53f10 100644
--- a/client/router.js
+++ b/client/router.js
@@ -1,3 +1,4 @@
+import { numeric as numericParser } from 'client/utils/paramsParser';
 import Router from 'vue-router';
 import store from './store';
 import Vue from 'vue';
@@ -7,15 +8,15 @@ import Catalog from './components/catalog/Container';
 import Course from './components/course';
 import CourseRevisions from './components/course/Revisions';
 import CourseSettings from './components/course/Settings';
+import CourseUserManagement from './components/course/Settings/CourseUserManagement';
 import Editor from './components/editor';
 import ForgotPassword from './components/auth/ForgotPassword';
 import General from './components/course/Settings/General';
 import Login from './components/auth/Login';
 import Outline from './components/course/Outline';
 import ResetPassword from './components/auth/ResetPassword';
-import SystemUserManagement from './components/system-user-management';
+import SystemUserManagement from './components/SystemUserManagement';
 import TreeView from './components/course/TreeView';
-import UserManagement from './components/course/Settings/UserManagement';
 
 Vue.use(Router);
 
@@ -28,7 +29,7 @@ let router = new Router({
   }, {
     path: '/course/:courseId',
     component: Course,
-    props: true,
+    props: numericParser,
     meta: { auth: true },
     children: [{
       path: '',
@@ -48,7 +49,8 @@ let router = new Router({
       }, {
         path: 'users',
         name: 'user-management',
-        component: UserManagement
+        props: numericParser,
+        component: CourseUserManagement
       }]
     }, {
       path: 'revisions',
diff --git a/client/utils/paramsParser.js b/client/utils/paramsParser.js
new file mode 100644
index 000000000..040cf4998
--- /dev/null
+++ b/client/utils/paramsParser.js
@@ -0,0 +1,5 @@
+'use strict';
+
+import mapValues from 'lodash/mapValues';
+
+export const numeric = route => mapValues(route.params, Number);
diff --git a/server/user/user.controller.js b/server/user/user.controller.js
index 501cf9327..67d24644e 100644
--- a/server/user/user.controller.js
+++ b/server/user/user.controller.js
@@ -2,19 +2,21 @@
 
 const { createError, validationError } = require('../shared/error/helpers');
 const { NO_CONTENT, NOT_FOUND } = require('http-status-codes');
+const { role } = require('../../config/shared');
 const { User } = require('../shared/database');
 
 function index({ query: { roleType } }, res) {
   let options = { attributes: ['id', 'email', 'role'] };
   return User.scope({ method: ['withRoleType', roleType] })
     .findAll(options)
+    .filter(user => user.role !== role.user.INTEGRATION)
     .then(data => res.json({ data }));
 }
 
 function upsert({ body: { email, role } }, res) {
+  const data = { deletedAt: null, role, email };
   return User.findOne({ where: { email }, paranoid: false })
-    .then(user => user ? user.update({ role }) : User.invite({ email, role }))
-    .then(user => user.deletedAt ? user.restore() : user)
+    .then(user => user ? user.update(data) : User.invite(data))
     .then(data => res.json({ data }));
 }
 

From 8cd2f7cd33cba0aaf1888e09821637c952f4d308 Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Thu, 23 May 2019 09:19:10 +0200
Subject: [PATCH 022/213] Clear email after user creation

---
 client/components/common/UserManagement/AddUser.vue | 10 +++++++++-
 client/components/common/UserManagement/index.vue   |  4 ++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/client/components/common/UserManagement/AddUser.vue b/client/components/common/UserManagement/AddUser.vue
index da8a74707..a0d5a57b2 100644
--- a/client/components/common/UserManagement/AddUser.vue
+++ b/client/components/common/UserManagement/AddUser.vue
@@ -37,7 +37,8 @@ import { withValidation } from 'utils/validation';
 export default {
   mixins: [withValidation()],
   props: {
-    roles: { type: Array, required: true }
+    roles: { type: Array, required: true },
+    isLoading: { type: Boolean, required: true }
   },
   data() {
     return {
@@ -52,6 +53,13 @@ export default {
         if (isValid) return this.$emit('upsert', email, role);
       });
     }
+  },
+  watch: {
+    isLoading(val) {
+      if (val) return;
+      this.email = '';
+      this.$nextTick(() => this.$validator.reset());
+    }
   }
 };
 </script>
diff --git a/client/components/common/UserManagement/index.vue b/client/components/common/UserManagement/index.vue
index 8cc0bc06e..d4732cdff 100644
--- a/client/components/common/UserManagement/index.vue
+++ b/client/components/common/UserManagement/index.vue
@@ -1,7 +1,7 @@
 <template>
   <v-card class="settings elevation-2">
     <progress-dialog :show="isLoading" :indeterminate="true"/>
-    <add-user :roles="roles" @upsert="upsert"/>
+    <add-user :roles="roles" :isLoading="isLoading" @upsert="upsert"/>
     <user-list
       v-bind="$attrs"
       :users="users"
@@ -21,7 +21,7 @@ export default {
   props: {
     users: { type: Array, required: true },
     roles: { type: Array, required: true },
-    isLoading: { type: Boolean, default: false }
+    isLoading: { type: Boolean, required: true }
   },
   methods: {
     upsert(...data) {

From 5be898920c6bab4a0dcaddd9a4b9ebc977b89e59 Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Thu, 23 May 2019 09:29:27 +0200
Subject: [PATCH 023/213] Moved debounce to common user management component

---
 client/components/SystemUserManagement.vue               | 6 +-----
 client/components/common/UserManagement/UserList.vue     | 9 ++++++++-
 .../components/course/Settings/CourseUserManagement.vue  | 5 ++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/client/components/SystemUserManagement.vue b/client/components/SystemUserManagement.vue
index 8823d547a..dfc5932c2 100644
--- a/client/components/SystemUserManagement.vue
+++ b/client/components/SystemUserManagement.vue
@@ -15,7 +15,6 @@
 
 <script>
 import api from '@/api/system';
-import debounce from 'lodash/debounce';
 import map from 'lodash/map';
 import omit from 'lodash/omit';
 import { role } from 'shared';
@@ -38,11 +37,8 @@ export default {
   },
   methods: {
     upsert(email, role) {
-      debounce(this.upsertUser, 500)(email, { role });
-    },
-    upsertUser(email, data) {
       this.isLoading = true;
-      return api.upsertUser(email, data).then(userData => {
+      return api.upsertUser(email, { role }).then(userData => {
         this.isLoading = false;
         const user = this.users.find(it => it.id === userData.id);
         return user ? Object.assign(user, userData) : this.users.unshift(userData);
diff --git a/client/components/common/UserManagement/UserList.vue b/client/components/common/UserManagement/UserList.vue
index 0597dd03c..e0df00ef4 100644
--- a/client/components/common/UserManagement/UserList.vue
+++ b/client/components/common/UserManagement/UserList.vue
@@ -17,7 +17,7 @@
         <v-select
           :value="item[roleType]"
           :items="roles"
-          @change="role => $emit('upsert', item.email, role)"
+          @change="role => upsert(item.email, role)"
           icon/>
       </td>
       <td class="actions">
@@ -30,6 +30,8 @@
 </template>
 
 <script>
+import debounce from 'lodash/debounce';
+
 export default {
   props: {
     users: { type: Array, required: true },
@@ -40,6 +42,11 @@ export default {
     headers() {
       return ['User', 'Role', ''].map(text => ({ text, sortable: false }));
     }
+  },
+  methods: {
+    upsert: debounce(function (email, role) {
+      this.$emit('upsert', email, role);
+    }, 500)
   }
 };
 </script>
diff --git a/client/components/course/Settings/CourseUserManagement.vue b/client/components/course/Settings/CourseUserManagement.vue
index 818443fb2..96dbec897 100644
--- a/client/components/course/Settings/CourseUserManagement.vue
+++ b/client/components/course/Settings/CourseUserManagement.vue
@@ -9,7 +9,6 @@
 </template>
 
 <script>
-import debounce from 'lodash/debounce';
 import map from 'lodash/map';
 import { mapActions, mapGetters } from 'vuex-module';
 import { role } from 'shared';
@@ -36,11 +35,11 @@ export default {
   },
   methods: {
     ...mapActions(['getUsers', 'upsertUser', 'removeUser'], 'course'),
-    upsert: debounce(function (email, role) {
+    upsert(email, role) {
       const { courseId } = this;
       this.isLoading = true;
       this.upsertUser({ email, role, courseId }).then(() => (this.isLoading = false));
-    }, 500),
+    },
     remove({ id: userId }) {
       const { courseId } = this;
       this.isLoading = true;

From 4ab9a3c5cc931cf5d3ac2e89679ed34f52f032f9 Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Thu, 23 May 2019 09:43:20 +0200
Subject: [PATCH 024/213] Added confirmation modal for user removal

---
 .../components/common/UserManagement/UserList.vue  | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/client/components/common/UserManagement/UserList.vue b/client/components/common/UserManagement/UserList.vue
index e0df00ef4..88b634779 100644
--- a/client/components/common/UserManagement/UserList.vue
+++ b/client/components/common/UserManagement/UserList.vue
@@ -22,7 +22,7 @@
       </td>
       <td class="actions">
         <v-btn color="blue-grey" icon flat small>
-          <v-icon @click="$emit('remove', item)">mdi-delete</v-icon>
+          <v-icon @click="remove(item)">mdi-delete</v-icon>
         </v-btn>
       </td>
     </template>
@@ -30,8 +30,11 @@
 </template>
 
 <script>
+import EventBus from 'EventBus';
 import debounce from 'lodash/debounce';
 
+const appChannel = EventBus.channel('app');
+
 export default {
   props: {
     users: { type: Array, required: true },
@@ -46,7 +49,14 @@ export default {
   methods: {
     upsert: debounce(function (email, role) {
       this.$emit('upsert', email, role);
-    }, 500)
+    }, 500),
+    remove(item) {
+      appChannel.emit('showConfirmationModal', {
+        title: `Remove user?`,
+        message: `Are you sure you want to remove ${item.email}?`,
+        action: () => this.$emit('remove', item)
+      });
+    }
   }
 };
 </script>

From d39f18f92f4b6c376642ef07d20e26d0a1ad790a Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Thu, 23 May 2019 09:45:22 +0200
Subject: [PATCH 025/213] Clean up

---
 client/components/SystemUserManagement.vue          | 2 +-
 client/components/common/UserManagement/AddUser.vue | 2 +-
 client/components/common/UserManagement/index.vue   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/components/SystemUserManagement.vue b/client/components/SystemUserManagement.vue
index dfc5932c2..0485ff21a 100644
--- a/client/components/SystemUserManagement.vue
+++ b/client/components/SystemUserManagement.vue
@@ -38,7 +38,7 @@ export default {
   methods: {
     upsert(email, role) {
       this.isLoading = true;
-      return api.upsertUser(email, { role }).then(userData => {
+      api.upsertUser(email, { role }).then(userData => {
         this.isLoading = false;
         const user = this.users.find(it => it.id === userData.id);
         return user ? Object.assign(user, userData) : this.users.unshift(userData);
diff --git a/client/components/common/UserManagement/AddUser.vue b/client/components/common/UserManagement/AddUser.vue
index a0d5a57b2..19601c023 100644
--- a/client/components/common/UserManagement/AddUser.vue
+++ b/client/components/common/UserManagement/AddUser.vue
@@ -50,7 +50,7 @@ export default {
     addUser() {
       const { email, role } = this;
       this.$validator.validateAll().then(isValid => {
-        if (isValid) return this.$emit('upsert', email, role);
+        if (isValid) this.$emit('upsert', email, role);
       });
     }
   },
diff --git a/client/components/common/UserManagement/index.vue b/client/components/common/UserManagement/index.vue
index d4732cdff..573ccdde9 100644
--- a/client/components/common/UserManagement/index.vue
+++ b/client/components/common/UserManagement/index.vue
@@ -25,7 +25,7 @@ export default {
   },
   methods: {
     upsert(...data) {
-      return this.$emit('upsert', ...data);
+      this.$emit('upsert', ...data);
     }
   },
   components: {

From 52538da7c5867b5334ce0539121885feb4f63d4d Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Thu, 23 May 2019 10:02:05 +0200
Subject: [PATCH 026/213] Clean up

---
 server/user/user.controller.js | 2 +-
 server/user/user.model.js      | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/server/user/user.controller.js b/server/user/user.controller.js
index 67d24644e..cb86366fa 100644
--- a/server/user/user.controller.js
+++ b/server/user/user.controller.js
@@ -6,7 +6,7 @@ const { role } = require('../../config/shared');
 const { User } = require('../shared/database');
 
 function index({ query: { roleType } }, res) {
-  let options = { attributes: ['id', 'email', 'role'] };
+  const options = { attributes: ['id', 'email', 'role'] };
   return User.scope({ method: ['withRoleType', roleType] })
     .findAll(options)
     .filter(user => user.role !== role.user.INTEGRATION)
diff --git a/server/user/user.model.js b/server/user/user.model.js
index 83a7531c7..11cf5994e 100644
--- a/server/user/user.model.js
+++ b/server/user/user.model.js
@@ -5,9 +5,9 @@ const jwt = require('jsonwebtoken');
 const mail = require('../shared/mail');
 const { Model, Op } = require('sequelize');
 const Promise = require('bluebird');
-const { role } = require('../../config/shared');
+const { role: roles } = require('../../config/shared');
 
-const { user: { ADMIN, USER, INTEGRATION } } = role;
+const { user: { ADMIN, USER, INTEGRATION } } = roles;
 
 const bcrypt = Promise.promisifyAll(require('bcryptjs'));
 const AUTH_SECRET = process.env.AUTH_JWT_SECRET;
@@ -102,7 +102,9 @@ class User extends Model {
   static scopes() {
     return {
       withRoleType(type) {
-        return type && { where: { role: { [Op.in]: role.getRoleNames(type) } } };
+        if (!type) return;
+        const role = { [Op.in]: roles.getRoleNames(type) };
+        return { where: { role } };
       }
     };
   }

From c8ba70da0932e9e67c812111f39bb4cde1a6f1d0 Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Thu, 23 May 2019 12:52:58 +0200
Subject: [PATCH 027/213] Fixed course level user navigation:

- fixed issue where navigation was disappearing for course level users
---
 client/components/course/index.vue | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/client/components/course/index.vue b/client/components/course/index.vue
index 0fff44990..5d67f2020 100644
--- a/client/components/course/index.vue
+++ b/client/components/course/index.vue
@@ -24,12 +24,16 @@ import filter from 'lodash/filter';
 import Promise from 'bluebird';
 import sortBy from 'lodash/sortBy';
 
-const tabs = [
-  { name: 'Structure', route: 'course', icon: 'file-tree' },
-  { name: 'Graph View', route: 'tree-view', icon: 'source-fork mdi-rotate-180' },
-  { name: 'History', route: 'course-revisions', icon: 'history' },
-  { name: 'Settings', route: 'course-info', icon: 'settings-outline' }
-];
+const TABS = {
+  GENERAL: [
+    { name: 'Structure', route: 'course', icon: 'file-tree' },
+    { name: 'Graph View', route: 'tree-view', icon: 'source-fork mdi-rotate-180' },
+    { name: 'History', route: 'course-revisions', icon: 'history' }
+  ],
+  SECURE: [
+    { name: 'Settings', route: 'course-info', icon: 'settings-outline' }
+  ]
+};
 
 export default {
   props: {
@@ -44,7 +48,8 @@ export default {
     ...mapGetters(['isAdmin', 'isCourseAdmin']),
     ...mapGetters(['course', 'activities', 'activity'], 'course'),
     tabs() {
-      if (!this.isAdmin && !this.isCourseAdmin) tabs.pop();
+      const tabs = [...TABS.GENERAL];
+      if (this.isAdmin || this.isCourseAdmin) tabs.push(...TABS.SECURE);
       return tabs;
     }
   },

From 9b436e5697e11257243bae33f27d09c432f71f65 Mon Sep 17 00:00:00 2001
From: Luka Saric <rpg.ari7@gmail.com>
Date: Fri, 24 May 2019 09:14:37 +0200
Subject: [PATCH 028/213] Addressed unused auth variable issue

---
 server/app.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/server/app.js b/server/app.js
index 870d5362a..4102e6a39 100644
--- a/server/app.js
+++ b/server/app.js
@@ -9,9 +9,7 @@ const passport = require('passport');
 const path = require('path');
 require('express-async-errors');
 
-// Setup authentication before instantiating the main app router.
-// eslint-disable-next-line no-unused-vars
-const auth = require('./shared/auth');
+require('./shared/auth');
 const config = require('../config/server');
 const logger = require('./shared/logger');
 const router = require('./router');

From 303a524e7feecfed78e6da2a344442ddda5c507c Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Tue, 28 May 2019 18:32:56 +0200
Subject: [PATCH 029/213] Added toolbar items for catalog and settings

---
 client/components/common/Navbar.vue | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/client/components/common/Navbar.vue b/client/components/common/Navbar.vue
index 9bfe89cec..7f5945f2b 100644
--- a/client/components/common/Navbar.vue
+++ b/client/components/common/Navbar.vue
@@ -15,7 +15,15 @@
       </span>
       {{ repository.name }}
     </router-link>
-    <v-spacer></v-spacer>
+    <v-spacer/>
+    <v-toolbar-items>
+      <v-btn :to="{ name: 'catalog' }" exact flat>
+        Catalog
+      </v-btn>
+      <v-btn v-if="isAdmin" :to="{ name: 'system-user-management' }" flat>
+        Settings
+      </v-btn>
+    </v-toolbar-items>
     <v-menu
       min-width="220px"
       transition="slide-y-transition"
@@ -30,11 +38,6 @@
         <v-list-tile>
           <v-list-tile-title>{{ user.email }}</v-list-tile-title>
         </v-list-tile>
-        <v-list-tile
-          v-if="isAdmin"
-          :to="{ name: 'system-user-management' }">
-          <v-list-tile-title>System user management</v-list-tile-title>
-        </v-list-tile>
         <v-list-tile @click="logout">
           <v-list-tile-title>Logout</v-list-tile-title>
         </v-list-tile>

From 01569c9a02d2ccb9c970fa569b8305079e63d40f Mon Sep 17 00:00:00 2001
From: Luka Saric <rpg.ari7@gmail.com>
Date: Thu, 30 May 2019 10:36:51 +0200
Subject: [PATCH 030/213] ESLint client import sort

- added import-sort eslint rule
- note: disabled manually eslint for router.js and main.js on client
---
 .eslintrc.js                                          |  9 +++++----
 client/App.vue                                        |  2 +-
 client/api/resource.js                                |  3 +--
 client/components/catalog/Card/index.vue              |  2 +-
 client/components/catalog/Container.vue               |  2 +-
 .../common/ActivityBrowser/SelectActivity.vue         |  4 ++--
 client/components/common/Meta/DatePicker.vue          |  2 +-
 .../content-elements/tce-drag-drop/edit/index.vue     |  2 +-
 .../content-elements/tce-fill-blank/edit/index.vue    |  2 +-
 .../content-elements/tce-html/edit/image-embed.js     |  4 ++--
 .../content-elements/tce-html/edit/index.vue          |  2 +-
 .../tce-matching-question/edit/index.vue              |  2 +-
 .../tce-numerical-response/edit/index.vue             |  2 +-
 .../content-elements/tce-pdf/edit/index.vue           |  2 +-
 .../content-elements/tce-single-choice/edit/index.vue |  2 +-
 .../course/Outline/InsertActivity/CreateActivity.vue  |  6 +++---
 .../course/Outline/InsertActivity/index.vue           |  2 +-
 client/components/course/Outline/NoActivities.vue     |  2 +-
 client/components/course/Revisions/RevisionItem.vue   |  2 +-
 client/components/course/Revisions/index.vue          |  2 +-
 client/components/course/Settings/CloneModal.vue      |  2 +-
 client/components/course/Settings/General.vue         |  2 +-
 .../components/course/Sidebar/Discussion/Thread.vue   |  2 +-
 client/components/course/Sidebar/Header.vue           |  2 +-
 client/components/course/TreeView/TreeGraph.vue       |  2 +-
 client/components/course/TreeView/index.vue           |  2 +-
 client/components/editor/index.vue                    |  2 +-
 client/components/editor/structure/AssessmentItem.vue |  2 +-
 .../editor/structure/ContentContainers/Container.vue  |  2 +-
 .../editor/structure/Exams/AssessmentGroup.vue        |  2 +-
 .../editor/structure/Exams/GroupIntroduction.vue      |  2 +-
 client/components/editor/structure/Exams/index.vue    |  2 +-
 client/main.js                                        |  3 ++-
 client/router.js                                      |  1 +
 client/store/helpers/collection.js                    |  4 ++--
 client/store/index.js                                 | 11 +++++------
 client/store/modules/activities.js                    |  6 +++---
 client/store/modules/course.js                        |  2 +-
 client/utils/activity.js                              |  2 +-
 package-lock.json                                     |  4 +++-
 40 files changed, 58 insertions(+), 55 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 457171f30..80286e157 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -29,10 +29,11 @@ module.exports = {
       anonymous: 'always',
       named: 'never'
     }],
-    // 'sort-imports': ['error', {
-    //   'ignoreCase': true,
-    //   'ignoreMemberSort': false
-    // }]
+    'sort-imports': ['error', {
+      'ignoreCase': true,
+      'ignoreMemberSort': false,
+      'memberSyntaxSortOrder': ['none', 'all', 'multiple', 'single']
+    }],
     // Vue rules
     'vue/html-self-closing': 'off',
     'vue/attribute-hyphenation': 'off',
diff --git a/client/App.vue b/client/App.vue
index 404165ed8..6385724d6 100644
--- a/client/App.vue
+++ b/client/App.vue
@@ -11,8 +11,8 @@
 <script>
 import ConfirmationModal from 'components/common/ConfirmationModal';
 import isIexplorer from 'is-iexplorer';
-import Navbar from 'components/common/Navbar';
 import { mapGetters } from 'vuex-module';
+import Navbar from 'components/common/Navbar';
 
 if (isIexplorer) document.body.classList.add('ie');
 
diff --git a/client/api/resource.js b/client/api/resource.js
index f4ff84cbd..907c97454 100644
--- a/client/api/resource.js
+++ b/client/api/resource.js
@@ -1,12 +1,11 @@
 import assign from 'lodash/assign';
+import axios from './request';
 import cloneDeep from 'lodash/cloneDeep';
 import cuid from 'cuid';
 import join from 'url-join';
 import omit from 'lodash/omit';
 import Queue from 'promise-queue';
 
-import axios from './request';
-
 // used to serialize api calls that modify data
 const queue = new Queue(1, Infinity);
 
diff --git a/client/components/catalog/Card/index.vue b/client/components/catalog/Card/index.vue
index ed1ec6889..351c7524d 100644
--- a/client/components/catalog/Card/index.vue
+++ b/client/components/catalog/Card/index.vue
@@ -21,9 +21,9 @@
 </template>
 
 <script>
-import { getObjectives } from 'shared/activities';
 import Acronym from 'components/common/Acronym';
 import get from 'lodash/get';
+import { getObjectives } from 'shared/activities';
 import map from 'lodash/map';
 import pluralize from 'pluralize';
 import Stat from './Stat';
diff --git a/client/components/catalog/Container.vue b/client/components/catalog/Container.vue
index 2098d507f..d19fb719d 100644
--- a/client/components/catalog/Container.vue
+++ b/client/components/catalog/Container.vue
@@ -31,12 +31,12 @@
 </template>
 
 <script>
+import { mapActions, mapGetters, mapMutations } from 'vuex-module';
 import CourseCard from './Card';
 import CreateCourse from './Create';
 import get from 'lodash/get';
 import InfiniteLoading from 'vue-infinite-loading';
 import isEmpty from 'lodash/isEmpty';
-import { mapActions, mapGetters, mapMutations } from 'vuex-module';
 import orderBy from 'lodash/orderBy';
 import Promise from 'bluebird';
 import Search from './Search';
diff --git a/client/components/common/ActivityBrowser/SelectActivity.vue b/client/components/common/ActivityBrowser/SelectActivity.vue
index 689ce11e4..27fe83ba9 100644
--- a/client/components/common/ActivityBrowser/SelectActivity.vue
+++ b/client/components/common/ActivityBrowser/SelectActivity.vue
@@ -31,14 +31,14 @@
 </template>
 
 <script>
-import { getAncestors } from 'client/utils/activity';
-import { getSchemaId } from 'shared/activities';
 import activityApi from 'client/api/activity';
 import CircularProgress from 'components/common/CircularProgress';
 import filter from 'lodash/filter';
 import find from 'lodash/find';
 import first from 'lodash/first';
 import get from 'lodash/get';
+import { getAncestors } from 'client/utils/activity';
+import { getSchemaId } from 'shared/activities';
 import map from 'lodash/map';
 import Promise from 'bluebird';
 import reduce from 'lodash/reduce';
diff --git a/client/components/common/Meta/DatePicker.vue b/client/components/common/Meta/DatePicker.vue
index c6669d6a2..12212f454 100644
--- a/client/components/common/Meta/DatePicker.vue
+++ b/client/components/common/Meta/DatePicker.vue
@@ -13,8 +13,8 @@
 </template>
 
 <script>
-import { Datetime } from 'vue-datetime';
 import 'vue-datetime/dist/vue-datetime.css';
+import { Datetime } from 'vue-datetime';
 
 export default {
   props: {
diff --git a/client/components/content-elements/tce-drag-drop/edit/index.vue b/client/components/content-elements/tce-drag-drop/edit/index.vue
index 703e0ae8a..8536152f4 100644
--- a/client/components/content-elements/tce-drag-drop/edit/index.vue
+++ b/client/components/content-elements/tce-drag-drop/edit/index.vue
@@ -66,9 +66,9 @@
 </template>
 
 <script>
-import { defaults } from 'utils/assessment';
 import cloneDeep from 'lodash/cloneDeep';
 import cuid from 'cuid';
+import { defaults } from 'utils/assessment';
 import forEach from 'lodash/forEach';
 import pick from 'lodash/pick';
 import pull from 'lodash/pull';
diff --git a/client/components/content-elements/tce-fill-blank/edit/index.vue b/client/components/content-elements/tce-fill-blank/edit/index.vue
index 787a269a5..ed6a89701 100644
--- a/client/components/content-elements/tce-fill-blank/edit/index.vue
+++ b/client/components/content-elements/tce-fill-blank/edit/index.vue
@@ -36,8 +36,8 @@
 </template>
 
 <script>
-import { defaults } from 'utils/assessment';
 import debounce from 'lodash/debounce';
+import { defaults } from 'utils/assessment';
 import draggable from 'vuedraggable';
 import filter from 'lodash/filter';
 import get from 'lodash/get';
diff --git a/client/components/content-elements/tce-html/edit/image-embed.js b/client/components/content-elements/tce-html/edit/image-embed.js
index c9f6497bf..fadf04fb0 100644
--- a/client/components/content-elements/tce-html/edit/image-embed.js
+++ b/client/components/content-elements/tce-html/edit/image-embed.js
@@ -1,8 +1,8 @@
-import repeat from 'lodash/repeat';
+import './image-embed.scss';
 import { Quill } from 'vue-quill-editor';
+import repeat from 'lodash/repeat';
 import Tooltip from './tooltip';
 
-import './image-embed.scss';
 const Keyboard = Quill.import('modules/keyboard');
 
 class EmbedTooltip extends Tooltip {
diff --git a/client/components/content-elements/tce-html/edit/index.vue b/client/components/content-elements/tce-html/edit/index.vue
index c989b106b..7ab666411 100644
--- a/client/components/content-elements/tce-html/edit/index.vue
+++ b/client/components/content-elements/tce-html/edit/index.vue
@@ -23,10 +23,10 @@
 </template>
 
 <script>
+import { Quill, quillEditor as QuillEditor } from 'vue-quill-editor';
 import debounce from 'lodash/debounce';
 import get from 'lodash/get';
 import ImageEmbed from './image-embed';
-import { quillEditor as QuillEditor, Quill } from 'vue-quill-editor';
 
 Quill.register('modules/imageEmbed', ImageEmbed);
 
diff --git a/client/components/content-elements/tce-matching-question/edit/index.vue b/client/components/content-elements/tce-matching-question/edit/index.vue
index 13a8be6bc..42a9aa6e9 100644
--- a/client/components/content-elements/tce-matching-question/edit/index.vue
+++ b/client/components/content-elements/tce-matching-question/edit/index.vue
@@ -79,9 +79,9 @@
 </template>
 
 <script>
-import { defaults } from 'utils/assessment';
 import cloneDeep from 'lodash/cloneDeep';
 import cuid from 'cuid';
+import { defaults } from 'utils/assessment';
 import find from 'lodash/find';
 import keys from 'lodash/keys';
 import pull from 'lodash/pull';
diff --git a/client/components/content-elements/tce-numerical-response/edit/index.vue b/client/components/content-elements/tce-numerical-response/edit/index.vue
index 970d10ef6..5eb110dc8 100644
--- a/client/components/content-elements/tce-numerical-response/edit/index.vue
+++ b/client/components/content-elements/tce-numerical-response/edit/index.vue
@@ -59,8 +59,8 @@
 </template>
 
 <script>
-import { defaults } from 'utils/assessment';
 import cloneDeep from 'lodash/cloneDeep';
+import { defaults } from 'utils/assessment';
 import find from 'lodash/find';
 import get from 'lodash/get';
 import includes from 'lodash/includes';
diff --git a/client/components/content-elements/tce-pdf/edit/index.vue b/client/components/content-elements/tce-pdf/edit/index.vue
index 424af0e7a..1819b60c5 100644
--- a/client/components/content-elements/tce-pdf/edit/index.vue
+++ b/client/components/content-elements/tce-pdf/edit/index.vue
@@ -41,8 +41,8 @@
 </template>
 
 <script>
-import get from 'lodash/get';
 import CircularProgress from './CircularProgress';
+import get from 'lodash/get';
 import isIE from 'is-iexplorer';
 import isSafari from 'is-safari';
 
diff --git a/client/components/content-elements/tce-single-choice/edit/index.vue b/client/components/content-elements/tce-single-choice/edit/index.vue
index 6555f4015..d44a8370e 100644
--- a/client/components/content-elements/tce-single-choice/edit/index.vue
+++ b/client/components/content-elements/tce-single-choice/edit/index.vue
@@ -40,8 +40,8 @@
 </template>
 
 <script>
-import { defaults } from 'utils/assessment';
 import cloneDeep from 'lodash/cloneDeep';
+import { defaults } from 'utils/assessment';
 import range from 'lodash/range';
 
 const customAlert = {
diff --git a/client/components/course/Outline/InsertActivity/CreateActivity.vue b/client/components/course/Outline/InsertActivity/CreateActivity.vue
index 1b813c6ff..0edb09663 100644
--- a/client/components/course/Outline/InsertActivity/CreateActivity.vue
+++ b/client/components/course/Outline/InsertActivity/CreateActivity.vue
@@ -39,13 +39,13 @@
 </template>
 
 <script>
-import { focus } from 'vue-focus';
-import { mapGetters } from 'vuex-module';
-import { withValidation } from 'utils/validation';
 import ActivityBrowser from 'components/common/ActivityBrowser';
 import first from 'lodash/first';
+import { focus } from 'vue-focus';
+import { mapGetters } from 'vuex-module';
 import multiselect from 'components/common/Select';
 import SelectAction from './SelectAction';
+import { withValidation } from 'utils/validation';
 
 export default {
   mixins: [withValidation()],
diff --git a/client/components/course/Outline/InsertActivity/index.vue b/client/components/course/Outline/InsertActivity/index.vue
index b5b909e99..8bd80887a 100644
--- a/client/components/course/Outline/InsertActivity/index.vue
+++ b/client/components/course/Outline/InsertActivity/index.vue
@@ -33,7 +33,6 @@
 </template>
 
 <script>
-import { getLevel } from 'shared/activities';
 import { getOutlineChildren, getParent } from 'utils/activity';
 import { mapActions, mapGetters, mapMutations, mapState } from 'vuex-module';
 import ActivityBrowser from 'components/common/ActivityBrowser';
@@ -43,6 +42,7 @@ import filter from 'lodash/filter';
 import find from 'lodash/find';
 import findIndex from 'lodash/findIndex';
 import get from 'lodash/get';
+import { getLevel } from 'shared/activities';
 import map from 'lodash/map';
 import SelectAction from './SelectAction';
 
diff --git a/client/components/course/Outline/NoActivities.vue b/client/components/course/Outline/NoActivities.vue
index 4946c51db..37d51266b 100644
--- a/client/components/course/Outline/NoActivities.vue
+++ b/client/components/course/Outline/NoActivities.vue
@@ -35,10 +35,10 @@
 
 <script>
 import { mapActions, mapGetters, mapMutations } from 'vuex-module';
-import { withValidation } from 'utils/validation';
 import filter from 'lodash/filter';
 import first from 'lodash/first';
 import multiselect from '../../common/Select';
+import { withValidation } from 'utils/validation';
 
 export default {
   mixins: [withValidation()],
diff --git a/client/components/course/Revisions/RevisionItem.vue b/client/components/course/Revisions/RevisionItem.vue
index 5c89ad2b0..336dec7d9 100644
--- a/client/components/course/Revisions/RevisionItem.vue
+++ b/client/components/course/Revisions/RevisionItem.vue
@@ -26,10 +26,10 @@ import {
   getRevisionAcronym,
   getRevisionColor
 } from 'utils/revision';
-import { mapGetters } from 'vuex-module';
 import EntityRevisions from './EntityRevisions';
 import fecha from 'fecha';
 import find from 'lodash/find';
+import { mapGetters } from 'vuex-module';
 
 export default {
   name: 'revision-item',
diff --git a/client/components/course/Revisions/index.vue b/client/components/course/Revisions/index.vue
index 1d3ba763a..495b21832 100644
--- a/client/components/course/Revisions/index.vue
+++ b/client/components/course/Revisions/index.vue
@@ -22,9 +22,9 @@
 </template>
 
 <script>
-import { isSameInstance } from 'utils/revision';
 import { mapActions, mapGetters } from 'vuex-module';
 import InfiniteLoading from 'vue-infinite-loading';
+import { isSameInstance } from 'utils/revision';
 import last from 'lodash/last';
 import reduce from 'lodash/reduce';
 import RevisionItem from './RevisionItem';
diff --git a/client/components/course/Settings/CloneModal.vue b/client/components/course/Settings/CloneModal.vue
index 019001532..96ec99177 100644
--- a/client/components/course/Settings/CloneModal.vue
+++ b/client/components/course/Settings/CloneModal.vue
@@ -48,8 +48,8 @@
 </template>
 
 <script>
-import { mapActions } from 'vuex-module';
 import CircularProgress from 'components/common/CircularProgress';
+import { mapActions } from 'vuex-module';
 import Modal from 'components/common/Modal';
 import pick from 'lodash/pick';
 import Promise from 'bluebird';
diff --git a/client/components/course/Settings/General.vue b/client/components/course/Settings/General.vue
index d5bec2d6d..b6ce80f19 100644
--- a/client/components/course/Settings/General.vue
+++ b/client/components/course/Settings/General.vue
@@ -29,11 +29,11 @@
 </template>
 
 <script>
-import { getRepositoryMeta } from 'shared/activities';
 import { mapActions, mapGetters } from 'vuex-module';
 import api from '../../../api/course';
 import cloneDeep from 'lodash/cloneDeep';
 import find from 'lodash/find';
+import { getRepositoryMeta } from 'shared/activities';
 import Meta from 'components/common/Meta';
 import set from 'lodash/set';
 
diff --git a/client/components/course/Sidebar/Discussion/Thread.vue b/client/components/course/Sidebar/Discussion/Thread.vue
index 280ae1afc..4b9b8aa27 100644
--- a/client/components/course/Sidebar/Discussion/Thread.vue
+++ b/client/components/course/Sidebar/Discussion/Thread.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import { mapGetters, mapActions } from 'vuex-module';
+import { mapActions, mapGetters } from 'vuex-module';
 import orderBy from 'lodash/orderBy';
 import ThreadComment from './Comment';
 
diff --git a/client/components/course/Sidebar/Header.vue b/client/components/course/Sidebar/Header.vue
index 21cafd40f..aa84c0508 100644
--- a/client/components/course/Sidebar/Header.vue
+++ b/client/components/course/Sidebar/Header.vue
@@ -23,13 +23,13 @@
 </template>
 
 <script>
+import { mapActions, mapGetters, mapMutations } from 'vuex-module';
 import EventBus from 'EventBus';
 import filter from 'lodash/filter';
 import find from 'lodash/find';
 import first from 'lodash/first';
 import get from 'lodash/get';
 import { isEditable } from 'shared/activities';
-import { mapActions, mapGetters, mapMutations } from 'vuex-module';
 import sortBy from 'lodash/sortBy';
 
 const appChannel = EventBus.channel('app');
diff --git a/client/components/course/TreeView/TreeGraph.vue b/client/components/course/TreeView/TreeGraph.vue
index 252d83dde..1982535e6 100644
--- a/client/components/course/TreeView/TreeGraph.vue
+++ b/client/components/course/TreeView/TreeGraph.vue
@@ -4,10 +4,10 @@
 
 <script>
 import * as d3 from 'd3-selection';
+import { hierarchy, tree } from 'd3-hierarchy';
 import clamp from 'lodash/clamp';
 import flatten from 'lodash/flatten';
 import get from 'lodash/get';
-import { hierarchy, tree } from 'd3-hierarchy';
 import range from 'lodash/range';
 import { zoom } from 'd3-zoom';
 
diff --git a/client/components/course/TreeView/index.vue b/client/components/course/TreeView/index.vue
index 95e1a2e41..8eed1c077 100644
--- a/client/components/course/TreeView/index.vue
+++ b/client/components/course/TreeView/index.vue
@@ -18,12 +18,12 @@
 </template>
 
 <script>
+import { mapGetters, mapMutations } from 'vuex-module';
 import filter from 'lodash/filter';
 import find from 'lodash/find';
 import get from 'lodash/get';
 import includes from 'lodash/includes';
 import map from 'lodash/map';
-import { mapGetters, mapMutations } from 'vuex-module';
 import reduce from 'lodash/reduce';
 import Sidebar from 'components/course/Sidebar';
 import TreeGraph from './TreeGraph';
diff --git a/client/components/editor/index.vue b/client/components/editor/index.vue
index b27ab9281..91bdb5ce5 100644
--- a/client/components/editor/index.vue
+++ b/client/components/editor/index.vue
@@ -42,8 +42,8 @@
 
 <script>
 import * as config from 'shared/activities';
-import { mapActions, mapGetters, mapMutations } from 'vuex-module';
 import { getElementId, isQuestion } from 'tce-core/utils';
+import { mapActions, mapGetters, mapMutations } from 'vuex-module';
 import Assessments from './structure/Assessments';
 import ContentContainers from './structure/ContentContainers';
 import debounce from 'lodash/debounce';
diff --git a/client/components/editor/structure/AssessmentItem.vue b/client/components/editor/structure/AssessmentItem.vue
index b88999d46..70e9820b8 100644
--- a/client/components/editor/structure/AssessmentItem.vue
+++ b/client/components/editor/structure/AssessmentItem.vue
@@ -62,7 +62,6 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex-module';
 import cloneDeep from 'lodash/cloneDeep';
 import filter from 'lodash/filter';
 import find from 'lodash/find';
@@ -70,6 +69,7 @@ import get from 'lodash/get';
 import { getLevel } from 'shared/activities';
 import isEmpty from 'lodash/isEmpty';
 import map from 'lodash/map';
+import { mapGetters } from 'vuex-module';
 import Multiselect from '../../common/Select';
 import set from 'lodash/set';
 import truncate from 'lodash/truncate';
diff --git a/client/components/editor/structure/ContentContainers/Container.vue b/client/components/editor/structure/ContentContainers/Container.vue
index 6472014b4..6fec9eb60 100644
--- a/client/components/editor/structure/ContentContainers/Container.vue
+++ b/client/components/editor/structure/ContentContainers/Container.vue
@@ -35,8 +35,8 @@
 </template>
 
 <script>
-import filter from 'lodash/filter';
 import { mapActions, mapGetters } from 'vuex-module';
+import filter from 'lodash/filter';
 import sortBy from 'lodash/sortBy';
 import TeachingElement from '../../TeachingElement';
 import TesList from '../TesList';
diff --git a/client/components/editor/structure/Exams/AssessmentGroup.vue b/client/components/editor/structure/Exams/AssessmentGroup.vue
index b0d51b332..91d03ba23 100644
--- a/client/components/editor/structure/Exams/AssessmentGroup.vue
+++ b/client/components/editor/structure/Exams/AssessmentGroup.vue
@@ -44,6 +44,7 @@
 </template>
 
 <script>
+import { mapActions, mapGetters, mapMutations } from 'vuex-module';
 import AssessmentItem from '../AssessmentItem';
 import cloneDeep from 'lodash/cloneDeep';
 import debounce from 'lodash/debounce';
@@ -51,7 +52,6 @@ import EventBus from 'EventBus';
 import filter from 'lodash/filter';
 import get from 'lodash/get';
 import GroupIntroduction from './GroupIntroduction';
-import { mapActions, mapGetters, mapMutations } from 'vuex-module';
 import numberToLetter from 'utils/numberToLetter';
 import sortBy from 'lodash/sortBy';
 import TesList from '../TesList';
diff --git a/client/components/editor/structure/Exams/GroupIntroduction.vue b/client/components/editor/structure/Exams/GroupIntroduction.vue
index 311ef08d9..f85adf9ac 100644
--- a/client/components/editor/structure/Exams/GroupIntroduction.vue
+++ b/client/components/editor/structure/Exams/GroupIntroduction.vue
@@ -19,9 +19,9 @@
 </template>
 
 <script>
+import { mapActions, mapGetters } from 'vuex-module';
 import filter from 'lodash/filter';
 import { isQuestion } from 'tce-core/utils';
-import { mapActions, mapGetters } from 'vuex-module';
 import TeachingElement from '../../TeachingElement';
 import TesList from '../TesList';
 
diff --git a/client/components/editor/structure/Exams/index.vue b/client/components/editor/structure/Exams/index.vue
index a06847076..a4138c5d0 100644
--- a/client/components/editor/structure/Exams/index.vue
+++ b/client/components/editor/structure/Exams/index.vue
@@ -17,9 +17,9 @@
 </template>
 
 <script>
+import { mapActions, mapGetters } from 'vuex-module';
 import Exam from './Exam';
 import filter from 'lodash/filter';
-import { mapActions, mapGetters } from 'vuex-module';
 
 export default {
   name: 'exams',
diff --git a/client/main.js b/client/main.js
index cc8e80654..efe594761 100644
--- a/client/main.js
+++ b/client/main.js
@@ -1,3 +1,4 @@
+/* eslint-disable sort-imports */
 import '@babel/polyfill';
 import 'dom-shims/shim/Element.classList';
 import 'dom-shims/shim/Element.mutation';
@@ -10,6 +11,7 @@ import colors from 'vuetify/es5/util/colors';
 import ElementRegistry from './ElementRegistry';
 import FileFilter from '@/directives/file-filter';
 import QuestionContainer from 'tce-core/QuestionContainer';
+import { sync } from 'vuex-router-sync';
 import Timeago from 'vue-timeago';
 import Tooltip from 'vue-directive-tooltip';
 import VeeValidate from './utils/validation';
@@ -17,7 +19,6 @@ import Vue from 'vue';
 import VueHotkey from 'v-hotkey';
 import Vuetify from 'vuetify';
 import VuetifySnackbar from '@/plugins/vuetify-snackbar';
-import { sync } from 'vuex-router-sync';
 
 import store from './store';
 import router from './router';
diff --git a/client/router.js b/client/router.js
index 60d4c423d..dc3d775e7 100644
--- a/client/router.js
+++ b/client/router.js
@@ -1,3 +1,4 @@
+/* eslint-disable sort-imports */
 import Router from 'vue-router';
 import store from './store';
 import Vue from 'vue';
diff --git a/client/store/helpers/collection.js b/client/store/helpers/collection.js
index e76b567fa..e0a31bf8a 100644
--- a/client/store/helpers/collection.js
+++ b/client/store/helpers/collection.js
@@ -1,10 +1,10 @@
 import cuid from 'cuid';
 import each from 'lodash/each';
+import Resource from '../../api/resource';
+
 import Vue from 'vue';
 import { VuexModule } from 'vuex-module';
 
-import Resource from '../../api/resource';
-
 export default function (collectionName, baseUrl = '') {
   let module = new VuexModule(collectionName);
 
diff --git a/client/store/index.js b/client/store/index.js
index 44e9f2c5a..08d2f57b8 100644
--- a/client/store/index.js
+++ b/client/store/index.js
@@ -1,18 +1,17 @@
-import Vue from 'vue';
-import Vuex from 'vuex';
-import createLogger from 'vuex/dist/logger';
-
 import activities from './modules/activities';
 import auth from './modules/auth';
 import comments from './modules/comments';
 import course from './modules/course';
 import courses from './modules/courses';
+import createLogger from 'vuex/dist/logger';
 import editor from './modules/editor';
+import plugins from './plugins';
 import revisions from './modules/revisions';
+import settings from '../settings';
 import tes from './modules/tes';
 
-import plugins from './plugins';
-import settings from '../settings';
+import Vue from 'vue';
+import Vuex from 'vuex';
 
 Vue.use(Vuex);
 
diff --git a/client/store/modules/activities.js b/client/store/modules/activities.js
index 4ad5ce26f..ed6910446 100644
--- a/client/store/modules/activities.js
+++ b/client/store/modules/activities.js
@@ -1,10 +1,10 @@
-import calculatePosition from 'utils/calculatePosition';
-import filter from 'lodash/filter';
-import find from 'lodash/find';
 import {
   getDescendants as getDeepChildren,
   getAncestors as getParents
 } from 'utils/activity';
+import calculatePosition from 'utils/calculatePosition';
+import filter from 'lodash/filter';
+import find from 'lodash/find';
 import get from 'lodash/get';
 import { getLevel } from 'shared/activities';
 import request from '../../api/request';
diff --git a/client/store/modules/course.js b/client/store/modules/course.js
index a882fde77..4dd7fa5c4 100644
--- a/client/store/modules/course.js
+++ b/client/store/modules/course.js
@@ -1,9 +1,9 @@
+import { getLevel, getOutlineLevels, getTesMeta } from 'shared/activities';
 import compact from 'lodash/compact';
 import courseApi from '../../api/course';
 import filter from 'lodash/filter';
 import find from 'lodash/find';
 import get from 'lodash/get';
-import { getLevel, getOutlineLevels, getTesMeta } from 'shared/activities';
 import map from 'lodash/map';
 import transform from 'lodash/transform';
 import values from 'lodash/values';
diff --git a/client/utils/activity.js b/client/utils/activity.js
index 4e62f3899..3187e624f 100644
--- a/client/utils/activity.js
+++ b/client/utils/activity.js
@@ -1,7 +1,7 @@
-import { getLevel } from 'shared/activities';
 import filter from 'lodash/filter';
 import find from 'lodash/find';
 import get from 'lodash/get';
+import { getLevel } from 'shared/activities';
 import sortBy from 'lodash/sortBy';
 
 export function getParent(activities, activity) {
diff --git a/package-lock.json b/package-lock.json
index 17a48b6d9..04ab04b09 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10250,6 +10250,7 @@
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.4.tgz",
       "integrity": "sha512-mlouk1OHlaUE8Odt1drMtG1bAJA4ZA6B/ehysgV0LUIrDHdKgo1KorZq3pK0b/7Z7LJIQ12MNM6aC+Tn6lUZ5w==",
       "dev": true,
+      "optional": true,
       "requires": {
         "safe-buffer": "^5.1.2",
         "yallist": "^3.0.0"
@@ -10259,7 +10260,8 @@
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz",
           "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },

From adbebe771a3bb91f0872073262149338d9ecdf23 Mon Sep 17 00:00:00 2001
From: zcuric <zcuric@gmail.com>
Date: Fri, 31 May 2019 11:05:57 +0200
Subject: [PATCH 031/213] Update smaller and non-breaking dependecies

---
 package-lock.json | 5216 ++++++++++++++++++++++-----------------------
 package.json      |   16 +-
 2 files changed, 2538 insertions(+), 2694 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 17a48b6d9..b6ad12c39 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -136,39 +136,153 @@
       }
     },
     "@babel/helper-call-delegate": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.1.0.tgz",
-      "integrity": "sha512-YEtYZrw3GUK6emQHKthltKNZwszBcHK58Ygcis+gVUrF4/FmTVr5CCqQNSfmvg2y+YDEANyYoaLz/SHsnusCwQ==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz",
+      "integrity": "sha512-l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-hoist-variables": "^7.0.0",
-        "@babel/traverse": "^7.1.0",
-        "@babel/types": "^7.0.0"
+        "@babel/helper-hoist-variables": "^7.4.4",
+        "@babel/traverse": "^7.4.4",
+        "@babel/types": "^7.4.4"
+      },
+      "dependencies": {
+        "@babel/generator": {
+          "version": "7.4.4",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.4.4.tgz",
+          "integrity": "sha512-53UOLK6TVNqKxf7RUh8NE851EHRxOOeVXKbK2bivdb+iziMyk03Sr4eaE9OELCbyZAAafAKPDwF2TPUES5QbxQ==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.4.4",
+            "jsesc": "^2.5.1",
+            "lodash": "^4.17.11",
+            "source-map": "^0.5.0",
+            "trim-right": "^1.0.1"
+          }
+        },
+        "@babel/helper-split-export-declaration": {
+          "version": "7.4.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz",
+          "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.4.4"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.4.5",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.5.tgz",
+          "integrity": "sha512-9mUqkL1FF5T7f0WDFfAoDdiMVPWsdD1gZYzSnaXsxUCUqzuch/8of9G3VUSNiZmMBoRxT3neyVsqeiL/ZPcjew==",
+          "dev": true
+        },
+        "@babel/traverse": {
+          "version": "7.4.5",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.5.tgz",
+          "integrity": "sha512-Vc+qjynwkjRmIFGxy0KYoPj4FdVDxLej89kMHFsWScq999uX+pwcX4v9mWRjW0KcAYTPAuVQl2LKP1wEVLsp+A==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.0.0",
+            "@babel/generator": "^7.4.4",
+            "@babel/helper-function-name": "^7.1.0",
+            "@babel/helper-split-export-declaration": "^7.4.4",
+            "@babel/parser": "^7.4.5",
+            "@babel/types": "^7.4.4",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0",
+            "lodash": "^4.17.11"
+          }
+        },
+        "@babel/types": {
+          "version": "7.4.4",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz",
+          "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2",
+            "lodash": "^4.17.11",
+            "to-fast-properties": "^2.0.0"
+          }
+        },
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
       }
     },
     "@babel/helper-create-class-features-plugin": {
-      "version": "7.3.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.3.4.tgz",
-      "integrity": "sha512-uFpzw6L2omjibjxa8VGZsJUPL5wJH0zzGKpoz0ccBkzIa6C8kWNUbiBmQ0rgOKWlHJ6qzmfa6lTiGchiV8SC+g==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.4.4.tgz",
+      "integrity": "sha512-UbBHIa2qeAGgyiNR9RszVF7bUHEdgS4JAUNT8SiqrAN6YJVxlOxeLr5pBzb5kan302dejJ9nla4RyKcR1XT6XA==",
       "dev": true,
       "requires": {
         "@babel/helper-function-name": "^7.1.0",
         "@babel/helper-member-expression-to-functions": "^7.0.0",
         "@babel/helper-optimise-call-expression": "^7.0.0",
         "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-replace-supers": "^7.3.4",
-        "@babel/helper-split-export-declaration": "^7.0.0"
+        "@babel/helper-replace-supers": "^7.4.4",
+        "@babel/helper-split-export-declaration": "^7.4.4"
+      },
+      "dependencies": {
+        "@babel/helper-split-export-declaration": {
+          "version": "7.4.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz",
+          "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.4.4"
+          }
+        },
+        "@babel/types": {
+          "version": "7.4.4",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz",
+          "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2",
+            "lodash": "^4.17.11",
+            "to-fast-properties": "^2.0.0"
+          }
+        }
       }
     },
     "@babel/helper-define-map": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.1.0.tgz",
-      "integrity": "sha512-yPPcW8dc3gZLN+U1mhYV91QU3n5uTbx7DUdf8NnPbjS0RMwBuHi9Xt2MUgppmNz7CJxTBWsGczTiEp1CSOTPRg==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.4.4.tgz",
+      "integrity": "sha512-IX3Ln8gLhZpSuqHJSnTNBWGDE9kdkTEWl21A/K7PQ00tseBwbqCHTvNLHSBd9M0R5rER4h5Rsvj9vw0R5SieBg==",
       "dev": true,
       "requires": {
         "@babel/helper-function-name": "^7.1.0",
-        "@babel/types": "^7.0.0",
-        "lodash": "^4.17.10"
+        "@babel/types": "^7.4.4",
+        "lodash": "^4.17.11"
+      },
+      "dependencies": {
+        "@babel/types": {
+          "version": "7.4.4",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz",
+          "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2",
+            "lodash": "^4.17.11",
+            "to-fast-properties": "^2.0.0"
+          }
+        }
       }
     },
     "@babel/helper-explode-assignable-expression": {
@@ -202,12 +316,25 @@
       }
     },
     "@babel/helper-hoist-variables": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.0.0.tgz",
-      "integrity": "sha512-Ggv5sldXUeSKsuzLkddtyhyHe2YantsxWKNi7A+7LeD12ExRDWTRk29JCXpaHPAbMaIPZSil7n+lq78WY2VY7w==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz",
+      "integrity": "sha512-VYk2/H/BnYbZDDg39hr3t2kKyifAm1W6zHRfhx8jGjIHpQEBv9dry7oQ2f3+J703TLu69nYdxsovl0XYfcnK4w==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.0.0"
+        "@babel/types": "^7.4.4"
+      },
+      "dependencies": {
+        "@babel/types": {
+          "version": "7.4.4",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz",
+          "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2",
+            "lodash": "^4.17.11",
+            "to-fast-properties": "^2.0.0"
+          }
+        }
       }
     },
     "@babel/helper-member-expression-to-functions": {
@@ -229,17 +356,56 @@
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.2.2",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.2.2.tgz",
-      "integrity": "sha512-YRD7I6Wsv+IHuTPkAmAS4HhY0dkPobgLftHp0cRGZSdrRvmZY8rFvae/GVu3bD00qscuvK3WPHB3YdNpBXUqrA==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.4.4.tgz",
+      "integrity": "sha512-3Z1yp8TVQf+B4ynN7WoHPKS8EkdTbgAEy0nU0rs/1Kw4pDgmvYH3rz3aI11KgxKCba2cn7N+tqzV1mY2HMN96w==",
       "dev": true,
       "requires": {
         "@babel/helper-module-imports": "^7.0.0",
         "@babel/helper-simple-access": "^7.1.0",
-        "@babel/helper-split-export-declaration": "^7.0.0",
-        "@babel/template": "^7.2.2",
-        "@babel/types": "^7.2.2",
-        "lodash": "^4.17.10"
+        "@babel/helper-split-export-declaration": "^7.4.4",
+        "@babel/template": "^7.4.4",
+        "@babel/types": "^7.4.4",
+        "lodash": "^4.17.11"
+      },
+      "dependencies": {
+        "@babel/helper-split-export-declaration": {
+          "version": "7.4.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz",
+          "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.4.4"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.4.5",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.5.tgz",
+          "integrity": "sha512-9mUqkL1FF5T7f0WDFfAoDdiMVPWsdD1gZYzSnaXsxUCUqzuch/8of9G3VUSNiZmMBoRxT3neyVsqeiL/ZPcjew==",
+          "dev": true
+        },
+        "@babel/template": {
+          "version": "7.4.4",
+          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.4.tgz",
+          "integrity": "sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.0.0",
+            "@babel/parser": "^7.4.4",
+            "@babel/types": "^7.4.4"
+          }
+        },
+        "@babel/types": {
+          "version": "7.4.4",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz",
+          "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2",
+            "lodash": "^4.17.11",
+            "to-fast-properties": "^2.0.0"
+          }
+        }
       }
     },
     "@babel/helper-optimise-call-expression": {
@@ -258,12 +424,12 @@
       "dev": true
     },
     "@babel/helper-regex": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.0.0.tgz",
-      "integrity": "sha512-TR0/N0NDCcUIUEbqV6dCO+LptmmSQFQ7q70lfcEB4URsjD0E1HzicrwUH+ap6BAQ2jhCX9Q4UqZy4wilujWlkg==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.4.4.tgz",
+      "integrity": "sha512-Y5nuB/kESmR3tKjU8Nkn1wMGEx1tjJX076HBMeL3XLQCu6vA/YRzuTW0bbb+qRnXvQGn+d6Rx953yffl8vEy7Q==",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.10"
+        "lodash": "^4.17.11"
       }
     },
     "@babel/helper-remap-async-to-generator": {
@@ -280,15 +446,94 @@
       }
     },
     "@babel/helper-replace-supers": {
-      "version": "7.3.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.3.4.tgz",
-      "integrity": "sha512-pvObL9WVf2ADs+ePg0jrqlhHoxRXlOa+SHRHzAXIz2xkYuOHfGl+fKxPMaS4Fq+uje8JQPobnertBBvyrWnQ1A==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.4.4.tgz",
+      "integrity": "sha512-04xGEnd+s01nY1l15EuMS1rfKktNF+1CkKmHoErDppjAAZL+IUBZpzT748x262HF7fibaQPhbvWUl5HeSt1EXg==",
       "dev": true,
       "requires": {
         "@babel/helper-member-expression-to-functions": "^7.0.0",
         "@babel/helper-optimise-call-expression": "^7.0.0",
-        "@babel/traverse": "^7.3.4",
-        "@babel/types": "^7.3.4"
+        "@babel/traverse": "^7.4.4",
+        "@babel/types": "^7.4.4"
+      },
+      "dependencies": {
+        "@babel/generator": {
+          "version": "7.4.4",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.4.4.tgz",
+          "integrity": "sha512-53UOLK6TVNqKxf7RUh8NE851EHRxOOeVXKbK2bivdb+iziMyk03Sr4eaE9OELCbyZAAafAKPDwF2TPUES5QbxQ==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.4.4",
+            "jsesc": "^2.5.1",
+            "lodash": "^4.17.11",
+            "source-map": "^0.5.0",
+            "trim-right": "^1.0.1"
+          }
+        },
+        "@babel/helper-split-export-declaration": {
+          "version": "7.4.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz",
+          "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.4.4"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.4.5",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.5.tgz",
+          "integrity": "sha512-9mUqkL1FF5T7f0WDFfAoDdiMVPWsdD1gZYzSnaXsxUCUqzuch/8of9G3VUSNiZmMBoRxT3neyVsqeiL/ZPcjew==",
+          "dev": true
+        },
+        "@babel/traverse": {
+          "version": "7.4.5",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.5.tgz",
+          "integrity": "sha512-Vc+qjynwkjRmIFGxy0KYoPj4FdVDxLej89kMHFsWScq999uX+pwcX4v9mWRjW0KcAYTPAuVQl2LKP1wEVLsp+A==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.0.0",
+            "@babel/generator": "^7.4.4",
+            "@babel/helper-function-name": "^7.1.0",
+            "@babel/helper-split-export-declaration": "^7.4.4",
+            "@babel/parser": "^7.4.5",
+            "@babel/types": "^7.4.4",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0",
+            "lodash": "^4.17.11"
+          }
+        },
+        "@babel/types": {
+          "version": "7.4.4",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz",
+          "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2",
+            "lodash": "^4.17.11",
+            "to-fast-properties": "^2.0.0"
+          }
+        },
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
+        }
       }
     },
     "@babel/helper-simple-access": {
@@ -370,12 +615,12 @@
       }
     },
     "@babel/plugin-proposal-class-properties": {
-      "version": "7.3.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.3.4.tgz",
-      "integrity": "sha512-lUf8D3HLs4yYlAo8zjuneLvfxN7qfKv1Yzbj5vjqaqMJxgJA3Ipwp4VUJ+OrOdz53Wbww6ahwB8UhB2HQyLotA==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.4.4.tgz",
+      "integrity": "sha512-WjKTI8g8d5w1Bc9zgwSz2nfrsNQsXcCf9J9cdCvrJV6RF56yztwm4TmJC0MgJ9tvwO9gUA/mcYe89bLdGfiXFg==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.3.4",
+        "@babel/helper-create-class-features-plugin": "^7.4.4",
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
@@ -390,9 +635,9 @@
       }
     },
     "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.3.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.3.4.tgz",
-      "integrity": "sha512-j7VQmbbkA+qrzNqbKHrBsW3ddFnOeva6wzSe/zB7T+xaxGc+RCpwo44wCmRixAIGRoIpmVgvzFzNJqQcO3/9RA==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.4.4.tgz",
+      "integrity": "sha512-dMBG6cSPBbHeEBdFXeQ2QLc5gUpg4Vkaz8octD4aoW/ISO+jBOcsuxYL7bsb5WSu8RLP6boxrBIALEHgoHtO9g==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
@@ -410,14 +655,14 @@
       }
     },
     "@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.2.0.tgz",
-      "integrity": "sha512-LvRVYb7kikuOtIoUeWTkOxQEV1kYvL5B6U3iWEGCzPNRus1MzJweFqORTj+0jkxozkTSYNJozPOddxmqdqsRpw==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz",
+      "integrity": "sha512-j1NwnOqMG9mFUOH58JTFsA/+ZYzQLUZ/drqWUqxCYLGeu2JFZL8YrNC9hBxKmWtAuOCHPcRpgv7fhap09Fb4kA==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-regex": "^7.0.0",
-        "regexpu-core": "^4.2.0"
+        "@babel/helper-regex": "^7.4.4",
+        "regexpu-core": "^4.5.4"
       }
     },
     "@babel/plugin-syntax-async-generators": {
@@ -502,9 +747,9 @@
       }
     },
     "@babel/plugin-transform-async-to-generator": {
-      "version": "7.3.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.3.4.tgz",
-      "integrity": "sha512-Y7nCzv2fw/jEZ9f678MuKdMo99MFDJMT/PvD9LisrR5JDFcJH6vYeH6RnjVt3p5tceyGRvTtEN0VOlU+rgHZjA==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.4.4.tgz",
+      "integrity": "sha512-YiqW2Li8TXmzgbXw+STsSqPBPFnGviiaSp6CYOq55X8GQ2SGVLrXB6pNid8HkqkZAzOH6knbai3snhP7v0fNwA==",
       "dev": true,
       "requires": {
         "@babel/helper-module-imports": "^7.0.0",
@@ -522,37 +767,51 @@
       }
     },
     "@babel/plugin-transform-block-scoping": {
-      "version": "7.3.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.3.4.tgz",
-      "integrity": "sha512-blRr2O8IOZLAOJklXLV4WhcEzpYafYQKSGT3+R26lWG41u/FODJuBggehtOwilVAcFu393v3OFj+HmaE6tVjhA==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.4.4.tgz",
+      "integrity": "sha512-jkTUyWZcTrwxu5DD4rWz6rDB5Cjdmgz6z7M7RLXOJyCUkFBawssDGcGh8M/0FTSB87avyJI1HsTwUXp9nKA1PA==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "lodash": "^4.17.11"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "4.17.11",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
-          "dev": true
-        }
       }
     },
     "@babel/plugin-transform-classes": {
-      "version": "7.3.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.3.4.tgz",
-      "integrity": "sha512-J9fAvCFBkXEvBimgYxCjvaVDzL6thk0j0dBvCeZmIUDBwyt+nv6HfbImsSrWsYXfDNDivyANgJlFXDUWRTZBuA==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.4.4.tgz",
+      "integrity": "sha512-/e44eFLImEGIpL9qPxSRat13I5QNRgBLu2hOQJCF7VLy/otSM/sypV1+XaIw5+502RX/+6YaSAPmldk+nhHDPw==",
       "dev": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.0.0",
-        "@babel/helper-define-map": "^7.1.0",
+        "@babel/helper-define-map": "^7.4.4",
         "@babel/helper-function-name": "^7.1.0",
         "@babel/helper-optimise-call-expression": "^7.0.0",
         "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-replace-supers": "^7.3.4",
-        "@babel/helper-split-export-declaration": "^7.0.0",
+        "@babel/helper-replace-supers": "^7.4.4",
+        "@babel/helper-split-export-declaration": "^7.4.4",
         "globals": "^11.1.0"
+      },
+      "dependencies": {
+        "@babel/helper-split-export-declaration": {
+          "version": "7.4.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz",
+          "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.4.4"
+          }
+        },
+        "@babel/types": {
+          "version": "7.4.4",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz",
+          "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2",
+            "lodash": "^4.17.11",
+            "to-fast-properties": "^2.0.0"
+          }
+        }
       }
     },
     "@babel/plugin-transform-computed-properties": {
@@ -565,23 +824,23 @@
       }
     },
     "@babel/plugin-transform-destructuring": {
-      "version": "7.3.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.3.2.tgz",
-      "integrity": "sha512-Lrj/u53Ufqxl/sGxyjsJ2XNtNuEjDyjpqdhMNh5aZ+XFOdThL46KBj27Uem4ggoezSYBxKWAil6Hu8HtwqesYw==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.4.4.tgz",
+      "integrity": "sha512-/aOx+nW0w8eHiEHm+BTERB2oJn5D127iye/SUQl7NjHy0lf+j7h4MKMMSOwdazGq9OxgiNADncE+SRJkCxjZpQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-dotall-regex": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.2.0.tgz",
-      "integrity": "sha512-sKxnyHfizweTgKZf7XsXu/CNupKhzijptfTM+bozonIuyVrLWVUvYjE2bhuSBML8VQeMxq4Mm63Q9qvcvUcciQ==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz",
+      "integrity": "sha512-P05YEhRc2h53lZDjRPk/OektxCVevFzZs2Gfjd545Wde3k+yFDbXORgl2e0xpbq8mLcKJ7Idss4fAg0zORN/zg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-regex": "^7.0.0",
-        "regexpu-core": "^4.1.3"
+        "@babel/helper-regex": "^7.4.4",
+        "regexpu-core": "^4.5.4"
       }
     },
     "@babel/plugin-transform-duplicate-keys": {
@@ -604,9 +863,9 @@
       }
     },
     "@babel/plugin-transform-flow-strip-types": {
-      "version": "7.3.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.3.4.tgz",
-      "integrity": "sha512-PmQC9R7DwpBFA+7ATKMyzViz3zCaMNouzZMPZN2K5PnbBbtL3AXFYTkDk+Hey5crQq2A90UG5Uthz0mel+XZrA==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.4.4.tgz",
+      "integrity": "sha512-WyVedfeEIILYEaWGAUWzVNyqG4sfsNooMhXWsu/YzOvVGcsnPb5PguysjJqI3t3qiaYj0BR8T2f5njdjTGe44Q==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
@@ -614,18 +873,18 @@
       }
     },
     "@babel/plugin-transform-for-of": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.2.0.tgz",
-      "integrity": "sha512-Kz7Mt0SsV2tQk6jG5bBv5phVbkd0gd27SgYD4hH1aLMJRchM0dzHaXvrWhVZ+WxAlDoAKZ7Uy3jVTW2mKXQ1WQ==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz",
+      "integrity": "sha512-9T/5Dlr14Z9TIEXLXkt8T1DU7F24cbhwhMNUziN3hB1AXoZcdzPcTiKGRn/6iOymDqtTKWnr/BtRKN9JwbKtdQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-function-name": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.2.0.tgz",
-      "integrity": "sha512-kWgksow9lHdvBC2Z4mxTsvc7YdY7w/V6B2vy9cTIPtLEE9NhwoWivaxdNM/S37elu5bqlLP/qOY906LukO9lkQ==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz",
+      "integrity": "sha512-iU9pv7U+2jC9ANQkKeNF6DrPy4GBa4NWQtl6dHB4Pb3izX2JOEvDTFarlNsBj/63ZEzNNIAMs3Qw4fNCcSOXJA==",
       "dev": true,
       "requires": {
         "@babel/helper-function-name": "^7.1.0",
@@ -641,6 +900,15 @@
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
+    "@babel/plugin-transform-member-expression-literals": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz",
+      "integrity": "sha512-HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
     "@babel/plugin-transform-modules-amd": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.2.0.tgz",
@@ -652,23 +920,23 @@
       }
     },
     "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.2.0.tgz",
-      "integrity": "sha512-V6y0uaUQrQPXUrmj+hgnks8va2L0zcZymeU7TtWEgdRLNkceafKXEduv7QzgQAE4lT+suwooG9dC7LFhdRAbVQ==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.4.4.tgz",
+      "integrity": "sha512-4sfBOJt58sEo9a2BQXnZq+Q3ZTSAUXyK3E30o36BOGnJ+tvJ6YSxF0PG6kERvbeISgProodWuI9UVG3/FMY6iw==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.1.0",
+        "@babel/helper-module-transforms": "^7.4.4",
         "@babel/helper-plugin-utils": "^7.0.0",
         "@babel/helper-simple-access": "^7.1.0"
       }
     },
     "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.3.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.3.4.tgz",
-      "integrity": "sha512-VZ4+jlGOF36S7TjKs8g4ojp4MEI+ebCQZdswWb/T9I4X84j8OtFAyjXjt/M16iIm5RIZn0UMQgg/VgIwo/87vw==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.4.4.tgz",
+      "integrity": "sha512-MSiModfILQc3/oqnG7NrP1jHaSPryO6tA2kOMmAQApz5dayPxWiHqmq4sWH2xF5LcQK56LlbKByCd8Aah/OIkQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-hoist-variables": "^7.0.0",
+        "@babel/helper-hoist-variables": "^7.4.4",
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
@@ -683,18 +951,18 @@
       }
     },
     "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.3.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.3.0.tgz",
-      "integrity": "sha512-NxIoNVhk9ZxS+9lSoAQ/LM0V2UEvARLttEHUrRDGKFaAxOYQcrkN/nLRE+BbbicCAvZPl7wMP0X60HsHE5DtQw==",
+      "version": "7.4.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.5.tgz",
+      "integrity": "sha512-z7+2IsWafTBbjNsOxU/Iv5CvTJlr5w4+HGu1HovKYTtgJ362f7kBcQglkfmlspKKZ3bgrbSGvLfNx++ZJgCWsg==",
       "dev": true,
       "requires": {
-        "regexp-tree": "^0.1.0"
+        "regexp-tree": "^0.1.6"
       }
     },
     "@babel/plugin-transform-new-target": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.0.0.tgz",
-      "integrity": "sha512-yin069FYjah+LbqfGeTfzIBODex/e++Yfa0rH0fpfam9uTbuEeEOx5GLGr210ggOV77mVRNoeqSYqeuaqSzVSw==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz",
+      "integrity": "sha512-r1z3T2DNGQwwe2vPGZMBNjioT2scgWzK9BCnDEh+46z8EEwXBq24uRzd65I7pjtugzPSj921aM15RpESgzsSuA==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0"
@@ -711,16 +979,25 @@
       }
     },
     "@babel/plugin-transform-parameters": {
-      "version": "7.3.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.3.3.tgz",
-      "integrity": "sha512-IrIP25VvXWu/VlBWTpsjGptpomtIkYrN/3aDp4UKm7xK6UxZY88kcJ1UwETbzHAlwN21MnNfwlar0u8y3KpiXw==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz",
+      "integrity": "sha512-oMh5DUO1V63nZcu/ZVLQFqiihBGo4OpxJxR1otF50GMeCLiRx5nUdtokd+u9SuVJrvvuIh9OosRFPP4pIPnwmw==",
       "dev": true,
       "requires": {
-        "@babel/helper-call-delegate": "^7.1.0",
+        "@babel/helper-call-delegate": "^7.4.4",
         "@babel/helper-get-function-arity": "^7.0.0",
         "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
+    "@babel/plugin-transform-property-literals": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz",
+      "integrity": "sha512-9q7Dbk4RhgcLp8ebduOpCbtjh7C0itoLYHXd9ueASKAG/is5PQtMR5VJGka9NKqGhYEGn5ITahd4h9QeBMylWQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
     "@babel/plugin-transform-react-display-name": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.2.0.tgz",
@@ -762,18 +1039,27 @@
       }
     },
     "@babel/plugin-transform-regenerator": {
-      "version": "7.3.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.3.4.tgz",
-      "integrity": "sha512-hvJg8EReQvXT6G9H2MvNPXkv9zK36Vxa1+csAVTpE1J3j0zlHplw76uudEbJxgvqZzAq9Yh45FLD4pk5mKRFQA==",
+      "version": "7.4.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz",
+      "integrity": "sha512-gBKRh5qAaCWntnd09S8QC7r3auLCqq5DI6O0DlfoyDjslSBVqBibrMdsqO+Uhmx3+BlOmE/Kw1HFxmGbv0N9dA==",
+      "dev": true,
+      "requires": {
+        "regenerator-transform": "^0.14.0"
+      }
+    },
+    "@babel/plugin-transform-reserved-words": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz",
+      "integrity": "sha512-fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw==",
       "dev": true,
       "requires": {
-        "regenerator-transform": "^0.13.4"
+        "@babel/helper-plugin-utils": "^7.0.0"
       }
     },
     "@babel/plugin-transform-runtime": {
-      "version": "7.3.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.3.4.tgz",
-      "integrity": "sha512-PaoARuztAdd5MgeVjAxnIDAIUet5KpogqaefQvPOmPYCxYoaPhautxDh3aO8a4xHsKgT/b9gSxR0BKK1MIewPA==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.4.4.tgz",
+      "integrity": "sha512-aMVojEjPszvau3NRg+TIH14ynZLvPewH4xhlCW1w6A3rkxTS1m4uwzRclYR9oS+rl/dr+kT+pzbfHuAWP/lc7Q==",
       "dev": true,
       "requires": {
         "@babel/helper-module-imports": "^7.0.0",
@@ -783,9 +1069,9 @@
       },
       "dependencies": {
         "semver": {
-          "version": "5.6.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
-          "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
+          "version": "5.7.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
           "dev": true
         }
       }
@@ -819,9 +1105,9 @@
       }
     },
     "@babel/plugin-transform-template-literals": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.2.0.tgz",
-      "integrity": "sha512-FkPix00J9A/XWXv4VoKJBMeSkyY9x/TqIh76wzcdfl57RJJcf8CehQ08uwfhCDNtRQYtHQKBTwKZDEyjE13Lwg==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz",
+      "integrity": "sha512-mQrEC4TWkhLN0z8ygIvEL9ZEToPhG5K7KDW3pzGqOfIGZ28Jb0POUkeWcoz8HnHvhFy6dwAT1j8OzqN8s804+g==",
       "dev": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.0.0",
@@ -838,9 +1124,9 @@
       }
     },
     "@babel/plugin-transform-typescript": {
-      "version": "7.3.2",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.3.2.tgz",
-      "integrity": "sha512-Pvco0x0ZSCnexJnshMfaibQ5hnK8aUHSvjCQhC1JR8eeg+iBwt0AtCO7gWxJ358zZevuf9wPSO5rv+WJcbHPXQ==",
+      "version": "7.4.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.4.5.tgz",
+      "integrity": "sha512-RPB/YeGr4ZrFKNwfuQRlMf2lxoCUaU01MTw39/OFE/RiL8HDjtn68BwEPft1P7JN4akyEmjGWAMNldOV7o9V2g==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
@@ -848,14 +1134,14 @@
       }
     },
     "@babel/plugin-transform-unicode-regex": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.2.0.tgz",
-      "integrity": "sha512-m48Y0lMhrbXEJnVUaYly29jRXbQ3ksxPrS1Tg8t+MHqzXhtBYAvI51euOBaoAlZLPHsieY9XPVMf80a5x0cPcA==",
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz",
+      "integrity": "sha512-il+/XdNw01i93+M9J9u4T7/e/Ue/vWfNZE4IRUQjplu2Mqb/AFTDimkw2tdEdSH50wuQXZAbXSql0UphQke+vA==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.0.0",
-        "@babel/helper-regex": "^7.0.0",
-        "regexpu-core": "^4.1.3"
+        "@babel/helper-regex": "^7.4.4",
+        "regexpu-core": "^4.5.4"
       }
     },
     "@babel/polyfill": {
@@ -880,60 +1166,76 @@
       }
     },
     "@babel/preset-env": {
-      "version": "7.3.4",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.3.4.tgz",
-      "integrity": "sha512-2mwqfYMK8weA0g0uBKOt4FE3iEodiHy9/CW0b+nWXcbL+pGzLx8ESYc+j9IIxr6LTDHWKgPm71i9smo02bw+gA==",
+      "version": "7.4.5",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.4.5.tgz",
+      "integrity": "sha512-f2yNVXM+FsR5V8UwcFeIHzHWgnhXg3NpRmy0ADvALpnhB0SLbCvrCRr4BLOUYbQNLS+Z0Yer46x9dJXpXewI7w==",
       "dev": true,
       "requires": {
         "@babel/helper-module-imports": "^7.0.0",
         "@babel/helper-plugin-utils": "^7.0.0",
         "@babel/plugin-proposal-async-generator-functions": "^7.2.0",
         "@babel/plugin-proposal-json-strings": "^7.2.0",
-        "@babel/plugin-proposal-object-rest-spread": "^7.3.4",
+        "@babel/plugin-proposal-object-rest-spread": "^7.4.4",
         "@babel/plugin-proposal-optional-catch-binding": "^7.2.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.2.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
         "@babel/plugin-syntax-async-generators": "^7.2.0",
         "@babel/plugin-syntax-json-strings": "^7.2.0",
         "@babel/plugin-syntax-object-rest-spread": "^7.2.0",
         "@babel/plugin-syntax-optional-catch-binding": "^7.2.0",
         "@babel/plugin-transform-arrow-functions": "^7.2.0",
-        "@babel/plugin-transform-async-to-generator": "^7.3.4",
+        "@babel/plugin-transform-async-to-generator": "^7.4.4",
         "@babel/plugin-transform-block-scoped-functions": "^7.2.0",
-        "@babel/plugin-transform-block-scoping": "^7.3.4",
-        "@babel/plugin-transform-classes": "^7.3.4",
+        "@babel/plugin-transform-block-scoping": "^7.4.4",
+        "@babel/plugin-transform-classes": "^7.4.4",
         "@babel/plugin-transform-computed-properties": "^7.2.0",
-        "@babel/plugin-transform-destructuring": "^7.2.0",
-        "@babel/plugin-transform-dotall-regex": "^7.2.0",
+        "@babel/plugin-transform-destructuring": "^7.4.4",
+        "@babel/plugin-transform-dotall-regex": "^7.4.4",
         "@babel/plugin-transform-duplicate-keys": "^7.2.0",
         "@babel/plugin-transform-exponentiation-operator": "^7.2.0",
-        "@babel/plugin-transform-for-of": "^7.2.0",
-        "@babel/plugin-transform-function-name": "^7.2.0",
+        "@babel/plugin-transform-for-of": "^7.4.4",
+        "@babel/plugin-transform-function-name": "^7.4.4",
         "@babel/plugin-transform-literals": "^7.2.0",
+        "@babel/plugin-transform-member-expression-literals": "^7.2.0",
         "@babel/plugin-transform-modules-amd": "^7.2.0",
-        "@babel/plugin-transform-modules-commonjs": "^7.2.0",
-        "@babel/plugin-transform-modules-systemjs": "^7.3.4",
+        "@babel/plugin-transform-modules-commonjs": "^7.4.4",
+        "@babel/plugin-transform-modules-systemjs": "^7.4.4",
         "@babel/plugin-transform-modules-umd": "^7.2.0",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.3.0",
-        "@babel/plugin-transform-new-target": "^7.0.0",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.4.5",
+        "@babel/plugin-transform-new-target": "^7.4.4",
         "@babel/plugin-transform-object-super": "^7.2.0",
-        "@babel/plugin-transform-parameters": "^7.2.0",
-        "@babel/plugin-transform-regenerator": "^7.3.4",
+        "@babel/plugin-transform-parameters": "^7.4.4",
+        "@babel/plugin-transform-property-literals": "^7.2.0",
+        "@babel/plugin-transform-regenerator": "^7.4.5",
+        "@babel/plugin-transform-reserved-words": "^7.2.0",
         "@babel/plugin-transform-shorthand-properties": "^7.2.0",
         "@babel/plugin-transform-spread": "^7.2.0",
         "@babel/plugin-transform-sticky-regex": "^7.2.0",
-        "@babel/plugin-transform-template-literals": "^7.2.0",
+        "@babel/plugin-transform-template-literals": "^7.4.4",
         "@babel/plugin-transform-typeof-symbol": "^7.2.0",
-        "@babel/plugin-transform-unicode-regex": "^7.2.0",
-        "browserslist": "^4.3.4",
+        "@babel/plugin-transform-unicode-regex": "^7.4.4",
+        "@babel/types": "^7.4.4",
+        "browserslist": "^4.6.0",
+        "core-js-compat": "^3.1.1",
         "invariant": "^2.2.2",
         "js-levenshtein": "^1.1.3",
-        "semver": "^5.3.0"
+        "semver": "^5.5.0"
       },
       "dependencies": {
+        "@babel/types": {
+          "version": "7.4.4",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.4.4.tgz",
+          "integrity": "sha512-dOllgYdnEFOebhkKCjzSVFqw/PmmB8pH6RGOWkY4GsboQNd47b1fBThBSwlHAq9alF9vc1M3+6oqR47R50L0tQ==",
+          "dev": true,
+          "requires": {
+            "esutils": "^2.0.2",
+            "lodash": "^4.17.11",
+            "to-fast-properties": "^2.0.0"
+          }
+        },
         "semver": {
-          "version": "5.6.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
-          "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
+          "version": "5.7.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
           "dev": true
         }
       }
@@ -962,20 +1264,12 @@
       }
     },
     "@babel/runtime": {
-      "version": "7.3.4",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.3.4.tgz",
-      "integrity": "sha512-IvfvnMdSaLBateu0jfsYIpZTxAc2cKEXEMiezGGN75QcBcecDUKd3PgLAncT0oOgxKy8dd8hrJKj9MfzgfZd6g==",
+      "version": "7.4.5",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.5.tgz",
+      "integrity": "sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==",
       "dev": true,
       "requires": {
-        "regenerator-runtime": "^0.12.0"
-      },
-      "dependencies": {
-        "regenerator-runtime": {
-          "version": "0.12.1",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz",
-          "integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==",
-          "dev": true
-        }
+        "regenerator-runtime": "^0.13.2"
       }
     },
     "@babel/template": {
@@ -1057,50 +1351,6 @@
         "cssnano": "^4.0.0",
         "cssnano-preset-default": "^4.0.0",
         "postcss": "^7.0.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "postcss": {
-          "version": "7.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-          "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "@mdi/font": {
@@ -1158,9 +1408,9 @@
           }
         },
         "semver": {
-          "version": "5.6.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
-          "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
+          "version": "5.7.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
           "dev": true
         },
         "strip-ansi": {
@@ -1192,32 +1442,28 @@
         "webpack-bundle-analyzer": "^3.0.3"
       },
       "dependencies": {
-        "commander": {
-          "version": "2.19.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
-          "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
-          "dev": true
-        },
         "gzip-size": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.0.0.tgz",
-          "integrity": "sha512-5iI7omclyqrnWw4XbXAmGhPsABkSIDQonv2K0h61lybgofWa6iZyvrI3r2zsJH4P8Nb64fFVzlvfhs0g7BBxAA==",
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz",
+          "integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==",
           "dev": true,
           "requires": {
             "duplexer": "^0.1.1",
-            "pify": "^3.0.0"
+            "pify": "^4.0.1"
+          },
+          "dependencies": {
+            "pify": {
+              "version": "4.0.1",
+              "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+              "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+              "dev": true
+            }
           }
         },
-        "opener": {
-          "version": "1.5.1",
-          "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.1.tgz",
-          "integrity": "sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA==",
-          "dev": true
-        },
         "webpack-bundle-analyzer": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.1.0.tgz",
-          "integrity": "sha512-nyDyWEs7C6DZlgvu1pR1zzJfIWSiGPbtaByZr8q+Fd2xp70FuM/8ngCJzj3Er1TYRLSFmp1F1OInbEm4DZH8NA==",
+          "version": "3.3.2",
+          "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.3.2.tgz",
+          "integrity": "sha512-7qvJLPKB4rRWZGjVp5U1KEjwutbDHSKboAl0IfafnrdXMrgC0tOtZbQD6Rw0u4cmpgRN4O02Fc0t8eAT+FgGzA==",
           "dev": true,
           "requires": {
             "acorn": "^6.0.7",
@@ -1236,9 +1482,9 @@
           }
         },
         "ws": {
-          "version": "6.1.4",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-6.1.4.tgz",
-          "integrity": "sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==",
+          "version": "6.2.1",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
+          "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
           "dev": true,
           "requires": {
             "async-limiter": "~1.0.0"
@@ -1607,23 +1853,15 @@
       }
     },
     "@poi/plugin-html-entry": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@poi/plugin-html-entry/-/plugin-html-entry-0.1.1.tgz",
-      "integrity": "sha512-04kdLhbP/W02M2mdn9tk4bP+tRIlt1U6rr1jBXAZscGFi8QA+Tj7EBks3/jqGodL2/5uOYfKPMJpoZRDBcBQWg==",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@poi/plugin-html-entry/-/plugin-html-entry-0.2.0.tgz",
+      "integrity": "sha512-2UOJIsSBY4e8SxGkxhI4XB/2DgTAQ/Z5OIApRE7gTjZySR0bMouf7bqsz0kQlj2JJsRLjv4aS5sS8fW3S82V7A==",
       "dev": true,
       "requires": {
         "chokidar": "^2.0.4",
         "fs-extra": "^7.0.1",
         "lodash": "^4.17.11",
         "posthtml": "^0.11.3"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "4.17.11",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
-          "dev": true
-        }
       }
     },
     "@poi/pnp-webpack-plugin": {
@@ -1692,12 +1930,31 @@
       "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.5.tgz",
       "integrity": "sha512-Ja7d4s0qyGFxjGeDq5S7Si25OFibSAHUi6i17UWnwNnpitADN7hah9q0Tl25gxuV5R1u2Bx+np6w4LHXfHyj/g=="
     },
+    "@types/normalize-package-data": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
+      "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA=="
+    },
+    "@types/prop-types": {
+      "version": "15.7.1",
+      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.1.tgz",
+      "integrity": "sha512-CFzn9idOEpHrgdw8JsoTkaDDyRWk1jrzIV8djzcgpq0y9tG4B4lFT+Nxh52DVpDXV+n4+NPNv7M1Dj5uMp6XFg=="
+    },
     "@types/q": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.1.tgz",
-      "integrity": "sha512-eqz8c/0kwNi/OEHQfvIuJVLTst3in0e7uTKeuY+WL/zfKn0xVujOTp42bS/vUUokhK5P2BppLd9JXMOMHcgbjA==",
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.2.tgz",
+      "integrity": "sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==",
       "dev": true
     },
+    "@types/react": {
+      "version": "16.8.19",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-16.8.19.tgz",
+      "integrity": "sha512-QzEzjrd1zFzY9cDlbIiFvdr+YUmefuuRYrPxmkwG0UQv5XF35gFIi7a95m1bNVcFU0VimxSZ5QVGSiBmlggQXQ==",
+      "requires": {
+        "@types/prop-types": "*",
+        "csstype": "^2.2.0"
+      }
+    },
     "@types/semver": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/@types/semver/-/semver-5.5.0.tgz",
@@ -1746,56 +2003,6 @@
         "prettier": "1.16.3",
         "source-map": "~0.6.1",
         "vue-template-es2015-compiler": "^1.9.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "postcss": {
-          "version": "7.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-          "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "@webassemblyjs/ast": {
@@ -2041,9 +2248,9 @@
       "dev": true
     },
     "address": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/address/-/address-1.0.3.tgz",
-      "integrity": "sha512-z55ocwKBRLryBs394Sm3ushTtBeg6VAeuku7utSoSnsJKvKcnXFIyC6vh27n3rXyxSgkJBBCAvyOn7gSUcTYjg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/address/-/address-1.1.0.tgz",
+      "integrity": "sha512-4diPfzWbLEIElVG4AnqP+00SULlPzNuyJFNnmMrLgyaxG6tZXJ1sn7mjBu4fHrJE+Yp/jgylOweJn2xsLMFggQ==",
       "dev": true
     },
     "addressparser": {
@@ -2096,11 +2303,36 @@
       "dev": true
     },
     "ansi-align": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz",
-      "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz",
+      "integrity": "sha512-ZpClVKqXN3RGBmKibdfWzqCY4lnjEuoNzU5T0oEFpfd/z5qJHVarukridD4juLO2FXMiwUQxr9WqQtaYa8XRYw==",
       "requires": {
-        "string-width": "^2.0.0"
+        "string-width": "^3.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
       }
     },
     "ansi-colors": {
@@ -2315,11 +2547,12 @@
       }
     },
     "assert": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
-      "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
+      "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
       "dev": true,
       "requires": {
+        "object-assign": "^4.1.1",
         "util": "0.10.3"
       },
       "dependencies": {
@@ -2407,9 +2640,12 @@
       "dev": true
     },
     "auto-bind": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/auto-bind/-/auto-bind-1.2.1.tgz",
-      "integrity": "sha512-/W9yj1yKmBLwpexwAujeD9YHwYmRuWFGV8HWE7smQab797VeHa4/cnE2NFeDhA+E+5e/OGBI8763EhLjfZ/MXA=="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/auto-bind/-/auto-bind-2.1.0.tgz",
+      "integrity": "sha512-qZuFvkes1eh9lB2mg8/HG18C+5GIO51r+RrCSst/lh+i5B1CtVlkhTE488M805Nr3dKl0sM/pIFKSKUIlg3zUg==",
+      "requires": {
+        "@types/react": "^16.8.12"
+      }
     },
     "autoprefixer": {
       "version": "9.5.1",
@@ -2593,15 +2829,23 @@
       "dev": true
     },
     "babel-loader": {
-      "version": "8.0.5",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.5.tgz",
-      "integrity": "sha512-NTnHnVRd2JnRqPC0vW+iOQWU5pchDbYXsG2E6DMXEpMfUcQKclF9gmf3G3ZMhzG7IG9ji4coL0cm+FxeWxDpnw==",
+      "version": "8.0.6",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.6.tgz",
+      "integrity": "sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw==",
       "dev": true,
       "requires": {
         "find-cache-dir": "^2.0.0",
         "loader-utils": "^1.0.2",
         "mkdirp": "^0.5.1",
-        "util.promisify": "^1.0.0"
+        "pify": "^4.0.1"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+          "dev": true
+        }
       }
     },
     "babel-plugin-assets-named-imports": {
@@ -2611,13 +2855,25 @@
       "dev": true
     },
     "babel-plugin-macros": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.5.0.tgz",
-      "integrity": "sha512-BWw0lD0kVZAXRD3Od1kMrdmfudqzDzYv2qrN3l2ISR1HVp1EgLKfbOrYV9xmY5k3qx3RIu5uPAUZZZHpo0o5Iw==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.6.0.tgz",
+      "integrity": "sha512-6hrXm6NIoSp+JiqhHZ6tUemhClnu//vjx9fAU5tkRCztTKxgiUpFpMDBX4yZiJIco7qkf0CPX2u4Ax3x6GCiUg==",
       "dev": true,
       "requires": {
-        "cosmiconfig": "^5.0.5",
-        "resolve": "^1.8.1"
+        "@babel/runtime": "^7.4.2",
+        "cosmiconfig": "^5.2.0",
+        "resolve": "^1.10.0"
+      },
+      "dependencies": {
+        "resolve": {
+          "version": "1.11.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.0.tgz",
+          "integrity": "sha512-WL2pBDjqT6pGUNSUzMw00o4T7If+z4H2x3Gz893WoUQ5KW8Vr9txp00ykiP16VBaZF5+j/OcXJHZ9+PCvdiDKw==",
+          "dev": true,
+          "requires": {
+            "path-parse": "^1.0.6"
+          }
+        }
       }
     },
     "babel-plugin-transform-vue-jsx": {
@@ -2934,17 +3190,58 @@
       "integrity": "sha1-62+amoUjuHpwbqkd7sPg1+qoqx8="
     },
     "boxen": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz",
-      "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/boxen/-/boxen-4.0.0.tgz",
+      "integrity": "sha512-gBklgJ9hxaEG8AvEq6JmHns0qQh7JS0uRQtpk4r0OW9AJFKfvP0PVoltH0xzZt/OIio2Iy48xkiV3OaIun7GUw==",
       "requires": {
-        "ansi-align": "^2.0.0",
-        "camelcase": "^4.0.0",
-        "chalk": "^2.0.1",
-        "cli-boxes": "^1.0.0",
-        "string-width": "^2.0.0",
-        "term-size": "^1.2.0",
-        "widest-line": "^2.0.0"
+        "ansi-align": "^3.0.0",
+        "camelcase": "^5.3.1",
+        "chalk": "^2.4.2",
+        "cli-boxes": "^2.2.0",
+        "string-width": "^3.1.0",
+        "term-size": "^2.1.0",
+        "type-fest": "^0.5.2",
+        "widest-line": "^3.1.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
+        },
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
       }
     },
     "brace-expansion": {
@@ -3068,14 +3365,14 @@
       }
     },
     "browserslist": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.4.2.tgz",
-      "integrity": "sha512-ISS/AIAiHERJ3d45Fz0AVYKkgcy+F/eJHzKEvv1j0wwKGKD9T3BrwKr/5g45L+Y4XIK5PlTqefHciRFcfE1Jxg==",
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.1.tgz",
+      "integrity": "sha512-1MC18ooMPRG2UuVFJTHFIAkk6mpByJfxCrnUyvSlu/hyQSFHMrlhM02SzNuCV+quTP4CKmqtOMAIjrifrpBJXQ==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30000939",
-        "electron-to-chromium": "^1.3.113",
-        "node-releases": "^1.1.8"
+        "caniuse-lite": "^1.0.30000971",
+        "electron-to-chromium": "^1.3.137",
+        "node-releases": "^1.1.21"
       }
     },
     "buffer": {
@@ -3152,7 +3449,8 @@
     "builtin-modules": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8="
+      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
+      "dev": true
     },
     "builtin-status-codes": {
       "version": "3.0.0",
@@ -3209,9 +3507,9 @@
       "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg="
     },
     "cac": {
-      "version": "6.4.2",
-      "resolved": "https://registry.npmjs.org/cac/-/cac-6.4.2.tgz",
-      "integrity": "sha512-HM7kl/Izk6pb2HD7z66LVNU52j0xWpBXg8J2MLnOdRMUo2wsrcxu3yRnubnDe/cT0btDzSOl3FPhze09uaT1Vw==",
+      "version": "6.5.1",
+      "resolved": "https://registry.npmjs.org/cac/-/cac-6.5.1.tgz",
+      "integrity": "sha512-mqKv0Ub/nXSoqlACRvrso3k7+nCdzUNimdh+3l0ywDNt27d/x5s/zEg2Ubf1MrsV5Q/DncxtXhNJLrJN6zq1jQ==",
       "dev": true
     },
     "cacache": {
@@ -3416,9 +3714,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30000939",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000939.tgz",
-      "integrity": "sha512-oXB23ImDJOgQpGjRv1tCtzAvJr4/OvrHi5SO2vUgB0g0xpdZZoA/BxfImiWfdwoYdUTtQrPsXsvYU/dmCSM8gg==",
+      "version": "1.0.30000971",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000971.tgz",
+      "integrity": "sha512-TQFYFhRS0O5rdsmSbF1Wn+16latXYsQJat66f7S7lizXW1PVpWJeZw9wqqVLIjuxDRz7s7xRUj13QCfd8hKn6g==",
       "dev": true
     },
     "capture-stack-trace": {
@@ -3548,9 +3846,9 @@
       "dev": true
     },
     "chrome-trace-event": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz",
-      "integrity": "sha512-xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
+      "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==",
       "dev": true,
       "requires": {
         "tslib": "^1.9.0"
@@ -3612,14 +3910,6 @@
       "dev": true,
       "requires": {
         "source-map": "~0.6.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
       }
     },
     "clean-webpack-plugin": {
@@ -3657,9 +3947,9 @@
       }
     },
     "cli-boxes": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz",
-      "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM="
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.0.tgz",
+      "integrity": "sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w=="
     },
     "cli-color": {
       "version": "1.4.0",
@@ -3692,9 +3982,9 @@
       }
     },
     "cli-spinners": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.3.1.tgz",
-      "integrity": "sha512-1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.1.0.tgz",
+      "integrity": "sha512-8B00fJOEh1HPrx4fo5eW16XmE1PcL1tGpGrxy63CXGP9nHdPBN63X75hA1zhvQuhVztJWLqV58Roj2qlNM7cAA==",
       "dev": true
     },
     "cli-width": {
@@ -3750,6 +4040,18 @@
       "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
       "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18="
     },
+    "clone-deep": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-2.0.2.tgz",
+      "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==",
+      "dev": true,
+      "requires": {
+        "for-own": "^1.0.0",
+        "is-plain-object": "^2.0.4",
+        "kind-of": "^6.0.0",
+        "shallow-clone": "^1.0.0"
+      }
+    },
     "clone-regexp": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-1.0.1.tgz",
@@ -3807,9 +4109,9 @@
       }
     },
     "color": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/color/-/color-3.1.0.tgz",
-      "integrity": "sha512-CwyopLkuRYO5ei2EpzpIh6LqJMt6Mt+jZhO5VI5f/wJLZriXQE32/SSqzmrh+QB+AZT81Cj8yv+7zwToW8ahZg==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/color/-/color-3.1.1.tgz",
+      "integrity": "sha512-PvUltIXRjehRKPSy89VnDWFKY58xyhTLyxIg21vwQBI6qLwZNPmC8k3C1uytIgFKEpOIzN4y32iPm8231zFHIg==",
       "dev": true,
       "requires": {
         "color-convert": "^1.9.1",
@@ -3886,35 +4188,35 @@
       }
     },
     "compressible": {
-      "version": "2.0.16",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.16.tgz",
-      "integrity": "sha512-JQfEOdnI7dASwCuSPWIeVYwc/zMsu/+tRhoUvEfXz2gxOA2DNjmG5vhtFdBlhWPPGo+RdT9S3tgc/uH5qgDiiA==",
+      "version": "2.0.17",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.17.tgz",
+      "integrity": "sha512-BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==",
       "dev": true,
       "requires": {
-        "mime-db": ">= 1.38.0 < 2"
-      },
-      "dependencies": {
-        "mime-db": {
-          "version": "1.38.0",
-          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz",
-          "integrity": "sha512-bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==",
-          "dev": true
-        }
+        "mime-db": ">= 1.40.0 < 2"
       }
     },
     "compression": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.3.tgz",
-      "integrity": "sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
+      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
       "dev": true,
       "requires": {
         "accepts": "~1.3.5",
         "bytes": "3.0.0",
-        "compressible": "~2.0.14",
+        "compressible": "~2.0.16",
         "debug": "2.6.9",
-        "on-headers": "~1.0.1",
+        "on-headers": "~1.0.2",
         "safe-buffer": "5.1.2",
         "vary": "~1.1.2"
+      },
+      "dependencies": {
+        "on-headers": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+          "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+          "dev": true
+        }
       }
     },
     "concat-map": {
@@ -4151,6 +4453,31 @@
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
       "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY="
     },
+    "core-js-compat": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.1.3.tgz",
+      "integrity": "sha512-EP018pVhgwsKHz3YoN1hTq49aRe+h017Kjz0NQz3nXV0cCRMvH3fLQl+vEPGr4r4J5sk4sU3tUC7U1aqTCeJeA==",
+      "dev": true,
+      "requires": {
+        "browserslist": "^4.6.0",
+        "core-js-pure": "3.1.3",
+        "semver": "^6.1.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.1.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.1.tgz",
+          "integrity": "sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==",
+          "dev": true
+        }
+      }
+    },
+    "core-js-pure": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.1.3.tgz",
+      "integrity": "sha512-k3JWTrcQBKqjkjI0bkfXS0lbpWPxYuHWfMMjC1VDmzU4Q58IwSbuXSo99YO/hUHlw/EB4AlfA2PVxOGkrIq6dA==",
+      "dev": true
+    },
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
@@ -4166,15 +4493,14 @@
       }
     },
     "cosmiconfig": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.1.0.tgz",
-      "integrity": "sha512-kCNPvthka8gvLtzAxQXvWo4FxqRB+ftRZyPZNuab5ngvM9Y7yw7hbEysglptLgpkGX9nAOKTBVkHUAe8xtYR6Q==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
+      "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
       "dev": true,
       "requires": {
         "import-fresh": "^2.0.0",
         "is-directory": "^0.3.1",
-        "js-yaml": "^3.9.0",
-        "lodash.get": "^4.4.2",
+        "js-yaml": "^3.13.1",
         "parse-json": "^4.0.0"
       },
       "dependencies": {
@@ -4331,94 +4657,105 @@
       "requires": {
         "postcss": "^7.0.1",
         "timsort": "^0.3.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      }
+    },
+    "css-loader": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-2.1.1.tgz",
+      "integrity": "sha512-OcKJU/lt232vl1P9EEDamhoO9iKY3tIjY5GU+XDLblAykTdgs6Ux9P1hTHve8nFKy5KPpOXOsVI/hIwi3841+w==",
+      "dev": true,
+      "requires": {
+        "camelcase": "^5.2.0",
+        "icss-utils": "^4.1.0",
+        "loader-utils": "^1.2.3",
+        "normalize-path": "^3.0.0",
+        "postcss": "^7.0.14",
+        "postcss-modules-extract-imports": "^2.0.0",
+        "postcss-modules-local-by-default": "^2.0.6",
+        "postcss-modules-scope": "^2.1.0",
+        "postcss-modules-values": "^2.0.0",
+        "postcss-value-parser": "^3.3.0",
+        "schema-utils": "^1.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.10.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
+          "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
+            "fast-deep-equal": "^2.0.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
           }
         },
-        "postcss": {
-          "version": "7.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-          "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
+        "ajv-keywords": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.0.tgz",
+          "integrity": "sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==",
+          "dev": true
+        },
+        "big.js": {
+          "version": "5.2.2",
+          "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+          "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+          "dev": true
+        },
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+          "dev": true
+        },
+        "fast-deep-equal": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+          "dev": true
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        },
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
+            "minimist": "^1.2.0"
           }
         },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+        "loader-utils": {
+          "version": "1.2.3",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
+          "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
           "dev": true,
           "requires": {
-            "has-flag": "^3.0.0"
+            "big.js": "^5.2.2",
+            "emojis-list": "^2.0.0",
+            "json5": "^1.0.1"
           }
-        }
-      }
-    },
-    "css-loader": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-1.0.1.tgz",
-      "integrity": "sha512-+ZHAZm/yqvJ2kDtPne3uX0C+Vr3Zn5jFn2N4HywtS5ujwvsVkyg0VArEXpl3BgczDA8anieki1FIzhchX4yrDw==",
-      "dev": true,
-      "requires": {
-        "babel-code-frame": "^6.26.0",
-        "css-selector-tokenizer": "^0.7.0",
-        "icss-utils": "^2.1.0",
-        "loader-utils": "^1.0.2",
-        "lodash": "^4.17.11",
-        "postcss": "^6.0.23",
-        "postcss-modules-extract-imports": "^1.2.0",
-        "postcss-modules-local-by-default": "^1.2.0",
-        "postcss-modules-scope": "^1.1.0",
-        "postcss-modules-values": "^1.3.0",
-        "postcss-value-parser": "^3.3.0",
-        "source-list-map": "^2.0.0"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "4.17.11",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+        },
+        "normalize-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
           "dev": true
         },
-        "postcss": {
-          "version": "6.0.23",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.4.0"
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
           }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
         }
       }
     },
@@ -4440,57 +4777,6 @@
       "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
       "dev": true
     },
-    "css-selector-tokenizer": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz",
-      "integrity": "sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==",
-      "dev": true,
-      "requires": {
-        "cssesc": "^0.1.0",
-        "fastparse": "^1.1.1",
-        "regexpu-core": "^1.0.0"
-      },
-      "dependencies": {
-        "cssesc": {
-          "version": "0.1.0",
-          "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz",
-          "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=",
-          "dev": true
-        },
-        "jsesc": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
-          "dev": true
-        },
-        "regexpu-core": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz",
-          "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=",
-          "dev": true,
-          "requires": {
-            "regenerate": "^1.2.1",
-            "regjsgen": "^0.2.0",
-            "regjsparser": "^0.1.4"
-          }
-        },
-        "regjsgen": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
-          "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
-          "dev": true
-        },
-        "regjsparser": {
-          "version": "0.1.5",
-          "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
-          "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
-          "dev": true,
-          "requires": {
-            "jsesc": "~0.5.0"
-          }
-        }
-      }
-    },
     "css-tree": {
       "version": "1.0.0-alpha.28",
       "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.28.tgz",
@@ -4543,50 +4829,6 @@
         "cssnano-preset-default": "^4.0.7",
         "is-resolvable": "^1.0.0",
         "postcss": "^7.0.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "postcss": {
-          "version": "7.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-          "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "cssnano-preset-default": {
@@ -4625,50 +4867,6 @@
         "postcss-reduce-transforms": "^4.0.2",
         "postcss-svgo": "^4.0.2",
         "postcss-unique-selectors": "^4.0.1"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "postcss": {
-          "version": "7.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-          "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "cssnano-util-get-arguments": {
@@ -4690,50 +4888,6 @@
       "dev": true,
       "requires": {
         "postcss": "^7.0.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "postcss": {
-          "version": "7.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-          "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "cssnano-util-same-parent": {
@@ -4759,18 +4913,21 @@
           "requires": {
             "mdn-data": "~1.1.0",
             "source-map": "^0.5.3"
-          },
-          "dependencies": {
-            "source-map": {
-              "version": "0.5.7",
-              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-              "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-              "dev": true
-            }
           }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
         }
       }
     },
+    "csstype": {
+      "version": "2.6.5",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.5.tgz",
+      "integrity": "sha512-JsTaiksRsel5n7XwqPAfB0l3TFKdpjW/kgAELf9vrb5adGA7UCPLajKK5s3nFrcFm3Rkyp/Qkgl73ENc1UY3cA=="
+    },
     "cuid": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/cuid/-/cuid-1.3.8.tgz",
@@ -5005,7 +5162,62 @@
       "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==",
       "dev": true
     },
-    "defaults": {
+    "default-gateway": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
+      "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
+      "dev": true,
+      "requires": {
+        "execa": "^1.0.0",
+        "ip-regex": "^2.1.0"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+          "dev": true,
+          "requires": {
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
+        "execa": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+          "dev": true,
+          "requires": {
+            "cross-spawn": "^6.0.0",
+            "get-stream": "^4.0.0",
+            "is-stream": "^1.1.0",
+            "npm-run-path": "^2.0.0",
+            "p-finally": "^1.0.0",
+            "signal-exit": "^3.0.0",
+            "strip-eof": "^1.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+          "dev": true,
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "semver": {
+          "version": "5.7.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
+          "dev": true
+        }
+      }
+    },
+    "defaults": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
       "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
@@ -5113,6 +5325,103 @@
         }
       }
     },
+    "del": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
+      "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
+      "dev": true,
+      "requires": {
+        "@types/glob": "^7.1.1",
+        "globby": "^6.1.0",
+        "is-path-cwd": "^2.0.0",
+        "is-path-in-cwd": "^2.0.0",
+        "p-map": "^2.0.0",
+        "pify": "^4.0.1",
+        "rimraf": "^2.6.3"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "7.1.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+          "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+          "dev": true,
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "globby": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+          "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+          "dev": true,
+          "requires": {
+            "array-union": "^1.0.1",
+            "glob": "^7.0.3",
+            "object-assign": "^4.0.1",
+            "pify": "^2.0.0",
+            "pinkie-promise": "^2.0.0"
+          },
+          "dependencies": {
+            "pify": {
+              "version": "2.3.0",
+              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+              "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+              "dev": true
+            }
+          }
+        },
+        "is-path-cwd": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.1.0.tgz",
+          "integrity": "sha512-Sc5j3/YnM8tDeyCsVeKlm/0p95075DyLmDEIkSgQ7mXkrOX+uTCtmQFm0CYzVyJwcCCmO3k8qfJt17SxQwB5Zw==",
+          "dev": true
+        },
+        "is-path-in-cwd": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
+          "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
+          "dev": true,
+          "requires": {
+            "is-path-inside": "^2.1.0"
+          }
+        },
+        "is-path-inside": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
+          "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
+          "dev": true,
+          "requires": {
+            "path-is-inside": "^1.0.2"
+          }
+        },
+        "p-map": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
+          "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
+          "dev": true
+        },
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+          "dev": true
+        },
+        "rimraf": {
+          "version": "2.6.3",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+          "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+          "dev": true,
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
+      }
+    },
     "del-cli": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/del-cli/-/del-cli-1.1.0.tgz",
@@ -5543,9 +5852,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.3.113",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.113.tgz",
-      "integrity": "sha512-De+lPAxEcpxvqPTyZAXELNpRZXABRxf+uL/rSykstQhzj/B0l1150G/ExIIxKc16lI89Hgz81J0BHAcbTqK49g==",
+      "version": "1.3.141",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.141.tgz",
+      "integrity": "sha512-DdQaeP8yQNYFdivOrp37UNAZMvyZP//+SWYMVJD31A/3gbI1J6olQs8tuRaHL2ij7dubhCDXhlE4F97mrT8KGQ==",
       "dev": true
     },
     "elliptic": {
@@ -5564,9 +5873,9 @@
       }
     },
     "email-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/email-regex/-/email-regex-1.0.0.tgz",
-      "integrity": "sha1-FsCPH6gxCQcJASdDCmhWJyi9Aps="
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/email-regex/-/email-regex-3.0.0.tgz",
+      "integrity": "sha512-5FxVen6tUcRJFHpFnW8jMMP4W7tP/xAaYIshi8ia72KMjmRJIwRvTZjWvJYd3qO6W7urOe4DmdbkNB2LkAs8JQ=="
     },
     "email-validator": {
       "version": "2.0.4",
@@ -5600,8 +5909,7 @@
     "emoji-regex": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-      "dev": true
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
     },
     "emojis-list": {
       "version": "2.1.0",
@@ -6694,12 +7002,6 @@
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
       "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
     },
-    "fastparse": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz",
-      "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==",
-      "dev": true
-    },
     "faye-websocket": {
       "version": "0.11.1",
       "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz",
@@ -6754,9 +7056,9 @@
       },
       "dependencies": {
         "ajv": {
-          "version": "6.9.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.2.tgz",
-          "integrity": "sha512-4UFy0/LgDo7Oa/+wOAlj44tp9K78u38E5/359eSrqEp1Z5PdVfimCcs7SluXMP755RUQu6d2b4AvF0R1C9RZjg==",
+          "version": "6.10.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
+          "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^2.0.1",
@@ -6925,6 +7227,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
       "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+      "dev": true,
       "requires": {
         "locate-path": "^2.0.0"
       }
@@ -7356,9 +7659,9 @@
       }
     },
     "fstream": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
-      "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
+      "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
       "requires": {
         "graceful-fs": "^4.1.2",
         "inherits": "~2.0.0",
@@ -7489,9 +7792,9 @@
       "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE="
     },
     "get-port": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/get-port/-/get-port-4.1.0.tgz",
-      "integrity": "sha512-4/fqAYrzrzOiqDrdeZRKXGdTGgbkfTEumGlNQPeP6Jy8w0PzN9mzeNQ3XgHaTNie8pQ3hOUkrwlZt2Fzk5H9mA==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/get-port/-/get-port-4.2.0.tgz",
+      "integrity": "sha512-/b3jarXkH8KJoOMQc3uVGHASwGLPq3gSFJ7tgJm2diza+bydJPTGOibin2steecKeOylE8oY2JERlVWkAJO6yw==",
       "dev": true
     },
     "get-stdin": {
@@ -8093,12 +8396,6 @@
           "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
           "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
           "dev": true
-        },
-        "he": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-          "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-          "dev": true
         }
       }
     },
@@ -8120,14 +8417,6 @@
         "pretty-error": "^2.1.1",
         "tapable": "^1.1.0",
         "util.promisify": "1.0.0"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "4.17.11",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
-          "dev": true
-        }
       }
     },
     "htmlparser2": {
@@ -8200,9 +8489,9 @@
       },
       "dependencies": {
         "eventemitter3": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz",
-          "integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==",
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz",
+          "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==",
           "dev": true
         }
       }
@@ -8236,14 +8525,6 @@
         "is-glob": "^4.0.0",
         "lodash": "^4.17.11",
         "micromatch": "^3.1.10"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "4.17.11",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
-          "dev": true
-        }
       }
     },
     "http-signature": {
@@ -8307,31 +8588,12 @@
       "dev": true
     },
     "icss-utils": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-2.1.0.tgz",
-      "integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz",
+      "integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==",
       "dev": true,
       "requires": {
-        "postcss": "^6.0.1"
-      },
-      "dependencies": {
-        "postcss": {
-          "version": "6.0.23",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.4.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
+        "postcss": "^7.0.14"
       }
     },
     "ieee754": {
@@ -8451,9 +8713,9 @@
           }
         },
         "p-limit": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.1.0.tgz",
-          "integrity": "sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==",
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
+          "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
           "dev": true,
           "requires": {
             "p-try": "^2.0.0"
@@ -8469,9 +8731,9 @@
           }
         },
         "p-try": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz",
-          "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==",
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
           "dev": true
         },
         "pkg-dir": {
@@ -8586,74 +8848,13 @@
       }
     },
     "internal-ip": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.2.0.tgz",
-      "integrity": "sha512-ZY8Rk+hlvFeuMmG5uH1MXhhdeMntmIaxaInvAmzMq/SHV8rv4Kh+6GiQNNDQd0wZFrcO+FiTBo8lui/osKOyJw==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
+      "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==",
       "dev": true,
       "requires": {
-        "default-gateway": "^4.0.1",
+        "default-gateway": "^4.2.0",
         "ipaddr.js": "^1.9.0"
-      },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "6.0.5",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-          "dev": true,
-          "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
-        },
-        "default-gateway": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
-          "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
-          "dev": true,
-          "requires": {
-            "execa": "^1.0.0",
-            "ip-regex": "^2.1.0"
-          }
-        },
-        "execa": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-          "dev": true,
-          "requires": {
-            "cross-spawn": "^6.0.0",
-            "get-stream": "^4.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
-          }
-        },
-        "get-stream": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-          "dev": true,
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        },
-        "ipaddr.js": {
-          "version": "1.9.0",
-          "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz",
-          "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==",
-          "dev": true
-        },
-        "semver": {
-          "version": "5.7.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
-          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
-          "dev": true
-        }
       }
     },
     "invariant": {
@@ -8768,6 +8969,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
       "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
+      "dev": true,
       "requires": {
         "builtin-modules": "^1.0.0"
       }
@@ -9136,9 +9338,9 @@
       "integrity": "sha512-kezcEqgB97BGeZZYtX/MA8AG410ptURstvnz5RAgyFZ8wQFPMxHY8GpTq+/ZHKT3frSlIthUq7EvLt9xn3TvXg=="
     },
     "javascript-stringify": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-1.6.0.tgz",
-      "integrity": "sha1-FC0RHzpuPa6PSpr9d9RYVbWpzOM=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-2.0.0.tgz",
+      "integrity": "sha512-zzK8+ByrzvOL6N92hRewwUKL0wN0TOaIuUjX0Jj8lraxWvr5wHYs2YTjaj2lstF+8qMv5cmPPef47va8NT8lDw==",
       "dev": true
     },
     "jmespath": {
@@ -9164,9 +9366,9 @@
       "dev": true
     },
     "jquery": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz",
-      "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg=="
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz",
+      "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw=="
     },
     "js-base64": {
       "version": "2.5.1",
@@ -9230,9 +9432,9 @@
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
     },
     "js-yaml": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz",
-      "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==",
+      "version": "3.13.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
       "requires": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -9280,9 +9482,9 @@
       "dev": true
     },
     "json3": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz",
-      "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz",
+      "integrity": "sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==",
       "dev": true
     },
     "json5": {
@@ -9535,6 +9737,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
       "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
+      "dev": true,
       "requires": {
         "graceful-fs": "^4.1.2",
         "parse-json": "^4.0.0",
@@ -9591,6 +9794,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
       "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+      "dev": true,
       "requires": {
         "p-locate": "^2.0.0",
         "path-exists": "^3.0.0"
@@ -9742,9 +9946,9 @@
       }
     },
     "loglevel": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.1.tgz",
-      "integrity": "sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=",
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.2.tgz",
+      "integrity": "sha512-Jt2MHrCNdtIe1W6co3tF5KXGRkzF+TYffiQstfXa04mrss9IKXzAAXYWak8LbZseAQY03sH2GzMCMU0ZOUc9bg==",
       "dev": true
     },
     "longest-streak": {
@@ -10065,14 +10269,6 @@
       "dev": true,
       "requires": {
         "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
       }
     },
     "merge2": {
@@ -10168,9 +10364,9 @@
       },
       "dependencies": {
         "ajv": {
-          "version": "6.9.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.2.tgz",
-          "integrity": "sha512-4UFy0/LgDo7Oa/+wOAlj44tp9K78u38E5/359eSrqEp1Z5PdVfimCcs7SluXMP755RUQu6d2b4AvF0R1C9RZjg==",
+          "version": "6.10.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
+          "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^2.0.1",
@@ -10250,6 +10446,7 @@
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.4.tgz",
       "integrity": "sha512-mlouk1OHlaUE8Odt1drMtG1bAJA4ZA6B/ehysgV0LUIrDHdKgo1KorZq3pK0b/7Z7LJIQ12MNM6aC+Tn6lUZ5w==",
       "dev": true,
+      "optional": true,
       "requires": {
         "safe-buffer": "^5.1.2",
         "yallist": "^3.0.0"
@@ -10259,7 +10456,8 @@
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz",
           "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -10753,12 +10951,6 @@
           "integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==",
           "dev": true
         },
-        "process": {
-          "version": "0.11.10",
-          "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-          "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
-          "dev": true
-        },
         "url": {
           "version": "0.11.0",
           "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
@@ -10859,18 +11051,18 @@
       }
     },
     "node-releases": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.9.tgz",
-      "integrity": "sha512-oic3GT4OtbWWKfRolz5Syw0Xus0KRFxeorLNj0s93ofX6PWyuzKjsiGxsCtWktBwwmTF6DdRRf2KreGqeOk5KA==",
+      "version": "1.1.22",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.22.tgz",
+      "integrity": "sha512-O6XpteBuntW1j86mw6LlovBIwTe+sO2+7vi9avQffNeIW4upgnaCVm6xrBWH+KATz7mNNRNNeEpuWB7dT6Cr3w==",
       "dev": true,
       "requires": {
         "semver": "^5.3.0"
       },
       "dependencies": {
         "semver": {
-          "version": "5.6.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
-          "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
+          "version": "5.7.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
           "dev": true
         }
       }
@@ -11022,6 +11214,7 @@
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
       "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
+      "dev": true,
       "requires": {
         "hosted-git-info": "^2.1.4",
         "is-builtin-module": "^1.0.0",
@@ -11032,7 +11225,8 @@
         "semver": {
           "version": "5.7.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
-          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
+          "dev": true
         }
       }
     },
@@ -11286,23 +11480,23 @@
       }
     },
     "ora": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-3.1.0.tgz",
-      "integrity": "sha512-vRBPaNCclUi8pUxRF/G8+5qEQkc6EgzKK1G2ZNJUIGu088Un5qIxFXeDgymvPRM9nmrcUOGzQgS1Vmtz+NtlMw==",
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-3.4.0.tgz",
+      "integrity": "sha512-eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg==",
       "dev": true,
       "requires": {
         "chalk": "^2.4.2",
         "cli-cursor": "^2.1.0",
-        "cli-spinners": "^1.3.1",
+        "cli-spinners": "^2.0.0",
         "log-symbols": "^2.2.0",
-        "strip-ansi": "^5.0.0",
+        "strip-ansi": "^5.2.0",
         "wcwidth": "^1.0.1"
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz",
-          "integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
           "dev": true
         },
         "chalk": {
@@ -11317,12 +11511,12 @@
           }
         },
         "strip-ansi": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz",
-          "integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==",
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^4.0.0"
+            "ansi-regex": "^4.1.0"
           }
         }
       }
@@ -11399,6 +11593,7 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
       "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "dev": true,
       "requires": {
         "p-try": "^1.0.0"
       }
@@ -11407,6 +11602,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
       "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+      "dev": true,
       "requires": {
         "p-limit": "^1.1.0"
       }
@@ -11420,7 +11616,8 @@
     "p-try": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
+      "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+      "dev": true
     },
     "pac-proxy-agent": {
       "version": "2.0.2",
@@ -11581,9 +11778,9 @@
       }
     },
     "parse-ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-2.0.0.tgz",
-      "integrity": "sha512-AddiXFSLLCqj+tCRJ9MrUtHZB4DWojO3tk0NVZ+g5MaMQHF2+p2ktqxuoXyPFLljz/aUK0Nfhd/uGWnhXVXEyA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-2.1.0.tgz",
+      "integrity": "sha512-kHt7kzLoS9VBZfUsiKjv43mr91ea+U05EyKkEtqp7vNbHxmaVuEqN7XxeEVnGrMtYOAxGrDElSi96K7EgO1zCA==",
       "dev": true
     },
     "parseurl": {
@@ -11698,8 +11895,7 @@
     "path-parse": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
-      "dev": true
+      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
     },
     "path-to-regexp": {
       "version": "0.1.7",
@@ -11710,6 +11906,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
       "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+      "dev": true,
       "requires": {
         "pify": "^3.0.0"
       }
@@ -11918,9 +12115,9 @@
       }
     },
     "poi": {
-      "version": "12.5.5",
-      "resolved": "https://registry.npmjs.org/poi/-/poi-12.5.5.tgz",
-      "integrity": "sha512-dY9MFFZzioqniAgOtaK3Rvpp0XjbjvwkpzmzVldJQ13E1GuVZ3oB7AmSKuKe5tQe6+LK8Ohxrw1ugAkmC3deKA==",
+      "version": "12.6.10",
+      "resolved": "https://registry.npmjs.org/poi/-/poi-12.6.10.tgz",
+      "integrity": "sha512-0EOOlzo9s9GgDP/MZqIo6niVuW9jfJbVehEhEk+c1C03FeVZMsXfrxKi91HM79t3YZPlA8U6maoiY0RSibNMbw==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.1.6",
@@ -11937,7 +12134,7 @@
         "@intervolga/optimize-cssnano-plugin": "^1.0.6",
         "@poi/dev-utils": "^12.1.1",
         "@poi/logger": "^12.0.0",
-        "@poi/plugin-html-entry": "^0.1.1",
+        "@poi/plugin-html-entry": "^0.2.0",
         "@poi/pnp-webpack-plugin": "^0.0.2",
         "babel-helper-vue-jsx-merge-props": "^2.0.3",
         "babel-loader": "^8.0.4",
@@ -11949,7 +12146,7 @@
         "case-sensitive-paths-webpack-plugin": "^2.1.2",
         "chalk": "^2.4.1",
         "copy-webpack-plugin": "^4.6.0",
-        "css-loader": "^1.0.1",
+        "css-loader": "^2.1.1",
         "cssnano": "^4.1.7",
         "dotenv": "^6.1.0",
         "dotenv-expand": "^4.2.0",
@@ -12036,9 +12233,9 @@
           }
         },
         "glob": {
-          "version": "7.1.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-          "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+          "version": "7.1.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+          "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
           "dev": true,
           "requires": {
             "fs.realpath": "^1.0.0",
@@ -12064,13 +12261,21 @@
           }
         },
         "gzip-size": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.0.0.tgz",
-          "integrity": "sha512-5iI7omclyqrnWw4XbXAmGhPsABkSIDQonv2K0h61lybgofWa6iZyvrI3r2zsJH4P8Nb64fFVzlvfhs0g7BBxAA==",
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz",
+          "integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==",
           "dev": true,
           "requires": {
             "duplexer": "^0.1.1",
-            "pify": "^3.0.0"
+            "pify": "^4.0.1"
+          },
+          "dependencies": {
+            "pify": {
+              "version": "4.0.1",
+              "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+              "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+              "dev": true
+            }
           }
         },
         "mississippi": {
@@ -12244,50 +12449,6 @@
         "postcss": "^7.0.5",
         "postcss-selector-parser": "^5.0.0-rc.4",
         "postcss-value-parser": "^3.3.1"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "postcss": {
-          "version": "7.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-          "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "postcss-colormin": {
@@ -12301,50 +12462,6 @@
         "has": "^1.0.0",
         "postcss": "^7.0.0",
         "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "postcss": {
-          "version": "7.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-          "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "postcss-convert-values": {
@@ -12355,50 +12472,6 @@
       "requires": {
         "postcss": "^7.0.0",
         "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "postcss": {
-          "version": "7.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-          "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "postcss-discard-comments": {
@@ -12408,50 +12481,6 @@
       "dev": true,
       "requires": {
         "postcss": "^7.0.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "postcss": {
-          "version": "7.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-          "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "postcss-discard-duplicates": {
@@ -12461,50 +12490,6 @@
       "dev": true,
       "requires": {
         "postcss": "^7.0.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "postcss": {
-          "version": "7.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-          "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "postcss-discard-empty": {
@@ -12514,50 +12499,6 @@
       "dev": true,
       "requires": {
         "postcss": "^7.0.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "postcss": {
-          "version": "7.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-          "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "postcss-discard-overridden": {
@@ -12567,50 +12508,6 @@
       "dev": true,
       "requires": {
         "postcss": "^7.0.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "postcss": {
-          "version": "7.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-          "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "postcss-html": {
@@ -12677,9 +12574,9 @@
       },
       "dependencies": {
         "ajv": {
-          "version": "6.9.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.2.tgz",
-          "integrity": "sha512-4UFy0/LgDo7Oa/+wOAlj44tp9K78u38E5/359eSrqEp1Z5PdVfimCcs7SluXMP755RUQu6d2b4AvF0R1C9RZjg==",
+          "version": "6.10.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
+          "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^2.0.1",
@@ -12694,28 +12591,6 @@
           "integrity": "sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==",
           "dev": true
         },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
         "fast-deep-equal": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
@@ -12728,17 +12603,6 @@
           "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
           "dev": true
         },
-        "postcss": {
-          "version": "7.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-          "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
         "schema-utils": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
@@ -12749,15 +12613,6 @@
             "ajv-errors": "^1.0.0",
             "ajv-keywords": "^3.1.0"
           }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
@@ -12787,50 +12642,6 @@
         "postcss": "^7.0.0",
         "postcss-value-parser": "^3.0.0",
         "stylehacks": "^4.0.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "postcss": {
-          "version": "7.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-          "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "postcss-merge-rules": {
@@ -12847,39 +12658,6 @@
         "vendors": "^1.0.0"
       },
       "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "postcss": {
-          "version": "7.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-          "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
         "postcss-selector-parser": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz",
@@ -12890,15 +12668,6 @@
             "indexes-of": "^1.0.1",
             "uniq": "^1.0.1"
           }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
@@ -12910,50 +12679,6 @@
       "requires": {
         "postcss": "^7.0.0",
         "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "postcss": {
-          "version": "7.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-          "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "postcss-minify-gradients": {
@@ -12966,50 +12691,6 @@
         "is-color-stop": "^1.0.0",
         "postcss": "^7.0.0",
         "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "postcss": {
-          "version": "7.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-          "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "postcss-minify-params": {
@@ -13024,50 +12705,6 @@
         "postcss": "^7.0.0",
         "postcss-value-parser": "^3.0.0",
         "uniqs": "^2.0.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "postcss": {
-          "version": "7.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-          "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "postcss-minify-selectors": {
@@ -13082,39 +12719,6 @@
         "postcss-selector-parser": "^3.0.0"
       },
       "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "postcss": {
-          "version": "7.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-          "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
         "postcss-selector-parser": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz",
@@ -13125,131 +12729,85 @@
             "indexes-of": "^1.0.1",
             "uniq": "^1.0.1"
           }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
     "postcss-modules-extract-imports": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.1.tgz",
-      "integrity": "sha512-6jt9XZwUhwmRUhb/CkyJY020PYaPJsCyt3UjbaWo6XEbH/94Hmv6MP7fG2C5NDU/BcHzyGYxNtHvM+LTf9HrYw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz",
+      "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==",
       "dev": true,
       "requires": {
-        "postcss": "^6.0.1"
-      },
-      "dependencies": {
-        "postcss": {
-          "version": "6.0.23",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.4.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
+        "postcss": "^7.0.5"
       }
     },
     "postcss-modules-local-by-default": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz",
-      "integrity": "sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-2.0.6.tgz",
+      "integrity": "sha512-oLUV5YNkeIBa0yQl7EYnxMgy4N6noxmiwZStaEJUSe2xPMcdNc8WmBQuQCx18H5psYbVxz8zoHk0RAAYZXP9gA==",
       "dev": true,
       "requires": {
-        "css-selector-tokenizer": "^0.7.0",
-        "postcss": "^6.0.1"
+        "postcss": "^7.0.6",
+        "postcss-selector-parser": "^6.0.0",
+        "postcss-value-parser": "^3.3.1"
       },
       "dependencies": {
-        "postcss": {
-          "version": "6.0.23",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+        "cssesc": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+          "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+          "dev": true
+        },
+        "postcss-selector-parser": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz",
+          "integrity": "sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.4.0"
+            "cssesc": "^3.0.0",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
           }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
         }
       }
     },
     "postcss-modules-scope": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz",
-      "integrity": "sha1-1upkmUx5+XtipytCb75gVqGUu5A=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.1.0.tgz",
+      "integrity": "sha512-91Rjps0JnmtUB0cujlc8KIKCsJXWjzuxGeT/+Q2i2HXKZ7nBUeF9YQTZZTNvHVoNYj1AthsjnGLtqDUE0Op79A==",
       "dev": true,
       "requires": {
-        "css-selector-tokenizer": "^0.7.0",
-        "postcss": "^6.0.1"
+        "postcss": "^7.0.6",
+        "postcss-selector-parser": "^6.0.0"
       },
       "dependencies": {
-        "postcss": {
-          "version": "6.0.23",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+        "cssesc": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+          "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+          "dev": true
+        },
+        "postcss-selector-parser": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz",
+          "integrity": "sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==",
           "dev": true,
           "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.4.0"
+            "cssesc": "^3.0.0",
+            "indexes-of": "^1.0.1",
+            "uniq": "^1.0.1"
           }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
         }
       }
     },
     "postcss-modules-values": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz",
-      "integrity": "sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-2.0.0.tgz",
+      "integrity": "sha512-Ki7JZa7ff1N3EIMlPnGTZfUMe69FFwiQPnVSXC9mnn3jozCRBYIxiZd44yJOV2AmabOo4qFf8s0dC/+lweG7+w==",
       "dev": true,
       "requires": {
         "icss-replace-symbols": "^1.1.0",
-        "postcss": "^6.0.1"
-      },
-      "dependencies": {
-        "postcss": {
-          "version": "6.0.23",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
-          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.1",
-            "source-map": "^0.6.1",
-            "supports-color": "^5.4.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
+        "postcss": "^7.0.6"
       }
     },
     "postcss-normalize-charset": {
@@ -13259,50 +12817,6 @@
       "dev": true,
       "requires": {
         "postcss": "^7.0.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "postcss": {
-          "version": "7.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-          "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "postcss-normalize-display-values": {
@@ -13314,50 +12828,6 @@
         "cssnano-util-get-match": "^4.0.0",
         "postcss": "^7.0.0",
         "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "postcss": {
-          "version": "7.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-          "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "postcss-normalize-positions": {
@@ -13370,50 +12840,6 @@
         "has": "^1.0.0",
         "postcss": "^7.0.0",
         "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "postcss": {
-          "version": "7.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-          "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "postcss-normalize-repeat-style": {
@@ -13426,50 +12852,6 @@
         "cssnano-util-get-match": "^4.0.0",
         "postcss": "^7.0.0",
         "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "postcss": {
-          "version": "7.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-          "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "postcss-normalize-string": {
@@ -13481,50 +12863,6 @@
         "has": "^1.0.0",
         "postcss": "^7.0.0",
         "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "postcss": {
-          "version": "7.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-          "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "postcss-normalize-timing-functions": {
@@ -13536,50 +12874,6 @@
         "cssnano-util-get-match": "^4.0.0",
         "postcss": "^7.0.0",
         "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "postcss": {
-          "version": "7.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-          "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "postcss-normalize-unicode": {
@@ -13591,50 +12885,6 @@
         "browserslist": "^4.0.0",
         "postcss": "^7.0.0",
         "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "postcss": {
-          "version": "7.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-          "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "postcss-normalize-url": {
@@ -13647,50 +12897,6 @@
         "normalize-url": "^3.0.0",
         "postcss": "^7.0.0",
         "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "postcss": {
-          "version": "7.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-          "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "postcss-normalize-whitespace": {
@@ -13701,50 +12907,6 @@
       "requires": {
         "postcss": "^7.0.0",
         "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "postcss": {
-          "version": "7.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-          "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "postcss-ordered-values": {
@@ -13756,50 +12918,6 @@
         "cssnano-util-get-arguments": "^4.0.0",
         "postcss": "^7.0.0",
         "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "postcss": {
-          "version": "7.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-          "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "postcss-reduce-initial": {
@@ -13812,50 +12930,6 @@
         "caniuse-api": "^3.0.0",
         "has": "^1.0.0",
         "postcss": "^7.0.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "postcss": {
-          "version": "7.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-          "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "postcss-reduce-transforms": {
@@ -13868,50 +12942,6 @@
         "has": "^1.0.0",
         "postcss": "^7.0.0",
         "postcss-value-parser": "^3.0.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "postcss": {
-          "version": "7.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-          "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "postcss-reporter": {
@@ -13991,50 +13021,6 @@
         "postcss": "^7.0.0",
         "postcss-value-parser": "^3.0.0",
         "svgo": "^1.0.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "postcss": {
-          "version": "7.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-          "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "postcss-syntax": {
@@ -14052,50 +13038,6 @@
         "alphanum-sort": "^1.0.0",
         "postcss": "^7.0.0",
         "uniqs": "^2.0.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "postcss": {
-          "version": "7.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-          "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
       }
     },
     "postcss-value-parser": {
@@ -14128,42 +13070,29 @@
       }
     },
     "posthtml": {
-      "version": "0.11.3",
-      "resolved": "https://registry.npmjs.org/posthtml/-/posthtml-0.11.3.tgz",
-      "integrity": "sha512-quMHnDckt2DQ9lRi6bYLnuyBDnVzK+McHa8+ar4kTdYbWEo/92hREOu3h70ZirudOOp/my2b3r0m5YtxY52yrA==",
+      "version": "0.11.4",
+      "resolved": "https://registry.npmjs.org/posthtml/-/posthtml-0.11.4.tgz",
+      "integrity": "sha512-ezlzBkoPoRgh0jkmT1dsM8eT+lr2azyZ546kbda8oHnVnzvyaB3Ywo6UxUz8wPSOkFAAflCxZJhvvpQH1F6qcA==",
       "dev": true,
       "requires": {
-        "object-assign": "^4.1.1",
-        "posthtml-parser": "^0.3.3",
-        "posthtml-render": "^1.1.0"
+        "posthtml-parser": "^0.4.1",
+        "posthtml-render": "^1.1.5"
       }
     },
     "posthtml-parser": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.3.3.tgz",
-      "integrity": "sha512-H/Z/yXGwl49A7hYQLV1iQ3h87NE0aZ/PMZhFwhw3lKeCAN+Ti4idrHvVvh4/GX10I7u77aQw+QB4vV5/Lzvv5A==",
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.4.1.tgz",
+      "integrity": "sha512-h7vXIQ21Ikz2w5wPClPakNP6mJeJCK6BT0GpqnQrNNABdR7/TchNlFyryL1Bz6Ww53YWCKkr6tdZuHlxY1AVdQ==",
       "dev": true,
       "requires": {
         "htmlparser2": "^3.9.2",
-        "isobject": "^2.1.0",
         "object-assign": "^4.1.1"
-      },
-      "dependencies": {
-        "isobject": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-          "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-          "dev": true,
-          "requires": {
-            "isarray": "1.0.0"
-          }
-        }
       }
     },
     "posthtml-render": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/posthtml-render/-/posthtml-render-1.1.4.tgz",
-      "integrity": "sha512-jL6eFIzoN3xUEvbo33OAkSDE2VIKU4JQ1wENOows1DpfnrdapR/K3Q1/fB43Mq7wQlcSgRm23nFrvoioufM7eA==",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/posthtml-render/-/posthtml-render-1.1.5.tgz",
+      "integrity": "sha512-yvt54j0zCBHQVEFAuR+yHld8CZrCa/E1Z/OcFNCV1IEWTLVxT8O7nYnM4IIw1CD4r8kaRd3lc42+0lgCKgm87w==",
       "dev": true
     },
     "prelude-ls": {
@@ -14207,6 +13136,12 @@
       "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
       "dev": true
     },
+    "process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+      "dev": true
+    },
     "process-nextick-args": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
@@ -14398,9 +13333,9 @@
       "dev": true
     },
     "querystringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.0.tgz",
-      "integrity": "sha512-sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
+      "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==",
       "dev": true
     },
     "quick-lru": {
@@ -14537,22 +13472,94 @@
       "dev": true
     },
     "read-pkg": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
-      "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.1.1.tgz",
+      "integrity": "sha512-dFcTLQi6BZ+aFUaICg7er+/usEoqFdQxiEBsEMNGoipenihtxxtdrQuBXvyANCEI8VuUIVYFgeHGx9sLLvim4w==",
       "requires": {
-        "load-json-file": "^4.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^3.0.0"
+        "@types/normalize-package-data": "^2.4.0",
+        "normalize-package-data": "^2.5.0",
+        "parse-json": "^4.0.0",
+        "type-fest": "^0.4.1"
+      },
+      "dependencies": {
+        "normalize-package-data": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+          "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+          "requires": {
+            "hosted-git-info": "^2.1.4",
+            "resolve": "^1.10.0",
+            "semver": "2 || 3 || 4 || 5",
+            "validate-npm-package-license": "^3.0.1"
+          }
+        },
+        "resolve": {
+          "version": "1.11.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.0.tgz",
+          "integrity": "sha512-WL2pBDjqT6pGUNSUzMw00o4T7If+z4H2x3Gz893WoUQ5KW8Vr9txp00ykiP16VBaZF5+j/OcXJHZ9+PCvdiDKw==",
+          "requires": {
+            "path-parse": "^1.0.6"
+          }
+        },
+        "semver": {
+          "version": "5.7.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
+        },
+        "type-fest": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.4.1.tgz",
+          "integrity": "sha512-IwzA/LSfD2vC1/YDYMv/zHP4rDF1usCwllsDpbolT3D4fUepIO7f9K70jjmUewU/LmGUKJcwcVtDCpnKk4BPMw=="
+        }
       }
     },
     "read-pkg-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
-      "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-6.0.0.tgz",
+      "integrity": "sha512-odtTvLl+EXo1eTsMnoUHRmg/XmXdTkwXVxy4VFE9Kp6cCq7b3l7QMdBndND3eAFzrbSAXC/WCUOQQ9rLjifKZw==",
       "requires": {
-        "find-up": "^2.0.0",
-        "read-pkg": "^3.0.0"
+        "find-up": "^4.0.0",
+        "read-pkg": "^5.1.1",
+        "type-fest": "^0.5.0"
+      },
+      "dependencies": {
+        "find-up": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.0.0.tgz",
+          "integrity": "sha512-zoH7ZWPkRdgwYCDVoQTzqjG8JSPANhtvLhh4KVUHyKnaUJJrNeFmWIkTcNuJmR3GLMEmGYEf2S2bjgx26JTF+Q==",
+          "requires": {
+            "locate-path": "^5.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
+          "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+          "requires": {
+            "p-limit": "^2.2.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
+        }
       }
     },
     "readable-stream": {
@@ -14610,18 +13617,24 @@
       "dev": true
     },
     "regenerate-unicode-properties": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-7.0.0.tgz",
-      "integrity": "sha512-s5NGghCE4itSlUS+0WUj88G6cfMVMmH8boTPNvABf8od+2dhT9WDlWu8n01raQAJZMOK8Ch6jSexaRO7swd6aw==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz",
+      "integrity": "sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA==",
       "dev": true,
       "requires": {
         "regenerate": "^1.4.0"
       }
     },
+    "regenerator-runtime": {
+      "version": "0.13.2",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz",
+      "integrity": "sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==",
+      "dev": true
+    },
     "regenerator-transform": {
-      "version": "0.13.4",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.13.4.tgz",
-      "integrity": "sha512-T0QMBjK3J0MtxjPmdIMXm72Wvj2Abb0Bd4HADdfijwMdoIsyQZ6fWC7kDFhk2YinBBEMZDL7Y7wh0J1sGx3S4A==",
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.0.tgz",
+      "integrity": "sha512-rtOelq4Cawlbmq9xuMR5gdFmv7ku/sFoB7sRiywx7aq53bc52b4j6zvH7Te1Vt/X2YveDKnCGUbioieU7FEL3w==",
       "dev": true,
       "requires": {
         "private": "^0.1.6"
@@ -14638,9 +13651,9 @@
       }
     },
     "regexp-tree": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.5.tgz",
-      "integrity": "sha512-nUmxvfJyAODw+0B13hj8CFVAxhe7fDEAgJgaotBu3nnR+IgGgZq59YedJP5VYTlkEfqjuK6TuRpnymKdatLZfQ==",
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.10.tgz",
+      "integrity": "sha512-K1qVSbcedffwuIslMwpe6vGlj+ZXRnGkvjAtFHfDZZZuEdA/h0dxljAPu9vhUo6Rrx2U2AwJ+nSQ6hK+lrP5MQ==",
       "dev": true
     },
     "regexpp": {
@@ -14650,17 +13663,17 @@
       "dev": true
     },
     "regexpu-core": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.4.0.tgz",
-      "integrity": "sha512-eDDWElbwwI3K0Lo6CqbQbA6FwgtCz4kYTarrri1okfkRLZAqstU+B3voZBCjg8Fl6iq0gXrJG6MvRgLthfvgOA==",
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.5.4.tgz",
+      "integrity": "sha512-BtizvGtFQKGPUcTy56o3nk1bGRp4SZOTYrDtGNlqCQufptV5IkkLN6Emw+yunAJjzf+C9FQFtvq7IoA3+oMYHQ==",
       "dev": true,
       "requires": {
         "regenerate": "^1.4.0",
-        "regenerate-unicode-properties": "^7.0.0",
+        "regenerate-unicode-properties": "^8.0.2",
         "regjsgen": "^0.5.0",
         "regjsparser": "^0.6.0",
         "unicode-match-property-ecmascript": "^1.0.4",
-        "unicode-match-property-value-ecmascript": "^1.0.2"
+        "unicode-match-property-value-ecmascript": "^1.1.0"
       }
     },
     "registry-auth-token": {
@@ -15374,9 +14387,9 @@
       },
       "dependencies": {
         "ajv": {
-          "version": "6.9.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.2.tgz",
-          "integrity": "sha512-4UFy0/LgDo7Oa/+wOAlj44tp9K78u38E5/359eSrqEp1Z5PdVfimCcs7SluXMP755RUQu6d2b4AvF0R1C9RZjg==",
+          "version": "6.10.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
+          "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^2.0.1",
@@ -15850,20 +14863,39 @@
         "safe-buffer": "^5.0.1"
       }
     },
-    "shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-      "requires": {
-        "shebang-regex": "^1.0.0"
-      }
-    },
-    "shebang-regex": {
+    "shallow-clone": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
-    },
-    "shell-quote": {
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-1.0.0.tgz",
+      "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==",
+      "dev": true,
+      "requires": {
+        "is-extendable": "^0.1.1",
+        "kind-of": "^5.0.0",
+        "mixin-object": "^2.0.1"
+      },
+      "dependencies": {
+        "kind-of": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+          "dev": true
+        }
+      }
+    },
+    "shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "requires": {
+        "shebang-regex": "^1.0.0"
+      }
+    },
+    "shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
+    },
+    "shell-quote": {
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz",
       "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=",
@@ -16699,21 +15731,13 @@
       }
     },
     "source-map-support": {
-      "version": "0.5.10",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.10.tgz",
-      "integrity": "sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==",
+      "version": "0.5.12",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz",
+      "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==",
       "dev": true,
       "requires": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
       }
     },
     "source-map-url": {
@@ -16810,9 +15834,9 @@
           "dev": true
         },
         "readable-stream": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.2.0.tgz",
-          "integrity": "sha512-RV20kLjdmpZuTF1INEb9IA3L68Nmi+Ri7ppZqo78wj//Pn62fCoJyV9zalccNzDD/OuJpMG4f+pfMl8+L6QdGw==",
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
+          "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==",
           "dev": true,
           "requires": {
             "inherits": "^2.0.3",
@@ -17028,7 +16052,8 @@
     "strip-bom": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+      "dev": true
     },
     "strip-eof": {
       "version": "1.0.0",
@@ -17066,39 +16091,6 @@
         "postcss-selector-parser": "^3.0.0"
       },
       "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "postcss": {
-          "version": "7.0.14",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.14.tgz",
-          "integrity": "sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
         "postcss-selector-parser": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz",
@@ -17109,15 +16101,6 @@
             "indexes-of": "^1.0.1",
             "uniq": "^1.0.1"
           }
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
         }
       }
     },
@@ -17401,6 +16384,18 @@
             "redent": "^2.0.0",
             "trim-newlines": "^2.0.0",
             "yargs-parser": "^10.0.0"
+          },
+          "dependencies": {
+            "read-pkg-up": {
+              "version": "3.0.0",
+              "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
+              "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
+              "dev": true,
+              "requires": {
+                "find-up": "^2.0.0",
+                "read-pkg": "^3.0.0"
+              }
+            }
           }
         },
         "micromatch": {
@@ -17436,6 +16431,17 @@
             "uniq": "^1.0.1"
           }
         },
+        "read-pkg": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "^4.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^3.0.0"
+          }
+        },
         "redent": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz",
@@ -17664,52 +16670,13 @@
       }
     },
     "superstruct": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/superstruct/-/superstruct-0.6.0.tgz",
-      "integrity": "sha512-6Y+bh5oFXCMUmGGzcdwd8M2qXMWn9aH3Qu2wV8Cg/Lxu+3fTxJ0dTx54nKd/Sm3lSz3i901xVatzev7c/xN8Lg==",
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/superstruct/-/superstruct-0.6.1.tgz",
+      "integrity": "sha512-LDbOKL5sNbOJ00Q36iYRhSexKIptZje0/mhNznnz04wT9CmsPDZg/K/UV1dgYuCwNMuOBHTbVROZsGB9EhhK4w==",
       "dev": true,
       "requires": {
         "clone-deep": "^2.0.1",
         "kind-of": "^6.0.1"
-      },
-      "dependencies": {
-        "clone-deep": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-2.0.2.tgz",
-          "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==",
-          "dev": true,
-          "requires": {
-            "for-own": "^1.0.0",
-            "is-plain-object": "^2.0.4",
-            "kind-of": "^6.0.0",
-            "shallow-clone": "^1.0.0"
-          }
-        },
-        "kind-of": {
-          "version": "6.0.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-          "dev": true
-        },
-        "shallow-clone": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-1.0.0.tgz",
-          "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.1",
-            "kind-of": "^5.0.0",
-            "mixin-object": "^2.0.1"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "5.1.0",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-              "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-              "dev": true
-            }
-          }
-        }
       }
     },
     "supports-color": {
@@ -17745,9 +16712,9 @@
       "dev": true
     },
     "svgo": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.2.0.tgz",
-      "integrity": "sha512-xBfxJxfk4UeVN8asec9jNxHiv3UAMv/ujwBWGYvQhhMb2u3YTGKkiybPcLFDLq7GLLWE9wa73e0/m8L5nTzQbw==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.2.2.tgz",
+      "integrity": "sha512-rAfulcwp2D9jjdGu+0CuqlrAUin6bBWrpoqXWwKDZZZJfXcUXQSxLJOFJCQCSA0x0pP2U0TxSlJu2ROq5Bq6qA==",
       "dev": true,
       "requires": {
         "chalk": "^2.4.1",
@@ -17757,7 +16724,7 @@
         "css-tree": "1.0.0-alpha.28",
         "css-url-regex": "^1.1.0",
         "csso": "^3.5.1",
-        "js-yaml": "^3.12.0",
+        "js-yaml": "^3.13.1",
         "mkdirp": "~0.5.1",
         "object.values": "^1.1.0",
         "sax": "~1.2.4",
@@ -17799,19 +16766,19 @@
       }
     },
     "tapable": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.1.tgz",
-      "integrity": "sha512-9I2ydhj8Z9veORCw5PRm4u9uebCn0mcCa6scWoNcbZ6dAtoo2618u9UUzxgmsCOreJpqDDuv61LvwofW7hLcBA==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
+      "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
       "dev": true
     },
     "tar": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
-      "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
+      "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
       "dev": true,
       "requires": {
         "block-stream": "*",
-        "fstream": "^1.0.2",
+        "fstream": "^1.0.12",
         "inherits": "2"
       }
     },
@@ -17844,58 +16811,43 @@
       }
     },
     "term-size": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz",
-      "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=",
-      "requires": {
-        "execa": "^0.7.0"
-      }
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/term-size/-/term-size-2.1.0.tgz",
+      "integrity": "sha512-I42EWhJ+2aeNQawGx1VtpO0DFI9YcfuvAMNIdKyf/6sRbHJ4P+ZQ/zIT87tE+ln1ymAGcCJds4dolfSAS0AcNg=="
     },
     "terser": {
-      "version": "3.16.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-3.16.1.tgz",
-      "integrity": "sha512-JDJjgleBROeek2iBcSNzOHLKsB/MdDf+E/BOAJ0Tk9r7p9/fVobfv7LMJ/g/k3v9SXdmjZnIlFd5nfn/Rt0Xow==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.0.0.tgz",
+      "integrity": "sha512-dOapGTU0hETFl1tCo4t56FN+2jffoKyER9qBGoUFyZ6y7WLoKT0bF+lAYi6B6YsILcGF3q1C2FBh8QcKSCgkgA==",
       "dev": true,
       "requires": {
-        "commander": "~2.17.1",
+        "commander": "^2.19.0",
         "source-map": "~0.6.1",
-        "source-map-support": "~0.5.9"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.17.1",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
-          "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
+        "source-map-support": "~0.5.10"
       }
     },
     "terser-webpack-plugin": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.2.3.tgz",
-      "integrity": "sha512-GOK7q85oAb/5kE12fMuLdn2btOS9OBZn4VsecpHDywoUC/jLhSAKOiYo0ezx7ss2EXPMzyEWFoE0s1WLE+4+oA==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.3.0.tgz",
+      "integrity": "sha512-W2YWmxPjjkUcOWa4pBEv4OP4er1aeQJlSo2UhtCFQCuRXEHjOFscO8VyWHj9JLlA0RzQb8Y2/Ta78XZvT54uGg==",
       "dev": true,
       "requires": {
-        "cacache": "^11.0.2",
+        "cacache": "^11.3.2",
         "find-cache-dir": "^2.0.0",
+        "is-wsl": "^1.1.0",
+        "loader-utils": "^1.2.3",
         "schema-utils": "^1.0.0",
-        "serialize-javascript": "^1.4.0",
+        "serialize-javascript": "^1.7.0",
         "source-map": "^0.6.1",
-        "terser": "^3.16.1",
-        "webpack-sources": "^1.1.0",
-        "worker-farm": "^1.5.2"
+        "terser": "^4.0.0",
+        "webpack-sources": "^1.3.0",
+        "worker-farm": "^1.7.0"
       },
       "dependencies": {
         "ajv": {
-          "version": "6.9.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.2.tgz",
-          "integrity": "sha512-4UFy0/LgDo7Oa/+wOAlj44tp9K78u38E5/359eSrqEp1Z5PdVfimCcs7SluXMP755RUQu6d2b4AvF0R1C9RZjg==",
+          "version": "6.10.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
+          "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^2.0.1",
@@ -17910,6 +16862,12 @@
           "integrity": "sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==",
           "dev": true
         },
+        "big.js": {
+          "version": "5.2.2",
+          "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+          "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+          "dev": true
+        },
         "fast-deep-equal": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
@@ -17922,6 +16880,26 @@
           "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
           "dev": true
         },
+        "json5": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
+        "loader-utils": {
+          "version": "1.2.3",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
+          "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^2.0.0",
+            "json5": "^1.0.1"
+          }
+        },
         "schema-utils": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
@@ -17933,10 +16911,10 @@
             "ajv-keywords": "^3.1.0"
           }
         },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+        "serialize-javascript": {
+          "version": "1.7.0",
+          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.7.0.tgz",
+          "integrity": "sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA==",
           "dev": true
         }
       }
@@ -18390,6 +17368,11 @@
       "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
       "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="
     },
+    "type-fest": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.5.2.tgz",
+      "integrity": "sha512-DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw=="
+    },
     "type-is": {
       "version": "1.6.16",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
@@ -18410,25 +17393,19 @@
       "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
     },
     "uglify-js": {
-      "version": "3.4.9",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz",
-      "integrity": "sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==",
+      "version": "3.4.10",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz",
+      "integrity": "sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==",
       "dev": true,
       "requires": {
-        "commander": "~2.17.1",
+        "commander": "~2.19.0",
         "source-map": "~0.6.1"
       },
       "dependencies": {
         "commander": {
-          "version": "2.17.1",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
-          "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "version": "2.19.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
+          "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
           "dev": true
         }
       }
@@ -18492,15 +17469,15 @@
       }
     },
     "unicode-match-property-value-ecmascript": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.0.2.tgz",
-      "integrity": "sha512-Rx7yODZC1L/T8XKo/2kNzVAQaRE88AaMvI1EF/Xnj3GW2wzN6fop9DDWuFAKUVFH7vozkz26DzP0qyWLKLIVPQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz",
+      "integrity": "sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g==",
       "dev": true
     },
     "unicode-property-aliases-ecmascript": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz",
-      "integrity": "sha512-2WSLa6OdYd2ng8oqiGIWnJqyFArvhn+5vgx5GTxMbUYjCYKUcuKS62YLFF0R/BDGlB1yzXjQOLtPAfHsgirEpg==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz",
+      "integrity": "sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==",
       "dev": true
     },
     "unified": {
@@ -18698,9 +17675,9 @@
       }
     },
     "untildify": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/untildify/-/untildify-3.0.3.tgz",
-      "integrity": "sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA=="
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
+      "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw=="
     },
     "unzip-response": {
       "version": "2.0.1",
@@ -18751,6 +17728,51 @@
         "latest-version": "^3.0.0",
         "semver-diff": "^2.0.0",
         "xdg-basedir": "^3.0.0"
+      },
+      "dependencies": {
+        "ansi-align": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz",
+          "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=",
+          "requires": {
+            "string-width": "^2.0.0"
+          }
+        },
+        "boxen": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz",
+          "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==",
+          "requires": {
+            "ansi-align": "^2.0.0",
+            "camelcase": "^4.0.0",
+            "chalk": "^2.0.1",
+            "cli-boxes": "^1.0.0",
+            "string-width": "^2.0.0",
+            "term-size": "^1.2.0",
+            "widest-line": "^2.0.0"
+          }
+        },
+        "cli-boxes": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz",
+          "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM="
+        },
+        "term-size": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz",
+          "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=",
+          "requires": {
+            "execa": "^0.7.0"
+          }
+        },
+        "widest-line": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.1.tgz",
+          "integrity": "sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==",
+          "requires": {
+            "string-width": "^2.1.1"
+          }
+        }
       }
     },
     "upper-case": {
@@ -18792,9 +17814,9 @@
       }
     },
     "url-join": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/url-join/-/url-join-1.1.0.tgz",
-      "integrity": "sha1-dBxsL0WWxIMNZxhGCSDQySIC3Hg="
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.0.tgz",
+      "integrity": "sha1-TTNA6AfTdzvamZH4MFrNzCpmXSo="
     },
     "url-loader": {
       "version": "1.1.2",
@@ -18808,9 +17830,9 @@
       },
       "dependencies": {
         "ajv": {
-          "version": "6.9.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.2.tgz",
-          "integrity": "sha512-4UFy0/LgDo7Oa/+wOAlj44tp9K78u38E5/359eSrqEp1Z5PdVfimCcs7SluXMP755RUQu6d2b4AvF0R1C9RZjg==",
+          "version": "6.10.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
+          "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^2.0.1",
@@ -18838,9 +17860,9 @@
           "dev": true
         },
         "mime": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
-          "integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
+          "version": "2.4.3",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.3.tgz",
+          "integrity": "sha512-QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw==",
           "dev": true
         },
         "schema-utils": {
@@ -18857,12 +17879,12 @@
       }
     },
     "url-parse": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.4.tgz",
-      "integrity": "sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==",
+      "version": "1.4.7",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
+      "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
       "dev": true,
       "requires": {
-        "querystringify": "^2.0.0",
+        "querystringify": "^2.1.1",
         "requires-port": "^1.0.0"
       }
     },
@@ -18936,9 +17958,9 @@
       "integrity": "sha512-+abxsl1o2C0cn6zJ4aCsougSDtVEbhXL4N+jVCQo/GObmdkk3yMHQWXYFBNvzygj6cfXlOZ3wZKj2Hh9wNFmdg=="
     },
     "v8-compile-cache": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz",
-      "integrity": "sha512-1wFuMUIM16MDJRCrpbpuEPTUGmM5QMUg0cr3KFwra2XgOgFcPGDQHDh3CszSCD2Zewc/dh/pamNEW8CbfDebUw==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz",
+      "integrity": "sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w==",
       "dev": true
     },
     "val-loader": {
@@ -19018,9 +18040,9 @@
       "integrity": "sha512-Ss9Jsolq4KV5gT70MGmjPY3AKDE2UvJeJiUXAvrcnC4psDBeMqhD5saX9+cLS4Alsm13x5mnaoCk03SoQjhksA=="
     },
     "vendors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.2.tgz",
-      "integrity": "sha512-w/hry/368nO21AN9QljsaIhb9ZiZtZARoVH5f3CsFbawdLdayCgKRPup7CggujvySMxx0I91NOyxdVENohprLQ==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.3.tgz",
+      "integrity": "sha512-fOi47nsJP5Wqefa43kyWSg80qF+Q3XA6MUkgi7Hp1HQaKDQW4cQrK2D0P7mmbFtsV1N89am55Yru/nyEwRubcw==",
       "dev": true
     },
     "verror": {
@@ -19370,9 +18392,9 @@
       }
     },
     "webpack": {
-      "version": "4.29.6",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.29.6.tgz",
-      "integrity": "sha512-MwBwpiE1BQpMDkbnUUaW6K8RFZjljJHArC6tWQJoFm0oQtfoSebtg4Y7/QHnJ/SddtjYLHaKGX64CFjG5rehJw==",
+      "version": "4.32.2",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.32.2.tgz",
+      "integrity": "sha512-F+H2Aa1TprTQrpodRAWUMJn7A8MgDx82yQiNvYMaj3d1nv3HetKU0oqEulL9huj8enirKi8KvEXQ3QtuHF89Zg==",
       "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.8.5",
@@ -19402,9 +18424,9 @@
       },
       "dependencies": {
         "ajv": {
-          "version": "6.9.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.2.tgz",
-          "integrity": "sha512-4UFy0/LgDo7Oa/+wOAlj44tp9K78u38E5/359eSrqEp1Z5PdVfimCcs7SluXMP755RUQu6d2b4AvF0R1C9RZjg==",
+          "version": "6.10.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
+          "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^2.0.1",
@@ -19420,9 +18442,9 @@
           "dev": true
         },
         "eslint-scope": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.2.tgz",
-          "integrity": "sha512-5q1+B/ogmHl8+paxtOKx38Z8LtWkVGuNt3+GQNErqwLl6ViNp/gdJGMCjZNxZ8j/VYjDNZ2Fo+eQc1TAVPIzbg==",
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+          "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
           "dev": true,
           "requires": {
             "esrecurse": "^4.1.0",
@@ -19483,77 +18505,93 @@
       }
     },
     "webpack-chain": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/webpack-chain/-/webpack-chain-5.2.0.tgz",
-      "integrity": "sha512-JXz9YgEkTqx8hvnES2VMRyWHNFlqJfLmA5QTyuJOXalkGg+MVdOgB0UaYtc4iDadEmzJLe8UyCl4wyDq3wWZDg==",
+      "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/webpack-chain/-/webpack-chain-5.2.4.tgz",
+      "integrity": "sha512-3g0uIbzM/EWnmf52bYhB5IZeBZiw5g9vNqF4iTBEqabpxGxcv+Aj9oL4Cvr19ujOsv/HPvpRFRPLZ/aylv10Wg==",
       "dev": true,
       "requires": {
         "deepmerge": "^1.5.2",
-        "javascript-stringify": "^1.6.0"
+        "javascript-stringify": "^2.0.0"
       }
     },
     "webpack-dev-middleware": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.6.0.tgz",
-      "integrity": "sha512-oeXA3m+5gbYbDBGo4SvKpAHJJEGMoekUbHgo1RK7CP1sz7/WOSeu/dWJtSTk+rzDCLkPwQhGocgIq6lQqOyOwg==",
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.0.tgz",
+      "integrity": "sha512-qvDesR1QZRIAZHOE3iQ4CXLZZSQ1lAUsSpnQmlB1PBfoN/xdRjmge3Dok0W4IdaVLJOGJy3sGI4sZHwjRU0PCA==",
       "dev": true,
       "requires": {
         "memory-fs": "^0.4.1",
-        "mime": "^2.3.1",
-        "range-parser": "^1.0.3",
+        "mime": "^2.4.2",
+        "range-parser": "^1.2.1",
         "webpack-log": "^2.0.0"
       },
       "dependencies": {
         "mime": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
-          "integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
+          "version": "2.4.3",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.3.tgz",
+          "integrity": "sha512-QgrPRJfE+riq5TPZMcHZOtm8c6K/yYrMbKIoRfapfiGLxS8OTeIfRhUGW5LU7MlRa52KOAGCfUNruqLrIBvWZw==",
+          "dev": true
+        },
+        "range-parser": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+          "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
           "dev": true
         }
       }
     },
     "webpack-dev-server": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.2.1.tgz",
-      "integrity": "sha512-sjuE4mnmx6JOh9kvSbPYw3u/6uxCLHNWfhWaIPwcXWsvWOPN+nc5baq4i9jui3oOBRXGonK9+OI0jVkaz6/rCw==",
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.4.1.tgz",
+      "integrity": "sha512-CRqZQX2ryMtrg0r3TXQPpNh76eM1HD3Wmu6zDBxIKi/d2y+4aa28Ia8weNT0bfgWpY6Vs3Oq/K8+DjfbR+tWYw==",
       "dev": true,
       "requires": {
         "ansi-html": "0.0.7",
         "bonjour": "^3.5.0",
-        "chokidar": "^2.0.0",
-        "compression": "^1.5.2",
-        "connect-history-api-fallback": "^1.3.0",
+        "chokidar": "^2.1.6",
+        "compression": "^1.7.4",
+        "connect-history-api-fallback": "^1.6.0",
         "debug": "^4.1.1",
-        "del": "^3.0.0",
-        "express": "^4.16.2",
-        "html-entities": "^1.2.0",
+        "del": "^4.1.1",
+        "express": "^4.17.0",
+        "html-entities": "^1.2.1",
         "http-proxy-middleware": "^0.19.1",
         "import-local": "^2.0.0",
-        "internal-ip": "^4.2.0",
+        "internal-ip": "^4.3.0",
         "ip": "^1.1.5",
-        "killable": "^1.0.0",
-        "loglevel": "^1.4.1",
-        "opn": "^5.1.0",
-        "portfinder": "^1.0.9",
+        "killable": "^1.0.1",
+        "loglevel": "^1.6.1",
+        "opn": "^5.5.0",
+        "portfinder": "^1.0.20",
         "schema-utils": "^1.0.0",
-        "selfsigned": "^1.9.1",
-        "semver": "^5.6.0",
-        "serve-index": "^1.7.2",
+        "selfsigned": "^1.10.4",
+        "semver": "^6.0.0",
+        "serve-index": "^1.9.1",
         "sockjs": "0.3.19",
         "sockjs-client": "1.3.0",
         "spdy": "^4.0.0",
-        "strip-ansi": "^3.0.0",
+        "strip-ansi": "^3.0.1",
         "supports-color": "^6.1.0",
         "url": "^0.11.0",
-        "webpack-dev-middleware": "^3.5.1",
+        "webpack-dev-middleware": "^3.7.0",
         "webpack-log": "^2.0.0",
-        "yargs": "12.0.2"
+        "yargs": "12.0.5"
       },
       "dependencies": {
+        "accepts": {
+          "version": "1.3.7",
+          "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
+          "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+          "dev": true,
+          "requires": {
+            "mime-types": "~2.1.24",
+            "negotiator": "0.6.2"
+          }
+        },
         "ajv": {
-          "version": "6.9.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.9.2.tgz",
-          "integrity": "sha512-4UFy0/LgDo7Oa/+wOAlj44tp9K78u38E5/359eSrqEp1Z5PdVfimCcs7SluXMP755RUQu6d2b4AvF0R1C9RZjg==",
+          "version": "6.10.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
+          "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^2.0.1",
@@ -19574,92 +18612,144 @@
           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
           "dev": true
         },
-        "cliui": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
-          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+        "body-parser": {
+          "version": "1.19.0",
+          "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
+          "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
           "dev": true,
           "requires": {
-            "string-width": "^2.1.1",
-            "strip-ansi": "^4.0.0",
-            "wrap-ansi": "^2.0.0"
+            "bytes": "3.1.0",
+            "content-type": "~1.0.4",
+            "debug": "2.6.9",
+            "depd": "~1.1.2",
+            "http-errors": "1.7.2",
+            "iconv-lite": "0.4.24",
+            "on-finished": "~2.3.0",
+            "qs": "6.7.0",
+            "raw-body": "2.4.0",
+            "type-is": "~1.6.17"
           },
           "dependencies": {
-            "ansi-regex": {
-              "version": "3.0.0",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-              "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-              "dev": true
-            },
-            "strip-ansi": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-              "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+            "debug": {
+              "version": "2.6.9",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+              "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
               "dev": true,
               "requires": {
-                "ansi-regex": "^3.0.0"
+                "ms": "2.0.0"
               }
+            },
+            "ms": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+              "dev": true
             }
           }
         },
-        "cross-spawn": {
-          "version": "6.0.5",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-          "dev": true,
-          "requires": {
-            "nice-try": "^1.0.4",
-            "path-key": "^2.0.1",
-            "semver": "^5.5.0",
-            "shebang-command": "^1.2.0",
-            "which": "^1.2.9"
-          }
+        "bytes": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+          "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
+          "dev": true
         },
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+        "chokidar": {
+          "version": "2.1.6",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz",
+          "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "anymatch": "^2.0.0",
+            "async-each": "^1.0.1",
+            "braces": "^2.3.2",
+            "fsevents": "^1.2.7",
+            "glob-parent": "^3.1.0",
+            "inherits": "^2.0.3",
+            "is-binary-path": "^1.0.0",
+            "is-glob": "^4.0.0",
+            "normalize-path": "^3.0.0",
+            "path-is-absolute": "^1.0.0",
+            "readdirp": "^2.2.1",
+            "upath": "^1.1.1"
           }
         },
-        "decamelize": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz",
-          "integrity": "sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==",
+        "content-disposition": {
+          "version": "0.5.3",
+          "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
+          "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
           "dev": true,
           "requires": {
-            "xregexp": "4.0.0"
+            "safe-buffer": "5.1.2"
           }
         },
-        "del": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
-          "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
+        "cookie": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
+          "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
+          "dev": true
+        },
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "dev": true,
           "requires": {
-            "globby": "^6.1.0",
-            "is-path-cwd": "^1.0.0",
-            "is-path-in-cwd": "^1.0.0",
-            "p-map": "^1.1.1",
-            "pify": "^3.0.0",
-            "rimraf": "^2.2.8"
+            "ms": "^2.1.1"
           }
         },
-        "execa": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+        "express": {
+          "version": "4.17.1",
+          "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
+          "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
           "dev": true,
           "requires": {
-            "cross-spawn": "^6.0.0",
-            "get-stream": "^4.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
+            "accepts": "~1.3.7",
+            "array-flatten": "1.1.1",
+            "body-parser": "1.19.0",
+            "content-disposition": "0.5.3",
+            "content-type": "~1.0.4",
+            "cookie": "0.4.0",
+            "cookie-signature": "1.0.6",
+            "debug": "2.6.9",
+            "depd": "~1.1.2",
+            "encodeurl": "~1.0.2",
+            "escape-html": "~1.0.3",
+            "etag": "~1.8.1",
+            "finalhandler": "~1.1.2",
+            "fresh": "0.5.2",
+            "merge-descriptors": "1.0.1",
+            "methods": "~1.1.2",
+            "on-finished": "~2.3.0",
+            "parseurl": "~1.3.3",
+            "path-to-regexp": "0.1.7",
+            "proxy-addr": "~2.0.5",
+            "qs": "6.7.0",
+            "range-parser": "~1.2.1",
+            "safe-buffer": "5.1.2",
+            "send": "0.17.1",
+            "serve-static": "1.14.1",
+            "setprototypeof": "1.1.1",
+            "statuses": "~1.5.0",
+            "type-is": "~1.6.18",
+            "utils-merge": "1.0.1",
+            "vary": "~1.1.2"
+          },
+          "dependencies": {
+            "debug": {
+              "version": "2.6.9",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+              "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+              "dev": true,
+              "requires": {
+                "ms": "2.0.0"
+              }
+            },
+            "ms": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+              "dev": true
+            }
           }
         },
         "fast-deep-equal": {
@@ -19668,64 +18758,594 @@
           "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
           "dev": true
         },
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "get-stream": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-          "dev": true,
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        },
-        "glob": {
-          "version": "7.1.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-          "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+        "finalhandler": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
+          "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
           "dev": true,
           "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
+            "debug": "2.6.9",
+            "encodeurl": "~1.0.2",
+            "escape-html": "~1.0.3",
+            "on-finished": "~2.3.0",
+            "parseurl": "~1.3.3",
+            "statuses": "~1.5.0",
+            "unpipe": "~1.0.0"
+          },
+          "dependencies": {
+            "debug": {
+              "version": "2.6.9",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+              "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+              "dev": true,
+              "requires": {
+                "ms": "2.0.0"
+              }
+            },
+            "ms": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+              "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+              "dev": true
+            }
           }
         },
-        "globby": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-          "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+        "fsevents": {
+          "version": "1.2.9",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
+          "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
           "dev": true,
+          "optional": true,
           "requires": {
-            "array-union": "^1.0.1",
-            "glob": "^7.0.3",
-            "object-assign": "^4.0.1",
-            "pify": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
+            "nan": "^2.12.1",
+            "node-pre-gyp": "^0.12.0"
           },
           "dependencies": {
-            "pify": {
+            "abbrev": {
+              "version": "1.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "ansi-regex": {
+              "version": "2.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "aproba": {
+              "version": "1.2.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "are-we-there-yet": {
+              "version": "1.1.5",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "delegates": "^1.0.0",
+                "readable-stream": "^2.0.6"
+              }
+            },
+            "balanced-match": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "brace-expansion": {
+              "version": "1.1.11",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+              }
+            },
+            "chownr": {
+              "version": "1.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "code-point-at": {
+              "version": "1.1.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "concat-map": {
+              "version": "0.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "console-control-strings": {
+              "version": "1.1.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "core-util-is": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "debug": {
+              "version": "4.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "ms": "^2.1.1"
+              }
+            },
+            "deep-extend": {
+              "version": "0.6.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "delegates": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "detect-libc": {
+              "version": "1.0.3",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "fs-minipass": {
+              "version": "1.2.5",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "minipass": "^2.2.1"
+              }
+            },
+            "fs.realpath": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "gauge": {
+              "version": "2.7.4",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "aproba": "^1.0.3",
+                "console-control-strings": "^1.0.0",
+                "has-unicode": "^2.0.0",
+                "object-assign": "^4.1.0",
+                "signal-exit": "^3.0.0",
+                "string-width": "^1.0.1",
+                "strip-ansi": "^3.0.1",
+                "wide-align": "^1.1.0"
+              }
+            },
+            "glob": {
+              "version": "7.1.3",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.0.4",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+              }
+            },
+            "has-unicode": {
+              "version": "2.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "iconv-lite": {
+              "version": "0.4.24",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "safer-buffer": ">= 2.1.2 < 3"
+              }
+            },
+            "ignore-walk": {
+              "version": "3.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "minimatch": "^3.0.4"
+              }
+            },
+            "inflight": {
+              "version": "1.0.6",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "once": "^1.3.0",
+                "wrappy": "1"
+              }
+            },
+            "inherits": {
+              "version": "2.0.3",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "ini": {
+              "version": "1.3.5",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "is-fullwidth-code-point": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "number-is-nan": "^1.0.0"
+              }
+            },
+            "isarray": {
+              "version": "1.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "minimatch": {
+              "version": "3.0.4",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "brace-expansion": "^1.1.7"
+              }
+            },
+            "minimist": {
+              "version": "0.0.8",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "minipass": {
+              "version": "2.3.5",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.0"
+              }
+            },
+            "minizlib": {
+              "version": "1.2.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "minipass": "^2.2.1"
+              }
+            },
+            "mkdirp": {
+              "version": "0.5.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "minimist": "0.0.8"
+              }
+            },
+            "ms": {
+              "version": "2.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "needle": {
               "version": "2.3.0",
-              "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-              "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-              "dev": true
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "debug": "^4.1.0",
+                "iconv-lite": "^0.4.4",
+                "sax": "^1.2.4"
+              }
+            },
+            "node-pre-gyp": {
+              "version": "0.12.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "detect-libc": "^1.0.2",
+                "mkdirp": "^0.5.1",
+                "needle": "^2.2.1",
+                "nopt": "^4.0.1",
+                "npm-packlist": "^1.1.6",
+                "npmlog": "^4.0.2",
+                "rc": "^1.2.7",
+                "rimraf": "^2.6.1",
+                "semver": "^5.3.0",
+                "tar": "^4"
+              }
+            },
+            "nopt": {
+              "version": "4.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "abbrev": "1",
+                "osenv": "^0.1.4"
+              }
+            },
+            "npm-bundled": {
+              "version": "1.0.6",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "npm-packlist": {
+              "version": "1.4.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "ignore-walk": "^3.0.1",
+                "npm-bundled": "^1.0.1"
+              }
+            },
+            "npmlog": {
+              "version": "4.1.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "are-we-there-yet": "~1.1.2",
+                "console-control-strings": "~1.1.0",
+                "gauge": "~2.7.3",
+                "set-blocking": "~2.0.0"
+              }
+            },
+            "number-is-nan": {
+              "version": "1.0.1",
+              "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,
+              "optional": true,
+              "requires": {
+                "wrappy": "1"
+              }
+            },
+            "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.5",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "os-homedir": "^1.0.0",
+                "os-tmpdir": "^1.0.0"
+              }
+            },
+            "path-is-absolute": {
+              "version": "1.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "process-nextick-args": {
+              "version": "2.0.0",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "rc": {
+              "version": "1.2.8",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "deep-extend": "^0.6.0",
+                "ini": "~1.3.0",
+                "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.3.6",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "core-util-is": "~1.0.0",
+                "inherits": "~2.0.3",
+                "isarray": "~1.0.0",
+                "process-nextick-args": "~2.0.0",
+                "safe-buffer": "~5.1.1",
+                "string_decoder": "~1.1.1",
+                "util-deprecate": "~1.0.1"
+              }
+            },
+            "rimraf": {
+              "version": "2.6.3",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "glob": "^7.1.3"
+              }
+            },
+            "safe-buffer": {
+              "version": "5.1.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "safer-buffer": {
+              "version": "2.1.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "sax": {
+              "version": "1.2.4",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "semver": {
+              "version": "5.7.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
+            },
+            "string-width": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "code-point-at": "^1.0.0",
+                "is-fullwidth-code-point": "^1.0.0",
+                "strip-ansi": "^3.0.0"
+              }
+            },
+            "string_decoder": {
+              "version": "1.1.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "safe-buffer": "~5.1.0"
+              }
+            },
+            "strip-ansi": {
+              "version": "3.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "ansi-regex": "^2.0.0"
+              }
+            },
+            "strip-json-comments": {
+              "version": "2.0.1",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "tar": {
+              "version": "4.4.8",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "chownr": "^1.1.1",
+                "fs-minipass": "^1.2.5",
+                "minipass": "^2.3.4",
+                "minizlib": "^1.1.1",
+                "mkdirp": "^0.5.0",
+                "safe-buffer": "^5.1.2",
+                "yallist": "^3.0.2"
+              }
+            },
+            "util-deprecate": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "wide-align": {
+              "version": "1.1.3",
+              "bundled": true,
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "string-width": "^1.0.2 || 2"
+              }
+            },
+            "wrappy": {
+              "version": "1.0.2",
+              "bundled": true,
+              "dev": true,
+              "optional": true
+            },
+            "yallist": {
+              "version": "3.0.3",
+              "bundled": true,
+              "dev": true,
+              "optional": true
             }
           }
         },
-        "invert-kv": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
-          "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
-          "dev": true
+        "iconv-lite": {
+          "version": "0.4.24",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+          "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+          "dev": true,
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3"
+          }
         },
         "json-schema-traverse": {
           "version": "0.4.1",
@@ -19733,81 +19353,136 @@
           "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
           "dev": true
         },
-        "lcid": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
-          "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
-          "dev": true,
-          "requires": {
-            "invert-kv": "^2.0.0"
-          }
+        "mime": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+          "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+          "dev": true
         },
-        "locate-path": {
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+          "dev": true
+        },
+        "negotiator": {
+          "version": "0.6.2",
+          "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
+          "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
+          "dev": true
+        },
+        "normalize-path": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+          "dev": true
+        },
+        "opn": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz",
+          "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==",
           "dev": true,
           "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
+            "is-wsl": "^1.1.0"
           }
         },
-        "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+        "parseurl": {
+          "version": "1.3.3",
+          "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+          "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
           "dev": true
         },
-        "os-locale": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
-          "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+        "qs": {
+          "version": "6.7.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
+          "dev": true
+        },
+        "range-parser": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+          "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+          "dev": true
+        },
+        "raw-body": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
+          "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
           "dev": true,
           "requires": {
-            "execa": "^1.0.0",
-            "lcid": "^2.0.0",
-            "mem": "^4.0.0"
+            "bytes": "3.1.0",
+            "http-errors": "1.7.2",
+            "iconv-lite": "0.4.24",
+            "unpipe": "1.0.0"
           }
         },
-        "p-limit": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.1.0.tgz",
-          "integrity": "sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==",
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
           "dev": true,
           "requires": {
-            "p-try": "^2.0.0"
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
           }
         },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+        "send": {
+          "version": "0.17.1",
+          "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
+          "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
           "dev": true,
           "requires": {
-            "p-limit": "^2.0.0"
+            "debug": "2.6.9",
+            "depd": "~1.1.2",
+            "destroy": "~1.0.4",
+            "encodeurl": "~1.0.2",
+            "escape-html": "~1.0.3",
+            "etag": "~1.8.1",
+            "fresh": "0.5.2",
+            "http-errors": "~1.7.2",
+            "mime": "1.6.0",
+            "ms": "2.1.1",
+            "on-finished": "~2.3.0",
+            "range-parser": "~1.2.1",
+            "statuses": "~1.5.0"
+          },
+          "dependencies": {
+            "debug": {
+              "version": "2.6.9",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+              "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+              "dev": true,
+              "requires": {
+                "ms": "2.0.0"
+              },
+              "dependencies": {
+                "ms": {
+                  "version": "2.0.0",
+                  "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+                  "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+                  "dev": true
+                }
+              }
+            }
           }
         },
-        "p-try": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz",
-          "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==",
-          "dev": true
-        },
-        "schema-utils": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+        "serve-static": {
+          "version": "1.14.1",
+          "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
+          "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
           "dev": true,
           "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
+            "encodeurl": "~1.0.2",
+            "escape-html": "~1.0.3",
+            "parseurl": "~1.3.3",
+            "send": "0.17.1"
           }
         },
-        "semver": {
-          "version": "5.6.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
-          "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
+        "setprototypeof": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
+          "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
           "dev": true
         },
         "strip-ansi": {
@@ -19828,55 +19503,30 @@
             "has-flag": "^3.0.0"
           }
         },
-        "url": {
-          "version": "0.11.0",
-          "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
-          "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+        "type-is": {
+          "version": "1.6.18",
+          "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+          "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
           "dev": true,
           "requires": {
-            "punycode": "1.3.2",
-            "querystring": "0.2.0"
+            "media-typer": "0.3.0",
+            "mime-types": "~2.1.24"
           }
         },
-        "which-module": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-          "dev": true
-        },
-        "xregexp": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz",
-          "integrity": "sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==",
+        "upath": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
+          "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==",
           "dev": true
         },
-        "yargs": {
-          "version": "12.0.2",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.2.tgz",
-          "integrity": "sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==",
-          "dev": true,
-          "requires": {
-            "cliui": "^4.0.0",
-            "decamelize": "^2.0.0",
-            "find-up": "^3.0.0",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^3.0.0",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
-            "set-blocking": "^2.0.0",
-            "string-width": "^2.0.0",
-            "which-module": "^2.0.0",
-            "y18n": "^3.2.1 || ^4.0.0",
-            "yargs-parser": "^10.1.0"
-          }
-        },
-        "yargs-parser": {
-          "version": "10.1.0",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
-          "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
+        "url": {
+          "version": "0.11.0",
+          "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+          "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
           "dev": true,
           "requires": {
-            "camelcase": "^4.1.0"
+            "punycode": "1.3.2",
+            "querystring": "0.2.0"
           }
         }
       }
@@ -19908,14 +19558,6 @@
       "requires": {
         "source-list-map": "^2.0.0",
         "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
       }
     },
     "websocket-driver": {
@@ -19963,11 +19605,46 @@
       }
     },
     "widest-line": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.1.tgz",
-      "integrity": "sha512-Ba5m9/Fa4Xt9eb2ELXt77JxVDV8w7qQrH0zS/TWSJdLyAwQjWoOzpzj5lwVftDz6n/EOu3tNACS84v509qwnJA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz",
+      "integrity": "sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==",
       "requires": {
-        "string-width": "^2.1.1"
+        "string-width": "^4.0.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
+        },
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+        },
+        "is-fullwidth-code-point": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
+        },
+        "string-width": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.1.0.tgz",
+          "integrity": "sha512-NrX+1dVVh+6Y9dnQ19pR0pP4FiEIlUvdTGn8pw6CKTNq5sgib2nIhmUNT5TAmhWmvKr3WcxBcP3E8nWezuipuQ==",
+          "requires": {
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^5.2.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        }
       }
     },
     "windows-release": {
@@ -20025,9 +19702,9 @@
       "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus="
     },
     "worker-farm": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.6.0.tgz",
-      "integrity": "sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
+      "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
       "dev": true,
       "requires": {
         "errno": "~0.1.7"
@@ -20170,6 +19847,173 @@
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
       "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
     },
+    "yargs": {
+      "version": "12.0.5",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
+      "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
+      "dev": true,
+      "requires": {
+        "cliui": "^4.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^3.0.0",
+        "get-caller-file": "^1.0.1",
+        "os-locale": "^3.0.0",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^1.0.1",
+        "set-blocking": "^2.0.0",
+        "string-width": "^2.0.0",
+        "which-module": "^2.0.0",
+        "y18n": "^3.2.1 || ^4.0.0",
+        "yargs-parser": "^11.1.1"
+      },
+      "dependencies": {
+        "camelcase": {
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+          "dev": true
+        },
+        "cliui": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+          "dev": true,
+          "requires": {
+            "string-width": "^2.1.1",
+            "strip-ansi": "^4.0.0",
+            "wrap-ansi": "^2.0.0"
+          }
+        },
+        "cross-spawn": {
+          "version": "6.0.5",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+          "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+          "dev": true,
+          "requires": {
+            "nice-try": "^1.0.4",
+            "path-key": "^2.0.1",
+            "semver": "^5.5.0",
+            "shebang-command": "^1.2.0",
+            "which": "^1.2.9"
+          }
+        },
+        "execa": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+          "dev": true,
+          "requires": {
+            "cross-spawn": "^6.0.0",
+            "get-stream": "^4.0.0",
+            "is-stream": "^1.1.0",
+            "npm-run-path": "^2.0.0",
+            "p-finally": "^1.0.0",
+            "signal-exit": "^3.0.0",
+            "strip-eof": "^1.0.0"
+          }
+        },
+        "find-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^3.0.0"
+          }
+        },
+        "get-stream": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+          "dev": true,
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
+        "invert-kv": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
+          "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
+          "dev": true
+        },
+        "lcid": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+          "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+          "dev": true,
+          "requires": {
+            "invert-kv": "^2.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^3.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "os-locale": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+          "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+          "dev": true,
+          "requires": {
+            "execa": "^1.0.0",
+            "lcid": "^2.0.0",
+            "mem": "^4.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
+          "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
+          "dev": true,
+          "requires": {
+            "p-try": "^2.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+          "dev": true,
+          "requires": {
+            "p-limit": "^2.0.0"
+          }
+        },
+        "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        },
+        "semver": {
+          "version": "5.7.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
+          "dev": true
+        },
+        "which-module": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+          "dev": true
+        },
+        "yargs-parser": {
+          "version": "11.1.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
+          "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^5.0.0",
+            "decamelize": "^1.2.0"
+          }
+        }
+      }
+    },
     "yargs-parser": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
diff --git a/package.json b/package.json
index 92f6ea2fe..08b190381 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
   "dependencies": {
     "@babel/polyfill": "^7.2.5",
     "@mdi/font": "^3.5.95",
-    "auto-bind": "^1.2.0",
+    "auto-bind": "^2.1.0",
     "aws-sdk": "^2.342.0",
     "axios": "^0.15.2",
     "bcryptjs": "^2.3.0",
@@ -50,7 +50,7 @@
     "body-parser": "^1.15.2",
     "bootstrap-sass": "^3.3.7",
     "bootswatch": "^3.3.7",
-    "boxen": "^1.3.0",
+    "boxen": "^4.0.0",
     "bunyan": "^1.8.5",
     "cors": "^2.8.1",
     "cropperjs": "^1.0.0-beta.1",
@@ -61,7 +61,7 @@
     "d3-zoom": "^1.7.1",
     "dom-shims": "^0.1.4",
     "dotenv": "^2.0.0",
-    "email-regex": "^1.0.0",
+    "email-regex": "^3.0.0",
     "emailjs": "^2.0.0",
     "event-source-polyfill": "^0.0.12",
     "exceljs": "^1.6.0",
@@ -80,7 +80,7 @@
     "is-safari": "^1.0.0",
     "is-url": "^1.2.2",
     "joi": "^10.0.1",
-    "jquery": "^3.1.1",
+    "jquery": "^3.4.1",
     "jsonwebtoken": "^8.0.0",
     "jszip": "^3.1.3",
     "loaders.css": "^0.1.2",
@@ -99,7 +99,7 @@
     "pluralize": "^7.0.0",
     "promise-queue": "^2.2.3",
     "rcfile": "^1.0.3",
-    "read-pkg-up": "^3.0.0",
+    "read-pkg-up": "^6.0.0",
     "safe-require": "^1.0.3",
     "sass-web-fonts": "^2.0.2",
     "save-as": "^0.1.8",
@@ -109,8 +109,8 @@
     "string-template": "^1.0.0",
     "to-case": "^2.0.0",
     "truncate": "^2.0.0",
-    "untildify": "^3.0.2",
-    "url-join": "^1.1.0",
+    "untildify": "^4.0.0",
+    "url-join": "^4.0.0",
     "v-hotkey": "^0.3.0",
     "vee-validate": "^2.2.3",
     "vue": "^2.6.10",
@@ -159,7 +159,7 @@
     "joycon": "^2.2.4",
     "node-sass": "^4.11.0",
     "nodemon": "^1.18.6",
-    "poi": "^12.5.5",
+    "poi": "^12.6.10",
     "poi-preset-bundle-report": "^2.0.2",
     "poi-preset-eslint": "^9.0.1",
     "sass-loader": "^7.1.0",

From 7b690398dee9c8d7c626774ef43a989fbbbca36f Mon Sep 17 00:00:00 2001
From: zcuric <zcuric@gmail.com>
Date: Fri, 31 May 2019 11:07:12 +0200
Subject: [PATCH 032/213] Rename  property to  as required by update

---
 server/script/preflight.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/script/preflight.js b/server/script/preflight.js
index 0fbf21f14..a5f883073 100644
--- a/server/script/preflight.js
+++ b/server/script/preflight.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const boxen = require('boxen');
-const pkg = require('read-pkg-up').sync().pkg;
+const pkg = require('read-pkg-up').sync().package;
 const semver = require('semver');
 
 require('dotenv').load();

From 5090791e6988d36a38aff260c8b1d82799c9df6d Mon Sep 17 00:00:00 2001
From: zcuric <zcuric@gmail.com>
Date: Fri, 31 May 2019 11:50:09 +0200
Subject: [PATCH 033/213] Set path always to string

---
 client/api/resource.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/api/resource.js b/client/api/resource.js
index f4ff84cbd..62d7fb6ee 100644
--- a/client/api/resource.js
+++ b/client/api/resource.js
@@ -18,7 +18,7 @@ export default class Resource {
   }
 
   url(path = '') {
-    return join(this.getBaseUrl(), path);
+    return join(this.getBaseUrl(), path.toString());
   }
 
   /**

From 77378b4a8fb1c20b1c06b098a3c3880685199eeb Mon Sep 17 00:00:00 2001
From: zcuric <zcuric@gmail.com>
Date: Fri, 31 May 2019 11:51:00 +0200
Subject: [PATCH 034/213] Remove empty string, it's a default argument

---
 client/api/resource.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/api/resource.js b/client/api/resource.js
index 62d7fb6ee..b5101a730 100644
--- a/client/api/resource.js
+++ b/client/api/resource.js
@@ -106,7 +106,7 @@ export default class Resource {
       // if server id is not provided but exist inside resource cache
       if (!model.id && this.getKey(model._cid)) this.setKey(model);
       const action = model.id ? 'patch' : 'post';
-      const url = model.id ? this.url(model.id) : this.url('');
+      const url = model.id ? this.url(model.id) : this.url();
       return axios[action](url, this.clean(model))
         .then(response => {
           if (!model.id) this.map(model._cid, response.data.data.id);

From 8ff3ed43a9a1517718ebc6384d9275c41d8fdff7 Mon Sep 17 00:00:00 2001
From: Luka Saric <rpg.ari7@gmail.com>
Date: Fri, 31 May 2019 13:02:19 +0200
Subject: [PATCH 035/213] Modified styles on client according to stylelint

- Added global font-family-fonts scss variable
- Added scss resources preset in poi config for global variables
- Modified style approach logic in EntitySidebar.vue according to linter
- Other component styles changed according to linter
---
 client/App.vue                                | 10 +--
 .../assets/stylesheets/common/_variables.scss |  3 +
 client/components/common/InputAsset.vue       |  2 +-
 client/components/common/Meta/Switch.vue      | 44 +++++-----
 client/components/common/Modal.vue            |  2 +-
 client/components/common/Navbar.vue           |  2 +-
 client/components/common/Select.vue           |  2 +-
 .../tce-brightcove-video/edit/Player.vue      |  2 +-
 .../content-elements/tce-modal/edit/Modal.vue |  7 +-
 .../tce-pdf/edit/CircularProgress.vue         | 14 ++--
 .../course/Revisions/EntitySidebar.vue        | 12 ++-
 package-lock.json                             | 84 +++++++++++++++++--
 package.json                                  |  1 +
 poi.config.js                                 |  6 ++
 14 files changed, 138 insertions(+), 53 deletions(-)

diff --git a/client/App.vue b/client/App.vue
index 404165ed8..36dce5f76 100644
--- a/client/App.vue
+++ b/client/App.vue
@@ -47,13 +47,13 @@ html {
   overflow: hidden;
 }
 
-.v-content .view {
-  overflow-y: scroll;
-  overflow-y: overlay;
-}
-
 .application, .v-content, .view {
   width: 100%;
   height: 100%;
 }
+
+.v-content .view {
+  overflow-y: scroll;
+  overflow-y: overlay;
+}
 </style>
diff --git a/client/assets/stylesheets/common/_variables.scss b/client/assets/stylesheets/common/_variables.scss
index 54b150b7b..bd431ee2e 100644
--- a/client/assets/stylesheets/common/_variables.scss
+++ b/client/assets/stylesheets/common/_variables.scss
@@ -4,3 +4,6 @@ $font-weight-regular: 400;
 $font-weight-medium: 500;
 $font-weight-semibold: 600;
 $font-weight-bold: 700;
+
+// Font family
+$font-family-icons: "Material Design Icons";
diff --git a/client/components/common/InputAsset.vue b/client/components/common/InputAsset.vue
index 664ebd241..c3520cb8e 100644
--- a/client/components/common/InputAsset.vue
+++ b/client/components/common/InputAsset.vue
@@ -119,8 +119,8 @@ export default {
 .v-text-field {
   max-width: 600px;
   margin: 0 20px;
-  padding: 0 7px;
   margin-top: 2px;
+  padding: 0 7px;
   padding-bottom: 0;
 }
 
diff --git a/client/components/common/Meta/Switch.vue b/client/components/common/Meta/Switch.vue
index 1bb8cc0b0..8d73f6b7a 100644
--- a/client/components/common/Meta/Switch.vue
+++ b/client/components/common/Meta/Switch.vue
@@ -75,23 +75,6 @@ input[type=checkbox] {
   opacity: 0;
 }
 
-label {
-  position: relative;
-  cursor: pointer;
-
-  &.checked .lever {
-    background: $lever-checked;
-
-    &::after {
-      background: $checked;
-    }
-
-    &::before, &::after {
-      left: 18px;
-    }
-  }
-}
-
 .lever {
   content: "";
   display: inline-block;
@@ -132,13 +115,30 @@ label {
   }
 }
 
-.lever:active::before {
-  transform: scale(2.4);
-  background-color: rgba(0,0,0,0.08);
+label {
+  position: relative;
+  cursor: pointer;
+
+  &.checked .lever {
+    background: $lever-checked;
+
+    &::after {
+      background: $checked;
+    }
 
-  .checked & {
+    &::before, &::after {
+      left: 18px;
+    }
+  }
+
+  .lever:active::before {
     transform: scale(2.4);
-    background-color: transparentize($checked, 0.85);
+    background-color: rgba(0,0,0,0.08);
+
+    .checked & {
+      transform: scale(2.4);
+      background-color: transparentize($checked, 0.85);
+    }
   }
 }
 </style>
diff --git a/client/components/common/Modal.vue b/client/components/common/Modal.vue
index 14880cae2..3a0ba6c03 100644
--- a/client/components/common/Modal.vue
+++ b/client/components/common/Modal.vue
@@ -69,7 +69,7 @@ function toggleFocusTrap(focusTrap, condition) {
     max-width: 640px;
     margin: 0 auto;
     padding: 4px;
-    font: 14px Roboto, Helvetica, Arial;
+    font: 14px Roboto, Helvetica, Arial, sans-serif;
     text-align: left;
     border: none;
     border-radius: 2px;
diff --git a/client/components/common/Navbar.vue b/client/components/common/Navbar.vue
index 7f641f6e3..d116c2fc5 100644
--- a/client/components/common/Navbar.vue
+++ b/client/components/common/Navbar.vue
@@ -79,9 +79,9 @@ $font-color: #333;
   }
 
   .app-name {
-    line-height: $container-height;
     font-size: 20px;
     font-weight: 400;
+    line-height: $container-height;
   }
 }
 
diff --git a/client/components/common/Select.vue b/client/components/common/Select.vue
index a5fc6e93e..a1abbc67c 100644
--- a/client/components/common/Select.vue
+++ b/client/components/common/Select.vue
@@ -167,7 +167,7 @@ export default {
       display: inline-block;
       color: #9c9c9c;
       font-size: 18px;
-      font-family: "Material Design Icons";
+      font-family: $font-family-icons;
       font-weight: normal;
       line-height: 26px;
       font-style: normal;
diff --git a/client/components/content-elements/tce-brightcove-video/edit/Player.vue b/client/components/content-elements/tce-brightcove-video/edit/Player.vue
index 0f9258a0b..25c8a8e69 100644
--- a/client/components/content-elements/tce-brightcove-video/edit/Player.vue
+++ b/client/components/content-elements/tce-brightcove-video/edit/Player.vue
@@ -181,6 +181,6 @@ function empty(el) {
 .brightcove-player /deep/ .vjs-error .vjs-error-display::before {
   content: "\F026";
   font-size: 42px;
-  font-family: "Material Design Icons";
+  font-family: $font-family-icons;
 }
 </style>
diff --git a/client/components/content-elements/tce-modal/edit/Modal.vue b/client/components/content-elements/tce-modal/edit/Modal.vue
index 6eae9e808..d4dc70dbb 100644
--- a/client/components/content-elements/tce-modal/edit/Modal.vue
+++ b/client/components/content-elements/tce-modal/edit/Modal.vue
@@ -87,7 +87,8 @@ function toggleFocusTrap(focusTrap, condition) {
 @function headings($from: 1, $to: 6) {
   @if $from == $to {
     @return 'h#{$from}';
-  } @else {
+  }
+  @else {
     @return 'h#{$from},' + headings($from + 1, $to);
   }
 }
@@ -97,7 +98,7 @@ function toggleFocusTrap(focusTrap, condition) {
   max-width: 640px;
   margin: 0 auto;
   padding: 4px;
-  font: 14px Roboto, Helvetica, Arial;
+  font: 14px Roboto, Helvetica, Arial, sans-serif;
   text-align: left;
   border: none;
   border-radius: 2px;
@@ -105,7 +106,7 @@ function toggleFocusTrap(focusTrap, condition) {
     0 11px 15px -7px rgba(0,0,0,0.2),
     0 24px 38px 3px rgba(0,0,0,0.14),
     0 9px 46px 8px rgba(0,0,0,0.12);
-  transition: all .3s ease;
+  transition: all 0.3s ease;
 }
 
 .modal-header {
diff --git a/client/components/content-elements/tce-pdf/edit/CircularProgress.vue b/client/components/content-elements/tce-pdf/edit/CircularProgress.vue
index 68355daa9..0c4a90e71 100644
--- a/client/components/content-elements/tce-pdf/edit/CircularProgress.vue
+++ b/client/components/content-elements/tce-pdf/edit/CircularProgress.vue
@@ -28,8 +28,8 @@ export default {
 .path {
   fill: none;
   stroke: #888;
-  stroke-dasharray: 80,200;
-  stroke-dashoffset: 0px;
+  stroke-dasharray: 80, 200;
+  stroke-dashoffset: 0;
   stroke-linecap: round;
   stroke-width: 5;
   transform-origin: center;
@@ -42,16 +42,18 @@ export default {
 
 @keyframes dash {
   0% {
-    stroke-dasharray: 1,200;
-    stroke-dashoffset: 0px;
+    stroke-dasharray: 1, 200;
+    stroke-dashoffset: 0;
   }
+
   50% {
-    stroke-dasharray: 100,200;
+    stroke-dasharray: 100, 200;
     stroke-dashoffset: -15px;
     stroke: #337ab7;
   }
+
   100% {
-    stroke-dasharray: 100,200;
+    stroke-dasharray: 100, 200;
     stroke-dashoffset: -125px;
   }
 }
diff --git a/client/components/course/Revisions/EntitySidebar.vue b/client/components/course/Revisions/EntitySidebar.vue
index 8e1cc4344..44e5a8427 100644
--- a/client/components/course/Revisions/EntitySidebar.vue
+++ b/client/components/course/Revisions/EntitySidebar.vue
@@ -56,6 +56,11 @@ export default {
 <style lang="scss" scoped>
 $revision-padding: 32px;
 
+.selected-revision {
+  color: #fff !important;
+  background-color: #1e88e5;
+}
+
 .sidebar {
   flex: 0 0 320px;
 }
@@ -119,9 +124,8 @@ $revision-padding: 32px;
   }
 }
 
-.selected, .selected.revision:hover {
-  color: #fff;
-  background-color: #1e88e5;
+.selected.revision:hover {
+  @extend .selected-revision;
 
   .rollback:hover {
     background-color: #42a5f5;
@@ -156,6 +160,8 @@ $revision-padding: 32px;
 }
 
 .selected {
+  @extend .selected-revision;
+
   .progress-background {
     opacity: 1;
   }
diff --git a/package-lock.json b/package-lock.json
index 17a48b6d9..30ee69189 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2804,8 +2804,7 @@
     "big.js": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
-      "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
-      "dev": true
+      "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q=="
     },
     "binary": {
       "version": "0.3.0",
@@ -5606,8 +5605,7 @@
     "emojis-list": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
-      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
-      "dev": true
+      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k="
     },
     "encodeurl": {
       "version": "1.0.2",
@@ -7824,7 +7822,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
       "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "dev": true,
       "requires": {
         "ansi-regex": "^2.0.0"
       },
@@ -7832,8 +7829,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
         }
       }
     },
@@ -9575,7 +9571,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
       "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
-      "dev": true,
       "requires": {
         "big.js": "^3.1.3",
         "emojis-list": "^2.0.0",
@@ -10250,6 +10245,7 @@
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.4.tgz",
       "integrity": "sha512-mlouk1OHlaUE8Odt1drMtG1bAJA4ZA6B/ehysgV0LUIrDHdKgo1KorZq3pK0b/7Z7LJIQ12MNM6aC+Tn6lUZ5w==",
       "dev": true,
+      "optional": true,
       "requires": {
         "safe-buffer": "^5.1.2",
         "yallist": "^3.0.0"
@@ -10259,7 +10255,8 @@
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz",
           "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -12160,6 +12157,14 @@
         "eslint-loader": "^1.7.1"
       }
     },
+    "poi-preset-sass-resources": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/poi-preset-sass-resources/-/poi-preset-sass-resources-4.0.2.tgz",
+      "integrity": "sha512-9Ine6DBXNrh3OBpukVmPY/eq2WFhQRjS6IL41MCYLXr9WJxc8++0dkvMClpd2nRQQbbtzDZYohUOf7KY9ATurQ==",
+      "requires": {
+        "sass-resources-loader": "^2.0.0"
+      }
+    },
     "popper.js": {
       "version": "1.12.5",
       "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.12.5.tgz",
@@ -15345,6 +15350,67 @@
         }
       }
     },
+    "sass-resources-loader": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/sass-resources-loader/-/sass-resources-loader-2.0.1.tgz",
+      "integrity": "sha512-UsjQWm01xglINC1kPidYwKOBBzOElVupm9RwtOkRlY0hPA4GKi2KFsn4BZypRD1kudaXgUnGnfbiVOE7c+ybAg==",
+      "requires": {
+        "async": "^2.1.4",
+        "chalk": "^1.1.3",
+        "glob": "^7.1.1",
+        "loader-utils": "^1.0.4"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+        },
+        "ansi-styles": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+          "requires": {
+            "ansi-styles": "^2.2.1",
+            "escape-string-regexp": "^1.0.2",
+            "has-ansi": "^2.0.0",
+            "strip-ansi": "^3.0.0",
+            "supports-color": "^2.0.0"
+          }
+        },
+        "glob": {
+          "version": "7.1.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+          "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+          "requires": {
+            "fs.realpath": "^1.0.0",
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "^3.0.4",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc="
+        }
+      }
+    },
     "sass-web-fonts": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/sass-web-fonts/-/sass-web-fonts-2.1.0.tgz",
diff --git a/package.json b/package.json
index 92f6ea2fe..88fecc2a6 100644
--- a/package.json
+++ b/package.json
@@ -97,6 +97,7 @@
     "pg": "^6.4.2",
     "pg-hstore": "^2.3.2",
     "pluralize": "^7.0.0",
+    "poi-preset-sass-resources": "^4.0.2",
     "promise-queue": "^2.2.3",
     "rcfile": "^1.0.3",
     "read-pkg-up": "^3.0.0",
diff --git a/poi.config.js b/poi.config.js
index 0c5061f82..24dd1e950 100644
--- a/poi.config.js
+++ b/poi.config.js
@@ -64,6 +64,12 @@ module.exports = {
         files: ['.brandrc', '.brandrc.js'],
         imagesPath
       }
+    },
+    {
+      resolve: 'poi-preset-sass-resources',
+      options: {
+        resources: './client/assets/stylesheets/common/_variables.scss'
+      }
     }
   ],
   entry: {

From 61dca095ab6b6b1437ad013bc4523db694be0857 Mon Sep 17 00:00:00 2001
From: snyk-test <snyk-test@snyk.io>
Date: Sat, 1 Jun 2019 04:49:28 +0000
Subject: [PATCH 036/213] fix: package.json & package-lock.json to reduce
 vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-AXIOS-174505
---
 package-lock.json | 37 ++++++++++++++++++++++++++++++++-----
 package.json      |  2 +-
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 17a48b6d9..ff7f1f8f5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2494,11 +2494,35 @@
       "dev": true
     },
     "axios": {
-      "version": "0.15.3",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.15.3.tgz",
-      "integrity": "sha1-LJ1jiy4ZGgjqHWzJiOrda6W9wFM=",
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz",
+      "integrity": "sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==",
       "requires": {
-        "follow-redirects": "1.0.0"
+        "follow-redirects": "1.5.10",
+        "is-buffer": "^2.0.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "follow-redirects": {
+          "version": "1.5.10",
+          "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
+          "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
+          "requires": {
+            "debug": "=3.1.0"
+          }
+        },
+        "is-buffer": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz",
+          "integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw=="
+        }
       }
     },
     "babel-code-frame": {
@@ -6999,6 +7023,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.0.0.tgz",
       "integrity": "sha1-jjQpjL0uF28lTv/sdaHHjMhJ/Tc=",
+      "dev": true,
       "requires": {
         "debug": "^2.2.0"
       }
@@ -10250,6 +10275,7 @@
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.4.tgz",
       "integrity": "sha512-mlouk1OHlaUE8Odt1drMtG1bAJA4ZA6B/ehysgV0LUIrDHdKgo1KorZq3pK0b/7Z7LJIQ12MNM6aC+Tn6lUZ5w==",
       "dev": true,
+      "optional": true,
       "requires": {
         "safe-buffer": "^5.1.2",
         "yallist": "^3.0.0"
@@ -10259,7 +10285,8 @@
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz",
           "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
diff --git a/package.json b/package.json
index 92f6ea2fe..f03824d73 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "@mdi/font": "^3.5.95",
     "auto-bind": "^1.2.0",
     "aws-sdk": "^2.342.0",
-    "axios": "^0.15.2",
+    "axios": "^0.19.0",
     "bcryptjs": "^2.3.0",
     "blob-util": "^1.2.1",
     "bluebird": "^3.4.6",

From 79f1153ca9871c57b4cdeaa678d44725874e5e24 Mon Sep 17 00:00:00 2001
From: Luka Saric <rpg.ari7@gmail.com>
Date: Sun, 2 Jun 2019 00:15:39 +0200
Subject: [PATCH 037/213] Addressed issues

- Removed unnecessery declared default value rule options
---
 .eslintrc.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 80286e157..9a234b103 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -30,9 +30,7 @@ module.exports = {
       named: 'never'
     }],
     'sort-imports': ['error', {
-      'ignoreCase': true,
-      'ignoreMemberSort': false,
-      'memberSyntaxSortOrder': ['none', 'all', 'multiple', 'single']
+      'ignoreCase': true
     }],
     // Vue rules
     'vue/html-self-closing': 'off',

From deb7fca61f9b17b2b23d5f7badae5e6120781317 Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Mon, 3 Jun 2019 15:13:54 +0200
Subject: [PATCH 038/213] Updated user management screens and navigation:

- moved the repository link to the right side
- increased the space between the toolbar items and the user avatar
- moved app footer to the common folder
- added app footer to the system user management
- replaced global loader with multiple local loaders
---
 client/components/SystemUserManagement.vue    | 47 ++++++++------
 client/components/common/Footer.vue           | 19 ++++++
 client/components/common/Navbar.vue           | 24 +++----
 .../common/UserManagement/AddUser.vue         |  1 +
 .../common/UserManagement/UserList.vue        |  4 +-
 .../common/UserManagement/index.vue           | 63 +++++++++++++++----
 .../course/Settings/CourseUserManagement.vue  | 16 ++---
 client/components/course/Settings/index.vue   | 20 +-----
 8 files changed, 120 insertions(+), 74 deletions(-)
 create mode 100644 client/components/common/Footer.vue

diff --git a/client/components/SystemUserManagement.vue b/client/components/SystemUserManagement.vue
index 0485ff21a..7f731e920 100644
--- a/client/components/SystemUserManagement.vue
+++ b/client/components/SystemUserManagement.vue
@@ -1,20 +1,24 @@
 <template>
-  <v-container>
-    <v-layout>
-      <v-flex>
-        <user-management
-          :users="users"
-          :roles="roles"
-          :isLoading="isLoading"
-          @upsert="upsert"
-          @remove="remove"/>
-      </v-flex>
-    </v-layout>
-  </v-container>
+  <div class="grey lighten-2 user-management-container">
+    <v-container>
+      <v-layout>
+        <v-flex>
+          <user-management
+            :users="users"
+            :roles="roles"
+            :isRequesting="isRequesting"
+            @upsert="upsert"
+            @remove="remove"/>
+        </v-flex>
+      </v-layout>
+      <app-footer/>
+    </v-container>
+  </div>
 </template>
 
 <script>
 import api from '@/api/system';
+import AppFooter from '@/components/common/Footer';
 import map from 'lodash/map';
 import omit from 'lodash/omit';
 import { role } from 'shared';
@@ -24,7 +28,7 @@ import UserManagement from 'components/common/UserManagement';
 export default {
   data() {
     return {
-      isLoading: true,
+      isRequesting: true,
       users: []
     };
   },
@@ -37,26 +41,33 @@ export default {
   },
   methods: {
     upsert(email, role) {
-      this.isLoading = true;
+      this.isRequesting = true;
       api.upsertUser(email, { role }).then(userData => {
-        this.isLoading = false;
+        this.isRequesting = false;
         const user = this.users.find(it => it.id === userData.id);
         return user ? Object.assign(user, userData) : this.users.unshift(userData);
       });
     },
     remove({ id }) {
-      this.isLoading = true;
+      this.isRequesting = true;
       api.removeUser(id).then(() => {
-        this.isLoading = false;
+        this.isRequesting = false;
         this.users = this.users.filter(user => user.id !== id);
       });
     }
   },
   created() {
-    api.getUsers().then(users => Object.assign(this, { users, isLoading: false }));
+    api.getUsers().then(users => Object.assign(this, { users, isRequesting: false }));
   },
   components: {
+    AppFooter,
     UserManagement
   }
 };
 </script>
+
+<style lang="scss" scoped>
+.user-management-container {
+  padding-bottom: 75px;
+}
+</style>
diff --git a/client/components/common/Footer.vue b/client/components/common/Footer.vue
new file mode 100644
index 000000000..c8287d6ca
--- /dev/null
+++ b/client/components/common/Footer.vue
@@ -0,0 +1,19 @@
+<template>
+  <v-footer height="52" color="primary" absolute>
+    <v-layout row justify-center>
+      <v-flex
+        xs-12
+        class="body-2 grey--text text--lighten-4 py-2">
+        <v-chip
+          color="grey lighten-4"
+          label
+          small
+          class="mr-3 grey--text text--darken-4">
+          v3.1 Silk
+        </v-chip>
+        Built with <v-icon color="pink">mdi-heart</v-icon>
+        ExtnsnEngine
+      </v-flex>
+    </v-layout>
+  </v-footer>
+</template>
diff --git a/client/components/common/Navbar.vue b/client/components/common/Navbar.vue
index a7c9df31d..b2167ed49 100644
--- a/client/components/common/Navbar.vue
+++ b/client/components/common/Navbar.vue
@@ -6,6 +6,7 @@
       </v-avatar>
       <v-toolbar-title class="app-name">{{ title }}</v-toolbar-title>
     </router-link>
+    <v-spacer/>
     <router-link
       v-if="repository"
       :to="{ name: 'course', params: { courseId: repository.id }}"
@@ -15,7 +16,6 @@
       </span>
       {{ repository.name }}
     </router-link>
-    <v-spacer/>
     <v-toolbar-items>
       <v-btn :to="{ name: 'catalog' }" exact flat>
         Catalog
@@ -79,14 +79,14 @@ $font-color: #333;
   z-index: 10;
 }
 
+.v-toolbar__items {
+  margin-right: 15px;
+}
+
 .app-brand {
+  display: flex;
   cursor: pointer;
 
-  .v-avatar {
-    float: left;
-    margin-right: 14px;
-  }
-
   .app-name {
     line-height: $container-height;
     font-size: 20px;
@@ -95,9 +95,7 @@ $font-color: #333;
 }
 
 .repository-title {
-  float: left;
-  width: 50%;
-  margin-left: 30px;
+  margin-right: 15px;
   color: $font-color;
   font-size: 16px;
   line-height: $container-height;
@@ -110,14 +108,6 @@ $font-color: #333;
   &:hover {
     color: darken($font-color, 20%);
   }
-
-  @media (max-width: 1200px) {
-    width: 40%;
-  }
-
-  @media (max-width: 1000px) {
-    width: 25%;
-  }
 }
 
 .navbar-acronym {
diff --git a/client/components/common/UserManagement/AddUser.vue b/client/components/common/UserManagement/AddUser.vue
index 19601c023..05c3faf95 100644
--- a/client/components/common/UserManagement/AddUser.vue
+++ b/client/components/common/UserManagement/AddUser.vue
@@ -20,6 +20,7 @@
       </v-flex>
       <v-flex xs2>
         <v-btn
+          :loading="isLoading"
           type="submit"
           color="blue-grey darken-1"
           small
diff --git a/client/components/common/UserManagement/UserList.vue b/client/components/common/UserManagement/UserList.vue
index 88b634779..1a15d0330 100644
--- a/client/components/common/UserManagement/UserList.vue
+++ b/client/components/common/UserManagement/UserList.vue
@@ -2,6 +2,7 @@
   <v-data-table
     :headers="headers"
     :items="users"
+    :loading="isLoading"
     no-data-text="No assigned users."
     hide-actions>
     <template v-slot:items="{ item }">
@@ -30,8 +31,8 @@
 </template>
 
 <script>
-import EventBus from 'EventBus';
 import debounce from 'lodash/debounce';
+import EventBus from 'EventBus';
 
 const appChannel = EventBus.channel('app');
 
@@ -39,6 +40,7 @@ export default {
   props: {
     users: { type: Array, required: true },
     roles: { type: Array, required: true },
+    isLoading: { type: Boolean, required: true },
     roleType: { type: String, default: 'role' }
   },
   computed: {
diff --git a/client/components/common/UserManagement/index.vue b/client/components/common/UserManagement/index.vue
index 573ccdde9..6ca0b36e1 100644
--- a/client/components/common/UserManagement/index.vue
+++ b/client/components/common/UserManagement/index.vue
@@ -1,36 +1,69 @@
 <template>
   <v-card class="settings elevation-2">
-    <progress-dialog :show="isLoading" :indeterminate="true"/>
-    <add-user :roles="roles" :isLoading="isLoading" @upsert="upsert"/>
-    <user-list
-      v-bind="$attrs"
-      :users="users"
-      :roles="roles"
-      @upsert="upsert"
-      @remove="data => $emit('remove', data)"/>
+    <div v-if="isInitialLoad" class="loading-spinner">
+      <v-progress-circular color="primary" indeterminate/>
+    </div>
+    <template v-else>
+      <add-user
+        :roles="roles"
+        :isLoading="isAddLoad"
+        @upsert="(...data) => upsert(loadingTypes.ADD, data)"/>
+      <user-list
+        v-bind="$attrs"
+        :users="users"
+        :roles="roles"
+        :isLoading="isEditLoad"
+        @upsert="(...data) => upsert(loadingTypes.EDIT, data)"
+        @remove="data => $emit('remove', loadingTypes.EDIT, data)"/>
+    </template>
   </v-card>
 </template>
 
 <script>
 import AddUser from './AddUser';
-import ProgressDialog from 'components/common/ProgressDialog';
 import UserList from './UserList';
 
+const LOADING_TYPES = { INIT: 'INIT', ADD: 'ADD', EDIT: 'EDIT' };
+
 export default {
   inheritAttrs: false,
   props: {
     users: { type: Array, required: true },
     roles: { type: Array, required: true },
-    isLoading: { type: Boolean, required: true }
+    isRequesting: { type: Boolean, required: true }
+  },
+  data() {
+    return {
+      loadingType: LOADING_TYPES.INIT
+    };
+  },
+  computed: {
+    loadingTypes() {
+      return LOADING_TYPES;
+    },
+    isInitialLoad() {
+      return this.loadingType === this.loadingTypes.INIT;
+    },
+    isAddLoad() {
+      return this.loadingType === this.loadingTypes.ADD;
+    },
+    isEditLoad() {
+      return this.loadingType === this.loadingTypes.EDIT;
+    }
   },
   methods: {
-    upsert(...data) {
+    upsert(type, data) {
+      this.loadingType = type;
       this.$emit('upsert', ...data);
     }
   },
+  watch: {
+    isRequesting(val) {
+      if (!val) this.loadingType = null;
+    }
+  },
   components: {
     AddUser,
-    ProgressDialog,
     UserList
   }
 };
@@ -38,6 +71,10 @@ export default {
 
 <style lang="scss" scoped>
 .settings {
-  padding: 30px 30px 10px;
+  padding: 30px 30px 30px;
+}
+
+.loading-spinner {
+  margin: 40px auto;
 }
 </style>
diff --git a/client/components/course/Settings/CourseUserManagement.vue b/client/components/course/Settings/CourseUserManagement.vue
index 96dbec897..5e338ce97 100644
--- a/client/components/course/Settings/CourseUserManagement.vue
+++ b/client/components/course/Settings/CourseUserManagement.vue
@@ -2,15 +2,15 @@
   <user-management
     :users="users"
     :roles="roles"
-    :isLoading="isLoading"
+    :isRequesting="isRequesting"
     @upsert="upsert"
     @remove="remove"
     roleType="courseRole"/>
 </template>
 
 <script>
-import map from 'lodash/map';
 import { mapActions, mapGetters } from 'vuex-module';
+import map from 'lodash/map';
 import { role } from 'shared';
 import { title as titleCase } from 'to-case';
 import UserManagement from 'components/common/UserManagement';
@@ -21,7 +21,7 @@ export default {
   },
   data() {
     return {
-      isLoading: true
+      isRequesting: true
     };
   },
   computed: {
@@ -37,17 +37,17 @@ export default {
     ...mapActions(['getUsers', 'upsertUser', 'removeUser'], 'course'),
     upsert(email, role) {
       const { courseId } = this;
-      this.isLoading = true;
-      this.upsertUser({ email, role, courseId }).then(() => (this.isLoading = false));
+      this.isRequesting = true;
+      this.upsertUser({ email, role, courseId }).then(() => (this.isRequesting = false));
     },
     remove({ id: userId }) {
       const { courseId } = this;
-      this.isLoading = true;
-      this.removeUser({ userId, courseId }).then(() => (this.isLoading = false));
+      this.isRequesting = true;
+      this.removeUser({ userId, courseId }).then(() => (this.isRequesting = false));
     }
   },
   created() {
-    this.getUsers().then(() => (this.isLoading = false));
+    this.getUsers().then(() => (this.isRequesting = false));
   },
   components: {
     UserManagement
diff --git a/client/components/course/Settings/index.vue b/client/components/course/Settings/index.vue
index c81f04508..74f4c5836 100644
--- a/client/components/course/Settings/index.vue
+++ b/client/components/course/Settings/index.vue
@@ -15,29 +15,14 @@
       @close="showCloneModal = false">
     </clone-modal>
     <progress-dialog :show="isPublishing" :status="publishPercentage"/>
-    <v-footer height="52" color="primary" absolute>
-      <v-layout row justify-center>
-        <v-flex
-          xs-12
-          class="body-2 grey--text text--lighten-4 py-2">
-          <v-chip
-            color="grey lighten-4"
-            label
-            small
-            class="mr-3 grey--text text--darken-4">
-            v3.1 Silk
-          </v-chip>
-          Built with <v-icon color="pink">mdi-heart</v-icon>
-          ExtnsnEngine
-        </v-flex>
-      </v-layout>
-    </v-footer>
+    <app-footer/>
   </v-container>
 </template>
 
 <script>
 import { mapActions, mapGetters } from 'vuex-module';
 import api from '@/api/course';
+import AppFooter from '@/components/common/Footer';
 import CloneModal from './CloneModal';
 import CourseUserManagement from './CourseUserManagement';
 import EventBus from 'EventBus';
@@ -94,6 +79,7 @@ export default {
     }
   },
   components: {
+    AppFooter,
     CloneModal,
     CourseUserManagement,
     General,

From 29bc39bf5af8c7e8cb1c70c4007288070f752c95 Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Mon, 3 Jun 2019 17:39:03 +0200
Subject: [PATCH 039/213] Updated system settings:

- added a sidebar navigation
- added schemas listing
- added elements listing
---
 client/components/common/Navbar.vue           |  4 +-
 .../system-settings/ElementsList.vue          | 57 +++++++++++++++++++
 .../system-settings/SchemasList.vue           | 28 +++++++++
 client/components/system-settings/Sidebar.vue | 36 ++++++++++++
 .../UserManagement.vue}                       | 29 ++--------
 client/components/system-settings/index.vue   | 33 +++++++++++
 client/router.js                              | 29 ++++++++--
 7 files changed, 186 insertions(+), 30 deletions(-)
 create mode 100644 client/components/system-settings/ElementsList.vue
 create mode 100644 client/components/system-settings/SchemasList.vue
 create mode 100644 client/components/system-settings/Sidebar.vue
 rename client/components/{SystemUserManagement.vue => system-settings/UserManagement.vue} (70%)
 create mode 100644 client/components/system-settings/index.vue

diff --git a/client/components/common/Navbar.vue b/client/components/common/Navbar.vue
index b2167ed49..b75c40e09 100644
--- a/client/components/common/Navbar.vue
+++ b/client/components/common/Navbar.vue
@@ -20,8 +20,8 @@
       <v-btn :to="{ name: 'catalog' }" exact flat>
         Catalog
       </v-btn>
-      <v-btn v-if="isAdmin" :to="{ name: 'system-user-management' }" flat>
-        Settings
+      <v-btn v-if="isAdmin" :to="{ name: 'system-management' }" flat>
+        System Settings
       </v-btn>
     </v-toolbar-items>
     <v-menu
diff --git a/client/components/system-settings/ElementsList.vue b/client/components/system-settings/ElementsList.vue
new file mode 100644
index 000000000..56bb5e489
--- /dev/null
+++ b/client/components/system-settings/ElementsList.vue
@@ -0,0 +1,57 @@
+<template>
+  <v-card>
+    <v-card-title>
+      <h1>Elements list</h1>
+    </v-card-title>
+    <v-list :expand="true" avatar>
+      <v-list-group
+        v-for="(group, name) in registry"
+        :key="name"
+        value="true">
+        <template v-slot:activator>
+          <v-list-tile>
+            <v-list-tile-title>{{ name | parseName }}</v-list-tile-title>
+          </v-list-tile>
+        </template>
+        <v-list-tile
+          v-for="({ name, ui, position }) in group"
+          :key="position"
+          ripple>
+          <v-list-tile-avatar>
+            <v-icon>{{ ui.icon }}</v-icon>
+          </v-list-tile-avatar>
+          <v-list-tile-content>
+            <v-list-tile-title v-text="name"/>
+          </v-list-tile-content>
+        </v-list-tile>
+      </v-list-group>
+    </v-list>
+  </v-card>
+</template>
+
+<script>
+import sortBy from 'lodash/sortBy';
+import startCase from 'lodash/startCase';
+
+const QUESTION_TYPES = ['ASSESSMENT', 'QUESTION'];
+
+export default {
+  inject: ['$teRegistry'],
+  computed: {
+    registry() {
+      const list = sortBy(this.$teRegistry.get(), 'position');
+      const icon = 'mdi-help-rhombus';
+      return list.reduce((registry, { name, type, position, ui }) => {
+        const group = QUESTION_TYPES.includes(type) ? 'questions' : 'teachingElements';
+        registry[group].push({ name, position, ui: { icon, ...ui } });
+        return registry;
+      }, { teachingElements: [], questions: [] });
+    }
+  },
+  filters: {
+    parseName(name) {
+      return startCase(name);
+    }
+  }
+};
+</script>
diff --git a/client/components/system-settings/SchemasList.vue b/client/components/system-settings/SchemasList.vue
new file mode 100644
index 000000000..d9b220527
--- /dev/null
+++ b/client/components/system-settings/SchemasList.vue
@@ -0,0 +1,28 @@
+<template>
+  <v-card>
+    <v-card-title>
+      <h1>Schemas list</h1>
+    </v-card-title>
+    <v-list>
+      <v-list-tile
+        v-for="{ id, name } in schemas"
+        :key="id">
+        <v-list-tile-content>
+          <v-list-tile-title v-text="name"/>
+        </v-list-tile-content>
+      </v-list-tile>
+    </v-list>
+  </v-card>
+</template>
+
+<script>
+import { SCHEMAS } from 'shared/activities';
+
+export default {
+  computed: {
+    schemas() {
+      return SCHEMAS;
+    }
+  }
+};
+</script>
diff --git a/client/components/system-settings/Sidebar.vue b/client/components/system-settings/Sidebar.vue
new file mode 100644
index 000000000..2bc67f065
--- /dev/null
+++ b/client/components/system-settings/Sidebar.vue
@@ -0,0 +1,36 @@
+<template>
+  <v-navigation-drawer value="true" stateless>
+    <v-list class="grey--text text--darken-2">
+      <v-list-tile
+        v-for="({ name, label, icon }) in routes"
+        :key="name"
+        :to="{ name }"
+        active-class="grey--text text--darken-3"
+        exact
+        ripple>
+        <v-list-tile-action class="pl-1">
+          <v-icon>{{ icon }}</v-icon>
+        </v-list-tile-action>
+        <v-list-tile-title>{{ label }}</v-list-tile-title>
+      </v-list-tile>
+    </v-list>
+  </v-navigation-drawer>
+</template>
+
+<script>
+export default {
+  computed: {
+    routes() {
+      return [
+        { label: 'Users', name: 'system-user-management', icon: 'mdi-account' },
+        { label: 'Schemas list', name: 'system-schemas-list', icon: 'mdi-sitemap' },
+        { label: 'Elements list', name: 'system-elements-list', icon: 'mdi-book-open-variant' }
+      ];
+    }
+  }
+};
+</script>
+
+<style>
+
+</style>
diff --git a/client/components/SystemUserManagement.vue b/client/components/system-settings/UserManagement.vue
similarity index 70%
rename from client/components/SystemUserManagement.vue
rename to client/components/system-settings/UserManagement.vue
index 7f731e920..3be8d6f23 100644
--- a/client/components/SystemUserManagement.vue
+++ b/client/components/system-settings/UserManagement.vue
@@ -1,24 +1,14 @@
 <template>
-  <div class="grey lighten-2 user-management-container">
-    <v-container>
-      <v-layout>
-        <v-flex>
-          <user-management
-            :users="users"
-            :roles="roles"
-            :isRequesting="isRequesting"
-            @upsert="upsert"
-            @remove="remove"/>
-        </v-flex>
-      </v-layout>
-      <app-footer/>
-    </v-container>
-  </div>
+  <user-management
+    :users="users"
+    :roles="roles"
+    :isRequesting="isRequesting"
+    @upsert="upsert"
+    @remove="remove"/>
 </template>
 
 <script>
 import api from '@/api/system';
-import AppFooter from '@/components/common/Footer';
 import map from 'lodash/map';
 import omit from 'lodash/omit';
 import { role } from 'shared';
@@ -60,14 +50,7 @@ export default {
     api.getUsers().then(users => Object.assign(this, { users, isRequesting: false }));
   },
   components: {
-    AppFooter,
     UserManagement
   }
 };
 </script>
-
-<style lang="scss" scoped>
-.user-management-container {
-  padding-bottom: 75px;
-}
-</style>
diff --git a/client/components/system-settings/index.vue b/client/components/system-settings/index.vue
new file mode 100644
index 000000000..820f3ee04
--- /dev/null
+++ b/client/components/system-settings/index.vue
@@ -0,0 +1,33 @@
+<template>
+  <div class="grey lighten-2 system-settings-container">
+    <v-container>
+      <v-layout row align-start>
+        <v-card>
+          <sidebar/>
+        </v-card>
+        <v-flex ml-4>
+          <router-view/>
+        </v-flex>
+      </v-layout>
+      <app-footer/>
+    </v-container>
+  </div>
+</template>
+
+<script>
+import AppFooter from '@/components/common/Footer';
+import Sidebar from './Sidebar';
+
+export default {
+  components: {
+    AppFooter,
+    Sidebar
+  }
+};
+</script>
+
+<style>
+.system-settings-container {
+  padding-bottom: 75px;
+}
+</style>
diff --git a/client/router.js b/client/router.js
index c405e088d..d46655621 100644
--- a/client/router.js
+++ b/client/router.js
@@ -16,7 +16,10 @@ import General from './components/course/Settings/General';
 import Login from './components/auth/Login';
 import Outline from './components/course/Outline';
 import ResetPassword from './components/auth/ResetPassword';
-import SystemUserManagement from './components/SystemUserManagement';
+import SystemElementsList from './components/system-settings/ElementsList';
+import SystemSchemasList from './components/system-settings/SchemasList';
+import SystemSettings from './components/system-settings';
+import SystemUserManagement from './components/system-settings/UserManagement';
 import TreeView from './components/course/TreeView';
 
 Vue.use(Router);
@@ -63,10 +66,26 @@ let router = new Router({
       component: TreeView
     }]
   }, {
-    path: '/settings/users',
-    name: 'system-user-management',
-    component: SystemUserManagement,
-    meta: { auth: true }
+    path: '/system-settings',
+    component: SystemSettings,
+    meta: { auth: true },
+    children: [{
+      path: '/',
+      name: 'system-management',
+      redirect: { name: 'system-user-management' }
+    }, {
+      path: 'users',
+      name: 'system-user-management',
+      component: SystemUserManagement
+    }, {
+      path: 'schemas',
+      name: 'system-schemas-list',
+      component: SystemSchemasList
+    }, {
+      path: 'elements',
+      name: 'system-elements-list',
+      component: SystemElementsList
+    }]
   }, {
     path: '/',
     name: 'auth',

From 8dbde65706cc5986437e0501537c9b96f5e9f9b1 Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Tue, 4 Jun 2019 09:33:09 +0200
Subject: [PATCH 040/213] Clean up

---
 client/components/common/UserManagement/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/components/common/UserManagement/index.vue b/client/components/common/UserManagement/index.vue
index 6ca0b36e1..b5d6a98f4 100644
--- a/client/components/common/UserManagement/index.vue
+++ b/client/components/common/UserManagement/index.vue
@@ -71,7 +71,7 @@ export default {
 
 <style lang="scss" scoped>
 .settings {
-  padding: 30px 30px 30px;
+  padding: 30px;
 }
 
 .loading-spinner {

From d96915285dbc9e468350508e7fbc0bc070d0fbc5 Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Tue, 4 Jun 2019 09:33:30 +0200
Subject: [PATCH 041/213] Added search to elements list and schemas list

---
 .../system-settings/ElementsList.vue          | 28 +++++++++++++++----
 .../system-settings/SchemasList.vue           | 25 +++++++++++++----
 2 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/client/components/system-settings/ElementsList.vue b/client/components/system-settings/ElementsList.vue
index 56bb5e489..8b6fdd9a0 100644
--- a/client/components/system-settings/ElementsList.vue
+++ b/client/components/system-settings/ElementsList.vue
@@ -1,11 +1,11 @@
 <template>
-  <v-card>
-    <v-card-title>
-      <h1>Elements list</h1>
-    </v-card-title>
+  <v-card class="elements-list-container">
+    <v-card-actions>
+      <v-text-field v-model.trim="search" label="Search" clearable/>
+    </v-card-actions>
     <v-list :expand="true" avatar>
       <v-list-group
-        v-for="(group, name) in registry"
+        v-for="(group, name) in filteredRegistry"
         :key="name"
         value="true">
         <template v-slot:activator>
@@ -37,6 +37,9 @@ const QUESTION_TYPES = ['ASSESSMENT', 'QUESTION'];
 
 export default {
   inject: ['$teRegistry'],
+  data() {
+    return { search: '' };
+  },
   computed: {
     registry() {
       const list = sortBy(this.$teRegistry.get(), 'position');
@@ -46,6 +49,15 @@ export default {
         registry[group].push({ name, position, ui: { icon, ...ui } });
         return registry;
       }, { teachingElements: [], questions: [] });
+    },
+    filteredRegistry() {
+      let { registry, search } = this;
+      if (!search) return registry;
+      search = search.toLowerCase();
+      const cond = ({ name }) => name.toLowerCase().includes(search);
+      const teachingElements = registry.teachingElements.filter(cond);
+      const questions = registry.questions.filter(cond);
+      return { teachingElements, questions };
     }
   },
   filters: {
@@ -55,3 +67,9 @@ export default {
   }
 };
 </script>
+
+<style lang="scss" scoped>
+.elements-list-container {
+  padding: 30px;
+}
+</style>
diff --git a/client/components/system-settings/SchemasList.vue b/client/components/system-settings/SchemasList.vue
index d9b220527..096e99f6b 100644
--- a/client/components/system-settings/SchemasList.vue
+++ b/client/components/system-settings/SchemasList.vue
@@ -1,11 +1,11 @@
 <template>
-  <v-card>
-    <v-card-title>
-      <h1>Schemas list</h1>
-    </v-card-title>
+  <v-card class="schemas-list-container">
+    <v-card-actions>
+      <v-text-field v-model.trim="search" label="Search" clearable/>
+    </v-card-actions>
     <v-list>
       <v-list-tile
-        v-for="{ id, name } in schemas"
+        v-for="{ id, name } in filteredSchemas"
         :key="id">
         <v-list-tile-content>
           <v-list-tile-title v-text="name"/>
@@ -19,10 +19,25 @@
 import { SCHEMAS } from 'shared/activities';
 
 export default {
+  data() {
+    return { search: '' };
+  },
   computed: {
     schemas() {
       return SCHEMAS;
+    },
+    filteredSchemas() {
+      let { schemas, search } = this;
+      if (!search) return schemas;
+      search = search.toLowerCase();
+      return schemas.filter(({ name }) => name.toLowerCase().includes(search));
     }
   }
 };
 </script>
+
+<style lang="scss" scoped>
+.schemas-list-container {
+  padding: 30px;
+}
+</style>

From 6f45297ca34c885bd1e0facfc5762bda00e6be8e Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Tue, 4 Jun 2019 09:48:48 +0200
Subject: [PATCH 042/213] Updates to system settings sidebar and routes:

- renamed users to system users
- renamed elements list to teaching elements
- renamed schemas list to repository types
- added fallback route
---
 client/components/common/Footer.vue           |  2 +-
 .../{SchemasList.vue => RepositoryTypes.vue}  |  4 +---
 client/components/system-settings/Sidebar.vue |  6 +++---
 ...{ElementsList.vue => TeachingElements.vue} |  4 +---
 client/router.js                              | 19 +++++++++++--------
 5 files changed, 17 insertions(+), 18 deletions(-)
 rename client/components/system-settings/{SchemasList.vue => RepositoryTypes.vue} (87%)
 rename client/components/system-settings/{ElementsList.vue => TeachingElements.vue} (94%)

diff --git a/client/components/common/Footer.vue b/client/components/common/Footer.vue
index c8287d6ca..6c25dbef5 100644
--- a/client/components/common/Footer.vue
+++ b/client/components/common/Footer.vue
@@ -12,7 +12,7 @@
           v3.1 Silk
         </v-chip>
         Built with <v-icon color="pink">mdi-heart</v-icon>
-        ExtnsnEngine
+        Extension Engine
       </v-flex>
     </v-layout>
   </v-footer>
diff --git a/client/components/system-settings/SchemasList.vue b/client/components/system-settings/RepositoryTypes.vue
similarity index 87%
rename from client/components/system-settings/SchemasList.vue
rename to client/components/system-settings/RepositoryTypes.vue
index 096e99f6b..09e31090f 100644
--- a/client/components/system-settings/SchemasList.vue
+++ b/client/components/system-settings/RepositoryTypes.vue
@@ -1,8 +1,6 @@
 <template>
   <v-card class="schemas-list-container">
-    <v-card-actions>
-      <v-text-field v-model.trim="search" label="Search" clearable/>
-    </v-card-actions>
+    <v-text-field v-model.trim="search" label="Search" clearable/>
     <v-list>
       <v-list-tile
         v-for="{ id, name } in filteredSchemas"
diff --git a/client/components/system-settings/Sidebar.vue b/client/components/system-settings/Sidebar.vue
index 2bc67f065..afa06618e 100644
--- a/client/components/system-settings/Sidebar.vue
+++ b/client/components/system-settings/Sidebar.vue
@@ -22,9 +22,9 @@ export default {
   computed: {
     routes() {
       return [
-        { label: 'Users', name: 'system-user-management', icon: 'mdi-account' },
-        { label: 'Schemas list', name: 'system-schemas-list', icon: 'mdi-sitemap' },
-        { label: 'Elements list', name: 'system-elements-list', icon: 'mdi-book-open-variant' }
+        { label: 'System Users', name: 'system-user-management', icon: 'mdi-account' },
+        { label: 'Repository Types', name: 'system-repository-types', icon: 'mdi-sitemap' },
+        { label: 'Teaching Elements', name: 'system-teaching-elements', icon: 'mdi-book-open-variant' }
       ];
     }
   }
diff --git a/client/components/system-settings/ElementsList.vue b/client/components/system-settings/TeachingElements.vue
similarity index 94%
rename from client/components/system-settings/ElementsList.vue
rename to client/components/system-settings/TeachingElements.vue
index 8b6fdd9a0..b793dd849 100644
--- a/client/components/system-settings/ElementsList.vue
+++ b/client/components/system-settings/TeachingElements.vue
@@ -1,8 +1,6 @@
 <template>
   <v-card class="elements-list-container">
-    <v-card-actions>
-      <v-text-field v-model.trim="search" label="Search" clearable/>
-    </v-card-actions>
+    <v-text-field v-model.trim="search" label="Search" clearable/>
     <v-list :expand="true" avatar>
       <v-list-group
         v-for="(group, name) in filteredRegistry"
diff --git a/client/router.js b/client/router.js
index d46655621..f281f58f6 100644
--- a/client/router.js
+++ b/client/router.js
@@ -16,9 +16,9 @@ import General from './components/course/Settings/General';
 import Login from './components/auth/Login';
 import Outline from './components/course/Outline';
 import ResetPassword from './components/auth/ResetPassword';
-import SystemElementsList from './components/system-settings/ElementsList';
-import SystemSchemasList from './components/system-settings/SchemasList';
+import SystemRepositoryTypesList from './components/system-settings/RepositoryTypes';
 import SystemSettings from './components/system-settings';
+import SystemTeachingElementsList from './components/system-settings/TeachingElements';
 import SystemUserManagement from './components/system-settings/UserManagement';
 import TreeView from './components/course/TreeView';
 
@@ -78,13 +78,16 @@ let router = new Router({
       name: 'system-user-management',
       component: SystemUserManagement
     }, {
-      path: 'schemas',
-      name: 'system-schemas-list',
-      component: SystemSchemasList
+      path: 'repository-types',
+      name: 'system-repository-types',
+      component: SystemRepositoryTypesList
     }, {
-      path: 'elements',
-      name: 'system-elements-list',
-      component: SystemElementsList
+      path: 'teaching-elements',
+      name: 'system-teaching-elements',
+      component: SystemTeachingElementsList
+    }, {
+      path: '*',
+      redirect: { name: 'system-management' }
     }]
   }, {
     path: '/',

From 88953241fede105dffdfc12890f16ca9391f990d Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Tue, 4 Jun 2019 12:40:16 +0200
Subject: [PATCH 043/213] Updates to system settings:

- renamed teaching elements to content elements
- renamed repository types to structure types
- updated sidebar icons
- structure types page now shows tree view of structure
and can search any level
- added version to content elements
---
 ...achingElements.vue => ContentElements.vue} | 21 ++++----
 .../system-settings/RepositoryTypes.vue       | 41 ---------------
 client/components/system-settings/Sidebar.vue |  4 +-
 .../system-settings/StructureTypes.vue        | 50 +++++++++++++++++++
 client/router.js                              | 16 +++---
 5 files changed, 72 insertions(+), 60 deletions(-)
 rename client/components/system-settings/{TeachingElements.vue => ContentElements.vue} (73%)
 delete mode 100644 client/components/system-settings/RepositoryTypes.vue
 create mode 100644 client/components/system-settings/StructureTypes.vue

diff --git a/client/components/system-settings/TeachingElements.vue b/client/components/system-settings/ContentElements.vue
similarity index 73%
rename from client/components/system-settings/TeachingElements.vue
rename to client/components/system-settings/ContentElements.vue
index b793dd849..c6e03f8ea 100644
--- a/client/components/system-settings/TeachingElements.vue
+++ b/client/components/system-settings/ContentElements.vue
@@ -1,7 +1,7 @@
 <template>
   <v-card class="elements-list-container">
     <v-text-field v-model.trim="search" label="Search" clearable/>
-    <v-list :expand="true" avatar>
+    <v-list :expand="true" avatar two-line>
       <v-list-group
         v-for="(group, name) in filteredRegistry"
         :key="name"
@@ -12,14 +12,17 @@
           </v-list-tile>
         </template>
         <v-list-tile
-          v-for="({ name, ui, position }) in group"
+          v-for="({ name, ui, version, position }) in group"
           :key="position"
           ripple>
           <v-list-tile-avatar>
-            <v-icon>{{ ui.icon }}</v-icon>
+            <v-icon large>{{ ui.icon }}</v-icon>
           </v-list-tile-avatar>
           <v-list-tile-content>
             <v-list-tile-title v-text="name"/>
+            <v-list-tile-sub-title>
+              Version {{ version }}
+            </v-list-tile-sub-title>
           </v-list-tile-content>
         </v-list-tile>
       </v-list-group>
@@ -42,20 +45,20 @@ export default {
     registry() {
       const list = sortBy(this.$teRegistry.get(), 'position');
       const icon = 'mdi-help-rhombus';
-      return list.reduce((registry, { name, type, position, ui }) => {
-        const group = QUESTION_TYPES.includes(type) ? 'questions' : 'teachingElements';
-        registry[group].push({ name, position, ui: { icon, ...ui } });
+      return list.reduce((registry, { type, ui, ...item }) => {
+        const group = QUESTION_TYPES.includes(type) ? 'questions' : 'contentElements';
+        registry[group].push({ ...item, ui: { icon, ...ui } });
         return registry;
-      }, { teachingElements: [], questions: [] });
+      }, { contentElements: [], questions: [] });
     },
     filteredRegistry() {
       let { registry, search } = this;
       if (!search) return registry;
       search = search.toLowerCase();
       const cond = ({ name }) => name.toLowerCase().includes(search);
-      const teachingElements = registry.teachingElements.filter(cond);
+      const contentElements = registry.contentElements.filter(cond);
       const questions = registry.questions.filter(cond);
-      return { teachingElements, questions };
+      return { contentElements, questions };
     }
   },
   filters: {
diff --git a/client/components/system-settings/RepositoryTypes.vue b/client/components/system-settings/RepositoryTypes.vue
deleted file mode 100644
index 09e31090f..000000000
--- a/client/components/system-settings/RepositoryTypes.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<template>
-  <v-card class="schemas-list-container">
-    <v-text-field v-model.trim="search" label="Search" clearable/>
-    <v-list>
-      <v-list-tile
-        v-for="{ id, name } in filteredSchemas"
-        :key="id">
-        <v-list-tile-content>
-          <v-list-tile-title v-text="name"/>
-        </v-list-tile-content>
-      </v-list-tile>
-    </v-list>
-  </v-card>
-</template>
-
-<script>
-import { SCHEMAS } from 'shared/activities';
-
-export default {
-  data() {
-    return { search: '' };
-  },
-  computed: {
-    schemas() {
-      return SCHEMAS;
-    },
-    filteredSchemas() {
-      let { schemas, search } = this;
-      if (!search) return schemas;
-      search = search.toLowerCase();
-      return schemas.filter(({ name }) => name.toLowerCase().includes(search));
-    }
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-.schemas-list-container {
-  padding: 30px;
-}
-</style>
diff --git a/client/components/system-settings/Sidebar.vue b/client/components/system-settings/Sidebar.vue
index afa06618e..b4dc6d968 100644
--- a/client/components/system-settings/Sidebar.vue
+++ b/client/components/system-settings/Sidebar.vue
@@ -23,8 +23,8 @@ export default {
     routes() {
       return [
         { label: 'System Users', name: 'system-user-management', icon: 'mdi-account' },
-        { label: 'Repository Types', name: 'system-repository-types', icon: 'mdi-sitemap' },
-        { label: 'Teaching Elements', name: 'system-teaching-elements', icon: 'mdi-book-open-variant' }
+        { label: 'Structure Types', name: 'system-structure-types', icon: 'mdi-file-tree' },
+        { label: 'Content Elements', name: 'system-content-elements', icon: 'mdi-puzzle' }
       ];
     }
   }
diff --git a/client/components/system-settings/StructureTypes.vue b/client/components/system-settings/StructureTypes.vue
new file mode 100644
index 000000000..bcf16d061
--- /dev/null
+++ b/client/components/system-settings/StructureTypes.vue
@@ -0,0 +1,50 @@
+<template>
+  <v-card class="schemas-list-container">
+    <v-text-field v-model.trim="search" label="Search" clearable/>
+    <v-treeview :items="schemas" :search="search" item-text="label">
+      <template v-slot:prepend="{ item, open }">
+        <v-icon :color="item.color">
+          {{ open ? 'mdi-folder-open' : 'mdi-folder' }}
+        </v-icon>
+      </template>
+    </v-treeview>
+  </v-card>
+</template>
+
+<script>
+import cuid from 'cuid';
+import { SCHEMAS } from 'shared/activities';
+
+const buildTree = (type, structure) => {
+  const id = cuid();
+  const { subLevels, ...leaf } = structure.find(it => it.type === type);
+  if (!subLevels.length) return { id, ...leaf };
+  const children = subLevels.map(type => buildTree(type, structure));
+  return { id, children, ...leaf };
+};
+
+export default {
+  data() {
+    return { search: '' };
+  },
+  computed: {
+    schemas() {
+      return SCHEMAS.map(({ name: label, structure }) => {
+        const roots = structure.filter(it => it.level === 1);
+        const children = roots.reduce((acc, { type }) => {
+          acc.push(buildTree(type, structure));
+          return acc;
+        }, []);
+        return { id: cuid(), label, children };
+      });
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.schemas-list-container {
+  padding: 30px;
+  text-align: left;
+}
+</style>
diff --git a/client/router.js b/client/router.js
index f281f58f6..736d36020 100644
--- a/client/router.js
+++ b/client/router.js
@@ -16,9 +16,9 @@ import General from './components/course/Settings/General';
 import Login from './components/auth/Login';
 import Outline from './components/course/Outline';
 import ResetPassword from './components/auth/ResetPassword';
-import SystemRepositoryTypesList from './components/system-settings/RepositoryTypes';
+import SystemContentElementsList from './components/system-settings/ContentElements';
+import SystemStructureTypesList from './components/system-settings/StructureTypes';
 import SystemSettings from './components/system-settings';
-import SystemTeachingElementsList from './components/system-settings/TeachingElements';
 import SystemUserManagement from './components/system-settings/UserManagement';
 import TreeView from './components/course/TreeView';
 
@@ -78,13 +78,13 @@ let router = new Router({
       name: 'system-user-management',
       component: SystemUserManagement
     }, {
-      path: 'repository-types',
-      name: 'system-repository-types',
-      component: SystemRepositoryTypesList
+      path: 'structure-types',
+      name: 'system-structure-types',
+      component: SystemStructureTypesList
     }, {
-      path: 'teaching-elements',
-      name: 'system-teaching-elements',
-      component: SystemTeachingElementsList
+      path: 'content-elements',
+      name: 'system-content-elements',
+      component: SystemContentElementsList
     }, {
       path: '*',
       redirect: { name: 'system-management' }

From b938645322a2756fd1837b8a58bf00757e19acad Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Tue, 4 Jun 2019 12:53:09 +0200
Subject: [PATCH 044/213] Navbar updates:

- moved system settings to dropdown
- replaced catalog button with home icon
- set max-width for repository title
---
 client/components/common/Navbar.vue | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/client/components/common/Navbar.vue b/client/components/common/Navbar.vue
index b75c40e09..0e76bfc2e 100644
--- a/client/components/common/Navbar.vue
+++ b/client/components/common/Navbar.vue
@@ -17,11 +17,8 @@
       {{ repository.name }}
     </router-link>
     <v-toolbar-items>
-      <v-btn :to="{ name: 'catalog' }" exact flat>
-        Catalog
-      </v-btn>
-      <v-btn v-if="isAdmin" :to="{ name: 'system-management' }" flat>
-        System Settings
+      <v-btn :to="{ name: 'catalog' }" exact flat icon>
+        <v-icon>mdi-home</v-icon>
       </v-btn>
     </v-toolbar-items>
     <v-menu
@@ -38,6 +35,9 @@
         <v-list-tile>
           <v-list-tile-title>{{ user.email }}</v-list-tile-title>
         </v-list-tile>
+        <v-list-tile v-if="isAdmin" :to="{ name: 'system-management' }">
+          <v-list-tile-title>System Settings</v-list-tile-title>
+        </v-list-tile>
         <v-list-tile @click="logout">
           <v-list-tile-title>Logout</v-list-tile-title>
         </v-list-tile>
@@ -95,6 +95,7 @@ $font-color: #333;
 }
 
 .repository-title {
+  max-width: 250px;
   margin-right: 15px;
   color: $font-color;
   font-size: 16px;

From 9db6a87d12e75ea6a388ab280984855f20b56eb1 Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Tue, 4 Jun 2019 13:00:20 +0200
Subject: [PATCH 045/213] Can now open structure tree by clicking anywhere

---
 client/components/system-settings/StructureTypes.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/client/components/system-settings/StructureTypes.vue b/client/components/system-settings/StructureTypes.vue
index bcf16d061..54c20a863 100644
--- a/client/components/system-settings/StructureTypes.vue
+++ b/client/components/system-settings/StructureTypes.vue
@@ -1,7 +1,11 @@
 <template>
   <v-card class="schemas-list-container">
     <v-text-field v-model.trim="search" label="Search" clearable/>
-    <v-treeview :items="schemas" :search="search" item-text="label">
+    <v-treeview
+      :items="schemas"
+      :search="search"
+      open-on-click
+      item-text="label">
       <template v-slot:prepend="{ item, open }">
         <v-icon :color="item.color">
           {{ open ? 'mdi-folder-open' : 'mdi-folder' }}

From f90342edff6a4ca0cbb870e0b15272924a518b7f Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Tue, 4 Jun 2019 13:08:47 +0200
Subject: [PATCH 046/213] Fixed  course navigation appearing in editor:

- moved editor route out of course route's children routes
---
 client/router.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/client/router.js b/client/router.js
index 736d36020..b774e2d85 100644
--- a/client/router.js
+++ b/client/router.js
@@ -39,10 +39,6 @@ let router = new Router({
       path: '',
       name: 'course',
       component: Outline
-    }, {
-      path: 'editor/:activityId',
-      name: 'editor',
-      component: Editor
     }, {
       path: 'settings',
       component: CourseSettings,
@@ -65,6 +61,11 @@ let router = new Router({
       name: 'tree-view',
       component: TreeView
     }]
+  }, {
+    path: '/course/:courseId/editor/:activityId',
+    name: 'editor',
+    component: Editor,
+    meta: { auth: true }
   }, {
     path: '/system-settings',
     component: SystemSettings,

From 4f97375c32260de9fc24accc19a2fe30d0407a8c Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Tue, 4 Jun 2019 13:14:41 +0200
Subject: [PATCH 047/213] Removed indeterminate option from progress dialog

---
 client/components/common/ProgressDialog.vue | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/client/components/common/ProgressDialog.vue b/client/components/common/ProgressDialog.vue
index 63ac95819..bbe3ac875 100644
--- a/client/components/common/ProgressDialog.vue
+++ b/client/components/common/ProgressDialog.vue
@@ -7,11 +7,7 @@
       <v-card color="blue-grey darken-3" dark>
         <v-card-text>
           Please wait...
-          <v-progress-linear
-            :indeterminate="indeterminate"
-            :value="status"
-            color="white"
-            class="mb-0"/>
+          <v-progress-linear :value="status" color="white" class="mb-0"/>
         </v-card-text>
       </v-card>
     </v-dialog>
@@ -22,7 +18,6 @@
 export default {
   props: {
     show: { type: Boolean, default: false },
-    indeterminate: { type: Boolean, default: false },
     status: { type: Number, default: 0 }
   }
 };

From 1f1a2bc07c44ce53a5cb9ddad9cd252ee251444b Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Tue, 4 Jun 2019 13:38:34 +0200
Subject: [PATCH 048/213] Added searchable prop to registry items

---
 client/components/system-settings/ContentElements.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/components/system-settings/ContentElements.vue b/client/components/system-settings/ContentElements.vue
index c6e03f8ea..a466be62f 100644
--- a/client/components/system-settings/ContentElements.vue
+++ b/client/components/system-settings/ContentElements.vue
@@ -46,8 +46,9 @@ export default {
       const list = sortBy(this.$teRegistry.get(), 'position');
       const icon = 'mdi-help-rhombus';
       return list.reduce((registry, { type, ui, ...item }) => {
+        const searchable = item.name.toLowerCase();
         const group = QUESTION_TYPES.includes(type) ? 'questions' : 'contentElements';
-        registry[group].push({ ...item, ui: { icon, ...ui } });
+        registry[group].push({ searchable, ...item, ui: { icon, ...ui } });
         return registry;
       }, { contentElements: [], questions: [] });
     },
@@ -55,7 +56,7 @@ export default {
       let { registry, search } = this;
       if (!search) return registry;
       search = search.toLowerCase();
-      const cond = ({ name }) => name.toLowerCase().includes(search);
+      const cond = ({ searchable }) => searchable.includes(search);
       const contentElements = registry.contentElements.filter(cond);
       const questions = registry.questions.filter(cond);
       return { contentElements, questions };

From 8a6e659c954161e4e6bf419fb2776d2d5b62c017 Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Tue, 4 Jun 2019 13:42:15 +0200
Subject: [PATCH 049/213] Clean up

---
 client/components/system-settings/Sidebar.vue | 4 ----
 client/components/system-settings/index.vue   | 2 +-
 server/user/user.model.js                     | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/client/components/system-settings/Sidebar.vue b/client/components/system-settings/Sidebar.vue
index b4dc6d968..c2fceb45b 100644
--- a/client/components/system-settings/Sidebar.vue
+++ b/client/components/system-settings/Sidebar.vue
@@ -30,7 +30,3 @@ export default {
   }
 };
 </script>
-
-<style>
-
-</style>
diff --git a/client/components/system-settings/index.vue b/client/components/system-settings/index.vue
index 820f3ee04..c25823b9d 100644
--- a/client/components/system-settings/index.vue
+++ b/client/components/system-settings/index.vue
@@ -26,7 +26,7 @@ export default {
 };
 </script>
 
-<style>
+<style lang="scss" scoped>
 .system-settings-container {
   padding-bottom: 75px;
 }
diff --git a/server/user/user.model.js b/server/user/user.model.js
index 11cf5994e..365220d54 100644
--- a/server/user/user.model.js
+++ b/server/user/user.model.js
@@ -1,9 +1,9 @@
 'use strict';
 
+const { Model, Op } = require('sequelize');
 const config = require('../../config/server');
 const jwt = require('jsonwebtoken');
 const mail = require('../shared/mail');
-const { Model, Op } = require('sequelize');
 const Promise = require('bluebird');
 const { role: roles } = require('../../config/shared');
 

From eb0b81fcd7005abaea6f60b8de00b9856d2d7664 Mon Sep 17 00:00:00 2001
From: franosincic <fsincic@extensionengine.com>
Date: Tue, 4 Jun 2019 16:39:05 +0200
Subject: [PATCH 050/213] Tweaked UI to use new primary colour

---
 .../content-elements/tce-multiple-choice/edit/index.vue       | 3 +--
 .../content-elements/tce-single-choice/edit/index.vue         | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/client/components/content-elements/tce-multiple-choice/edit/index.vue b/client/components/content-elements/tce-multiple-choice/edit/index.vue
index b722de518..70eb1ff69 100644
--- a/client/components/content-elements/tce-multiple-choice/edit/index.vue
+++ b/client/components/content-elements/tce-multiple-choice/edit/index.vue
@@ -14,7 +14,7 @@
             @change="toggleAnswer(index)"
             type="checkbox">
         </span>
-        <v-avatar v-else size="32" color="blue">{{ index + 1 }}</v-avatar>
+        <v-avatar v-else size="32" color="primary">{{ index + 1 }}</v-avatar>
         <span :class="errorClass(index)" class="input-container">
           <input
             :ref="`input${index}`"
@@ -157,7 +157,6 @@ ul {
 
     .v-avatar {
       float: left;
-      margin-top: 3px;
       margin-right: 10px;
       color: #fff;
       font-weight: 700;
diff --git a/client/components/content-elements/tce-single-choice/edit/index.vue b/client/components/content-elements/tce-single-choice/edit/index.vue
index d44a8370e..b76c2c629 100644
--- a/client/components/content-elements/tce-single-choice/edit/index.vue
+++ b/client/components/content-elements/tce-single-choice/edit/index.vue
@@ -21,7 +21,7 @@
             @change="selectAnswer(index)"
             type="radio">
         </span>
-        <v-avatar v-else size="32" color="blue">{{ index + 1 }}</v-avatar>
+        <v-avatar v-else size="32" color="primary">{{ index + 1 }}</v-avatar>
         <span :class="{ 'has-error': answerError(index) }" class="answers-input">
           <input
             :ref="`input${index}`"
@@ -192,7 +192,7 @@ ul {
 
     .v-avatar {
       float: left;
-      margin-top: 8px;
+      margin-top: 5px;
       margin-right: 6px;
       color: #fff;
       font-weight: 700;

From f3dfd6b9df7e47683df6b8701ff983e1966210f3 Mon Sep 17 00:00:00 2001
From: franosincic <fsincic@extensionengine.com>
Date: Tue, 4 Jun 2019 16:49:36 +0200
Subject: [PATCH 051/213] =?UTF-8?q?=F0=9F=92=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../content-elements/tce-multiple-choice/edit/index.vue         | 1 +
 .../content-elements/tce-single-choice/edit/index.vue           | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/components/content-elements/tce-multiple-choice/edit/index.vue b/client/components/content-elements/tce-multiple-choice/edit/index.vue
index 70eb1ff69..c2dca096d 100644
--- a/client/components/content-elements/tce-multiple-choice/edit/index.vue
+++ b/client/components/content-elements/tce-multiple-choice/edit/index.vue
@@ -157,6 +157,7 @@ ul {
 
     .v-avatar {
       float: left;
+      margin-top: 1px;
       margin-right: 10px;
       color: #fff;
       font-weight: 700;
diff --git a/client/components/content-elements/tce-single-choice/edit/index.vue b/client/components/content-elements/tce-single-choice/edit/index.vue
index b76c2c629..b0c548a1d 100644
--- a/client/components/content-elements/tce-single-choice/edit/index.vue
+++ b/client/components/content-elements/tce-single-choice/edit/index.vue
@@ -192,7 +192,7 @@ ul {
 
     .v-avatar {
       float: left;
-      margin-top: 5px;
+      margin-top: 4px;
       margin-right: 6px;
       color: #fff;
       font-weight: 700;

From fb8694b083ebdeb67895a9ba4a8078294cc5d157 Mon Sep 17 00:00:00 2001
From: franosincic <fsincic@extensionengine.com>
Date: Wed, 5 Jun 2019 00:26:09 +0200
Subject: [PATCH 052/213] Meta Select options image preview

---
 client/components/common/Meta/Select.vue | 16 +++++++++++++++-
 client/components/common/Select.vue      | 10 ++++++++++
 package-lock.json                        |  6 +++---
 package.json                             |  2 +-
 4 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/client/components/common/Meta/Select.vue b/client/components/common/Meta/Select.vue
index 426d50903..75ce70177 100644
--- a/client/components/common/Meta/Select.vue
+++ b/client/components/common/Meta/Select.vue
@@ -12,6 +12,14 @@
       @open="active = true"
       @close="active = false"
       @input="update">
+      <template slot="option" slot-scope="{ option }">
+        <img v-if="option.img" :src="option.img" :alt="option.label" class="img">
+        <span>{{ option.label }}</span>
+      </template>
+      <template slot="singleLabel" slot-scope="{ option }">
+        <img v-if="option.img" :src="option.img" :alt="option.label" class="img">
+        <span>{{ option.label }}</span>
+      </template>
     </multiselect>
   </div>
 </template>
@@ -65,7 +73,13 @@ export default {
     color: #808080;
   }
 
-  .multiselect {
+  .img {
+    width: 36px;
+    height: 36px;
+    margin-right: 15px;
+  }
+
+  /deep/ .multiselect {
     color: #333;
     font-size: 17px;
     line-height: 24px;
diff --git a/client/components/common/Select.vue b/client/components/common/Select.vue
index a5fc6e93e..f6920c4db 100644
--- a/client/components/common/Select.vue
+++ b/client/components/common/Select.vue
@@ -7,6 +7,16 @@
       @input="val => $emit('input', val)"
       @close="close"
       @open="open">
+      <slot
+        v-for="slot in Object.keys($slots)"
+        :name="slot"
+        :slot="slot"/>
+      <template
+        v-for="slot in Object.keys($scopedSlots)"
+        slot-scope="scope"
+        :slot="slot">
+        <slot v-bind="scope" :name="slot"/>
+      </template>
     </multiselect>
     <span
       v-if="showResetButton"
diff --git a/package-lock.json b/package-lock.json
index 4ce229fc1..8930f9095 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18287,9 +18287,9 @@
       }
     },
     "vue-multiselect": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/vue-multiselect/-/vue-multiselect-2.0.2.tgz",
-      "integrity": "sha512-lxXPqZlLpUo0DtfLq1Slh1GdCwVA18k0KJQRB5tYMbB5/qefqxCxXH3sHZmAocapSRyqSVvBU+ieYYIxkRT40w=="
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/vue-multiselect/-/vue-multiselect-2.1.0.tgz",
+      "integrity": "sha512-mEhApxZ6MUISGLuGDy0RF5UlAKUgG/Qq0DWYE/C+CA1h6ZszM3cHfpNFfFm2AMWLclY2SAWpY1HlQLjsw8WnvQ=="
     },
     "vue-plyr": {
       "version": "3.0.0",
diff --git a/package.json b/package.json
index 93aa1218b..9a6cb5820 100644
--- a/package.json
+++ b/package.json
@@ -122,7 +122,7 @@
     "vue-focus": "^2.1.0",
     "vue-infinite-loading": "^2.2.1",
     "vue-infinite-scroll": "^2.0.0",
-    "vue-multiselect": "2.0.2",
+    "vue-multiselect": "^2.1.0",
     "vue-plyr": "^3.0.0",
     "vue-quill-editor": "^2.3.3",
     "vue-router": "^2.0.3",

From 2c08a614feccbe275dae86e9a1529cf180bdab8b Mon Sep 17 00:00:00 2001
From: Luka Saric <rpg.ari7@gmail.com>
Date: Wed, 5 Jun 2019 11:05:22 +0200
Subject: [PATCH 053/213] Snackbar upgrade

- added `right` position as default value for snackbar appearance
- added `primary` snackbar prop with global primary color
---
 client/components/editor/TeachingElement.vue | 3 +--
 client/plugins/vuetify-snackbar/Snackbar.vue | 3 ++-
 client/plugins/vuetify-snackbar/index.js     | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/client/components/editor/TeachingElement.vue b/client/components/editor/TeachingElement.vue
index f2384c6d8..057af724d 100644
--- a/client/components/editor/TeachingElement.vue
+++ b/client/components/editor/TeachingElement.vue
@@ -38,8 +38,7 @@ export default {
         .then(() => this.showNotification());
     },
     showNotification: throttle(function () {
-      const opts = { color: 'primary', right: true };
-      this.$snackbar.show('Element saved', opts);
+      this.$snackbar.primary('Element saved');
     }, 4000),
     remove() {
       this.removeElement(this.element).then(() => {
diff --git a/client/plugins/vuetify-snackbar/Snackbar.vue b/client/plugins/vuetify-snackbar/Snackbar.vue
index 91736bd29..5f07bb7d6 100644
--- a/client/plugins/vuetify-snackbar/Snackbar.vue
+++ b/client/plugins/vuetify-snackbar/Snackbar.vue
@@ -9,7 +9,8 @@
 const initialData = () => ({
   message: '',
   color: '',
-  timeout: 2500
+  timeout: 2500,
+  right: true
 });
 
 export default {
diff --git a/client/plugins/vuetify-snackbar/index.js b/client/plugins/vuetify-snackbar/index.js
index 2795cad4b..edb39c380 100644
--- a/client/plugins/vuetify-snackbar/index.js
+++ b/client/plugins/vuetify-snackbar/index.js
@@ -10,6 +10,7 @@ export const install = (Vue, { parent = document.body } = {}) => {
   const $snackbar = {
     show: (msg, options) => queue.add(() => vm.show(msg, options)),
     close: () => vm.close,
+    primary: (msg, options) => $snackbar.show(msg, { ...options, color: 'primary' }),
     success: (msg, options) => $snackbar.show(msg, { ...options, color: 'success' }),
     info: (msg, options) => $snackbar.show(msg, { ...options, color: 'info' }),
     warning: (msg, options) => $snackbar.show(msg, { ...options, color: 'warning' }),

From 2adecbba1ea5c62b7395766e733a4689db668408 Mon Sep 17 00:00:00 2001
From: Hrvoje Vucic <hrvoje.vucic@hotmail.com>
Date: Thu, 6 Jun 2019 14:39:24 +0200
Subject: [PATCH 054/213] Extend InputAsset component to accept additional prop

---
 client/components/common/InputAsset.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/components/common/InputAsset.vue b/client/components/common/InputAsset.vue
index 664ebd241..6df27ac17 100644
--- a/client/components/common/InputAsset.vue
+++ b/client/components/common/InputAsset.vue
@@ -11,6 +11,7 @@
       <v-icon>mdi-open-in-new</v-icon>
     </v-btn>
     <file-upload
+      v-if="allowFileUpload"
       v-show="!file && isEditing"
       :uploading.sync="uploading"
       :validate="{ ext: extensions }"
@@ -34,7 +35,7 @@
       v-if="!uploading && (urlInput || !hasAsset)"
       v-model="urlInput"
       :disabled="!isEditing"
-      placeholder="or paste a URL"/>
+      :placeholder="allowFileUpload ? 'or paste a URL' : 'Paste a URL'"/>
     <span class="actions">
       <v-btn
         v-if="!isEditing"
@@ -73,7 +74,8 @@ export default {
     url: { type: String, default: null },
     publicUrl: { type: String, default: null },
     extensions: { type: Array, required: true },
-    uploadLabel: { type: String, default: 'Select file' }
+    uploadLabel: { type: String, default: 'Select file' },
+    allowFileUpload: { type: Boolean, default: true }
   },
   data() {
     const isLinked = !isUploaded(this.url);

From 729e096cc4dc903994bd382363eecf47018bdee0 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Thu, 6 Jun 2019 22:25:08 +0200
Subject: [PATCH 055/213] Cleanup :lipstick:

---
 client/components/editor/TeachingElement.vue | 2 +-
 client/plugins/vuetify-snackbar/Snackbar.vue | 2 +-
 client/plugins/vuetify-snackbar/index.js     | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/client/components/editor/TeachingElement.vue b/client/components/editor/TeachingElement.vue
index 057af724d..b046b854b 100644
--- a/client/components/editor/TeachingElement.vue
+++ b/client/components/editor/TeachingElement.vue
@@ -38,7 +38,7 @@ export default {
         .then(() => this.showNotification());
     },
     showNotification: throttle(function () {
-      this.$snackbar.primary('Element saved');
+      this.$snackbar.show('Element saved');
     }, 4000),
     remove() {
       this.removeElement(this.element).then(() => {
diff --git a/client/plugins/vuetify-snackbar/Snackbar.vue b/client/plugins/vuetify-snackbar/Snackbar.vue
index 5f07bb7d6..2360fc00c 100644
--- a/client/plugins/vuetify-snackbar/Snackbar.vue
+++ b/client/plugins/vuetify-snackbar/Snackbar.vue
@@ -8,7 +8,7 @@
 <script>
 const initialData = () => ({
   message: '',
-  color: '',
+  color: 'primary',
   timeout: 2500,
   right: true
 });
diff --git a/client/plugins/vuetify-snackbar/index.js b/client/plugins/vuetify-snackbar/index.js
index edb39c380..2795cad4b 100644
--- a/client/plugins/vuetify-snackbar/index.js
+++ b/client/plugins/vuetify-snackbar/index.js
@@ -10,7 +10,6 @@ export const install = (Vue, { parent = document.body } = {}) => {
   const $snackbar = {
     show: (msg, options) => queue.add(() => vm.show(msg, options)),
     close: () => vm.close,
-    primary: (msg, options) => $snackbar.show(msg, { ...options, color: 'primary' }),
     success: (msg, options) => $snackbar.show(msg, { ...options, color: 'success' }),
     info: (msg, options) => $snackbar.show(msg, { ...options, color: 'info' }),
     warning: (msg, options) => $snackbar.show(msg, { ...options, color: 'warning' }),

From 8969ef008eaab3573a21bf46c92003524e556f8e Mon Sep 17 00:00:00 2001
From: Luka Saric <rpg.ari7@gmail.com>
Date: Mon, 10 Jun 2019 11:28:07 +0200
Subject: [PATCH 056/213] Addressed issue

- Replaced extended class with `mixin`
---
 client/components/course/Revisions/EntitySidebar.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/components/course/Revisions/EntitySidebar.vue b/client/components/course/Revisions/EntitySidebar.vue
index 44e5a8427..14b3da05e 100644
--- a/client/components/course/Revisions/EntitySidebar.vue
+++ b/client/components/course/Revisions/EntitySidebar.vue
@@ -56,8 +56,8 @@ export default {
 <style lang="scss" scoped>
 $revision-padding: 32px;
 
-.selected-revision {
-  color: #fff !important;
+@mixin selected-revision() {
+  color: #fff;
   background-color: #1e88e5;
 }
 
@@ -125,7 +125,7 @@ $revision-padding: 32px;
 }
 
 .selected.revision:hover {
-  @extend .selected-revision;
+  @include selected-revision();
 
   .rollback:hover {
     background-color: #42a5f5;
@@ -160,7 +160,7 @@ $revision-padding: 32px;
 }
 
 .selected {
-  @extend .selected-revision;
+  @include selected-revision();
 
   .progress-background {
     opacity: 1;

From 4a2d4761926f1be8f57f69ccce9596ba3e3a6c1c Mon Sep 17 00:00:00 2001
From: Hrvoje Vucic <hrvoje.vucic@hotmail.com>
Date: Mon, 10 Jun 2019 11:55:12 +0200
Subject: [PATCH 057/213] Order props by importance

---
 client/components/common/InputAsset.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/components/common/InputAsset.vue b/client/components/common/InputAsset.vue
index 6df27ac17..c192f782f 100644
--- a/client/components/common/InputAsset.vue
+++ b/client/components/common/InputAsset.vue
@@ -74,8 +74,8 @@ export default {
     url: { type: String, default: null },
     publicUrl: { type: String, default: null },
     extensions: { type: Array, required: true },
-    uploadLabel: { type: String, default: 'Select file' },
-    allowFileUpload: { type: Boolean, default: true }
+    allowFileUpload: { type: Boolean, default: true },
+    uploadLabel: { type: String, default: 'Select file' }
   },
   data() {
     const isLinked = !isUploaded(this.url);

From 57e40df55769a529e05f3cc13f8d4d8668a9e51b Mon Sep 17 00:00:00 2001
From: Luka Saric <rpg.ari7@gmail.com>
Date: Mon, 10 Jun 2019 12:45:26 +0200
Subject: [PATCH 058/213] Modified bunyan logger

- Extracted log level  option into `.env` file
- Set default level value as it was before (`info`)
---
 .env.example            | 3 +++
 server/shared/logger.js | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.env.example b/.env.example
index 852bd600c..aa2845033 100644
--- a/.env.example
+++ b/.env.example
@@ -55,6 +55,9 @@ ENABLE_DEFAULT_SCHEMA=1
 # repositoryId and activityId.
 PREVIEW_URL=https://myserver.com/repository/{repositoryId}/activity/{activityId}
 
+# Logger
+LOG_LEVEL='info'
+
 # Terminal (forcefully enable color)
 FORCE_COLOR=1
 
diff --git a/server/shared/logger.js b/server/shared/logger.js
index 90b9d471d..c08eab94b 100644
--- a/server/shared/logger.js
+++ b/server/shared/logger.js
@@ -4,7 +4,8 @@ const bunyan = require('bunyan');
 
 const logger = bunyan.createLogger({
   name: 'tailor-server',
-  serializers: bunyan.stdSerializers
+  serializers: bunyan.stdSerializers,
+  level: process.env.LOG_LEVEL
 });
 
 module.exports = logger;

From 30d00fc998add5f20e1a27bc9e3f8731352af6d3 Mon Sep 17 00:00:00 2001
From: Luka Saric <rpg.ari7@gmail.com>
Date: Mon, 10 Jun 2019 14:05:29 +0200
Subject: [PATCH 059/213] Addressed issues

- Added font-family primary & secondary global variables
- Moved opening bracket in poi config above
- Removed unnecessary parens in mixins
---
 client/App.vue                                              | 2 +-
 client/assets/stylesheets/common/_variables.scss            | 2 ++
 client/components/common/ActivityBrowser/index.vue          | 2 +-
 client/components/common/Meta/ColorPicker/ColorInput.vue    | 4 ++--
 client/components/common/Meta/index.vue                     | 2 +-
 client/components/common/Modal.vue                          | 2 +-
 client/components/common/Select.vue                         | 2 +-
 client/components/content-elements/tce-modal/edit/Modal.vue | 2 +-
 client/components/course/Revisions/EntitySidebar.vue        | 6 +++---
 client/components/course/TreeView/TreeGraph.vue             | 2 +-
 poi.config.js                                               | 3 +--
 11 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/client/App.vue b/client/App.vue
index 36dce5f76..8395034fa 100644
--- a/client/App.vue
+++ b/client/App.vue
@@ -40,7 +40,7 @@ html {
 
 #app {
   color: rgba(0,0,0,0.87);
-  font-family: Poppins, Helvetica, Arial, sans-serif;
+  font-family: $font-family-primary;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   text-align: center;
diff --git a/client/assets/stylesheets/common/_variables.scss b/client/assets/stylesheets/common/_variables.scss
index bd431ee2e..a0bbc43fe 100644
--- a/client/assets/stylesheets/common/_variables.scss
+++ b/client/assets/stylesheets/common/_variables.scss
@@ -7,3 +7,5 @@ $font-weight-bold: 700;
 
 // Font family
 $font-family-icons: "Material Design Icons";
+$font-family-primary: Poppins, Helvetica, Arial, sans-serif;
+$font-family-secondary: Roboto, Helvetica, Arial, sans-serif;
diff --git a/client/components/common/ActivityBrowser/index.vue b/client/components/common/ActivityBrowser/index.vue
index 63647b1e6..a1ea45d95 100644
--- a/client/components/common/ActivityBrowser/index.vue
+++ b/client/components/common/ActivityBrowser/index.vue
@@ -44,7 +44,7 @@ export default {
 .activity-browser {
   width: 550px;
   margin: 25px auto;
-  font-family: Roboto, 'Helvetica Neue', Helvetica, Arial, sans-serif;
+  font-family: $font-family-secondary;
   color: #333;
 }
 </style>
diff --git a/client/components/common/Meta/ColorPicker/ColorInput.vue b/client/components/common/Meta/ColorPicker/ColorInput.vue
index e1555d5e0..f6b119467 100644
--- a/client/components/common/Meta/ColorPicker/ColorInput.vue
+++ b/client/components/common/Meta/ColorPicker/ColorInput.vue
@@ -44,7 +44,7 @@ export default {
 .btn {
   margin-right: 5px;
   padding: 6px 16px;
-  font-family: Roboto, Helvetica, Arial, sans-serif;
+  font-family: $font-family-secondary;
   font-size: 12.5px;
   font-weight: 500;
   outline: none;
@@ -110,7 +110,7 @@ export default {
   .input__input {
     height: 24px;
     color: #222;
-    font-family: Roboto, Helvetica, Arial, sans-serif;
+    font-family: $font-family-secondary;
     font-size: 13px;
     background: #fdfdfd;
   }
diff --git a/client/components/common/Meta/index.vue b/client/components/common/Meta/index.vue
index 884de9e4d..4365832a3 100644
--- a/client/components/common/Meta/index.vue
+++ b/client/components/common/Meta/index.vue
@@ -46,7 +46,7 @@ export default {
 <style lang="scss" scoped>
 /deep/ .title {
   color: #808080;
-  font-family: Roboto, Helvetica, sans-serif;
+  font-family: $font-family-secondary;
   font-size: 14px !important;
   font-weight: normal;
 }
diff --git a/client/components/common/Modal.vue b/client/components/common/Modal.vue
index 3a0ba6c03..b355c2a72 100644
--- a/client/components/common/Modal.vue
+++ b/client/components/common/Modal.vue
@@ -69,7 +69,7 @@ function toggleFocusTrap(focusTrap, condition) {
     max-width: 640px;
     margin: 0 auto;
     padding: 4px;
-    font: 14px Roboto, Helvetica, Arial, sans-serif;
+    font: 14px $font-family-secondary;
     text-align: left;
     border: none;
     border-radius: 2px;
diff --git a/client/components/common/Select.vue b/client/components/common/Select.vue
index a1abbc67c..e432230af 100644
--- a/client/components/common/Select.vue
+++ b/client/components/common/Select.vue
@@ -146,7 +146,7 @@ export default {
       text-overflow: ellipsis;
       white-space: nowrap;
       font-size: 12px;
-      font-family: Roboto, Helvetica, Arial, sans-serif;
+      font-family: $font-family-secondary;
     }
   }
 
diff --git a/client/components/content-elements/tce-modal/edit/Modal.vue b/client/components/content-elements/tce-modal/edit/Modal.vue
index d4dc70dbb..782938528 100644
--- a/client/components/content-elements/tce-modal/edit/Modal.vue
+++ b/client/components/content-elements/tce-modal/edit/Modal.vue
@@ -98,7 +98,7 @@ function toggleFocusTrap(focusTrap, condition) {
   max-width: 640px;
   margin: 0 auto;
   padding: 4px;
-  font: 14px Roboto, Helvetica, Arial, sans-serif;
+  font: 14px $font-family-secondary;
   text-align: left;
   border: none;
   border-radius: 2px;
diff --git a/client/components/course/Revisions/EntitySidebar.vue b/client/components/course/Revisions/EntitySidebar.vue
index 14b3da05e..10bad10a3 100644
--- a/client/components/course/Revisions/EntitySidebar.vue
+++ b/client/components/course/Revisions/EntitySidebar.vue
@@ -56,7 +56,7 @@ export default {
 <style lang="scss" scoped>
 $revision-padding: 32px;
 
-@mixin selected-revision() {
+@mixin selected-revision {
   color: #fff;
   background-color: #1e88e5;
 }
@@ -125,7 +125,7 @@ $revision-padding: 32px;
 }
 
 .selected.revision:hover {
-  @include selected-revision();
+  @include selected-revision;
 
   .rollback:hover {
     background-color: #42a5f5;
@@ -160,7 +160,7 @@ $revision-padding: 32px;
 }
 
 .selected {
-  @include selected-revision();
+  @include selected-revision;
 
   .progress-background {
     opacity: 1;
diff --git a/client/components/course/TreeView/TreeGraph.vue b/client/components/course/TreeView/TreeGraph.vue
index 252d83dde..2fb953c04 100644
--- a/client/components/course/TreeView/TreeGraph.vue
+++ b/client/components/course/TreeView/TreeGraph.vue
@@ -242,7 +242,7 @@ function rangeToArray(start, end, size) {
 </script>
 
 <style lang="scss">
-$font: 14px Roboto, Helvetica, Arial;
+$font: 14px $font-family-secondary;
 $text-color: #5a5a5a;
 $node-color: #b9b9b9;
 $link-color: #ababab;
diff --git a/poi.config.js b/poi.config.js
index 24dd1e950..a8451d7da 100644
--- a/poi.config.js
+++ b/poi.config.js
@@ -64,8 +64,7 @@ module.exports = {
         files: ['.brandrc', '.brandrc.js'],
         imagesPath
       }
-    },
-    {
+    }, {
       resolve: 'poi-preset-sass-resources',
       options: {
         resources: './client/assets/stylesheets/common/_variables.scss'

From fc14ab63004c656292c8b74578ed72497896e8fb Mon Sep 17 00:00:00 2001
From: Luka Saric <rpg.ari7@gmail.com>
Date: Mon, 10 Jun 2019 15:51:39 +0200
Subject: [PATCH 060/213] Dynamic logging level

- Added different logging level based on the environment
---
 server/shared/logger.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/server/shared/logger.js b/server/shared/logger.js
index c08eab94b..4ee84c79b 100644
--- a/server/shared/logger.js
+++ b/server/shared/logger.js
@@ -2,10 +2,15 @@
 
 const bunyan = require('bunyan');
 
+const logLevel = (() => {
+  if (process.env.LOG_LEVEL) return process.env.LOG_LEVEL;
+  return process.env.NODE_ENV === 'production' ? 'info' : 'debug';
+})();
+
 const logger = bunyan.createLogger({
   name: 'tailor-server',
   serializers: bunyan.stdSerializers,
-  level: process.env.LOG_LEVEL
+  level: logLevel
 });
 
 module.exports = logger;

From 3e00391d7fb6f38364e26e018af07eae28e79f6e Mon Sep 17 00:00:00 2001
From: Luka Saric <rpg.ari7@gmail.com>
Date: Tue, 11 Jun 2019 12:44:32 +0200
Subject: [PATCH 061/213] Addressed issue

- Fixed `rgba` missing spaces
---
 client/components/common/Meta/Switch.vue                  | 8 ++++----
 .../components/content-elements/tce-modal/edit/Modal.vue  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/client/components/common/Meta/Switch.vue b/client/components/common/Meta/Switch.vue
index 8d73f6b7a..d6ca2cc82 100644
--- a/client/components/common/Meta/Switch.vue
+++ b/client/components/common/Meta/Switch.vue
@@ -109,9 +109,9 @@ input[type=checkbox] {
   &::after {
     background-color: $unchecked;
     box-shadow:
-      0 3px 1px -2px rgba(0,0,0,0.2),
-      0 2px 2px 0 rgba(0,0,0,0.14),
-      0 1px 5px 0 rgba(0,0,0,0.12);
+      0 3px 1px -2px rgba(0, 0, 0, 0.2),
+      0 2px 2px 0 rgba(0, 0, 0, 0.14),
+      0 1px 5px 0 rgba(0, 0, 0, 0.12);
   }
 }
 
@@ -133,7 +133,7 @@ label {
 
   .lever:active::before {
     transform: scale(2.4);
-    background-color: rgba(0,0,0,0.08);
+    background-color: rgba(0, 0, 0, 0.08);
 
     .checked & {
       transform: scale(2.4);
diff --git a/client/components/content-elements/tce-modal/edit/Modal.vue b/client/components/content-elements/tce-modal/edit/Modal.vue
index 782938528..01e64b95c 100644
--- a/client/components/content-elements/tce-modal/edit/Modal.vue
+++ b/client/components/content-elements/tce-modal/edit/Modal.vue
@@ -65,7 +65,7 @@ function toggleFocusTrap(focusTrap, condition) {
 }
 
 .modal.in[backdrop] {
-  background-color: rgba(0,0,0,0.5);
+  background-color: rgba(0, 0, 0, 0.5);
 }
 
 .modal-dialog {
@@ -103,9 +103,9 @@ function toggleFocusTrap(focusTrap, condition) {
   border: none;
   border-radius: 2px;
   box-shadow:
-    0 11px 15px -7px rgba(0,0,0,0.2),
-    0 24px 38px 3px rgba(0,0,0,0.14),
-    0 9px 46px 8px rgba(0,0,0,0.12);
+    0 11px 15px -7px rgba(0, 0, 0, 0.2),
+    0 24px 38px 3px rgba(0, 0, 0, 0.14),
+    0 9px 46px 8px rgba(0, 0, 0, 0.12);
   transition: all 0.3s ease;
 }
 

From b4cc8361d905ae406688e64d60ed53a6daaa00ba Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Wed, 12 Jun 2019 08:00:36 +0200
Subject: [PATCH 062/213] Restore repo user mgm

---
 .../common/UserManagement/index.vue           | 80 -------------------
 .../course/Settings/CourseUserManagement.vue  | 56 -------------
 .../Settings}/UserManagement/AddUser.vue      | 21 +++--
 .../Settings}/UserManagement/UserList.vue     | 41 +++++-----
 .../course/Settings/UserManagement/index.vue  | 35 ++++++++
 client/components/course/Settings/index.vue   |  6 +-
 6 files changed, 69 insertions(+), 170 deletions(-)
 delete mode 100644 client/components/common/UserManagement/index.vue
 delete mode 100644 client/components/course/Settings/CourseUserManagement.vue
 rename client/components/{common => course/Settings}/UserManagement/AddUser.vue (73%)
 rename client/components/{common => course/Settings}/UserManagement/UserList.vue (60%)
 create mode 100644 client/components/course/Settings/UserManagement/index.vue

diff --git a/client/components/common/UserManagement/index.vue b/client/components/common/UserManagement/index.vue
deleted file mode 100644
index b5d6a98f4..000000000
--- a/client/components/common/UserManagement/index.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<template>
-  <v-card class="settings elevation-2">
-    <div v-if="isInitialLoad" class="loading-spinner">
-      <v-progress-circular color="primary" indeterminate/>
-    </div>
-    <template v-else>
-      <add-user
-        :roles="roles"
-        :isLoading="isAddLoad"
-        @upsert="(...data) => upsert(loadingTypes.ADD, data)"/>
-      <user-list
-        v-bind="$attrs"
-        :users="users"
-        :roles="roles"
-        :isLoading="isEditLoad"
-        @upsert="(...data) => upsert(loadingTypes.EDIT, data)"
-        @remove="data => $emit('remove', loadingTypes.EDIT, data)"/>
-    </template>
-  </v-card>
-</template>
-
-<script>
-import AddUser from './AddUser';
-import UserList from './UserList';
-
-const LOADING_TYPES = { INIT: 'INIT', ADD: 'ADD', EDIT: 'EDIT' };
-
-export default {
-  inheritAttrs: false,
-  props: {
-    users: { type: Array, required: true },
-    roles: { type: Array, required: true },
-    isRequesting: { type: Boolean, required: true }
-  },
-  data() {
-    return {
-      loadingType: LOADING_TYPES.INIT
-    };
-  },
-  computed: {
-    loadingTypes() {
-      return LOADING_TYPES;
-    },
-    isInitialLoad() {
-      return this.loadingType === this.loadingTypes.INIT;
-    },
-    isAddLoad() {
-      return this.loadingType === this.loadingTypes.ADD;
-    },
-    isEditLoad() {
-      return this.loadingType === this.loadingTypes.EDIT;
-    }
-  },
-  methods: {
-    upsert(type, data) {
-      this.loadingType = type;
-      this.$emit('upsert', ...data);
-    }
-  },
-  watch: {
-    isRequesting(val) {
-      if (!val) this.loadingType = null;
-    }
-  },
-  components: {
-    AddUser,
-    UserList
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-.settings {
-  padding: 30px;
-}
-
-.loading-spinner {
-  margin: 40px auto;
-}
-</style>
diff --git a/client/components/course/Settings/CourseUserManagement.vue b/client/components/course/Settings/CourseUserManagement.vue
deleted file mode 100644
index 5e338ce97..000000000
--- a/client/components/course/Settings/CourseUserManagement.vue
+++ /dev/null
@@ -1,56 +0,0 @@
-<template>
-  <user-management
-    :users="users"
-    :roles="roles"
-    :isRequesting="isRequesting"
-    @upsert="upsert"
-    @remove="remove"
-    roleType="courseRole"/>
-</template>
-
-<script>
-import { mapActions, mapGetters } from 'vuex-module';
-import map from 'lodash/map';
-import { role } from 'shared';
-import { title as titleCase } from 'to-case';
-import UserManagement from 'components/common/UserManagement';
-
-export default {
-  props: {
-    courseId: { type: Number, required: true }
-  },
-  data() {
-    return {
-      isRequesting: true
-    };
-  },
-  computed: {
-    ...mapGetters(['users'], 'course'),
-    roles() {
-      return map(role.course, it => ({
-        text: titleCase(it.replace('COURSE', '')),
-        value: it
-      }));
-    }
-  },
-  methods: {
-    ...mapActions(['getUsers', 'upsertUser', 'removeUser'], 'course'),
-    upsert(email, role) {
-      const { courseId } = this;
-      this.isRequesting = true;
-      this.upsertUser({ email, role, courseId }).then(() => (this.isRequesting = false));
-    },
-    remove({ id: userId }) {
-      const { courseId } = this;
-      this.isRequesting = true;
-      this.removeUser({ userId, courseId }).then(() => (this.isRequesting = false));
-    }
-  },
-  created() {
-    this.getUsers().then(() => (this.isRequesting = false));
-  },
-  components: {
-    UserManagement
-  }
-};
-</script>
diff --git a/client/components/common/UserManagement/AddUser.vue b/client/components/course/Settings/UserManagement/AddUser.vue
similarity index 73%
rename from client/components/common/UserManagement/AddUser.vue
rename to client/components/course/Settings/UserManagement/AddUser.vue
index 05c3faf95..befbc7d02 100644
--- a/client/components/common/UserManagement/AddUser.vue
+++ b/client/components/course/Settings/UserManagement/AddUser.vue
@@ -20,7 +20,6 @@
       </v-flex>
       <v-flex xs2>
         <v-btn
-          :loading="isLoading"
           type="submit"
           color="blue-grey darken-1"
           small
@@ -33,13 +32,13 @@
 </template>
 
 <script>
+import { mapActions } from 'vuex-module';
 import { withValidation } from 'utils/validation';
 
 export default {
   mixins: [withValidation()],
   props: {
-    roles: { type: Array, required: true },
-    isLoading: { type: Boolean, required: true }
+    roles: { type: Array, required: true }
   },
   data() {
     return {
@@ -48,19 +47,17 @@ export default {
     };
   },
   methods: {
+    ...mapActions(['upsertUser'], 'course'),
     addUser() {
       const { email, role } = this;
-      this.$validator.validateAll().then(isValid => {
-        if (isValid) this.$emit('upsert', email, role);
+      const { courseId } = this.$route.params;
+      this.$validator.validateAll().then(async isValid => {
+        if (!isValid) return;
+        await this.upsertUser({ courseId, email, role });
+        this.email = '';
+        this.$nextTick(() => this.$validator.reset());
       });
     }
-  },
-  watch: {
-    isLoading(val) {
-      if (val) return;
-      this.email = '';
-      this.$nextTick(() => this.$validator.reset());
-    }
   }
 };
 </script>
diff --git a/client/components/common/UserManagement/UserList.vue b/client/components/course/Settings/UserManagement/UserList.vue
similarity index 60%
rename from client/components/common/UserManagement/UserList.vue
rename to client/components/course/Settings/UserManagement/UserList.vue
index 1a15d0330..63e52dc6e 100644
--- a/client/components/common/UserManagement/UserList.vue
+++ b/client/components/course/Settings/UserManagement/UserList.vue
@@ -16,9 +16,9 @@
       </td>
       <td class="role-select">
         <v-select
-          :value="item[roleType]"
+          :value="item.courseRole"
           :items="roles"
-          @change="role => upsert(item.email, role)"
+          @change="role => changeRole(item.email, role)"
           icon/>
       </td>
       <td class="actions">
@@ -31,34 +31,39 @@
 </template>
 
 <script>
+import { mapActions, mapGetters } from 'vuex-module';
 import debounce from 'lodash/debounce';
-import EventBus from 'EventBus';
-
-const appChannel = EventBus.channel('app');
 
 export default {
   props: {
-    users: { type: Array, required: true },
-    roles: { type: Array, required: true },
-    isLoading: { type: Boolean, required: true },
-    roleType: { type: String, default: 'role' }
+    roles: { type: Array, required: true }
+  },
+  data() {
+    return { isLoading: true };
   },
   computed: {
+    ...mapGetters(['users'], 'course'),
     headers() {
       return ['User', 'Role', ''].map(text => ({ text, sortable: false }));
     }
   },
   methods: {
-    upsert: debounce(function (email, role) {
-      this.$emit('upsert', email, role);
-    }, 500),
-    remove(item) {
-      appChannel.emit('showConfirmationModal', {
-        title: `Remove user?`,
-        message: `Are you sure you want to remove ${item.email}?`,
-        action: () => this.$emit('remove', item)
-      });
+    ...mapActions(['getUsers', 'upsertUser', 'removeUser'], 'course'),
+    fetchUsers() {
+      this.isLoading = true;
+      return this.getUsers().then(() => (this.isLoading = false));
+    },
+    changeRole(email, role) {
+      const { courseId } = this.$route.params;
+      debounce(this.upsertUser, 500)({ courseId, email, role });
+    },
+    remove(user) {
+      const { courseId } = this.$route.params;
+      this.removeUser({ userId: user.id, courseId });
     }
+  },
+  created() {
+    this.fetchUsers();
   }
 };
 </script>
diff --git a/client/components/course/Settings/UserManagement/index.vue b/client/components/course/Settings/UserManagement/index.vue
new file mode 100644
index 000000000..f433ca785
--- /dev/null
+++ b/client/components/course/Settings/UserManagement/index.vue
@@ -0,0 +1,35 @@
+<template>
+  <v-card class="settings elevation-2">
+    <add-user :roles="roles"/>
+    <user-list :roles="roles"/>
+  </v-card>
+</template>
+
+<script>
+import AddUser from './AddUser';
+import map from 'lodash/map';
+import { role } from 'shared';
+import { title as titleCase } from 'to-case';
+import UserList from './UserList';
+
+export default {
+  computed: {
+    roles() {
+      return map(role.course, it => ({
+        text: titleCase(it.replace('COURSE', '')),
+        value: it
+      }));
+    }
+  },
+  components: {
+    AddUser,
+    UserList
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.settings {
+  padding: 30px 30px 10px;
+}
+</style>
diff --git a/client/components/course/Settings/index.vue b/client/components/course/Settings/index.vue
index fc851cbb3..8770216d5 100644
--- a/client/components/course/Settings/index.vue
+++ b/client/components/course/Settings/index.vue
@@ -24,12 +24,11 @@ import { mapActions, mapGetters } from 'vuex-module';
 import api from '@/api/course';
 import AppFooter from '@/components/common/Footer';
 import CloneModal from './CloneModal';
-import CourseUserManagement from './CourseUserManagement';
 import EventBus from 'EventBus';
 import General from './General';
 import JSZip from 'jszip';
-import ProgressDialog from 'components/common/ProgressDialog';
-import publishMixin from 'components/common/mixins/publish';
+import ProgressDialog from '@/components/common/ProgressDialog';
+import publishMixin from '@/components/common/mixins/publish';
 import saveAs from 'save-as';
 import Sidebar from './Sidebar';
 
@@ -86,7 +85,6 @@ export default {
   components: {
     AppFooter,
     CloneModal,
-    CourseUserManagement,
     General,
     ProgressDialog,
     Sidebar

From 54534ace4500435a7df710f319131fbb392963ec Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Wed, 12 Jun 2019 08:07:17 +0200
Subject: [PATCH 063/213] Exposed helper for fetching or inviting user

- Added attrs to profile virtual
- withRoleType scope cleanup
---
 server/user/user.model.js | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/server/user/user.model.js b/server/user/user.model.js
index 365220d54..a0145f63a 100644
--- a/server/user/user.model.js
+++ b/server/user/user.model.js
@@ -4,6 +4,7 @@ const { Model, Op } = require('sequelize');
 const config = require('../../config/server');
 const jwt = require('jsonwebtoken');
 const mail = require('../shared/mail');
+const pick = require('lodash/pick');
 const Promise = require('bluebird');
 const { role: roles } = require('../../config/shared');
 
@@ -35,11 +36,8 @@ class User extends Model {
       profile: {
         type: VIRTUAL,
         get() {
-          return {
-            id: this.id,
-            email: this.email,
-            role: this.role
-          };
+          return pick(this,
+            ['id', 'email', 'role', 'createdAt', 'updatedAt', 'deletedAt']);
         }
       },
       token: {
@@ -101,9 +99,8 @@ class User extends Model {
 
   static scopes() {
     return {
-      withRoleType(type) {
-        if (!type) return;
-        const role = { [Op.in]: roles.getRoleNames(type) };
+      withRoleType() {
+        const role = { [Op.in]: roles.getRoleValues('user') };
         return { where: { role } };
       }
     };
@@ -118,6 +115,14 @@ class User extends Model {
       });
   }
 
+  static findOrInvite({ email, role = USER }) {
+    return User.findOne({ where: { email }, paranoid: false }).then(user => {
+      if (!user) return User.invite({ email, role });
+      if (!user.deletedAt) return user;
+      return user.restore();
+    });
+  }
+
   isAdmin() {
     return this.role === ADMIN || this.role === INTEGRATION;
   }

From b971dbd7267be1848ec2993fc1481a12fab51b0c Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Wed, 12 Jun 2019 08:15:20 +0200
Subject: [PATCH 064/213] Added pagination helpers

---
 server/shared/database/helpers.js    | 54 +++++++++++++++++++++-------
 server/shared/database/pagination.js | 27 ++++++++++++++
 2 files changed, 68 insertions(+), 13 deletions(-)
 create mode 100644 server/shared/database/pagination.js

diff --git a/server/shared/database/helpers.js b/server/shared/database/helpers.js
index e7a3f30d2..4b2b3968e 100644
--- a/server/shared/database/helpers.js
+++ b/server/shared/database/helpers.js
@@ -1,9 +1,11 @@
 'use strict';
 
-const { Sequelize, Op } = require('sequelize');
+const { Sequelize, Utils: { SequelizeMethod }, Op } = require('sequelize');
+const get = require('lodash/get');
 const has = require('lodash/has');
 const inRange = require('lodash/inRange');
 const last = require('lodash/last');
+const mapValues = require('lodash/mapValues');
 
 // eslint-disable-next-line no-extra-parens
 const AsyncFunction = (async function () {}).constructor;
@@ -11,23 +13,42 @@ const AsyncFunction = (async function () {}).constructor;
 const isAsyncFunction = arg => arg instanceof AsyncFunction;
 const notEmpty = input => input.length > 0;
 
-const sql = {
-  concat,
-  where
-};
-
 module.exports = {
-  sql,
+  sql: { concat, where },
   getValidator,
   setLogging,
-  wrapAsyncMethods
+  wrapAsyncMethods,
+  parsePath,
+  build: Model => ({
+    column: (col, model) => dbColumn(col, model || Model),
+    ...mapValues(sqlFunctions, it => buildSqlFunc(it, Model))
+  })
 };
 
-function wrapAsyncMethods(Model, wrapper = require('bluebird').method) {
-  const transformer = ({ value }) => isAsyncFunction(value) && wrapper(value);
-  transformProperties(Model, transformer);
-  transformProperties(Model.prototype, transformer);
-  return Model;
+const dbColumn = (col, Model) => {
+  if (col instanceof SequelizeMethod) return col;
+  const name = get(Model, `rawAttributes.${col}.field`, col);
+  return Sequelize.col(name);
+};
+
+function parsePath(path, Model) {
+  if (!path.includes('.')) return [dbColumn(path, Model)];
+  const [alias, ...columns] = path.split('.');
+  const { target: model } = Model.associations[alias];
+  return [{ model, as: alias }, ...parsePath(columns.join('.'), model)];
+}
+
+const sqlFunctions = {
+  min: 'MIN',
+  max: 'MAX',
+  average: 'AVG',
+  count: 'COUNT',
+  distinct: 'DISTINCT',
+  sum: 'SUM'
+};
+
+function buildSqlFunc(name, Model) {
+  return (col, model) => Sequelize.fn(name, dbColumn(col, model || Model));
 }
 
 function getValidator(Model, attribute) {
@@ -68,3 +89,10 @@ function transformProperties(obj, cb) {
     if (val) obj[name] = val;
   });
 }
+
+function wrapAsyncMethods(Model, wrapper = require('bluebird').method) {
+  const transformer = ({ value }) => isAsyncFunction(value) && wrapper(value);
+  transformProperties(Model, transformer);
+  transformProperties(Model.prototype, transformer);
+  return Model;
+}
diff --git a/server/shared/database/pagination.js b/server/shared/database/pagination.js
new file mode 100644
index 000000000..95faf77e8
--- /dev/null
+++ b/server/shared/database/pagination.js
@@ -0,0 +1,27 @@
+'use strict';
+
+const { parsePath } = require('./helpers');
+const pick = require('lodash/pick');
+
+const parseOptions = ({ limit, offset, sortOrder }) => ({
+  limit: parseInt(limit, 10) || 100,
+  offset: parseInt(offset, 10) || 0,
+  sortOrder: sortOrder || 'ASC'
+});
+
+function processPagination(Model) {
+  return (req, _, next) => {
+    const options = parseOptions(req.query);
+    Object.assign(req.query, options);
+    req.options = pick(options, ['limit', 'offset']);
+    const { sortBy } = req.query;
+    if (sortBy) {
+      req.options.order = [[...parsePath(sortBy, Model), options.sortOrder]];
+    }
+    next();
+  };
+}
+
+module.exports = {
+  processPagination
+};

From 8db3f61452a8ad21db5bdf5ac5a329d809ffff1b Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Wed, 12 Jun 2019 08:18:00 +0200
Subject: [PATCH 065/213] Updated user api

- Support filtering and pagination
- Renamed api interface
---
 client/api/system.js               | 23 -----------------------
 client/api/user.js                 | 21 +++++++++++++++++++++
 config/shared/role.js              |  2 +-
 server/course/course.controller.js |  3 +--
 server/user/index.js               |  9 ++++++---
 server/user/user.controller.js     | 29 ++++++++++++++++++-----------
 6 files changed, 47 insertions(+), 40 deletions(-)
 delete mode 100644 client/api/system.js
 create mode 100644 client/api/user.js

diff --git a/client/api/system.js b/client/api/system.js
deleted file mode 100644
index 1e0d689f4..000000000
--- a/client/api/system.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import request from './request';
-
-const extractData = res => res.data.data;
-
-function getUsers() {
-  const options = { params: { roleType: 'user' } };
-  return request.get('/users', options).then(extractData);
-}
-
-function upsertUser(email, data) {
-  const body = { email, ...data };
-  return request.post('/users', body).then(extractData);
-}
-
-function removeUser(id) {
-  return request.delete(`/users/${id}`);
-}
-
-export default {
-  getUsers,
-  upsertUser,
-  removeUser
-};
diff --git a/client/api/user.js b/client/api/user.js
new file mode 100644
index 000000000..7362d8987
--- /dev/null
+++ b/client/api/user.js
@@ -0,0 +1,21 @@
+import request from './request';
+
+const extractData = res => res.data.data;
+
+function fetch(params) {
+  return request.get('/users', { params }).then(extractData);
+}
+
+function upsert(data) {
+  return request.post('/users', data).then(extractData);
+}
+
+function remove({ id }) {
+  return request.delete(`/users/${id}`);
+}
+
+export default {
+  fetch,
+  upsert,
+  remove
+};
diff --git a/config/shared/role.js b/config/shared/role.js
index eae73bb18..c7d5394ef 100644
--- a/config/shared/role.js
+++ b/config/shared/role.js
@@ -14,5 +14,5 @@ module.exports = {
   ...role,
   userRoleRegex,
   courseRoleRegex,
-  getRoleNames: type => values(role[type] || {})
+  getRoleValues: type => values(role[type] || {})
 };
diff --git a/server/course/course.controller.js b/server/course/course.controller.js
index 3bd47df8b..a7ab0d6a0 100644
--- a/server/course/course.controller.js
+++ b/server/course/course.controller.js
@@ -64,8 +64,7 @@ function getUsers(req, res) {
 
 function upsertUser({ course, body }, res) {
   const { email, role } = body;
-  return User.findOne({ where: { email } })
-    .then(user => user || User.invite({ email }))
+  return User.findOrInvite({ email, role })
     .then(user => findOrCreateRole(course, user, role))
     .then(user => Object.assign({}, user.profile, { courseRole: role }))
     .then(user => res.json({ data: { user } }));
diff --git a/server/user/index.js b/server/user/index.js
index c70db81b9..155c9487b 100644
--- a/server/user/index.js
+++ b/server/user/index.js
@@ -3,7 +3,9 @@
 const auth = require('passport').authenticate('jwt');
 const ctrl = require('./user.controller');
 const model = require('./user.model');
+const { processPagination } = require('../shared/database/pagination');
 const router = require('express').Router();
+const { User } = require('../shared/database');
 
 router
   // Public routes:
@@ -11,9 +13,10 @@ router
   .post('/users/forgotPassword', ctrl.forgotPassword)
   .post('/users/resetPassword', ctrl.resetPassword)
   // Protected routes:
-  .get('/users', auth, ctrl.index)
-  .post('/users', auth, ctrl.upsert)
-  .delete('/users/:id', auth, ctrl.remove);
+  .use('/users*', auth)
+  .get('/users', processPagination(User), ctrl.list)
+  .post('/users', ctrl.upsert)
+  .delete('/users/:id', ctrl.remove);
 
 module.exports = {
   model,
diff --git a/server/user/user.controller.js b/server/user/user.controller.js
index cb86366fa..95cff0fde 100644
--- a/server/user/user.controller.js
+++ b/server/user/user.controller.js
@@ -2,21 +2,28 @@
 
 const { createError, validationError } = require('../shared/error/helpers');
 const { NO_CONTENT, NOT_FOUND } = require('http-status-codes');
-const { role } = require('../../config/shared');
+const map = require('lodash/map');
+const { Op } = require('sequelize');
+const { role: { user: userRole } } = require('../../config/shared');
 const { User } = require('../shared/database');
 
-function index({ query: { roleType } }, res) {
-  const options = { attributes: ['id', 'email', 'role'] };
-  return User.scope({ method: ['withRoleType', roleType] })
-    .findAll(options)
-    .filter(user => user.role !== role.user.INTEGRATION)
-    .then(data => res.json({ data }));
+// TODO: Add fistName, lastName after profile merge
+const createFilter = q => map(['email'],
+  it => ({ [it]: { [Op.iLike]: `%${q}%` } }));
+
+function list({ query: { email, role, filter, archived }, options }, res) {
+  const where = { [Op.and]: [{ role: { [Op.ne]: userRole.INTEGRATION } }] };
+  if (filter) where[Op.or] = createFilter(filter);
+  if (email) where[Op.and].push({ email });
+  if (role) where[Op.and].push({ role });
+  return User.findAndCountAll({ where, ...options, paranoid: !archived })
+    .then(({ rows, count }) => {
+      return res.json({ data: { items: map(rows, 'profile'), total: count } });
+    });
 }
 
 function upsert({ body: { email, role } }, res) {
-  const data = { deletedAt: null, role, email };
-  return User.findOne({ where: { email }, paranoid: false })
-    .then(user => user ? user.update(data) : User.invite(data))
+  return User.findOrInvite({ email, role })
     .then(data => res.json({ data }));
 }
 
@@ -59,7 +66,7 @@ function login({ body }, res) {
 }
 
 module.exports = {
-  index,
+  list,
   upsert,
   remove,
   forgotPassword,

From fb1afd22fef43eea05852345dd393f192e36db4c Mon Sep 17 00:00:00 2001
From: Vedran Karacic <karacicvedran@gmail.com>
Date: Wed, 12 Jun 2019 12:39:22 +0200
Subject: [PATCH 066/213] Fix company name in the footer

---
 client/components/course/Settings/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/components/course/Settings/index.vue b/client/components/course/Settings/index.vue
index ef14479ac..a6e002d12 100644
--- a/client/components/course/Settings/index.vue
+++ b/client/components/course/Settings/index.vue
@@ -28,7 +28,7 @@
             v3.1 Silk
           </v-chip>
           Built with <v-icon color="pink">mdi-heart</v-icon>
-          ExtnsnEngine
+          Extension Engine
         </v-flex>
       </v-layout>
     </v-footer>

From 5db95d06f491b1abdf0f5a0dea9c25fbf801cb6d Mon Sep 17 00:00:00 2001
From: snyk-test <snyk-test@snyk.io>
Date: Thu, 13 Jun 2019 04:49:32 +0000
Subject: [PATCH 067/213] fix: package.json & package-lock.json to reduce
 vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-SEQUELIZECLI-174320
---
 package-lock.json | 202 +++++++++++++++++++++++++++-------------------
 package.json      |   2 +-
 2 files changed, 121 insertions(+), 83 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index cc85f3069..f95cf134c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1955,12 +1955,6 @@
         "csstype": "^2.2.0"
       }
     },
-    "@types/semver": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-5.5.0.tgz",
-      "integrity": "sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ==",
-      "dev": true
-    },
     "@types/unist": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz",
@@ -5830,35 +5824,31 @@
       }
     },
     "editorconfig": {
-      "version": "0.15.2",
-      "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.2.tgz",
-      "integrity": "sha512-GWjSI19PVJAM9IZRGOS+YKI8LN+/sjkSjNyvxL5ucqP9/IqtYNXBaQ/6c/hkPNYQHyOHra2KoXZI/JVpuqwmcQ==",
+      "version": "0.15.3",
+      "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz",
+      "integrity": "sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==",
       "dev": true,
       "requires": {
-        "@types/node": "^10.11.7",
-        "@types/semver": "^5.5.0",
         "commander": "^2.19.0",
-        "lru-cache": "^4.1.3",
+        "lru-cache": "^4.1.5",
         "semver": "^5.6.0",
         "sigmund": "^1.0.1"
       },
       "dependencies": {
-        "@types/node": {
-          "version": "10.12.29",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.29.tgz",
-          "integrity": "sha512-J/tnbnj8HcsBgCe2apZbdUpQ7hs4d7oZNTYA5bekWdP0sr2NGsOpI/HRdDroEi209tEvTcTtxhD0FfED3DhEcw==",
-          "dev": true
-        },
-        "commander": {
-          "version": "2.19.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz",
-          "integrity": "sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==",
-          "dev": true
+        "lru-cache": {
+          "version": "4.1.5",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+          "dev": true,
+          "requires": {
+            "pseudomap": "^1.0.2",
+            "yallist": "^2.1.2"
+          }
         },
         "semver": {
-          "version": "5.6.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
-          "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
+          "version": "5.7.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
           "dev": true
         }
       }
@@ -6012,14 +6002,14 @@
       }
     },
     "es5-ext": {
-      "version": "0.10.48",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.48.tgz",
-      "integrity": "sha512-CdRvPlX/24Mj5L4NVxTs4804sxiS2CjVprgCmrgoDkdmjdY4D+ySHa7K3jJf8R40dFg0tIm3z/dk326LrnuSGw==",
+      "version": "0.10.50",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.50.tgz",
+      "integrity": "sha512-KMzZTPBkeQV/JcSQhI5/z6d9VWJ3EnQ194USTUwIYZ2ZbpN8+SGXQKt1h68EX44+qt+Fzr8DO17vnxrw7c3agw==",
       "dev": true,
       "requires": {
         "es6-iterator": "~2.0.3",
         "es6-symbol": "~3.1.1",
-        "next-tick": "1"
+        "next-tick": "^1.0.0"
       }
     },
     "es5-shim": {
@@ -6069,14 +6059,14 @@
       }
     },
     "es6-weak-map": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz",
-      "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
+      "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
       "dev": true,
       "requires": {
         "d": "1",
-        "es5-ext": "^0.10.14",
-        "es6-iterator": "^2.0.1",
+        "es5-ext": "^0.10.46",
+        "es6-iterator": "^2.0.3",
         "es6-symbol": "^3.1.1"
       }
     },
@@ -9393,22 +9383,22 @@
       "dev": true
     },
     "js-beautify": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.9.0.tgz",
-      "integrity": "sha512-P0skmY4IDjfLiVrx+GLDeme8w5G0R1IGXgccVU5HP2VM3lRblH7qN2LTea5vZAxrDjpZBD0Jv+ahpjwVcbz/rw==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.10.0.tgz",
+      "integrity": "sha512-OMwf/tPDpE/BLlYKqZOhqWsd3/z2N3KOlyn1wsCRGFwViE8LOQTcDtathQvHvZc+q+zWmcNAbwKSC+iJoMaH2Q==",
       "dev": true,
       "requires": {
         "config-chain": "^1.1.12",
-        "editorconfig": "^0.15.2",
+        "editorconfig": "^0.15.3",
         "glob": "^7.1.3",
-        "mkdirp": "~0.5.0",
+        "mkdirp": "~0.5.1",
         "nopt": "~4.0.1"
       },
       "dependencies": {
         "glob": {
-          "version": "7.1.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-          "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
+          "version": "7.1.4",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
+          "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
           "dev": true,
           "requires": {
             "fs.realpath": "^1.0.0",
@@ -14649,9 +14639,9 @@
       }
     },
     "sequelize-cli": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/sequelize-cli/-/sequelize-cli-5.4.0.tgz",
-      "integrity": "sha512-4Gvl0yH0T3hhSdiiOci3+IKIfVG9x2os0hGWsbfa8QuyGgk9mZOqgTBnSCRtuxsdAyzUix9kfcTnfNolVNtprg==",
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/sequelize-cli/-/sequelize-cli-5.5.0.tgz",
+      "integrity": "sha512-twVQ02alCpr2XvxNmpi32C48WZs6xHTH1OFTfTS5Meg3BVqOM8ghiZoml4FITFjlD8sAJSQjlAHTwqTbuolA6Q==",
       "dev": true,
       "requires": {
         "bluebird": "^3.5.3",
@@ -14661,30 +14651,30 @@
         "lodash": "^4.17.5",
         "resolve": "^1.5.0",
         "umzug": "^2.1.0",
-        "yargs": "^12.0.5"
+        "yargs": "^13.1.0"
       },
       "dependencies": {
-        "bluebird": {
-          "version": "3.5.3",
-          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.3.tgz",
-          "integrity": "sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==",
+        "ansi-regex": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
           "dev": true
         },
         "camelcase": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz",
-          "integrity": "sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==",
+          "version": "5.3.1",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
           "dev": true
         },
         "cliui": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
-          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
           "dev": true,
           "requires": {
-            "string-width": "^2.1.1",
-            "strip-ansi": "^4.0.0",
-            "wrap-ansi": "^2.0.0"
+            "string-width": "^3.1.0",
+            "strip-ansi": "^5.2.0",
+            "wrap-ansi": "^5.1.0"
           }
         },
         "cross-spawn": {
@@ -14724,6 +14714,12 @@
             "locate-path": "^3.0.0"
           }
         },
+        "get-caller-file": {
+          "version": "2.0.5",
+          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+          "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+          "dev": true
+        },
         "get-stream": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
@@ -14770,9 +14766,9 @@
           }
         },
         "p-limit": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.1.0.tgz",
-          "integrity": "sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==",
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
+          "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
           "dev": true,
           "requires": {
             "p-try": "^2.0.0"
@@ -14788,47 +14784,89 @@
           }
         },
         "p-try": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+          "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+          "dev": true
+        },
+        "require-main-filename": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz",
-          "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==",
+          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+          "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
           "dev": true
         },
         "semver": {
-          "version": "5.6.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
-          "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==",
+          "version": "5.7.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+          "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
           "dev": true
         },
+        "string-width": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+          "dev": true,
+          "requires": {
+            "emoji-regex": "^7.0.1",
+            "is-fullwidth-code-point": "^2.0.0",
+            "strip-ansi": "^5.1.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^4.1.0"
+          }
+        },
         "which-module": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
           "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
           "dev": true
         },
+        "wrap-ansi": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+          "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.0",
+            "string-width": "^3.0.0",
+            "strip-ansi": "^5.0.0"
+          }
+        },
+        "y18n": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+          "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+          "dev": true
+        },
         "yargs": {
-          "version": "12.0.5",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
-          "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
+          "version": "13.2.4",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz",
+          "integrity": "sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==",
           "dev": true,
           "requires": {
-            "cliui": "^4.0.0",
-            "decamelize": "^1.2.0",
+            "cliui": "^5.0.0",
             "find-up": "^3.0.0",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^3.0.0",
+            "get-caller-file": "^2.0.1",
+            "os-locale": "^3.1.0",
             "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
+            "require-main-filename": "^2.0.0",
             "set-blocking": "^2.0.0",
-            "string-width": "^2.0.0",
+            "string-width": "^3.0.0",
             "which-module": "^2.0.0",
-            "y18n": "^3.2.1 || ^4.0.0",
-            "yargs-parser": "^11.1.1"
+            "y18n": "^4.0.0",
+            "yargs-parser": "^13.1.0"
           }
         },
         "yargs-parser": {
-          "version": "11.1.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
-          "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
+          "version": "13.1.1",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
+          "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
           "dev": true,
           "requires": {
             "camelcase": "^5.0.0",
diff --git a/package.json b/package.json
index b5724113f..b9623cf57 100644
--- a/package.json
+++ b/package.json
@@ -164,7 +164,7 @@
     "poi-preset-bundle-report": "^2.0.2",
     "poi-preset-eslint": "^9.0.1",
     "sass-loader": "^7.1.0",
-    "sequelize-cli": "^5.4.0",
+    "sequelize-cli": "^5.5.0",
     "strip-json-comments": "^2.0.1",
     "stylelint": "^10.0.1",
     "stylelint-config-standard": "^18.3.0",

From d71ec988fbb82afa5a65251ff5883470aa4a3e6b Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Thu, 13 Jun 2019 18:23:34 +0200
Subject: [PATCH 068/213] Created date format filter

---
 client/main.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/main.js b/client/main.js
index efe594761..9d9046891 100644
--- a/client/main.js
+++ b/client/main.js
@@ -9,6 +9,7 @@ import 'vue-directive-tooltip/css/index.css';
 import assetsApi from '@/api/asset';
 import colors from 'vuetify/es5/util/colors';
 import ElementRegistry from './ElementRegistry';
+import fecha from 'fecha';
 import FileFilter from '@/directives/file-filter';
 import QuestionContainer from 'tce-core/QuestionContainer';
 import { sync } from 'vuex-router-sync';
@@ -25,7 +26,9 @@ import router from './router';
 import App from './App';
 
 Vue.component('tce-question-container', QuestionContainer);
-
+Vue.filter('formatDate', (value, dateFormat = 'MM/DD/YY HH:mm') => {
+  return value && fecha.format(new Date(value), dateFormat);
+});
 Vue.use(FileFilter);
 Vue.use(VueHotkey);
 Vue.use(Vuetify, {

From 98f2120617f2303feedd32166b5d6a6ca75d9bc8 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Thu, 13 Jun 2019 18:24:02 +0200
Subject: [PATCH 069/213] Update routes :wrench:

---
 client/router.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/client/router.js b/client/router.js
index b774e2d85..ecfb4c181 100644
--- a/client/router.js
+++ b/client/router.js
@@ -9,15 +9,15 @@ import Catalog from './components/catalog/Container';
 import Course from './components/course';
 import CourseRevisions from './components/course/Revisions';
 import CourseSettings from './components/course/Settings';
-import CourseUserManagement from './components/course/Settings/CourseUserManagement';
+import RepoUserManagement from './components/course/Settings/UserManagement';
 import Editor from './components/editor';
 import ForgotPassword from './components/auth/ForgotPassword';
 import General from './components/course/Settings/General';
+import InstalledElements from './components/system-settings/ContentElements';
+import InstalledSchemas from './components/system-settings/StructureTypes';
 import Login from './components/auth/Login';
 import Outline from './components/course/Outline';
 import ResetPassword from './components/auth/ResetPassword';
-import SystemContentElementsList from './components/system-settings/ContentElements';
-import SystemStructureTypesList from './components/system-settings/StructureTypes';
 import SystemSettings from './components/system-settings';
 import SystemUserManagement from './components/system-settings/UserManagement';
 import TreeView from './components/course/TreeView';
@@ -50,7 +50,7 @@ let router = new Router({
         path: 'users',
         name: 'user-management',
         props: numericParser,
-        component: CourseUserManagement
+        component: RepoUserManagement
       }]
     }, {
       path: 'revisions',
@@ -79,13 +79,13 @@ let router = new Router({
       name: 'system-user-management',
       component: SystemUserManagement
     }, {
-      path: 'structure-types',
-      name: 'system-structure-types',
-      component: SystemStructureTypesList
+      path: 'installed-schemas',
+      name: 'installed-schemas',
+      component: InstalledSchemas
     }, {
-      path: 'content-elements',
-      name: 'system-content-elements',
-      component: SystemContentElementsList
+      path: 'installed-elements',
+      name: 'installed-elements',
+      component: InstalledElements
     }, {
       path: '*',
       redirect: { name: 'system-management' }

From 19b1f81c86bcaff5e74d777849f9bf2e1601d3c1 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Thu, 13 Jun 2019 20:21:18 +0200
Subject: [PATCH 070/213] Added user dialog

---
 client/components/system-settings/Sidebar.vue |   4 +-
 .../system-settings/UserManagement.vue        |  56 --------
 .../UserManagement/UserDialog.vue             | 127 ++++++++++++++++++
 package-lock.json                             |  23 ++++
 package.json                                  |   1 +
 server/teaching-element/te.controller.js      |   3 +-
 6 files changed, 154 insertions(+), 60 deletions(-)
 delete mode 100644 client/components/system-settings/UserManagement.vue
 create mode 100644 client/components/system-settings/UserManagement/UserDialog.vue

diff --git a/client/components/system-settings/Sidebar.vue b/client/components/system-settings/Sidebar.vue
index c2fceb45b..96cd88c67 100644
--- a/client/components/system-settings/Sidebar.vue
+++ b/client/components/system-settings/Sidebar.vue
@@ -23,8 +23,8 @@ export default {
     routes() {
       return [
         { label: 'System Users', name: 'system-user-management', icon: 'mdi-account' },
-        { label: 'Structure Types', name: 'system-structure-types', icon: 'mdi-file-tree' },
-        { label: 'Content Elements', name: 'system-content-elements', icon: 'mdi-puzzle' }
+        { label: 'Structure Types', name: 'installed-schemas', icon: 'mdi-file-tree' },
+        { label: 'Content Elements', name: 'installed-elements', icon: 'mdi-puzzle' }
       ];
     }
   }
diff --git a/client/components/system-settings/UserManagement.vue b/client/components/system-settings/UserManagement.vue
deleted file mode 100644
index 3be8d6f23..000000000
--- a/client/components/system-settings/UserManagement.vue
+++ /dev/null
@@ -1,56 +0,0 @@
-<template>
-  <user-management
-    :users="users"
-    :roles="roles"
-    :isRequesting="isRequesting"
-    @upsert="upsert"
-    @remove="remove"/>
-</template>
-
-<script>
-import api from '@/api/system';
-import map from 'lodash/map';
-import omit from 'lodash/omit';
-import { role } from 'shared';
-import { title as titleCase } from 'to-case';
-import UserManagement from 'components/common/UserManagement';
-
-export default {
-  data() {
-    return {
-      isRequesting: true,
-      users: []
-    };
-  },
-  computed: {
-    roles() {
-      const { user: roles } = role;
-      const userRoles = omit(roles, role.user.INTEGRATION);
-      return map(userRoles, value => ({ text: titleCase(value), value }));
-    }
-  },
-  methods: {
-    upsert(email, role) {
-      this.isRequesting = true;
-      api.upsertUser(email, { role }).then(userData => {
-        this.isRequesting = false;
-        const user = this.users.find(it => it.id === userData.id);
-        return user ? Object.assign(user, userData) : this.users.unshift(userData);
-      });
-    },
-    remove({ id }) {
-      this.isRequesting = true;
-      api.removeUser(id).then(() => {
-        this.isRequesting = false;
-        this.users = this.users.filter(user => user.id !== id);
-      });
-    }
-  },
-  created() {
-    api.getUsers().then(users => Object.assign(this, { users, isRequesting: false }));
-  },
-  components: {
-    UserManagement
-  }
-};
-</script>
diff --git a/client/components/system-settings/UserManagement/UserDialog.vue b/client/components/system-settings/UserManagement/UserDialog.vue
new file mode 100644
index 000000000..4e6656214
--- /dev/null
+++ b/client/components/system-settings/UserManagement/UserDialog.vue
@@ -0,0 +1,127 @@
+<template>
+  <v-dialog v-hotkey="{ esc: close }" v-model="show" width="700">
+    <v-form @submit.prevent="save">
+      <v-card class="pa-3">
+        <v-card-title class="headline pr-0">
+          <span>{{ userData ? 'Edit' : 'Create' }} User</span>
+          <v-spacer/>
+          <v-btn
+            v-if="!isNewUser"
+            :disabled="isLoading"
+            :loading="isLoading"
+            @click="invite"
+            color="blue-grey"
+            outline>
+            Reinvite
+          </v-btn>
+        </v-card-title>
+        <v-card-text>
+          <v-text-field
+            v-validate="{ required: true, email: true, 'unique-email': userData }"
+            v-model="user.email"
+            :error-messages="vErrors.collect('email')"
+            label="E-mail"
+            data-vv-name="email"
+            class="mb-3"/>
+          <v-select
+            v-validate="'required'"
+            v-model="user.role"
+            :items="roles"
+            :error-messages="vErrors.collect('role')"
+            label="Role"
+            data-vv-name="role"
+            class="mb-3"/>
+        </v-card-text>
+        <v-card-actions>
+          <v-spacer/>
+          <v-btn @click="close">Cancel</v-btn>
+          <v-btn color="primary" type="submit">Save</v-btn>
+        </v-card-actions>
+      </v-card>
+    </v-form>
+  </v-dialog>
+</template>
+
+<script>
+import api from '@/api/user';
+import cloneDeep from 'lodash/cloneDeep';
+import humanize from 'humanize-string';
+import isEmpty from 'lodash/isEmpty';
+import map from 'lodash/map';
+import { role } from 'shared';
+import { withValidation } from 'utils/validation';
+
+const resetUser = () => {
+  return {
+    email: '',
+    role: null
+  };
+};
+
+export default {
+  name: 'user-dialog',
+  mixins: [withValidation()],
+  props: {
+    visible: { type: Boolean, default: false },
+    userData: { type: Object, default: () => ({}) }
+  },
+  data() {
+    return {
+      user: resetUser(),
+      isLoading: false
+    };
+  },
+  computed: {
+    show: {
+      get() {
+        return this.visible;
+      },
+      set(value) {
+        if (!value) this.close();
+      }
+    },
+    roles() {
+      return map(role.getRoleValues('user'), it => ({ text: humanize(it), value: it }));
+    },
+    isNewUser() {
+      return !this.user.id;
+    }
+  },
+  methods: {
+    close() {
+      this.user = resetUser();
+      this.$emit('update:visible', false);
+    },
+    save() {
+      this.$validator.validateAll().then(isValid => {
+        if (!isValid) return;
+        const action = this.isNewUser ? 'create' : 'update';
+        api.upsert(this.user).then(() => this.$emit(`${action}d`));
+        this.close();
+      });
+    },
+    invite() {
+      this.isLoading = true;
+      api.invite(this.user).finally(() => (this.isLoading = false));
+    }
+  },
+  watch: {
+    show(val) {
+      if (!val) return;
+      this.vErrors.clear();
+      if (!isEmpty(this.userData)) this.user = cloneDeep(this.userData);
+    }
+  },
+  mounted() {
+    if (this.$validator.rules['unique-email']) return;
+    this.$validator.extend('unique-email', {
+      getMessage: field => `The ${field} is not unique.`,
+      validate: (email, userData) => {
+        if (userData && email === userData.email) return true;
+        return api.fetch({ email })
+          .then(({ total }) => ({ valid: !total }));
+      }
+    });
+  }
+};
+</script>
diff --git a/package-lock.json b/package-lock.json
index 4ce229fc1..a65af7774 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8593,6 +8593,29 @@
         }
       }
     },
+    "humanize-string": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/humanize-string/-/humanize-string-2.1.0.tgz",
+      "integrity": "sha512-sQ+hqmxyXW8Cj7iqxcQxD7oSy3+AXnIZXdUF9lQMkzaG8dtbKAB8U7lCtViMnwQ+MpdCKsO2Kiij3G6UUXq/Xg==",
+      "requires": {
+        "decamelize": "^2.0.0"
+      },
+      "dependencies": {
+        "decamelize": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz",
+          "integrity": "sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==",
+          "requires": {
+            "xregexp": "4.0.0"
+          }
+        },
+        "xregexp": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz",
+          "integrity": "sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg=="
+        }
+      }
+    },
     "iconv-lite": {
       "version": "0.4.23",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
diff --git a/package.json b/package.json
index 93aa1218b..83e7bfea6 100644
--- a/package.json
+++ b/package.json
@@ -75,6 +75,7 @@
     "hls.js": "^0.10.1",
     "http-errors": "^1.5.1",
     "http-status-codes": "^1.1.6",
+    "humanize-string": "^2.1.0",
     "is-iexplorer": "^1.0.0",
     "is-localhost": "0.0.2",
     "is-safari": "^1.0.0",
diff --git a/server/teaching-element/te.controller.js b/server/teaching-element/te.controller.js
index 689c6e257..fc419151e 100644
--- a/server/teaching-element/te.controller.js
+++ b/server/teaching-element/te.controller.js
@@ -1,13 +1,12 @@
 'use strict';
 
-const { Activity, TeachingElement, Sequelize } = require('../shared/database');
+const { Activity, TeachingElement } = require('../shared/database');
 const { createError } = require('../shared/error/helpers');
 const { NOT_FOUND } = require('http-status-codes');
 const { Op } = require('sequelize');
 const { resolveStatics } = require('../shared/storage/helpers');
 const pick = require('lodash/pick');
 
-
 function list({ course, query, opts }, res) {
   if (query.activityId || query.parentId) {
     const { activityId, parentId } = query;

From 11604dbe8a817b0fbcaaffb403e3be925b664152 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Thu, 13 Jun 2019 21:17:25 +0200
Subject: [PATCH 071/213] Basic system level user list

---
 .../system-settings/UserManagement/index.vue  | 179 ++++++++++++++++++
 1 file changed, 179 insertions(+)
 create mode 100644 client/components/system-settings/UserManagement/index.vue

diff --git a/client/components/system-settings/UserManagement/index.vue b/client/components/system-settings/UserManagement/index.vue
new file mode 100644
index 000000000..89d8308c6
--- /dev/null
+++ b/client/components/system-settings/UserManagement/index.vue
@@ -0,0 +1,179 @@
+<template>
+  <v-layout justify-center class="elevation-1 white">
+    <v-flex class="mt-1">
+      <v-toolbar color="white" flat>
+        <v-spacer/>
+        <v-btn @click.stop="showUserDialog()" color="primary" outline>
+          Add user
+        </v-btn>
+      </v-toolbar>
+      <div>
+        <v-layout column align-end class="px-4 table-toolbar">
+          <v-flex lg4>
+            <v-text-field
+              v-model="filter"
+              append-icon="mdi-magnify"
+              label="Search"
+              single-line
+              hide-details
+              clearable/>
+          </v-flex>
+          <v-flex lg4 class="my-1">
+            <v-checkbox
+              v-model="showArchived"
+              label="Show archived"
+              class="archived-checkbox"
+              hide-details/>
+          </v-flex>
+        </v-layout>
+        <v-data-table
+          :headers="headers"
+          :items="users"
+          :total-items="totalItems"
+          :pagination.sync="dataTable"
+          :must-sort="true">
+          <template slot="items" slot-scope="{ item }">
+            <tr :key="item.id">
+              <td class="no-wrap text-xs-left">{{ item.email }}</td>
+              <td class="no-wrap text-xs-left">{{ item.role }}</td>
+              <td class="no-wrap text-xs-left">{{ item.createdAt | formatDate }}</td>
+              <td class="no-wrap text-xs-center">
+                <v-btn
+                  @click="showUserDialog(item)"
+                  color="primary"
+                  small
+                  flat
+                  icon>
+                  <v-icon>mdi-pencil</v-icon>
+                </v-btn>
+                <v-btn
+                  :disabled="user.id === item.id"
+                  @click="archiveOrRestore(item)"
+                  color="primary"
+                  small
+                  flat
+                  icon>
+                  <v-icon>
+                    mdi-account-{{ item.deletedAt ? 'convert' : 'off' }}
+                  </v-icon>
+                </v-btn>
+              </td>
+            </tr>
+          </template>
+        </v-data-table>
+      </div>
+      <user-dialog
+        :visible.sync="userDialog"
+        :userData="editedUser"
+        @updated="fetch(defaultPage)"
+        @created="fetch(defaultPage)"/>
+    </v-flex>
+  </v-layout>
+</template>
+
+<script>
+import api from '@/api/user';
+import EventBus from 'EventBus';
+import humanize from 'humanize-string';
+import { mapGetters } from 'vuex-module';
+import throttle from 'lodash/throttle';
+import UserDialog from './UserDialog';
+
+const appChannel = EventBus.channel('app');
+
+const defaultPage = () => ({ sortBy: 'updatedAt', descending: true, page: 1 });
+const headers = () => [
+  { text: 'Email', value: 'email' },
+  { text: 'Role', value: 'role' },
+  { text: 'Date Created', value: 'createdAt' },
+  { text: 'Actions', value: 'email', align: 'center', sortable: false }
+];
+const actions = {
+  archive: user => api.remove(user),
+  restore: user => api.upsert(user)
+};
+
+export default {
+  name: 'user-list',
+  data() {
+    return {
+      users: [],
+      filter: null,
+      dataTable: defaultPage(),
+      totalItems: 0,
+      userDialog: false,
+      editedUser: null,
+      showArchived: false,
+      confirmation: null
+    };
+  },
+  computed: {
+    ...mapGetters(['user']),
+    headers,
+    defaultPage
+  },
+  methods: {
+    showUserDialog(user = null) {
+      this.editedUser = user;
+      this.userDialog = true;
+    },
+    fetch: throttle(async function (opts) {
+      Object.assign(this.dataTable, opts);
+      const { items, total } = await api.fetch({
+        sortBy: this.dataTable.sortBy,
+        sortOrder: this.dataTable.descending ? 'DESC' : 'ASC',
+        offset: (this.dataTable.page - 1) * this.dataTable.rowsPerPage,
+        limit: this.dataTable.rowsPerPage,
+        filter: this.filter,
+        archived: this.showArchived || undefined
+      });
+      this.users = items;
+      this.totalItems = total;
+    }, 400),
+    archiveOrRestore(user) {
+      const action = user.deletedAt ? 'restore' : 'archive';
+      this.confirmation = {
+        title: `${humanize(action)} user`,
+        message: `Are you sure you want to ${action} user "${user.email}"?`,
+        action: () => actions[action](user).then(() => this.fetch())
+      };
+      appChannel.emit('showConfirmationModal', this.confirmation);
+    }
+  },
+  watch: {
+    dataTable() {
+      this.fetch();
+    },
+    filter() {
+      this.fetch();
+    },
+    showArchived() {
+      this.fetch();
+    }
+  },
+  components: { UserDialog }
+};
+</script>
+
+<style lang="scss" scoped>
+.user-table /deep/ .v-input--checkbox {
+  justify-content: center;
+}
+
+.archived-checkbox /deep/ .v-input__slot {
+  flex-direction: row-reverse;
+
+  .v-input--selection-controls__input {
+    justify-content: center;
+    margin-right: 0;
+  }
+
+  .v-icon {
+    font-size: 18px;
+  }
+
+  label {
+    font-size: 14px;
+  }
+}
+</style>

From c69927381767591be0b27ab78b346ce8d16c5c16 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Fri, 14 Jun 2019 06:39:38 +0200
Subject: [PATCH 072/213] Cleanup :lipstick:

---
 server/course/course.controller.js |  2 +-
 server/user/user.controller.js     |  2 +-
 server/user/user.model.js          | 10 ++++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/server/course/course.controller.js b/server/course/course.controller.js
index a7ab0d6a0..c62f3efdc 100644
--- a/server/course/course.controller.js
+++ b/server/course/course.controller.js
@@ -64,7 +64,7 @@ function getUsers(req, res) {
 
 function upsertUser({ course, body }, res) {
   const { email, role } = body;
-  return User.findOrInvite({ email, role })
+  return User.inviteOrUpdate({ email })
     .then(user => findOrCreateRole(course, user, role))
     .then(user => Object.assign({}, user.profile, { courseRole: role }))
     .then(user => res.json({ data: { user } }));
diff --git a/server/user/user.controller.js b/server/user/user.controller.js
index 95cff0fde..ffb56b712 100644
--- a/server/user/user.controller.js
+++ b/server/user/user.controller.js
@@ -23,7 +23,7 @@ function list({ query: { email, role, filter, archived }, options }, res) {
 }
 
 function upsert({ body: { email, role } }, res) {
-  return User.findOrInvite({ email, role })
+  return User.inviteOrUpdate({ email, role })
     .then(data => res.json({ data }));
 }
 
diff --git a/server/user/user.model.js b/server/user/user.model.js
index a0145f63a..df518aaae 100644
--- a/server/user/user.model.js
+++ b/server/user/user.model.js
@@ -4,6 +4,7 @@ const { Model, Op } = require('sequelize');
 const config = require('../../config/server');
 const jwt = require('jsonwebtoken');
 const mail = require('../shared/mail');
+const map = require('lodash/map');
 const pick = require('lodash/pick');
 const Promise = require('bluebird');
 const { role: roles } = require('../../config/shared');
@@ -115,11 +116,12 @@ class User extends Model {
       });
   }
 
-  static findOrInvite({ email, role = USER }) {
+  static inviteOrUpdate(data) {
+    const { email } = data;
     return User.findOne({ where: { email }, paranoid: false }).then(user => {
-      if (!user) return User.invite({ email, role });
-      if (!user.deletedAt) return user;
-      return user.restore();
+      if (!user) return User.invite(data);
+      map(({ ...data, deletedAt: null }), (v, k) => user.setDataValue(k, v));
+      return user.save();
     });
   }
 

From 4c5b3ff4260e18e758f44802cef47b47051df3a6 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Fri, 14 Jun 2019 06:43:14 +0200
Subject: [PATCH 073/213] :lipstick:

---
 client/components/system-settings/UserManagement/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/components/system-settings/UserManagement/index.vue b/client/components/system-settings/UserManagement/index.vue
index 89d8308c6..4d2117699 100644
--- a/client/components/system-settings/UserManagement/index.vue
+++ b/client/components/system-settings/UserManagement/index.vue
@@ -173,6 +173,7 @@ export default {
   }
 
   label {
+    margin: 0 2px 0 0;
     font-size: 14px;
   }
 }

From b6ca9481b71472489e11555dec86806e029921fa Mon Sep 17 00:00:00 2001
From: Dario Vladovic <d.vladimyr@gmail.com>
Date: Fri, 14 Jun 2019 17:08:52 +0200
Subject: [PATCH 074/213] Add JSDoc types to configuration objects :tada:

---
 package-lock.json   | 215 ++++++++++++++++++++++++++++++++++++++++++++
 package.json        |   2 +
 poi.config.js       |   2 +
 stylelint.config.js |   1 +
 4 files changed, 220 insertions(+)

diff --git a/package-lock.json b/package-lock.json
index f95cf134c..06fee2c95 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1902,12 +1902,77 @@
       "resolved": "https://registry.npmjs.org/@snyk/gemfile/-/gemfile-1.2.0.tgz",
       "integrity": "sha512-nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA=="
     },
+    "@types/anymatch": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.1.tgz",
+      "integrity": "sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA==",
+      "dev": true
+    },
+    "@types/body-parser": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.17.0.tgz",
+      "integrity": "sha512-a2+YeUjPkztKJu5aIF2yArYFQQp8d51wZ7DavSHjFuY1mqVgidGyzEQ41JIVNy82fXj8yPgy2vJmfIywgESW6w==",
+      "dev": true,
+      "requires": {
+        "@types/connect": "*",
+        "@types/node": "*"
+      }
+    },
+    "@types/clean-css": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@types/clean-css/-/clean-css-4.2.1.tgz",
+      "integrity": "sha512-A1HQhQ0hkvqqByJMgg+Wiv9p9XdoYEzuwm11SVo1mX2/4PSdhjcrUlilJQoqLscIheC51t1D5g+EFWCXZ2VTQQ==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@types/connect": {
+      "version": "3.4.32",
+      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.32.tgz",
+      "integrity": "sha512-4r8qa0quOvh7lGD0pre62CAb1oni1OO6ecJLGCezTmhQ8Fz50Arx9RUszryR8KlgK6avuSXvviL6yWyViQABOg==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@types/connect-history-api-fallback": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.2.tgz",
+      "integrity": "sha512-tobKLYh5XszXIQ2lHTeyK1wMi/3K5WiOKb/sl6MENCirlOcXw0jUBHHmST2dLKnYMv6WHWPOSmR8jIF3za0MBQ==",
+      "dev": true,
+      "requires": {
+        "@types/express-serve-static-core": "*",
+        "@types/node": "*"
+      }
+    },
     "@types/events": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
       "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==",
       "dev": true
     },
+    "@types/express": {
+      "version": "4.17.0",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.0.tgz",
+      "integrity": "sha512-CjaMu57cjgjuZbh9DpkloeGxV45CnMGlVd+XpG7Gm9QgVrd7KFq+X4HY0vM+2v0bczS48Wg7bvnMY5TN+Xmcfw==",
+      "dev": true,
+      "requires": {
+        "@types/body-parser": "*",
+        "@types/express-serve-static-core": "*",
+        "@types/serve-static": "*"
+      }
+    },
+    "@types/express-serve-static-core": {
+      "version": "4.16.7",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.7.tgz",
+      "integrity": "sha512-847KvL8Q1y3TtFLRTXcVakErLJQgdpFSaq+k043xefz9raEf0C7HalpSY7OW5PyjCnY8P7bPW5t/Co9qqp+USg==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*",
+        "@types/range-parser": "*"
+      }
+    },
     "@types/glob": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz",
@@ -1919,6 +1984,54 @@
         "@types/node": "*"
       }
     },
+    "@types/html-minifier": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/@types/html-minifier/-/html-minifier-3.5.3.tgz",
+      "integrity": "sha512-j1P/4PcWVVCPEy5lofcHnQ6BtXz9tHGiFPWzqm7TtGuWZEfCHEP446HlkSNc9fQgNJaJZ6ewPtp2aaFla/Uerg==",
+      "dev": true,
+      "requires": {
+        "@types/clean-css": "*",
+        "@types/relateurl": "*",
+        "@types/uglify-js": "*"
+      }
+    },
+    "@types/html-webpack-plugin": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/@types/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz",
+      "integrity": "sha512-in9rViBsTRB4ZApndZ12It68nGzSMHVK30JD7c49iLIHMFeTPbP7I7wevzMv7re2o0k5TlU6Ry/beyrmgWX7Bg==",
+      "dev": true,
+      "requires": {
+        "@types/html-minifier": "*",
+        "@types/tapable": "*",
+        "@types/webpack": "*"
+      }
+    },
+    "@types/http-proxy": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.0.tgz",
+      "integrity": "sha512-l+s0IoxSHqhLFJPDHRfO235kgrCkvFD8JmdV/T9C4BKBYPIjrQopGFH4r7h2e3jQqgJRCthRCAZIxDoFnj1zwQ==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@types/http-proxy-middleware": {
+      "version": "0.19.2",
+      "resolved": "https://registry.npmjs.org/@types/http-proxy-middleware/-/http-proxy-middleware-0.19.2.tgz",
+      "integrity": "sha512-aXcAs2VEaiHwlFlEqMJ+sNSFCO+wuWXcvdBk5Un7f0tUv1eTIIAmkd4S5D/Yi5JI0xofPpm9h3017TngbrLh7A==",
+      "dev": true,
+      "requires": {
+        "@types/connect": "*",
+        "@types/http-proxy": "*",
+        "@types/node": "*"
+      }
+    },
+    "@types/mime": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.1.tgz",
+      "integrity": "sha512-FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw==",
+      "dev": true
+    },
     "@types/minimatch": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
@@ -1935,6 +2048,27 @@
       "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
       "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA=="
     },
+    "@types/poi": {
+      "version": "12.5.0",
+      "resolved": "https://registry.npmjs.org/@types/poi/-/poi-12.5.0.tgz",
+      "integrity": "sha512-iLzKrVgGcm+80gtMHWfEBPrQRt9mNyD5FnNV9a3jZXaw8UuQua9tgOT5+78slZYuQk031Wp7RVK9dB9D30b6uQ==",
+      "dev": true,
+      "requires": {
+        "@types/html-webpack-plugin": "*",
+        "@types/webpack": "*",
+        "@types/webpack-dev-server": "*",
+        "cac": "~6.4.2",
+        "webpack-chain": "^5.2.4"
+      },
+      "dependencies": {
+        "cac": {
+          "version": "6.4.3",
+          "resolved": "https://registry.npmjs.org/cac/-/cac-6.4.3.tgz",
+          "integrity": "sha512-vnSAe5+uEWFnCre3NkjYJS/Gq6PjZLXw9iErjtPH/2pBr3Ieyvh751zpA33eNBhyX4gDjlsaJBQLn70lawytZQ==",
+          "dev": true
+        }
+      }
+    },
     "@types/prop-types": {
       "version": "15.7.1",
       "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.1.tgz",
@@ -1946,6 +2080,12 @@
       "integrity": "sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw==",
       "dev": true
     },
+    "@types/range-parser": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.3.tgz",
+      "integrity": "sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==",
+      "dev": true
+    },
     "@types/react": {
       "version": "16.8.19",
       "resolved": "https://registry.npmjs.org/@types/react/-/react-16.8.19.tgz",
@@ -1955,6 +2095,46 @@
         "csstype": "^2.2.0"
       }
     },
+    "@types/relateurl": {
+      "version": "0.2.28",
+      "resolved": "https://registry.npmjs.org/@types/relateurl/-/relateurl-0.2.28.tgz",
+      "integrity": "sha1-a9p9uGU/piZD9e5p6facEaOS46Y=",
+      "dev": true
+    },
+    "@types/serve-static": {
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.2.tgz",
+      "integrity": "sha512-/BZ4QRLpH/bNYgZgwhKEh+5AsboDBcUdlBYgzoLX0fpj3Y2gp6EApyOlM3bK53wQS/OE1SrdSYBAbux2D1528Q==",
+      "dev": true,
+      "requires": {
+        "@types/express-serve-static-core": "*",
+        "@types/mime": "*"
+      }
+    },
+    "@types/stylelint": {
+      "version": "9.10.0",
+      "resolved": "https://registry.npmjs.org/@types/stylelint/-/stylelint-9.10.0.tgz",
+      "integrity": "sha512-xnlufv0Pn+UxHpCEsobMQ/AFvGoD1YkXtHpz7S49UJcw60tzUnKQWrZs+ICYwUcw9MIaHcURUsqN7iPd59iG4g==",
+      "dev": true,
+      "requires": {
+        "postcss": "7.x.x"
+      }
+    },
+    "@types/tapable": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.4.tgz",
+      "integrity": "sha512-78AdXtlhpCHT0K3EytMpn4JNxaf5tbqbLcbIRoQIHzpTIyjpxLQKRoxU55ujBXAtg3Nl2h/XWvfDa9dsMOd0pQ==",
+      "dev": true
+    },
+    "@types/uglify-js": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.0.4.tgz",
+      "integrity": "sha512-SudIN9TRJ+v8g5pTG8RRCqfqTMNqgWCKKd3vtynhGzkIIjxaicNAMuY5TRadJ6tzDu3Dotf3ngaMILtmOdmWEQ==",
+      "dev": true,
+      "requires": {
+        "source-map": "^0.6.1"
+      }
+    },
     "@types/unist": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz",
@@ -1982,6 +2162,41 @@
         "@types/unist": "*"
       }
     },
+    "@types/webpack": {
+      "version": "4.4.32",
+      "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.4.32.tgz",
+      "integrity": "sha512-mNARoaSJTzbiHxtZbf9NULFilu2frqD+g9Iyl9V2jPYJWXi+AC3Hz8lQWPZ5LLtgUm7iF4SDDMB/1bPrbRQgFw==",
+      "dev": true,
+      "requires": {
+        "@types/anymatch": "*",
+        "@types/node": "*",
+        "@types/tapable": "*",
+        "@types/uglify-js": "*",
+        "source-map": "^0.6.0"
+      }
+    },
+    "@types/webpack-chain": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/@types/webpack-chain/-/webpack-chain-5.2.0.tgz",
+      "integrity": "sha512-/DhcbcUcN593BvM7g/o6JWNiJ7bBSdk8g0kynUc2jktjGTHeVVANn5rGfnC1QW5bbiupj82pSQpmhFLKIfrFbw==",
+      "dev": true,
+      "requires": {
+        "webpack-chain": "*"
+      }
+    },
+    "@types/webpack-dev-server": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/@types/webpack-dev-server/-/webpack-dev-server-3.1.6.tgz",
+      "integrity": "sha512-fysTHPetk7emf4XPj+GCbwGy56JTIUXWH7FuSABctCU2i+pczOD9bbUqd1+vT18WhqEqsr5v8SPshvm/FL3yDw==",
+      "dev": true,
+      "requires": {
+        "@types/connect-history-api-fallback": "*",
+        "@types/express": "*",
+        "@types/http-proxy-middleware": "*",
+        "@types/serve-static": "*",
+        "@types/webpack": "*"
+      }
+    },
     "@vue/component-compiler-utils": {
       "version": "2.6.0",
       "resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-2.6.0.tgz",
diff --git a/package.json b/package.json
index b9623cf57..2a4cbe4ab 100644
--- a/package.json
+++ b/package.json
@@ -141,6 +141,8 @@
     "@babel/core": "^7.3.3",
     "@poi/plugin-bundle-report": "^12.1.0",
     "@poi/plugin-eslint": "^12.0.0",
+    "@types/poi": "^12.5.0",
+    "@types/stylelint": "^9.10.0",
     "acorn": "^6.1.0",
     "babel-eslint": "^10.0.1",
     "clean-webpack-plugin": "^1.0.1",
diff --git a/poi.config.js b/poi.config.js
index a8451d7da..cac6c7245 100644
--- a/poi.config.js
+++ b/poi.config.js
@@ -22,6 +22,7 @@ const aliases = {
 
 const copy = [{ from: 'client/assets/img', to: imagesPath }];
 
+/** @type {import('poi').Config.DevServer} */
 const devServer = {
   headers: {
     'X-Powered-By': 'Webpack DevSever'
@@ -37,6 +38,7 @@ const devServer = {
 
 const extensions = ['.vue'];
 
+/** @type {import('poi').Config} */
 module.exports = {
   plugins: [
     '@poi/eslint',
diff --git a/stylelint.config.js b/stylelint.config.js
index c73a69c39..a3832cf16 100644
--- a/stylelint.config.js
+++ b/stylelint.config.js
@@ -1,3 +1,4 @@
+/** @type {import('stylelint').Configuration} */
 module.exports = {
   extends: 'stylelint-config-standard',
   plugins: ['stylelint-scss', 'stylelint-order'],

From 6a6bf82644f8b72edf37eeaba527088660fa4bae Mon Sep 17 00:00:00 2001
From: Dario Vladovic <d.vladimyr@gmail.com>
Date: Mon, 17 Jun 2019 01:10:51 +0200
Subject: [PATCH 075/213] Replace `sed` magic with cross platform cli :wrench:

---
 package-lock.json | 189 ++++++++++++++++++++++++++++++++++++++++++++++
 package.json      |   3 +-
 2 files changed, 191 insertions(+), 1 deletion(-)

diff --git a/package-lock.json b/package-lock.json
index f95cf134c..4967b94b6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7018,6 +7018,15 @@
         "websocket-driver": ">=0.5.1"
       }
     },
+    "fd-slicer": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
+      "dev": true,
+      "requires": {
+        "pend": "~1.2.0"
+      }
+    },
     "feature-policy": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/feature-policy/-/feature-policy-0.2.0.tgz",
@@ -11939,6 +11948,12 @@
         "sha.js": "^2.4.8"
       }
     },
+    "pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
+      "dev": true
+    },
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
@@ -14019,6 +14034,158 @@
         "any-promise": "^1.3.0"
       }
     },
+    "rewrite-lockfile": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/rewrite-lockfile/-/rewrite-lockfile-1.0.0.tgz",
+      "integrity": "sha512-tpfG+LshicbyViSNL83PADTOM4zd09amS/BVIib6yFS448MA+FPg2C+Bj9puW4pEQSqdEAC3Y7U9cxZJy1gjBA==",
+      "dev": true,
+      "requires": {
+        "chalk": "^2.4.2",
+        "fd-slicer": "^1.1.0",
+        "meow": "^5.0.0",
+        "pumpify": "^2.0.0",
+        "split2": "^3.1.1"
+      },
+      "dependencies": {
+        "camelcase-keys": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz",
+          "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=",
+          "dev": true,
+          "requires": {
+            "camelcase": "^4.1.0",
+            "map-obj": "^2.0.0",
+            "quick-lru": "^1.0.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "duplexify": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.1.tgz",
+          "integrity": "sha512-DY3xVEmVHTv1wSzKNbwoU6nVjzI369Y6sPoqfYr0/xlx3IdX2n94xIszTcjPO8W8ZIv0Wb0PXNcjuZyT4wiICA==",
+          "dev": true,
+          "requires": {
+            "end-of-stream": "^1.4.1",
+            "inherits": "^2.0.3",
+            "readable-stream": "^3.1.1",
+            "stream-shift": "^1.0.0"
+          }
+        },
+        "indent-string": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
+          "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=",
+          "dev": true
+        },
+        "map-obj": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
+          "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=",
+          "dev": true
+        },
+        "meow": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/meow/-/meow-5.0.0.tgz",
+          "integrity": "sha512-CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig==",
+          "dev": true,
+          "requires": {
+            "camelcase-keys": "^4.0.0",
+            "decamelize-keys": "^1.0.0",
+            "loud-rejection": "^1.0.0",
+            "minimist-options": "^3.0.1",
+            "normalize-package-data": "^2.3.4",
+            "read-pkg-up": "^3.0.0",
+            "redent": "^2.0.0",
+            "trim-newlines": "^2.0.0",
+            "yargs-parser": "^10.0.0"
+          }
+        },
+        "pumpify": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-2.0.0.tgz",
+          "integrity": "sha512-ieN9HmpFPt4J4U4qnjN4BxrnqpPPXJyp3qFErxfwBtFOec6ewpIHdS2eu3TkmGW6S+RzFGEOGpm5ih/X/onRPQ==",
+          "dev": true,
+          "requires": {
+            "duplexify": "^4.1.1",
+            "inherits": "^2.0.3",
+            "pump": "^3.0.0"
+          }
+        },
+        "read-pkg": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+          "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+          "dev": true,
+          "requires": {
+            "load-json-file": "^4.0.0",
+            "normalize-package-data": "^2.3.2",
+            "path-type": "^3.0.0"
+          }
+        },
+        "read-pkg-up": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
+          "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
+          "dev": true,
+          "requires": {
+            "find-up": "^2.0.0",
+            "read-pkg": "^3.0.0"
+          }
+        },
+        "readable-stream": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
+          "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "redent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz",
+          "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
+          "dev": true,
+          "requires": {
+            "indent-string": "^3.0.0",
+            "strip-indent": "^2.0.0"
+          }
+        },
+        "strip-indent": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
+          "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=",
+          "dev": true
+        },
+        "trim-newlines": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz",
+          "integrity": "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=",
+          "dev": true
+        },
+        "yargs-parser": {
+          "version": "10.1.0",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
+          "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
+          "dev": true,
+          "requires": {
+            "camelcase": "^4.1.0"
+          }
+        }
+      }
+    },
     "rgb-regex": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz",
@@ -15991,6 +16158,28 @@
         "extend-shallow": "^3.0.0"
       }
     },
+    "split2": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-3.1.1.tgz",
+      "integrity": "sha512-emNzr1s7ruq4N+1993yht631/JH+jaj0NYBosuKmLcq+JkGQ9MmTw1RB1fGaTCzUuseRIClrlSLHRNYGwWQ58Q==",
+      "dev": true,
+      "requires": {
+        "readable-stream": "^3.0.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
+          "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        }
+      }
+    },
     "sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
diff --git a/package.json b/package.json
index b9623cf57..344ad6dae 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
     "integration:add": "node -r ./server/script/preflight ./server/script/addIntegration.js",
     "integration:token": "node -r ./server/script/preflight ./server/script/generateIntegrationToken.js",
     "start": "node -r ./server/script/preflight ./server",
-    "postshrinkwrap": "sed -i.bak 's/http:\\/\\//https:\\/\\//g' package-lock.json && rm -v package-lock.json.bak"
+    "postshrinkwrap": "rewrite-lockfile package-lock.json"
   },
   "dependencies": {
     "@babel/polyfill": "^7.2.5",
@@ -163,6 +163,7 @@
     "poi": "^12.6.10",
     "poi-preset-bundle-report": "^2.0.2",
     "poi-preset-eslint": "^9.0.1",
+    "rewrite-lockfile": "^1.0.0",
     "sass-loader": "^7.1.0",
     "sequelize-cli": "^5.5.0",
     "strip-json-comments": "^2.0.1",

From 32d55260f1c7eb06f858e5ccece6ed1f2171feeb Mon Sep 17 00:00:00 2001
From: Dario Vladovic <d.vladimyr@gmail.com>
Date: Mon, 17 Jun 2019 03:05:58 +0200
Subject: [PATCH 076/213] Update opensource love badge :heart:

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 711ab41f7..85aae43f1 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 [![Known Vulnerabilities](https://snyk.io/test/github/ExtensionEngine/tailor/develop/badge.svg)](https://snyk.io/test/github/ExtensionEngine/tailor)
 [![GitHub license](https://badgen.net/github/license/ExtensionEngine/tailor)](https://github.com/ExtensionEngine/tailor/blob/develop/LICENSE)
 [![js semistandard style](https://badgen.net/badge/code%20style/semistandard/pink)](https://github.com/Flet/semistandard)
-[![Open Source Love](https://badges.frapsoft.com/os/v2/open-source.svg?v=102)](https://github.com/ellerbrock/open-source-badge/)
+[![Open Source Love](https://badgen.net/badge/Open%20Source/%E2%9D%A4/3eaf8e)](https://github.com/ellerbrock/open-source-badge/)
 
 Adaptive course authoring platform.
 

From 70bd169c1c61649d0f70f8c1d9c64ccc53206153 Mon Sep 17 00:00:00 2001
From: parmezan38 <luka38.stojanac@gmail.com>
Date: Tue, 18 Jun 2019 14:36:37 +0200
Subject: [PATCH 077/213] Replace vuex module with vuex for authorization

- Create auth folder
- Move all vuex module actions, getters, mutations to auth
- Replace mapGetters from vuex-module with vuex in App
- Replace mapActions from vuex-module with vuex in ForgotPassword
---
 client/App.vue                                |  4 +-
 client/components/auth/ForgotPassword.vue     |  4 +-
 client/components/auth/Login.vue              |  6 +--
 client/components/auth/ResetPassword.vue      |  4 +-
 client/components/common/Navbar.vue           |  5 +-
 .../course/Sidebar/Discussion/Comment.vue     |  4 +-
 client/router.js                              |  2 +-
 client/store/modules/auth.js                  | 52 -------------------
 client/store/modules/auth/actions.js          | 23 ++++++++
 client/store/modules/auth/getters.js          |  5 ++
 client/store/modules/auth/index.js            | 15 ++++++
 client/store/modules/auth/mutations.js        |  8 +++
 12 files changed, 66 insertions(+), 66 deletions(-)
 delete mode 100644 client/store/modules/auth.js
 create mode 100644 client/store/modules/auth/actions.js
 create mode 100644 client/store/modules/auth/getters.js
 create mode 100644 client/store/modules/auth/index.js
 create mode 100644 client/store/modules/auth/mutations.js

diff --git a/client/App.vue b/client/App.vue
index d71747e2d..5ef2eb677 100644
--- a/client/App.vue
+++ b/client/App.vue
@@ -11,14 +11,14 @@
 <script>
 import ConfirmationModal from 'components/common/ConfirmationModal';
 import isIexplorer from 'is-iexplorer';
-import { mapGetters } from 'vuex-module';
+import { mapGetters } from 'vuex';
 import Navbar from 'components/common/Navbar';
 
 if (isIexplorer) document.body.classList.add('ie');
 
 export default {
   name: 'app',
-  computed: mapGetters(['user']),
+  computed: mapGetters('auth', ['user']),
   components: {
     ConfirmationModal,
     Navbar
diff --git a/client/components/auth/ForgotPassword.vue b/client/components/auth/ForgotPassword.vue
index b5e4eea07..f73fb6a6e 100644
--- a/client/components/auth/ForgotPassword.vue
+++ b/client/components/auth/ForgotPassword.vue
@@ -25,7 +25,7 @@
 
 <script>
 import { delay } from 'bluebird';
-import { mapActions } from 'vuex-module';
+import { mapActions } from 'vuex';
 
 export default {
   data() {
@@ -36,7 +36,7 @@ export default {
     };
   },
   methods: {
-    ...mapActions(['forgotPassword']),
+    ...mapActions('auth', ['forgotPassword']),
     submit() {
       // TODO: Temp
       this.showMessage = true;
diff --git a/client/components/auth/Login.vue b/client/components/auth/Login.vue
index a7cb39356..43d37b705 100644
--- a/client/components/auth/Login.vue
+++ b/client/components/auth/Login.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script>
-import { mapActions, mapGetters } from 'vuex-module';
+import { mapActions, mapGetters } from 'vuex';
 const LOGIN_ERR_MESSAGE = 'User email and password do not match';
 
 export default {
@@ -43,9 +43,9 @@ export default {
       message: ''
     };
   },
-  computed: mapGetters(['user']),
+  computed: mapGetters('auth', ['user']),
   methods: {
-    ...mapActions(['login']),
+    ...mapActions('auth', ['login']),
     submit() {
       this.message = '';
       this.login({ email: this.email, password: this.password })
diff --git a/client/components/auth/ResetPassword.vue b/client/components/auth/ResetPassword.vue
index 24b471697..e41ce0431 100644
--- a/client/components/auth/ResetPassword.vue
+++ b/client/components/auth/ResetPassword.vue
@@ -38,7 +38,7 @@
 </template>
 
 <script>
-import { mapActions } from 'vuex-module';
+import { mapActions } from 'vuex';
 import { withValidation } from 'utils/validation';
 
 export default {
@@ -55,7 +55,7 @@ export default {
     }
   },
   methods: {
-    ...mapActions(['resetPassword']),
+    ...mapActions('auth', ['resetPassword']),
     submit() {
       const token = this.$route.params.token;
       this.$validator.validateAll().then(result => {
diff --git a/client/components/common/Navbar.vue b/client/components/common/Navbar.vue
index d116c2fc5..74358c8d3 100644
--- a/client/components/common/Navbar.vue
+++ b/client/components/common/Navbar.vue
@@ -39,8 +39,9 @@
 </template>
 
 <script>
-import { mapActions, mapGetters } from 'vuex-module';
 import { getAcronym } from 'utils/course';
+import { mapActions } from 'vuex';
+import { mapGetters } from 'vuex-module';
 
 export default {
   name: 'main-toolbar',
@@ -58,7 +59,7 @@ export default {
       return this.repository ? getAcronym(this.repository.name) : null;
     }
   },
-  methods: mapActions(['logout'])
+  methods: mapActions('auth', ['logout'])
 };
 </script>
 
diff --git a/client/components/course/Sidebar/Discussion/Comment.vue b/client/components/course/Sidebar/Discussion/Comment.vue
index 2f3d77668..302a6ed7d 100644
--- a/client/components/course/Sidebar/Discussion/Comment.vue
+++ b/client/components/course/Sidebar/Discussion/Comment.vue
@@ -66,7 +66,7 @@
 <script>
 import Avatar from 'vue-avatar';
 import { focus } from 'vue-focus';
-import { mapGetters } from 'vuex-module';
+import { mapGetters } from 'vuex';
 import TextEditor from 'components/common/TextEditor';
 import ThreadComment from './Comment';
 
@@ -84,7 +84,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['user']),
+    ...mapGetters('auth', ['user']),
     authorInitials() {
       return this.comment.author.email.substr(0, 2).toUpperCase();
     },
diff --git a/client/router.js b/client/router.js
index dc3d775e7..fdd5f2ee1 100644
--- a/client/router.js
+++ b/client/router.js
@@ -80,7 +80,7 @@ let router = new Router({
 });
 
 router.beforeEach((to, from, next) => {
-  if (to.matched.some(it => it.meta.auth) && !store.getters.user) {
+  if (to.matched.some(it => it.meta.auth) && !store.getters['auth/user']) {
     next({ path: '/login', query: { redirect: to.fullPath } });
   } else {
     next();
diff --git a/client/store/modules/auth.js b/client/store/modules/auth.js
deleted file mode 100644
index f2f3b03fc..000000000
--- a/client/store/modules/auth.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import authApi from '../../api/auth';
-import { role } from 'shared';
-import { VuexModule } from 'vuex-module';
-
-const { state, getter, action, mutation, build } = new VuexModule();
-
-state({
-  user: JSON.parse(window.localStorage.getItem('TAILOR_USER') || '{}')
-});
-
-getter(function user() {
-  let res = this.state.user;
-  return res.email ? res : null;
-});
-
-getter(function isAdmin() {
-  const user = this.state.user;
-  return user.role === role.user.ADMIN;
-});
-
-action(function login(credentials) {
-  return authApi
-    .login(credentials)
-    .then(user => this.commit('login', user));
-});
-
-action(function logout() {
-  return authApi
-    .logout()
-    .then(() => setTimeout(() => {
-      window.localStorage.removeItem('TAILOR_USER');
-      window.location.reload();
-    }, 0));
-});
-
-action(function forgotPassword({ email }) {
-  return authApi.forgotPassword(email);
-});
-
-action(function resetPassword({ token, password }) {
-  return authApi.resetPassword(token, password);
-});
-
-mutation(function login(user) {
-  this.state.user = user;
-});
-
-mutation(function logout() {
-  this.state.user = {};
-});
-
-export default build();
diff --git a/client/store/modules/auth/actions.js b/client/store/modules/auth/actions.js
new file mode 100644
index 000000000..d98a7693a
--- /dev/null
+++ b/client/store/modules/auth/actions.js
@@ -0,0 +1,23 @@
+import authApi from '../../../api/auth';
+
+export const login = ({ commit }, credentials) => {
+  return authApi.login(credentials)
+    .then(user => commit('login', user));
+};
+
+export const logout = () => {
+  return authApi
+    .logout()
+    .then(() => setTimeout(() => {
+      window.localStorage.removeItem('TAILOR_USER');
+      window.location.reload();
+    }, 0));
+};
+
+export const forgotPassword = (context, { email }) => {
+  return authApi.forgotPassword(email);
+};
+
+export const resetPassword = (context, { token, password }) => {
+  return authApi.resetPassword(token, password);
+};
diff --git a/client/store/modules/auth/getters.js b/client/store/modules/auth/getters.js
new file mode 100644
index 000000000..9a62bd03f
--- /dev/null
+++ b/client/store/modules/auth/getters.js
@@ -0,0 +1,5 @@
+import { role } from 'shared';
+
+export const user = ({ user }) => user.email ? user : null;
+
+export const isAdmin = ({ user }) => user.role === role.user.ADMIN;
diff --git a/client/store/modules/auth/index.js b/client/store/modules/auth/index.js
new file mode 100644
index 000000000..f4a283072
--- /dev/null
+++ b/client/store/modules/auth/index.js
@@ -0,0 +1,15 @@
+import * as actions from './actions';
+import * as getters from './getters';
+import * as mutations from './mutations';
+
+const state = {
+  user: JSON.parse(window.localStorage.getItem('TAILOR_USER')) || {}
+};
+
+export default {
+  namespaced: true,
+  state,
+  getters,
+  actions,
+  mutations
+};
diff --git a/client/store/modules/auth/mutations.js b/client/store/modules/auth/mutations.js
new file mode 100644
index 000000000..e09ecf769
--- /dev/null
+++ b/client/store/modules/auth/mutations.js
@@ -0,0 +1,8 @@
+export const login = (state, user) => {
+  state.user = user;
+  console.log(state);
+};
+
+export const logout = state => {
+  state.user = null;
+};

From 4dff867029f8f2bb29ceab755525031de3b66bae Mon Sep 17 00:00:00 2001
From: parmezan38 <luka38.stojanac@gmail.com>
Date: Wed, 19 Jun 2019 19:52:40 +0200
Subject: [PATCH 078/213] Work in progress :construction:

---
 client/App.vue                                |   2 +-
 client/components/auth/ForgotPassword.vue     |   2 +-
 client/components/auth/Login.vue              |   4 +-
 client/components/auth/ResetPassword.vue      |   2 +-
 client/components/catalog/Container.vue       |   8 +-
 client/components/catalog/Create.vue          |   4 +-
 client/components/common/Navbar.vue           |   7 +-
 .../common/tce-core/ElementToolbar.vue        |   4 +-
 client/components/course/Outline/Activity.vue |  10 +-
 .../Outline/InsertActivity/CreateActivity.vue |   4 +-
 .../course/Outline/InsertActivity/index.vue   |   8 +-
 .../course/Outline/NoActivities.vue           |   8 +-
 client/components/course/Outline/index.vue    |   6 +-
 .../components/course/Outline/reorderMixin.js |   4 +-
 .../course/Revisions/RevisionItem.vue         |   6 +-
 client/components/course/Revisions/index.vue  |   8 +-
 .../components/course/Settings/CloneModal.vue |   4 +-
 client/components/course/Settings/General.vue |   6 +-
 .../Settings/UserManagement/AddUser.vue       |   4 +-
 .../Settings/UserManagement/UserList.vue      |   6 +-
 client/components/course/Settings/index.vue   |   8 +-
 client/components/course/Sidebar/Body.vue     |   6 +-
 .../course/Sidebar/Discussion/Comment.vue     |   2 +-
 .../course/Sidebar/Discussion/Thread.vue      |   4 +-
 .../course/Sidebar/Discussion/index.vue       |  10 +-
 client/components/course/Sidebar/Header.vue   |   8 +-
 .../components/course/Sidebar/Publishing.vue  |   4 +-
 .../course/Sidebar/Relationship.vue           |   8 +-
 client/components/course/Sidebar/index.vue    |   4 +-
 client/components/course/TreeView/index.vue   |   6 +-
 client/components/course/index.vue            |  20 +--
 .../components/editor/MainSidebar/index.vue   |   6 +-
 .../components/editor/MetaSidebar/index.vue   |   4 +-
 client/components/editor/TeachingElement.vue  |   6 +-
 client/components/editor/Toolbar.vue          |   4 +-
 client/components/editor/index.vue            |  16 +-
 .../editor/structure/AssessmentItem.vue       |   4 +-
 .../editor/structure/Assessments.vue          |   8 +-
 .../structure/ContentContainers/Container.vue |   6 +-
 .../structure/ContentContainers/index.vue     |   4 +-
 .../structure/Exams/AssessmentGroup.vue       |   8 +-
 .../editor/structure/Exams/Exam.vue           |   6 +-
 .../structure/Exams/GroupIntroduction.vue     |   4 +-
 .../editor/structure/Exams/index.vue          |   6 +-
 client/router.js                              |   2 +-
 client/store/helpers/actions.js               |  76 ++++++++
 .../helpers/{collection.js => collectionX.js} |   3 +-
 client/store/helpers/mutations.js             |  52 ++++++
 client/{api => store/helpers}/resource.js     |   8 +-
 client/store/index.js                         |  18 ++
 client/store/modules/activities.js            |  94 ----------
 client/store/modules/activities/actions.js    |  44 +++++
 client/store/modules/activities/getters.js    |  41 +++++
 client/store/modules/activities/index.js      |  17 ++
 client/store/modules/activities/mutations.js  |   9 +
 client/store/modules/auth/actions.js          |  10 +-
 client/store/modules/auth/index.js            |   5 +-
 client/store/modules/auth/mutations.js        |   1 -
 client/store/modules/comments.js              |  87 ---------
 client/store/modules/comments/actions.js      |  44 +++++
 client/store/modules/comments/getters.js      |  17 ++
 client/store/modules/comments/index.js        |  19 ++
 client/store/modules/comments/mutations.js    |  44 +++++
 client/store/modules/course.js                | 167 ------------------
 client/store/modules/course/actions.js        |  24 +++
 client/store/modules/course/getters.js        |  98 ++++++++++
 client/store/modules/course/index.js          |  20 +++
 client/store/modules/course/mutations.js      |  37 ++++
 client/store/modules/courses.js               |  91 ----------
 client/store/modules/courses/actions.js       |  31 ++++
 client/store/modules/courses/getters.js       |  20 +++
 client/store/modules/courses/index.js         |  27 +++
 client/store/modules/courses/mutations.js     |  45 +++++
 client/store/modules/editor.js                |  33 ----
 client/store/modules/editor/getters.js        |  28 +++
 client/store/modules/editor/index.js          |   6 +
 client/store/modules/revisions.js             |  57 ------
 client/store/modules/revisions/actions.js     |  29 +++
 client/store/modules/revisions/getters.js     |  10 ++
 client/store/modules/revisions/index.js       |  22 +++
 client/store/modules/revisions/mutations.js   |  24 +++
 client/store/modules/tes.js                   |  30 ----
 client/store/modules/tes/actions.js           |  22 +++
 client/store/modules/tes/getters.js           |   1 +
 client/store/modules/tes/index.js             |  17 ++
 client/store/modules/tes/mutations.js         |   9 +
 86 files changed, 1000 insertions(+), 708 deletions(-)
 create mode 100644 client/store/helpers/actions.js
 rename client/store/helpers/{collection.js => collectionX.js} (98%)
 create mode 100644 client/store/helpers/mutations.js
 rename client/{api => store/helpers}/resource.js (96%)
 delete mode 100644 client/store/modules/activities.js
 create mode 100644 client/store/modules/activities/actions.js
 create mode 100644 client/store/modules/activities/getters.js
 create mode 100644 client/store/modules/activities/index.js
 create mode 100644 client/store/modules/activities/mutations.js
 delete mode 100644 client/store/modules/comments.js
 create mode 100644 client/store/modules/comments/actions.js
 create mode 100644 client/store/modules/comments/getters.js
 create mode 100644 client/store/modules/comments/index.js
 create mode 100644 client/store/modules/comments/mutations.js
 delete mode 100644 client/store/modules/course.js
 create mode 100644 client/store/modules/course/actions.js
 create mode 100644 client/store/modules/course/getters.js
 create mode 100644 client/store/modules/course/index.js
 create mode 100644 client/store/modules/course/mutations.js
 delete mode 100644 client/store/modules/courses.js
 create mode 100644 client/store/modules/courses/actions.js
 create mode 100644 client/store/modules/courses/getters.js
 create mode 100644 client/store/modules/courses/index.js
 create mode 100644 client/store/modules/courses/mutations.js
 delete mode 100644 client/store/modules/editor.js
 create mode 100644 client/store/modules/editor/getters.js
 create mode 100644 client/store/modules/editor/index.js
 delete mode 100644 client/store/modules/revisions.js
 create mode 100644 client/store/modules/revisions/actions.js
 create mode 100644 client/store/modules/revisions/getters.js
 create mode 100644 client/store/modules/revisions/index.js
 create mode 100644 client/store/modules/revisions/mutations.js
 delete mode 100644 client/store/modules/tes.js
 create mode 100644 client/store/modules/tes/actions.js
 create mode 100644 client/store/modules/tes/getters.js
 create mode 100644 client/store/modules/tes/index.js
 create mode 100644 client/store/modules/tes/mutations.js

diff --git a/client/App.vue b/client/App.vue
index 5ef2eb677..712b193fe 100644
--- a/client/App.vue
+++ b/client/App.vue
@@ -18,7 +18,7 @@ if (isIexplorer) document.body.classList.add('ie');
 
 export default {
   name: 'app',
-  computed: mapGetters('auth', ['user']),
+  computed: mapGetters(['user']),
   components: {
     ConfirmationModal,
     Navbar
diff --git a/client/components/auth/ForgotPassword.vue b/client/components/auth/ForgotPassword.vue
index f73fb6a6e..0a3b3de4e 100644
--- a/client/components/auth/ForgotPassword.vue
+++ b/client/components/auth/ForgotPassword.vue
@@ -36,7 +36,7 @@ export default {
     };
   },
   methods: {
-    ...mapActions('auth', ['forgotPassword']),
+    ...mapActions(['forgotPassword']),
     submit() {
       // TODO: Temp
       this.showMessage = true;
diff --git a/client/components/auth/Login.vue b/client/components/auth/Login.vue
index 43d37b705..a899693ff 100644
--- a/client/components/auth/Login.vue
+++ b/client/components/auth/Login.vue
@@ -43,9 +43,9 @@ export default {
       message: ''
     };
   },
-  computed: mapGetters('auth', ['user']),
+  computed: mapGetters(['user']),
   methods: {
-    ...mapActions('auth', ['login']),
+    ...mapActions(['login']),
     submit() {
       this.message = '';
       this.login({ email: this.email, password: this.password })
diff --git a/client/components/auth/ResetPassword.vue b/client/components/auth/ResetPassword.vue
index e41ce0431..507a1e711 100644
--- a/client/components/auth/ResetPassword.vue
+++ b/client/components/auth/ResetPassword.vue
@@ -55,7 +55,7 @@ export default {
     }
   },
   methods: {
-    ...mapActions('auth', ['resetPassword']),
+    ...mapActions(['resetPassword']),
     submit() {
       const token = this.$route.params.token;
       this.$validator.validateAll().then(result => {
diff --git a/client/components/catalog/Container.vue b/client/components/catalog/Container.vue
index d19fb719d..7874206c4 100644
--- a/client/components/catalog/Container.vue
+++ b/client/components/catalog/Container.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script>
-import { mapActions, mapGetters, mapMutations } from 'vuex-module';
+import { mapActions, mapGetters, mapMutations } from 'vuex';
 import CourseCard from './Card';
 import CreateCourse from './Create';
 import get from 'lodash/get';
@@ -47,7 +47,7 @@ export default {
   },
   computed: {
     ...mapGetters(['courses']),
-    ...mapGetters(['hasMoreResults'], 'courses'),
+    ...mapGetters('courses', ['hasMoreResults']),
     loaderState() {
       return get(this.$refs, 'infiniteLoading.stateChanger', {});
     },
@@ -56,8 +56,8 @@ export default {
     }
   },
   methods: {
-    ...mapActions(['fetch'], 'courses'),
-    ...mapMutations(['setSearch'], 'courses'),
+    ...mapActions('courses', ['fetch']),
+    ...mapMutations('courses', ['setSearch']),
     loadMore() {
       return this.fetch().then(() => {
         if (!isEmpty(this.courses)) this.loaderState.loaded();
diff --git a/client/components/catalog/Create.vue b/client/components/catalog/Create.vue
index 16fdbe767..cfd0ae538 100644
--- a/client/components/catalog/Create.vue
+++ b/client/components/catalog/Create.vue
@@ -54,7 +54,7 @@
 </template>
 
 <script>
-import { mapActions, mapGetters } from 'vuex-module';
+import { mapActions, mapGetters } from 'vuex';
 import Promise from 'bluebird';
 import { SCHEMAS } from 'shared/activities';
 import { withValidation } from 'utils/validation';
@@ -82,7 +82,7 @@ export default {
     }
   },
   methods: {
-    ...mapActions(['save'], 'courses'),
+    ...mapActions('courses', ['save']),
     submit() {
       this.$validator.validateAll().then(isValid => {
         if (!isValid) return;
diff --git a/client/components/common/Navbar.vue b/client/components/common/Navbar.vue
index 74358c8d3..53ee6b90e 100644
--- a/client/components/common/Navbar.vue
+++ b/client/components/common/Navbar.vue
@@ -39,9 +39,8 @@
 </template>
 
 <script>
+import { mapActions, mapGetters } from 'vuex';
 import { getAcronym } from 'utils/course';
-import { mapActions } from 'vuex';
-import { mapGetters } from 'vuex-module';
 
 export default {
   name: 'main-toolbar',
@@ -54,12 +53,12 @@ export default {
     };
   },
   computed: {
-    ...mapGetters({ repository: 'course' }, 'course'),
+    ...mapGetters('course', { repository: 'course' }),
     repositoryAcronym() {
       return this.repository ? getAcronym(this.repository.name) : null;
     }
   },
-  methods: mapActions('auth', ['logout'])
+  methods: mapActions(['logout'])
 };
 </script>
 
diff --git a/client/components/common/tce-core/ElementToolbar.vue b/client/components/common/tce-core/ElementToolbar.vue
index 4fb3011c4..1a9e2e160 100644
--- a/client/components/common/tce-core/ElementToolbar.vue
+++ b/client/components/common/tce-core/ElementToolbar.vue
@@ -21,7 +21,7 @@
 import { getElementId, getToolbarName, isQuestion } from './utils';
 import DefaultToolbar from './DefaultToolbar';
 import EventBus from 'EventBus';
-import { mapActions } from 'vuex-module';
+import { mapActions } from 'vuex';
 import Vue from 'vue';
 import { withValidation } from 'utils/validation';
 
@@ -51,7 +51,7 @@ export default {
     }
   },
   methods: {
-    ...mapActions({ saveElement: 'save', removeElement: 'remove' }, 'tes'),
+    ...mapActions('tes', { saveElement: 'save', removeElement: 'remove' }),
     remove(element) {
       this.focusoutElement();
       if (element.embedded) return this.elementBus.emit('delete');
diff --git a/client/components/course/Outline/Activity.vue b/client/components/course/Outline/Activity.vue
index 04f4bf426..cdf8d526f 100644
--- a/client/components/course/Outline/Activity.vue
+++ b/client/components/course/Outline/Activity.vue
@@ -71,7 +71,7 @@
 </template>
 
 <script>
-import { mapGetters, mapMutations, mapState } from 'vuex-module';
+import { mapGetters, mapMutations, mapState } from 'vuex';
 import Draggable from 'vuedraggable';
 import filter from 'lodash/filter';
 import find from 'lodash/find';
@@ -103,11 +103,11 @@ export default {
     };
   },
   computed: {
-    ...mapGetters({
+    ...mapGetters('course', {
       structure: 'structure',
       focusedActivity: 'activity',
       isCollapsed: 'isCollapsed'
-    }, 'course'),
+    }),
     ...mapState({ outlineState: s => s.course.outline }),
     config() {
       return find(this.structure, { type: this.type });
@@ -151,8 +151,8 @@ export default {
     }
   },
   methods: {
-    ...mapMutations(
-      ['focusActivity', 'toggleActivity', 'showActivityOptions'], 'course'),
+    ...mapMutations('course',
+      ['focusActivity', 'toggleActivity', 'showActivityOptions']),
     focus(options = false) {
       this.focusActivity(this._cid);
       return this.showActivityOptions(options ? this._cid : null);
diff --git a/client/components/course/Outline/InsertActivity/CreateActivity.vue b/client/components/course/Outline/InsertActivity/CreateActivity.vue
index 0edb09663..b87cdc6b1 100644
--- a/client/components/course/Outline/InsertActivity/CreateActivity.vue
+++ b/client/components/course/Outline/InsertActivity/CreateActivity.vue
@@ -42,7 +42,7 @@
 import ActivityBrowser from 'components/common/ActivityBrowser';
 import first from 'lodash/first';
 import { focus } from 'vue-focus';
-import { mapGetters } from 'vuex-module';
+import { mapGetters } from 'vuex';
 import multiselect from 'components/common/Select';
 import SelectAction from './SelectAction';
 import { withValidation } from 'utils/validation';
@@ -56,7 +56,7 @@ export default {
   data() {
     return { name: '', level: null };
   },
-  computed: mapGetters(['structure'], 'course'),
+  computed: mapGetters('course', ['structure']),
   methods: {
     create() {
       this.$validator.validateAll().then(isValid => {
diff --git a/client/components/course/Outline/InsertActivity/index.vue b/client/components/course/Outline/InsertActivity/index.vue
index 8bd80887a..47ed03e0b 100644
--- a/client/components/course/Outline/InsertActivity/index.vue
+++ b/client/components/course/Outline/InsertActivity/index.vue
@@ -34,7 +34,7 @@
 
 <script>
 import { getOutlineChildren, getParent } from 'utils/activity';
-import { mapActions, mapGetters, mapMutations, mapState } from 'vuex-module';
+import { mapActions, mapGetters, mapMutations, mapState } from 'vuex';
 import ActivityBrowser from 'components/common/ActivityBrowser';
 import calculatePosition from 'utils/calculatePosition';
 import CreateActivity from './CreateActivity';
@@ -57,7 +57,7 @@ export default {
   },
   computed: {
     ...mapGetters(['activities']),
-    ...mapGetters(['structure'], 'course'),
+    ...mapGetters('course', ['structure']),
     ...mapState({ outlineState: s => s.course.outline }),
     showActions() {
       return this.anchor._cid === this.outlineState.showOptions;
@@ -73,8 +73,8 @@ export default {
     }
   },
   methods: {
-    ...mapActions({ copy: 'clone', create: 'save' }, 'activities'),
-    ...mapMutations(['showActivityOptions', 'focusActivity'], 'course'),
+    ...mapActions('activities', { copy: 'clone', create: 'save' }),
+    ...mapMutations('course', ['showActivityOptions', 'focusActivity']),
     show() {
       this.showActivityOptions(this.anchor._cid);
       this.focusActivity(this.anchor._cid);
diff --git a/client/components/course/Outline/NoActivities.vue b/client/components/course/Outline/NoActivities.vue
index 37d51266b..8dd7dbc25 100644
--- a/client/components/course/Outline/NoActivities.vue
+++ b/client/components/course/Outline/NoActivities.vue
@@ -34,7 +34,7 @@
 </template>
 
 <script>
-import { mapActions, mapGetters, mapMutations } from 'vuex-module';
+import { mapActions, mapGetters, mapMutations } from 'vuex';
 import filter from 'lodash/filter';
 import first from 'lodash/first';
 import multiselect from '../../common/Select';
@@ -49,7 +49,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['course', 'structure', 'activities'], 'course'),
+    ...mapGetters('course', ['course', 'structure', 'activities']),
     levels() {
       return filter(this.structure, { level: 1 });
     },
@@ -58,8 +58,8 @@ export default {
     }
   },
   methods: {
-    ...mapActions(['save'], 'activities'),
-    ...mapMutations(['focusActivity'], 'course'),
+    ...mapActions('activities', ['save']),
+    ...mapMutations('course', ['focusActivity']),
     onLevelSelected(level) {
       if (!level) return;
       this.level = level;
diff --git a/client/components/course/Outline/index.vue b/client/components/course/Outline/index.vue
index 97cda0432..ffc5c16f1 100644
--- a/client/components/course/Outline/index.vue
+++ b/client/components/course/Outline/index.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script>
-import { mapGetters, mapMutations } from 'vuex-module';
+import { mapGetters, mapMutations } from 'vuex';
 import Activity from './Activity';
 import Draggable from 'vuedraggable';
 import filter from 'lodash/filter';
@@ -52,7 +52,7 @@ export default {
     showLoader: { type: Boolean, default: false }
   },
   computed: {
-    ...mapGetters(['structure', 'outlineActivities'], 'course'),
+    ...mapGetters('course', ['structure', 'outlineActivities']),
     isFlat() {
       const types = map(filter(this.structure, { level: 2 }), 'type');
       if (!types.length) return false;
@@ -64,7 +64,7 @@ export default {
         .sort((x, y) => x.position - y.position);
     }
   },
-  methods: mapMutations(['toggleActivities'], 'course'),
+  methods: mapMutations('course', ['toggleActivities']),
   components: { Activity, Draggable, NoActivities, Sidebar }
 };
 </script>
diff --git a/client/components/course/Outline/reorderMixin.js b/client/components/course/Outline/reorderMixin.js
index 83ba43544..69f445316 100644
--- a/client/components/course/Outline/reorderMixin.js
+++ b/client/components/course/Outline/reorderMixin.js
@@ -1,8 +1,8 @@
-import { mapActions } from 'vuex-module';
+import { mapActions } from 'vuex';
 
 export default {
   methods: {
-    ...mapActions({ updatePosition: 'reorder' }, 'activities'),
+    ...mapActions('activities', { updatePosition: 'reorder' }),
     reorder({ newIndex: newPosition }, items) {
       const activity = items[newPosition];
       const isFirstChild = newPosition === 0;
diff --git a/client/components/course/Revisions/RevisionItem.vue b/client/components/course/Revisions/RevisionItem.vue
index 336dec7d9..0ddc31f81 100644
--- a/client/components/course/Revisions/RevisionItem.vue
+++ b/client/components/course/Revisions/RevisionItem.vue
@@ -29,7 +29,7 @@ import {
 import EntityRevisions from './EntityRevisions';
 import fecha from 'fecha';
 import find from 'lodash/find';
-import { mapGetters } from 'vuex-module';
+import { mapGetters } from 'vuex';
 
 export default {
   name: 'revision-item',
@@ -40,8 +40,8 @@ export default {
     return { expanded: false };
   },
   computed: {
-    ...mapGetters(['structure'], 'course'),
-    ...mapGetters(['getParent'], 'activities'),
+    ...mapGetters('course', ['structure']),
+    ...mapGetters('activities', ['getParent']),
     activity() {
       const { state } = this.revision;
       const activityId = state.activityId || state.id;
diff --git a/client/components/course/Revisions/index.vue b/client/components/course/Revisions/index.vue
index 495b21832..a1bcc9a93 100644
--- a/client/components/course/Revisions/index.vue
+++ b/client/components/course/Revisions/index.vue
@@ -22,7 +22,7 @@
 </template>
 
 <script>
-import { mapActions, mapGetters } from 'vuex-module';
+import { mapActions, mapGetters } from 'vuex';
 import InfiniteLoading from 'vue-infinite-loading';
 import { isSameInstance } from 'utils/revision';
 import last from 'lodash/last';
@@ -37,8 +37,8 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['revisions'], 'course'),
-    ...mapGetters(['hasMoreResults'], 'revisions'),
+    ...mapGetters('course', ['revisions']),
+    ...mapGetters('revisions', ['hasMoreResults']),
     bundledRevisions() {
       return reduce(this.revisions, (acc, it) => {
         const prevRevision = last(acc);
@@ -49,7 +49,7 @@ export default {
     }
   },
   methods: {
-    ...mapActions(['fetch', 'resetPagination'], 'revisions'),
+    ...mapActions('revisions', ['fetch', 'resetPagination']),
     fetchRevisions($state) {
       this.fetch().then(() => {
         const diff = this.bundledRevisions.length - this.bundledRevisionCount;
diff --git a/client/components/course/Settings/CloneModal.vue b/client/components/course/Settings/CloneModal.vue
index 96ec99177..80f2dd57f 100644
--- a/client/components/course/Settings/CloneModal.vue
+++ b/client/components/course/Settings/CloneModal.vue
@@ -49,7 +49,7 @@
 
 <script>
 import CircularProgress from 'components/common/CircularProgress';
-import { mapActions } from 'vuex-module';
+import { mapActions } from 'vuex';
 import Modal from 'components/common/Modal';
 import pick from 'lodash/pick';
 import Promise from 'bluebird';
@@ -66,7 +66,7 @@ export default {
     };
   },
   methods: {
-    ...mapActions(['clone'], 'courses'),
+    ...mapActions('courses', ['clone']),
     close() {
       this.$emit('close');
       this.name = '';
diff --git a/client/components/course/Settings/General.vue b/client/components/course/Settings/General.vue
index b6ce80f19..e6f39093a 100644
--- a/client/components/course/Settings/General.vue
+++ b/client/components/course/Settings/General.vue
@@ -29,7 +29,7 @@
 </template>
 
 <script>
-import { mapActions, mapGetters } from 'vuex-module';
+import { mapActions, mapGetters } from 'vuex';
 import api from '../../../api/course';
 import cloneDeep from 'lodash/cloneDeep';
 import find from 'lodash/find';
@@ -42,7 +42,7 @@ export default {
     return { publishing: false };
   },
   computed: {
-    ...mapGetters(['course'], 'course'),
+    ...mapGetters('course', ['course']),
     requiredData() {
       return [{
         key: 'name',
@@ -63,7 +63,7 @@ export default {
     }
   },
   methods: {
-    ...mapActions(['update'], 'courses'),
+    ...mapActions('courses', ['update']),
     updateKey(key, value) {
       if (find(this.metadata, { key })) key = `data.${key}`;
       const data = cloneDeep(this.course);
diff --git a/client/components/course/Settings/UserManagement/AddUser.vue b/client/components/course/Settings/UserManagement/AddUser.vue
index befbc7d02..4dec11cfd 100644
--- a/client/components/course/Settings/UserManagement/AddUser.vue
+++ b/client/components/course/Settings/UserManagement/AddUser.vue
@@ -32,7 +32,7 @@
 </template>
 
 <script>
-import { mapActions } from 'vuex-module';
+import { mapActions } from 'vuex';
 import { withValidation } from 'utils/validation';
 
 export default {
@@ -47,7 +47,7 @@ export default {
     };
   },
   methods: {
-    ...mapActions(['upsertUser'], 'course'),
+    ...mapActions('course', ['upsertUser']),
     addUser() {
       const { email, role } = this;
       const { courseId } = this.$route.params;
diff --git a/client/components/course/Settings/UserManagement/UserList.vue b/client/components/course/Settings/UserManagement/UserList.vue
index 63e52dc6e..eec38f8a5 100644
--- a/client/components/course/Settings/UserManagement/UserList.vue
+++ b/client/components/course/Settings/UserManagement/UserList.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script>
-import { mapActions, mapGetters } from 'vuex-module';
+import { mapActions, mapGetters } from 'vuex';
 import debounce from 'lodash/debounce';
 
 export default {
@@ -42,13 +42,13 @@ export default {
     return { isLoading: true };
   },
   computed: {
-    ...mapGetters(['users'], 'course'),
+    ...mapGetters('course', ['users']),
     headers() {
       return ['User', 'Role', ''].map(text => ({ text, sortable: false }));
     }
   },
   methods: {
-    ...mapActions(['getUsers', 'upsertUser', 'removeUser'], 'course'),
+    ...mapActions('course', ['getUsers', 'upsertUser', 'removeUser']),
     fetchUsers() {
       this.isLoading = true;
       return this.getUsers().then(() => (this.isLoading = false));
diff --git a/client/components/course/Settings/index.vue b/client/components/course/Settings/index.vue
index a6e002d12..56b7080a7 100644
--- a/client/components/course/Settings/index.vue
+++ b/client/components/course/Settings/index.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script>
-import { mapActions, mapGetters } from 'vuex-module';
+import { mapActions, mapGetters } from 'vuex';
 import api from '../../../api/course';
 import CloneModal from './CloneModal';
 import EventBus from 'EventBus';
@@ -59,12 +59,12 @@ export default {
   },
   computed: {
     ...mapGetters(['isAdmin']),
-    ...mapGetters(['course', 'outlineActivities', 'isCourseAdmin'], 'course'),
+    ...mapGetters('course', ['course', 'outlineActivities', 'isCourseAdmin']),
     publishPercentage: ({ publishStatus }) => publishStatus.progress * 100
   },
   methods: {
-    ...mapActions({ removeCourse: 'remove' }, 'courses'),
-    ...mapActions({ publishActivity: 'publish' }, 'activities'),
+    ...mapActions('courses', { removeCourse: 'remove' }),
+    ...mapActions('activities', { publishActivity: 'publish' }),
     downloadContentInventory() {
       api.getContentInventory(this.$route.params.courseId)
         .then(response => JSZip.loadAsync(response))
diff --git a/client/components/course/Sidebar/Body.vue b/client/components/course/Sidebar/Body.vue
index 02f4bcc00..5e047f374 100644
--- a/client/components/course/Sidebar/Body.vue
+++ b/client/components/course/Sidebar/Body.vue
@@ -27,7 +27,7 @@
 </template>
 
 <script>
-import { mapActions, mapGetters } from 'vuex-module';
+import { mapActions, mapGetters } from 'vuex';
 import Discussion from './Discussion';
 import Meta from 'components/common/Meta';
 import Publishing from './Publishing';
@@ -36,7 +36,7 @@ import Relationship from './Relationship';
 export default {
   computed: {
     ...mapGetters(['isAdmin']),
-    ...mapGetters(['activity', 'getConfig', 'getMetadata', 'isCourseAdmin'], 'course'),
+    ...mapGetters('course', ['activity', 'getConfig', 'getMetadata', 'isCourseAdmin']),
     config() {
       return this.getConfig(this.activity);
     },
@@ -45,7 +45,7 @@ export default {
     }
   },
   methods: {
-    ...mapActions(['update'], 'activities'),
+    ...mapActions('activities', ['update']),
     updateActivity(key, value) {
       const data = { ...this.activity.data, [key]: value };
       this.update({ _cid: this.activity._cid, data });
diff --git a/client/components/course/Sidebar/Discussion/Comment.vue b/client/components/course/Sidebar/Discussion/Comment.vue
index 302a6ed7d..26d8efc1f 100644
--- a/client/components/course/Sidebar/Discussion/Comment.vue
+++ b/client/components/course/Sidebar/Discussion/Comment.vue
@@ -84,7 +84,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters('auth', ['user']),
+    ...mapGetters(['user']),
     authorInitials() {
       return this.comment.author.email.substr(0, 2).toUpperCase();
     },
diff --git a/client/components/course/Sidebar/Discussion/Thread.vue b/client/components/course/Sidebar/Discussion/Thread.vue
index 4b9b8aa27..29fb65cb9 100644
--- a/client/components/course/Sidebar/Discussion/Thread.vue
+++ b/client/components/course/Sidebar/Discussion/Thread.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import { mapActions, mapGetters } from 'vuex-module';
+import { mapActions, mapGetters } from 'vuex';
 import orderBy from 'lodash/orderBy';
 import ThreadComment from './Comment';
 
@@ -36,7 +36,7 @@ export default {
     }
   },
   methods: {
-    ...mapActions(['update', 'remove'], 'comments'),
+    ...mapActions('comments', ['update', 'remove']),
     onUpdate(comment, content) {
       const updatedAt = Date.now();
       this.update(Object.assign({}, comment, { content, updatedAt }));
diff --git a/client/components/course/Sidebar/Discussion/index.vue b/client/components/course/Sidebar/Discussion/index.vue
index e256f65b2..aa4ed2c85 100644
--- a/client/components/course/Sidebar/Discussion/index.vue
+++ b/client/components/course/Sidebar/Discussion/index.vue
@@ -47,7 +47,7 @@
 </template>
 
 <script>
-import { mapActions, mapGetters } from 'vuex-module';
+import { mapActions, mapGetters } from 'vuex';
 import DiscussionThread from './Thread';
 import TextEditor from 'components/common/TextEditor';
 
@@ -69,8 +69,8 @@ export default {
   },
   computed: {
     ...mapGetters(['user']),
-    ...mapGetters(['activity'], 'course'),
-    ...mapGetters(['commentsCount', 'commentsFetched'], 'comments'),
+    ...mapGetters('course', ['activity']),
+    ...mapGetters('comments', ['commentsCount', 'commentsFetched']),
     direction() {
       return this.editorPosition === 'bottom' ? 'reverse' : '';
     },
@@ -87,7 +87,7 @@ export default {
     }
   },
   methods: {
-    ...mapActions(['fetch', 'save', 'subscribe', 'unsubscribe'], 'comments'),
+    ...mapActions('comments', ['setBaseUrl', 'fetch', 'save', 'subscribe', 'unsubscribe']),
     fetchComments() {
       if (this.commentsFetched) return;
       this.fetch({ activityId: this.activity.id });
@@ -118,6 +118,8 @@ export default {
     }
   },
   mounted() {
+    const { courseId } = this.$route.params;
+    this.setBaseUrl(`/courses/${courseId}/comments`);
     this.fetchComments();
     this.subscribe();
   },
diff --git a/client/components/course/Sidebar/Header.vue b/client/components/course/Sidebar/Header.vue
index aa84c0508..d24aff53c 100644
--- a/client/components/course/Sidebar/Header.vue
+++ b/client/components/course/Sidebar/Header.vue
@@ -23,7 +23,7 @@
 </template>
 
 <script>
-import { mapActions, mapGetters, mapMutations } from 'vuex-module';
+import { mapActions, mapGetters, mapMutations } from 'vuex';
 import EventBus from 'EventBus';
 import filter from 'lodash/filter';
 import find from 'lodash/find';
@@ -37,15 +37,15 @@ const TREE_VIEW_ROUTE = 'tree-view';
 
 export default {
   computed: {
-    ...mapGetters(['activity', 'activities'], 'course'),
+    ...mapGetters('course', ['activity', 'activities']),
     isEditable() {
       const type = get(this.activity, 'type');
       return type && isEditable(type);
     }
   },
   methods: {
-    ...mapActions(['remove'], 'activities'),
-    ...mapMutations(['focusActivity'], 'course'),
+    ...mapActions('activities', ['remove']),
+    ...mapMutations('course', ['focusActivity']),
     edit() {
       if (!this.isEditable) return;
       this.$router.push({
diff --git a/client/components/course/Sidebar/Publishing.vue b/client/components/course/Sidebar/Publishing.vue
index 6c0981e84..ed06e8985 100644
--- a/client/components/course/Sidebar/Publishing.vue
+++ b/client/components/course/Sidebar/Publishing.vue
@@ -32,7 +32,7 @@
 </template>
 
 <script>
-import { mapActions, mapGetters } from 'vuex-module';
+import { mapActions, mapGetters } from 'vuex';
 import fecha from 'fecha';
 import { getDescendants } from 'utils/activity';
 import { getLevel } from 'shared/activities';
@@ -41,7 +41,7 @@ import publishMixin from 'components/common/mixins/publish';
 export default {
   mixins: [publishMixin],
   computed: {
-    ...mapGetters(['activity', 'outlineActivities'], 'course'),
+    ...mapGetters('course', ['activity', 'outlineActivities']),
     config() {
       return getLevel(this.activity.type);
     },
diff --git a/client/components/course/Sidebar/Relationship.vue b/client/components/course/Sidebar/Relationship.vue
index 284d27b4a..d4835754d 100644
--- a/client/components/course/Sidebar/Relationship.vue
+++ b/client/components/course/Sidebar/Relationship.vue
@@ -21,7 +21,7 @@
 
 <script>
 import { getLevel, getSchemaId } from 'shared/activities';
-import { mapActions, mapGetters } from 'vuex-module';
+import { mapActions, mapGetters } from 'vuex';
 import castArray from 'lodash/castArray';
 import cloneDeep from 'lodash/cloneDeep';
 import compact from 'lodash/compact';
@@ -50,8 +50,8 @@ export default {
     allowedTypes: { type: Array, default: () => [] }
   },
   computed: {
-    ...mapGetters(['activity', 'outlineActivities'], 'course'),
-    ...mapGetters(['getLineage'], 'activities'),
+    ...mapGetters('course', ['activity', 'outlineActivities']),
+    ...mapGetters('activities', ['getLineage']),
     options() {
       const { allowInsideLineage, allowCircularLinks, activity: { id } } = this;
       const activities = without(this.outlineActivities, this.activity);
@@ -83,7 +83,7 @@ export default {
     }
   },
   methods: {
-    ...mapActions(['update'], 'activities'),
+    ...mapActions('activities', ['update']),
     getCustomLabel(activity) {
       return get(activity, 'data.name', '');
     },
diff --git a/client/components/course/Sidebar/index.vue b/client/components/course/Sidebar/index.vue
index ea0bbf6ee..180b183f4 100644
--- a/client/components/course/Sidebar/index.vue
+++ b/client/components/course/Sidebar/index.vue
@@ -16,13 +16,13 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex-module';
+import { mapGetters } from 'vuex';
 import SidebarBody from './Body';
 import SidebarHeader from './Header';
 
 export default {
   computed: {
-    ...mapGetters(['activity'], 'course'),
+    ...mapGetters('course', ['activity']),
     activitySelected() {
       return !!this.activity._cid;
     }
diff --git a/client/components/course/TreeView/index.vue b/client/components/course/TreeView/index.vue
index 8eed1c077..112a4b7c1 100644
--- a/client/components/course/TreeView/index.vue
+++ b/client/components/course/TreeView/index.vue
@@ -18,7 +18,7 @@
 </template>
 
 <script>
-import { mapGetters, mapMutations } from 'vuex-module';
+import { mapGetters, mapMutations } from 'vuex';
 import filter from 'lodash/filter';
 import find from 'lodash/find';
 import get from 'lodash/get';
@@ -47,7 +47,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['activities', 'course', 'structure'], 'course'),
+    ...mapGetters('course', ['activities', 'course', 'structure']),
     // TODO: Remove this hack!
     visibility() {
       return this.showLoader ? 'hidden' : 'visible';
@@ -65,7 +65,7 @@ export default {
     }
   },
   methods: {
-    ...mapMutations(['focusActivity'], 'course'),
+    ...mapMutations('course', ['focusActivity']),
     setSelected(node) {
       if (this.selectedNode) this.selectedNode.classList.remove('selected');
       this.selectedNode = node;
diff --git a/client/components/course/index.vue b/client/components/course/index.vue
index e0d7c0a44..9d3a0b441 100644
--- a/client/components/course/index.vue
+++ b/client/components/course/index.vue
@@ -24,7 +24,7 @@
 </template>
 
 <script>
-import { mapActions, mapGetters, mapMutations } from 'vuex-module';
+import { mapActions, mapGetters, mapMutations } from 'vuex';
 import filter from 'lodash/filter';
 import Promise from 'bluebird';
 import sortBy from 'lodash/sortBy';
@@ -37,7 +37,7 @@ export default {
   },
   computed: {
     ...mapGetters(['isAdmin']),
-    ...mapGetters(['course', 'activities', 'activity', 'isCourseAdmin'], 'course'),
+    ...mapGetters('course', ['course', 'activities', 'activity', 'isCourseAdmin']),
     tabs() {
       const items = [
         { name: 'Structure', route: 'course', icon: 'file-tree' },
@@ -50,14 +50,14 @@ export default {
     }
   },
   methods: {
-    ...mapActions(['getUsers'], 'course'),
-    ...mapActions({ getCourse: 'get' }, 'courses'),
-    ...mapActions({ getActivities: 'fetch' }, 'activities'),
-    ...mapMutations({ resetActivityFocus: 'focusActivity' }, 'course'),
-    ...mapMutations({ setupActivityApi: 'setBaseUrl' }, 'activities'),
-    ...mapMutations({ setupCommentsApi: 'setBaseUrl' }, 'comments'),
-    ...mapMutations({ setupRevisionApi: 'setBaseUrl' }, 'revisions'),
-    ...mapMutations({ setupTesApi: 'setBaseUrl' }, 'tes')
+    ...mapActions('course', ['getUsers']),
+    ...mapActions('courses', { getCourse: 'get' }),
+    ...mapActions('activities', { getActivities: 'fetch' }),
+    ...mapMutations('course', { resetActivityFocus: 'focusActivity' }),
+    ...mapActions('activities', { setupActivityApi: 'setBaseUrl' }),
+    ...mapActions('comments', { setupCommentsApi: 'setBaseUrl' }),
+    ...mapActions('revisions', { setupRevisionApi: 'setBaseUrl' }),
+    ...mapActions('tes', { setupTesApi: 'setBaseUrl' })
   },
   async created() {
     const { courseId } = this.$route.params;
diff --git a/client/components/editor/MainSidebar/index.vue b/client/components/editor/MainSidebar/index.vue
index ffc907191..4737dd14a 100644
--- a/client/components/editor/MainSidebar/index.vue
+++ b/client/components/editor/MainSidebar/index.vue
@@ -32,7 +32,7 @@
 </template>
 
 <script>
-import { mapActions, mapGetters } from 'vuex-module';
+import { mapActions, mapGetters } from 'vuex';
 import ActivitySidebar from '../../course/Sidebar/Body';
 import Discussion from '../../course/Sidebar/Discussion';
 import format from 'string-template';
@@ -48,7 +48,7 @@ export default {
   },
   computed: {
     ...mapGetters(['isAdmin']),
-    ...mapGetters(['outlineActivities', 'isCourseAdmin'], 'course'),
+    ...mapGetters('course', ['outlineActivities', 'isCourseAdmin']),
     actions() {
       const { $router, activity: { courseId } } = this;
       const items = [{
@@ -73,7 +73,7 @@ export default {
       return format(PREVIEW_URL, { repositoryId: courseId, activityId: id });
     }
   },
-  methods: mapActions({ publishActivity: 'publish' }, 'activities'),
+  methods: mapActions('activities', { publishActivity: 'publish' }),
   components: { ActivitySidebar, Discussion }
 };
 </script>
diff --git a/client/components/editor/MetaSidebar/index.vue b/client/components/editor/MetaSidebar/index.vue
index c6a1eeff0..71ae21046 100644
--- a/client/components/editor/MetaSidebar/index.vue
+++ b/client/components/editor/MetaSidebar/index.vue
@@ -14,7 +14,7 @@
 
 <script>
 import cloneDeep from 'lodash/cloneDeep';
-import { mapActions } from 'vuex-module';
+import { mapActions } from 'vuex';
 import MetaInput from 'components/common/Meta';
 
 export default {
@@ -29,7 +29,7 @@ export default {
     };
   },
   methods: {
-    ...mapActions(['update'], 'tes'),
+    ...mapActions('tes', ['update']),
     updateElement(key, value) {
       this.sidebarMeta = { ...this.sidebarMeta, [key]: value };
       return this.update({
diff --git a/client/components/editor/TeachingElement.vue b/client/components/editor/TeachingElement.vue
index b046b854b..1d444c1e7 100644
--- a/client/components/editor/TeachingElement.vue
+++ b/client/components/editor/TeachingElement.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import { mapActions, mapMutations } from 'vuex-module';
+import { mapActions, mapMutations } from 'vuex';
 import cloneDeep from 'lodash/cloneDeep';
 import { ContainedContent } from 'tce-core';
 import EventBus from 'EventBus';
@@ -25,8 +25,8 @@ export default {
     dragged: { type: Boolean, default: false }
   },
   methods: {
-    ...mapActions({ saveElement: 'save', removeElement: 'remove' }, 'tes'),
-    ...mapMutations({ addElement: 'add' }, 'tes'),
+    ...mapActions('tes', { saveElement: 'save', removeElement: 'remove' }),
+    ...mapMutations('tes', { addElement: 'add' }),
     add(element) {
       this.addElement({ ...this.element, ...cloneDeep(element) });
     },
diff --git a/client/components/editor/Toolbar.vue b/client/components/editor/Toolbar.vue
index dc529f8f1..f0c249dba 100644
--- a/client/components/editor/Toolbar.vue
+++ b/client/components/editor/Toolbar.vue
@@ -34,7 +34,7 @@
 <script>
 import { ElementToolbar } from 'tce-core';
 import { getLevel } from 'shared/activities';
-import { mapGetters } from 'vuex-module';
+import { mapGetters } from 'vuex';
 
 export default {
   name: 'editor-toolbar',
@@ -42,7 +42,7 @@ export default {
     element: { type: Object, default: null }
   },
   computed: {
-    ...mapGetters(['activity'], 'editor'),
+    ...mapGetters('editor', ['activity']),
     config() {
       return getLevel(this.activity.type);
     }
diff --git a/client/components/editor/index.vue b/client/components/editor/index.vue
index 18c71a790..378aa94bb 100644
--- a/client/components/editor/index.vue
+++ b/client/components/editor/index.vue
@@ -45,7 +45,7 @@
 <script>
 import * as config from 'shared/activities';
 import { getElementId, isQuestion } from 'tce-core/utils';
-import { mapActions, mapGetters, mapMutations } from 'vuex-module';
+import { mapActions, mapGetters, mapMutations } from 'vuex';
 import Assessments from './structure/Assessments';
 import ContentContainers from './structure/ContentContainers';
 import debounce from 'lodash/debounce';
@@ -71,8 +71,8 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['course', 'getMetadata'], 'course'),
-    ...mapGetters(['activity', 'contentContainers'], 'editor'),
+    ...mapGetters('course', ['course', 'getMetadata']),
+    ...mapGetters('editor', ['activity', 'contentContainers']),
     metadata() {
       if (!this.focusedElement) return [];
       return this.getMetadata(this.focusedElement);
@@ -89,11 +89,11 @@ export default {
     }
   },
   methods: {
-    ...mapActions({ getCourse: 'get' }, 'courses'),
-    ...mapActions({ getActivities: 'fetch' }, 'activities'),
-    ...mapActions({ getTeachingElements: 'fetch' }, 'tes'),
-    ...mapMutations({ setupActivitiesApi: 'setBaseUrl' }, 'activities'),
-    ...mapMutations({ setupTesApi: 'setBaseUrl' }, 'tes'),
+    ...mapActions('courses', { getCourse: 'get' }),
+    ...mapActions('activities', { getActivities: 'fetch' }),
+    ...mapActions('tes', { getTeachingElements: 'fetch' }),
+    ...mapMutations('activities', { setupActivitiesApi: 'setBaseUrl' }),
+    ...mapMutations('tes', { setupTesApi: 'setBaseUrl' }),
     getContainerConfig(type) {
       return find(this.containerConfigs, { type });
     },
diff --git a/client/components/editor/structure/AssessmentItem.vue b/client/components/editor/structure/AssessmentItem.vue
index 70e9820b8..e36b53ed3 100644
--- a/client/components/editor/structure/AssessmentItem.vue
+++ b/client/components/editor/structure/AssessmentItem.vue
@@ -69,7 +69,7 @@ import get from 'lodash/get';
 import { getLevel } from 'shared/activities';
 import isEmpty from 'lodash/isEmpty';
 import map from 'lodash/map';
-import { mapGetters } from 'vuex-module';
+import { mapGetters } from 'vuex';
 import Multiselect from '../../common/Select';
 import set from 'lodash/set';
 import truncate from 'lodash/truncate';
@@ -93,7 +93,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['getExamObjectives'], 'activities'),
+    ...mapGetters('activities', ['getExamObjectives']),
     elementConfig() {
       return this.$teRegistry.get(this.assessment.data.type);
     },
diff --git a/client/components/editor/structure/Assessments.vue b/client/components/editor/structure/Assessments.vue
index beed6a3be..f6f3fff07 100644
--- a/client/components/editor/structure/Assessments.vue
+++ b/client/components/editor/structure/Assessments.vue
@@ -30,7 +30,7 @@
 </template>
 
 <script>
-import { mapActions, mapGetters, mapMutations } from 'vuex-module';
+import { mapActions, mapGetters, mapMutations } from 'vuex';
 import AddElement from 'tce-core/AddElement';
 import AssessmentItem from './AssessmentItem';
 import EventBus from 'EventBus';
@@ -47,14 +47,14 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['activity', 'assessments'], 'editor'),
+    ...mapGetters('editor', ['activity', 'assessments']),
     hasAssessments() {
       return this.assessments.length;
     }
   },
   methods: {
-    ...mapActions(['save', 'update', 'remove'], 'tes'),
-    ...mapMutations(['add'], 'tes'),
+    ...mapActions('tes', ['save', 'update', 'remove']),
+    ...mapMutations('tes', ['add']),
     addAssessment(assessment) {
       this.add(assessment);
       this.selected.push(assessment._cid);
diff --git a/client/components/editor/structure/ContentContainers/Container.vue b/client/components/editor/structure/ContentContainers/Container.vue
index 6fec9eb60..db67fbd96 100644
--- a/client/components/editor/structure/ContentContainers/Container.vue
+++ b/client/components/editor/structure/ContentContainers/Container.vue
@@ -35,7 +35,7 @@
 </template>
 
 <script>
-import { mapActions, mapGetters } from 'vuex-module';
+import { mapActions, mapGetters } from 'vuex';
 import filter from 'lodash/filter';
 import sortBy from 'lodash/sortBy';
 import TeachingElement from '../../TeachingElement';
@@ -57,11 +57,11 @@ export default {
     }
   },
   methods: {
-    ...mapActions({
+    ...mapActions('tes', {
       reorderElements: 'reorder',
       insertElement: 'insert',
       addElement: 'save'
-    }, 'tes'),
+    }),
     reorder({ newIndex: newPosition }) {
       const items = this.teachingElements;
       const element = items[newPosition];
diff --git a/client/components/editor/structure/ContentContainers/index.vue b/client/components/editor/structure/ContentContainers/index.vue
index 0b1153b41..34799a6be 100644
--- a/client/components/editor/structure/ContentContainers/index.vue
+++ b/client/components/editor/structure/ContentContainers/index.vue
@@ -33,7 +33,7 @@ import ContentContainer from './Container';
 import EventBus from 'EventBus';
 import get from 'lodash/get';
 import isEmpty from 'lodash/isEmpty';
-import { mapActions } from 'vuex-module';
+import { mapActions } from 'vuex';
 import maxBy from 'lodash/maxBy';
 
 const appChannel = EventBus.channel('app');
@@ -63,7 +63,7 @@ export default {
     }
   },
   methods: {
-    ...mapActions(['save', 'remove'], 'activities'),
+    ...mapActions('activities', ['save', 'remove']),
     addContainer() {
       const { type, parentId, nextPosition: position } = this;
       this.save({ type, parentId, position });
diff --git a/client/components/editor/structure/Exams/AssessmentGroup.vue b/client/components/editor/structure/Exams/AssessmentGroup.vue
index 91d03ba23..ff71a5477 100644
--- a/client/components/editor/structure/Exams/AssessmentGroup.vue
+++ b/client/components/editor/structure/Exams/AssessmentGroup.vue
@@ -44,7 +44,7 @@
 </template>
 
 <script>
-import { mapActions, mapGetters, mapMutations } from 'vuex-module';
+import { mapActions, mapGetters, mapMutations } from 'vuex';
 import AssessmentItem from '../AssessmentItem';
 import cloneDeep from 'lodash/cloneDeep';
 import debounce from 'lodash/debounce';
@@ -82,9 +82,9 @@ export default {
     }
   },
   methods: {
-    ...mapMutations(['add'], 'tes'),
-    ...mapActions(['save', 'update', 'reorder', 'remove'], 'tes'),
-    ...mapActions({ updateGroup: 'update', removeGroup: 'remove' }, 'activities'),
+    ...mapMutations('tes', ['add']),
+    ...mapActions('tes', ['save', 'update', 'reorder', 'remove']),
+    ...mapActions('activities', { updateGroup: 'update', removeGroup: 'remove' }),
     addAssessment(assessment) {
       this.add(assessment);
       this.selected.push(assessment._cid);
diff --git a/client/components/editor/structure/Exams/Exam.vue b/client/components/editor/structure/Exams/Exam.vue
index af3c8d501..6c439a3f7 100644
--- a/client/components/editor/structure/Exams/Exam.vue
+++ b/client/components/editor/structure/Exams/Exam.vue
@@ -44,7 +44,7 @@
 </template>
 
 <script>
-import { mapActions, mapGetters } from 'vuex-module';
+import { mapActions, mapGetters } from 'vuex';
 import AssessmentGroup from './AssessmentGroup';
 import EventBus from 'EventBus';
 import filter from 'lodash/filter';
@@ -79,8 +79,8 @@ export default {
     }
   },
   methods: {
-    ...mapActions(['save', 'remove'], 'activities'),
-    ...mapActions({ getTeachingElements: 'fetch' }, 'tes'),
+    ...mapActions('activities', ['save', 'remove']),
+    ...mapActions('tes', { getTeachingElements: 'fetch' }),
     createGroup() {
       this.save({
         type: 'ASSESSMENT_GROUP',
diff --git a/client/components/editor/structure/Exams/GroupIntroduction.vue b/client/components/editor/structure/Exams/GroupIntroduction.vue
index f85adf9ac..49bba91c3 100644
--- a/client/components/editor/structure/Exams/GroupIntroduction.vue
+++ b/client/components/editor/structure/Exams/GroupIntroduction.vue
@@ -19,7 +19,7 @@
 </template>
 
 <script>
-import { mapActions, mapGetters } from 'vuex-module';
+import { mapActions, mapGetters } from 'vuex';
 import filter from 'lodash/filter';
 import { isQuestion } from 'tce-core/utils';
 import TeachingElement from '../../TeachingElement';
@@ -38,7 +38,7 @@ export default {
     }
   },
   methods: {
-    ...mapActions({ reorderElements: 'reorder', saveElement: 'save' }, 'tes'),
+    ...mapActions('tes', { reorderElements: 'reorder', saveElement: 'save' }),
     reorder({ newIndex: newPosition }) {
       const items = this.introductionElements;
       const element = items[newPosition];
diff --git a/client/components/editor/structure/Exams/index.vue b/client/components/editor/structure/Exams/index.vue
index a4138c5d0..41f3ce4cf 100644
--- a/client/components/editor/structure/Exams/index.vue
+++ b/client/components/editor/structure/Exams/index.vue
@@ -17,14 +17,14 @@
 </template>
 
 <script>
-import { mapActions, mapGetters } from 'vuex-module';
+import { mapActions, mapGetters } from 'vuex';
 import Exam from './Exam';
 import filter from 'lodash/filter';
 
 export default {
   name: 'exams',
   computed: {
-    ...mapGetters(['activity'], 'editor'),
+    ...mapGetters('editor', ['activity']),
     ...mapGetters(['activities']),
     exams() {
       const parentId = this.activity.id;
@@ -32,7 +32,7 @@ export default {
     }
   },
   methods: {
-    ...mapActions(['save'], 'activities'),
+    ...mapActions('activities', ['save']),
     create() {
       this.save({
         type: 'EXAM',
diff --git a/client/router.js b/client/router.js
index fdd5f2ee1..dc3d775e7 100644
--- a/client/router.js
+++ b/client/router.js
@@ -80,7 +80,7 @@ let router = new Router({
 });
 
 router.beforeEach((to, from, next) => {
-  if (to.matched.some(it => it.meta.auth) && !store.getters['auth/user']) {
+  if (to.matched.some(it => it.meta.auth) && !store.getters.user) {
     next({ path: '/login', query: { redirect: to.fullPath } });
   } else {
     next();
diff --git a/client/store/helpers/actions.js b/client/store/helpers/actions.js
new file mode 100644
index 000000000..b78292ed7
--- /dev/null
+++ b/client/store/helpers/actions.js
@@ -0,0 +1,76 @@
+import cuid from 'cuid';
+import Resource from './resource';
+
+export default function ($baseUrl) {
+  let api = new Resource($baseUrl);
+
+  const get = ({ commit }, id) => {
+    // TODO:  check if it needs replacing like boutique
+    //        commit('save', res) || res)
+    return api.getById(id).then(res => commit('save', res));
+  };
+
+  const fetch = ({ commit }, params = {}) => {
+    return api.fetch(params).then(res => commit('fetch', res));
+  };
+
+  const reset = ({ commit }) => {
+    return api.fetch().then(res => commit('reset', res));
+  };
+
+  const save = ({ commit, state }, model) => {
+    if (!model._cid) model._cid = cuid();
+    model._synced = false;
+    model._version = Date.now();
+
+    // create or update model locally
+    commit('save', model);
+
+    return api.save(model)
+      .then(model => {
+        // check if new change happened locally during api call
+        // do not update meta if there is newer change
+        const previous = state.items[model._cid];
+        if (previous && previous._version === model._version) model._synced = true;
+        commit('save', model);
+      });
+  };
+
+  const remove = ({ commit }, model) => {
+    // If added locally; not waiting for id (add)
+    if (!model.id && !model._version) {
+      commit('remove', [model]);
+      return Promise.resolve(true);
+    }
+
+    return api.remove(model)
+      .then(removed => commit('remove', removed));
+  };
+
+  const update = ({ commit }, model) => {
+    const cid = model._cid;
+    const changes = { ...model };
+    delete changes._cid;
+    return api.update(cid, changes)
+      .then(updated => commit('update', updated));
+  };
+
+  const setBaseUrl = ({ state, commit }, baseUrl) => {
+    if (state.$baseUrl !== baseUrl) {
+      api = new Resource(baseUrl);
+      commit('setBaseUrl', baseUrl);
+    }
+    console.log('base setBaseUrl', { api, baseUrl: api.baseUrl, args: [...arguments] });
+  };
+
+  return {
+    api,
+    get,
+    fetch,
+    reset,
+    save,
+    remove,
+    update,
+    setBaseUrl
+  };
+}
diff --git a/client/store/helpers/collection.js b/client/store/helpers/collectionX.js
similarity index 98%
rename from client/store/helpers/collection.js
rename to client/store/helpers/collectionX.js
index e0a31bf8a..61a1332a4 100644
--- a/client/store/helpers/collection.js
+++ b/client/store/helpers/collectionX.js
@@ -1,6 +1,6 @@
 import cuid from 'cuid';
 import each from 'lodash/each';
-import Resource from '../../api/resource';
+import Resource from './resource';
 
 import Vue from 'vue';
 import { VuexModule } from 'vuex-module';
@@ -15,7 +15,6 @@ export default function (collectionName, baseUrl = '') {
     $internals: {},
     $baseUrl: baseUrl
   });
-
   const getBaseUrl = () => module.state.$baseUrl;
   module.api = new Resource(getBaseUrl);
 
diff --git a/client/store/helpers/mutations.js b/client/store/helpers/mutations.js
new file mode 100644
index 000000000..8e32e6b76
--- /dev/null
+++ b/client/store/helpers/mutations.js
@@ -0,0 +1,52 @@
+import cuid from 'cuid';
+import each from 'lodash/each';
+import Resource from './resource';
+import Vue from 'vue';
+
+export default function ($apiUrl) {
+  let api = new Resource($apiUrl);
+
+  const fetch = (state, result) => {
+    each(result, it => {
+      // TODO: Extract api unrelated methods
+      api.setCid(it);
+      Vue.set(state.items, it._cid, it);
+    });
+  };
+
+  const reset = (state, result) => {
+    state.items = result;
+  };
+
+  const add = (state, model) => {
+    if (!model._cid) model._cid = cuid();
+    Vue.set(state.items, model._cid, model);
+  };
+
+  const save = (state, model) => {
+    Vue.set(state.items, model._cid, model);
+  };
+
+  const remove = (state, result) => {
+    result.forEach(it => Vue.delete(state.items, it._cid));
+  };
+
+  const update = (state, model) => {
+    Vue.set(state.items, model._cid, model);
+  };
+
+  const setBaseUrl = (state, url) => {
+    state.$baseUrl = url;
+  };
+
+  return {
+    api,
+    fetch,
+    reset,
+    add,
+    save,
+    remove,
+    update,
+    setBaseUrl
+  };
+}
diff --git a/client/api/resource.js b/client/store/helpers/resource.js
similarity index 96%
rename from client/api/resource.js
rename to client/store/helpers/resource.js
index 66e5c604e..7ab35a103 100644
--- a/client/api/resource.js
+++ b/client/store/helpers/resource.js
@@ -1,5 +1,5 @@
 import assign from 'lodash/assign';
-import axios from './request';
+import axios from '../../api/request';
 import cloneDeep from 'lodash/cloneDeep';
 import cuid from 'cuid';
 import join from 'url-join';
@@ -10,14 +10,14 @@ import Queue from 'promise-queue';
 const queue = new Queue(1, Infinity);
 
 export default class Resource {
-  constructor(getBaseUrl) {
-    this.getBaseUrl = getBaseUrl;
+  constructor(baseUrl) {
+    this.baseUrl = baseUrl;
     this.queue = queue;
     this.mappings = {};
   }
 
   url(path = '') {
-    return join(this.getBaseUrl(), path.toString());
+    return join(this.baseUrl, path.toString());
   }
 
   /**
diff --git a/client/store/index.js b/client/store/index.js
index 08d2f57b8..49441a4cc 100644
--- a/client/store/index.js
+++ b/client/store/index.js
@@ -29,9 +29,27 @@ const modules = {
   tes
 };
 
+const mapGetters = (namespace, getters) => {
+  return getters.reduce((acc, name) => {
+    const path = [namespace, name].join('/');
+    return Object.assign(acc, {
+      [name](_, getters) {
+        return getters[path];
+      }
+    });
+  }, {});
+};
+
 export default new Vuex.Store({
   middlewares,
   modules,
   plugins,
+  getters: {
+    ...mapGetters('courses', ['courses', 'courseQueryParams']),
+    ...mapGetters('activities', ['activities']),
+    ...mapGetters('tes', ['tes']),
+    ...mapGetters('revisions', ['revisions', 'revisionQueryParams']),
+    ...mapGetters('comments', ['comments'])
+  },
   strict: false
 });
diff --git a/client/store/modules/activities.js b/client/store/modules/activities.js
deleted file mode 100644
index ed6910446..000000000
--- a/client/store/modules/activities.js
+++ /dev/null
@@ -1,94 +0,0 @@
-import {
-  getDescendants as getDeepChildren,
-  getAncestors as getParents
-} from 'utils/activity';
-import calculatePosition from 'utils/calculatePosition';
-import filter from 'lodash/filter';
-import find from 'lodash/find';
-import get from 'lodash/get';
-import { getLevel } from 'shared/activities';
-import request from '../../api/request';
-import VuexCollection from '../helpers/collection';
-
-const { getter, action, mutation, build } = new VuexCollection('activities');
-
-getter(function activities() {
-  return this.state.items;
-}, { global: true });
-
-getter(function getParent() {
-  return activityId => {
-    const activity = find(this.state.items, { id: activityId });
-    return activity ? find(this.state.items, { id: activity.parentId }) : null;
-  };
-});
-
-getter(function getDescendants() {
-  return activity => getDeepChildren(this.state.items, activity);
-});
-
-getter(function getAncestors() {
-  return activity => getParents(this.state.items, activity);
-});
-
-getter(function getLineage() {
-  return activity => {
-    const ancestors = getParents(this.state.items, activity);
-    const descendants = getDeepChildren(this.state.items, activity);
-    return [...ancestors, ...descendants];
-  };
-});
-
-getter(function getExamObjectives() {
-  const getObjectives = activity => {
-    const config = getLevel(activity.type);
-    const objectiveTypes = get(config, 'exams.objectives');
-    if (!objectiveTypes) return [];
-    let children = getDeepChildren(this.state.items, activity);
-    return filter(children, it => objectiveTypes.includes(it.type));
-  };
-
-  return exam => getObjectives(find(this.state.items, { id: exam.parentId }));
-});
-
-action(function reorder({ activity, context }) {
-  this.commit('reorder', { activity, position: calculatePosition(context) });
-  const data = { position: context.newPosition };
-  return this.api.post(`${activity.id}/reorder`, data)
-    .then(res => {
-      let activity = res.data.data;
-      this.api.setCid(activity);
-      this.commit('save', activity);
-    });
-});
-
-action(function remove(model) {
-  const descendants = getDeepChildren(this.state.items, model);
-  if (!model.id && !model._version) {
-    this.commit('remove', [model]);
-    return Promise.resolve(true);
-  }
-  return this.api.remove(model)
-    .then(() => this.commit('remove', [model, ...descendants]));
-});
-
-action(function clone(mapping) {
-  const { srcId, srcCourseId } = mapping;
-  const url = `/courses/${srcCourseId}/activities/${srcId}/clone`;
-  return request.post(url, mapping)
-    .then(({ data: { data } }) => this.commit('fetch', data));
-});
-
-action(function publish(activity) {
-  const { id, courseId } = activity;
-  const url = `/courses/${courseId}/activities/${id}/publish`;
-  return request.get(url).then(({ data: { data } }) => {
-    this.commit('save', { ...activity, publishedAt: data.publishedAt });
-  });
-});
-
-mutation(function reorder({ activity, position }) {
-  activity.position = position;
-});
-
-export default build();
diff --git a/client/store/modules/activities/actions.js b/client/store/modules/activities/actions.js
new file mode 100644
index 000000000..1d75ca119
--- /dev/null
+++ b/client/store/modules/activities/actions.js
@@ -0,0 +1,44 @@
+import calculatePosition from 'utils/calculatePosition';
+import generateActions from '../../helpers/actions';
+import { getDescendants as getDeepChildren } from 'utils/activity';
+import request from '../../../api/request';
+
+const { api, get, fetch, reset, save, update, setBaseUrl } = generateActions();
+
+const reorder = ({ commit }, { activity, context }) => {
+  commit('reorder', { activity, position: calculatePosition(context) });
+  const data = { position: context.newPosition };
+  return api.post(`${activity.id}/reorder`, data)
+    .then(res => {
+      let activity = res.data.data;
+      api.setCid(activity);
+      commit('save', activity);
+    });
+};
+
+const remove = ({ state, commit }, model) => {
+  const descendants = getDeepChildren(state.items, model);
+  if (!model.id && !model._version) {
+    commit('remove', [model]);
+    return Promise.resolve(true);
+  }
+  return api.remove(model)
+    .then(() => commit('remove', [model, ...descendants]));
+};
+
+const clone = ({ commit }, mapping) => {
+  const { srcId, srcCourseId } = mapping;
+  const url = `/courses/${srcCourseId}/activities/${srcId}/clone`;
+  return request.post(url, mapping)
+    .then(({ data: { data } }) => commit('fetch', data));
+};
+
+const publish = ({ commit }, activity) => {
+  const { id, courseId } = activity;
+  const url = `/courses/${courseId}/activities/${id}/publish`;
+  return request.get(url).then(({ data: { data } }) => {
+    commit('save', { ...activity, publishedAt: data.publishedAt });
+  });
+};
+
+export { clone, get, fetch, publish, remove, reorder, reset, save, update, setBaseUrl };
diff --git a/client/store/modules/activities/getters.js b/client/store/modules/activities/getters.js
new file mode 100644
index 000000000..1096bdb68
--- /dev/null
+++ b/client/store/modules/activities/getters.js
@@ -0,0 +1,41 @@
+import {
+  getDescendants as getDeepChildren,
+  getAncestors as getParents
+} from 'utils/activity';
+import filter from 'lodash/filter';
+import find from 'lodash/find';
+import get from 'lodash/get';
+import { getLevel } from 'shared/activities';
+
+export const activities = state => state.items;
+
+export const getParent = state => {
+  return activityId => {
+    const activity = find(state.items, { id: activityId });
+    return activity ? find(state.items, { id: activity.parentId }) : null;
+  };
+};
+
+export const getDescendants = state => {
+  return activity => getDeepChildren(state.items, activity);
+};
+
+export const getAncestors = state => {
+  return activity => getParents(state.items, activity);
+};
+
+export const getLineage = state => {
+  return activity => getParents(state.items, activity);
+};
+
+export const getExamObjectives = state => {
+  const getObjectives = activity => {
+    const config = getLevel(activity.type);
+    const objectiveTypes = get(config, 'exams.objectives');
+    if (!objectiveTypes) return [];
+    let children = getDeepChildren(state.items, activity);
+    return filter(children, it => objectiveTypes.includes(it.type));
+  };
+
+  return exam => getObjectives(find(state.items, { id: exam.parentId }));
+};
diff --git a/client/store/modules/activities/index.js b/client/store/modules/activities/index.js
new file mode 100644
index 000000000..b296fc703
--- /dev/null
+++ b/client/store/modules/activities/index.js
@@ -0,0 +1,17 @@
+import * as actions from './actions';
+import * as getters from './getters';
+import * as mutations from './mutations';
+
+const state = {
+  items: {},
+  $internals: {},
+  $baseUrl: ''
+};
+
+export default {
+  namespaced: true,
+  state,
+  getters,
+  actions,
+  mutations
+};
diff --git a/client/store/modules/activities/mutations.js b/client/store/modules/activities/mutations.js
new file mode 100644
index 000000000..70f976e51
--- /dev/null
+++ b/client/store/modules/activities/mutations.js
@@ -0,0 +1,9 @@
+import generateMutations from '../../helpers/mutations';
+
+const { fetch, reset, add, save, remove, update, setBaseUrl } = generateMutations();
+
+const reorder = (state, { activity, position }) => {
+  activity.position = position;
+};
+
+export { fetch, reset, add, save, remove, reorder, update, setBaseUrl };
diff --git a/client/store/modules/auth/actions.js b/client/store/modules/auth/actions.js
index d98a7693a..d3825a8f0 100644
--- a/client/store/modules/auth/actions.js
+++ b/client/store/modules/auth/actions.js
@@ -1,12 +1,12 @@
-import authApi from '../../../api/auth';
+import api from '../../../api/auth';
 
 export const login = ({ commit }, credentials) => {
-  return authApi.login(credentials)
+  return api.login(credentials)
     .then(user => commit('login', user));
 };
 
 export const logout = () => {
-  return authApi
+  return api
     .logout()
     .then(() => setTimeout(() => {
       window.localStorage.removeItem('TAILOR_USER');
@@ -15,9 +15,9 @@ export const logout = () => {
 };
 
 export const forgotPassword = (context, { email }) => {
-  return authApi.forgotPassword(email);
+  return api.forgotPassword(email);
 };
 
 export const resetPassword = (context, { token, password }) => {
-  return authApi.resetPassword(token, password);
+  return api.resetPassword(token, password);
 };
diff --git a/client/store/modules/auth/index.js b/client/store/modules/auth/index.js
index f4a283072..be2c36883 100644
--- a/client/store/modules/auth/index.js
+++ b/client/store/modules/auth/index.js
@@ -3,11 +3,12 @@ import * as getters from './getters';
 import * as mutations from './mutations';
 
 const state = {
-  user: JSON.parse(window.localStorage.getItem('TAILOR_USER')) || {}
+  user: JSON.parse(window.localStorage.getItem('TAILOR_USER')) || {},
+  items: {}
 };
 
 export default {
-  namespaced: true,
+  namespaced: false,
   state,
   getters,
   actions,
diff --git a/client/store/modules/auth/mutations.js b/client/store/modules/auth/mutations.js
index e09ecf769..658a21787 100644
--- a/client/store/modules/auth/mutations.js
+++ b/client/store/modules/auth/mutations.js
@@ -1,6 +1,5 @@
 export const login = (state, user) => {
   state.user = user;
-  console.log(state);
 };
 
 export const logout = state => {
diff --git a/client/store/modules/comments.js b/client/store/modules/comments.js
deleted file mode 100644
index 4d2849071..000000000
--- a/client/store/modules/comments.js
+++ /dev/null
@@ -1,87 +0,0 @@
-import cuid from 'cuid';
-import filter from 'lodash/filter';
-import find from 'lodash/find';
-import orderBy from 'lodash/orderBy';
-import pick from 'lodash/pick';
-import SSEClient from '../../SSEClient';
-import Vue from 'vue';
-import VuexCollection from '../helpers/collection';
-
-const { action, getter, state, mutation, build } = new VuexCollection('comments');
-let SSE_CLIENT;
-
-state({
-  courseId: '',
-  activitiesFetched: {}
-});
-
-getter(function comments() {
-  const activityId = this.rootGetters['course/activity'].id;
-  const activityComments = filter(this.state.items, { activityId });
-  return orderBy(activityComments, 'createdAt', 'desc');
-}, { global: true });
-
-getter(function commentsCount() {
-  return Object.keys(this.rootGetters.comments).length;
-});
-
-getter(function commentsFetched() {
-  const activityId = this.rootGetters['course/activity'].id;
-  return !!this.state.activitiesFetched[activityId];
-});
-
-action(function fetch({ activityId }) {
-  const { courseId } = this.rootState.route.params;
-  let action = this.state.courseId === courseId ? 'fetch' : 'reset';
-  if (action === 'reset') this.commit('setCourse', courseId);
-  this.api.fetch({ activityId })
-    .then(result => this.commit(action, result))
-    .then(result => this.commit('commentsFetched', activityId));
-});
-
-action(function subscribe() {
-  if (SSE_CLIENT) SSE_CLIENT.disconnect();
-  SSE_CLIENT = new SSEClient(`/api/v1${this.state.$baseUrl}/subscribe`);
-  SSE_CLIENT.subscribe('comment_create', item => this.commit('sseAdd', item));
-  SSE_CLIENT.subscribe('comment_update', item => this.commit('sseUpdate', item));
-  SSE_CLIENT.subscribe('comment_delete', item => this.commit('sseUpdate', item));
-});
-
-action(function unsubscribe() {
-  if (!SSE_CLIENT) return;
-  SSE_CLIENT.disconnect();
-});
-
-action(function remove(comment) {
-  // Update locally and let real data update be pushed from server
-  // after soft delete
-  comment.deletedAt = new Date();
-  this.commit('update', comment);
-  return this.api.remove(comment);
-});
-
-mutation(function setCourse(courseId) {
-  this.state.courseId = courseId;
-  this.state.activitiesFetched = {};
-});
-
-mutation(function commentsFetched(activityId) {
-  Vue.set(this.state.activitiesFetched, activityId, true);
-});
-
-mutation(function sseAdd(comment) {
-  const { id } = comment;
-  if (find(this.state.items, { id })) return;
-  comment._cid = cuid();
-  Vue.set(this.state.items, comment._cid, comment);
-});
-
-mutation(function sseUpdate(comment) {
-  const existing = find(this.state.items, { id: comment.id });
-  if (!existing) return;
-  const data = pick(comment, ['content', 'createdAt', 'updatedAt', 'deletedAt']);
-  const updated = Object.assign({}, existing, data);
-  Vue.set(this.state.items, updated._cid, updated);
-});
-
-export default build();
diff --git a/client/store/modules/comments/actions.js b/client/store/modules/comments/actions.js
new file mode 100644
index 000000000..9f0486877
--- /dev/null
+++ b/client/store/modules/comments/actions.js
@@ -0,0 +1,44 @@
+import generateActions from '../../helpers/actions';
+import SSEClient from '../../../SSEClient';
+let SSE_CLIENT;
+
+const { api, get, save, setBaseUrl } = generateActions();
+api.pusi = 'kurac';
+
+const fetch = ({ state, commit, rootState }, { activityId }) => {
+  console.log({ api, baseUrl: api.baseUrl });
+  const { courseId } = rootState.route.params;
+  let action = state.courseId === courseId ? 'fetch' : 'reset';
+  if (action === 'reset') commit('setCourse', courseId);
+  api.fetch({ activityId })
+    .then(result => commit(action, result))
+    .then(result => commit('commentsFetched', activityId));
+};
+
+const subscribe = ({ state, commit }) => {
+  if (SSE_CLIENT) SSE_CLIENT.disconnect();
+  SSE_CLIENT = new SSEClient(`/api/v1${state.$baseUrl}/subscribe`);
+  SSE_CLIENT.subscribe('comment_create', item => commit('sseAdd', item));
+  SSE_CLIENT.subscribe('comment_update', item => commit('sseUpdate', item));
+  SSE_CLIENT.subscribe('comment_delete', item => commit('sseUpdate', item));
+};
+
+const unsubscribe = () => {
+  if (!SSE_CLIENT) return;
+  SSE_CLIENT.disconnect();
+};
+
+const remove = ({ state, commit }, comment) => {
+  // Update locally and let real data update be pushed from server
+  // after soft delete
+  comment.deletedAt = new Date();
+  commit('update', comment);
+  return api.remove(comment);
+};
+
+function someShit() {
+  setBaseUrl.apply(this, arguments);
+  console.log({ api, baseUrl: api.baseUrl, args: [...arguments] });
+}
+
+export { fetch, get, remove, save, subscribe, unsubscribe, someShit as setBaseUrl };
diff --git a/client/store/modules/comments/getters.js b/client/store/modules/comments/getters.js
new file mode 100644
index 000000000..e9f4af10a
--- /dev/null
+++ b/client/store/modules/comments/getters.js
@@ -0,0 +1,17 @@
+import filter from 'lodash/filter';
+import orderBy from 'lodash/orderBy';
+
+export const comments = (state, getters, rootState, rootGetters) => {
+  const activityId = rootGetters['course/activity'].id;
+  const activityComments = filter(state.items, { activityId });
+  return orderBy(activityComments, 'createdAt', 'desc');
+};
+
+export const commentsCount = (state, getters, rootState, rootGetters) => {
+  return Object.keys(rootGetters.comments).length;
+};
+
+export const commentsFetched = (state, getters, rootState, rootGetters) => {
+  const activityId = rootGetters['course/activity'].id;
+  return !!state.activitiesFetched[activityId];
+};
diff --git a/client/store/modules/comments/index.js b/client/store/modules/comments/index.js
new file mode 100644
index 000000000..38680db13
--- /dev/null
+++ b/client/store/modules/comments/index.js
@@ -0,0 +1,19 @@
+import * as actions from './actions';
+import * as getters from './getters';
+import * as mutations from './mutations';
+
+const state = {
+  courseId: '',
+  activitiesFetched: {},
+  items: {},
+  $internals: {},
+  $baseUrl: ''
+};
+
+export default {
+  namespaced: true,
+  state,
+  getters,
+  actions,
+  mutations
+};
diff --git a/client/store/modules/comments/mutations.js b/client/store/modules/comments/mutations.js
new file mode 100644
index 000000000..f1fcd042c
--- /dev/null
+++ b/client/store/modules/comments/mutations.js
@@ -0,0 +1,44 @@
+import cuid from 'cuid';
+import generateMutations from '../../helpers/mutations';
+import pick from 'lodash/pick';
+import Vue from 'vue';
+
+const { fetch, reset, add, save, remove, update, setBaseUrl } = generateMutations();
+
+const setCourse = (state, courseId) => {
+  state.courseId = courseId;
+  state.activitiesFetched = {};
+};
+
+const commentsFetched = (state, activityId) => {
+  Vue.set(state.activitiesFetched, activityId, true);
+};
+
+const sseAdd = (state, comment) => {
+  const { id } = comment;
+  if (find(state.items, { id })) return;
+  comment._cid = cuid();
+  Vue.set(state.items, comment._cid, comment);
+};
+
+const sseUpdate = (state, comment) => {
+  const existing = find(state.items, { id: comment.id });
+  if (!existing) return;
+  const data = pick(comment, ['content', 'createdAt', 'updatedAt', 'deletedAt']);
+  const updated = Object.assign({}, existing, data);
+  Vue.set(state.items, updated._cid, updated);
+};
+
+export {
+  fetch,
+  reset,
+  add,
+  save,
+  remove,
+  update,
+  setBaseUrl,
+  setCourse,
+  commentsFetched,
+  sseAdd,
+  sseUpdate
+};
diff --git a/client/store/modules/course.js b/client/store/modules/course.js
deleted file mode 100644
index 23b0c657c..000000000
--- a/client/store/modules/course.js
+++ /dev/null
@@ -1,167 +0,0 @@
-import { getLevel, getOutlineLevels, getTesMeta } from 'shared/activities';
-import compact from 'lodash/compact';
-import courseApi from '../../api/course';
-import filter from 'lodash/filter';
-import find from 'lodash/find';
-import get from 'lodash/get';
-import map from 'lodash/map';
-import { role } from 'shared';
-import transform from 'lodash/transform';
-import values from 'lodash/values';
-import Vue from 'vue';
-import { VuexModule } from 'vuex-module';
-
-const { build, getter, action, mutation, state } = new VuexModule('course');
-const COURSE_ROUTE = /\/course\/\d+/;
-// NOTE: teaching elements always have `activityId` foreign key and that is
-//       how we can tell if an element is `tes` or `activity`
-const isTes = element => !!element.activityId;
-
-state({
-  activity: undefined,
-  users: {},
-  outline: { expanded: {}, showOptions: null }
-});
-
-getter(function course() {
-  const courseId = get(this.rootState, 'route.params.courseId');
-  if (!courseId) return;
-  if (!this.rootState.route.fullPath.match(COURSE_ROUTE)) return;
-  return find(this.rootGetters.courses, { id: Number(courseId) });
-});
-
-getter(function structure() {
-  const course = this.getters['course/course'];
-  if (!course) return;
-  return getOutlineLevels(course.schema);
-});
-
-getter(function activities() {
-  const course = this.getters['course/course'];
-  if (!course) return;
-  const { activities: items } = this.rootGetters;
-  return filter(items, { courseId: course.id });
-});
-
-getter(function activity() {
-  const { activities } = this.rootGetters;
-  return activities[this.state.activity] || {};
-});
-
-getter(function outlineActivities() {
-  const activities = this.getters['course/activities'];
-  const structure = this.getters['course/structure'];
-  const outlineTypes = map(structure, 'type');
-  return filter(activities, it => outlineTypes.includes(it.type));
-});
-
-getter(function isCollapsed() {
-  const { outline } = this.state;
-  return activity => activity && !outline.expanded[activity._cid];
-});
-
-getter(function revisions() {
-  const course = this.getters['course/course'];
-  if (!course) return [];
-  const revs = this.rootGetters.revisions;
-  return filter(revs, { courseId: course.id })
-    .map(rev => ({ ...rev, createdAt: new Date(rev.createdAt) }))
-    .sort((rev1, rev2) => rev2.createdAt - rev1.createdAt);
-});
-
-getter(function getConfig() {
-  return element => {
-    if (!element.type) return {};
-    if (isTes(element)) {
-      const course = this.rootGetters['course/course'];
-      return getTesMeta(course.schema, element.type);
-    }
-    return getLevel(element.type) || {};
-  };
-});
-
-getter(function getMetadata() {
-  return element => {
-    if (!element) return [];
-    const config = this.rootGetters['course/getConfig'](element);
-    if (!config.meta) return [];
-    return map(config.meta, it => {
-      const value = get(element, `${isTes(element) ? 'meta' : 'data'}.${it.key}`);
-      return { ...it, value };
-    });
-  };
-});
-
-getter(function users() {
-  return values(this.state.users);
-});
-
-getter(function currentUser() {
-  const { user } = this.rootState.auth;
-  return find(this.state.users, { id: user.id });
-});
-
-getter(function isCourseAdmin() {
-  const user = this.getters['course/currentUser'];
-  return get(user, 'courseRole') === role.course.ADMIN;
-});
-
-getter(function isCourseAuthor() {
-  const user = this.getters['course/currentUser'];
-  return get(user, 'courseRole') === role.course.AUTHOR;
-});
-
-action(function getUsers() {
-  const { route } = this.rootState;
-  const courseId = route.params.courseId;
-  return courseApi.getUsers(courseId)
-    .then(users => this.commit('setUsers', users));
-});
-
-action(function upsertUser({ courseId, email, role }) {
-  return courseApi.upsertUser(courseId, { email, role })
-    .then(user => this.commit('upsertUser', user));
-});
-
-action(function removeUser({ courseId, userId }) {
-  return courseApi.removeUser(courseId, userId)
-    .then(() => this.commit('removeUser', userId));
-});
-
-mutation(function upsertUser(user) {
-  Vue.set(this.state.users, user.id, user);
-});
-
-mutation(function removeUser(id) {
-  Vue.delete(this.state.users, id);
-});
-
-mutation(function setUsers(users) {
-  this.state.users = {};
-  users.forEach(it => Vue.set(this.state.users, it.id, it));
-});
-
-mutation(function toggleActivities() {
-  const { getters, state } = this;
-  const outline = filter(getters['course/outlineActivities'], it => !it.deletedAt);
-  const totalExpanded = compact(Object.values(state.outline.expanded)).length;
-  const isOpen = totalExpanded < outline.length;
-  const expanded = transform(outline, (acc, it) => (acc[it._cid] = isOpen), {});
-  Vue.set(this.state.outline, 'expanded', expanded);
-});
-
-mutation(function toggleActivity({ _cid, expanded }) {
-  let expandedItems = this.state.outline.expanded;
-  expanded = expanded === undefined ? !expandedItems[_cid] : expanded;
-  Vue.set(expandedItems, _cid, expanded);
-});
-
-mutation(function showActivityOptions(_cid) {
-  this.state.outline.showOptions = _cid;
-});
-
-mutation(function focusActivity(_cid) {
-  this.state.activity = _cid;
-});
-
-export default build();
diff --git a/client/store/modules/course/actions.js b/client/store/modules/course/actions.js
new file mode 100644
index 000000000..89ef9c393
--- /dev/null
+++ b/client/store/modules/course/actions.js
@@ -0,0 +1,24 @@
+import api from '../../../api/course';
+import filter from 'lodash/filter';
+
+export const getUsers = ({ rootState, commit }) => {
+  const { route } = rootState;
+  const courseId = route.params.courseId;
+  return api.getUsers(courseId)
+    .then(users => commit('setUsers', users));
+};
+
+export const upsertUser = ({ commit }, { courseId, email, role }) => {
+  return api.upsertUser(courseId, { email, role })
+    .then(user => commit('upsertUser', user));
+};
+
+export const removeUser = ({ commit }, { courseId, userId }) => {
+  return api.removeUser(courseId, userId)
+    .then(() => commit('removeUser', userId));
+};
+
+export const toggleActivities = ({ getters, commit }) => {
+  const outline = filter(getters['course/outlineActivities'], it => !it.deletedAt);
+  commit('toggleActivities', outline);
+};
diff --git a/client/store/modules/course/getters.js b/client/store/modules/course/getters.js
new file mode 100644
index 000000000..45d5c387b
--- /dev/null
+++ b/client/store/modules/course/getters.js
@@ -0,0 +1,98 @@
+import { getLevel, getOutlineLevels, getTesMeta } from 'shared/activities';
+import filter from 'lodash/filter';
+import find from 'lodash/find';
+import get from 'lodash/get';
+import map from 'lodash/map';
+import { role } from 'shared';
+import values from 'lodash/values';
+
+const COURSE_ROUTE = /\/course\/\d+/;
+// NOTE: teaching elements always have `activityId` foreign key and that is
+//       how we can tell if an element is `tes` or `activity`
+const isTes = element => !!element.activityId;
+
+export const course = (state, getters, rootState, rootGetters) => {
+  const courseId = get(rootState, 'route.params.courseId');
+  if (!courseId) return;
+  if (!rootState.route.fullPath.match(COURSE_ROUTE)) return;
+  return find(rootGetters.courses, { id: Number(courseId) });
+};
+
+export const structure = (state, getters) => {
+  const course = getters.course;
+  if (!course) return;
+  return getOutlineLevels(course.schema);
+};
+
+export const activities = (state, getters, rootState, rootGetters) => {
+  const course = getters.course;
+  if (!course) return;
+  const { activities: items } = rootGetters;
+  return filter(items, { courseId: course.id });
+};
+
+export const activity = (state, getters, rootState, rootGetters) => {
+  const { activities } = rootGetters;
+  return activities[state.activity] || {};
+};
+
+export const outlineActivities = (state, getters) => {
+  const activities = getters.activities;
+  const structure = getters.structure;
+  const outlineTypes = map(structure, 'type');
+  return filter(activities, it => outlineTypes.includes(it.type));
+};
+
+export const isCollapsed = state => {
+  const { outline } = state;
+  return activity => activity && !outline.expanded[activity._cid];
+};
+
+export const revisions = (state, getters, rootState, rootGetters) => {
+  const course = getters.course;
+  if (!course) return [];
+  const revs = rootGetters.revisions;
+  return filter(revs, { courseId: course.id })
+    .map(rev => ({ ...rev, createdAt: new Date(rev.createdAt) }))
+    .sort((rev1, rev2) => rev2.createdAt - rev1.createdAt);
+};
+
+export const getConfig = (state, getters, rootState, rootGetters) => {
+  return element => {
+    if (!element.type) return {};
+    if (isTes(element)) {
+      const course = rootGetters.course;
+      return getTesMeta(course.schema, element.type);
+    }
+    return getLevel(element.type) || {};
+  };
+};
+
+export const getMetadata = (state, getters, rootState, rootGetters) => {
+  return element => {
+    if (!element) return [];
+    const config = getters.getConfig(element);
+    if (!config.meta) return [];
+    return map(config.meta, it => {
+      const value = get(element, `${isTes(element) ? 'meta' : 'data'}.${it.key}`);
+      return { ...it, value };
+    });
+  };
+};
+
+export const users = state => values(state.users);
+
+export const currentUser = (state, getters, rootState) => {
+  const { user } = rootState.auth;
+  return find(state.users, { id: user.id });
+};
+
+export const isCourseAdmin = (state, getters) => {
+  const user = getters.currentUser;
+  return get(user, 'courseRole') === role.course.ADMIN;
+};
+
+export const isCourseAuthor = (state, getters) => {
+  const user = getters.currentUser;
+  return get(user, 'courseRole') === role.course.AUTHOR;
+};
diff --git a/client/store/modules/course/index.js b/client/store/modules/course/index.js
new file mode 100644
index 000000000..d1e00babc
--- /dev/null
+++ b/client/store/modules/course/index.js
@@ -0,0 +1,20 @@
+import * as actions from './actions';
+import * as getters from './getters';
+import * as mutations from './mutations';
+
+const state = {
+  activity: undefined,
+  items: {},
+  users: {},
+  outline: { expanded: {}, showOptions: null },
+  $internals: {},
+  $baseUrl: ''
+};
+
+export default {
+  namespaced: true,
+  state,
+  getters,
+  actions,
+  mutations
+};
diff --git a/client/store/modules/course/mutations.js b/client/store/modules/course/mutations.js
new file mode 100644
index 000000000..0b0e85910
--- /dev/null
+++ b/client/store/modules/course/mutations.js
@@ -0,0 +1,37 @@
+import compact from 'lodash/compact';
+import transform from 'lodash/transform';
+import Vue from 'vue';
+
+export const upsertUser = (state, user) => {
+  Vue.set(state.users, user.id, user);
+};
+
+export const removeUser = (state, id) => {
+  Vue.delete(state.users, id);
+};
+
+export const setUsers = (state, users) => {
+  state.users = {};
+  users.forEach(it => Vue.set(state.users, it.id, it));
+};
+
+export const toggleActivities = (state, outline) => {
+  const totalExpanded = compact(Object.values(state.outline.expanded)).length;
+  const isOpen = totalExpanded < outline.length;
+  const expanded = transform(outline, (acc, it) => (acc[it._cid] = isOpen), {});
+  Vue.set(this.state.outline, 'expanded', expanded);
+};
+
+export const toggleActivity = (state, { _cid, expanded }) => {
+  let expandedItems = state.outline.expanded;
+  expanded = expanded === undefined ? !expandedItems[_cid] : expanded;
+  Vue.set(expandedItems, _cid, expanded);
+};
+
+export const showActivityOptions = (state, _cid) => {
+  state.outline.showOptions = _cid;
+};
+
+export const focusActivity = (state, _cid) => {
+  state.activity = _cid;
+};
diff --git a/client/store/modules/courses.js b/client/store/modules/courses.js
deleted file mode 100644
index 446dd56e1..000000000
--- a/client/store/modules/courses.js
+++ /dev/null
@@ -1,91 +0,0 @@
-import Vue from 'vue';
-import VuexCollection from '../helpers/collection';
-
-const { state, getter, action, mutation, build } = new VuexCollection('courses', '/courses');
-const PAGINATION_DEFAULTS = { offset: 0, limit: 21 };
-
-state({
-  search: '',
-  $internals: {
-    pagination: PAGINATION_DEFAULTS,
-    sort: {
-      order: 'DESC',
-      field: 'updatedAt'
-    },
-    allCoursesFetched: false
-  }
-});
-
-getter(function courses() {
-  return this.state.items;
-}, { global: true });
-
-getter(function courseQueryParams() {
-  const { pagination, sort } = this.state.$internals;
-  const search = this.state.search;
-
-  return {
-    search,
-    offset: pagination.offset,
-    limit: pagination.limit,
-    sortOrder: sort.order,
-    sortBy: sort.field
-  };
-}, { global: true });
-
-getter(function hasMoreResults() {
-  return !this.state.$internals.allCoursesFetched;
-});
-
-action(function fetch({ reset = false } = {}) {
-  const mutation = reset ? 'reset' : 'fetch';
-  const params = this.getters.courseQueryParams;
-  return this.api.get('', params).then(response => {
-    const { data: courses } = response.data;
-
-    let result = {};
-    courses.forEach(it => {
-      this.api.setCid(it);
-      result[it._cid] = it;
-    });
-
-    this.commit('setPagination', { offset: params.offset + params.limit });
-    this.commit('allCoursesFetched', courses.length < params.limit);
-    this.commit(mutation, result);
-  });
-});
-
-action(function clone({ id, name, description }) {
-  return this.api.post(`/${id}/clone`, { name, description }).then(response => {
-    const { data: course } = response.data;
-    this.commit('add', course);
-    return course.id;
-  });
-});
-
-mutation(function resetPagination() {
-  this.state.$internals.pagination = PAGINATION_DEFAULTS;
-});
-
-mutation(function save(course) {
-  const search = this.state.search.toLowerCase();
-  const name = course.name.toLowerCase();
-  if (search && !name.includes(search)) return;
-  Vue.set(this.state.items, course._cid, course);
-});
-
-mutation(function setPagination(changes) {
-  let $internals = this.state.$internals;
-  $internals.pagination = { ...$internals.pagination, ...changes };
-});
-
-mutation(function setSearch(query = '') {
-  this.state.$internals.pagination = PAGINATION_DEFAULTS;
-  this.state.search = query;
-});
-
-mutation(function allCoursesFetched(allFetched) {
-  this.state.$internals.allCoursesFetched = allFetched;
-});
-
-export default build();
diff --git a/client/store/modules/courses/actions.js b/client/store/modules/courses/actions.js
new file mode 100644
index 000000000..bfb7aaf91
--- /dev/null
+++ b/client/store/modules/courses/actions.js
@@ -0,0 +1,31 @@
+import generateActions from '../../helpers/actions';
+
+const { api, get, reset, save, remove, update, setBaseUrl } = generateActions('/courses');
+
+const fetch = ({ getters, commit }, { reset = false } = {}) => {
+  const mutation = reset ? 'reset' : 'fetch';
+  const params = getters.courseQueryParams;
+  return api.get('', params).then(response => {
+    const { data: courses } = response.data;
+
+    let result = {};
+    courses.forEach(it => {
+      api.setCid(it);
+      result[it._cid] = it;
+    });
+
+    commit('setPagination', { offset: params.offset + params.limit });
+    commit('allCoursesFetched', courses.length < params.limit);
+    commit(mutation, result);
+  });
+};
+
+const clone = ({ commit }, { id, name, description }) => {
+  return api.post(`/${id}/clone`, { name, description }).then(response => {
+    const { data: course } = response.data;
+    commit('add', course);
+    return course.id;
+  });
+};
+
+export { get, fetch, clone, reset, save, remove, update, setBaseUrl };
diff --git a/client/store/modules/courses/getters.js b/client/store/modules/courses/getters.js
new file mode 100644
index 000000000..f6f644dc5
--- /dev/null
+++ b/client/store/modules/courses/getters.js
@@ -0,0 +1,20 @@
+export const courses = state => {
+  return state.items;
+};
+
+export const courseQueryParams = state => {
+  const { pagination, sort } = state.$internals;
+  const search = state.search;
+
+  return {
+    search,
+    offset: pagination.offset,
+    limit: pagination.limit,
+    sortOrder: sort.order,
+    sortBy: sort.field
+  };
+};
+
+export const hasMoreResults = state => {
+  return !state.$internals.allCoursesFetched;
+};
diff --git a/client/store/modules/courses/index.js b/client/store/modules/courses/index.js
new file mode 100644
index 000000000..f1df3ae95
--- /dev/null
+++ b/client/store/modules/courses/index.js
@@ -0,0 +1,27 @@
+import * as actions from './actions';
+import * as getters from './getters';
+import * as mutations from './mutations';
+
+const PAGINATION_DEFAULTS = { offset: 0, limit: 21 };
+
+const state = {
+  search: '',
+  items: {},
+  $internals: {
+    pagination: PAGINATION_DEFAULTS,
+    sort: {
+      order: 'DESC',
+      field: 'updatedAt'
+    },
+    allCoursesFetched: false
+  },
+  $baseUrl: ''
+};
+
+export default {
+  namespaced: true,
+  state,
+  getters,
+  actions,
+  mutations
+};
diff --git a/client/store/modules/courses/mutations.js b/client/store/modules/courses/mutations.js
new file mode 100644
index 000000000..d86351713
--- /dev/null
+++ b/client/store/modules/courses/mutations.js
@@ -0,0 +1,45 @@
+import generateMutations from '../../helpers/mutations';
+import Vue from 'vue';
+
+const { fetch, reset, add, remove, update, setBaseUrl } = generateMutations('/courses');
+
+const PAGINATION_DEFAULTS = { offset: 0, limit: 21 };
+
+const resetPagination = state => {
+  state.$internals.pagination = PAGINATION_DEFAULTS;
+};
+
+const save = (state, course) => {
+  const search = state.search.toLowerCase();
+  const name = course.name.toLowerCase();
+  if (search && !name.includes(search)) return;
+  Vue.set(state.items, course._cid, course);
+};
+
+const setPagination = (state, changes) => {
+  let $internals = state.$internals;
+  $internals.pagination = { ...$internals.pagination, ...changes };
+};
+
+const setSearch = (state, query = '') => {
+  state.$internals.pagination = PAGINATION_DEFAULTS;
+  state.search = query;
+};
+
+const allCoursesFetched = (state, allFetched) => {
+  state.$internals.allCoursesFetched = allFetched;
+};
+
+export {
+  allCoursesFetched,
+  fetch,
+  reset,
+  add,
+  resetPagination,
+  save,
+  setPagination,
+  setSearch,
+  remove,
+  update,
+  setBaseUrl
+};
diff --git a/client/store/modules/editor.js b/client/store/modules/editor.js
deleted file mode 100644
index c7636ed75..000000000
--- a/client/store/modules/editor.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import filter from 'lodash/filter';
-import find from 'lodash/find';
-import get from 'lodash/get';
-import { getSupportedContainers } from 'shared/activities';
-import reduce from 'lodash/reduce';
-import { VuexModule } from 'vuex-module';
-
-const { getter, build } = new VuexModule('editor');
-
-getter(function activity() {
-  const id = parseInt(get(this.rootState, 'route.params.activityId'), 10);
-  return find(this.rootGetters.activities, { id });
-});
-
-getter(function contentContainers() {
-  const { activities } = this.rootGetters;
-  const activity = this.getters['editor/activity'];
-  if (!activity) return;
-  const containers = getSupportedContainers(activity.type);
-  return reduce(containers, (acc, { type }) => {
-    acc[type] = filter(activities, { parentId: activity.id, type });
-    return acc;
-  }, {});
-});
-
-getter(function assessments() {
-  const { tes } = this.rootGetters;
-  const activity = this.getters['editor/activity'];
-  if (!activity) return;
-  return filter(tes, { activityId: activity.id, type: 'ASSESSMENT' });
-});
-
-export default build();
diff --git a/client/store/modules/editor/getters.js b/client/store/modules/editor/getters.js
new file mode 100644
index 000000000..8884028b6
--- /dev/null
+++ b/client/store/modules/editor/getters.js
@@ -0,0 +1,28 @@
+import filter from 'lodash/filter';
+import find from 'lodash/find';
+import get from 'lodash/get';
+import { getSupportedContainers } from 'shared/activities';
+import reduce from 'lodash/reduce';
+
+export const activity = (state, getters, rootState, rootGetters) => {
+  const id = parseInt(get(rootState, 'route.params.activityId'), 10);
+  return find(rootGetters.activities, { id });
+};
+
+export const contentContainers = (state, getters, rootState, rootGetters) => {
+  const { activities } = rootGetters;
+  const activity = getters.activity;
+  if (!activity) return;
+  const containers = getSupportedContainers(activity.type);
+  return reduce(containers, (acc, { type }) => {
+    acc[type] = filter(activities, { parentId: activity.id, type });
+    return acc;
+  }, {});
+};
+
+export const assessments = (state, getters, rootState, rootGetters) => {
+  const { tes } = rootGetters;
+  const activity = getters.activity;
+  if (!activity) return;
+  return filter(tes, { activityId: activity.id, type: 'ASSESSMENT' });
+};
diff --git a/client/store/modules/editor/index.js b/client/store/modules/editor/index.js
new file mode 100644
index 000000000..e3d05b666
--- /dev/null
+++ b/client/store/modules/editor/index.js
@@ -0,0 +1,6 @@
+import * as getters from './getters';
+
+export default {
+  namespaced: true,
+  getters
+};
diff --git a/client/store/modules/revisions.js b/client/store/modules/revisions.js
deleted file mode 100644
index 6d43069b8..000000000
--- a/client/store/modules/revisions.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import VuexCollection from '../helpers/collection';
-
-const { state, build, getter, action, mutation } = new VuexCollection('revisions');
-const PAGINATION_DEFAULTS = { offset: 0, limit: 25 };
-
-state({
-  $internals: {
-    pagination: PAGINATION_DEFAULTS,
-    allRevisionsFetched: false
-  }
-});
-
-getter(function revisions() {
-  return this.state.items;
-}, { global: true });
-
-getter(function revisionQueryParams() {
-  const { pagination } = this.state.$internals;
-  return pagination;
-}, { global: true });
-
-getter(function hasMoreResults() {
-  return !this.state.$internals.allRevisionsFetched;
-});
-
-action(function fetch() {
-  const params = this.getters.revisionQueryParams;
-  return this.api.get('', params).then(response => {
-    const { data: revisions } = response.data;
-
-    let result = {};
-    revisions.forEach(it => {
-      this.api.setCid(it);
-      result[it._cid] = it;
-    });
-
-    this.commit('setPagination', { offset: params.offset + params.limit });
-    this.commit('allRevisionsFetched', revisions.length < params.limit);
-    this.commit('fetch', result);
-  });
-});
-
-action(function resetPagination() {
-  this.commit('setPagination', PAGINATION_DEFAULTS);
-  this.commit('reset', {});
-});
-
-mutation(function setPagination(changes) {
-  let $internals = this.state.$internals;
-  $internals.pagination = { ...$internals.pagination, ...changes };
-});
-
-mutation(function allRevisionsFetched(allFetched) {
-  this.state.$internals.allRevisionsFetched = allFetched;
-});
-
-export default build();
diff --git a/client/store/modules/revisions/actions.js b/client/store/modules/revisions/actions.js
new file mode 100644
index 000000000..51c1f625e
--- /dev/null
+++ b/client/store/modules/revisions/actions.js
@@ -0,0 +1,29 @@
+import generateActions from '../../helpers/actions';
+
+const { api, get, reset, save, remove, update, setBaseUrl } = generateActions();
+
+const PAGINATION_DEFAULTS = { offset: 0, limit: 25 };
+
+const fetch = ({ getters, commit }) => {
+  const params = getters.revisionQueryParams;
+  return api.get('', params).then(response => {
+    const { data: revisions } = response.data;
+
+    let result = {};
+    revisions.forEach(it => {
+      api.setCid(it);
+      result[it._cid] = it;
+    });
+
+    commit('setPagination', { offset: params.offset + params.limit });
+    commit('allRevisionsFetched', revisions.length < params.limit);
+    commit('fetch', result);
+  });
+};
+
+const resetPagination = ({ commit }) => {
+  commit('setPagination', PAGINATION_DEFAULTS);
+  commit('reset', {});
+};
+
+export { get, fetch, remove, reset, save, update, resetPagination, setBaseUrl };
diff --git a/client/store/modules/revisions/getters.js b/client/store/modules/revisions/getters.js
new file mode 100644
index 000000000..4b6d90d2d
--- /dev/null
+++ b/client/store/modules/revisions/getters.js
@@ -0,0 +1,10 @@
+export const revisions = state => state.items;
+
+export const revisionQueryParams = state => {
+  const { pagination } = state.$internals;
+  return pagination;
+};
+
+export const hasMoreResults = state => {
+  return !state.$internals.allRevisionsFetched;
+};
diff --git a/client/store/modules/revisions/index.js b/client/store/modules/revisions/index.js
new file mode 100644
index 000000000..65db32b5b
--- /dev/null
+++ b/client/store/modules/revisions/index.js
@@ -0,0 +1,22 @@
+import * as actions from './actions';
+import * as getters from './getters';
+import * as mutations from './mutations';
+
+const PAGINATION_DEFAULTS = { offset: 0, limit: 21 };
+
+const state = {
+  items: {},
+  $internals: {
+    pagination: PAGINATION_DEFAULTS,
+    allRevisionsFetched: false
+  },
+  $baseUrl: ''
+};
+
+export default {
+  namespaced: true,
+  state,
+  getters,
+  actions,
+  mutations
+};
diff --git a/client/store/modules/revisions/mutations.js b/client/store/modules/revisions/mutations.js
new file mode 100644
index 000000000..2057a8bd3
--- /dev/null
+++ b/client/store/modules/revisions/mutations.js
@@ -0,0 +1,24 @@
+import generateMutations from '../../helpers/mutations';
+
+const { fetch, reset, add, save, remove, update, setBaseUrl } = generateMutations();
+
+const setPagination = (state, changes) => {
+  let $internals = state.$internals;
+  $internals.pagination = { ...$internals.pagination, ...changes };
+};
+
+const allRevisionsFetched = (state, allFetched) => {
+  state.$internals.allRevisionsFetched = allFetched;
+};
+
+export {
+  allRevisionsFetched,
+  fetch,
+  reset,
+  add,
+  save,
+  remove,
+  setPagination,
+  update,
+  setBaseUrl
+};
diff --git a/client/store/modules/tes.js b/client/store/modules/tes.js
deleted file mode 100644
index 890741129..000000000
--- a/client/store/modules/tes.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import calculatePosition from 'utils/calculatePosition.js';
-import VuexCollection from '../helpers/collection.js';
-
-const { action, build, getter, mutation } = new VuexCollection('tes', '/tes');
-
-getter(function tes() {
-  return this.state.items;
-}, { global: true });
-
-action(function insert({ element, context }) {
-  const position = calculatePosition(context);
-  return this.context.dispatch('tes/save', { ...element, position });
-});
-
-action(function reorder({ element, context }) {
-  this.commit('reorder', { element, position: calculatePosition(context) });
-  const data = { position: context.newPosition };
-  return this.api.post(`${element.id}/reorder`, data)
-    .then(res => {
-      let element = res.data.data;
-      this.api.setCid(element);
-      this.commit('save', element);
-    });
-});
-
-mutation(function reorder({ element, position }) {
-  element.position = position;
-});
-
-export default build();
diff --git a/client/store/modules/tes/actions.js b/client/store/modules/tes/actions.js
new file mode 100644
index 000000000..38e9b0bb0
--- /dev/null
+++ b/client/store/modules/tes/actions.js
@@ -0,0 +1,22 @@
+import calculatePosition from 'utils/calculatePosition.js';
+import generateActions from '../../helpers/actions';
+
+const { api, get, fetch, reset, save, remove, update, setBaseUrl } = generateActions('/tes');
+
+const insert = ({ element, context }) => {
+  const position = calculatePosition(context);
+  return context.dispatch('tes/save', { ...element, position });
+};
+
+const reorder = ({ element, context, commit }) => {
+  commit('reorder', { element, position: calculatePosition(context) });
+  const data = { position: context.newPosition };
+  return api.post(`${element.id}/reorder`, data)
+    .then(res => {
+      let element = res.data.data;
+      api.setCid(element);
+      commit('save', element);
+    });
+};
+
+export { get, fetch, insert, remove, reorder, reset, save, update, setBaseUrl };
diff --git a/client/store/modules/tes/getters.js b/client/store/modules/tes/getters.js
new file mode 100644
index 000000000..21d787a70
--- /dev/null
+++ b/client/store/modules/tes/getters.js
@@ -0,0 +1 @@
+export const tes = state => state.items;
diff --git a/client/store/modules/tes/index.js b/client/store/modules/tes/index.js
new file mode 100644
index 000000000..b296fc703
--- /dev/null
+++ b/client/store/modules/tes/index.js
@@ -0,0 +1,17 @@
+import * as actions from './actions';
+import * as getters from './getters';
+import * as mutations from './mutations';
+
+const state = {
+  items: {},
+  $internals: {},
+  $baseUrl: ''
+};
+
+export default {
+  namespaced: true,
+  state,
+  getters,
+  actions,
+  mutations
+};
diff --git a/client/store/modules/tes/mutations.js b/client/store/modules/tes/mutations.js
new file mode 100644
index 000000000..e81ee9545
--- /dev/null
+++ b/client/store/modules/tes/mutations.js
@@ -0,0 +1,9 @@
+import generateMutations from '../../helpers/mutations';
+
+const { fetch, reset, add, save, remove, update, setBaseUrl } = generateMutations('/tes');
+
+const reorder = ({ element, position }) => {
+  element.position = position;
+};
+
+export { fetch, reset, add, save, remove, reorder, update, setBaseUrl };

From 8724b675553104672377aa0960f0f86a0e0d6501 Mon Sep 17 00:00:00 2001
From: parmezan38 <luka38.stojanac@gmail.com>
Date: Fri, 21 Jun 2019 16:51:09 +0200
Subject: [PATCH 079/213] Work in progress :construction:

---
 client/store/helpers/actions.js              | 130 ++++++++-----------
 client/store/helpers/collectionX.js          | 109 ----------------
 client/store/helpers/mutations.js            |  80 +++++-------
 client/store/modules/activities/actions.js   |  19 ++-
 client/store/modules/activities/index.js     |   5 +-
 client/store/modules/activities/mutations.js |  12 +-
 client/store/modules/comments/actions.js     |  19 +--
 client/store/modules/comments/index.js       |   5 +-
 client/store/modules/comments/mutations.js   |  12 +-
 client/store/modules/course/getters.js       |   2 +-
 client/store/modules/courses/actions.js      |  21 +--
 client/store/modules/courses/index.js        |   5 +-
 client/store/modules/courses/mutations.js    |  11 +-
 client/store/modules/revisions/actions.js    |  17 ++-
 client/store/modules/revisions/index.js      |   5 +-
 client/store/modules/revisions/mutations.js  |  12 +-
 client/store/modules/tes/actions.js          |  18 ++-
 client/store/modules/tes/index.js            |   5 +-
 client/store/modules/tes/mutations.js        |  12 +-
 19 files changed, 201 insertions(+), 298 deletions(-)
 delete mode 100644 client/store/helpers/collectionX.js

diff --git a/client/store/helpers/actions.js b/client/store/helpers/actions.js
index b78292ed7..332dbf17d 100644
--- a/client/store/helpers/actions.js
+++ b/client/store/helpers/actions.js
@@ -1,76 +1,58 @@
 import cuid from 'cuid';
-import Resource from './resource';
 
-export default function ($baseUrl) {
-  let api = new Resource($baseUrl);
-
-  const get = ({ commit }, id) => {
-    // TODO:  check if it needs replacing like boutique
-    //        commit('save', res) || res)
-    return api.getById(id).then(res => commit('save', res));
-  };
-
-  const fetch = ({ commit }, params = {}) => {
-    return api.fetch(params).then(res => commit('fetch', res));
-  };
-
-  const reset = ({ commit }) => {
-    return api.fetch().then(res => commit('reset', res));
-  };
-
-  const save = ({ commit, state }, model) => {
-    if (!model._cid) model._cid = cuid();
-    model._synced = false;
-    model._version = Date.now();
-
-    // create or update model locally
-    commit('save', model);
-
-    return api.save(model)
-      .then(model => {
-        // check if new change happened locally during api call
-        // do not update meta if there is newer change
-        const previous = state.items[model._cid];
-        if (previous && previous._version === model._version) model._synced = true;
-        commit('save', model);
-      });
-  };
-
-  const remove = ({ commit }, model) => {
-    // If added locally; not waiting for id (add)
-    if (!model.id && !model._version) {
-      commit('remove', [model]);
-      return Promise.resolve(true);
-    }
-
-    return api.remove(model)
-      .then(removed => commit('remove', removed));
-  };
-
-  const update = ({ commit }, model) => {
-    const cid = model._cid;
-    const changes = { ...model };
-    delete changes._cid;
-    return api.update(cid, changes)
-      .then(updated => commit('update', updated));
-  };
-
-  const setBaseUrl = ({ state, commit }, baseUrl) => {
-    if (state.$baseUrl !== baseUrl) {
-      api = new Resource(baseUrl);
-      commit('setBaseUrl', baseUrl);
-    }
-    console.log('base setBaseUrl', { api, baseUrl: api.baseUrl, args: [...arguments] });
-  };
-
-  return {
-    api,
-    get,
-    fetch,
-    reset,
-    save,
-    remove,
-    update,
-    setBaseUrl
-  };
-}
+export const get = ({ state, commit }, id) => {
+  // TODO:  check if it needs replacing like boutique
+  //        commit('save', res) || res)
+  return state.api.getById(id).then(res => commit('save', res));
+};
+
+export const fetch = ({ state, commit }, params = {}) => {
+  return state.api.fetch(params).then(res => commit('fetch', res));
+};
+
+export const reset = ({ state, commit }) => {
+  return state.api.fetch().then(res => commit('reset', res));
+};
+
+export const save = ({ commit, state }, model) => {
+  if (!model._cid) model._cid = cuid();
+  model._synced = false;
+  model._version = Date.now();
+
+  // create or update model locally
+  commit('save', model);
+
+  return state.api.save(model)
+    .then(model => {
+      // check if new change happened locally during api call
+      // do not update meta if there is newer change
+      const previous = state.items[model._cid];
+      if (previous && previous._version === model._version) model._synced = true;
+      commit('save', model);
+    });
+};
+
+export const remove = ({ state, commit }, model) => {
+  // If added locally; not waiting for id (add)
+  if (!model.id && !model._version) {
+    commit('remove', [model]);
+    return Promise.resolve(true);
+  }
+
+  return state.api.remove(model)
+    .then(removed => commit('remove', removed));
+};
+
+export const update = ({ state, commit }, model) => {
+  const cid = model._cid;
+  const changes = { ...model };
+  delete changes._cid;
+  return state.api.update(cid, changes)
+    .then(updated => commit('update', updated));
+};
+
+export const setBaseUrl = ({ state, commit }, baseUrl) => {
+  if (state.api.baseUrl !== baseUrl) {
+    commit('setBaseUrl', baseUrl);
+  }
+};
diff --git a/client/store/helpers/collectionX.js b/client/store/helpers/collectionX.js
deleted file mode 100644
index 61a1332a4..000000000
--- a/client/store/helpers/collectionX.js
+++ /dev/null
@@ -1,109 +0,0 @@
-import cuid from 'cuid';
-import each from 'lodash/each';
-import Resource from './resource';
-
-import Vue from 'vue';
-import { VuexModule } from 'vuex-module';
-
-export default function (collectionName, baseUrl = '') {
-  let module = new VuexModule(collectionName);
-
-  let { state, action, mutation } = module;
-
-  state({
-    items: {},
-    $internals: {},
-    $baseUrl: baseUrl
-  });
-  const getBaseUrl = () => module.state.$baseUrl;
-  module.api = new Resource(getBaseUrl);
-
-  action(function get(id) {
-    return this.api.getById(id)
-      .then(result => this.commit('save', result));
-  });
-
-  action(function fetch(params = {}) {
-    return this.api.fetch(params)
-      .then(result => this.commit('fetch', result));
-  });
-
-  action(function reset() {
-    return this.api.fetch()
-      .then(result => this.commit('reset', result));
-  });
-
-  action(function save(model) {
-    if (!model._cid) model._cid = cuid();
-    model._synced = false;
-    model._version = Date.now();
-
-    // create or update model locally
-    this.commit('save', model);
-
-    return this.api.save(model)
-      .then(model => {
-        // check if new change happened locally during api call
-        // do not update meta if there is newer change
-        const previous = this.context.state.items[model._cid];
-        if (previous && previous._version === model._version) model._synced = true;
-        this.commit('save', model);
-      });
-  });
-
-  action(function remove(model) {
-    // If added locally; not waiting for id (add)
-    if (!model.id && !model._version) {
-      this.commit('remove', [model]);
-      return Promise.resolve(true);
-    }
-
-    return this.api.remove(model)
-      .then(removed => this.commit('remove', removed));
-  });
-
-  action(function update(model) {
-    const cid = model._cid;
-    const changes = { ...model };
-    delete changes._cid;
-    return this.api.update(cid, changes)
-      .then(updated => this.commit('update', updated));
-  });
-
-  // TODO: Do the proper syncing
-  mutation(function fetch(result) {
-    each(result, it => {
-      this.api.setCid(it);
-      Vue.set(this.state.items, it._cid, it);
-    });
-  });
-
-  mutation(function reset(result) {
-    this.state.items = result;
-  });
-
-  mutation(function add(model) {
-    if (!model._cid) model._cid = cuid();
-    Vue.set(this.state.items, model._cid, model);
-  });
-
-  mutation(function save(model) {
-    Vue.set(this.state.items, model._cid, model);
-  });
-
-  mutation(function remove(result) {
-    result.forEach(it => Vue.delete(this.state.items, it._cid));
-  });
-
-  mutation(function update(model) {
-    Vue.set(this.state.items, model._cid, model);
-  });
-
-  // TODO: Fix state extend in order to nest $baseUrl
-  // within $internals
-  mutation(function setBaseUrl(url) {
-    this.state.$baseUrl = url;
-  });
-
-  return module;
-}
diff --git a/client/store/helpers/mutations.js b/client/store/helpers/mutations.js
index 8e32e6b76..6d578dc66 100644
--- a/client/store/helpers/mutations.js
+++ b/client/store/helpers/mutations.js
@@ -1,52 +1,36 @@
 import cuid from 'cuid';
 import each from 'lodash/each';
-import Resource from './resource';
 import Vue from 'vue';
 
-export default function ($apiUrl) {
-  let api = new Resource($apiUrl);
-
-  const fetch = (state, result) => {
-    each(result, it => {
-      // TODO: Extract api unrelated methods
-      api.setCid(it);
-      Vue.set(state.items, it._cid, it);
-    });
-  };
-
-  const reset = (state, result) => {
-    state.items = result;
-  };
-
-  const add = (state, model) => {
-    if (!model._cid) model._cid = cuid();
-    Vue.set(state.items, model._cid, model);
-  };
-
-  const save = (state, model) => {
-    Vue.set(state.items, model._cid, model);
-  };
-
-  const remove = (state, result) => {
-    result.forEach(it => Vue.delete(state.items, it._cid));
-  };
-
-  const update = (state, model) => {
-    Vue.set(state.items, model._cid, model);
-  };
-
-  const setBaseUrl = (state, url) => {
-    state.$baseUrl = url;
-  };
-
-  return {
-    api,
-    fetch,
-    reset,
-    add,
-    save,
-    remove,
-    update,
-    setBaseUrl
-  };
-}
+export const fetch = (state, result) => {
+  each(result, it => {
+    // TODO: Extract api unrelated methods
+    state.api.setCid(it);
+    Vue.set(state.items, it._cid, it);
+  });
+};
+
+export const reset = (state, result) => {
+  state.items = result;
+};
+
+export const add = (state, model) => {
+  if (!model._cid) model._cid = cuid();
+  Vue.set(state.items, model._cid, model);
+};
+
+export const save = (state, model) => {
+  Vue.set(state.items, model._cid, model);
+};
+
+export const remove = (state, result) => {
+  result.forEach(it => Vue.delete(state.items, it._cid));
+};
+
+export const update = (state, model) => {
+  Vue.set(state.items, model._cid, model);
+};
+
+export const setBaseUrl = (state, url) => {
+  state.api.baseUrl = url;
+};
diff --git a/client/store/modules/activities/actions.js b/client/store/modules/activities/actions.js
index 1d75ca119..f4c69ef90 100644
--- a/client/store/modules/activities/actions.js
+++ b/client/store/modules/activities/actions.js
@@ -1,17 +1,22 @@
+import {
+  fetch,
+  get,
+  reset,
+  save,
+  setBaseUrl,
+  update
+} from '../../helpers/actions';
 import calculatePosition from 'utils/calculatePosition';
-import generateActions from '../../helpers/actions';
 import { getDescendants as getDeepChildren } from 'utils/activity';
 import request from '../../../api/request';
 
-const { api, get, fetch, reset, save, update, setBaseUrl } = generateActions();
-
-const reorder = ({ commit }, { activity, context }) => {
+const reorder = ({ state, commit }, { activity, context }) => {
   commit('reorder', { activity, position: calculatePosition(context) });
   const data = { position: context.newPosition };
-  return api.post(`${activity.id}/reorder`, data)
+  return state.api.post(`${activity.id}/reorder`, data)
     .then(res => {
       let activity = res.data.data;
-      api.setCid(activity);
+      state.api.setCid(activity);
       commit('save', activity);
     });
 };
@@ -22,7 +27,7 @@ const remove = ({ state, commit }, model) => {
     commit('remove', [model]);
     return Promise.resolve(true);
   }
-  return api.remove(model)
+  return state.api.remove(model)
     .then(() => commit('remove', [model, ...descendants]));
 };
 
diff --git a/client/store/modules/activities/index.js b/client/store/modules/activities/index.js
index b296fc703..79cb6ef12 100644
--- a/client/store/modules/activities/index.js
+++ b/client/store/modules/activities/index.js
@@ -1,11 +1,12 @@
 import * as actions from './actions';
 import * as getters from './getters';
 import * as mutations from './mutations';
+import Resource from '../../helpers/resource';
 
 const state = {
+  api: new Resource(),
   items: {},
-  $internals: {},
-  $baseUrl: ''
+  $internals: {}
 };
 
 export default {
diff --git a/client/store/modules/activities/mutations.js b/client/store/modules/activities/mutations.js
index 70f976e51..3af6c4ad2 100644
--- a/client/store/modules/activities/mutations.js
+++ b/client/store/modules/activities/mutations.js
@@ -1,6 +1,12 @@
-import generateMutations from '../../helpers/mutations';
-
-const { fetch, reset, add, save, remove, update, setBaseUrl } = generateMutations();
+import {
+  add,
+  fetch,
+  remove,
+  reset,
+  save,
+  setBaseUrl,
+  update
+} from '../../helpers/mutations';
 
 const reorder = (state, { activity, position }) => {
   activity.position = position;
diff --git a/client/store/modules/comments/actions.js b/client/store/modules/comments/actions.js
index 9f0486877..003e43602 100644
--- a/client/store/modules/comments/actions.js
+++ b/client/store/modules/comments/actions.js
@@ -1,23 +1,19 @@
-import generateActions from '../../helpers/actions';
+import { get, save, setBaseUrl } from '../../helpers/actions';
 import SSEClient from '../../../SSEClient';
 let SSE_CLIENT;
 
-const { api, get, save, setBaseUrl } = generateActions();
-api.pusi = 'kurac';
-
 const fetch = ({ state, commit, rootState }, { activityId }) => {
-  console.log({ api, baseUrl: api.baseUrl });
   const { courseId } = rootState.route.params;
   let action = state.courseId === courseId ? 'fetch' : 'reset';
   if (action === 'reset') commit('setCourse', courseId);
-  api.fetch({ activityId })
+  state.api.fetch({ activityId })
     .then(result => commit(action, result))
     .then(result => commit('commentsFetched', activityId));
 };
 
 const subscribe = ({ state, commit }) => {
   if (SSE_CLIENT) SSE_CLIENT.disconnect();
-  SSE_CLIENT = new SSEClient(`/api/v1${state.$baseUrl}/subscribe`);
+  SSE_CLIENT = new SSEClient(`/api/v1${state.api.baseUrl}/subscribe`);
   SSE_CLIENT.subscribe('comment_create', item => commit('sseAdd', item));
   SSE_CLIENT.subscribe('comment_update', item => commit('sseUpdate', item));
   SSE_CLIENT.subscribe('comment_delete', item => commit('sseUpdate', item));
@@ -33,12 +29,7 @@ const remove = ({ state, commit }, comment) => {
   // after soft delete
   comment.deletedAt = new Date();
   commit('update', comment);
-  return api.remove(comment);
+  return state.api.remove(comment);
 };
 
-function someShit() {
-  setBaseUrl.apply(this, arguments);
-  console.log({ api, baseUrl: api.baseUrl, args: [...arguments] });
-}
-
-export { fetch, get, remove, save, subscribe, unsubscribe, someShit as setBaseUrl };
+export { fetch, get, remove, save, subscribe, unsubscribe, setBaseUrl };
diff --git a/client/store/modules/comments/index.js b/client/store/modules/comments/index.js
index 38680db13..2ceaaf886 100644
--- a/client/store/modules/comments/index.js
+++ b/client/store/modules/comments/index.js
@@ -1,13 +1,14 @@
 import * as actions from './actions';
 import * as getters from './getters';
 import * as mutations from './mutations';
+import Resource from '../../helpers/resource';
 
 const state = {
+  api: new Resource(),
   courseId: '',
   activitiesFetched: {},
   items: {},
-  $internals: {},
-  $baseUrl: ''
+  $internals: {}
 };
 
 export default {
diff --git a/client/store/modules/comments/mutations.js b/client/store/modules/comments/mutations.js
index f1fcd042c..f42f9f5d4 100644
--- a/client/store/modules/comments/mutations.js
+++ b/client/store/modules/comments/mutations.js
@@ -1,10 +1,16 @@
+import {
+  add,
+  fetch,
+  remove,
+  reset,
+  save,
+  setBaseUrl,
+  update
+} from '../../helpers/mutations';
 import cuid from 'cuid';
-import generateMutations from '../../helpers/mutations';
 import pick from 'lodash/pick';
 import Vue from 'vue';
 
-const { fetch, reset, add, save, remove, update, setBaseUrl } = generateMutations();
-
 const setCourse = (state, courseId) => {
   state.courseId = courseId;
   state.activitiesFetched = {};
diff --git a/client/store/modules/course/getters.js b/client/store/modules/course/getters.js
index 45d5c387b..2371e3bd7 100644
--- a/client/store/modules/course/getters.js
+++ b/client/store/modules/course/getters.js
@@ -61,7 +61,7 @@ export const getConfig = (state, getters, rootState, rootGetters) => {
   return element => {
     if (!element.type) return {};
     if (isTes(element)) {
-      const course = rootGetters.course;
+      const course = getters.course;
       return getTesMeta(course.schema, element.type);
     }
     return getLevel(element.type) || {};
diff --git a/client/store/modules/courses/actions.js b/client/store/modules/courses/actions.js
index bfb7aaf91..335c212e6 100644
--- a/client/store/modules/courses/actions.js
+++ b/client/store/modules/courses/actions.js
@@ -1,16 +1,21 @@
-import generateActions from '../../helpers/actions';
+import {
+  get,
+  remove,
+  reset,
+  save,
+  setBaseUrl,
+  update
+} from '../../helpers/actions';
 
-const { api, get, reset, save, remove, update, setBaseUrl } = generateActions('/courses');
-
-const fetch = ({ getters, commit }, { reset = false } = {}) => {
+const fetch = ({ state, getters, commit }, { reset = false } = {}) => {
   const mutation = reset ? 'reset' : 'fetch';
   const params = getters.courseQueryParams;
-  return api.get('', params).then(response => {
+  return state.api.get('', params).then(response => {
     const { data: courses } = response.data;
 
     let result = {};
     courses.forEach(it => {
-      api.setCid(it);
+      state.api.setCid(it);
       result[it._cid] = it;
     });
 
@@ -20,8 +25,8 @@ const fetch = ({ getters, commit }, { reset = false } = {}) => {
   });
 };
 
-const clone = ({ commit }, { id, name, description }) => {
-  return api.post(`/${id}/clone`, { name, description }).then(response => {
+const clone = ({ state, commit }, { id, name, description }) => {
+  return state.api.post(`/${id}/clone`, { name, description }).then(response => {
     const { data: course } = response.data;
     commit('add', course);
     return course.id;
diff --git a/client/store/modules/courses/index.js b/client/store/modules/courses/index.js
index f1df3ae95..7e3dda80a 100644
--- a/client/store/modules/courses/index.js
+++ b/client/store/modules/courses/index.js
@@ -1,10 +1,12 @@
 import * as actions from './actions';
 import * as getters from './getters';
 import * as mutations from './mutations';
+import Resource from '../../helpers/resource';
 
 const PAGINATION_DEFAULTS = { offset: 0, limit: 21 };
 
 const state = {
+  api: new Resource('/courses'),
   search: '',
   items: {},
   $internals: {
@@ -14,8 +16,7 @@ const state = {
       field: 'updatedAt'
     },
     allCoursesFetched: false
-  },
-  $baseUrl: ''
+  }
 };
 
 export default {
diff --git a/client/store/modules/courses/mutations.js b/client/store/modules/courses/mutations.js
index d86351713..db80adcb7 100644
--- a/client/store/modules/courses/mutations.js
+++ b/client/store/modules/courses/mutations.js
@@ -1,8 +1,13 @@
-import generateMutations from '../../helpers/mutations';
+import {
+  add,
+  fetch,
+  remove,
+  reset,
+  setBaseUrl,
+  update
+} from '../../helpers/mutations';
 import Vue from 'vue';
 
-const { fetch, reset, add, remove, update, setBaseUrl } = generateMutations('/courses');
-
 const PAGINATION_DEFAULTS = { offset: 0, limit: 21 };
 
 const resetPagination = state => {
diff --git a/client/store/modules/revisions/actions.js b/client/store/modules/revisions/actions.js
index 51c1f625e..b5717374c 100644
--- a/client/store/modules/revisions/actions.js
+++ b/client/store/modules/revisions/actions.js
@@ -1,17 +1,22 @@
-import generateActions from '../../helpers/actions';
-
-const { api, get, reset, save, remove, update, setBaseUrl } = generateActions();
+import {
+  get,
+  remove,
+  reset,
+  save,
+  setBaseUrl,
+  update
+} from '../../helpers/actions';
 
 const PAGINATION_DEFAULTS = { offset: 0, limit: 25 };
 
-const fetch = ({ getters, commit }) => {
+const fetch = ({ state, getters, commit }) => {
   const params = getters.revisionQueryParams;
-  return api.get('', params).then(response => {
+  return state.api.get('', params).then(response => {
     const { data: revisions } = response.data;
 
     let result = {};
     revisions.forEach(it => {
-      api.setCid(it);
+      state.api.setCid(it);
       result[it._cid] = it;
     });
 
diff --git a/client/store/modules/revisions/index.js b/client/store/modules/revisions/index.js
index 65db32b5b..689eb8e10 100644
--- a/client/store/modules/revisions/index.js
+++ b/client/store/modules/revisions/index.js
@@ -1,16 +1,17 @@
 import * as actions from './actions';
 import * as getters from './getters';
 import * as mutations from './mutations';
+import Resource from '../../helpers/resource';
 
 const PAGINATION_DEFAULTS = { offset: 0, limit: 21 };
 
 const state = {
+  api: new Resource(),
   items: {},
   $internals: {
     pagination: PAGINATION_DEFAULTS,
     allRevisionsFetched: false
-  },
-  $baseUrl: ''
+  }
 };
 
 export default {
diff --git a/client/store/modules/revisions/mutations.js b/client/store/modules/revisions/mutations.js
index 2057a8bd3..09d03eb45 100644
--- a/client/store/modules/revisions/mutations.js
+++ b/client/store/modules/revisions/mutations.js
@@ -1,6 +1,12 @@
-import generateMutations from '../../helpers/mutations';
-
-const { fetch, reset, add, save, remove, update, setBaseUrl } = generateMutations();
+import {
+  add,
+  fetch,
+  remove,
+  reset,
+  save,
+  setBaseUrl,
+  update
+} from '../../helpers/mutations';
 
 const setPagination = (state, changes) => {
   let $internals = state.$internals;
diff --git a/client/store/modules/tes/actions.js b/client/store/modules/tes/actions.js
index 38e9b0bb0..4235d93ac 100644
--- a/client/store/modules/tes/actions.js
+++ b/client/store/modules/tes/actions.js
@@ -1,20 +1,26 @@
+import {
+  fetch,
+  get,
+  remove,
+  reset,
+  save,
+  setBaseUrl,
+  update
+} from '../../helpers/actions';
 import calculatePosition from 'utils/calculatePosition.js';
-import generateActions from '../../helpers/actions';
-
-const { api, get, fetch, reset, save, remove, update, setBaseUrl } = generateActions('/tes');
 
 const insert = ({ element, context }) => {
   const position = calculatePosition(context);
   return context.dispatch('tes/save', { ...element, position });
 };
 
-const reorder = ({ element, context, commit }) => {
+const reorder = ({ state, element, context, commit }) => {
   commit('reorder', { element, position: calculatePosition(context) });
   const data = { position: context.newPosition };
-  return api.post(`${element.id}/reorder`, data)
+  return state.api.post(`${element.id}/reorder`, data)
     .then(res => {
       let element = res.data.data;
-      api.setCid(element);
+      state.api.setCid(element);
       commit('save', element);
     });
 };
diff --git a/client/store/modules/tes/index.js b/client/store/modules/tes/index.js
index b296fc703..75d4b2e1f 100644
--- a/client/store/modules/tes/index.js
+++ b/client/store/modules/tes/index.js
@@ -1,11 +1,12 @@
 import * as actions from './actions';
 import * as getters from './getters';
 import * as mutations from './mutations';
+import Resource from '../../helpers/resource';
 
 const state = {
+  api: new Resource('/tes'),
   items: {},
-  $internals: {},
-  $baseUrl: ''
+  $internals: {}
 };
 
 export default {
diff --git a/client/store/modules/tes/mutations.js b/client/store/modules/tes/mutations.js
index e81ee9545..aee2fe541 100644
--- a/client/store/modules/tes/mutations.js
+++ b/client/store/modules/tes/mutations.js
@@ -1,6 +1,12 @@
-import generateMutations from '../../helpers/mutations';
-
-const { fetch, reset, add, save, remove, update, setBaseUrl } = generateMutations('/tes');
+import {
+  add,
+  fetch,
+  remove,
+  reset,
+  save,
+  setBaseUrl,
+  update
+} from '../../helpers/mutations';
 
 const reorder = ({ element, position }) => {
   element.position = position;

From bc27f01b42fd91462ed68f050bd68876ac5a94e3 Mon Sep 17 00:00:00 2001
From: snyk-test <snyk-test@snyk.io>
Date: Sat, 22 Jun 2019 04:49:46 +0000
Subject: [PATCH 080/213] fix: package.json & package-lock.json to reduce
 vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-SEQUELIZE-450221
---
 package-lock.json | 36 +++++++++++++-----------------------
 package.json      |  2 +-
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f95cf134c..50a289c5c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14592,9 +14592,9 @@
       }
     },
     "sequelize": {
-      "version": "5.6.1",
-      "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-5.6.1.tgz",
-      "integrity": "sha512-QsXUDar6ow0HrF9BtnHRaNumu6qRYb97dfwvez/Z5guH3i6w6k8+bp6gP3VCiDC+2qX+jQIyrYohKg9evy8GFg==",
+      "version": "5.8.11",
+      "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-5.8.11.tgz",
+      "integrity": "sha512-liaJWsXBxB1GUqUMNudX0eh8N7Rb5oTQcKdE6UZnW6efumkEU96BzGQvk3SXonaJs4KlfG7Zm8kozLjv3nXTiQ==",
       "requires": {
         "bluebird": "^3.5.0",
         "cls-bluebird": "^2.1.0",
@@ -14606,7 +14606,7 @@
         "moment-timezone": "^0.5.21",
         "retry-as-promised": "^3.1.0",
         "semver": "^5.6.0",
-        "sequelize-pool": "^1.0.2",
+        "sequelize-pool": "^2.1.0",
         "toposort-class": "^1.0.1",
         "uuid": "^3.2.1",
         "validator": "^10.11.0",
@@ -14627,9 +14627,9 @@
           "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
         },
         "ms": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
         },
         "semver": {
           "version": "5.7.0",
@@ -14876,19 +14876,9 @@
       }
     },
     "sequelize-pool": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/sequelize-pool/-/sequelize-pool-1.0.2.tgz",
-      "integrity": "sha512-VMKl/gCCdIvB1gFZ7p+oqLFEyZEz3oMMYjkKvfEC7GoO9bBcxmfOOU9RdkoltfXGgBZFigSChihRly2gKtsh2w==",
-      "requires": {
-        "bluebird": "^3.5.3"
-      },
-      "dependencies": {
-        "bluebird": {
-          "version": "3.5.4",
-          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz",
-          "integrity": "sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw=="
-        }
-      }
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/sequelize-pool/-/sequelize-pool-2.1.0.tgz",
+      "integrity": "sha512-NDy4qJPxm6+i7FEQqAsJPKVmKLOgorQJ5fYxrTNmvhb3QAbC5nAUxftiIOKQCyYXhWSgPBlDw7eJQozavmq45g=="
     },
     "serialize-javascript": {
       "version": "1.6.1",
@@ -19811,9 +19801,9 @@
       }
     },
     "wkx": {
-      "version": "0.4.6",
-      "resolved": "https://registry.npmjs.org/wkx/-/wkx-0.4.6.tgz",
-      "integrity": "sha512-LHxXlzRCYQXA9ZHgs8r7Gafh0gVOE8o3QmudM1PIkOdkXXjW7Thcl+gb2P2dRuKgW8cqkitCRZkkjtmWzpHi7A==",
+      "version": "0.4.7",
+      "resolved": "https://registry.npmjs.org/wkx/-/wkx-0.4.7.tgz",
+      "integrity": "sha512-pHf546L96TK8RradLt1cWaIffstgv/zXZ14CGz5KnBs1AxBX0wm+IDphjJw0qrEqRv8P9W9CdTt8Z1unMRZ19A==",
       "requires": {
         "@types/node": "*"
       }
diff --git a/package.json b/package.json
index b9623cf57..a101f72c1 100644
--- a/package.json
+++ b/package.json
@@ -105,7 +105,7 @@
     "sass-web-fonts": "^2.0.2",
     "save-as": "^0.1.8",
     "semver": "^6.0.0",
-    "sequelize": "^5.6.1",
+    "sequelize": "^5.8.11",
     "snyk": "^1.134.2",
     "string-template": "^1.0.0",
     "to-case": "^2.0.0",

From 29b3448f455f685621d06dd924d92f797c4b76ed Mon Sep 17 00:00:00 2001
From: parmezan38 <luka38.stojanac@gmail.com>
Date: Mon, 24 Jun 2019 11:44:52 +0200
Subject: [PATCH 081/213] Fix duplicate comments with missing lodash/find

---
 client/store/modules/comments/mutations.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/store/modules/comments/mutations.js b/client/store/modules/comments/mutations.js
index f42f9f5d4..50042a19d 100644
--- a/client/store/modules/comments/mutations.js
+++ b/client/store/modules/comments/mutations.js
@@ -8,6 +8,7 @@ import {
   update
 } from '../../helpers/mutations';
 import cuid from 'cuid';
+import find from 'lodash/find';
 import pick from 'lodash/pick';
 import Vue from 'vue';
 

From 645d9c6aba158ee6f981d78fd3172e5c173fc3b6 Mon Sep 17 00:00:00 2001
From: parmezan38 <luka38.stojanac@gmail.com>
Date: Mon, 24 Jun 2019 12:28:44 +0200
Subject: [PATCH 082/213] Fix leftover vuex-module to vuex mapActions

---
 client/components/course/Sidebar/Publishing.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/components/course/Sidebar/Publishing.vue b/client/components/course/Sidebar/Publishing.vue
index ed06e8985..bf4a7fa64 100644
--- a/client/components/course/Sidebar/Publishing.vue
+++ b/client/components/course/Sidebar/Publishing.vue
@@ -55,7 +55,7 @@ export default {
       return [...getDescendants(outlineActivities, activity), activity];
     }
   },
-  methods: mapActions({ publishActivity: 'publish' }, 'activities')
+  methods: mapActions('activities', { publishActivity: 'publish' })
 };
 </script>
 

From 4a1818ecfb05a7e4c210f2639c07c1d8d6ba56ec Mon Sep 17 00:00:00 2001
From: parmezan38 <luka38.stojanac@gmail.com>
Date: Wed, 26 Jun 2019 14:14:47 +0200
Subject: [PATCH 083/213] Refactor and cleanup :lipstick:

---
 client/components/course/Settings/General.vue |  2 +-
 client/components/course/Settings/index.vue   |  2 +-
 client/store/helpers/mutations.js             |  8 ++------
 client/store/helpers/resource.js              |  2 +-
 client/store/modules/activities/actions.js    | 11 ++---------
 client/store/modules/activities/mutations.js  | 10 +---------
 client/store/modules/auth/actions.js          |  6 ++----
 client/store/modules/comments/actions.js      |  2 +-
 client/store/modules/comments/mutations.js    |  6 +++---
 client/store/modules/course/actions.js        |  2 +-
 client/store/modules/course/mutations.js      |  8 ++------
 client/store/modules/courses/actions.js       |  9 +--------
 client/store/modules/courses/getters.js       |  8 ++------
 client/store/modules/courses/mutations.js     |  8 ++++----
 client/store/modules/revisions/actions.js     |  9 +--------
 client/store/modules/revisions/getters.js     |  4 +---
 client/store/modules/tes/actions.js           | 10 +---------
 client/store/modules/tes/mutations.js         | 10 +---------
 18 files changed, 28 insertions(+), 89 deletions(-)

diff --git a/client/components/course/Settings/General.vue b/client/components/course/Settings/General.vue
index e6f39093a..2b6f02319 100644
--- a/client/components/course/Settings/General.vue
+++ b/client/components/course/Settings/General.vue
@@ -30,7 +30,7 @@
 
 <script>
 import { mapActions, mapGetters } from 'vuex';
-import api from '../../../api/course';
+import api from '@/api/course';
 import cloneDeep from 'lodash/cloneDeep';
 import find from 'lodash/find';
 import { getRepositoryMeta } from 'shared/activities';
diff --git a/client/components/course/Settings/index.vue b/client/components/course/Settings/index.vue
index 56b7080a7..836f3316b 100644
--- a/client/components/course/Settings/index.vue
+++ b/client/components/course/Settings/index.vue
@@ -37,7 +37,7 @@
 
 <script>
 import { mapActions, mapGetters } from 'vuex';
-import api from '../../../api/course';
+import api from '@/api/course';
 import CloneModal from './CloneModal';
 import EventBus from 'EventBus';
 import General from './General';
diff --git a/client/store/helpers/mutations.js b/client/store/helpers/mutations.js
index 6d578dc66..24ecc8553 100644
--- a/client/store/helpers/mutations.js
+++ b/client/store/helpers/mutations.js
@@ -19,17 +19,13 @@ export const add = (state, model) => {
   Vue.set(state.items, model._cid, model);
 };
 
-export const save = (state, model) => {
-  Vue.set(state.items, model._cid, model);
-};
+export const save = (state, model) => Vue.set(state.items, model._cid, model);
 
 export const remove = (state, result) => {
   result.forEach(it => Vue.delete(state.items, it._cid));
 };
 
-export const update = (state, model) => {
-  Vue.set(state.items, model._cid, model);
-};
+export const update = (state, model) => Vue.set(state.items, model._cid, model);
 
 export const setBaseUrl = (state, url) => {
   state.api.baseUrl = url;
diff --git a/client/store/helpers/resource.js b/client/store/helpers/resource.js
index 7ab35a103..a44e29569 100644
--- a/client/store/helpers/resource.js
+++ b/client/store/helpers/resource.js
@@ -1,5 +1,5 @@
 import assign from 'lodash/assign';
-import axios from '../../api/request';
+import axios from '@/api/request';
 import cloneDeep from 'lodash/cloneDeep';
 import cuid from 'cuid';
 import join from 'url-join';
diff --git a/client/store/modules/activities/actions.js b/client/store/modules/activities/actions.js
index f4c69ef90..4d9ec8ade 100644
--- a/client/store/modules/activities/actions.js
+++ b/client/store/modules/activities/actions.js
@@ -1,14 +1,7 @@
-import {
-  fetch,
-  get,
-  reset,
-  save,
-  setBaseUrl,
-  update
-} from '../../helpers/actions';
+import { fetch, get, reset, save, setBaseUrl, update } from '../../helpers/actions';
 import calculatePosition from 'utils/calculatePosition';
 import { getDescendants as getDeepChildren } from 'utils/activity';
-import request from '../../../api/request';
+import request from '@/api/request';
 
 const reorder = ({ state, commit }, { activity, context }) => {
   commit('reorder', { activity, position: calculatePosition(context) });
diff --git a/client/store/modules/activities/mutations.js b/client/store/modules/activities/mutations.js
index 3af6c4ad2..f724dbdf1 100644
--- a/client/store/modules/activities/mutations.js
+++ b/client/store/modules/activities/mutations.js
@@ -1,12 +1,4 @@
-import {
-  add,
-  fetch,
-  remove,
-  reset,
-  save,
-  setBaseUrl,
-  update
-} from '../../helpers/mutations';
+import { add, fetch, remove, reset, save, setBaseUrl, update } from '../../helpers/mutations';
 
 const reorder = (state, { activity, position }) => {
   activity.position = position;
diff --git a/client/store/modules/auth/actions.js b/client/store/modules/auth/actions.js
index d3825a8f0..96167a8ee 100644
--- a/client/store/modules/auth/actions.js
+++ b/client/store/modules/auth/actions.js
@@ -1,4 +1,4 @@
-import api from '../../../api/auth';
+import api from '@/api/auth';
 
 export const login = ({ commit }, credentials) => {
   return api.login(credentials)
@@ -14,9 +14,7 @@ export const logout = () => {
     }, 0));
 };
 
-export const forgotPassword = (context, { email }) => {
-  return api.forgotPassword(email);
-};
+export const forgotPassword = (context, { email }) => api.forgotPassword(email);
 
 export const resetPassword = (context, { token, password }) => {
   return api.resetPassword(token, password);
diff --git a/client/store/modules/comments/actions.js b/client/store/modules/comments/actions.js
index 003e43602..e2ac66c0d 100644
--- a/client/store/modules/comments/actions.js
+++ b/client/store/modules/comments/actions.js
@@ -8,7 +8,7 @@ const fetch = ({ state, commit, rootState }, { activityId }) => {
   if (action === 'reset') commit('setCourse', courseId);
   state.api.fetch({ activityId })
     .then(result => commit(action, result))
-    .then(result => commit('commentsFetched', activityId));
+    .then(() => commit('commentsFetched', activityId));
 };
 
 const subscribe = ({ state, commit }) => {
diff --git a/client/store/modules/comments/mutations.js b/client/store/modules/comments/mutations.js
index 50042a19d..4c51859ce 100644
--- a/client/store/modules/comments/mutations.js
+++ b/client/store/modules/comments/mutations.js
@@ -37,13 +37,13 @@ const sseUpdate = (state, comment) => {
 };
 
 export {
+  add,
   fetch,
+  remove,
   reset,
-  add,
   save,
-  remove,
-  update,
   setBaseUrl,
+  update,
   setCourse,
   commentsFetched,
   sseAdd,
diff --git a/client/store/modules/course/actions.js b/client/store/modules/course/actions.js
index 89ef9c393..a6df7c433 100644
--- a/client/store/modules/course/actions.js
+++ b/client/store/modules/course/actions.js
@@ -1,4 +1,4 @@
-import api from '../../../api/course';
+import api from '@/api/course';
 import filter from 'lodash/filter';
 
 export const getUsers = ({ rootState, commit }) => {
diff --git a/client/store/modules/course/mutations.js b/client/store/modules/course/mutations.js
index 0b0e85910..62f70cb43 100644
--- a/client/store/modules/course/mutations.js
+++ b/client/store/modules/course/mutations.js
@@ -2,13 +2,9 @@ import compact from 'lodash/compact';
 import transform from 'lodash/transform';
 import Vue from 'vue';
 
-export const upsertUser = (state, user) => {
-  Vue.set(state.users, user.id, user);
-};
+export const upsertUser = (state, user) => Vue.set(state.users, user.id, user);
 
-export const removeUser = (state, id) => {
-  Vue.delete(state.users, id);
-};
+export const removeUser = (state, id) => Vue.delete(state.users, id);
 
 export const setUsers = (state, users) => {
   state.users = {};
diff --git a/client/store/modules/courses/actions.js b/client/store/modules/courses/actions.js
index 335c212e6..7fa0f5485 100644
--- a/client/store/modules/courses/actions.js
+++ b/client/store/modules/courses/actions.js
@@ -1,11 +1,4 @@
-import {
-  get,
-  remove,
-  reset,
-  save,
-  setBaseUrl,
-  update
-} from '../../helpers/actions';
+import { get, remove, reset, save, setBaseUrl, update } from '../../helpers/actions';
 
 const fetch = ({ state, getters, commit }, { reset = false } = {}) => {
   const mutation = reset ? 'reset' : 'fetch';
diff --git a/client/store/modules/courses/getters.js b/client/store/modules/courses/getters.js
index f6f644dc5..7fd6b2d3e 100644
--- a/client/store/modules/courses/getters.js
+++ b/client/store/modules/courses/getters.js
@@ -1,6 +1,4 @@
-export const courses = state => {
-  return state.items;
-};
+export const courses = state => state.items;
 
 export const courseQueryParams = state => {
   const { pagination, sort } = state.$internals;
@@ -15,6 +13,4 @@ export const courseQueryParams = state => {
   };
 };
 
-export const hasMoreResults = state => {
-  return !state.$internals.allCoursesFetched;
-};
+export const hasMoreResults = state => !state.$internals.allCoursesFetched;
diff --git a/client/store/modules/courses/mutations.js b/client/store/modules/courses/mutations.js
index db80adcb7..01aff7b1e 100644
--- a/client/store/modules/courses/mutations.js
+++ b/client/store/modules/courses/mutations.js
@@ -36,15 +36,15 @@ const allCoursesFetched = (state, allFetched) => {
 };
 
 export {
+  add,
   allCoursesFetched,
   fetch,
+  remove,
   reset,
-  add,
   resetPagination,
   save,
   setPagination,
   setSearch,
-  remove,
-  update,
-  setBaseUrl
+  setBaseUrl,
+  update
 };
diff --git a/client/store/modules/revisions/actions.js b/client/store/modules/revisions/actions.js
index b5717374c..c820b5110 100644
--- a/client/store/modules/revisions/actions.js
+++ b/client/store/modules/revisions/actions.js
@@ -1,11 +1,4 @@
-import {
-  get,
-  remove,
-  reset,
-  save,
-  setBaseUrl,
-  update
-} from '../../helpers/actions';
+import { get, remove, reset, save, setBaseUrl, update } from '../../helpers/actions';
 
 const PAGINATION_DEFAULTS = { offset: 0, limit: 25 };
 
diff --git a/client/store/modules/revisions/getters.js b/client/store/modules/revisions/getters.js
index 4b6d90d2d..b2dacfa96 100644
--- a/client/store/modules/revisions/getters.js
+++ b/client/store/modules/revisions/getters.js
@@ -5,6 +5,4 @@ export const revisionQueryParams = state => {
   return pagination;
 };
 
-export const hasMoreResults = state => {
-  return !state.$internals.allRevisionsFetched;
-};
+export const hasMoreResults = state => !state.$internals.allRevisionsFetched;
diff --git a/client/store/modules/tes/actions.js b/client/store/modules/tes/actions.js
index 4235d93ac..34bfb58eb 100644
--- a/client/store/modules/tes/actions.js
+++ b/client/store/modules/tes/actions.js
@@ -1,12 +1,4 @@
-import {
-  fetch,
-  get,
-  remove,
-  reset,
-  save,
-  setBaseUrl,
-  update
-} from '../../helpers/actions';
+import { fetch, get, remove, reset, save, setBaseUrl, update } from '../../helpers/actions';
 import calculatePosition from 'utils/calculatePosition.js';
 
 const insert = ({ element, context }) => {
diff --git a/client/store/modules/tes/mutations.js b/client/store/modules/tes/mutations.js
index aee2fe541..8c802147b 100644
--- a/client/store/modules/tes/mutations.js
+++ b/client/store/modules/tes/mutations.js
@@ -1,12 +1,4 @@
-import {
-  add,
-  fetch,
-  remove,
-  reset,
-  save,
-  setBaseUrl,
-  update
-} from '../../helpers/mutations';
+import { add, fetch, remove, reset, save, setBaseUrl, update } from '../../helpers/mutations';
 
 const reorder = ({ element, position }) => {
   element.position = position;

From 72d867ef09f44017da6d4ed72dbf85249cbf4e71 Mon Sep 17 00:00:00 2001
From: parmezan38 <luka38.stojanac@gmail.com>
Date: Wed, 26 Jun 2019 18:32:33 +0200
Subject: [PATCH 084/213] Remove vuex-module from package and package-lock

---
 package-lock.json | 8 --------
 package.json      | 1 -
 2 files changed, 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f95cf134c..f1d5b0193 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18471,14 +18471,6 @@
       "resolved": "https://registry.npmjs.org/vuex/-/vuex-2.5.0.tgz",
       "integrity": "sha512-5oJPOJySBgSgSzoeO+gZB/BbN/XsapgIF6tz34UwJqnGZMQurzIO3B4KIBf862gfc9ya+oduY5sSkq+5/oOilQ=="
     },
-    "vuex-module": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/vuex-module/-/vuex-module-0.4.0.tgz",
-      "integrity": "sha512-ciSoK4OkwTcBK1d4j6LvBojak1pxGGLZwzo9B7e9dFhDb//G9kvggwpcOxWRNgWQPAuV/DBsCVBkrWPjdQjqEw==",
-      "requires": {
-        "vuex": "^2.1.1"
-      }
-    },
     "vuex-router-sync": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/vuex-router-sync/-/vuex-router-sync-3.0.0.tgz",
diff --git a/package.json b/package.json
index b9623cf57..d088fb9ea 100644
--- a/package.json
+++ b/package.json
@@ -132,7 +132,6 @@
     "vuedraggable": "^2.15.0",
     "vuetify": "^1.5.7",
     "vuex": "^2.0.0",
-    "vuex-module": "^0.4.0",
     "vuex-router-sync": "^3.0.0",
     "weekstart": "^1.0.0",
     "yup": "^0.24.1"

From d12362da31f45d2392e06c4f4464c7dfbd6ac7c8 Mon Sep 17 00:00:00 2001
From: parmezan38 <luka38.stojanac@gmail.com>
Date: Wed, 26 Jun 2019 19:13:02 +0200
Subject: [PATCH 085/213] Fix Toggle All button error

---
 client/store/modules/course/mutations.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/store/modules/course/mutations.js b/client/store/modules/course/mutations.js
index 62f70cb43..0ff080073 100644
--- a/client/store/modules/course/mutations.js
+++ b/client/store/modules/course/mutations.js
@@ -15,7 +15,7 @@ export const toggleActivities = (state, outline) => {
   const totalExpanded = compact(Object.values(state.outline.expanded)).length;
   const isOpen = totalExpanded < outline.length;
   const expanded = transform(outline, (acc, it) => (acc[it._cid] = isOpen), {});
-  Vue.set(this.state.outline, 'expanded', expanded);
+  Vue.set(state.outline, 'expanded', expanded);
 };
 
 export const toggleActivity = (state, { _cid, expanded }) => {

From f6fbadf62603150525c72e034b0f4e4d757f32ab Mon Sep 17 00:00:00 2001
From: parmezan38 <luka38.stojanac@gmail.com>
Date: Wed, 26 Jun 2019 19:37:50 +0200
Subject: [PATCH 086/213] Fix Toggle All not opening and closing courses

---
 client/components/course/Outline/index.vue | 4 ++--
 client/store/modules/course/actions.js     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/components/course/Outline/index.vue b/client/components/course/Outline/index.vue
index ffc5c16f1..b3e98c780 100644
--- a/client/components/course/Outline/index.vue
+++ b/client/components/course/Outline/index.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script>
-import { mapGetters, mapMutations } from 'vuex';
+import { mapActions, mapGetters } from 'vuex';
 import Activity from './Activity';
 import Draggable from 'vuedraggable';
 import filter from 'lodash/filter';
@@ -64,7 +64,7 @@ export default {
         .sort((x, y) => x.position - y.position);
     }
   },
-  methods: mapMutations('course', ['toggleActivities']),
+  methods: mapActions('course', ['toggleActivities']),
   components: { Activity, Draggable, NoActivities, Sidebar }
 };
 </script>
diff --git a/client/store/modules/course/actions.js b/client/store/modules/course/actions.js
index a6df7c433..878e93dc6 100644
--- a/client/store/modules/course/actions.js
+++ b/client/store/modules/course/actions.js
@@ -19,6 +19,6 @@ export const removeUser = ({ commit }, { courseId, userId }) => {
 };
 
 export const toggleActivities = ({ getters, commit }) => {
-  const outline = filter(getters['course/outlineActivities'], it => !it.deletedAt);
+  const outline = filter(getters.outlineActivities, it => !it.deletedAt);
   commit('toggleActivities', outline);
 };

From aa481d10e33b7a2f22993c2f0da84e997d7a1016 Mon Sep 17 00:00:00 2001
From: parmezan38 <luka38.stojanac@gmail.com>
Date: Fri, 28 Jun 2019 12:28:54 +0200
Subject: [PATCH 087/213] Remove empty assessments check before saveFile

---
 server/shared/publishing/helpers.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server/shared/publishing/helpers.js b/server/shared/publishing/helpers.js
index c2c84ed5e..0a030e04d 100644
--- a/server/shared/publishing/helpers.js
+++ b/server/shared/publishing/helpers.js
@@ -127,7 +127,6 @@ function publishExams(parent) {
 function publishAssessments(parent) {
   const options = { where: { type: 'ASSESSMENT' }, attributes: TES_ATTRS };
   return parent.getTeachingElements(options).then(assessments => {
-    if (!assessments.length) return Promise.resolve([]);
     const key = getAssessmentsKey(parent);
     return saveFile(parent, key, assessments).then(() => assessments);
   });

From 4f8f6a697e0dd2bb29937f22188f2a85e7198e30 Mon Sep 17 00:00:00 2001
From: parmezan38 <luka38.stojanac@gmail.com>
Date: Fri, 28 Jun 2019 13:40:04 +0200
Subject: [PATCH 088/213] Cleanup :lipstick:

---
 client/components/course/index.vue                           | 4 ++--
 client/components/editor/structure/Exams/AssessmentGroup.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/components/course/index.vue b/client/components/course/index.vue
index 9d3a0b441..abff2e04e 100644
--- a/client/components/course/index.vue
+++ b/client/components/course/index.vue
@@ -53,11 +53,11 @@ export default {
     ...mapActions('course', ['getUsers']),
     ...mapActions('courses', { getCourse: 'get' }),
     ...mapActions('activities', { getActivities: 'fetch' }),
-    ...mapMutations('course', { resetActivityFocus: 'focusActivity' }),
     ...mapActions('activities', { setupActivityApi: 'setBaseUrl' }),
     ...mapActions('comments', { setupCommentsApi: 'setBaseUrl' }),
     ...mapActions('revisions', { setupRevisionApi: 'setBaseUrl' }),
-    ...mapActions('tes', { setupTesApi: 'setBaseUrl' })
+    ...mapActions('tes', { setupTesApi: 'setBaseUrl' }),
+    ...mapMutations('course', { resetActivityFocus: 'focusActivity' })
   },
   async created() {
     const { courseId } = this.$route.params;
diff --git a/client/components/editor/structure/Exams/AssessmentGroup.vue b/client/components/editor/structure/Exams/AssessmentGroup.vue
index ff71a5477..7f82b8a95 100644
--- a/client/components/editor/structure/Exams/AssessmentGroup.vue
+++ b/client/components/editor/structure/Exams/AssessmentGroup.vue
@@ -82,9 +82,9 @@ export default {
     }
   },
   methods: {
-    ...mapMutations('tes', ['add']),
     ...mapActions('tes', ['save', 'update', 'reorder', 'remove']),
     ...mapActions('activities', { updateGroup: 'update', removeGroup: 'remove' }),
+    ...mapMutations('tes', ['add']),
     addAssessment(assessment) {
       this.add(assessment);
       this.selected.push(assessment._cid);

From 3b316191919aa63730c4a78d70820c34c4bd1030 Mon Sep 17 00:00:00 2001
From: Dario Vladovic <d.vladimyr@gmail.com>
Date: Sun, 30 Jun 2019 15:55:43 +0200
Subject: [PATCH 089/213] Remove unused ESLint config

---
 server/.eslintrc.js | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 server/.eslintrc.js

diff --git a/server/.eslintrc.js b/server/.eslintrc.js
deleted file mode 100644
index 036726dc8..000000000
--- a/server/.eslintrc.js
+++ /dev/null
@@ -1,7 +0,0 @@
-'use strict';
-
-module.exports = {
-  env: {
-    mocha: true
-  }
-}

From a0da6294e2c64555d1f5777d41ebf0644fc4ab81 Mon Sep 17 00:00:00 2001
From: Dario Vladovic <d.vladimyr@gmail.com>
Date: Sun, 30 Jun 2019 15:58:39 +0200
Subject: [PATCH 090/213] Add `use strict` pragma :goat:

---
 .eslintrc.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.eslintrc.js b/.eslintrc.js
index 9a234b103..b82e62433 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,3 +1,5 @@
+'use strict';
+
 const isDev = process.env.NODE_ENV === 'development';
 
 module.exports = {

From 918ffc2836d7cdb5b8bff5efe265448e3f258dcc Mon Sep 17 00:00:00 2001
From: Dario Vladovic <d.vladimyr@gmail.com>
Date: Wed, 3 Jul 2019 00:34:31 +0200
Subject: [PATCH 091/213] Implement background & color format reset :tada:

- swapping default `ColorPicker` with new variant
- implementing custom theme (extends "snow")
---
 .../tce-html/edit/Toolbar.vue                 | 56 +++++++++----------
 .../tce-html/edit/color-picker.js             | 32 +++++++++++
 .../tce-html/edit/color-picker.scss           | 22 ++++++++
 .../content-elements/tce-html/edit/index.vue  |  3 +
 .../content-elements/tce-html/edit/theme.js   | 34 +++++++++++
 .../content-elements/tce-html/edit/tooltip.js |  4 +-
 6 files changed, 121 insertions(+), 30 deletions(-)
 create mode 100644 client/components/content-elements/tce-html/edit/color-picker.js
 create mode 100644 client/components/content-elements/tce-html/edit/color-picker.scss
 create mode 100644 client/components/content-elements/tce-html/edit/theme.js

diff --git a/client/components/content-elements/tce-html/edit/Toolbar.vue b/client/components/content-elements/tce-html/edit/Toolbar.vue
index cf9bc29fc..eb7615a2e 100644
--- a/client/components/content-elements/tce-html/edit/Toolbar.vue
+++ b/client/components/content-elements/tce-html/edit/Toolbar.vue
@@ -27,36 +27,36 @@
     </span>
     <span class="ql-formats">
       <select class="ql-color">
-        <option value="rgb(0, 0, 0)"/>
-        <option value="rgb(230, 0, 0)"/>
-        <option value="rgb(255, 153, 0)"/>
-        <option value="rgb(255, 255, 0)"/>
-        <option value="rgb(0, 138, 0)"/>
-        <option value="rgb(0, 102, 204)"/>
-        <option value="rgb(153, 51, 255)"/>
-        <option value="rgb(255, 255, 255)"/>
-        <option value="rgb(250, 204, 204)"/>
-        <option value="rgb(255, 235, 204)"/>
-        <option value="rgb(204, 224, 245)"/>
-        <option value="rgb(235, 214, 255)"/>
-        <option value="rgb(187, 187, 187)"/>
-        <option value="rgb(102, 185, 102)"/>
+        <option value="rgb(0, 0, 0)"></option>
+        <option value="rgb(230, 0, 0)"></option>
+        <option value="rgb(255, 153, 0)"></option>
+        <option value="rgb(255, 255, 0)"></option>
+        <option value="rgb(0, 138, 0)"></option>
+        <option value="rgb(0, 102, 204)"></option>
+        <option value="rgb(153, 51, 255)"></option>
+        <option value="rgb(255, 255, 255)"></option>
+        <option value="rgb(250, 204, 204)"></option>
+        <option value="rgb(255, 235, 204)"></option>
+        <option value="rgb(204, 224, 245)"></option>
+        <option value="rgb(235, 214, 255)"></option>
+        <option value="rgb(187, 187, 187)"></option>
+        <option value="rgb(102, 185, 102)"></option>
       </select>
       <select class="ql-background">
-        <option value="rgb(0, 0, 0)"/>
-        <option value="rgb(230, 0, 0)"/>
-        <option value="rgb(255, 153, 0)"/>
-        <option value="rgb(255, 255, 0)"/>
-        <option value="rgb(0, 138, 0)"/>
-        <option value="rgb(0, 102, 204)"/>
-        <option value="rgb(153, 51, 255)"/>
-        <option value="rgb(255, 255, 255)"/>
-        <option value="rgb(250, 204, 204)"/>
-        <option value="rgb(255, 235, 204)"/>
-        <option value="rgb(204, 224, 245)"/>
-        <option value="rgb(235, 214, 255)"/>
-        <option value="rgb(187, 187, 187)"/>
-        <option value="rgb(102, 185, 102)"/>
+        <option value="rgb(0, 0, 0)"></option>
+        <option value="rgb(230, 0, 0)"></option>
+        <option value="rgb(255, 153, 0)"></option>
+        <option value="rgb(255, 255, 0)"></option>
+        <option value="rgb(0, 138, 0)"></option>
+        <option value="rgb(0, 102, 204)"></option>
+        <option value="rgb(153, 51, 255)"></option>
+        <option value="rgb(255, 255, 255)"></option>
+        <option value="rgb(250, 204, 204)"></option>
+        <option value="rgb(255, 235, 204)"></option>
+        <option value="rgb(204, 224, 245)"></option>
+        <option value="rgb(235, 214, 255)"></option>
+        <option value="rgb(187, 187, 187)"></option>
+        <option value="rgb(102, 185, 102)"></option>
       </select>
     </span>
     <span class="ql-formats">
diff --git a/client/components/content-elements/tce-html/edit/color-picker.js b/client/components/content-elements/tce-html/edit/color-picker.js
new file mode 100644
index 000000000..0db1ec28c
--- /dev/null
+++ b/client/components/content-elements/tce-html/edit/color-picker.js
@@ -0,0 +1,32 @@
+import './color-picker.scss';
+import { Quill } from 'vue-quill-editor';
+const BaseColorPicker = Quill.import('ui/color-picker');
+
+const className = (...names) => names.join(' ');
+
+export default class ColorPicker extends BaseColorPicker {
+  constructor(quill, { type, select, label }) {
+    super(select, label);
+    this.quill = quill;
+    this.type = type;
+  }
+
+  buildPicker() {
+    super.buildPicker();
+    const btnReset = document.createElement('button');
+    btnReset.className = className('picker-item__none');
+    btnReset.tabIndex = 0;
+    btnReset.appendChild(createIcon('water-off'));
+    btnReset.innerHTML += 'None';
+    btnReset.addEventListener('click', () => {
+      this.quill.format(this.type, null, Quill.sources.USER);
+    });
+    this.options.insertAdjacentElement('afterbegin', btnReset);
+  }
+}
+
+function createIcon(name) {
+  const icon = document.createElement('span');
+  icon.className = className('icon', 'mdi', `mdi-${name}`);
+  return icon;
+}
diff --git a/client/components/content-elements/tce-html/edit/color-picker.scss b/client/components/content-elements/tce-html/edit/color-picker.scss
new file mode 100644
index 000000000..aa6d28987
--- /dev/null
+++ b/client/components/content-elements/tce-html/edit/color-picker.scss
@@ -0,0 +1,22 @@
+.ql-color-picker {
+  .ql-picker-options .picker-item__none {
+    $height: 30px;
+    $icon-size: 18px;
+
+    display: inline-flex;
+    width: 100%;
+    height: $height;
+    padding: 0 1px;
+    line-height: $height;
+    float: none;
+    align-items: center;
+    vertical-align: middle;
+    text-align: left;
+
+    .icon {
+      vertical-align: top;
+      margin-right: 4px;
+      font-size: $icon-size;
+    }
+  }
+}
diff --git a/client/components/content-elements/tce-html/edit/index.vue b/client/components/content-elements/tce-html/edit/index.vue
index 7ab666411..03f4ab592 100644
--- a/client/components/content-elements/tce-html/edit/index.vue
+++ b/client/components/content-elements/tce-html/edit/index.vue
@@ -24,11 +24,13 @@
 
 <script>
 import { Quill, quillEditor as QuillEditor } from 'vue-quill-editor';
+import CustomTheme from './theme';
 import debounce from 'lodash/debounce';
 import get from 'lodash/get';
 import ImageEmbed from './image-embed';
 
 Quill.register('modules/imageEmbed', ImageEmbed);
+Quill.register(`themes/${CustomTheme.name}`, CustomTheme);
 
 const toolbar = {
   container: '#quillToolbar',
@@ -46,6 +48,7 @@ const toolbar = {
 };
 
 const options = {
+  theme: CustomTheme.name,
   modules: {
     toolbar,
     imageEmbed: { spacing: 1 },
diff --git a/client/components/content-elements/tce-html/edit/theme.js b/client/components/content-elements/tce-html/edit/theme.js
new file mode 100644
index 000000000..6cddc413b
--- /dev/null
+++ b/client/components/content-elements/tce-html/edit/theme.js
@@ -0,0 +1,34 @@
+import ColorPicker from './color-picker';
+import { Quill } from 'vue-quill-editor';
+
+const SnowTheme = Quill.import('themes/snow');
+
+const findIndex = (selects, type) => selects.findIndex(it => it.classList.contains(type));
+const remove = (arr, index) => arr.splice(index, 1)[0];
+
+class CustomTheme extends SnowTheme {
+  buildPickers(selects, icons) {
+    const backgroundIndex = findIndex(selects, 'ql-background');
+    const colorIndex = findIndex(selects, 'ql-color');
+    selects = selects.slice();
+    const backgroundSelect = remove(selects, backgroundIndex);
+    const colorSelect = remove(selects, colorIndex);
+    super.buildPickers(selects, icons);
+    this.pickers.push(
+      new ColorPicker(this.quill, {
+        type: 'background',
+        select: backgroundSelect,
+        label: icons.background
+      }),
+      new ColorPicker(this.quill, {
+        type: 'color',
+        select: colorSelect,
+        label: icons.color
+      })
+    );
+  }
+}
+
+CustomTheme.DEFAULTS = Object.assign({}, SnowTheme.DEFAULTS);
+
+export default CustomTheme;
diff --git a/client/components/content-elements/tce-html/edit/tooltip.js b/client/components/content-elements/tce-html/edit/tooltip.js
index 092943711..87f5671b5 100644
--- a/client/components/content-elements/tce-html/edit/tooltip.js
+++ b/client/components/content-elements/tce-html/edit/tooltip.js
@@ -1,7 +1,7 @@
 import { Quill } from 'vue-quill-editor';
-const Tooltip = Quill.import('ui/tooltip');
+const BaseTooltip = Quill.import('ui/tooltip');
 
-export default class BaseTooltip extends Tooltip {
+export default class Tooltip extends BaseTooltip {
   constructor(quill, bounds) {
     super(quill, bounds);
     this._onClick = this._onClick.bind(this);

From 6e20c799a68ad9c598d20d5b9d406f904e34ce96 Mon Sep 17 00:00:00 2001
From: Dario Vladovic <d.vladimyr@gmail.com>
Date: Wed, 3 Jul 2019 20:39:10 +0200
Subject: [PATCH 092/213] Update `package-lock.json` :goat:

---
 package-lock.json | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c6869044f..bf5093dd9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2175,15 +2175,6 @@
         "source-map": "^0.6.0"
       }
     },
-    "@types/webpack-chain": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/@types/webpack-chain/-/webpack-chain-5.2.0.tgz",
-      "integrity": "sha512-/DhcbcUcN593BvM7g/o6JWNiJ7bBSdk8g0kynUc2jktjGTHeVVANn5rGfnC1QW5bbiupj82pSQpmhFLKIfrFbw==",
-      "dev": true,
-      "requires": {
-        "webpack-chain": "*"
-      }
-    },
     "@types/webpack-dev-server": {
       "version": "3.1.6",
       "resolved": "https://registry.npmjs.org/@types/webpack-dev-server/-/webpack-dev-server-3.1.6.tgz",

From a245c5c8562bca462ebbb332b7c053eacd8499de Mon Sep 17 00:00:00 2001
From: parmezan38 <luka38.stojanac@gmail.com>
Date: Thu, 4 Jul 2019 15:36:22 +0200
Subject: [PATCH 093/213] Fix issue when inserting in-between elements

---
 client/store/modules/tes/actions.js   | 6 +++---
 client/store/modules/tes/mutations.js | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/store/modules/tes/actions.js b/client/store/modules/tes/actions.js
index 34bfb58eb..387c4cf13 100644
--- a/client/store/modules/tes/actions.js
+++ b/client/store/modules/tes/actions.js
@@ -1,12 +1,12 @@
 import { fetch, get, remove, reset, save, setBaseUrl, update } from '../../helpers/actions';
 import calculatePosition from 'utils/calculatePosition.js';
 
-const insert = ({ element, context }) => {
+const insert = ({ dispatch }, { element, context }) => {
   const position = calculatePosition(context);
-  return context.dispatch('tes/save', { ...element, position });
+  return dispatch('save', { ...element, position });
 };
 
-const reorder = ({ state, element, context, commit }) => {
+const reorder = ({ state, commit }, { element, context }) => {
   commit('reorder', { element, position: calculatePosition(context) });
   const data = { position: context.newPosition };
   return state.api.post(`${element.id}/reorder`, data)
diff --git a/client/store/modules/tes/mutations.js b/client/store/modules/tes/mutations.js
index 8c802147b..4a7fe3759 100644
--- a/client/store/modules/tes/mutations.js
+++ b/client/store/modules/tes/mutations.js
@@ -1,6 +1,6 @@
 import { add, fetch, remove, reset, save, setBaseUrl, update } from '../../helpers/mutations';
 
-const reorder = ({ element, position }) => {
+const reorder = (state, { element, position }) => {
   element.position = position;
 };
 

From 3eefd229b8923159eed4414f2ba70b44b33212c1 Mon Sep 17 00:00:00 2001
From: Igor Bebic <igor.bebic@gmail.com>
Date: Fri, 5 Jul 2019 11:34:26 +0200
Subject: [PATCH 094/213] Show confirmation modal when canceling assessment

---
 .../components/editor/structure/Assessments.vue   | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/client/components/editor/structure/Assessments.vue b/client/components/editor/structure/Assessments.vue
index beed6a3be..65ae562de 100644
--- a/client/components/editor/structure/Assessments.vue
+++ b/client/components/editor/structure/Assessments.vue
@@ -17,7 +17,7 @@
         :expanded="isSelected(it)"
         @selected="toggleSelect(it)"
         @save="saveAssessment"
-        @delete="it.id ? requestDeleteConfirmation(it) : remove(it)"/>
+        @delete="requestRemoveConfirmation(it)"/>
     </ul>
     <add-element
       :include="['ASSESSMENT']"
@@ -33,6 +33,7 @@
 import { mapActions, mapGetters, mapMutations } from 'vuex-module';
 import AddElement from 'tce-core/AddElement';
 import AssessmentItem from './AssessmentItem';
+import capitalize from 'lodash/capitalize';
 import EventBus from 'EventBus';
 import map from 'lodash/map';
 
@@ -81,12 +82,12 @@ export default {
       this.allSelected = !this.allSelected;
       this.selected = this.allSelected ? map(this.assessments, it => it._cid) : [];
     },
-    requestDeleteConfirmation(assessment) {
-      appChannel.emit('showConfirmationModal', {
-        title: 'Delete assessment?',
-        message: 'Are you sure you want to delete assessment?',
-        action: () => this.remove(assessment)
-      });
+    requestRemoveConfirmation(assessment) {
+      const actionPrefix = assessment.id ? 'delete' : 'discard';
+      const title = capitalize(`${actionPrefix} assessment?`);
+      const message = `Are you sure you want to ${actionPrefix} assessment?`;
+      const action = () => this.remove(assessment);
+      appChannel.emit('showConfirmationModal', { title, message, action });
     }
   },
   components: { AddElement, AssessmentItem }

From 910eb0642ce28849c2a4c6552ceeaa73f5f68a3a Mon Sep 17 00:00:00 2001
From: Igor Bebic <igor.bebic@gmail.com>
Date: Fri, 5 Jul 2019 11:58:16 +0200
Subject: [PATCH 095/213] Fixed alignment for Activity create type dropdown

---
 .../course/Outline/InsertActivity/CreateActivity.vue      | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/client/components/course/Outline/InsertActivity/CreateActivity.vue b/client/components/course/Outline/InsertActivity/CreateActivity.vue
index 0edb09663..b786fbd74 100644
--- a/client/components/course/Outline/InsertActivity/CreateActivity.vue
+++ b/client/components/course/Outline/InsertActivity/CreateActivity.vue
@@ -93,6 +93,14 @@ export default {
   .type-select {
     min-width: 170px;
     margin-left: 25px;
+
+    /deep/ .multiselect {
+      padding-top: 0;
+
+      .multiselect__select {
+        top: 0;
+      }
+    }
   }
 
   .actions {

From 7e51901c35dba76df82577d50859cbb0a33cc9af Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Mon, 8 Jul 2019 12:40:58 +0200
Subject: [PATCH 096/213] Align store helpers with boutique ones

---
 client/store/helpers/actions.js   | 108 +++++++++++++++++-------------
 client/store/helpers/mutations.js |  30 ++++-----
 client/store/helpers/resource.js  |  52 +++++++-------
 3 files changed, 102 insertions(+), 88 deletions(-)

diff --git a/client/store/helpers/actions.js b/client/store/helpers/actions.js
index 332dbf17d..8a4d7554b 100644
--- a/client/store/helpers/actions.js
+++ b/client/store/helpers/actions.js
@@ -1,58 +1,72 @@
 import cuid from 'cuid';
+import Resource from './resource';
 
-export const get = ({ state, commit }, id) => {
-  // TODO:  check if it needs replacing like boutique
-  //        commit('save', res) || res)
-  return state.api.getById(id).then(res => commit('save', res));
-};
+export default function ($apiUrl) {
+  let api = new Resource($apiUrl);
 
-export const fetch = ({ state, commit }, params = {}) => {
-  return state.api.fetch(params).then(res => commit('fetch', res));
-};
+  const get = ({ commit }, id) => {
+    return api.getById(id).then(item => commit('save', item) || item);
+  };
 
-export const reset = ({ state, commit }) => {
-  return state.api.fetch().then(res => commit('reset', res));
-};
+  const fetch = ({ commit }, opts = {}) => {
+    return api.fetch(opts).then(res => commit('fetch', res));
+  };
 
-export const save = ({ commit, state }, model) => {
-  if (!model._cid) model._cid = cuid();
-  model._synced = false;
-  model._version = Date.now();
+  const reset = ({ commit }, opts = {}) => {
+    return api.fetch(opts).then(res => commit('reset', res));
+  };
 
-  // create or update model locally
-  commit('save', model);
+  const filter = ({ commit }, opts = {}) => {
+    return api.fetch(opts).then(res => commit('reset', res));
+  };
 
-  return state.api.save(model)
-    .then(model => {
-      // check if new change happened locally during api call
-      // do not update meta if there is newer change
+  const save = ({ state, commit }, model) => {
+    if (!model._cid) model._cid = cuid();
+    model._synced = false;
+    model._version = Date.now();
+    // Create or update model locally.
+    commit('save', model);
+    return api.save(model).then(model => {
+      // Check if new change happened locally during api call.
+      // Do not update meta if there is newer change.
       const previous = state.items[model._cid];
       if (previous && previous._version === model._version) model._synced = true;
       commit('save', model);
     });
-};
-
-export const remove = ({ state, commit }, model) => {
-  // If added locally; not waiting for id (add)
-  if (!model.id && !model._version) {
-    commit('remove', [model]);
-    return Promise.resolve(true);
-  }
-
-  return state.api.remove(model)
-    .then(removed => commit('remove', removed));
-};
-
-export const update = ({ state, commit }, model) => {
-  const cid = model._cid;
-  const changes = { ...model };
-  delete changes._cid;
-  return state.api.update(cid, changes)
-    .then(updated => commit('update', updated));
-};
-
-export const setBaseUrl = ({ state, commit }, baseUrl) => {
-  if (state.api.baseUrl !== baseUrl) {
-    commit('setBaseUrl', baseUrl);
-  }
-};
+  };
+
+  const update = ({ commit }, model) => {
+    const cid = model._cid;
+    const changes = { ...model };
+    delete changes._cid;
+    return api.update(cid, changes)
+      .then(updated => commit('save', updated));
+  };
+
+  const remove = ({ commit }, model) => {
+    if (!model.id && !model._version) {
+      commit('remove', [model]);
+      return Promise.resolve(true);
+    }
+    return api.remove(model).then(() => commit('remove', [model]));
+  };
+
+  const setEndpoint = ({ state, commit }, apiUrl) => {
+    if (state.$apiUrl !== apiUrl) {
+      api.baseUrl = apiUrl;
+      commit('setEndpoint', apiUrl);
+    }
+  };
+
+  return {
+    api,
+    fetch,
+    filter,
+    get,
+    remove,
+    reset,
+    save,
+    setEndpoint,
+    update
+  };
+}
diff --git a/client/store/helpers/mutations.js b/client/store/helpers/mutations.js
index 24ecc8553..0f94f567a 100644
--- a/client/store/helpers/mutations.js
+++ b/client/store/helpers/mutations.js
@@ -2,31 +2,27 @@ import cuid from 'cuid';
 import each from 'lodash/each';
 import Vue from 'vue';
 
-export const fetch = (state, result) => {
-  each(result, it => {
-    // TODO: Extract api unrelated methods
-    state.api.setCid(it);
-    Vue.set(state.items, it._cid, it);
-  });
+export const fetch = (state, items) => {
+  each(items, it => Vue.set(state.items, it._cid, it));
 };
 
-export const reset = (state, result) => {
-  state.items = result;
+export const reset = (state, items = {}) => {
+  state.items = items;
 };
 
 export const add = (state, model) => {
-  if (!model._cid) model._cid = cuid();
-  Vue.set(state.items, model._cid, model);
+  const _cid = model._cid || cuid();
+  Vue.set(state.items, _cid, { ...model, _cid });
 };
 
-export const save = (state, model) => Vue.set(state.items, model._cid, model);
-
-export const remove = (state, result) => {
-  result.forEach(it => Vue.delete(state.items, it._cid));
+export const save = (state, model) => {
+  Vue.set(state.items, model._cid, model);
 };
 
-export const update = (state, model) => Vue.set(state.items, model._cid, model);
+export const remove = (state, models) => {
+  models.forEach(it => Vue.delete(state.items, it._cid));
+};
 
-export const setBaseUrl = (state, url) => {
-  state.api.baseUrl = url;
+export const setEndpoint = (state, url) => {
+  state.$apiUrl = url;
 };
diff --git a/client/store/helpers/resource.js b/client/store/helpers/resource.js
index a44e29569..c3edb7169 100644
--- a/client/store/helpers/resource.js
+++ b/client/store/helpers/resource.js
@@ -5,8 +5,9 @@ import cuid from 'cuid';
 import join from 'url-join';
 import omit from 'lodash/omit';
 import Queue from 'promise-queue';
+import reduce from 'lodash/reduce';
 
-// used to serialize api calls that modify data
+// Used to serialize api calls that modify data.
 const queue = new Queue(1, Infinity);
 
 export default class Resource {
@@ -37,6 +38,18 @@ export default class Resource {
     if (model.id) this.map(model._cid, model.id);
   }
 
+  /**
+   * Transform BE collection into store format.
+   * @param {Array} items
+   */
+  processEntries(items) {
+    return reduce(items, (acc, it) => {
+      this.setCid(it);
+      acc[it._cid] = it;
+      return acc;
+    }, {});
+  }
+
   /**
    * Get server id based on client id.
    * @param {string} _cid
@@ -67,7 +80,7 @@ export default class Resource {
     this.mappings[id] = _cid;
   }
 
-  /*
+  /**
    * Remove both client and server ids for given model.
    * @param {object} model
    */
@@ -105,13 +118,12 @@ export default class Resource {
       // if server id is not provided but exist inside resource cache
       if (!model.id && this.getKey(model._cid)) this.setKey(model);
       const action = model.id ? 'patch' : 'post';
-      const url = model.id ? this.url(model.id) : this.url();
-      return axios[action](url, this.clean(model))
-        .then(response => {
-          if (!model.id) this.map(model._cid, response.data.data.id);
-          model = cloneDeep(model);
-          return assign(model, response.data.data);
-        });
+      const url = this.url(model.id ? model.id.toString() : '');
+      return axios[action](url, this.clean(model)).then(response => {
+        if (!model.id) this.map(model._cid, response.data.data.id);
+        model = cloneDeep(model);
+        return assign(model, response.data.data);
+      });
     });
   }
 
@@ -122,13 +134,11 @@ export default class Resource {
    */
   update(cid, changes) {
     const key = this.getKey(cid);
-    return this
-      .patch(key, changes)
-      .then(response => {
-        const updated = response.data.data;
-        updated._cid = cid;
-        return updated;
-      });
+    return this.patch(key, changes).then(response => {
+      const updated = response.data.data;
+      updated._cid = cid;
+      return updated;
+    });
   }
 
   /**
@@ -148,14 +158,8 @@ export default class Resource {
    * @param {object} params Query params
    */
   fetch(params) {
-    return this.get('', params).then(response => {
-      let result = {};
-      response.data.data.forEach(it => {
-        this.setCid(it);
-        result[it._cid] = it;
-      });
-      return result;
-    });
+    return this.get('', params)
+      .then(({ data: { data } }) => this.processEntries(data));
   }
 
   get(path, params = {}) {

From 9bb5d92f3ae80809d57788c4a6801304f33312f8 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Mon, 8 Jul 2019 12:42:21 +0200
Subject: [PATCH 097/213] Adapted activities module to store helpers

---
 client/store/modules/activities/actions.js   | 47 +++++++++++---------
 client/store/modules/activities/getters.js   | 10 +++--
 client/store/modules/activities/index.js     |  5 +--
 client/store/modules/activities/mutations.js |  6 +--
 4 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/client/store/modules/activities/actions.js b/client/store/modules/activities/actions.js
index 4d9ec8ade..c0e6b9350 100644
--- a/client/store/modules/activities/actions.js
+++ b/client/store/modules/activities/actions.js
@@ -1,17 +1,15 @@
-import { fetch, get, reset, save, setBaseUrl, update } from '../../helpers/actions';
 import calculatePosition from 'utils/calculatePosition';
+import generateActions from '../../helpers/actions';
 import { getDescendants as getDeepChildren } from 'utils/activity';
 import request from '@/api/request';
 
-const reorder = ({ state, commit }, { activity, context }) => {
-  commit('reorder', { activity, position: calculatePosition(context) });
-  const data = { position: context.newPosition };
-  return state.api.post(`${activity.id}/reorder`, data)
-    .then(res => {
-      let activity = res.data.data;
-      state.api.setCid(activity);
-      commit('save', activity);
-    });
+const { api, fetch, get, reset, save, setEndpoint, update } = generateActions();
+
+const reorder = ({ commit }, { activity, context }) => {
+  const position = calculatePosition(context);
+  commit('reorder', { activity, position });
+  return api.post(`${activity.id}/reorder`, { position: context.newPosition })
+    .then(({ data: { data } }) => commit('save', { ...activity, ...data }));
 };
 
 const remove = ({ state, commit }, model) => {
@@ -20,23 +18,32 @@ const remove = ({ state, commit }, model) => {
     commit('remove', [model]);
     return Promise.resolve(true);
   }
-  return state.api.remove(model)
+  return api.remove(model)
     .then(() => commit('remove', [model, ...descendants]));
 };
 
+const publish = ({ commit }, activity) => {
+  return api.get(`${activity.id}/publish`).then(({ data: { data } }) => {
+    commit('save', { ...activity, publishedAt: data.publishedAt });
+  });
+};
+
 const clone = ({ commit }, mapping) => {
   const { srcId, srcCourseId } = mapping;
   const url = `/courses/${srcCourseId}/activities/${srcId}/clone`;
   return request.post(url, mapping)
-    .then(({ data: { data } }) => commit('fetch', data));
+    .then(({ data: { data } }) => commit('fetch', api.processEntries(data)));
 };
 
-const publish = ({ commit }, activity) => {
-  const { id, courseId } = activity;
-  const url = `/courses/${courseId}/activities/${id}/publish`;
-  return request.get(url).then(({ data: { data } }) => {
-    commit('save', { ...activity, publishedAt: data.publishedAt });
-  });
+export {
+  clone,
+  get,
+  fetch,
+  publish,
+  remove,
+  reorder,
+  reset,
+  save,
+  setEndpoint,
+  update
 };
-
-export { clone, get, fetch, publish, remove, reorder, reset, save, update, setBaseUrl };
diff --git a/client/store/modules/activities/getters.js b/client/store/modules/activities/getters.js
index 1096bdb68..4ef93080f 100644
--- a/client/store/modules/activities/getters.js
+++ b/client/store/modules/activities/getters.js
@@ -10,8 +10,8 @@ import { getLevel } from 'shared/activities';
 export const activities = state => state.items;
 
 export const getParent = state => {
-  return activityId => {
-    const activity = find(state.items, { id: activityId });
+  return id => {
+    const activity = find(state.items, { id });
     return activity ? find(state.items, { id: activity.parentId }) : null;
   };
 };
@@ -25,7 +25,11 @@ export const getAncestors = state => {
 };
 
 export const getLineage = state => {
-  return activity => getParents(state.items, activity);
+  return activity => {
+    const ancestors = getParents(state.items, activity);
+    const descendants = getDeepChildren(state.items, activity);
+    return [...ancestors, ...descendants];
+  };
 };
 
 export const getExamObjectives = state => {
diff --git a/client/store/modules/activities/index.js b/client/store/modules/activities/index.js
index 79cb6ef12..0cabc9f0c 100644
--- a/client/store/modules/activities/index.js
+++ b/client/store/modules/activities/index.js
@@ -1,12 +1,11 @@
 import * as actions from './actions';
 import * as getters from './getters';
 import * as mutations from './mutations';
-import Resource from '../../helpers/resource';
 
 const state = {
-  api: new Resource(),
   items: {},
-  $internals: {}
+  $internals: {},
+  $apiUrl: null
 };
 
 export default {
diff --git a/client/store/modules/activities/mutations.js b/client/store/modules/activities/mutations.js
index f724dbdf1..c8de207a0 100644
--- a/client/store/modules/activities/mutations.js
+++ b/client/store/modules/activities/mutations.js
@@ -1,7 +1,7 @@
-import { add, fetch, remove, reset, save, setBaseUrl, update } from '../../helpers/mutations';
+import { add, fetch, remove, reset, save, setEndpoint } from '../../helpers/mutations';
 
 const reorder = (state, { activity, position }) => {
-  activity.position = position;
+  state.items[activity._cid].position = position;
 };
 
-export { fetch, reset, add, save, remove, reorder, update, setBaseUrl };
+export { add, fetch, remove, reorder, reset, save, setEndpoint };

From c3c7df51246efe3d11ba48bb33106d2701d76540 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Mon, 8 Jul 2019 12:42:34 +0200
Subject: [PATCH 098/213] Adapted auth module to store helpers

---
 client/store/modules/auth/actions.js | 4 ++--
 client/store/modules/auth/getters.js | 5 ++---
 client/store/modules/auth/index.js   | 3 +--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/client/store/modules/auth/actions.js b/client/store/modules/auth/actions.js
index 96167a8ee..68e3712a5 100644
--- a/client/store/modules/auth/actions.js
+++ b/client/store/modules/auth/actions.js
@@ -14,8 +14,8 @@ export const logout = () => {
     }, 0));
 };
 
-export const forgotPassword = (context, { email }) => api.forgotPassword(email);
+export const forgotPassword = (_, { email }) => api.forgotPassword(email);
 
-export const resetPassword = (context, { token, password }) => {
+export const resetPassword = (_, { token, password }) => {
   return api.resetPassword(token, password);
 };
diff --git a/client/store/modules/auth/getters.js b/client/store/modules/auth/getters.js
index 9a62bd03f..94cfff06f 100644
--- a/client/store/modules/auth/getters.js
+++ b/client/store/modules/auth/getters.js
@@ -1,5 +1,4 @@
+import get from 'lodash/get';
 import { role } from 'shared';
 
-export const user = ({ user }) => user.email ? user : null;
-
-export const isAdmin = ({ user }) => user.role === role.user.ADMIN;
+export const isAdmin = ({ user }) => get(user, 'role') === role.user.ADMIN;
diff --git a/client/store/modules/auth/index.js b/client/store/modules/auth/index.js
index be2c36883..61d76fcf8 100644
--- a/client/store/modules/auth/index.js
+++ b/client/store/modules/auth/index.js
@@ -3,8 +3,7 @@ import * as getters from './getters';
 import * as mutations from './mutations';
 
 const state = {
-  user: JSON.parse(window.localStorage.getItem('TAILOR_USER')) || {},
-  items: {}
+  user: JSON.parse(window.localStorage.getItem('TAILOR_USER'))
 };
 
 export default {

From d72b17a2e4cff526424102a3b7f1d1ae76abba31 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Mon, 8 Jul 2019 12:42:47 +0200
Subject: [PATCH 099/213] Adapted comments module to store helpers

---
 client/store/modules/comments/actions.js   | 23 +++++++++++-----------
 client/store/modules/comments/getters.js   |  9 +++++----
 client/store/modules/comments/index.js     |  8 +++-----
 client/store/modules/comments/mutations.js | 19 ++++--------------
 4 files changed, 24 insertions(+), 35 deletions(-)

diff --git a/client/store/modules/comments/actions.js b/client/store/modules/comments/actions.js
index e2ac66c0d..9547ca339 100644
--- a/client/store/modules/comments/actions.js
+++ b/client/store/modules/comments/actions.js
@@ -1,19 +1,21 @@
-import { get, save, setBaseUrl } from '../../helpers/actions';
+import generateActions from '../../helpers/actions';
 import SSEClient from '../../../SSEClient';
+
+const { api, get, save, setEndpoint } = generateActions();
 let SSE_CLIENT;
 
-const fetch = ({ state, commit, rootState }, { activityId }) => {
-  const { courseId } = rootState.route.params;
-  let action = state.courseId === courseId ? 'fetch' : 'reset';
+const fetch = ({ state, commit }, { id, courseId }) => {
+  const action = state.courseId === courseId ? 'fetch' : 'reset';
   if (action === 'reset') commit('setCourse', courseId);
-  state.api.fetch({ activityId })
-    .then(result => commit(action, result))
-    .then(() => commit('commentsFetched', activityId));
+  return api.fetch({ activityId: id }).then(items => {
+    commit(action, items);
+    commit('commentsFetched', id);
+  });
 };
 
 const subscribe = ({ state, commit }) => {
   if (SSE_CLIENT) SSE_CLIENT.disconnect();
-  SSE_CLIENT = new SSEClient(`/api/v1${state.api.baseUrl}/subscribe`);
+  SSE_CLIENT = new SSEClient(`/api/v1/${state.$apiUrl}/subscribe`);
   SSE_CLIENT.subscribe('comment_create', item => commit('sseAdd', item));
   SSE_CLIENT.subscribe('comment_update', item => commit('sseUpdate', item));
   SSE_CLIENT.subscribe('comment_delete', item => commit('sseUpdate', item));
@@ -28,8 +30,7 @@ const remove = ({ state, commit }, comment) => {
   // Update locally and let real data update be pushed from server
   // after soft delete
   comment.deletedAt = new Date();
-  commit('update', comment);
-  return state.api.remove(comment);
+  return api.remove(comment);
 };
 
-export { fetch, get, remove, save, subscribe, unsubscribe, setBaseUrl };
+export { fetch, get, remove, save, subscribe, setEndpoint, unsubscribe };
diff --git a/client/store/modules/comments/getters.js b/client/store/modules/comments/getters.js
index e9f4af10a..e9a333e7a 100644
--- a/client/store/modules/comments/getters.js
+++ b/client/store/modules/comments/getters.js
@@ -1,17 +1,18 @@
 import filter from 'lodash/filter';
 import orderBy from 'lodash/orderBy';
 
-export const comments = (state, getters, rootState, rootGetters) => {
+// TODO: Remove from store if not reused
+export const comments = (state, _getters, _rootState, rootGetters) => {
   const activityId = rootGetters['course/activity'].id;
   const activityComments = filter(state.items, { activityId });
   return orderBy(activityComments, 'createdAt', 'desc');
 };
 
-export const commentsCount = (state, getters, rootState, rootGetters) => {
-  return Object.keys(rootGetters.comments).length;
+export const commentsCount = (_state, getters) => {
+  return Object.keys(getters.comments).length;
 };
 
-export const commentsFetched = (state, getters, rootState, rootGetters) => {
+export const commentsFetched = (state, _getters, _rootState, rootGetters) => {
   const activityId = rootGetters['course/activity'].id;
   return !!state.activitiesFetched[activityId];
 };
diff --git a/client/store/modules/comments/index.js b/client/store/modules/comments/index.js
index 2ceaaf886..910e95b1a 100644
--- a/client/store/modules/comments/index.js
+++ b/client/store/modules/comments/index.js
@@ -1,14 +1,12 @@
 import * as actions from './actions';
 import * as getters from './getters';
 import * as mutations from './mutations';
-import Resource from '../../helpers/resource';
 
 const state = {
-  api: new Resource(),
-  courseId: '',
-  activitiesFetched: {},
   items: {},
-  $internals: {}
+  activitiesFetched: {},
+  courseId: null,
+  $apiUrl: null
 };
 
 export default {
diff --git a/client/store/modules/comments/mutations.js b/client/store/modules/comments/mutations.js
index 4c51859ce..d90469a08 100644
--- a/client/store/modules/comments/mutations.js
+++ b/client/store/modules/comments/mutations.js
@@ -1,12 +1,4 @@
-import {
-  add,
-  fetch,
-  remove,
-  reset,
-  save,
-  setBaseUrl,
-  update
-} from '../../helpers/mutations';
+import { fetch, remove, reset, save, setEndpoint } from '../../helpers/mutations';
 import cuid from 'cuid';
 import find from 'lodash/find';
 import pick from 'lodash/pick';
@@ -32,20 +24,17 @@ const sseUpdate = (state, comment) => {
   const existing = find(state.items, { id: comment.id });
   if (!existing) return;
   const data = pick(comment, ['content', 'createdAt', 'updatedAt', 'deletedAt']);
-  const updated = Object.assign({}, existing, data);
-  Vue.set(state.items, updated._cid, updated);
+  Vue.set(state.items, existing._cid, { ...existing, ...data });
 };
 
 export {
-  add,
+  commentsFetched,
   fetch,
   remove,
   reset,
   save,
-  setBaseUrl,
-  update,
   setCourse,
-  commentsFetched,
+  setEndpoint,
   sseAdd,
   sseUpdate
 };

From c9da61722563aef5001440948387db580bf8cf73 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Mon, 8 Jul 2019 12:42:59 +0200
Subject: [PATCH 100/213] Adapted course module to store helpers

---
 client/store/modules/course/actions.js   | 13 +++--
 client/store/modules/course/getters.js   | 60 ++++++++----------------
 client/store/modules/course/index.js     |  6 +--
 client/store/modules/course/mutations.js | 30 ++++++------
 4 files changed, 42 insertions(+), 67 deletions(-)

diff --git a/client/store/modules/course/actions.js b/client/store/modules/course/actions.js
index 878e93dc6..aa1c4f3bd 100644
--- a/client/store/modules/course/actions.js
+++ b/client/store/modules/course/actions.js
@@ -1,9 +1,13 @@
 import api from '@/api/course';
 import filter from 'lodash/filter';
 
+export const toggleActivities = ({ getters, commit }) => {
+  const outline = filter(getters.outlineActivities, it => !it.deletedAt);
+  commit('toggleActivities', outline);
+};
+
 export const getUsers = ({ rootState, commit }) => {
-  const { route } = rootState;
-  const courseId = route.params.courseId;
+  const { route: { params: { courseId } } } = rootState;
   return api.getUsers(courseId)
     .then(users => commit('setUsers', users));
 };
@@ -17,8 +21,3 @@ export const removeUser = ({ commit }, { courseId, userId }) => {
   return api.removeUser(courseId, userId)
     .then(() => commit('removeUser', userId));
 };
-
-export const toggleActivities = ({ getters, commit }) => {
-  const outline = filter(getters.outlineActivities, it => !it.deletedAt);
-  commit('toggleActivities', outline);
-};
diff --git a/client/store/modules/course/getters.js b/client/store/modules/course/getters.js
index 2371e3bd7..3943ad5ab 100644
--- a/client/store/modules/course/getters.js
+++ b/client/store/modules/course/getters.js
@@ -6,72 +6,58 @@ import map from 'lodash/map';
 import { role } from 'shared';
 import values from 'lodash/values';
 
-const COURSE_ROUTE = /\/course\/\d+/;
-// NOTE: teaching elements always have `activityId` foreign key and that is
-//       how we can tell if an element is `tes` or `activity`
 const isTes = element => !!element.activityId;
 
-export const course = (state, getters, rootState, rootGetters) => {
-  const courseId = get(rootState, 'route.params.courseId');
+export const course = (_state, _getters, { route }, { courses }) => {
+  const courseId = get(route, 'params.courseId');
   if (!courseId) return;
-  if (!rootState.route.fullPath.match(COURSE_ROUTE)) return;
-  return find(rootGetters.courses, { id: Number(courseId) });
+  return find(courses, { id: parseInt(courseId, 10) });
 };
 
-export const structure = (state, getters) => {
-  const course = getters.course;
+export const structure = (_, { course }) => {
   if (!course) return;
   return getOutlineLevels(course.schema);
 };
 
-export const activities = (state, getters, rootState, rootGetters) => {
-  const course = getters.course;
+export const activities = (_state, { course }, _rootState, rootGetters) => {
   if (!course) return;
   const { activities: items } = rootGetters;
   return filter(items, { courseId: course.id });
 };
 
-export const activity = (state, getters, rootState, rootGetters) => {
-  const { activities } = rootGetters;
+export const activity = (state, _getters, _rootState, { activities }) => {
   return activities[state.activity] || {};
 };
 
-export const outlineActivities = (state, getters) => {
-  const activities = getters.activities;
-  const structure = getters.structure;
+export const outlineActivities = (_, getters) => {
+  const { activities, structure } = getters;
   const outlineTypes = map(structure, 'type');
   return filter(activities, it => outlineTypes.includes(it.type));
 };
 
 export const isCollapsed = state => {
-  const { outline } = state;
-  return activity => activity && !outline.expanded[activity._cid];
+  return activity => activity && !state.outline.expanded[activity._cid];
 };
 
-export const revisions = (state, getters, rootState, rootGetters) => {
-  const course = getters.course;
+export const revisions = (_state, { course }, _rootState, rootGetters) => {
   if (!course) return [];
-  const revs = rootGetters.revisions;
-  return filter(revs, { courseId: course.id })
+  return filter(rootGetters.revisions, { courseId: course.id })
     .map(rev => ({ ...rev, createdAt: new Date(rev.createdAt) }))
     .sort((rev1, rev2) => rev2.createdAt - rev1.createdAt);
 };
 
-export const getConfig = (state, getters, rootState, rootGetters) => {
+export const getConfig = (_, { course }) => {
   return element => {
     if (!element.type) return {};
-    if (isTes(element)) {
-      const course = getters.course;
-      return getTesMeta(course.schema, element.type);
-    }
+    if (isTes(element)) return getTesMeta(course.schema, element.type);
     return getLevel(element.type) || {};
   };
 };
 
-export const getMetadata = (state, getters, rootState, rootGetters) => {
+export const getMetadata = (_, { getConfig }) => {
   return element => {
     if (!element) return [];
-    const config = getters.getConfig(element);
+    const config = getConfig(element);
     if (!config.meta) return [];
     return map(config.meta, it => {
       const value = get(element, `${isTes(element) ? 'meta' : 'data'}.${it.key}`);
@@ -82,17 +68,9 @@ export const getMetadata = (state, getters, rootState, rootGetters) => {
 
 export const users = state => values(state.users);
 
-export const currentUser = (state, getters, rootState) => {
+export const isCourseAdmin = (state, _, rootState) => {
   const { user } = rootState.auth;
-  return find(state.users, { id: user.id });
-};
-
-export const isCourseAdmin = (state, getters) => {
-  const user = getters.currentUser;
-  return get(user, 'courseRole') === role.course.ADMIN;
-};
-
-export const isCourseAuthor = (state, getters) => {
-  const user = getters.currentUser;
-  return get(user, 'courseRole') === role.course.AUTHOR;
+  if (!user) return;
+  const courseUser = find(state.users, { id: user.id });
+  return get(courseUser, 'courseRole') === role.course.ADMIN;
 };
diff --git a/client/store/modules/course/index.js b/client/store/modules/course/index.js
index d1e00babc..3a66e814a 100644
--- a/client/store/modules/course/index.js
+++ b/client/store/modules/course/index.js
@@ -4,11 +4,9 @@ import * as mutations from './mutations';
 
 const state = {
   activity: undefined,
-  items: {},
-  users: {},
   outline: { expanded: {}, showOptions: null },
-  $internals: {},
-  $baseUrl: ''
+  users: {},
+  $apiUrl: null
 };
 
 export default {
diff --git a/client/store/modules/course/mutations.js b/client/store/modules/course/mutations.js
index 0ff080073..55ed148c4 100644
--- a/client/store/modules/course/mutations.js
+++ b/client/store/modules/course/mutations.js
@@ -2,13 +2,18 @@ import compact from 'lodash/compact';
 import transform from 'lodash/transform';
 import Vue from 'vue';
 
-export const upsertUser = (state, user) => Vue.set(state.users, user.id, user);
+export const focusActivity = (state, _cid) => {
+  state.activity = _cid;
+};
 
-export const removeUser = (state, id) => Vue.delete(state.users, id);
+export const showActivityOptions = (state, _cid) => {
+  state.outline.showOptions = _cid;
+};
 
-export const setUsers = (state, users) => {
-  state.users = {};
-  users.forEach(it => Vue.set(state.users, it.id, it));
+export const toggleActivity = (state, { _cid, expanded }) => {
+  const expandedItems = state.outline.expanded;
+  expanded = expanded === undefined ? !expandedItems[_cid] : expanded;
+  Vue.set(expandedItems, _cid, expanded);
 };
 
 export const toggleActivities = (state, outline) => {
@@ -18,16 +23,11 @@ export const toggleActivities = (state, outline) => {
   Vue.set(state.outline, 'expanded', expanded);
 };
 
-export const toggleActivity = (state, { _cid, expanded }) => {
-  let expandedItems = state.outline.expanded;
-  expanded = expanded === undefined ? !expandedItems[_cid] : expanded;
-  Vue.set(expandedItems, _cid, expanded);
-};
+export const upsertUser = (state, user) => Vue.set(state.users, user.id, user);
 
-export const showActivityOptions = (state, _cid) => {
-  state.outline.showOptions = _cid;
-};
+export const removeUser = (state, id) => Vue.delete(state.users, id);
 
-export const focusActivity = (state, _cid) => {
-  state.activity = _cid;
+export const setUsers = (state, users) => {
+  state.users = {};
+  users.forEach(it => Vue.set(state.users, it.id, it));
 };

From 0e89bfd2fdb317fba1494eb69ddf6bce1ff8fe82 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Mon, 8 Jul 2019 12:43:06 +0200
Subject: [PATCH 101/213] Adapted courses module to store helpers

---
 client/store/modules/courses/actions.js   | 34 ++++++++++++-----------
 client/store/modules/courses/index.js     |  4 +--
 client/store/modules/courses/mutations.js | 14 ++--------
 3 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/client/store/modules/courses/actions.js b/client/store/modules/courses/actions.js
index 7fa0f5485..66eeb5334 100644
--- a/client/store/modules/courses/actions.js
+++ b/client/store/modules/courses/actions.js
@@ -1,29 +1,31 @@
-import { get, remove, reset, save, setBaseUrl, update } from '../../helpers/actions';
+import generateActions from '../../helpers/actions';
 
-const fetch = ({ state, getters, commit }, { reset = false } = {}) => {
+const {
+  api,
+  get,
+  remove,
+  reset,
+  save,
+  setEndpoint,
+  update
+} = generateActions('/courses');
+
+const fetch = ({ getters, commit }, { reset = false } = {}) => {
   const mutation = reset ? 'reset' : 'fetch';
   const params = getters.courseQueryParams;
-  return state.api.get('', params).then(response => {
-    const { data: courses } = response.data;
-
-    let result = {};
-    courses.forEach(it => {
-      state.api.setCid(it);
-      result[it._cid] = it;
-    });
-
+  return api.fetch(params).then(courses => {
     commit('setPagination', { offset: params.offset + params.limit });
-    commit('allCoursesFetched', courses.length < params.limit);
-    commit(mutation, result);
+    commit('allCoursesFetched', Object.keys(courses).length < params.limit);
+    commit(mutation, courses);
   });
 };
 
-const clone = ({ state, commit }, { id, name, description }) => {
-  return state.api.post(`/${id}/clone`, { name, description }).then(response => {
+const clone = ({ commit }, { id, name, description }) => {
+  return api.post(`/${id}/clone`, { name, description }).then(response => {
     const { data: course } = response.data;
     commit('add', course);
     return course.id;
   });
 };
 
-export { get, fetch, clone, reset, save, remove, update, setBaseUrl };
+export { clone, fetch, get, remove, reset, save, setEndpoint, update };
diff --git a/client/store/modules/courses/index.js b/client/store/modules/courses/index.js
index 7e3dda80a..fbec05e7d 100644
--- a/client/store/modules/courses/index.js
+++ b/client/store/modules/courses/index.js
@@ -1,14 +1,12 @@
 import * as actions from './actions';
 import * as getters from './getters';
 import * as mutations from './mutations';
-import Resource from '../../helpers/resource';
 
 const PAGINATION_DEFAULTS = { offset: 0, limit: 21 };
 
 const state = {
-  api: new Resource('/courses'),
-  search: '',
   items: {},
+  search: '',
   $internals: {
     pagination: PAGINATION_DEFAULTS,
     sort: {
diff --git a/client/store/modules/courses/mutations.js b/client/store/modules/courses/mutations.js
index 01aff7b1e..4fac90e75 100644
--- a/client/store/modules/courses/mutations.js
+++ b/client/store/modules/courses/mutations.js
@@ -1,11 +1,4 @@
-import {
-  add,
-  fetch,
-  remove,
-  reset,
-  setBaseUrl,
-  update
-} from '../../helpers/mutations';
+import { add, fetch, remove, reset, setEndpoint } from '../../helpers/mutations';
 import Vue from 'vue';
 
 const PAGINATION_DEFAULTS = { offset: 0, limit: 21 };
@@ -43,8 +36,7 @@ export {
   reset,
   resetPagination,
   save,
+  setEndpoint,
   setPagination,
-  setSearch,
-  setBaseUrl,
-  update
+  setSearch
 };

From 369d06a54efd14b0268b18a871fa8d5ba3d56261 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Mon, 8 Jul 2019 12:43:17 +0200
Subject: [PATCH 102/213] Adapted editor module to store helpers

---
 client/store/modules/editor/getters.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/store/modules/editor/getters.js b/client/store/modules/editor/getters.js
index 8884028b6..8a86450a3 100644
--- a/client/store/modules/editor/getters.js
+++ b/client/store/modules/editor/getters.js
@@ -4,15 +4,15 @@ import get from 'lodash/get';
 import { getSupportedContainers } from 'shared/activities';
 import reduce from 'lodash/reduce';
 
-export const activity = (state, getters, rootState, rootGetters) => {
+export const activity = (_state, _getters, rootState, rootGetters) => {
   const id = parseInt(get(rootState, 'route.params.activityId'), 10);
   return find(rootGetters.activities, { id });
 };
 
-export const contentContainers = (state, getters, rootState, rootGetters) => {
+export const contentContainers = (_state, getters, _rootState, rootGetters) => {
   const { activities } = rootGetters;
-  const activity = getters.activity;
-  if (!activity) return;
+  const { activity } = getters;
+  if (!activity) return {};
   const containers = getSupportedContainers(activity.type);
   return reduce(containers, (acc, { type }) => {
     acc[type] = filter(activities, { parentId: activity.id, type });
@@ -20,9 +20,9 @@ export const contentContainers = (state, getters, rootState, rootGetters) => {
   }, {});
 };
 
-export const assessments = (state, getters, rootState, rootGetters) => {
+export const assessments = (_state, getters, _rootState, rootGetters) => {
   const { tes } = rootGetters;
-  const activity = getters.activity;
-  if (!activity) return;
+  const { activity } = getters;
+  if (!activity) return [];
   return filter(tes, { activityId: activity.id, type: 'ASSESSMENT' });
 };

From 68fbb3cc6aa89f1461bb25751210e88d01621f12 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Mon, 8 Jul 2019 12:43:44 +0200
Subject: [PATCH 103/213] Adapted revisions module to store helpers

---
 client/store/modules/revisions/actions.js   | 24 +++++++--------------
 client/store/modules/revisions/getters.js   |  5 +----
 client/store/modules/revisions/index.js     |  2 --
 client/store/modules/revisions/mutations.js | 20 +++++------------
 4 files changed, 14 insertions(+), 37 deletions(-)

diff --git a/client/store/modules/revisions/actions.js b/client/store/modules/revisions/actions.js
index c820b5110..4edf475a1 100644
--- a/client/store/modules/revisions/actions.js
+++ b/client/store/modules/revisions/actions.js
@@ -1,27 +1,19 @@
-import { get, remove, reset, save, setBaseUrl, update } from '../../helpers/actions';
+import generateActions from '../../helpers/actions';
 
+const { api, get, remove, reset, save, setEndpoint } = generateActions();
 const PAGINATION_DEFAULTS = { offset: 0, limit: 25 };
 
-const fetch = ({ state, getters, commit }) => {
-  const params = getters.revisionQueryParams;
-  return state.api.get('', params).then(response => {
-    const { data: revisions } = response.data;
-
-    let result = {};
-    revisions.forEach(it => {
-      state.api.setCid(it);
-      result[it._cid] = it;
-    });
-
+const fetch = ({ getters: { revisionQueryParams: params }, commit }) => {
+  return api.fetch(params).then(revisions => {
     commit('setPagination', { offset: params.offset + params.limit });
-    commit('allRevisionsFetched', revisions.length < params.limit);
-    commit('fetch', result);
+    commit('allRevisionsFetched', Object.keys(revisions).length < params.limit);
+    commit('fetch', revisions);
   });
 };
 
 const resetPagination = ({ commit }) => {
   commit('setPagination', PAGINATION_DEFAULTS);
-  commit('reset', {});
+  commit('reset');
 };
 
-export { get, fetch, remove, reset, save, update, resetPagination, setBaseUrl };
+export { get, fetch, remove, reset, resetPagination, save, setEndpoint };
diff --git a/client/store/modules/revisions/getters.js b/client/store/modules/revisions/getters.js
index b2dacfa96..1bb33be56 100644
--- a/client/store/modules/revisions/getters.js
+++ b/client/store/modules/revisions/getters.js
@@ -1,8 +1,5 @@
 export const revisions = state => state.items;
 
-export const revisionQueryParams = state => {
-  const { pagination } = state.$internals;
-  return pagination;
-};
+export const revisionQueryParams = state => state.$internals.pagination;
 
 export const hasMoreResults = state => !state.$internals.allRevisionsFetched;
diff --git a/client/store/modules/revisions/index.js b/client/store/modules/revisions/index.js
index 689eb8e10..e9c295ffc 100644
--- a/client/store/modules/revisions/index.js
+++ b/client/store/modules/revisions/index.js
@@ -1,12 +1,10 @@
 import * as actions from './actions';
 import * as getters from './getters';
 import * as mutations from './mutations';
-import Resource from '../../helpers/resource';
 
 const PAGINATION_DEFAULTS = { offset: 0, limit: 21 };
 
 const state = {
-  api: new Resource(),
   items: {},
   $internals: {
     pagination: PAGINATION_DEFAULTS,
diff --git a/client/store/modules/revisions/mutations.js b/client/store/modules/revisions/mutations.js
index 09d03eb45..9a842bb77 100644
--- a/client/store/modules/revisions/mutations.js
+++ b/client/store/modules/revisions/mutations.js
@@ -1,15 +1,7 @@
-import {
-  add,
-  fetch,
-  remove,
-  reset,
-  save,
-  setBaseUrl,
-  update
-} from '../../helpers/mutations';
+import { add, fetch, reset, save, setEndpoint } from '../../helpers/mutations';
 
 const setPagination = (state, changes) => {
-  let $internals = state.$internals;
+  const $internals = state.$internals;
   $internals.pagination = { ...$internals.pagination, ...changes };
 };
 
@@ -18,13 +10,11 @@ const allRevisionsFetched = (state, allFetched) => {
 };
 
 export {
+  add,
   allRevisionsFetched,
   fetch,
   reset,
-  add,
   save,
-  remove,
-  setPagination,
-  update,
-  setBaseUrl
+  setEndpoint,
+  setPagination
 };

From 3478757160fdc580dce73e1743c59ac6770fa5ee Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Mon, 8 Jul 2019 12:43:50 +0200
Subject: [PATCH 104/213] Adapted tes module to store helpers

---
 client/store/modules/tes/index.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/client/store/modules/tes/index.js b/client/store/modules/tes/index.js
index 75d4b2e1f..0cabc9f0c 100644
--- a/client/store/modules/tes/index.js
+++ b/client/store/modules/tes/index.js
@@ -1,12 +1,11 @@
 import * as actions from './actions';
 import * as getters from './getters';
 import * as mutations from './mutations';
-import Resource from '../../helpers/resource';
 
 const state = {
-  api: new Resource('/tes'),
   items: {},
-  $internals: {}
+  $internals: {},
+  $apiUrl: null
 };
 
 export default {

From 4de93674ba8146bf9a398aa6956db020403c811a Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Mon, 8 Jul 2019 12:44:50 +0200
Subject: [PATCH 105/213] Updated mappings

---
 client/App.vue                                     |  6 ++++--
 client/components/auth/Login.vue                   |  4 ++--
 .../course/Sidebar/Discussion/Comment.vue          |  4 ++--
 .../components/course/Sidebar/Discussion/index.vue | 10 +++++-----
 client/components/course/index.vue                 |  8 ++++----
 client/components/editor/index.vue                 | 14 +++++++++-----
 6 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/client/App.vue b/client/App.vue
index 712b193fe..7ae3b77a3 100644
--- a/client/App.vue
+++ b/client/App.vue
@@ -11,14 +11,16 @@
 <script>
 import ConfirmationModal from 'components/common/ConfirmationModal';
 import isIexplorer from 'is-iexplorer';
-import { mapGetters } from 'vuex';
+import { mapState } from 'vuex';
 import Navbar from 'components/common/Navbar';
 
 if (isIexplorer) document.body.classList.add('ie');
 
 export default {
   name: 'app',
-  computed: mapGetters(['user']),
+  computed: mapState({
+    user: state => state.auth.user
+  }),
   components: {
     ConfirmationModal,
     Navbar
diff --git a/client/components/auth/Login.vue b/client/components/auth/Login.vue
index a899693ff..cb9b7076c 100644
--- a/client/components/auth/Login.vue
+++ b/client/components/auth/Login.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script>
-import { mapActions, mapGetters } from 'vuex';
+import { mapActions, mapState } from 'vuex';
 const LOGIN_ERR_MESSAGE = 'User email and password do not match';
 
 export default {
@@ -43,7 +43,7 @@ export default {
       message: ''
     };
   },
-  computed: mapGetters(['user']),
+  computed: mapState({ user: state => state.auth.user }),
   methods: {
     ...mapActions(['login']),
     submit() {
diff --git a/client/components/course/Sidebar/Discussion/Comment.vue b/client/components/course/Sidebar/Discussion/Comment.vue
index 26d8efc1f..c2d92d39c 100644
--- a/client/components/course/Sidebar/Discussion/Comment.vue
+++ b/client/components/course/Sidebar/Discussion/Comment.vue
@@ -66,7 +66,7 @@
 <script>
 import Avatar from 'vue-avatar';
 import { focus } from 'vue-focus';
-import { mapGetters } from 'vuex';
+import { mapState } from 'vuex';
 import TextEditor from 'components/common/TextEditor';
 import ThreadComment from './Comment';
 
@@ -84,7 +84,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['user']),
+    ...mapState({ user: state => state.auth.user }),
     authorInitials() {
       return this.comment.author.email.substr(0, 2).toUpperCase();
     },
diff --git a/client/components/course/Sidebar/Discussion/index.vue b/client/components/course/Sidebar/Discussion/index.vue
index aa4ed2c85..3fa08fc97 100644
--- a/client/components/course/Sidebar/Discussion/index.vue
+++ b/client/components/course/Sidebar/Discussion/index.vue
@@ -47,7 +47,7 @@
 </template>
 
 <script>
-import { mapActions, mapGetters } from 'vuex';
+import { mapActions, mapGetters, mapState } from 'vuex';
 import DiscussionThread from './Thread';
 import TextEditor from 'components/common/TextEditor';
 
@@ -68,7 +68,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['user']),
+    ...mapState({ user: state => state.auth.user }),
     ...mapGetters('course', ['activity']),
     ...mapGetters('comments', ['commentsCount', 'commentsFetched']),
     direction() {
@@ -87,10 +87,10 @@ export default {
     }
   },
   methods: {
-    ...mapActions('comments', ['setBaseUrl', 'fetch', 'save', 'subscribe', 'unsubscribe']),
+    ...mapActions('comments', ['setEndpoint', 'fetch', 'save', 'subscribe', 'unsubscribe']),
     fetchComments() {
       if (this.commentsFetched) return;
-      this.fetch({ activityId: this.activity.id });
+      this.fetch(this.activity);
     },
     post() {
       if (!this.comment.content) return;
@@ -119,7 +119,7 @@ export default {
   },
   mounted() {
     const { courseId } = this.$route.params;
-    this.setBaseUrl(`/courses/${courseId}/comments`);
+    this.setEndpoint(`/courses/${courseId}/comments`);
     this.fetchComments();
     this.subscribe();
   },
diff --git a/client/components/course/index.vue b/client/components/course/index.vue
index abff2e04e..ce28d72af 100644
--- a/client/components/course/index.vue
+++ b/client/components/course/index.vue
@@ -53,10 +53,10 @@ export default {
     ...mapActions('course', ['getUsers']),
     ...mapActions('courses', { getCourse: 'get' }),
     ...mapActions('activities', { getActivities: 'fetch' }),
-    ...mapActions('activities', { setupActivityApi: 'setBaseUrl' }),
-    ...mapActions('comments', { setupCommentsApi: 'setBaseUrl' }),
-    ...mapActions('revisions', { setupRevisionApi: 'setBaseUrl' }),
-    ...mapActions('tes', { setupTesApi: 'setBaseUrl' }),
+    ...mapActions('activities', { setupActivityApi: 'setEndpoint' }),
+    ...mapActions('comments', { setupCommentsApi: 'setEndpoint' }),
+    ...mapActions('revisions', { setupRevisionApi: 'setEndpoint' }),
+    ...mapActions('tes', { setupTesApi: 'setEndpoint' }),
     ...mapMutations('course', { resetActivityFocus: 'focusActivity' })
   },
   async created() {
diff --git a/client/components/editor/index.vue b/client/components/editor/index.vue
index 378aa94bb..ad55c10c6 100644
--- a/client/components/editor/index.vue
+++ b/client/components/editor/index.vue
@@ -45,7 +45,7 @@
 <script>
 import * as config from 'shared/activities';
 import { getElementId, isQuestion } from 'tce-core/utils';
-import { mapActions, mapGetters, mapMutations } from 'vuex';
+import { mapActions, mapGetters } from 'vuex';
 import Assessments from './structure/Assessments';
 import ContentContainers from './structure/ContentContainers';
 import debounce from 'lodash/debounce';
@@ -90,10 +90,14 @@ export default {
   },
   methods: {
     ...mapActions('courses', { getCourse: 'get' }),
-    ...mapActions('activities', { getActivities: 'fetch' }),
-    ...mapActions('tes', { getTeachingElements: 'fetch' }),
-    ...mapMutations('activities', { setupActivitiesApi: 'setBaseUrl' }),
-    ...mapMutations('tes', { setupTesApi: 'setBaseUrl' }),
+    ...mapActions('activities', {
+      getActivities: 'fetch',
+      setupActivitiesApi: 'setEndpoint'
+    }),
+    ...mapActions('tes', {
+      getTeachingElements: 'fetch',
+      setupTesApi: 'setEndpoint'
+    }),
     getContainerConfig(type) {
       return find(this.containerConfigs, { type });
     },

From 3f893c3b896dfb549b6f956cb247115e803d9b6d Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Mon, 8 Jul 2019 12:45:06 +0200
Subject: [PATCH 106/213] Removed notion of course

---
 client/components/catalog/Container.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/components/catalog/Container.vue b/client/components/catalog/Container.vue
index 7874206c4..064cb6bbd 100644
--- a/client/components/catalog/Container.vue
+++ b/client/components/catalog/Container.vue
@@ -22,7 +22,7 @@
           <v-progress-circular color="primary" indeterminate/>
         </div>
         <div slot="no-results" class="no-results">
-          {{ orderedCourses.length ? '' : 'No courses found.' }}
+          {{ orderedCourses.length ? '' : 'No repositories found.' }}
         </div>
         <span slot="no-more"></span>
       </infinite-loading>

From 9387ecf3507e7660d4cbbfbaf7e24d74e75fe2da Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Mon, 8 Jul 2019 12:46:01 +0200
Subject: [PATCH 107/213] Updated auth check

- Due to removed user getter
---
 client/router.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/router.js b/client/router.js
index dc3d775e7..b7c9985bf 100644
--- a/client/router.js
+++ b/client/router.js
@@ -80,7 +80,7 @@ let router = new Router({
 });
 
 router.beforeEach((to, from, next) => {
-  if (to.matched.some(it => it.meta.auth) && !store.getters.user) {
+  if (to.matched.some(it => it.meta.auth) && !store.state.auth.user) {
     next({ path: '/login', query: { redirect: to.fullPath } });
   } else {
     next();

From 70096401ab027a3268aa03b3b3af7c7eb626ec15 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Mon, 8 Jul 2019 12:55:43 +0200
Subject: [PATCH 108/213] Fixed rebase issues :wrench:

---
 client/store/modules/tes/actions.js   | 42 ++++++++++++++++++---------
 client/store/modules/tes/mutations.js |  6 ++--
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/client/store/modules/tes/actions.js b/client/store/modules/tes/actions.js
index 387c4cf13..6a9571e9e 100644
--- a/client/store/modules/tes/actions.js
+++ b/client/store/modules/tes/actions.js
@@ -1,20 +1,36 @@
-import { fetch, get, remove, reset, save, setBaseUrl, update } from '../../helpers/actions';
 import calculatePosition from 'utils/calculatePosition.js';
+import generateActions from '../../helpers/actions';
+
+const {
+  api,
+  fetch,
+  get,
+  remove,
+  reset,
+  save,
+  setEndpoint,
+  update
+} = generateActions();
 
 const insert = ({ dispatch }, { element, context }) => {
-  const position = calculatePosition(context);
-  return dispatch('save', { ...element, position });
+  return dispatch('save', { ...element, position: calculatePosition(context) });
 };
 
-const reorder = ({ state, commit }, { element, context }) => {
-  commit('reorder', { element, position: calculatePosition(context) });
-  const data = { position: context.newPosition };
-  return state.api.post(`${element.id}/reorder`, data)
-    .then(res => {
-      let element = res.data.data;
-      state.api.setCid(element);
-      commit('save', element);
-    });
+const reorder = ({ commit }, { element, context }) => {
+  const position = calculatePosition(context);
+  commit('reorder', { element, position });
+  return api.post(`${element.id}/reorder`, { position: context.newPosition })
+    .then(({ data: { data } }) => commit('save', { ...element, ...data }));
 };
 
-export { get, fetch, insert, remove, reorder, reset, save, update, setBaseUrl };
+export {
+  get,
+  fetch,
+  insert,
+  remove,
+  reorder,
+  reset,
+  save,
+  setEndpoint,
+  update
+};
diff --git a/client/store/modules/tes/mutations.js b/client/store/modules/tes/mutations.js
index 4a7fe3759..1bdab9690 100644
--- a/client/store/modules/tes/mutations.js
+++ b/client/store/modules/tes/mutations.js
@@ -1,7 +1,7 @@
-import { add, fetch, remove, reset, save, setBaseUrl, update } from '../../helpers/mutations';
+import { add, fetch, remove, reset, save, setEndpoint } from '../../helpers/mutations';
 
 const reorder = (state, { element, position }) => {
-  element.position = position;
+  state.items[element._cid].position = position;
 };
 
-export { fetch, reset, add, save, remove, reorder, update, setBaseUrl };
+export { add, fetch, remove, reorder, reset, save, setEndpoint };

From dfeec06588b903622eb56fa20a4fbd51519f1eea Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Mon, 8 Jul 2019 13:45:57 +0200
Subject: [PATCH 109/213] Exposed update action for comments

---
 client/store/modules/comments/actions.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/client/store/modules/comments/actions.js b/client/store/modules/comments/actions.js
index 9547ca339..7e2a740ee 100644
--- a/client/store/modules/comments/actions.js
+++ b/client/store/modules/comments/actions.js
@@ -1,7 +1,7 @@
 import generateActions from '../../helpers/actions';
 import SSEClient from '../../../SSEClient';
 
-const { api, get, save, setEndpoint } = generateActions();
+const { api, get, save, setEndpoint, update } = generateActions();
 let SSE_CLIENT;
 
 const fetch = ({ state, commit }, { id, courseId }) => {
@@ -33,4 +33,13 @@ const remove = ({ state, commit }, comment) => {
   return api.remove(comment);
 };
 
-export { fetch, get, remove, save, subscribe, setEndpoint, unsubscribe };
+export {
+  fetch,
+  get,
+  remove,
+  save,
+  subscribe,
+  setEndpoint,
+  unsubscribe,
+  update
+};

From ab71c17286b08bca65aaefd8c644dd218aabf4aa Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Mon, 8 Jul 2019 14:20:02 +0200
Subject: [PATCH 110/213] Cleanup :wrench:

---
 client/components/course/Sidebar/Discussion/index.vue | 4 +++-
 client/store/modules/revisions/index.js               | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/components/course/Sidebar/Discussion/index.vue b/client/components/course/Sidebar/Discussion/index.vue
index 3fa08fc97..61a0dfe91 100644
--- a/client/components/course/Sidebar/Discussion/index.vue
+++ b/client/components/course/Sidebar/Discussion/index.vue
@@ -87,7 +87,9 @@ export default {
     }
   },
   methods: {
-    ...mapActions('comments', ['setEndpoint', 'fetch', 'save', 'subscribe', 'unsubscribe']),
+    ...mapActions('comments',
+      ['setEndpoint', 'fetch', 'save', 'subscribe', 'unsubscribe']
+    ),
     fetchComments() {
       if (this.commentsFetched) return;
       this.fetch(this.activity);
diff --git a/client/store/modules/revisions/index.js b/client/store/modules/revisions/index.js
index e9c295ffc..68f1bbbf6 100644
--- a/client/store/modules/revisions/index.js
+++ b/client/store/modules/revisions/index.js
@@ -2,7 +2,7 @@ import * as actions from './actions';
 import * as getters from './getters';
 import * as mutations from './mutations';
 
-const PAGINATION_DEFAULTS = { offset: 0, limit: 21 };
+const PAGINATION_DEFAULTS = { offset: 0, limit: 25 };
 
 const state = {
   items: {},

From 5eff0cc0934a2bbc34392d3090597e17d1b1d86c Mon Sep 17 00:00:00 2001
From: Dario Vladovic <d.vladimyr@gmail.com>
Date: Mon, 8 Jul 2019 15:25:35 +0200
Subject: [PATCH 111/213] Cleanup :lipstick:

---
 .../content-elements/tce-html/edit/color-picker.scss        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/components/content-elements/tce-html/edit/color-picker.scss b/client/components/content-elements/tce-html/edit/color-picker.scss
index aa6d28987..4c9e46fae 100644
--- a/client/components/content-elements/tce-html/edit/color-picker.scss
+++ b/client/components/content-elements/tce-html/edit/color-picker.scss
@@ -4,13 +4,13 @@
     $icon-size: 18px;
 
     display: inline-flex;
+    align-items: center;
+    vertical-align: middle;
+    float: none;
     width: 100%;
     height: $height;
     padding: 0 1px;
     line-height: $height;
-    float: none;
-    align-items: center;
-    vertical-align: middle;
     text-align: left;
 
     .icon {

From dee5c2ddaf3f423b1de58857266f15ccfd57e65f Mon Sep 17 00:00:00 2001
From: Dario Vladovic <d.vladimyr@gmail.com>
Date: Mon, 8 Jul 2019 15:55:13 +0200
Subject: [PATCH 112/213] Fix color picker selection index calculation :bug:

- wrapping color options to prevent wrong selection index
  being calculated
---
 .../tce-html/edit/color-picker.js             | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/client/components/content-elements/tce-html/edit/color-picker.js b/client/components/content-elements/tce-html/edit/color-picker.js
index 0db1ec28c..60bffe0c6 100644
--- a/client/components/content-elements/tce-html/edit/color-picker.js
+++ b/client/components/content-elements/tce-html/edit/color-picker.js
@@ -13,20 +13,34 @@ export default class ColorPicker extends BaseColorPicker {
 
   buildPicker() {
     super.buildPicker();
-    const btnReset = document.createElement('button');
+    const btnReset = createButton({ icon: 'mdi-water-off', text: 'None' });
     btnReset.className = className('picker-item__none');
-    btnReset.tabIndex = 0;
-    btnReset.appendChild(createIcon('water-off'));
-    btnReset.innerHTML += 'None';
     btnReset.addEventListener('click', () => {
       this.quill.format(this.type, null, Quill.sources.USER);
     });
-    this.options.insertAdjacentElement('afterbegin', btnReset);
+    const colorOptions = wrapOptions(this.options);
+    colorOptions.className = className('picker-colors');
+    this.options.appendChild(btnReset);
+    this.options.appendChild(colorOptions);
   }
 }
 
+function wrapOptions(options) {
+  const container = document.createElement('div');
+  Array.from(options.children).forEach(option => container.appendChild(option));
+  return container;
+}
+
+function createButton({ icon, text }) {
+  const btn = document.createElement('button');
+  btn.tabIndex = 0;
+  btn.appendChild(createIcon(icon));
+  btn.innerHTML += text;
+  return btn;
+}
+
 function createIcon(name) {
   const icon = document.createElement('span');
-  icon.className = className('icon', 'mdi', `mdi-${name}`);
+  icon.className = className('icon', 'mdi', name);
   return icon;
 }

From 491f8f2f82083fcd012119ea093379eb6fc75414 Mon Sep 17 00:00:00 2001
From: Dario Vladovic <d.vladimyr@gmail.com>
Date: Mon, 8 Jul 2019 17:18:37 +0200
Subject: [PATCH 113/213] Close picker after format reset

---
 .../tce-html/edit/color-picker.js             |  2 ++
 .../content-elements/tce-html/edit/theme.js   | 36 +++++++++----------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/client/components/content-elements/tce-html/edit/color-picker.js b/client/components/content-elements/tce-html/edit/color-picker.js
index 60bffe0c6..1f2bb7ac9 100644
--- a/client/components/content-elements/tce-html/edit/color-picker.js
+++ b/client/components/content-elements/tce-html/edit/color-picker.js
@@ -1,5 +1,6 @@
 import './color-picker.scss';
 import { Quill } from 'vue-quill-editor';
+
 const BaseColorPicker = Quill.import('ui/color-picker');
 
 const className = (...names) => names.join(' ');
@@ -17,6 +18,7 @@ export default class ColorPicker extends BaseColorPicker {
     btnReset.className = className('picker-item__none');
     btnReset.addEventListener('click', () => {
       this.quill.format(this.type, null, Quill.sources.USER);
+      this.close();
     });
     const colorOptions = wrapOptions(this.options);
     colorOptions.className = className('picker-colors');
diff --git a/client/components/content-elements/tce-html/edit/theme.js b/client/components/content-elements/tce-html/edit/theme.js
index 6cddc413b..981824bb0 100644
--- a/client/components/content-elements/tce-html/edit/theme.js
+++ b/client/components/content-elements/tce-html/edit/theme.js
@@ -3,32 +3,32 @@ import { Quill } from 'vue-quill-editor';
 
 const SnowTheme = Quill.import('themes/snow');
 
-const findIndex = (selects, type) => selects.findIndex(it => it.classList.contains(type));
-const remove = (arr, index) => arr.splice(index, 1)[0];
+export default class CustomTheme extends SnowTheme {
+  static DEFAULTS = Object.assign({}, SnowTheme.DEFAULTS);
 
-class CustomTheme extends SnowTheme {
   buildPickers(selects, icons) {
-    const backgroundIndex = findIndex(selects, 'ql-background');
-    const colorIndex = findIndex(selects, 'ql-color');
     selects = selects.slice();
-    const backgroundSelect = remove(selects, backgroundIndex);
-    const colorSelect = remove(selects, colorIndex);
+    const background = remove(selects, it => it.classList.contains('ql-background'));
+    const color = remove(selects, it => it.classList.contains('ql-color'));
     super.buildPickers(selects, icons);
-    this.pickers.push(
-      new ColorPicker(this.quill, {
+    if (background) {
+      this.pickers.push(new ColorPicker(this.quill, {
         type: 'background',
-        select: backgroundSelect,
+        select: background,
         label: icons.background
-      }),
-      new ColorPicker(this.quill, {
+      }));
+    }
+    if (color) {
+      this.pickers.push(new ColorPicker(this.quill, {
         type: 'color',
-        select: colorSelect,
+        select: color,
         label: icons.color
-      })
-    );
+      }));
+    }
   }
 }
 
-CustomTheme.DEFAULTS = Object.assign({}, SnowTheme.DEFAULTS);
-
-export default CustomTheme;
+function remove(arr, cb) {
+  const index = arr.findIndex(cb);
+  return arr.splice(index, 1)[0];
+}

From 5f9ed995655af4a645beef26c4cdad940fcd1a7e Mon Sep 17 00:00:00 2001
From: Dario Vladovic <d.vladimyr@gmail.com>
Date: Mon, 8 Jul 2019 17:20:46 +0200
Subject: [PATCH 114/213] Cleanup :lipstick:

---
 .../content-elements/tce-html/edit/image-embed.js  | 14 +++++++-------
 .../content-elements/tce-html/edit/tooltip.js      |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/client/components/content-elements/tce-html/edit/image-embed.js b/client/components/content-elements/tce-html/edit/image-embed.js
index fadf04fb0..da0d690d0 100644
--- a/client/components/content-elements/tce-html/edit/image-embed.js
+++ b/client/components/content-elements/tce-html/edit/image-embed.js
@@ -6,6 +6,13 @@ import Tooltip from './tooltip';
 const Keyboard = Quill.import('modules/keyboard');
 
 class EmbedTooltip extends Tooltip {
+  static TEMPLATE = `
+    <div class="controls">
+      <label>Enter image url:</label>
+      <input class="url" type="text">
+      <a class="action">Save</a>
+    </div>`;
+
   constructor(quill, bounds, { spacing = 0 } = {}) {
     super(quill, bounds);
     this.padding = repeat(' ', spacing);
@@ -55,13 +62,6 @@ class EmbedTooltip extends Tooltip {
   }
 }
 
-EmbedTooltip.TEMPLATE = `
-  <div class="controls">
-    <label>Enter image url:</label>
-    <input class="url" type="text">
-    <a class="action">Save</a>
-  </div>`;
-
 export default class ImageEmbed {
   constructor(quill, options = {}) {
     this.quill = quill;
diff --git a/client/components/content-elements/tce-html/edit/tooltip.js b/client/components/content-elements/tce-html/edit/tooltip.js
index 87f5671b5..2e3e9e36a 100644
--- a/client/components/content-elements/tce-html/edit/tooltip.js
+++ b/client/components/content-elements/tce-html/edit/tooltip.js
@@ -1,4 +1,5 @@
 import { Quill } from 'vue-quill-editor';
+
 const BaseTooltip = Quill.import('ui/tooltip');
 
 export default class Tooltip extends BaseTooltip {

From dc02be30fa94a4bd1e5b4bcdc4d01c9ec9432fea Mon Sep 17 00:00:00 2001
From: Dario Vladovic <d.vladimyr@gmail.com>
Date: Mon, 8 Jul 2019 17:27:10 +0200
Subject: [PATCH 115/213] Reorganize `tce-html` file structure :wrench:

---
 client/components/content-elements/tce-html/edit/index.vue   | 2 +-
 .../tce-html/edit/{ => modules}/image-embed.js               | 5 ++---
 .../tce-html/edit/{ => modules}/image-embed.scss             | 0
 client/components/content-elements/tce-html/edit/theme.js    | 2 +-
 .../content-elements/tce-html/edit/{ => ui}/color-picker.js  | 0
 .../tce-html/edit/{ => ui}/color-picker.scss                 | 0
 .../content-elements/tce-html/edit/{ => ui}/tooltip.js       | 0
 7 files changed, 4 insertions(+), 5 deletions(-)
 rename client/components/content-elements/tce-html/edit/{ => modules}/image-embed.js (94%)
 rename client/components/content-elements/tce-html/edit/{ => modules}/image-embed.scss (100%)
 rename client/components/content-elements/tce-html/edit/{ => ui}/color-picker.js (100%)
 rename client/components/content-elements/tce-html/edit/{ => ui}/color-picker.scss (100%)
 rename client/components/content-elements/tce-html/edit/{ => ui}/tooltip.js (100%)

diff --git a/client/components/content-elements/tce-html/edit/index.vue b/client/components/content-elements/tce-html/edit/index.vue
index 03f4ab592..3f86cddd2 100644
--- a/client/components/content-elements/tce-html/edit/index.vue
+++ b/client/components/content-elements/tce-html/edit/index.vue
@@ -27,7 +27,7 @@ import { Quill, quillEditor as QuillEditor } from 'vue-quill-editor';
 import CustomTheme from './theme';
 import debounce from 'lodash/debounce';
 import get from 'lodash/get';
-import ImageEmbed from './image-embed';
+import ImageEmbed from './modules/image-embed';
 
 Quill.register('modules/imageEmbed', ImageEmbed);
 Quill.register(`themes/${CustomTheme.name}`, CustomTheme);
diff --git a/client/components/content-elements/tce-html/edit/image-embed.js b/client/components/content-elements/tce-html/edit/modules/image-embed.js
similarity index 94%
rename from client/components/content-elements/tce-html/edit/image-embed.js
rename to client/components/content-elements/tce-html/edit/modules/image-embed.js
index da0d690d0..8e260db8c 100644
--- a/client/components/content-elements/tce-html/edit/image-embed.js
+++ b/client/components/content-elements/tce-html/edit/modules/image-embed.js
@@ -1,7 +1,6 @@
 import './image-embed.scss';
 import { Quill } from 'vue-quill-editor';
-import repeat from 'lodash/repeat';
-import Tooltip from './tooltip';
+import Tooltip from '../ui/tooltip';
 
 const Keyboard = Quill.import('modules/keyboard');
 
@@ -15,7 +14,7 @@ class EmbedTooltip extends Tooltip {
 
   constructor(quill, bounds, { spacing = 0 } = {}) {
     super(quill, bounds);
-    this.padding = repeat(' ', spacing);
+    this.padding = ' '.repeat(spacing);
     this.textbox = this.root.querySelector('input.url');
     this.btnAction = this.root.querySelector('a.action');
     this.listen();
diff --git a/client/components/content-elements/tce-html/edit/image-embed.scss b/client/components/content-elements/tce-html/edit/modules/image-embed.scss
similarity index 100%
rename from client/components/content-elements/tce-html/edit/image-embed.scss
rename to client/components/content-elements/tce-html/edit/modules/image-embed.scss
diff --git a/client/components/content-elements/tce-html/edit/theme.js b/client/components/content-elements/tce-html/edit/theme.js
index 981824bb0..1826c4ae3 100644
--- a/client/components/content-elements/tce-html/edit/theme.js
+++ b/client/components/content-elements/tce-html/edit/theme.js
@@ -1,4 +1,4 @@
-import ColorPicker from './color-picker';
+import ColorPicker from './ui/color-picker';
 import { Quill } from 'vue-quill-editor';
 
 const SnowTheme = Quill.import('themes/snow');
diff --git a/client/components/content-elements/tce-html/edit/color-picker.js b/client/components/content-elements/tce-html/edit/ui/color-picker.js
similarity index 100%
rename from client/components/content-elements/tce-html/edit/color-picker.js
rename to client/components/content-elements/tce-html/edit/ui/color-picker.js
diff --git a/client/components/content-elements/tce-html/edit/color-picker.scss b/client/components/content-elements/tce-html/edit/ui/color-picker.scss
similarity index 100%
rename from client/components/content-elements/tce-html/edit/color-picker.scss
rename to client/components/content-elements/tce-html/edit/ui/color-picker.scss
diff --git a/client/components/content-elements/tce-html/edit/tooltip.js b/client/components/content-elements/tce-html/edit/ui/tooltip.js
similarity index 100%
rename from client/components/content-elements/tce-html/edit/tooltip.js
rename to client/components/content-elements/tce-html/edit/ui/tooltip.js

From 250ed94409c322c8420a5bf7e7829ef5f9e798df Mon Sep 17 00:00:00 2001
From: Dario Vladovic <d.vladimyr@gmail.com>
Date: Mon, 8 Jul 2019 19:27:57 +0200
Subject: [PATCH 116/213] Group all Quill modifications under custom theme
 :tada:

---
 .../content-elements/tce-html/edit/index.vue  |  9 ++-
 .../tce-html/edit/modules/image-embed.js      | 70 ++-----------------
 .../content-elements/tce-html/edit/theme.js   | 55 ++++++++-------
 .../tce-html/edit/ui/color-picker.js          |  7 +-
 .../tce-html/edit/ui/image-embed-tooltip.js   | 60 ++++++++++++++++
 .../image-embed-tooltip.scss}                 |  0
 .../tce-html/edit/ui/tooltip.js               |  8 +--
 7 files changed, 104 insertions(+), 105 deletions(-)
 create mode 100644 client/components/content-elements/tce-html/edit/ui/image-embed-tooltip.js
 rename client/components/content-elements/tce-html/edit/{modules/image-embed.scss => ui/image-embed-tooltip.scss} (100%)

diff --git a/client/components/content-elements/tce-html/edit/index.vue b/client/components/content-elements/tce-html/edit/index.vue
index 3f86cddd2..a9480ce4f 100644
--- a/client/components/content-elements/tce-html/edit/index.vue
+++ b/client/components/content-elements/tce-html/edit/index.vue
@@ -24,13 +24,12 @@
 
 <script>
 import { Quill, quillEditor as QuillEditor } from 'vue-quill-editor';
-import CustomTheme from './theme';
+import createCustomTheme from './theme';
 import debounce from 'lodash/debounce';
 import get from 'lodash/get';
-import ImageEmbed from './modules/image-embed';
 
-Quill.register('modules/imageEmbed', ImageEmbed);
-Quill.register(`themes/${CustomTheme.name}`, CustomTheme);
+const CustomTheme = createCustomTheme(Quill);
+Quill.register(`themes/${CustomTheme.NAME}`, CustomTheme, true);
 
 const toolbar = {
   container: '#quillToolbar',
@@ -48,7 +47,7 @@ const toolbar = {
 };
 
 const options = {
-  theme: CustomTheme.name,
+  theme: CustomTheme.NAME,
   modules: {
     toolbar,
     imageEmbed: { spacing: 1 },
diff --git a/client/components/content-elements/tce-html/edit/modules/image-embed.js b/client/components/content-elements/tce-html/edit/modules/image-embed.js
index 8e260db8c..d243a650c 100644
--- a/client/components/content-elements/tce-html/edit/modules/image-embed.js
+++ b/client/components/content-elements/tce-html/edit/modules/image-embed.js
@@ -1,71 +1,13 @@
-import './image-embed.scss';
-import { Quill } from 'vue-quill-editor';
-import Tooltip from '../ui/tooltip';
+import createImageEmbedTooltip from '../ui/image-embed-tooltip';
 
-const Keyboard = Quill.import('modules/keyboard');
+export default Quill => class ImageEmbed {
+  static NAME = 'imageEmbed';
 
-class EmbedTooltip extends Tooltip {
-  static TEMPLATE = `
-    <div class="controls">
-      <label>Enter image url:</label>
-      <input class="url" type="text">
-      <a class="action">Save</a>
-    </div>`;
-
-  constructor(quill, bounds, { spacing = 0 } = {}) {
-    super(quill, bounds);
-    this.padding = ' '.repeat(spacing);
-    this.textbox = this.root.querySelector('input.url');
-    this.btnAction = this.root.querySelector('a.action');
-    this.listen();
-  }
-
-  listen() {
-    this.btnAction.addEventListener('click', () => this.embedImage());
-    this.textbox.addEventListener('keydown', e => {
-      if (Keyboard.match(e, 'enter')) {
-        this.embedImage();
-        e.preventDefault();
-      } else if (Keyboard.match(e, 'escape')) {
-        this.hide();
-        e.preventDefault();
-      }
-    });
-  }
-
-  show() {
-    super.show();
-    this.root.classList.add('ql-image-embed');
-    this.textbox.select();
-  }
-
-  embedImage() {
-    const url = this.textbox.value;
-    if (!url) return;
-    const { quill } = this;
-    const range = quill.getSelection(true);
-    if (range) {
-      const { padding } = this;
-      const source = Quill.sources.USER;
-      let offset = range.index + range.length;
-      quill.insertText(offset, padding, source);
-      offset += padding.length;
-      quill.insertEmbed(offset, 'image', url, source);
-      offset += 1;
-      quill.insertText(offset, padding, source);
-      offset += padding.length;
-      quill.setSelection(offset, source);
-    }
-    this.textbox.value = '';
-    this.hide();
-  }
-}
-
-export default class ImageEmbed {
   constructor(quill, options = {}) {
     this.quill = quill;
     quill.tooltips = quill.tooltips = {};
     const bounds = quill.options.bounds;
-    quill.tooltips.imageEmbed = new EmbedTooltip(quill, bounds, options);
+    const ImageEmbedTooltip = createImageEmbedTooltip(Quill);
+    quill.tooltips.imageEmbed = new ImageEmbedTooltip(quill, bounds, options);
   }
-}
+};
diff --git a/client/components/content-elements/tce-html/edit/theme.js b/client/components/content-elements/tce-html/edit/theme.js
index 1826c4ae3..43db7cf97 100644
--- a/client/components/content-elements/tce-html/edit/theme.js
+++ b/client/components/content-elements/tce-html/edit/theme.js
@@ -1,32 +1,37 @@
-import ColorPicker from './ui/color-picker';
-import { Quill } from 'vue-quill-editor';
+import createColorPicker from './ui/color-picker';
+import createImageEmbed from './modules/image-embed';
 
-const SnowTheme = Quill.import('themes/snow');
+export default Quill => {
+  const ImageEmbed = createImageEmbed(Quill);
+  Quill.register(`modules/${ImageEmbed.NAME}`, ImageEmbed, true);
 
-export default class CustomTheme extends SnowTheme {
-  static DEFAULTS = Object.assign({}, SnowTheme.DEFAULTS);
+  return class CustomTheme extends Quill.import('themes/snow') {
+    static DEFAULTS = Object.assign({}, super.DEFAULTS);
+    static NAME = 'tailor';
 
-  buildPickers(selects, icons) {
-    selects = selects.slice();
-    const background = remove(selects, it => it.classList.contains('ql-background'));
-    const color = remove(selects, it => it.classList.contains('ql-color'));
-    super.buildPickers(selects, icons);
-    if (background) {
-      this.pickers.push(new ColorPicker(this.quill, {
-        type: 'background',
-        select: background,
-        label: icons.background
-      }));
+    buildPickers(selects, icons) {
+      selects = selects.slice();
+      const background = remove(selects, it => it.classList.contains('ql-background'));
+      const color = remove(selects, it => it.classList.contains('ql-color'));
+      super.buildPickers(selects, icons);
+      const ColorPicker = createColorPicker(Quill);
+      if (background) {
+        this.pickers.push(new ColorPicker(this.quill, {
+          type: 'background',
+          select: background,
+          label: icons.background
+        }));
+      }
+      if (color) {
+        this.pickers.push(new ColorPicker(this.quill, {
+          type: 'color',
+          select: color,
+          label: icons.color
+        }));
+      }
     }
-    if (color) {
-      this.pickers.push(new ColorPicker(this.quill, {
-        type: 'color',
-        select: color,
-        label: icons.color
-      }));
-    }
-  }
-}
+  };
+};
 
 function remove(arr, cb) {
   const index = arr.findIndex(cb);
diff --git a/client/components/content-elements/tce-html/edit/ui/color-picker.js b/client/components/content-elements/tce-html/edit/ui/color-picker.js
index 1f2bb7ac9..5d4f7c781 100644
--- a/client/components/content-elements/tce-html/edit/ui/color-picker.js
+++ b/client/components/content-elements/tce-html/edit/ui/color-picker.js
@@ -1,11 +1,8 @@
 import './color-picker.scss';
-import { Quill } from 'vue-quill-editor';
-
-const BaseColorPicker = Quill.import('ui/color-picker');
 
 const className = (...names) => names.join(' ');
 
-export default class ColorPicker extends BaseColorPicker {
+export default Quill => class ColorPicker extends Quill.import('ui/color-picker') {
   constructor(quill, { type, select, label }) {
     super(select, label);
     this.quill = quill;
@@ -25,7 +22,7 @@ export default class ColorPicker extends BaseColorPicker {
     this.options.appendChild(btnReset);
     this.options.appendChild(colorOptions);
   }
-}
+};
 
 function wrapOptions(options) {
   const container = document.createElement('div');
diff --git a/client/components/content-elements/tce-html/edit/ui/image-embed-tooltip.js b/client/components/content-elements/tce-html/edit/ui/image-embed-tooltip.js
new file mode 100644
index 000000000..93705f39e
--- /dev/null
+++ b/client/components/content-elements/tce-html/edit/ui/image-embed-tooltip.js
@@ -0,0 +1,60 @@
+import './image-embed-tooltip.scss';
+import createTooltip from './tooltip';
+
+export default Quill => class ImageEmbedTooltip extends createTooltip(Quill) {
+  static TEMPLATE = `
+    <div class="controls">
+      <label>Enter image url:</label>
+      <input class="url" type="text">
+      <a class="action">Save</a>
+    </div>`;
+
+  constructor(quill, bounds, { spacing = 0 } = {}) {
+    super(quill, bounds);
+    this.padding = ' '.repeat(spacing);
+    this.textbox = this.root.querySelector('input.url');
+    this.btnAction = this.root.querySelector('a.action');
+    this.listen();
+  }
+
+  listen() {
+    const Keyboard = Quill.import('modules/keyboard');
+    this.btnAction.addEventListener('click', () => this.embedImage());
+    this.textbox.addEventListener('keydown', e => {
+      if (Keyboard.match(e, 'enter')) {
+        this.embedImage();
+        e.preventDefault();
+      } else if (Keyboard.match(e, 'escape')) {
+        this.hide();
+        e.preventDefault();
+      }
+    });
+  }
+
+  show() {
+    super.show();
+    this.root.classList.add('ql-image-embed');
+    this.textbox.select();
+  }
+
+  embedImage() {
+    const url = this.textbox.value;
+    if (!url) return;
+    const { quill } = this;
+    const range = quill.getSelection(true);
+    if (range) {
+      const { padding } = this;
+      const source = Quill.sources.USER;
+      let offset = range.index + range.length;
+      quill.insertText(offset, padding, source);
+      offset += padding.length;
+      quill.insertEmbed(offset, 'image', url, source);
+      offset += 1;
+      quill.insertText(offset, padding, source);
+      offset += padding.length;
+      quill.setSelection(offset, source);
+    }
+    this.textbox.value = '';
+    this.hide();
+  }
+};
diff --git a/client/components/content-elements/tce-html/edit/modules/image-embed.scss b/client/components/content-elements/tce-html/edit/ui/image-embed-tooltip.scss
similarity index 100%
rename from client/components/content-elements/tce-html/edit/modules/image-embed.scss
rename to client/components/content-elements/tce-html/edit/ui/image-embed-tooltip.scss
diff --git a/client/components/content-elements/tce-html/edit/ui/tooltip.js b/client/components/content-elements/tce-html/edit/ui/tooltip.js
index 2e3e9e36a..506286fae 100644
--- a/client/components/content-elements/tce-html/edit/ui/tooltip.js
+++ b/client/components/content-elements/tce-html/edit/ui/tooltip.js
@@ -1,8 +1,4 @@
-import { Quill } from 'vue-quill-editor';
-
-const BaseTooltip = Quill.import('ui/tooltip');
-
-export default class Tooltip extends BaseTooltip {
+export default Quill => class Tooltip extends Quill.import('ui/tooltip') {
   constructor(quill, bounds) {
     super(quill, bounds);
     this._onClick = this._onClick.bind(this);
@@ -26,4 +22,4 @@ export default class Tooltip extends BaseTooltip {
   _onClick(e) {
     if (this.isOpen && !this.root.contains(e.target)) this.hide();
   }
-}
+};

From a568bf5d54a2ca73a4881a0febb1dd17554e2a8a Mon Sep 17 00:00:00 2001
From: Dario Vladovic <d.vladimyr@gmail.com>
Date: Mon, 8 Jul 2019 19:41:34 +0200
Subject: [PATCH 117/213] Cleanup :lipstick:

---
 .../content-elements/tce-html/edit/modules/image-embed.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/components/content-elements/tce-html/edit/modules/image-embed.js b/client/components/content-elements/tce-html/edit/modules/image-embed.js
index d243a650c..45ee66799 100644
--- a/client/components/content-elements/tce-html/edit/modules/image-embed.js
+++ b/client/components/content-elements/tce-html/edit/modules/image-embed.js
@@ -1,13 +1,13 @@
 import createImageEmbedTooltip from '../ui/image-embed-tooltip';
 
-export default Quill => class ImageEmbed {
+export default Quill => class ImageEmbed extends Quill.import('core/module') {
   static NAME = 'imageEmbed';
 
   constructor(quill, options = {}) {
-    this.quill = quill;
-    quill.tooltips = quill.tooltips = {};
-    const bounds = quill.options.bounds;
+    super(quill, options);
+    const { bounds } = quill.options;
     const ImageEmbedTooltip = createImageEmbedTooltip(Quill);
+    quill.tooltips = quill.tooltips || {};
     quill.tooltips.imageEmbed = new ImageEmbedTooltip(quill, bounds, options);
   }
 };

From 80ea782d326d263a3f346c756f7f91f33fb01bee Mon Sep 17 00:00:00 2001
From: Dario Vladovic <d.vladimyr@gmail.com>
Date: Mon, 8 Jul 2019 20:05:56 +0200
Subject: [PATCH 118/213] Override image handler inside tailor theme :wrench:

---
 .../content-elements/tce-html/edit/index.vue    |  3 ---
 .../content-elements/tce-html/edit/theme.js     | 17 +++++++++++++++--
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/client/components/content-elements/tce-html/edit/index.vue b/client/components/content-elements/tce-html/edit/index.vue
index a9480ce4f..8b9447e7d 100644
--- a/client/components/content-elements/tce-html/edit/index.vue
+++ b/client/components/content-elements/tce-html/edit/index.vue
@@ -39,9 +39,6 @@ const toolbar = {
     },
     undo() {
       this.quill.history.undo();
-    },
-    image() {
-      this.quill.tooltips.imageEmbed.show();
     }
   }
 };
diff --git a/client/components/content-elements/tce-html/edit/theme.js b/client/components/content-elements/tce-html/edit/theme.js
index 43db7cf97..c3fde1efe 100644
--- a/client/components/content-elements/tce-html/edit/theme.js
+++ b/client/components/content-elements/tce-html/edit/theme.js
@@ -5,9 +5,22 @@ export default Quill => {
   const ImageEmbed = createImageEmbed(Quill);
   Quill.register(`modules/${ImageEmbed.NAME}`, ImageEmbed, true);
 
-  return class CustomTheme extends Quill.import('themes/snow') {
-    static DEFAULTS = Object.assign({}, super.DEFAULTS);
+  const SnowTheme = Quill.import('themes/snow');
+  const { toolbar: baseToolbar } = SnowTheme.DEFAULTS.modules;
+  const toolbar = {
+    handlers: {
+      ...baseToolbar.handlers,
+      image() {
+        this.quill.tooltips.imageEmbed.show();
+      }
+    }
+  };
+
+  return class CustomTheme extends SnowTheme {
     static NAME = 'tailor';
+    static DEFAULTS = {
+      modules: { toolbar }
+    };
 
     buildPickers(selects, icons) {
       selects = selects.slice();

From c982e0b15e1b07ee3cf2e4edeae292c18792ab25 Mon Sep 17 00:00:00 2001
From: Dario Vladovic <d.vladimyr@gmail.com>
Date: Tue, 9 Jul 2019 00:16:55 +0200
Subject: [PATCH 119/213] Refactor quill toolbar

- using material design icons :tada:
- enabling more color/background colors
---
 .../tce-html/edit/Toolbar.vue                 | 182 ++++++++----------
 .../content-elements/tce-html/edit/index.vue  |  21 +-
 .../content-elements/tce-html/edit/theme.js   |  86 ++++++++-
 .../tce-html/edit/toolbar-icons.js            |  63 ++++++
 .../tce-html/edit/ui/color-picker.js          |   3 +-
 package-lock.json                             |   6 +-
 package.json                                  |   2 +-
 7 files changed, 248 insertions(+), 115 deletions(-)
 create mode 100644 client/components/content-elements/tce-html/edit/toolbar-icons.js

diff --git a/client/components/content-elements/tce-html/edit/Toolbar.vue b/client/components/content-elements/tce-html/edit/Toolbar.vue
index eb7615a2e..328d259a8 100644
--- a/client/components/content-elements/tce-html/edit/Toolbar.vue
+++ b/client/components/content-elements/tce-html/edit/Toolbar.vue
@@ -1,86 +1,59 @@
 <template>
-  <div
-    @mousedown.prevent="() => {}"
-    id="quillToolbar"
-    class="tce-html-toolbar">
-    <span class="ql-formats">
-      <button class="ql-undo"><span class="icon mdi mdi-undo"></span></button>
-      <button class="ql-redo"><span class="icon mdi mdi-redo"></span></button>
-    </span>
-    <span class="ql-formats">
-      <select class="ql-font"></select>
-      <select class="ql-header"></select>
-    </span>
-    <span class="ql-formats">
-      <button class="ql-bold"></button>
-      <button class="ql-italic"></button>
-      <button class="ql-underline"></button>
-      <button class="ql-strike"></button>
-    </span>
-    <span class="ql-formats">
-      <button class="ql-blockquote"></button>
-      <button class="ql-code-block"></button>
-    </span>
-    <span class="ql-formats">
-      <button class="ql-script" value="sub"></button>
-      <button class="ql-script" value="super"></button>
-    </span>
-    <span class="ql-formats">
-      <select class="ql-color">
-        <option value="rgb(0, 0, 0)"></option>
-        <option value="rgb(230, 0, 0)"></option>
-        <option value="rgb(255, 153, 0)"></option>
-        <option value="rgb(255, 255, 0)"></option>
-        <option value="rgb(0, 138, 0)"></option>
-        <option value="rgb(0, 102, 204)"></option>
-        <option value="rgb(153, 51, 255)"></option>
-        <option value="rgb(255, 255, 255)"></option>
-        <option value="rgb(250, 204, 204)"></option>
-        <option value="rgb(255, 235, 204)"></option>
-        <option value="rgb(204, 224, 245)"></option>
-        <option value="rgb(235, 214, 255)"></option>
-        <option value="rgb(187, 187, 187)"></option>
-        <option value="rgb(102, 185, 102)"></option>
-      </select>
-      <select class="ql-background">
-        <option value="rgb(0, 0, 0)"></option>
-        <option value="rgb(230, 0, 0)"></option>
-        <option value="rgb(255, 153, 0)"></option>
-        <option value="rgb(255, 255, 0)"></option>
-        <option value="rgb(0, 138, 0)"></option>
-        <option value="rgb(0, 102, 204)"></option>
-        <option value="rgb(153, 51, 255)"></option>
-        <option value="rgb(255, 255, 255)"></option>
-        <option value="rgb(250, 204, 204)"></option>
-        <option value="rgb(255, 235, 204)"></option>
-        <option value="rgb(204, 224, 245)"></option>
-        <option value="rgb(235, 214, 255)"></option>
-        <option value="rgb(187, 187, 187)"></option>
-        <option value="rgb(102, 185, 102)"></option>
-      </select>
-    </span>
-    <span class="ql-formats">
-      <button class="ql-link" type="button"></button>
-      <button class="ql-image" type="button"></button>
-      <!-- <button class="ql-video" type="button"></button> -->
-    </span>
-    <span class="ql-formats">
-      <button class="ql-list" value="ordered" type="button"></button>
-      <button class="ql-list" value="bullet" type="button"></button>
-      <select class="ql-align">
-        <option selected=""></option>
-        <option value="center"></option>
-        <option value="right"></option>
-        <option value="justify"></option>
-      </select>
-    </span>
-    <span class="ql-formats">
-      <button type="button" class="ql-indent" value="-1"></button>
-      <button type="button" class="ql-indent" value="+1"></button>
-    </span>
-    <span class="ql-formats">
-      <button type="button" class="ql-direction" value="rtl"></button>
-    </span>
+  <div class="tce-html-toolbar">
+    <div @mousedown.prevent="() => {}" id="quillToolbar">
+      <span class="ql-formats">
+        <button class="ql-undo" type="button"></button>
+        <button class="ql-redo" type="button"></button>
+      </span>
+      <span class="ql-formats">
+        <select class="ql-font"></select>
+        <select class="ql-header"></select>
+      </span>
+      <span class="ql-formats">
+        <button class="ql-bold" type="button"></button>
+        <button class="ql-italic" type="button"></button>
+        <button class="ql-underline" type="button"></button>
+        <button class="ql-strike" type="button"></button>
+      </span>
+      <span class="ql-formats">
+        <select class="ql-color"></select>
+        <select class="ql-background"></select>
+      </span>
+      <span class="ql-formats">
+        <button class="ql-script" value="sub" type="button"></button>
+        <button class="ql-script" value="super" type="button"></button>
+      </span>
+      <span class="ql-formats">
+        <button class="ql-header" value="1" type="button"></button>
+        <button class="ql-header" value="2" type="button"></button>
+        <button class="ql-blockquote" type="button"></button>
+        <button class="ql-code-block" type="button"></button>
+      </span>
+      <span class="ql-formats">
+        <button class="ql-list" value="ordered" type="button"></button>
+        <button class="ql-list" value="bullet" type="button"></button>
+        <button class="ql-indent" value="-1" type="button"></button>
+        <button class="ql-indent" value="+1" type="button"></button>
+      </span>
+      <span class="ql-formats">
+        <select class="ql-align">
+          <option selected=""></option>
+          <option value="center"></option>
+          <option value="right"></option>
+          <option value="justify"></option>
+        </select>
+        <button class="ql-direction" value="rtl" type="button"></button>
+      </span>
+      <span class="ql-formats">
+        <button class="ql-link" type="button"></button>
+        <button class="ql-image" type="button"></button>
+        <!-- <button class="ql-video" type="button"></button> -->
+        <!-- <button class="ql-formula" type="button"></button> -->
+      </span>
+      <span class="ql-formats">
+        <button class="ql-clean" type="button"></button>
+      </span>
+    </div>
   </div>
 </template>
 
@@ -91,27 +64,42 @@ export default {
 </script>
 
 <style lang="scss">
+$icon-color: #333;
+$icon-size: 18px;
+
 .tce-html-toolbar {
-  display: none;
-  position: relative;
-  z-index: 999;
-  width: 100%;
+  display: flex;
+  align-items: center;
   height: 45px;
-  text-align: left;
+  text-align: initial;
+}
 
-  .icon {
-    display: inline-block;
-    font-size: 16px;
-    line-height: 16px;
-    vertical-align: middle;
-  }
+.ql-toolbar.ql-snow {
+  border: none;
 }
 
-.tce-html-toolbar.ql-toolbar {
-  display: block;
+.ql-toolbar .icon {
+  width: $icon-size;
+  height: $icon-size;
+  color: $icon-color;
+  font-size: $icon-size;
+  line-height: $icon-size;
+  vertical-align: top;
 }
 
-.tce-html-toolbar.ql-toolbar.ql-snow {
-  border: none;
+.ql-toolbar .ql-direction {
+  span:last-child {
+    display: none;
+  }
+
+  &.ql-active {
+    span:last-child {
+      display: initial;
+    }
+
+    span:first-child {
+      display: none;
+    }
+  }
 }
 </style>
diff --git a/client/components/content-elements/tce-html/edit/index.vue b/client/components/content-elements/tce-html/edit/index.vue
index 8b9447e7d..63eb1e940 100644
--- a/client/components/content-elements/tce-html/edit/index.vue
+++ b/client/components/content-elements/tce-html/edit/index.vue
@@ -125,21 +125,20 @@ export default {
 </style>
 
 <style lang="scss">
-.tce-html {
-  .ql-editor {
-    min-height: 121px;
+.ql-container.ql-snow {
+  font-size: 16px;
+  border: none;
+}
 
-    img {
-      vertical-align: initial;
-    }
-  }
+.ql-editor {
+  min-height: 120px;
 
-  .ql-container.ql-snow {
-    border: none !important;
+  &.ql-blank::before {
+    width: 100%;
   }
 
-  .ql-editor.ql-blank::before {
-    width: 100%;
+  img {
+    vertical-align: initial;
   }
 }
 </style>
diff --git a/client/components/content-elements/tce-html/edit/theme.js b/client/components/content-elements/tce-html/edit/theme.js
index c3fde1efe..b4ccc5bc9 100644
--- a/client/components/content-elements/tce-html/edit/theme.js
+++ b/client/components/content-elements/tce-html/edit/theme.js
@@ -1,6 +1,46 @@
+import mdiToolbarIcons, { getMdiIcon } from './toolbar-icons';
 import createColorPicker from './ui/color-picker';
 import createImageEmbed from './modules/image-embed';
 
+const colors = [
+  '#000000',
+  '#e60000',
+  '#ff9900',
+  '#ffff00',
+  '#008a00',
+  '#0066cc',
+  '#9933ff',
+  '#ffffff',
+  '#facccc',
+  '#ffebcc',
+  '#ffffcc',
+  '#cce8cc',
+  '#cce0f5',
+  '#ebd6ff',
+  '#bbbbbb',
+  '#f06666',
+  '#ffc266',
+  '#ffff66',
+  '#66b966',
+  '#66a3e0',
+  '#c285ff',
+  '#888888',
+  '#a10000',
+  '#b26b00',
+  '#b2b200',
+  '#006100',
+  '#0047b2',
+  '#6b24b2',
+  '#444444',
+  '#5c0000',
+  '#663d00',
+  '#666600',
+  '#003700',
+  '#002966',
+  '#3d1466'
+];
+const reQuillControl = /^ql-/;
+
 export default Quill => {
   const ImageEmbed = createImageEmbed(Quill);
   Quill.register(`modules/${ImageEmbed.NAME}`, ImageEmbed, true);
@@ -22,30 +62,72 @@ export default Quill => {
       modules: { toolbar }
     };
 
+    buildButtons(buttons) {
+      Array.from(buttons).forEach(it => buildButton(it));
+    }
+
     buildPickers(selects, icons) {
       selects = selects.slice();
       const background = remove(selects, it => it.classList.contains('ql-background'));
       const color = remove(selects, it => it.classList.contains('ql-color'));
+      const align = remove(selects, it => it.classList.contains('ql-align'));
       super.buildPickers(selects, icons);
       const ColorPicker = createColorPicker(Quill);
+      const IconPicker = Quill.import('ui/icon-picker');
       if (background) {
+        fillSelect(background, colors, '#ffffff');
         this.pickers.push(new ColorPicker(this.quill, {
           type: 'background',
           select: background,
-          label: icons.background
+          label: getMdiIcon('background')
         }));
       }
       if (color) {
+        fillSelect(color, colors, '#000000');
         this.pickers.push(new ColorPicker(this.quill, {
           type: 'color',
           select: color,
-          label: icons.color
+          label: getMdiIcon('color')
         }));
       }
+      if (align) {
+        const icons = mapKeys(mdiToolbarIcons.align, (_, icon) => getMdiIcon('align', icon));
+        this.pickers.push(new IconPicker(align, icons));
+      }
     }
   };
 };
 
+function buildButton(button) {
+  let name = Array.from(button.classList).find(it => reQuillControl.test(it));
+  if (!name) return;
+  name = name.replace(reQuillControl, '');
+  if (name === 'direction') {
+    button.innerHTML = getMdiIcon(name, '') + getMdiIcon(name, 'rtl');
+    return;
+  }
+  button.innerHTML = getMdiIcon(name, button.value);
+}
+
+function fillSelect(select, values, defaultValue = false) {
+  values.forEach(value => {
+    const option = document.createElement('option');
+    if (value === defaultValue) {
+      option.setAttribute('selected', 'selected');
+    } else {
+      option.setAttribute('value', value);
+    }
+    select.appendChild(option);
+  });
+}
+
+function mapKeys(obj, cb) {
+  return Object.entries(obj).reduce((acc, [key, value]) => {
+    value = cb(value, key);
+    return Object.assign(acc, { [key]: value });
+  }, {});
+}
+
 function remove(arr, cb) {
   const index = arr.findIndex(cb);
   return arr.splice(index, 1)[0];
diff --git a/client/components/content-elements/tce-html/edit/toolbar-icons.js b/client/components/content-elements/tce-html/edit/toolbar-icons.js
new file mode 100644
index 000000000..5908d9827
--- /dev/null
+++ b/client/components/content-elements/tce-html/edit/toolbar-icons.js
@@ -0,0 +1,63 @@
+const isString = arg => typeof arg === 'string';
+
+const mdiToolbarIcons = {
+  undo: 'undo',
+  redo: 'redo',
+  align: {
+    '': 'format-align-left',
+    center: 'format-align-center',
+    right: 'format-align-right',
+    justify: 'format-alignt-justify'
+  },
+  background: 'format-color-highlight',
+  blockquote: 'format-quote-close',
+  bold: 'format-bold',
+  clean: 'format-clear',
+  code: 'code-tags',
+  'code-block': 'code-tags',
+  color: 'format-color-text',
+  direction: {
+    '': 'format-textdirection-l-to-r',
+    rtl: 'format-textdirection-r-to-l'
+  },
+  formula: 'function-variant',
+  header: {
+    '1': 'format-header-1',
+    '2': 'format-header-2'
+  },
+  italic: 'format-italic',
+  image: 'image-plus',
+  indent: {
+    '+1': 'format-indent-increase',
+    '-1': 'format-indent-decrease'
+  },
+  link: 'link',
+  list: {
+    bullet: 'format-list-bulleted',
+    check: 'format-list-checks',
+    ordered: 'format-list-numbered'
+  },
+  script: {
+    sub: 'format-subscript',
+    super: 'format-superscript'
+  },
+  strike: 'format-strikethrough',
+  table: 'table-plus',
+  underline: 'format-underline',
+  video: 'video-plus'
+};
+
+export default mdiToolbarIcons;
+
+const textColor = `
+  <span style="position: relative;">
+    <span class="icon mdi mdi-format-color-text" style="position: absolute;"></span>
+    <span class="icon mdi mdi-color-helper" style="position: absolute;"></span>
+  </span>`;
+
+export function getMdiIcon(name, value) {
+  if (name === 'color') return textColor;
+  const icon = mdiToolbarIcons[name];
+  const code = isString(icon) ? icon : icon[value];
+  return `<span class="icon mdi mdi-${code}"></span>`;
+}
diff --git a/client/components/content-elements/tce-html/edit/ui/color-picker.js b/client/components/content-elements/tce-html/edit/ui/color-picker.js
index 5d4f7c781..75e32c683 100644
--- a/client/components/content-elements/tce-html/edit/ui/color-picker.js
+++ b/client/components/content-elements/tce-html/edit/ui/color-picker.js
@@ -31,8 +31,9 @@ function wrapOptions(options) {
 }
 
 function createButton({ icon, text }) {
-  const btn = document.createElement('button');
+  const btn = document.createElement('span');
   btn.tabIndex = 0;
+  btn.setAttribute('role', 'button');
   btn.appendChild(createIcon(icon));
   btn.innerHTML += text;
   return btn;
diff --git a/package-lock.json b/package-lock.json
index 50a289c5c..29916733d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1354,9 +1354,9 @@
       }
     },
     "@mdi/font": {
-      "version": "3.5.95",
-      "resolved": "https://registry.npmjs.org/@mdi/font/-/font-3.5.95.tgz",
-      "integrity": "sha512-WHSJ0TJ70qkn+EPsW9w22pQU+kjEnRZlfN4N7xsFFmKa6VhpdQcwTWqj9PDH3oq6Be2p0IW/VDURJvPWDnBAUw=="
+      "version": "3.7.95",
+      "resolved": "https://registry.npmjs.org/@mdi/font/-/font-3.7.95.tgz",
+      "integrity": "sha512-JFQSv1GwhilTN6mj2SHu+YH+jZAIPn6sir/gGYoMSgyEM94nzlLGc7Ew21mnDEr0+W3LhFaInu8dqZFvNUx1bA=="
     },
     "@mrmlnc/readdir-enhanced": {
       "version": "2.2.1",
diff --git a/package.json b/package.json
index a101f72c1..f46475da2 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@babel/polyfill": "^7.2.5",
-    "@mdi/font": "^3.5.95",
+    "@mdi/font": "^3.7.95",
     "auto-bind": "^2.1.0",
     "aws-sdk": "^2.342.0",
     "axios": "^0.19.0",

From c5d1e658044ca9f608ce0abcbf7549c5f3988821 Mon Sep 17 00:00:00 2001
From: Dario Vladovic <d.vladimyr@gmail.com>
Date: Tue, 9 Jul 2019 01:51:49 +0200
Subject: [PATCH 120/213] Change file layout :wrench:

- grouping everything inside `theme` folder
---
 .../tce-html/edit/{theme.js => theme/index.js}              | 6 +++---
 .../tce-html/edit/{ => theme}/modules/image-embed.js        | 0
 .../tce-html/edit/{ => theme}/toolbar-icons.js              | 6 +++---
 .../tce-html/edit/{ => theme}/ui/color-picker.js            | 0
 .../tce-html/edit/{ => theme}/ui/color-picker.scss          | 0
 .../tce-html/edit/{ => theme}/ui/image-embed-tooltip.js     | 0
 .../tce-html/edit/{ => theme}/ui/image-embed-tooltip.scss   | 0
 .../tce-html/edit/{ => theme}/ui/tooltip.js                 | 0
 8 files changed, 6 insertions(+), 6 deletions(-)
 rename client/components/content-elements/tce-html/edit/{theme.js => theme/index.js} (93%)
 rename client/components/content-elements/tce-html/edit/{ => theme}/modules/image-embed.js (100%)
 rename client/components/content-elements/tce-html/edit/{ => theme}/toolbar-icons.js (94%)
 rename client/components/content-elements/tce-html/edit/{ => theme}/ui/color-picker.js (100%)
 rename client/components/content-elements/tce-html/edit/{ => theme}/ui/color-picker.scss (100%)
 rename client/components/content-elements/tce-html/edit/{ => theme}/ui/image-embed-tooltip.js (100%)
 rename client/components/content-elements/tce-html/edit/{ => theme}/ui/image-embed-tooltip.scss (100%)
 rename client/components/content-elements/tce-html/edit/{ => theme}/ui/tooltip.js (100%)

diff --git a/client/components/content-elements/tce-html/edit/theme.js b/client/components/content-elements/tce-html/edit/theme/index.js
similarity index 93%
rename from client/components/content-elements/tce-html/edit/theme.js
rename to client/components/content-elements/tce-html/edit/theme/index.js
index b4ccc5bc9..4482f75db 100644
--- a/client/components/content-elements/tce-html/edit/theme.js
+++ b/client/components/content-elements/tce-html/edit/theme/index.js
@@ -1,4 +1,4 @@
-import mdiToolbarIcons, { getMdiIcon } from './toolbar-icons';
+import mdiIcons, { getMdiIcon } from './toolbar-icons';
 import createColorPicker from './ui/color-picker';
 import createImageEmbed from './modules/image-embed';
 
@@ -56,7 +56,7 @@ export default Quill => {
     }
   };
 
-  return class CustomTheme extends SnowTheme {
+  return class TailorTheme extends SnowTheme {
     static NAME = 'tailor';
     static DEFAULTS = {
       modules: { toolbar }
@@ -91,7 +91,7 @@ export default Quill => {
         }));
       }
       if (align) {
-        const icons = mapKeys(mdiToolbarIcons.align, (_, icon) => getMdiIcon('align', icon));
+        const icons = mapKeys(mdiIcons.align, (_, icon) => getMdiIcon('align', icon));
         this.pickers.push(new IconPicker(align, icons));
       }
     }
diff --git a/client/components/content-elements/tce-html/edit/modules/image-embed.js b/client/components/content-elements/tce-html/edit/theme/modules/image-embed.js
similarity index 100%
rename from client/components/content-elements/tce-html/edit/modules/image-embed.js
rename to client/components/content-elements/tce-html/edit/theme/modules/image-embed.js
diff --git a/client/components/content-elements/tce-html/edit/toolbar-icons.js b/client/components/content-elements/tce-html/edit/theme/toolbar-icons.js
similarity index 94%
rename from client/components/content-elements/tce-html/edit/toolbar-icons.js
rename to client/components/content-elements/tce-html/edit/theme/toolbar-icons.js
index 5908d9827..9d7c5aeb2 100644
--- a/client/components/content-elements/tce-html/edit/toolbar-icons.js
+++ b/client/components/content-elements/tce-html/edit/theme/toolbar-icons.js
@@ -1,6 +1,6 @@
 const isString = arg => typeof arg === 'string';
 
-const mdiToolbarIcons = {
+const mdiIcons = {
   undo: 'undo',
   redo: 'redo',
   align: {
@@ -47,7 +47,7 @@ const mdiToolbarIcons = {
   video: 'video-plus'
 };
 
-export default mdiToolbarIcons;
+export default mdiIcons;
 
 const textColor = `
   <span style="position: relative;">
@@ -57,7 +57,7 @@ const textColor = `
 
 export function getMdiIcon(name, value) {
   if (name === 'color') return textColor;
-  const icon = mdiToolbarIcons[name];
+  const icon = mdiIcons[name];
   const code = isString(icon) ? icon : icon[value];
   return `<span class="icon mdi mdi-${code}"></span>`;
 }
diff --git a/client/components/content-elements/tce-html/edit/ui/color-picker.js b/client/components/content-elements/tce-html/edit/theme/ui/color-picker.js
similarity index 100%
rename from client/components/content-elements/tce-html/edit/ui/color-picker.js
rename to client/components/content-elements/tce-html/edit/theme/ui/color-picker.js
diff --git a/client/components/content-elements/tce-html/edit/ui/color-picker.scss b/client/components/content-elements/tce-html/edit/theme/ui/color-picker.scss
similarity index 100%
rename from client/components/content-elements/tce-html/edit/ui/color-picker.scss
rename to client/components/content-elements/tce-html/edit/theme/ui/color-picker.scss
diff --git a/client/components/content-elements/tce-html/edit/ui/image-embed-tooltip.js b/client/components/content-elements/tce-html/edit/theme/ui/image-embed-tooltip.js
similarity index 100%
rename from client/components/content-elements/tce-html/edit/ui/image-embed-tooltip.js
rename to client/components/content-elements/tce-html/edit/theme/ui/image-embed-tooltip.js
diff --git a/client/components/content-elements/tce-html/edit/ui/image-embed-tooltip.scss b/client/components/content-elements/tce-html/edit/theme/ui/image-embed-tooltip.scss
similarity index 100%
rename from client/components/content-elements/tce-html/edit/ui/image-embed-tooltip.scss
rename to client/components/content-elements/tce-html/edit/theme/ui/image-embed-tooltip.scss
diff --git a/client/components/content-elements/tce-html/edit/ui/tooltip.js b/client/components/content-elements/tce-html/edit/theme/ui/tooltip.js
similarity index 100%
rename from client/components/content-elements/tce-html/edit/ui/tooltip.js
rename to client/components/content-elements/tce-html/edit/theme/ui/tooltip.js

From 6739c0148e7720577bb19758002053ca27a49607 Mon Sep 17 00:00:00 2001
From: Dario Vladovic <d.vladimyr@gmail.com>
Date: Tue, 9 Jul 2019 03:13:00 +0200
Subject: [PATCH 121/213] Tweak toolbar control hover & active state :art:

---
 .../tce-html/edit/Toolbar.vue                 | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/client/components/content-elements/tce-html/edit/Toolbar.vue b/client/components/content-elements/tce-html/edit/Toolbar.vue
index 328d259a8..e5444b581 100644
--- a/client/components/content-elements/tce-html/edit/Toolbar.vue
+++ b/client/components/content-elements/tce-html/edit/Toolbar.vue
@@ -65,6 +65,7 @@ export default {
 
 <style lang="scss">
 $icon-color: #333;
+$icon-accent-color: #ff6590;
 $icon-size: 18px;
 
 .tce-html-toolbar {
@@ -74,10 +75,6 @@ $icon-size: 18px;
   text-align: initial;
 }
 
-.ql-toolbar.ql-snow {
-  border: none;
-}
-
 .ql-toolbar .icon {
   width: $icon-size;
   height: $icon-size;
@@ -102,4 +99,27 @@ $icon-size: 18px;
     }
   }
 }
+
+.ql-toolbar.ql-snow {
+  border: none;
+
+  @mixin icon-color($color, $background: none) {
+    background: $background;
+
+    .icon {
+      color: $icon-accent-color;
+    }
+  }
+
+  button:hover, button:focus, .ql-picker-label:hover, .ql-picker-item:hover {
+    @include icon-color($color: $icon-accent-color);
+  }
+
+  button.ql-active, .ql-picker-label.ql-active, .ql-picker-item.ql-selected {
+    @include icon-color(
+      $color: $icon-accent-color,
+      $background: lighten($icon-accent-color, 25%)
+    );
+  }
+}
 </style>

From adaf7cc88059220366618fad4fd10df1cb65388d Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Tue, 9 Jul 2019 07:48:52 +0200
Subject: [PATCH 122/213] Minor tweaks :wrench:

---
 client/components/system-settings/Sidebar.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/components/system-settings/Sidebar.vue b/client/components/system-settings/Sidebar.vue
index 96cd88c67..ecca0133d 100644
--- a/client/components/system-settings/Sidebar.vue
+++ b/client/components/system-settings/Sidebar.vue
@@ -1,15 +1,15 @@
 <template>
   <v-navigation-drawer value="true" stateless>
-    <v-list class="grey--text text--darken-2">
+    <v-list class="grey--text text--darken-3">
       <v-list-tile
         v-for="({ name, label, icon }) in routes"
         :key="name"
         :to="{ name }"
-        active-class="grey--text text--darken-3"
+        active-class="blue-grey--text text--darken-4"
         exact
         ripple>
         <v-list-tile-action class="pl-1">
-          <v-icon>{{ icon }}</v-icon>
+          <v-icon>mdi-{{ icon }}</v-icon>
         </v-list-tile-action>
         <v-list-tile-title>{{ label }}</v-list-tile-title>
       </v-list-tile>
@@ -22,9 +22,9 @@ export default {
   computed: {
     routes() {
       return [
-        { label: 'System Users', name: 'system-user-management', icon: 'mdi-account' },
-        { label: 'Structure Types', name: 'installed-schemas', icon: 'mdi-file-tree' },
-        { label: 'Content Elements', name: 'installed-elements', icon: 'mdi-puzzle' }
+        { label: 'System Users', name: 'system-user-management', icon: 'account' },
+        { label: 'Structure Types', name: 'installed-schemas', icon: 'file-tree' },
+        { label: 'Content Elements', name: 'installed-elements', icon: 'puzzle' }
       ];
     }
   }

From 04514659d94ad9e5e7ccd7146b0aeac319e9bc91 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Tue, 9 Jul 2019 08:16:40 +0200
Subject: [PATCH 123/213] Minor tweaks :wrench:

---
 .../components/system-settings/ContentElements.vue | 14 +++++++++-----
 client/components/system-settings/Sidebar.vue      |  2 +-
 .../components/system-settings/StructureTypes.vue  |  4 ++--
 client/components/system-settings/index.vue        |  4 ++--
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/client/components/system-settings/ContentElements.vue b/client/components/system-settings/ContentElements.vue
index a466be62f..7150e917a 100644
--- a/client/components/system-settings/ContentElements.vue
+++ b/client/components/system-settings/ContentElements.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-card class="elements-list-container">
+  <v-card class="element-list-container">
     <v-text-field v-model.trim="search" label="Search" clearable/>
     <v-list :expand="true" avatar two-line>
       <v-list-group
@@ -20,9 +20,7 @@
           </v-list-tile-avatar>
           <v-list-tile-content>
             <v-list-tile-title v-text="name"/>
-            <v-list-tile-sub-title>
-              Version {{ version }}
-            </v-list-tile-sub-title>
+            <v-list-tile-sub-title>Version {{ version }}</v-list-tile-sub-title>
           </v-list-tile-content>
         </v-list-tile>
       </v-list-group>
@@ -71,7 +69,13 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.elements-list-container {
+.element-list-container {
   padding: 30px;
 }
+
+.theme--light.v-list {
+  .v-list__group--active:before, .v-list__group--active:after {
+    background: none;
+  }
+}
 </style>
diff --git a/client/components/system-settings/Sidebar.vue b/client/components/system-settings/Sidebar.vue
index ecca0133d..f5471a7c8 100644
--- a/client/components/system-settings/Sidebar.vue
+++ b/client/components/system-settings/Sidebar.vue
@@ -24,7 +24,7 @@ export default {
       return [
         { label: 'System Users', name: 'system-user-management', icon: 'account' },
         { label: 'Structure Types', name: 'installed-schemas', icon: 'file-tree' },
-        { label: 'Content Elements', name: 'installed-elements', icon: 'puzzle' }
+        { label: 'Installed Elements', name: 'installed-elements', icon: 'puzzle' }
       ];
     }
   }
diff --git a/client/components/system-settings/StructureTypes.vue b/client/components/system-settings/StructureTypes.vue
index 54c20a863..65db0958e 100644
--- a/client/components/system-settings/StructureTypes.vue
+++ b/client/components/system-settings/StructureTypes.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-card class="schemas-list-container">
+  <v-card class="schema-list-container">
     <v-text-field v-model.trim="search" label="Search" clearable/>
     <v-treeview
       :items="schemas"
@@ -47,7 +47,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.schemas-list-container {
+.schema-list-container {
   padding: 30px;
   text-align: left;
 }
diff --git a/client/components/system-settings/index.vue b/client/components/system-settings/index.vue
index c25823b9d..2b0d7976f 100644
--- a/client/components/system-settings/index.vue
+++ b/client/components/system-settings/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="grey lighten-2 system-settings-container">
+  <div class="system-settings-container grey lighten-2">
     <v-container>
       <v-layout row align-start>
         <v-card>
@@ -28,6 +28,6 @@ export default {
 
 <style lang="scss" scoped>
 .system-settings-container {
-  padding-bottom: 75px;
+  padding: 20px 0 75px 0;
 }
 </style>

From 262d90cdfa4df90a49fc60a1e1febec0b24bb17d Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Tue, 9 Jul 2019 08:46:29 +0200
Subject: [PATCH 124/213] Ability to reinvite

---
 client/api/user.js                                   |  7 ++++++-
 .../system-settings/UserManagement/UserDialog.vue    |  6 +++---
 server/user/index.js                                 |  3 ++-
 server/user/user.controller.js                       | 12 ++++++++++--
 server/user/user.model.js                            | 12 +++++++-----
 5 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/client/api/user.js b/client/api/user.js
index 7362d8987..5c73b36e8 100644
--- a/client/api/user.js
+++ b/client/api/user.js
@@ -14,8 +14,13 @@ function remove({ id }) {
   return request.delete(`/users/${id}`);
 }
 
+function reinvite({ id }) {
+  return request.post(`/users/${id}/reinvite`);
+}
+
 export default {
   fetch,
   upsert,
-  remove
+  remove,
+  reinvite
 };
diff --git a/client/components/system-settings/UserManagement/UserDialog.vue b/client/components/system-settings/UserManagement/UserDialog.vue
index 4e6656214..6c9543036 100644
--- a/client/components/system-settings/UserManagement/UserDialog.vue
+++ b/client/components/system-settings/UserManagement/UserDialog.vue
@@ -9,7 +9,7 @@
             v-if="!isNewUser"
             :disabled="isLoading"
             :loading="isLoading"
-            @click="invite"
+            @click="reinvite"
             color="blue-grey"
             outline>
             Reinvite
@@ -100,9 +100,9 @@ export default {
         this.close();
       });
     },
-    invite() {
+    reinvite() {
       this.isLoading = true;
-      api.invite(this.user).finally(() => (this.isLoading = false));
+      api.reinvite(this.user).finally(() => (this.isLoading = false));
     }
   },
   watch: {
diff --git a/server/user/index.js b/server/user/index.js
index 155c9487b..fc807b991 100644
--- a/server/user/index.js
+++ b/server/user/index.js
@@ -16,7 +16,8 @@ router
   .use('/users*', auth)
   .get('/users', processPagination(User), ctrl.list)
   .post('/users', ctrl.upsert)
-  .delete('/users/:id', ctrl.remove);
+  .delete('/users/:id', ctrl.remove)
+  .post('/users/:id/reinvite', ctrl.reinvite);
 
 module.exports = {
   model,
diff --git a/server/user/user.controller.js b/server/user/user.controller.js
index ffb56b712..fb4076509 100644
--- a/server/user/user.controller.js
+++ b/server/user/user.controller.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const { createError, validationError } = require('../shared/error/helpers');
-const { NO_CONTENT, NOT_FOUND } = require('http-status-codes');
+const { ACCEPTED, NO_CONTENT, NOT_FOUND } = require('http-status-codes');
 const map = require('lodash/map');
 const { Op } = require('sequelize');
 const { role: { user: userRole } } = require('../../config/shared');
@@ -65,11 +65,19 @@ function login({ body }, res) {
     });
 }
 
+function reinvite({ params }, res) {
+  return User.findByPk(params.id)
+    .then(user => user || createError(NOT_FOUND, 'User does not exist!'))
+    .then(user => User.sendInvitation(user))
+    .then(() => res.status(ACCEPTED).end());
+}
+
 module.exports = {
   list,
   upsert,
   remove,
   forgotPassword,
   resetPassword,
-  login
+  login,
+  reinvite
 };
diff --git a/server/user/user.model.js b/server/user/user.model.js
index df518aaae..98c52dcb9 100644
--- a/server/user/user.model.js
+++ b/server/user/user.model.js
@@ -109,11 +109,7 @@ class User extends Model {
 
   static invite(user, emailCb = noop) {
     return this.create(user)
-      .then(user => {
-        user.token = user.createToken({ expiresIn: '5 days' });
-        mail.invite(user).asCallback(emailCb);
-        return user.save();
-      });
+      .then(user => this.sendInvitation(user, emailCb));
   }
 
   static inviteOrUpdate(data) {
@@ -125,6 +121,12 @@ class User extends Model {
     });
   }
 
+  static sendInvitation(user, emailCb = noop) {
+    user.token = user.createToken({ expiresIn: '5 days' });
+    mail.invite(user).asCallback(emailCb);
+    return user.save();
+  }
+
   isAdmin() {
     return this.role === ADMIN || this.role === INTEGRATION;
   }

From 547f148b7750d5cc382b7dff5f74470f15715e78 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Tue, 9 Jul 2019 08:48:20 +0200
Subject: [PATCH 125/213] Minor tweaks :wrench:

---
 client/components/system-settings/Sidebar.vue        | 2 +-
 client/components/system-settings/StructureTypes.vue | 3 ++-
 client/components/system-settings/index.vue          | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/client/components/system-settings/Sidebar.vue b/client/components/system-settings/Sidebar.vue
index f5471a7c8..d7cf814a0 100644
--- a/client/components/system-settings/Sidebar.vue
+++ b/client/components/system-settings/Sidebar.vue
@@ -5,7 +5,7 @@
         v-for="({ name, label, icon }) in routes"
         :key="name"
         :to="{ name }"
-        active-class="blue-grey--text text--darken-4"
+        active-class="blue-grey--text text--darken-3"
         exact
         ripple>
         <v-list-tile-action class="pl-1">
diff --git a/client/components/system-settings/StructureTypes.vue b/client/components/system-settings/StructureTypes.vue
index 65db0958e..9c292751a 100644
--- a/client/components/system-settings/StructureTypes.vue
+++ b/client/components/system-settings/StructureTypes.vue
@@ -5,7 +5,8 @@
       :items="schemas"
       :search="search"
       open-on-click
-      item-text="label">
+      item-text="label"
+      class="pt-3">
       <template v-slot:prepend="{ item, open }">
         <v-icon :color="item.color">
           {{ open ? 'mdi-folder-open' : 'mdi-folder' }}
diff --git a/client/components/system-settings/index.vue b/client/components/system-settings/index.vue
index 2b0d7976f..7c7dfc45c 100644
--- a/client/components/system-settings/index.vue
+++ b/client/components/system-settings/index.vue
@@ -28,6 +28,6 @@ export default {
 
 <style lang="scss" scoped>
 .system-settings-container {
-  padding: 20px 0 75px 0;
+  padding: 25px 0 75px 0;
 }
 </style>

From 70d256d82e699575b680e4a3317fd3ca39612f86 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Tue, 9 Jul 2019 09:24:32 +0200
Subject: [PATCH 126/213] Added routes to the main toolbar

---
 client/components/common/Navbar.vue | 72 ++++++++++++++---------------
 1 file changed, 34 insertions(+), 38 deletions(-)

diff --git a/client/components/common/Navbar.vue b/client/components/common/Navbar.vue
index 9022cddbb..1ffd826b5 100644
--- a/client/components/common/Navbar.vue
+++ b/client/components/common/Navbar.vue
@@ -1,24 +1,22 @@
 <template>
-  <v-toolbar color="white" app fixed>
+  <v-toolbar color="grey lighten-5" app dense fixed>
     <router-link :to="{ name: 'catalog' }" tag="span" class="app-brand">
-      <v-avatar color="blue darken-3" size="40">
-        <v-icon color="white">mdi-content-cut</v-icon>
+      <v-avatar color="primary darken-1" size="34" class="mt-1">
+        <v-icon color="grey lighten-4">mdi-content-cut</v-icon>
       </v-avatar>
-      <v-toolbar-title class="app-name">{{ title }}</v-toolbar-title>
+      <v-toolbar-title class="app-name ml-2">{{ title }}</v-toolbar-title>
     </router-link>
     <v-spacer/>
-    <router-link
-      v-if="repository"
-      :to="{ name: 'course', params: { courseId: repository.id }}"
-      class="repository-title">
-      <span class="navbar-acronym">
-        <span>{{ repositoryAcronym }}</span>
-      </span>
-      {{ repository.name }}
-    </router-link>
-    <v-toolbar-items>
-      <v-btn :to="{ name: 'catalog' }" exact flat icon>
-        <v-icon>mdi-home</v-icon>
+    <v-toolbar-items class="mr-2">
+      <v-btn
+        v-for="({ name, to, icon }) in routes"
+        :key="name"
+        :to="to"
+        color="blue-grey darken-3"
+        exact
+        flat>
+        <v-icon class="pr-1">mdi-{{ icon }}</v-icon>
+        <span class="toolbar-route">{{ name }}</span>
       </v-btn>
     </v-toolbar-items>
     <v-menu
@@ -26,18 +24,15 @@
       transition="slide-y-transition"
       offset-y
       z-index="1000">
-      <v-btn slot="activator" icon large class="mr-2">
-        <v-avatar size="42px" color="#eaeaea">
-          <span class="grey--text headline">{{ user.email[0] }}</span>
+      <v-btn slot="activator" icon class="mr-2">
+        <v-avatar size="34" color="grey lighten-2">
+          <span class="grey--text text--darken-1 headline">{{ user.email[0] }}</span>
         </v-avatar>
       </v-btn>
       <v-list>
         <v-list-tile>
           <v-list-tile-title>{{ user.email }}</v-list-tile-title>
         </v-list-tile>
-        <v-list-tile v-if="isAdmin" :to="{ name: 'system-management' }">
-          <v-list-tile-title>System Settings</v-list-tile-title>
-        </v-list-tile>
         <v-list-tile @click="logout">
           <v-list-tile-title>Logout</v-list-tile-title>
         </v-list-tile>
@@ -48,7 +43,6 @@
 
 <script>
 import { mapActions, mapGetters } from 'vuex';
-import { getAcronym } from 'utils/course';
 
 export default {
   name: 'main-toolbar',
@@ -63,8 +57,20 @@ export default {
   computed: {
     ...mapGetters(['isAdmin']),
     ...mapGetters('course', { repository: 'course' }),
-    repositoryAcronym() {
-      return this.repository ? getAcronym(this.repository.name) : null;
+    routes() {
+      const items = [
+        { name: 'Catalog', to: { name: 'catalog' }, icon: 'view-list' },
+        { name: 'Admin', to: { name: 'system-user-management' }, icon: 'settings' }
+      ];
+      if (!this.isAdmin) items.pop();
+      if (this.repository) {
+        items.unshift({
+          name: this.repository.name,
+          to: { name: 'course', params: { courseId: this.repository.id } },
+          icon: 'card-text-outline'
+        });
+      }
+      return items;
     }
   },
   methods: mapActions(['logout'])
@@ -85,6 +91,7 @@ $font-color: #333;
 
 .app-brand {
   display: flex;
+  padding-bottom: 2px;
   cursor: pointer;
 
   .app-name {
@@ -94,13 +101,8 @@ $font-color: #333;
   }
 }
 
-.repository-title {
-  max-width: 250px;
-  margin-right: 15px;
-  color: $font-color;
-  font-size: 16px;
-  line-height: $container-height;
-  text-align: left;
+.toolbar-route {
+  max-width: 380px;
   text-overflow: ellipsis;
   white-space: nowrap;
   text-decoration: none;
@@ -110,10 +112,4 @@ $font-color: #333;
     color: darken($font-color, 20%);
   }
 }
-
-.navbar-acronym {
-  padding-right: 4px;
-  color: #777;
-  font-weight: bold;
-}
 </style>

From b97cb41f7404692b9d4a4e5b9697601b0128e5a1 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Tue, 9 Jul 2019 09:48:05 +0200
Subject: [PATCH 127/213] Minor tweaks :wrench:

- Removed Integration role as option
- Set user list default to 10 items
---
 client/components/system-settings/Sidebar.vue    |  2 +-
 .../UserManagement/UserDialog.vue                |  4 +++-
 .../system-settings/UserManagement/index.vue     | 16 +++++++++++++---
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/client/components/system-settings/Sidebar.vue b/client/components/system-settings/Sidebar.vue
index d7cf814a0..512e90879 100644
--- a/client/components/system-settings/Sidebar.vue
+++ b/client/components/system-settings/Sidebar.vue
@@ -5,7 +5,7 @@
         v-for="({ name, label, icon }) in routes"
         :key="name"
         :to="{ name }"
-        active-class="blue-grey--text text--darken-3"
+        active-class="primary--text text--darken-1"
         exact
         ripple>
         <v-list-tile-action class="pl-1">
diff --git a/client/components/system-settings/UserManagement/UserDialog.vue b/client/components/system-settings/UserManagement/UserDialog.vue
index 6c9543036..eb2ab97d2 100644
--- a/client/components/system-settings/UserManagement/UserDialog.vue
+++ b/client/components/system-settings/UserManagement/UserDialog.vue
@@ -49,6 +49,7 @@ import humanize from 'humanize-string';
 import isEmpty from 'lodash/isEmpty';
 import map from 'lodash/map';
 import { role } from 'shared';
+import without from 'lodash/without';
 import { withValidation } from 'utils/validation';
 
 const resetUser = () => {
@@ -81,7 +82,8 @@ export default {
       }
     },
     roles() {
-      return map(role.getRoleValues('user'), it => ({ text: humanize(it), value: it }));
+      const roles = without(role.getRoleValues('user'), 'INTEGRATION');
+      return map(roles, it => ({ text: humanize(it), value: it }));
     },
     isNewUser() {
       return !this.user.id;
diff --git a/client/components/system-settings/UserManagement/index.vue b/client/components/system-settings/UserManagement/index.vue
index 9c43aed3f..67e9b6b47 100644
--- a/client/components/system-settings/UserManagement/index.vue
+++ b/client/components/system-settings/UserManagement/index.vue
@@ -31,7 +31,8 @@
           :items="users"
           :total-items="totalItems"
           :pagination.sync="dataTable"
-          :must-sort="true">
+          :must-sort="true"
+          :loading="loading">
           <template slot="items" slot-scope="{ item }">
             <tr :key="item.id">
               <td class="no-wrap text-xs-left">{{ item.email }}</td>
@@ -81,7 +82,13 @@ import UserDialog from './UserDialog';
 
 const appChannel = EventBus.channel('app');
 
-const defaultPage = () => ({ sortBy: 'updatedAt', descending: true, page: 1 });
+const defaultPage = () => ({
+  sortBy: 'updatedAt',
+  descending: true,
+  page: 1,
+  rowsPerPage: 10
+});
+
 const headers = () => [
   { text: 'Email', value: 'email' },
   { text: 'Role', value: 'role' },
@@ -104,7 +111,8 @@ export default {
       userDialog: false,
       editedUser: null,
       showArchived: false,
-      confirmation: null
+      confirmation: null,
+      loading: true
     };
   },
   computed: {
@@ -118,6 +126,7 @@ export default {
       this.userDialog = true;
     },
     fetch: throttle(async function (opts) {
+      this.loading = true;
       Object.assign(this.dataTable, opts);
       const { items, total } = await api.fetch({
         sortBy: this.dataTable.sortBy,
@@ -129,6 +138,7 @@ export default {
       });
       this.users = items;
       this.totalItems = total;
+      this.loading = false;
     }, 400),
     archiveOrRestore(user) {
       const action = user.deletedAt ? 'restore' : 'archive';

From 7dd05d5c5cb5fd401305c4552c44fac7a99546fb Mon Sep 17 00:00:00 2001
From: Toma Zelic <zelic.toma@gmail.com>
Date: Tue, 9 Jul 2019 10:36:24 +0200
Subject: [PATCH 128/213] Add Multiselect meta type

---
 .../Meta/{Select.vue => BaseSelect.vue}       | 18 ++++---
 client/components/common/Meta/Multiselect.js  | 17 +++++++
 client/components/common/Meta/Select.js       | 17 +++++++
 client/components/common/Meta/index.vue       | 11 +++--
 package-lock.json                             | 47 +++++--------------
 5 files changed, 65 insertions(+), 45 deletions(-)
 rename client/components/common/Meta/{Select.vue => BaseSelect.vue} (78%)
 create mode 100644 client/components/common/Meta/Multiselect.js
 create mode 100644 client/components/common/Meta/Select.js

diff --git a/client/components/common/Meta/Select.vue b/client/components/common/Meta/BaseSelect.vue
similarity index 78%
rename from client/components/common/Meta/Select.vue
rename to client/components/common/Meta/BaseSelect.vue
index 75ce70177..8f4e2eacc 100644
--- a/client/components/common/Meta/Select.vue
+++ b/client/components/common/Meta/BaseSelect.vue
@@ -9,6 +9,7 @@
       :options="options"
       :searchable="false"
       :placeholder="meta.placeholder"
+      :multiple="isMultiSelect"
       @open="active = true"
       @close="active = false"
       @input="update">
@@ -25,13 +26,11 @@
 </template>
 
 <script>
-import find from 'lodash/find';
-import get from 'lodash/get';
 import isString from 'lodash/isString';
 import Select from '../../common/Select';
 
 export default {
-  name: 'multi-select',
+  name: 'base-meta-select',
   props: {
     meta: { type: Object, default: () => ({ value: null }) }
   },
@@ -39,8 +38,11 @@ export default {
     return { active: false };
   },
   computed: {
-    value() {
-      return find(this.options, { value: this.meta.value });
+    isMultiSelect: () => {
+      throw new Error('Computed "isMultiSelect" must be implemented');
+    },
+    value: () => {
+      throw new Error('Computed "value" must be implemented');
     },
     options() {
       const { options } = this.meta;
@@ -48,8 +50,12 @@ export default {
     }
   },
   methods: {
+    parseInput() {
+      throw new Error('Method "parseInput" must be implemented');
+    },
     update(data) {
-      return this.$emit('update', this.meta.key, get(data, 'value', null));
+      const payload = this.parseInput(data);
+      return this.$emit('update', this.meta.key, payload);
     }
   },
   components: { multiselect: Select }
diff --git a/client/components/common/Meta/Multiselect.js b/client/components/common/Meta/Multiselect.js
new file mode 100644
index 000000000..b650ecd33
--- /dev/null
+++ b/client/components/common/Meta/Multiselect.js
@@ -0,0 +1,17 @@
+import BaseSelect from './BaseSelect';
+
+export default {
+  name: 'meta-multiselect',
+  extends: BaseSelect,
+  computed: {
+    isMultiSelect: () => true,
+    value() {
+      return this.options.filter(it => (this.meta.value || []).includes(it.value));
+    }
+  },
+  methods: {
+    parseInput(data = []) {
+      return data.map(it => it.value);
+    }
+  }
+};
diff --git a/client/components/common/Meta/Select.js b/client/components/common/Meta/Select.js
new file mode 100644
index 000000000..e4f1dee69
--- /dev/null
+++ b/client/components/common/Meta/Select.js
@@ -0,0 +1,17 @@
+import BaseSelect from './BaseSelect';
+import find from 'lodash/find';
+import get from 'lodash/get';
+
+export default {
+  name: 'meta-select',
+  extends: BaseSelect,
+  computed: {
+    isMultiSelect: () => false,
+    value() {
+      return find(this.options, { value: this.meta.value });
+    }
+  },
+  methods: {
+    parseInput: data => get(data, 'value', null)
+  }
+};
diff --git a/client/components/common/Meta/index.vue b/client/components/common/Meta/index.vue
index 4365832a3..b3b3c959e 100644
--- a/client/components/common/Meta/index.vue
+++ b/client/components/common/Meta/index.vue
@@ -1,6 +1,6 @@
 <template>
   <component
-    :is="resolveComponent(meta.type)"
+    :is="component"
     :meta="meta"
     @update="(key, value) => $emit('update', key, value)">
   </component>
@@ -13,6 +13,7 @@ import DatePicker from './DatePicker';
 import FileUpload from './File';
 import Input from './Input';
 import mapKeys from 'lodash/mapKeys';
+import Multiselect from './Multiselect';
 import Select from './Select';
 import Switch from './Switch';
 import Textarea from './Textarea';
@@ -24,6 +25,7 @@ const META_TYPES = {
   DATETIME: DatePicker,
   INPUT: Input,
   SELECT: Select,
+  MULTISELECT: Multiselect,
   SWITCH: Switch,
   TEXTAREA: Textarea,
   FILE: FileUpload
@@ -34,10 +36,9 @@ export default {
   props: {
     meta: { type: Object, required: true }
   },
-  methods: {
-    resolveComponent(type = '') {
-      return META_TYPES[type.toUpperCase()] || META_TYPES.INPUT;
-    }
+  computed: {
+    type: vm => (vm.meta.type || '').toUpperCase(),
+    component: vm => META_TYPES[vm.type] || META_TYPES.INPUT
   },
   components
 };
diff --git a/package-lock.json b/package-lock.json
index 587c570b4..91d8da5e9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10666,7 +10666,6 @@
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.4.tgz",
       "integrity": "sha512-mlouk1OHlaUE8Odt1drMtG1bAJA4ZA6B/ehysgV0LUIrDHdKgo1KorZq3pK0b/7Z7LJIQ12MNM6aC+Tn6lUZ5w==",
       "dev": true,
-      "optional": true,
       "requires": {
         "safe-buffer": "^5.1.2",
         "yallist": "^3.0.0"
@@ -10676,8 +10675,7 @@
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz",
           "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=",
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },
@@ -18833,7 +18831,7 @@
     "vue-video-player": {
       "version": "3.1.4",
       "resolved": "https://registry.npmjs.org/vue-video-player/-/vue-video-player-3.1.4.tgz",
-      "integrity": "sha1-cAmwbc7EObPqZFGDIX0xTL8NN/0=",
+      "integrity": "sha512-CqVvhy2QSDRxXfaHn029Cpz+mbV2gubIcdZE5Uu1e7f0ZfpdqpuqnSYyE50nUXzM3zfa7TaYOARpLsY3FdLtOQ==",
       "requires": {
         "video.js": "^5.11.7"
       }
@@ -19309,8 +19307,7 @@
             "ansi-regex": {
               "version": "2.1.1",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "aproba": {
               "version": "1.2.0",
@@ -19331,14 +19328,12 @@
             "balanced-match": {
               "version": "1.0.0",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "brace-expansion": {
               "version": "1.1.11",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
@@ -19353,20 +19348,17 @@
             "code-point-at": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "concat-map": {
               "version": "0.0.1",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "console-control-strings": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "core-util-is": {
               "version": "1.0.2",
@@ -19483,8 +19475,7 @@
             "inherits": {
               "version": "2.0.3",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "ini": {
               "version": "1.3.5",
@@ -19496,7 +19487,6 @@
               "version": "1.0.0",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "number-is-nan": "^1.0.0"
               }
@@ -19511,7 +19501,6 @@
               "version": "3.0.4",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "brace-expansion": "^1.1.7"
               }
@@ -19519,14 +19508,12 @@
             "minimist": {
               "version": "0.0.8",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "minipass": {
               "version": "2.3.5",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
                 "yallist": "^3.0.0"
@@ -19545,7 +19532,6 @@
               "version": "0.5.1",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "minimist": "0.0.8"
               }
@@ -19626,8 +19612,7 @@
             "number-is-nan": {
               "version": "1.0.1",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "object-assign": {
               "version": "4.1.1",
@@ -19639,7 +19624,6 @@
               "version": "1.4.0",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "wrappy": "1"
               }
@@ -19725,8 +19709,7 @@
             "safe-buffer": {
               "version": "5.1.2",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "safer-buffer": {
               "version": "2.1.2",
@@ -19762,7 +19745,6 @@
               "version": "1.0.2",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "code-point-at": "^1.0.0",
                 "is-fullwidth-code-point": "^1.0.0",
@@ -19782,7 +19764,6 @@
               "version": "3.0.1",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "ansi-regex": "^2.0.0"
               }
@@ -19826,14 +19807,12 @@
             "wrappy": {
               "version": "1.0.2",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             },
             "yallist": {
               "version": "3.0.3",
               "bundled": true,
-              "dev": true,
-              "optional": true
+              "dev": true
             }
           }
         },

From 53411894a90a88f4322b33656bdab1eb3ca7e1ed Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Tue, 9 Jul 2019 10:59:05 +0200
Subject: [PATCH 129/213] Cleanup :lipstick:

- Clean up, clean up, we all had fun today...
---
 client/components/common/Navbar.vue |  2 +-
 server/user/user.model.js           | 11 +----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/client/components/common/Navbar.vue b/client/components/common/Navbar.vue
index 1ffd826b5..b0447edfb 100644
--- a/client/components/common/Navbar.vue
+++ b/client/components/common/Navbar.vue
@@ -7,7 +7,7 @@
       <v-toolbar-title class="app-name ml-2">{{ title }}</v-toolbar-title>
     </router-link>
     <v-spacer/>
-    <v-toolbar-items class="mr-2">
+    <v-toolbar-items>
       <v-btn
         v-for="({ name, to, icon }) in routes"
         :key="name"
diff --git a/server/user/user.model.js b/server/user/user.model.js
index 98c52dcb9..2229c1de2 100644
--- a/server/user/user.model.js
+++ b/server/user/user.model.js
@@ -1,10 +1,10 @@
 'use strict';
 
-const { Model, Op } = require('sequelize');
 const config = require('../../config/server');
 const jwt = require('jsonwebtoken');
 const mail = require('../shared/mail');
 const map = require('lodash/map');
+const { Model } = require('sequelize');
 const pick = require('lodash/pick');
 const Promise = require('bluebird');
 const { role: roles } = require('../../config/shared');
@@ -98,15 +98,6 @@ class User extends Model {
     };
   }
 
-  static scopes() {
-    return {
-      withRoleType() {
-        const role = { [Op.in]: roles.getRoleValues('user') };
-        return { where: { role } };
-      }
-    };
-  }
-
   static invite(user, emailCb = noop) {
     return this.create(user)
       .then(user => this.sendInvitation(user, emailCb));

From 16fcc58662db706b60fcc11ecdebe78e8902f8b8 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Tue, 9 Jul 2019 11:05:56 +0200
Subject: [PATCH 130/213] Set pagination options

---
 client/components/system-settings/UserManagement/index.vue | 3 ++-
 client/router.js                                           | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/components/system-settings/UserManagement/index.vue b/client/components/system-settings/UserManagement/index.vue
index 67e9b6b47..b781f841d 100644
--- a/client/components/system-settings/UserManagement/index.vue
+++ b/client/components/system-settings/UserManagement/index.vue
@@ -32,7 +32,8 @@
           :total-items="totalItems"
           :pagination.sync="dataTable"
           :must-sort="true"
-          :loading="loading">
+          :loading="loading"
+          :rows-per-page-items="[10, 20, 50, 100]">
           <template slot="items" slot-scope="{ item }">
             <tr :key="item.id">
               <td class="no-wrap text-xs-left">{{ item.email }}</td>
diff --git a/client/router.js b/client/router.js
index dc2d62d58..08676ab72 100644
--- a/client/router.js
+++ b/client/router.js
@@ -9,7 +9,6 @@ import Catalog from './components/catalog/Container';
 import Course from './components/course';
 import CourseRevisions from './components/course/Revisions';
 import CourseSettings from './components/course/Settings';
-import RepoUserManagement from './components/course/Settings/UserManagement';
 import Editor from './components/editor';
 import ForgotPassword from './components/auth/ForgotPassword';
 import General from './components/course/Settings/General';
@@ -17,6 +16,7 @@ import InstalledElements from './components/system-settings/ContentElements';
 import InstalledSchemas from './components/system-settings/StructureTypes';
 import Login from './components/auth/Login';
 import Outline from './components/course/Outline';
+import RepoUserManagement from './components/course/Settings/UserManagement';
 import ResetPassword from './components/auth/ResetPassword';
 import SystemSettings from './components/system-settings';
 import SystemUserManagement from './components/system-settings/UserManagement';

From fe6afc07f1b6130580b94a0e6611900b03c7f2dd Mon Sep 17 00:00:00 2001
From: Toma Zelic <zelic.toma@gmail.com>
Date: Tue, 9 Jul 2019 16:00:08 +0200
Subject: [PATCH 131/213] Cleanup :lipstick:

---
 client/components/common/Meta/BaseSelect.vue |  6 ++----
 client/components/common/Meta/Multiselect.js | 10 +++++-----
 client/components/common/Meta/Select.js      |  8 ++------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/client/components/common/Meta/BaseSelect.vue b/client/components/common/Meta/BaseSelect.vue
index 8f4e2eacc..5c0b73a83 100644
--- a/client/components/common/Meta/BaseSelect.vue
+++ b/client/components/common/Meta/BaseSelect.vue
@@ -27,16 +27,14 @@
 
 <script>
 import isString from 'lodash/isString';
-import Select from '../../common/Select';
+import Select from '@/components/common/Select';
 
 export default {
   name: 'base-meta-select',
   props: {
     meta: { type: Object, default: () => ({ value: null }) }
   },
-  data() {
-    return { active: false };
-  },
+  data: () => ({ active: false }),
   computed: {
     isMultiSelect: () => {
       throw new Error('Computed "isMultiSelect" must be implemented');
diff --git a/client/components/common/Meta/Multiselect.js b/client/components/common/Meta/Multiselect.js
index b650ecd33..172afe053 100644
--- a/client/components/common/Meta/Multiselect.js
+++ b/client/components/common/Meta/Multiselect.js
@@ -1,17 +1,17 @@
 import BaseSelect from './BaseSelect';
 
+const includes = (arr, ...args) => arr.includes(...args);
+
 export default {
   name: 'meta-multiselect',
   extends: BaseSelect,
   computed: {
     isMultiSelect: () => true,
-    value() {
-      return this.options.filter(it => (this.meta.value || []).includes(it.value));
+    value: ({ meta, options }) => {
+      return options.filter(it => includes(meta.value || [], it.value));
     }
   },
   methods: {
-    parseInput(data = []) {
-      return data.map(it => it.value);
-    }
+    parseInput: (data = []) => data.map(it => it.value)
   }
 };
diff --git a/client/components/common/Meta/Select.js b/client/components/common/Meta/Select.js
index e4f1dee69..570a8125f 100644
--- a/client/components/common/Meta/Select.js
+++ b/client/components/common/Meta/Select.js
@@ -1,17 +1,13 @@
 import BaseSelect from './BaseSelect';
-import find from 'lodash/find';
-import get from 'lodash/get';
 
 export default {
   name: 'meta-select',
   extends: BaseSelect,
   computed: {
     isMultiSelect: () => false,
-    value() {
-      return find(this.options, { value: this.meta.value });
-    }
+    value: ({ meta, options }) => options.find(it => it.value === meta.value)
   },
   methods: {
-    parseInput: data => get(data, 'value', null)
+    parseInput: ({ data }) => data.value || null
   }
 };

From d61c3a99d2aed054e4e37ff34ff533fdd4784242 Mon Sep 17 00:00:00 2001
From: Dario Vladovic <d.vladimyr@gmail.com>
Date: Wed, 10 Jul 2019 10:32:54 +0200
Subject: [PATCH 132/213] Tweak toolbar styles :art:

---
 .../tce-html/edit/Toolbar.vue                 | 26 +++++++---
 package-lock.json                             | 47 ++++++++++++++-----
 2 files changed, 54 insertions(+), 19 deletions(-)

diff --git a/client/components/content-elements/tce-html/edit/Toolbar.vue b/client/components/content-elements/tce-html/edit/Toolbar.vue
index e5444b581..19d7ee103 100644
--- a/client/components/content-elements/tce-html/edit/Toolbar.vue
+++ b/client/components/content-elements/tce-html/edit/Toolbar.vue
@@ -103,23 +103,37 @@ $icon-size: 18px;
 .ql-toolbar.ql-snow {
   border: none;
 
-  @mixin icon-color($color, $background: none) {
+  @mixin colorize($color, $background: none) {
+    color: $icon-accent-color;
     background: $background;
 
     .icon {
-      color: $icon-accent-color;
+      color: inherit;
     }
+
+    // dropdown chevrons
+    .ql-stroke {
+      stroke: currentColor;
+    }
+  }
+
+  button:hover, button:focus {
+    @include colorize($color: $icon-accent-color);
   }
 
-  button:hover, button:focus, .ql-picker-label:hover, .ql-picker-item:hover {
-    @include icon-color($color: $icon-accent-color);
+  .ql-picker:not(.ql-expanded) .ql-picker-label:hover, .ql-picker-item:hover {
+    @include colorize($color: $icon-accent-color);
   }
 
-  button.ql-active, .ql-picker-label.ql-active, .ql-picker-item.ql-selected {
-    @include icon-color(
+  button.ql-active, .ql-picker-label.ql-active {
+    @include colorize(
       $color: $icon-accent-color,
       $background: lighten($icon-accent-color, 25%)
     );
   }
+
+  .ql-picker-item.ql-selected {
+    @include colorize($color: $icon-accent-color);
+  }
 }
 </style>
diff --git a/package-lock.json b/package-lock.json
index 5e04406c2..11865570c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10689,6 +10689,7 @@
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.4.tgz",
       "integrity": "sha512-mlouk1OHlaUE8Odt1drMtG1bAJA4ZA6B/ehysgV0LUIrDHdKgo1KorZq3pK0b/7Z7LJIQ12MNM6aC+Tn6lUZ5w==",
       "dev": true,
+      "optional": true,
       "requires": {
         "safe-buffer": "^5.1.2",
         "yallist": "^3.0.0"
@@ -10698,7 +10699,8 @@
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz",
           "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -18854,7 +18856,7 @@
     "vue-video-player": {
       "version": "3.1.4",
       "resolved": "https://registry.npmjs.org/vue-video-player/-/vue-video-player-3.1.4.tgz",
-      "integrity": "sha512-CqVvhy2QSDRxXfaHn029Cpz+mbV2gubIcdZE5Uu1e7f0ZfpdqpuqnSYyE50nUXzM3zfa7TaYOARpLsY3FdLtOQ==",
+      "integrity": "sha1-cAmwbc7EObPqZFGDIX0xTL8NN/0=",
       "requires": {
         "video.js": "^5.11.7"
       }
@@ -19330,7 +19332,8 @@
             "ansi-regex": {
               "version": "2.1.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "aproba": {
               "version": "1.2.0",
@@ -19351,12 +19354,14 @@
             "balanced-match": {
               "version": "1.0.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "brace-expansion": {
               "version": "1.1.11",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
@@ -19371,17 +19376,20 @@
             "code-point-at": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "concat-map": {
               "version": "0.0.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "console-control-strings": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "core-util-is": {
               "version": "1.0.2",
@@ -19498,7 +19506,8 @@
             "inherits": {
               "version": "2.0.3",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "ini": {
               "version": "1.3.5",
@@ -19510,6 +19519,7 @@
               "version": "1.0.0",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "number-is-nan": "^1.0.0"
               }
@@ -19524,6 +19534,7 @@
               "version": "3.0.4",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "brace-expansion": "^1.1.7"
               }
@@ -19531,12 +19542,14 @@
             "minimist": {
               "version": "0.0.8",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "minipass": {
               "version": "2.3.5",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
                 "yallist": "^3.0.0"
@@ -19555,6 +19568,7 @@
               "version": "0.5.1",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "minimist": "0.0.8"
               }
@@ -19635,7 +19649,8 @@
             "number-is-nan": {
               "version": "1.0.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "object-assign": {
               "version": "4.1.1",
@@ -19647,6 +19662,7 @@
               "version": "1.4.0",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "wrappy": "1"
               }
@@ -19732,7 +19748,8 @@
             "safe-buffer": {
               "version": "5.1.2",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "safer-buffer": {
               "version": "2.1.2",
@@ -19768,6 +19785,7 @@
               "version": "1.0.2",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "code-point-at": "^1.0.0",
                 "is-fullwidth-code-point": "^1.0.0",
@@ -19787,6 +19805,7 @@
               "version": "3.0.1",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "ansi-regex": "^2.0.0"
               }
@@ -19830,12 +19849,14 @@
             "wrappy": {
               "version": "1.0.2",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "yallist": {
               "version": "3.0.3",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             }
           }
         },

From f5979cfc9b92145c7137176bab36e617ad840cc4 Mon Sep 17 00:00:00 2001
From: Dario Vladovic <d.vladimyr@gmail.com>
Date: Wed, 10 Jul 2019 12:44:53 +0200
Subject: [PATCH 133/213] Implement toolbar item tooltips :tada:

---
 .../tce-html/edit/Toolbar.vue                 | 102 +++++++++++++-----
 .../tce-html/edit/theme/index.js              |  29 ++++-
 package-lock.json                             |   8 ++
 package.json                                  |   1 +
 4 files changed, 114 insertions(+), 26 deletions(-)

diff --git a/client/components/content-elements/tce-html/edit/Toolbar.vue b/client/components/content-elements/tce-html/edit/Toolbar.vue
index 19d7ee103..ff127a251 100644
--- a/client/components/content-elements/tce-html/edit/Toolbar.vue
+++ b/client/components/content-elements/tce-html/edit/Toolbar.vue
@@ -2,56 +2,56 @@
   <div class="tce-html-toolbar">
     <div @mousedown.prevent="() => {}" id="quillToolbar">
       <span class="ql-formats">
-        <button class="ql-undo" type="button"></button>
-        <button class="ql-redo" type="button"></button>
+        <button class="ql-undo" title="Undo" type="button"></button>
+        <button class="ql-redo" title="Redo" type="button"></button>
       </span>
       <span class="ql-formats">
-        <select class="ql-font"></select>
-        <select class="ql-header"></select>
+        <select class="ql-font" title="Font"></select>
+        <select class="ql-header" title="Style"></select>
       </span>
       <span class="ql-formats">
-        <button class="ql-bold" type="button"></button>
-        <button class="ql-italic" type="button"></button>
-        <button class="ql-underline" type="button"></button>
-        <button class="ql-strike" type="button"></button>
+        <button class="ql-bold" title="Bold" type="button"></button>
+        <button class="ql-italic" title="Italic" type="button"></button>
+        <button class="ql-underline" title="Underline" type="button"></button>
+        <button class="ql-strike" title="Strikethrough" type="button"></button>
       </span>
       <span class="ql-formats">
-        <select class="ql-color"></select>
-        <select class="ql-background"></select>
+        <select class="ql-color" title="Text color"></select>
+        <select class="ql-background" title="Highlight color"></select>
       </span>
       <span class="ql-formats">
-        <button class="ql-script" value="sub" type="button"></button>
-        <button class="ql-script" value="super" type="button"></button>
+        <button class="ql-script" value="sub" title="Subscript" type="button"></button>
+        <button class="ql-script" value="super" title="Superscript" type="button"></button>
       </span>
       <span class="ql-formats">
-        <button class="ql-header" value="1" type="button"></button>
-        <button class="ql-header" value="2" type="button"></button>
-        <button class="ql-blockquote" type="button"></button>
-        <button class="ql-code-block" type="button"></button>
+        <button class="ql-header" value="1" title="Heading 1" type="button"></button>
+        <button class="ql-header" value="2" title="Heading 2" type="button"></button>
+        <button class="ql-blockquote" title="Quote" type="button"></button>
+        <button class="ql-code-block" title="Code" type="button"></button>
       </span>
       <span class="ql-formats">
-        <button class="ql-list" value="ordered" type="button"></button>
-        <button class="ql-list" value="bullet" type="button"></button>
-        <button class="ql-indent" value="-1" type="button"></button>
-        <button class="ql-indent" value="+1" type="button"></button>
+        <button class="ql-list" value="ordered" title="Numbered list" type="button"></button>
+        <button class="ql-list" value="bullet" title="Bulleted List" type="button"></button>
+        <button class="ql-indent" value="-1" title="Decrease indent" type="button"></button>
+        <button class="ql-indent" value="+1" title="Increase indent" type="button"></button>
       </span>
       <span class="ql-formats">
-        <select class="ql-align">
+        <select class="ql-align" title="Alignment">
           <option selected=""></option>
           <option value="center"></option>
           <option value="right"></option>
           <option value="justify"></option>
         </select>
-        <button class="ql-direction" value="rtl" type="button"></button>
+        <button class="ql-direction" value="rtl" title="Text direction" type="button"></button>
       </span>
       <span class="ql-formats">
-        <button class="ql-link" type="button"></button>
-        <button class="ql-image" type="button"></button>
+        <button class="ql-link" title="Insert link..." type="button"></button>
+        <button class="ql-image" title="Image" type="button"></button>
         <!-- <button class="ql-video" type="button"></button> -->
         <!-- <button class="ql-formula" type="button"></button> -->
       </span>
       <span class="ql-formats">
-        <button class="ql-clean" type="button"></button>
+        <button class="ql-clean" title="Clear formatting" type="button"></button>
       </span>
     </div>
   </div>
@@ -136,4 +136,56 @@ $icon-size: 18px;
     @include colorize($color: $icon-accent-color);
   }
 }
+
+.ql-toolbar .tooltip {
+  $color: #2a2a2a;
+  $arrow-size: 5px;
+
+  display: block;
+  position: absolute;
+  padding: 6px 12px;
+  line-height: 1.42;
+  background: $color;
+  border: 1px solid #fff;
+  border-radius: 0;
+  cursor: default;
+  z-index: 999;
+  // TODO: Remove this after bootstrap gets removed!
+  opacity: initial;
+
+  .tooltip-arrow {
+    position: absolute;
+    width: 0;
+    height: 0;
+    border-color: $color;
+    border-style: solid;
+    margin: $arrow-size;
+  }
+
+  .tooltip-inner {
+    padding: 0;
+    color: #fff;
+    font-size: 0.96rem;
+    font-family: $font-family-secondary;
+    font-weight: 500;
+    text-align: center;
+    // TODO: Remove this after bootstrap gets removed!
+    background: initial;
+  }
+
+  &[x-placement^="bottom"] {
+    margin-top: $arrow-size;
+  }
+
+  &[x-placement^="bottom"] .tooltip-arrow {
+    top: -$arrow-size;
+    left: calc(50% - #{$arrow-size});
+    margin-top: 0;
+    margin-bottom: 0;
+    border-width: 0 $arrow-size $arrow-size $arrow-size;
+    border-left-color: transparent;
+    border-right-color: transparent;
+    border-top-color: transparent;
+  }
+}
 </style>
diff --git a/client/components/content-elements/tce-html/edit/theme/index.js b/client/components/content-elements/tce-html/edit/theme/index.js
index 4482f75db..ccfb18bd4 100644
--- a/client/components/content-elements/tce-html/edit/theme/index.js
+++ b/client/components/content-elements/tce-html/edit/theme/index.js
@@ -1,6 +1,7 @@
 import mdiIcons, { getMdiIcon } from './toolbar-icons';
 import createColorPicker from './ui/color-picker';
 import createImageEmbed from './modules/image-embed';
+import Tooltip from 'tooltip.js';
 
 const colors = [
   '#000000',
@@ -40,6 +41,11 @@ const colors = [
   '#3d1466'
 ];
 const reQuillControl = /^ql-/;
+const tooltipTemplate = `
+  <div class="tooltip" role="tooltip">
+    <div class="tooltip-arrow"></div>
+    <div class="tooltip-inner"></div>
+  </div>`;
 
 export default Quill => {
   const ImageEmbed = createImageEmbed(Quill);
@@ -62,8 +68,14 @@ export default Quill => {
       modules: { toolbar }
     };
 
+    extendToolbar(toolbar) {
+      super.extendToolbar(toolbar);
+      this.buildTooltips();
+    }
+
     buildButtons(buttons) {
-      Array.from(buttons).forEach(it => buildButton(it));
+      buttons.forEach(it => buildButton(it));
+      this.buttons = buttons;
     }
 
     buildPickers(selects, icons) {
@@ -95,6 +107,11 @@ export default Quill => {
         this.pickers.push(new IconPicker(align, icons));
       }
     }
+
+    buildTooltips() {
+      this.pickers.forEach(it => buildTooltip(it.container, it.select.title));
+      this.buttons.forEach(it => buildTooltip(it));
+    }
   };
 };
 
@@ -109,6 +126,16 @@ function buildButton(button) {
   button.innerHTML = getMdiIcon(name, button.value);
 }
 
+function buildTooltip(el, title, delay = 300) {
+  if (el.style.display === 'none') return;
+  return new Tooltip(el, {
+    template: tooltipTemplate,
+    placement: 'bottom',
+    title,
+    delay
+  });
+}
+
 function fillSelect(select, values, defaultValue = false) {
   values.forEach(value => {
     const option = document.createElement('option');
diff --git a/package-lock.json b/package-lock.json
index 11865570c..bb3d4e1fb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17728,6 +17728,14 @@
       "resolved": "https://registry.npmjs.org/toml/-/toml-2.3.6.tgz",
       "integrity": "sha512-gVweAectJU3ebq//Ferr2JUY4WKSDe5N+z0FvjDncLGyHmIDoxgY/2Ie4qfEIDm4IS7OA6Rmdm7pdEEdMcV/xQ=="
     },
+    "tooltip.js": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/tooltip.js/-/tooltip.js-1.3.2.tgz",
+      "integrity": "sha512-DeDr9JxYx/lSvQ53ZCRFLxXrmrSyU3fLz6k+ITUTw69AIYtpWij/NmOJQscJ7BwY5lcEwWJWSfqqQWVvTMYZiw==",
+      "requires": {
+        "popper.js": "^1.0.2"
+      }
+    },
     "topo": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/topo/-/topo-2.0.2.tgz",
diff --git a/package.json b/package.json
index cca8ea13c..ca3dfc458 100644
--- a/package.json
+++ b/package.json
@@ -110,6 +110,7 @@
     "snyk": "^1.134.2",
     "string-template": "^1.0.0",
     "to-case": "^2.0.0",
+    "tooltip.js": "^1.3.2",
     "truncate": "^2.0.0",
     "untildify": "^4.0.0",
     "url-join": "^4.0.0",

From 97a722bf51e2d18e9d81d4eac1f14f2a13b614f2 Mon Sep 17 00:00:00 2001
From: Dario Vladovic <d.vladimyr@gmail.com>
Date: Wed, 10 Jul 2019 13:18:43 +0200
Subject: [PATCH 134/213] Fix tooltip behavior :bug:

- preventing tooltip on expanded pickers
- closing tooltip on click
---
 .../tce-html/edit/theme/index.js              | 32 +++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/client/components/content-elements/tce-html/edit/theme/index.js b/client/components/content-elements/tce-html/edit/theme/index.js
index ccfb18bd4..b35a3cd5d 100644
--- a/client/components/content-elements/tce-html/edit/theme/index.js
+++ b/client/components/content-elements/tce-html/edit/theme/index.js
@@ -1,7 +1,7 @@
 import mdiIcons, { getMdiIcon } from './toolbar-icons';
+import BaseTooltip from 'tooltip.js';
 import createColorPicker from './ui/color-picker';
 import createImageEmbed from './modules/image-embed';
-import Tooltip from 'tooltip.js';
 
 const colors = [
   '#000000',
@@ -47,6 +47,16 @@ const tooltipTemplate = `
     <div class="tooltip-inner"></div>
   </div>`;
 
+const isExpanded = el => el.classList.contains('ql-expanded');
+const isPicker = el => el.classList.contains('ql-picker');
+
+class Tooltip extends BaseTooltip {
+  _show(reference, options) {
+    if (isPicker(reference) && isExpanded(reference)) return;
+    return super._show(reference, options);
+  }
+}
+
 export default Quill => {
   const ImageEmbed = createImageEmbed(Quill);
   Quill.register(`modules/${ImageEmbed.NAME}`, ImageEmbed, true);
@@ -109,8 +119,18 @@ export default Quill => {
     }
 
     buildTooltips() {
-      this.pickers.forEach(it => buildTooltip(it.container, it.select.title));
-      this.buttons.forEach(it => buildTooltip(it));
+      this.pickers.forEach(picker => {
+        const tooltip = buildTooltip(picker.container, picker.select.title);
+        const { togglePicker } = picker;
+        picker.togglePicker = function () {
+          if (tooltip) tooltip.hide();
+          return togglePicker.apply(this, arguments);
+        };
+      });
+      this.buttons.forEach(button => {
+        const tooltip = buildTooltip(button);
+        button.addEventListener('click', () => tooltip && tooltip.hide());
+      });
     }
   };
 };
@@ -126,13 +146,13 @@ function buildButton(button) {
   button.innerHTML = getMdiIcon(name, button.value);
 }
 
-function buildTooltip(el, title, delay = 300) {
+function buildTooltip(el, title, showDelay = 500) {
   if (el.style.display === 'none') return;
   return new Tooltip(el, {
     template: tooltipTemplate,
     placement: 'bottom',
-    title,
-    delay
+    delay: { show: showDelay, hide: 0 },
+    title
   });
 }
 

From ff64eceaab731b3853a70ddf8fc8ce2750bf14de Mon Sep 17 00:00:00 2001
From: Dario Vladovic <d.vladimyr@gmail.com>
Date: Wed, 10 Jul 2019 14:00:18 +0200
Subject: [PATCH 135/213] Tooltip fine tuning :lipstick:

---
 client/components/content-elements/tce-html/edit/Toolbar.vue | 5 ++++-
 .../components/content-elements/tce-html/edit/theme/index.js | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/client/components/content-elements/tce-html/edit/Toolbar.vue b/client/components/content-elements/tce-html/edit/Toolbar.vue
index ff127a251..fc659900b 100644
--- a/client/components/content-elements/tce-html/edit/Toolbar.vue
+++ b/client/components/content-elements/tce-html/edit/Toolbar.vue
@@ -139,17 +139,20 @@ $icon-size: 18px;
 
 .ql-toolbar .tooltip {
   $color: #2a2a2a;
+  $offset: 2px;
   $arrow-size: 5px;
 
   display: block;
   position: absolute;
+  top: $offset !important;
   padding: 6px 12px;
   line-height: 1.42;
   background: $color;
   border: 1px solid #fff;
   border-radius: 0;
-  cursor: default;
   z-index: 999;
+  user-select: none;
+  cursor: default;
   // TODO: Remove this after bootstrap gets removed!
   opacity: initial;
 
diff --git a/client/components/content-elements/tce-html/edit/theme/index.js b/client/components/content-elements/tce-html/edit/theme/index.js
index b35a3cd5d..728b1edf9 100644
--- a/client/components/content-elements/tce-html/edit/theme/index.js
+++ b/client/components/content-elements/tce-html/edit/theme/index.js
@@ -146,7 +146,7 @@ function buildButton(button) {
   button.innerHTML = getMdiIcon(name, button.value);
 }
 
-function buildTooltip(el, title, showDelay = 500) {
+function buildTooltip(el, title, showDelay = 350) {
   if (el.style.display === 'none') return;
   return new Tooltip(el, {
     template: tooltipTemplate,

From 3b909f73317147b3c9a061c993c02644356094c5 Mon Sep 17 00:00:00 2001
From: Dario Vladovic <d.vladimyr@gmail.com>
Date: Wed, 10 Jul 2019 14:01:06 +0200
Subject: [PATCH 136/213] Fix typo :goat:

---
 .../content-elements/tce-html/edit/theme/toolbar-icons.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/components/content-elements/tce-html/edit/theme/toolbar-icons.js b/client/components/content-elements/tce-html/edit/theme/toolbar-icons.js
index 9d7c5aeb2..66450d750 100644
--- a/client/components/content-elements/tce-html/edit/theme/toolbar-icons.js
+++ b/client/components/content-elements/tce-html/edit/theme/toolbar-icons.js
@@ -7,7 +7,7 @@ const mdiIcons = {
     '': 'format-align-left',
     center: 'format-align-center',
     right: 'format-align-right',
-    justify: 'format-alignt-justify'
+    justify: 'format-align-justify'
   },
   background: 'format-color-highlight',
   blockquote: 'format-quote-close',

From c2e3d4ebf8984b19250a5d65b6339ddc685230ac Mon Sep 17 00:00:00 2001
From: Dario Vladovic <d.vladimyr@gmail.com>
Date: Wed, 10 Jul 2019 14:22:13 +0200
Subject: [PATCH 137/213] Refactor tooltips :wrench:

- refactoring tooltip style
- using `data-title` instead of `title` attribute to prevent
  showing native tooltip
---
 .../tce-html/edit/Toolbar.vue                 | 89 ++++++++-----------
 .../tce-html/edit/theme/index.js              | 57 ++++++------
 2 files changed, 64 insertions(+), 82 deletions(-)

diff --git a/client/components/content-elements/tce-html/edit/Toolbar.vue b/client/components/content-elements/tce-html/edit/Toolbar.vue
index fc659900b..a8cc79656 100644
--- a/client/components/content-elements/tce-html/edit/Toolbar.vue
+++ b/client/components/content-elements/tce-html/edit/Toolbar.vue
@@ -2,56 +2,56 @@
   <div class="tce-html-toolbar">
     <div @mousedown.prevent="() => {}" id="quillToolbar">
       <span class="ql-formats">
-        <button class="ql-undo" title="Undo" type="button"></button>
-        <button class="ql-redo" title="Redo" type="button"></button>
+        <button class="ql-undo" data-title="Undo" type="button"></button>
+        <button class="ql-redo" data-title="Redo" type="button"></button>
       </span>
       <span class="ql-formats">
-        <select class="ql-font" title="Font"></select>
-        <select class="ql-header" title="Style"></select>
+        <select class="ql-font" data-title="Font"></select>
+        <select class="ql-header" data-title="Style"></select>
       </span>
       <span class="ql-formats">
-        <button class="ql-bold" title="Bold" type="button"></button>
-        <button class="ql-italic" title="Italic" type="button"></button>
-        <button class="ql-underline" title="Underline" type="button"></button>
-        <button class="ql-strike" title="Strikethrough" type="button"></button>
+        <button class="ql-bold" data-title="Bold" type="button"></button>
+        <button class="ql-italic" data-title="Italic" type="button"></button>
+        <button class="ql-underline" data-title="Underline" type="button"></button>
+        <button class="ql-strike" data-title="Strikethrough" type="button"></button>
       </span>
       <span class="ql-formats">
-        <select class="ql-color" title="Text color"></select>
-        <select class="ql-background" title="Highlight color"></select>
+        <select class="ql-color" data-title="Text color"></select>
+        <select class="ql-background" data-title="Highlight color"></select>
       </span>
       <span class="ql-formats">
-        <button class="ql-script" value="sub" title="Subscript" type="button"></button>
-        <button class="ql-script" value="super" title="Superscript" type="button"></button>
+        <button class="ql-script" value="sub" data-title="Subscript" type="button"></button>
+        <button class="ql-script" value="super" data-title="Superscript" type="button"></button>
       </span>
       <span class="ql-formats">
-        <button class="ql-header" value="1" title="Heading 1" type="button"></button>
-        <button class="ql-header" value="2" title="Heading 2" type="button"></button>
-        <button class="ql-blockquote" title="Quote" type="button"></button>
-        <button class="ql-code-block" title="Code" type="button"></button>
+        <button class="ql-header" value="1" data-title="Heading 1" type="button"></button>
+        <button class="ql-header" value="2" data-title="Heading 2" type="button"></button>
+        <button class="ql-blockquote" data-title="Quote" type="button"></button>
+        <button class="ql-code-block" data-title="Code" type="button"></button>
       </span>
       <span class="ql-formats">
-        <button class="ql-list" value="ordered" title="Numbered list" type="button"></button>
-        <button class="ql-list" value="bullet" title="Bulleted List" type="button"></button>
-        <button class="ql-indent" value="-1" title="Decrease indent" type="button"></button>
-        <button class="ql-indent" value="+1" title="Increase indent" type="button"></button>
+        <button class="ql-list" value="ordered" data-title="Numbered list" type="button"></button>
+        <button class="ql-list" value="bullet" data-title="Bulleted List" type="button"></button>
+        <button class="ql-indent" value="-1" data-title="Decrease indent" type="button"></button>
+        <button class="ql-indent" value="+1" data-title="Increase indent" type="button"></button>
       </span>
       <span class="ql-formats">
-        <select class="ql-align" title="Alignment">
+        <select class="ql-align" data-title="Alignment">
           <option selected=""></option>
           <option value="center"></option>
           <option value="right"></option>
           <option value="justify"></option>
         </select>
-        <button class="ql-direction" value="rtl" title="Text direction" type="button"></button>
+        <button class="ql-direction" value="rtl" data-title="Text direction" type="button"></button>
       </span>
       <span class="ql-formats">
-        <button class="ql-link" title="Insert link..." type="button"></button>
-        <button class="ql-image" title="Image" type="button"></button>
+        <button class="ql-link" data-title="Insert link..." type="button"></button>
+        <button class="ql-image" data-title="Image" type="button"></button>
         <!-- <button class="ql-video" type="button"></button> -->
         <!-- <button class="ql-formula" type="button"></button> -->
       </span>
       <span class="ql-formats">
-        <button class="ql-clean" title="Clear formatting" type="button"></button>
+        <button class="ql-clean" data-title="Clear formatting" type="button"></button>
       </span>
     </div>
   </div>
@@ -138,36 +138,40 @@ $icon-size: 18px;
 }
 
 .ql-toolbar .tooltip {
-  $color: #2a2a2a;
+  $background-color: #2a2a2a;
+  $text-color: #fff;
   $offset: 2px;
   $arrow-size: 5px;
 
   display: block;
   position: absolute;
-  top: $offset !important;
+  z-index: 999;
+  margin-top: $arrow-size + $offset;
   padding: 6px 12px;
   line-height: 1.42;
-  background: $color;
+  background: $background-color;
   border: 1px solid #fff;
   border-radius: 0;
-  z-index: 999;
   user-select: none;
   cursor: default;
   // TODO: Remove this after bootstrap gets removed!
   opacity: initial;
 
-  .tooltip-arrow {
+  &-arrow {
     position: absolute;
+    top: -$arrow-size;
+    left: calc(50% - #{$arrow-size});
     width: 0;
     height: 0;
-    border-color: $color;
-    border-style: solid;
-    margin: $arrow-size;
+    margin: 0 $arrow-size;
+    border: $arrow-size solid transparent;
+    border-top-width: 0;
+    border-bottom-color: $background-color;
   }
 
-  .tooltip-inner {
+  &-inner {
     padding: 0;
-    color: #fff;
+    color: $text-color;
     font-size: 0.96rem;
     font-family: $font-family-secondary;
     font-weight: 500;
@@ -175,20 +179,5 @@ $icon-size: 18px;
     // TODO: Remove this after bootstrap gets removed!
     background: initial;
   }
-
-  &[x-placement^="bottom"] {
-    margin-top: $arrow-size;
-  }
-
-  &[x-placement^="bottom"] .tooltip-arrow {
-    top: -$arrow-size;
-    left: calc(50% - #{$arrow-size});
-    margin-top: 0;
-    margin-bottom: 0;
-    border-width: 0 $arrow-size $arrow-size $arrow-size;
-    border-left-color: transparent;
-    border-right-color: transparent;
-    border-top-color: transparent;
-  }
 }
 </style>
diff --git a/client/components/content-elements/tce-html/edit/theme/index.js b/client/components/content-elements/tce-html/edit/theme/index.js
index 728b1edf9..4a40b75b2 100644
--- a/client/components/content-elements/tce-html/edit/theme/index.js
+++ b/client/components/content-elements/tce-html/edit/theme/index.js
@@ -1,7 +1,7 @@
 import mdiIcons, { getMdiIcon } from './toolbar-icons';
-import BaseTooltip from 'tooltip.js';
 import createColorPicker from './ui/color-picker';
 import createImageEmbed from './modules/image-embed';
+import Tooltip from 'tooltip.js';
 
 const colors = [
   '#000000',
@@ -41,20 +41,33 @@ const colors = [
   '#3d1466'
 ];
 const reQuillControl = /^ql-/;
-const tooltipTemplate = `
-  <div class="tooltip" role="tooltip">
-    <div class="tooltip-arrow"></div>
-    <div class="tooltip-inner"></div>
-  </div>`;
 
-const isExpanded = el => el.classList.contains('ql-expanded');
-const isPicker = el => el.classList.contains('ql-picker');
+class ToolbarTooltip extends Tooltip {
+  constructor(input, showDelay = 350) {
+    const isPicker = Boolean(input.select);
+    const reference = isPicker ? input.container : input;
+    const title = isPicker ? input.select.dataset.title : input.dataset.title;
+    super(reference, {
+      placement: 'bottom',
+      delay: { show: showDelay, hide: 0 },
+      title
+    });
+    if (isPicker) return this._interceptToggle(input);
+    input.addEventListener('click', this.hide);
+  }
 
-class Tooltip extends BaseTooltip {
   _show(reference, options) {
-    if (isPicker(reference) && isExpanded(reference)) return;
+    if (reference.classList.contains('ql-expanded')) return;
     return super._show(reference, options);
   }
+
+  _interceptToggle(picker) {
+    const { togglePicker } = picker;
+    picker.togglePicker = () => {
+      this.hide();
+      return togglePicker.call(picker);
+    };
+  }
 }
 
 export default Quill => {
@@ -119,18 +132,8 @@ export default Quill => {
     }
 
     buildTooltips() {
-      this.pickers.forEach(picker => {
-        const tooltip = buildTooltip(picker.container, picker.select.title);
-        const { togglePicker } = picker;
-        picker.togglePicker = function () {
-          if (tooltip) tooltip.hide();
-          return togglePicker.apply(this, arguments);
-        };
-      });
-      this.buttons.forEach(button => {
-        const tooltip = buildTooltip(button);
-        button.addEventListener('click', () => tooltip && tooltip.hide());
-      });
+      this.pickers.forEach(picker => new ToolbarTooltip(picker));
+      this.buttons.forEach(button => new ToolbarTooltip(button));
     }
   };
 };
@@ -146,16 +149,6 @@ function buildButton(button) {
   button.innerHTML = getMdiIcon(name, button.value);
 }
 
-function buildTooltip(el, title, showDelay = 350) {
-  if (el.style.display === 'none') return;
-  return new Tooltip(el, {
-    template: tooltipTemplate,
-    placement: 'bottom',
-    delay: { show: showDelay, hide: 0 },
-    title
-  });
-}
-
 function fillSelect(select, values, defaultValue = false) {
   values.forEach(value => {
     const option = document.createElement('option');

From ac44ca9e111e43d13d146802b7094d068aacebfe Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Wed, 10 Jul 2019 17:03:34 +0200
Subject: [PATCH 138/213] Fixed meta selectnot working

---
 client/components/common/Meta/Select.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/components/common/Meta/Select.js b/client/components/common/Meta/Select.js
index 570a8125f..c6442aece 100644
--- a/client/components/common/Meta/Select.js
+++ b/client/components/common/Meta/Select.js
@@ -8,6 +8,6 @@ export default {
     value: ({ meta, options }) => options.find(it => it.value === meta.value)
   },
   methods: {
-    parseInput: ({ data }) => data.value || null
+    parseInput: data => data.value || null
   }
 };

From 52ccafc5414d212620c5608d2b39e292c87c5291 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Wed, 10 Jul 2019 17:27:21 +0200
Subject: [PATCH 139/213] Moved preview to parent level :wrench:

- In order to support Exams and Assessment pool
---
 client/components/editor/MainSidebar/index.vue | 18 +++++++++---------
 .../structure/ContentContainers/Container.vue  | 13 -------------
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/client/components/editor/MainSidebar/index.vue b/client/components/editor/MainSidebar/index.vue
index 4737dd14a..eb7fd6eae 100644
--- a/client/components/editor/MainSidebar/index.vue
+++ b/client/components/editor/MainSidebar/index.vue
@@ -34,12 +34,10 @@
 <script>
 import { mapActions, mapGetters } from 'vuex';
 import ActivitySidebar from '../../course/Sidebar/Body';
+import api from '@/api/preview';
 import Discussion from '../../course/Sidebar/Discussion';
-import format from 'string-template';
 import publishMixin from 'components/common/mixins/publish';
 
-const { PREVIEW_URL } = process.env;
-
 export default {
   mixins: [publishMixin],
   props: {
@@ -54,7 +52,7 @@ export default {
       const items = [{
         title: 'Preview',
         icon: 'eye',
-        action: () => window.open(this.previewUrl, '_blank')
+        action: () => this.previewContainer()
       }, {
         title: 'Back',
         icon: 'arrow-left',
@@ -66,14 +64,16 @@ export default {
         icon: 'upload',
         action: () => this.confirmPublishing()
       }].concat(items);
-    },
-    previewUrl() {
-      if (!PREVIEW_URL) return;
+    }
+  },
+  methods: {
+    ...mapActions('activities', { publishActivity: 'publish' }),
+    previewContainer() {
       const { courseId, id } = this.activity;
-      return format(PREVIEW_URL, { repositoryId: courseId, activityId: id });
+      return api.createPreview(courseId, id)
+        .then(location => window.open(location));
     }
   },
-  methods: mapActions('activities', { publishActivity: 'publish' }),
   components: { ActivitySidebar, Discussion }
 };
 </script>
diff --git a/client/components/editor/structure/ContentContainers/Container.vue b/client/components/editor/structure/ContentContainers/Container.vue
index a33b4c655..db67fbd96 100644
--- a/client/components/editor/structure/ContentContainers/Container.vue
+++ b/client/components/editor/structure/ContentContainers/Container.vue
@@ -1,13 +1,6 @@
 <template>
   <div class="mb-5">
     <div class="actions">
-      <v-btn
-        @click="previewContainer"
-        class="btn btn-default btn-material pull-left"
-        type="button">
-        <span class="mdi mdi-eye"></span>
-        Preview {{ name }}
-      </v-btn>
       <v-btn
         @click="deleteContainer"
         color="error"
@@ -43,7 +36,6 @@
 
 <script>
 import { mapActions, mapGetters } from 'vuex';
-import api from '@/api/preview';
 import filter from 'lodash/filter';
 import sortBy from 'lodash/sortBy';
 import TeachingElement from '../../TeachingElement';
@@ -77,11 +69,6 @@ export default {
       const context = { items, newPosition, isFirstChild };
       this.reorderElements({ element, context });
     },
-    previewContainer() {
-      const { courseId, id } = this.container;
-      return api.createPreview(courseId, id)
-        .then(location => window.open(location));
-    },
     insert(element) {
       const items = this.teachingElements;
       const { position: newPosition } = element;

From e24fc8900a4307e2c8efa4a8cd6df7dd37568f95 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Wed, 10 Jul 2019 17:28:42 +0200
Subject: [PATCH 140/213] Send entire activity for preview

- Removed got
- Added helpers for fetching assessments and containers
---
 .env.example                           |   2 +-
 package-lock.json                      | 146 +------------------------
 package.json                           |   1 -
 server/activity/activity.controller.js |  25 +++--
 server/activity/index.js               |   2 +-
 server/shared/publishing/helpers.js    |  34 ++++--
 6 files changed, 45 insertions(+), 165 deletions(-)

diff --git a/.env.example b/.env.example
index 4aab58671..1e040d2e6 100644
--- a/.env.example
+++ b/.env.example
@@ -51,7 +51,7 @@ STORAGE_BUCKET=
 # Disabling default schema won't work if custom schema does not exist.
 ENABLE_DEFAULT_SCHEMA=1
 
-# LMS perspective preview route
+# LMS preview route
 PREVIEW_URL=https://boutique.localhost/api/v1/preview/
 
 # Logger
diff --git a/package-lock.json b/package-lock.json
index 55dcc7227..2d7dfd330 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1870,11 +1870,6 @@
       "integrity": "sha512-5yqBjV6yZzrJBYVG6ASAbhRhAQMjEu1nYDPJFbpPDcfNxEvsO+QwIxFq3ABQwH0iq59nI62v8VtxEc/z+jDFOg==",
       "dev": true
     },
-    "@sindresorhus/is": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
-      "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="
-    },
     "@snyk/dep-graph": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.4.0.tgz",
@@ -1907,14 +1902,6 @@
       "resolved": "https://registry.npmjs.org/@snyk/gemfile/-/gemfile-1.2.0.tgz",
       "integrity": "sha512-nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA=="
     },
-    "@szmarczak/http-timer": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz",
-      "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==",
-      "requires": {
-        "defer-to-connect": "^1.0.1"
-      }
-    },
     "@types/anymatch": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.1.tgz",
@@ -3863,30 +3850,6 @@
         "schema-utils": "^0.4.2"
       }
     },
-    "cacheable-request": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.0.0.tgz",
-      "integrity": "sha512-2N7AmszH/WPPpl5Z3XMw1HAP+8d+xugnKQAeKvxFZ/04dbT/CAznqwbl+7eSr3HkwdepNwtb2yx3CAMQWvG01Q==",
-      "requires": {
-        "clone-response": "^1.0.2",
-        "get-stream": "^4.0.0",
-        "http-cache-semantics": "^4.0.0",
-        "keyv": "^3.0.0",
-        "lowercase-keys": "^1.0.1",
-        "normalize-url": "^3.1.0",
-        "responselike": "^1.0.2"
-      },
-      "dependencies": {
-        "get-stream": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        }
-      }
-    },
     "call-me-maybe": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
@@ -4322,14 +4285,6 @@
         "is-supported-regexp-flag": "^1.0.0"
       }
     },
-    "clone-response": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
-      "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
-      "requires": {
-        "mimic-response": "^1.0.0"
-      }
-    },
     "cls-bluebird": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/cls-bluebird/-/cls-bluebird-2.1.0.tgz",
@@ -5401,14 +5356,6 @@
       "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
       "dev": true
     },
-    "decompress-response": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
-      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
-      "requires": {
-        "mimic-response": "^1.0.0"
-      }
-    },
     "deep-eql": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz",
@@ -5510,11 +5457,6 @@
         }
       }
     },
-    "defer-to-connect": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.0.2.tgz",
-      "integrity": "sha512-k09hcQcTDY+cwgiwa6PYKLm3jlagNzQ+RSvhjzESOGOx+MNOuXkxTfEvPrO1IOQ81tArCFYQgi631clB70RpQw=="
-    },
     "define-properties": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
@@ -8306,34 +8248,6 @@
         }
       }
     },
-    "got": {
-      "version": "9.6.0",
-      "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
-      "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==",
-      "requires": {
-        "@sindresorhus/is": "^0.14.0",
-        "@szmarczak/http-timer": "^1.1.2",
-        "cacheable-request": "^6.0.0",
-        "decompress-response": "^3.3.0",
-        "duplexer3": "^0.1.4",
-        "get-stream": "^4.1.0",
-        "lowercase-keys": "^1.0.1",
-        "mimic-response": "^1.0.1",
-        "p-cancelable": "^1.0.0",
-        "to-readable-stream": "^1.0.0",
-        "url-parse-lax": "^3.0.0"
-      },
-      "dependencies": {
-        "get-stream": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        }
-      }
-    },
     "graceful-fs": {
       "version": "4.1.15",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
@@ -8735,11 +8649,6 @@
         }
       }
     },
-    "http-cache-semantics": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz",
-      "integrity": "sha512-TcIMG3qeVLgDr1TEd2XvHaTnMPwYQUQMIBLy+5pLSDKYFc7UIqj39w8EGzZkaxoLv/l2K8HaI0t5AVA+YYgUew=="
-    },
     "http-deceiver": {
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
@@ -9769,11 +9678,6 @@
       "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
       "dev": true
     },
-    "json-buffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
-      "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg="
-    },
     "json-parse-better-errors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
@@ -9966,14 +9870,6 @@
         "safe-buffer": "^5.0.1"
       }
     },
-    "keyv": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
-      "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==",
-      "requires": {
-        "json-buffer": "3.0.0"
-      }
-    },
     "killable": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
@@ -10673,11 +10569,6 @@
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
       "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="
     },
-    "mimic-response": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="
-    },
     "min-document": {
       "version": "2.19.0",
       "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
@@ -11585,7 +11476,8 @@
     "normalize-url": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz",
-      "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg=="
+      "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==",
+      "dev": true
     },
     "npm-bundled": {
       "version": "1.0.5",
@@ -11903,11 +11795,6 @@
         "os-tmpdir": "^1.0.0"
       }
     },
-    "p-cancelable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
-      "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="
-    },
     "p-defer": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
@@ -13481,11 +13368,6 @@
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
       "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
     },
-    "prepend-http": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz",
-      "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc="
-    },
     "prettier": {
       "version": "1.16.3",
       "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.16.3.tgz",
@@ -13657,6 +13539,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
       "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dev": true,
       "requires": {
         "end-of-stream": "^1.1.0",
         "once": "^1.3.1"
@@ -14363,14 +14246,6 @@
       "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
       "dev": true
     },
-    "responselike": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
-      "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
-      "requires": {
-        "lowercase-keys": "^1.0.0"
-      }
-    },
     "restore-cursor": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
@@ -17784,11 +17659,6 @@
         "to-space-case": "^1.0.0"
       }
     },
-    "to-readable-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz",
-      "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q=="
-    },
     "to-regex": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
@@ -18554,14 +18424,6 @@
         "requires-port": "^1.0.0"
       }
     },
-    "url-parse-lax": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz",
-      "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=",
-      "requires": {
-        "prepend-http": "^2.0.0"
-      }
-    },
     "url-polyfill": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/url-polyfill/-/url-polyfill-1.1.5.tgz",
@@ -18992,7 +18854,7 @@
     "vue-video-player": {
       "version": "3.1.4",
       "resolved": "https://registry.npmjs.org/vue-video-player/-/vue-video-player-3.1.4.tgz",
-      "integrity": "sha512-CqVvhy2QSDRxXfaHn029Cpz+mbV2gubIcdZE5Uu1e7f0ZfpdqpuqnSYyE50nUXzM3zfa7TaYOARpLsY3FdLtOQ==",
+      "integrity": "sha1-cAmwbc7EObPqZFGDIX0xTL8NN/0=",
       "requires": {
         "video.js": "^5.11.7"
       }
diff --git a/package.json b/package.json
index 2c8be84c2..52e76c76a 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,6 @@
     "fecha": "^2.3.0",
     "file-type": "^7.5.0",
     "focus-trap": "^2.3.1",
-    "got": "^9.6.0",
     "hash-obj": "^1.0.0",
     "helmet": "^3.12.0",
     "hls.js": "^0.10.1",
diff --git a/server/activity/activity.controller.js b/server/activity/activity.controller.js
index 556ec129b..44f305f9b 100644
--- a/server/activity/activity.controller.js
+++ b/server/activity/activity.controller.js
@@ -1,14 +1,14 @@
 'use strict';
 
 const { Activity } = require('../shared/database');
-const { fetchContainer } = require('../shared/publishing/helpers');
-const { getOutlineLevels } = require('../../config/shared/activities');
-const { previewUrl } = require('../../config/server');
+const { fetchActivityContent } = require('../shared/publishing/helpers');
 const find = require('lodash/find');
 const get = require('lodash/get');
+const { getOutlineLevels } = require('../../config/shared/activities');
 const pick = require('lodash/pick');
+const { previewUrl } = require('../../config/server');
 const publishingService = require('../shared/publishing/publishing.service');
-const request = require('got');
+const request = require('axios');
 
 function create({ course, body, params, user }, res) {
   const outlineConfig = find(getOutlineLevels(course.schema), { type: body.type });
@@ -62,12 +62,15 @@ function clone({ activity, body }, res) {
   });
 }
 
-function getPreview({ activity }, res) {
-  return fetchContainer(activity)
-    .then(data => request.post(previewUrl, { json: true, body: data }))
-    .then(resp => res.json({
-      location: `${new URL(resp.body.data.url, previewUrl)}`
-    }));
+function getPreviewUrl({ course, activity }, res) {
+  return fetchActivityContent(course, activity)
+    .then(content => {
+      const body = { uid: activity.uid, ...content };
+      return request.post(previewUrl, body);
+    })
+    .then(({ data: { url } }) => {
+      return res.json({ location: `${new URL(url, previewUrl)}` });
+    });
 }
 
 module.exports = {
@@ -79,5 +82,5 @@ module.exports = {
   reorder,
   clone,
   publish,
-  getPreview
+  getPreviewUrl
 };
diff --git a/server/activity/index.js b/server/activity/index.js
index 9e0188fc4..4584d29fd 100644
--- a/server/activity/index.js
+++ b/server/activity/index.js
@@ -20,7 +20,7 @@ router
   .post('/courses/:courseId/activities/:activityId/reorder', ctrl.reorder)
   .post('/courses/:courseId/activities/:activityId/clone', ctrl.clone)
   .get('/courses/:courseId/activities/:activityId/publish', ctrl.publish)
-  .get('/courses/:courseId/activities/:activityId/preview', ctrl.getPreview);
+  .get('/courses/:courseId/activities/:activityId/preview', ctrl.getPreviewUrl);
 
 function getActivity(req, _res, next, activityId) {
   return Activity.findByPk(activityId, { paranoid: false })
diff --git a/server/shared/publishing/helpers.js b/server/shared/publishing/helpers.js
index 4e467435e..ed5ff41eb 100644
--- a/server/shared/publishing/helpers.js
+++ b/server/shared/publishing/helpers.js
@@ -100,19 +100,24 @@ function getPublishedStructure(repository) {
   });
 }
 
+function fetchActivityContent(repository, activity) {
+  return Promise.all([
+    fetchContainers(repository, activity),
+    fetchAssessments(activity),
+    fetchExams(activity)
+  ]).spread((containers, assessments, exams) => ({ containers, assessments, exams }));
+}
+
 function publishContent(repository, activity) {
-  const config = find(repository.getSchemaConfig().structure, pick(activity, 'type'));
-  const containerTypes = get(config, 'contentContainers', []);
   return Promise.all([
-    publishContainers(activity, containerTypes),
+    publishContainers(repository, activity),
     publishExams(activity),
     publishAssessments(activity)
   ]).spread((containers, exams, assessments) => ({ containers, exams, assessments }));
 }
 
-function publishContainers(parent, types) {
-  return parent.getChildren({ where: { type: types } })
-    .then(containers => Promise.map(containers, fetchContainer))
+function publishContainers(repository, parent) {
+  return fetchContainers(repository, parent)
     .then(containers => Promise.map(containers, it => {
       return saveFile(parent, `${it.id}.container`, it).then(() => it);
     }));
@@ -125,13 +130,19 @@ function publishExams(parent) {
 }
 
 function publishAssessments(parent) {
-  const options = { where: { type: 'ASSESSMENT' }, attributes: TES_ATTRS };
-  return parent.getTeachingElements(options).then(assessments => {
+  return fetchAssessments(parent).then(assessments => {
     const key = getAssessmentsKey(parent);
     return saveFile(parent, key, assessments).then(() => assessments);
   });
 }
 
+function fetchContainers(repository, parent) {
+  const config = find(repository.getSchemaConfig().structure, pick(parent, 'type'));
+  const containerTypes = get(config, 'contentContainers', []);
+  return parent.getChildren({ where: { type: containerTypes } })
+    .then(containers => Promise.map(containers, fetchContainer));
+}
+
 function fetchContainer(container) {
   const order = [['position', 'ASC']];
   return container.getTeachingElements({ attributes: TES_ATTRS, order }).then(tes => ({
@@ -143,6 +154,11 @@ function fetchContainer(container) {
   }));
 }
 
+function fetchAssessments(parent) {
+  const options = { where: { type: 'ASSESSMENT' }, attributes: TES_ATTRS };
+  return parent.getTeachingElements(options);
+}
+
 function fetchExams(parent) {
   return parent.getChildren({ where: { type: 'EXAM' } })
     .then(exams => Promise.map(exams, fetchQuestionGroups))
@@ -261,5 +277,5 @@ module.exports = {
   publishActivity,
   unpublishActivity,
   publishRepositoryDetails,
-  fetchContainer
+  fetchActivityContent
 };

From 50657a6766514e5a46d1797019c0f1038b9d268c Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Wed, 10 Jul 2019 17:38:17 +0200
Subject: [PATCH 141/213] Move preview call to activity api

---
 client/api/activity.js                         | 6 ++++++
 client/api/preview.js                          | 8 --------
 client/components/editor/MainSidebar/index.vue | 2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)
 delete mode 100644 client/api/preview.js

diff --git a/client/api/activity.js b/client/api/activity.js
index 4e4dfe14b..373384820 100644
--- a/client/api/activity.js
+++ b/client/api/activity.js
@@ -5,6 +5,12 @@ function getActivities(courseId, params) {
     .then(res => res.data.data);
 }
 
+function createPreview(courseId, activityId) {
+  return request.get(`courses/${courseId}/activities/${activityId}/preview`)
+    .then(res => res.data.location);
+}
+
 export default {
+  createPreview,
   getActivities
 };
diff --git a/client/api/preview.js b/client/api/preview.js
deleted file mode 100644
index 78b671c1a..000000000
--- a/client/api/preview.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import request from './request';
-
-function createPreview(courseId, activityId) {
-  return request.get(`courses/${courseId}/activities/${activityId}/preview`)
-    .then(res => res.data.location);
-}
-
-export default { createPreview };
diff --git a/client/components/editor/MainSidebar/index.vue b/client/components/editor/MainSidebar/index.vue
index eb7fd6eae..411f3fff6 100644
--- a/client/components/editor/MainSidebar/index.vue
+++ b/client/components/editor/MainSidebar/index.vue
@@ -34,7 +34,7 @@
 <script>
 import { mapActions, mapGetters } from 'vuex';
 import ActivitySidebar from '../../course/Sidebar/Body';
-import api from '@/api/preview';
+import api from '@/api/activity';
 import Discussion from '../../course/Sidebar/Discussion';
 import publishMixin from 'components/common/mixins/publish';
 

From f51e616f6b93a2367066ccc5cd6e7f3d5800fd30 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Fri, 12 Jul 2019 16:03:10 +0200
Subject: [PATCH 142/213] Return last change upon fetching repo list

---
 server/course/course.controller.js | 10 +++++++++-
 server/course/course.model.js      |  5 ++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/server/course/course.controller.js b/server/course/course.controller.js
index c62f3efdc..4071b5720 100644
--- a/server/course/course.controller.js
+++ b/server/course/course.controller.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { Course, CourseUser, User } = require('../shared/database');
+const { Course, CourseUser, User, Revision } = require('../shared/database');
 const { createContentInventory } = require('../integrations/knewton');
 const { createError } = require('../shared/error/helpers');
 const { getSchema } = require('../../config/shared/activities');
@@ -16,6 +16,14 @@ const DEFAULT_COLORS = ['#689F38', '#FF5722', '#2196F3'];
 
 function index({ query, user, opts }, res) {
   if (query.search) opts.where.name = { [Op.iLike]: `%${query.search}%` };
+  opts.include = [{
+    model: Revision,
+    as: 'revisions',
+    include: [{ model: User, attributes: ['id', 'email'] }],
+    order: [['createdAt', 'DESC']],
+    limit: 1
+  }];
+  opts.order = [['createdAt', 'DESC']];
   const courses = user.isAdmin() ? Course.findAll(opts) : user.getCourses(opts);
   return courses.then(data => res.json({ data }));
 }
diff --git a/server/course/course.model.js b/server/course/course.model.js
index aec2511be..8c3cffd56 100644
--- a/server/course/course.model.js
+++ b/server/course/course.model.js
@@ -50,7 +50,7 @@ class Course extends Model {
     };
   }
 
-  static associate({ Activity, Comment, CourseUser, TeachingElement, User }) {
+  static associate({ Activity, Comment, CourseUser, Revision, TeachingElement, User }) {
     this.hasMany(Activity, {
       foreignKey: { name: 'courseId', field: 'course_id' }
     });
@@ -60,6 +60,9 @@ class Course extends Model {
     this.hasMany(TeachingElement, {
       foreignKey: { name: 'courseId', field: 'course_id' }
     });
+    this.hasMany(Revision, {
+      foreignKey: { name: 'courseId', field: 'course_id' }
+    });
     this.belongsToMany(User, {
       through: CourseUser,
       foreignKey: { name: 'courseId', field: 'course_id' }

From 103c23515207d539d829246702644f8f05d8651d Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Fri, 12 Jul 2019 17:04:21 +0200
Subject: [PATCH 143/213] Revamped catalog card

---
 client/components/catalog/Card.vue       |  95 +++++++++++++++++++
 client/components/catalog/Card/Stat.vue  |  27 ------
 client/components/catalog/Card/index.vue | 113 -----------------------
 3 files changed, 95 insertions(+), 140 deletions(-)
 create mode 100644 client/components/catalog/Card.vue
 delete mode 100644 client/components/catalog/Card/Stat.vue
 delete mode 100644 client/components/catalog/Card/index.vue

diff --git a/client/components/catalog/Card.vue b/client/components/catalog/Card.vue
new file mode 100644
index 000000000..44aba7d37
--- /dev/null
+++ b/client/components/catalog/Card.vue
@@ -0,0 +1,95 @@
+<template>
+  <v-card @click="navigateTo" class="repository-card">
+    <div class="card-heading blue-grey darken-4">
+      <v-chip :color="repository.data.color" small label class="ml-3 mr-0"/>
+      <v-chip color="grey lighten-3" small label class="ml-0 body-2">
+        {{ schema }}
+      </v-chip>
+      <v-card-title class="headline grey--text text--lighten-4 pt-1">
+        {{ name }}
+      </v-card-title>
+    </div>
+    <div class="card-body">
+      <div class="pb-2 grey--text text--darken-2">
+        <v-icon color="primary" class="pr-1">mdi-pencil-outline</v-icon>
+        <span>{{ userAction.createdAt | formatDate }}</span>
+        <div>{{ userAction.user.email }}</div>
+      </div>
+      <div class="desc grey--text text--darken-3">{{ description }}</div>
+    </div>
+    <v-card-actions class="px-2 py-1">
+      <v-btn icon>
+        <v-icon color="pink" class="mdi-rotate-45">mdi-pin</v-icon>
+      </v-btn>
+    </v-card-actions>
+  </v-card>
+</template>
+
+<script>
+import first from 'lodash/first';
+import { getSchema } from 'shared/activities';
+import truncate from 'truncate';
+
+export default {
+  props: {
+    repository: { type: Object, required: true }
+  },
+  computed: {
+    name: ({ repository }) => truncate(repository.name, 70),
+    description: ({ repository }) => truncate(repository.description, 100),
+    schema: ({ repository }) => getSchema(repository.schema).name,
+    userAction: ({ repository }) => first(repository.revisions)
+  },
+  methods: {
+    navigateTo() {
+      if (window.getSelection().toString()) return;
+      this.$router.push({
+        name: 'course',
+        params: { courseId: this.repository.id }
+      });
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.repository-card {
+  text-align: left;
+  transition: box-shadow 0.1s ease;
+  cursor: pointer;
+
+  &:hover {
+    box-shadow: 0 10px 20px rgba(0,0,0,0.2), 0 8px 8px rgba(0,0,0,0.18);
+  }
+}
+
+.card-heading {
+  height: 144px;
+  padding: 6px 0 0;
+  overflow: hidden;
+
+  .v-chip {
+    font-weight: 600;
+    text-transform: uppercase;
+  }
+
+  @media (max-width: 1263px) {
+    height: 180px;
+  }
+}
+
+.card-body {
+  margin-bottom: 10px;
+  padding: 14px 24px 0;
+
+  .desc {
+    height: 60px;
+    font-weight: 500;
+    overflow: hidden;
+
+    @media (max-width: 1263px) {
+      height: 85px;
+    }
+  }
+}
+</style>
diff --git a/client/components/catalog/Card/Stat.vue b/client/components/catalog/Card/Stat.vue
deleted file mode 100644
index 70bf359e2..000000000
--- a/client/components/catalog/Card/Stat.vue
+++ /dev/null
@@ -1,27 +0,0 @@
-<template>
-  <span>
-    <div class="stat-name">{{ name }}</div>
-    <span class="stat-value">{{ value }}</span>
-  </span>
-</template>
-
-<script>
-export default {
-  props: {
-    name: { type: String, required: true },
-    value: { type: Number, default: 0 }
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-.stat-name {
-  color: #888;
-  font-size: 14px;
-}
-
-.stat-value {
-  color: #555;
-  font-size: 20px;
-}
-</style>
diff --git a/client/components/catalog/Card/index.vue b/client/components/catalog/Card/index.vue
deleted file mode 100644
index 351c7524d..000000000
--- a/client/components/catalog/Card/index.vue
+++ /dev/null
@@ -1,113 +0,0 @@
-<template>
-  <div class="col-lg-4">
-    <div @click="navigateTo" class="repo-card white elevation-2">
-      <div class="body">
-        <div class="repo-title">
-          <acronym :course="course"/>
-          {{ name }}
-        </div>
-        <div class="description">{{ description }}</div>
-      </div>
-      <div class="row">
-        <span class="col-xs-6">
-          <stat :name="objectiveLabel" :value="objectives"/>
-        </span>
-        <span class="col-xs-6">
-          <stat :value="assessments" name="Knowledge checks"/>
-        </span>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import Acronym from 'components/common/Acronym';
-import get from 'lodash/get';
-import { getObjectives } from 'shared/activities';
-import map from 'lodash/map';
-import pluralize from 'pluralize';
-import Stat from './Stat';
-import truncate from 'truncate';
-
-export default {
-  props: {
-    course: { type: Object, required: true }
-  },
-  computed: {
-    name() {
-      return truncate(this.course.name, 75);
-    },
-    description() {
-      return truncate(this.course.description, 180);
-    },
-    objectiveLabel() {
-      const objectives = map(getObjectives(this.course.schema), 'label');
-      return objectives.length > 1 ? 'Objectives' : pluralize(objectives[0]);
-    },
-    assessments() {
-      return get(this.course, 'stats.assessments', 0);
-    },
-    objectives() {
-      return get(this.course, 'stats.objectives', 0);
-    }
-  },
-  methods: {
-    navigateTo() {
-      if (window.getSelection().toString()) return;
-      this.$router.push({
-        name: 'course',
-        params: { courseId: this.course.id }
-      });
-    }
-  },
-  components: {
-    Acronym,
-    Stat
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-.repo-card {
-  min-height: 300px;
-  margin-top: 40px;
-  padding: 30px 30px 20px;
-  color: #555;
-  border-radius: 3px;
-  transition: box-shadow 0.2s ease;
-  cursor: pointer;
-
-  &:hover {
-    box-shadow: 0 10px 20px rgba(0,0,0,0.2), 0 8px 8px rgba(0,0,0,0.18) !important;
-  }
-
-  .body {
-    height: 220px;
-    margin-bottom: 15px;
-    overflow: hidden;
-
-    @media (min-width: 1200px) and (max-width: 1300px) {
-      height: 250px;
-    }
-  }
-}
-
-.repo-title {
-  height: 100px;
-  margin: 20px 0 10px;
-  font-size: 20px;
-  font-weight: 300;
-  line-height: 34px;
-  text-align: left;
-
-  @media (min-width: 1200px) and (max-width: 1300px) {
-    height: 125px;
-  }
-}
-
-.description {
-  max-height: 130px;
-  font-size: 14px;
-  text-align: left;
-}
-</style>

From dadfad94c709c456d8f128e6cbb91a78f0a1c5f7 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Fri, 12 Jul 2019 17:28:11 +0200
Subject: [PATCH 144/213] Updated catalog container

- Replaced bootstrap grid with vuetify one
---
 client/components/catalog/Container.vue | 101 +++++++++++++-----------
 1 file changed, 57 insertions(+), 44 deletions(-)

diff --git a/client/components/catalog/Container.vue b/client/components/catalog/Container.vue
index 064cb6bbd..3dd4cafbc 100644
--- a/client/components/catalog/Container.vue
+++ b/client/components/catalog/Container.vue
@@ -1,44 +1,50 @@
 <template>
-  <div class="catalog grey lighten-2" infinite-wrapper>
-    <div class="row">
-      <div class="col-md-6 col-md-offset-3 col-sm-10 col-sm-offset-1">
-        <search @change="search"></search>
+  <div infinite-wrapper class="catalog-wrapper">
+    <v-container class="catalog">
+      <v-layout row class="mb-4">
+        <v-flex md6 sm10 offset-md3 offset-sm1>
+          <search @change="search" class="pt-4"/>
+        </v-flex>
+        <v-flex md3 sm1>
+          <create-repository class="pt-2"/>
+        </v-flex>
+      </v-layout>
+      <v-layout v-show="!searching" row wrap>
+        <v-flex
+          v-for="repository in orderedRepositories"
+          :key="repository._cid"
+          xs4
+          class="px-2 py-3">
+          <repository-card :repository="repository"/>
+        </v-flex>
+      </v-layout>
+      <v-progress-circular
+        v-show="searching"
+        color="primary"
+        indeterminate
+        class="search-spinner"/>
+    </v-container>
+    <infinite-loading ref="infiniteLoading" @infinite="loadMore">
+      <div slot="spinner" class="spinner">
+        <v-progress-circular color="primary" indeterminate/>
       </div>
-      <div class="col-md-2 col-sm-1">
-        <create-course class="pull-right"/>
+      <div slot="no-results" class="no-results subheading">
+        {{ orderedRepositories.length ? '' : 'No matches found' }}
       </div>
-    </div>
-    <div v-show="searching" class="search-spinner">
-      <v-progress-circular color="primary" indeterminate/>
-    </div>
-    <div v-show="!searching" class="row course-list">
-      <course-card
-        v-for="course in orderedCourses"
-        :key="course._cid"
-        :course="course">
-      </course-card>
-      <infinite-loading ref="infiniteLoading" @infinite="loadMore">
-        <div slot="spinner" class="spinner">
-          <v-progress-circular color="primary" indeterminate/>
-        </div>
-        <div slot="no-results" class="no-results">
-          {{ orderedCourses.length ? '' : 'No repositories found.' }}
-        </div>
-        <span slot="no-more"></span>
-      </infinite-loading>
-    </div>
+      <span slot="no-more"></span>
+    </infinite-loading>
   </div>
 </template>
 
 <script>
 import { mapActions, mapGetters, mapMutations } from 'vuex';
-import CourseCard from './Card';
-import CreateCourse from './Create';
+import CreateRepository from './Create';
 import get from 'lodash/get';
 import InfiniteLoading from 'vue-infinite-loading';
 import isEmpty from 'lodash/isEmpty';
 import orderBy from 'lodash/orderBy';
 import Promise from 'bluebird';
+import RepositoryCard from './Card';
 import Search from './Search';
 
 export default {
@@ -48,11 +54,11 @@ export default {
   computed: {
     ...mapGetters(['courses']),
     ...mapGetters('courses', ['hasMoreResults']),
+    orderedRepositories() {
+      return orderBy(this.courses, 'updatedAt', 'desc');
+    },
     loaderState() {
       return get(this.$refs, 'infiniteLoading.stateChanger', {});
-    },
-    orderedCourses() {
-      return orderBy(this.courses, 'updatedAt', 'desc');
     }
   },
   methods: {
@@ -67,7 +73,7 @@ export default {
     load(query) {
       this.loaderState.loaded();
       this.loaderState.complete();
-      return Promise.join(this.fetch({ reset: true }), Promise.delay(500))
+      return Promise.join(this.fetch({ reset: true }))
         .then(() => {
           this.loaderState.reset();
           if (!isEmpty(this.courses)) this.loaderState.loaded();
@@ -84,32 +90,39 @@ export default {
     this.search();
   },
   components: {
-    CourseCard,
-    CreateCourse,
+    CreateRepository,
     InfiniteLoading,
+    RepositoryCard,
     Search
   }
 };
 </script>
 
 <style lang="scss" scoped>
-.catalog {
-  padding: 30px 100px 100px;
-
-  @media (min-width: 1700px) {
-    padding: 30px 300px 100px;
-  }
+.catalog-wrapper {
+  position: relative;
+}
 
-  /deep/ .course-search {
-    margin-top: 8px;
+.catalog {
+  &::before {
+    position: absolute;
+    top: 0;
+    left: 0;
+    height: 230px;
+    width: 100%;
+    background: #455a64;
+    box-shadow:
+      0px 3px 5px -1px rgba(0,0,0,0.2),
+      0px 5px 8px 0px rgba(0,0,0,0.14),
+      0px 1px 14px 0px rgba(0,0,0,0.12);
   }
 }
 
 .search-spinner {
-  margin-top: 80px;
+  margin-top: 170px;
 }
 
 .spinner, .no-results {
-  margin-top: 36px;
+  margin-top: 120px;
 }
 </style>

From bae6eb85ee140e863de644f8aabed2483a772c6d Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Fri, 12 Jul 2019 17:29:53 +0200
Subject: [PATCH 145/213] Renamed default schema

---
 config/shared/activities-rc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/shared/activities-rc.js b/config/shared/activities-rc.js
index 1b99c4e83..6546bd95c 100644
--- a/config/shared/activities-rc.js
+++ b/config/shared/activities-rc.js
@@ -16,7 +16,7 @@ const CONTENT_CONTAINERS = [{
 
 const SCHEMAS = [{
   id: 'DEFAULT_SCHEMA',
-  name: 'Default schema',
+  name: 'Sample course',
   meta: [],
   structure: [{
     level: 1,

From 04f70936c91270aaa5b37ff5af2d5cb3bc4d40d8 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Sun, 14 Jul 2019 15:37:51 +0200
Subject: [PATCH 146/213] Created simple sorting component

- WIP
---
 client/components/catalog/SelectOrder.vue | 55 +++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 client/components/catalog/SelectOrder.vue

diff --git a/client/components/catalog/SelectOrder.vue b/client/components/catalog/SelectOrder.vue
new file mode 100644
index 000000000..e9783824b
--- /dev/null
+++ b/client/components/catalog/SelectOrder.vue
@@ -0,0 +1,55 @@
+<template>
+  <span>
+    <v-menu offset-y>
+      <template v-slot:activator="{ on }">
+        <v-btn v-on="on" icon flat>
+          <v-icon color="primary lighten-4">mdi-sort</v-icon>
+        </v-btn>
+      </template>
+      <v-list>
+        <v-list-tile
+          v-for="({ text, field, order }) in options"
+          :key="field"
+          @click="$emit('update', { field, order })">
+          <v-list-tile-title
+            :class="`${selected.field === field ? 'pink' : 'black'}--text`">
+            {{ text }}
+          </v-list-tile-title>
+        </v-list-tile>
+      </v-list>
+    </v-menu>
+    <v-btn @click="toggleOrder" icon flat>
+      <v-icon color="primary lighten-4">
+        mdi-sort-{{ selected.order === 'ASC' ? 'ascending' : 'descending' }}
+      </v-icon>
+    </v-btn>
+  </span>
+</template>
+
+<script>
+export default {
+  props: {
+    selected: { type: Object, required: true }
+  },
+  computed: {
+    options() {
+      return [
+        { text: 'Creation date', field: 'createdAt', order: 'DESC' },
+        { text: 'Name', field: 'name', order: 'ASC' }
+      ];
+    }
+  },
+  methods: {
+    toggleOrder() {
+      const order = this.selected.order === 'ASC' ? 'DESC' : 'ASC';
+      this.$emit('update', { ...this.selected, order });
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.v-menu, .v-btn {
+  display: inline-block;
+}
+</style>

From 26b1666aee71b6ec3ed6bc1f3d4ab8d4988be327 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Sun, 14 Jul 2019 15:55:29 +0200
Subject: [PATCH 147/213] Added pinned attr to the courseUser model

- Ability to pin repo on dashboard
---
 server/course/courseUser.model.js                |  6 +++++-
 .../migrations/20190712153652-pin-repo.js        | 16 ++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 server/shared/database/migrations/20190712153652-pin-repo.js

diff --git a/server/course/courseUser.model.js b/server/course/courseUser.model.js
index db17ae4b9..12ab9ce52 100644
--- a/server/course/courseUser.model.js
+++ b/server/course/courseUser.model.js
@@ -4,7 +4,7 @@ const { course: role } = require('../../config/shared').role;
 const { Model } = require('sequelize');
 
 class CourseUser extends Model {
-  static fields({ INTEGER, DATE, ENUM }) {
+  static fields({ BOOLEAN, DATE, ENUM, INTEGER }) {
     return {
       userId: {
         type: INTEGER,
@@ -22,6 +22,10 @@ class CourseUser extends Model {
         type: ENUM(role.ADMIN, role.AUTHOR),
         defaultValue: role.AUTHOR
       },
+      pinned: {
+        type: BOOLEAN,
+        defaultValue: false
+      },
       createdAt: {
         type: DATE,
         field: 'created_at'
diff --git a/server/shared/database/migrations/20190712153652-pin-repo.js b/server/shared/database/migrations/20190712153652-pin-repo.js
new file mode 100644
index 000000000..ec5f46a94
--- /dev/null
+++ b/server/shared/database/migrations/20190712153652-pin-repo.js
@@ -0,0 +1,16 @@
+'use strict';
+
+const TABLE_NAME = 'course_user';
+const COLUMN_NAME = 'pinned';
+
+module.exports = {
+  up: (queryInterface, { BOOLEAN }) => {
+    return queryInterface.addColumn(TABLE_NAME, COLUMN_NAME, {
+      type: BOOLEAN,
+      defaultValue: false
+    });
+  },
+  down: (queryInterface) => {
+    return queryInterface.removeColumn(TABLE_NAME, COLUMN_NAME);
+  }
+};

From 24148123fa2f42ad232043913083ad3070567fd1 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Sun, 14 Jul 2019 15:57:15 +0200
Subject: [PATCH 148/213] Added missing courseUser relationship :wrench:

---
 server/course/course.model.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/server/course/course.model.js b/server/course/course.model.js
index 8c3cffd56..044b2a126 100644
--- a/server/course/course.model.js
+++ b/server/course/course.model.js
@@ -63,6 +63,9 @@ class Course extends Model {
     this.hasMany(Revision, {
       foreignKey: { name: 'courseId', field: 'course_id' }
     });
+    this.hasMany(CourseUser, {
+      foreignKey: { name: 'courseId', field: 'course_id' }
+    });
     this.belongsToMany(User, {
       through: CourseUser,
       foreignKey: { name: 'courseId', field: 'course_id' }

From c00ec1ba93900705d6ca26a7010c06e2d59a4e0e Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Sun, 14 Jul 2019 16:12:00 +0200
Subject: [PATCH 149/213] Course ctrl updates

- Ability to pin a course
- Fetching last revision and courseUser record upon listing courses
- Ability to do case insensitive sort by name
- WIP
---
 server/course/course.controller.js | 19 ++++++++++++++++---
 server/course/index.js             |  1 +
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/server/course/course.controller.js b/server/course/course.controller.js
index 4071b5720..ba9d303b3 100644
--- a/server/course/course.controller.js
+++ b/server/course/course.controller.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { Course, CourseUser, User, Revision } = require('../shared/database');
+const { Course, CourseUser, User, Revision, sequelize } = require('../shared/database');
 const { createContentInventory } = require('../integrations/knewton');
 const { createError } = require('../shared/error/helpers');
 const { getSchema } = require('../../config/shared/activities');
@@ -13,17 +13,21 @@ const publishingService = require('../shared/publishing/publishing.service');
 const sample = require('lodash/sample');
 
 const DEFAULT_COLORS = ['#689F38', '#FF5722', '#2196F3'];
+const lowercaseName = sequelize.fn('lower', sequelize.col('name'));
 
 function index({ query, user, opts }, res) {
   if (query.search) opts.where.name = { [Op.iLike]: `%${query.search}%` };
+  if (getVal(opts, 'order.0.0') === 'name') opts.order[0][0] = lowercaseName;
   opts.include = [{
     model: Revision,
-    as: 'revisions',
     include: [{ model: User, attributes: ['id', 'email'] }],
     order: [['createdAt', 'DESC']],
     limit: 1
   }];
-  opts.order = [['createdAt', 'DESC']];
+  const courseUser = query.pinned
+    ? { where: { userId: user.id, pinned: true }, required: true }
+    : { where: { userId: user.id }, required: false };
+  opts.include.push({ model: CourseUser, ...courseUser });
   const courses = user.isAdmin() ? Course.findAll(opts) : user.getCourses(opts);
   return courses.then(data => res.json({ data }));
 }
@@ -53,6 +57,14 @@ function remove({ course, user }, res) {
     .then(() => res.status(204).send());
 }
 
+async function pin({ user, course, body }, res) {
+  const opts = { where: { courseId: course.id, userId: user.id } };
+  const [courseUser] = await CourseUser.findOrCreate(opts);
+  courseUser.pinned = body.pin;
+  await courseUser.save();
+  return res.json({ data: courseUser });
+}
+
 function clone({ user, course, body }, res) {
   const { name, description } = body;
   const context = { userId: user.id };
@@ -118,6 +130,7 @@ module.exports = {
   get,
   patch,
   remove,
+  pin,
   clone,
   getUsers,
   upsertUser,
diff --git a/server/course/index.js b/server/course/index.js
index 40ef8dcc4..92476d12a 100644
--- a/server/course/index.js
+++ b/server/course/index.js
@@ -16,6 +16,7 @@ router
   .get('/courses/:id', ctrl.get)
   .patch('/courses/:id', ctrl.patch)
   .delete('/courses/:id', ctrl.remove)
+  .post('/courses/:id/pin', ctrl.pin)
   .post('/courses/:id/clone', authorize(), ctrl.clone)
   .post('/courses/:id/publish', ctrl.publishRepoInfo)
   .get('/courses/:id/users', ctrl.getUsers)

From 2baa5a76717f1ff8d9d8e5aac943993593d97b22 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Sun, 14 Jul 2019 16:13:22 +0200
Subject: [PATCH 150/213] :lipstick:

---
 client/components/catalog/Search.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/client/components/catalog/Search.vue b/client/components/catalog/Search.vue
index c299e4d67..96a77e73d 100644
--- a/client/components/catalog/Search.vue
+++ b/client/components/catalog/Search.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="course-search">
     <div
-      :style="{ width: expanded ? '100%' : '80%' }"
+      :style="{ width: expanded ? '100%' : '95%' }"
       class="input-group">
       <span class="input-group-btn">
         <button
@@ -57,11 +57,9 @@ export default {
 
 <style lang="scss" scoped>
 .course-search {
-  width: 450px;
   margin: 0 auto;
 
   .input-group {
-    width: 80%;
     margin: 0 auto;
     overflow: hidden;
     border-radius: 3px;

From dacc08ea1e3a8693a3d5f9967cdc85f34c03ae7c Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Sun, 14 Jul 2019 16:24:24 +0200
Subject: [PATCH 151/213] Updated  repo creation modal

- Tweaked heading style
- Fixed issue with default schema
---
 client/components/catalog/Create.vue | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/client/components/catalog/Create.vue b/client/components/catalog/Create.vue
index cfd0ae538..b88d52e54 100644
--- a/client/components/catalog/Create.vue
+++ b/client/components/catalog/Create.vue
@@ -4,12 +4,25 @@
     v-if="isAdmin"
     v-model="isVisible"
     width="600px">
-    <v-btn slot="activator" color="pink" dark absolute fab>
+    <v-btn
+      slot="activator"
+      color="pink"
+      fixed
+      right
+      bottom
+      fab
+      dark
+      class="mr-3 mb-4">
       <v-icon>mdi-plus</v-icon>
     </v-btn>
     <v-form @submit.prevent="submit">
       <v-card class="pa-3">
-        <v-card-title class="headline">Create repository</v-card-title>
+        <v-card-title class="headline">
+          <v-avatar color="secondary" size="38" class="mr-2">
+            <v-icon color="white">mdi-folder-plus-outline</v-icon>
+          </v-avatar>
+          New
+        </v-card-title>
         <v-card-text>
           <v-alert
             :value="vErrors.has('default')"
@@ -25,7 +38,6 @@
             :error-messages="vErrors.collect('schema')"
             item-value="id"
             item-text="name"
-            label="Type"
             data-vv-name="schema"
             class="mb-3"/>
           <v-text-field
@@ -60,7 +72,7 @@ import { SCHEMAS } from 'shared/activities';
 import { withValidation } from 'utils/validation';
 
 const getDefaultData = () => ({
-  schema: null,
+  schema: SCHEMAS[0].id,
   name: null,
   description: null
 });

From afc508f3b750c36ddbbb93bccf0ea593979e8e36 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Sun, 14 Jul 2019 23:07:39 +0200
Subject: [PATCH 152/213] Store support for pinned courses

- WIP
---
 client/store/modules/courses/actions.js   | 39 +++++++++++++++++++++--
 client/store/modules/courses/getters.js   |  2 +-
 client/store/modules/courses/index.js     |  4 ++-
 client/store/modules/courses/mutations.js | 31 +++++++++++++-----
 4 files changed, 64 insertions(+), 12 deletions(-)

diff --git a/client/store/modules/courses/actions.js b/client/store/modules/courses/actions.js
index 66eeb5334..2d717d248 100644
--- a/client/store/modules/courses/actions.js
+++ b/client/store/modules/courses/actions.js
@@ -1,4 +1,7 @@
+import find from 'lodash/find';
+import forEach from 'lodash/forEach';
 import generateActions from '../../helpers/actions';
+import getVal from 'lodash/get';
 
 const {
   api,
@@ -13,13 +16,18 @@ const {
 const fetch = ({ getters, commit }, { reset = false } = {}) => {
   const mutation = reset ? 'reset' : 'fetch';
   const params = getters.courseQueryParams;
-  return api.fetch(params).then(courses => {
+  return fetchCourses(params).then(courses => {
     commit('setPagination', { offset: params.offset + params.limit });
     commit('allCoursesFetched', Object.keys(courses).length < params.limit);
     commit(mutation, courses);
   });
 };
 
+const fetchPinned = ({ commit }) => {
+  return fetchCourses({ pinned: true })
+    .then(courses => commit('fetchPinned', courses));
+};
+
 const clone = ({ commit }, { id, name, description }) => {
   return api.post(`/${id}/clone`, { name, description }).then(response => {
     const { data: course } = response.data;
@@ -28,4 +36,31 @@ const clone = ({ commit }, { id, name, description }) => {
   });
 };
 
-export { clone, fetch, get, remove, reset, save, setEndpoint, update };
+const pin = ({ commit, getters }, { id, pin }) => {
+  return api.post(`/${id}/pin`, { pin }).then(({ data: { data } }) => {
+    commit('save', { ...find(getters.courses, { id }), courseUser: data });
+  });
+};
+
+export {
+  clone,
+  fetch,
+  fetchPinned,
+  get,
+  pin,
+  remove,
+  reset,
+  save,
+  setEndpoint,
+  update
+};
+
+function fetchCourses(params) {
+  return api.fetch(params).then(courses => {
+    forEach(courses, it => {
+      it.courseUser = getVal(it, 'courseUsers.0');
+      it.lastChange = it.revisions[0];
+    });
+    return courses;
+  });
+}
diff --git a/client/store/modules/courses/getters.js b/client/store/modules/courses/getters.js
index 7fd6b2d3e..9ddb4b01a 100644
--- a/client/store/modules/courses/getters.js
+++ b/client/store/modules/courses/getters.js
@@ -1,4 +1,4 @@
-export const courses = state => state.items;
+export const courses = state => ({ ...state.pinned, ...state.items });
 
 export const courseQueryParams = state => {
   const { pagination, sort } = state.$internals;
diff --git a/client/store/modules/courses/index.js b/client/store/modules/courses/index.js
index fbec05e7d..6b99f1cff 100644
--- a/client/store/modules/courses/index.js
+++ b/client/store/modules/courses/index.js
@@ -6,12 +6,14 @@ const PAGINATION_DEFAULTS = { offset: 0, limit: 21 };
 
 const state = {
   items: {},
+  pinned: {},
   search: '',
+  showPinned: false,
   $internals: {
     pagination: PAGINATION_DEFAULTS,
     sort: {
       order: 'DESC',
-      field: 'updatedAt'
+      field: 'createdAt'
     },
     allCoursesFetched: false
   }
diff --git a/client/store/modules/courses/mutations.js b/client/store/modules/courses/mutations.js
index 4fac90e75..c5140fc86 100644
--- a/client/store/modules/courses/mutations.js
+++ b/client/store/modules/courses/mutations.js
@@ -3,10 +3,6 @@ import Vue from 'vue';
 
 const PAGINATION_DEFAULTS = { offset: 0, limit: 21 };
 
-const resetPagination = state => {
-  state.$internals.pagination = PAGINATION_DEFAULTS;
-};
-
 const save = (state, course) => {
   const search = state.search.toLowerCase();
   const name = course.name.toLowerCase();
@@ -14,9 +10,12 @@ const save = (state, course) => {
   Vue.set(state.items, course._cid, course);
 };
 
-const setPagination = (state, changes) => {
-  let $internals = state.$internals;
-  $internals.pagination = { ...$internals.pagination, ...changes };
+const fetchPinned = (state, courses) => {
+  state.pinned = courses;
+};
+
+const togglePinned = state => {
+  state.showPinned = !state.showPinned;
 };
 
 const setSearch = (state, query = '') => {
@@ -24,6 +23,19 @@ const setSearch = (state, query = '') => {
   state.search = query;
 };
 
+const setOrder = (state, order) => {
+  state.$internals.sort = { ...state.$internals.sort, ...order };
+};
+
+const setPagination = (state, changes) => {
+  const $internals = state.$internals;
+  $internals.pagination = { ...$internals.pagination, ...changes };
+};
+
+const resetPagination = state => {
+  state.$internals.pagination = PAGINATION_DEFAULTS;
+};
+
 const allCoursesFetched = (state, allFetched) => {
   state.$internals.allCoursesFetched = allFetched;
 };
@@ -32,11 +44,14 @@ export {
   add,
   allCoursesFetched,
   fetch,
+  fetchPinned,
   remove,
   reset,
   resetPagination,
   save,
   setEndpoint,
   setPagination,
-  setSearch
+  setOrder,
+  setSearch,
+  togglePinned
 };

From 33d52065d385fe3a21a5f59da471901d10dea816 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Sun, 14 Jul 2019 23:10:19 +0200
Subject: [PATCH 153/213] Added pin btn

---
 client/components/catalog/Card.vue | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/client/components/catalog/Card.vue b/client/components/catalog/Card.vue
index 44aba7d37..f2b74bd05 100644
--- a/client/components/catalog/Card.vue
+++ b/client/components/catalog/Card.vue
@@ -2,7 +2,7 @@
   <v-card @click="navigateTo" class="repository-card">
     <div class="card-heading blue-grey darken-4">
       <v-chip :color="repository.data.color" small label class="ml-3 mr-0"/>
-      <v-chip color="grey lighten-3" small label class="ml-0 body-2">
+      <v-chip color="grey lighten-3" small label class="ml-0">
         {{ schema }}
       </v-chip>
       <v-card-title class="headline grey--text text--lighten-4 pt-1">
@@ -18,8 +18,12 @@
       <div class="desc grey--text text--darken-3">{{ description }}</div>
     </div>
     <v-card-actions class="px-2 py-1">
-      <v-btn icon>
-        <v-icon color="pink" class="mdi-rotate-45">mdi-pin</v-icon>
+      <v-btn @click.stop="pin({ id: repository.id, pin: !isPinned })" icon>
+        <v-icon
+          :color="isPinned ? 'pink': 'grey'"
+          :class="{ 'mdi-rotate-45': isPinned }">
+          mdi-pin
+        </v-icon>
       </v-btn>
     </v-card-actions>
   </v-card>
@@ -27,7 +31,9 @@
 
 <script>
 import first from 'lodash/first';
+import get from 'lodash/get';
 import { getSchema } from 'shared/activities';
+import { mapActions } from 'vuex';
 import truncate from 'truncate';
 
 export default {
@@ -38,9 +44,11 @@ export default {
     name: ({ repository }) => truncate(repository.name, 70),
     description: ({ repository }) => truncate(repository.description, 100),
     schema: ({ repository }) => getSchema(repository.schema).name,
-    userAction: ({ repository }) => first(repository.revisions)
+    userAction: ({ repository }) => first(repository.revisions),
+    isPinned: ({ repository }) => get(repository, 'courseUser.pinned', false)
   },
   methods: {
+    ...mapActions('courses', ['pin']),
     navigateTo() {
       if (window.getSelection().toString()) return;
       this.$router.push({

From 4dca4e6b2fad7ff3532623c9a3c6f680b637ae2c Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Sun, 14 Jul 2019 23:35:38 +0200
Subject: [PATCH 154/213] Added show pinned filter & sorting

- WIP
---
 client/components/catalog/Container.vue   | 53 ++++++++++++++++++-----
 client/components/catalog/SelectOrder.vue | 14 +++---
 2 files changed, 48 insertions(+), 19 deletions(-)

diff --git a/client/components/catalog/Container.vue b/client/components/catalog/Container.vue
index 3dd4cafbc..1bf88e708 100644
--- a/client/components/catalog/Container.vue
+++ b/client/components/catalog/Container.vue
@@ -1,12 +1,21 @@
 <template>
   <div infinite-wrapper class="catalog-wrapper">
+    <create-repository/>
     <v-container class="catalog">
-      <v-layout row class="mb-4">
-        <v-flex md6 sm10 offset-md3 offset-sm1>
-          <search @change="search" class="pt-4"/>
+      <v-layout row class="pt-2 mb-4">
+        <v-flex md4 sm10 offset-md4 offset-sm1>
+          <search @change="search"/>
         </v-flex>
-        <v-flex md3 sm1>
-          <create-repository class="pt-2"/>
+        <v-flex md3 sm1 class="text-sm-left pl-2">
+          <v-btn @click="togglePinned" icon flat>
+            <v-icon :color="showPinned ? 'lime accent-3' : 'primary lighten-4'">
+              mdi-pin
+            </v-icon>
+          </v-btn>
+          <select-order
+            :sortBy="sortBy"
+            @update="setOrder"
+            class="pl-4"/>
         </v-flex>
       </v-layout>
       <v-layout v-show="!searching" row wrap>
@@ -37,33 +46,44 @@
 </template>
 
 <script>
-import { mapActions, mapGetters, mapMutations } from 'vuex';
+import { mapActions, mapGetters, mapMutations, mapState } from 'vuex';
 import CreateRepository from './Create';
+import filter from 'lodash/filter';
 import get from 'lodash/get';
 import InfiniteLoading from 'vue-infinite-loading';
 import isEmpty from 'lodash/isEmpty';
+import isString from 'lodash/isString';
 import orderBy from 'lodash/orderBy';
 import Promise from 'bluebird';
 import RepositoryCard from './Card';
 import Search from './Search';
+import SelectOrder from './SelectOrder';
 
 export default {
   data() {
     return { searching: false };
   },
   computed: {
-    ...mapGetters(['courses']),
-    ...mapGetters('courses', ['hasMoreResults']),
+    ...mapState('courses', {
+      sortBy: state => state.$internals.sort,
+      showPinned: 'showPinned'
+    }),
+    ...mapGetters('courses', ['courses', 'hasMoreResults']),
     orderedRepositories() {
-      return orderBy(this.courses, 'updatedAt', 'desc');
+      const { field, order } = this.sortBy;
+      const items = orderBy(this.courses, it => {
+        return isString(it[field]) ? it[field].toLowerCase() : it[field];
+      }, order.toLowerCase());
+      if (!this.showPinned) return items;
+      return filter(items, it => get(it, 'courseUser.pinned', false));
     },
     loaderState() {
       return get(this.$refs, 'infiniteLoading.stateChanger', {});
     }
   },
   methods: {
-    ...mapActions('courses', ['fetch']),
-    ...mapMutations('courses', ['setSearch']),
+    ...mapActions('courses', ['fetch', 'fetchPinned']),
+    ...mapMutations('courses', ['togglePinned', 'setSearch', 'setOrder']),
     loadMore() {
       return this.fetch().then(() => {
         if (!isEmpty(this.courses)) this.loaderState.loaded();
@@ -86,14 +106,21 @@ export default {
       return this.load().then(() => (this.searching = false));
     }
   },
+  watch: {
+    sortBy(val) {
+      this.search();
+    }
+  },
   mounted() {
+    this.fetchPinned();
     this.search();
   },
   components: {
     CreateRepository,
     InfiniteLoading,
     RepositoryCard,
-    Search
+    Search,
+    SelectOrder
   }
 };
 </script>
@@ -104,6 +131,8 @@ export default {
 }
 
 .catalog {
+  max-width: 1185px !important;
+
   &::before {
     position: absolute;
     top: 0;
diff --git a/client/components/catalog/SelectOrder.vue b/client/components/catalog/SelectOrder.vue
index e9783824b..0c1024411 100644
--- a/client/components/catalog/SelectOrder.vue
+++ b/client/components/catalog/SelectOrder.vue
@@ -2,7 +2,7 @@
   <span>
     <v-menu offset-y>
       <template v-slot:activator="{ on }">
-        <v-btn v-on="on" icon flat>
+        <v-btn v-on="on" icon flat class="mx-0">
           <v-icon color="primary lighten-4">mdi-sort</v-icon>
         </v-btn>
       </template>
@@ -12,15 +12,15 @@
           :key="field"
           @click="$emit('update', { field, order })">
           <v-list-tile-title
-            :class="`${selected.field === field ? 'pink' : 'black'}--text`">
+            :class="`${sortBy.field === field ? 'pink' : 'black'}--text`">
             {{ text }}
           </v-list-tile-title>
         </v-list-tile>
       </v-list>
     </v-menu>
-    <v-btn @click="toggleOrder" icon flat>
+    <v-btn @click="toggleOrder" icon flat class="mx-0">
       <v-icon color="primary lighten-4">
-        mdi-sort-{{ selected.order === 'ASC' ? 'ascending' : 'descending' }}
+        mdi-sort-{{ sortBy.order === 'ASC' ? 'ascending' : 'descending' }}
       </v-icon>
     </v-btn>
   </span>
@@ -29,7 +29,7 @@
 <script>
 export default {
   props: {
-    selected: { type: Object, required: true }
+    sortBy: { type: Object, required: true }
   },
   computed: {
     options() {
@@ -41,8 +41,8 @@ export default {
   },
   methods: {
     toggleOrder() {
-      const order = this.selected.order === 'ASC' ? 'DESC' : 'ASC';
-      this.$emit('update', { ...this.selected, order });
+      const order = this.sortBy.order === 'ASC' ? 'DESC' : 'ASC';
+      this.$emit('update', { ...this.sortBy, order });
     }
   }
 };

From 4e933346f0c66b7e869fb4db31647831f6ade92e Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Sun, 14 Jul 2019 23:52:14 +0200
Subject: [PATCH 155/213] Updated create btn position

---
 client/components/catalog/Container.vue | 17 ++++++++++++++---
 client/components/catalog/Create.vue    | 10 +++-------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/client/components/catalog/Container.vue b/client/components/catalog/Container.vue
index 1bf88e708..e81b7d849 100644
--- a/client/components/catalog/Container.vue
+++ b/client/components/catalog/Container.vue
@@ -1,8 +1,8 @@
 <template>
   <div infinite-wrapper class="catalog-wrapper">
-    <create-repository/>
     <v-container class="catalog">
-      <v-layout row class="pt-2 mb-4">
+      <v-layout row class="catalog-actions">
+        <create-repository/>
         <v-flex md4 sm10 offset-md4 offset-sm1>
           <search @change="search"/>
         </v-flex>
@@ -15,7 +15,7 @@
           <select-order
             :sortBy="sortBy"
             @update="setOrder"
-            class="pl-4"/>
+            class="pl-2"/>
         </v-flex>
       </v-layout>
       <v-layout v-show="!searching" row wrap>
@@ -154,4 +154,15 @@ export default {
 .spinner, .no-results {
   margin-top: 120px;
 }
+
+.catalog-actions {
+  margin-bottom: 14px;
+  padding-top: 8px;
+  position: relative;
+
+  /deep/ .add-repo {
+    top: 4px;
+    right: 14px;
+  }
+}
 </style>
diff --git a/client/components/catalog/Create.vue b/client/components/catalog/Create.vue
index b88d52e54..b8a5d2e40 100644
--- a/client/components/catalog/Create.vue
+++ b/client/components/catalog/Create.vue
@@ -7,12 +7,10 @@
     <v-btn
       slot="activator"
       color="pink"
-      fixed
-      right
-      bottom
       fab
       dark
-      class="mr-3 mb-4">
+      absolute
+      class="add-repo">
       <v-icon>mdi-plus</v-icon>
     </v-btn>
     <v-form @submit.prevent="submit">
@@ -56,9 +54,7 @@
         <v-card-actions>
           <v-spacer/>
           <v-btn :disabled="showLoader" @click="hide">Cancel</v-btn>
-          <v-btn :loading="showLoader" color="primary" outline type="submit">
-            Create
-          </v-btn>
+          <v-btn :loading="showLoader" outline type="submit">Create</v-btn>
         </v-card-actions>
       </v-card>
     </v-form>

From 00e1a69585bd23539c7ebcaeeb6a6f635e4e0d0e Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Mon, 15 Jul 2019 07:37:22 +0200
Subject: [PATCH 156/213] :lipstick:

---
 client/components/catalog/Container.vue | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/client/components/catalog/Container.vue b/client/components/catalog/Container.vue
index e81b7d849..8d10cd4ab 100644
--- a/client/components/catalog/Container.vue
+++ b/client/components/catalog/Container.vue
@@ -131,7 +131,9 @@ export default {
 }
 
 .catalog {
-  max-width: 1185px !important;
+  @media(min-width: 1440px) {
+    max-width: 1185px !important;
+  }
 
   &::before {
     position: absolute;
@@ -156,13 +158,13 @@ export default {
 }
 
 .catalog-actions {
-  margin-bottom: 14px;
-  padding-top: 8px;
+  margin-bottom: 20px;
+  padding-top: 12px;
   position: relative;
 
   /deep/ .add-repo {
-    top: 4px;
-    right: 14px;
+    top: 10px;
+    right: 16px;
   }
 }
 </style>

From 95aa9f4a679b794f8e3ff0e91bb07cdb6e229006 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Mon, 15 Jul 2019 07:43:36 +0200
Subject: [PATCH 157/213] Cleanup :lipstick:

---
 client/components/catalog/Card.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/components/catalog/Card.vue b/client/components/catalog/Card.vue
index f2b74bd05..70e751943 100644
--- a/client/components/catalog/Card.vue
+++ b/client/components/catalog/Card.vue
@@ -72,8 +72,8 @@ export default {
 }
 
 .card-heading {
-  height: 144px;
-  padding: 6px 0 0;
+  height: 146px;
+  padding: 8px 0 0;
   overflow: hidden;
 
   .v-chip {

From 9cb98670c8e21d2a5bfe415e49f82d3c47bbfe0a Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Mon, 15 Jul 2019 07:54:22 +0200
Subject: [PATCH 158/213] Updated footer height :lipstick:

---
 client/components/common/Footer.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/components/common/Footer.vue b/client/components/common/Footer.vue
index 6c25dbef5..a02f7dfd3 100644
--- a/client/components/common/Footer.vue
+++ b/client/components/common/Footer.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-footer height="52" color="primary" absolute>
+  <v-footer height="48" color="primary" absolute>
     <v-layout row justify-center>
       <v-flex
         xs-12

From 55f2ee9f512c1135208103f60dc2b81ce6fb0de4 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Mon, 15 Jul 2019 08:35:49 +0200
Subject: [PATCH 159/213] Added tooltip on pin btn

- Disabled filtering if there are no pinned repos
- Fixed issue with search (omit pinned list from getter)
---
 client/components/catalog/Container.vue | 22 +++++++++++++++++-----
 client/store/modules/courses/getters.js |  5 ++++-
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/client/components/catalog/Container.vue b/client/components/catalog/Container.vue
index 8d10cd4ab..a96f32cda 100644
--- a/client/components/catalog/Container.vue
+++ b/client/components/catalog/Container.vue
@@ -7,11 +7,20 @@
           <search @change="search"/>
         </v-flex>
         <v-flex md3 sm1 class="text-sm-left pl-2">
-          <v-btn @click="togglePinned" icon flat>
-            <v-icon :color="showPinned ? 'lime accent-3' : 'primary lighten-4'">
-              mdi-pin
-            </v-icon>
-          </v-btn>
+          <v-tooltip open-delay="1000" right>
+            <template v-slot:activator="{ on }">
+              <v-btn
+                v-on="on"
+                @click="hasPinnedRepos && togglePinned()"
+                icon
+                flat>
+                <v-icon :color="showPinned ? 'lime accent-3' : 'primary lighten-4'">
+                  mdi-pin
+                </v-icon>
+              </v-btn>
+            </template>
+            <span>{{ hasPinnedRepos ? 'Show pinned' : '0 pinned items' }}</span>
+          </v-tooltip>
           <select-order
             :sortBy="sortBy"
             @update="setOrder"
@@ -77,6 +86,9 @@ export default {
       if (!this.showPinned) return items;
       return filter(items, it => get(it, 'courseUser.pinned', false));
     },
+    hasPinnedRepos() {
+      return filter(this.courses, 'courseUser.pinned').length;
+    },
     loaderState() {
       return get(this.$refs, 'infiniteLoading.stateChanger', {});
     }
diff --git a/client/store/modules/courses/getters.js b/client/store/modules/courses/getters.js
index 9ddb4b01a..3b710bee3 100644
--- a/client/store/modules/courses/getters.js
+++ b/client/store/modules/courses/getters.js
@@ -1,4 +1,7 @@
-export const courses = state => ({ ...state.pinned, ...state.items });
+export const courses = state => ({
+  ...(state.search ? {} : state.pinned),
+  ...state.items
+});
 
 export const courseQueryParams = state => {
   const { pagination, sort } = state.$internals;

From 0d70e22bdaff640f5240a45d1f8e33e092cea0da Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Mon, 15 Jul 2019 09:00:24 +0200
Subject: [PATCH 160/213] Remove pinned filter after unpinning all repos

---
 client/components/catalog/Container.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/client/components/catalog/Container.vue b/client/components/catalog/Container.vue
index a96f32cda..4715bc042 100644
--- a/client/components/catalog/Container.vue
+++ b/client/components/catalog/Container.vue
@@ -121,6 +121,9 @@ export default {
   watch: {
     sortBy(val) {
       this.search();
+    },
+    hasPinnedRepos(val) {
+      if (this.showPinned && !val) this.togglePinned();
     }
   },
   mounted() {

From a665610895ce6bd978f6b75bebe4f002010dfbc7 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Mon, 15 Jul 2019 09:22:04 +0200
Subject: [PATCH 161/213] Reset order & refetch upon repo creation

---
 client/components/catalog/Container.vue | 2 +-
 client/store/modules/courses/actions.js | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/client/components/catalog/Container.vue b/client/components/catalog/Container.vue
index 4715bc042..408f905c3 100644
--- a/client/components/catalog/Container.vue
+++ b/client/components/catalog/Container.vue
@@ -7,7 +7,7 @@
           <search @change="search"/>
         </v-flex>
         <v-flex md3 sm1 class="text-sm-left pl-2">
-          <v-tooltip open-delay="1000" right>
+          <v-tooltip open-delay="800" right>
             <template v-slot:activator="{ on }">
               <v-btn
                 v-on="on"
diff --git a/client/store/modules/courses/actions.js b/client/store/modules/courses/actions.js
index 2d717d248..c30465cce 100644
--- a/client/store/modules/courses/actions.js
+++ b/client/store/modules/courses/actions.js
@@ -8,11 +8,17 @@ const {
   get,
   remove,
   reset,
-  save,
   setEndpoint,
   update
 } = generateActions('/courses');
 
+const save = ({ commit, dispatch }, model) => {
+  return api.save(model).then(() => {
+    commit('setOrder', { field: 'createdAt', order: 'DESC' });
+    dispatch('reset');
+  });
+};
+
 const fetch = ({ getters, commit }, { reset = false } = {}) => {
   const mutation = reset ? 'reset' : 'fetch';
   const params = getters.courseQueryParams;

From 7070c37061253f1aee9cdf9873c30b70ff69fb84 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Mon, 15 Jul 2019 09:30:43 +0200
Subject: [PATCH 162/213] Tweaked logo pos

---
 client/components/common/Navbar.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/components/common/Navbar.vue b/client/components/common/Navbar.vue
index b0447edfb..410b7392c 100644
--- a/client/components/common/Navbar.vue
+++ b/client/components/common/Navbar.vue
@@ -4,7 +4,7 @@
       <v-avatar color="primary darken-1" size="34" class="mt-1">
         <v-icon color="grey lighten-4">mdi-content-cut</v-icon>
       </v-avatar>
-      <v-toolbar-title class="app-name ml-2">{{ title }}</v-toolbar-title>
+      <v-toolbar-title class="app-name">{{ title }}</v-toolbar-title>
     </router-link>
     <v-spacer/>
     <v-toolbar-items>
@@ -95,6 +95,7 @@ $font-color: #333;
   cursor: pointer;
 
   .app-name {
+    margin: 1px 0 0 10px;
     font-size: 20px;
     font-weight: 400;
     line-height: $container-height;

From 8930e678f334075ef378f2c0241ae3cb764a2f03 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Mon, 15 Jul 2019 11:24:01 +0200
Subject: [PATCH 163/213] Updated change icon

---
 client/components/catalog/Card.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/components/catalog/Card.vue b/client/components/catalog/Card.vue
index 70e751943..c47a7eaff 100644
--- a/client/components/catalog/Card.vue
+++ b/client/components/catalog/Card.vue
@@ -11,7 +11,7 @@
     </div>
     <div class="card-body">
       <div class="pb-2 grey--text text--darken-2">
-        <v-icon color="primary" class="pr-1">mdi-pencil-outline</v-icon>
+        <v-icon color="primary" class="pr-1">mdi-history</v-icon>
         <span>{{ userAction.createdAt | formatDate }}</span>
         <div>{{ userAction.user.email }}</div>
       </div>

From 6d7384ae94504d676791c5e354fccaf1b70ad73a Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Mon, 15 Jul 2019 11:30:22 +0200
Subject: [PATCH 164/213] Match new catalog style

- WIP
---
 client/components/system-settings/Sidebar.vue  |  2 +-
 .../UserManagement/UserDialog.vue              |  2 +-
 .../system-settings/UserManagement/index.vue   |  4 ++--
 client/components/system-settings/index.vue    | 18 +++++++++++++++++-
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/client/components/system-settings/Sidebar.vue b/client/components/system-settings/Sidebar.vue
index 512e90879..c786fe2a9 100644
--- a/client/components/system-settings/Sidebar.vue
+++ b/client/components/system-settings/Sidebar.vue
@@ -5,7 +5,7 @@
         v-for="({ name, label, icon }) in routes"
         :key="name"
         :to="{ name }"
-        active-class="primary--text text--darken-1"
+        active-class="black--text"
         exact
         ripple>
         <v-list-tile-action class="pl-1">
diff --git a/client/components/system-settings/UserManagement/UserDialog.vue b/client/components/system-settings/UserManagement/UserDialog.vue
index eb2ab97d2..4a336a0d5 100644
--- a/client/components/system-settings/UserManagement/UserDialog.vue
+++ b/client/components/system-settings/UserManagement/UserDialog.vue
@@ -35,7 +35,7 @@
         <v-card-actions>
           <v-spacer/>
           <v-btn @click="close">Cancel</v-btn>
-          <v-btn color="primary" type="submit">Save</v-btn>
+          <v-btn color="primary" type="submit" outline>Save</v-btn>
         </v-card-actions>
       </v-card>
     </v-form>
diff --git a/client/components/system-settings/UserManagement/index.vue b/client/components/system-settings/UserManagement/index.vue
index b781f841d..962938f85 100644
--- a/client/components/system-settings/UserManagement/index.vue
+++ b/client/components/system-settings/UserManagement/index.vue
@@ -1,9 +1,9 @@
 <template>
   <v-layout justify-center class="elevation-1 white">
-    <v-flex class="mt-1">
+    <v-flex>
       <v-toolbar color="white" flat>
         <v-spacer/>
-        <v-btn @click.stop="showUserDialog()" color="primary" outline>
+        <v-btn @click.stop="showUserDialog()" color="primary darken-1" outline>
           Add user
         </v-btn>
       </v-toolbar>
diff --git a/client/components/system-settings/index.vue b/client/components/system-settings/index.vue
index 7c7dfc45c..2b8e3e2f9 100644
--- a/client/components/system-settings/index.vue
+++ b/client/components/system-settings/index.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="system-settings-container grey lighten-2">
+    <div class="heading"></div>
     <v-container>
       <v-layout row align-start>
         <v-card>
@@ -28,6 +29,21 @@ export default {
 
 <style lang="scss" scoped>
 .system-settings-container {
-  padding: 25px 0 75px 0;
+  width: 100%;
+  height: 100%;
+  padding: 46px 0 75px 0;
+}
+
+.heading {
+  position: absolute;
+  top: 0;
+  left: 0;
+  height: 110px;
+  width: 100%;
+  background: #455a64;
+  box-shadow:
+    0px 3px 5px -1px rgba(0,0,0,0.2),
+    0px 5px 8px 0px rgba(0,0,0,0.14),
+    0px 1px 14px 0px rgba(0,0,0,0.12);
 }
 </style>

From 728a971ffd282dd68a9b51057049f329e0c36c76 Mon Sep 17 00:00:00 2001
From: Igor Bebic <igor.bebic@gmail.com>
Date: Wed, 17 Jul 2019 11:17:38 +0200
Subject: [PATCH 165/213] Refresh auth screens design, update logo

---
 client/components/auth/Container.vue      | 33 +++++++++------------
 client/components/auth/ForgotPassword.vue | 11 +++----
 client/components/auth/Login.vue          | 18 +++---------
 client/components/auth/ResetPassword.vue  | 35 +++++++++++------------
 4 files changed, 38 insertions(+), 59 deletions(-)

diff --git a/client/components/auth/Container.vue b/client/components/auth/Container.vue
index d32e74c82..2eda4408e 100644
--- a/client/components/auth/Container.vue
+++ b/client/components/auth/Container.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="auth-container">
-    <div class="auth-panel">
+    <div class="auth-panel elevation-2">
       <div class="auth-header">
-        <img :src="logo" alt="Logo"/>
+        <v-icon size="73" color="white" class="logo">mdi-content-cut</v-icon>
         <h1>{{ title }}</h1>
       </div>
       <div class="auth-body">
@@ -16,35 +16,26 @@
 export default {
   data() {
     return {
-      title: BRAND_CONFIG.TITLE,
-      logo: BRAND_CONFIG.LOGO_FULL
+      title: BRAND_CONFIG.TITLE
     };
   }
 };
 </script>
 
 <style lang="scss">
+$primary: #2e434c;
+
 .auth-container {
   padding-top: 5%;
 }
 
 .auth-panel {
-  width: 440px;
+  width: 480px;
   margin: auto;
   background-color: #fff;
-  box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23);
   border-radius: 4px;
   transition: all 0.3s cubic-bezier(0.25,0.8,0.25,1);
 
-  &:hover {
-    box-shadow: 0 6px 10px rgba(0,0,0,0.2), 0 6px 8px rgba(0,0,0,0.22);
-  }
-
-  img {
-    width: 130px;
-    margin: 15px 0 10px;
-  }
-
   h1 {
     margin: 0;
     color: white;
@@ -54,23 +45,27 @@ export default {
 
   .auth-header {
     padding-bottom: 20px;
-    background: linear-gradient(90deg, $brandColor 65%, $altBrandColor);
+    background-color: $primary;
     border-radius: 4px 4px 0 0;
+
+    .logo {
+      margin: 30px 0;
+    }
   }
 
   .auth-body {
-    padding: 20px 30px;
+    padding: 25px 30px;
 
     a {
       color: inherit;
-      font-weight: 500;
+      font-weight: 400;
     }
   }
 
   .message {
     min-height: 16px;
     margin-bottom: 20px;
-    color: #da126d;
+    color: #e91e63;
     font-size: 16px;
     line-height: 16px;
   }
diff --git a/client/components/auth/ForgotPassword.vue b/client/components/auth/ForgotPassword.vue
index 0a3b3de4e..8dc9c2791 100644
--- a/client/components/auth/ForgotPassword.vue
+++ b/client/components/auth/ForgotPassword.vue
@@ -6,15 +6,12 @@
     <div v-else>
       <form @submit.prevent="submit">
         <div class="form-group">
-          <input
+          <v-text-field
             v-model="email"
-            class="form-control"
             type="email"
-            placeholder="Please enter your email"/>
+            label="Please enter your email"/>
         </div>
-        <button type="submit" class="btn btn-default btn-block">
-          Send reset email
-        </button>
+        <v-btn color="primary" outline block type="submit">Send reset email</v-btn>
         <div class="options">
           <a @click="$router.go(-1)">Back</a>
         </div>
@@ -55,7 +52,7 @@ export default {
 }
 
 .options {
-  padding-top: 16px;
+  padding: 20px 0 5px;
 
   a {
     display: inline-block;
diff --git a/client/components/auth/Login.vue b/client/components/auth/Login.vue
index cb9b7076c..c714f03bf 100644
--- a/client/components/auth/Login.vue
+++ b/client/components/auth/Login.vue
@@ -5,27 +5,17 @@
     </div>
     <form @submit.prevent="submit" novalidate>
       <div class="form-group">
-        <input
-          v-model="email"
-          class="form-control"
-          type="email"
-          placeholder="Email"/>
+        <v-text-field v-model="email" type="email" label="Email"/>
       </div>
       <div class="form-group">
-        <input
-          v-model="password"
-          class="form-control"
-          type="password"
-          placeholder="Password"/>
+        <v-text-field v-model="password" type="password" label="Password"/>
       </div>
       <div class="options">
         <router-link :to="{ name: 'forgot-password' }">
           Forgot password ?
         </router-link>
       </div>
-      <button type="submit" class="btn btn-default btn-material btn-block">
-        Log in
-      </button>
+      <v-btn color="primary" outline block type="submit">Log in</v-btn>
     </form>
   </div>
 </template>
@@ -58,7 +48,7 @@ export default {
 
 <style lang="scss" scoped>
 .options {
-  padding: 5px 0 10px;
+  padding: 10px 0 25px;
   text-align: right;
 }
 </style>
diff --git a/client/components/auth/ResetPassword.vue b/client/components/auth/ResetPassword.vue
index 507a1e711..a236a1f48 100644
--- a/client/components/auth/ResetPassword.vue
+++ b/client/components/auth/ResetPassword.vue
@@ -2,37 +2,28 @@
   <div>
     <div class="message"><span>{{ error }}</span></div>
     <form @submit.prevent="submit">
-      <div :class="{ 'has-error': vErrors.has('password') }" class="form-group">
-        <input
+      <div class="form-group">
+        <v-text-field
           v-validate="{ required: true, min: 6, alphanumerical: true }"
           ref="password"
           v-model="password"
-          class="form-control"
+          :error-messages="vErrors.collect('password')"
           name="password"
           type="password"
-          placeholder="Password"/>
-        <span class="help-block">{{ vErrors.first('password') }}</span>
+          label="Password"/>
       </div>
-      <div
-        :class="{ 'has-error': vErrors.has('passwordConfirmation') }"
-        class="form-group">
-        <input
+      <div class="form-group">
+        <v-text-field
           v-validate="{ required: true, confirmed: 'password' }"
+          :error-messages="vErrors.collect('passwordConfirmation')"
           data-vv-as="password"
-          class="form-control"
           name="passwordConfirmation"
           type="password"
-          placeholder="Please re-enter your password"/>
-        <span class="help-block">
-          {{ vErrors.first('passwordConfirmation') }}
-        </span>
+          label="Please re-enter your password"/>
       </div>
-      <button
-        :disabled="!isValid"
-        class="btn btn-default btn-block"
-        type="submit">
+      <v-btn :disabled="!isValid" color="primary" outline block type="submit">
         Change password
-      </button>
+      </v-btn>
     </form>
   </div>
 </template>
@@ -67,3 +58,9 @@ export default {
   }
 };
 </script>
+
+<style lang="scss" scoped>
+.form-group {
+  margin-top: 10px;
+}
+</style>

From db9369e695b7b41caa3aa79a5a7dd0904908a4b2 Mon Sep 17 00:00:00 2001
From: Igor Bebic <igor.bebic@gmail.com>
Date: Wed, 17 Jul 2019 12:48:23 +0200
Subject: [PATCH 166/213] Make logo image configurable again, update favicon

---
 client/assets/img/default-favicon.ico      | Bin 1150 -> 5430 bytes
 client/assets/img/default-logo-compact.svg |  17 +----------------
 client/assets/img/default-logo-full.svg    |  17 +----------------
 client/components/auth/Container.vue       |  17 ++++++++++-------
 client/components/common/Navbar.vue        |  15 +++++++++------
 5 files changed, 21 insertions(+), 45 deletions(-)

diff --git a/client/assets/img/default-favicon.ico b/client/assets/img/default-favicon.ico
index f6c1ddd17b0f4011bfaf4f00ba9183790d176389..4afca61ecdb539c66a6ca8b0411d232812fd0c25 100644
GIT binary patch
literal 5430
zcmcgwYiv|S6dtUKCMqPxMB@(|qi8I9x3wmQ_`|xpP`BM(FtK2bud1Ytff@uKL?k>C
zO&VKTT3&rnz*a#JP)W-}N(;3$Sfx*)MUc?=s3@g$n}F7g=bL-y?%dnE?Y0tca_-DM
zbI$qBoH=u5b{U(*u47ZDGHT;l&h?B<V~oYe>)+dnUqHMEiAP<M(D~FbM*LGZ>m<G%
zUco2a3F#hpLBOMR1iadyAklZ_&-Nxg<e(y085s#T27K;fk{>4GQ3zv2$;rt#sCI;|
zNBe3{YBFE?#w$Gg#ZWYT$v>pp2zcEkPd)hvZ#(fV?>^bd`}%(6Yx7r1S<wc4ZvOGM
zjl84nJHB|qbKn)hhxA$6bm|Ykv*=}^3%NIQU*Knc>^Akm+xf|6J~T8WT6{wX@u0Sl
zi05R@=6%2YB5ZG~DCVboe&CRcqHEZ8<)?dHUC;-uTeF(~boR8+l~@kAreDSyU6%T?
zm6(72ae;$i!|*wxD==LHq=PlK@KybfDogmH*D|B%YnN63iwjoqvuAoN{zEq$9(49W
z&#@xlXTKB@@msR+c@E52;)gs<^SNB4{}1v8YY*RJT|eYHav<Q-HXwi6TU+?4lO4hj
z%teh0>{{}Navi#O{QmnU2fbPyY>51&xv07h{lmz4U0Z((8y;;v=HehP?a}^mm)Lbx
zJ4QSZ(@vtWLFgAE*Hu~cFHK>rK8~>!lXS9=+rOn8bfAkm6Hk;vgnA?%Dm;5`*GXr@
z{?15AxP|68kMe3`(5HPve)kbwHK<SUXuW7X=0Y}h%cD!Cr6k-L)Z>qs$#{>|hJ#-B
zrgWd{-qEc`AH}-UTvrn2cyR50AwKWJR&=D1BYuC<9hA2X<Cw1<*Z$pvIF3Xb$q9L<
zYlPc-4Y8#!=dlMyB1Smyk#NsT?5xaLd`o!|KTxxqZ?7ul3+6v9ZB4ZOIpA^M9YKur
zQc~h?BHU()y=vJ)-hc6;I9pKjLE&(iS8U9W2|MUZ<dtQG{PW$_f(rANOT8wid?4IB
ziH&(n?5@sMURAk{H#Z(JeR+4ud}+(E1$NDsJ571`UcGfgMAqZ_ATo2RvojO#r+oWM
z;%_ZqD|EX$PVhOY51V@X_kAY#4R!lXp45@86L!rPpHlr#RCTVZdo$gul}mlJSa0}@
zd8>S^3HUwTT^7ESi4j}Z^=PGtfnL|FdwfTAxxo4Q*kKC}VhH@>%||VK;ExMiuVZ0g
z)7+nt{>wHud!EQOU?Fyxch#2ld|+Te;2&!^WQnK1COODUa)|i|pVK|A47#h7N?f(Y
zzLU0`TI3gSCyEU$oFxIT>$r-m_Lsk%!!cLfIS}(k>Z`tBjvx!q@JqEbN+0|E!YJdG
zm^rPnihZzlFAvSM<he!P0Y{#pW67E0YP{RqTEx8>KFIZOz%X?k#;y<#XVhpimN7d%
ze3&3M>;nHk#b07CUHmHFyQ|8wFJhP%#XoxfEqg1QA3bs)dj1)?25eccW7&6#U&y~Q
z<=c$)=1prXd9CJ|eZ4Vnbv#xda7UuMRi+(3H+!yGe`@#b67>hQ?^@R%+$a71M{gti
zA=L+2f14WX%y?iN_k7GVYW=m>0{TY2s<xGWIP};9x8e+-9H>zE|I7J<J1wyBq<P)b
z2>);C1AeDso}KOATh3ps1^CEGDQj<?YLr7h4BGF5bpC%RZDl>1%KQ8EyAOQ8?>?-B
z%rWc>DeKfa`JmoEaIe;99(n8cFL$f7xB9);O&=sK?qAp!Qf9OkJ~-aLd|FG!j2ZNA
z%g6`!AUY3!mv#{cti{3FJ$y%18OOemV-sw9?Qyqz5%Rf{R39dY<K$;A?)G*(r*9(;
z_@Bwi&O~_4sj10#IblWPVU3KOH21}L{W0#edC0A3IAihky(#L0rACe6%aFL!Qa+7k
zKh|;7NuyTNc|m6u<tgST<|uMj@Jex?lyxl@+q^!GbH?~EV~<~9?4C=EO*zNd<a);9
bKr86)0}vbMBlYSHJLkwIYy$&Wzy$WccVY^v

literal 1150
zcmaizPe@c@6vaQu(r6<TQDD%bW+vLSvKj}(f+5kx)UriwVzO2L!Fh@}3pJ)igR{sY
zu(F^(16oE-&LU+(Bb#w&f@$vhU(&)>&F!4~=F@o)G{bMc`_4V*z5C63&zK5)YibOB
zcbe8pW40P&0ss;eSI1%udYd=7=yBPPQ|~vR3N(W>_yqodBKQJ^K?H0BtI3#~V|E)z
zIYHk~AgH}i3;KRRzX@uAaYA}cn;mWo`lUTwr?9r?_=lcBZ-<_v-oGAeG6sL@LR4Oi
zjwpSoW4I<^ZFPF+MTT=!gD~d$7C%xa*~~NPzZjM4AUpP4;!XP%*3{UehhAiskv$3q
zx!-t`o9{axmE_q|GF8Y+;zUFeCnH)@V^8z&GK1_8_yBaT{g+OoKO(uQS2DBkUY-s;
zlJtXnQkb7tjXip-AM0oEyX;tJ>ps>f_fuD8;>~Lr%T37LYrWC~P3QLB7vA5M@_gHY
zUD9*BMPBB{Wimf4lZ9!msj*k?Ma}%es)jvvH3ub|&B)t#vvT8dD>$PyHTFvTw&(eX
z?10V34(^uQS2`s>Hz&6`&Xv4At*Nm`kM(1H3=RQ2pFZh4yiZ1-q~%VxBTgu==0i=5
zJ$mRx<_Bm2l^}t+ioD<ae>)oXdgsKxsIf;+X%8vnHUK`qTfoEiP@w3!uJ^yznc(5I
z`7Uh-$nIg@o+E+!D_EP|TYpC{3HYud!?)c1xX1b~G@>2=i-6AtSptI~40L9jTdFc<
Re4Q~}6;}EGN-s0a{srR1=r8~P

diff --git a/client/assets/img/default-logo-compact.svg b/client/assets/img/default-logo-compact.svg
index 235037e80..08532e51d 100644
--- a/client/assets/img/default-logo-compact.svg
+++ b/client/assets/img/default-logo-compact.svg
@@ -1,16 +1 @@
-<svg width="64" height="64" xmlns="http://www.w3.org/2000/svg">
-
- <g>
-  <title>background</title>
-  <rect fill="none" id="canvas_background" height="402" width="582" y="-1" x="-1"/>
- </g>
- <g>
-  <title>Layer 1</title>
-  <circle id="svg_2" r="32" fill="#0d47a1" cy="32.100376" cx="32.200752"/>
-  <path opacity="0.2" id="svg_5" fill="#231F20" d="m44,38c-6.188,0 -8.187,-2.868 -8.187,-2.868l-19.813,-21.132c0,19.062 19.525,24.06 19.525,30.259c0,1.896 0.476,3.467 1.035,4.667c1.169,2.969 4.056,5.074 7.44,5.074c4.418,0 8,-3.582 8,-8s-3.582,-8 -8,-8zm0,12c-2.206,0 -4,-1.794 -4,-4s1.794,-4 4,-4s4,1.794 4,4s-1.794,4 -4,4z"/>
-  <path id="svg_8" fill="#ffffff" d="m44,36c-6.188,0 -8.187,-2.868 -8.187,-2.868l-19.813,-21.132c0,19.062 19.525,24.06 19.525,30.259c0,1.896 0.476,3.467 1.035,4.667c1.169,2.969 4.056,5.074 7.44,5.074c4.418,0 8,-3.582 8,-8s-3.582,-8 -8,-8zm0,12c-2.206,0 -4,-1.794 -4,-4s1.794,-4 4,-4s4,1.794 4,4s-1.794,4 -4,4z"/>
-  <path opacity="0.2" id="svg_10" fill="#231F20" d="m28.187,35.132c0,0 -1.999,2.868 -8.187,2.868c-4.418,0 -8,3.582 -8,8s3.582,8 8,8c3.384,0 6.271,-2.105 7.44,-5.074c0.559,-1.201 1.035,-2.771 1.035,-4.667c0,-6.199 19.525,-11.197 19.525,-30.259l-19.813,21.132zm-8.187,14.868c-2.206,0 -4,-1.794 -4,-4s1.794,-4 4,-4s4,1.794 4,4s-1.794,4 -4,4z"/>
-  <path id="svg_12" fill="#ffffff" d="m28.287376,33.031624c0,0 -1.999,2.868 -8.187,2.868c-4.418,0 -8,3.582 -8,8s3.582,8 8,8c3.384,0 6.271,-2.105 7.44,-5.074c0.559,-1.201 1.035,-2.771 1.035,-4.667c0,-6.199 19.525,-11.197 19.525,-30.259l-19.813,21.132zm-8.187,14.868c-2.206,0 -4,-1.794 -4,-4s1.794,-4 4,-4s4,1.794 4,4s-1.794,4 -4,4z"/>
-  <circle id="svg_14" r="1.5" fill="#4F5D73" cy="33" cx="32"/>
- </g>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M19,3L13,9L15,11L22,4V3M12,12.5A0.5,0.5 0 0,1 11.5,12A0.5,0.5 0 0,1 12,11.5A0.5,0.5 0 0,1 12.5,12A0.5,0.5 0 0,1 12,12.5M6,20A2,2 0 0,1 4,18C4,16.89 4.9,16 6,16A2,2 0 0,1 8,18C8,19.11 7.1,20 6,20M6,8A2,2 0 0,1 4,6C4,4.89 4.9,4 6,4A2,2 0 0,1 8,6C8,7.11 7.1,8 6,8M9.64,7.64C9.87,7.14 10,6.59 10,6A4,4 0 0,0 6,2A4,4 0 0,0 2,6A4,4 0 0,0 6,10C6.59,10 7.14,9.87 7.64,9.64L10,12L7.64,14.36C7.14,14.13 6.59,14 6,14A4,4 0 0,0 2,18A4,4 0 0,0 6,22A4,4 0 0,0 10,18C10,17.41 9.87,16.86 9.64,16.36L12,14L19,21H22V20L9.64,7.64Z" fill="#f5f5f5"/></svg>
\ No newline at end of file
diff --git a/client/assets/img/default-logo-full.svg b/client/assets/img/default-logo-full.svg
index 235037e80..08532e51d 100644
--- a/client/assets/img/default-logo-full.svg
+++ b/client/assets/img/default-logo-full.svg
@@ -1,16 +1 @@
-<svg width="64" height="64" xmlns="http://www.w3.org/2000/svg">
-
- <g>
-  <title>background</title>
-  <rect fill="none" id="canvas_background" height="402" width="582" y="-1" x="-1"/>
- </g>
- <g>
-  <title>Layer 1</title>
-  <circle id="svg_2" r="32" fill="#0d47a1" cy="32.100376" cx="32.200752"/>
-  <path opacity="0.2" id="svg_5" fill="#231F20" d="m44,38c-6.188,0 -8.187,-2.868 -8.187,-2.868l-19.813,-21.132c0,19.062 19.525,24.06 19.525,30.259c0,1.896 0.476,3.467 1.035,4.667c1.169,2.969 4.056,5.074 7.44,5.074c4.418,0 8,-3.582 8,-8s-3.582,-8 -8,-8zm0,12c-2.206,0 -4,-1.794 -4,-4s1.794,-4 4,-4s4,1.794 4,4s-1.794,4 -4,4z"/>
-  <path id="svg_8" fill="#ffffff" d="m44,36c-6.188,0 -8.187,-2.868 -8.187,-2.868l-19.813,-21.132c0,19.062 19.525,24.06 19.525,30.259c0,1.896 0.476,3.467 1.035,4.667c1.169,2.969 4.056,5.074 7.44,5.074c4.418,0 8,-3.582 8,-8s-3.582,-8 -8,-8zm0,12c-2.206,0 -4,-1.794 -4,-4s1.794,-4 4,-4s4,1.794 4,4s-1.794,4 -4,4z"/>
-  <path opacity="0.2" id="svg_10" fill="#231F20" d="m28.187,35.132c0,0 -1.999,2.868 -8.187,2.868c-4.418,0 -8,3.582 -8,8s3.582,8 8,8c3.384,0 6.271,-2.105 7.44,-5.074c0.559,-1.201 1.035,-2.771 1.035,-4.667c0,-6.199 19.525,-11.197 19.525,-30.259l-19.813,21.132zm-8.187,14.868c-2.206,0 -4,-1.794 -4,-4s1.794,-4 4,-4s4,1.794 4,4s-1.794,4 -4,4z"/>
-  <path id="svg_12" fill="#ffffff" d="m28.287376,33.031624c0,0 -1.999,2.868 -8.187,2.868c-4.418,0 -8,3.582 -8,8s3.582,8 8,8c3.384,0 6.271,-2.105 7.44,-5.074c0.559,-1.201 1.035,-2.771 1.035,-4.667c0,-6.199 19.525,-11.197 19.525,-30.259l-19.813,21.132zm-8.187,14.868c-2.206,0 -4,-1.794 -4,-4s1.794,-4 4,-4s4,1.794 4,4s-1.794,4 -4,4z"/>
-  <circle id="svg_14" r="1.5" fill="#4F5D73" cy="33" cx="32"/>
- </g>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M19,3L13,9L15,11L22,4V3M12,12.5A0.5,0.5 0 0,1 11.5,12A0.5,0.5 0 0,1 12,11.5A0.5,0.5 0 0,1 12.5,12A0.5,0.5 0 0,1 12,12.5M6,20A2,2 0 0,1 4,18C4,16.89 4.9,16 6,16A2,2 0 0,1 8,18C8,19.11 7.1,20 6,20M6,8A2,2 0 0,1 4,6C4,4.89 4.9,4 6,4A2,2 0 0,1 8,6C8,7.11 7.1,8 6,8M9.64,7.64C9.87,7.14 10,6.59 10,6A4,4 0 0,0 6,2A4,4 0 0,0 2,6A4,4 0 0,0 6,10C6.59,10 7.14,9.87 7.64,9.64L10,12L7.64,14.36C7.14,14.13 6.59,14 6,14A4,4 0 0,0 2,18A4,4 0 0,0 6,22A4,4 0 0,0 10,18C10,17.41 9.87,16.86 9.64,16.36L12,14L19,21H22V20L9.64,7.64Z" fill="#f5f5f5"/></svg>
\ No newline at end of file
diff --git a/client/components/auth/Container.vue b/client/components/auth/Container.vue
index 2eda4408e..bd9530e45 100644
--- a/client/components/auth/Container.vue
+++ b/client/components/auth/Container.vue
@@ -2,7 +2,7 @@
   <div class="auth-container">
     <div class="auth-panel elevation-2">
       <div class="auth-header">
-        <v-icon size="73" color="white" class="logo">mdi-content-cut</v-icon>
+        <img :src="logo" alt="Logo" class="logo">
         <h1>{{ title }}</h1>
       </div>
       <div class="auth-body">
@@ -14,11 +14,10 @@
 
 <script>
 export default {
-  data() {
-    return {
-      title: BRAND_CONFIG.TITLE
-    };
-  }
+  data: () => ({
+    title: BRAND_CONFIG.TITLE,
+    logo: BRAND_CONFIG.LOGO_FULL
+  })
 };
 </script>
 
@@ -39,7 +38,7 @@ $primary: #2e434c;
   h1 {
     margin: 0;
     color: white;
-    font-size: 22px;
+    font-size: 1.57rem;
     line-height: 18px;
   }
 
@@ -70,4 +69,8 @@ $primary: #2e434c;
     line-height: 16px;
   }
 }
+
+.logo {
+  width: 5.36rem;
+}
 </style>
diff --git a/client/components/common/Navbar.vue b/client/components/common/Navbar.vue
index b0447edfb..c9401a566 100644
--- a/client/components/common/Navbar.vue
+++ b/client/components/common/Navbar.vue
@@ -2,7 +2,7 @@
   <v-toolbar color="grey lighten-5" app dense fixed>
     <router-link :to="{ name: 'catalog' }" tag="span" class="app-brand">
       <v-avatar color="primary darken-1" size="34" class="mt-1">
-        <v-icon color="grey lighten-4">mdi-content-cut</v-icon>
+        <img :src="logo" alt="Logo" class="logo">
       </v-avatar>
       <v-toolbar-title class="app-name ml-2">{{ title }}</v-toolbar-title>
     </router-link>
@@ -49,11 +49,10 @@ export default {
   props: {
     user: { type: Object, required: true }
   },
-  data() {
-    return {
-      title: BRAND_CONFIG.TITLE
-    };
-  },
+  data: () => ({
+    title: BRAND_CONFIG.TITLE,
+    logo: BRAND_CONFIG.LOGO_COMPACT
+  }),
   computed: {
     ...mapGetters(['isAdmin']),
     ...mapGetters('course', { repository: 'course' }),
@@ -112,4 +111,8 @@ $font-color: #333;
     color: darken($font-color, 20%);
   }
 }
+
+.logo {
+  width: 26px;
+}
 </style>

From 1264f7c6ec8a737aa70ca749566326d2459aa665 Mon Sep 17 00:00:00 2001
From: Igor Bebic <igor.bebic@gmail.com>
Date: Wed, 17 Jul 2019 16:11:28 +0200
Subject: [PATCH 167/213] Add validation, minor redesign

---
 client/components/auth/ForgotPassword.vue | 16 ++++++++++--
 client/components/auth/Login.vue          | 31 +++++++++++++++++++----
 2 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/client/components/auth/ForgotPassword.vue b/client/components/auth/ForgotPassword.vue
index 8dc9c2791..54b0a663e 100644
--- a/client/components/auth/ForgotPassword.vue
+++ b/client/components/auth/ForgotPassword.vue
@@ -7,11 +7,16 @@
       <form @submit.prevent="submit">
         <div class="form-group">
           <v-text-field
+            v-validate="{ required: true, email: true }"
             v-model="email"
+            :error-messages="vErrors.collect('email')"
             type="email"
+            name="email"
             label="Please enter your email"/>
         </div>
-        <v-btn color="primary" outline block type="submit">Send reset email</v-btn>
+        <v-btn :disabled="!isValid" color="primary" outline block type="submit">
+          Send reset email
+        </v-btn>
         <div class="options">
           <a @click="$router.go(-1)">Back</a>
         </div>
@@ -23,8 +28,10 @@
 <script>
 import { delay } from 'bluebird';
 import { mapActions } from 'vuex';
+import { withValidation } from 'utils/validation';
 
 export default {
+  mixins: [withValidation()],
   data() {
     return {
       email: '',
@@ -32,6 +39,11 @@ export default {
       showMessage: false
     };
   },
+  computed: {
+    isValid() {
+      return this.email && this.vErrors.count() === 0;
+    }
+  },
   methods: {
     ...mapActions(['forgotPassword']),
     submit() {
@@ -52,7 +64,7 @@ export default {
 }
 
 .options {
-  padding: 20px 0 5px;
+  padding-top: 10px;
 
   a {
     display: inline-block;
diff --git a/client/components/auth/Login.vue b/client/components/auth/Login.vue
index c714f03bf..315d05a4e 100644
--- a/client/components/auth/Login.vue
+++ b/client/components/auth/Login.vue
@@ -5,27 +5,43 @@
     </div>
     <form @submit.prevent="submit" novalidate>
       <div class="form-group">
-        <v-text-field v-model="email" type="email" label="Email"/>
+        <v-text-field
+          v-validate="{ required: true, email: true }"
+          v-model="email"
+          :error-messages="vErrors.collect('email')"
+          type="email"
+          name="email"
+          label="Email"/>
       </div>
       <div class="form-group">
-        <v-text-field v-model="password" type="password" label="Password"/>
+        <v-text-field
+          v-validate="{ required: true }"
+          v-model="password"
+          :error-messages="vErrors.collect('password')"
+          type="password"
+          name="password"
+          label="Password"/>
       </div>
+      <v-btn :disabled="!isValid" color="primary" outline block type="submit">
+        Log in
+      </v-btn>
       <div class="options">
         <router-link :to="{ name: 'forgot-password' }">
           Forgot password ?
         </router-link>
       </div>
-      <v-btn color="primary" outline block type="submit">Log in</v-btn>
     </form>
   </div>
 </template>
 
 <script>
 import { mapActions, mapState } from 'vuex';
+import { withValidation } from 'utils/validation';
 const LOGIN_ERR_MESSAGE = 'User email and password do not match';
 
 export default {
   name: 'login',
+  mixins: [withValidation()],
   data() {
     return {
       email: '',
@@ -33,7 +49,12 @@ export default {
       message: ''
     };
   },
-  computed: mapState({ user: state => state.auth.user }),
+  computed: {
+    ...mapState({ user: state => state.auth.user }),
+    isValid() {
+      return this.email && this.password && this.vErrors.count() === 0;
+    }
+  },
   methods: {
     ...mapActions(['login']),
     submit() {
@@ -48,7 +69,7 @@ export default {
 
 <style lang="scss" scoped>
 .options {
-  padding: 10px 0 25px;
+  padding: 15px 0 5px;
   text-align: right;
 }
 </style>

From 7cd0986245c3b85a8ae0a67f7d0d3cfd49428c91 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Wed, 17 Jul 2019 16:17:43 +0200
Subject: [PATCH 168/213] Updated search component

- Use vuetify
---
 client/components/catalog/Search.vue | 67 ++++------------------------
 1 file changed, 9 insertions(+), 58 deletions(-)

diff --git a/client/components/catalog/Search.vue b/client/components/catalog/Search.vue
index 96a77e73d..9a3a0ee34 100644
--- a/client/components/catalog/Search.vue
+++ b/client/components/catalog/Search.vue
@@ -1,30 +1,15 @@
 <template>
-  <div class="course-search">
-    <div
-      :style="{ width: expanded ? '100%' : '95%' }"
-      class="input-group">
-      <span class="input-group-btn">
-        <button
-          v-show="!query"
-          @mousedown.prevent="expand = true"
-          type="button"
-          class="btn">
-          <span class="mdi mdi-magnify"></span>
-        </button>
-        <button
-          v-show="query"
-          @mousedown.prevent="query = ''"
-          type="button"
-          class="btn">
-          <span class="mdi mdi-close"></span>
-        </button>
-      </span>
-      <input
+  <div class="repo-search">
+    <div :style="{ width: expanded ? '100%' : '95%' }">
+      <v-text-field
         v-focus="expanded"
         v-model.trim="query"
         @focus="expanded = true"
         @blur="expanded = false"
-        class="form-control"
+        @input="emitChange"
+        prepend-inner-icon="mdi-magnify"
+        solo
+        clearable
         placeholder="Search..."/>
     </div>
   </div>
@@ -46,49 +31,15 @@ export default {
       this.$emit('change', this.query);
     }, 500)
   },
-  watch: {
-    query() {
-      this.emitChange();
-    }
-  },
   directives: focus
 };
 </script>
 
 <style lang="scss" scoped>
-.course-search {
-  margin: 0 auto;
-
-  .input-group {
+.repo-search {
+  > div {
     margin: 0 auto;
-    overflow: hidden;
-    border-radius: 3px;
-    box-shadow:
-      0 2px 2px 0 rgba(0,0,0,0.14),
-      0 1px 5px 0 rgba(0,0,0,0.12),
-      0 3px 1px -2px rgba(0,0,0,0.2);
     transition: width 0.3s ease;
   }
-
-  .form-control {
-    height: 44px;
-    padding: 0 7px;
-    font-size: 18px;
-    text-indent: 10px;
-    box-shadow: none;
-  }
-
-  .btn {
-    padding: 8px 12px 5px;
-    color: #656565;
-    font-size: 22px;
-    background-color: white;
-    box-shadow: none;
-    outline: none;
-
-    &:hover {
-      color: #444;
-    }
-  }
 }
 </style>

From 94428d7aaa3ae15ed5a3564806f50f59de684838 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Wed, 17 Jul 2019 17:05:46 +0200
Subject: [PATCH 169/213] Unified retrieval of pinned items

---
 client/components/catalog/Container.vue   | 100 +++++++++++-----------
 client/store/modules/courses/actions.js   |   6 --
 client/store/modules/courses/getters.js   |  18 ++--
 client/store/modules/courses/index.js     |   1 -
 client/store/modules/courses/mutations.js |   2 +-
 5 files changed, 62 insertions(+), 65 deletions(-)

diff --git a/client/components/catalog/Container.vue b/client/components/catalog/Container.vue
index 408f905c3..b459e6804 100644
--- a/client/components/catalog/Container.vue
+++ b/client/components/catalog/Container.vue
@@ -1,6 +1,6 @@
 <template>
   <div infinite-wrapper class="catalog-wrapper">
-    <v-container class="catalog">
+    <v-container :class="{ 'catalog-empty': !hasRepositories }" class="catalog">
       <v-layout row class="catalog-actions">
         <create-repository/>
         <v-flex md4 sm10 offset-md4 offset-sm1>
@@ -11,7 +11,7 @@
             <template v-slot:activator="{ on }">
               <v-btn
                 v-on="on"
-                @click="hasPinnedRepos && togglePinned()"
+                @click="togglePinned() || search(queryParams.search)"
                 icon
                 flat>
                 <v-icon :color="showPinned ? 'lime accent-3' : 'primary lighten-4'">
@@ -19,50 +19,44 @@
                 </v-icon>
               </v-btn>
             </template>
-            <span>{{ hasPinnedRepos ? 'Show pinned' : '0 pinned items' }}</span>
+            <span>Toggle pinned</span>
           </v-tooltip>
-          <select-order
-            :sortBy="sortBy"
-            @update="setOrder"
-            class="pl-2"/>
+          <select-order :sortBy="sortBy" @update="setOrder" class="pl-2"/>
         </v-flex>
       </v-layout>
       <v-layout v-show="!searching" row wrap>
         <v-flex
-          v-for="repository in orderedRepositories"
+          v-for="repository in repositories"
           :key="repository._cid"
           xs4
           class="px-2 py-3">
           <repository-card :repository="repository"/>
         </v-flex>
       </v-layout>
-      <v-progress-circular
-        v-show="searching"
-        color="primary"
-        indeterminate
-        class="search-spinner"/>
+      <infinite-loading ref="infiniteLoading" @infinite="loadMore">
+        <div slot="spinner" class="spinner">
+          <v-progress-circular color="primary" indeterminate/>
+        </div>
+        <div slot="no-results" class="no-results subheading">
+          <v-alert
+            :value="true"
+            color="blue-grey lighten-4"
+            icon="mdi-cloud-search-outline"
+            outline>
+            {{ noRepositoriesMessage }}
+          </v-alert>
+        </div>
+        <span slot="no-more"></span>
+      </infinite-loading>
     </v-container>
-    <infinite-loading ref="infiniteLoading" @infinite="loadMore">
-      <div slot="spinner" class="spinner">
-        <v-progress-circular color="primary" indeterminate/>
-      </div>
-      <div slot="no-results" class="no-results subheading">
-        {{ orderedRepositories.length ? '' : 'No matches found' }}
-      </div>
-      <span slot="no-more"></span>
-    </infinite-loading>
   </div>
 </template>
 
 <script>
 import { mapActions, mapGetters, mapMutations, mapState } from 'vuex';
 import CreateRepository from './Create';
-import filter from 'lodash/filter';
 import get from 'lodash/get';
 import InfiniteLoading from 'vue-infinite-loading';
-import isEmpty from 'lodash/isEmpty';
-import isString from 'lodash/isString';
-import orderBy from 'lodash/orderBy';
 import Promise from 'bluebird';
 import RepositoryCard from './Card';
 import Search from './Search';
@@ -70,35 +64,39 @@ import SelectOrder from './SelectOrder';
 
 export default {
   data() {
-    return { searching: false };
+    return {
+      searching: false
+    };
   },
   computed: {
     ...mapState('courses', {
       sortBy: state => state.$internals.sort,
       showPinned: 'showPinned'
     }),
-    ...mapGetters('courses', ['courses', 'hasMoreResults']),
-    orderedRepositories() {
-      const { field, order } = this.sortBy;
-      const items = orderBy(this.courses, it => {
-        return isString(it[field]) ? it[field].toLowerCase() : it[field];
-      }, order.toLowerCase());
-      if (!this.showPinned) return items;
-      return filter(items, it => get(it, 'courseUser.pinned', false));
+    ...mapGetters('courses', {
+      repositories: 'courses',
+      queryParams: 'courseQueryParams',
+      hasMoreResults: 'hasMoreResults'
+    }),
+    hasRepositories() {
+      return !!this.repositories.length;
     },
-    hasPinnedRepos() {
-      return filter(this.courses, 'courseUser.pinned').length;
+    noRepositoriesMessage() {
+      if (this.hasRepositories) return;
+      if (this.queryParams.search) return 'No matches found';
+      if (this.showPinned) return '0 pinned items';
+      return '0 available repositories';
     },
     loaderState() {
       return get(this.$refs, 'infiniteLoading.stateChanger', {});
     }
   },
   methods: {
-    ...mapActions('courses', ['fetch', 'fetchPinned']),
+    ...mapActions('courses', ['fetch']),
     ...mapMutations('courses', ['togglePinned', 'setSearch', 'setOrder']),
     loadMore() {
       return this.fetch().then(() => {
-        if (!isEmpty(this.courses)) this.loaderState.loaded();
+        if (this.hasRepositories) this.loaderState.loaded();
         if (!this.hasMoreResults) this.loaderState.complete();
       });
     },
@@ -108,28 +106,25 @@ export default {
       return Promise.join(this.fetch({ reset: true }))
         .then(() => {
           this.loaderState.reset();
-          if (!isEmpty(this.courses)) this.loaderState.loaded();
+          if (this.hasRepositories) this.loaderState.loaded();
           if (!this.hasMoreResults) this.loaderState.complete();
         });
     },
     search(query) {
       this.setSearch(query);
       this.searching = true;
-      return this.load().then(() => (this.searching = false));
+      return this.load()
+        .then(() => (this.searching = false));
     }
   },
   watch: {
     sortBy(val) {
       this.search();
     },
-    hasPinnedRepos(val) {
-      if (this.showPinned && !val) this.togglePinned();
+    repositories(val) {
+      if (!val.length & this.showPinned) this.loaderState.reset();
     }
   },
-  mounted() {
-    this.fetchPinned();
-    this.search();
-  },
   components: {
     CreateRepository,
     InfiniteLoading,
@@ -162,14 +157,17 @@ export default {
       0px 5px 8px 0px rgba(0,0,0,0.14),
       0px 1px 14px 0px rgba(0,0,0,0.12);
   }
-}
 
-.search-spinner {
-  margin-top: 170px;
+  &.catalog-empty {
+    &::before {
+      height: 100%;
+      width: 100%;
+    }
+  }
 }
 
 .spinner, .no-results {
-  margin-top: 120px;
+  margin-top: 40px;
 }
 
 .catalog-actions {
diff --git a/client/store/modules/courses/actions.js b/client/store/modules/courses/actions.js
index c30465cce..24bf42a8b 100644
--- a/client/store/modules/courses/actions.js
+++ b/client/store/modules/courses/actions.js
@@ -29,11 +29,6 @@ const fetch = ({ getters, commit }, { reset = false } = {}) => {
   });
 };
 
-const fetchPinned = ({ commit }) => {
-  return fetchCourses({ pinned: true })
-    .then(courses => commit('fetchPinned', courses));
-};
-
 const clone = ({ commit }, { id, name, description }) => {
   return api.post(`/${id}/clone`, { name, description }).then(response => {
     const { data: course } = response.data;
@@ -51,7 +46,6 @@ const pin = ({ commit, getters }, { id, pin }) => {
 export {
   clone,
   fetch,
-  fetchPinned,
   get,
   pin,
   remove,
diff --git a/client/store/modules/courses/getters.js b/client/store/modules/courses/getters.js
index 3b710bee3..f08c1ce9c 100644
--- a/client/store/modules/courses/getters.js
+++ b/client/store/modules/courses/getters.js
@@ -1,18 +1,24 @@
-export const courses = state => ({
-  ...(state.search ? {} : state.pinned),
-  ...state.items
-});
+import filter from 'lodash/filter';
+import get from 'lodash/get';
+
+export const courses = state => {
+  if (!state.showPinned) return Object.values(state.items);
+  return filter(state.items, it => get(it, 'courseUser.pinned'));
+};
 
 export const courseQueryParams = state => {
   const { pagination, sort } = state.$internals;
-  const search = state.search;
+  const { search, showPinned } = state;
 
   return {
     search,
     offset: pagination.offset,
     limit: pagination.limit,
     sortOrder: sort.order,
-    sortBy: sort.field
+    sortBy: sort.field,
+    ...{
+      pinned: showPinned || undefined
+    }
   };
 };
 
diff --git a/client/store/modules/courses/index.js b/client/store/modules/courses/index.js
index 6b99f1cff..5532250be 100644
--- a/client/store/modules/courses/index.js
+++ b/client/store/modules/courses/index.js
@@ -6,7 +6,6 @@ const PAGINATION_DEFAULTS = { offset: 0, limit: 21 };
 
 const state = {
   items: {},
-  pinned: {},
   search: '',
   showPinned: false,
   $internals: {
diff --git a/client/store/modules/courses/mutations.js b/client/store/modules/courses/mutations.js
index c5140fc86..b89775df3 100644
--- a/client/store/modules/courses/mutations.js
+++ b/client/store/modules/courses/mutations.js
@@ -4,7 +4,7 @@ import Vue from 'vue';
 const PAGINATION_DEFAULTS = { offset: 0, limit: 21 };
 
 const save = (state, course) => {
-  const search = state.search.toLowerCase();
+  const search = state.search && state.search.toLowerCase();
   const name = course.name.toLowerCase();
   if (search && !name.includes(search)) return;
   Vue.set(state.items, course._cid, course);

From 858ed9c0626fcdf22c27bc2626721d0a3303952f Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Wed, 17 Jul 2019 17:22:33 +0200
Subject: [PATCH 170/213] Removed course stats

---
 server/course/course.model.js                 | 18 -------
 server/course/hooks.js                        | 49 -------------------
 .../20190717151915-remove-course-stats.js     | 16 ++++++
 3 files changed, 16 insertions(+), 67 deletions(-)
 delete mode 100644 server/course/hooks.js
 create mode 100644 server/shared/database/migrations/20190717151915-remove-course-stats.js

diff --git a/server/course/course.model.js b/server/course/course.model.js
index 044b2a126..2b693806e 100644
--- a/server/course/course.model.js
+++ b/server/course/course.model.js
@@ -2,7 +2,6 @@
 
 const { getRepositoryRelationships, getSchema } = require('../../config/shared/activities');
 const { Model } = require('sequelize');
-const hooks = require('./hooks');
 const pick = require('lodash/pick');
 const Promise = require('bluebird');
 
@@ -31,10 +30,6 @@ class Course extends Model {
         type: JSONB,
         defaultValue: {}
       },
-      stats: {
-        type: JSONB,
-        defaultValue: { objectives: 0, assessments: 0 }
-      },
       createdAt: {
         type: DATE,
         field: 'created_at'
@@ -82,19 +77,6 @@ class Course extends Model {
     };
   }
 
-  static hooks(Hooks, models) {
-    hooks.add(this, Hooks, models);
-  }
-
-  static updateStats(id, key, value) {
-    return this.findByPk(id).then(course => {
-      if (!course) return;
-      const stats = course.stats || {};
-      stats[key] = value;
-      return course.update({ stats });
-    });
-  }
-
   /**
    * Maps references for cloned activities and teaching elements.
    * @param {Object} mappings Dict where keys represent old and values new ids.
diff --git a/server/course/hooks.js b/server/course/hooks.js
deleted file mode 100644
index 16de64b78..000000000
--- a/server/course/hooks.js
+++ /dev/null
@@ -1,49 +0,0 @@
-'use strict';
-
-const { getObjectives, getSchemaId } = require('../../config/shared/activities');
-const forEach = require('lodash/forEach');
-const castArray = require('lodash/castArray');
-const find = require('lodash/find');
-const first = require('lodash/first');
-const logger = require('../shared/logger');
-const map = require('lodash/map');
-
-exports.add = (Course, Hooks, { Activity, TeachingElement }) => {
-  const hooks = [
-    Hooks.afterCreate,
-    Hooks.afterBulkCreate,
-    Hooks.afterDestroy,
-    Hooks.afterBulkDestroy
-  ];
-
-  forEach(hooks, type => {
-    const hook = Hooks.withType(type, updateObjectiveStats);
-    return Activity.addHook(type, hook);
-  });
-  forEach(hooks, type => {
-    const hook = Hooks.withType(type, updateAssessmentStats);
-    return TeachingElement.addHook(type, hook);
-  });
-
-  function updateObjectiveStats(hookType, instances) {
-    const activity = first(castArray(instances));
-    const { id, courseId, type } = activity;
-    const schemaId = getSchemaId(type);
-    if (!schemaId) return;
-    logger.info(`[Course] Activity#${hookType}`, { type, id, courseId });
-    const objectiveTypes = map(getObjectives(schemaId), 'type');
-    const where = { courseId, type: objectiveTypes, detached: false };
-    return Activity.count({ where })
-      .then(count => Course.updateStats(courseId, 'objectives', count));
-  }
-
-  function updateAssessmentStats(hookType, instances) {
-    const assessment = find(castArray(instances), { type: 'ASSESSMENT' });
-    if (!assessment) return;
-    const { id, courseId, type } = assessment;
-    logger.info(`[Course] TeachingElement#${hookType}`, { type, id, courseId });
-    const where = { courseId, type: 'ASSESSMENT', detached: false };
-    return TeachingElement.count({ where })
-      .then(count => Course.updateStats(courseId, 'assessments', count));
-  }
-};
diff --git a/server/shared/database/migrations/20190717151915-remove-course-stats.js b/server/shared/database/migrations/20190717151915-remove-course-stats.js
new file mode 100644
index 000000000..9e3f466bb
--- /dev/null
+++ b/server/shared/database/migrations/20190717151915-remove-course-stats.js
@@ -0,0 +1,16 @@
+'use strict';
+
+const TABLE_NAME = 'course';
+const COLUMN_NAME = 'stats';
+
+module.exports = {
+  up: (queryInterface) => {
+    return queryInterface.removeColumn(TABLE_NAME, COLUMN_NAME);
+  },
+  down: (queryInterface, { JSONB }) => {
+    return queryInterface.addColumn(TABLE_NAME, COLUMN_NAME, {
+      type: JSONB,
+      defaultValue: { objectives: 0, assessments: 0 }
+    });
+  }
+};

From 3d1ce0729703bb971d93d03e9a6f7fd7804637af Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Wed, 17 Jul 2019 17:37:17 +0200
Subject: [PATCH 171/213] Tweaked sort options :wrench:

---
 client/components/catalog/SelectOrder.vue | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/client/components/catalog/SelectOrder.vue b/client/components/catalog/SelectOrder.vue
index 0c1024411..9dd8da0a9 100644
--- a/client/components/catalog/SelectOrder.vue
+++ b/client/components/catalog/SelectOrder.vue
@@ -6,15 +6,13 @@
           <v-icon color="primary lighten-4">mdi-sort</v-icon>
         </v-btn>
       </template>
-      <v-list>
+      <v-list class="py-0">
         <v-list-tile
           v-for="({ text, field, order }) in options"
           :key="field"
+          :class="{ 'secondary--text text--lighten-1': sortBy.field === field }"
           @click="$emit('update', { field, order })">
-          <v-list-tile-title
-            :class="`${sortBy.field === field ? 'pink' : 'black'}--text`">
-            {{ text }}
-          </v-list-tile-title>
+          <v-list-tile-title>{{ text }}</v-list-tile-title>
         </v-list-tile>
       </v-list>
     </v-menu>

From 559fb00f751e9b217857396cbb36e853ea4b009e Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Wed, 17 Jul 2019 18:56:14 +0200
Subject: [PATCH 172/213] Fixed issue with validation errors upon reopen

---
 client/components/catalog/Create.vue | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/client/components/catalog/Create.vue b/client/components/catalog/Create.vue
index b8a5d2e40..70e8821be 100644
--- a/client/components/catalog/Create.vue
+++ b/client/components/catalog/Create.vue
@@ -102,14 +102,9 @@ export default {
     },
     hide() {
       this.isVisible = false;
-    }
-  },
-  watch: {
-    isVisible(val) {
-      if (!val) return;
       this.repository = getDefaultData();
+      this.$validator.reset();
       this.showLoader = false;
-      this.vErrors.clear();
     }
   }
 };

From 59da06771de9216f31a4c3dd26a6e6a481c205da Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Wed, 17 Jul 2019 18:57:19 +0200
Subject: [PATCH 173/213] Fixed issue with ordering

- Need to reorder on client due to storage format
---
 client/store/modules/courses/getters.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/client/store/modules/courses/getters.js b/client/store/modules/courses/getters.js
index f08c1ce9c..70ac3d87c 100644
--- a/client/store/modules/courses/getters.js
+++ b/client/store/modules/courses/getters.js
@@ -1,9 +1,13 @@
 import filter from 'lodash/filter';
 import get from 'lodash/get';
+import orderBy from 'lodash/orderBy';
 
 export const courses = state => {
-  if (!state.showPinned) return Object.values(state.items);
-  return filter(state.items, it => get(it, 'courseUser.pinned'));
+  const { sort } = state.$internals;
+  const items = state.showPinned
+    ? filter(state.items, it => get(it, 'courseUser.pinned'))
+    : state.items;
+  return orderBy(items, sort.field, sort.order.toLowerCase());
 };
 
 export const courseQueryParams = state => {

From 050e9126123c793b237690ca5f6995b6b116bf36 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Wed, 17 Jul 2019 19:02:06 +0200
Subject: [PATCH 174/213] :wrench:

---
 client/components/catalog/SelectOrder.vue | 2 +-
 client/store/modules/courses/actions.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/components/catalog/SelectOrder.vue b/client/components/catalog/SelectOrder.vue
index 9dd8da0a9..a271aab92 100644
--- a/client/components/catalog/SelectOrder.vue
+++ b/client/components/catalog/SelectOrder.vue
@@ -12,7 +12,7 @@
           :key="field"
           :class="{ 'secondary--text text--lighten-1': sortBy.field === field }"
           @click="$emit('update', { field, order })">
-          <v-list-tile-title>{{ text }}</v-list-tile-title>
+          <v-list-tile-title class="pr-3">{{ text }}</v-list-tile-title>
         </v-list-tile>
       </v-list>
     </v-menu>
diff --git a/client/store/modules/courses/actions.js b/client/store/modules/courses/actions.js
index 24bf42a8b..2b66bda8e 100644
--- a/client/store/modules/courses/actions.js
+++ b/client/store/modules/courses/actions.js
@@ -13,7 +13,7 @@ const {
 } = generateActions('/courses');
 
 const save = ({ commit, dispatch }, model) => {
-  return api.save(model).then(() => {
+  return api.post('/', model).then(() => {
     commit('setOrder', { field: 'createdAt', order: 'DESC' });
     dispatch('reset');
   });

From 572f18ce7866fa245658e847352fea6034b32f6f Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Thu, 18 Jul 2019 08:14:07 +0200
Subject: [PATCH 175/213] :wrench:

---
 client/components/catalog/Create.vue | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/client/components/catalog/Create.vue b/client/components/catalog/Create.vue
index 70e8821be..95152a142 100644
--- a/client/components/catalog/Create.vue
+++ b/client/components/catalog/Create.vue
@@ -3,7 +3,7 @@
     v-hotkey="{ esc: hide }"
     v-if="isAdmin"
     v-model="isVisible"
-    width="600px">
+    width="700px">
     <v-btn
       slot="activator"
       color="pink"
@@ -85,9 +85,7 @@ export default {
   },
   computed: {
     ...mapGetters(['isAdmin']),
-    schemas() {
-      return SCHEMAS;
-    }
+    schemas: () => SCHEMAS
   },
   methods: {
     ...mapActions('courses', ['save']),
@@ -101,10 +99,15 @@ export default {
       });
     },
     hide() {
-      this.isVisible = false;
       this.repository = getDefaultData();
-      this.$validator.reset();
       this.showLoader = false;
+      this.isVisible = false;
+    }
+  },
+  watch: {
+    isVisible(val) {
+      if (!val) return;
+      setTimeout(() => this.$validator.reset(), 60);
     }
   }
 };

From fced098172342a68d78c4f6d0827a2c59fc89681 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Thu, 18 Jul 2019 09:57:15 +0200
Subject: [PATCH 176/213] Tweaked system settings UI

---
 client/components/common/Footer.vue           |  8 +++++-
 .../system-settings/ContentElements.vue       |  6 ++++-
 .../system-settings/StructureTypes.vue        |  6 ++++-
 client/components/system-settings/index.vue   | 27 ++++++++++++-------
 4 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/client/components/common/Footer.vue b/client/components/common/Footer.vue
index a02f7dfd3..15d7ce203 100644
--- a/client/components/common/Footer.vue
+++ b/client/components/common/Footer.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-footer height="48" color="primary" absolute>
+  <v-footer height="46" color="primary" absolute>
     <v-layout row justify-center>
       <v-flex
         xs-12
@@ -17,3 +17,9 @@
     </v-layout>
   </v-footer>
 </template>
+
+<style lang="scss" scoped>
+.v-footer {
+  box-shadow: 0px -1px 1px 0px rgba(0,0,0,0.2);
+}
+</style>
diff --git a/client/components/system-settings/ContentElements.vue b/client/components/system-settings/ContentElements.vue
index 7150e917a..cfcd25ae1 100644
--- a/client/components/system-settings/ContentElements.vue
+++ b/client/components/system-settings/ContentElements.vue
@@ -1,6 +1,10 @@
 <template>
   <v-card class="element-list-container">
-    <v-text-field v-model.trim="search" label="Search" clearable/>
+    <v-text-field
+      v-model.trim="search"
+      label="Search"
+      append-icon="mdi-magnify"
+      clearable/>
     <v-list :expand="true" avatar two-line>
       <v-list-group
         v-for="(group, name) in filteredRegistry"
diff --git a/client/components/system-settings/StructureTypes.vue b/client/components/system-settings/StructureTypes.vue
index 9c292751a..5e8f28469 100644
--- a/client/components/system-settings/StructureTypes.vue
+++ b/client/components/system-settings/StructureTypes.vue
@@ -1,6 +1,10 @@
 <template>
   <v-card class="schema-list-container">
-    <v-text-field v-model.trim="search" label="Search" clearable/>
+    <v-text-field
+      v-model.trim="search"
+      label="Search"
+      append-icon="mdi-magnify"
+      clearable/>
     <v-treeview
       :items="schemas"
       :search="search"
diff --git a/client/components/system-settings/index.vue b/client/components/system-settings/index.vue
index 2b8e3e2f9..32bcdfd49 100644
--- a/client/components/system-settings/index.vue
+++ b/client/components/system-settings/index.vue
@@ -1,6 +1,16 @@
 <template>
-  <div class="system-settings-container grey lighten-2">
-    <div class="heading"></div>
+  <div class="system-settings-container white">
+    <div class="heading primary elevation-5">
+      <v-chip
+        color="primary lighten-4"
+        label
+        class="body-2 mt-2 ml-3">
+        <v-icon color="secondary lighten-1" class="pr-1">
+          mdi-shield-account-outline
+        </v-icon>
+        Admin
+      </v-chip>
+    </div>
     <v-container>
       <v-layout row align-start>
         <v-card>
@@ -31,19 +41,18 @@ export default {
 .system-settings-container {
   width: 100%;
   height: 100%;
-  padding: 46px 0 75px 0;
+  padding: 50px 0 60px;
 }
 
 .heading {
   position: absolute;
   top: 0;
   left: 0;
-  height: 110px;
   width: 100%;
-  background: #455a64;
-  box-shadow:
-    0px 3px 5px -1px rgba(0,0,0,0.2),
-    0px 5px 8px 0px rgba(0,0,0,0.14),
-    0px 1px 14px 0px rgba(0,0,0,0.12);
+  height: 46px;
+  text-align: left;
+  text-transform: uppercase;
+  color: #444;
+  z-index: 2;
 }
 </style>

From 32d084cab256021e7c0be9028ad81ec54e4cf488 Mon Sep 17 00:00:00 2001
From: abasic <antoniobasic@gmail.com>
Date: Thu, 18 Jul 2019 11:53:10 +0200
Subject: [PATCH 177/213] Upped various packages because of security issues

---
 package-lock.json | 109 ++++++++++++++++++----------------------------
 package.json      |   2 +-
 2 files changed, 44 insertions(+), 67 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d6e25083a..9b139cfac 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -54,9 +54,9 @@
           }
         },
         "lodash": {
-          "version": "4.17.11",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+          "version": "4.17.14",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz",
+          "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==",
           "dev": true
         },
         "ms": {
@@ -93,9 +93,9 @@
       },
       "dependencies": {
         "lodash": {
-          "version": "4.17.11",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+          "version": "4.17.14",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz",
+          "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==",
           "dev": true
         },
         "source-map": {
@@ -1310,9 +1310,9 @@
           }
         },
         "lodash": {
-          "version": "4.17.11",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+          "version": "4.17.14",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz",
+          "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==",
           "dev": true
         },
         "ms": {
@@ -1335,9 +1335,9 @@
       },
       "dependencies": {
         "lodash": {
-          "version": "4.17.11",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+          "version": "4.17.14",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz",
+          "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==",
           "dev": true
         }
       }
@@ -1764,9 +1764,9 @@
           "dev": true
         },
         "lodash": {
-          "version": "4.17.11",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+          "version": "4.17.14",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz",
+          "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==",
           "dev": true
         },
         "ms": {
@@ -10026,9 +10026,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.11",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
+      "version": "4.17.14",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz",
+      "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw=="
     },
     "lodash.assign": {
       "version": "4.2.0",
@@ -10113,15 +10113,15 @@
       "dev": true
     },
     "lodash.merge": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.1.tgz",
-      "integrity": "sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==",
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
     "lodash.mergewith": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz",
-      "integrity": "sha512-eWw5r+PYICtEBgrBE5hhlT6aAa75f411bgDz/ZL2KZqYV03USvucsxcHUIlGTDTECs1eunpI7HOV7U+WLDvNdQ==",
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz",
+      "integrity": "sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==",
       "dev": true
     },
     "lodash.once": {
@@ -10715,9 +10715,9 @@
       }
     },
     "mixin-deep": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
-      "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
       "dev": true,
       "requires": {
         "for-in": "^1.0.2",
@@ -15337,9 +15337,9 @@
       "dev": true
     },
     "set-value": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
-      "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
       "dev": true,
       "requires": {
         "extend-shallow": "^2.0.1",
@@ -15668,9 +15668,9 @@
           }
         },
         "lodash": {
-          "version": "4.17.11",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
+          "version": "4.17.14",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz",
+          "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw=="
         },
         "ms": {
           "version": "2.1.1",
@@ -15747,9 +15747,9 @@
           }
         },
         "lodash": {
-          "version": "4.17.11",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
+          "version": "4.17.14",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz",
+          "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw=="
         },
         "ms": {
           "version": "2.1.1",
@@ -15910,9 +15910,9 @@
       },
       "dependencies": {
         "lodash": {
-          "version": "4.17.11",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-          "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
+          "version": "4.17.14",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz",
+          "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw=="
         },
         "source-map": {
           "version": "0.6.1",
@@ -18043,38 +18043,15 @@
       }
     },
     "union-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
-      "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
       "dev": true,
       "requires": {
         "arr-union": "^3.1.0",
         "get-value": "^2.0.6",
         "is-extendable": "^0.1.1",
-        "set-value": "^0.4.3"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "set-value": {
-          "version": "0.4.3",
-          "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
-          "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-extendable": "^0.1.1",
-            "is-plain-object": "^2.0.1",
-            "to-object-path": "^0.3.0"
-          }
-        }
+        "set-value": "^2.0.1"
       }
     },
     "uniq": {
diff --git a/package.json b/package.json
index ca3dfc458..0d13a9ef4 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
     "jsonwebtoken": "^8.0.0",
     "jszip": "^3.1.3",
     "loaders.css": "^0.1.2",
-    "lodash": "^4.17.11",
+    "lodash": "^4.17.14",
     "luxon": "^1.0.0",
     "mime-types": "^2.1.14",
     "minimist": "^1.2.0",

From 69ac85d06a1c98d97f261bdde307384421fc41ad Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Fri, 19 Jul 2019 17:30:55 +0200
Subject: [PATCH 178/213] Merge model upon update :wrench:

---
 client/store/helpers/actions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/store/helpers/actions.js b/client/store/helpers/actions.js
index 8a4d7554b..5d237411c 100644
--- a/client/store/helpers/actions.js
+++ b/client/store/helpers/actions.js
@@ -40,7 +40,7 @@ export default function ($apiUrl) {
     const changes = { ...model };
     delete changes._cid;
     return api.update(cid, changes)
-      .then(updated => commit('save', updated));
+      .then(updated => commit('save', { ...model, ...updated }));
   };
 
   const remove = ({ commit }, model) => {

From 30085a15eba9c01e789edfa430d8b7cc1f5de67d Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Mon, 22 Jul 2019 10:18:49 +0200
Subject: [PATCH 179/213] Tweaked catalog fetch

- Bumped vue-infinite-loading
- Simplified methods for retrieval / loading
- Fixed issue with pagination reset upon filtering
---
 client/components/catalog/Container.vue   | 60 ++++++++---------------
 client/store/modules/courses/actions.js   | 10 ++--
 client/store/modules/courses/getters.js   | 14 +++---
 client/store/modules/courses/mutations.js |  4 +-
 package.json                              |  2 +-
 5 files changed, 35 insertions(+), 55 deletions(-)

diff --git a/client/components/catalog/Container.vue b/client/components/catalog/Container.vue
index b459e6804..64e766378 100644
--- a/client/components/catalog/Container.vue
+++ b/client/components/catalog/Container.vue
@@ -4,16 +4,12 @@
       <v-layout row class="catalog-actions">
         <create-repository/>
         <v-flex md4 sm10 offset-md4 offset-sm1>
-          <search @change="search"/>
+          <search @change="setSearch($event)"/>
         </v-flex>
         <v-flex md3 sm1 class="text-sm-left pl-2">
           <v-tooltip open-delay="800" right>
             <template v-slot:activator="{ on }">
-              <v-btn
-                v-on="on"
-                @click="togglePinned() || search(queryParams.search)"
-                icon
-                flat>
+              <v-btn v-on="on" @click="togglePinned()" icon flat>
                 <v-icon :color="showPinned ? 'lime accent-3' : 'primary lighten-4'">
                   mdi-pin
                 </v-icon>
@@ -24,7 +20,7 @@
           <select-order :sortBy="sortBy" @update="setOrder" class="pl-2"/>
         </v-flex>
       </v-layout>
-      <v-layout v-show="!searching" row wrap>
+      <v-layout row wrap>
         <v-flex
           v-for="repository in repositories"
           :key="repository._cid"
@@ -33,7 +29,7 @@
           <repository-card :repository="repository"/>
         </v-flex>
       </v-layout>
-      <infinite-loading ref="infiniteLoading" @infinite="loadMore">
+      <infinite-loading ref="loader" @infinite="load">
         <div slot="spinner" class="spinner">
           <v-progress-circular color="primary" indeterminate/>
         </div>
@@ -57,17 +53,13 @@ import { mapActions, mapGetters, mapMutations, mapState } from 'vuex';
 import CreateRepository from './Create';
 import get from 'lodash/get';
 import InfiniteLoading from 'vue-infinite-loading';
-import Promise from 'bluebird';
+import isEqual from 'lodash/isEqual';
+import pick from 'lodash/pick';
 import RepositoryCard from './Card';
 import Search from './Search';
 import SelectOrder from './SelectOrder';
 
 export default {
-  data() {
-    return {
-      searching: false
-    };
-  },
   computed: {
     ...mapState('courses', {
       sortBy: state => state.$internals.sort,
@@ -78,6 +70,9 @@ export default {
       queryParams: 'courseQueryParams',
       hasMoreResults: 'hasMoreResults'
     }),
+    loader() {
+      return get(this.$refs, 'loader.stateChanger', {});
+    },
     hasRepositories() {
       return !!this.repositories.length;
     },
@@ -86,43 +81,28 @@ export default {
       if (this.queryParams.search) return 'No matches found';
       if (this.showPinned) return '0 pinned items';
       return '0 available repositories';
-    },
-    loaderState() {
-      return get(this.$refs, 'infiniteLoading.stateChanger', {});
     }
   },
   methods: {
     ...mapActions('courses', ['fetch']),
     ...mapMutations('courses', ['togglePinned', 'setSearch', 'setOrder']),
-    loadMore() {
+    load() {
       return this.fetch().then(() => {
-        if (this.hasRepositories) this.loaderState.loaded();
-        if (!this.hasMoreResults) this.loaderState.complete();
+        if (this.hasRepositories) this.loader.loaded();
+        if (!this.hasMoreResults) this.loader.complete();
       });
-    },
-    load(query) {
-      this.loaderState.loaded();
-      this.loaderState.complete();
-      return Promise.join(this.fetch({ reset: true }))
-        .then(() => {
-          this.loaderState.reset();
-          if (this.hasRepositories) this.loaderState.loaded();
-          if (!this.hasMoreResults) this.loaderState.complete();
-        });
-    },
-    search(query) {
-      this.setSearch(query);
-      this.searching = true;
-      return this.load()
-        .then(() => (this.searching = false));
     }
   },
   watch: {
-    sortBy(val) {
-      this.search();
+    repositories(items) {
+      // If all items get unpinned
+      if (!items.length & this.showPinned) this.loader.reset();
     },
-    repositories(val) {
-      if (!val.length & this.showPinned) this.loaderState.reset();
+    queryParams(val, oldVal) {
+      const attrs = ['search', 'sortOrder', 'sortBy', 'pinned'];
+      const changedFilter = !isEqual(pick(val, attrs), pick(oldVal, attrs));
+      if (!changedFilter) return;
+      this.load().then(() => this.loader.reset());
     }
   },
   components: {
diff --git a/client/store/modules/courses/actions.js b/client/store/modules/courses/actions.js
index 2b66bda8e..1e81d0feb 100644
--- a/client/store/modules/courses/actions.js
+++ b/client/store/modules/courses/actions.js
@@ -19,13 +19,13 @@ const save = ({ commit, dispatch }, model) => {
   });
 };
 
-const fetch = ({ getters, commit }, { reset = false } = {}) => {
-  const mutation = reset ? 'reset' : 'fetch';
+const fetch = ({ getters, commit }) => {
   const params = getters.courseQueryParams;
-  return fetchCourses(params).then(courses => {
+  const mutation = params.offset === 0 ? 'reset' : 'fetch';
+  return fetchCourses(params).then(items => {
+    commit(mutation, items);
     commit('setPagination', { offset: params.offset + params.limit });
-    commit('allCoursesFetched', Object.keys(courses).length < params.limit);
-    commit(mutation, courses);
+    commit('allCoursesFetched', Object.keys(items).length < params.limit);
   });
 };
 
diff --git a/client/store/modules/courses/getters.js b/client/store/modules/courses/getters.js
index 70ac3d87c..7e997d827 100644
--- a/client/store/modules/courses/getters.js
+++ b/client/store/modules/courses/getters.js
@@ -1,13 +1,11 @@
-import filter from 'lodash/filter';
-import get from 'lodash/get';
+import isString from 'lodash/isString';
 import orderBy from 'lodash/orderBy';
 
-export const courses = state => {
-  const { sort } = state.$internals;
-  const items = state.showPinned
-    ? filter(state.items, it => get(it, 'courseUser.pinned'))
-    : state.items;
-  return orderBy(items, sort.field, sort.order.toLowerCase());
+const processSortAttr = val => isString(val) ? val.toLowerCase() : val;
+
+export const courses = ({ items, $internals }) => {
+  const { sort: { field, order } } = $internals;
+  return orderBy(items, it => processSortAttr(it[field]), order.toLowerCase());
 };
 
 export const courseQueryParams = state => {
diff --git a/client/store/modules/courses/mutations.js b/client/store/modules/courses/mutations.js
index b89775df3..3025f174b 100644
--- a/client/store/modules/courses/mutations.js
+++ b/client/store/modules/courses/mutations.js
@@ -15,15 +15,17 @@ const fetchPinned = (state, courses) => {
 };
 
 const togglePinned = state => {
+  state.$internals.pagination = { ...PAGINATION_DEFAULTS };
   state.showPinned = !state.showPinned;
 };
 
 const setSearch = (state, query = '') => {
-  state.$internals.pagination = PAGINATION_DEFAULTS;
+  state.$internals.pagination = { ...PAGINATION_DEFAULTS };
   state.search = query;
 };
 
 const setOrder = (state, order) => {
+  state.$internals.pagination = { ...PAGINATION_DEFAULTS };
   state.$internals.sort = { ...state.$internals.sort, ...order };
 };
 
diff --git a/package.json b/package.json
index ca3dfc458..c7dd41568 100644
--- a/package.json
+++ b/package.json
@@ -123,7 +123,7 @@
     "vue-datetime": "^1.0.0-beta.3",
     "vue-directive-tooltip": "^1.4.2",
     "vue-focus": "^2.1.0",
-    "vue-infinite-loading": "^2.2.1",
+    "vue-infinite-loading": "^2.4.4",
     "vue-infinite-scroll": "^2.0.0",
     "vue-multiselect": "^2.1.0",
     "vue-plyr": "^3.0.0",

From dfbf3caf0a9eea9eea7fb3e82941dd919ac426d7 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Mon, 22 Jul 2019 10:55:45 +0200
Subject: [PATCH 180/213] UI tweaks :lipstick:

---
 client/components/catalog/Container.vue     | 2 +-
 client/components/system-settings/index.vue | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/client/components/catalog/Container.vue b/client/components/catalog/Container.vue
index 64e766378..da898eb12 100644
--- a/client/components/catalog/Container.vue
+++ b/client/components/catalog/Container.vue
@@ -157,7 +157,7 @@ export default {
 
   /deep/ .add-repo {
     top: 10px;
-    right: 16px;
+    right: 12px;
   }
 }
 </style>
diff --git a/client/components/system-settings/index.vue b/client/components/system-settings/index.vue
index 32bcdfd49..e7f3251b2 100644
--- a/client/components/system-settings/index.vue
+++ b/client/components/system-settings/index.vue
@@ -2,12 +2,10 @@
   <div class="system-settings-container white">
     <div class="heading primary elevation-5">
       <v-chip
-        color="primary lighten-4"
+        color="primary lighten-3"
         label
-        class="body-2 mt-2 ml-3">
-        <v-icon color="secondary lighten-1" class="pr-1">
-          mdi-shield-account-outline
-        </v-icon>
+        class="mt-2 ml-3 primary--text text--darken-2 body-2">
+        <v-icon color="primary darken-2" class="pr-1">mdi-shield-outline</v-icon>
         Admin
       </v-chip>
     </div>

From c6c103da19b7d6e22c51b095ded722c3a6d1650d Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Mon, 22 Jul 2019 12:27:28 +0200
Subject: [PATCH 181/213] Use Vuetify generated css variables

---
 client/components/auth/Container.vue | 14 ++++++--------
 client/components/common/Navbar.vue  |  6 ++----
 client/main.js                       |  3 +++
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/client/components/auth/Container.vue b/client/components/auth/Container.vue
index bd9530e45..b709f73a1 100644
--- a/client/components/auth/Container.vue
+++ b/client/components/auth/Container.vue
@@ -14,16 +14,14 @@
 
 <script>
 export default {
-  data: () => ({
-    title: BRAND_CONFIG.TITLE,
-    logo: BRAND_CONFIG.LOGO_FULL
-  })
+  computed: {
+    title: () => BRAND_CONFIG.TITLE,
+    logo: () => BRAND_CONFIG.LOGO_FULL
+  }
 };
 </script>
 
 <style lang="scss">
-$primary: #2e434c;
-
 .auth-container {
   padding-top: 5%;
 }
@@ -44,7 +42,7 @@ $primary: #2e434c;
 
   .auth-header {
     padding-bottom: 20px;
-    background-color: $primary;
+    background-color: var(--v-primary-darken1);
     border-radius: 4px 4px 0 0;
 
     .logo {
@@ -64,7 +62,7 @@ $primary: #2e434c;
   .message {
     min-height: 16px;
     margin-bottom: 20px;
-    color: #e91e63;
+    color: var(--v-secondary-base);
     font-size: 16px;
     line-height: 16px;
   }
diff --git a/client/components/common/Navbar.vue b/client/components/common/Navbar.vue
index c9401a566..2501fc781 100644
--- a/client/components/common/Navbar.vue
+++ b/client/components/common/Navbar.vue
@@ -49,13 +49,11 @@ export default {
   props: {
     user: { type: Object, required: true }
   },
-  data: () => ({
-    title: BRAND_CONFIG.TITLE,
-    logo: BRAND_CONFIG.LOGO_COMPACT
-  }),
   computed: {
     ...mapGetters(['isAdmin']),
     ...mapGetters('course', { repository: 'course' }),
+    title: () => BRAND_CONFIG.TITLE,
+    logo: () => BRAND_CONFIG.LOGO_COMPACT,
     routes() {
       const items = [
         { name: 'Catalog', to: { name: 'catalog' }, icon: 'view-list' },
diff --git a/client/main.js b/client/main.js
index 9d9046891..841b6d45b 100644
--- a/client/main.js
+++ b/client/main.js
@@ -36,6 +36,9 @@ Vue.use(Vuetify, {
   theme: {
     primary: colors.blueGrey.darken2,
     secondary: colors.pink
+  },
+  options: {
+    customProperties: true
   }
 });
 Vue.use(VuetifySnackbar);

From 1910c71f9ffded7f59398594696c25fead949d58 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Mon, 22 Jul 2019 13:39:11 +0200
Subject: [PATCH 182/213] Cleanup

- Removed bootstrap classes
- Added input icons
- Removed leftovers
---
 client/components/auth/Container.vue      |  9 +---
 client/components/auth/ForgotPassword.vue | 52 ++++++++------------
 client/components/auth/Login.vue          | 47 ++++++++----------
 client/components/auth/ResetPassword.vue  | 58 +++++++++++------------
 4 files changed, 72 insertions(+), 94 deletions(-)

diff --git a/client/components/auth/Container.vue b/client/components/auth/Container.vue
index b709f73a1..253a641d1 100644
--- a/client/components/auth/Container.vue
+++ b/client/components/auth/Container.vue
@@ -6,7 +6,7 @@
         <h1>{{ title }}</h1>
       </div>
       <div class="auth-body">
-        <router-view></router-view>
+        <router-view/>
       </div>
     </div>
   </div>
@@ -31,13 +31,11 @@ export default {
   margin: auto;
   background-color: #fff;
   border-radius: 4px;
-  transition: all 0.3s cubic-bezier(0.25,0.8,0.25,1);
 
   h1 {
     margin: 0;
     color: white;
     font-size: 1.57rem;
-    line-height: 18px;
   }
 
   .auth-header {
@@ -46,6 +44,7 @@ export default {
     border-radius: 4px 4px 0 0;
 
     .logo {
+      width: 5.36rem;
       margin: 30px 0;
     }
   }
@@ -67,8 +66,4 @@ export default {
     line-height: 16px;
   }
 }
-
-.logo {
-  width: 5.36rem;
-}
 </style>
diff --git a/client/components/auth/ForgotPassword.vue b/client/components/auth/ForgotPassword.vue
index 54b0a663e..7cda6e12e 100644
--- a/client/components/auth/ForgotPassword.vue
+++ b/client/components/auth/ForgotPassword.vue
@@ -1,27 +1,22 @@
 <template>
   <div>
-    <div v-if="showMessage" class="well">
-      <span>{{ message }}</span>
-    </div>
-    <div v-else>
-      <form @submit.prevent="submit">
-        <div class="form-group">
-          <v-text-field
-            v-validate="{ required: true, email: true }"
-            v-model="email"
-            :error-messages="vErrors.collect('email')"
-            type="email"
-            name="email"
-            label="Please enter your email"/>
-        </div>
-        <v-btn :disabled="!isValid" color="primary" outline block type="submit">
-          Send reset email
-        </v-btn>
-        <div class="options">
-          <a @click="$router.go(-1)">Back</a>
-        </div>
-      </form>
-    </div>
+    <v-alert :value="showMessage" color="primary" class="mb-4">{{ message }}</v-alert>
+    <form @submit.prevent="submit">
+      <v-text-field
+        v-validate="{ required: true, email: true }"
+        v-model="email"
+        :error-messages="vErrors.collect('email')"
+        prepend-icon="mdi-email-outline"
+        type="email"
+        name="email"
+        label="Please enter your email"/>
+      <v-btn :disabled="!isValid" color="primary" outline block type="submit">
+        Send reset email
+      </v-btn>
+      <div class="options">
+        <a @click="$router.go(-1)">Back</a>
+      </div>
+    </form>
   </div>
 </template>
 
@@ -35,34 +30,27 @@ export default {
   data() {
     return {
       email: '',
-      message: 'Reset email sent',
+      message: 'Sending reset email...',
       showMessage: false
     };
   },
   computed: {
-    isValid() {
-      return this.email && this.vErrors.count() === 0;
-    }
+    isValid: vm => vm.email && vm.vErrors.count() === 0
   },
   methods: {
     ...mapActions(['forgotPassword']),
     submit() {
-      // TODO: Temp
       this.showMessage = true;
       this.forgotPassword({ email: this.email })
         .then(() => delay(1000))
         .then(() => this.$router.push('/'))
-        .catch(() => (this.message = 'Error'));
+        .catch(() => (this.message = 'Something went wrong!'));
     }
   }
 };
 </script>
 
 <style lang="scss" scoped>
-.well {
-  font-size: 16px;
-}
-
 .options {
   padding-top: 10px;
 
diff --git a/client/components/auth/Login.vue b/client/components/auth/Login.vue
index 315d05a4e..58ff4fce2 100644
--- a/client/components/auth/Login.vue
+++ b/client/components/auth/Login.vue
@@ -1,27 +1,25 @@
 <template>
   <div>
-    <div class="message">
-      <span v-if="message">{{ message }}</span>
-    </div>
+    <div v-visible="message" class="message">{{ message }}</div>
     <form @submit.prevent="submit" novalidate>
-      <div class="form-group">
-        <v-text-field
-          v-validate="{ required: true, email: true }"
-          v-model="email"
-          :error-messages="vErrors.collect('email')"
-          type="email"
-          name="email"
-          label="Email"/>
-      </div>
-      <div class="form-group">
-        <v-text-field
-          v-validate="{ required: true }"
-          v-model="password"
-          :error-messages="vErrors.collect('password')"
-          type="password"
-          name="password"
-          label="Password"/>
-      </div>
+      <v-text-field
+        v-validate="{ required: true, email: true }"
+        v-model="email"
+        :error-messages="vErrors.collect('email')"
+        prepend-icon="mdi-email-outline"
+        type="email"
+        name="email"
+        label="Email"
+        class="py-2"/>
+      <v-text-field
+        v-validate="{ required: true }"
+        v-model="password"
+        :error-messages="vErrors.collect('password')"
+        prepend-icon="mdi-lock-outline"
+        type="password"
+        name="password"
+        label="Password"
+        class="py-2"/>
       <v-btn :disabled="!isValid" color="primary" outline block type="submit">
         Log in
       </v-btn>
@@ -35,7 +33,7 @@
 </template>
 
 <script>
-import { mapActions, mapState } from 'vuex';
+import { mapActions } from 'vuex';
 import { withValidation } from 'utils/validation';
 const LOGIN_ERR_MESSAGE = 'User email and password do not match';
 
@@ -50,10 +48,7 @@ export default {
     };
   },
   computed: {
-    ...mapState({ user: state => state.auth.user }),
-    isValid() {
-      return this.email && this.password && this.vErrors.count() === 0;
-    }
+    isValid: vm => vm.email && vm.password && (vm.vErrors.count() === 0)
   },
   methods: {
     ...mapActions(['login']),
diff --git a/client/components/auth/ResetPassword.vue b/client/components/auth/ResetPassword.vue
index a236a1f48..7140672ff 100644
--- a/client/components/auth/ResetPassword.vue
+++ b/client/components/auth/ResetPassword.vue
@@ -1,27 +1,33 @@
 <template>
   <div>
-    <div class="message"><span>{{ error }}</span></div>
+    <div class="message">{{ error }}</div>
     <form @submit.prevent="submit">
-      <div class="form-group">
-        <v-text-field
-          v-validate="{ required: true, min: 6, alphanumerical: true }"
-          ref="password"
-          v-model="password"
-          :error-messages="vErrors.collect('password')"
-          name="password"
-          type="password"
-          label="Password"/>
-      </div>
-      <div class="form-group">
-        <v-text-field
-          v-validate="{ required: true, confirmed: 'password' }"
-          :error-messages="vErrors.collect('passwordConfirmation')"
-          data-vv-as="password"
-          name="passwordConfirmation"
-          type="password"
-          label="Please re-enter your password"/>
-      </div>
-      <v-btn :disabled="!isValid" color="primary" outline block type="submit">
+      <v-text-field
+        v-validate="{ required: true, min: 6, alphanumerical: true }"
+        ref="password"
+        v-model="password"
+        :error-messages="vErrors.collect('password')"
+        prepend-icon="mdi-lock"
+        name="password"
+        type="password"
+        label="Password"
+        class="my-1"/>
+      <v-text-field
+        v-validate="{ required: true, confirmed: 'password' }"
+        :error-messages="vErrors.collect('passwordConfirmation')"
+        prepend-icon="mdi-lock-outline"
+        data-vv-as="password"
+        name="passwordConfirmation"
+        type="password"
+        label="Please re-enter your password"
+        class="my-1"/>
+      <v-btn
+        :disabled="!isValid"
+        color="primary"
+        outline
+        block
+        type="submit"
+        class="mt-3">
         Change password
       </v-btn>
     </form>
@@ -48,8 +54,8 @@ export default {
   methods: {
     ...mapActions(['resetPassword']),
     submit() {
-      const token = this.$route.params.token;
-      this.$validator.validateAll().then(result => {
+      const { token } = this.$route.params;
+      this.$validator.validateAll().then(() => {
         return this.resetPassword({ password: this.password, token })
           .then(() => this.$router.push('/'))
           .catch(() => (this.error = 'An error has occurred!'));
@@ -58,9 +64,3 @@ export default {
   }
 };
 </script>
-
-<style lang="scss" scoped>
-.form-group {
-  margin-top: 10px;
-}
-</style>

From b47f1577dd4a5a3e34c0d242822daee4c460a35c Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Mon, 22 Jul 2019 15:46:44 +0200
Subject: [PATCH 183/213] :wrench:

- Disable autocomplete due to placeholder UI issues
- Temp define size in px due to build issues
---
 client/components/auth/Container.vue | 4 ++--
 client/components/auth/Login.vue     | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/components/auth/Container.vue b/client/components/auth/Container.vue
index 253a641d1..abcd177d3 100644
--- a/client/components/auth/Container.vue
+++ b/client/components/auth/Container.vue
@@ -35,7 +35,7 @@ export default {
   h1 {
     margin: 0;
     color: white;
-    font-size: 1.57rem;
+    font-size: 22px;
   }
 
   .auth-header {
@@ -44,7 +44,7 @@ export default {
     border-radius: 4px 4px 0 0;
 
     .logo {
-      width: 5.36rem;
+      width: 75px;
       margin: 30px 0;
     }
   }
diff --git a/client/components/auth/Login.vue b/client/components/auth/Login.vue
index 58ff4fce2..ae60d31dd 100644
--- a/client/components/auth/Login.vue
+++ b/client/components/auth/Login.vue
@@ -16,6 +16,7 @@
         v-model="password"
         :error-messages="vErrors.collect('password')"
         prepend-icon="mdi-lock-outline"
+        browser-autocomplete="new-password"
         type="password"
         name="password"
         label="Password"

From db7a0f8f841aba8876dbbfc51d85f9250eefd307 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Mon, 22 Jul 2019 16:05:57 +0200
Subject: [PATCH 184/213] Fixed issue with search persistance :wrench:

---
 client/components/catalog/Container.vue |  2 +-
 client/components/catalog/Search.vue    | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/client/components/catalog/Container.vue b/client/components/catalog/Container.vue
index da898eb12..cafbe671f 100644
--- a/client/components/catalog/Container.vue
+++ b/client/components/catalog/Container.vue
@@ -4,7 +4,7 @@
       <v-layout row class="catalog-actions">
         <create-repository/>
         <v-flex md4 sm10 offset-md4 offset-sm1>
-          <search @change="setSearch($event)"/>
+          <search :value="queryParams.search" @update="setSearch($event)"/>
         </v-flex>
         <v-flex md3 sm1 class="text-sm-left pl-2">
           <v-tooltip open-delay="800" right>
diff --git a/client/components/catalog/Search.vue b/client/components/catalog/Search.vue
index 9a3a0ee34..d29f07440 100644
--- a/client/components/catalog/Search.vue
+++ b/client/components/catalog/Search.vue
@@ -3,7 +3,7 @@
     <div :style="{ width: expanded ? '100%' : '95%' }">
       <v-text-field
         v-focus="expanded"
-        v-model.trim="query"
+        :value="value"
         @focus="expanded = true"
         @blur="expanded = false"
         @input="emitChange"
@@ -20,15 +20,17 @@ import debounce from 'lodash/debounce';
 import focus from 'vue-focus';
 
 export default {
+  props: {
+    value: { type: String, default: null }
+  },
   data() {
     return {
-      query: '',
       expanded: false
     };
   },
   methods: {
-    emitChange: debounce(function () {
-      this.$emit('change', this.query);
+    emitChange: debounce(function (val) {
+      this.$emit('update', val && val.trim());
     }, 500)
   },
   directives: focus

From 9d976cfd9d3621d0e28f32f426bc83b6e37d077b Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Tue, 23 Jul 2019 09:32:46 +0200
Subject: [PATCH 185/213] FIxed issue with confirmation

- Needs binded value for confirmation in order to avoid validation issues
---
 client/components/auth/ResetPassword.vue | 4 +++-
 package-lock.json                        | 6 +++---
 package.json                             | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/client/components/auth/ResetPassword.vue b/client/components/auth/ResetPassword.vue
index 7140672ff..07b8c502a 100644
--- a/client/components/auth/ResetPassword.vue
+++ b/client/components/auth/ResetPassword.vue
@@ -14,6 +14,7 @@
         class="my-1"/>
       <v-text-field
         v-validate="{ required: true, confirmed: 'password' }"
+        v-model="passwordConfirmation"
         :error-messages="vErrors.collect('passwordConfirmation')"
         prepend-icon="mdi-lock-outline"
         data-vv-as="password"
@@ -43,7 +44,8 @@ export default {
   data() {
     return {
       error: null,
-      password: ''
+      password: '',
+      passwordConfirmation: ''
     };
   },
   computed: {
diff --git a/package-lock.json b/package-lock.json
index d6e25083a..a235997e3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18573,9 +18573,9 @@
       "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
     },
     "vee-validate": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/vee-validate/-/vee-validate-2.2.3.tgz",
-      "integrity": "sha512-Ss9Jsolq4KV5gT70MGmjPY3AKDE2UvJeJiUXAvrcnC4psDBeMqhD5saX9+cLS4Alsm13x5mnaoCk03SoQjhksA=="
+      "version": "2.2.13",
+      "resolved": "https://registry.npmjs.org/vee-validate/-/vee-validate-2.2.13.tgz",
+      "integrity": "sha512-Mj5vFyrSnqIAFZOfhF1asLqymV/rEWQNv7gjWCQIydQ1evKoQ7TzP0F9HZzuWEIWotI2/UumMK5QI8wRkeL0kQ=="
     },
     "vendors": {
       "version": "1.0.3",
diff --git a/package.json b/package.json
index ca3dfc458..8ffa64b31 100644
--- a/package.json
+++ b/package.json
@@ -115,7 +115,7 @@
     "untildify": "^4.0.0",
     "url-join": "^4.0.0",
     "v-hotkey": "^0.3.0",
-    "vee-validate": "^2.2.3",
+    "vee-validate": "^2.2.13",
     "vue": "^2.6.10",
     "vue-aplayer": "^1.4.1",
     "vue-avatar": "^2.1.1",

From 36fda53489d1d9c737be05625907a0d86edfffe9 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Tue, 23 Jul 2019 09:36:06 +0200
Subject: [PATCH 186/213] Tweaked pw reset notification

---
 client/components/auth/ForgotPassword.vue | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/client/components/auth/ForgotPassword.vue b/client/components/auth/ForgotPassword.vue
index 7cda6e12e..f27622f99 100644
--- a/client/components/auth/ForgotPassword.vue
+++ b/client/components/auth/ForgotPassword.vue
@@ -1,6 +1,11 @@
 <template>
   <div>
-    <v-alert :value="showMessage" color="primary" class="mb-4">{{ message }}</v-alert>
+    <v-alert
+      :value="showMessage"
+      :color="error ? 'secondary' : 'primary lighten-1'"
+      class="mb-4 body-2">
+      {{ error || 'Sending reset email...' }}
+    </v-alert>
     <form @submit.prevent="submit">
       <v-text-field
         v-validate="{ required: true, email: true }"
@@ -30,8 +35,8 @@ export default {
   data() {
     return {
       email: '',
-      message: 'Sending reset email...',
-      showMessage: false
+      showMessage: false,
+      error: null
     };
   },
   computed: {
@@ -41,10 +46,9 @@ export default {
     ...mapActions(['forgotPassword']),
     submit() {
       this.showMessage = true;
-      this.forgotPassword({ email: this.email })
-        .then(() => delay(1000))
+      Promise.all([this.forgotPassword({ email: this.email }), delay(3000)])
         .then(() => this.$router.push('/'))
-        .catch(() => (this.message = 'Something went wrong!'));
+        .catch(() => (this.error = 'Something went wrong!'));
     }
   }
 };

From 89a57e74c74df32f73470571d5d48438622ec655 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Tue, 23 Jul 2019 10:00:09 +0200
Subject: [PATCH 187/213] Reset filters upon adding new repo

---
 client/store/modules/courses/actions.js   | 1 +
 client/store/modules/courses/mutations.js | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/client/store/modules/courses/actions.js b/client/store/modules/courses/actions.js
index 1e81d0feb..d69513b1d 100644
--- a/client/store/modules/courses/actions.js
+++ b/client/store/modules/courses/actions.js
@@ -15,6 +15,7 @@ const {
 const save = ({ commit, dispatch }, model) => {
   return api.post('/', model).then(() => {
     commit('setOrder', { field: 'createdAt', order: 'DESC' });
+    commit('resetFilters');
     dispatch('reset');
   });
 };
diff --git a/client/store/modules/courses/mutations.js b/client/store/modules/courses/mutations.js
index 3025f174b..b5b7cea37 100644
--- a/client/store/modules/courses/mutations.js
+++ b/client/store/modules/courses/mutations.js
@@ -38,6 +38,11 @@ const resetPagination = state => {
   state.$internals.pagination = PAGINATION_DEFAULTS;
 };
 
+const resetFilters = state => {
+  state.search = '';
+  state.showPinned = false;
+};
+
 const allCoursesFetched = (state, allFetched) => {
   state.$internals.allCoursesFetched = allFetched;
 };
@@ -50,6 +55,7 @@ export {
   remove,
   reset,
   resetPagination,
+  resetFilters,
   save,
   setEndpoint,
   setPagination,

From e0f4becda87c1b165e4bfa02486c029bc3bfcd8d Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Tue, 23 Jul 2019 10:10:06 +0200
Subject: [PATCH 188/213] Fixed issue with unpinning a repo

---
 client/store/modules/courses/getters.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/client/store/modules/courses/getters.js b/client/store/modules/courses/getters.js
index 7e997d827..15b1fd1c9 100644
--- a/client/store/modules/courses/getters.js
+++ b/client/store/modules/courses/getters.js
@@ -1,10 +1,15 @@
+import filter from 'lodash/filter';
+import get from 'lodash/get';
 import isString from 'lodash/isString';
 import orderBy from 'lodash/orderBy';
 
 const processSortAttr = val => isString(val) ? val.toLowerCase() : val;
 
-export const courses = ({ items, $internals }) => {
-  const { sort: { field, order } } = $internals;
+export const courses = state => {
+  const items = state.showPinned
+    ? filter(state.items, it => get(it, 'courseUser.pinned'))
+    : state.items;
+  const { sort: { field, order } } = state.$internals;
   return orderBy(items, it => processSortAttr(it[field]), order.toLowerCase());
 };
 

From f91c5b2a33ee011d67c9ea855b9454b9db71bed3 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Tue, 23 Jul 2019 10:10:35 +0200
Subject: [PATCH 189/213] Check validation before reseting pw

---
 client/components/auth/ResetPassword.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/components/auth/ResetPassword.vue b/client/components/auth/ResetPassword.vue
index 07b8c502a..e86d7adee 100644
--- a/client/components/auth/ResetPassword.vue
+++ b/client/components/auth/ResetPassword.vue
@@ -57,7 +57,8 @@ export default {
     ...mapActions(['resetPassword']),
     submit() {
       const { token } = this.$route.params;
-      this.$validator.validateAll().then(() => {
+      this.$validator.validateAll().then(isValid => {
+        if (!isValid) return;
         return this.resetPassword({ password: this.password, token })
           .then(() => this.$router.push('/'))
           .catch(() => (this.error = 'An error has occurred!'));

From 392cb05b446c92b6ce3679f622aba6158d6cddd8 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Tue, 23 Jul 2019 11:04:14 +0200
Subject: [PATCH 190/213] Tweaked reset pw flow :wrench:

---
 client/components/auth/ForgotPassword.vue | 27 +++++++++++++++--------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/client/components/auth/ForgotPassword.vue b/client/components/auth/ForgotPassword.vue
index f27622f99..396505ba9 100644
--- a/client/components/auth/ForgotPassword.vue
+++ b/client/components/auth/ForgotPassword.vue
@@ -6,7 +6,7 @@
       class="mb-4 body-2">
       {{ error || 'Sending reset email...' }}
     </v-alert>
-    <form @submit.prevent="submit">
+    <form v-if="!error" @submit.prevent="submit">
       <v-text-field
         v-validate="{ required: true, email: true }"
         v-model="email"
@@ -15,13 +15,19 @@
         type="email"
         name="email"
         label="Please enter your email"/>
-      <v-btn :disabled="!isValid" color="primary" outline block type="submit">
+      <v-btn
+        :disabled="!isValid || showMessage"
+        color="primary"
+        outline
+        block
+        type="submit">
         Send reset email
       </v-btn>
       <div class="options">
         <a @click="$router.go(-1)">Back</a>
       </div>
     </form>
+    <a v-else @click.stop="resetInput">Retry</a>
   </div>
 </template>
 
@@ -30,15 +36,15 @@ import { delay } from 'bluebird';
 import { mapActions } from 'vuex';
 import { withValidation } from 'utils/validation';
 
+const getDefaultData = () => ({
+  email: '',
+  showMessage: false,
+  error: null
+});
+
 export default {
   mixins: [withValidation()],
-  data() {
-    return {
-      email: '',
-      showMessage: false,
-      error: null
-    };
-  },
+  data: () => getDefaultData(),
   computed: {
     isValid: vm => vm.email && vm.vErrors.count() === 0
   },
@@ -49,6 +55,9 @@ export default {
       Promise.all([this.forgotPassword({ email: this.email }), delay(3000)])
         .then(() => this.$router.push('/'))
         .catch(() => (this.error = 'Something went wrong!'));
+    },
+    resetInput() {
+      Object.assign(this, getDefaultData());
     }
   }
 };

From 63635950bd5831abc782a614245ef2566c404784 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Tue, 23 Jul 2019 11:38:46 +0200
Subject: [PATCH 191/213] :lipstick:

---
 client/components/system-settings/UserManagement/index.vue | 1 +
 client/components/system-settings/index.vue                | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/client/components/system-settings/UserManagement/index.vue b/client/components/system-settings/UserManagement/index.vue
index 962938f85..4c59020f7 100644
--- a/client/components/system-settings/UserManagement/index.vue
+++ b/client/components/system-settings/UserManagement/index.vue
@@ -4,6 +4,7 @@
       <v-toolbar color="white" flat>
         <v-spacer/>
         <v-btn @click.stop="showUserDialog()" color="primary darken-1" outline>
+          <v-icon class="pr-2">mdi-account-plus-outline</v-icon>
           Add user
         </v-btn>
       </v-toolbar>
diff --git a/client/components/system-settings/index.vue b/client/components/system-settings/index.vue
index e7f3251b2..a3d595917 100644
--- a/client/components/system-settings/index.vue
+++ b/client/components/system-settings/index.vue
@@ -2,10 +2,10 @@
   <div class="system-settings-container white">
     <div class="heading primary elevation-5">
       <v-chip
-        color="primary lighten-3"
+        color="grey lighten-2"
         label
-        class="mt-2 ml-3 primary--text text--darken-2 body-2">
-        <v-icon color="primary darken-2" class="pr-1">mdi-shield-outline</v-icon>
+        outline
+        class="mt-2 ml-3 px-3 body-2">
         Admin
       </v-chip>
     </div>

From 3072501282c7aa5b7ddf57dfbcd81a0ea69bfc0c Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Tue, 23 Jul 2019 12:39:11 +0200
Subject: [PATCH 192/213] Tweaked user mgm filters

---
 .../system-settings/UserManagement/index.vue  | 40 ++++++-------------
 1 file changed, 13 insertions(+), 27 deletions(-)

diff --git a/client/components/system-settings/UserManagement/index.vue b/client/components/system-settings/UserManagement/index.vue
index 4c59020f7..a67939374 100644
--- a/client/components/system-settings/UserManagement/index.vue
+++ b/client/components/system-settings/UserManagement/index.vue
@@ -9,8 +9,15 @@
         </v-btn>
       </v-toolbar>
       <div>
-        <v-layout column align-end class="px-4 table-toolbar">
-          <v-flex lg4>
+        <v-layout row class="filters">
+          <v-flex>
+            <v-switch
+              v-model="showArchived"
+              label="Archived"
+              color="secondary"
+              hide-details/>
+          </v-flex>
+          <v-flex>
             <v-text-field
               v-model="filter"
               append-icon="mdi-magnify"
@@ -19,13 +26,6 @@
               hide-details
               clearable/>
           </v-flex>
-          <v-flex lg4 class="my-1">
-            <v-checkbox
-              v-model="showArchived"
-              label="Show archived"
-              class="archived-checkbox"
-              hide-details/>
-          </v-flex>
         </v-layout>
         <v-data-table
           :headers="headers"
@@ -168,25 +168,11 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.user-table /deep/ .v-input--checkbox {
-  justify-content: center;
+.v-input--switch.v-input /deep/ .v-label {
+  margin-bottom: 0 !important;
 }
 
-.archived-checkbox /deep/ .v-input__slot {
-  flex-direction: row-reverse;
-
-  .v-input--selection-controls__input {
-    justify-content: center;
-    margin-right: 0;
-  }
-
-  .v-icon {
-    font-size: 18px;
-  }
-
-  label {
-    margin: 0 2px 0 0;
-    font-size: 14px;
-  }
+.filters {
+  margin: 0 18px 8px;
 }
 </style>

From 6b6579d38deb96fc6315104b6ff67e610daa2fef Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Tue, 23 Jul 2019 13:15:01 +0200
Subject: [PATCH 193/213] Removed obsolete mutation

---
 client/store/modules/courses/mutations.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/client/store/modules/courses/mutations.js b/client/store/modules/courses/mutations.js
index b5b7cea37..894d03254 100644
--- a/client/store/modules/courses/mutations.js
+++ b/client/store/modules/courses/mutations.js
@@ -10,10 +10,6 @@ const save = (state, course) => {
   Vue.set(state.items, course._cid, course);
 };
 
-const fetchPinned = (state, courses) => {
-  state.pinned = courses;
-};
-
 const togglePinned = state => {
   state.$internals.pagination = { ...PAGINATION_DEFAULTS };
   state.showPinned = !state.showPinned;

From 77be4393448e2500e71681ad02364ab3e14ecfef Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Tue, 23 Jul 2019 13:16:44 +0200
Subject: [PATCH 194/213] :wrench:

---
 client/store/modules/courses/mutations.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/store/modules/courses/mutations.js b/client/store/modules/courses/mutations.js
index 894d03254..60e147b6e 100644
--- a/client/store/modules/courses/mutations.js
+++ b/client/store/modules/courses/mutations.js
@@ -47,7 +47,6 @@ export {
   add,
   allCoursesFetched,
   fetch,
-  fetchPinned,
   remove,
   reset,
   resetPagination,

From ac9ee021d2b8c3c2b82d2e0e1c76c2566b2dbb63 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Tue, 23 Jul 2019 13:21:11 +0200
Subject: [PATCH 195/213] Cleanup :lipstick:

---
 client/store/modules/courses/mutations.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/store/modules/courses/mutations.js b/client/store/modules/courses/mutations.js
index 60e147b6e..6a950b6c5 100644
--- a/client/store/modules/courses/mutations.js
+++ b/client/store/modules/courses/mutations.js
@@ -11,17 +11,17 @@ const save = (state, course) => {
 };
 
 const togglePinned = state => {
-  state.$internals.pagination = { ...PAGINATION_DEFAULTS };
+  resetPagination(state);
   state.showPinned = !state.showPinned;
 };
 
 const setSearch = (state, query = '') => {
-  state.$internals.pagination = { ...PAGINATION_DEFAULTS };
+  resetPagination(state);
   state.search = query;
 };
 
 const setOrder = (state, order) => {
-  state.$internals.pagination = { ...PAGINATION_DEFAULTS };
+  resetPagination(state);
   state.$internals.sort = { ...state.$internals.sort, ...order };
 };
 
@@ -31,7 +31,7 @@ const setPagination = (state, changes) => {
 };
 
 const resetPagination = state => {
-  state.$internals.pagination = PAGINATION_DEFAULTS;
+  state.$internals.pagination = { ...PAGINATION_DEFAULTS };
 };
 
 const resetFilters = state => {

From d352bf25f54b6d4fcd85ee8f3c9e816ce591dcec Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Tue, 23 Jul 2019 14:32:17 +0200
Subject: [PATCH 196/213] :lipstick:

---
 client/components/catalog/Container.vue | 6 +++---
 server/course/course.controller.js      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/components/catalog/Container.vue b/client/components/catalog/Container.vue
index cafbe671f..124a7f1e1 100644
--- a/client/components/catalog/Container.vue
+++ b/client/components/catalog/Container.vue
@@ -35,7 +35,7 @@
         </div>
         <div slot="no-results" class="no-results subheading">
           <v-alert
-            :value="true"
+            value="true"
             color="blue-grey lighten-4"
             icon="mdi-cloud-search-outline"
             outline>
@@ -94,9 +94,9 @@ export default {
     }
   },
   watch: {
-    repositories(items) {
+    repositories() {
       // If all items get unpinned
-      if (!items.length & this.showPinned) this.loader.reset();
+      if (!this.hasRepositories && this.showPinned) this.loader.reset();
     },
     queryParams(val, oldVal) {
       const attrs = ['search', 'sortOrder', 'sortBy', 'pinned'];
diff --git a/server/course/course.controller.js b/server/course/course.controller.js
index ba9d303b3..7d9dc6502 100644
--- a/server/course/course.controller.js
+++ b/server/course/course.controller.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { Course, CourseUser, User, Revision, sequelize } = require('../shared/database');
+const { Course, CourseUser, Revision, sequelize, User } = require('../shared/database');
 const { createContentInventory } = require('../integrations/knewton');
 const { createError } = require('../shared/error/helpers');
 const { getSchema } = require('../../config/shared/activities');

From 9dfc11f2113f1ad01c1eeb0efdbc03cba76eaaee Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Wed, 24 Jul 2019 09:14:26 +0200
Subject: [PATCH 197/213] Remove catalog filter message glitches

- Handle loading
---
 client/components/catalog/Container.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/client/components/catalog/Container.vue b/client/components/catalog/Container.vue
index 124a7f1e1..16e4a00d5 100644
--- a/client/components/catalog/Container.vue
+++ b/client/components/catalog/Container.vue
@@ -35,7 +35,7 @@
         </div>
         <div slot="no-results" class="no-results subheading">
           <v-alert
-            value="true"
+            :value="!loading"
             color="blue-grey lighten-4"
             icon="mdi-cloud-search-outline"
             outline>
@@ -60,6 +60,11 @@ import Search from './Search';
 import SelectOrder from './SelectOrder';
 
 export default {
+  data() {
+    return {
+      loading: true
+    };
+  },
   computed: {
     ...mapState('courses', {
       sortBy: state => state.$internals.sort,
@@ -77,6 +82,7 @@ export default {
       return !!this.repositories.length;
     },
     noRepositoriesMessage() {
+      if (this.loading) return;
       if (this.hasRepositories) return;
       if (this.queryParams.search) return 'No matches found';
       if (this.showPinned) return '0 pinned items';
@@ -87,9 +93,11 @@ export default {
     ...mapActions('courses', ['fetch']),
     ...mapMutations('courses', ['togglePinned', 'setSearch', 'setOrder']),
     load() {
+      this.loading = true;
       return this.fetch().then(() => {
         if (this.hasRepositories) this.loader.loaded();
         if (!this.hasMoreResults) this.loader.complete();
+        this.loading = false;
       });
     }
   },

From 1b914e5bec8b60eb84e995e52898040cf106658e Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Wed, 24 Jul 2019 09:18:07 +0200
Subject: [PATCH 198/213] :lipstick:

---
 client/components/system-settings/UserManagement/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/components/system-settings/UserManagement/index.vue b/client/components/system-settings/UserManagement/index.vue
index a67939374..27ac7639e 100644
--- a/client/components/system-settings/UserManagement/index.vue
+++ b/client/components/system-settings/UserManagement/index.vue
@@ -14,7 +14,7 @@
             <v-switch
               v-model="showArchived"
               label="Archived"
-              color="secondary"
+              color="primary"
               hide-details/>
           </v-flex>
           <v-flex>

From 94e709767ba57197d897ebf7153a807bc2fc1f97 Mon Sep 17 00:00:00 2001
From: Igor Bebic <igor.bebic@gmail.com>
Date: Wed, 24 Jul 2019 11:32:18 +0200
Subject: [PATCH 199/213] Implement autocomplete on adding people to course

---
 .../Settings/UserManagement/AddUser.vue       | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/client/components/course/Settings/UserManagement/AddUser.vue b/client/components/course/Settings/UserManagement/AddUser.vue
index 4dec11cfd..eb0f04c3f 100644
--- a/client/components/course/Settings/UserManagement/AddUser.vue
+++ b/client/components/course/Settings/UserManagement/AddUser.vue
@@ -2,10 +2,12 @@
   <form @submit.prevent="addUser">
     <v-layout row align-center class="pl-3">
       <v-flex xs7 class="pr-2">
-        <v-text-field
+        <v-combobox
           v-validate="{ required: true, email: true }"
           v-model="email"
           :error-messages="vErrors.collect('email')"
+          :items="suggestedEmails"
+          @input.native="fetchEmails($event.srcElement.value)"
           data-vv-name="email"
           label="Email"/>
       </v-flex>
@@ -19,19 +21,15 @@
           flat/>
       </v-flex>
       <v-flex xs2>
-        <v-btn
-          type="submit"
-          color="blue-grey darken-1"
-          small
-          dark>
-          Add
-        </v-btn>
+        <v-btn type="submit" color="blue-grey darken-1" outline>Add</v-btn>
       </v-flex>
     </v-layout>
   </form>
 </template>
 
 <script>
+import api from '@/api/user';
+import debounce from 'lodash/debounce';
 import { mapActions } from 'vuex';
 import { withValidation } from 'utils/validation';
 
@@ -43,6 +41,7 @@ export default {
   data() {
     return {
       email: '',
+      suggestedEmails: [],
       role: this.roles[0].value
     };
   },
@@ -55,9 +54,16 @@ export default {
         if (!isValid) return;
         await this.upsertUser({ courseId, email, role });
         this.email = '';
+        this.suggestedEmails = [];
         this.$nextTick(() => this.$validator.reset());
       });
-    }
+    },
+    fetchEmails: debounce(function (filter) {
+      if (filter.length < 3) return;
+      return api.fetch({ filter }).then(({ items }) => {
+        this.suggestedEmails = items.map(it => it.email);
+      });
+    }, 500)
   }
 };
 </script>

From 3bd88def73ced424bc0181113203109564f13c48 Mon Sep 17 00:00:00 2001
From: Igor Bebic <igor.bebic@gmail.com>
Date: Wed, 24 Jul 2019 11:50:47 +0200
Subject: [PATCH 200/213] Clear suggestedEmails on input length less than 3

---
 client/components/course/Settings/UserManagement/AddUser.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/components/course/Settings/UserManagement/AddUser.vue b/client/components/course/Settings/UserManagement/AddUser.vue
index eb0f04c3f..2a3b6d563 100644
--- a/client/components/course/Settings/UserManagement/AddUser.vue
+++ b/client/components/course/Settings/UserManagement/AddUser.vue
@@ -59,7 +59,10 @@ export default {
       });
     },
     fetchEmails: debounce(function (filter) {
-      if (filter.length < 3) return;
+      if (filter.length < 3) {
+        this.suggestedEmails = [];
+        return;
+      }
       return api.fetch({ filter }).then(({ items }) => {
         this.suggestedEmails = items.map(it => it.email);
       });

From 7351c0102c54df929aa9e7f2104b4816ff57c73f Mon Sep 17 00:00:00 2001
From: Igor Bebic <igor.bebic@gmail.com>
Date: Wed, 24 Jul 2019 12:00:43 +0200
Subject: [PATCH 201/213] Use primary color on UserList

---
 client/components/course/Settings/UserManagement/UserList.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/components/course/Settings/UserManagement/UserList.vue b/client/components/course/Settings/UserManagement/UserList.vue
index eec38f8a5..4cde1b412 100644
--- a/client/components/course/Settings/UserManagement/UserList.vue
+++ b/client/components/course/Settings/UserManagement/UserList.vue
@@ -7,7 +7,7 @@
     hide-actions>
     <template v-slot:items="{ item }">
       <td class="text-xs-left">
-        <v-avatar color="blue lighten-1" size="40" dark class="mr-3">
+        <v-avatar color="primary lighten-2" size="40" dark class="mr-3">
           <span class="headline white--text">
             {{ item.email[0].toUpperCase() }}
           </span>
@@ -22,7 +22,7 @@
           icon/>
       </td>
       <td class="actions">
-        <v-btn color="blue-grey" icon flat small>
+        <v-btn color="primary" icon flat small>
           <v-icon @click="remove(item)">mdi-delete</v-icon>
         </v-btn>
       </td>

From 5ae0e90663ec775806e750a50dc6c09240d49a4d Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Wed, 24 Jul 2019 14:20:47 +0200
Subject: [PATCH 202/213] Fixed style collisions :wrench:

---
 client/components/system-settings/StructureTypes.vue |  4 ++++
 .../system-settings/UserManagement/index.vue         | 12 ++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/client/components/system-settings/StructureTypes.vue b/client/components/system-settings/StructureTypes.vue
index 5e8f28469..1fc7d18a5 100644
--- a/client/components/system-settings/StructureTypes.vue
+++ b/client/components/system-settings/StructureTypes.vue
@@ -55,5 +55,9 @@ export default {
 .schema-list-container {
   padding: 30px;
   text-align: left;
+
+  /deep/ .v-treeview-node__label {
+    font-size: 17px;
+  }
 }
 </style>
diff --git a/client/components/system-settings/UserManagement/index.vue b/client/components/system-settings/UserManagement/index.vue
index 27ac7639e..1955d0f89 100644
--- a/client/components/system-settings/UserManagement/index.vue
+++ b/client/components/system-settings/UserManagement/index.vue
@@ -168,8 +168,16 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.v-input--switch.v-input /deep/ .v-label {
-  margin-bottom: 0 !important;
+.v-input--switch {
+  /deep/ {
+    .v-label {
+      margin-bottom: 0;
+    }
+
+    input[type=checkbox] {
+      position: absolute;
+    }
+  }
 }
 
 .filters {

From 6602806e4fe7da1807a9eab39ed463a58cb7cc8d Mon Sep 17 00:00:00 2001
From: Igor Bebic <igor.bebic@gmail.com>
Date: Wed, 24 Jul 2019 15:00:47 +0200
Subject: [PATCH 203/213] Shorten debounce delay, minor refactor

---
 .../Settings/UserManagement/AddUser.vue       | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/client/components/course/Settings/UserManagement/AddUser.vue b/client/components/course/Settings/UserManagement/AddUser.vue
index 2a3b6d563..b59cda254 100644
--- a/client/components/course/Settings/UserManagement/AddUser.vue
+++ b/client/components/course/Settings/UserManagement/AddUser.vue
@@ -6,8 +6,8 @@
           v-validate="{ required: true, email: true }"
           v-model="email"
           :error-messages="vErrors.collect('email')"
-          :items="suggestedEmails"
-          @input.native="fetchEmails($event.srcElement.value)"
+          :items="suggestedUsers"
+          @input.native="fetchUsers($event.srcElement.value)"
           data-vv-name="email"
           label="Email"/>
       </v-flex>
@@ -41,7 +41,7 @@ export default {
   data() {
     return {
       email: '',
-      suggestedEmails: [],
+      suggestedUsers: [],
       role: this.roles[0].value
     };
   },
@@ -54,19 +54,18 @@ export default {
         if (!isValid) return;
         await this.upsertUser({ courseId, email, role });
         this.email = '';
-        this.suggestedEmails = [];
+        this.suggestedUsers = [];
         this.$nextTick(() => this.$validator.reset());
       });
     },
-    fetchEmails: debounce(function (filter) {
-      if (filter.length < 3) {
-        this.suggestedEmails = [];
-        return;
+    fetchUsers: debounce(function (filter) {
+      if (filter.length > 1) {
+        return api.fetch({ filter }).then(({ items }) => {
+          this.suggestedUsers = items.map(it => it.email);
+        });
       }
-      return api.fetch({ filter }).then(({ items }) => {
-        this.suggestedEmails = items.map(it => it.email);
-      });
-    }, 500)
+      this.suggestedUsers = [];
+    }, 300)
   }
 };
 </script>

From f0fe0afc54029ddf73c0a46f714beb8448559e56 Mon Sep 17 00:00:00 2001
From: Igor Bebic <igor.bebic@gmail.com>
Date: Wed, 24 Jul 2019 15:19:29 +0200
Subject: [PATCH 204/213] Even more refactoring

---
 .../course/Settings/UserManagement/AddUser.vue         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/components/course/Settings/UserManagement/AddUser.vue b/client/components/course/Settings/UserManagement/AddUser.vue
index b59cda254..65ca3b975 100644
--- a/client/components/course/Settings/UserManagement/AddUser.vue
+++ b/client/components/course/Settings/UserManagement/AddUser.vue
@@ -7,7 +7,7 @@
           v-model="email"
           :error-messages="vErrors.collect('email')"
           :items="suggestedUsers"
-          @input.native="fetchUsers($event.srcElement.value)"
+          @update:searchInput="fetchUsers"
           data-vv-name="email"
           label="Email"/>
       </v-flex>
@@ -29,8 +29,8 @@
 
 <script>
 import api from '@/api/user';
-import debounce from 'lodash/debounce';
 import { mapActions } from 'vuex';
+import throttle from 'lodash/throttle';
 import { withValidation } from 'utils/validation';
 
 export default {
@@ -58,14 +58,14 @@ export default {
         this.$nextTick(() => this.$validator.reset());
       });
     },
-    fetchUsers: debounce(function (filter) {
-      if (filter.length > 1) {
+    fetchUsers: throttle(function (filter) {
+      if (filter && filter.length > 1) {
         return api.fetch({ filter }).then(({ items }) => {
           this.suggestedUsers = items.map(it => it.email);
         });
       }
       this.suggestedUsers = [];
-    }, 300)
+    }, 350)
   }
 };
 </script>

From 847f242a3707a8726c1eab2b362a99de8a8d98e9 Mon Sep 17 00:00:00 2001
From: Dario Vladovic <d.vladimyr@gmail.com>
Date: Wed, 24 Jul 2019 23:05:52 +0200
Subject: [PATCH 205/213] Show app version with codename

- rendering app version inside `<app-footer>`
- printing app version according to html-version-spec
- bumping app version to `v3.2.0`
---
 build/plugins/html-version-spec.js  | 12 ++++++------
 client/components/common/Footer.vue | 18 ++++++++++++++++--
 package.json                        |  3 ++-
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/build/plugins/html-version-spec.js b/build/plugins/html-version-spec.js
index 0ec005053..5e48bb681 100644
--- a/build/plugins/html-version-spec.js
+++ b/build/plugins/html-version-spec.js
@@ -14,21 +14,21 @@ exports.apply = ({ config, pkg }) => {
       return getVersion(pkg);
     }
   };
-  if (isObject(config.html)) {
-    return Object.assign(config.html, { meta });
-  }
   if (isObject(config.pages)) {
     return forEach(config.pages, page => Object.assign(page, { meta }));
   }
+  const { output } = config;
+  output.html = output.html || {};
+  Object.assign(output.html, { meta });
 };
 
 function getVersion(pkg) {
-  const semver = pkg.data.version;
+  const { codename, version } = pkg.data;
   try {
     const rev = execSync('git', ['rev-parse', '--short', 'HEAD']);
-    return `${semver}-rev-${rev}`;
+    return `${version}-rev-${rev} (${codename})`;
   } catch (err) {
     console.error(err);
   }
-  return `${semver}`;
+  return `${version} (${codename})`;
 }
diff --git a/client/components/common/Footer.vue b/client/components/common/Footer.vue
index 15d7ce203..c6a120a1c 100644
--- a/client/components/common/Footer.vue
+++ b/client/components/common/Footer.vue
@@ -9,7 +9,7 @@
           label
           small
           class="mr-3 grey--text text--darken-4">
-          v3.1 Silk
+          v{{ version }} {{ codename }}
         </v-chip>
         Built with <v-icon color="pink">mdi-heart</v-icon>
         Extension Engine
@@ -18,8 +18,22 @@
   </v-footer>
 </template>
 
+<script>
+import { codename, version } from '@/../package.json';
+
+const capitalize = str => str.charAt(0).toUpperCase() + str.substr(1);
+
+export default {
+  name: 'app-footer',
+  computed: {
+    version: () => version,
+    codename: () => capitalize(codename)
+  }
+};
+</script>
+
 <style lang="scss" scoped>
 .v-footer {
-  box-shadow: 0px -1px 1px 0px rgba(0,0,0,0.2);
+  box-shadow: 0 -1px 1px 0 rgba(0,0,0,0.2);
 }
 </style>
diff --git a/package.json b/package.json
index 4c25d46ab..6718880f9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,7 @@
 {
   "name": "tailor",
-  "version": "3.1.0",
+  "version": "3.2.0",
+  "codename": "silk",
   "description": "Content authoring platform",
   "author": "ExtensionEngine <info@extensionengine.com>",
   "private": true,

From 04b674e0bb8e3d6c8085d5c5fe4978015b513df1 Mon Sep 17 00:00:00 2001
From: franosincic <fsincic@extensionengine.com>
Date: Thu, 25 Jul 2019 11:38:29 +0200
Subject: [PATCH 206/213] Reroute regular users from restricted routes

---
 client/router.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/router.js b/client/router.js
index 08676ab72..811eef788 100644
--- a/client/router.js
+++ b/client/router.js
@@ -69,7 +69,7 @@ let router = new Router({
   }, {
     path: '/system-settings',
     component: SystemSettings,
-    meta: { auth: true },
+    meta: { auth: true, restricted: true },
     children: [{
       path: '/',
       name: 'system-management',
@@ -113,6 +113,8 @@ let router = new Router({
 router.beforeEach((to, from, next) => {
   if (to.matched.some(it => it.meta.auth) && !store.state.auth.user) {
     next({ path: '/login', query: { redirect: to.fullPath } });
+  } else if (to.matched.some(it => it.meta.restricted) && !store.getters.isAdmin) {
+    next({ name: from.name });
   } else {
     next();
   }

From b325c8e985142bc320b7ba86677321f9b951aaef Mon Sep 17 00:00:00 2001
From: franosincic <fsincic@extensionengine.com>
Date: Thu, 25 Jul 2019 11:39:30 +0200
Subject: [PATCH 207/213] Restrict users API routes

---
 server/user/index.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/user/index.js b/server/user/index.js
index fc807b991..07706edf9 100644
--- a/server/user/index.js
+++ b/server/user/index.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const auth = require('passport').authenticate('jwt');
+const { authorize } = require('../shared/auth/mw');
 const ctrl = require('./user.controller');
 const model = require('./user.model');
 const { processPagination } = require('../shared/database/pagination');
@@ -13,7 +14,7 @@ router
   .post('/users/forgotPassword', ctrl.forgotPassword)
   .post('/users/resetPassword', ctrl.resetPassword)
   // Protected routes:
-  .use('/users*', auth)
+  .use('/users*', auth, authorize())
   .get('/users', processPagination(User), ctrl.list)
   .post('/users', ctrl.upsert)
   .delete('/users/:id', ctrl.remove)

From 0d1297504c6fff65fc6b01c2fc03bff11790b066 Mon Sep 17 00:00:00 2001
From: franosincic <fsincic@extensionengine.com>
Date: Thu, 25 Jul 2019 12:17:10 +0200
Subject: [PATCH 208/213] =?UTF-8?q?Removed=20v-visible=20directive=20?=
 =?UTF-8?q?=F0=9F=92=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/auth/Login.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/components/auth/Login.vue b/client/components/auth/Login.vue
index ae60d31dd..7f1d84423 100644
--- a/client/components/auth/Login.vue
+++ b/client/components/auth/Login.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div v-visible="message" class="message">{{ message }}</div>
+    <div class="message">{{ message }}</div>
     <form @submit.prevent="submit" novalidate>
       <v-text-field
         v-validate="{ required: true, email: true }"

From 74aba73ec2c529178b5a6579a63d7376d6cd16a8 Mon Sep 17 00:00:00 2001
From: franosincic <fsincic@extensionengine.com>
Date: Thu, 25 Jul 2019 12:40:34 +0200
Subject: [PATCH 209/213] Use fullPath instead name for rerouting

---
 client/router.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/router.js b/client/router.js
index 811eef788..b8113953f 100644
--- a/client/router.js
+++ b/client/router.js
@@ -114,7 +114,7 @@ router.beforeEach((to, from, next) => {
   if (to.matched.some(it => it.meta.auth) && !store.state.auth.user) {
     next({ path: '/login', query: { redirect: to.fullPath } });
   } else if (to.matched.some(it => it.meta.restricted) && !store.getters.isAdmin) {
-    next({ name: from.name });
+    next({ path: from.fullPath });
   } else {
     next();
   }

From dd4c60cfac51f2949efee3e3a7f9e718d19b05c2 Mon Sep 17 00:00:00 2001
From: franosincic <fsincic@extensionengine.com>
Date: Thu, 25 Jul 2019 13:17:23 +0200
Subject: [PATCH 210/213] Refactor router

---
 client/router.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/client/router.js b/client/router.js
index b8113953f..6f06ad63f 100644
--- a/client/router.js
+++ b/client/router.js
@@ -1,6 +1,8 @@
 /* eslint-disable sort-imports */
+import get from 'lodash/get';
 import { numeric as numericParser } from 'client/utils/paramsParser';
 import Router from 'vue-router';
+import { role } from 'shared';
 import store from './store';
 import Vue from 'vue';
 
@@ -69,7 +71,7 @@ let router = new Router({
   }, {
     path: '/system-settings',
     component: SystemSettings,
-    meta: { auth: true, restricted: true },
+    meta: { auth: true, allowed: [role.user.ADMIN] },
     children: [{
       path: '/',
       name: 'system-management',
@@ -113,7 +115,7 @@ let router = new Router({
 router.beforeEach((to, from, next) => {
   if (to.matched.some(it => it.meta.auth) && !store.state.auth.user) {
     next({ path: '/login', query: { redirect: to.fullPath } });
-  } else if (to.matched.some(it => it.meta.restricted) && !store.getters.isAdmin) {
+  } else if (!isAllowed(to)) {
     next({ path: from.fullPath });
   } else {
     next();
@@ -121,3 +123,8 @@ router.beforeEach((to, from, next) => {
 });
 
 export default router;
+
+function isAllowed(route) {
+  const allowed = get(route.matched.find(it => it.meta.allowed), 'meta.allowed');
+  return !allowed || allowed.includes(store.state.auth.user.role);
+}

From a6a74cd418c1acf01ea2dc8fb302e4e3714d466d Mon Sep 17 00:00:00 2001
From: franosincic <fsincic@extensionengine.com>
Date: Thu, 25 Jul 2019 14:55:40 +0200
Subject: [PATCH 211/213] Cleanup :lipstick:

---
 client/router.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/client/router.js b/client/router.js
index 6f06ad63f..0a9518d46 100644
--- a/client/router.js
+++ b/client/router.js
@@ -1,8 +1,7 @@
 /* eslint-disable sort-imports */
-import get from 'lodash/get';
 import { numeric as numericParser } from 'client/utils/paramsParser';
 import Router from 'vue-router';
-import { role } from 'shared';
+import { role } from '@/../config/shared';
 import store from './store';
 import Vue from 'vue';
 
@@ -125,6 +124,6 @@ router.beforeEach((to, from, next) => {
 export default router;
 
 function isAllowed(route) {
-  const allowed = get(route.matched.find(it => it.meta.allowed), 'meta.allowed');
-  return !allowed || allowed.includes(store.state.auth.user.role);
+  const { meta = {} } = route.matched.find(({ meta = {} }) => meta.allowed) || {};
+  return !meta.allowed || meta.allowed.includes(store.state.auth.user.role);
 }

From 048fa7ce193fb4e87b4fa2ac3cbf1816680fe459 Mon Sep 17 00:00:00 2001
From: Dario Vladovic <d.vladimyr@gmail.com>
Date: Thu, 25 Jul 2019 15:15:20 +0200
Subject: [PATCH 212/213] Update version in package lock :goat:

---
 package-lock.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package-lock.json b/package-lock.json
index 226afde30..634041aac 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "tailor",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

From e05ef444953c5824338519cf3f3c70b9d7945618 Mon Sep 17 00:00:00 2001
From: Damir Perisic <underscope@gmail.com>
Date: Thu, 25 Jul 2019 16:55:34 +0200
Subject: [PATCH 213/213] Reset catalog upon cloning repo :wrench:

---
 client/store/modules/courses/actions.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/store/modules/courses/actions.js b/client/store/modules/courses/actions.js
index d69513b1d..ff2f8aa0d 100644
--- a/client/store/modules/courses/actions.js
+++ b/client/store/modules/courses/actions.js
@@ -30,10 +30,10 @@ const fetch = ({ getters, commit }) => {
   });
 };
 
-const clone = ({ commit }, { id, name, description }) => {
+const clone = ({ dispatch }, { id, name, description }) => {
   return api.post(`/${id}/clone`, { name, description }).then(response => {
     const { data: course } = response.data;
-    commit('add', course);
+    dispatch('reset');
     return course.id;
   });
 };