Renaming pages and adding content

Working on #18 #17 #16 #
WoofyIO · Mar 23, 2018 · af86059 · af86059
1 parent 764a0f6
commit af86059
Show file tree

Hide file tree

Showing 19 changed files with 59 additions and 58 deletions.
diff --git a/Queercon/.sourcemaps/main.js.map b/Queercon/.sourcemaps/main.js.map
diff --git a/Queercon/src/app/app.module.ts b/Queercon/src/app/app.module.ts
@@ -3,8 +3,8 @@ import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule, IonicErrorHandler } from 'ionic-angular';
 import { MyApp } from './app.component';
 
-import { CalendarPage } from '../pages/calendar/calendar';
-import { AboutPage } from '../pages/about/about';
+import { EventsPage } from '../pages/events/events';
+import { SupportersPage } from '../pages/supporters/supporters';
 import { ContactPage } from '../pages/contact/contact';
 import { HomePage } from '../pages/home/home';
 import { TabsPage } from '../pages/tabs/tabs';
@@ -15,8 +15,8 @@ import { SplashScreen } from '@ionic-native/splash-screen';
 @NgModule({
   declarations: [
     MyApp,
-    AboutPage,
-    CalendarPage,
+    SupportersPage,
+    EventsPage,
     ContactPage,
     HomePage,
     TabsPage
@@ -28,8 +28,8 @@ import { SplashScreen } from '@ionic-native/splash-screen';
   bootstrap: [IonicApp],
   entryComponents: [
     MyApp,
-    AboutPage,
-    CalendarPage,
+    SupportersPage,
+    EventsPage,
     ContactPage,
     HomePage,
     TabsPage

diff --git a/Queercon/src/assets/imgs/full_name_band.png b/Queercon/src/assets/imgs/full_name_band.png
diff --git a/Queercon/src/assets/imgs/thumbgrey.png b/Queercon/src/assets/imgs/thumbgrey.png
diff --git a/Queercon/src/pages/about/about.scss b/Queercon/src/pages/about/about.scss
diff --git a/Queercon/src/pages/calendar/calendar.html → Queercon/src/pages/events/events.html b/Queercon/src/pages/calendar/calendar.html → Queercon/src/pages/events/events.html
@@ -1,7 +1,7 @@
 <ion-header>
   <ion-navbar>
     <ion-title>
-      Calendar
+      Events
     </ion-title>
   </ion-navbar>
 </ion-header>

diff --git a/Queercon/src/pages/calendar/calendar.scss → Queercon/src/pages/events/events.scss b/Queercon/src/pages/calendar/calendar.scss → Queercon/src/pages/events/events.scss
diff --git a/Queercon/src/pages/about/about.ts → Queercon/src/pages/events/events.ts b/Queercon/src/pages/about/about.ts → Queercon/src/pages/events/events.ts
@@ -2,10 +2,10 @@ import { Component } from '@angular/core';
 import { NavController } from 'ionic-angular';
 
 @Component({
-  selector: 'page-about',
-  templateUrl: 'about.html'
+  selector: 'page-events',
+  templateUrl: 'events.html'
 })
-export class AboutPage {
+export class EventsPage {
 
   constructor(public navCtrl: NavController) {
 

diff --git a/Queercon/src/pages/home/home.html b/Queercon/src/pages/home/home.html
@@ -3,11 +3,11 @@
     <ion-title>Home</ion-title>
   </ion-navbar>
 </ion-header>
-
+	
 <ion-content padding>
-  <h2>Welcome to Ionic!</h2>
-  <p>
-    This starter project comes with simple tabs-based layout for apps
+<img src="assets/imgs/full_name_band.png">
+    <p>
+      This starter project comes with simple tabs-based layout for apps
     that are going to primarily use a Tabbed UI.
   </p>
   <p>
@@ -16,3 +16,4 @@ <h2>Welcome to Ionic!</h2>
   </p>
 
 </ion-content>
+
diff --git a/Queercon/src/pages/about/about.html → ...rcon/src/pages/supporters/supporters.html b/Queercon/src/pages/about/about.html → ...rcon/src/pages/supporters/supporters.html
@@ -1,7 +1,7 @@
 <ion-header>
   <ion-navbar>
     <ion-title>
-      About Queercon
+      Our Valued Supporters
     </ion-title>
   </ion-navbar>
 </ion-header>

diff --git a/Queercon/src/pages/supporters/supporters.scss b/Queercon/src/pages/supporters/supporters.scss
@@ -0,0 +1,3 @@
+page-supporters {
+
+}
diff --git a/Queercon/src/pages/calendar/calendar.ts → Queercon/src/pages/supporters/supporters.ts b/Queercon/src/pages/calendar/calendar.ts → Queercon/src/pages/supporters/supporters.ts
@@ -2,10 +2,10 @@ import { Component } from '@angular/core';
 import { NavController } from 'ionic-angular';
 
 @Component({
-  selector: 'page-calendar',
-  templateUrl: 'calendar.html'
+  selector: 'page-supporters',
+  templateUrl: 'supporters.html'
 })
-export class CalendarPage {
+export class SupportersPage {
 
   constructor(public navCtrl: NavController) {
 

diff --git a/Queercon/src/pages/tabs/tabs.html b/Queercon/src/pages/tabs/tabs.html
@@ -1,6 +1,6 @@
 <ion-tabs>
   <ion-tab [root]="tab1Root" tabTitle="Home" tabIcon="home"></ion-tab>
-  <ion-tab [root]="tab2Root" tabTitle="Calendar" tabIcon="calendar"></ion-tab>
-  <ion-tab [root]="tab3Root" tabTitle="About Queercon" tabIcon="information-circle"></ion-tab>
+  <ion-tab [root]="tab2Root" tabTitle="Events" tabIcon="calendar"></ion-tab>
+  <ion-tab [root]="tab3Root" tabTitle="Supporters" tabIcon="information-circle"></ion-tab>
   <ion-tab [root]="tab4Root" tabTitle="Stay in Touch" tabIcon="contacts"></ion-tab>
 </ion-tabs>
diff --git a/Queercon/src/pages/tabs/tabs.ts b/Queercon/src/pages/tabs/tabs.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 
-import { CalendarPage } from '../calendar/calendar';
-import { AboutPage } from '../about/about';
+import { EventsPage } from '../events/events';
+import { SupportersPage } from '../supporters/supporters';
 import { ContactPage } from '../contact/contact';
 import { HomePage } from '../home/home';
 
@@ -11,8 +11,8 @@ import { HomePage } from '../home/home';
 export class TabsPage {
 
   tab1Root = HomePage;
-  tab2Root = CalendarPage;
-  tab3Root = AboutPage;
+  tab2Root = EventsPage;
+  tab3Root = SupportersPage;
   tab4Root = ContactPage;
 
   constructor() {

diff --git a/Queercon/www/assets/imgs/full_name_band.png b/Queercon/www/assets/imgs/full_name_band.png
diff --git a/Queercon/www/assets/imgs/thumbgrey.png b/Queercon/www/assets/imgs/thumbgrey.png
diff --git a/Queercon/www/build/main.js b/Queercon/www/build/main.js