Version control is hard

Working on #19 and cleaning up #12
WoofyIO · Mar 29, 2018 · 6f563ad · 6f563ad
1 parent 04b04cd
commit 6f563ad
Show file tree

Hide file tree

Showing 13 changed files with 52 additions and 58 deletions.
diff --git a/Queercon/src/app/app.component.ts b/Queercon/src/app/app.component.ts
@@ -17,7 +17,6 @@ import { NewsPage } from '../pages/news/news';
 
 declare const codePush: any
 declare const InstallMode: any
-//declare const AppCenter: any
 
 
 @Component({
@@ -27,15 +26,15 @@ declare const InstallMode: any
 export class MyApp {
 	@ViewChild(Nav) nav: Nav;
 
-	private webWiew: any = window;
+	/* Remove in staging *///private webWiew: any = window;
 
 	rootPage:any = HomePage;
 
 	pages: Array<{title: string, component: any}>;
 
   constructor(public platform: Platform, public statusBar: StatusBar, public splashScreen: SplashScreen) {
 
-		this.webWiew.AppCenter.Analytics.trackEvent('App loaded');
+		/* Remove in staging *///this.webWiew.AppCenter.Analytics.trackEvent('App loaded');
 
 		this.pages = [
 			{ title: 'Home', component: HomePage },
@@ -53,21 +52,19 @@ export class MyApp {
 
 		platform.ready().then(() => {
 
-			this.webWiew.AppCenter.Analytics.trackEvent('App Ready');
+			/* Remove in staging *///this.webWiew.AppCenter.Analytics.trackEvent('App Ready');
 
-      // Okay, so the platform is ready and our plugins are available.
 
-			// Here you can do any higher level native things you might need.
-
- 			codePush.sync(null, {
+			/* Remove in staging *///
+/*  			codePush.sync(null, {
 				updateDialog: {
 					appendReleaseDescription: true,
 					mandatoryUpdateMessage: "An important content update has been installed",
 					optionalUpdateMessage: "A content update is available. Install now?",
 					descriptionPrefix: "\n\nChange log:\n"
 				},
 				installMode: InstallMode.IMMEDIATE
-				}); 
+				});  */
 
 
       statusBar.styleDefault();
@@ -80,8 +77,7 @@ export class MyApp {
 
 
   openPage(page) {
-    // Reset the content nav to have just this page
-    // we wouldn't want the back button to show in this scenario
+
     this.nav.setRoot(page.component);
   }
 }
diff --git a/Queercon/src/pages/about/about.ts b/Queercon/src/pages/about/about.ts
@@ -15,10 +15,10 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular';
 })
 export class AboutPage {
 
-  private webWiew: any = window;
+  /* Remove in staging *///private webWiew: any = window;
 
   constructor(public navCtrl: NavController, public navParams: NavParams) {
-    this.webWiew.AppCenter.Analytics.trackEvent('About Loaded');
+    /* Remove in staging *///this.webWiew.AppCenter.Analytics.trackEvent('About Loaded');
   }
 
   ionViewDidLoad() {

diff --git a/Queercon/src/pages/chat/chat.ts b/Queercon/src/pages/chat/chat.ts
@@ -15,10 +15,10 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular';
 })
 export class ChatPage {
 
-  private webWiew: any = window;
+  /* Remove in staging *///private webWiew: any = window;
 
   constructor(public navCtrl: NavController, public navParams: NavParams) {
-    this.webWiew.AppCenter.Analytics.trackEvent('Chat Loaded');
+    /* Remove in staging *///this.webWiew.AppCenter.Analytics.trackEvent('Chat Loaded');
   }
 
   ionViewDidLoad() {

diff --git a/Queercon/src/pages/contact/contact.ts b/Queercon/src/pages/contact/contact.ts
@@ -7,10 +7,10 @@ import { NavController } from 'ionic-angular';
 })
 export class ContactPage {
 
-  private webWiew: any = window;
+
 
   constructor(public navCtrl: NavController) {
-    this.webWiew.AppCenter.Analytics.trackEvent('Contacts Loaded');
+
 
   }
 

diff --git a/Queercon/src/pages/events/events.html b/Queercon/src/pages/events/events.html
@@ -0,0 +1,21 @@
+<ion-header>
+    <ion-navbar>
+      <button ion-button menuToggle>
+        <ion-icon name="menu"></ion-icon>
+      </button>
+      <ion-title>Events</ion-title>
+    </ion-navbar>
+  </ion-header>
+
+  <ion-content>
+    <ion-list>
+      <ion-card *ngFor="let event of events" (click)="openEventDetailsPage(item)">
+        <ion-card-header>
+          {{ event.title }}
+        </ion-card-header>
+        <ion-card-content>
+        {{ event.summary }}
+        </ion-card-content>
+      </ion-card>
+    </ion-list>
+  </ion-content>
diff --git a/Queercon/src/pages/events/events.ts b/Queercon/src/pages/events/events.ts
@@ -9,45 +9,23 @@ import 'rxjs/add/operator/map';
 
 export class EventsDetailsPage {
   item;
-  private webWiew: any = window;
+  /* Remove in staging *///private webWiew: any = window;
   constructor(params: NavParams) {
-    this.webWiew.AppCenter.Analytics.trackEvent('EventsPage Detail Loaded');
+    /* Remove in staging *///this.webWiew.AppCenter.Analytics.trackEvent('EventsPage Detail Loaded');
     this.item = params.data.item;
   }
 }
 
 
 
 @Component({
-  template: `
-<ion-header>
-  <ion-navbar>
-    <button ion-button menuToggle>
-      <ion-icon name="menu"></ion-icon>
-    </button>
-    <ion-title>Events</ion-title>
-  </ion-navbar>
-</ion-header>
-
-<ion-content>
-  <ion-list>
-    <ion-card *ngFor="let event of events" (click)="openEventDetailsPage(item)">
-      <ion-card-header>
-        {{ event.title }}
-      </ion-card-header>
-      <ion-card-content>
-      {{ event.summary }}
-      </ion-card-content>
-    </ion-card>
-  </ion-list>
-</ion-content>
-`
+  templateUrl: 'events.html',
 })
 export class EventsPage {
-  private webWiew: any = window;
+  /* Remove in staging *///private webWiew: any = window;
   events: any[];
   constructor(public nav: NavController, http: Http) {
-    this.webWiew.AppCenter.Analytics.trackEvent('EventsPage Loaded');
+    /* Remove in staging *///this.webWiew.AppCenter.Analytics.trackEvent('EventsPage Loaded');
     let localData = http.get('assets/events.json').map(res => res.json().items);
     localData.subscribe(data => {
       this.events = data;

diff --git a/Queercon/src/pages/home/home.ts b/Queercon/src/pages/home/home.ts
@@ -19,10 +19,10 @@ import { NewsPage } from '../news/news';
 
 export class HomePage {
 
-	private webWiew: any = window;
+
 
   constructor(public navCtrl: NavController) {
-		this.webWiew.AppCenter.Analytics.trackEvent('Home Loaded');
+
 
   }
 

diff --git a/Queercon/src/pages/local/local.ts b/Queercon/src/pages/local/local.ts
@@ -15,10 +15,10 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular';
 })
 export class LocalPage {
 
-  private webWiew: any = window;
+  /* Remove in staging *///private webWiew: any = window;
 
   constructor(public navCtrl: NavController, public navParams: NavParams) {
-    this.webWiew.AppCenter.Analytics.trackEvent('Locals Loaded');
+    /* Remove in staging *///this.webWiew.AppCenter.Analytics.trackEvent('Locals Loaded');
   }
 
   ionViewDidLoad() {

diff --git a/Queercon/src/pages/news/news.ts b/Queercon/src/pages/news/news.ts
@@ -15,10 +15,10 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular';
 })
 export class NewsPage {
 
-  private webWiew: any = window;
+  /* Remove in staging *///private webWiew: any = window;
 
   constructor(public navCtrl: NavController, public navParams: NavParams) {
-    this.webWiew.AppCenter.Analytics.trackEvent('News Loaded');
+    /* Remove in staging *///this.webWiew.AppCenter.Analytics.trackEvent('News Loaded');
   }
 
   ionViewDidLoad() {

diff --git a/Queercon/src/pages/qc-rsa2018/qc-rsa2018.ts b/Queercon/src/pages/qc-rsa2018/qc-rsa2018.ts
@@ -15,10 +15,10 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular';
 })
 export class QcRsa2018Page {
 
-  private webWiew: any = window;
+  /* Remove in staging *///rivate webWiew: any = window;
 
   constructor(public navCtrl: NavController, public navParams: NavParams) {
-    this.webWiew.AppCenter.Analytics.trackEvent('QC RSA 18 Loaded');
+   /* Remove in staging */// this.webWiew.AppCenter.Analytics.trackEvent('QC RSA 18 Loaded');
   }
 
   ionViewDidLoad() {

diff --git a/Queercon/src/pages/qc15/qc15.ts b/Queercon/src/pages/qc15/qc15.ts
@@ -15,10 +15,9 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular';
 })
 export class Qc15Page {
 
-  private webWiew: any = window;
 
   constructor(public navCtrl: NavController, public navParams: NavParams) {
-    this.webWiew.AppCenter.Analytics.trackEvent('QC15 Loaded');
+
 
   }
 

diff --git a/Queercon/src/pages/supporters/supporters.ts b/Queercon/src/pages/supporters/supporters.ts
@@ -7,10 +7,10 @@ import { NavController } from 'ionic-angular';
 })
 export class SupportersPage {
 
-  private webWiew: any = window;
+
 
   constructor(public navCtrl: NavController) {
-    this.webWiew.AppCenter.Analytics.trackEvent('Supporters Loaded');
+
 
   }
 

diff --git a/Queercon/src/pages/volunteer/volunteer.ts b/Queercon/src/pages/volunteer/volunteer.ts
@@ -15,10 +15,10 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular';
 })
 export class VolunteerPage {
 
-  private webWiew: any = window;
+
 
   constructor(public navCtrl: NavController, public navParams: NavParams) {
-    this.webWiew.AppCenter.Analytics.trackEvent('Volunteer Loaded');
+
   }
 
   ionViewDidLoad() {