fix(app): fix all ngc issues

yannbf · yannbf · commit 2c65a71b8cb5 · 2017-11-30T13:38:28.000-03:00
when building prod with the latest Ionic, ngc was firing many issues, which are corrected in this commit.
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -3,7 +3,7 @@ import { Component, ViewChild } from '@angular/core';
 import { Nav, Platform, MenuController } from 'ionic-angular';
 import { StatusBar } from '@ionic-native/status-bar';
 import { SplashScreen } from '@ionic-native/splash-screen';
-import { Subject } from 'rxjs';
+import { Subject } from 'rxjs/Subject';
 
 @Component({
   templateUrl: 'app.html'
@@ -17,6 +17,8 @@ export class MyApp {
   pages: Array<{ title: string, component: any, active: boolean, icon: string }>;
   rightMenuItems: Array<{ icon: string, active: boolean }>;
   state: any;
+  placeholder = 'assets/img/avatar/girl-avatar.png';
+  chosenPicture: any;
 
   constructor(
     public platform: Platform,
@@ -54,8 +56,7 @@ export class MyApp {
       { title: 'Popup Menu', component: 'PopupMenuListPage', active: false, icon: 'beer' },
       { title: 'Profile', component: 'ProfileListPage', active: false, icon: 'camera' },
       { title: 'Side Menu', component: 'SideMenuPage', active: false, icon: 'bookmark' },
-      // Removed for now as there were breaking changes in slides
-      { title: 'Timeline', component: 'TimelinePage', active: false, icon: 'calendar'},
+      { title: 'Timeline', component: 'TimelinePage', active: false, icon: 'calendar' },
       { title: 'Slides', component: 'SlidesPage', active: false, icon: 'contact' },
       { title: 'Theming', component: 'ThemingPage', active: false, icon: 'power' },
     ];
diff --git a/src/app/app.imports.ts b/src/app/app.imports.ts
@@ -24,12 +24,12 @@ import { Autosize } from '../components/autosize/autosize';
 // Modules
 import { SwingModule } from 'angular2-swing';
 import { BrowserModule } from '@angular/platform-browser';
-import { HttpModule } from '@angular/http';
+import { HttpClientModule } from '@angular/common/http';
 
 export const MODULES = [
   SwingModule,
   BrowserModule,
-  HttpModule,
+  HttpClientModule,
 ];
 
 export const PROVIDERS = [
diff --git a/src/components/components.module.ts b/src/components/components.module.ts
@@ -1,3 +1,4 @@
+import { TimelineComponentModule } from './timeline/timeline.module';
 import { NgModule } from '@angular/core';
 import { IonicModule } from 'ionic-angular';
 
@@ -6,22 +7,18 @@ import { TimerProgress } from './timer-progress/timer-progress';
 import { ExpandableHeader } from './expandable-header/expandable-header';
 import { FlashCardComponent } from './flash-card/flash-card';
 import { AccordionListComponent } from './accordion-list/accordion-list';
-import { TimelineComponent, TimelineItemComponent, TimelineTimeComponent } from './timeline/timeline';
 
 export const components = [
   Timer,
   TimerProgress,
   ExpandableHeader,
   FlashCardComponent,
   AccordionListComponent,
-  TimelineComponent,
-  TimelineItemComponent,
-  TimelineTimeComponent,
 ];
 
 @NgModule({
   declarations: [components],
   imports: [IonicModule],
-  exports: [components]
+  exports: [components, TimelineComponentModule]
 })
 export class ComponentsModule {}
diff --git a/src/components/timeline/timeline.module.ts b/src/components/timeline/timeline.module.ts
@@ -6,9 +6,6 @@ import {
     TimelineTimeComponent
 } from './timeline';
 
-export const components = [
-];
-
 @NgModule({
   declarations: [
     TimelineComponent,
diff --git a/src/components/timeline/timeline.ts b/src/components/timeline/timeline.ts
@@ -5,31 +5,23 @@ import { Component, Input } from '@angular/core';
   templateUrl: 'timeline.html'
 })
 export class TimelineComponent {
-  @Input('endIcon') endIcon = "ionic";
-  constructor() {
-
-  }
-
+  @Input('endIcon') endIcon = 'ionic';
+  constructor() { }
 }
 
 @Component({
   selector: 'timeline-item',
   template: '<ng-content></ng-content>'
 })
 export class TimelineItemComponent{
-  constructor(){
-
-  }
+  constructor() { }
 }
 
-
 @Component({
   selector:'timeline-time',
   template: '<span>{{time.subtitle}}</span> <span>{{time.title}}</span>'
 })
 export class TimelineTimeComponent{
-  @Input('time') time = {};
-  constructor(){
-
-  }
+  @Input('time') time: { title?: string, subtitle?: string} = {};
+  constructor() { }
 }
diff --git a/src/pages/miscellaneous/flash-card/flash-card.ts b/src/pages/miscellaneous/flash-card/flash-card.ts
@@ -7,7 +7,7 @@ import { NavController, NavParams, IonicPage } from 'ionic-angular';
   templateUrl: 'flash-card.html'
 })
 export class FlashCardPage {
-  private flashCards = [];
+  flashCards = [];
   constructor(public navCtrl: NavController, public navParams: NavParams) {
     this.flashCards = [
       {
diff --git a/src/pages/miscellaneous/tinder-cards/tinder-cards.ts b/src/pages/miscellaneous/tinder-cards/tinder-cards.ts
@@ -1,7 +1,5 @@
 import { ToastService } from '../../../providers/util/toast.service';
 import { Component, ViewChild, ViewChildren, QueryList } from '@angular/core';
-import { Http } from '@angular/http';
-import 'rxjs/Rx';
 
 import {
   StackConfig,
@@ -10,6 +8,7 @@ import {
   SwingCardComponent
 } from 'angular2-swing';
 import { NavController, IonicPage } from 'ionic-angular';
+import { HttpClient } from '@angular/common/http';
 
 @IonicPage()
 @Component({
@@ -24,7 +23,7 @@ export class TinderCardsPage {
   stackConfig: StackConfig;
   recentCard: string = '';
 
-  constructor(public navCtrl: NavController, public http: Http, public toastCtrl: ToastService) {
+  constructor(public navCtrl: NavController, public http: HttpClient, public toastCtrl: ToastService) {
     this.stackConfig = {
       throwOutConfidence: (offset, element: any) => {
         return Math.min(Math.abs(offset) / (element.offsetWidth / 2), 1);
@@ -79,9 +78,8 @@ export class TinderCardsPage {
   // Add new cards to our array
   addNewCards(count: number) {
     this.http.get('https://randomuser.me/api/?results=' + count)
-      .map(data => data.json().results)
-      .subscribe(result => {
-        for (const val of result) {
+      .subscribe((result: any) => {
+        for (const val of result.results) {
           this.cards.push(val);
         }
       });
@@ -90,9 +88,9 @@ export class TinderCardsPage {
   // http://stackoverflow.com/questions/57803/how-to-convert-decimal-to-hex-in-javascript
   decimalToHex(d, padding) {
     let hex = Number(d).toString(16);
-    padding = typeof (padding) === 'undefined' || padding === null ? padding = 2 : padding;
+    const numPadding = typeof (padding) === 'undefined' || padding === null ? 2 : padding;
 
-    while (hex.length < padding) {
+    while (hex.length < numPadding) {
       hex = '0' + hex;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import { NavController, NavParams, IonicPage } from 'ionic-angular';`
`7`	`7`	`templateUrl: 'flash-card.html'`
`8`	`8`	`})`
`9`	`9`	`export class FlashCardPage {`
`10`		`- private flashCards = [];`
	`10`	`+ flashCards = [];`
`11`	`11`	`constructor(public navCtrl: NavController, public navParams: NavParams) {`
`12`	`12`	`this.flashCards = [`
`13`	`13`	`{`