chore: deleted areas table

app/Http/Controllers/API/EventController.php

@@ -37,7 +37,6 @@ public function store(Request $request)
     {
         $data = $this->validate($request, [
             'calendar_id' => 'required|exists:calendars,id',
-            'area' => 'required|exists:areas,id',
             'title' => 'required|string|max:255',
             'short_description' => 'nullable|max:280',
             'long_description' => 'nullable',
@@ -89,8 +88,7 @@ public function store(Request $request)
             'image' => $imageName,
         ]);
 
-        // Ensure area and user association
-        $event->area()->associate($request->input('area'));
+        // Ensure user association
         $event->user()->associate($user);
         $event->save();
 
@@ -121,7 +119,6 @@ public function update(Request $request, Event $event)
     {
         $data = $this->validate($request, [
             'calendar_id' => 'required|exists:calendars,id',
-            'area' => 'required|exists:areas,id',
             'title' => 'required|string|max:255',
             'short_description' => 'nullable|max:280',
             'long_description' => 'nullable',
@@ -182,7 +179,6 @@ public function update(Request $request, Event $event)
             'image' => $imageURL,
         ]);
 
-        $event->area()->associate($request->input('area'));
         $event->user()->associate($user);
         $event->save();
 

app/Http/Controllers/EventController.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use App\Models\Area;
 use App\Models\Calendar;
 use App\Models\Event;
 use Carbon\Carbon;
@@ -33,11 +32,9 @@ public function create()
     {
         $this->authorize('create', Event::class);
 
-        $areas = Area::all();
-
         $calendars = Calendar::all();
 
-        return view('events.create', compact('areas', 'calendars'));
+        return view('events.create', compact('calendars'));
     }
 
     /**
@@ -49,7 +46,6 @@ public function store(Request $request)
 
         $this->validate($request, [
             'calendar_id' => 'required|exists:calendars,id',
-            'area' => 'required|exists:areas,id',
             'title' => 'required|string|max:255',
             'short_description' => 'nullable|max:280',
             'long_description' => 'nullable',
@@ -97,8 +93,7 @@ public function store(Request $request)
             'image' => $imageName,
         ]);
 
-        // Ensure area and user association
-        $event->area()->associate($request->input('area'));
+        // Ensure user association
         $event->user()->associate(\Auth::user());
         $event->save();
 
@@ -128,11 +123,9 @@ public function edit(Event $event)
     {
         $this->authorize('update', $event);
 
-        $areas = Area::all();
-
         $calendars = Calendar::all();
 
-        return view('events.edit', compact('areas', 'calendars', 'event'));
+        return view('events.edit', compact('calendars', 'event'));
     }
 
     /**
@@ -144,7 +137,6 @@ public function update(Request $request, Event $event)
 
         $this->validate($request, [
             'calendar_id' => 'required|exists:calendars,id',
-            'area' => 'required|exists:areas,id',
             'title' => 'required|string|max:255',
             'short_description' => 'nullable|max:280',
             'long_description' => 'nullable',
@@ -201,8 +193,7 @@ public function update(Request $request, Event $event)
             'image' => $imageURL,
         ]);
 
-        // Ensure area and user association
-        $event->area()->associate($request->input('area'));
+        // Ensure user association
         $event->user()->associate(\Auth::user());
 
         // Save the event before handling recurrences

app/Http/Controllers/StaffingController.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use App\Models\Area;
 use App\Models\Staffing;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
@@ -63,11 +62,9 @@ public function create()
             }
         }
 
-        $areas = Area::all();
-
         $channels = $this->getGuildChannels();
 
-        return view('staffing.create', compact('allData', 'areas', 'channels'));
+        return view('staffing.create', compact('allData', 'channels'));
     }
 
     protected function getGuildChannels() {

app/Http/Controllers/UserController.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use App\Models\Area;
 use App\Models\Group;
 use App\Models\User;
 use Carbon\Carbon;
@@ -36,11 +35,9 @@ public function show(User $user)
                 return \Auth::user()->can('view', $event);
             });
 
-        $areas = Area::all();
-
         $groups = Group::all();
 
-        return view('users.show', compact('user', 'events', 'areas', 'groups'));
+        return view('users.show', compact('user', 'events', 'groups'));
     }
 
     /**
@@ -53,14 +50,8 @@ public function update(Request $request, User $user)
         $permissions = [];
 
         // Generate a list of possible validations
-        foreach (Area::all() as $area) {
-            foreach (Group::all() as $group) {
-                // Only process ranks the user is allowed to change
-                $this->authorize('updateGroup', [$user, $group, $area]);
-
-                $key = $area->id . '_' . $group->name;
-                $permissions[$key] = '';
-            }
+        foreach (Group::all() as $group) {
+            $permissions[$group->name] = '';
         }
 
         // Valiate and allow these fields, then loop through permissions to set the final data set
@@ -69,27 +60,22 @@ public function update(Request $request, User $user)
             isset($data[$key]) ? $permissions[$key] = true : $permissions[$key] = false;
         }
 
+        //dd($permissions);
+
         // Check and update the permissions
         foreach ($permissions as $key => $value) {
-            $str = explode('_', $key);
-
-            $area = Area::where('id', $str[0])->get()->first();
-            $group = Group::where('name', $str[1])->get()->first();
+            $group = Group::where('name', $key)->get()->first();
 
             // Check if permission is not set, and set it or other way around.
-            if ($user->groups()->where('area_id', $area->id)->where('group_id', $group->id)->get()->count() == 0) {
+            if ($user->groups()->where('group_id', $group->id)->get()->count() == 0) {
                 if ($value == true) {
-                    $this->authorize('updateGroup', [$user, $group, $area]);
-
                     // Attach the new permission
-                    $user->groups()->attach($group, ['area_id' => $area->id, 'inserted_by' => \Auth::user()->id]);
+                    $user->groups()->attach($group, ['inserted_by' => \Auth::user()->id]);
                 }
             } else {
                 if ($value == false) {
-                    $this->authorize('updateGroup', [$user, $group, $area]);
-
                     // Detach the permission
-                    $user->groups()->wherePivot('area_id', $area->id)->wherePivot('group_id', $group->id)->detach();
+                    $user->groups()->wherePivot('group_id', $group->id)->detach();
                 }
             }
         }

app/Models/Event.php

@@ -29,8 +29,7 @@ class Event extends Model
         'recurrence_end_date',
         'published',
         'image',
-        'user_id',
-        'area_id'
+        'user_id'
     ];
 
     protected $dates = [
@@ -43,11 +42,6 @@ public function user()
         return $this->belongsTo(User::class);
     }
 
-    public function area()
-    {
-        return $this->belongsTo(Area::class);
-    }
-
     public function calendar() 
     {
         return $this->belongsTo(Calendar::class);
@@ -124,8 +118,7 @@ public function generateRecurrences()
                     'recurrence_unit' => $this->recurrence_unit,
                     'recurrence_end_date' => $this->recurrence_end_date,
                     'image' => $this->image,
-                    'user_id' => $this->user_id,
-                    'area_id' => $this->area_id,
+                    'user_id' => $this->user_id
                 ]);
 
                 // Move to the next recurrence date

app/Models/Group.php

@@ -11,6 +11,6 @@ class Group extends Model
 
     public function users()
     {
-        return $this->belongsToMany(User::class, 'permissions')->withPivot('area_id')->withTimestamps();
+        return $this->belongsToMany(User::class, 'permissions');
     }
 }

app/Models/Staffing.php

@@ -18,8 +18,4 @@ class Staffing extends Model
         'id', 'title', 'date', 'description', 'channel_id', 'message_id', 'week_int', 'section_1_title', 'section_2_title', 'section_3_title', 'section_4_title', 'restrict_bookings'
     ];
 
-    public function area() 
-    {
-        return $this->belongsTo(Area::class, 'area_id');
-    }
 }

app/Models/User.php

@@ -51,7 +51,7 @@ class User extends Authenticatable
      */
     public function groups()
     {
-        return $this->belongsToMany(Group::class, 'permissions')->withPivot('area_id')->withTimestamps();
+        return $this->belongsToMany(Group::class, 'permissions');
     }
 
     public function events()
@@ -69,39 +69,19 @@ public function getNameAttribute()
      *
      * @return bool
      */
-    public function isModerator(?Area $area = null) 
+    public function isModerator() 
     {
-        if($area == null) {
-            return $this->groups->where('id', 2)->isNotEmpty();
-        }
-
-        foreach($this->groups->where('id', 2) as $group) {
-            if($group->pivot->area_id == $area->id) {
-                return true;
-            }
-        }
-
-        return false;
+        return $this->groups->where('id', 2)->isNotEmpty();
     }
 
-    public function isModeratorOrAbove(?Area $area = null) 
+    /**
+     * Return if user is a moderator or above
+     * 
+     * @return bool
+     */
+    public function isModeratorOrAbove() 
     {
-        if ($area == null) {
-            return $this->groups->where('id', '<=', 2)->isNotEmpty();
-        }
-
-        if ($this->isAdmin()) {
-            return true;
-        }
-
-        // Check if user is moderator or above in the specified area
-        foreach ($this->groups->where('id', '<=', 2) as $group) {
-            if ($group->pivot->area_id == $area->id) {
-                return true;
-            }
-        }
-
-        return false;
+        return $this->groups->where('id', '<=', 2)->isNotEmpty();;
     }
 
     /**

app/Policies/EventPolicy.php

@@ -17,7 +17,7 @@ public function index(User $user)
 
     public function view(?User $user, Event $event)
     {
-        return $user && ($user->isModeratorOrAbove() || $user->isModerator($event->area) || $user->is($event->user)) || $event->calendar->public;
+        return $user && ($user->isModeratorOrAbove() || $user->isModerator() || $user->is($event->user)) || $event->calendar->public;
     }
 
     public function create(User $user) 
@@ -27,11 +27,11 @@ public function create(User $user)
 
     public function update(User $user, Event $event) 
     {
-        return $user->isModerator($event->area) || $user->isAdmin();
+        return $user->isModerator() || $user->isAdmin();
     }
 
     public function destroy(User $user, Event $event)
     {
-        return $user->isModerator($event->area) || $user->isAdmin();
+        return $user->isModerator() || $user->isAdmin();
     }
 }

app/Policies/StaffingPolicy.php

@@ -12,6 +12,6 @@ class StaffingPolicy
 
     public function view(User $user, Staffing $staffing)
     {
-        return $user->isAdmin() || $user->isModerator($staffing->area);
+        return $user->isAdmin() || $user->isModerator();
     }
 }

app/Policies/UserPolicy.php

@@ -2,7 +2,6 @@
 
 namespace App\Policies;
 
-use App\Models\Area;
 use App\Models\Group;
 use App\Models\User;
 use Illuminate\Auth\Access\HandlesAuthorization;
@@ -30,9 +29,4 @@ public function update(User $user, User $model)
     {
         return $user->isAdmin();
     }
-
-    public function updateGroup(User $user, User $model) 
-    {
-        return $user->isAdmin();
-    }
 }