Fixed response menu dashboard, many getUserDetails requests, charts

firebase.json

@@ -1,6 +1,10 @@
 {
   "hosting": {
-    "public": "./dist/e-commerce",
+    "public": "dist/e-commerce",
+    "rewrites": [ {
+      "source": "**",
+      "destination": "/index.html"
+    } ],
     "ignore": [
       "firebase.json",
       "**/.*",

src/app/components/dashboard/dashboard-body/dashboard-analytics/dashboard-analytics.component.ts

@@ -33,7 +33,6 @@ export class DashboardAnalyticsComponent implements OnInit, OnDestroy, AfterView
 
   // * CONSTRUCTOR
   constructor(
-    private LoginService: LoginService,
     private ChartService: ChartService
   ) {
     this.ChartService.getDataCharts().subscribe(
@@ -116,10 +115,8 @@ export class DashboardAnalyticsComponent implements OnInit, OnDestroy, AfterView
     this.ChartService.chartArea = this.constructorChart('chartArea', optionsChartArea);
 
     // ! Creo el siguiente chart
-    setTimeout(() => {
-      this.generatePieChart(data);
-    }, 500);
-
+
+    this.generatePieChart(data);
   }
 
   /**
@@ -150,10 +147,8 @@ export class DashboardAnalyticsComponent implements OnInit, OnDestroy, AfterView
     this.ChartService.chartPie = new ApexCharts(document.getElementById('pieChart'), options);
     this.ChartService.chartPie.render();
 
-    setTimeout(() => {
-      this.createChartDonut(data);
-    }, 700);
 
+    this.createChartDonut(data);
   }
 
   /**
@@ -182,10 +177,7 @@ export class DashboardAnalyticsComponent implements OnInit, OnDestroy, AfterView
 
     this.ChartService.chartDonut = this.constructorChart('chartDonut', options);
 
-    setTimeout(() => {
       this.createChartRadar(data);
-    }, 800);
-
   }
 
   createChartRadar(data: any) {
@@ -213,10 +205,8 @@ export class DashboardAnalyticsComponent implements OnInit, OnDestroy, AfterView
 
     this.ChartService.chartRadar = this.constructorChart('chartRadar', options);
 
-    setTimeout(() => {
-      this.createChartLine(data);
-    }, 900);
 
+    this.createChartLine(data);
   }
 
   /**

src/app/components/dashboard/dashboard-body/dashboard-list-users/dashboard-list-users.component.ts

@@ -34,8 +34,7 @@ export class DashboardListUsersComponent implements OnInit {
 
   // * CONSTRUCTOR
   constructor(
-    private AuthService: AuthService,
-    private LoginService: LoginService
+    private AuthService: AuthService
   ) {
     // this.LoginService.checkTokenExpiration();
     this.AuthService.svListUsers().subscribe(

src/app/components/dashboard/dashboard-body/dashboard-orders/dashboard-orders.component.ts

@@ -39,15 +39,8 @@ export class DashboardOrdersComponent {
 
   // * CONSTRUCTOR
   constructor(
-    private LoginService: LoginService,
-    private FacturacionService: FacturacionService,
-    private ToastService: ToastService
+    private FacturacionService: FacturacionService
   ) {
-    // this.LoginService.checkTokenExpiration(); // ? Check Token Login     
-    // this.FacturacionService.svListFacturas().subscribe( data => {
-    //   this.listFacturas = data;
-    // })
-
     this.action = Crud;
     this.loadListFacturas();
   }

src/app/components/dashboard/dashboard-body/dashboard-products/dashboard-products.component.ts

@@ -37,8 +37,7 @@ export class DashboardProductsComponent implements OnInit {
 
   // * CONSTRUCTOR
   constructor(
-    private ProductService: ProductService,
-    private LoginService: LoginService
+    private ProductService: ProductService
   ) {
     this.action = Crud;
   }

src/app/components/dashboard/dashboard-body/dashboard-products/form-product/form-product.component.ts

@@ -86,8 +86,7 @@ export class FormProductComponent implements OnInit {
     private FormBuilder: FormBuilder,
     private ProductService: ProductService,
     private storage: Storage,
-    private ToastService: ToastService,
-    private datePipe: DatePipe
+    private ToastService: ToastService
   ) { }
 
   ngOnInit(): void {

src/app/components/dashboard/dashboard-body/dashboard-profile/dashboard-profile.component.ts

@@ -23,9 +23,9 @@ export class DashboardProfileComponent implements OnInit, AfterViewInit {
     public UrlService: UrlService
   ) {
     // this.LoginService.checkTokenExpiration();
-    if (!this.AuthService.userData) {      
-      this.refreshData(true);
-    } 
+    // if (!this.AuthService.userData) {      
+    //   this.refreshData(true);
+    // } 
   }
 
   ngAfterViewInit(): void {}
@@ -47,6 +47,7 @@ export class DashboardProfileComponent implements OnInit, AfterViewInit {
    * @param $event 
    */
   refreshData($event: any){    
-    this.AuthService.svDetailsUser(localStorage.getItem('userLogin') as string).subscribe();
+    // this.AuthService.svDetailsUser(localStorage.getItem('userLogin') as string).subscribe();
+    // this.AuthService.svDetailsUserID(localStorage.getItem('idUser') as any);
   }
 }

src/app/components/dashboard/dashboard-body/dashboard-shopping-cart/dashboard-shopping-cart.component.ts

@@ -13,7 +13,6 @@ export class DashboardShoppingCartComponent {
 
   // * CONSTRUCTOR
   constructor(
-    private LoginService: LoginService,
     private CartService: CartService
   ) {
     // this.LoginService.checkTokenExpiration();

src/app/components/dashboard/dashboard-body/dashboard-shopping-cart/payment-form/payment-form.component.ts

@@ -96,9 +96,9 @@ export class PaymentFormComponent implements OnInit {
     private Router: Router,
     public UrlService: UrlService
   ) {
-    if (this.AuthService.userData == null || this.AuthService.userData == undefined) {
-      this.AuthService.svGetUserData();
-    }
+    // if (this.AuthService.userData == null || this.AuthService.userData == undefined) {
+    //   this.AuthService.svGetUserData();
+    // }
 
     this.DeliveryService.svGetListDelivery().subscribe(
       rp => {
@@ -153,6 +153,8 @@ export class PaymentFormComponent implements OnInit {
         date: ""
       } as any;
 
+
+
       this.ToastService.showOverlay = true;
 
       this.FacturacionService.svAltaFacturacion(facturacionRequest, products).subscribe(

src/app/components/dashboard/dashboard-body/dashboard-shopping-history/dashboard-shopping-history.component.ts

@@ -41,13 +41,10 @@ export class DashboardShoppingHistoryComponent {
 
   // * CONSTRUCTOR
   constructor(
-    private LoginService: LoginService,
     private FacturacionService: FacturacionService,
     private AuthService: AuthService
   ) {
     this.loadListFacturas();
-    console.log("Llamo a cargar Lista");
-
     this.action = Crud;
   }
 
@@ -72,25 +69,14 @@ export class DashboardShoppingHistoryComponent {
   }
 
   loadListFacturas() {
-    console.log("Entro a cargar lista");
-    console.log(this.AuthService.userData);
-
-    // this.AuthService.svDetailsUser(localStorage.getItem('userLogin') as string).subscribe(
-    //   (user) => {
-    //     console.log(user);
-
-        this.FacturacionService.svListFacturasUser(this.AuthService.svIdUserLogin).subscribe(data => {
-          this.listFacturas = data;
-          console.log(data);
-
-          if (data.length != 0) {
-            this.tieneFacturas = true;
-          }else{
-            this.tieneFacturas = false;
-          }
-        });
-    //   }
-    // );
+    this.FacturacionService.svListFacturasUser(this.AuthService.svIdUserLogin).subscribe(data => {
+      this.listFacturas = data;
+      if (data.length != 0) {
+        this.tieneFacturas = true;
+      } else {
+        this.tieneFacturas = false;
+      }
+    });
   }
 
   /**

src/app/components/dashboard/dashboard-body/dashboard-store/dashboard-store.component.ts

@@ -10,9 +10,7 @@ export class DashboardStoreComponent {
 
   // * CONSTRUCTOR
   constructor(
-    private LoginService: LoginService
   ) {
-    // this.LoginService.checkTokenExpiration();
   }
 
 }

src/app/components/dashboard/dashboard-menu/dashboard-menu.component.html

@@ -1,7 +1,7 @@
-<div class="block lg:block bg-menu text-white flex flex-col pt-5 w-full h-full pl-10 lg:pl-5 flex-grow overflow-y-auto">
+<div class="block lg:block bg-menu text-white flex flex-col pt-2 w-full h-full pl-10 lg:pl-5 flex-grow overflow-y-auto">
 
    <div class="w-full flex justify-center">
-    <div class="mb-4 flex flex-col justify-center items-center w-56 h-52 lg:w-36 lg:h-36 xl:w-52 xl:h-52" (click)="navClose()" [routerLink]="'/dashboard/profile'">
+    <div class="mb-2 flex flex-col justify-center items-center w-56 h-52 lg:w-36 lg:h-36 xl:w-52 xl:h-52" (click)="navClose()" [routerLink]="'/dashboard/profile'">
         <img [src]="this.AuthService.userData?.img ? this.AuthService.userData?.img : UrlService.url?.profileDefault "
         alt="Imagen de perfil"
         class="w-40 h-40 lg:pr-0 lg:w-36 lg:h-36 xl:w-44 xl:h-44 object-cover rounded-full transition-transform transform-gpu hover:scale-105 cursor-pointer"

src/app/components/login/login.component.ts

@@ -60,15 +60,15 @@ export class LoginComponent implements OnInit {
       this.LoginService.svLogin(this.formLogin.value as LoginRequest).subscribe({
         next: (userData) => {
           //Trae el Token
-          // console.log("Logeado: ",userData);  
-          this.AuthService.svDetailsUser(this.formLogin.get('username')?.value).subscribe();
+          // console.log("Logeado: ",userData);           
         },
         error: (errorData) => {
           // console.error(errorData);
           this.loginError = errorData;
           this.ToastService.showOverlay = false;
         },
         complete: () => {
+          this.AuthService.svDetailsUser(this.formLogin.get('username')?.value).subscribe();
           setTimeout(() => {
             this.formLogin.reset();
             this.Router.navigateByUrl('/dashboard/profile');

src/app/components/store/item/item.component.ts

@@ -31,7 +31,6 @@ export class ItemComponent implements OnInit, OnDestroy {
   constructor(
     private route: ActivatedRoute,
     private productServ: ProductService,
-    private authServ: AuthService,
     private cartServ: CartService,
     private Location: Location,
     private Router: Router

src/app/services/auth.service.ts

@@ -25,7 +25,7 @@ export class AuthService {
   ) {
 
     let id = localStorage.getItem('idUser');
-    id ? this.svIdUserLogin = Number.parseInt(id) : 0;
+    id ? this.svIdUserLogin = Number.parseInt(id) : 0;    
   }
 
   // * GETTERs