diff --git a/src/app/components/about/about.component.ts b/src/app/components/about/about.component.ts index d2907cd..c891813 100644 --- a/src/app/components/about/about.component.ts +++ b/src/app/components/about/about.component.ts @@ -23,7 +23,7 @@ export class AboutComponent implements OnInit { @ViewChild(MatSort, {static: true}) sort: MatSort; ngOnInit() { - this.activityService.getActivitys(); + this.activityService.getActivities(); this.activityService.activitylist.subscribe(response => { this.actionlist = response; this.dataSource = new MatTableDataSource(this.actionlist.Actions); diff --git a/src/app/components/feed/feed.component.ts b/src/app/components/feed/feed.component.ts index 64efd5d..491b80d 100644 --- a/src/app/components/feed/feed.component.ts +++ b/src/app/components/feed/feed.component.ts @@ -38,7 +38,7 @@ export class FeedComponent implements OnInit { this.user = user; this.loggedIn = user.loggedIn; }); - this.activityService.getActivitys(); + this.activityService.getActivities(); this.activityService.activitylist.subscribe(response => { this.actionlist = response; }); diff --git a/src/app/services/activity/activity.service.ts b/src/app/services/activity/activity.service.ts index 4e4f43f..526bfd0 100644 --- a/src/app/services/activity/activity.service.ts +++ b/src/app/services/activity/activity.service.ts @@ -18,7 +18,7 @@ export class ActivityService { this.activitylist.next(pActivitylist); } - public getActivitys() { + public getActivities() { if (this.activitylist.getValue().Actions.length < 1) { const headers = new Headers(); headers.set('Content-Type', 'application/json'); diff --git a/src/app/services/feed/feed.service.ts b/src/app/services/feed/feed.service.ts index 1f39cdc..9f990b9 100644 --- a/src/app/services/feed/feed.service.ts +++ b/src/app/services/feed/feed.service.ts @@ -14,9 +14,9 @@ export class FeedService { public newPostsAvailable = new BehaviorSubject(true); public topPostsAvailable = new BehaviorSubject(true); - public posts: BehaviorSubject = new BehaviorSubject(new Array()); - public newPosts: BehaviorSubject = new BehaviorSubject(new Array()); - public mostLikedPosts: BehaviorSubject = new BehaviorSubject(new Array()); + public posts: BehaviorSubject = new BehaviorSubject([]); + public newPosts: BehaviorSubject = new BehaviorSubject([]); + public mostLikedPosts: BehaviorSubject = new BehaviorSubject([]); private activePostList = 'NEW'; private mostLikedOffset = 0; private newOffset = 0; @@ -52,9 +52,9 @@ export class FeedService { content: pContent }}; return this.http.post(environment.graphQLUrl, body).subscribe(response => { - const updatedposts = this.newPosts.getValue(); - updatedposts.unshift(this.renderPost(response.json())); - this.newPosts.next(updatedposts); + const updatedPosts = this.newPosts.getValue(); + updatedPosts.unshift(this.renderPost(response.json())); + this.newPosts.next(updatedPosts); this.setPost('NEW'); }); } @@ -89,14 +89,14 @@ export class FeedService { id: activityId }}; return this.http.post(environment.graphQLUrl, body).subscribe(response => { - const updatedposts = this.newPosts.getValue(); - updatedposts.unshift(this.renderPost(response.json())); - this.newPosts.next(updatedposts); + const updatedPosts = this.newPosts.getValue(); + updatedPosts.unshift(this.renderPost(response.json())); + this.newPosts.next(updatedPosts); this.setPost('NEW'); }); } - public upvote(pPostID: number): any { + public upvote(postId: number): any { const headers = new Headers(); headers.set('Content-Type', 'application/json'); @@ -105,7 +105,7 @@ export class FeedService { post{userVote upvotes downvotes} } }`, variables: { - postId: pPostID + postId }}; return this.http.post(environment.graphQLUrl, body); @@ -163,12 +163,12 @@ export class FeedService { headers.set('Content-Type', 'application/json'); this.http.post(environment.graphQLUrl, this.buildJson(this.activePostList, this.newOffset)) .subscribe(response => { - let updatedposts = this.newPosts.getValue(); - updatedposts = updatedposts.concat(this.renderAllPosts(response.json())); + let updatedPosts = this.newPosts.getValue(); + updatedPosts = updatedPosts.concat(this.renderAllPosts(response.json())); if (this.renderAllPosts(response.json()).length < 1) { this.newPostsAvailable.next(false); } - this.newPosts.next(updatedposts); + this.newPosts.next(updatedPosts); this.setPost('NEW'); }); } else if (this.activePostList === 'TOP' && this.topPostsAvailable) {