Marcelo Puebla / autoservicio-axion

Download as
Browse Code ยป

Commit 40fe9d20967c9df142dacf5dcb50b0e71d74d716

Authored by Marcelo Puebla
2 parents 147facd3ee a30a8f1dda
Exists in develop

Merge branch 'master' into 'develop' 

Master(benjamin)

See merge request !90
Showing 4 changed files   Show diff stats
src/app/modules/seleccion-articulos/filtro-categorias/filtro-categorias.component.html
Diff comments   View file @ 40fe9d2
... ... @@ -27,7 +27,7 @@
27 27 ondragstart="return false;"
28 28 (contextmenu)="false"
29 29 class="col-12 img-fluid align-self-end d-none
30   - d-sm-block rounded-circle w-100 h-auto"
  30 + d-sm-block rounded-circle h-50"
31 31 src="assets/img/logo-spot.svg">
32 32 <small class="col-12 px-0 my-1 h-100 h-md-25 align-self-end text-center text-truncate">Todos</small>
33 33 </div>
src/app/modules/seleccion-articulos/seleccion-articulos.component.html
Diff comments   View file @ 40fe9d2
... ... @@ -28,6 +28,14 @@
28 28 <div
29 29 class="col-7 col-sm-9 col-xl-10 pb-3 h-100 align-self-center scroll-y-visible"
30 30 (scroll)="scrollEvent($event)">
  31 + <!-- SPINNER -->
  32 + <div
  33 + class="d-flex justify-content-center"
  34 + *ngIf="loading">
  35 + <div class="spinner-border text-primary mt-5" role="status">
  36 + <span class="sr-only">Loading...</span>
  37 + </div>
  38 + </div>
31 39 <div class="row row-cols-1 row-cols-sm-3 row-cols-xl-6">
32 40 <!-- ARTICULO -->
33 41 <div
src/app/modules/seleccion-articulos/seleccion-articulos.component.scss
Diff comments   View file @ 40fe9d2
... ... @@ -11,3 +11,8 @@
11 11 .d-contents {
12 12 display: contents !important;
13 13 }
  14 +
  15 +.spinner-border {
  16 + width: 10rem;
  17 + height: 10rem;
  18 +}
src/app/modules/seleccion-articulos/seleccion-articulos.component.ts
Diff comments   View file @ 40fe9d2
... ... @@ -20,7 +20,7 @@ import { ANIMATIONS } from &#39;src/app/utils/animations&#39;;
20 20 animations: [ANIMATIONS.EnterLeaveY]
21 21 })
22 22 export class SeleccionArticulosComponent implements OnInit, AfterViewInit, OnDestroy {
23   - showSpinner = true;
  23 + loading = true;
24 24 timeoutHandler: any;
25 25 urlImagenes = `${APP_SETTINGS.apiImagenes}/imagenes/`;
26 26 articulos: IArticulo[] = [];
... ... @@ -67,7 +67,6 @@ export class SeleccionArticulosComponent implements OnInit, AfterViewInit, OnDes
67 67 localStorage.setItem('articulos', JSON.stringify(result));
68 68 this.setProductos();
69 69 }, (error) => {
70   - this.showSpinner = false;
71 70 console.error(error);
72 71 });
73 72 }
... ... @@ -75,6 +74,7 @@ export class SeleccionArticulosComponent implements OnInit, AfterViewInit, OnDes
75 74 setProductos() {
76 75 this.articulos = JSON.parse(localStorage.getItem('articulos'));
77 76 this.filterItems();
  77 + this.loading = false;
78 78 }
79 79  
80 80 filterItems() {