diff --git a/client/cypress/support/commands.js b/client/cypress/support/commands.js index a7ad46c4..36703777 100644 --- a/client/cypress/support/commands.js +++ b/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); diff --git a/client/src/App.vue b/client/src/App.vue index 0e78c5fd..21e500bd 100644 --- a/client/src/App.vue +++ b/client/src/App.vue @@ -18,7 +18,6 @@ diff --git a/client/src/pages/start.vue b/client/src/pages/start.vue index 1b060ce1..5cf62c22 100644 --- a/client/src/pages/start.vue +++ b/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; diff --git a/client/src/router/index.js b/client/src/router/index.js index e1737ce4..58f96b2e 100644 --- a/client/src/router/index.js +++ b/client/src/router/index.js @@ -46,8 +46,7 @@ const routes = [ { path: '/', name: 'home', - component: start, - // meta: {layout: 'blank'} + component: start }, { path: '/login', diff --git a/server/users/models.py b/server/users/models.py index 77921c6d..36c3b287 100644 --- a/server/users/models.py +++ b/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)