Merge branch 'master' into julius-dev

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

@@ -2,6 +2,8 @@ import { Component, OnInit } from '@angular/core';
 import { Post } from 'src/app/models/post';
 import { FeedService } from 'src/app/services/feed/feed.service';
 import { Actionlist } from 'src/app/models/actionlist';
+import { DatasharingService } from '../../services/datasharing.service';
+import { User } from 'src/app/models/user';
 
 @Component({
   selector: 'home-feed',
@@ -22,10 +24,20 @@ export class FeedComponent implements OnInit {
 
   actionlist: Actionlist = new Actionlist();
 
-  constructor(private feedService: FeedService) { }
+  loggedIn = false;
+  userId: number;
+  user: User;
+
+  constructor(private feedService: FeedService,private data: DatasharingService) { }
 
   ngOnInit() {
-    this.feedService.getAllPostsRaw().subscribe(response => {
+    this.data.currentUserInfo.subscribe(user => {
+      this.user = user;
+      this.loggedIn = user.loggedIn;
+      if(this.loggedIn) this.userId = user.userID;
+      console.log("the userId is " + this.userId);
+    });
+    this.feedService.getAllPostsRawByUserId(this.userId).subscribe(response => {
       this.feedNew = this.feedService.renderAllPosts(response.json());
       this.parentSelectedPostList = this.feedNew;
       this.feedMostLiked = this.feedNew;
@@ -44,7 +56,7 @@ export class FeedComponent implements OnInit {
 
   showNew() {
     console.log('showNew()');
-    this.feedService.getAllPostsRaw().subscribe(response => {
+    this.feedService.getAllPostsRawByUserId(this.userId).subscribe(response => {
       this.feedNew = this.feedService.renderAllPosts(response.json());
       this.parentSelectedPostList = this.feedNew; });
     this.viewNew = true;
@@ -53,7 +65,7 @@ export class FeedComponent implements OnInit {
 
   showMostLiked() {
     console.log('showMostLiked()');
-    this.feedService.getAllPostsRaw().subscribe(response => {
+    this.feedService.getAllPostsRawByUserId(this.userId).subscribe(response => {
       this.feedMostLiked = this.feedService.renderAllPosts(response.json());
       this.parentSelectedPostList = this.feedMostLiked; });
     this.viewNew = false;
@@ -62,7 +74,7 @@ export class FeedComponent implements OnInit {
 
 
   refresh($event) {
-    this.feedService.getAllPostsRaw().subscribe(response => {
+    this.feedService.getAllPostsRawByUserId(this.userId).subscribe(response => {
       this.parentSelectedPostList = this.feedService.renderAllPosts(response.json());
       console.log('Refresh');
     });

src/app/models/user.ts

@@ -1,15 +1,15 @@
 export class User {
-  constructor(
+  loggedIn : boolean
-    public userID: number,
+  userID : number
-    public loggedIn: boolean,
+  username : string
-    public username: string,
+  handle : string
-    public handle: string,
+  email : string
-    public email: string,
+  points : number
-    public points: number,
+  level : number
-    public level: number,
+
-    public friendIDs: number[],
+  friendIDs : number[]
-    public groupIDs: number[],
+  groupIDs : number[]
-    public chatIDs: number[],
+  chatIDs : number[]
-    public requestIDs: number[],
+
-  ) {}
+  requestIDs : number[]
 }

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

@@ -85,6 +85,19 @@ export class FeedService {
       });
     return this.posts;
   }
+  public getAllPostsById(userId: number): Array<Post> {
+    const url = environment.graphQLUrl;
+
+    const headers = new Headers();
+    headers.set('Content-Type', 'application/json');
+
+    this.http.post(url, this.getBodyForGetAllPostsByUserId(userId))
+    .subscribe(response => {
+        this.posts = this.renderAllPosts(response.json());
+        console.log(response);
+      });
+    return this.posts;
+  }
 
   public getAllPostsRaw(): any {
     const url = environment.graphQLUrl;
@@ -95,13 +108,38 @@ export class FeedService {
     return this.http.post(url, this.getBodyForGetAllPosts());
   }
 
+  public getAllPostsRawByUserId(userId: number): any {
+    const url = environment.graphQLUrl;
+
+    const headers = new Headers();
+    headers.set('Content-Type', 'application/json');
+
+    return this.http.post(url, this.getBodyForGetAllPostsByUserId(userId));
+  }
+
+  /*getBodyForGetAllPostsByUserId(pUserId: number) {
+    const body =  {query: `query ($userId: ID) {
+        getPosts (first: 1000, offset: 0, userId: $userId) {id, content, htmlContent, upvotes, downvotes, userVote, author{name, handle, id}, createdAt}
+      }`, variables: {
+        userId: pUserId
+      }};
+      return body
+  }*/
+  
+  getBodyForGetAllPostsByUserId(pUserId: number) {
+    const body =  {query: `query ($userId: ID!) {
+        getPosts (first: 1000, offset: 0) {id, content, htmlContent, upvotes, downvotes, userVote(userId: $userId), author{name, handle, id}, createdAt}
+      }`, variables: {
+        userId: pUserId
+      }};
+      return body
+  }
   getBodyForGetAllPosts() {
     const body =  {query: `query {
-        getPosts (first: 1000, offset: 0) {id, content, htmlContent, upvotes, downvotes, userVote, author{name, handle, id}, createdAt}
+        getPosts (first: 1000, offset: 0) {id, content, htmlContent, upvotes, downvotes, author{name, handle, id}, createdAt}
       }`
-      };
+      }
-
+      return body
-      return body;
   }
 
   public renderAllPosts(pResponse: any): Array<Post> {

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

@@ -33,23 +33,22 @@ export class LoginService {
     this.router.navigateByUrl('');
   }
 
-  public updateUserInfo(response: any) {
+  public updateUserInfo(response : any){
-    const loginData = response.data.login;
+    const user: User = new User();
-    const user: User = new User(
+    user.loggedIn = true;
-      loginData.login.id,
+    user.userID = response.data.login.id;
-      true,
+    user.username = response.data.login.name;
-      loginData.name,
+    user.handle = response.data.login.handle;
-      loginData.handle,
+    user.email = response.data.login.email;
-      loginData.email,
+    user.points = response.data.login.points;
-      loginData.points,
+    user.level = response.data.login.level;
-      loginData.level,
+    user.friendIDs = response.data.login.friends;
-      loginData.friends,
+    user.groupIDs = response.data.login.groups;
-      loginData.groups,
+    user.chatIDs = response.data.login.chats;
-      loginData.chats,
+    user.requestIDs = response.data.login.requests;
-      loginData.requests,
+
-    );
+    this.data.changeUserInfo(user)
     
-    this.data.changeUserInfo(user);
   }
 
   public buildJson(login: Login): any {