diff --git a/src/app/components/feed/feed.component.ts b/src/app/components/feed/feed.component.ts index baf1aa8..dd8500c 100644 --- a/src/app/components/feed/feed.component.ts +++ b/src/app/components/feed/feed.component.ts @@ -39,6 +39,7 @@ export class FeedComponent implements OnInit { } ngOnInit() { + console.log('init feedcomponent'); this.data.currentUserInfo.subscribe(user => { this.user = user; this.loggedIn = user.loggedIn; @@ -55,7 +56,6 @@ export class FeedComponent implements OnInit { this.loadingNew = response; }); this.feedService.topPostsAvailable.subscribe(response => { - console.log(response); this.loadingMostLiked = response; }); } @@ -83,7 +83,6 @@ export class FeedComponent implements OnInit { } onScroll() { - console.log('scrolled'); this.feedService.getNextPosts(); } diff --git a/src/app/components/home/home.component.html b/src/app/components/home/home.component.html index cee7549..267dc79 100644 --- a/src/app/components/home/home.component.html +++ b/src/app/components/home/home.component.html @@ -1,4 +1,5 @@ -
+ +
@@ -12,14 +13,9 @@
- -
+ + +
diff --git a/src/app/components/home/home.component.ts b/src/app/components/home/home.component.ts index 7df509d..1e80db3 100644 --- a/src/app/components/home/home.component.ts +++ b/src/app/components/home/home.component.ts @@ -1,6 +1,6 @@ import {Component, OnInit} from '@angular/core'; import {DatasharingService} from 'src/app/services/datasharing.service'; -import {FeedService} from 'src/app/services/feed/feed.service'; +import { MediaObserver } from '@angular/flex-layout'; @Component({ selector: 'app-home', @@ -11,7 +11,7 @@ export class HomeComponent implements OnInit { loggedIn: boolean; - constructor(private data: DatasharingService, private feedService: FeedService) { + constructor(private data: DatasharingService, public media: MediaObserver) { } ngOnInit() { diff --git a/src/app/services/feed/feed.service.ts b/src/app/services/feed/feed.service.ts index b6755a2..184de70 100644 --- a/src/app/services/feed/feed.service.ts +++ b/src/app/services/feed/feed.service.ts @@ -151,6 +151,7 @@ export class FeedService { } public getPosts(sort: string) { + console.log('feedservice: getPosts()'); if ((sort === 'NEW' && this.newPosts.getValue().length === 0) || (sort === 'TOP' && this.mostLikedPosts.getValue().length === 0)) { const headers = new Headers();