diff --git a/Angular-UrbanBazaar/src/app/services/member-user.service.ts b/Angular-UrbanBazaar/src/app/services/member-user.service.ts index 92edf41..a94666d 100644 --- a/Angular-UrbanBazaar/src/app/services/member-user.service.ts +++ b/Angular-UrbanBazaar/src/app/services/member-user.service.ts @@ -4,6 +4,7 @@ import { Observable } from 'rxjs'; import { MemberUser } from '../models/member-user'; import 'rxjs/add/operator/map'; import { Http ,Response} from '@angular/http'; +import { HttpClient } from '@angular/common/http'; @Injectable({ providedIn: 'root' @@ -15,7 +16,7 @@ export class MemberUserService { private _url : String = "http://localhost:8008/user/"; - constructor(private _http : Http) { } + constructor(private _http : HttpClient) { } // public showMembersByUser(id : number) : Observable { // return this._http.get(this._url+"/showUserMembers/"+id); @@ -25,27 +26,27 @@ export class MemberUserService { // this._http.post(this._url+"/addMember", member); // } - showAllMemberUsers() : Observable { - return this._http.get(this._url+"showAllMembers").map((res : Response) => res.json()); - } - - addMemberUser(member: MemberUser) : Observable { - return this._http.post(this._url+"addMember/",member).map((res: Response)=> null); - } - searchMemberUser(memberid : number) : Observable { - return this._http.get(this._url+"showAllMembers/" +memberid).map((res : Response) => res.json()); - } - searchMembersbyUser(userid : number) : Observable { - return this._http.get(this._url+"showUserMembers/" +userid).map((res : Response) => res.json()); - } - deleteMemberUser(memberid : number) : Observable { - return this._http.delete(this._url+"deleteMember/" +memberid).map((res : Response) => null); - } - updateMemberUser(member :MemberUser) : Observable { - return this._http.put(this._url+"updateMember/",member).map((res: Response)=> null); - } - + showAllMemberUsers() { + return this._http.get(this._url+"showAllMembers")} + // .map((res : Response) => res.json()); } + // : Observable + addMemberUser(member: MemberUser){ + return this._http.post(this._url+"addMember/",member)} + // : Observable .map((res: Response)=> null); } + searchMemberUser(memberid : number) { + return this._http.get(this._url+"showAllMembers/" +memberid)} + // : Observable.map((res : Response) => res.json()); } + searchMembersbyUser(userid : number){ + return this._http.get(this._url+"showUserMembers/" +userid)} + // : Observable .map((res : Response) => res.json()); } + deleteMemberUser(memberid : number) { + return this._http.delete(this._url+"deleteMember/" +memberid)} + // .map((res : Response) => null); }: Observable + updateMemberUser(member :MemberUser) { + return this._http.put(this._url+"updateMember/",member) + // : Observable.map((res: Response)=> null); } + } diff --git a/Angular-UrbanBazaar/src/app/services/user.service.ts b/Angular-UrbanBazaar/src/app/services/user.service.ts index 50d4a3d..c0a6af2 100644 --- a/Angular-UrbanBazaar/src/app/services/user.service.ts +++ b/Angular-UrbanBazaar/src/app/services/user.service.ts @@ -6,6 +6,7 @@ import { Login } from '../models/login'; import { User } from '../models/user'; import 'rxjs/add/operator/map'; import { Observable } from 'rxjs'; +import { HttpClient } from '@angular/common/http'; @Injectable({ @@ -16,7 +17,7 @@ export class UserService { // private _url : string = "http://localhost:9000"; -constructor(private _http : Http) { } +constructor(private _http : HttpClient) { } // public showAllUsers() : Observable { // return this._http.get(this._url + "/showAllUsers"); @@ -30,33 +31,33 @@ constructor(private _http : Http) { } // this._http.post(this._url+"/addUser/", user); currentUser:User private _url:string ="http://localhost:8008/user/" -showAllUsers() : Observable { - return this._http.get(this._url+"showAllUsers").map((res : Response) => res.json()); -} +showAllUsers() { + return this._http.get(this._url+"showAllUsers")} + // .map((res : Response) => res.json());} -addUser(user: User) : Observable { - return this._http.post(this._url+"addUser/",user).map((res: Response)=> null).pipe(); -} +addUser(user: User) { + return this._http.post(this._url+"addUser/",user)} + // .map((res: Response)=> null).pipe();} // loginUser (user:User):Observable{ // return this._http.post("http://localhost:8006/user/login/",user).map((res: Response)=>null); // } -searchUser(userid : number) : Observable { - return this._http.get(this._url+"findUserById/" +userid).map((res : Response) => res.json()); -} -updateUser(user : User) : Observable { - return this._http.put(this._url+"update/",user).map((res: Response)=> null); -} +searchUser(userid : number) { + return this._http.get(this._url+"findUserById/" +userid)} + // .map((res : Response) => res.json());} +updateUser(user : User) { + return this._http.put(this._url+"update/",user)} + // .map((res: Response)=> null);} // findUserByUsername(name : string) : Observable { // return this._http.get("http://localhost:8006/user/findUserByName/"+name).map((res : Response) => res.json()); // } -public loginUser(user : Login) : Observable { - return this._http.post(this._url+"login/",user).map((res: Response)=>null); -} +public loginUser(user : Login) { + return this._http.post(this._url+"login/",user)} + // .map((res: Response)=>null);} -public findUserByUsername(name : string) : Observable { - return this._http.get(this._url+"findUserByName/"+name).map((res : Response) => res.json()); -} +public findUserByUsername(name : string) { + return this._http.get(this._url+"findUserByName/"+name)} + //.map((res : Response) => res.json());} // private _url : String = "http://localhost:8001/user";