Merge branch 'master' into develop
This commit is contained in:
commit
2f111d54ba
|
@ -48,9 +48,9 @@ public function __construct()
|
||||||
protected function validator(array $data)
|
protected function validator(array $data)
|
||||||
{
|
{
|
||||||
return Validator::make($data, [
|
return Validator::make($data, [
|
||||||
'name' => 'required|max:255',
|
'name' => 'required|string|max:255',
|
||||||
'email' => 'required|email|max:255|unique:users',
|
'email' => 'required|string|email|max:255|unique:users',
|
||||||
'password' => 'required|min:6|confirmed',
|
'password' => 'required|string|min:6|confirmed',
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -7,6 +7,8 @@
|
||||||
|
|
||||||
require('./bootstrap');
|
require('./bootstrap');
|
||||||
|
|
||||||
|
window.Vue = require('vue');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Next, we will create a fresh Vue application instance and attach it to
|
* Next, we will create a fresh Vue application instance and attach it to
|
||||||
* the page. Then, you may begin adding components to this application
|
* the page. Then, you may begin adding components to this application
|
||||||
|
|
|
@ -11,14 +11,6 @@ window.$ = window.jQuery = require('jquery');
|
||||||
|
|
||||||
require('bootstrap-sass');
|
require('bootstrap-sass');
|
||||||
|
|
||||||
/**
|
|
||||||
* Vue is a modern JavaScript library for building interactive web interfaces
|
|
||||||
* using reactive data binding and reusable components. Vue's API is clean
|
|
||||||
* and simple, leaving you to focus on building your next great project.
|
|
||||||
*/
|
|
||||||
|
|
||||||
window.Vue = require('vue');
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* We'll load the axios HTTP library which allows us to easily issue requests
|
* We'll load the axios HTTP library which allows us to easily issue requests
|
||||||
* to our Laravel back-end. This library automatically handles sending the
|
* to our Laravel back-end. This library automatically handles sending the
|
||||||
|
|
Loading…
Reference in New Issue