- larvale version 5.6 to 5.8

app/Http/Controllers/Auth/LoginController.php

@@ -4,7 +4,6 @@ namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
-use Illuminate\Http\Request;
 
 class LoginController extends Controller
 {
@@ -38,14 +37,14 @@ class LoginController extends Controller
         $this->middleware('guest', ['except' => 'logout']);
     }
 
-    public function logout(Request $request)
+    // public function logout(Request $request)
-    {
+    // {
-        $this->guard()->logout();
+    //     $this->guard()->logout();
 
-        $request->session()->flush();
+    //     $request->session()->flush();
 
-        $request->session()->regenerate();
+    //     $request->session()->regenerate();
 
-        return redirect('/');
+    //     return redirect('/');
-    }
+    // }
 }

composer.json

@@ -13,15 +13,16 @@
 		"davejamesmiller/laravel-breadcrumbs": "5.x",
 		"felixkiss/uniquewith-validator": "^3.1",
 		"fideloper/proxy": "^4.0",
-		"laravel/framework": "5.6.*",
+		"laravel/framework": "^5.8.0",
 		"laravel/tinker": "^1.0",
 		"laravelcollective/html": "^5.6",
 		"mcamara/laravel-localization": "^1.3",
 		"solarium/solarium": "^3.8",
-		"yajra/laravel-datatables-oracle": "^8.8",
+		"yajra/laravel-datatables-oracle": "^9.0",
 		"zizaco/entrust": "^1.9"
 	},
 	"require-dev": {
+		"composer/composer": "^1.9",
 		"fzaninotto/faker": "^1.8",
 		"phpunit/phpunit": "^7.0",
 		"squizlabs/php_codesniffer": "^3.4"
@@ -39,23 +40,22 @@
 		}
 	},
 	"autoload-dev": {
-		"classmap": [
+		"psr-4": {
-			"tests/TestCase.php"
+			"Tests\\": "tests/"
-		]
+		}
 	},
 	"scripts": {
 		"post-install-cmd": [
-			"php artisan clear-compiled",
+			"@php artisan clear-compiled"
-			"php artisan optimize"
 		],
 		"post-create-project-cmd": [
 			"php -r \"copy('.env.example', '.env');\"",
-			"php artisan key:generate"
+			"@php artisan key:generate --ansi"
 		],
 		"post-autoload-dump": [
-            "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
+			"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
-            "@php artisan package:discover"
+			"@php artisan package:discover --ansi"
-        ]
+		]
 	},
 	"config": {
 		"preferred-install": "dist",

config/app.php

@@ -202,9 +202,10 @@ return [
     'aliases' => [
 
         'App'       => 'Illuminate\Support\Facades\App',
+        'Arr' => Illuminate\Support\Arr::class,
         'Artisan'   => 'Illuminate\Support\Facades\Artisan',
-        'Auth'      => 'Illuminate\Support\Facades\Auth',
+        'Auth' => Illuminate\Support\Facades\Auth::class,
-        'Blade'     => 'Illuminate\Support\Facades\Blade',
+        'Blade' => Illuminate\Support\Facades\Blade::class,
         'Broadcast' => Illuminate\Support\Facades\Broadcast::class,
         'Bus'       => 'Illuminate\Support\Facades\Bus',
         'Cache'     => 'Illuminate\Support\Facades\Cache',

resources/js/search/search-results/facet-list-class.ts

@@ -1,5 +1,5 @@
 import { Component, Vue, Prop, Provide } from 'vue-property-decorator';
-import FilterItem from './../models/filter-item';
+import FilterItem from '../models/filter-item';
 
 @Component
 export default class FacetList extends Vue {

resources/views/auth/login.blade.php

@@ -38,7 +38,7 @@
                         <input name="remember" id="remember" type="checkbox"> Remember me
                     </label>
                     <button type="submit" class="pure-button pure-button-primary">Login</button>
-                    <a class="btn btn-link" href="{{ url('/password/email') }}">Forgot Your Password?</a>
+                    {{-- <a class="btn btn-link" href="{{ url('/password/email') }}">Forgot Your Password?</a> --}}
                 </div>
             </form>
         </div>

routes/web.php

@@ -1,5 +1,6 @@
 <?php
 use Illuminate\Support\Facades\Route;
+use Illuminate\Support\Facades\Auth;
 
 /*
 |--------------------------------------------------------------------------
@@ -512,15 +513,17 @@ Route::get('history', [
 // 'auth' => 'Auth\AuthController',
 // 'password' => 'Auth\PasswordController',
 // ]);
-//Auth::routes();
+// Auth::routes();
-$this->get('login', 'Auth\LoginController@showLoginForm')->name('login');
+// Authentication Routes...
-$this->post('login', 'Auth\LoginController@login');
+ Route::get('login', 'Auth\LoginController@showLoginForm')->name('login');
-$this->get('logout', 'Auth\LoginController@logout')->name('logout');
+ Route::post('login', 'Auth\LoginController@login');
-// Registration Routes...
+ Route::get('logout', 'Auth\LoginController@logout')->name('logout');
-$this->get('register', 'Auth\RegisterController@showRegistrationForm')->name('register');
+
-$this->post('register', 'Auth\RegisterController@register');
+// // Registration Routes...
-// Password Reset Routes...
+// Route::get('register', 'Auth\RegisterController@showRegistrationForm')->name('register');
-$this->get('password/reset', 'Auth\ForgotPasswordController@showLinkRequestForm')->name('password.request');
+// Route::post('register', 'Auth\RegisterController@register');
-$this->post('password/email', 'Auth\ForgotPasswordController@sendResetLinkEmail')->name('password.email');
+// // // Password Reset Routes...
-$this->get('password/reset/{token}', 'Auth\ResetPasswordController@showResetForm')->name('password.reset');
+// Route::get('password/reset', 'Auth\ForgotPasswordController@showLinkRequestForm')->name('password.request');
-$this->post('password/reset', 'Auth\ResetPasswordController@reset');
+// Route::post('password/email', 'Auth\ForgotPasswordController@sendResetLinkEmail')->name('password.email');
+// Route::get('password/reset/{token}', 'Auth\ResetPasswordController@showResetForm')->name('password.reset');
+// Route::post('password/reset', 'Auth\ResetPasswordController@reset');

tsconfig.json

@@ -8,6 +8,6 @@
         "experimentalDecorators": true,
     },
     "include": [
-        "resources/assets/js/**/*"
+        "resources/js/**/*"
     ]
 }

webpack.mix.js

@@ -14,17 +14,17 @@ let mix = require('laravel-mix');
 
 // .sass('resources/assets/sass/app1.scss', 'public/css')
 
-mix.js('resources/assets/js/datasetPublish.js', 'public/backend/publish')
+mix.js('resources/js/datasetPublish.js', 'public/backend/publish')
-    .js('resources/assets/js/search/main.ts', 'public/js/search')
+    .js('resources/js/search/main.ts', 'public/js/search')
-    .js('resources/assets/js/app.js', 'public/js')
+    .js('resources/js/app.js', 'public/js')
-    .js('resources/assets/js/lib.js', 'public/js')
+    .js('resources/js/lib.js', 'public/js')
-    .js('resources/assets/js/releaseDataset.js', 'public/backend/publish')
+    .js('resources/js/releaseDataset.js', 'public/backend/publish')
-    .js('resources/assets/js/approveDataset.js', 'public/backend/publish')
+    .js('resources/js/approveDataset.js', 'public/backend/publish')
-    .js('resources/assets/js/ckeditor.js', 'public/backend/')   
+    .js('resources/js/ckeditor.js', 'public/backend/')   
-    .sass('resources/assets/sass/app1.scss', 'public/css', { implementation: require('node-sass')})
+    .sass('resources/sass/app1.scss', 'public/css', { implementation: require('node-sass')})
     //.sass('node_modules/purecss/build/pure.css', 'public/css', { implementation: require('node-sass') })
-    .sass('resources/assets/sass/font-awesome.scss', 'public/css', { implementation: require('node-sass') })
+    .sass('resources/sass/font-awesome.scss', 'public/css', { implementation: require('node-sass') })
-    .js('resources/assets/js/scripts.js', 'public/js')   
+    .js('resources/js/scripts.js', 'public/js')   
     .scripts([
         'node_modules/datatables.net/js/jquery.dataTables.js',
         'node_modules/datatables.net-buttons/js/dataTables.buttons.js',