diff --git a/Queercon/src/app/app.module.ts b/Queercon/src/app/app.module.ts index 61b5989..6fd12fe 100644 --- a/Queercon/src/app/app.module.ts +++ b/Queercon/src/app/app.module.ts @@ -2,7 +2,7 @@ import { NgModule, ErrorHandler } from '@angular/core'; import { BrowserModule } from '@angular/platform-browser'; import { IonicApp, IonicModule, IonicErrorHandler } from 'ionic-angular'; import { MyApp } from './app.component'; -import { HttpModule } from '@angular/http'; +//import { HttpModule } from '@angular/http'; import { HomePage } from '../pages/home/home'; import { Qc15Page } from '../pages/qc15/qc15'; @@ -41,7 +41,7 @@ import { OneSignal } from '@ionic-native/onesignal'; ], imports: [ BrowserModule, - HttpModule, + //HttpModule, IonicModule.forRoot(MyApp, { statusbarPadding: false, }, diff --git a/Queercon/src/pages/events/events.ts b/Queercon/src/pages/events/events.ts index d8e6490..35444d0 100644 --- a/Queercon/src/pages/events/events.ts +++ b/Queercon/src/pages/events/events.ts @@ -1,7 +1,7 @@ import { Component } from '@angular/core'; import { NavController, NavParams } from 'ionic-angular'; -import { Http } from '@angular/http'; -import 'rxjs/add/operator/map'; +/* import { Http } from '@angular/http'; +import 'rxjs/add/operator/map'; */ @Component({ @@ -22,17 +22,16 @@ export class EventsDetailsPage { }) export class EventsPage { /* Remove in staging *///private webWiew: any = window; - itemsOld = []; items = []; - constructor(public nav: NavController, public http: Http) { + constructor(public nav: NavController, /* public http: Http */) { console.log('QC Events constructor loaded'); - let localData = this.http.get('../assets/json/events.json').map(res => res.json().events); +/* let localData = this.http.get('events.json').map(res => res.json().events); localData.subscribe(data => { this.items = data; - }) + }) */ - this.itemsOld = [ + this.items = [ { "title": "Queercon Mixer", "location": "Queercon Suite",