Changeset 0a1fb54 for app/Http/Controllers

Timestamp:

11/23/21 22:01:52 (3 years ago)

Author:

beratkjufliju <kufliju@…>

Branches:

master

Children:

dbc5976

Parents:

4d73966

Message:

bug fixes

Location:

app/Http/Controllers

Files:

• Auth/CreatePasswordController.php (modified) (1 diff)
• Auth/VerifyLoginController.php (modified) (1 diff)
• Auth/VerifyNewEmailController.php (added)
• Dashboard/DepartmentsController.php (modified) (5 diffs)
• Dashboard/FilesController.php (modified) (1 diff)
• Dashboard/FoldersController.php (modified) (2 diffs)
• Dashboard/IndexController.php (modified) (1 diff)
• Dashboard/SettingsController.php (modified) (4 diffs)
• Dashboard/UsersController.php (modified) (3 diffs)

app/Http/Controllers/Auth/CreatePasswordController.php

@@ -36 +36 @@
         $user->save();
 
-        return redirect()->route("auth.loginShow");
+        return redirect()->route("auth.showLogin");
     }
 }

app/Http/Controllers/Auth/VerifyLoginController.php

@@ -6 +6 @@
 use App\Http\Controllers\Controller;
 use App\Models\User;
+use App\Notifications\VerifyUser;
 use Illuminate\Http\Request;
 use App\Services\Hashid;
+use Illuminate\Support\Carbon;
 
 class VerifyLoginController extends Controller

app/Http/Controllers/Dashboard/DepartmentsController.php

@@ -27 +27 @@
     }
 
-    public function create()
-    {
-        return view("dashboard.departments.create");
-    }
-
     public function store(NewDepartmentRequest $request)
     {
@@ -48 +43 @@
         $department->user_id = auth()->id();
 
-        $users = User::all();
-
         $department->save();
 
@@ -55 +48 @@
 
         return redirect()->route("dashboard.departments.index");
-    }
-
-    public function editShow($id)
-    {
-        return view("dashboard.departments.edit")->with([
-            "department" => Department::findOrFail($id)
-        ]);
     }
 
@@ -79 +65 @@
             $location = 'Departments' . DIRECTORY_SEPARATOR . $request->code;
 
-            if(!Storage::disk('local')->has($location) && Folder::where('department_id', $department->id)->pluck('no_of_files')->first() > 0){
+            if(!Storage::disk('local')->has($location) ){
                 Storage::disk('local')->move($oldLocation, $location);
                 $department->location = $location;
@@ -88 +74 @@
                     $folder->arch_id = $department->code . '/' . $currArchId;
                     $folder->save();
+
                 foreach($folder->files as $file) {
+                    //dd($file);
                     $file->location = $location . DIRECTORY_SEPARATOR . $folder->name . DIRECTORY_SEPARATOR . $file->name;
                     $file->save();

app/Http/Controllers/Dashboard/FilesController.php

@@ -57 +57 @@
 
                 if(File::where(['folder_id' => $folder->id, 'name' => $fileName])->count() > 0) {
+
                     Alert::flash("The uploaded file already exists", "error");
-
                     return redirect()->back();
                 }

app/Http/Controllers/Dashboard/FoldersController.php

@@ -36 +36 @@
 
             if ($request->query('sort') == 'newest') {
-                $folders = $foldersInDeptSort->orderBy('created_at', 'desc')->paginate(12);
+                $folders = $foldersInDeptSort->orderBy('created_at', 'desc')->paginate(9);
             }
             else if ($request->query('sort') == 'name') {
-                $folders = $foldersInDeptSort->orderBy('name', 'asc')->paginate(12);
+                $folders = $foldersInDeptSort->orderBy('name', 'asc')->paginate(9);
             }
             else if ($request->query('sort') == 'no_of_files') {
-                $folders = $foldersInDeptSort->orderBy('no_of_files', 'desc')->paginate(12);
+                $folders = $foldersInDeptSort->orderBy('no_of_files', 'desc')->paginate(9);
             }
             else if($request->query('sort') == 'count'){
                 $total = $foldersInDeptSort->folder->files->count();
-                $folders = $foldersInDeptSort->orderBy($total, 'asc')->paginate(12);
+                $folders = $foldersInDeptSort->orderBy($total, 'asc')->paginate(9);
             }
             else {
-                $folders = Folder::where('department_id', $request->query('id'))->paginate(12);
+                $folders = Folder::where('department_id', $request->query('id'))->paginate(9);
             }
         } else {
             if ($request->query('sort') == 'newest') {
-                $folders = Folder::orderBy('created_at', 'desc')->paginate(12);
+                $folders = Folder::orderBy('created_at', 'desc')->paginate(9);
             }
             else if ($request->query('sort') == 'name') {
-                $folders = Folder::orderBy('name', 'asc')->paginate(12);
+                $folders = Folder::orderBy('name', 'asc')->paginate(9);
             }
             else if ($request->query('sort') == 'no_of_files') {
-                $folders = Folder::orderBy('no_of_files', 'desc')->paginate(12);
+                $folders = Folder::orderBy('no_of_files', 'desc')->paginate(9);
             }
             else if ($request->query('sort') == 'recent') {
-                $folders = Folder::orderBy('created_at', 'desc')->paginate(12);
+                $folders = Folder::orderBy('created_at', 'desc')->paginate(9);
             } else if ($request->query('search')) {
 
@@ -73 +73 @@
                 $folders = $result;
             } else {
-                $folders = Folder::paginate(12);
+                $folders = Folder::paginate(9);
             }
         }

app/Http/Controllers/Dashboard/IndexController.php

@@ -32 +32 @@
         return view("dashboard.index")->with([
             "counters" => $counters,
-            "largestDepartments" => Department::orderBy('no_of_folders', 'desc')->limit(10)->get(),
+            "largestDepartments" => Department::orderBy('no_of_folders', 'desc')->limit(5)->get(),
             "folders" => Folder::all(),
             "files" => File::all(),

app/Http/Controllers/Dashboard/SettingsController.php

@@ -21 +21 @@
     public function settings()
     {
-        $fileType = FileType::find("1");
-
         return view("dashboard.settings.index")->with([
             "user" => auth()->user(),
-            "adminAndReferents" => User::where("role_id", 1)->orWhere("role_id", 2)->get(),
             "active_tab" => "account",
-            "fileType" => $fileType
+            "fileType" => FileType::find("1")
         ]);
     }
@@ -38 +35 @@
             $user->save();
 
+            Alert::flash("Username updated successfully");
+
             auth()->logout();
             session()->flush();
 
-            return redirect()->route("auth.loginShow");
+            return redirect()->route("auth.showLogin");
     }
 
@@ -51 +50 @@
             $user->save();
 
+            Alert::flash("Password updated successfully");
+
             auth()->logout();
             session()->flush();
 
-            return redirect()->route("auth.loginShow");
+            return redirect()->route("auth.showLogin");
     }
 
@@ -71 +72 @@
         $user->notify(new VerifyNewEmail($user));
 
+        Alert::flash("Email updated successfully");
+
         auth()->logout();
         session()->flush();
 
-        return redirect()->route("auth.loginShow");
+        return redirect()->route("auth.showLogin");
     }
 

app/Http/Controllers/Dashboard/UsersController.php

@@ -27 +27 @@
         return view("dashboard.users.index")->with([
             "users" => User::all(),
-            "roles" => Role::all(),
-            "adminAndReferents" => User::where("role_id", 1)->orWhere("role_id", 2)->get()
-        ]);
-    }
-
-    public function create()
-    {
-        return view("dashboard.users.create")->with([
-            "roles" => Role::all(),
+            "roles" => Role::all()
         ]);
     }
@@ -77 +69 @@
     }
 
-    public function editShow($id)
-    {
-        return view("dashboard.users.edit")->with([
-            "user" => User::findOrFail($id),
-            "roles" => Role::all(),
-        ]);
-    }
-
     public function edit(UpdateUserRequest $request, $id)
     {
@@ -110 +94 @@
 
         if($user->isDirty('email')) {
+            $user->is_active = false;
+            $user->security_code = $user->generateSecurityCode();
+            $user->verify_token = $user->generateVerifyToken();
             $user->notify(new VerifyNewEmail($user));
         }
+
         $user->save();