Index: app/Http/Controllers/Auth/CreatePasswordController.php
===================================================================
--- app/Http/Controllers/Auth/CreatePasswordController.php	(revision 4d73966906e9f8aed724a4abdb8e595046d2af47)
+++ app/Http/Controllers/Auth/CreatePasswordController.php	(revision 0a1fb54deb0f1b8748e3f675bf85a9a0281751cc)
@@ -36,5 +36,5 @@
         $user->save();
 
-        return redirect()->route("auth.loginShow");
+        return redirect()->route("auth.showLogin");
     }
 }
Index: app/Http/Controllers/Auth/VerifyLoginController.php
===================================================================
--- app/Http/Controllers/Auth/VerifyLoginController.php	(revision 4d73966906e9f8aed724a4abdb8e595046d2af47)
+++ app/Http/Controllers/Auth/VerifyLoginController.php	(revision 0a1fb54deb0f1b8748e3f675bf85a9a0281751cc)
@@ -6,6 +6,8 @@
 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
Index: app/Http/Controllers/Auth/VerifyNewEmailController.php
===================================================================
--- app/Http/Controllers/Auth/VerifyNewEmailController.php	(revision 0a1fb54deb0f1b8748e3f675bf85a9a0281751cc)
+++ app/Http/Controllers/Auth/VerifyNewEmailController.php	(revision 0a1fb54deb0f1b8748e3f675bf85a9a0281751cc)
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Helpers\Alert;
+use App\Http\Requests\Auth\VerifyNewEmailRequest;
+use App\Models\User;
+use App\Http\Controllers\Controller;
+
+class VerifyNewEmailController extends Controller
+{
+    public function __construct()
+    {
+        $this->middleware("checkVerifyNewEmail");
+    }
+
+    public function create($id, $token)
+    {
+        return view("auth.verify_new_email")->with([
+            "id" => $id,
+            "token" => $token
+        ]);
+    }
+
+    public function verify(VerifyNewEmailRequest $request, $id, $token)
+    {
+        $user = User::find($id);
+        $user->is_active = true;
+        $user->save();
+
+        Alert::flash("Email address verified successfully");
+
+        return redirect()->route("auth.login");
+    }
+}
Index: app/Http/Controllers/Dashboard/DepartmentsController.php
===================================================================
--- app/Http/Controllers/Dashboard/DepartmentsController.php	(revision 4d73966906e9f8aed724a4abdb8e595046d2af47)
+++ app/Http/Controllers/Dashboard/DepartmentsController.php	(revision 0a1fb54deb0f1b8748e3f675bf85a9a0281751cc)
@@ -27,9 +27,4 @@
     }
 
-    public function create()
-    {
-        return view("dashboard.departments.create");
-    }
-
     public function store(NewDepartmentRequest $request)
     {
@@ -48,6 +43,4 @@
         $department->user_id = auth()->id();
 
-        $users = User::all();
-
         $department->save();
 
@@ -55,11 +48,4 @@
 
         return redirect()->route("dashboard.departments.index");
-    }
-
-    public function editShow($id)
-    {
-        return view("dashboard.departments.edit")->with([
-            "department" => Department::findOrFail($id)
-        ]);
     }
 
@@ -79,5 +65,5 @@
             $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,5 +74,7 @@
                     $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();
Index: app/Http/Controllers/Dashboard/FilesController.php
===================================================================
--- app/Http/Controllers/Dashboard/FilesController.php	(revision 4d73966906e9f8aed724a4abdb8e595046d2af47)
+++ app/Http/Controllers/Dashboard/FilesController.php	(revision 0a1fb54deb0f1b8748e3f675bf85a9a0281751cc)
@@ -57,6 +57,6 @@
 
                 if(File::where(['folder_id' => $folder->id, 'name' => $fileName])->count() > 0) {
+
                     Alert::flash("The uploaded file already exists", "error");
-
                     return redirect()->back();
                 }
Index: app/Http/Controllers/Dashboard/FoldersController.php
===================================================================
--- app/Http/Controllers/Dashboard/FoldersController.php	(revision 4d73966906e9f8aed724a4abdb8e595046d2af47)
+++ app/Http/Controllers/Dashboard/FoldersController.php	(revision 0a1fb54deb0f1b8748e3f675bf85a9a0281751cc)
@@ -36,31 +36,31 @@
 
             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,5 +73,5 @@
                 $folders = $result;
             } else {
-                $folders = Folder::paginate(12);
+                $folders = Folder::paginate(9);
             }
         }
Index: app/Http/Controllers/Dashboard/IndexController.php
===================================================================
--- app/Http/Controllers/Dashboard/IndexController.php	(revision 4d73966906e9f8aed724a4abdb8e595046d2af47)
+++ app/Http/Controllers/Dashboard/IndexController.php	(revision 0a1fb54deb0f1b8748e3f675bf85a9a0281751cc)
@@ -32,5 +32,5 @@
         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(),
Index: app/Http/Controllers/Dashboard/SettingsController.php
===================================================================
--- app/Http/Controllers/Dashboard/SettingsController.php	(revision 4d73966906e9f8aed724a4abdb8e595046d2af47)
+++ app/Http/Controllers/Dashboard/SettingsController.php	(revision 0a1fb54deb0f1b8748e3f675bf85a9a0281751cc)
@@ -21,11 +21,8 @@
     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,8 +35,10 @@
             $user->save();
 
+            Alert::flash("Username updated successfully");
+
             auth()->logout();
             session()->flush();
 
-            return redirect()->route("auth.loginShow");
+            return redirect()->route("auth.showLogin");
     }
 
@@ -51,8 +50,10 @@
             $user->save();
 
+            Alert::flash("Password updated successfully");
+
             auth()->logout();
             session()->flush();
 
-            return redirect()->route("auth.loginShow");
+            return redirect()->route("auth.showLogin");
     }
 
@@ -71,8 +72,10 @@
         $user->notify(new VerifyNewEmail($user));
 
+        Alert::flash("Email updated successfully");
+
         auth()->logout();
         session()->flush();
 
-        return redirect()->route("auth.loginShow");
+        return redirect()->route("auth.showLogin");
     }
 
Index: app/Http/Controllers/Dashboard/UsersController.php
===================================================================
--- app/Http/Controllers/Dashboard/UsersController.php	(revision 4d73966906e9f8aed724a4abdb8e595046d2af47)
+++ app/Http/Controllers/Dashboard/UsersController.php	(revision 0a1fb54deb0f1b8748e3f675bf85a9a0281751cc)
@@ -27,13 +27,5 @@
         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,12 +69,4 @@
     }
 
-    public function editShow($id)
-    {
-        return view("dashboard.users.edit")->with([
-            "user" => User::findOrFail($id),
-            "roles" => Role::all(),
-        ]);
-    }
-
     public function edit(UpdateUserRequest $request, $id)
     {
@@ -110,6 +94,10 @@
 
         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();
 
Index: app/Http/Middleware/Authenticate.php
===================================================================
--- app/Http/Middleware/Authenticate.php	(revision 4d73966906e9f8aed724a4abdb8e595046d2af47)
+++ app/Http/Middleware/Authenticate.php	(revision 0a1fb54deb0f1b8748e3f675bf85a9a0281751cc)
@@ -16,5 +16,5 @@
     {
         if (! $request->expectsJson()) {
-            return route('auth.loginShow');
+            return route('auth.showLogin');
         }
     }
Index: app/Http/Middleware/CheckCreatePassword.php
===================================================================
--- app/Http/Middleware/CheckCreatePassword.php	(revision 4d73966906e9f8aed724a4abdb8e595046d2af47)
+++ app/Http/Middleware/CheckCreatePassword.php	(revision 0a1fb54deb0f1b8748e3f675bf85a9a0281751cc)
@@ -24,10 +24,10 @@
 
         if($user->is_active) {
-            return redirect()->route("auth.loginShow");
+            return redirect()->route("auth.showLogin");
         }
 
         if(!$user->is_forgot_password) {
-            if(Carbon::now()->greaterThan($user->created_at->addMinutes(10))) {
-                return redirect()->route("auth.loginShow");
+            if(Carbon::now()->greaterThan($user->created_at->addMinutes(180))) {
+                return redirect()->route("auth.showLogin");
             }
         }
Index: app/Http/Middleware/CheckIsActive.php
===================================================================
--- app/Http/Middleware/CheckIsActive.php	(revision 4d73966906e9f8aed724a4abdb8e595046d2af47)
+++ app/Http/Middleware/CheckIsActive.php	(revision 0a1fb54deb0f1b8748e3f675bf85a9a0281751cc)
@@ -24,5 +24,5 @@
             auth()->logout();
 
-            return redirect()->route("auth.loginShow");
+            return redirect()->route("auth.showLogin");
         }
 
Index: app/Http/Middleware/CheckVerifyNewEmail.php
===================================================================
--- app/Http/Middleware/CheckVerifyNewEmail.php	(revision 4d73966906e9f8aed724a4abdb8e595046d2af47)
+++ app/Http/Middleware/CheckVerifyNewEmail.php	(revision 0a1fb54deb0f1b8748e3f675bf85a9a0281751cc)
@@ -23,5 +23,5 @@
 
         if($user->is_active) {
-            return redirect()->route("auth.loginShow");
+            return redirect()->route("auth.showLogin");
         }
 
Index: app/Http/Middleware/CheckVerifyToken.php
===================================================================
--- app/Http/Middleware/CheckVerifyToken.php	(revision 4d73966906e9f8aed724a4abdb8e595046d2af47)
+++ app/Http/Middleware/CheckVerifyToken.php	(revision 0a1fb54deb0f1b8748e3f675bf85a9a0281751cc)
@@ -6,4 +6,5 @@
 use App\Services\Hashid;
 use Closure;
+use Illuminate\Support\Carbon;
 
 class CheckVerifyToken
@@ -23,5 +24,5 @@
         $user = User::findOrFail($hashId->decode($id));
 
-        if ($user->verify_token !== $token || now()->greaterThan($user->updated_at->addMinutes(1))) {
+        if ($user->verify_token !== $token || Carbon::now()->greaterThan($user->updated_at->addMinutes(1))) {
             return redirect()->route("auth.login");
         }
Index: app/Models/Department.php
===================================================================
--- app/Models/Department.php	(revision 4d73966906e9f8aed724a4abdb8e595046d2af47)
+++ app/Models/Department.php	(revision 0a1fb54deb0f1b8748e3f675bf85a9a0281751cc)
@@ -9,5 +9,4 @@
 class Department extends Model
 {
-    use Notifiable;
     use HasFactory;
 
@@ -20,15 +19,11 @@
     ];
 
-    public function getCreatedByName()
-    {
-        return User::where('id', $this->user_id)->pluck('username')->first();
-    }
-
     public function folder(){
         return $this->hasMany(Folder::class);
     }
 
-//    public function getDeptId(){
-//        return Department::where('id', $this->id)->get();
-//    }
+    public function user(){
+        return $this->belongsTo(User::class);
+    }
+
 }
Index: app/Models/File.php
===================================================================
--- app/Models/File.php	(revision 4d73966906e9f8aed724a4abdb8e595046d2af47)
+++ app/Models/File.php	(revision 0a1fb54deb0f1b8748e3f675bf85a9a0281751cc)
@@ -12,5 +12,5 @@
 
     protected $table = "files";
-    protected $fillable = ["name", "location", "document_id"];
+    protected $fillable = ["name", "location", "folder_id"];
 
     public function folder()
@@ -21,5 +21,5 @@
     public function getSize($location)
     {
-        $fileSize = Storage::disk('uploads')->size($location) / 1024 / 1024;
+        $fileSize = Storage::disk('local')->size($location) / 1024 / 1024;
         $fileSize = round($fileSize, 2);
         return $fileSize;
Index: app/Models/User.php
===================================================================
--- app/Models/User.php	(revision 4d73966906e9f8aed724a4abdb8e595046d2af47)
+++ app/Models/User.php	(revision 0a1fb54deb0f1b8748e3f675bf85a9a0281751cc)
@@ -134,7 +134,15 @@
     }
 
+    public function getCreatedByUsername()
+    {
+        return User::where('id', $this->created_by)->pluck('username')->first();
+    }
+
     public function getCreatedByName()
     {
-        return User::where('id', $this->created_by)->pluck('username')->first();
+        $name = User::where('id', $this->created_by)->pluck('name')->first();
+        $surname = User::where('id', $this->created_by)->pluck('surname')->first();
+
+        return $name . " " . $surname;
     }
 
@@ -142,3 +150,7 @@
         return $this->hasMany(Folder::class);
     }
+
+    public function department() {
+        return $this->hasMany(Department::class);
+    }
 }
Index: app/Notifications/VerifyNewEmail.php
===================================================================
--- app/Notifications/VerifyNewEmail.php	(revision 0a1fb54deb0f1b8748e3f675bf85a9a0281751cc)
+++ app/Notifications/VerifyNewEmail.php	(revision 0a1fb54deb0f1b8748e3f675bf85a9a0281751cc)
@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Notifications;
+
+use App\Models\User;
+use Illuminate\Bus\Queueable;
+use Illuminate\Notifications\Notification;
+use Illuminate\Notifications\Messages\MailMessage;
+
+class VerifyNewEmail extends Notification
+{
+    use Queueable;
+
+    private $user;
+
+    /**
+     * Create a new notification instance.
+     *
+     * @return void
+     */
+    public function __construct(User $user)
+    {
+        $this->user = $user;
+    }
+
+    /**
+     * Get the notification's delivery channels.
+     *
+     * @param mixed $notifiable
+     * @return array
+     */
+    public function via($notifiable)
+    {
+        return ['mail'];
+    }
+
+    /**
+     * Get the mail representation of the notification.
+     *
+     * @param mixed $notifiable
+     * @return \Illuminate\Notifications\Messages\MailMessage
+     */
+    public function toMail($notifiable)
+    {
+        return (new MailMessage)
+            ->greeting("Hello " . $this->user->name)
+            ->line("To verify your new email click the button.")
+            ->line("Your security code is: " . $this->user->security_code)
+            ->action("Verify", url("/auth/verify/" . $this->user->id . "/" . $this->user->verify_token));
+    }
+
+    /**
+     * Get the array representation of the notification.
+     *
+     * @param mixed $notifiable
+     * @return array
+     */
+    public function toArray($notifiable)
+    {
+        return [
+            //
+        ];
+    }
+}
Index: app/Notifications/VerifyUser.php
===================================================================
--- app/Notifications/VerifyUser.php	(revision 4d73966906e9f8aed724a4abdb8e595046d2af47)
+++ app/Notifications/VerifyUser.php	(revision 0a1fb54deb0f1b8748e3f675bf85a9a0281751cc)
@@ -70,5 +70,3 @@
         ];
     }
-
-
 }
Index: app/Notifications/WelcomeUser.php
===================================================================
--- app/Notifications/WelcomeUser.php	(revision 4d73966906e9f8aed724a4abdb8e595046d2af47)
+++ app/Notifications/WelcomeUser.php	(revision 0a1fb54deb0f1b8748e3f675bf85a9a0281751cc)
@@ -49,5 +49,5 @@
             ->line("Security Code: " . $this->user->security_code)
             ->line("To create password for your account just click the button then create something good. :))")
-            ->line("NOTE: You have only 10 minutes to create your password.")
+            ->line("NOTE: You have only 3 hours to create your password.")
             ->action("Create Password", url("/auth/create-password/" . $this->user->id . "/" . $this->user->verify_token));
     }
Index: config/filesystems.php
===================================================================
--- config/filesystems.php	(revision 4d73966906e9f8aed724a4abdb8e595046d2af47)
+++ config/filesystems.php	(revision 0a1fb54deb0f1b8748e3f675bf85a9a0281751cc)
@@ -60,5 +60,5 @@
         'uploads' => [
             'driver' => 'local',
-            'root'   => storage_path() . DIRECTORY_SEPARATOR . 'app',
+            'root'   => public_path() . DIRECTORY_SEPARATOR . 'uploads' . DIRECTORY_SEPARATOR,
         ],
 
Index: database/factories/DepartmentFactory.php
===================================================================
--- database/factories/DepartmentFactory.php	(revision 4d73966906e9f8aed724a4abdb8e595046d2af47)
+++ database/factories/DepartmentFactory.php	(revision 0a1fb54deb0f1b8748e3f675bf85a9a0281751cc)
@@ -28,5 +28,5 @@
     {
         $location = $this->faker->unique()->numberBetween(1, 10);
-        Storage::disk('uploads')->makeDirectory('Departments/' . $location);
+        Storage::disk('local')->makeDirectory('Departments/' . $location);
         return [
             'name' => "Department" . ' ' . $this->faker->unique()->firstName(),
Index: database/factories/FolderFactory.php
===================================================================
--- database/factories/FolderFactory.php	(revision 4d73966906e9f8aed724a4abdb8e595046d2af47)
+++ database/factories/FolderFactory.php	(revision 0a1fb54deb0f1b8748e3f675bf85a9a0281751cc)
@@ -27,8 +27,8 @@
     public function definition()
     {
-        $inputArray = [5, 15, 25, 35, 45, 55, 65, 75, 85, 95];
-        $deptId = Arr::random($inputArray);
+        //$inputArray = [5, 15, 25, 35, 45, 55, 65, 75, 85, 95];
+        //$deptId = Arr::random($inputArray);
 
-        //$deptId = $this->faker->numberBetween(1, 10);
+        $deptId = $this->faker->numberBetween(1, 10);
 
         $deptCode = Department::find($deptId)->code;
@@ -37,5 +37,5 @@
 
         $location = 'Departments' . DIRECTORY_SEPARATOR . $deptCode . DIRECTORY_SEPARATOR . $name;
-        Storage::disk('uploads')->makeDirectory($location);
+        Storage::disk('local')->makeDirectory($location);
 
         return [
Index: database/seeders/UsersTableSeeder.php
===================================================================
--- database/seeders/UsersTableSeeder.php	(revision 4d73966906e9f8aed724a4abdb8e595046d2af47)
+++ database/seeders/UsersTableSeeder.php	(revision 0a1fb54deb0f1b8748e3f675bf85a9a0281751cc)
@@ -61,5 +61,5 @@
         ]);
 
-        User::factory()->count(50)->create();
+        //User::factory()->count(50)->create();
 
     }
Index: resources/views/auth/forgot.blade.php
===================================================================
--- resources/views/auth/forgot.blade.php	(revision 4d73966906e9f8aed724a4abdb8e595046d2af47)
+++ resources/views/auth/forgot.blade.php	(revision 0a1fb54deb0f1b8748e3f675bf85a9a0281751cc)
@@ -23,5 +23,5 @@
         <hr>
         <p class="text-muted">I remember my password</p>
-        <a href="{{ route("auth.loginShow") }}" class="btn btn-sm btn-outline-light ml-1">Login</a>
+        <a href="{{ route("auth.showLogin") }}" class="btn btn-sm btn-outline-light ml-1">Login</a>
     </form>
     <!-- ./ form -->
Index: resources/views/auth/verify-login.blade.php
===================================================================
--- resources/views/auth/verify-login.blade.php	(revision 4d73966906e9f8aed724a4abdb8e595046d2af47)
+++ resources/views/auth/verify-login.blade.php	(revision 0a1fb54deb0f1b8748e3f675bf85a9a0281751cc)
@@ -24,4 +24,3 @@
 
     </form>
-
 @endsection
Index: resources/views/auth/verify_new_email.blade.php
===================================================================
--- resources/views/auth/verify_new_email.blade.php	(revision 0a1fb54deb0f1b8748e3f675bf85a9a0281751cc)
+++ resources/views/auth/verify_new_email.blade.php	(revision 0a1fb54deb0f1b8748e3f675bf85a9a0281751cc)
@@ -0,0 +1,35 @@
+@extends('layouts.auth')
+
+@section("title", "SaveSpace - Verify new email")
+
+@section('content')
+
+    <!-- logo -->
+    <div id="logo">
+        <img class="logo" width="150" src="{{ url('assets/media/images/logo.png') }}" alt="image">
+    </div>
+    <!-- ./ logo -->
+
+    <h5>Verify your new e-mail address</h5>
+
+    <!-- form -->
+    <form class="card" action="{{ route("auth.verify", ["id" => $id, "token" => $token]) }}" method="post">
+
+        @csrf
+
+        <div class="card-body p-6">
+
+            <div class="form-group">
+                <label class="form-label">Security Code</label>
+                <input type="text" class="form-control" name="security_code" autocomplete="off" required>
+            </div>
+
+            <div class="form-footer">
+                <input type="submit" value="Verify" class="btn btn-primary btn-block">
+            </div>
+
+        </div>
+    </form>
+    <!-- ./ form -->
+
+@endsection
Index: resources/views/dashboard/departments/index.blade.php
===================================================================
--- resources/views/dashboard/departments/index.blade.php	(revision 4d73966906e9f8aed724a4abdb8e595046d2af47)
+++ resources/views/dashboard/departments/index.blade.php	(revision 0a1fb54deb0f1b8748e3f675bf85a9a0281751cc)
@@ -52,5 +52,4 @@
                                 <th>Folders</th>
                                 <th>Created by</th>
-                                <th>Created at</th>
                                 <th>Updated at</th>
                                 <th>Directory</th>
@@ -66,11 +65,15 @@
                                     <td>{{ $department->code }}</td>
                                     <td>{{ $department->no_of_folders }}</td>
-                                    <td>{{ $department->getCreatedByName() }}</td>
-                                    <td>{{ date('d.m.Y - H:i', strtotime($department->created_at)) }}</td>
+                                    <td>{{ $department->user->username }}
+                                        <div class="font-weight-light p-1">{{$department->user->name}} {{$department->user->surname}}</div>
+                                        <div class="font-weight-light p-1">{{ date('d.m.Y - H:i', strtotime($department->created_at)) }}</div>
+                                    </td>
+
                                     @if($department->updated_at==NULL)
                                         <td>/</td>
                                     @else
-                                    <td>{{ date('d.m.Y - H:i', strtotime($department->updated_at)) }}</td>
+                                        <td class="font-weight-light p-1">{{ date('d.m.Y - H:i', strtotime($department->updated_at)) }}</td>
                                     @endif
+
                                     <!-- Trigger -->
                                     <td><button data-clipboard-text="{{$department->location}}" class="btn btn-sm btn-primary text-white" data-toggle="tooltip" data-placement="right" title="{{$department->location}}"><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-clipboard" viewBox="0 0 16 16">
Index: resources/views/dashboard/folders/files.blade.php
===================================================================
--- resources/views/dashboard/folders/files.blade.php	(revision 4d73966906e9f8aed724a4abdb8e595046d2af47)
+++ resources/views/dashboard/folders/files.blade.php	(revision 0a1fb54deb0f1b8748e3f675bf85a9a0281751cc)
@@ -70,7 +70,8 @@
 
             <p>Files in {{$folder->name}}</p>
-
+{{--            @dd($files)--}}
             <div class="row">
                 @forelse($files as $file)
+
                     <div class="col-xl-3 col-lg-4 col-md-6 col-sm-12">
                         <div class="card app-file-list">
@@ -162,5 +163,5 @@
                 <div class="modal-content">
                     <div class="modal-header">
-                        <h5 class="modal-title" id="exampleModalCenterTitle">Upload</h5>
+                        <h5 class="modal-title" id="exampleModalCenterTitle">Upload files to {{$folder->name}}</h5>
                         <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                             <i class="ti-close"></i>
Index: resources/views/dashboard/folders/index.blade.php
===================================================================
--- resources/views/dashboard/folders/index.blade.php	(revision 4d73966906e9f8aed724a4abdb8e595046d2af47)
+++ resources/views/dashboard/folders/index.blade.php	(revision 0a1fb54deb0f1b8748e3f675bf85a9a0281751cc)
@@ -83,5 +83,5 @@
                                 <a class="dropdown-item" href="javascript:void(0)" data-toggle="modal" data-target="#createModal">Add folder</a>
                                 @endif
-                                    @if(auth()->user()->hasPermission('export_data'))
+                                    @if(auth()->user()->hasPermission('export_data') && Request::query('id')==null)
                                 <a href="{{ route('dashboard.folders.export') }}" class="dropdown-item text-success">Export</a>
                             </div>
@@ -171,4 +171,5 @@
                                 <p class="badge bg-success-bright text-success">Version: {{$folder->version}}</p>
                                 <p>Archive ID: {{$folder->arch_id}}</p>
+                                <p>Department: {{$folder->department->name}}</p>
                                 <p>Note: {{$folder->note}}</p>
                                 <div class="row">
Index: resources/views/dashboard/index.blade.php
===================================================================
--- resources/views/dashboard/index.blade.php	(revision 4d73966906e9f8aed724a4abdb8e595046d2af47)
+++ resources/views/dashboard/index.blade.php	(revision 0a1fb54deb0f1b8748e3f675bf85a9a0281751cc)
@@ -119,5 +119,4 @@
                                 <th>Name</th>
                                 <th>Created at</th>
-                                <th>Updated at</th>
                                 <th>Folder name</th>
                                 <th>Folder archive ID</th>
@@ -165,9 +164,4 @@
                                     <td>{{ $file->name }}</td>
                                     <td>{{ date('d.m.Y - H:i', strtotime($file->created_at)) }}</td>
-                                    @if($file->updated_at==NULL)
-                                        <td>/</td>
-                                    @else
-                                        <td>{{ date('d.m.Y - H:i', strtotime($file->updated_at)) }}</td>
-                                    @endif
                                     <td><a href="{{ route('dashboard.folders.files', ['id' => $file->folder_id]) }}" class="text-linkedin">{{ \App\Models\Folder::find($file->folder_id)->name }}</a></td>
                                     <td>{{ \App\Models\Folder::find($file->folder_id)->arch_id }}</td>
@@ -180,7 +174,4 @@
                                     @if(auth()->user()->hasPermission('manage_all_files'))
                                     <td>
-                                        <a href="javascript:void(0)" class="text-secondary" data-toggle="modal" data-target="#editModal_{{$file->id}}" title="Edit">
-                                            <i class="ti-pencil"></i>
-                                        </a>
                                         <a href="{{ route("dashboard.files.downloadFile", ['id' => $file->id]) }}" class="text-danger ml-2"title="Download">
                                             <i class="ti-download"></i>
@@ -244,5 +235,5 @@
                     <div class="d-flex justify-content-between align-items-start mb-3">
                         <h6 class="card-title mb-0">Largest departments</h6>
-                        <a href="{{route("dashboard.departments.index")}}" class="small text-linkedin">View</a>
+                        <a href="{{route("dashboard.departments.index")}}" class="small text-linkedin">View all</a>
                     </div>
                 </div>
@@ -260,5 +251,5 @@
 
                             <td>
-                                <a href="{{ route("dashboard.folders.index", ['id' => $department->id]) }}">{{$department->name}}</a>
+                                <a href="{{ route("dashboard.folders.index", ['id' => $department->id]) }}" class="text-linkedin">{{$department->name}}</a>
                             </td>
                             <td>
Index: resources/views/dashboard/settings/index.blade.php
===================================================================
--- resources/views/dashboard/settings/index.blade.php	(revision 4d73966906e9f8aed724a4abdb8e595046d2af47)
+++ resources/views/dashboard/settings/index.blade.php	(revision 0a1fb54deb0f1b8748e3f675bf85a9a0281751cc)
@@ -70,5 +70,5 @@
                                         <div class="col-md-1">
                                             <div class="form-group">
-                                                <label>Current</label>
+                                                <label></label>
                                                 <figure class="avatar avatar-sm mr-2">
                                                     @if(auth()->user()->avatar==NULL)
Index: resources/views/dashboard/users/index.blade.php
===================================================================
--- resources/views/dashboard/users/index.blade.php	(revision 4d73966906e9f8aed724a4abdb8e595046d2af47)
+++ resources/views/dashboard/users/index.blade.php	(revision 0a1fb54deb0f1b8748e3f675bf85a9a0281751cc)
@@ -45,5 +45,4 @@
                                 <th>Name</th>
                                 <th>Created by</th>
-                                <th>Created at</th>
                                 <th>Updated at</th>
                                 <th>Status</th>
@@ -81,6 +80,9 @@
                                     <div class="font-weight-light p-1">{{$user->phone_number}}</div>
                                     </td>
-                                    <td>{{ $user->getCreatedByName() }}</td>
-                                    <td>{{ date('d.m.Y - H:i', strtotime($user->created_at)) }}</td>
+                                    <td>{{ $user->getCreatedByUsername() }}
+                                        <div class="font-weight-light p-1">{{$user->getCreatedByName()}}</div>
+                                        <div class="font-weight-light p-1">{{ date('d.m.Y - H:i', strtotime($user->created_at)) }}</div>
+                                    </td>
+
                                     @if($user->updated_at==NULL)
                                         <td>/</td>
@@ -88,4 +90,5 @@
                                         <td>{{ date('d.m.Y - H:i', strtotime($user->updated_at)) }}</td>
                                     @endif
+
                                     <td>
                                         @if(Cache::has('is_online' . $user->id))
@@ -99,5 +102,5 @@
                                         @endif
                                     </td>
-                                    @if(auth()->user()->hasPermission('manage_all_users'))
+                                    @if(auth()->user()->hasPermission('manage_all_users') && auth()->user()->id != $user->id)
                                     @if($user->hasRole("Referent") || $user->hasRole("Viewer") && $user->is_confirmed)
                                         <td>
@@ -105,7 +108,17 @@
                                                 <i class="ti-pencil"></i>
                                             </a>
+                                            @if ($user->is_active)
+                                            <a href="javascript:void(0)" data-toggle="modal" data-target="#blockModal_{{$user->id}}" class="text-warning ml-2" title="Block">
+                                                <i class="ti-lock"></i>
+                                            </a>
+                                            @else
+                                                <a href="javascript:void(0)" data-toggle="modal" data-target="#unBlockModal_{{$user->id}}" class="text-warning ml-2" title="Unblock">
+                                                    <i class="ti-unlock"></i>
+                                                </a>
+                                            @endif
                                             <a href="javascript:void(0)" class="text-danger ml-2" data-toggle="modal" data-target="#deleteModal_{{$user->id}}" title="Delete">
                                                 <i class="ti-trash"></i>
                                             </a>
+
                                         </td>
                                     @else
@@ -186,5 +199,5 @@
                                                         <div class="col-md-1">
                                                             <div class="form-group">
-                                                                <label>Current</label>
+                                                                <label></label>
                                                                 <figure class="avatar avatar-sm mr-2">
                                                                     @if($user->avatar==NULL)
@@ -223,4 +236,59 @@
                                                     @method('DELETE')
                                                     <p>Are you sure you want to delete user {{$user->username}} ?</p>
+                                                    <p>Number of folders created: <a href="{{ route("dashboard.folders.index", ['id' => $user->id]) }}" class="text-linkedin">{{\App\Models\Folder::where('user_id', $user->id)->count()}}</a></p>
+                                                    <div class="modal-footer">
+                                                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close
+                                                        </button>
+                                                        <button type="submit" class="btn btn-primary">Save changes</button>
+                                                    </div>
+                                                </form>
+                                            </div>
+
+                                        </div>
+                                    </div>
+                                </div>
+
+                                <div class="modal fade" id="blockModal_{{$user->id}}" tabindex="-1" role="dialog" aria-hidden="true">
+                                    <div class="modal-dialog modal-dialog-centered" role="document">
+                                        <div class="modal-content">
+                                            <div class="modal-header">
+                                                <h5 class="modal-title" id="exampleModalCenterTitle">Block confirmation</h5>
+                                                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                                                    <i class="ti-close"></i>
+                                                </button>
+                                            </div>
+                                            <div class="modal-body">
+                                                <form action="{{ route("dashboard.users.block", $user->id) }}" method="POST">
+                                                    @csrf
+                                                    @method('patch')
+                                                    <p>Are you sure you want to block user {{$user->username}} ?</p>
+                                                    <p>Number of folders created: <a href="{{ route("dashboard.folders.index", ['id' => $user->id]) }}" class="text-linkedin">{{\App\Models\Folder::where('user_id', $user->id)->count()}}</a></p>
+                                                    <div class="modal-footer">
+                                                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close
+                                                        </button>
+                                                        <button type="submit" class="btn btn-primary">Save changes</button>
+                                                    </div>
+                                                </form>
+                                            </div>
+
+                                        </div>
+                                    </div>
+                                </div>
+
+
+                                <div class="modal fade" id="unBlockModal_{{$user->id}}" tabindex="-1" role="dialog" aria-hidden="true">
+                                    <div class="modal-dialog modal-dialog-centered" role="document">
+                                        <div class="modal-content">
+                                            <div class="modal-header">
+                                                <h5 class="modal-title" id="exampleModalCenterTitle">Unblock confirmation</h5>
+                                                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                                                    <i class="ti-close"></i>
+                                                </button>
+                                            </div>
+                                            <div class="modal-body">
+                                                <form action="{{ route("dashboard.users.unblock", $user->id) }}" method="POST">
+                                                    @csrf
+                                                    @method('patch')
+                                                    <p>Are you sure you want to block user {{$user->username}} ?</p>
                                                     <p>Number of folders created: <a href="{{ route("dashboard.folders.index", ['id' => $user->id]) }}" class="text-linkedin">{{\App\Models\Folder::where('user_id', $user->id)->count()}}</a></p>
                                                     <div class="modal-footer">
Index: routes/web.php
===================================================================
--- routes/web.php	(revision 4d73966906e9f8aed724a4abdb8e595046d2af47)
+++ routes/web.php	(revision 0a1fb54deb0f1b8748e3f675bf85a9a0281751cc)
@@ -27,5 +27,5 @@
 Route::group(['prefix' => 'auth'], function () {
 
-    Route::get('/login', "Auth\LoginController@showLogin")->name("auth.loginShow");
+    Route::get('/login', "Auth\LoginController@showLogin")->name("auth.showLogin");
     Route::get('/verify-login/{id}/{token}', "Auth\VerifyLoginController@index")->middleware("CheckVerifyToken")->name("verify-login.index");
     Route::post('/verify-login/{id}/{token}', "Auth\VerifyLoginController@verify")->name("verify-login");
@@ -41,4 +41,8 @@
     });
 
+    Route::group(['middleware' => "checkVerifyNewEmail"], function () {
+        Route::get('/verify/{id}/{token}', "Auth\VerifyNewEmailController@create")->name("auth.verifyShow");
+        Route::post('/verify/{id}/{token}', "Auth\VerifyNewEmailController@verify")->name("auth.verify");
+    });
 });
 
@@ -84,8 +88,6 @@
     // Departments manage
     Route::group(['middleware' => 'permission:manage_all_departments'], function () {
-        Route::get("/departments/create", "Dashboard\DepartmentsController@create")->name("dashboard.departments.create");
-        Route::post("/departments/store", "Dashboard\DepartmentsController@store")->name("dashboard.departments.store");
-        Route::get("/departments/{id}/edit", "Dashboard\DepartmentsController@editShow")->name("dashboard.departments.editShow");
-        Route::patch("/departments/{id}/edit", "Dashboard\DepartmentsController@edit")->name("dashboard.departments.edit");
+       Route::post("/departments/store", "Dashboard\DepartmentsController@store")->name("dashboard.departments.store");
+       Route::patch("/departments/{id}/edit", "Dashboard\DepartmentsController@edit")->name("dashboard.departments.edit");
      });