Updated Laravel to 5.7, changed ResetPasswordController and ForgotPas…

…swordController to utilize new method signatures for 5.7. Updated asset directories per the new 5.7 spec, and updated the associated webpack and package.json references.

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -23,10 +23,11 @@ public function __construct()
     /**
      * Get the response for a successful password reset link.
      *
+     * @param  \Illuminate\Http\Request $request
      * @param  string  $response
      * @return \Illuminate\Http\RedirectResponse
      */
-    protected function sendResetLinkResponse($response)
+    protected function sendResetLinkResponse(Request $request, $response)
     {
         return ['status' => trans($response)];
     }

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -23,10 +23,11 @@ public function __construct()
     /**
      * Get the response for a successful password reset.
      *
+     * @param  \Illuminate\Http\Request $request
      * @param  string  $response
      * @return \Illuminate\Http\RedirectResponse
      */
-    protected function sendResetResponse($response)
+    protected function sendResetResponse(Request $request, $response)
     {
         return ['status' => trans($response)];
     }

composer.json

@@ -7,7 +7,7 @@
     "require": {
         "php": "^7.1.3",
         "fideloper/proxy": "^4.0",
-        "laravel/framework": "5.6.*",
+        "laravel/framework": "5.7.*",
         "laravel/socialite": "^3.0",
         "laravel/tinker": "~1.0",
         "tymon/jwt-auth": "^1.0.0-rc.2"

package.json

@@ -8,7 +8,7 @@
     "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
     "prod": "npm run production",
     "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
-    "lint": "vue-cli-service lint resources/assets/js"
+    "lint": "vue-cli-service lint resources/js"
   },
   "dependencies": {
     "@fortawesome/fontawesome": "^1.1.7",

webpack.mix.js

@@ -5,8 +5,8 @@ const mix = require('laravel-mix')
 mix.config.vue.esModule = true
 
 mix
-  .js('resources/assets/js/app.js', 'public/js')
-  .sass('resources/assets/sass/app.scss', 'public/css')
+  .js('resources/js/app.js', 'public/js')
+  .sass('resources/sass/app.scss', 'public/css')
 
   .sourceMaps()
   .disableNotifications()
@@ -40,7 +40,7 @@ mix.webpackConfig({
   resolve: {
     extensions: ['.js', '.json', '.vue'],
     alias: {
-      '~': path.join(__dirname, './resources/assets/js')
+      '~': path.join(__dirname, './resources/js')
     }
   },
   output: {