Skip to content

2
2018_web_app
Commit 07199fb4 by gema
Options

1. rediseño del dashboard. creado un template y un menú especial para el… 

1. rediseño del dashboard. creado un template y un menú especial para el dashboard. 2. añadido logout en menú vertical y home. 3. ajustes carrito de la compra.
parent dc823c41
Showing with 128 additions and 30 deletions
fuel/app/classes/controller/login/index.php
......@@ -92,7 +92,7 @@ class Controller_Login_Index extends Controller
public function get_logout()
{
Auth::logout();
Session::destroy();
Response::redirect('/');
}
......
fuel/app/config/development/constants.php
......@@ -27,7 +27,7 @@
// Url redirect a DEL SUPER --> "https://delsuper.es/inutralia?ids=";
const DOMAIN = "http://inutralia20back";
const DOMAIN = "http://inutraliaback20";
const V1 = '/api/v1/';
const APIKEY = "?api-key=7745289b-f09c-4e0b-89d1-bb59c599c85e";
......
fuel/app/views/dashboard/index.twig
{% extends 'layout/template.twig' %}
{% extends 'layout/template_dashboard.twig' %}
{% block content %}
<div class="container pt-container-ppal">
<div class="row">
......@@ -41,31 +41,41 @@
</div>
</div>
<div class="col-md-5">
<div class="row item-list-style mt30">
<div class="col-xs-10"> Inicio</div>
<div class="col-xs-2"><i class="fa fa-angle-right"></i></div>
{#logo#}
<div class="text-center mt40">
<img src="assets/img/logos/inutralia_big.png" class="img-responsive-custom "/>
</div>
<a href="recetario">
<div class="row item-list-style">
<div class="col-xs-10"> Recetario</div>
<div class="col-xs-2"><i class="fa fa-angle-right"></i></div>
</div>
</a>
<a href="boletin-saludable">
<div class="row item-list-style">
<div class="col-xs-10">Boletín saludable</div>
<div class="col-xs-2"><i class="fa fa-angle-right"></i></div>
</div>
</a>
<div class="mt40">
{#otras seccions links#}
<a href="recetario ">
<div class="row item-list-style mt30">
<div class="col-xs-10"> Recetario</div>
<div class="col-xs-2"><i class="fa fa-angle-right"></i></div>
</div>
</a>
<a href="boletin-saludable">
<div class="row item-list-style">
<div class="col-xs-10">Boletín saludable</div>
<div class="col-xs-2"><i class="fa fa-angle-right"></i></div>
</div>
</a>
<a href="lista-compra">
<div class="row item-list-style">
<div class="col-xs-10">Lista de la compra </div>
<div class="col-xs-2"><i class="fa fa-angle-right"></i></div>
</div>
</a>
<a href="lista-compra">
<div class="row item-list-style">
<div class="col-xs-10">Lista de la compra </div>
<div class="col-xs-2"><i class="fa fa-angle-right"></i></div>
<div class="logout-home-position" style="margin-top:30%;">
<h2 class="mt40">Bienvenid@</br>
Gema</h2>
<a href="auth/logout" class="btn btn-custom btn-other">Cerrar Sesión <i class="fa fa-sign-out"></i> </a>
</div>
</a>
</div>
</div>
</div>
......
fuel/app/views/layout/menu.twig
......@@ -27,6 +27,8 @@
<li><a href="recetario">Recetario</a></li>
<li><a href="boletin-saludable">Boletín saludable</a></li>
<li><a href="lista-compra">Lista de la compra</a></li>
<li><a href="auth/logout" class="color-other">Cerrar Sesión <i class="fa fa-sign-out" style="font-size:20px;"></i></a></li>
</ul>
</nav>
</div>
\ No newline at end of file
fuel/app/views/layout/menu_dashboard.twig 0 → 100644
<!--*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*MENU PRINCIPAL-*-*-*-*--*-*-*-*-*-*-*-*-*-*-*-*-*-*-***-->
<div class="mt-menu-horizontal container">
<nav class="navbar navbar-fixed-top" role="navigation" style="background-color: white;">
<div class="container">
<div class="row mt20">
<div class="col-xs-2 text-left">
<a type="button" id="trigger-overlay" >
<i class="fa fa-bars fa-2x line-height-60 color-menu-personalizado"></i>
</a>
</div>
<div class="col-xs-10 text-right">
</div>
</div>
</div>
</nav>
</div>
<!-- open/close menu content -->
<div class="overlay overlay overlay-contentpush">
<button type="button" class="overlay-close">Close</button>
<nav>
<ul>
<li><a href="dashboard">Inicio</a></li>
<li><a href="perfil">Mi Perfil</a></li>
<li><a href="menupersonalizado" >Menú Personalizado</a></li>
<li><a href="menussaludables" >Menús Saludables</a></li>
<li><a href="recetario">Recetario</a></li>
<li><a href="boletin-saludable">Boletín saludable</a></li>
<li><a href="lista-compra">Lista de la compra</a></li>
<li><a href="auth/logout" class="color-other">Cerrar Sesión <i class="fa fa-sign-out" style="font-size:20px;"></i></a></li>
</ul>
</nav>
</div>
\ No newline at end of file
fuel/app/views/layout/template_dashboard.twig 0 → 100644
<!DOCTYPE html>
<!--[if lt IE 7]> <html class="ie lt-ie9 lt-ie8 lt-ie7"> <![endif]-->
<!--[if IE 7]> <html class="ie lt-ie9 lt-ie8"> <![endif]-->
<!--[if IE 8]> <html class="ie lt-ie9"> <![endif]-->
<!--[if gt IE 8]> <html class="ie gt-ie8"> <![endif]-->
<!--[if !IE]><!-->
<html><!-- <![endif]-->
<head>
<base href="{{ base_url(false) }}">
<title>
{% block title %}
APP| {{ session_get('empresa').nombre_largo }}
{% endblock %}
</title>
<link rel="shortcut icon" href="/assets/img/favicon.ico">
<meta charset="UTF-8" />
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=0, minimum-scale=1.0, maximum-scale=1.0">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<meta http-equiv="X-UA-Compatible" content="IE=9; IE=8; IE=7; IE=EDGE" />
<!--includes css-->
{% include 'includes/includes_before.twig' %}
</head>
<body>
<!--loading -->
<div class="se-pre-con" style="z-index:9999"></div>
<!--menú vertical y horizontal-->
{% include 'layout/menu_dashboard.twig' %}
<!--content-->
<div>
{% block content %}
{% endblock %}
</div>
<!--includes js-->
{% include 'includes/includes_after.twig' %}
</body>
</html>
fuel/app/views/listacompra/index.twig
......@@ -31,12 +31,12 @@
</div>
<div class="col-md-6">
<!--logo del super-->
<div class="text-center">
<h2>Haz la compra necesaria para tu conseguir tu menú en el supermercado DelSuper</h2>
<div class="text-center mt40">
<h2>Haz la compra necesaria para la elaboración de tu menú en el supermercado DelSuper</h2>
<img src="assets/img/listacompra/logo-del-super.png" class="img-responsive-custom"/>
</div>
<!--botones-->
<div class="row">
<div class="row mt40">
<div class="col-md-6">
<button class="btn btn-custom btn-delete mt20" ><i class="fa fa-trash"></i> Todos</button>
</div>
......
fuel/app/views/menupersonalizado/index.twig
......@@ -190,7 +190,7 @@
<div class="row">
<div class="col-md-4 col-md-offset-8">
<button class="btn btn-custom btn-menu-personalizado mt20" ><i class="fa fa-save"></i> Guardar Perfil</button>
<button class="btn btn-custom btn-menu-personalizado mt20" ><i class="fa fa-save"></i> Guardar Selección</button>
</div>
</div>
......
fuel/app/views/menussaludables/menu/index.twig
......@@ -179,7 +179,7 @@
<div class="row">
<div class="col-md-4 col-md-offset-8">
<button class="btn btn-custom btn-menus-saludables mt20" ><i class="fa fa-save"></i> Guardar Perfil</button>
<button class="btn btn-custom btn-menus-saludables mt20" ><i class="fa fa-save"></i> Guardar Selección</button>
</div>
</div>
......
public/assets/css/custom.css
......@@ -18,7 +18,7 @@ body{
.color-menus-saludables {color:#92bb00}
.color-menus-saludables-light {color:#cdde87}
.color-trivial {color:#b3b3b3;}
.color-other {color:#000;}
.color-other {color:#000!important;}
.bg-color-menu-personalizado{background-color:#c966cd; }
.bg-color-menu-personalizado-light{background-color:#dea1e0; }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment