| |
@@ -5,14 +5,14 @@
|
| |
import { FacebookProvider } from '../../providers/social/facebook';
|
| |
import { TwitterProvider } from '../../providers/social/twitter';
|
| |
import { SocialMediaPost } from '../../providers/social/social';
|
| |
- import { forkJoin } from 'rxjs/observable/forkJoin';
|
| |
+ import { combineLatest } from 'rxjs/observable/combineLatest';
|
| |
import { FedoraMagazineService, Post, Image } from '../../providers/fedora-magazine/fedora-magazine';
|
| |
import { CommunityBlogService } from '../../providers/community-blog/community-blog';
|
| |
|
| |
- const HANDLE = {
|
| |
- FB: 'fedoraqa',
|
| |
- TWITTER: 'fedora_qa',
|
| |
- };
|
| |
+ const HANDLE = Object.seal({
|
| |
+ FB: 'TheFedoraProject',
|
| |
+ TWITTER: 'fedora',
|
| |
+ });
|
| |
|
| |
@Component({
|
| |
selector: 'page-home',
|
| |
@@ -41,7 +41,11 @@
|
| |
*/
|
| |
private blogposts: Post[];
|
| |
|
| |
- constructor(public navCtrl: NavController, private browser: Browser, private fb: FacebookProvider, private twitter: TwitterProvider, private fedoraMag: FedoraMagazineService, private communityblog: CommunityBlogService) {
|
| |
+ constructor(public navCtrl: NavController, private browser: Browser,
|
| |
+ private fb: FacebookProvider,
|
| |
+ private twitter: TwitterProvider,
|
| |
+ private fedoraMag: FedoraMagazineService,
|
| |
+ private communityblog: CommunityBlogService) {
|
| |
this.socialposts = [];
|
| |
this.blogposts = [];
|
| |
this.carousel = [];
|
| |
@@ -53,7 +57,7 @@
|
| |
* Currently, we fetch posts from Facebook and Twitter
|
| |
*/
|
| |
private updateSocialMedia(): void {
|
| |
- forkJoin(this.fb.getPosts(HANDLE.FB), this.twitter.getPosts(HANDLE.TWITTER))
|
| |
+ combineLatest(this.fb.getPosts(HANDLE.FB), this.twitter.getPosts(HANDLE.TWITTER))
|
| |
.subscribe(values => {
|
| |
this.socialposts = [...values[0], ...values[1]] as SocialMediaPost[];
|
| |
});
|
| |
@@ -103,4 +107,4 @@
|
| |
this.navCtrl.push(NotificationsPage, { animate: true, direction: 'forward' });
|
| |
}
|
| |
|
| |
- }
|
| |
\ No newline at end of file
|
| |
+ }
|
| |
Closes #7 and #8
Show posts from:
1. https://www.facebook.com/TheFedoraProject/
2. https://twitter.com/fedora