Martin Macola / autoservicio

Download as
Browse Code »

Commit d494d55e1acf96a213db99078565b15acc6e1674

Authored by Eric Fernandez
2 parents 6c93d2c3ed 917568becd
Exists in master

Merge branch 'master' into 'master' 

Master(mpuebla)

See merge request !46
Showing 7 changed files   Show diff stats
src/app/components/confirmacion-carrito/confirmacion-carrito.component.html
Diff comments   View file @ d494d55
... ... @@ -73,7 +73,7 @@
73 73 </p>
74 74 </div>
75 75 </div>
76   - <div class="row vh-50 overflow-scroll m-0">
  76 + <div class="row vh-50 px-2 overflow-scroll m-0">
77 77 <div class="col-12 p-0 mb-2" *ngFor="let producto of productos">
78 78 <p class="h6 m-0 card-text text-left">
79 79 <small>{{producto.DetArt}}</small>
src/app/components/header/header.component.html
Diff comments   View file @ d494d55
1 1 <div class="row m-0 bg-light p-4 justify-content-between">
2   - <div class="col-auto">
3   - <img src="{{apiUrl}}/imagenes/logoaxion.png">
  2 + <div class="col-6">
  3 + <img class="w-25 float-left" src="{{apiUrl}}/imagenes/logoempresa.png">
4 4 </div>
5   - <div class="col-auto">
6   - <img src="{{apiUrl}}/imagenes/logodebo.png">
  5 + <div class="col-6">
  6 + <img class="w-25 float-right" src="{{apiUrl}}/imagenes/logodebo.png">
7 7 </div>
8 8 </div>
src/app/components/home/home.component.html
Diff comments   View file @ d494d55
1 1 <div class="container-fluid p-0">
2   - <img src="{{apiUrl}}/imagenes/homeBackground.jpg" class="background-image vh-100 w-100">
  2 + <img
  3 + src="{{apiUrl}}/imagenes/homeBackground.jpg"
  4 + class="background-image vh-100 w-100">
3 5 <div class="row m-0">
4 6 <div class="col p-0">
5 7 <div
... ... @@ -9,14 +11,34 @@
9 11 <!-- HEADER -->
10 12 <div class="row m-0 w-100 bg-primary-gradient-horizontal">
11 13 <div class="col-6 bg-white p-3 rounded-bottom-right">
12   - <img class="w-25 mx-auto d-block" src="{{apiUrl}}/imagenes/logoaxion.png">
  14 + <img class="w-25 mx-auto d-block" src="{{apiUrl}}/imagenes/logoempresa.png">
13 15 </div>
14 16 </div>
15 17  
16 18 <!-- INFO DE BIENVENIDA -->
17 19 <div class="row w-100">
18 20 <div class="col-4 offset-2">
19   - <img src="{{apiUrl}}/imagenes/accesoPLAYA.png" class="w-100">
  21 +
  22 + <div id="carouselExampleSlidesOnly" class="carousel slide" data-ride="carousel">
  23 + <div class="carousel-inner">
  24 + <div class="carousel-item active">
  25 + <img
  26 + src="{{apiUrl}}/imagenes/coca1.jpg"
  27 + class="d-block rounded-sm shadow w-100">
  28 + </div>
  29 + <div class="carousel-item">
  30 + <img
  31 + src="{{apiUrl}}/imagenes/coca2.jpg"
  32 + class="d-block rounded-sm shadow w-100">
  33 + </div>
  34 + <div class="carousel-item">
  35 + <img
  36 + src="{{apiUrl}}/imagenes/coca3.jpg"
  37 + class="d-block rounded-sm shadow w-100">
  38 + </div>
  39 + </div>
  40 + </div>
  41 +
20 42 </div>
21 43 <div class="col-6 text-center text-white my-auto">
22 44 <p class="display-2 font-weight-bold mb-5">¡BIENVENIDO!</p>
src/app/components/mensaje-final/mensaje-final.component.html
Diff comments   View file @ d494d55
... ... @@ -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/logoaxion.png">
  10 + <img class="w-25 mx-auto d-block" src="{{apiUrl}}/imagenes/logoempresa.png">
11 11 </div>
12 12 </div>
13 13  
src/app/components/mensaje-final/mensaje-final.component.ts
Diff comments   View file @ d494d55
... ... @@ -23,7 +23,7 @@ export class MensajeFinalComponent implements OnInit {
23 23 this.timer = setTimeout(() => {
24 24  
25 25 this.limpiarCarritoYvolver();
26   - }, 30000)
  26 + }, 3000)
27 27 }
28 28  
29 29 ngOnDestroy() {
src/app/components/pago/pago.component.html
Diff comments   View file @ d494d55
... ... @@ -72,7 +72,7 @@
72 72 </p>
73 73 </div>
74 74 </div>
75   - <div class="row vh-50 overflow-scroll m-0">
  75 + <div class="row px-2 vh-50 overflow-scroll m-0">
76 76 <div class="col-12 p-0 mb-2" *ngFor="let producto of productos">
77 77 <p class="h6 m-0 card-text text-left">
78 78 <small>{{producto.DetArt}}</small>
src/app/components/pago/pago.component.ts
Diff comments   View file @ d494d55
... ... @@ -28,7 +28,6 @@ export class PagoComponent implements OnInit {
28 28  
29 29 ngOnInit() {
30 30 this.productos = this.productoService.productos;
31   - this.router.navigate(['mensaje-final']);
32 31 }
33 32  
34 33 pagar() {