changed navigation to myGames

MyPassionProjectClient/src/pages/games/games.html

@@ -1,44 +0,0 @@
-<ion-header>
-  <ion-navbar>
-    <ion-buttons start>
-      <button ion-button menuToggle>
-        <ion-icon name="menu"></ion-icon>
-      </button>
-    </ion-buttons>
-    <ion-title>Games</ion-title>
-  </ion-navbar>
-</ion-header>
-
-
-<ion-content padding>
-
-  <ion-searchbar [(ngModel)]="searchTerm" (ionInput)="getItems($event)" placeholder="Search Games"></ion-searchbar>
-  <ion-list>
-    <ion-item-sliding *ngFor="let game of filteredGames">
-      <ion-item>
-      <ion-thumbnail item-start>
-        <img src={{game.thumbnail}}>
-      </ion-thumbnail>
-      <h2>{{game.name}}</h2>
-      <p>{{game.mechanics}}</p>
-      <button ion-button clear item-end>View</button>
-        </ion-item>
-
-
-      <ion-item-options side="left">
-        <button ion-button color="primary" (click)="doAddToOwnedAndPlayedList()">
-          <ion-icon name="add"></ion-icon> Owned and Played
-        </button>
-      </ion-item-options>
-
-      <ion-item-options side="right">
-      <button ion-button color="primary" (click)="doAddToOwnedList()">
-      <ion-icon name="add"></ion-icon> Owned
-      </button>
-        <button ion-button color="secondary" (click)="doAddToPlayedList()">
-          <ion-icon name="add"></ion-icon> Played
-        </button>
-      </ion-item-options>
-    </ion-item-sliding>
-  </ion-list>
-</ion-content>

MyPassionProjectClient/src/pages/games/games.module.ts

@@ -1,17 +0,0 @@
-import { NgModule } from '@angular/core';
-import { IonicPageModule } from 'ionic-angular';
-import { GamesPage } from './games';
-import { GamesService } from '../../providers/games-service';
-
-@NgModule({
-  declarations: [
-    GamesPage,
-  ],
-  imports: [
-    IonicPageModule.forChild(GamesPage),
-  ],
-  providers: [
-    GamesService
-  ],
-})
-export class GamesPageModule {}

MyPassionProjectClient/src/pages/games/games.scss

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

MyPassionProjectClient/src/pages/menu/menu.ts

@@ -1,4 +1,4 @@
-import {GamesPage} from "../games/games";
+import {MyGamesPage} from "../my-games/my-games";
 import {FriendsPage} from "../friends/friends";
 import {SummaryPage} from "../summary/summary";
 import { TabsPage } from './../tabs/tabs';
@@ -29,7 +29,6 @@ export class MenuPage {
 
   pages: PageInterface[] = [
     { 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' },
     { title: 'Settings', pageName: 'SettingsPage', icon: 'build' },
@@ -53,9 +52,6 @@ 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/my-games/my-games.html

@@ -0,0 +1,45 @@
+<ion-header>
+    <ion-navbar>
+      <ion-buttons start>
+        <button ion-button menuToggle>
+          <ion-icon name="menu"></ion-icon>
+        </button>
+      </ion-buttons>
+      <ion-title>Games</ion-title>
+    </ion-navbar>
+  </ion-header>
+  
+  
+  <ion-content padding>
+  
+    <ion-searchbar [(ngModel)]="searchTerm" (ionInput)="getItems($event)" placeholder="Search Games"></ion-searchbar> 
+    <ion-list>
+      <ion-item-sliding *ngFor="let game of filteredGames">
+        <ion-item>
+        <ion-thumbnail item-start>
+          <img src={{game.thumbnail}}>
+        </ion-thumbnail>
+        <h2>{{game.name}}</h2>
+        <p>{{game.mechanics}}</p>
+        <button ion-button clear item-end>View</button>
+          </ion-item>
+  
+  
+        <ion-item-options side="left">
+          <button ion-button color="primary" (click)="doAddToOwnedAndPlayedList()">
+            <ion-icon name="add"></ion-icon> Owned and Played
+          </button>
+        </ion-item-options>
+  
+        <ion-item-options side="right">
+        <button ion-button color="primary" (click)="doAddToOwnedList()">
+        <ion-icon name="add"></ion-icon> Owned
+        </button>
+          <button ion-button color="secondary" (click)="doAddToPlayedList()">
+            <ion-icon name="add"></ion-icon> Played
+          </button>
+        </ion-item-options>
+      </ion-item-sliding>
+    </ion-list>
+  </ion-content>
+  

MyPassionProjectClient/src/pages/my-games/my-games.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from 'ionic-angular';
+import { MyGamesPage } from './my-games';
+import { GamesService } from '../../providers/games-service';
+import { UsersService } from '../../providers/users-service';
+
+@NgModule({
+  declarations: [
+    MyGamesPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(MyGamesPage),
+  ],
+  providers: [
+    GamesService,
+    UsersService,
+  ],
+})
+export class MyGamesPageModule {}

MyPassionProjectClient/src/pages/my-games/my-games.scss

@@ -0,0 +1,3 @@
+page-my-games {
+
+}

MyPassionProjectClient/src/pages/games/games.ts → MyPassionProjectClient/src/pages/my-games/my-games.ts

@@ -1,26 +1,28 @@
 import { Component } from '@angular/core';
 import {IonicPage, NavController, NavParams, ToastController} from 'ionic-angular';
-import { GamesService } from '../../providers/games-service';
 import { UsersService } from '../../providers/users-service';
  
 @IonicPage()
 @Component({
-  selector: 'page-games',
-  templateUrl: 'games.html',
+  selector: 'page-my-games',
+  templateUrl: 'my-games.html',
 })
-export class GamesPage {
+export class MyGamesPage {
     games: any;
     filteredGames: any;
+    userId: any;
 
-  constructor(public navCtrl: NavController, public navParams: NavParams, public toastCtrl: ToastController, public gamesService: GamesService) {
-    this.gamesService.getUsersGames().subscribe(games=>{
-      this.filteredGames = games;
-      this.games = games;
-    })
-    ;
+  constructor(public navCtrl: NavController, public navParams: NavParams, public toastCtrl: ToastController, public usersService: UsersService) {
+    console.log(navParams.get('id'));
+    this.userId = navParams.get('id');
   }
   
     ionViewDidLoad() {
+      this.usersService.getUsersGames(this.userId).subscribe(games=>{
+        this.filteredGames = games;
+        this.games = games;
+      })
+      ;
     }
 
     getItems(ev: any) {
@@ -47,6 +49,5 @@ export class GamesPage {
       position: 'bottom'
     });
     toast.present();
-
   }
 }

MyPassionProjectClient/src/pages/summary/summary.html

@@ -26,15 +26,11 @@
             {{user.summary}}
           </p>
     
-          <!-- <button ion-item (click)="get()">
-            GetUserName
-          </button> -->
-    
         </ion-card-content>
     
       </ion-card>
     
-      <ion-card>
+      <ion-card (click)=viewGames()>
     
         <ion-card-header>
           <strong>My Games</strong>

MyPassionProjectClient/src/pages/summary/summary.ts

@@ -18,5 +18,10 @@ export class SummaryPage {
     console.log(this.usersService.user);
   }
 
+  viewGames(){ 
+    let params = {id: this.user.id};
+    this.navCtrl.push('MyGamesPage',params);
+  }
+
 }
  

MyPassionProjectClient/src/pages/tabs/tabs.html

@@ -1,7 +1,6 @@
 <ion-tabs>
     
     <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>
 </ion-tabs>

MyPassionProjectClient/src/pages/tabs/tabs.ts

@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import {IonicPage, NavController, NavParams} from 'ionic-angular';
+import {IonicPage, NavParams} from 'ionic-angular';
 
 @IonicPage()
 @Component({
@@ -9,7 +9,6 @@ import {IonicPage, NavController, NavParams} from 'ionic-angular';
 export class TabsPage {
   summaryRoot: any = 'SummaryPage';
   friendsRoot: any = 'FriendsPage';
-  gamesRoot: any = 'GamesPage';
   gameSearchRoot: any = 'GameSearchPage';
   myIndex: number;
 

MyPassionProjectClient/src/providers/games-service.ts

@@ -1,6 +1,7 @@
 import {Injectable} from "@angular/core";
 import {HttpClient} from "@angular/common/http";
 import {Observable} from "rxjs/Observable";
+import { UsersService } from "./users-service";
 
 @Injectable()
 export class GamesService{
@@ -28,8 +29,4 @@ export class GamesService{
     return this.gameId = game.id;
   }
 
-  getUsersGames(){
-    return this.http.get(this.GAMES_API+"/library/"+this.gameId);
-  }
-
 }

MyPassionProjectClient/src/providers/users-service.ts

@@ -20,6 +20,7 @@ export class User {
 export class UsersService{
   public API = "https://tabletoptracker.herokuapp.com";
   public USERS_API = this.API + "/users";
+  public GAMES_API = this.API + "/games";
   public user: User;
   public userId: any;
 
@@ -34,6 +35,7 @@ export class UsersService{
   setUser(account){
     this.userId = account.id;
     this.user = account;
+    console.log(this.userId);
   }
 
   getUser() {
@@ -57,4 +59,8 @@ export class UsersService{
     console.log(this.USERS_API + "/" + this.userId + "/library");
     return this.http.put(this.USERS_API + "/" + this.userId + "/library", gameId);
   }
+
+  getUsersGames(userId){
+    return this.http.get(this.GAMES_API+"/library/"+userId);
+  }
 }