Changeset 24a616f for app/Http

Timestamp:

10/13/21 15:44:57 (3 years ago)

Author:

Berat Kjufliju <kufliju@…>

Branches:

develop, master

Children:

120759b

Parents:

194a359

Message:

added documents crud, added last_seen_to_user, edited views

Location:

app/Http

Files:

• Controllers/Dashboard/DepartmentsController.php (modified) (4 diffs)
• Controllers/Dashboard/DocumentsController.php (added)
• Controllers/Dashboard/IndexController.php (modified) (1 diff)
• Controllers/Dashboard/SettingsController.php (modified) (2 diffs)
• Controllers/Dashboard/UsersController.php (modified) (6 diffs)
• Kernel.php (modified) (1 diff)
• Middleware/LastSeenUserActivity.php (added)
• Requests/Dashboard/DocumentRequest.php (added)
• Requests/Dashboard/NewUserRequest.php (modified) (1 diff)
• Requests/Dashboard/UpdateUserData.php (added)
• Requests/Dashboard/UpdateUserRequest.php (modified) (1 diff)

app/Http/Controllers/Dashboard/DepartmentsController.php

@@ -11 +11 @@
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Storage;
 
 class DepartmentsController extends Controller
@@ -17 +18 @@
     {
         return view("dashboard.departments.index")->with([
-            "departments" => Department::all()
+            "departments" => Department::all(),
         ]);
     }
@@ -37 +38 @@
         $department = Department::findOrFail($id);
 
+        $oldDepartmentCode = $department->code;
+
         $department->name = $request->name;
         $department->code = $request->code;
+
+        $path = '/Departments/' . $request->code;
+        $department->location = $path;
+
+        $files = Storage::allFiles($oldDepartmentCode);
+
+        if($department->isDirty('code'))
+        {
+            if(!Storage::disk('local')->has('Departments/' . $request->code)){
+                Storage::disk('local')->move('Departments/' . $oldDepartmentCode, 'Departments/' . $department->code);
+            }
+        }
 
         $department->save();
@@ -54 +69 @@
         $department->code = $request->code;
 
+        if(!Storage::disk('local')->has('Departments/' . $request->code)){
+            Storage::disk('local')->makeDirectory('Departments/' . $request->code);
+        }
+
         $department->user_id = auth()->id();
+        $department->location = '/Departments/' . $request->code;
+
+        dd($department->location);
 
         $department->save();

app/Http/Controllers/Dashboard/IndexController.php

@@ -15 +15 @@
         );
 
-        Alert::flash("test");
-
         return view("dashboard.index")->with([
             "counters" => $counters,

app/Http/Controllers/Dashboard/SettingsController.php

@@ -9 +9 @@
 use App\Http\Requests\Dashboard\PhotosSettingsRequest;
 use App\Http\Requests\Dashboard\SocialLinksSettingsRequest;
+use App\Http\Requests\Dashboard\UpdateUserData;
+use App\Http\Requests\Dashboard\UpdateUserRequest;
 use App\Http\Requests\Dashboard\UsernameSettingsRequest;
 use App\Http\Requests\Dashboard\UserProfileSettingsRequest;
@@ -78 +80 @@
     }
 
-
-
 }

app/Http/Controllers/Dashboard/UsersController.php

@@ -5 +5 @@
 use App\Helpers\Alert;
 use App\Http\Requests\Dashboard\NewUserRequest;
+use App\Http\Requests\Dashboard\UpdateUserData;
 use App\Http\Requests\Dashboard\UpdateUserRequest;
+use App\Models\Avatar;
+use Illuminate\Support\Facades\File;
 use App\Models\Role;
 use App\Models\User;
@@ -12 +15 @@
 use App\Notifications\WelcomeUser;
 use App\Http\Controllers\Controller;
+use Illuminate\Support\Facades\Storage;
 
 class UsersController extends Controller
 {
+
     public function index()
     {
@@ -44 +49 @@
         $user->role_id = $request->userRole;
 
+        if ($request->hasFile("avatar")) {
+            $image = $request->file("avatar");
+            $avatarName = $user->id . '_avatar' . time() . '.' . request()->avatar->getClientOriginalExtension();
+
+            if (!empty($user->avatar)) {
+                Storage::disk('uploads')->delete("/users/" . $user->avatar);
+            }
+
+            Storage::disk('uploads')->put("/users/" . $avatarName, File::get($image));
+
+            $user->avatar = $avatarName;
+        }
         $user->save();
 
@@ -70 +87 @@
         $user->mobile_number = $request->mobile_number;
         $user->role_id = $request->userRole;
+
+        if ($request->hasFile("avatar")) {
+            $image = $request->file("avatar");
+            $avatarName = $user->id . '_avatar' . time() . '.' . request()->avatar->getClientOriginalExtension();
+
+            if (!empty($user->avatar)) {
+                Storage::disk('uploads')->delete("/users/" . $user->avatar);
+            }
+
+            Storage::disk('uploads')->put("/users/" . $avatarName, File::get($image));
+
+            $user->avatar = $avatarName;
+        }
+
         if($user->isDirty('email')) {
             $user->notify(new VerifyNewEmail($user));
@@ -78 +109 @@
 
         return redirect()->route("dashboard.users.index");
-    }
-
-    public function editUserData(UpdateUserRequest $request, $id)
-    {
-        $user = User::findOrFail($id);
-        $user->name = $request->name;
-        $user->surname = $request->surname;
-        $user->mobile_number = $request->mobile_number;
-
-        $user->save();
-
-        Alert::flash("User data updated successfully");
-
-        return redirect()->route("dashboard.settings.index");
     }
 
@@ -129 +146 @@
       return $roles;
     }
+
+    public function editUserData(UpdateUserData $request, $id)
+    {
+        $user = User::findOrFail($id);
+        $user->name = $request->name;
+        $user->surname = $request->surname;
+        $user->mobile_number = $request->mobile_number;
+
+        if ($request->hasFile("avatar")) {
+            $image = $request->file("avatar");
+            $avatarName = $user->id . '_avatar' . time() . '.' . request()->avatar->getClientOriginalExtension();
+
+            if (!empty($user->avatar)) {
+                Storage::disk('uploads')->delete("/users/" . $user->avatar);
+            }
+
+            Storage::disk('uploads')->put("/users/" . $avatarName, File::get($image));
+
+            $user->avatar = $avatarName;
+        }
+
+        $user->save();
+
+        Alert::flash("User data updated successfully");
+
+        return redirect()->route("dashboard.settings.index");
+    }
 }

app/Http/Kernel.php

@@ -39 +39 @@
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
+            \App\Http\Middleware\LastSeenUserActivity::class,
         ],
 

app/Http/Requests/Dashboard/NewUserRequest.php

@@ -30 +30 @@
             "email" => "required|string|email|max:255|unique:users,email",
             "username" => "required|min:8|unique:users,username",
-            "userRole" => "required|exists:roles,id"
+            "userRole" => "required|exists:roles,id",
+            "avatar" => "mimes:jpeg,png,gif|max:5000",
         ];
     }

app/Http/Requests/Dashboard/UpdateUserRequest.php

@@ -30 +30 @@
             "email" => "required|string|email|max:255|unique:users,email,$this->id,id",
             "username" => "required|min:8|unique:users,username,$this->id,id",
-            "userRole" => "required|exists:roles,id"
+            "userRole" => "required|exists:roles,id",
+            "avatar" => "mimes:jpeg,png,gif|max:5000",
         ];
     }