Merge branch 'master' into master

src/app/homepage/homepage.component.scss

@@ -10,7 +10,7 @@
 }
 
 .logo-wrapper {
-  svg {
+  svg, img {
     width: 132px;
     height: 61px;
   }
@@ -58,7 +58,10 @@
   h1, h2, h3, h4, h5, h6 {
     color: $black-color;
   }
-  h3 { font-size: 24px; }
+  h3 { 
+    font-size: 24px; 
+    font-weight: 600;
+  }
   h5 {
     color: $grey-color;
     margin-top: -20px;

src/app/homepage/homepage.component.ts

@@ -18,6 +18,7 @@ import { Router, NavigationEnd } from '@angular/router';
 })
 export class HomepageComponent implements OnInit, AfterViewInit {
   isSidebarOpened = true;
+  previousWidth: number;
 
   constructor(
     private readonly cd: ChangeDetectorRef,
@@ -26,6 +27,7 @@ export class HomepageComponent implements OnInit, AfterViewInit {
 
   ngOnInit(): void {
     this.router.events.filter(e => e instanceof NavigationEnd).subscribe(() => {
+      this.previousWidth = window.innerWidth;
       this.checkWindowWidth(window.innerWidth);
     });
   }
@@ -45,7 +47,8 @@ export class HomepageComponent implements OnInit, AfterViewInit {
 
   checkWindowWidth(innerWidth?: number) {
     innerWidth = innerWidth ? innerWidth : window.innerWidth;
-    if (innerWidth <= 768) {
+    if (this.previousWidth !== innerWidth && innerWidth <= 768) {
+      this.previousWidth = innerWidth;
       this.isSidebarOpened = false;
       this.cd.detectChanges();
     }

src/app/homepage/menu/menu-item/menu-item.component.scss

@@ -26,14 +26,14 @@ h3 {
   @extend .transition;
   position: absolute;
   top: 1px;
-  right: 0;
+  right: 20px;
   font-size: 22px;
   cursor: pointer;
 }
 
   li {
     display: block;
-    padding: 10px 0;
+    padding: 8px 0;
 
     a {
       color: $black-color;
@@ -74,4 +74,8 @@ h3 {
       color: $red-color;
     }
   }
+}
+
+ul {
+  padding-left: 25px;
 }

src/app/homepage/menu/menu.component.html

@@ -6,5 +6,6 @@
     [externalUrl]="item?.externalUrl"
     [path]="item?.path"
     [children]="item.children"
+    class="nav-item"
   ></app-menu-item>
 </nav> 

src/app/homepage/menu/menu.component.scss

@@ -7,8 +7,8 @@
   @include transform(translateX(-100%));
   padding: 55px 30px 40px 45px;
   width: 345px;
-  background: $white-color;
-  box-shadow: 0 0 25px rgba(0, 0, 0, 0.1);
+  background: #f9f9f9;
+  box-shadow: inset -35px -18px 70px rgba(233, 233, 233, 0.65);
   position: absolute !important;
   bottom: 0;
   top: 0;
@@ -21,3 +21,12 @@
   @include media(large) { width: 300px; }
   @include media(medium) { padding: 20px 25px 20px 25px; }
 }
+
+.nav-item {
+  margin: 0 -20px;
+  padding: 0 20px;
+  border-bottom: 1px solid #efefef;
+  &:last-of-type {
+    border: 0;
+  }
+}

src/app/homepage/pages/recipes/passport/passport.component.ts

@@ -66,7 +66,7 @@ export class AuthService {
     return `
 import * as passport from 'passport';
 import { ExtractJwt, Strategy } from 'passport-jwt';
-import { Component, Inject } from '@nestjs/common';
+import { Component, Inject, UnauthorizedException } from '@nestjs/common';
 import { AuthService } from '../auth.service';
 
 @Component()
@@ -86,7 +86,7 @@ export class JwtStrategy extends Strategy {
   public async verify(req, payload, done) {
     const isValid = await this.authService.validateUser(payload);
     if (!isValid) {
-      return done('Unauthorized', false);
+      return done(new UnauthorizedException(), false);
     }
     done(null, payload);
   }

src/styles.scss

@@ -8,7 +8,7 @@ body {
   font-size: 15px;
   font-weight: 500;
   font-family: 'Montserrat', "Helvetica Neue", sans-serif;
-  background-color: $white-color;
+  background-color: #fbfbfb;
   color: $grey-color;
   margin: 0;
 }