Few fixes and enhancments to dashboard

Author: root

.editorconfig

@@ -116,7 +116,11 @@ public function create()
     public function store(Request $request)
     {
         $data = $request->all();
-        $data['expires'] = Carbon::parse($data['expires'])->timestamp;
+        if(isset($data['permanent'])) {
+            $data['expires'] = 0;
+        } else {
+            $data['expires'] = Carbon::parse($data['expires'])->timestamp;
+        }
         $data['account_id'] = $this->convertSteamID64ToAccountId($data['account_id']);
         $data['lastvisit'] = Carbon::now()->timestamp;
         $vip = new VIP($data);
@@ -131,14 +135,18 @@ private function convertSteamID64ToAccountId($steamID64)
     public function edit($id)
     {
         $vip = VIP::findOrFail($id);
-        $vip['expires'] = Carbon::parse($vip['expires'])->toDateTimeString();
+        $vip->ends = Carbon::parse($vip->expires)->toDateString();
         $servers = VIPServer::all();
         return view('admin.vip.edit', compact('vip', 'servers'));
     }
     public function update(Request $request, $id)
     {
         $data = $request->all();
-        $data['expires'] = Carbon::parse($data['expires'])->timestamp;
+        if(isset($data['permanent'])) {
+            $data['expires'] = 0;
+        } else {
+            $data['expires'] = Carbon::parse($data['expires'])->timestamp;
+        }
         $vip = VIP::findOrFail($id);
         $vip->update($data);
         return redirect()->route('vip.index')->with('success', __('admins.vipAddedSuccessfully'));

.env.example

@@ -2,6 +2,7 @@
 
 namespace App\Http;
 
+use App\Http\Middleware\Admin;
 use App\Http\Middleware\Ban;
 use App\Http\Middleware\CheckSetupMiddleware;
 use App\Http\Middleware\Kick;
@@ -78,5 +79,6 @@ class Kernel extends HttpKernel
         'permission.mute' => Mute::class,
         'permission.kick' => Kick::class,
         'checkSetup' => CheckSetupMiddleware::class,
+        'admin' => Admin::class,
     ];
 }

.env.vercel.example

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use App\Helpers\PermissionsHelper;
+use Closure;
+use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class Admin
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
+     */
+    public function handle(Request $request, Closure $next): Response
+    {
+        // Check if the authenticated user has the required permission
+        if (! PermissionsHelper::isSuperAdmin() && ! PermissionsHelper::hasAdminCreatePermission() && ! PermissionsHelper::hasAdminEditPermission()) {
+            abort(403, 'Unauthorized action.');
+        }
+
+        return $next($request);
+    }
+}

.gitattributes

@@ -9,7 +9,7 @@
     | Application Version
     |--------------------------------------------------------------------------
     */
-    'version' => '4.1.1',
+    'version' => '4.2',
     /*
     |--------------------------------------------------------------------------
     | Application Name