added profile update feature

MyPassionProject/src/main/java/com/example/demo/Controller/UserController.java

@@ -26,14 +26,9 @@ public class UserController {
     return userService.getUserById(userId);
   }
 
-  @PutMapping(value = "/users/{userId}/summary")
-  public ResponseEntity<User> updateSummary(@RequestBody String newSummary, @PathVariable Long userId){
-    return userService.updateUserSummary(newSummary, userId);
-  }
-
-  @PutMapping(value="/users/{userId}/profileName")
-  public ResponseEntity<User> updateProfileName(@RequestBody String newName, @PathVariable Long userId){
-      return userService.updateUserProfileName(newName,userId);
+  @PutMapping(value = "/users/{userId}")
+  public ResponseEntity<User> updateSummary(@RequestBody User user, @PathVariable Long userId){
+    return userService.updateUserProfile(user, userId);
   }
 
   @DeleteMapping(value="/users/{userId}")

MyPassionProject/src/main/java/com/example/demo/Entity/User.java

@@ -43,4 +43,12 @@ public class User {
     public void setProfileName(String profileName) {
         this.profileName = profileName;
     }
+
+    public String getSummary() {
+        return summary;
+    }
+
+    public String getProfileName() {
+        return profileName;
+    }
 }

MyPassionProject/src/main/java/com/example/demo/Service/UserService.java

@@ -30,16 +30,15 @@ public class UserService {
     return new ResponseEntity<>(userRepo.findById(id).get(), HttpStatus.CREATED);
   }
 
-  public ResponseEntity<User> updateUserSummary (String newSummary, Long userId){
-    User userToUpdate = userRepo.getOne(userId);
-    userToUpdate.setSummary(newSummary);
-    return new ResponseEntity<>(userRepo.save(userToUpdate), HttpStatus.OK);
-  }
-
-  public ResponseEntity<User> updateUserProfileName (String newName, Long userId){
-    User userToUpdate = userRepo.getOne(userId);
-    userToUpdate.setProfileName(newName);
-    return new ResponseEntity<>(userRepo.save(userToUpdate), HttpStatus.OK);
+  public ResponseEntity<User> updateUserProfile (User user, Long userId){
+    User currentUser = userRepo.getOne(userId);
+    if(user.getSummary()!=null) {
+      currentUser.setSummary(user.getSummary());
+    }
+    if(user.getProfileName()!=null){
+      currentUser.setProfileName(user.getProfileName());
+    }
+    return new ResponseEntity<>(userRepo.save(currentUser), HttpStatus.OK);
   }
 
   public ResponseEntity deleteUser(Long id) {

MyPassionProjectClient/src/app/app.module.ts

@@ -3,16 +3,17 @@ import { ErrorHandler, NgModule } from '@angular/core';
 import { IonicApp, IonicErrorHandler, IonicModule } from 'ionic-angular';
 import { SplashScreen } from '@ionic-native/splash-screen';
 import { StatusBar } from '@ionic-native/status-bar';
-
 import { MyApp } from './app.component';
 import {MenuPageModule} from "../pages/menu/menu.module";
 import { HttpClientModule } from '../../node_modules/@angular/common/http';
 import { UsersService } from '../providers/users-service';
+import { ProfileModalPage } from '../pages/settings/profile-modal';
 
 
 @NgModule({
   declarations: [
-    MyApp
+    MyApp,
+    ProfileModalPage
   ],
   imports: [
     BrowserModule,
@@ -22,8 +23,9 @@ import { UsersService } from '../providers/users-service';
   ],
   bootstrap: [IonicApp],
   entryComponents: [
-    MyApp
-  ],
+    MyApp,
+    ProfileModalPage,
+   ],
   providers: [
     StatusBar,
     SplashScreen,

MyPassionProjectClient/src/pages/friends/friends.ts

@@ -1,13 +1,6 @@
 import { Component } from '@angular/core';
 import {IonicPage, NavController, NavParams, ToastController} from 'ionic-angular';
 
-/**
- * Generated class for the FriendsPage page.
- *
- * See https://ionicframework.com/docs/components/#navigation for more info on
- * Ionic pages and navigation.
- */
-
 @IonicPage()
 @Component({
   selector: 'page-friends',

MyPassionProjectClient/src/pages/game-search/game-search.ts

@@ -11,7 +11,6 @@ export class GameSearchPage {
     game: any;
     searchResult: any;
     searchTerm: '';
-    userName: any;
 
   constructor(public navCtrl: NavController, public navParams: NavParams, public toastCtrl: ToastController, public bggGames: BggGameSearch) {
   }

MyPassionProjectClient/src/pages/menu/menu.ts

@@ -21,16 +21,16 @@ export interface PageInterface {
 export class MenuPage {
   // Basic root for our content view
   rootPage = 'TabsPage';
-  userName: String;
 
   // Reference to the app's root nav
   @ViewChild(Nav) nav: Nav;
 
   pages: PageInterface[] = [
     { title: 'Home', pageName: 'TabsPage', tabComponent: 'ProfilePage', index: 0, icon: 'home' },
-    { title: 'Games', pageName: 'TabsPage', tabComponent: 'GamesPage', index: 1, icon: 'search' },
-    { title: 'Game Search', pageName: 'TabsPage', tabComponent: 'GameSearchPage', index: 1, icon: 'search' },
-    { title: 'Friends', pageName: 'TabsPage', tabComponent: 'FriendsPage', index: 2, icon: 'contacts' },
+    { 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: 'search' },
   ];
 
   constructor(public navCtrl: NavController) {
@@ -41,7 +41,7 @@ export class MenuPage {
 
     // The index is equal to the order of our tabs inside tabs.ts
     if (page.index) {
-      params = { tabIndex: page.index, userName: this.userName };
+      params = { tabIndex: page.index };
     }
 
     // The active child nav is our Tabs Navigation

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

@@ -5,7 +5,7 @@ import { UsersService } from '../../providers/users-service';
 
 @NgModule({
   declarations: [
-    ProfilePage,
+    ProfilePage
   ],
   imports: [
     IonicPageModule.forChild(ProfilePage),

MyPassionProjectClient/src/pages/profile/profile.ts

@@ -11,7 +11,7 @@ export class ProfilePage {
   user: any;
 
   constructor(public navCtrl: NavController, public navParams: NavParams, public usersService: UsersService) {
-    this.user = this.usersService.getUserById().subscribe(user=>this.user = user);  
+    this.user = this.usersService.getUserProfile().subscribe(user=>this.user = user);  
     console.log(this.user);
   }
 

MyPassionProjectClient/src/pages/settings/profile-modal.html

@@ -0,0 +1,30 @@
+<ion-header>
+
+        <ion-navbar>
+          <ion-title>Update Profile</ion-title>
+          <ion-buttons end>
+                <button ion-button (click)="dismiss()">
+                    <span ion-text showWhen="ios,core">Cancel</span>
+                    <ion-icon name="md-close" showWhen="android,windows"></ion-icon>
+                </button>
+            </ion-buttons>
+        </ion-navbar>
+      
+      </ion-header>   
+      <ion-content padding>
+        <form (submit)=updateProfile()>
+          <ion-list>
+            <ion-item>
+              <ion-label stacked>Profile Name</ion-label>
+              <ion-input type="text" [(ngModel)]="user.profileName" name="profilename"></ion-input>
+            </ion-item>
+            <ion-item>
+                <ion-label stacked>Summary</ion-label>
+                <ion-textarea type="text" [(ngModel)]="user.summary" name="summary"></ion-textarea>
+            </ion-item>
+            <div padding>
+                <button ion-button color="primary" block clear>Update</button>
+            </div>
+          </ion-list>
+        </form>
+      </ion-content>

MyPassionProjectClient/src/pages/settings/profile-modal.ts

@@ -0,0 +1,34 @@
+import { ViewChild, Component } from "../../../node_modules/@angular/core";
+import { UsersService } from "../../providers/users-service";
+import {ViewController, ToastController, NavController} from 'ionic-angular';
+
+@Component({
+    templateUrl: './profile-modal.html'
+  })
+export class ProfileModalPage {
+    user: any;
+
+    constructor(public viewCtrl: ViewController, public toastCtrl: ToastController, public usersService: UsersService, public navCtrl: NavController) {
+        this.user = this.usersService.getUserProfile().subscribe(user=>this.user = user);
+    } 
+    
+    updateProfile() {
+        console.log(this.user);
+        this.usersService.updateProfile(this.user).subscribe(response => {
+            let toast = this.toastCtrl.create({
+                message: 'Profile updated.',
+                duration: 2000
+              });
+            toast.present();
+            this.dismiss();
+          }) 
+      }
+    
+      ionViewDidLoad() {
+      }
+    
+      dismiss() {
+        this.viewCtrl.dismiss();
+      }
+    
+}

MyPassionProjectClient/src/pages/settings/settings.html

@@ -0,0 +1,15 @@
+<ion-header>
+    <ion-navbar>
+      <ion-title>Settings</ion-title>
+    </ion-navbar>
+  </ion-header>
+  <ion-content padding>
+      <ion-list>
+          <button ion-item (click)="updateProfile()">
+            Update Profile
+          </button>  
+      </ion-list>
+  </ion-content>
+
+
+    

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

@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { IonicPageModule } from 'ionic-angular';
+import { SettingsPage } from './settings';
+import { ProfileModalPage } from './profile-modal';
+
+@NgModule({
+  declarations: [
+    SettingsPage,
+  ],
+  imports: [
+    IonicPageModule.forChild(SettingsPage),
+  ],
+})
+export class SettingsPageModule {}

MyPassionProjectClient/src/pages/settings/settings.scss

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

MyPassionProjectClient/src/pages/settings/settings.ts

@@ -0,0 +1,24 @@
+import { Component } from '@angular/core';
+import { IonicPage, NavController, NavParams, ModalController } from 'ionic-angular';
+import { ProfileModalPage } from './profile-modal';
+
+@IonicPage()
+@Component({
+  selector: 'page-settings',
+  templateUrl: 'settings.html',
+})
+export class SettingsPage {
+
+  constructor(public navCtrl: NavController, public navParams: NavParams, public modalCtrl: ModalController) {
+  }
+
+  ionViewDidLoad() {
+    console.log('ionViewDidLoad SettingsPage');
+  }
+    
+  updateProfile() {
+    let modal = this.modalCtrl.create(ProfileModalPage);
+    modal.present();
+  }
+
+}

MyPassionProjectClient/src/pages/tabs/tabs.html

@@ -1,6 +1,6 @@
 <ion-tabs>
     <ion-tab [root]="profileRoot" tabTitle="Home" tabIcon="home"></ion-tab>
-    <ion-tab [root]="gamesRoot" tabTitle="Games" tabIcon="search"></ion-tab>
-    <ion-tab [root]="gameSearchRoot" tabTitle="GameSearch" tabIcon="search"></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/providers/users-service.ts

@@ -11,10 +11,6 @@ export class UsersService{
   constructor(public http: HttpClient){
   }
 
-  getUserById() {
-      return this.http.get(this.USERS_API+"/1")
-  }
-
   addUser(account): Observable<any>{
    this.setUser(account);
     return this.http.post(this.USERS_API,account);
@@ -22,6 +18,13 @@ export class UsersService{
 
   setUser(account){
     this.userName = account.userName;
-    console.log(this.userName);
+  }
+
+  updateProfile(profile): Observable<any>{
+    return this.http.put(this.USERS_API + "/1", profile);
+  }
+
+  getUserProfile(){
+    return this.http.get(this.USERS_API+"/1")
   }
 }