From 529d3c4b07d9851aa9e7e807efd1f39af6d21603 Mon Sep 17 00:00:00 2001 From: Abhishek Date: Jul 30 2018 07:30:03 +0000 Subject: [PATCH 1/6] fetch blog posts by categories --- diff --git a/src/providers/community-blog/community-blog.ts b/src/providers/community-blog/community-blog.ts index 4108cd5..746139f 100644 --- a/src/providers/community-blog/community-blog.ts +++ b/src/providers/community-blog/community-blog.ts @@ -18,11 +18,16 @@ export class CommunityBlogService { /** * Fetch the list of latest posts on Fedora Community Blog * + * @param category from which posts are to be fetched * @returns Observable which emits an array of blog posts */ - getBlogPosts(): Observable { - return this.http.get(`${ENDPOINT}/posts`) - .map((data: any[]) => data.map((blogpost: any) => ({ + getBlogPosts(category): Observable { + + let request; + //if no category is specified, fetch posts without parameters. + category === 'null' ? request = this.http.get(`${ENDPOINT}/posts`) : request = this.http.get(`${ENDPOINT}/posts`, { params: {'categories': category}}); + + return request.map((data: any[]) => data.map((blogpost: any) => ({ id: blogpost.id, link: blogpost.link, permalink: blogpost.guid.rendered, @@ -34,4 +39,4 @@ export class CommunityBlogService { featuredImage:'' }))); } -} +} \ No newline at end of file From 93a82ef34f09893deb32aecf74b5054a3821a71b Mon Sep 17 00:00:00 2001 From: Abhishek Date: Jul 30 2018 07:30:03 +0000 Subject: [PATCH 2/6] add women page --- diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 16768b7..f759855 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -16,7 +16,7 @@ import { HomePage } from '../pages/home/home'; import { MagazinePage } from '../pages/magazine/magazine'; import { AskPage } from '../pages/ask/ask'; import { CalendarPage, Search, meetingDetails } from '../pages/calendar/calendar'; -import { MorePage, AboutDetailPage, AboutPage, BookmarksPage } from '../pages/more/more'; +import { MorePage, AboutDetailPage, AboutPage, BookmarksPage, WomenDiversity } from '../pages/more/more'; import { NotificationsPage } from '../pages/notifications/notifications'; import { PackageSearchPage } from '../pages/package-search/package-search'; import { ViewPackagePage } from '../pages/view-package/view-package'; @@ -45,6 +45,7 @@ import { Browser } from '../providers/browser/browser'; ViewPackagePage, Search, meetingDetails, + WomenDiversity, NoBookmarksComponent, NoMeetingsComponent, NoResultsComponent, @@ -72,7 +73,8 @@ import { Browser } from '../providers/browser/browser'; PackageSearchPage, ViewPackagePage, Search, - meetingDetails + meetingDetails, + WomenDiversity ], providers: [ Browser, From 6d89fec25da317b5e26febd9e481a95bc0387104 Mon Sep 17 00:00:00 2001 From: Abhishek Date: Jul 30 2018 07:30:03 +0000 Subject: [PATCH 3/6] update blog provider --- diff --git a/src/pages/home/home.ts b/src/pages/home/home.ts index 3053836..c50495c 100644 --- a/src/pages/home/home.ts +++ b/src/pages/home/home.ts @@ -77,7 +77,7 @@ export class HomePage { * Fetch Blog Posts from the Fedora Community Blog */ private updateBlogPosts(): void { - this.communityblog.getBlogPosts() + this.communityblog.getBlogPosts('null') .subscribe(blogposts => { this.blogposts = blogposts; }); From c389a22633a0ce7de152c582de8ee13774bda9bb Mon Sep 17 00:00:00 2001 From: Abhishek Date: Jul 30 2018 07:30:03 +0000 Subject: [PATCH 4/6] add women page template and providers --- diff --git a/src/pages/more/more.scss b/src/pages/more/more.scss index 5cbb769..2309baa 100755 --- a/src/pages/more/more.scss +++ b/src/pages/more/more.scss @@ -51,7 +51,7 @@ page-more { bookmarks, about-us, -about-detail { +about-detail, women-diversity { ion-header { padding: 16px 24px; background-color: #fff; @@ -116,3 +116,44 @@ about-detail { } } } + +women-diversity { + ion-content { + .scroll-content { + p { + margin:0; + padding: 16px 24px; + background-color: #fff; + } + ion-label{ + margin: 0 0 4px 0; + padding: 12px 24px; + background-color: #fff; + color: #3C6DB3; + font-family: "Montserrat-Semibold"; + } + } + } + .card { + padding: 12px 24px; + background-color: #FFFFFF !important; + box-shadow: none; + margin: 4px 0; + width: 100%; + } + .card-header { + padding: 0 !important; + } + .card-content { + margin-top: 4px; + padding: 0 !important; + } + ion-card { + span { + display: block; + } + .active-title { + margin-bottom: 4px; + } + } +} diff --git a/src/pages/more/more.ts b/src/pages/more/more.ts index dd8f503..a3d8374 100755 --- a/src/pages/more/more.ts +++ b/src/pages/more/more.ts @@ -2,6 +2,9 @@ import { Component } from '@angular/core'; import { NavController, NavParams } from 'ionic-angular'; import { NotificationsPage } from '../../pages/notifications/notifications'; import { PackageSearchPage } from '../package-search/package-search'; +import { Browser } from '../../providers/browser/browser'; +import { Post } from '../../providers/fedora-magazine/fedora-magazine'; +import { CommunityBlogService } from '../../providers/community-blog/community-blog'; @Component({ selector: 'page-more', @@ -88,7 +91,8 @@ export class AboutPage { * @param navItem clicked item of about Fedora */ openAboutDetailPage(item) { - this.navCtrl.push(AboutDetailPage, { item: item }); + //open details if not women page, else push the women page + item.title === 'Women and Diversity' ? this.navCtrl.push(WomenDiversity) : this.navCtrl.push(AboutDetailPage, { item: item }); } } @@ -130,4 +134,47 @@ export class BookmarksPage { } } +/** Women and Diversity Page Component */ + +@Component({ + selector: 'women-diversity', + templateUrl: 'women-diversity.html', + providers: [CommunityBlogService] +}) +export class WomenDiversity { + + /** + * List of posts from Fedora Community Blog + */ + private blogposts: Post[]; + + constructor(private browser: Browser, private communityblog: CommunityBlogService) { + this.blogposts = []; + } + + /** + * Fetch Blog Posts from the Fedora Community Blog + */ + private updateBlogPosts(): void { + this.communityblog.getBlogPosts('454') + .subscribe(blogposts => { + this.blogposts = blogposts; + }); + } + + ngOnInit() { + this.updateBlogPosts(); + } + + /** + * Opens a update in a browser + * + * Opens the update in an in-app browser in mobile app and in a new tab on desktop. + * + * @param update update to open + */ + openUpdate(update: any): void { + this.browser.open(update.link); + } +} diff --git a/src/pages/more/women-diversity.html b/src/pages/more/women-diversity.html new file mode 100755 index 0000000..dded5df --- /dev/null +++ b/src/pages/more/women-diversity.html @@ -0,0 +1,27 @@ + + + + + + Women and Diversity + + + +

+ The Fedora Project welcomes and encourages participation by everyone. Our community is based on mutual respect, tolerance, + and encouragement, and we are working to help each other live up to these principles. Please, refer to + our Code of Conduct + if you need more information. Fedora Diversity and Inclusion team is committed to fostering diversity and inclusion in Fedora + community. +

+ + Latest Updates → + + + + + + + From 61130e79be7f3e80a33eee56a83a3c6dcba29e66 Mon Sep 17 00:00:00 2001 From: Abhishek Date: Jul 30 2018 07:52:10 +0000 Subject: [PATCH 5/6] fix link --- diff --git a/src/pages/more/women-diversity.html b/src/pages/more/women-diversity.html index dded5df..90c7b5d 100755 --- a/src/pages/more/women-diversity.html +++ b/src/pages/more/women-diversity.html @@ -12,7 +12,7 @@ Template for the Women and Diversity Page

The Fedora Project welcomes and encourages participation by everyone. Our community is based on mutual respect, tolerance, and encouragement, and we are working to help each other live up to these principles. Please, refer to - our Code of Conduct + our Code of Conduct if you need more information. Fedora Diversity and Inclusion team is committed to fostering diversity and inclusion in Fedora community.

From ddc12b54de34977640cab58aa403b0622591b08a Mon Sep 17 00:00:00 2001 From: Abhishek Date: Jul 31 2018 17:52:58 +0000 Subject: [PATCH 6/6] change header style --- diff --git a/src/pages/more/more.scss b/src/pages/more/more.scss index 2309baa..1cbbe5b 100755 --- a/src/pages/more/more.scss +++ b/src/pages/more/more.scss @@ -129,8 +129,6 @@ women-diversity { margin: 0 0 4px 0; padding: 12px 24px; background-color: #fff; - color: #3C6DB3; - font-family: "Montserrat-Semibold"; } } } diff --git a/src/pages/more/women-diversity.html b/src/pages/more/women-diversity.html index 90c7b5d..7dbb33c 100755 --- a/src/pages/more/women-diversity.html +++ b/src/pages/more/women-diversity.html @@ -17,7 +17,7 @@ Template for the Women and Diversity Page community.

- Latest Updates → + Latest Updates