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

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

@@ -9,7 +9,8 @@ import { Actionlist } from 'src/app/models/actionlist';
   styleUrls: ['./feed.component.sass']
 })
 export class FeedComponent implements OnInit {
-
+  checked: boolean //if the "I protected the environment."-box is checked
+  value: number //points value of the green action
   viewNew: boolean = true
   viewMostLiked: boolean = false
 

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

@@ -35,12 +35,12 @@
       <p [innerHTML]="post.htmlContent"></p>
   </mat-card-content>
   <mat-card-actions>
-    <button mat-button>
+    <button mat-button (click)="voteUp(post)">
       <mat-icon aria-hidden="false" color="primary" *ngIf="post.userVote == 'UPVOTE'">keyboard_arrow_up</mat-icon>
       <mat-icon aria-hidden="false" *ngIf="!post.userVote || post.userVote == 'DOWNVOTE'">keyboard_arrow_up</mat-icon>
     </button>
     {{post.upvotes}}
-    <button mat-button>
+    <button mat-button (click)="voteDown(post)">
       <mat-icon aria-hidden="false" color="primary" *ngIf="post.userVote == 'DOWNVOTE'">keyboard_arrow_down</mat-icon>
       <mat-icon aria-hidden="false" *ngIf="!post.userVote || post.userVote == 'UPVOTE'">keyboard_arrow_down</mat-icon>
     </button>

src/app/components/home/home.component.html

@@ -1,7 +1,7 @@
 <div id="content" fxShow="true" fxHide.lt-md="true">
-    <div id="chat"><home-chatmanager id="chatcontainer" *ngIf="!loggedIn"></home-chatmanager></div>
+    <div id="chat"><home-chatmanager id="chatcontainer" [hidden]="!loggedIn"></home-chatmanager></div>
     <div id="feed"><home-feed id="feedcontainer"></home-feed></div>
-    <div id="social"><home-social id="socialcontainer" *ngIf="!loggedIn"></home-social></div>
+    <div id="social"><home-social id="socialcontainer" [hidden]="!loggedIn"></home-social></div>
 </div>
 <!--
 <mat-tab-group headerPosition="below" position="0" id="bottom-menu" fxShow="true" fxHide.gt-sm="true">