Refactor product service

restorecommerce · Jan 10, 2024 · 17e7d60 · 17e7d60
1 parent 72ddeeb
commit 17e7d60
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 19 deletions.
diff --git a/src/app/directives/hover-color-picker-directive.service.ts b/src/app/directives/hover-color-picker-directive.service.ts
@@ -1,5 +1,5 @@
 import { Directive, ElementRef, HostListener, Input } from '@angular/core';
-import { ProductService } from '../services/product.service';
+import { ProductService } from '../products/services/product.service';
 
 @Directive({
   selector: '[appHoverColorPicker]',

diff --git a/src/app/products/components/product-card/product-card.component.ts b/src/app/products/components/product-card/product-card.component.ts
@@ -1,8 +1,7 @@
 import { Component, OnInit, Input } from '@angular/core';
 import { Router } from '@angular/router';
 import { IoRestorecommerceProductPhysicalVariant } from 'src/app/generated/graphql';
-import { ProductService } from 'src/app/services/product.service';
-import { Product } from '../products/products.component';
+import { ProductService } from '../../services/product.service';
 
 @Component({
   selector: 'app-product-card',
@@ -35,7 +34,7 @@ export class ProductCardComponent implements OnInit {
   }
 
   ngOnInit(): void {
-  this.selectedColor = 0;
+    this.selectedColor = 0;
   }
 
   onMouseEnter($event: string) {
@@ -50,7 +49,6 @@ export class ProductCardComponent implements OnInit {
     // if (this.product.selectedColor === colorHovered) {
     //   return;
     // }
-
     // if (!this.product.colors.find((color) => color === colorHovered)) {
     //   this.selectedColor = this.product.selectedColor;
     // } else {

diff --git a/src/app/products/components/product-variants/product-variants.component.ts b/src/app/products/components/product-variants/product-variants.component.ts
@@ -2,7 +2,7 @@ import { Component } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { map, switchMap } from 'rxjs';
 
-import { ProductService } from 'src/app/services/product.service';
+import { ProductService } from 'src/app/products/services/product.service';
 
 @Component({
   selector: 'app-product-variants',

diff --git a/src/app/products/components/product/product.component.ts b/src/app/products/components/product/product.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { ScreenService } from 'src/app/services/screen.service';
-import { ProductService } from 'src/app/services/product.service';
+import { ProductService } from 'src/app/products/services/product.service';
 import { combineLatest, map, switchMap } from 'rxjs';
 
 @Component({

diff --git a/src/app/products/components/shoes-products/shoes-products.component.ts b/src/app/products/components/shoes-products/shoes-products.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { ProductService } from 'src/app/services/product.service';
+import { ProductService } from 'src/app/products/services/product.service';
 
 @Component({
   selector: 'app-shoes-products',

diff --git a/src/app/services/product.service.ts → src/app/products/services/product.service.ts b/src/app/services/product.service.ts → src/app/products/services/product.service.ts
@@ -1,15 +1,14 @@
 import { Injectable, EventEmitter, OnDestroy } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 
-import { Product } from '../models/product';
-import { Product as ProductCard } from '../products/components/products/products.component';
+import { Product } from '../../models/product';
+import { Product as ProductCard } from '../components/products/products.component';
 import { Subject, Subscription, map, catchError, of, tap } from 'rxjs';
 import {
   IoRestorecommerceProductProduct,
   IoRestorecommerceResourcebaseFilterOperation,
   ProductsQueryGQL,
-} from '../generated/graphql';
-import { Observable } from '@apollo/client/utilities';
+} from '../../generated/graphql';
 
 @Injectable({
   providedIn: 'root',

diff --git a/src/app/services/Product-detail.service.ts b/src/app/services/Product-detail.service.ts