Fix typos & stuff

master
Trivernis 5 years ago
parent c485641afb
commit 67c4664fe5

@ -23,7 +23,7 @@ export class AboutComponent implements OnInit {
@ViewChild(MatSort, {static: true}) sort: MatSort; @ViewChild(MatSort, {static: true}) sort: MatSort;
ngOnInit() { ngOnInit() {
this.activityService.getActivitys(); this.activityService.getActivities();
this.activityService.activitylist.subscribe(response => { this.activityService.activitylist.subscribe(response => {
this.actionlist = response; this.actionlist = response;
this.dataSource = new MatTableDataSource(this.actionlist.Actions); this.dataSource = new MatTableDataSource(this.actionlist.Actions);

@ -38,7 +38,7 @@ export class FeedComponent implements OnInit {
this.user = user; this.user = user;
this.loggedIn = user.loggedIn; this.loggedIn = user.loggedIn;
}); });
this.activityService.getActivitys(); this.activityService.getActivities();
this.activityService.activitylist.subscribe(response => { this.activityService.activitylist.subscribe(response => {
this.actionlist = response; this.actionlist = response;
}); });

@ -18,7 +18,7 @@ export class ActivityService {
this.activitylist.next(pActivitylist); this.activitylist.next(pActivitylist);
} }
public getActivitys() { public getActivities() {
if (this.activitylist.getValue().Actions.length < 1) { if (this.activitylist.getValue().Actions.length < 1) {
const headers = new Headers(); const headers = new Headers();
headers.set('Content-Type', 'application/json'); headers.set('Content-Type', 'application/json');

@ -14,9 +14,9 @@ export class FeedService {
public newPostsAvailable = new BehaviorSubject<boolean>(true); public newPostsAvailable = new BehaviorSubject<boolean>(true);
public topPostsAvailable = new BehaviorSubject<boolean>(true); public topPostsAvailable = new BehaviorSubject<boolean>(true);
public posts: BehaviorSubject<Post[]> = new BehaviorSubject(new Array()); public posts: BehaviorSubject<Post[]> = new BehaviorSubject([]);
public newPosts: BehaviorSubject<Post[]> = new BehaviorSubject(new Array()); public newPosts: BehaviorSubject<Post[]> = new BehaviorSubject([]);
public mostLikedPosts: BehaviorSubject<Post[]> = new BehaviorSubject(new Array()); public mostLikedPosts: BehaviorSubject<Post[]> = new BehaviorSubject([]);
private activePostList = 'NEW'; private activePostList = 'NEW';
private mostLikedOffset = 0; private mostLikedOffset = 0;
private newOffset = 0; private newOffset = 0;
@ -52,9 +52,9 @@ export class FeedService {
content: pContent content: pContent
}}; }};
return this.http.post(environment.graphQLUrl, body).subscribe(response => { return this.http.post(environment.graphQLUrl, body).subscribe(response => {
const updatedposts = this.newPosts.getValue(); const updatedPosts = this.newPosts.getValue();
updatedposts.unshift(this.renderPost(response.json())); updatedPosts.unshift(this.renderPost(response.json()));
this.newPosts.next(updatedposts); this.newPosts.next(updatedPosts);
this.setPost('NEW'); this.setPost('NEW');
}); });
} }
@ -89,14 +89,14 @@ export class FeedService {
id: activityId id: activityId
}}; }};
return this.http.post(environment.graphQLUrl, body).subscribe(response => { return this.http.post(environment.graphQLUrl, body).subscribe(response => {
const updatedposts = this.newPosts.getValue(); const updatedPosts = this.newPosts.getValue();
updatedposts.unshift(this.renderPost(response.json())); updatedPosts.unshift(this.renderPost(response.json()));
this.newPosts.next(updatedposts); this.newPosts.next(updatedPosts);
this.setPost('NEW'); this.setPost('NEW');
}); });
} }
public upvote(pPostID: number): any { public upvote(postId: number): any {
const headers = new Headers(); const headers = new Headers();
headers.set('Content-Type', 'application/json'); headers.set('Content-Type', 'application/json');
@ -105,7 +105,7 @@ export class FeedService {
post{userVote upvotes downvotes} post{userVote upvotes downvotes}
} }
}`, variables: { }`, variables: {
postId: pPostID postId
}}; }};
return this.http.post(environment.graphQLUrl, body); return this.http.post(environment.graphQLUrl, body);
@ -163,12 +163,12 @@ export class FeedService {
headers.set('Content-Type', 'application/json'); headers.set('Content-Type', 'application/json');
this.http.post(environment.graphQLUrl, this.buildJson(this.activePostList, this.newOffset)) this.http.post(environment.graphQLUrl, this.buildJson(this.activePostList, this.newOffset))
.subscribe(response => { .subscribe(response => {
let updatedposts = this.newPosts.getValue(); let updatedPosts = this.newPosts.getValue();
updatedposts = updatedposts.concat(this.renderAllPosts(response.json())); updatedPosts = updatedPosts.concat(this.renderAllPosts(response.json()));
if (this.renderAllPosts(response.json()).length < 1) { if (this.renderAllPosts(response.json()).length < 1) {
this.newPostsAvailable.next(false); this.newPostsAvailable.next(false);
} }
this.newPosts.next(updatedposts); this.newPosts.next(updatedPosts);
this.setPost('NEW'); this.setPost('NEW');
}); });
} else if (this.activePostList === 'TOP' && this.topPostsAvailable) { } else if (this.activePostList === 'TOP' && this.topPostsAvailable) {

Loading…
Cancel
Save