diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 59e63b1c..bcca1465 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -10,6 +10,7 @@ $routes->get('/test', 'Home::test'); $routes->get('/login', 'LoginController::index');///auth/google $routes->get('/logout', 'LoginController::logout'); $routes->get('/oauth2callback', 'LoginController::receiveGoogleOAuthResponse'); +$routes->get('/auth/google', 'LoginController::initiateGoogleOAuth'); $routes->group("/user", ["filter" => "authMVC"], function($routes){ diff --git a/app/Controllers/BaseController.php b/app/Controllers/BaseController.php index c53dc7bb..f8e87392 100644 --- a/app/Controllers/BaseController.php +++ b/app/Controllers/BaseController.php @@ -57,4 +57,12 @@ abstract class BaseController extends Controller $this->session = \Config\Services::session(); } + + + public function loadLayout($view_name,$data) + { + echo view('layout/header',$data); + echo view($view_name, $data); + echo view('layout/footer',$data); + } } diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php index b3666279..9aa8de06 100644 --- a/app/Controllers/ClientController.php +++ b/app/Controllers/ClientController.php @@ -77,6 +77,8 @@ class ClientController extends AdminController echo view('layout/header', $headerData); echo view('client_list', $data); echo view('layout/footer'); + + // $this->loadLayout('client_onboarding', $data); } public function clientOnboarding() @@ -99,8 +101,9 @@ class ClientController extends AdminController echo view('layout/header', $headerData); echo view('client_onboarding', $data); echo view('layout/footer'); - } - + + } + public function editClientOnboarding($id = null) { diff --git a/app/Controllers/LoginController.php b/app/Controllers/LoginController.php index 78f239bd..f536fac9 100644 --- a/app/Controllers/LoginController.php +++ b/app/Controllers/LoginController.php @@ -61,11 +61,16 @@ class LoginController extends BaseController } }else{ - $return = googleOAuthLogin(false); - return $return; + + return redirect()->to(base_url('login')); } } + public function initiateGoogleOAuth() + { + return googleOAuthLogin(false); + } + public function logout() { session()->destroy(); diff --git a/app/Views/login.php b/app/Views/login.php index b82d0f66..ffdf7240 100644 --- a/app/Views/login.php +++ b/app/Views/login.php @@ -69,6 +69,7 @@
+ /assets/images/googleButton.svg" width="300">