diff --git a/src/app/modules/cancelar-compra/cancelar-compra.component.scss b/src/app/modules/cancelar-compra/cancelar-compra.component.scss index 253fbfc..f0420bd 100644 --- a/src/app/modules/cancelar-compra/cancelar-compra.component.scss +++ b/src/app/modules/cancelar-compra/cancelar-compra.component.scss @@ -2,19 +2,19 @@ background-color: rgb(212, 212, 212); } -#cancelCard.lash{ +#cancelCard.media-pantalla{ height: 45% !important; margin-top: 1rem !important; } -#cancelCard.lash h4{ +#cancelCard.media-pantalla h4{ margin-top: 1rem !important; } -#cancelImg.lash{ +#cancelImg.media-pantalla{ height: 20% !important; } -#cancelImg.lash img{ +#cancelImg.media-pantalla img{ max-width: 15% !important; -} \ No newline at end of file +} diff --git a/src/app/modules/cancelar-compra/cancelar-compra.component.ts b/src/app/modules/cancelar-compra/cancelar-compra.component.ts index 5bfabea..cf8f8cc 100644 --- a/src/app/modules/cancelar-compra/cancelar-compra.component.ts +++ b/src/app/modules/cancelar-compra/cancelar-compra.component.ts @@ -14,14 +14,13 @@ export class CancelarCompraComponent implements OnInit { private location: Location, private router: Router, private articuloService: ArticuloService - ) { } + ) {} ngOnInit() { setTimeout(() => { this.limpiarCarritoYvolver(); }, 90000); this.mediaPantalla(); - } volverPreviousPage() { @@ -33,9 +32,9 @@ export class CancelarCompraComponent implements OnInit { this.router.navigate(['/']); } - mediaPantalla(){ - if ($("body").hasClass("lash")) { - $("#cancelImg,#cancelCard").addClass("lash"); + mediaPantalla() { + if ($('body').hasClass('media-pantalla')) { + $('#cancelImg,#cancelCard').addClass('media-pantalla'); } } -} +} \ No newline at end of file diff --git a/src/app/modules/carrito/carrito.component.html b/src/app/modules/carrito/carrito.component.html index 43e2fd7..8705cfa 100644 --- a/src/app/modules/carrito/carrito.component.html +++ b/src/app/modules/carrito/carrito.component.html @@ -13,14 +13,16 @@ -
+

No hay artículos en el carrito

diff --git a/src/app/modules/carrito/carrito.component.scss b/src/app/modules/carrito/carrito.component.scss index 0de3bcf..6f7854a 100644 --- a/src/app/modules/carrito/carrito.component.scss +++ b/src/app/modules/carrito/carrito.component.scss @@ -3,10 +3,10 @@ border-radius: 1.5rem; } - #art-carrito.lash{ + #art-carrito.media-pantalla{ min-height: 130px !important; } -#carrito.lash{ +#carrito.media-pantalla{ max-height: 60% !important; -} \ No newline at end of file +} diff --git a/src/app/modules/carrito/carrito.component.ts b/src/app/modules/carrito/carrito.component.ts index 6cde46e..1cc565e 100644 --- a/src/app/modules/carrito/carrito.component.ts +++ b/src/app/modules/carrito/carrito.component.ts @@ -26,7 +26,7 @@ import { Router } from '@angular/router'; export class CarritoComponent implements OnInit { urlImagenes = `${APP_SETTINGS.apiDeboSuite}/imagenes/`; maxCantidad = 50; - flagPantalla:boolean = false; + flagPantalla = false; constructor( public articuloService: ArticuloService, private location: Location, @@ -38,7 +38,7 @@ export class CarritoComponent implements OnInit { this.router.navigate(['']); return; } - this.mediaPantalla() + this.mediaPantalla(); } deleteArticulo(index: number) { @@ -61,9 +61,9 @@ export class CarritoComponent implements OnInit { goBack() { this.location.back(); } - mediaPantalla(){ - if ($("body").hasClass("lash")) { - $("#carrito").addClass("lash"); + mediaPantalla() { + if ($('body').hasClass('media-pantalla')) { + $('#carrito').addClass('media-pantalla'); this.flagPantalla = true; } } diff --git a/src/app/modules/forma-pago/forma-pago.component.scss b/src/app/modules/forma-pago/forma-pago.component.scss index bf9831c..3a780b2 100644 --- a/src/app/modules/forma-pago/forma-pago.component.scss +++ b/src/app/modules/forma-pago/forma-pago.component.scss @@ -1,4 +1,4 @@ -#card1.lash{ + #card1.media-pantalla{ position: absolute; bottom: 150px; -webkit-box-flex: 0; @@ -8,7 +8,7 @@ margin-left: 0 !important; } - #card2.lash{ + #card2.media-pantalla{ position: absolute; bottom: 150px; -webkit-box-flex: 0; @@ -16,4 +16,5 @@ max-width: 41.6666666667%; right: 10%; margin-right: 0 !important; - } \ No newline at end of file + } + \ No newline at end of file diff --git a/src/app/modules/forma-pago/forma-pago.component.ts b/src/app/modules/forma-pago/forma-pago.component.ts index aa8c6fa..80812a5 100644 --- a/src/app/modules/forma-pago/forma-pago.component.ts +++ b/src/app/modules/forma-pago/forma-pago.component.ts @@ -12,7 +12,7 @@ export class FormaPagoComponent implements OnInit { constructor( private articuloService: ArticuloService, private router: Router, - ) { } + ) {} ngOnInit() { if (!this.articuloService.carrito.length) { @@ -20,7 +20,6 @@ export class FormaPagoComponent implements OnInit { return; } this.mediaPantalla(); - } medioPago(medioPago: number) { @@ -34,9 +33,10 @@ export class FormaPagoComponent implements OnInit { break; } } - mediaPantalla(){ - if ($("body").hasClass("lash")) { - $("#card1,#card2").addClass("lash"); + + mediaPantalla() { + if ($('body').hasClass('media-pantalla')) { + $('#card1,#card2').addClass('media-pantalla'); } } } diff --git a/src/app/modules/info-formas-pago/info-formas-pago.component.html b/src/app/modules/info-formas-pago/info-formas-pago.component.html index 790f0a7..3ee6009 100644 --- a/src/app/modules/info-formas-pago/info-formas-pago.component.html +++ b/src/app/modules/info-formas-pago/info-formas-pago.component.html @@ -11,7 +11,8 @@
-
+
-
+
Todos
-
+

ARTÍCULOS EN TÚ CARRITO DE COMPRAS

@@ -207,9 +211,10 @@

{{articuloService.subTotal | currency}}

VER CARRITO
+ [ngClass]="{'mt-4':boxCarrito.classList.contains('col-8')}" + id="ver-car">VER CARRITO
+ [ngClass]="{'mt-4':boxCarrito.classList.contains('col-8')}" id="img-car"> { this.showSplashScreen = false; }, this.timerSplashScreen); - // - $(document).ready(function(){ - $("body").removeClass("lash"); + + $(document).ready(function() { + $('body').removeClass('media-pantalla'); }); } - } diff --git a/src/app/shared/footer/footer.component.html b/src/app/shared/footer/footer.component.html index d7695a9..c4b4984 100644 --- a/src/app/shared/footer/footer.component.html +++ b/src/app/shared/footer/footer.component.html @@ -1,6 +1,6 @@
-
+
ESTAMOS PARA AYUDARTE
+ (click)="goBack()" [ngClass]="{'media-pantalla':activo}">
VOLVER
diff --git a/src/app/shared/footer/footer.component.ts b/src/app/shared/footer/footer.component.ts index fe753be..bdc0bf1 100644 --- a/src/app/shared/footer/footer.component.ts +++ b/src/app/shared/footer/footer.component.ts @@ -6,10 +6,8 @@ import { Location } from '@angular/common'; templateUrl: './footer.component.html', styleUrls: ['./footer.component.scss'] }) - export class FooterComponent implements OnInit { - - + constructor(private location: Location) { this.mediaPantalla(); } @@ -19,12 +17,13 @@ export class FooterComponent implements OnInit { goBack() { this.location.back(); } - mediaPantalla(){ - $(document).ready(function(){ - $("#test").click(function(){ - $("body,#card1,#card2,#content,.catContent,#headerPub,#headerPad,.cat-btn,#boxCarrito,#cancelImg,#cancelCard,#carrito,#art-carrito").toggleClass("lash"); - $("#bagsCarrito").toggleClass(["col-auto","col-4"]); - $("#ver-car,#img-car").toggleClass("mt-4"); + + mediaPantalla() { + $(document).ready(function() { + $('#btn-media-pantalla').click(function() { + $('body,#card1,#card2,#content,.cat-content,#headerPub,#headerPad,.cat-btn,#boxCarrito,#cancelImg,#cancelCard,#carrito,#art-carrito').toggleClass('media-pantalla'); + $('#bagsCarrito').toggleClass(['col-auto','col-4']); + $('#ver-car,#img-car').toggleClass('mt-4'); }); }); } diff --git a/src/app/shared/header-publicidad/header-publicidad.component.scss b/src/app/shared/header-publicidad/header-publicidad.component.scss index fa2529d..de0fa5c 100644 --- a/src/app/shared/header-publicidad/header-publicidad.component.scss +++ b/src/app/shared/header-publicidad/header-publicidad.component.scss @@ -1,6 +1,6 @@ -#headerPub.lash{ +#headerPub.media-pantalla{ height: 12% !important; } -#headerPad.lash{ +#headerPad.media-pantalla{ padding: 0.5rem !important; -} \ No newline at end of file +} diff --git a/src/index.html b/src/index.html index e037ef9..4362310 100644 --- a/src/index.html +++ b/src/index.html @@ -7,7 +7,7 @@ - + diff --git a/src/styles.scss b/src/styles.scss index a3c1789..1dc9fde 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -66,9 +66,9 @@ p { transform: rotate(-180deg); } -body.lash{ +body.media-pantalla{ position: absolute !important; bottom: 0; width: 100%; height: 50%; -} \ No newline at end of file +}