turn it off and turn it back on again

MyPassionProjectClient/src/app/app.module.ts

@@ -1,6 +1,6 @@
 import { BrowserModule } from '@angular/platform-browser';
 import { ErrorHandler, NgModule } from '@angular/core';
-import { IonicApp, IonicErrorHandler, IonicModule } from 'ionic-angular';
+import { IonicApp, IonicErrorHandler, IonicModule, IonicPage, Menu } from 'ionic-angular';
 import { SplashScreen } from '@ionic-native/splash-screen';
 import { StatusBar } from '@ionic-native/status-bar';
 import { MyApp } from './app.component';
@@ -13,25 +13,27 @@ import { Transfer } from '../../node_modules/@ionic-native/transfer';
 import { Camera } from '../../node_modules/@ionic-native/camera';
 import { FilePath } from '../../node_modules/@ionic-native/file-path';
 import {File} from '../../node_modules/@ionic-native/file';
+import { MenuPage } from '../pages/menu/menu';
 
 
 @NgModule({
   declarations: [
     MyApp,
     ProfileModalPage,
-    PictureModalPage
+    PictureModalPage,
+    MenuPage
   ],
   imports: [
     BrowserModule,
     IonicModule.forRoot(MyApp),
-    MenuPageModule,
     HttpClientModule,
   ],
   bootstrap: [IonicApp],
   entryComponents: [
     MyApp,
     ProfileModalPage,
-    PictureModalPage
+    PictureModalPage,
+    MenuPage
    ],
   providers: [
     StatusBar,

MyPassionProjectClient/src/pages/friends/friends.html

@@ -13,7 +13,9 @@
 
 
 <ion-content padding>
-
+    <button ion-item (click)="get()">
+        GetUserName
+      </button>
   <ion-searchbar placeholder="Search People"></ion-searchbar>
   <ion-list>
     <ion-item-sliding>

MyPassionProjectClient/src/pages/friends/friends.ts

@@ -1,5 +1,6 @@
 import { Component } from '@angular/core';
 import {IonicPage, NavController, NavParams, ToastController} from 'ionic-angular';
+import { UsersService } from '../../providers/users-service';
 
 @IonicPage()
 @Component({
@@ -8,7 +9,7 @@ import {IonicPage, NavController, NavParams, ToastController} from 'ionic-angula
 })
 export class FriendsPage {
 
-  constructor(public navCtrl: NavController, public navParams: NavParams, public toastCtrl: ToastController) {
+  constructor(public navCtrl: NavController, public navParams: NavParams, public toastCtrl: ToastController, public usersService: UsersService) {
   }
 
   addToFriendList() {
@@ -23,4 +24,6 @@ export class FriendsPage {
 
   viewFriendDetails() {}
 
+  get(){console.log(this.usersService.user)}
+
 }

MyPassionProjectClient/src/pages/menu/menu.ts

@@ -1,6 +1,6 @@
-import {ProfilePage} from "../profile/profile";
 import {GamesPage} from "../games/games";
 import {FriendsPage} from "../friends/friends";
+import {SummaryPage} from "../summary/summary";
 import { TabsPage } from './../tabs/tabs';
 import {Component, ViewChild} from '@angular/core';
 import { IonicPage, NavController, Nav, NavParams, MenuController } from 'ionic-angular';
@@ -28,7 +28,7 @@ export class MenuPage {
   @ViewChild(Nav) nav: Nav;
 
   pages: PageInterface[] = [
-    { title: 'Home', pageName: 'TabsPage', tabComponent: 'ProfilePage', index: 0, icon: 'home' },
+    { title: 'MyPage', pageName: 'TabsPage', tabComponent: 'SummaryPage', index: 0, icon: 'home' },
     { title: 'MyGames', pageName: 'TabsPage', tabComponent: 'GamesPage', index: 1, icon: 'search' },
     { title: 'Game Search', pageName: 'TabsPage', tabComponent: 'GameSearchPage', index: 2, icon: 'search' },
     { title: 'Friends', pageName: 'TabsPage', tabComponent: 'FriendsPage', index: 3, icon: 'contacts' },
@@ -45,6 +45,9 @@ export class MenuPage {
     // The index is equal to the order of our tabs inside tabs.ts
     if (page.index) {
       params = { tabIndex: page.index};
+      console.log(params);
+      console.log("param1");
+      console.log(this.usersService.user);
     }
 
     // The active child nav is our Tabs Navigation
@@ -53,6 +56,9 @@ export class MenuPage {
     } else {
       // Tabs are not active, so reset the root page
       // In this case: moving to or from SpecialPage
+      console.log(params);
+      console.log("param2");
+      console.log(this.usersService.user);
       this.nav.setRoot(page.pageName, params);
     }
   }

MyPassionProjectClient/src/pages/profile/profile.html

@@ -1,69 +0,0 @@
-<ion-header>
-
-  <ion-navbar>
-    <ion-buttons start>
-      <button ion-button menuToggle>
-        <ion-icon name="menu"></ion-icon>
-      </button>
-    </ion-buttons>
-    <ion-title>Profile</ion-title>
-  </ion-navbar>
-
-</ion-header>
-
-
-<ion-content padding>
-  <ion-card>
-
-    <ion-card-header>
-      <strong>My Profile</strong>
-    </ion-card-header>
-    <img src="/assets/imgs/avatar.png"/>
-
-    <ion-card-content>
-      <ion-card-title>
-        {{user.profileName}}
-      </ion-card-title>
-      <p>
-        {{user.summary}}
-      </p>
-    </ion-card-content>
-
-  </ion-card>
-
-  <ion-card>
-
-    <ion-card-header>
-      <strong>My Games</strong>
-    </ion-card-header>
-
-    <ion-card-content>
-      <ion-card-title>
-        Descent: Journeys in the Dark
-      </ion-card-title>
-      <p>
-        Adventure, Modular Board
-      </p>
-
-      <ion-card-title>
-        Dominion
-      </ion-card-title>
-      <p>
-        Strategy, Deck-Builder
-      </p>
-
-      <ion-card-title>
-        Sushi Go!
-      </ion-card-title>
-      <p>
-        Family, Card Drafting
-      </p>
-    </ion-card-content>
-
-  </ion-card>
-</ion-content>
-
-
-
-
-

MyPassionProjectClient/src/pages/profile/profile.module.ts

@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core';
-import { IonicPageModule } from 'ionic-angular';
-import { ProfilePage } from './profile';
-import { UsersService } from '../../providers/users-service';
-
-@NgModule({
-  declarations: [
-    ProfilePage
-  ],
-  imports: [
-    IonicPageModule.forChild(ProfilePage),
-  ],
-  providers: [
-    UsersService,
-  ],
-})
-export class ProfilePageModule {}

MyPassionProjectClient/src/pages/profile/profile.scss

@@ -1,3 +0,0 @@
-page-profile {
-
-}

MyPassionProjectClient/src/pages/profile/profile.ts

@@ -1,34 +0,0 @@
-import { Component } from '@angular/core';
-import { IonicPage, NavController, NavParams } from 'ionic-angular';
-import { User, UsersService } from '../../providers/users-service';
-
-@IonicPage()
-@Component({
-  selector: 'page-profile',
-  templateUrl: 'profile.html',
-})
-export class ProfilePage {
-  user: User;
-
-  constructor(public navCtrl: NavController, public navParams: NavParams, public usersService: UsersService) {
-    console.log("profile"); 
-    console.log(navParams.data);
-    console.log(this.navParams.get("user"));
-    console.log("passed in from param");
-
-    console.log(this.usersService.user);
-    this.user = this.usersService.getUser();
-    console.log(this.user);
-    if (!this.user) {
-      this.user = new User(1, "test", "test1", "test");
-    }
-  }
-
-  ionViewDidLoad() { 
-  }
-
-  getProfile(){
-    console.log(this.usersService.user);
-  }
-}
- 

MyPassionProjectClient/src/pages/settings/settings.module.ts

@@ -1,7 +1,6 @@
 import { NgModule } from '@angular/core';
 import { IonicPageModule } from 'ionic-angular';
 import { SettingsPage } from './settings';
-import { ProfileModalPage } from './profile-modal';
 
 @NgModule({
   declarations: [

MyPassionProjectClient/src/pages/settings/settings.ts

@@ -2,7 +2,6 @@ import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams, ModalController, ViewController } from 'ionic-angular';
 import { ProfileModalPage } from './profile-modal';
 import { PictureModalPage } from './picture-modal';
-import { ProfilePage } from '../profile/profile';
 
 @IonicPage()
 @Component({

MyPassionProjectClient/src/pages/signup/signup.ts

@@ -2,7 +2,6 @@ import { Component } from '@angular/core';
 import { IonicPage, NavController, NavParams, Menu } from 'ionic-angular';
 import {MenuPage} from "../menu/menu";
 import { UsersService } from '../../providers/users-service';
-import { ProfilePage } from '../profile/profile';
 
 @IonicPage()
 @Component({

MyPassionProjectClient/src/pages/summary/summary.html

@@ -0,0 +1,67 @@
+<ion-header>
+  <ion-navbar>
+      <ion-buttons start>
+          <button ion-button menuToggle>
+            <ion-icon name="menu"></ion-icon>
+          </button>
+        </ion-buttons>
+    <ion-title>MyPage</ion-title>
+  </ion-navbar>
+</ion-header>
+
+
+<ion-content padding>
+    <ion-card>
+  
+        <ion-card-header>
+          <strong>My Profile</strong>
+        </ion-card-header>
+        <img src="/assets/imgs/avatar.png"/>
+    
+        <ion-card-content>
+          <ion-card-title>
+            profilename
+          </ion-card-title>
+          <p>
+            summary
+          </p>
+    
+          <button ion-item (click)="get()">
+            GetUserName
+          </button>
+    
+        </ion-card-content>
+    
+      </ion-card>
+    
+      <ion-card>
+    
+        <ion-card-header>
+          <strong>My Games</strong>
+        </ion-card-header>
+    
+        <ion-card-content>
+          <ion-card-title>
+            Descent: Journeys in the Dark
+          </ion-card-title>
+          <p>
+            Adventure, Modular Board
+          </p>
+    
+          <ion-card-title>
+            Dominion
+          </ion-card-title>
+          <p>
+            Strategy, Deck-Builder
+          </p>
+    
+          <ion-card-title>
+            Sushi Go!
+          </ion-card-title>
+          <p>
+            Family, Card Drafting
+          </p>
+        </ion-card-content>
+    
+      </ion-card>
+</ion-content>

MyPassionProjectClient/src/pages/summary/summary.module.ts

@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from 'ionic-angular';
+import { SummaryPage } from './summary';
+
+@NgModule({
+  declarations: [
+    SummaryPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(SummaryPage),
+  ],
+})
+export class SummaryPageModule {}

MyPassionProjectClient/src/pages/summary/summary.scss

@@ -0,0 +1,3 @@
+page-summary {
+
+}

MyPassionProjectClient/src/pages/summary/summary.ts

@@ -0,0 +1,22 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams } from 'ionic-angular';
+import { UsersService } from '../../providers/users-service';
+
+@IonicPage()
+@Component({
+  selector: 'page-summary',
+  templateUrl: 'summary.html',
+})
+export class SummaryPage {
+  user: any;
+
+  constructor(public navCtrl: NavController, public navParams: NavParams, public usersService: UsersService) {
+    this.user = this.usersService.user;
+  }
+
+  get() {
+    console.log(this.usersService.user);
+  }
+
+}
+ 

MyPassionProjectClient/src/pages/tabs/tabs.html

@@ -1,5 +1,6 @@
 <ion-tabs>
-    <ion-tab [root]="profileRoot" tabTitle="Home" tabIcon="home"></ion-tab>
+    
+    <ion-tab [root]="summaryRoot" tabTitle="MyPage" tabIcon="home"></ion-tab>
     <ion-tab [root]="gamesRoot" tabTitle="MyGames" tabIcon="search"></ion-tab>
     <ion-tab [root]="gameSearchRoot" tabTitle="Game Search" tabIcon="search"></ion-tab>
     <ion-tab [root]="friendsRoot" tabTitle="Friends" tabIcon="contacts"></ion-tab>

MyPassionProjectClient/src/pages/tabs/tabs.ts

@@ -1,21 +1,13 @@
 import { Component } from '@angular/core';
 import {IonicPage, NavController, NavParams} from 'ionic-angular';
 
-/**
- * Generated class for the TabsPage tabs.
- *
- * See https://ionicframework.com/docs/components/#navigation for more info on
- * Ionic pages and navigation.
- */
-
 @IonicPage()
 @Component({
   selector: 'page-tabs',
   templateUrl: 'tabs.html'
 })
 export class TabsPage {
-
-  profileRoot: any = 'ProfilePage';
+  summaryRoot: any = 'SummaryPage';
   friendsRoot: any = 'FriendsPage';
   gamesRoot: any = 'GamesPage';
   gameSearchRoot: any = 'GameSearchPage';