Martin Macola / autoservicio

Download as
Browse Code »

Commit 83893139b8ccd117a285a5162f7a2b46fd013bc1

Authored by Marcelo Puebla
1 parent b363e367e7
Exists in master

Cambio en variable apiurl.

Showing 22 changed files with 50 additions and 45 deletions   Show diff stats
... ... @@ -96,7 +96,11 @@
96 96 "./node_modules/bootstrap/dist/css/bootstrap.min.css",
97 97 "src/styles.scss"
98 98 ],
99   - "scripts": []
  99 + "scripts": [
  100 + "node_modules/jquery/dist/jquery.slim.min.js",
  101 + "node_modules/popper.js/dist/umd/popper.min.js",
  102 + "node_modules/bootstrap/dist/js/bootstrap.min.js"
  103 + ]
100 104 }
101 105 },
102 106 "lint": {
src/app/components/amb-imagenes/amb-imagenes.component.html
Diff comments   View file @ 8389313
... ... @@ -41,13 +41,13 @@
41 41 <img
42 42 *ngIf="articulo.imagenes.length == 0"
43 43 class="fade-in w-100 mx-auto img-fluid"
44   - src="{{apiUrl}}/imagenes/noImage.jpg">
  44 + src="{{apiImagenes}}/imagenes/noImage.jpg">
45 45 <carousel [interval]="false">
46 46 <slide *ngFor="let item of articulo.imagenes; let index = index">
47 47 <img
48 48 *ngIf="!item.fromGallery"
49 49 class="fade-in img-fluid w-100"
50   - src="{{apiUrl}}/imagenes/{{item.imagen}}">
  50 + src="{{apiImagenes}}/imagenes/{{item.imagen}}">
51 51 <img
52 52 *ngIf="item.fromGallery"
53 53 class="fade-in img-fluid w-100"
src/app/components/amb-imagenes/amb-imagenes.component.ts
Diff comments   View file @ 8389313
... ... @@ -12,7 +12,7 @@ import { HttpClient } from &#39;@angular/common/http&#39;;
12 12  
13 13 export class AmbImagenesComponent implements OnInit {
14 14  
15   - apiUrl = appSettings.apiUrl;
  15 + apiUrl = appSettings.apiImagenes;
16 16 articulos: Producto[] = [];
17 17 private auxProductos: Producto[] = [];
18 18 private searchTerm: string = '';
src/app/components/busqueda-productos/busqueda-productos.component.html
Diff comments   View file @ 8389313
... ... @@ -71,7 +71,7 @@
71 71 <div
72 72 class="card-effect bg-white rounded-sm shadow border-0"
73 73 (click)="elegirProducto(producto)">
74   - <img src="{{apiUrl}}/imagenes/{{producto.imagenes[0].imagen}}" class="rounded-sm w-100 m-auto">
  74 + <img src="{{apiImagenes}}/imagenes/{{producto.imagenes[0].imagen}}" class="rounded-sm w-100 m-auto">
75 75 <div class="p-2">
76 76 <p class="h6 min-h-40 text-left m-0"><small>{{producto.DET_LAR}}</small></p>
77 77 <div class="row m-0">
src/app/components/busqueda-productos/busqueda-productos.component.ts
Diff comments   View file @ 8389313
... ... @@ -18,7 +18,7 @@ export class BusquedaProductosComponent implements OnInit {
18 18 private categoriaActive: number = null;
19 19 private showSpinner: boolean = true;
20 20 private queMostrar: string = 'todo';
21   - private apiUrl: string = appSettings.apiUrl;
  21 + private apiImagenes: string = appSettings.apiImagenes;
22 22 private categorias: Categoria[] = [];
23 23 private blurFocus = new EventEmitter();
24 24  
src/app/components/cancelar-compra/cancelar-compra.component.html
Diff comments   View file @ 8389313
... ... @@ -6,7 +6,7 @@
6 6 <div class="row h-100">
7 7 <div class="col-12 my-auto">
8 8 <div class="card rounded">
9   - <img src="{{apiUrl}}/imagenes/atencion.svg" class="w-50 mx-auto mt-5 mb-4">
  9 + <img src="{{apiImagenes}}/imagenes/atencion.svg" class="w-50 mx-auto mt-5 mb-4">
10 10 <div class="mb-5 mt-4">
11 11 <p class="display-3 card-text text-center font-weight-bold">
12 12 Atención
src/app/components/cancelar-compra/cancelar-compra.component.ts
Diff comments   View file @ 8389313
... ... @@ -11,7 +11,7 @@ import { ProductoService } from &#39;src/app/services/producto.service&#39;;
11 11 })
12 12 export class CancelarCompraComponent implements OnInit, OnDestroy {
13 13  
14   - private apiUrl: string = appSettings.apiUrl;
  14 + private apiImagenes: string = appSettings.apiImagenes;
15 15 private timer: any;
16 16  
17 17 constructor(
src/app/components/confirmacion-carrito/confirmacion-carrito.component.html
Diff comments   View file @ 8389313
... ... @@ -38,7 +38,7 @@
38 38 <div class="col-4 p-2" *ngFor="let producto of productos">
39 39 <div class="bg-white rounded-sm shadow border-0">
40 40 <img
41   - src="{{apiUrl}}/imagenes/{{producto.imagenes[0].imagen}}"
  41 + src="{{apiImagenes}}/imagenes/{{producto.imagenes[0].imagen}}"
42 42 class="shadow rounded-sm w-100 m-auto">
43 43 <div class="p-2">
44 44 <p class="h6 min-h-55 text-left m-0">
src/app/components/confirmacion-carrito/confirmacion-carrito.component.ts
Diff comments   View file @ 8389313
... ... @@ -14,7 +14,7 @@ export class ConfirmacionCarritoComponent implements OnInit, OnDestroy {
14 14  
15 15 private productos: Producto[] = [];
16 16 private total: number = 0;
17   - private apiUrl: string = appSettings.apiUrl;
  17 + private apiImagenes: string = appSettings.apiImagenes;
18 18 private timerReposo: any;
19 19  
20 20 constructor(
src/app/components/header/header.component.html
Diff comments   View file @ 8389313
1 1 <div class="row m-0 bg-light p-4 justify-content-between">
2 2 <div class="col-6">
3   - <img class="w-25 float-left" src="{{apiUrl}}/imagenes/logoempresa.png">
  3 + <img class="w-25 float-left" src="{{apiImagenes}}/imagenes/logoempresa.png">
4 4 </div>
5 5 <div class="col-6">
6   - <img class="w-25 float-right" src="{{apiUrl}}/imagenes/logodebo.png">
  6 + <img class="w-25 float-right" src="{{apiImagenes}}/imagenes/logodebo.png">
7 7 </div>
8 8 </div>
src/app/components/header/header.component.ts
Diff comments   View file @ 8389313
... ... @@ -8,7 +8,7 @@ import { appSettings } from &#39;src/etc/AppSettings&#39;;
8 8 })
9 9 export class HeaderComponent implements OnInit {
10 10  
11   - private apiUrl : string = appSettings.apiUrl;
  11 + private apiImagenes : string = appSettings.apiImagenes;
12 12  
13 13 constructor() { }
14 14  
src/app/components/home/home.component.html
Diff comments   View file @ 8389313
1 1 <div class="container-fluid p-0">
2 2 <img
3   - src="{{apiUrl}}/imagenes/homeBackground.jpg"
  3 + src="{{apiImagenes}}/imagenes/homeBackground.jpg"
4 4 class="background-image vh-100 w-100">
5 5 <div class="row m-0">
6 6 <div class="col p-0">
... ... @@ -11,7 +11,7 @@
11 11 <!-- HEADER -->
12 12 <div class="row m-0 w-100 bg-primary-gradient-horizontal">
13 13 <div class="col-6 bg-white p-3 rounded-bottom-right">
14   - <img class="w-25 mx-auto d-block" src="{{apiUrl}}/imagenes/logoempresa.png">
  14 + <img class="w-25 mx-auto d-block" src="{{apiImagenes}}/imagenes/logoempresa.png">
15 15 </div>
16 16 </div>
17 17  
... ... @@ -22,17 +22,17 @@
22 22 <carousel [showIndicators]="false" [interval]="1500">
23 23 <slide class="h-100">
24 24 <img
25   - src="{{apiUrl}}/imagenes/coca1.jpg"
  25 + src="{{apiImagenes}}/imagenes/coca1.jpg"
26 26 class="fade-in d-block rounded-sm shadow mw-100 h-100 w-auto mx-auto">
27 27 </slide>
28 28 <slide class="h-100">
29 29 <img
30   - src="{{apiUrl}}/imagenes/coca2.jpg"
  30 + src="{{apiImagenes}}/imagenes/coca2.jpg"
31 31 class="fade-in d-block rounded-sm shadow mw-100 h-100 w-auto mx-auto">
32 32 </slide>
33 33 <slide class="h-100">
34 34 <img
35   - src="{{apiUrl}}/imagenes/coca3.jpg"
  35 + src="{{apiImagenes}}/imagenes/coca3.jpg"
36 36 class="fade-in d-block rounded-sm shadow mw-100 h-100 w-auto mx-auto">
37 37 </slide>
38 38 </carousel>
... ... @@ -47,7 +47,7 @@
47 47 <!-- FOOTER -->
48 48 <div class="row m-0 w-100 bg-gray">
49 49 <div class="col-6 bg-white offset-6 p-3 rounded-top-left">
50   - <img class="w-25 mx-auto d-block" src="{{apiUrl}}/imagenes/logodebo.png">
  50 + <img class="w-25 mx-auto d-block" src="{{apiImagenes}}/imagenes/logodebo.png">
51 51 </div>
52 52 </div>
53 53  
src/app/components/home/home.component.ts
Diff comments   View file @ 8389313
... ... @@ -9,7 +9,7 @@ import { appSettings } from &#39;src/etc/AppSettings&#39;;
9 9 })
10 10 export class HomeComponent implements OnInit {
11 11  
12   - private apiUrl: string = appSettings.apiUrl;
  12 + private apiImagenes: string = appSettings.apiImagenes;
13 13  
14 14 constructor() { }
15 15  
src/app/components/inicio/inicio.component.html
Diff comments   View file @ 8389313
... ... @@ -21,7 +21,7 @@
21 21 <p class="h3 card-title">Promociones</p>
22 22 </div>
23 23 <div class="col-auto p-0">
24   - <img src="{{apiUrl}}/imagenes/primario.promociones.png" class="icon-dim m-0">
  24 + <img src="{{apiImagenes}}/imagenes/primario.promociones.png" class="icon-dim m-0">
25 25 </div>
26 26 </div>
27 27 <p class="h5 card-text text-muted font-weight-light">Conozca las ofertas del momento.</p>
... ... @@ -30,22 +30,22 @@
30 30 <carousel [showIndicators]="false" [interval]="1500">
31 31 <slide class="h-100">
32 32 <img
33   - src="{{apiUrl}}/imagenes/beldent.jpg"
  33 + src="{{apiImagenes}}/imagenes/beldent.jpg"
34 34 class="fade-in d-block w-75 m-auto rounded">
35 35 </slide>
36 36 <slide class="h-100">
37 37 <img
38   - src="{{apiUrl}}/imagenes/cafe con leche y medialunas.jpg"
  38 + src="{{apiImagenes}}/imagenes/cafe con leche y medialunas.jpg"
39 39 class="fade-in d-block w-75 m-auto rounded">
40 40 </slide>
41 41 <slide class="h-100">
42 42 <img
43   - src="{{apiUrl}}/imagenes/Surtido bagley.jpg"
  43 + src="{{apiImagenes}}/imagenes/Surtido bagley.jpg"
44 44 class="fade-in d-block w-75 m-auto rounded">
45 45 </slide>
46 46 <slide class="h-100">
47 47 <img
48   - src="{{apiUrl}}/imagenes/yogurisimo.jpg"
  48 + src="{{apiImagenes}}/imagenes/yogurisimo.jpg"
49 49 class="fade-in d-block w-75 m-auto rounded">
50 50 </slide>
51 51 </carousel>
... ... @@ -60,14 +60,14 @@
60 60 <p class="h3 card-title">Ordenar Pedido</p>
61 61 </div>
62 62 <div class="col-auto p-0">
63   - <img src="{{apiUrl}}/imagenes/primario.ordenar.png" class="icon-dim">
  63 + <img src="{{apiImagenes}}/imagenes/primario.ordenar.png" class="icon-dim">
64 64 </div>
65 65 </div>
66 66 <p class="h5 card-text text-muted font-weight-light">Arme su pedido y solo pase a retirar.</p>
67 67 </div>
68 68 <img
69 69 class="card-img-bottom d-block w-100 mx-auto rounded"
70   - src="{{apiUrl}}/imagenes/cafe.jpg">
  70 + src="{{apiImagenes}}/imagenes/cafe.jpg">
71 71 </div>
72 72 </div>
73 73  
... ... @@ -103,7 +103,7 @@
103 103 <p class="h3 card-title">Cargar Productos</p>
104 104 </div>
105 105 <div class="col-auto p-0">
106   - <img src="{{apiUrl}}/imagenes/escanear.png" class="icon-dim mb-2">
  106 + <img src="{{apiImagenes}}/imagenes/escanear.png" class="icon-dim mb-2">
107 107 </div>
108 108 </div>
109 109 <p class="h5 card-text text-muted font-weight-light">
... ... @@ -117,13 +117,13 @@
117 117 <img
118 118 *ngIf="!productoAcargar"
119 119 class="card-img-top d-block w-100 mx-auto rounded-sm"
120   - src="{{apiUrl}}/imagenes/escanner.jpg">
  120 + src="{{apiImagenes}}/imagenes/escanner.jpg">
121 121  
122 122 <!-- PRODUCTO A CARGAR -->
123 123 <div class="fade-in m-0" *ngIf="productoAcargar && !promoAcargar">
124 124 <img
125 125 class="card-img-top d-block w-75 mx-auto rounded-sm"
126   - src="{{apiUrl}}/imagenes/{{productoAcargar.imagenes[0].imagen}}">
  126 + src="{{apiImagenes}}/imagenes/{{productoAcargar.imagenes[0].imagen}}">
127 127  
128 128 <div class="row justify-content-between m-3">
129 129 <div class="col-12 text-left px-1">
... ... @@ -139,7 +139,7 @@
139 139 <div class="fade-in m-0" *ngIf="promoAcargar">
140 140 <img
141 141 class="card-img-top d-block w-100 mx-auto rounded-sm"
142   - src="{{apiUrl}}/imagenes/{{promoAcargar.imagenes[0].imagen}}">
  142 + src="{{apiImagenes}}/imagenes/{{promoAcargar.imagenes[0].imagen}}">
143 143  
144 144 <div class="row justify-content-between m-3">
145 145 <div class="col-12 text-left px-1">
... ... @@ -195,7 +195,7 @@
195 195 que no tienen código.</p>
196 196 </div>
197 197 <div class="col-auto p-0">
198   - <img src="{{apiUrl}}/imagenes/primario.buscar.png" class="icon-dim mb-2">
  198 + <img src="{{apiImagenes}}/imagenes/primario.buscar.png" class="icon-dim mb-2">
199 199 </div>
200 200 </div>
201 201  
src/app/components/inicio/inicio.component.ts
Diff comments   View file @ 8389313
... ... @@ -21,7 +21,7 @@ export class InicioComponent implements OnInit, AfterViewInit {
21 21 private productos: Producto[] = [];
22 22 private promociones: Producto[] = [];
23 23 private sinonimos: Sinonimo[] = [];
24   - private apiUrl: string = appSettings.apiUrl;
  24 + private apiImagenes: string = appSettings.apiImagenes;
25 25  
26 26 @ViewChild('pop', { static: false }) popoverDirective: PopoverDirective;
27 27  
src/app/components/mensaje-final/mensaje-final.component.html
Diff comments   View file @ 8389313
1 1 <div class="container-fluid fade-in p-0 disable-user-select">
2   - <img src="{{apiUrl}}/imagenes/homeBackground.jpg" class="background-image vh-100 w-100">
  2 + <img src="{{apiImagenes}}/imagenes/homeBackground.jpg" class="background-image vh-100 w-100">
3 3 <div class="row m-0">
4 4 <div class="col p-0">
5 5 <div class="vh-100 fade-in d-flex align-content-between flex-wrap disable-user-select">
... ... @@ -7,7 +7,7 @@
7 7 <!-- HEADER -->
8 8 <div class="row m-0 w-100 bg-primary-gradient-horizontal">
9 9 <div class="col-6 bg-white p-3 rounded-bottom-right">
10   - <img class="w-25 mx-auto d-block" src="{{apiUrl}}/imagenes/logoempresa.png">
  10 + <img class="w-25 mx-auto d-block" src="{{apiImagenes}}/imagenes/logoempresa.png">
11 11 </div>
12 12 </div>
13 13  
... ... @@ -33,7 +33,7 @@
33 33 <!-- FOOTER -->
34 34 <div class="row m-0 w-100 bg-gray">
35 35 <div class="col-6 bg-white offset-6 p-3 rounded-top-left">
36   - <img class="w-25 mx-auto d-block" src="{{apiUrl}}/imagenes/logodebo.png">
  36 + <img class="w-25 mx-auto d-block" src="{{apiImagenes}}/imagenes/logodebo.png">
37 37 </div>
38 38 </div>
39 39  
src/app/components/mensaje-final/mensaje-final.component.ts
Diff comments   View file @ 8389313
... ... @@ -10,7 +10,7 @@ import { Router } from &#39;@angular/router&#39;;
10 10 })
11 11 export class MensajeFinalComponent implements OnInit {
12 12  
13   - private apiUrl: string = appSettings.apiUrl;
  13 + private apiImagenes: string = appSettings.apiImagenes;
14 14 private timer: any;
15 15  
16 16 constructor(
src/app/components/pago/pago.component.html
Diff comments   View file @ 8389313
... ... @@ -31,7 +31,7 @@
31 31 <div
32 32 class="bg-white rounded-sm shadow border-0"
33 33 (click)="pagoEfectivo()">
34   - <img src="{{apiUrl}}/imagenes/efectivo.png" class="rounded-sm w-75 py-2 mx-auto d-block">
  34 + <img src="{{apiImagenes}}/imagenes/efectivo.png" class="rounded-sm w-75 py-2 mx-auto d-block">
35 35 <div class="p-2 card-text text-center">
36 36 <p class="h6 text-center m-0">Efectivo</p>
37 37 </div>
... ... @@ -39,7 +39,7 @@
39 39 </div>
40 40 <div class="col-4 p-2">
41 41 <div class="bg-white rounded-sm shadow border-0">
42   - <img src="{{apiUrl}}/imagenes/tarjeta.png" class="rounded-sm w-75 py-2 mx-auto d-block">
  42 + <img src="{{apiImagenes}}/imagenes/tarjeta.png" class="rounded-sm w-75 py-2 mx-auto d-block">
43 43 <div class="p-2 card-text text-center">
44 44 <p class="h6 text-center m-0">Tarjeta</p>
45 45 </div>
... ... @@ -49,7 +49,7 @@
49 49 <div
50 50 class="bg-white rounded-sm shadow border-0"
51 51 (click)="pagar()">
52   - <img src="{{apiUrl}}/imagenes/qr.png" class="rounded-sm w-75 py-2 mx-auto d-block">
  52 + <img src="{{apiImagenes}}/imagenes/qr.png" class="rounded-sm w-75 py-2 mx-auto d-block">
53 53 <div class="p-2 card-text text-center">
54 54 <p class="h6 text-center m-0">Pago Electrónico</p>
55 55 </div>
... ... @@ -106,7 +106,7 @@
106 106  
107 107 <div *ngIf="verQR" class="row fade-in mt-5">
108 108 <div class="col-6 offset-3 border-0 mb-auto">
109   - <img src="{{apiUrl}}/imagenes/qrmp.jpg" class="w-50 mx-auto d-block shadow rounded-sm">
  109 + <img src="{{apiImagenes}}/imagenes/qrmp.jpg" class="w-50 mx-auto d-block shadow rounded-sm">
110 110 </div>
111 111 </div>
112 112  
src/app/components/pago/pago.component.ts
Diff comments   View file @ 8389313
... ... @@ -12,7 +12,7 @@ import { Producto } from &#39;src/app/wrappers/producto&#39;;
12 12 })
13 13 export class PagoComponent implements OnInit, OnDestroy {
14 14  
15   - private apiUrl: string = appSettings.apiUrl;
  15 + private apiImagenes: string = appSettings.apiImagenes;
16 16 private verQR: boolean = false;
17 17 private productos: Producto[] = [];
18 18 private total: number = 0;
src/app/components/sidebar/sidebar.component.html
Diff comments   View file @ 8389313
... ... @@ -11,7 +11,7 @@
11 11 <div
12 12 class="slide-in-bl my-2 bg-white border-0 rounded-sm"
13 13 *ngFor="let producto of productosCarrito.slice().reverse(); let i = index">
14   - <img class="w-100 m-auto rounded-sm shadow" src="{{apiUrl}}/imagenes/{{producto.imagenes[0].imagen}}">
  14 + <img class="w-100 m-auto rounded-sm shadow" src="{{apiImagenes}}/imagenes/{{producto.imagenes[0].imagen}}">
15 15 <div class="row m-0 p-0 px-1 py-1 shadow rounded-sm">
16 16 <div class="col-12 p-0 pt-2 text-left my-auto">
17 17 <p class="m-0 h6"><small>{{producto.DetArt}}</small></p>
src/app/components/sidebar/sidebar.component.ts
Diff comments   View file @ 8389313
... ... @@ -15,7 +15,7 @@ export class SidebarComponent implements OnInit {
15 15 private cantMin: number = 1;
16 16 private cantMax: number = 50;
17 17 private total: number = 0;
18   - private apiUrl: string = appSettings.apiUrl;
  18 + private apiImagenes: string = appSettings.apiImagenes;
19 19  
20 20 public productosCarrito: Producto[] = [];
21 21  
src/etc/AppSettings ejemplo.ts
Diff comments   View file @ 8389313
1 1 export const appSettings = {
2   - // apiUrl: 'http://10.231.45.117:4705/autoservicio'
  2 + // apiUrl: 'http://10.231.45.117:4705/autoservicio',
  3 + // apiImagenes: 'http://10.231.45.117:4513/'
3 4 };