Initial refactoring work

This commit is contained in:
Deon George
2018-05-20 22:53:14 +10:00
parent d6cb505e1c
commit feda44db8a
121 changed files with 6601 additions and 602 deletions

View File

@@ -36,4 +36,12 @@ class LoginController extends Controller
{
$this->middleware('guest')->except('logout');
}
/**
* Show our themed login page
*/
public function showLoginForm()
{
return view('adminlte::auth.login');
}
}

View File

@@ -0,0 +1,34 @@
<?php
namespace App\Http\Controllers\Auth;
use Illuminate\Support\Facades\Auth;
use App\Http\Controllers\Controller;
use Socialite;
class SocialLoginController extends Controller
{
public function redirectToProvider($provider)
{
return Socialite::with($provider)->redirect();
}
public function handleProviderCallback($provider)
{
$openiduser = Socialite::with($provider)->user();
$user = Socialite::with($provider)->findOrCreateUser($openiduser);
Auth::login($user,FALSE);
/*
if (! $user->profile_update)
{
return redirect()->to(url('settings'));
}
*/
return redirect()->intended();
}
}

View File

@@ -0,0 +1,16 @@
<?php
namespace App\Http\Controllers;
class UserHomeController extends Controller
{
public function __construct()
{
$this->middleware('auth');
}
public function home()
{
return View('home');
}
}

View File

@@ -0,0 +1,14 @@
<?php
namespace App\Http\Controllers;
class WelcomeController extends Controller
{
public function index() {
return view('welcome');
}
public function under_construction() {
abort(499,'Under Construction');
}
}

View File

@@ -2,6 +2,7 @@
namespace App\Http;
use App\Http\Middleware\SetSite;
use Illuminate\Foundation\Http\Kernel as HttpKernel;
class Kernel extends HttpKernel
@@ -36,6 +37,7 @@ class Kernel extends HttpKernel
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
\App\Http\Middleware\VerifyCsrfToken::class,
\Illuminate\Routing\Middleware\SubstituteBindings::class,
\App\Http\Middleware\SetSite::class,
],
'api' => [
@@ -57,6 +59,7 @@ class Kernel extends HttpKernel
'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
'can' => \Illuminate\Auth\Middleware\Authorize::class,
'demoMode' => \Spatie\DemoMode\DemoMode::class,
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
'theme' => \Igaster\LaravelTheme\Middleware\setTheme::class,

View File

@@ -27,7 +27,7 @@ class SetSite
public function handle($request, Closure $next)
{
// @todo Figure out how to know if this is an API call - and deny it if it's not in the database.
$so = NULL;
$so = new Site;
if (Schema::hasTable('site'))
{
@@ -38,7 +38,7 @@ class SetSite
}
// If we dont exist, we'll return a fake model.
if (! $so) {
if (! $so or ! $so->exists) {
$so = (new Site)->sample();
}
@@ -50,4 +50,4 @@ class SetSite
return $next($request);
}
}
}