diff --git a/common/Controller/Web/Base.php b/common/Controller/Web/Base.php index ac5c43a..8028697 100644 --- a/common/Controller/Web/Base.php +++ b/common/Controller/Web/Base.php @@ -9,7 +9,6 @@ use Carbon\Carbon; class Base { public function __invoke(Request $request, Response $response, View $view, Container $container) { - $aviso = true; $filename = implode(DIRECTORY_SEPARATOR, [ $container->get('folders.data'), 'avisos.json' @@ -32,7 +31,12 @@ class Base { } $item->imagen = ''; }); + $filename = implode(DIRECTORY_SEPARATOR, [ + $container->get('folders.data'), + 'resumen.json' + ]); + $resumen = json_decode(trim(file_get_contents($filename))); $indicadores = ['uf' => 'UF', 'euro' => 'Euro', 'imacec' => 'IMACEC', 'dolar' => 'USD', 'ipc' => 'IPC', 'utm' => 'UTM', 'bitcoin' => 'BitCoin', 'libra_cobre' => 'Lb. Cu']; - return $view->render($response, 'home', compact('aviso', 'avisos', 'destacados', 'segmentos', 'indicadores')); + return $view->render($response, 'home', compact('aviso', 'avisos', 'destacados', 'segmentos', 'resumen', 'indicadores')); } } diff --git a/common/Controller/Web/Faq.php b/common/Controller/Web/Faq.php index cef965e..7867771 100644 --- a/common/Controller/Web/Faq.php +++ b/common/Controller/Web/Faq.php @@ -1,12 +1,18 @@ render($response, 'faq'); + public function __invoke(Request $request, Response $response, View $view, Container $container) { + $filename = implode(DIRECTORY_SEPARATOR, [ + $container->get('folders.data'), + 'faqs.json' + ]); + $faqs = json_decode(trim(file_get_contents($filename))); + return $view->render($response, 'faq', compact('faqs')); } } diff --git a/common/Controller/Web/Nosotros.php b/common/Controller/Web/Nosotros.php index 7e62abd..c43ef60 100644 --- a/common/Controller/Web/Nosotros.php +++ b/common/Controller/Web/Nosotros.php @@ -1,12 +1,30 @@ render($response, 'nosotros'); + public function __invoke(Request $request, Response $response, View $view, Container $container) { + $filename = implode(DIRECTORY_SEPARATOR, [ + $container->get('folders.data'), + 'nosotros.json' + ]); + $nosotros = json_decode(trim(file_get_contents($filename))); + $nosotros = $this->str_split_unicode($nosotros, strlen($nosotros) / 2, '-'); + return $view->render($response, 'nosotros', compact('nosotros')); + } + protected function str_split_unicode($str, $l = 0) { + if ($l > 0) { + $ret = array(); + $len = mb_strlen($str, "UTF-8"); + for ($i = 0; $i < $len; $i += $l) { + $ret[] = mb_substr($str, $i, $l, "UTF-8"); + } + return $ret; + } + return preg_split("//u", $str, -1, PREG_SPLIT_NO_EMPTY); } } diff --git a/resources/views/faq.blade.php b/resources/views/faq.blade.php index c92762a..2ca55f2 100644 --- a/resources/views/faq.blade.php +++ b/resources/views/faq.blade.php @@ -7,42 +7,17 @@ FAQ's
-
- - Lorem ipsum? -
-
-

- dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco - laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat - cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor - incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. -

-
-
- - Duis aute irure dolor -
-
-
-
- - Reprehenderit in voluptate -
-
-
-
- - Velit esse cillum dolore -
-
-
-
- - Fugiat nulla pariatur -
-
-
+ @foreach ($faqs as $faq) +
+ + {{$faq->titulo}} +
+
+

+ {{$faq->contenido}} +

+
+ @endforeach
diff --git a/resources/views/home/aviso.blade.php b/resources/views/home/aviso.blade.php index 954b5cb..6c05b06 100644 --- a/resources/views/home/aviso.blade.php +++ b/resources/views/home/aviso.blade.php @@ -1,4 +1,4 @@ -@if (isset($aviso) and $aviso) +@if (isset($avisos->activo) and $avisos->activo)
@@ -9,7 +9,7 @@ Bono Pie 10%
- @foreach ($avisos as $i => $av) + @foreach ($avisos->avisos as $i => $av) @endforeach
@@ -22,7 +22,7 @@