Pear-Trading/Foodloop-Server
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Did test and routing fixes and dependency fix

Browse source
This commit is contained in:
piratefinn 2017-04-24 17:42:07 +01:00
parent 2acee95d86
commit a4ce60407e
12 changed files with 116 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

21
lib/Pear/LocalLoop.pm
View file

@ -104,10 +104,11 @@ sub startup {
my $r = $self->routes;
$r->get('/')->to('root#index');
$r->post('/')->to('root#auth_login');
$r->get('/register')->to('register#index');
$r->post('/register')->to('register#register');
$r->any('/logout')->to('root#auth_logout');
$r->get('/admin')->to('admin#index');
$r->post('/admin')->to('admin#auth_login');
# $r->get('/register')->to('register#index');
# $r->post('/register')->to('register#register');
$r->any('/admin/logout')->to('admin#auth_logout');
my $api_public_get = $r->under('/api');
$api_public_get->get('/info/ages')->to('api-info#get_ages');
@ -142,7 +143,7 @@ sub startup {
my $admin_routes = $r->under('/admin')->to('admin#under');
$admin_routes->get('/')->to('admin#home');
$admin_routes->get('/home')->to('admin#home');
$admin_routes->get('/tokens')->to('admin-tokens#index');
$admin_routes->post('/tokens')->to('admin-tokens#create');
@ -160,14 +161,14 @@ sub startup {
$admin_routes->get('/organisations/pending/:id')->to('admin-organisations#pending_read');
$admin_routes->get('/organisations/pending/:id/approve')->to('admin-organisations#pending_approve');
my $user_routes = $r->under('/')->to('root#under');
# my $user_routes = $r->under('/')->to('root#under');
$user_routes->get('/home')->to('root#home');
# $user_routes->get('/home')->to('root#home');
my $portal_api = $r->under('/portal')->to('api-auth#check_json')->under('/')->to('portal#under');
# my $portal_api = $r->under('/portal')->to('api-auth#check_json')->under('/')->to('portal#under');
$portal_api->post('/upload')->to('api-upload#post_upload');
$portal_api->post('/search')->to('api-upload#post_search');
# $portal_api->post('/upload')->to('api-upload#post_upload');
# $portal_api->post('/search')->to('api-upload#post_search');
$self->hook( before_dispatch => sub {
my $self = shift;

21
lib/Pear/LocalLoop/Controller/Admin.pm
View file

@ -6,10 +6,8 @@ sub under {
if ( $c->is_user_authenticated ) {
return 1 if defined $c->current_user->administrator;
$c->redirect_to('/home');
} else {
$c->redirect_to('/');
}
$c->redirect_to('/');
return undef;
}
@ -31,4 +29,21 @@ sub home {
);
}
sub auth_login {
my $c = shift;
if ( $c->authenticate($c->param('email'), $c->param('password')) ) {
$c->redirect_to('/admin/home');
} else {
$c->redirect_to('/admin');
}
}
sub auth_logout {
my $c = shift;
$c->logout;
$c->redirect_to('/admin');
}
1;

6
lib/Pear/LocalLoop/Controller/Root.pm
View file

@ -4,9 +4,9 @@ use Mojo::Base 'Mojolicious::Controller';
sub index {
my $c = shift;
if ( $c->is_user_authenticated ) {
$c->redirect_to('/home');
}
# if ( $c->is_user_authenticated ) {
# $c->redirect_to('/home');
# }
}
sub under {