From cf18949409d4c487f12d1bc885160011ab292f71 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Mon, 4 May 2020 12:58:53 -0400 Subject: [PATCH 1/7] Cambio a la forma de obtener los indices --- common/Controller/Web/Documentos.php | 25 +++++++++++++++++++++++++ public/assets/styles/home.css | 2 +- resources/routes/web/documentos.php | 6 ++++++ resources/views/home/indice.blade.php | 16 ++++++++++++++-- 4 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 common/Controller/Web/Documentos.php create mode 100644 resources/routes/web/documentos.php diff --git a/common/Controller/Web/Documentos.php b/common/Controller/Web/Documentos.php new file mode 100644 index 0000000..e4b9c05 --- /dev/null +++ b/common/Controller/Web/Documentos.php @@ -0,0 +1,25 @@ +get('folders.upload'), + $documento . '.pdf' + ]); + $existe = file_exists($filename); + $output = [ + 'informacion' => $documento, + 'archivo' => $filename, + 'existe' => $existe + ]; + $response->getBody()->write(json_encode($output)); + return $response + ->withHeader('Content-Type', 'application/json') + ->withStatus(201); + } +} diff --git a/public/assets/styles/home.css b/public/assets/styles/home.css index ca6f9c6..656d336 100644 --- a/public/assets/styles/home.css +++ b/public/assets/styles/home.css @@ -129,7 +129,7 @@ #indice .img, #indice .img img { max-height: 20rem !important; - min-height: 10rem !important; + min-height: 20rem !important; } #indice .contenido { padding-top: 5rem !important; diff --git a/resources/routes/web/documentos.php b/resources/routes/web/documentos.php new file mode 100644 index 0000000..3b4170b --- /dev/null +++ b/resources/routes/web/documentos.php @@ -0,0 +1,6 @@ +group('/documentos', function($app) { + $app->get('/existe/{documento}', [Documentos::class, 'existe']); +}); diff --git a/resources/views/home/indice.blade.php b/resources/views/home/indice.blade.php index dee3668..e34e210 100644 --- a/resources/views/home/indice.blade.php +++ b/resources/views/home/indice.blade.php @@ -36,6 +36,7 @@ @push('scripts') @endpush From 7a0ec94abe35353ded449afa74dcdbf1209c8cfa Mon Sep 17 00:00:00 2001 From: Aldarien Date: Mon, 4 May 2020 19:29:27 -0400 Subject: [PATCH 3/7] FIX: Se agrega tipo de retorno --- common/Controller/Web/Documentos.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/Controller/Web/Documentos.php b/common/Controller/Web/Documentos.php index e4b9c05..1f50fd5 100644 --- a/common/Controller/Web/Documentos.php +++ b/common/Controller/Web/Documentos.php @@ -6,7 +6,7 @@ use Psr\Http\Message\ServerRequestInterface as Request; use Psr\Http\Message\ResponseInterface as Response; class Documentos { - public function existe(Request $request, Response $response, Container $container, $documento) { + public function existe(Request $request, Response $response, Container $container, $documento): Response { $filename = implode(DIRECTORY_SEPARATOR, [ $container->get('folders.upload'), $documento . '.pdf' From 90c5d9dcd68e89d28e2a20333da76daabb5e3cdb Mon Sep 17 00:00:00 2001 From: Aldarien Date: Mon, 4 May 2020 19:30:14 -0400 Subject: [PATCH 4/7] Se agrega modo para ver archivos que han sido subidos y poder eliminarlos --- common/Controller/Web/Admin/Documentos.php | 39 +++++ resources/routes/web/admin/documentos.php | 2 + resources/views/admin/archivos/list.blade.php | 142 ++++++++++++++++++ resources/views/admin/documento.blade.php | 6 +- resources/views/admin/documentos.blade.php | 84 ----------- 5 files changed, 184 insertions(+), 89 deletions(-) create mode 100644 resources/views/admin/archivos/list.blade.php diff --git a/common/Controller/Web/Admin/Documentos.php b/common/Controller/Web/Admin/Documentos.php index c72d730..0b19b05 100644 --- a/common/Controller/Web/Admin/Documentos.php +++ b/common/Controller/Web/Admin/Documentos.php @@ -4,9 +4,31 @@ namespace ProVM\NotariaRaby\Common\Controller\Web\Admin; use Psr\Container\ContainerInterface as Container; 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 Documentos { + public function __invoke(Request $request, Response $response, Container $container, View $view, $tipo): Response { + $glob = implode(DIRECTORY_SEPARATOR, [ + $container->get('folders.upload'), + $tipo . '*.pdf' + ]); + $files = glob($glob); + $archivos = []; + foreach ($files as $filename) { + $file = new \SplFileInfo($filename); + $archivos []= $file; + } + $titulo = $tipo; + $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, 'admin.archivos.list', compact('titulo', 'archivos', 'months')); + } public function upload(Request $request, Response $response, Filemanager $filemanager, Container $container): Response { $post = $request->getParsedBody(); $files = $request->getUploadedFiles(); @@ -33,4 +55,21 @@ class Documentos { ->withHeader('Content-Type', 'application/json') ->withStatus(201); } + public function delete(Request $request, Response $response, Container $container): Response { + $post = $request->getParsedBody(); + $filename = implode(DIRECTORY_SEPARATOR, [ + $container->get('folders.upload'), + $post['archivo'] . '.pdf' + ]); + $status = unlink($filename); + $output = [ + 'informacion' => $post, + 'estado' => $status, + 'archivo' => $filename + ]; + $response->getBody()->write(json_encode($output)); + return $response + ->withHeader('Content-Type', 'application/json') + ->withStatus(201); + } } diff --git a/resources/routes/web/admin/documentos.php b/resources/routes/web/admin/documentos.php index 625887e..199f9e4 100644 --- a/resources/routes/web/admin/documentos.php +++ b/resources/routes/web/admin/documentos.php @@ -2,5 +2,7 @@ use ProVM\NotariaRaby\Common\Controller\Web\Admin\Documentos; $app->group('/documentos', function($app) { + $app->post('/delete', [Documentos::class, 'delete']); + $app->get('/{tipo}', Documentos::class); $app->post('[/]', [Documentos::class, 'upload']); }); diff --git a/resources/views/admin/archivos/list.blade.php b/resources/views/admin/archivos/list.blade.php new file mode 100644 index 0000000..cb3934a --- /dev/null +++ b/resources/views/admin/archivos/list.blade.php @@ -0,0 +1,142 @@ +@extends('admin.layout.base') + +@section('page_content') +
+

+ {{str_replace('_', ' ', mb_strtoupper($titulo))}} +

+
+
+
+
+ +
+ + + + + + + + + @foreach ($archivos as $archivo) + + + + + @endforeach + +
Documento
{{str_replace([$titulo, '_'], ['', ' '], $archivo->getBasename('.' . $archivo->getExtension()))}} + +
+
+
+
+
+ +@endsection + +@push('scripts') + +@endpush diff --git a/resources/views/admin/documento.blade.php b/resources/views/admin/documento.blade.php index 747b7ff..1d1c5d6 100644 --- a/resources/views/admin/documento.blade.php +++ b/resources/views/admin/documento.blade.php @@ -4,11 +4,7 @@ {{$descripcion}} diff --git a/resources/views/admin/documentos.blade.php b/resources/views/admin/documentos.blade.php index d5c8be6..f32e5b4 100644 --- a/resources/views/admin/documentos.blade.php +++ b/resources/views/admin/documentos.blade.php @@ -22,80 +22,9 @@ /> - @push('scripts') @endpush From 46e2e564572c2a1862c87a0c151cf3ce841fc51c Mon Sep 17 00:00:00 2001 From: Aldarien Date: Mon, 4 May 2020 19:50:45 -0400 Subject: [PATCH 5/7] Volver en archivos y focus en login --- resources/views/admin/archivos/list.blade.php | 7 ++++++- resources/views/admin/login.blade.php | 8 ++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/resources/views/admin/archivos/list.blade.php b/resources/views/admin/archivos/list.blade.php index cb3934a..545b365 100644 --- a/resources/views/admin/archivos/list.blade.php +++ b/resources/views/admin/archivos/list.blade.php @@ -8,6 +8,7 @@
+ Volver
@endsection + +@push('scripts') + +@endpush From 47f3a0904b3289abb0869010d0a3bbdd7f0214b7 Mon Sep 17 00:00:00 2001 From: Aldarien Date: Mon, 4 May 2020 19:53:43 -0400 Subject: [PATCH 6/7] FIX: layout login --- resources/views/admin/login.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/admin/login.blade.php b/resources/views/admin/login.blade.php index be8f7c7..b31ed74 100644 --- a/resources/views/admin/login.blade.php +++ b/resources/views/admin/login.blade.php @@ -1,4 +1,4 @@ -@extends('admin.layout.base') +@extends('layout.base') @section('page_content')
From fd06072f67f3bfe74a2ac665379d8e6b17c1b0ae Mon Sep 17 00:00:00 2001 From: Aldarien Date: Mon, 4 May 2020 20:03:49 -0400 Subject: [PATCH 7/7] FIX: link admin --- resources/views/admin/archivos/list.blade.php | 2 +- resources/views/admin/clave.blade.php | 2 +- resources/views/admin/documentos.blade.php | 2 +- resources/views/admin/formulario.blade.php | 4 ++-- resources/views/admin/login.blade.php | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/views/admin/archivos/list.blade.php b/resources/views/admin/archivos/list.blade.php index 545b365..7473971 100644 --- a/resources/views/admin/archivos/list.blade.php +++ b/resources/views/admin/archivos/list.blade.php @@ -71,7 +71,7 @@ e.preventDefault() var form_data = new FormData(this) $.ajax({ - url: '{{$urls->base}}/admin/documentos', + url: '{{$urls->admin}}/documentos', type: 'post', data: form_data, contentType: false, diff --git a/resources/views/admin/clave.blade.php b/resources/views/admin/clave.blade.php index b92dd70..8d09867 100644 --- a/resources/views/admin/clave.blade.php +++ b/resources/views/admin/clave.blade.php @@ -3,7 +3,7 @@ @section('page_content')

Cambiar Clave

-
+
diff --git a/resources/views/admin/documentos.blade.php b/resources/views/admin/documentos.blade.php index f32e5b4..9a8ad99 100644 --- a/resources/views/admin/documentos.blade.php +++ b/resources/views/admin/documentos.blade.php @@ -30,7 +30,7 @@ $('#transparencia').checkbox() $('#transparencia').click(function() { var status = $(this).checkbox('is checked') - $.post('{{$urls->base}}/admin/transparencia', {'activo': status}, function(data) { + $.post('{{$urls->admin}}/transparencia', {'activo': status}, function(data) { var msg = [''] if (data.estado == 'ok') { if (data.informacion.activo == 'true') { diff --git a/resources/views/admin/formulario.blade.php b/resources/views/admin/formulario.blade.php index 208a3cd..2f9c9a0 100644 --- a/resources/views/admin/formulario.blade.php +++ b/resources/views/admin/formulario.blade.php @@ -51,7 +51,7 @@ var titulo = $(this).find("[name='titulo']").val() var contenido = $(this).find("[name='contenido']").val() - $.post('{{$urls->base}}/admin/notificacion', {titulo: titulo, contenido: contenido}, function(data) { + $.post('{{$urls->admin}}/notificacion', {titulo: titulo, contenido: contenido}, function(data) { var msg = '' if (data.estado == 'ok') { msg = 'Editado correctamente.' @@ -68,7 +68,7 @@ $('#activar').checkbox() $('#activar').click(function() { var status = $(this).checkbox('is checked') - $.post('{{$urls->base}}/admin/notificacion', {'activo': status}, function(data) { + $.post('{{$urls->admin}}/notificacion', {'activo': status}, function(data) { msg = [] if (data.estado == 'ok') { if (data.editado.activo) { diff --git a/resources/views/admin/login.blade.php b/resources/views/admin/login.blade.php index b31ed74..33bb63b 100644 --- a/resources/views/admin/login.blade.php +++ b/resources/views/admin/login.blade.php @@ -2,7 +2,7 @@ @section('page_content')
- +

Ingresar