Merge branch 'master' of https://github.com/Vatsim-Scandinavia/staffi…

…ng-manager

Dockerfile

@@ -49,11 +49,13 @@ COPY --from=frontend --chown=www-data:www-data /app/public/ /app/public/
 
 WORKDIR /app
 
+# Ensure the storage and cache directories have the correct permissions
 RUN chmod -R 755 storage bootstrap/cache && \
-        composer install --no-dev --no-interaction --prefer-dist && \
-        mkdir -p /app/storage/app/public/files
+    composer install --no-dev --no-interaction --prefer-dist && \
+    mkdir -p /app/storage/app/public/banners && \
+    chmod -R 775 /app/storage
 
 # Wrap around the default PHP entrypoint with a custom entrypoint
 COPY ./container/entrypoint.sh /usr/local/bin/service-entrypoint
 ENTRYPOINT [ "service-entrypoint" ]
-CMD ["apache2-foreground"]
+CMD ["apache2-foreground"]

app/Http/Controllers/API/EventController.php

@@ -23,7 +23,7 @@ public function index(Calendar $calendar)
 
         // Set the full path on the image attribute
         $events->transform(function ($event) {
-            $event->image = asset('storage/banners/' . $event->image);
+            $event->image = isset($event->image) ? asset('storage/banners/' . $event->image) : null;
             return $event;
         });
 
@@ -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' => 'required|max:280',
             'long_description' => 'required',
@@ -70,7 +69,7 @@ public function store(Request $request)
             $storedPath = $image->storeAs('banners', $imageName, 'public');
 
             // Check if the image was successfully uploaded
-            if (!Storage::disk('public')->exists($storedPath)) {
+            if ($storedPath && !Storage::disk('public')->exists($storedPath)) {
                 return back()->withErrors(['image' => 'Failed to upload the image.'])->withInput();
             }
 
@@ -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' => 'required|max:280',
             'long_description' => 'required',
@@ -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/Auth/LoginController.php

@@ -62,7 +62,7 @@ public function login(Request $request)
 
             return redirect()->away($authorizationUrl);
         } elseif ($request->input('state') !== session()->pull('oauthstate')) {
-            return redirect()->route('welcome')->withError('Something went wrong, please try again (state mismatch).');
+            return redirect()->route('home')->withError('Something went wrong, please try again (state mismatch).');
         } else {
             return $this->verifyLogin($request);
         }
@@ -81,7 +81,7 @@ protected function verifyLogin(Request $request)
                 'code' => $request->input('code'),
             ]);
         } catch (IdentityProviderException $e) {
-            return redirect()->route('welcome')->withError('Authentication error: ' . $e->getMessage());
+            return redirect()->route('home')->withError('Authentication error: ' . $e->getMessage());
         }
 
         $resourceOwner = json_decode(json_encode($this->provider->getResourceOwner($accessToken)->toArray()));
@@ -93,7 +93,7 @@ protected function verifyLogin(Request $request)
             !$data['first_name'] ||
             !$data['last_name']
         ) {
-            return redirect()->route('welcome')->withError('Missing data from sign-in request. You need to grant all permissions.');
+            return redirect()->route('home')->withError('Missing data from sign-in request. You need to grant all permissions.');
         }
 
         $account = $this->completeLogin($data, $accessToken);
@@ -133,14 +133,14 @@ protected function completeLogin(array $data, $token)
     }
 
     /**
-     * Log out he user and redirect to welcome page
+     * Log out he user and redirect to home page
      *
      * @return \Illuminate\Http\RedirectResponse
      */
     public function logout()
     {
         auth()->logout();
 
-        return redirect(route('welcome'))->withSuccess('You have been successfully logged out');
+        return redirect(route('home'))->withSuccess('You have been successfully logged out');
     }
 }

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' => 'required|max:280',
             'long_description' => 'required',
@@ -78,7 +74,7 @@ public function store(Request $request)
             $storedPath = $image->storeAs('banners', $imageName, 'public');
 
             // Check if the image was successfully uploaded
-            if (!Storage::disk('public')->exists($storedPath)) {
+            if ($storedPath && !Storage::disk('public')->exists($storedPath)) {
                 return back()->withErrors(['image' => 'Failed to upload the image.'])->withInput();
             }
 
@@ -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' => 'required|max:280',
             'long_description' => 'required',
@@ -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/WelcomeController.php → app/Http/Controllers/HomeController.php

@@ -6,7 +6,7 @@
 use App\Models\Event;
 use Carbon\Carbon;
 
-class WelcomeController extends Controller
+class HomeController extends Controller
 {
     /**
      * Show the landing page if not logged in, or redirect if logged in.
@@ -15,14 +15,14 @@ class WelcomeController extends Controller
      */
     public function index()
     {
-        $now = Carbon::now();
-        $UpcomingEvents = Event::where('start_date', '>=', $now)
-            ->orderBy('start_date', 'asc')
-            ->get()
-            ->filter(function ($event) {
-                return $event->calendar->public;
+        // Get events with start date today and the connected Calendar is public
+        $upcomingEvents = Event::where('start_date', '>=', Carbon::today())
+            ->whereHas('calendar', function($query) {
+                $query->where('public', 1);
             })
-            ->take(5);
+            ->orderBy('start_date', 'asc')
+            ->limit(5)
+            ->get();
 
         $calendar = Calendar::where('public', 1)->first();
 
@@ -42,6 +42,6 @@ public function index()
         }
 
 
-        return view('welcome', compact('UpcomingEvents', 'events', 'calendar'));
+        return view('home', compact('upcomingEvents', 'events', 'calendar'));
     }
 }

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');
     }
 }