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 01/46] 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 02/46] 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 03/46] 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 04/46] 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 05/46] 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 06/46] 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 07/46] 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 08/46] 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 09/46] :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 10/46] 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 11/46] 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 12/46] 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 13/46] 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 14/46] 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 15/46] :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 16/46] 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 17/46] 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 18/46] 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 19/46] 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 20/46] 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 21/46] 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 22/46] 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 23/46] 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 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 24/46] 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 25/46] 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 26/46] 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 27/46] 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 28/46] 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 29/46] 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 30/46] :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 31/46] :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 32/46] 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 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 33/46] 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 34/46] 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 35/46] 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 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 36/46] 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 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 37/46] 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 38/46] 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 39/46] 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 40/46] 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 41/46] :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 42/46] 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 43/46] 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 44/46] :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 45/46] 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 46/46] :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');