Browse Source

Merge branch 'master' into develop

Taylor Otwell 7 years ago
parent
commit
2f111d54ba

+ 3 - 3
app/Http/Controllers/Auth/RegisterController.php

@@ -48,9 +48,9 @@ class RegisterController extends Controller
     protected function validator(array $data)
     {
         return Validator::make($data, [
-            'name' => 'required|max:255',
-            'email' => 'required|email|max:255|unique:users',
-            'password' => 'required|min:6|confirmed',
+            'name' => 'required|string|max:255',
+            'email' => 'required|string|email|max:255|unique:users',
+            'password' => 'required|string|min:6|confirmed',
         ]);
     }
 

+ 2 - 0
resources/assets/js/app.js

@@ -7,6 +7,8 @@
 
 require('./bootstrap');
 
+window.Vue = require('vue');
+
 /**
  * Next, we will create a fresh Vue application instance and attach it to
  * the page. Then, you may begin adding components to this application

+ 0 - 8
resources/assets/js/bootstrap.js

@@ -11,14 +11,6 @@ window.$ = window.jQuery = require('jquery');
 
 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
  * to our Laravel back-end. This library automatically handles sending the