diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php index 6a247fef..e11ac074 100755 --- a/app/Http/Controllers/Auth/ForgotPasswordController.php +++ b/app/Http/Controllers/Auth/ForgotPasswordController.php @@ -20,6 +20,11 @@ class ForgotPasswordController extends Controller use SendsPasswordResetEmails; + public function showLinkRequestForm() + { + return $this->view('auth.passwords.email'); + } + /** * Create a new controller instance. * diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 2abd9e04..ae5ccf17 100755 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -27,6 +27,11 @@ class LoginController extends Controller */ protected $redirectTo = '/home'; + public function showLoginForm() + { + return $this->view('auth/login'); + } + /** * Create a new controller instance. * diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 750a4d59..d97f0278 100755 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -30,6 +30,11 @@ class RegisterController extends Controller */ protected $redirectTo = '/home'; + public function showRegistrationForm() + { + return $this->view('auth.register'); + } + /** * Create a new controller instance. * diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php index c73bf99f..1c748ac5 100755 --- a/app/Http/Controllers/Auth/ResetPasswordController.php +++ b/app/Http/Controllers/Auth/ResetPasswordController.php @@ -20,6 +20,13 @@ class ResetPasswordController extends Controller use ResetsPasswords; + public function showResetForm(Request $request, $token = null) + { + return $this->view('auth.passwords.reset', + ['token' => $token, 'email' => $request->email] + ); + } + /** * Create a new controller instance. * diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 03e02a23..1a048fcb 100755 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -10,4 +10,10 @@ use Illuminate\Foundation\Auth\Access\AuthorizesRequests; class Controller extends BaseController { use AuthorizesRequests, DispatchesJobs, ValidatesRequests; + + public function view($template, $vars=[]) + { + $tpl = 'layouts/'.config('phpvms.skin').'/'.$template; + return view($tpl, $vars); + } } diff --git a/app/Http/Controllers/Frontend/BaseController.php b/app/Http/Controllers/Frontend/BaseController.php index a1f09416..11b12a4e 100644 --- a/app/Http/Controllers/Frontend/BaseController.php +++ b/app/Http/Controllers/Frontend/BaseController.php @@ -6,5 +6,5 @@ use App\Http\Controllers\AppBaseController; class BaseController extends AppBaseController { - + } diff --git a/app/Http/Controllers/Frontend/DashboardController.php b/app/Http/Controllers/Frontend/DashboardController.php index efa0381e..fc062a25 100644 --- a/app/Http/Controllers/Frontend/DashboardController.php +++ b/app/Http/Controllers/Frontend/DashboardController.php @@ -11,10 +11,10 @@ class DashboardController extends BaseController */ public function index() { - return view('frontend.dashboard'); + return $this->view('frontend/dashboard'); } public function test() { - return view('frontend.dashboard'); + return $this->view('frontend/dashboard'); } } diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index a0e90d52..83769aae 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -2,9 +2,8 @@ namespace App\Http\Controllers; -use Illuminate\Http\Request; -class HomeController extends Controller +class HomeController extends AppBaseController { /** * Show the application dashboard. @@ -12,6 +11,6 @@ class HomeController extends Controller */ public function index() { - return view('home'); + return $this->view('home'); } } diff --git a/config/phpvms.php b/config/phpvms.php index 4a4a2df3..dd45ad7a 100644 --- a/config/phpvms.php +++ b/config/phpvms.php @@ -11,6 +11,11 @@ return [ + /** + * The skin to use for the front-end + */ + 'skin' => 'default', + /** * Start date. Set the date of when your VA has started * Used as an anchor point for some financials and things diff --git a/resources/views/auth/emails/password.blade.php b/resources/views/layouts/default/auth/emails/password.blade.php similarity index 100% rename from resources/views/auth/emails/password.blade.php rename to resources/views/layouts/default/auth/emails/password.blade.php diff --git a/resources/views/auth/layout.blade.php b/resources/views/layouts/default/auth/layout.blade.php similarity index 100% rename from resources/views/auth/layout.blade.php rename to resources/views/layouts/default/auth/layout.blade.php diff --git a/resources/views/auth/login.blade.php b/resources/views/layouts/default/auth/login.blade.php similarity index 98% rename from resources/views/auth/login.blade.php rename to resources/views/layouts/default/auth/login.blade.php index 371ae960..780e7130 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/layouts/default/auth/login.blade.php @@ -1,4 +1,4 @@ -@extends('auth.layout') +@extends('layouts.default.auth.layout') @section('content')