Clean up code

client/cypress/support/commands.js

@@ -149,7 +149,7 @@ Cypress.Commands.add('register', (prefix, firstname, lastname, street, city, pos
   if (acceptTerms) {
     cy.get('[data-cy="acceptedTerms-input"] > input').first().check({force: true}).then(() => {
       cy.get('[data-cy="acceptedTerms-input"] > input:checkbox').should('be.checked');
-    }); ;
+    });
   }
 
   cy.get('[data-cy="passwordConfirmation-input"]').type(passwordConfirmation);

client/src/App.vue

@@ -18,7 +18,6 @@
 <script>
   import DefaultLayout from '@/layouts/DefaultLayout';
   import SimpleLayout from '@/layouts/SimpleLayout';
-  import BlankLayout from '@/layouts/BlankLayout';
   import FullScreenLayout from '@/layouts/FullScreenLayout';
   import PublicLayout from '@/layouts/PublicLayout';
   import Modal from '@/components/Modal';
@@ -47,7 +46,6 @@
       ScrollUp,
       DefaultLayout,
       SimpleLayout,
-      BlankLayout,
       FullScreenLayout,
       PublicLayout,
       Modal,

client/src/components/ScrollUp.vue

@@ -56,7 +56,7 @@
     cursor: pointer;
     background-color: $color-white;
     border: 1px solid $color-silver;
-    z-index: 90;
+    z-index: 2;
 
     &__icon {
       width: 50px;

client/src/components/news/NewsTeaser.vue

@@ -3,7 +3,7 @@
     <a :href="teaser.newsArticleUrl">
       <img
         :src="teaser.imageUrl"
-        class="news-news-teaser__image">
+        class="news-teaser__image">
       <p class="news-teaser__image-source">
         <a
           :href="teaser.imageSource"

client/src/layouts/BlankLayout.vue

@@ -1,28 +0,0 @@
-<template>
-  <div class="blank-layout">
-    <profile-sidebar/>
-    <navigation-sidebar/>
-    <router-view/>
-  </div>
-</template>
-
-<style lang="scss">
-  .blank-layout {
-    /*
-      For IE11
-    */
-    display: flex;
-  }
-</style>
-
-<script>
-  import ProfileSidebar from '@/components/profile/ProfileSidebar';
-  import NavigationSidebar from '@/components/book-navigation/NavigationSidebar';
-
-  export default {
-    components: {
-      ProfileSidebar,
-      NavigationSidebar
-    },
-  }
-</script>

client/src/pages/start.vue

@@ -125,17 +125,6 @@
       margin-bottom: 60px;
     }
 
-    &__my {
-      color: $color-white;
-      /*font-size: 2rem;*/
-      font-weight: 800;
-      -webkit-text-stroke: 1px $color-brand;
-      /*text-shadow: -1px -1px 0 $color-brand,
-      1px -1px 0 $color-brand,
-      -1px 1px 0 $color-brand,
-      1px 1px 0 $color-brand;*/
-    }
-
     &__heading {
       width: 100%;
       @include meta-title;
@@ -161,7 +150,6 @@
     }
 
     &__modules-list {
-      /*margin: 0 30px;*/
       display: -ms-grid;
       -ms-grid-column-align: center;
       -ms-grid-columns: 1fr 1fr 1fr;
@@ -204,7 +192,7 @@
   .news {
     padding-bottom: $large-spacing;
 
-    & &__list {
+    &__list {
       display: flex;
 
       grid-row-gap: $large-spacing;

client/src/router/index.js

@@ -46,8 +46,7 @@ const routes = [
   {
     path: '/',
     name: 'home',
-    component: start,
+    component: start
-    // meta: {layout: 'blank'}
   },
   {
     path: '/login',

server/users/models.py

@@ -17,7 +17,7 @@ DEFAULT_SCHOOL_ID = 1
 
 class User(AbstractUser):
     last_module = models.ForeignKey('books.Module', related_name='+', on_delete=models.SET_NULL, null=True)
-    # recent_modules = models.ManyToManyField('books.Module', related_name='+', through='books.RecentModule')
+    recent_modules = models.ManyToManyField('books.Module', related_name='+', through='books.RecentModule')
     last_topic = models.ForeignKey('books.Topic', related_name='+', on_delete=models.SET_NULL, null=True)
     avatar_url = models.CharField(max_length=254, blank=True, default='')
     email = models.EmailField(_('email address'), unique=True)