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

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

@@ -34,7 +34,7 @@ export class FeedComponent implements OnInit {
     this.data.currentUserInfo.subscribe(user => {
       this.user = user;
       this.loggedIn = user.loggedIn;
-      if(this.loggedIn){
+      if (this.loggedIn) {
         this.userId = user.userID;
         this.feedService.getAllPostsRawByUserId(this.userId).subscribe(response => {
           this.feedNew = this.feedService.renderAllPosts(response.json());
@@ -49,7 +49,7 @@ export class FeedComponent implements OnInit {
           this.feedMostLiked = this.feedNew;
           console.log(this.feedNew);
         });
-      } 
+    }
 
     });
 

src/app/services/login/login.service.ts

@@ -53,7 +53,7 @@ export class LoginService {
 
   public buildJson(login: Login): any {
     const body = {
-      query: `mutation($email: String, $pwHash: String) {
+      query: `mutation($email: String!, $pwHash: String!) {
         login(email: $email, passwordHash: $pwHash) {
           id,
           name,