- Welcome to Urban Bazaar !!! -
-
+
Urban Bazaar
+ +
+
Login Page
@@ -20,24 +19,9 @@
[formControl]="password">
-
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/Angular-UrbanBazaar/src/app/auth/login/login.component.ts b/Angular-UrbanBazaar/src/app/auth/login/login.component.ts
index 371acab..7a8f8e2 100644
--- a/Angular-UrbanBazaar/src/app/auth/login/login.component.ts
+++ b/Angular-UrbanBazaar/src/app/auth/login/login.component.ts
@@ -18,11 +18,9 @@ export class LoginComponent implements OnInit {
responseMessage : string = "";
temp : Observable;
// temp : User;
- // temps : Observable;
- // userList : Observable;
-signup(){
- this.router.navigateByUrl('/signup')
-}
+ temps : Observable;
+ userList : Observable;
+
constructor(private _userService : UserService, private router : Router) {}
userLogin() {
@@ -34,14 +32,17 @@ signup(){
this.temp = this._userService.findUserByUsername(this.username.value);
this.temp.subscribe(v => {
if(v.userpassword == this.password.value)
- { this.temp.subscribe(v => this._userService.currentUser = v);
- this.router.navigateByUrl('/home');
- alert("Login Successfull !!")}
+ this.responseMessage = "Login success !!";
else
- alert("Login falied !!");
+ this.responseMessage = "Password Incorrect.";
});
-
+ if(this.responseMessage == "Login success !!") {
+ this.temp.subscribe(v => this._userService.currentUser = v);
+ this.router.navigateByUrl('/home');
+ }
+ else
+ alert(this.responseMessage);
}
ngOnInit(): void {
diff --git a/Angular-UrbanBazaar/src/app/auth/sign-up/sign-up.component.html b/Angular-UrbanBazaar/src/app/auth/sign-up/sign-up.component.html
index 3df5dea..7e8b79f 100644
--- a/Angular-UrbanBazaar/src/app/auth/sign-up/sign-up.component.html
+++ b/Angular-UrbanBazaar/src/app/auth/sign-up/sign-up.component.html
@@ -1,83 +1 @@
-
-;
-
- isFormSubmitted : boolean;
- public signup(signupForm : NgForm) {
- if (signupForm.invalid) {
- alert("Kindly enter all details")
- return;
- }
- this.isFormSubmitted=true;
-
- this._userservice.addUser(this.user).subscribe(x => { this.tys="y"; alert("Signup Successful")
- if(this.tys=="t")
- alert("not")});
-
-
- }
- constructor(private _userservice:UserService) {
- this.user=new User();
- this.isFormSubmitted=false;
- }
+ constructor() { }
ngOnInit(): void {
}
-
}
diff --git a/Angular-UrbanBazaar/src/app/components/cart/cart.component.ts b/Angular-UrbanBazaar/src/app/components/cart/cart.component.ts
index 993a34b..9295a9c 100644
--- a/Angular-UrbanBazaar/src/app/components/cart/cart.component.ts
+++ b/Angular-UrbanBazaar/src/app/components/cart/cart.component.ts
@@ -13,25 +13,28 @@ export class CartComponent implements OnInit {
public cartdetails:any =[];
public grandTotal!: number;
+ user : User;
- constructor(private cartservice:CartService) {
- // this.cartdetails = this.cartservice.showAllOrder();
+ constructor(private cartservice : CartService) {
+ this.user = JSON.parse(localStorage.getItem('currentUser'));
+ this.cartdetails = this.cartservice.showCartForUser(this.user.userid);
}
ngOnInit(): void {
- this.cartservice.getProducts()
- .subscribe(res=>{
- this.cartdetails = res;
- this.grandTotal = this.cartservice.getTotalPrice();
- })
+ this.user = JSON.parse(localStorage.getItem('currentUser'));
+ this.cartdetails = this.cartservice.showCartForUser(this.user.userid);
}
- removeItem(item:any){
- this.cartservice.removeCartItem(item);
+
+ public removeItem(cart_id : number){
+ this.cartservice.deleteCartItemForUserId(cart_id);
+ }
+
+ public addCartItem(cartItem : Cart) {
+ this.cartservice.addCartItem(cartItem)
}
- emptyCart()
- {
- this.cartservice.removeAllCart();
+ public emptyCart() {
+ this.cartservice.removeAllCartForUserId(this.user.userid);
}
}
diff --git a/Angular-UrbanBazaar/src/app/components/home/home.component.html b/Angular-UrbanBazaar/src/app/components/home/home.component.html
index 0c83e9f..7805ff7 100644
--- a/Angular-UrbanBazaar/src/app/components/home/home.component.html
+++ b/Angular-UrbanBazaar/src/app/components/home/home.component.html
@@ -1,17 +1,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
OR
Please provide your details to signup with Urban Bazaar
- - \ No newline at end of file +sign-up works!
diff --git a/Angular-UrbanBazaar/src/app/auth/sign-up/sign-up.component.ts b/Angular-UrbanBazaar/src/app/auth/sign-up/sign-up.component.ts index 7ba8690..ec35435 100644 --- a/Angular-UrbanBazaar/src/app/auth/sign-up/sign-up.component.ts +++ b/Angular-UrbanBazaar/src/app/auth/sign-up/sign-up.component.ts @@ -1,8 +1,4 @@ import { Component, OnInit } from '@angular/core'; -import { NgForm } from '@angular/forms'; -import { Observable } from 'rxjs'; -import { User } from 'src/app/models/user'; -import { UserService } from 'src/app/services/user.service'; @Component({ selector: 'app-sign-up', @@ -11,31 +7,9 @@ import { UserService } from 'src/app/services/user.service'; }) export class SignUpComponent implements OnInit { - user :User; - tys :string="t" - temp : Observable-