From 9871a4540cea6f6f3fb88506f1ba8f9906162348 Mon Sep 17 00:00:00 2001 From: shresth Date: Dec 03 2018 07:30:41 +0000 Subject: [PATCH 1/13] added About page --- diff --git a/package-lock.json b/package-lock.json index 53ea2e7..29603ea 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3784,11 +3784,13 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true + "bundled": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -3801,15 +3803,18 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "concat-map": { "version": "0.0.1", - "bundled": true + "bundled": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -3912,7 +3917,8 @@ }, "inherits": { "version": "2.0.3", - "bundled": true + "bundled": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -3922,6 +3928,7 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -3934,17 +3941,20 @@ "minimatch": { "version": "3.0.4", "bundled": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true + "bundled": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -3961,6 +3971,7 @@ "mkdirp": { "version": "0.5.1", "bundled": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -4033,7 +4044,8 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true + "bundled": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -4043,6 +4055,7 @@ "once": { "version": "1.4.0", "bundled": true, + "optional": true, "requires": { "wrappy": "1" } @@ -4148,6 +4161,7 @@ "string-width": { "version": "1.0.2", "bundled": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 1a1d5ea..660b3f8 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -14,6 +14,7 @@ import { TabsPage } from '../pages/tabs/tabs'; import { HomePage } from '../pages/home/home'; import { MagazinePage } from '../pages/magazine/magazine'; import { AskPage } from '../pages/ask/ask'; +import { AboutAppPage } from '../pages/about-app/about-app'; import { MorePage, AboutDetailPage, AboutPage, BookmarksPage, WomenDiversity, FedoraPodcast, PodcastPlayer } from '../pages/more/more'; import { CalendarPage, Search, meetingDetails } from '../pages/calendar/calendar'; import { NotificationsPage } from '../pages/notifications/notifications'; @@ -39,6 +40,7 @@ import { Browser } from '../providers/browser/browser'; NotificationsPage, AboutDetailPage, AboutPage, + AboutAppPage, BookmarksPage, PackageSearchPage, ViewPackagePage, @@ -66,6 +68,7 @@ import { Browser } from '../providers/browser/browser'; CalendarPage, TabsPage, HomePage, + AboutAppPage, MorePage, NotificationsPage, AboutDetailPage, diff --git a/src/assets/img/info.png b/src/assets/img/info.png new file mode 100644 index 0000000..70aa91f Binary files /dev/null and b/src/assets/img/info.png differ diff --git a/src/pages/about-app/about-app.html b/src/pages/about-app/about-app.html new file mode 100644 index 0000000..b4bb3d4 --- /dev/null +++ b/src/pages/about-app/about-app.html @@ -0,0 +1,85 @@ + + + + About App + + + + + + Fedora + + + How can you use fedora app? + + + The Fedora App provides a central location for Fedora users and contributors to stay updated on The Fedora Project. News updates, social posts, Ask Fedora, as well as articles from Fedora Magazine are all held under this app. + + + + + Technology Used In Fedora App + + + + Angular, Ionic 3, TypeScript, SCSS + + + + + + Fedora App Features + + +
    +
  • Fedora Magazine +
      +
    • Browse recent articles from Fedora Magazine
      • +
    • Share articles via Facebook, e-Mail, text, and more
      • +
    • Be taken directly to Fedora Magazine official site.
      • +
    +
    • +
  • Fedora Social +
      +
    • View updates of Fedora's Facebook news Feed
      • +
    • Also links to official Facebook page
      • +
    +
    • +
  • Ask Fedora +
      +
    • Browse and ask questions about Fedora Linux to Ask Fedora
      • +
    • Share questions and comments.
      • +
    • Search, vote, and answer questions.
      • +
    +
    • +
  • Fedora Calendar +
      +
    • View events for Fedora from all different SIGs including QA, budget, classroom, etc.
      • +
    • Add event to device calendar directly from app.
      • +
    • View the date, time, and description of the event.
      • +
    +
    • +
+ + + + + Contributers + + +
    +
  • Sudhir Dharanendraiah
    • +
  • Kanika Murarka
    • +
  • Amitosh Swain Mahapatra
    • +
  • Abhishek Sharma
    • +
  • Arvind Chembarpu
    • +
  • Sumantro Mukherjee
    • +
  • Lauren LeGardye
    • +
  • Manaswini Das
    • +
  • RP Herrold
    • +
+ + + + + diff --git a/src/pages/about-app/about-app.scss b/src/pages/about-app/about-app.scss new file mode 100644 index 0000000..d8fef19 --- /dev/null +++ b/src/pages/about-app/about-app.scss @@ -0,0 +1,9 @@ +page-about{ + .centre { + display: block; + margin-left: auto; + margin-right: auto; + width:50% + } + +} \ No newline at end of file diff --git a/src/pages/about-app/about-app.ts b/src/pages/about-app/about-app.ts new file mode 100644 index 0000000..e90d4d2 --- /dev/null +++ b/src/pages/about-app/about-app.ts @@ -0,0 +1,14 @@ +import { Component } from '@angular/core'; +import { NavController } from 'ionic-angular'; +//hey their +@Component({ + selector: 'page-about', + templateUrl: 'about-app.html' +}) +export class AboutAppPage { + + constructor(public navCtrl: NavController) { + + } + +} diff --git a/src/pages/more/more.html b/src/pages/more/more.html index 42a5bae..ff2dac8 100755 --- a/src/pages/more/more.html +++ b/src/pages/more/more.html @@ -45,6 +45,10 @@ About Fedora + + + + + + \ No newline at end of file diff --git a/src/pages/fedora-planet/fedora-planet.scss b/src/pages/fedora-planet/fedora-planet.scss new file mode 100644 index 0000000..bfe963c --- /dev/null +++ b/src/pages/fedora-planet/fedora-planet.scss @@ -0,0 +1,13 @@ +page-fedora-planet { + + img { + all: unset; + } + .feed-title{ + all: unset; + } + .centre{ + text-align: center; + } + + } \ No newline at end of file diff --git a/src/pages/fedora-planet/fedora-planet.ts b/src/pages/fedora-planet/fedora-planet.ts new file mode 100644 index 0000000..c7c13da --- /dev/null +++ b/src/pages/fedora-planet/fedora-planet.ts @@ -0,0 +1,60 @@ +import { Component } from '@angular/core'; +import { NavController } from 'ionic-angular'; +import { Feed, FedoraPlanetFeed } from '../../providers/fedora-planet-feed/fedora-planet-feed'; + + + + +@Component({ + selector: 'page-fedora-planet', + templateUrl: 'fedora-planet.html' +}) +export class FedoraPlanetPage { + + feedList = []; + feedTitle = ""; + + constructor(public navCtrl: NavController, + private fedoraPlanetFeed: FedoraPlanetFeed ) + { + (async () => { + var rawFeeds = await this.fedoraPlanetFeed.getFeeds(); + console.log(rawFeeds); + this.feedTitle = rawFeeds.title; + var i =0; + rawFeeds.items.forEach(item => { + this.feedList.push(new Feed(item.title, + item.content, + item.author, + item.contentSnippet, + item.id, + item.isoDate, + item.link, + item.pubDate, + "index"+i)); + i++; + }); + })(); + + //if(typeof rawFeeds[Symbol.iterator] === 'function') + //{this.feedList= rawFeeds } + } + showFeed(feed: any): void { + var tmp = feed.contentSnippet; + feed.contentSnippet=feed.content; + feed.content = tmp; + console.log(feed); + } + // + //feeds: json; + ionViewWillEnter() + { + + + } + + + + + +} \ No newline at end of file diff --git a/src/pages/home/home.html b/src/pages/home/home.html index 8facbf9..3749fa0 100644 --- a/src/pages/home/home.html +++ b/src/pages/home/home.html @@ -33,9 +33,9 @@
- + - + diff --git a/src/pages/more/more.html b/src/pages/more/more.html index ff2dac8..d050ac2 100755 --- a/src/pages/more/more.html +++ b/src/pages/more/more.html @@ -37,8 +37,12 @@ Fedora Podcast + - - - - - \ No newline at end of file diff --git a/src/pages/fedora-planet/fedora-planet.scss b/src/pages/fedora-planet/fedora-planet.scss deleted file mode 100644 index bfe963c..0000000 --- a/src/pages/fedora-planet/fedora-planet.scss +++ /dev/null @@ -1,13 +0,0 @@ -page-fedora-planet { - - img { - all: unset; - } - .feed-title{ - all: unset; - } - .centre{ - text-align: center; - } - - } \ No newline at end of file diff --git a/src/pages/fedora-planet/fedora-planet.ts b/src/pages/fedora-planet/fedora-planet.ts deleted file mode 100644 index c7c13da..0000000 --- a/src/pages/fedora-planet/fedora-planet.ts +++ /dev/null @@ -1,60 +0,0 @@ -import { Component } from '@angular/core'; -import { NavController } from 'ionic-angular'; -import { Feed, FedoraPlanetFeed } from '../../providers/fedora-planet-feed/fedora-planet-feed'; - - - - -@Component({ - selector: 'page-fedora-planet', - templateUrl: 'fedora-planet.html' -}) -export class FedoraPlanetPage { - - feedList = []; - feedTitle = ""; - - constructor(public navCtrl: NavController, - private fedoraPlanetFeed: FedoraPlanetFeed ) - { - (async () => { - var rawFeeds = await this.fedoraPlanetFeed.getFeeds(); - console.log(rawFeeds); - this.feedTitle = rawFeeds.title; - var i =0; - rawFeeds.items.forEach(item => { - this.feedList.push(new Feed(item.title, - item.content, - item.author, - item.contentSnippet, - item.id, - item.isoDate, - item.link, - item.pubDate, - "index"+i)); - i++; - }); - })(); - - //if(typeof rawFeeds[Symbol.iterator] === 'function') - //{this.feedList= rawFeeds } - } - showFeed(feed: any): void { - var tmp = feed.contentSnippet; - feed.contentSnippet=feed.content; - feed.content = tmp; - console.log(feed); - } - // - //feeds: json; - ionViewWillEnter() - { - - - } - - - - - -} \ No newline at end of file diff --git a/src/pages/more/more.html b/src/pages/more/more.html index d050ac2..517c956 100755 --- a/src/pages/more/more.html +++ b/src/pages/more/more.html @@ -37,10 +37,6 @@ Fedora Podcast - + + + + + \ No newline at end of file diff --git a/src/pages/fedora-planet/fedora-planet.scss b/src/pages/fedora-planet/fedora-planet.scss new file mode 100644 index 0000000..bfe963c --- /dev/null +++ b/src/pages/fedora-planet/fedora-planet.scss @@ -0,0 +1,13 @@ +page-fedora-planet { + + img { + all: unset; + } + .feed-title{ + all: unset; + } + .centre{ + text-align: center; + } + + } \ No newline at end of file diff --git a/src/pages/fedora-planet/fedora-planet.ts b/src/pages/fedora-planet/fedora-planet.ts new file mode 100644 index 0000000..c7c13da --- /dev/null +++ b/src/pages/fedora-planet/fedora-planet.ts @@ -0,0 +1,60 @@ +import { Component } from '@angular/core'; +import { NavController } from 'ionic-angular'; +import { Feed, FedoraPlanetFeed } from '../../providers/fedora-planet-feed/fedora-planet-feed'; + + + + +@Component({ + selector: 'page-fedora-planet', + templateUrl: 'fedora-planet.html' +}) +export class FedoraPlanetPage { + + feedList = []; + feedTitle = ""; + + constructor(public navCtrl: NavController, + private fedoraPlanetFeed: FedoraPlanetFeed ) + { + (async () => { + var rawFeeds = await this.fedoraPlanetFeed.getFeeds(); + console.log(rawFeeds); + this.feedTitle = rawFeeds.title; + var i =0; + rawFeeds.items.forEach(item => { + this.feedList.push(new Feed(item.title, + item.content, + item.author, + item.contentSnippet, + item.id, + item.isoDate, + item.link, + item.pubDate, + "index"+i)); + i++; + }); + })(); + + //if(typeof rawFeeds[Symbol.iterator] === 'function') + //{this.feedList= rawFeeds } + } + showFeed(feed: any): void { + var tmp = feed.contentSnippet; + feed.contentSnippet=feed.content; + feed.content = tmp; + console.log(feed); + } + // + //feeds: json; + ionViewWillEnter() + { + + + } + + + + + +} \ No newline at end of file diff --git a/src/pages/more/more.html b/src/pages/more/more.html index 517c956..864aab0 100755 --- a/src/pages/more/more.html +++ b/src/pages/more/more.html @@ -41,14 +41,14 @@ Bookmarks + - - - + \ No newline at end of file diff --git a/src/pages/fedora-planet/fedora-planet.scss b/src/pages/fedora-planet/fedora-planet.scss index bfe963c..c290141 100644 --- a/src/pages/fedora-planet/fedora-planet.scss +++ b/src/pages/fedora-planet/fedora-planet.scss @@ -1,4 +1,37 @@ page-fedora-planet { + ion-content { + background-color: #EFF0F1 !important; + } + .card { + padding: 16px 24px; + background-color: #FFFFFF!important; + box-shadow: none; + margin: 4px 0; + width: 100%; + } + .card-header{ + padding: 0!important; + } + .card-content{ + margin-top: 8px; + padding: 0!important; + } + ion-card{ + img{ + width: auto; + float: left; + margin-right: 12px; + } + span{ + display: block; + } + .active-title{ + margin-bottom: 4px; + } + ion-icon{ + margin-right: 5px; + } + } img { all: unset; diff --git a/src/pages/more/more.html b/src/pages/more/more.html index 864aab0..dfc750a 100755 --- a/src/pages/more/more.html +++ b/src/pages/more/more.html @@ -42,7 +42,7 @@ Bookmarks