diff --git a/docker/Makefile b/docker/Makefile index a20cce805e39ace291b50e59a23af31b91a80d94..325cbfbe312f3f1e59076a1012bdf0df2482176a 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -68,7 +68,7 @@ start: ## Inicializa un entorno previamente inicializado con recreate-all @echo "========= Tupa (api-backend): http://localhost:${PORT_API_BACKEND}/${APP_API_BACKEND}" @echo "========= Tupa (api-frontend): http://localhost:${PORT_API_FRONTEND}/${APP_API_FRONTEND}" @echo "========= Tupa (frontend): http://localhost:${PORT_FRONTEND}/" - @echo "========= Tupa (visitas): http://localhost:${PORT_VISITAS}/${APP_VISITAS}" + @echo "========= Tupa (visitas): http://localhost:${PORT_VISITAS}" @echo "================================================================================" stop: ## Detiene todos los contenedores @@ -106,7 +106,7 @@ recreate-all: ## OjO, borra base de [meta]datos. Crea un entorno nuevo completo. @echo "========= Tupa (api-backend): http://localhost:${PORT_API_BACKEND}/${APP_API_BACKEND}" @echo "========= Tupa (api-frontend): http://localhost:${PORT_API_FRONTEND}/${APP_API_FRONTEND}" @echo "========= Tupa (frontend): http://localhost:${PORT_FRONTEND}/" - @echo "========= Tupa (visitas): http://localhost:${PORT_VISITAS}/${APP_VISITAS}" + @echo "========= Tupa (visitas): http://localhost:${PORT_VISITAS}" @echo "================================================================================" backend-regenerar: ## Regenerar metadatos del backend diff --git a/visitas/public/css/app.css b/visitas/public/css/app.css index 1977a40c177c06471f2bf9a88bd39737f9802213..abcf7560dc244f0b8dbd1a6a7299f984e303cfdc 100644 --- a/visitas/public/css/app.css +++ b/visitas/public/css/app.css @@ -1,7 +1,10 @@ -body{ - background:#f3f3f3; !important +nav{ + background-color:white !important; + border-background:1px solid grey; + box-shadow: 0px 0px 3px 0px rgba(0, 0, 0, 0.62); } + .contenedor-head h3{ font-weight: bold !important; padding-bottom: 20px; @@ -24,10 +27,14 @@ form label{ footer{ background:#343a40; - height: 40px; text-align: center; color:white; padding:10px; + font-size: 16px; +} + +footer a{ + color: #4ea1d0; } .btn-pers{ @@ -76,12 +83,18 @@ footer{ @media (max-width: 720px) { .contenedor{ - margin-top:15%; + margin-top:20%; } .codigo-pasaporte img{ width: 300px; } + + .contenedor-head h3{ + font-weight: bold !important; + padding-bottom: 20px; + font-size: 24px; + } } /*! diff --git a/visitas/public/img/logo_tupa_iso.png b/visitas/public/img/logo_tupa_iso.png new file mode 100644 index 0000000000000000000000000000000000000000..385d07626c440a874db52dfe7492d95692bd8225 Binary files /dev/null and b/visitas/public/img/logo_tupa_iso.png differ diff --git a/visitas/public/img/logo_tupa_original.png b/visitas/public/img/logo_tupa_original.png new file mode 100644 index 0000000000000000000000000000000000000000..a8f379e9ae57c995c78adf2e3f8b8deb019c5aef Binary files /dev/null and b/visitas/public/img/logo_tupa_original.png differ diff --git a/visitas/public/img/tupa_visitas.png b/visitas/public/img/tupa_visitas.png new file mode 100644 index 0000000000000000000000000000000000000000..9163229cf93a1503f0a714c125f343bc2e389ac8 Binary files /dev/null and b/visitas/public/img/tupa_visitas.png differ diff --git a/visitas/resources/views/declaracionJurada.blade.php b/visitas/resources/views/declaracionJurada.blade.php index fc0c138a637dc24076a59fc0d36176990e082f47..ceeef56116a8cd0d46677c7588e8e560641ddab5 100644 --- a/visitas/resources/views/declaracionJurada.blade.php +++ b/visitas/resources/views/declaracionJurada.blade.php @@ -14,7 +14,7 @@ <div id="declaracion-jurada"> <p>Por la presente declaro en carácter de declaración jurada que HE LEÃDO Y COMPRENDIDO LA INFORMACIÓN VERTIDA EN LA <a href="{{asset($url_terminos)}}" target="_blank">RESOLUCIÓN UNAM N°175/2020</a> y esta ampliación. <br> - Declaro fehacientemente que actualmente no presento + Declaro fehacientemente que actualmente no presento: <ul> <li>FIEBRE</li> <li>TOS</li> diff --git a/visitas/resources/views/plantilla.blade.php b/visitas/resources/views/plantilla.blade.php index be2020fb7e85c8543266096f125c9fcd24fd58d5..c90d05b2950b006bef37fe16a12d821931b2a8d6 100644 --- a/visitas/resources/views/plantilla.blade.php +++ b/visitas/resources/views/plantilla.blade.php @@ -4,6 +4,8 @@ <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> <title>Pase Unam</title> + <link href="{{url('/img/logo_tupa_iso.png')}}" rel="shortcut icon"> + <link href="{{url('/img/logo_tupa_iso.png')}}" rel="icon"> <link rel="stylesheet" type="text/css" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css"> <script src="https://code.jquery.com/jquery-3.5.1.min.js" @@ -15,16 +17,23 @@ {!! htmlScriptTagJsApi() !!} </head> <body> - <nav class="navbar navbar-dark bg-dark fixed-top no-imprimir"> - <span class="navbar-brand mb-0 h1"><img src="{{url('/img/logo_unam.png')}}" width="100px" alt=""></span> + <nav class="navbar navbar-pers fixed-top no-imprimir"> + <a href="{{route('declaracion_jurada')}}"> + <span class="navbar-brand ml-4 h1"> + <img src="{{url('/img/logo_unam.png')}}" width="120px" alt=""> + </span> + </a> + <div class="navbar-brand"> + <span class="navbar-brand mb-0 h1"><img src="{{url('/img/tupa_visitas.png')}}" width="130px" alt=""></span> + </div> </nav> <br><br> <div class="container"> @yield('seccion') </div> - <footer class='fixed-bottom'> - Desarrollado por el equipo de sistemas + <footer> + Desarrollado por el equipo de sistemas de Rectorado - <a href="mailto:sistemas@campus.unam.edu.ar">sistemas@campus.unam.edu.ar</a> </footer> </body> </html> diff --git a/visitas/routes/web.php b/visitas/routes/web.php index a53b9b20969582177078bab7fd0127b4586ca467..65e2f9f42ddc4bb67ff4bd7ed3a634148f689879 100644 --- a/visitas/routes/web.php +++ b/visitas/routes/web.php @@ -16,7 +16,7 @@ return view('welcome'); });*/ -Route::get('/', 'VisitasController@showDeclaracionJurada'); +Route::get('/', 'VisitasController@showDeclaracionJurada')->name('declaracion_jurada'); Route::match(['get', 'post'],'/solicitudPase', 'VisitasController@solicitudPase')->name('solicitud_pase');