Skip to content
This repository has been archived by the owner on Jun 11, 2019. It is now read-only.

Commit

Permalink
#41 - just using local variable
Browse files Browse the repository at this point in the history
Will write bash script to find/replace/update
  • Loading branch information
jakevis committed Apr 3, 2018
1 parent 265fcca commit 7d774f4
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
4 changes: 2 additions & 2 deletions Queercon/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -41,7 +41,7 @@ import { OneSignal } from '@ionic-native/onesignal';
],
imports: [
BrowserModule,
HttpModule,
//HttpModule,
IonicModule.forRoot(MyApp, {
statusbarPadding: false,
},
Expand Down
13 changes: 6 additions & 7 deletions Queercon/src/pages/events/events.ts
Original file line number Diff line number Diff line change
@@ -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({
Expand All @@ -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",
Expand Down

0 comments on commit 7d774f4

Please sign in to comment.