Luis Suarez / autoservicio-axion

Download as
Browse Code »

Commit 8d599c3d3e110f69c7eacb00ac927f632e9e3423

Authored by Luis Suarez
1 parent 27f29326c7
Exists in 20200117-axion-responsive

correcciones merge request

Showing 21 changed files with 84 additions and 83 deletions   Show diff stats
src/app/modules/cancelar-compra/cancelar-compra.component.scss
Diff comments   View file @ 8d599c3
... ... @@ -2,19 +2,19 @@
2 2 background-color: rgb(212, 212, 212);
3 3 }
4 4  
5   -#cancelCard.lash{
  5 +#cancelCard.media-pantalla{
6 6 height: 45% !important;
7 7 margin-top: 1rem !important;
8 8 }
9 9  
10   -#cancelCard.lash h4{
  10 +#cancelCard.media-pantalla h4{
11 11 margin-top: 1rem !important;
12 12 }
13 13  
14   -#cancelImg.lash{
  14 +#cancelImg.media-pantalla{
15 15 height: 20% !important;
16 16 }
17 17  
18   -#cancelImg.lash img{
  18 +#cancelImg.media-pantalla img{
19 19 max-width: 15% !important;
20   -}
21 20 \ No newline at end of file
  21 +}
src/app/modules/cancelar-compra/cancelar-compra.component.ts
Diff comments   View file @ 8d599c3
... ... @@ -14,14 +14,13 @@ export class CancelarCompraComponent implements OnInit {
14 14 private location: Location,
15 15 private router: Router,
16 16 private articuloService: ArticuloService
17   - ) { }
  17 + ) {}
18 18  
19 19 ngOnInit() {
20 20 setTimeout(() => {
21 21 this.limpiarCarritoYvolver();
22 22 }, 90000);
23 23 this.mediaPantalla();
24   -
25 24 }
26 25  
27 26 volverPreviousPage() {
... ... @@ -33,9 +32,9 @@ export class CancelarCompraComponent implements OnInit {
33 32 this.router.navigate(['/']);
34 33 }
35 34  
36   - mediaPantalla(){
37   - if ($("body").hasClass("lash")) {
38   - $("#cancelImg,#cancelCard").addClass("lash");
  35 + mediaPantalla() {
  36 + if ($('body').hasClass('media-pantalla')) {
  37 + $('#cancelImg,#cancelCard').addClass('media-pantalla');
39 38 }
40 39 }
41 40 -}
  41 +}
42 42 \ No newline at end of file
src/app/modules/carrito/carrito.component.html
Diff comments   View file @ 8d599c3
... ... @@ -13,14 +13,16 @@
13 13 </div>
14 14  
15 15 <!-- CARRITO -->
16   - <div class="row mx-2 mt-4 h-80 justify-content-center align-content-start scroll-y-visible" id="carrito">
  16 + <div class="row mx-2 mt-4 h-80 justify-content-center align-content-start scroll-y-visible"
  17 + id="carrito">
17 18 <!-- MENSAJE DE ADVERTENCIA -->
18 19 <div class="col-10 align-self-center alert alert-primary" *ngIf="!articuloService.carrito.length">
19 20 <p class="h5 text-center">No hay artículos en el carrito</p>
20 21 </div>
21 22 <!-- ARTICULOS -->
22 23 <div
23   - class="col-12 col-xl-6 p-2 h-25 text-center text-truncate" [ngClass]="{'lash':flagPantalla == true}" id="art-carrito"
  24 + class="col-12 col-xl-6 p-2 h-25 text-center text-truncate"
  25 + [ngClass]="{'media-pantalla':flagPantalla == true}" id="art-carrito"
24 26 *ngFor="let articulo of articuloService.carrito; let i = index;"
25 27 @EnterLeave>
26 28 <!-- ARTICULO -->
src/app/modules/carrito/carrito.component.scss
Diff comments   View file @ 8d599c3
... ... @@ -3,10 +3,10 @@
3 3 border-radius: 1.5rem;
4 4 }
5 5  
6   - #art-carrito.lash{
  6 + #art-carrito.media-pantalla{
7 7 min-height: 130px !important;
8 8 }
9 9  
10   -#carrito.lash{
  10 +#carrito.media-pantalla{
11 11 max-height: 60% !important;
12   -}
13 12 \ No newline at end of file
  13 +}
src/app/modules/carrito/carrito.component.ts
Diff comments   View file @ 8d599c3
... ... @@ -26,7 +26,7 @@ import { Router } from &#39;@angular/router&#39;;
26 26 export class CarritoComponent implements OnInit {
27 27 urlImagenes = `${APP_SETTINGS.apiDeboSuite}/imagenes/`;
28 28 maxCantidad = 50;
29   - flagPantalla:boolean = false;
  29 + flagPantalla = false;
30 30 constructor(
31 31 public articuloService: ArticuloService,
32 32 private location: Location,
... ... @@ -38,7 +38,7 @@ export class CarritoComponent implements OnInit {
38 38 this.router.navigate(['']);
39 39 return;
40 40 }
41   - this.mediaPantalla()
  41 + this.mediaPantalla();
42 42 }
43 43  
44 44 deleteArticulo(index: number) {
... ... @@ -61,9 +61,9 @@ export class CarritoComponent implements OnInit {
61 61 goBack() {
62 62 this.location.back();
63 63 }
64   - mediaPantalla(){
65   - if ($("body").hasClass("lash")) {
66   - $("#carrito").addClass("lash");
  64 + mediaPantalla() {
  65 + if ($('body').hasClass('media-pantalla')) {
  66 + $('#carrito').addClass('media-pantalla');
67 67 this.flagPantalla = true;
68 68 }
69 69 }
src/app/modules/forma-pago/forma-pago.component.scss
Diff comments   View file @ 8d599c3
1   -#card1.lash{
  1 + #card1.media-pantalla{
2 2 position: absolute;
3 3 bottom: 150px;
4 4 -webkit-box-flex: 0;
... ... @@ -8,7 +8,7 @@
8 8 margin-left: 0 !important;
9 9 }
10 10  
11   - #card2.lash{
  11 + #card2.media-pantalla{
12 12 position: absolute;
13 13 bottom: 150px;
14 14 -webkit-box-flex: 0;
... ... @@ -16,4 +16,5 @@
16 16 max-width: 41.6666666667%;
17 17 right: 10%;
18 18 margin-right: 0 !important;
19   - }
20 19 \ No newline at end of file
  20 + }
  21 +
21 22 \ No newline at end of file
src/app/modules/forma-pago/forma-pago.component.ts
Diff comments   View file @ 8d599c3
... ... @@ -12,7 +12,7 @@ export class FormaPagoComponent implements OnInit {
12 12 constructor(
13 13 private articuloService: ArticuloService,
14 14 private router: Router,
15   - ) { }
  15 + ) {}
16 16  
17 17 ngOnInit() {
18 18 if (!this.articuloService.carrito.length) {
... ... @@ -20,7 +20,6 @@ export class FormaPagoComponent implements OnInit {
20 20 return;
21 21 }
22 22 this.mediaPantalla();
23   -
24 23 }
25 24  
26 25 medioPago(medioPago: number) {
... ... @@ -34,9 +33,10 @@ export class FormaPagoComponent implements OnInit {
34 33 break;
35 34 }
36 35 }
37   - mediaPantalla(){
38   - if ($("body").hasClass("lash")) {
39   - $("#card1,#card2").addClass("lash");
  36 +
  37 + mediaPantalla() {
  38 + if ($('body').hasClass('media-pantalla')) {
  39 + $('#card1,#card2').addClass('media-pantalla');
40 40 }
41 41 }
42 42 }
src/app/modules/info-formas-pago/info-formas-pago.component.html
Diff comments   View file @ 8d599c3
... ... @@ -11,7 +11,8 @@
11 11 </div>
12 12 <div class="h-85">
13 13 <div class="row h-auto mt-6 mx-0 justify-content-center text-center" >
14   - <div class="col-7 col-lg-4 p-5 m-5 h-auto align-self-end border border-secondary rounded"id="card1">
  14 + <div class="col-7 col-lg-4 p-5 m-5 h-auto align-self-end
  15 + border border-secondary rounded" id="card1">
15 16 <img
16 17 draggable="false"
17 18 ondragstart="return false;"
... ... @@ -40,7 +41,8 @@
40 41 src="assets/img/ir.svg">
41 42 </div>
42 43 </div>
43   - <div class="col-7 col-lg-4 p-5 m-5 h-auto align-self-center border border-primary rounded" id="card2">
  44 + <div class="col-7 col-lg-4 p-5 m-5 h-auto align-self-center
  45 + border border-primary rounded" id="card2">
44 46 <img
45 47 draggable="false"
46 48 ondragstart="return false;"
src/app/modules/info-formas-pago/info-formas-pago.component.scss
Diff comments   View file @ 8d599c3
... ... @@ -2,7 +2,7 @@
2 2 margin-top: 4.5rem;
3 3 }
4 4  
5   -#card1.lash{
  5 +#card1.media-pantalla{
6 6 position: absolute;
7 7 bottom: 0;
8 8 -webkit-box-flex: 0;
... ... @@ -12,7 +12,7 @@
12 12 margin-left: 0 !important;
13 13 }
14 14  
15   -#card2.lash{
  15 +#card2.media-pantalla{
16 16 position: absolute;
17 17 bottom: 0;
18 18 -webkit-box-flex: 0;
... ... @@ -21,4 +21,4 @@
21 21 right: 5%;
22 22 margin-right: 0 !important;
23 23 height: 202px !important;
24   -}
25 24 \ No newline at end of file
  25 +}
src/app/modules/info-formas-pago/info-formas-pago.component.ts
Diff comments   View file @ 8d599c3
... ... @@ -11,12 +11,9 @@ export class InfoFormasPagoComponent implements OnInit {
11 11 ngOnInit() {
12 12 this.mediaPantalla();
13 13 }
14   -
15   - mediaPantalla(){
16   - if ($("body").hasClass("lash")) {
17   - $("#card1,#card2").addClass("lash");
  14 + mediaPantalla() {
  15 + if ($('body').hasClass('media-pantalla')) {
  16 + $('#card1,#card2').addClass('media-pantalla');
18 17 }
19 18 }
20 19 }
21   -
22   -
src/app/modules/opcion-pedido/opcion-pedido.component.scss
Diff comments   View file @ 8d599c3
1   -#card1.lash{
  1 +#card1.media-pantalla{
2 2 position: absolute;
3 3 bottom: 150px;
4 4 -webkit-box-flex: 0;
... ... @@ -8,7 +8,7 @@
8 8 margin-left: 0 !important;
9 9 }
10 10  
11   - #card2.lash{
  11 + #card2.media-pantalla{
12 12 position: absolute;
13 13 bottom: 150px;
14 14 -webkit-box-flex: 0;
src/app/modules/opcion-pedido/opcion-pedido.component.ts
Diff comments   View file @ 8d599c3
... ... @@ -23,9 +23,9 @@ export class OpcionPedidoComponent implements OnInit {
23 23 seleccionPedido(lugar) {
24 24 localStorage.setItem('pedidoPara', lugar);
25 25 }
26   - mediaPantalla(){
27   - if ($("body").hasClass("lash")) {
28   - $("#card1,#card2").addClass("lash");
  26 + mediaPantalla() {
  27 + if ($('body').hasClass('media-pantalla')) {
  28 + $('#card1,#card2').addClass('media-pantalla');
29 29 }
30 30 }
31 31 }
src/app/modules/seleccion-articulos/seleccion-articulos.component.html
Diff comments   View file @ 8d599c3
... ... @@ -35,7 +35,7 @@
35 35 #templateCategorias
36 36 class="col-12 px-0 box-categorias border border-primary border-left-0 rounded-right scroll-y">
37 37 <div
38   - class="row mx-4 mb-2 h-32 justify-content-center tab catContent"
  38 + class="row mx-4 mb-2 h-32 justify-content-center tab cat-content"
39 39 [ngClass]="{ 'active': allActive, 'border-bottom-effect': !allActive }"
40 40 (click)="selectCategoria(-1, 0)" id="">
41 41 <img
... ... @@ -47,8 +47,9 @@
47 47 <small class="col-12 px-0 my-1 h-25 align-self-end text-center text-truncate">Todos</small>
48 48 </div>
49 49 <div
50   - class="row mx-4 mb-2 h-32 justify-content-center tab catContent"
51   - [ngClass]="{ 'active': categoria.selected, 'border-bottom-effect': !categoria.selected, 'lash':mpActive }"
  50 + class="row mx-4 mb-2 h-32 justify-content-center tab cat-content"
  51 + [ngClass]="{ 'active': categoria.selected, 'border-bottom-effect': !categoria.selected,
  52 + 'media-pantalla':mpActive }"
52 53 (click)="selectCategoria(i, categoria.id)"
53 54 *ngFor="let categoria of categorias; let i = index;" id="">
54 55 <img
... ... @@ -133,7 +134,10 @@
133 134 </div>
134 135 <!-- FOOTER CARRITO DE COMPRAS -->
135 136 <div class="row w-90 mx-auto h-auto justify-content-center">
136   - <div class="h-75 px-0 border border-primary rounded" #boxCarrito [ngClass]="boxCarrito.classList.contains('lash') && articuloService.carrito.length ? 'col-8' : 'col-12'" id="boxCarrito">
  137 + <div class="h-75 px-0 border border-primary rounded"
  138 + #boxCarrito id="boxCarrito"
  139 + [ngClass]="boxCarrito.classList.contains('media-pantalla')
  140 + && articuloService.carrito.length ? 'col-8' : 'col-12'">
137 141 <!-- CABECERA -->
138 142 <div class="row mx-0 h-15 border-bottom border-primary">
139 143 <p class="col align-self-center text-truncate"><small>ARTÍCULOS EN TÚ CARRITO DE COMPRAS</small></p>
... ... @@ -207,9 +211,10 @@
207 211 <p class="text-center text-white mt-1 py-1">{{articuloService.subTotal | currency}}</p>
208 212 </div>
209 213 <div class="col-auto align-self-center text-primary ml-2 bg-light"
210   - [ngClass]="{'mt-4':boxCarrito.classList.contains('col-8')}" id="ver-car">VER CARRITO</div>
  214 + [ngClass]="{'mt-4':boxCarrito.classList.contains('col-8')}"
  215 + id="ver-car">VER CARRITO</div>
211 216 <div class="col-auto p-0 bg-primary d-none d-sm-block"
212   - [ngClass]="{'mt-4':boxCarrito.classList.contains('col-8')}" id="img-car">
  217 + [ngClass]="{'mt-4':boxCarrito.classList.contains('col-8')}" id="img-car">
213 218 <img
214 219 draggable="false"
215 220 ondragstart="return false;"
src/app/modules/seleccion-articulos/seleccion-articulos.component.scss
Diff comments   View file @ 8d599c3
... ... @@ -44,15 +44,15 @@ $primary: #aa006b;
44 44 border-radius: 1.5rem;
45 45 }
46 46  
47   -#content.lash{
  47 +#content.media-pantalla{
48 48 max-height: 60% !important;
49 49 }
50 50  
51   -.catContent.lash{
  51 +.cat-content.media-pantalla{
52 52 margin: 1.3rem 0.9rem !important;
53 53 height: 60% !important;
54 54 }
55 55  
56   -.cat-btn.lash{
  56 +.cat-btn.media-pantalla{
57 57 height: 7% !important;
58 58 }
src/app/modules/seleccion-articulos/seleccion-articulos.component.ts
Diff comments   View file @ 8d599c3
... ... @@ -26,13 +26,12 @@ export class SeleccionArticulosComponent implements OnInit {
26 26 allActive = true;
27 27 modalRef: BsModalRef;
28 28 total: number = 0;
29   - mpActive:boolean = false;
  29 + mpActive = false;
30 30 constructor(
31 31 public articuloService: ArticuloService,
32 32 private categoriaService: CategoriaService,
33 33 ) { }
34 34  
35   -
36 35 ngOnInit() {
37 36 this.getCategorias();
38 37 this.mediaPantalla();
... ... @@ -152,12 +151,10 @@ export class SeleccionArticulosComponent implements OnInit {
152 151 }, 500);
153 152 }
154 153  
155   - mediaPantalla(){
156   - if ($("body").hasClass("lash")) {
157   - $(".catContent,#content,#headerPub,#headerPad,.cat-btn,#boxCarrito").addClass("lash");
158   - this.mpActive=true;
  154 + mediaPantalla() {
  155 + if ($('body').hasClass('media-pantalla')) {
  156 + $('.cat-content,#content,#headerPub,#headerPad,.cat-btn,#boxCarrito').addClass('media-pantalla');
  157 + this.mpActive = true;
159 158 }
160 159 }
161   -
162 160 }
163   -
src/app/modules/splash-screen/splash-screen.component.ts
Diff comments   View file @ 8d599c3
... ... @@ -19,10 +19,9 @@ export class SplashScreenComponent implements OnInit {
19 19 setTimeout(() => {
20 20 this.showSplashScreen = false;
21 21 }, this.timerSplashScreen);
22   - //
23   - $(document).ready(function(){
24   - $("body").removeClass("lash");
  22 +
  23 + $(document).ready(function() {
  24 + $('body').removeClass('media-pantalla');
25 25 });
26 26 }
27   -
28 27 }
src/app/shared/footer/footer.component.html
Diff comments   View file @ 8d599c3
1 1 <div class="row w-90 mx-auto h-100 justify-content-between bg-white">
2 2 <div class="col-auto align-self-center px-0 bg-white">
3   - <div class="btn-effect row mx-0 bg-light" id="test">
  3 + <div class="btn-effect row mx-0 bg-light" id="btn-media-pantalla">
4 4 <div class="col-auto align-self-center text-primary">ESTAMOS PARA AYUDARTE</div>
5 5 <div class="col-auto p-0 bg-primary d-none d-sm-block">
6 6 <img
... ... @@ -14,7 +14,7 @@
14 14 </div>
15 15 <div
16 16 class="btn-effect col-auto align-self-center px-0 bg-white"
17   - (click)="goBack()" [ngClass]="{'lash':activo}">
  17 + (click)="goBack()" [ngClass]="{'media-pantalla':activo}">
18 18 <div class="row mx-0 bg-light">
19 19 <div class="col-auto align-self-center text-primary">VOLVER</div>
20 20 <div class="col-auto p-0 bg-primary d-none d-sm-block">
src/app/shared/footer/footer.component.ts
Diff comments   View file @ 8d599c3
... ... @@ -6,10 +6,8 @@ import { Location } from &#39;@angular/common&#39;;
6 6 templateUrl: './footer.component.html',
7 7 styleUrls: ['./footer.component.scss']
8 8 })
9   -
10 9 export class FooterComponent implements OnInit {
11   -
12   -
  10 +
13 11 constructor(private location: Location) {
14 12 this.mediaPantalla();
15 13 }
... ... @@ -19,12 +17,13 @@ export class FooterComponent implements OnInit {
19 17 goBack() {
20 18 this.location.back();
21 19 }
22   - mediaPantalla(){
23   - $(document).ready(function(){
24   - $("#test").click(function(){
25   - $("body,#card1,#card2,#content,.catContent,#headerPub,#headerPad,.cat-btn,#boxCarrito,#cancelImg,#cancelCard,#carrito,#art-carrito").toggleClass("lash");
26   - $("#bagsCarrito").toggleClass(["col-auto","col-4"]);
27   - $("#ver-car,#img-car").toggleClass("mt-4");
  20 +
  21 + mediaPantalla() {
  22 + $(document).ready(function() {
  23 + $('#btn-media-pantalla').click(function() {
  24 + $('body,#card1,#card2,#content,.cat-content,#headerPub,#headerPad,.cat-btn,#boxCarrito,#cancelImg,#cancelCard,#carrito,#art-carrito').toggleClass('media-pantalla');
  25 + $('#bagsCarrito').toggleClass(['col-auto','col-4']);
  26 + $('#ver-car,#img-car').toggleClass('mt-4');
28 27 });
29 28 });
30 29 }
src/app/shared/header-publicidad/header-publicidad.component.scss
Diff comments   View file @ 8d599c3
1   -#headerPub.lash{
  1 +#headerPub.media-pantalla{
2 2 height: 12% !important;
3 3 }
4   -#headerPad.lash{
  4 +#headerPad.media-pantalla{
5 5 padding: 0.5rem !important;
6   -}
7 6 \ No newline at end of file
  7 +}
... ... @@ -7,7 +7,7 @@
7 7 <meta name="viewport" content="width=device-width, initial-scale=1">
8 8 <link rel="icon" type="image/x-icon" href="favicon.ico">
9 9 </head>
10   -<body >
  10 +<body>
11 11 <app-root></app-root>
12 12 </body>
13 13 </html>
... ... @@ -66,9 +66,9 @@ p {
66 66 transform: rotate(-180deg);
67 67 }
68 68  
69   -body.lash{
  69 +body.media-pantalla{
70 70 position: absolute !important;
71 71 bottom: 0;
72 72 width: 100%;
73 73 height: 50%;
74   -}
75 74 \ No newline at end of file
  75 +}