-
+
+
Submit Your Review
+
+
+
diff --git a/ShopifyUI/src/app/components/product-detail/product-detail.component.ts b/ShopifyUI/src/app/components/product-detail/product-detail.component.ts
index 70e7922..fc649ab 100644
--- a/ShopifyUI/src/app/components/product-detail/product-detail.component.ts
+++ b/ShopifyUI/src/app/components/product-detail/product-detail.component.ts
@@ -1,8 +1,10 @@
import { Component, OnInit } from '@angular/core';
+import { FormControl, FormGroup, Validators } from '@angular/forms';
import { ActivatedRoute } from '@angular/router';
import { Cart } from 'src/app/model/cart.model';
import { Product } from 'src/app/model/product.model';
-import { ReviewDto } from 'src/app/model/review.model';
+import { Review } from 'src/app/model/review.model';
+import { ReviewDto } from 'src/app/model/reviewDto.model';
import { CartService } from 'src/app/service/cart.service';
import { ProductService } from 'src/app/service/product.service';
import { ReviewService } from 'src/app/service/review.service';
@@ -14,16 +16,31 @@ import { ReviewService } from 'src/app/service/review.service';
})
export class ProductDetailComponent implements OnInit {
pid:any;
- uid:string = "1";
+ uid:any = 1;
product:Product;
currentRating:any = [];
rating:any = [];
quantity:number = 1;
cartNo:number = 0;
reviewDtos: ReviewDto[] = [];
- constructor(private actRouter:ActivatedRoute, private productService:ProductService, private cartService:CartService,private reviewService:ReviewService) { }
+ reviewForm: FormGroup;
+ username:any='';
+ authcode:any='';
+ constructor(private actRouter:ActivatedRoute, private productService:ProductService, private cartService:CartService,private reviewService:ReviewService) {
+ this.reviewForm = new FormGroup({
+ reviewText : new FormControl(''),
+ rating : new FormControl(''),
+ })
+ }
ngOnInit(): void {
+ this.username = window.sessionStorage.getItem("username");
+ this.authcode = window.sessionStorage.getItem("authcode");
+ this.uid = window.sessionStorage.getItem("user_id");
+ this.reviewForm = new FormGroup({
+ reviewText : new FormControl('', Validators.required),
+ rating : new FormControl('', Validators.required),
+ })
this.cartService.getCartByUser(this.uid).subscribe(data1 => {
this.cartNo = data1.length;
})
@@ -42,6 +59,7 @@ export class ProductDetailComponent implements OnInit {
})
this.reviewService.getReviewsByProduct(this.pid).subscribe(data => {
this.reviewDtos = data;
+ console.log(this.reviewDtos)
})
}
@@ -63,4 +81,41 @@ export class ProductDetailComponent implements OnInit {
})
}
+ onReviewFormSubmit() {
+ let review : Review = {
+ reviewText: this.reviewForm.value.reviewText,
+ rating: this.reviewForm.value.rating,
+ }
+ this.reviewService.postReview(this.uid,this.pid,review).subscribe(data => {
+ this.reviewForm = new FormGroup({
+ reviewText : new FormControl('', Validators.required),
+ rating : new FormControl('', Validators.required),
+ })
+ this.reviewService.getReviewsByProduct(this.pid).subscribe(data => {
+ this.reviewDtos = data;
+ console.log(this.reviewDtos)
+ })
+ })
+ }
+
+ onReviewDelete(rid:number) {
+ this.reviewService.deleteReview(rid).subscribe(data => {
+ this.reviewDtos.forEach((i, index) => {
+ if (i.id == rid) {
+ this.reviewDtos.splice(index, 1);
+ }
+ })
+ })
+ }
+
+ onLogout() {
+ if (this.authcode != null) {
+ this.authcode = null;
+ this.username = null;
+ window.sessionStorage.removeItem("username");
+ window.sessionStorage.removeItem("user_id");
+ window.sessionStorage.removeItem("authcode");
+ window.sessionStorage.removeItem("isLoggedIn");
+ }
+ }
}
diff --git a/ShopifyUI/src/app/components/products/products.component.html b/ShopifyUI/src/app/components/products/products.component.html
index 7154203..17ca418 100644
--- a/ShopifyUI/src/app/components/products/products.component.html
+++ b/ShopifyUI/src/app/components/products/products.component.html
@@ -1,5 +1,6 @@
-
-
+
+
+
Shopify
-
Login
+
+
+
+
+
+ Hello {{username}}
+
Personal details
+ Orders
+ Logout
+
+
+
+ Login
+
+
diff --git a/ShopifyUI/src/app/components/products/products.component.ts b/ShopifyUI/src/app/components/products/products.component.ts
index 11d1c5a..ec08a59 100644
--- a/ShopifyUI/src/app/components/products/products.component.ts
+++ b/ShopifyUI/src/app/components/products/products.component.ts
@@ -17,7 +17,9 @@ export class ProductsComponent implements OnInit {
products: Product[] = [];
searchForm: FormGroup;
prodName:string;
- uid:string = "1";
+ uid:number = 1;
+ username:any='';
+ authcode:any='';
constructor(private productService: ProductService,private cartService: CartService) {
this.searchForm = new FormGroup({
prodName: new FormControl('')
@@ -25,6 +27,8 @@ export class ProductsComponent implements OnInit {
}
ngOnInit(): void {
+ this.username = window.sessionStorage.getItem("username");
+ this.authcode = window.sessionStorage.getItem("authcode");
console.log("In Product Component");
this.searchForm = new FormGroup({
prodName: new FormControl('', Validators.required)
@@ -57,4 +61,16 @@ export class ProductsComponent implements OnInit {
})
})
}
+
+ onLogout() {
+ if (this.authcode != null) {
+ this.authcode = null;
+ this.username = null;
+ window.sessionStorage.removeItem("username");
+ window.sessionStorage.removeItem("user_id");
+ window.sessionStorage.removeItem("authcode");
+ window.sessionStorage.removeItem("isLoggedIn");
+ }
+ }
+
}
diff --git a/ShopifyUI/src/app/model/review.model.ts b/ShopifyUI/src/app/model/review.model.ts
index ebe86c0..9b151cc 100644
--- a/ShopifyUI/src/app/model/review.model.ts
+++ b/ShopifyUI/src/app/model/review.model.ts
@@ -1,6 +1,10 @@
-export class ReviewDto {
- reviewText:string;
- rating:number;
- username:string;
- product_name:string;
+import { Product } from "./product.model";
+import { User } from "./user.model";
+
+export class Review {
+ id?:number;
+ reviewText:string = '';
+ rating:number = 0;
+ user?: User
+ product?: Product;
}
\ No newline at end of file
diff --git a/ShopifyUI/src/app/model/reviewDto.model.ts b/ShopifyUI/src/app/model/reviewDto.model.ts
new file mode 100644
index 0000000..7db2e3e
--- /dev/null
+++ b/ShopifyUI/src/app/model/reviewDto.model.ts
@@ -0,0 +1,8 @@
+export class ReviewDto {
+ id?: number;
+ reviewText:string;
+ rating:number;
+ userId?:number;
+ username:string;
+ productName:string;
+}
\ No newline at end of file
diff --git a/ShopifyUI/src/app/service/cart.service.ts b/ShopifyUI/src/app/service/cart.service.ts
index c6cd52f..b01a5fa 100644
--- a/ShopifyUI/src/app/service/cart.service.ts
+++ b/ShopifyUI/src/app/service/cart.service.ts
@@ -12,12 +12,12 @@ export class CartService {
constructor(private httpClent:HttpClient) { }
- public postCart(cart:Cart,uid:string,pid:number): Observable {
+ public postCart(cart:Cart,uid:number,pid:number): Observable {
let cart_post_api = this.path + "/cart/" + uid + "/" + pid;
return this.httpClent.post(cart_post_api,cart);
}
- public getCartByUser(uid:string): Observable {
+ public getCartByUser(uid:number): Observable {
let cart_get_api = this.path + "/cart/" + uid;
return this.httpClent.get(cart_get_api);
}
diff --git a/ShopifyUI/src/app/service/review.service.ts b/ShopifyUI/src/app/service/review.service.ts
index 3bbd46e..cc1fb08 100644
--- a/ShopifyUI/src/app/service/review.service.ts
+++ b/ShopifyUI/src/app/service/review.service.ts
@@ -1,7 +1,8 @@
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs';
-import { ReviewDto } from '../model/review.model';
+import { Review } from '../model/review.model';
+import { ReviewDto } from '../model/reviewDto.model';
@Injectable({
providedIn: 'root'
@@ -12,8 +13,18 @@ export class ReviewService {
constructor(private httpClient:HttpClient) { }
+ public postReview(uid:number,pid:number,review:Review): Observable {
+ let review_post_api = this.path + "/review/" + pid + "/" + uid;
+ return this.httpClient.post(review_post_api,review);
+ }
+
public getReviewsByProduct(pid:string): Observable {
let review_get_api = this.path + "/review/product?pid=" + pid;
return this.httpClient.get(review_get_api);
}
+
+ public deleteReview(rid:number) {
+ let review_delete_api = this.path + "/review/" + rid;
+ return this.httpClient.delete(review_delete_api);
+ }
}
diff --git a/ShopifyUI/src/app/service/user.service.ts b/ShopifyUI/src/app/service/user.service.ts
index 3569db9..d27130d 100644
--- a/ShopifyUI/src/app/service/user.service.ts
+++ b/ShopifyUI/src/app/service/user.service.ts
@@ -1,9 +1,38 @@
+import { HttpClient, HttpHeaders } from '@angular/common/http';
import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { User } from '../model/user.model';
@Injectable({
providedIn: 'root'
})
export class UserService {
- constructor() { }
+ path:string = "http://localhost:59279/api1";
+
+ constructor(private httpClient:HttpClient) { }
+
+ public postUser(user:User): Observable {
+ let user_post_api = this.path + '/sign-up';
+ let authcode = btoa(user.username + ":" + user.password)
+ user.username = authcode;
+ user.password = "";
+ return this.httpClient.post(user_post_api,user);
+ }
+
+ public loginUser(user: User) {
+ let httpOptions = {
+ headers: new HttpHeaders({
+ 'Content-Type': 'application/json',
+ 'Authorization': 'Basic ' + btoa(user.username + ":" + user.password)
+ })
+ }
+ let user_login_api = this.path + "/login"
+ return this.httpClient.get(user_login_api, httpOptions);
+ }
+
+ public getUserByName(username:string): Observable {
+ let user_getName_api = this.path + "/user/name/" + username;
+ return this.httpClient.get(user_getName_api);
+ }
}
diff --git a/ShopifyUI/src/styles.css b/ShopifyUI/src/styles.css
index 5e0c58e..acfa071 100644
--- a/ShopifyUI/src/styles.css
+++ b/ShopifyUI/src/styles.css
@@ -31,6 +31,15 @@ body {
color: white;
}
+.dropBtn {
+ color: white;
+ font-size: 25px;
+}
+
+.dropBtn:hover {
+ color: white;
+}
+
.active a {
border-bottom: 1px solid white;
}