40 changed files with 209 additions and 817 deletions
Split View
Diff Options
-
10Angular-UrbanBazaar/angular.json
-
300Angular-UrbanBazaar/package-lock.json
-
9Angular-UrbanBazaar/package.json
-
9Angular-UrbanBazaar/proxy.config.json
-
28Angular-UrbanBazaar/src/app/app.module.ts
-
32Angular-UrbanBazaar/src/app/auth/login/login.component.html
-
21Angular-UrbanBazaar/src/app/auth/login/login.component.ts
-
84Angular-UrbanBazaar/src/app/auth/sign-up/sign-up.component.html
-
28Angular-UrbanBazaar/src/app/auth/sign-up/sign-up.component.ts
-
27Angular-UrbanBazaar/src/app/components/cart/cart.component.ts
-
29Angular-UrbanBazaar/src/app/components/home/home.component.html
-
9Angular-UrbanBazaar/src/app/components/home/home.component.ts
-
6Angular-UrbanBazaar/src/app/components/page-nav-bar/page-nav-bar.component.html
-
3Angular-UrbanBazaar/src/app/components/page-nav-bar/page-nav-bar.component.ts
-
0Angular-UrbanBazaar/src/app/components/user-add/user-add.component.css
-
1Angular-UrbanBazaar/src/app/components/user-add/user-add.component.html
-
25Angular-UrbanBazaar/src/app/components/user-add/user-add.component.spec.ts
-
15Angular-UrbanBazaar/src/app/components/user-add/user-add.component.ts
-
63Angular-UrbanBazaar/src/app/components/user-profile-details/user-profile-details.component.html
-
44Angular-UrbanBazaar/src/app/components/user-profile-details/user-profile-details.component.ts
-
2Angular-UrbanBazaar/src/app/models/member-user.ts
-
57Angular-UrbanBazaar/src/app/services/member-user.service.ts
-
2Angular-UrbanBazaar/src/app/services/orders.service.ts
-
2Angular-UrbanBazaar/src/app/services/product-category.service.ts
-
2Angular-UrbanBazaar/src/app/services/product.service.ts
-
84Angular-UrbanBazaar/src/app/services/user.service.ts
-
5UB_CartServiceProxy/src/main/java/com/example/urbanbazaar/controller/CartController.java
-
4UB_CartServiceProxy/src/main/resources/application.properties
-
4UB_OrderServiceProxy/src/main/resources/application.properties
-
2UB_ProductServiceProxy/src/main/java/com/example/urbanbazaar/controller/ProductCategoryController.java
-
2UB_ProductServiceProxy/src/main/java/com/example/urbanbazaar/controller/ProductController.java
-
4UB_ProductServiceProxy/src/main/resources/application.properties
-
23UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/controller/MemberUserController.java
-
39UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/controller/UserController.java
-
21UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/model/MemberUser.java
-
3UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/model/User.java
-
5UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/repository/MemberUserRepository.java
-
2UB_UserServiceProxy/src/main/java/com/example/urbanbazaar/repository/UserRepository.java
-
4UB_UserServiceProxy/src/main/resources/application.properties
-
16grocery_db_tables.sql
@ -1,19 +1,18 @@ |
|||
{ |
|||
"/products":{ |
|||
"target":"http://10.3.117.7:8007", |
|||
"target":"http://10.3.117.7:8002", |
|||
"secure":false |
|||
}, |
|||
"/user":{ |
|||
"target":"http://10.3.117.7:8008", |
|||
"target":"http://10.3.117.7:8006", |
|||
"secure":false |
|||
}, |
|||
"/orders":{ |
|||
"target":"http://10.3.117.7:8009", |
|||
"target":"http://10.3.117.7:8003", |
|||
"secure":false |
|||
}, |
|||
"/cart":{ |
|||
"target":"http://10.3.117.7:8010", |
|||
"target":"http://10.3.117.7:8004", |
|||
"secure":false |
|||
} |
|||
|
|||
} |
|||
@ -1,83 +1 @@ |
|||
<!-- <div > |
|||
<app-page-nav-bar></app-page-nav-bar> |
|||
</div> --> |
|||
<p style="text-align:center;">Please provide your details to signup with Urban Bazaar</p> |
|||
<form #signupForm="ngForm" style="text-align:center;" (ngSubmit)="signup(signupForm)"> |
|||
|
|||
User UserEmail: |
|||
<input type="text" name="useremail" [(ngModel)]="user.useremail" required #useremail="ngModel" /> |
|||
<br/><br/> |
|||
<div *ngIf="useremail.invalid && signupForm.submitted && !isFormSubmitted"> |
|||
<h6 style="color: red">Please Enter User Email Id...</h6> |
|||
</div> |
|||
<br/> |
|||
User Password : |
|||
<input type="password" name="userpassword" [(ngModel)]="user.userpassword" required #userpassword="ngModel" /> |
|||
<br/><br/> |
|||
<div *ngIf="userpassword.invalid && signupForm.submitted && !isFormSubmitted"> |
|||
<h6 style="color: red">Please Enter User Password...</h6> |
|||
</div> |
|||
<br/> |
|||
User First Name : |
|||
<input type="text" name="userfirstname" [(ngModel)]="user.userfirstname" required #userfirstname="ngModel" /> |
|||
<br/><br/> |
|||
<div *ngIf="userfirstname.invalid && signupForm.submitted && !isFormSubmitted"> |
|||
<h6 style="color: red">Please Enter User First Name...</h6> |
|||
</div> |
|||
<br/> |
|||
User Last Name : |
|||
<input type="text" name="userlastname" [(ngModel)]="user.userlastname" |
|||
required #userlastname="ngModel" /> |
|||
<br/><br/> |
|||
<div *ngIf="userlastname.invalid && signupForm.submitted && !isFormSubmitted"> |
|||
<h6 style="color: red">Please Enter User Last Name...</h6> |
|||
</div> |
|||
<br/> |
|||
User City : |
|||
<input type="text" name="usercity" [(ngModel)]="user.usercity" required #usercity="ngModel" /> |
|||
<br/><br/> |
|||
<div *ngIf="usercity.invalid && signupForm.submitted && !isFormSubmitted"> |
|||
<h6 style="color: red">Please Enter UserCity...</h6> |
|||
</div> |
|||
<br/> |
|||
User State : |
|||
<input type="text" name="userstate" [(ngModel)]="user.userstate" required #userstate="ngModel" /> |
|||
<br/><br/> |
|||
<div *ngIf="userstate.invalid && signupForm.submitted && !isFormSubmitted"> |
|||
<h6 style="color: red">Please Enter UserState...</h6> |
|||
</div> |
|||
<br/> |
|||
User Zip : |
|||
<input type="text" name="userzip" [(ngModel)]="user.userzip" required #userzip="ngModel" /> |
|||
<br/><br/> |
|||
<div *ngIf="userzip.invalid && signupForm.submitted && !isFormSubmitted"> |
|||
<h6 style="color: red">Please Enter User Zip...</h6> |
|||
</div> |
|||
<br/> |
|||
User Phone Number : |
|||
<input type="text" name="userphone" [(ngModel)]="user.userphone" required #userphone="ngModel" /> |
|||
<br/><br/> |
|||
<div *ngIf="userphone.invalid && signupForm.submitted && !isFormSubmitted"> |
|||
<h6 style="color: red">Please Enter User Number...</h6> |
|||
</div> |
|||
<br/> |
|||
|
|||
User Address : |
|||
<input type="text" name="useraddress" [(ngModel)]="user.useraddress" required #useraddress="ngModel" /> |
|||
<br/><br/> |
|||
<div *ngIf="useraddress.invalid && signupForm.submitted && !isFormSubmitted"> |
|||
<h6 style="color: red">Please Enter User Address...</h6> |
|||
</div> |
|||
<br/> |
|||
User Address2 : |
|||
<input type="text" name="useraddress2" [(ngModel)]="user.useraddress2" required #useraddress2="ngModel" /> |
|||
<br/><br/> |
|||
<div *ngIf="useraddress2.invalid && signupForm.submitted && !isFormSubmitted"> |
|||
<h6 style="color: red">Please Enter User Address2...</h6> |
|||
</div> |
|||
<br/> |
|||
<input type="Submit" value="Submit" /> |
|||
</form> |
|||
<!-- <div style="text-align:center;"> |
|||
<a [routerLink]="['user-show']">UserDetails</a> |
|||
</div> --> |
|||
<p>sign-up works!</p> |
|||
@ -0,0 +1 @@ |
|||
<p>user-add works!</p> |
|||
@ -0,0 +1,25 @@ |
|||
import { ComponentFixture, TestBed } from '@angular/core/testing'; |
|||
|
|||
import { UserAddComponent } from './user-add.component'; |
|||
|
|||
describe('UserAddComponent', () => { |
|||
let component: UserAddComponent; |
|||
let fixture: ComponentFixture<UserAddComponent>; |
|||
|
|||
beforeEach(async () => { |
|||
await TestBed.configureTestingModule({ |
|||
declarations: [ UserAddComponent ] |
|||
}) |
|||
.compileComponents(); |
|||
}); |
|||
|
|||
beforeEach(() => { |
|||
fixture = TestBed.createComponent(UserAddComponent); |
|||
component = fixture.componentInstance; |
|||
fixture.detectChanges(); |
|||
}); |
|||
|
|||
it('should create', () => { |
|||
expect(component).toBeTruthy(); |
|||
}); |
|||
}); |
|||
@ -0,0 +1,15 @@ |
|||
import { Component, OnInit } from '@angular/core'; |
|||
|
|||
@Component({ |
|||
selector: 'app-user-add', |
|||
templateUrl: './user-add.component.html', |
|||
styleUrls: ['./user-add.component.css'] |
|||
}) |
|||
export class UserAddComponent implements OnInit { |
|||
|
|||
constructor() { } |
|||
|
|||
ngOnInit(): void { |
|||
} |
|||
|
|||
} |
|||
@ -1,64 +1,23 @@ |
|||
// import { HttpClient } from '@angular/common/http';
|
|||
import { HttpClient } from '@angular/common/http'; |
|||
import { Injectable } from '@angular/core'; |
|||
import { Observable } from 'rxjs'; |
|||
import { MemberUser } from '../models/member-user'; |
|||
import 'rxjs/add/operator/map'; |
|||
import { Http ,Response} from '@angular/http'; |
|||
|
|||
@Injectable({ |
|||
providedIn: 'root' |
|||
}) |
|||
export class MemberUserService { |
|||
|
|||
|
|||
|
|||
|
|||
private _url : String = "http://localhost:8008/user/"; |
|||
private _url : String = "http://localhost:4405/user"; |
|||
|
|||
constructor(private _http : Http) { } |
|||
|
|||
// public showMembersByUser(id : number) : Observable<MemberUser[]> {
|
|||
// return this._http.get<MemberUser[]>(this._url+"/showUserMembers/"+id);
|
|||
// }
|
|||
|
|||
// public addMemberToUser(member : MemberUser) {
|
|||
// this._http.post(this._url+"/addMember", member);
|
|||
// }
|
|||
constructor(private _http : HttpClient) { } |
|||
|
|||
showAllMemberUsers() : Observable<MemberUser[]> { |
|||
return this._http.get(this._url+"showAllMembers").map((res : Response) => res.json()); |
|||
} |
|||
|
|||
addMemberUser(member: MemberUser) : Observable<any> { |
|||
return this._http.post(this._url+"addMember/",member).map((res: Response)=> null); |
|||
} |
|||
searchMemberUser(memberid : number) : Observable<MemberUser> { |
|||
return this._http.get(this._url+"showAllMembers/" +memberid).map((res : Response) => res.json()); |
|||
} |
|||
searchMembersbyUser(userid : number) : Observable<MemberUser[]> { |
|||
return this._http.get(this._url+"showUserMembers/" +userid).map((res : Response) => res.json()); |
|||
} |
|||
deleteMemberUser(memberid : number) : Observable<any> { |
|||
return this._http.delete(this._url+"deleteMember/" +memberid).map((res : Response) => null); |
|||
public showMembersByUser(id : number) : Observable<MemberUser[]> { |
|||
return this._http.get<MemberUser[]>(this._url+"/showUserMembers/"+id); |
|||
} |
|||
updateMemberUser(member :MemberUser) : Observable<any> { |
|||
return this._http.put(this._url+"updateMember/",member).map((res: Response)=> null); |
|||
} |
|||
|
|||
|
|||
|
|||
|
|||
|
|||
// private _url : String = "http://localhost:8001/user";
|
|||
|
|||
// constructor(private _http : HttpClient) { }
|
|||
|
|||
// public showMembersByUser(id : number) : Observable<MemberUser[]> {
|
|||
// return this._http.get<MemberUser[]>(this._url+"/showUserMembers/"+id);
|
|||
// }
|
|||
|
|||
// public addMemberToUser(member : MemberUser) {
|
|||
// this._http.post(this._url+"/addMember", member);
|
|||
// }
|
|||
public addMemberToUser(member : MemberUser) { |
|||
this._http.post(this._url+"/addMember", member); |
|||
} |
|||
|
|||
} |
|||
@ -1,81 +1,37 @@ |
|||
// import { HttpClient } from '@angular/common/http';
|
|||
import { HttpClient } from '@angular/common/http'; |
|||
import { Injectable } from '@angular/core'; |
|||
import { Http,Response } from '@angular/http'; |
|||
// import { Observable } from 'rxjs';
|
|||
import { Observable } from 'rxjs'; |
|||
import { Login } from '../models/login'; |
|||
import { User } from '../models/user'; |
|||
import 'rxjs/add/operator/map'; |
|||
import { Observable } from 'rxjs'; |
|||
|
|||
|
|||
@Injectable({ |
|||
providedIn: 'root' |
|||
}) |
|||
export class UserService { |
|||
|
|||
|
|||
// private _url : string = "http://localhost:9000";
|
|||
private _url : String = "http://localhost:4405/user"; |
|||
currentUser : User; |
|||
|
|||
constructor(private _http : Http) { } |
|||
|
|||
// public showAllUsers() : Observable<User[]> {
|
|||
// return this._http.get<User[]>(this._url + "/showAllUsers");
|
|||
// }
|
|||
constructor(private _http : HttpClient) { } |
|||
|
|||
// public searchUser(id : number) : Observable<User> {
|
|||
// return this._http.get<User>(this._url+"/findUserById/"+id);
|
|||
// }
|
|||
public showAllUsers() : Observable<User[]> { |
|||
return this._http.get<User[]>(this._url + "/showAllUsers"); |
|||
} |
|||
|
|||
// public addUser(user : User) {
|
|||
// this._http.post(this._url+"/addUser/", user);
|
|||
currentUser:User |
|||
private _url:string ="http://localhost:8008/user/" |
|||
showAllUsers() : Observable<User[]> { |
|||
return this._http.get(this._url+"showAllUsers").map((res : Response) => res.json()); |
|||
} |
|||
public searchUser(id : number) : Observable<User> { |
|||
return this._http.get<User>(this._url+"/findUserById/"+id); |
|||
} |
|||
|
|||
addUser(user: User) : Observable<any> { |
|||
return this._http.post(this._url+"addUser/",user).map((res: Response)=> null).pipe(); |
|||
} |
|||
// loginUser (user:User):Observable<any>{
|
|||
// return this._http.post("http://localhost:8006/user/login/",user).map((res: Response)=>null);
|
|||
// }
|
|||
searchUser(userid : number) : Observable<User> { |
|||
return this._http.get(this._url+"findUserById/" +userid).map((res : Response) => res.json()); |
|||
} |
|||
updateUser(user : User) : Observable<any> { |
|||
return this._http.put(this._url+"update/",user).map((res: Response)=> null); |
|||
} |
|||
// findUserByUsername(name : string) : Observable<User> {
|
|||
// return this._http.get("http://localhost:8006/user/findUserByName/"+name).map((res : Response) => res.json());
|
|||
// }
|
|||
public addUser(user : User) { |
|||
this._http.post(this._url+"/addUser", user); |
|||
} |
|||
|
|||
public loginUser(user : Login) : Observable<string> { |
|||
return this._http.post(this._url+"login/",user).map((res: Response)=>null); |
|||
} |
|||
public userLogin(user : Login) : Observable<string> { |
|||
return this._http.post<string>(this._url+"/login", user); |
|||
} |
|||
|
|||
public findUserByUsername(name : string) : Observable<User> { |
|||
return this._http.get(this._url+"findUserByName/"+name).map((res : Response) => res.json()); |
|||
} |
|||
|
|||
|
|||
// private _url : String = "http://localhost:8001/user";
|
|||
// currentUser : User;
|
|||
|
|||
// constructor(private _http : HttpClient) { }
|
|||
|
|||
// public showAllUsers() : Observable<User[]> {
|
|||
// return this._http.get<User[]>(this._url + "/showAllUsers");
|
|||
// }
|
|||
|
|||
// public searchUser(id : number) : Observable<User> {
|
|||
// return this._http.get<User>(this._url+"/findUserById/"+id);
|
|||
// }
|
|||
|
|||
// public addUser(user : User) {
|
|||
// this._http.post(this._url+"/addUser", user);
|
|||
// }
|
|||
|
|||
|
|||
public findUserByUsername(name : string) : Observable<User> { |
|||
return this._http.get<User>(this._url+"/findUserByName/"+name); |
|||
} |
|||
|
|||
} |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue