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

src/app/components/chat/chat.component.sass

@@ -80,4 +80,12 @@
     padding: 0.125em
     resize: none
   #send
-    @include gridPosition(1, 2, 2, 3)
+    @include gridPosition(1, 2, 2, 3)
+  button
+    background-color: $cFeedChooserBackground
+    color: $cFontWhite
+    border: none
+    border-radius: 0.5em
+  button:hover
+    background-color: lighten($cFeedChooserBackground, 10%)
+    cursor: pointer

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

@@ -18,14 +18,14 @@ export class PostlistComponent implements OnInit {
   ngOnInit() {
   }
 
-  voteUp(pPost: Post){
+  voteUp(pPost: Post) {
-    this.feedService.upvote(pPost.id)
+    this.feedService.upvote(pPost.id).subscribe(response => {
-    this.voteEvent.emit(true)
+        this.voteEvent.emit(true)})
   }
 
-  voteDown(pPost: Post){
+  voteDown(pPost: Post) {
-    this.feedService.downvote(pPost.id)
+    this.feedService.downvote(pPost.id).subscribe(response => {
-    this.voteEvent.emit(true)
+        this.voteEvent.emit(true)})
   }
 
 }

src/app/services/chat/chat.service.ts

@@ -229,7 +229,7 @@ export class ChatService {
   }
 
   getBodyForSendMessage(pchatID: number, pContent: string) {
-    const body =  {query: `mutation($chatID: number, $content: string) {
+    const body =  {query: `mutation($chatID: ID!, $content: String!) {
         sendMessage(chatId: $chatID, content: $content) {id} 
       }`, variables: {
           chatId: pchatID,

src/app/services/feed/feed.service.ts

@@ -42,7 +42,7 @@ export class FeedService {
         console.log(response.text())})
   }
 
-  public upvote(pPostID: number): void {
+  public upvote(pPostID: number): any {
     let url = 'https://greenvironment.net/graphql'
  
     let headers = new Headers()
@@ -54,11 +54,10 @@ export class FeedService {
           postId: pPostID
       }}
  
-    this.http.post(url, body).subscribe(response => {
+    return this.http.post(url, body)
-        console.log(response.text())})
   }
 
-  public downvote(pPostID: number): void {
+  public downvote(pPostID: number): any {
     let url = 'https://greenvironment.net/graphql'
  
     let headers = new Headers()
@@ -70,8 +69,7 @@ export class FeedService {
           postId: pPostID
       }}
  
-    this.http.post(url, body).subscribe(response => {
+    return this.http.post(url, body)
-        console.log(response.text())})
   }
 
   public getAllPosts(): Array<Post> {