Commit 401229e99a36eec726502867ad3dc3aa3b5a59d2
1 parent
97be65005b
Exists in
master
and in
2 other branches
Creado componente de publicidades
Showing
7 changed files
with
15 additions
and
83 deletions
Show diff stats
src/app/app.module.ts
... | ... | @@ -5,7 +5,7 @@ import { AppComponent } from './app.component'; |
5 | 5 | import { SplashScreenComponent } from './modules/splash-screen/splash-screen.component'; |
6 | 6 | import { SplitPipe } from './pipes/split.pipe'; |
7 | 7 | import { AdminComponent } from './modules/admin/admin.component'; |
8 | -import { FooterComponent } from './modules/footer/footer.component'; | |
8 | +import { FooterComponent } from './shared/footer/footer.component'; | |
9 | 9 | |
10 | 10 | @NgModule({ |
11 | 11 | declarations: [ |
... | ... | @@ -13,7 +13,7 @@ import { FooterComponent } from './modules/footer/footer.component'; |
13 | 13 | SplashScreenComponent, |
14 | 14 | SplitPipe, |
15 | 15 | AdminComponent, |
16 | - FooterComponent | |
16 | + FooterComponent, | |
17 | 17 | ], |
18 | 18 | imports: [ |
19 | 19 | BrowserModule, |
src/app/modules/footer/footer.component.html
... | ... | @@ -1,20 +0,0 @@ |
1 | -<div class="row w-90 mx-auto h-100 justify-content-between bg-white"> | |
2 | - <div class="col-auto align-self-center px-0 bg-white"> | |
3 | - <div class="btn-effect row mx-0 bg-light"> | |
4 | - <div class="col-auto align-self-center text-primary">ESTAMOS PARA AYUDARTE</div> | |
5 | - <div class="col-auto p-0 bg-primary d-none d-sm-block"> | |
6 | - <img class="p-2 img-accesibilidad" src="assets/img/iconos-accesibilidad.svg"> | |
7 | - </div> | |
8 | - </div> | |
9 | - </div> | |
10 | - <div | |
11 | - class="btn-effect col-auto align-self-center px-0 bg-white" | |
12 | - (click)="goBack()"> | |
13 | - <div class="row mx-0 bg-light"> | |
14 | - <div class="col-auto align-self-center text-primary">VOLVER</div> | |
15 | - <div class="col-auto p-0 bg-primary d-none d-sm-block"> | |
16 | - <img class="p-2 img-volver" src="assets/img/icono-volver.svg"> | |
17 | - </div> | |
18 | - </div> | |
19 | - </div> | |
20 | -</div> |
src/app/modules/footer/footer.component.scss
src/app/modules/footer/footer.component.spec.ts
... | ... | @@ -1,25 +0,0 @@ |
1 | -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; | |
2 | - | |
3 | -import { FooterComponent } from './footer.component'; | |
4 | - | |
5 | -describe('FooterComponent', () => { | |
6 | - let component: FooterComponent; | |
7 | - let fixture: ComponentFixture<FooterComponent>; | |
8 | - | |
9 | - beforeEach(async(() => { | |
10 | - TestBed.configureTestingModule({ | |
11 | - declarations: [ FooterComponent ] | |
12 | - }) | |
13 | - .compileComponents(); | |
14 | - })); | |
15 | - | |
16 | - beforeEach(() => { | |
17 | - fixture = TestBed.createComponent(FooterComponent); | |
18 | - component = fixture.componentInstance; | |
19 | - fixture.detectChanges(); | |
20 | - }); | |
21 | - | |
22 | - it('should create', () => { | |
23 | - expect(component).toBeTruthy(); | |
24 | - }); | |
25 | -}); |
src/app/modules/footer/footer.component.ts
... | ... | @@ -1,17 +0,0 @@ |
1 | -import { Component, OnInit } from "@angular/core"; | |
2 | -import { Location } from "@angular/common"; | |
3 | - | |
4 | -@Component({ | |
5 | - selector: "app-footer", | |
6 | - templateUrl: "./footer.component.html", | |
7 | - styleUrls: ["./footer.component.scss"] | |
8 | -}) | |
9 | -export class FooterComponent implements OnInit { | |
10 | - constructor(private location: Location) {} | |
11 | - | |
12 | - ngOnInit() {} | |
13 | - | |
14 | - goBack() { | |
15 | - this.location.back(); | |
16 | - } | |
17 | -} |
src/app/modules/seleccion-articulos/seleccion-articulos.component.html
1 | 1 | <div class="h-92 bg-white fade-in-left"> |
2 | 2 | <!-- PUBLICIDADES --> |
3 | - <div class="row mx-0 h-10"> | |
4 | - <div class="col-12 p-3 h-100"> | |
5 | - <div class="bg-dark h-100"></div> | |
6 | - </div> | |
7 | - </div> | |
8 | - <div class="mx-0 h-90 align-items-end"> | |
3 | + <app-header-publicidad></app-header-publicidad> | |
4 | + | |
5 | + <div class="row mx-0 h-90 align-items-end"> | |
9 | 6 | <!-- CABECERA --> |
10 | - <div class="row mx-4 h-auto border border-primary rounded-sm"> | |
7 | + <div class="row w-100 mx-4 h-auto border border-primary rounded-sm"> | |
11 | 8 | <div class="col-12 p-2 align-self-center"> |
12 | 9 | <div class="px-3"> |
13 | 10 | <p class="h6 text-truncate">SELECCIONÁ TÚ COMIDA Y/O BEBIDA</p> |
... | ... | @@ -15,7 +12,7 @@ |
15 | 12 | </div> |
16 | 13 | </div> |
17 | 14 | <!-- CUERPO --> |
18 | - <div class="row mr-4 h-70"> | |
15 | + <div class="row w-100 mr-4 h-70"> | |
19 | 16 | <div class="col-12 h-100 px-0 py-3"> |
20 | 17 | <div class="row mx-0 h-100"> |
21 | 18 | <!-- FILTRO CATEGORIAS --> |
src/app/modules/seleccion-articulos/seleccion-articulos.module.ts
1 | -import { NgModule } from '@angular/core'; | |
2 | -import { CommonModule } from '@angular/common'; | |
3 | - | |
4 | -import { SeleccionArticulosRoutingModule } from './seleccion-articulos-routing.module'; | |
5 | -import { SeleccionArticulosComponent } from './seleccion-articulos.component'; | |
1 | +import { NgModule } from "@angular/core"; | |
2 | +import { CommonModule } from "@angular/common"; | |
6 | 3 | |
4 | +import { SeleccionArticulosRoutingModule } from "./seleccion-articulos-routing.module"; | |
5 | +import { SeleccionArticulosComponent } from "./seleccion-articulos.component"; | |
6 | +import { HeaderPublicidadComponent } from "src/app/shared/header-publicidad/header-publicidad.component"; | |
7 | 7 | |
8 | 8 | @NgModule({ |
9 | - declarations: [SeleccionArticulosComponent], | |
10 | - imports: [ | |
11 | - CommonModule, | |
12 | - SeleccionArticulosRoutingModule | |
13 | - ] | |
9 | + declarations: [SeleccionArticulosComponent, HeaderPublicidadComponent], | |
10 | + imports: [CommonModule, SeleccionArticulosRoutingModule] | |
14 | 11 | }) |
15 | -export class SeleccionArticulosModule { } | |
12 | +export class SeleccionArticulosModule {} |