Merge branch 'max_dev' of Software_Engineering_I/greenvironment-frontend into master

src/app/components/feed/feed.component.html

@@ -49,7 +49,7 @@ infinite-scroll
 <div id="complete-feed">
   <div id="feedlist">
     <feed-postlist [childPostList]="parentSelectedPostList"></feed-postlist>
-    <div style="height: 60px;" [hidden]='(!loadingNew && view === "new") || (!loadingMostLiked && view === "mostLiked") '>
+    <div style="height: 60px;" [hidden]='(!loadingNew && view === "new") || (!loadingMostLiked && view === "mostliked") '>
       <!--<mat-spinner *ngIf='loadingNew && view === "mostLiked"' style="margin:0 auto; margin-top: 2em;" diameter="50"></mat-spinner>-->
         <mat-spinner style="margin:0 auto; margin-top: 2em;" diameter="50"></mat-spinner>
     </div>

src/app/components/feed/feed.component.ts

@@ -82,7 +82,6 @@ export class FeedComponent implements OnInit {
   }
 
   showMostLiked() {
-    this.view = 'mostLiked';
     this.feedService.getPosts('TOP');
   }
 }

src/app/components/main-navigation/main-navigation.component.html

@@ -41,18 +41,18 @@
       <mat-icon svgIcon="logo" style="min-width: 35px;" routerLink="" class="link"></mat-icon>
       <span routerLink="" class="link">Greenvironment</span>
       <nav mat-tab-nav-bar backgroundColor="primary" fxShow="true" fxHide.lt-md="true" routerLinkActive #rla="">
-        <div [hidden]="!loggedIn">
-        <a mat-tab-link class="link"
-              *ngFor="let link of navLinksLoggedIn"
-              [routerLink]="link.path"
-              (click)="activeLink = link"
-              routerLinkActive #rla="routerLinkActive"
-              [routerLinkActiveOptions]="{exact:true}"
-              [active]="activeLink == link">
-              {{link.label}}
+        <div *ngIf="loggedIn">
+          <a mat-tab-link class="link"
+          *ngFor="let link of navLinksLoggedIn"
+          [routerLink]="link.path"
+          (click)="activeLink = link"
+          routerLinkActive #rla="routerLinkActive"
+          [routerLinkActiveOptions]="{exact:true}"
+          [active]="rla.isActive">
+            {{link.label}}
           </a>
-          </div>
-          <div [hidden]="loggedIn">
+        </div>
+        <div *ngIf="!loggedIn">
           <a mat-tab-link class="link"
           *ngFor="let link of navLinks"
           [routerLink]="link.path"
@@ -60,7 +60,7 @@
           routerLinkActive #rla="routerLinkActive"
           [routerLinkActiveOptions]="{exact:true}"
           [active]="rla.isActive">
-          {{link.label}}
+            {{link.label}}
           </a>
         </div>
       </nav>