deon/osb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to Laravel 6

Browse Source
This commit is contained in:
Deon George
2020-01-11 13:36:11 +11:00
parent 8224fba840
commit c941fcb148
19 changed files with 1867 additions and 2161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/Http/Controllers/Auth/LoginController.php
View File

@@ -2,9 +2,8 @@
namespace App\Http\Controllers\Auth;
use Illuminate\Foundation\Auth\AuthenticatesUsers;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\AuthenticatesUsers;
class LoginController extends Controller
{
@@ -38,11 +37,16 @@ class LoginController extends Controller
$this->middleware('guest')->except('logout');
}
/**
* Show our themed login page
*/
public function showLoginForm()
{
return view('adminlte::auth.login');
}
}
/**
* Show our themed login page
*/
public function showLoginForm()
{
$login_note = '';
if (file_exists('login_note.txt'))
$login_note = file_get_contents('login_note.txt');
return view('adminlte::auth.login')->with('login_note',$login_note);
}
}

5
app/Models/Site.php
View File

@@ -3,6 +3,7 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Arr;
use Illuminate\Support\Facades\Log;
class Site extends Model
@@ -72,7 +73,7 @@ class Site extends Model
'top_menu' => [],
];
return array_get($default,$key);
return Arr::get($default,$key);
}
public function getSiteLogoAttribute()
@@ -264,7 +265,7 @@ class Site extends Model
public function aboutus()
{
// @todo To be implemented
return array_get($this->_sampledata(),'aboutus');
return Arr::get($this->_sampledata(),'aboutus');
}
private function _address()