From 2ae6826ff461b5c24dadf9a7fcbcbf91bbc0cb7a Mon Sep 17 00:00:00 2001 From: Aldarien Date: Tue, 31 Mar 2020 19:41:26 -0300 Subject: [PATCH] Cambios en titulo, en boton fojas, y en indices online --- .gitignore | 2 +- TODO.md | 11 ++++ bootstrap/web/config.php | 23 ++++++-- bootstrap/web/setup.php | 8 ++- common/Controller/Web/Admin/Admin.php | 9 +++- common/Controller/Web/Admin/Documentos.php | 6 ++- common/Controller/Web/Contacto.php | 41 +++++++++----- common/Controller/Web/Home.php | 13 +++-- composer.json | 4 +- public/assets/styles/home.css | 6 +-- public/assets/styles/main.css | 5 +- resources/data/transparencia0.yml | 13 ----- resources/views/admin/documento.blade.php | 6 ++- resources/views/admin/documentos.blade.php | 38 +++++++++++-- resources/views/home/indice.blade.php | 54 ++++++++++++++++--- resources/views/home/links.blade.php | 2 +- resources/views/home/numero.blade.php | 32 +++++++---- resources/views/layout/footer/datos.blade.php | 2 +- resources/views/layout/menu.blade.php | 4 +- 19 files changed, 213 insertions(+), 66 deletions(-) create mode 100644 TODO.md delete mode 100644 resources/data/transparencia0.yml diff --git a/.gitignore b/.gitignore index 3f54fdc..7d6ad32 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,7 @@ composer.lock /resources/cache/ # Uploads -/upload/ +/public/uploads/ # ENV .ENV diff --git a/TODO.md b/TODO.md new file mode 100644 index 0000000..919f306 --- /dev/null +++ b/TODO.md @@ -0,0 +1,11 @@ +# TODO + +1. Edición de Equipos +5. Titulo Web + - Notaría Patricio Raby Benavente +6. Diseño respuestas + - formulario + - admin + - activacion + - subir archivo + - aviso diff --git a/bootstrap/web/config.php b/bootstrap/web/config.php index 1fdb281..b578bf6 100644 --- a/bootstrap/web/config.php +++ b/bootstrap/web/config.php @@ -8,8 +8,12 @@ return [ '{folders.resources}', 'cache' ])), - 'folders.upload' => DI\string(implode(DIRECTORY_SEPARATOR, [ + 'folders.public' => DI\string(implode(DIRECTORY_SEPARATOR, [ '{folders.base}', + 'public' + ])), + 'folders.upload' => DI\string(implode(DIRECTORY_SEPARATOR, [ + '{folders.public}', 'uploads' ])), 'folders.data' => DI\string(implode(DIRECTORY_SEPARATOR, [ @@ -38,14 +42,17 @@ return [ '{urls.assets}', 'fonts' ])), - 'urls.uploads' => DI\string(implode('', [ - 'file://', - '{folders.upload}' + 'urls.uploads' => DI\string(implode('/', [ + '{urls.base}', + 'uploads' ])), '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.fojas' => 'http://fojas.cl/?motv=vista_descarga_web&cons_sel=not_patricrabybenavent', 'urls.atencion' => 'https://zeroq.cl/#/local/notaria-patricio-raby/48', 'urls.atencion.logo' => 'https://zeroq.cl/img/logo-small.png', + 'urls.map' => 'https://maps.google.com/maps?hl=es&q=Notaria%20Patricio%20Raby+(Notaria%20Patricio%20Raby)&ie=UTF8&z=16&iwloc=B&output=embed', + 'urls.map2' => 'https://www.google.com/maps/embed/v1/place?q=notaria+patricio+raby&key=AIzaSyBFw0Qbyq9zTFTd-tUY6dZWTgaQzuU17R8', 'styles' => [ 'https://cdnjs.cloudflare.com/ajax/libs/fomantic-ui/2.8.4/semantic.min.css', DI\string(implode('/', ['{urls.styles}', 'iconmoon.css'])), @@ -66,6 +73,14 @@ return [ DI\string(implode('/', ['{urls.fonts}', 'iconmoon.eof'])) ] ], + 'email.recepcion' => 'recepcion@notariaraby.cl', + 'email.administrativo' => 'vwielandt@notariaraby.cl', + 'email' => [ + 'host' => 'smtp.notariaraby.cl', + 'username' => '', + 'password' => '', + 'secure' => 'ssl' + ], 'scripts' => [ 'https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js', 'https://cdnjs.cloudflare.com/ajax/libs/fomantic-ui/2.8.4/semantic.min.js', diff --git a/bootstrap/web/setup.php b/bootstrap/web/setup.php index 549b758..b872d8f 100644 --- a/bootstrap/web/setup.php +++ b/bootstrap/web/setup.php @@ -18,6 +18,7 @@ return [ 'scripts' => $container->get('urls.scripts'), 'fonts' => $container->get('urls.fonts') ], + 'fojas' => $container->get('urls.fojas'), 'notaria_turno' => $container->get('urls.notaria.turno'), 'atencion' => (object) [ 'url' => $container->get('urls.atencion'), @@ -36,5 +37,10 @@ return [ $manager = new ProVM\Common\Service\Filemanager($c->get(Symfony\Component\Filesystem\Filesystem::class), $c->get('folders.upload')); $manager->addFolder('data', $c->get('folders.data')); return $manager; - } + }, + Nette\Mail\SendmailMailer::class => DI\create(), + Nette\Mail\SmtpMailer::class => function(Container $c) { + return new Nette\Mail\SmtpMailer($c->get('email')); + }, + Nette\Mail\Message::class => DI\create() ]; diff --git a/common/Controller/Web/Admin/Admin.php b/common/Controller/Web/Admin/Admin.php index 31d7eaa..da0ac5e 100644 --- a/common/Controller/Web/Admin/Admin.php +++ b/common/Controller/Web/Admin/Admin.php @@ -4,6 +4,7 @@ namespace ProVM\NotariaRaby\Common\Controller\Web\Admin; use Psr\Http\Message\ServerRequestInterface as Request; use Psr\Http\Message\ResponseInterface as Response; use Slim\Views\Blade as View; +use Carbon\Carbon; use ProVM\Common\Service\Filemanager; class Admin { @@ -17,7 +18,13 @@ class Admin { 'activo' => false ]; } + $months = (object) ['full' => [], 'short' => []]; + $m = Carbon::createFromDate(0, 1, 1); + for ($i = 0; $i < 12; $i ++) { + $months->full []= ucwords($m->copy()->addMonths($i)->locale('es_ES')->isoFormat('MMMM')); + $months->short []= ucwords($m->copy()->addMonths($i)->locale('es_ES')->isoFormat('MMM')); + } $transparencia = $filemanager->folder('data')->load('transparencia.yml')->activo; - return $view->render($response, 'admin.admin', compact('aviso', 'transparencia')); + return $view->render($response, 'admin.admin', compact('aviso', 'transparencia', 'months')); } } diff --git a/common/Controller/Web/Admin/Documentos.php b/common/Controller/Web/Admin/Documentos.php index bdf70a4..c72d730 100644 --- a/common/Controller/Web/Admin/Documentos.php +++ b/common/Controller/Web/Admin/Documentos.php @@ -14,8 +14,12 @@ class Documentos { $filename = implode(DIRECTORY_SEPARATOR, [ $container->get('folders.upload'), - $post['filename'] . '.pdf' + $post['filename'] ]); + if (isset($post['month'])) { + $filename .= '_' . implode('_', array_reverse(explode(' ', $post['month']))); + } + $filename .= '.pdf'; $file->moveTo($filename); $status = (file_exists($filename) and filemtime($filename) == time()); diff --git a/common/Controller/Web/Contacto.php b/common/Controller/Web/Contacto.php index c2df839..7bec709 100644 --- a/common/Controller/Web/Contacto.php +++ b/common/Controller/Web/Contacto.php @@ -1,28 +1,45 @@ '' - ]; - $map = (object) [ - 'lat' => -33.415938, - 'long' => -70.591688 - ]; - $url = 'https://www.google.com/maps/embed/v1/place?q=notaria+patricio+raby&key=AIzaSyBFw0Qbyq9zTFTd-tUY6dZWTgaQzuU17R8'; - $url = 'https://maps.google.com/maps?hl=es&q=Notaria%20Patricio%20Raby+(Notaria%20Patricio%20Raby)&ie=UTF8&z=16&iwloc=B&output=embed'; + public function __invoke(Request $request, Response $response, View $view, Container $container): Response { + $url = $container->get('urls.map'); return $view->render($response, 'contacto', compact('url')); } - public function formulario(Request $request, Response $response): Response { + public function formulario(Request $request, Response $response, Mailer $mailer, Container $container): Response { $post = $request->getParsedBody(); + $body = []; + foreach ($post as $key => $val) { + $body []= $key . ': ' . $val; + } + $body = implode(PHP_EOL, $body); + $subject = 'Contacto Web - ' . $post['nombre']; + + $message = $container->make(Message::class) + ->setFrom($post['email'], $post['nombre']) + ->addTo($container->get('email.recepcion')) + ->addCc($container->get('email.administrativo')) + ->setSubject($subject) + ->setBody($body) + ->setHTMLBody(nl2br($body)); + //$mailer->send($message); + $output = [ - 'informacion' => $post + 'informacion' => $post, + 'mail' => [ + 'to' => $container->get('email.recepcion'), + 'cc' => $container->get('email.administrativo'), + 'asunto' => $subject, + 'mensaje' => $body + ] ]; $response->getBody()->write(json_encode($output)); return $response diff --git a/common/Controller/Web/Home.php b/common/Controller/Web/Home.php index bef752b..6a07023 100644 --- a/common/Controller/Web/Home.php +++ b/common/Controller/Web/Home.php @@ -5,15 +5,16 @@ use Psr\Http\Message\ServerRequestInterface as Request; use Psr\Http\Message\ResponseInterface as Response; use Psr\Container\ContainerInterface as Container; use Slim\Views\Blade as View; +use Carbon\Carbon; use ProVM\Common\Service\Filemanager; class Home { public function __invoke(Request $request, Response $response, View $view, Filemanager $manager, Container $container): Response { $banner = (object) [ - 'titulo' => "5° NOTARÍA DE SANTIAGO\nPATRICIO RABY BENAVENTE", + 'titulo' => "5° NOTARÍA DE SANTIAGO", 'contenido' => "Gertrudis Echenique 30, of. 32, El Golf\n Metro Alcantara" ]; - + $links = $manager->folder('data')->load('documentos.yml'); array_walk($links->documentos, function(&$item) use ($container) { $item = new Documento($container, $item->texto, $item->uri, $item->icono); @@ -23,7 +24,13 @@ class Home { }); $aviso = $manager->folder('data')->load('aviso.yml'); $transparencia = $manager->folder('data')->load('transparencia.yml')->activo; - return $view->render($response, 'home', compact('banner', 'aviso', 'links', 'transparencia')); + $months = (object) ['full' => [], 'short' => []]; + $m = Carbon::createFromDate(0, 1, 1); + for ($i = 0; $i < 12; $i ++) { + $months->full []= ucwords($m->copy()->addMonths($i)->locale('es_ES')->isoFormat('MMMM')); + $months->short []= ucwords($m->copy()->addMonths($i)->locale('es_ES')->isoFormat('MMM')); + } + return $view->render($response, 'home', compact('banner', 'aviso', 'links', 'transparencia', 'months')); } } diff --git a/composer.json b/composer.json index 333afe9..be18e64 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,9 @@ "symfony/var-dumper": "^5.0", "symfony/filesystem": "^5.0", "tuupola/slim-basic-auth": "^3.2", - "mustangostang/spyc": "^0.6.3" + "mustangostang/spyc": "^0.6.3", + "nette/mail": "^3.1", + "nesbot/carbon": "^2.32" }, "require-dev": { "phpunit/phpunit": "^8.5", diff --git a/public/assets/styles/home.css b/public/assets/styles/home.css index 3c93c92..b0a9ed5 100644 --- a/public/assets/styles/home.css +++ b/public/assets/styles/home.css @@ -54,7 +54,7 @@ #numero { background-position: center; background-attachment: fixed; - height: 15rem; + min-height: 15rem; margin: 0 !important; display: block; } @@ -123,8 +123,8 @@ max-height: 20rem !important; } #indice .contenido { - padding-top: 9rem !important; - padding-bottom: 9rem !important; + padding-top: 5rem !important; + padding-bottom: 5rem !important; color: rgba(0, 0, 0, 0.9) !important; } #indice .contenido .titulo { diff --git a/public/assets/styles/main.css b/public/assets/styles/main.css index 301135e..72728eb 100644 --- a/public/assets/styles/main.css +++ b/public/assets/styles/main.css @@ -10,9 +10,12 @@ html { } #page_menu .brand { font-family: Helvetica, Arial !important; - font-weight: 900 !important; + font-weight: 600 !important; font-size: 2rem; } +#page_menu .side { + font-size: 1rem; +} #page_menu .item:first-child { padding-left: 0 !important; } diff --git a/resources/data/transparencia0.yml b/resources/data/transparencia0.yml deleted file mode 100644 index 4a0e80f..0000000 --- a/resources/data/transparencia0.yml +++ /dev/null @@ -1,13 +0,0 @@ -activo: true -descripcion: "La función del notario Público se encuentra regida por las normas establecidas en el Título XI párrafo 7 artículo 399 al 445 del Código Orgánico de tribunales. Son funciones del Notario, entre otras, las contenidas en el artículo 401 del código señalado y que se expresan a continuación:" -funciones: - - Extender los instrumentos públicos con arreglo a las instrucciones que, de palabra o por escrito, les dieren las partes otorgantes. - - Levantar inventarios solemnes. - - Efectuar protestos de letras de cambio y demás documentos mercantiles. - - "Notificar los traspasos de acciones, constituciones y notificaciones de prendas que se les solicitaren." - - Asistir a las juntas generales de accionistas de sociedades anónimas, para los efectos que la ley o reglamento de ellas lo exigieren. - - En general dar fe de los hechos para que fueren requeridos y que no estuvieren encomendados a otros funcionarios. - - Guardar y conservar en riguroso orden cronológico los documentos que ante ellos se otorguen, en forma de precaver todo extravío y hacer fácil y expedito su examen. - - Otorgar certificados o testimonios de los actos celebrados ante ellos o protocolizados en sus registros. - - Facilitar a cualquiera persona que lo solicite el examen de los instrumentos públicos que ante ellos se otorguen y documentos que se protocolicen. - - Autorizar las firmas que se estampen en documentos privados, sea en su presencia o cuya autenticidad les conste. diff --git a/resources/views/admin/documento.blade.php b/resources/views/admin/documento.blade.php index 61d180e..747b7ff 100644 --- a/resources/views/admin/documento.blade.php +++ b/resources/views/admin/documento.blade.php @@ -4,7 +4,11 @@ {{$descripcion}}
- + @include('admin.uicon')
diff --git a/resources/views/admin/documentos.blade.php b/resources/views/admin/documentos.blade.php index c7ed462..7780cd5 100644 --- a/resources/views/admin/documentos.blade.php +++ b/resources/views/admin/documentos.blade.php @@ -2,7 +2,7 @@ Carga de documentos
- @include('admin.documento', ['descripcion' => 'Escrituras Públicas', 'link' => 'escrituras_publicas']) + @include('admin.documento', ['descripcion' => 'Índices', 'link' => 'indices', 'mod' => 'fecha']) @include('admin.documento', ['descripcion' => 'Balances Anuales', 'link' => 'balances_anuales']) @include('admin.documento', ['descripcion' => 'Interés y Patrimonio', 'link' => 'intereses_y_patrimonio']) @include('admin.documento', ['descripcion' => 'Informes Fiscalía', 'link' => 'informes_fiscalia']) @@ -18,6 +18,7 @@
+
@@ -36,9 +37,12 @@ @push('scripts') diff --git a/resources/views/home/indice.blade.php b/resources/views/home/indice.blade.php index aec0fed..973e4fe 100644 --- a/resources/views/home/indice.blade.php +++ b/resources/views/home/indice.blade.php @@ -1,15 +1,25 @@
-
- -
-
+
+
- - ESCRITURAS PÚBLICAS - + ÍNDICES EN LÍNEA
+
+
+
+
+
+ + +
+
+
+ + + +
@@ -22,3 +32,33 @@ } @endpush + +@push('scripts') + +@endpush diff --git a/resources/views/home/links.blade.php b/resources/views/home/links.blade.php index c7538bd..e3c8331 100644 --- a/resources/views/home/links.blade.php +++ b/resources/views/home/links.blade.php @@ -10,7 +10,7 @@ @include('home.links.consultas', ['title' => 'LINKS DE CONSULTA', 'items' => $links->consulta])
-
+
diff --git a/resources/views/home/numero.blade.php b/resources/views/home/numero.blade.php index e863bc3..0c2ef1b 100644 --- a/resources/views/home/numero.blade.php +++ b/resources/views/home/numero.blade.php @@ -1,15 +1,29 @@
-
+
-
- - - +
+
+
+ + + +
+
+
+
+
+
+ + + +
+
diff --git a/resources/views/layout/footer/datos.blade.php b/resources/views/layout/footer/datos.blade.php index bed2977..d289c83 100644 --- a/resources/views/layout/footer/datos.blade.php +++ b/resources/views/layout/footer/datos.blade.php @@ -8,7 +8,7 @@

- +56 2 2599 2453 + +56 2 2599 2453
administracion@notariaraby.cl

diff --git a/resources/views/layout/menu.blade.php b/resources/views/layout/menu.blade.php index 6671bba..fd93a6a 100644 --- a/resources/views/layout/menu.blade.php +++ b/resources/views/layout/menu.blade.php @@ -1,8 +1,8 @@