mirror of
https://github.com/exane/not-gwent-online
synced 2024-10-31 10:36:53 +00:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
28aefb4417
@ -18,8 +18,23 @@ module.exports = {
|
||||
|
||||
if( ! this.username || ! this.password || ! this.email) {
|
||||
$('.form-error').hide().fadeIn('fast');
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
$('.form-error').hide();
|
||||
$('.icon-action-load').show();
|
||||
|
||||
this.$http.post('./api/register', this.$data, function(data) {
|
||||
|
||||
location.reload();
|
||||
|
||||
}).error(function (data) {
|
||||
|
||||
$('.icon-action-load').hide();
|
||||
|
||||
})
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
@ -1,5 +1,5 @@
|
||||
.icon-load {
|
||||
background: url(../img/load.gif) no-repeat;
|
||||
.icon-action-load {
|
||||
background: url(../img/action-load.gif) no-repeat;
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
float: right;
|
||||
|
@ -1,5 +1,23 @@
|
||||
<?php
|
||||
|
||||
// todo: move to controllers
|
||||
use Gwent\User;
|
||||
use Illuminate\Support\Facades\Request;
|
||||
|
||||
Route::group(['prefix' => 'api'], function() {
|
||||
|
||||
post('/register', function() {
|
||||
$user = new User();
|
||||
$user->username = Request::input('username');
|
||||
$user->email = Request::input('email');
|
||||
$user->password = bcrypt(Request::input('password'));
|
||||
$user->save();
|
||||
|
||||
Auth::login($user);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
get('/lobby', function() {
|
||||
return innerView();
|
||||
});
|
||||
|
Loading…
Reference in New Issue
Block a user