|
|
@ -1,4 +1,4 @@
|
|
|
|
import {Component, OnInit, ViewChild} from '@angular/core';
|
|
|
|
import {Component, OnInit, ViewChild, ElementRef} from '@angular/core';
|
|
|
|
import {Post} from 'src/app/models/post';
|
|
|
|
import {Post} from 'src/app/models/post';
|
|
|
|
import {FeedService, Sort} from 'src/app/services/feed/feed.service';
|
|
|
|
import {FeedService, Sort} from 'src/app/services/feed/feed.service';
|
|
|
|
import {Activitylist} from 'src/app/models/activity';
|
|
|
|
import {Activitylist} from 'src/app/models/activity';
|
|
|
@ -17,7 +17,7 @@ export class FeedComponent implements OnInit {
|
|
|
|
loadingNew = true;
|
|
|
|
loadingNew = true;
|
|
|
|
loadingMostLiked = true;
|
|
|
|
loadingMostLiked = true;
|
|
|
|
// file upload variables
|
|
|
|
// file upload variables
|
|
|
|
@ViewChild('name', {static: false}) fileInput;
|
|
|
|
@ViewChild('fileInput', {static: false}) fileInput: ElementRef;
|
|
|
|
public uploading = false;
|
|
|
|
public uploading = false;
|
|
|
|
public profilePictureUrl: BehaviorSubject<string | null>;
|
|
|
|
public profilePictureUrl: BehaviorSubject<string | null>;
|
|
|
|
private file;
|
|
|
|
private file;
|
|
|
@ -64,8 +64,11 @@ export class FeedComponent implements OnInit {
|
|
|
|
this.loadingMostLiked = this.loadingNew = available;
|
|
|
|
this.loadingMostLiked = this.loadingNew = available;
|
|
|
|
});
|
|
|
|
});
|
|
|
|
this.feedService.posting.subscribe(posting => {
|
|
|
|
this.feedService.posting.subscribe(posting => {
|
|
|
|
|
|
|
|
const temp = this.posting;
|
|
|
|
this.posting = posting;
|
|
|
|
this.posting = posting;
|
|
|
|
this.resetPostInput();
|
|
|
|
if (temp !== this.posting && !this.posting) {
|
|
|
|
|
|
|
|
this.resetPostInput();
|
|
|
|
|
|
|
|
}
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|