diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 7046f23..9564aa2 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -3,6 +3,7 @@ import { Routes, RouterModule } from '@angular/router'; import { SplashScreenComponent } from './modules/splash-screen/splash-screen.component'; import { AdminComponent } from './modules/admin/admin.component'; import { FormasPagoModule } from './modules/formas-pago/formas-pago.module'; +import { OpcionPedidoModule } from './modules/opcion-pedido/opcion-pedido.module'; const routes: Routes = [ { path: '', component: SplashScreenComponent }, @@ -11,6 +12,7 @@ const routes: Routes = [ component: AdminComponent, children: [ { path: 'formas-pago', loadChildren: () => FormasPagoModule }, + { path: 'opcion-pedido', loadChildren: () => OpcionPedidoModule }, ] }, { path: '**', redirectTo: '', pathMatch: 'full' }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index eeda00b..c7433b1 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,6 +1,5 @@ import { BrowserModule } from '@angular/platform-browser'; import { NgModule } from '@angular/core'; - import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; import { SplashScreenComponent } from './modules/splash-screen/splash-screen.component'; diff --git a/src/app/modules/footer/footer.component.html b/src/app/modules/footer/footer.component.html index 50975be..01d9c9a 100644 --- a/src/app/modules/footer/footer.component.html +++ b/src/app/modules/footer/footer.component.html @@ -3,15 +3,17 @@
ESTAMOS PARA AYUDARTE
- +
-
+
VOLVER
- +
diff --git a/src/app/modules/footer/footer.component.scss b/src/app/modules/footer/footer.component.scss index 585815a..e69de29 100644 --- a/src/app/modules/footer/footer.component.scss +++ b/src/app/modules/footer/footer.component.scss @@ -1,7 +0,0 @@ -.img-button-accesibilidad { - width: 60px; -} - -.img-button-volver { - width: 40px; -} diff --git a/src/app/modules/footer/footer.component.ts b/src/app/modules/footer/footer.component.ts index da17d82..19c0776 100644 --- a/src/app/modules/footer/footer.component.ts +++ b/src/app/modules/footer/footer.component.ts @@ -1,15 +1,17 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit } from "@angular/core"; +import { Location } from "@angular/common"; @Component({ - selector: 'app-footer', - templateUrl: './footer.component.html', - styleUrls: ['./footer.component.scss'] + selector: "app-footer", + templateUrl: "./footer.component.html", + styleUrls: ["./footer.component.scss"] }) export class FooterComponent implements OnInit { + constructor(private location: Location) {} - constructor() { } + ngOnInit() {} - ngOnInit() { + goBack() { + this.location.back(); } - } diff --git a/src/app/modules/formas-pago/formas-pago-routing.module.ts b/src/app/modules/formas-pago/formas-pago-routing.module.ts index f26c0e5..510bcbc 100644 --- a/src/app/modules/formas-pago/formas-pago-routing.module.ts +++ b/src/app/modules/formas-pago/formas-pago-routing.module.ts @@ -1,13 +1,11 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; -import { FormasPagoComponent } from './formas-pago.component'; +import { NgModule } from "@angular/core"; +import { Routes, RouterModule } from "@angular/router"; +import { FormasPagoComponent } from "./formas-pago.component"; -const routes: Routes = [ - { path: '', component: FormasPagoComponent }, -]; +const routes: Routes = [{ path: "", component: FormasPagoComponent }]; @NgModule({ imports: [RouterModule.forChild(routes)], exports: [RouterModule] }) -export class FormasPagoRoutingModule { } +export class FormasPagoRoutingModule {} diff --git a/src/app/modules/formas-pago/formas-pago.component.html b/src/app/modules/formas-pago/formas-pago.component.html index cf3e97d..61f5376 100644 --- a/src/app/modules/formas-pago/formas-pago.component.html +++ b/src/app/modules/formas-pago/formas-pago.component.html @@ -13,7 +13,11 @@ tarjetas y

-
CONTINUAR
+
+ CONTINUAR +
diff --git a/src/app/modules/formas-pago/formas-pago.component.scss b/src/app/modules/formas-pago/formas-pago.component.scss index 56e52c1..e69de29 100644 --- a/src/app/modules/formas-pago/formas-pago.component.scss +++ b/src/app/modules/formas-pago/formas-pago.component.scss @@ -1,8 +0,0 @@ -.img-in-top { - position: absolute; - top: -35px; - left: 50%; - height: 70px; - -webkit-transform: translateX(-50%); - transform: translateX(-50%); -} diff --git a/src/app/modules/formas-pago/formas-pago.component.ts b/src/app/modules/formas-pago/formas-pago.component.ts index cb160ee..ed26ff8 100644 --- a/src/app/modules/formas-pago/formas-pago.component.ts +++ b/src/app/modules/formas-pago/formas-pago.component.ts @@ -1,15 +1,12 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit } from "@angular/core"; @Component({ - selector: 'app-formas-pago', - templateUrl: './formas-pago.component.html', - styleUrls: ['./formas-pago.component.scss'] + selector: "app-formas-pago", + templateUrl: "./formas-pago.component.html", + styleUrls: ["./formas-pago.component.scss"] }) export class FormasPagoComponent implements OnInit { + constructor() {} - constructor() { } - - ngOnInit() { - } - + ngOnInit() {} } diff --git a/src/app/modules/opcion-pedido/opcion-pedido-routing.module.ts b/src/app/modules/opcion-pedido/opcion-pedido-routing.module.ts new file mode 100644 index 0000000..3cada33 --- /dev/null +++ b/src/app/modules/opcion-pedido/opcion-pedido-routing.module.ts @@ -0,0 +1,11 @@ +import { NgModule } from "@angular/core"; +import { Routes, RouterModule } from "@angular/router"; +import { OpcionPedidoComponent } from './opcion-pedido.component'; + +const routes: Routes = [{ path: "", component: OpcionPedidoComponent }]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class OpcionPedidoRoutingModule {} diff --git a/src/app/modules/opcion-pedido/opcion-pedido.component.html b/src/app/modules/opcion-pedido/opcion-pedido.component.html new file mode 100644 index 0000000..6249117 --- /dev/null +++ b/src/app/modules/opcion-pedido/opcion-pedido.component.html @@ -0,0 +1,48 @@ +
+
+
+ +
+
+
+
+
+

TU PEDIDO ES PARA:

+
+
+
+
+
+
+
+ +
+
comer acá
+
+ +
+
+
+
+
+
+
+
+
+
+ +
+
para llevar
+
+ +
+
+
+
+
+
+
diff --git a/src/app/modules/opcion-pedido/opcion-pedido.component.scss b/src/app/modules/opcion-pedido/opcion-pedido.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/modules/opcion-pedido/opcion-pedido.component.spec.ts b/src/app/modules/opcion-pedido/opcion-pedido.component.spec.ts new file mode 100644 index 0000000..e16bda0 --- /dev/null +++ b/src/app/modules/opcion-pedido/opcion-pedido.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { OpcionPedidoComponent } from './opcion-pedido.component'; + +describe('OpcionPedidoComponent', () => { + let component: OpcionPedidoComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ OpcionPedidoComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(OpcionPedidoComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/modules/opcion-pedido/opcion-pedido.component.ts b/src/app/modules/opcion-pedido/opcion-pedido.component.ts new file mode 100644 index 0000000..d6e712d --- /dev/null +++ b/src/app/modules/opcion-pedido/opcion-pedido.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-opcion-pedido', + templateUrl: './opcion-pedido.component.html', + styleUrls: ['./opcion-pedido.component.scss'] +}) +export class OpcionPedidoComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/modules/opcion-pedido/opcion-pedido.module.ts b/src/app/modules/opcion-pedido/opcion-pedido.module.ts new file mode 100644 index 0000000..077c204 --- /dev/null +++ b/src/app/modules/opcion-pedido/opcion-pedido.module.ts @@ -0,0 +1,10 @@ +import { NgModule } from "@angular/core"; +import { CommonModule } from "@angular/common"; +import { OpcionPedidoRoutingModule } from "./opcion-pedido-routing.module"; +import { OpcionPedidoComponent } from "./opcion-pedido.component"; + +@NgModule({ + declarations: [OpcionPedidoComponent], + imports: [CommonModule, OpcionPedidoRoutingModule] +}) +export class OpcionPedidoModule {} diff --git a/src/app/modules/splash-screen/splash-screen.component.html b/src/app/modules/splash-screen/splash-screen.component.html index 09d9909..74ded20 100644 --- a/src/app/modules/splash-screen/splash-screen.component.html +++ b/src/app/modules/splash-screen/splash-screen.component.html @@ -34,7 +34,7 @@
+ [routerLink]="['/formas-pago']">

TOCA PARA COMENZAR

diff --git a/src/assets/img/ir.svg b/src/assets/img/ir.svg new file mode 100644 index 0000000..963e3bc --- /dev/null +++ b/src/assets/img/ir.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/src/scss/icons.scss b/src/scss/icons.scss new file mode 100644 index 0000000..14a12c0 --- /dev/null +++ b/src/scss/icons.scss @@ -0,0 +1,15 @@ +.img-ir { + width: 30px; +} + +.img-plato { + width: 50px; +} + +.img-accesibilidad { + width: 60px; +} + +.img-volver { + width: 40px; +} diff --git a/src/styles.scss b/src/styles.scss index 329b974..56f0f88 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -1,6 +1,7 @@ @import "scss/styles-bootstrap.scss"; @import "scss/height-width.scss"; @import "scss/animations.scss"; +@import "scss/icons.scss"; @import "node_modules/bootstrap/scss/_variables.scss"; @font-face { @@ -47,3 +48,12 @@ p { .rounded-sm { border-radius: 0.5rem !important; } + +.img-in-top { + position: absolute; + top: -35px; + left: 50%; + height: 70px; + -webkit-transform: translateX(-50%); + transform: translateX(-50%); +}