From 55deab246cedcc387434a45457bfd9e2f1bbf3b5 Mon Sep 17 00:00:00 2001 From: Abhishek Date: Jul 25 2018 17:57:25 +0000 Subject: [PATCH 1/7] add icons --- diff --git a/src/assets/img/Fedora.svg b/src/assets/img/Fedora.svg old mode 100644 new mode 100755 diff --git a/src/assets/img/ask-active.svg b/src/assets/img/ask-active.svg old mode 100644 new mode 100755 diff --git a/src/assets/img/ask-inactive.svg b/src/assets/img/ask-inactive.svg old mode 100644 new mode 100755 diff --git a/src/assets/img/back.svg b/src/assets/img/back.svg old mode 100644 new mode 100755 diff --git a/src/assets/img/bookmark-active.svg b/src/assets/img/bookmark-active.svg old mode 100644 new mode 100755 diff --git a/src/assets/img/bookmark-inactive.svg b/src/assets/img/bookmark-inactive.svg old mode 100644 new mode 100755 diff --git a/src/assets/img/cal-active.svg b/src/assets/img/cal-active.svg old mode 100644 new mode 100755 diff --git a/src/assets/img/cal-inactive.svg b/src/assets/img/cal-inactive.svg old mode 100644 new mode 100755 diff --git a/src/assets/img/calendar.svg b/src/assets/img/calendar.svg old mode 100644 new mode 100755 diff --git a/src/assets/img/clock.svg b/src/assets/img/clock.svg old mode 100644 new mode 100755 diff --git a/src/assets/img/downvote.svg b/src/assets/img/downvote.svg old mode 100644 new mode 100755 diff --git a/src/assets/img/dropdown.svg b/src/assets/img/dropdown.svg old mode 100644 new mode 100755 diff --git a/src/assets/img/es-bookmarks.svg b/src/assets/img/es-bookmarks.svg new file mode 100755 index 0000000..fd591f0 --- /dev/null +++ b/src/assets/img/es-bookmarks.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/img/es-cal.svg b/src/assets/img/es-cal.svg old mode 100644 new mode 100755 diff --git a/src/assets/img/es-search.svg b/src/assets/img/es-search.svg old mode 100644 new mode 100755 diff --git a/src/assets/img/fedora.png b/src/assets/img/fedora.png old mode 100644 new mode 100755 Binary files a/src/assets/img/fedora.png and b/src/assets/img/fedora.png differ diff --git a/src/assets/img/home-active.svg b/src/assets/img/home-active.svg old mode 100644 new mode 100755 diff --git a/src/assets/img/home-inactive.svg b/src/assets/img/home-inactive.svg old mode 100644 new mode 100755 diff --git a/src/assets/img/mag-active.svg b/src/assets/img/mag-active.svg old mode 100644 new mode 100755 diff --git a/src/assets/img/mag-inactive.svg b/src/assets/img/mag-inactive.svg old mode 100644 new mode 100755 diff --git a/src/assets/img/more-account.svg b/src/assets/img/more-account.svg new file mode 100755 index 0000000..a9a2496 --- /dev/null +++ b/src/assets/img/more-account.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/img/more-active.svg b/src/assets/img/more-active.svg old mode 100644 new mode 100755 diff --git a/src/assets/img/more-bookmark.svg b/src/assets/img/more-bookmark.svg new file mode 100755 index 0000000..d8e8e71 --- /dev/null +++ b/src/assets/img/more-bookmark.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/img/more-inactive.svg b/src/assets/img/more-inactive.svg old mode 100644 new mode 100755 diff --git a/src/assets/img/more-logout.svg b/src/assets/img/more-logout.svg new file mode 100755 index 0000000..57d8c2c --- /dev/null +++ b/src/assets/img/more-logout.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/img/more-podcast.svg b/src/assets/img/more-podcast.svg new file mode 100755 index 0000000..c71da24 --- /dev/null +++ b/src/assets/img/more-podcast.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/img/more-search.svg b/src/assets/img/more-search.svg new file mode 100755 index 0000000..3f7a9ed --- /dev/null +++ b/src/assets/img/more-search.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/img/notification.svg b/src/assets/img/notification.svg old mode 100644 new mode 100755 diff --git a/src/assets/img/search.svg b/src/assets/img/search.svg old mode 100644 new mode 100755 diff --git a/src/assets/img/sort.svg b/src/assets/img/sort.svg old mode 100644 new mode 100755 diff --git a/src/assets/img/star-active.svg b/src/assets/img/star-active.svg old mode 100644 new mode 100755 diff --git a/src/assets/img/star-inactive.svg b/src/assets/img/star-inactive.svg old mode 100644 new mode 100755 diff --git a/src/assets/img/upvote.svg b/src/assets/img/upvote.svg old mode 100644 new mode 100755 From bb9f8e38d2444edf98085ede7b6659c5056a3151 Mon Sep 17 00:00:00 2001 From: Abhishek Date: Jul 25 2018 17:57:51 +0000 Subject: [PATCH 2/7] update modules and styles --- diff --git a/src/app/app.module.ts b/src/app/app.module.ts old mode 100644 new mode 100755 index 9ae6982..3178776 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -16,9 +16,8 @@ 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} from '../pages/more/more'; +import { MorePage, AboutDetailPage, AboutPage, BookmarksPage} from '../pages/more/more'; import { NotificationsPage} from '../pages/notifications/notifications'; -import { WomenPage } from '../pages/women/women'; import { PackageSearchPage } from '../pages/package-search/package-search'; import { ViewPackagePage } from '../pages/view-package/view-package'; @@ -34,7 +33,9 @@ import { Browser } from '../providers/browser/browser'; CalendarPage, MorePage, NotificationsPage, - WomenPage, + AboutDetailPage, + AboutPage, + BookmarksPage, PackageSearchPage, ViewPackagePage, Search, @@ -56,7 +57,9 @@ import { Browser } from '../providers/browser/browser'; HomePage, MorePage, NotificationsPage, - WomenPage, + AboutDetailPage, + BookmarksPage, + AboutPage, PackageSearchPage, ViewPackagePage, Search, diff --git a/src/app/app.scss b/src/app/app.scss old mode 100644 new mode 100755 index 6b060c3..75d458e --- a/src/app/app.scss +++ b/src/app/app.scss @@ -125,23 +125,12 @@ ion-navbar { box-shadow: 0 2px 4px 0 rgba(86, 86, 86, 0.05); } -[padding] ion-list ion-item { - h1:first-child, - h2:first-child, - h3:first-child, - h4:first-child, - h5:first-child, - h6:first-child { - margin-top: unset; - } -} - .pkg-lib { - color: #03A9F4 + color: #A07CBC!important; } .pkg-devel { - color: #FFEB3B; + color: #E59728!important; } //segment styles @@ -205,4 +194,8 @@ ion-segment { color: #3C6EB4; line-height: 14px; } +} + +.hidden{ + display: none; } \ No newline at end of file From 4cf3ab7d11c08939d89963c7e7c0e83e103a6643 Mon Sep 17 00:00:00 2001 From: Abhishek Date: Jul 25 2018 17:58:10 +0000 Subject: [PATCH 3/7] update package page ui --- diff --git a/src/pages/package-search/package-search.html b/src/pages/package-search/package-search.html old mode 100644 new mode 100755 index 015bded..3a10377 --- a/src/pages/package-search/package-search.html +++ b/src/pages/package-search/package-search.html @@ -1,28 +1,30 @@ - - - - - Fedora Package Search - - + + + + Fedora Package Search + + + - - + - - Showing {{ matches }} results - - - -

{{ pkg.name }}

-

{{ pkg.summary }}

- +
+ Showing {{ matches }} results + + + + + {{ pkg.name }} + + + + + {{ pkg.summary }} + + + +
diff --git a/src/pages/package-search/package-search.scss b/src/pages/package-search/package-search.scss old mode 100644 new mode 100755 index dfc5957..936baec --- a/src/pages/package-search/package-search.scss +++ b/src/pages/package-search/package-search.scss @@ -1,3 +1,86 @@ -page-search { +.pkg-head { + padding: 16px 24px; + background-color: #fff; + span { + font-family: "Montserrat-Regular"; + font-size: 16px; + color: #9A9FA6; + letter-spacing: 0.57px; + margin: 0 0 16px 16px; + text-transform: uppercase; + } + .toolbar-title { + padding: 0 !important; + } + .searchbar { + padding: 16px 0 0 0; + .searchbar-search-icon { + right: 90%; + background-image: url(../assets/img/search.svg); + } + .searchbar-input { + box-shadow: none; + padding: 8px 12px 8px 48px; + line-height: 2.5rem; + border: 1px solid transparent; + font-family: "OpenSans-Regular"; + background: rgba(239, 240, 241, 0.50); + &:focus { + background: #fff; + border: 1px solid rgba(#3B6FBB, 0.5); + } + } + } + &::after { + background-image: none; + box-shadow: 0 2px 4px 0 rgba(86, 86, 86, 0.05); + } +} +.pkg-content { + [col-1], + [col-11] { + padding: 0 !important; + } + .col{ + padding:0; + ion-icon{ + color: unset; + margin-right: 4px; + vertical-align: middle; + } + } + background-color: #EFF0F1 !important; + ion-list { + margin: 0 !important; + } + .card { + padding: 12px 16px; + margin: 0 0 2px 0; + width: 100%; + background-color: #fff !important; + box-shadow: none; + } + .emptystate { + height: 50vh; + } + .card-header { + font-family: "OpenSans-Semibold"; + font-size: 14px; + color: #3B6FBB; + line-height: 20px; + padding: 0; + } + ion-label { + padding: 16px 16px 12px 16px; + background-color: #fff; + margin: 0; + } + .card-content { + font-family: "OpenSans-Regular"; + font-size: 12px; + color: #535961; + line-height: 20px; + padding: 0; + } } diff --git a/src/pages/package-search/package-search.ts b/src/pages/package-search/package-search.ts old mode 100644 new mode 100755 From 22449fcb29d1d6f34ba96cc3cfe68b25531c991f Mon Sep 17 00:00:00 2001 From: Abhishek Date: Jul 25 2018 17:58:22 +0000 Subject: [PATCH 4/7] update individual package page ui --- diff --git a/src/pages/view-package/view-package.html b/src/pages/view-package/view-package.html old mode 100644 new mode 100755 index 77955b4..19153be --- a/src/pages/view-package/view-package.html +++ b/src/pages/view-package/view-package.html @@ -5,32 +5,45 @@ Ionic pages and navigation. --> - - - Package {{ pkg.name }} - - + + + {{ pkg.name }} + - +

{{ pkg.name }}

+

{{ pkg.summary }}

{{ pkg.upstreamUrl }}

-

Description

-

{{ pkg.description }}

-

Install

-

- $ sudo dnf install {{ pkg.name }} -

-

Sub packages

- - - -

{{ pkg.name }}

-

{{ pkg.summary }}

- - + +
+ Description +

+
+ + + +
+ Install +

+ $ sudo dnf install {{ pkg.name }} +

+
+ + + +
+ Sub Packages + + +

{{ pkg.name }}

+

{{ pkg.summary }}

+ + +
+ diff --git a/src/pages/view-package/view-package.scss b/src/pages/view-package/view-package.scss old mode 100644 new mode 100755 index 82f4cdb..fd54572 --- a/src/pages/view-package/view-package.scss +++ b/src/pages/view-package/view-package.scss @@ -1,6 +1,80 @@ page-view-package { - .code-block { - background: #f0f0f0; - border-radius: 3px; + ion-header { + padding: 16px 24px; + background-color: #fff; + span { + font-family: "Montserrat-Regular"; + font-size: 16px; + color: #9A9FA6; + letter-spacing: 0.57px; + margin: 0 0 16px 16px; + text-transform: uppercase; + } + .toolbar-title { + padding: 0 !important; + } + } + .header-md::after { + background-color: #ECEDEE; + background-image: none; + } + .scroll-content { + padding: 24px !important; + h1 { + margin: 0 0 12px 0; + font-family: "OpenSans-Semibold"; + font-size: 16px; + color: #3C6EB4; + line-height: 20px; + } + p { + margin: 16px 0 8px 0; + } + hr { + height: 0; + background-color: none; + border: 1px solid #EFF0F1; + margin: 0; + } + .info { + margin: 12px 0; + max-width: 100%; + ion-label { + margin: 0 0 6px 0; + font-size: 11px; + } + p { + margin: 0; + } + .code { + margin-top: 4px; + code { + background: #f0f0f0; + border-radius: 3px; + padding: 4px; + } + } + ion-item { + margin-top: 4px; + padding: 0; + h2 { + font-family: "OpenSans-Semibold"; + font-size: 14px; + color: #3B6FBB; + padding: 0; + text-transform: none; + letter-spacing: 0; + } + h3 { + font-family: "OpenSans-Regular"; + font-size: 12px; + color: #535961; + line-height: 20px; + padding: 0; + text-transform: none; + letter-spacing: 0; + } + } + } } } diff --git a/src/pages/view-package/view-package.ts b/src/pages/view-package/view-package.ts old mode 100644 new mode 100755 From ffdadbe24debdcc2359921ee3ed37c623240bce1 Mon Sep 17 00:00:00 2001 From: Abhishek Date: Jul 25 2018 17:58:39 +0000 Subject: [PATCH 5/7] update more page ui --- diff --git a/src/pages/more/about-detail.html b/src/pages/more/about-detail.html new file mode 100755 index 0000000..822bc39 --- /dev/null +++ b/src/pages/more/about-detail.html @@ -0,0 +1,13 @@ + + + + + + {{selectedItem.title}} + + + +

+ diff --git a/src/pages/more/about.html b/src/pages/more/about.html new file mode 100755 index 0000000..b1f1ecc --- /dev/null +++ b/src/pages/more/about.html @@ -0,0 +1,17 @@ + + + + + + About Us + + + + + + + diff --git a/src/pages/more/bookmarks.html b/src/pages/more/bookmarks.html new file mode 100755 index 0000000..4538757 --- /dev/null +++ b/src/pages/more/bookmarks.html @@ -0,0 +1,18 @@ + + + + + + Bookmarks + + + +
+ +

We couldn't find any articles

+

Press to save an article for offline viewing

+ +
+ diff --git a/src/pages/more/more.html b/src/pages/more/more.html old mode 100644 new mode 100755 index a129c0e..2cf6180 --- a/src/pages/more/more.html +++ b/src/pages/more/more.html @@ -1,14 +1,52 @@ - - - - + + + + + + diff --git a/src/pages/more/more.scss b/src/pages/more/more.scss old mode 100644 new mode 100755 index dfcf761..a2165a5 --- a/src/pages/more/more.scss +++ b/src/pages/more/more.scss @@ -1,3 +1,115 @@ page-more { + .login { + margin: 24px 0 12px 24px; + h1 { + font-family: "OpenSans-Semibold"; + font-size: 16px; + color: #3C6DB3; + margin: 0 0 4px 0; + } + h2 { + font-family: "OpenSans-Regular"; + font-size: 12px; + color: #9A9EA5; + margin: 0; + } + .avatar { + background-color: #3c6db3; + color: #fff; + font-size: 18px; + line-height: 25px; + height: 100%; + border-radius: 50%; + padding: 7px 13px; + font-family: "OpenSans-Bold"; + margin-right: 8px; + } + } + .menu { + margin-top: 12px; + button { + padding: 0 32px; + .label-md { + margin: 0; + } + ion-label { + overflow: visible; + } + img { + margin-right: 16px; + } + span { + font-family: 'OpenSans-Regular'; + font-size: 16px; + color: #535861; + text-transform: none; + letter-spacing: 0; + } + } + } +} + +bookmarks, +about-us, +about-detail { + ion-header { + padding: 16px 24px; + background-color: #fff; + span { + font-family: "Montserrat-Semibold"; + font-size: 16px; + color: #3C6DB3; + letter-spacing: 0.57px; + margin: 0 0 16px 16px; + text-transform: uppercase; + } + .toolbar-title { + padding: 0 !important; + } + } + .header-md::after { + background-color: #fff; + box-shadow: 0 2px 4px 0 rgba(86, 86, 86, 0.05); + background-image: none; + } + ion-content { + background-color: #ECEDEE !important; + } +} + +about-us, +about-detail { + ion-content { + background-color: #fff !important; + } +} + +about-us { + .header-md::after { + background-color: #FFF; + box-shadow: 0 2px 4px 0 rgba(86, 86, 86, 0.05); + background-image: none; + margin-bottom: 1em; + } + .item { + padding: 0 24px; + } + .label { + font-family: 'OpenSans-Regular'; + font-size: 16px; + color: #535861; + text-transform: none; + letter-spacing: 0; + overflow: visible; + } +} +about-detail { + ion-content { + .scroll-content { + padding: 16px 24px; + font-size: 16px; + line-height: 26px; + } + } } diff --git a/src/pages/more/more.ts b/src/pages/more/more.ts old mode 100644 new mode 100755 index 8dcab3b..dd8f503 --- a/src/pages/more/more.ts +++ b/src/pages/more/more.ts @@ -1,5 +1,6 @@ import { Component } from '@angular/core'; -import { NavController } from 'ionic-angular'; +import { NavController, NavParams } from 'ionic-angular'; +import { NotificationsPage } from '../../pages/notifications/notifications'; import { PackageSearchPage } from '../package-search/package-search'; @Component({ @@ -8,14 +9,125 @@ import { PackageSearchPage } from '../package-search/package-search'; }) export class MorePage { - pages = { - packageSearch: PackageSearchPage - }; + /** + * For demo purposes + */ + private loggedIn: boolean; - constructor(private navCtrl: NavController) { + constructor(public navCtrl: NavController, public navParams: NavParams) { + this.loggedIn = false; } - open(page:string) { - this.navCtrl.push(this.pages[page]); + /** + * Open page to the corresponding menu item + * @param page page name clicked + */ + itemSelected(page) { + switch (page) { + case 'bookmarks': + this.navCtrl.push(BookmarksPage, { animate: true, direction: 'forward' }); + break; + case 'about': + this.navCtrl.push(AboutPage, { animate: true, direction: 'forward' }); + break; + case 'package': + this.navCtrl.push(PackageSearchPage, { animate: true, direction: 'forward' }); + } + } + + + /** + * Open the notifications pane from the home page + */ + openNotificationPage() { + this.navCtrl.push(NotificationsPage, { animate: true, direction: 'forward' }); } } + +/** + * About Page Component + */ + +@Component({ + selector: 'about-us', + templateUrl: 'about.html', +}) +export class AboutPage { + + /** + * List of Items to show in about us list + */ + public navItems = []; + + constructor(public navCtrl: NavController, public navParams: NavParams) { + this.navItems = [ + { + 'title': 'What is Fedora?', + 'description': 'The Fedora Project is a community of people working together to build a free and open source software platform and to collaborate on and share user-focused solutions built on that platform. Or, in plain English, we make an operating system and we make it easy for you do useful stuff with it.

The Fedora community includes thousands of individuals with different views and approaches, but together we share some common values. We call these the “Four Foundations”: Freedom, Friends, Features, and First.' + }, + { + 'title': 'Our Mission', + 'description': 'Fedora creates an innovative platform for hardware, clouds, and containers that enables software developers and community members to build tailored solutions for their users.

At the operating system level, we don’t just integrate. We do new things — we build a platform, not just a distribution. The Features and First foundations drive us to innovate. We do all of this as a transparent, collaborative community of Friends, and entirely as open source and free software — Freedom.' + }, + { + 'title': 'Our Method', + 'description': 'The Fedora Project is a center for innovation in free and open source software. In our community,contributors of all kinds come together to advance the ecosystem for the benefit of everyone. The Fedora community contributes everything it builds back to the free and open source world and continues to make advances of significance to the broader community, as evidenced by the regular and rapid incorporation of its features into other Linux distributions. Regardless of which Linux distribution you use, you are relying on code developed within the Fedora Project.

We believe software patents are harmful, a hindrance to innovation in software development, and are inconsistent with the values of free and open source software. While tightly integrating proprietary and patent encumbered components might superficially improve ease of use, this practice does not benefit the community in the long run. The Fedora community prefers approaches that benefit the progress of free software in the future over those that emphasize short term ease of use.' + }, + { + 'title': 'Women and Diversity', + 'description': '' + }, + { + 'title': 'Contribute to Fedora App', + 'description': 'Fedora App is the central location for Fedora users and innovators 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.

Contribute to app development : https://pagure.io/Fedora-app/' + } + ] + } + + /**Open detailed info of selected item + * @param navItem clicked item of about Fedora + */ + openAboutDetailPage(item) { + this.navCtrl.push(AboutDetailPage, { item: item }); + } +} + +/** + * About Detailed Component + */ +@Component({ + selector: 'about-detail', + templateUrl: 'about-detail.html', +}) +export class AboutDetailPage { + /** + * Individual About Item receieved + */ + public selectedItem; + constructor(public navCtrl: NavController, public navParams: NavParams) { + this.selectedItem = navParams.data.item; + } +} + +/** + * Bookmarks Page Component + */ + +@Component({ + selector: 'bookmarks', + templateUrl: 'bookmarks.html', +}) +export class BookmarksPage { + + constructor(public navCtrl: NavController, public navParams: NavParams) { + } + + /** + * Switches to Mag View to read articles + */ + toMag() { + this.navCtrl.parent.select(1); + } +} + + From ff69d6bb935306a8e0d8929aa19a8efbed7f3d91 Mon Sep 17 00:00:00 2001 From: Abhishek Date: Jul 25 2018 17:58:51 +0000 Subject: [PATCH 6/7] update styles --- diff --git a/src/theme/variables.scss b/src/theme/variables.scss old mode 100644 new mode 100755 From e02b6a721a7bcda47a262197ac73a74980ff11b7 Mon Sep 17 00:00:00 2001 From: Abhishek Date: Jul 26 2018 07:40:57 +0000 Subject: [PATCH 7/7] change about us to about fedora --- diff --git a/src/pages/more/more.html b/src/pages/more/more.html index 2cf6180..42a5bae 100755 --- a/src/pages/more/more.html +++ b/src/pages/more/more.html @@ -14,6 +14,7 @@
A
+

Abhishek Sharma

@thelittlewonder

@@ -42,7 +43,7 @@