parent
3ae0604057
commit
30d6ec3322
|
@ -50,8 +50,7 @@ class RegisterController extends Controller
|
|||
return Validator::make($data, [
|
||||
'name' => 'required|string|max:255',
|
||||
'email' => 'required|string|email|max:255|unique:users',
|
||||
'password' => 'required|string|min:6|confirmed',
|
||||
'username' => 'required|string|max:20|unique:users'
|
||||
'password' => 'required|string|min:6|confirmed'
|
||||
]);
|
||||
}
|
||||
|
||||
|
@ -66,8 +65,7 @@ class RegisterController extends Controller
|
|||
return User::create([
|
||||
'name' => $data['name'],
|
||||
'email' => $data['email'],
|
||||
'password' => bcrypt($data['password']),
|
||||
'username' => $data['username']
|
||||
'password' => bcrypt($data['password'])
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -32,8 +32,7 @@ class UserControllerAPI extends Controller
|
|||
{
|
||||
$request->validate([
|
||||
'name' => 'required',
|
||||
'email' => 'required|email|unique:users,email',
|
||||
'username' => 'required|unique:email',
|
||||
'email' => 'required|email|unique:users',
|
||||
'password' => 'min:3'
|
||||
]);
|
||||
$user = new User();
|
||||
|
@ -47,8 +46,8 @@ class UserControllerAPI extends Controller
|
|||
{
|
||||
$request->validate([
|
||||
'name' => 'required',
|
||||
'email' => 'required|email|unique:users,email,'.$id,
|
||||
'age' => 'integer|between:18,75'
|
||||
'email' => 'required|email|unique:users'.$id,
|
||||
'password' => 'min:3'
|
||||
]);
|
||||
$user = User::findOrFail($id);
|
||||
$user->update($request->all());
|
||||
|
|
|
@ -25,7 +25,6 @@ class InitialMigrations extends Migration
|
|||
$table->string('email')->unique();
|
||||
$table->string('password');
|
||||
$table->rememberToken();
|
||||
$table->integer('age');
|
||||
//$table->integer('department_id')->unsigned();
|
||||
//$table->foreign('department_id')->references('id')->on('departments');
|
||||
$table->timestamps();
|
||||
|
@ -45,7 +44,6 @@ class InitialMigrations extends Migration
|
|||
*/
|
||||
public function down()
|
||||
{
|
||||
Schema::dropIfExists('departments');
|
||||
Schema::dropIfExists('password_resets');
|
||||
Schema::dropIfExists('users');
|
||||
}
|
||||
|
|
|
@ -1,34 +0,0 @@
|
|||
<?php
|
||||
|
||||
use Illuminate\Database\Seeder;
|
||||
|
||||
class DepartmentsTableSeeder extends Seeder
|
||||
{
|
||||
/**
|
||||
* Run the database seeds.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function run()
|
||||
{
|
||||
$departments = [
|
||||
'Ciências Jurídicas',
|
||||
'Ciências da Linguagem',
|
||||
'Engenharia do Ambiente',
|
||||
'Engenharia Civil',
|
||||
'Engenharia Eletrotécnica',
|
||||
'Engenharia Informática',
|
||||
'Engenharia Mecânica',
|
||||
'Gestão e Economia',
|
||||
'Matemática'
|
||||
];
|
||||
$createdAt = Carbon\Carbon::now()->subMonths(2);
|
||||
foreach ($departments as $department) {
|
||||
DB::table('departments')->insert([
|
||||
'name' => $department,
|
||||
'created_at' => $createdAt,
|
||||
'updated_at' => $createdAt,
|
||||
]);
|
||||
}
|
||||
}
|
||||
}
|
|
@ -30,7 +30,6 @@ class UsersTableSeeder extends Seeder
|
|||
'email' => $faker->unique()->safeEmail,
|
||||
'password' => $password ?: $password = bcrypt('secret'),
|
||||
'remember_token' => str_random(10),
|
||||
'age' => $faker->numberBetween(18, 75),
|
||||
//'department_id' => $departmentId,
|
||||
'created_at' => $createdAt,
|
||||
'updated_at' => $updatedAt,
|
||||
|
|
|
@ -46829,15 +46829,17 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
|
|||
// guardar na localStorage o token
|
||||
localStorage.setItem('token', token);
|
||||
// user já se encontra logado e com a sessão guardada
|
||||
console.log('AQUI CHEGA!');
|
||||
|
||||
_this.$router.push('/multiplayerGame');
|
||||
_this.$router.push('/');
|
||||
}).catch(function (loginError) {
|
||||
// Something went wrong!
|
||||
console.log('Login Error: ' + loginError);
|
||||
|
||||
_this.loginError = true;
|
||||
});
|
||||
},
|
||||
register: function register() {
|
||||
this.$router.push('/register');
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -46936,7 +46938,15 @@ var render = function() {
|
|||
_vm._v(" "),
|
||||
_c(
|
||||
"a",
|
||||
{ staticClass: "btn btn-default", attrs: { to: "/register" } },
|
||||
{
|
||||
staticClass: "btn btn-default",
|
||||
on: {
|
||||
click: function($event) {
|
||||
$event.preventDefault()
|
||||
_vm.register()
|
||||
}
|
||||
}
|
||||
},
|
||||
[_vm._v("Register")]
|
||||
)
|
||||
])
|
||||
|
@ -47189,41 +47199,35 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
|
|||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
|
||||
|
||||
/* harmony default export */ __webpack_exports__["default"] = ({
|
||||
data: function data() {
|
||||
return {
|
||||
user: {
|
||||
username: '',
|
||||
email: '',
|
||||
password: '',
|
||||
name: ''
|
||||
email: null,
|
||||
password: null,
|
||||
name: null
|
||||
|
||||
},
|
||||
registerError: false
|
||||
}
|
||||
//registerError: false
|
||||
};
|
||||
},
|
||||
|
||||
methods: {
|
||||
register: function register() {
|
||||
axios.post('api/register', {
|
||||
username: user.username,
|
||||
email: user.email,
|
||||
password: user.password,
|
||||
name: user.name
|
||||
axios.post('/api/register', {
|
||||
email: this.user.email,
|
||||
password: this.user.password,
|
||||
name: this.user.name
|
||||
}).then(function (response) {
|
||||
// guarda logo o token do registado
|
||||
localStorage.setItem('token', response.data.access_token);
|
||||
console.log(response);
|
||||
//this.$router.push('/');
|
||||
}).catch(function (registerError) {
|
||||
console.log(registerError);
|
||||
// Something went wrong!
|
||||
//this.registerError = true;
|
||||
|
||||
console.log('Login Error: ' + registerError);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@ -47249,38 +47253,6 @@ var render = function() {
|
|||
}
|
||||
},
|
||||
[
|
||||
_c("div", { staticClass: "control-group" }, [
|
||||
_c(
|
||||
"label",
|
||||
{ staticClass: "control-label", attrs: { for: "username" } },
|
||||
[_vm._v("Username")]
|
||||
),
|
||||
_vm._v(" "),
|
||||
_c("div", { staticClass: "controls" }, [
|
||||
_c("input", {
|
||||
directives: [
|
||||
{
|
||||
name: "model",
|
||||
rawName: "v-model",
|
||||
value: _vm.user.username,
|
||||
expression: "user.username"
|
||||
}
|
||||
],
|
||||
staticClass: "input-xlarge",
|
||||
attrs: { type: "text", id: "username", name: "username" },
|
||||
domProps: { value: _vm.user.username },
|
||||
on: {
|
||||
input: function($event) {
|
||||
if ($event.target.composing) {
|
||||
return
|
||||
}
|
||||
_vm.$set(_vm.user, "username", $event.target.value)
|
||||
}
|
||||
}
|
||||
})
|
||||
])
|
||||
]),
|
||||
_vm._v(" "),
|
||||
_c("div", { staticClass: "control-group" }, [
|
||||
_c("label", { staticClass: "control-label", attrs: { for: "email" } }, [
|
||||
_vm._v("E-mail")
|
||||
|
@ -47377,22 +47349,27 @@ var render = function() {
|
|||
])
|
||||
]),
|
||||
_vm._v(" "),
|
||||
_vm._m(0)
|
||||
_c("div", { staticClass: "control-group" }, [
|
||||
_c("div", { staticClass: "controls" }, [
|
||||
_c(
|
||||
"a",
|
||||
{
|
||||
staticClass: "btn btn-default",
|
||||
on: {
|
||||
click: function($event) {
|
||||
$event.preventDefault()
|
||||
_vm.register()
|
||||
}
|
||||
}
|
||||
},
|
||||
[_vm._v("Register")]
|
||||
)
|
||||
])
|
||||
])
|
||||
]
|
||||
)
|
||||
}
|
||||
var staticRenderFns = [
|
||||
function() {
|
||||
var _vm = this
|
||||
var _h = _vm.$createElement
|
||||
var _c = _vm._self._c || _h
|
||||
return _c("div", { staticClass: "control-group" }, [
|
||||
_c("div", { staticClass: "controls" }, [
|
||||
_c("button", { staticClass: "btn btn-success" }, [_vm._v("Register")])
|
||||
])
|
||||
])
|
||||
}
|
||||
]
|
||||
var staticRenderFns = []
|
||||
render._withStripped = true
|
||||
module.exports = { render: render, staticRenderFns: staticRenderFns }
|
||||
if (false) {
|
||||
|
|
|
@ -1,42 +0,0 @@
|
|||
<template>
|
||||
<table class="table table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Name</th>
|
||||
<th>Date</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="department in departments" :key="department.id">
|
||||
<td>{{ department.name }}</td>
|
||||
<td>{{ department.date }}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</template>
|
||||
|
||||
<script type="text/javascript">
|
||||
// Component code (not registered)
|
||||
module.exports={
|
||||
data: function () {
|
||||
return {
|
||||
departments: []
|
||||
}
|
||||
},
|
||||
mounted(){
|
||||
if (this.$root.departments.length === 0) {
|
||||
axios.get('api/departments')
|
||||
.then(response=>{
|
||||
this.$root.departments = response.data.data;
|
||||
this.departments = this.$root.departments;
|
||||
})
|
||||
} else {
|
||||
this.departments = this.$root.departments;
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
/* Specific style applied only on the component*/
|
||||
</style>
|
|
@ -16,7 +16,7 @@
|
|||
<div class="text-center">
|
||||
<a class="btn btn-primary" v-on:click.prevent="login()">Login</a>
|
||||
<br><br>
|
||||
<a class="btn btn-default" to="/register">Register</a>
|
||||
<a class="btn btn-default" v-on:click.prevent="register()">Register</a>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
|
@ -59,6 +59,10 @@ export default {
|
|||
|
||||
});
|
||||
|
||||
},
|
||||
register() {
|
||||
this.$router.push('/register');
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1,12 +1,5 @@
|
|||
<template>
|
||||
|
||||
<form @submit.prevent="register(user)">
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="username">Username</label>
|
||||
<div class="controls">
|
||||
<input type="text" v-model="user.username" id="username" name="username" class="input-xlarge">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="email">E-mail</label>
|
||||
|
@ -32,7 +25,7 @@
|
|||
<div class="control-group">
|
||||
<!-- Button -->
|
||||
<div class="controls">
|
||||
<button class="btn btn-success">Register</button>
|
||||
<a class="btn btn-default" v-on:click.prevent="register()">Register</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
@ -46,29 +39,32 @@ export default {
|
|||
data() {
|
||||
return {
|
||||
user : {
|
||||
username : '',
|
||||
email: '',
|
||||
password : '',
|
||||
name : '',
|
||||
email: null,
|
||||
password : null,
|
||||
name : null,
|
||||
|
||||
},
|
||||
registerError: false
|
||||
//registerError: false
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
register: function() {
|
||||
axios.post('api/register', {
|
||||
username : user.username,
|
||||
email : user.email,
|
||||
password : user.password,
|
||||
name : user.name
|
||||
}).then( function(response) {
|
||||
// guarda logo o token do registado
|
||||
localStorage.setItem('token', response.data.access_token);
|
||||
axios.post('/api/register', {
|
||||
email : this.user.email,
|
||||
password : this.user.password,
|
||||
name : this.user.name
|
||||
}).then(response => {
|
||||
console.log(response);
|
||||
//this.$router.push('/');
|
||||
}).catch(registerError => {
|
||||
console.log(registerError);
|
||||
});
|
||||
},
|
||||
// Something went wrong!
|
||||
//this.registerError = true;
|
||||
|
||||
console.log('Login Error: ' + registerError);
|
||||
|
||||
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -4,18 +4,19 @@
|
|||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
@yield('metatags')
|
||||
|
||||
@yield('metatags')
|
||||
<title>@yield('title')</title>
|
||||
@yield('extrastyles')
|
||||
@yield('extrastyles')
|
||||
<!-- Latest compiled and minified CSS & JS -->
|
||||
<link rel="stylesheet" href="{{ URL::asset('css/app.css') }}">
|
||||
|
||||
</head>
|
||||
</head>
|
||||
<body>
|
||||
<div class="container" id="app">
|
||||
@yield('content')
|
||||
</div>
|
||||
|
||||
@yield('pagescript')
|
||||
@yield('pagescript')
|
||||
</body>
|
||||
</html>
|
||||
|
|
Loading…
Reference in New Issue