Merge branch 'master' into develop

.gitignore

@@ -1,5 +1,6 @@
 /node_modules
 /public/storage
+/storage/*.key
 /vendor
 /.idea
 Homestead.json

app/Http/Controllers/Auth/RegisterController.php

@@ -3,8 +3,8 @@
 namespace App\Http\Controllers\Auth;
 
 use App\User;
-use Validator;
 use App\Http\Controllers\Controller;
+use Illuminate\Support\Facades\Validator;
 use Illuminate\Foundation\Auth\RegistersUsers;
 
 class RegisterController extends Controller

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -20,6 +20,13 @@ class ResetPasswordController extends Controller
 
     use ResetsPasswords;
 
+    /**
+     * Where to redirect users after resetting their password.
+     *
+     * @var string
+     */
+    protected $redirectTo = '/home';
+
     /**
      * Create a new controller instance.
      *

config/filesystems.php

@@ -8,10 +8,8 @@ return [
     |--------------------------------------------------------------------------
     |
     | Here you may specify the default filesystem disk that should be used
-    | by the framework. A "local" driver, as well as a variety of cloud
+    | by the framework. The "local" disk, as well as a variety of cloud
-    | based drivers are available for your choosing. Just store away!
+    | based disks are available to your application. Just store away!
-    |
-    | Supported: "local", "ftp", "s3", "rackspace"
     |
     */
 
@@ -39,6 +37,8 @@ return [
     | may even configure multiple disks of the same driver. Defaults have
     | been setup for each driver as an example of the required options.
     |
+    | Supported Drivers: "local", "ftp", "s3", "rackspace"
+    |
     */
 
     'disks' => [

database/factories/ModelFactory.php

@@ -11,6 +11,7 @@
 |
 */
 
+/** @var \Illuminate\Database\Eloquent\Factory $factory */
 $factory->define(App\User::class, function (Faker\Generator $faker) {
     static $password;
 

database/migrations/.gitkeep

@@ -1 +0,0 @@
-

database/migrations/2014_10_12_000000_create_users_table.php

@@ -30,6 +30,6 @@ class CreateUsersTable extends Migration
      */
     public function down()
     {
-        Schema::drop('users');
+        Schema::dropIfExists('users');
     }
 }

database/migrations/2014_10_12_100000_create_password_resets_table.php

@@ -27,6 +27,6 @@ class CreatePasswordResetsTable extends Migration
      */
     public function down()
     {
-        Schema::drop('password_resets');
+        Schema::dropIfExists('password_resets');
     }
 }

database/seeds/.gitkeep

@@ -1 +0,0 @@
-

gulpfile.js

@@ -1,6 +1,6 @@
 const elixir = require('laravel-elixir');
 
-require('laravel-elixir-vue');
+require('laravel-elixir-vue-2');
 
 /*
  |--------------------------------------------------------------------------
@@ -9,11 +9,11 @@ require('laravel-elixir-vue');
  |
  | Elixir provides a clean, fluent API for defining some basic Gulp tasks
  | for your Laravel application. By default, we are compiling the Sass
- | file for our application, as well as publishing vendor resources.
+ | file for your application as well as publishing vendor resources.
  |
  */
 
-elixir(mix => {
+elixir((mix) => {
     mix.sass('app.scss')
        .webpack('app.js');
 });

package.json

@@ -8,11 +8,11 @@
     "bootstrap-sass": "^3.3.7",
     "gulp": "^3.9.1",
     "jquery": "^3.1.0",
-    "laravel-elixir": "^6.0.0-9",
+    "laravel-elixir": "^6.0.0-11",
-    "laravel-elixir-vue": "^0.1.4",
+    "laravel-elixir-vue-2": "^0.2.0",
     "laravel-elixir-webpack-official": "^1.0.2",
-    "lodash": "^4.14.0",
+    "lodash": "^4.16.2",
-    "vue": "^1.0.26",
+    "vue": "^2.0.1",
-    "vue-resource": "^0.9.3"
+    "vue-resource": "^1.0.3"
   }
 }

resources/assets/js/app.js

@@ -9,12 +9,12 @@ require('./bootstrap');
 
 /**
  * Next, we will create a fresh Vue application instance and attach it to
- * the body of the page. From here, you may begin adding components to
+ * the page. Then, you may begin adding components to this application
- * the application, or feel free to tweak this setup for your needs.
+ * or customize the JavaScript scaffolding to fit your unique needs.
  */
 
 Vue.component('example', require('./components/Example.vue'));
 
 const app = new Vue({
-    el: 'body'
+    el: '#app'
 });

resources/assets/js/bootstrap.js

@@ -26,7 +26,7 @@ require('vue-resource');
  */
 
 Vue.http.interceptors.push((request, next) => {
-    request.headers['X-CSRF-TOKEN'] = Laravel.csrfToken;
+    request.headers.set('X-CSRF-TOKEN', Laravel.csrfToken);
 
     next();
 });

resources/assets/js/components/Example.vue

@@ -16,7 +16,7 @@
 
 <script>
     export default {
-        ready() {
+        mounted() {
             console.log('Component ready.')
         }
     }

resources/assets/sass/_variables.scss

@@ -14,7 +14,7 @@ $brand-primary: #3097D1;
 $brand-info: #8eb4cb;
 $brand-success: #2ab27b;
 $brand-warning: #cbb956;
-$brand-danger:  #bf5329;
+$brand-danger: #bf5329;
 
 // Typography
 $font-family-sans-serif: "Raleway", sans-serif;

resources/views/welcome.blade.php

@@ -68,8 +68,12 @@
         <div class="flex-center position-ref full-height">
             @if (Route::has('login'))
                 <div class="top-right links">
-                    <a href="{{ url('/login') }}">Login</a>
+                    @if (Auth::check())
-                    <a href="{{ url('/register') }}">Register</a>
+                        <a href="{{ url('/home') }}">Home</a>
+                    @else
+                        <a href="{{ url('/login') }}">Login</a>
+                        <a href="{{ url('/register') }}">Register</a>
+                    @endif
                 </div>
             @endif