From 91b996201ca464c87bd731ddbd0d11839faa955b Mon Sep 17 00:00:00 2001 From: Aldarien Date: Fri, 28 Feb 2020 13:57:44 -0300 Subject: [PATCH] v0.4.0 --- bootstrap/web/config.php | 4 ++ bootstrap/web/setup.php | 5 +- common/Controller/Web/Home.php | 17 +++++- resources/views/home/links.blade.php | 53 +++++-------------- .../views/home/links/consultas.blade.php | 7 +++ .../views/home/links/documentos.blade.php | 6 +++ resources/views/home/links/listado.blade.php | 19 +++++++ resources/views/home/numero.blade.php | 8 +-- resources/views/home/suplente.blade.php | 35 +----------- resources/views/home/suplente/datos.blade.php | 17 ++++++ .../views/home/suplente/horario.blade.php | 13 +++++ resources/views/layout/footer.blade.php | 14 ++++- 12 files changed, 118 insertions(+), 80 deletions(-) create mode 100644 resources/views/home/links/consultas.blade.php create mode 100644 resources/views/home/links/documentos.blade.php create mode 100644 resources/views/home/links/listado.blade.php create mode 100644 resources/views/home/suplente/datos.blade.php create mode 100644 resources/views/home/suplente/horario.blade.php diff --git a/bootstrap/web/config.php b/bootstrap/web/config.php index 4796bbc..37fad27 100644 --- a/bootstrap/web/config.php +++ b/bootstrap/web/config.php @@ -18,6 +18,10 @@ return [ '{urls.assets}', 'images' ])), + 'urls.metro.logo' => 'https://img.freepik.com/free-icon/santiago-metro-logo_318-66588.jpg?size=338&ext=jpg', + 'urls.notaria.turno' => 'http://www.notariasdeturno.cl', + 'urls.play.store' => 'https://play.google.com/store/apps/details?id=cl.totalpack.suturno.movil', + 'urls.play.store.logo' => 'https://www.gstatic.com/android/market_images/web/favicon_v2.ico', 'assets' => (object) [ (object) [ 'script' => 'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js' diff --git a/bootstrap/web/setup.php b/bootstrap/web/setup.php index 3f22177..81cad27 100644 --- a/bootstrap/web/setup.php +++ b/bootstrap/web/setup.php @@ -12,7 +12,10 @@ return [ 'base' => $container->get('urls.base'), 'assets' => (object) [ 'images' => $container->get('urls.images') - ] + ], + 'notaria_turno' => $container->get('urls.notaria.turno'), + 'play_store' => $container->get('urls.play.store'), + 'play_store_logo' => $container->get('urls.play.store.logo') ], 'assets' => $container->get('assets') ] diff --git a/common/Controller/Web/Home.php b/common/Controller/Web/Home.php index eea09f6..d333aa8 100644 --- a/common/Controller/Web/Home.php +++ b/common/Controller/Web/Home.php @@ -10,8 +10,21 @@ class Home { public function __invoke(Request $request, Response $response, View $view, Container $container): Response { $banner = (object) [ 'titulo' => "5° NOTARÍA DE SANTIAGO\nPATRICIO RABY BENAVENTE", - 'contenido' => "Gertrudis Echenique 30, of. 32, El Golf\nget('urls.images') . "/logo_metro_blanco.png\" />Metro Alcantara" + 'contenido' => "Gertrudis Echenique 30, of. 32, El Golf\nget('urls.metro.logo') . "\" /> Metro Alcantara" ]; - return $view->render($response, 'home', compact('banner')); + $suplente = (object) [ + 'horario' => (object) [ + 'titulo' => "Horario lunes a viernes\n9:30 - 13:30 | 15:30 - 18:00", + 'contenido' => "La atención dentro del horario, puede verse + afectada circunstancialmente y sin previo + aviso, por encontrarse el notario cumpliendo + funciones fuera de la Notaría." + ], + 'datos' => (object) [ + 'fechas' => "DEL 1 DE ABRIL AL 15 DE MAYO", + 'nombre' => "MARIA VIRGINIA\nWIELANDT COVARRUBIAS" + ] + ]; + return $view->render($response, 'home', compact('banner', 'suplente')); } } diff --git a/resources/views/home/links.blade.php b/resources/views/home/links.blade.php index 40f9c5b..3dfc2ec 100644 --- a/resources/views/home/links.blade.php +++ b/resources/views/home/links.blade.php @@ -1,45 +1,18 @@
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - -
DOCUMENTOS ONLINE
Autorizaciones
Declaraciones
Certificados
Poderes
Contratos
Otros
+
+
+
+ @include('home.links.documentos') +
+
+
+ @include('home.links.consultas') +
+
+
+
+
-
- - - - - - -
LINKS DE CONSULTA
-
-
diff --git a/resources/views/home/links/consultas.blade.php b/resources/views/home/links/consultas.blade.php new file mode 100644 index 0000000..8bf5ab4 --- /dev/null +++ b/resources/views/home/links/consultas.blade.php @@ -0,0 +1,7 @@ +@include('home.links.listado', ['title' => 'LINKS DE CONSULTA', 'items' => [ + (object) [ + 'icono' => '', + 'contenido' => 'link1', + 'link' => 'http://' + ] +]]) diff --git a/resources/views/home/links/documentos.blade.php b/resources/views/home/links/documentos.blade.php new file mode 100644 index 0000000..ab60424 --- /dev/null +++ b/resources/views/home/links/documentos.blade.php @@ -0,0 +1,6 @@ +@include('home.links.listado', ['title' => 'DOCUMENTOS ONLINE', 'items' => [ + (object) [ + 'icono' => '', + 'contenido' => 'Autorizaciones' + ] +]]) diff --git a/resources/views/home/links/listado.blade.php b/resources/views/home/links/listado.blade.php new file mode 100644 index 0000000..66fc86c --- /dev/null +++ b/resources/views/home/links/listado.blade.php @@ -0,0 +1,19 @@ +
+
+ {{$title}} +
+ @foreach ($items as $item) +
+ @if (isset($item->link)) + + @endif + @if (isset($item->icono)) + + @endif + {{$item->contenido}} + @if (isset($item->link)) + + @endif +
+ @endforeach +
diff --git a/resources/views/home/numero.blade.php b/resources/views/home/numero.blade.php index 4fad398..d986a37 100644 --- a/resources/views/home/numero.blade.php +++ b/resources/views/home/numero.blade.php @@ -2,9 +2,11 @@
- NÚMERO DE ATENCIÓN ONLINE -
- + + NÚMERO DE ATENCIÓN ONLINE +
+ +
diff --git a/resources/views/home/suplente.blade.php b/resources/views/home/suplente.blade.php index 9be7e43..af608dc 100644 --- a/resources/views/home/suplente.blade.php +++ b/resources/views/home/suplente.blade.php @@ -1,37 +1,6 @@
-
-

- Horario lunes a viernes -
- 9:30 - 13:30 | 15:30 - 18:00 -

-

- La atención dentro del horario, puede verse - afectada circunstancialmente y sin previo - aviso, por encontrarse el notario cumpliendo - funciones fuera de la Notaría. -

- -
-
-
-
-
-
-

NOTARIO SUPLENTE

-

DEL 1 DE ABRIL AL 15 DE MAYO

-

- MARIA VIRGINIA -
- WIELANDT COVARRUBIAS -

-
-
-
-
-
+ @include('home.suplente.horario') + @include('home.suplente.datos')
diff --git a/resources/views/home/suplente/datos.blade.php b/resources/views/home/suplente/datos.blade.php new file mode 100644 index 0000000..25ac3b3 --- /dev/null +++ b/resources/views/home/suplente/datos.blade.php @@ -0,0 +1,17 @@ +
+
+
+
+
+

NOTARIO SUPLENTE

+

+ {!!nl2br($suplente->datos->fechas)!!} +

+

+ {!!nl2br($suplente->datos->nombre)!!} +

+
+
+
+
+
diff --git a/resources/views/home/suplente/horario.blade.php b/resources/views/home/suplente/horario.blade.php new file mode 100644 index 0000000..86825e8 --- /dev/null +++ b/resources/views/home/suplente/horario.blade.php @@ -0,0 +1,13 @@ +
+

+ {!!nl2br($suplente->horario->titulo)!!} +

+

+ {!!nl2br($suplente->horario->contenido)!!} +

+ + + +
diff --git a/resources/views/layout/footer.blade.php b/resources/views/layout/footer.blade.php index 51bb773..f9db250 100644 --- a/resources/views/layout/footer.blade.php +++ b/resources/views/layout/footer.blade.php @@ -1,2 +1,14 @@ -
+ @include('layout.scripts')