diff --git a/lib/Dojo.pm b/lib/Dojo.pm index 949f381..6f8fc1a 100644 --- a/lib/Dojo.pm +++ b/lib/Dojo.pm @@ -41,12 +41,12 @@ use Dojo::Model::Data; # ============================================================================= # admin ======================================================================= - $r->any('/admin/home')->to('home#admin_home'); - $r->any('/admin/radio')->to('home#admin_radio'); - $r->any('/admin/eventos')->to('home#admin_eventos'); - $r->any('/admin/eventos/:type'=> [type=>['e','p','c']])->to('home#admin_eventos'); - $r->any('/admin/mensajes')->to('home#admin_mensajes'); - $r->any('/admin/json/:dreq/:id')->to('home#admin_json'); + # $r->any('/admin/home')->to('home#admin_home'); + #$r->any('/admin/radio')->to('home#admin_radio'); + #$r->any('/admin/eventos')->to('home#admin_eventos'); + #$r->any('/admin/eventos/:type'=> [type=>['e','p','c']])->to('home#admin_eventos'); + #$r->any('/admin/mensajes')->to('home#admin_mensajes'); + #$r->any('/admin/json/:dreq/:id')->to('home#admin_json'); # ============================================================================= # login ======================================================================= @@ -55,6 +55,16 @@ use Dojo::Model::Data; my $logged_in = $r->under('/')->to('users#is_logged'); $logged_in->get('/radio')->to('home#radio'); + + my $admin = $r->under('/admin')->to('users#is_admin'); + $admin->any('')->to('home#admin'); + $admin->any('home')->to('home#admin_home'); + $admin->any('radio')->to('home#admin_radio'); + $admin->any('eventos')->to('home#admin_eventos'); + $admin->any('eventos/:type'=> [type=>['e','p','c']])->to('home#admin_eventos'); + $admin->any('mensajes')->to('home#admin_mensajes'); + $admin->any('json/:dreq/:id')->to('home#admin_json'); + # ============================================================================= diff --git a/lib/Dojo/Controller/Home.pm b/lib/Dojo/Controller/Home.pm index 7dca256..92e9057 100644 --- a/lib/Dojo/Controller/Home.pm +++ b/lib/Dojo/Controller/Home.pm @@ -115,6 +115,10 @@ sub tst{ # Admin ======================================================================= + sub admin{ + my $c= shift; + $c->redirect_to('/admin/home'); + } sub admin_home{ my $c=shift; $c->dbv->umod($c->param('link'),$c->param('update')) diff --git a/lib/Dojo/Controller/Users.pm b/lib/Dojo/Controller/Users.pm index 62f73dc..3046ca7 100644 --- a/lib/Dojo/Controller/Users.pm +++ b/lib/Dojo/Controller/Users.pm @@ -4,19 +4,34 @@ use Dojo::Support qw{ merge_hash load_module }; sub login { - my $c = shift; - $c->stash((load_module("users/login"))[0]); - my $user = $c->param('uname') // ''; - my $pass = $c->param('pass') //''; - $c->stash(layout=>"defaultContact"); - return $c->render unless my $pmid = $c->dbg->check($user, $pass); - $c->session(user => $user, pmid=>$pmid, nick=> $c->param('nick')); - $c->redirect_to('radio'); + my $self = shift; + #falta si el usuario ya está registrado y llama a login. + if ($self->session('ureq')//1 == 4){ + $self->stash( css=>["users/login/cssaForm.css"]); + $self->stash(template=>'users/logina') ; + $self->stash(layout=>"default"); + } + else{ + $self->stash( css=>["users/login/cssForm.css"]); + $self->stash(layout=>"defaultContact"); + } + my $user = $self->param('uname') // ''; + my $pass = $self->param('pass') //''; + return $self->render unless my $pmid = $self->dbg->check($user, $pass); + $self->session(user => $user, pmid=>$pmid, nick=> $self->param('nick')); + $self->redirect_to($self->session('prev')); } sub is_logged { my $self = shift; return 1 if $self->session('user'); + $self->session(prev=>$self->url_for); + $self->redirect_to('login'); +} +sub is_admin { + my $self = shift; + return 1 if ($self->session('pmid')==4); + $self->session(ureq=>4,prev=>$self->url_for); $self->redirect_to('login'); } diff --git a/public/users/login/cssaForm.css b/public/users/login/cssaForm.css new file mode 100755 index 0000000..bbb5cae --- /dev/null +++ b/public/users/login/cssaForm.css @@ -0,0 +1,46 @@ +section.hero{ + height:100vh; + background-repeat: no-repeat; + background-attachment: fixed; + background-size:cover; + background-image:url("puerta.jpg"); + background-position: center center; + +} +article.login{ + background: rgba(33, 33, 33, 0.8); + color:white; + margin: auto 0px auto auto; + padding: 50px 0px; + text-align: center; + min-width: 400px; + width: 36%; + min-height: 100vh; +} + +article.login p{ +margin: 20vh auto 20px; +font-size: 2em; +} + +article.login form{ + font-size:1.2em; +} + +label{ + display:block; + margin:10px 5px 15px 10px; +} + +form.login > input{ +} + +form.login > input#submit { + display:block; + margin:30px auto; + width:200px; + height:60px; +} + +form.login > .pass{ +} diff --git a/templates/home/htmlNav.html.ep b/templates/home/htmlNav.html.ep index 912245d..d31bffd 100644 --- a/templates/home/htmlNav.html.ep +++ b/templates/home/htmlNav.html.ep @@ -1,6 +1,6 @@