From a7957beffbf05ede176d117075254a53301438a3 Mon Sep 17 00:00:00 2001
From: TimothyMee <timothy33.tf@gmail.com>
Date: Mon, 5 Mar 2018 16:37:24 +0100
Subject: [PATCH] fixed the bug. where the theme setting was only working on
 theg on the home page

---
 app/Http/Controllers/AuthController.php |  7 ++++++-
 app/Http/Controllers/HomeController.php |  5 -----
 app/UserSetting.php                     | 11 +++++++++++
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
index 9a9b686..edc7094 100644
--- a/app/Http/Controllers/AuthController.php
+++ b/app/Http/Controllers/AuthController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Department;
+use App\UserSetting;
 use Illuminate\Http\Request;
 use App\User;
 use Image;
@@ -57,13 +58,17 @@ public function login()
         return view('auth.login', compact('title'));
     }
 
-    public function postLogin(Request $request)
+    public function postLogin(Request $request, UserSetting $userSetting)
     {
         $data = $request->all();
         try{
             if (auth()->attempt(['email' => $data['email'], 'password' => $data['password'], 'is_active' => true])) {
                 if (auth()->user()->user_type == 1 || auth()->user()->user_type == 2)
                 {
+                    //Saving the theme value into the session
+                    $userSetting = $userSetting->view(auth()->id());
+                    $userSetting = $userSetting[0]->theme;
+                    session(['theme' => $userSetting]);
                     return redirect()->intended(route('home'));
                 }
 
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index a21e65d..d4f9099 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -30,8 +30,6 @@ public function index(User $user,  Course $course, Department $department, UserS
         $courses = $course->viewAll();
         $users = $user->viewAll();
         $departments = $department->viewAll();
-        $userSetting = $userSetting->view(auth()->id());
-        $userSetting = $userSetting[0]->theme;
 
         $admin = array();
         $student = array();
@@ -83,9 +81,6 @@ public function index(User $user,  Course $course, Department $department, UserS
             'courseCount' => $courseCount,
         ];
 
-//        Saving the theme value into the session
-        session(['theme' => $userSetting]);
-
 
         return view('home')->with('data',$data);
     }
diff --git a/app/UserSetting.php b/app/UserSetting.php
index 48990fc..1e74449 100644
--- a/app/UserSetting.php
+++ b/app/UserSetting.php
@@ -19,10 +19,21 @@ public function saveSetting($data)
         if(! $existingData->exists()){
             $data['user_id'] = auth()->id();
             $this->create($data);
+
+            //Saving the theme value into the session
+            $userSetting = $this->view(auth()->id());
+            $userSetting = $userSetting[0]->theme;
+            session(['theme' => $userSetting]);
             return true;
         }
         else{
             $this->updateUserSettings($data);
+
+            //Saving the theme value into the session
+            $userSetting = $this->view(auth()->id());
+            $userSetting = $userSetting[0]->theme;
+            session(['theme' => '']);
+            session(['theme' => $userSetting]);
             return true;
         }
     }