Revert "merge 1"

This reverts commit 0bc6c20a6d.

app/Http/Controllers/ProfileController.php

@@ -21,12 +21,8 @@
 
 namespace App\Http\Controllers;
 
-use App\Exceptions\ProfileAlreadyExistsException;
-use App\Exceptions\ProfileCreationFailedException;
-use App\Exceptions\ProfileNotFoundException;
 use App\Facades\IP;
 use App\Http\Requests\ProfileSave;
-use App\Services\AccountSuspensionService;
 use App\Services\ProfileService;
 use App\User;
 use Carbon\Carbon;
@@ -36,12 +32,18 @@ use Spatie\Permission\Models\Role;
 
 class ProfileController extends Controller
 {
-    private ProfileService $profileService;
+    private $profileService;
 
     public function __construct(ProfileService $profileService) {
         $this->profileService = $profileService;
     }
 
+    public function index()
+    {
+        return view('dashboard.user.directory')
+          ->with('users', User::with('profile', 'bans')->paginate(9));
+    }
+
     public function showProfile()
     {
         // TODO: Come up with cleaner social media solution, e.g. social media object
@@ -58,23 +60,26 @@ class ProfileController extends Controller
             ]);
     }
 
-    public function showSingleProfile(AccountSuspensionService $accountSuspensionService, User $user)
+    public function showSingleProfile(User $user)
     {
-
-        if (is_null($user->profile)) {
-
-            return redirect()
-                ->back()
-                ->with('error', "This user doesn't have a profile.");
-
-        }
-
         $socialMediaProfiles = json_decode($user->profile->socialLinks, true);
         $createdDate = Carbon::parse($user->created_at);
 
+        $systemRoles = Role::all()->pluck('name')->all();
+        $userRoles = $user->roles->pluck('name')->all();
+
+        $roleList = [];
+
+        foreach ($systemRoles as $role) {
+            if (in_array($role, $userRoles)) {
+                $roleList[$role] = true;
+            } else {
+                $roleList[$role] = false;
+            }
+        }
 
         $suspensionInfo = null;
-        if ($accountSuspensionService->isSuspended($user))
+        if ($user->isBanned())
         {
             $suspensionInfo = [
 
@@ -93,7 +98,8 @@ class ProfileController extends Controller
                     'insta' => $socialMediaProfiles['links']['insta'] ?? 'UpdateMe',
                     'discord' => $socialMediaProfiles['links']['discord'] ?? 'UpdateMe#12345',
                     'since' => $createdDate->englishMonth.' '.$createdDate->year,
-                    'ipInfo' => IP::lookup($user->currentIp),
+                    'ipInfo' => IP::lookup($user->originalIP),
+                    'roles' => $roleList,
                     'suspensionInfo' => $suspensionInfo
                 ]);
         } else {
@@ -108,44 +114,4 @@ class ProfileController extends Controller
             ->back()
             ->with('success', __('Profile updated.'));
     }
-
-
-    public function createProfile(Request $request)
-    {
-
-        try {
-            $this->profileService->createProfile($request->user());
-        } catch (\Exception $e) {
-
-            return redirect()
-                ->back()
-                ->with('error', $e->getMessage());
-
-        }
-
-        return redirect()
-            ->back()
-            ->with('success', __('Your profile has been created.'));
-    }
-
-
-
-    public function deleteProfile(Request $request)
-    {
-
-        try {
-            $this->profileService->deleteProfile($request->user());
-        } catch (ProfileNotFoundException $e) {
-
-            return redirect()
-                ->back()
-                ->with('error', $e->getMessage());
-
-        }
-
-        return redirect()
-            ->back()
-            ->with('success', __('Profile deleted successfully.'));
-
-    }
 }