Merge pull request #1395 from krayin/more-cleanup

feat: krayin version and routes clean up done

.env.example

@@ -1,6 +1,5 @@
 APP_NAME='Krayin CRM'
 APP_ENV=local
-APP_VERSION=1.3.0
 APP_KEY=
 APP_DEBUG=true
 APP_URL=http://localhost

app/Console/Kernel.php

@@ -7,33 +7,21 @@
 
 class Kernel extends ConsoleKernel
 {
-    /**
-     * The Artisan commands provided by your application.
-     *
-     * @var array
-     */
-    protected $commands = [
-        //
-    ];
-
     /**
      * Define the application's command schedule.
-     *
-     * @return void
      */
-    protected function schedule(Schedule $schedule)
+    protected function schedule(Schedule $schedule): void
     {
         // $schedule->command('inspire')->hourly();
     }
 
     /**
      * Register the commands for the application.
-     *
-     * @return void
      */
-    protected function commands()
+    protected function commands(): void
     {
         $this->load(__DIR__.'/Commands');
+
         $this->load(__DIR__.'/../../packages/Webkul/Core/src/Console/Commands');
 
         require base_path('routes/console.php');

app/Exceptions/Handler.php

@@ -7,19 +7,10 @@
 
 class Handler extends ExceptionHandler
 {
-    /**
-     * A list of the exception types that are not reported.
-     *
-     * @var array
-     */
-    protected $dontReport = [
-        //
-    ];
-
     /**
      * A list of the inputs that are never flashed for validation exceptions.
      *
-     * @var array
+     * @var array<int, string>
      */
     protected $dontFlash = [
         'current_password',
@@ -29,10 +20,8 @@ class Handler extends ExceptionHandler
 
     /**
      * Register the exception handling callbacks for the application.
-     *
-     * @return void
      */
-    public function register()
+    public function register(): void
     {
         $this->reportable(function (Throwable $e) {
             //

app/Providers/AuthServiceProvider.php

@@ -2,28 +2,25 @@
 
 namespace App\Providers;
 
+// use Illuminate\Support\Facades\Gate;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
 
 class AuthServiceProvider extends ServiceProvider
 {
     /**
-     * The policy mappings for the application.
+     * The model to policy mappings for the application.
      *
-     * @var array
+     * @var array<class-string, class-string>
      */
     protected $policies = [
-        // 'App\Models\Model' => 'App\Policies\ModelPolicy',
+        //
     ];
 
     /**
      * Register any authentication / authorization services.
-     *
-     * @return void
      */
-    public function boot()
+    public function boot(): void
     {
-        $this->registerPolicies();
-
         //
     }
 }

app/Providers/BroadcastServiceProvider.php

@@ -9,10 +9,8 @@ class BroadcastServiceProvider extends ServiceProvider
 {
     /**
      * Bootstrap any application services.
-     *
-     * @return void
      */
-    public function boot()
+    public function boot(): void
     {
         Broadcast::routes();
 

app/Providers/EventServiceProvider.php

@@ -10,9 +10,9 @@
 class EventServiceProvider extends ServiceProvider
 {
     /**
-     * The event listener mappings for the application.
+     * The event to listener mappings for the application.
      *
-     * @var array
+     * @var array<class-string, array<int, class-string>>
      */
     protected $listen = [
         Registered::class => [
@@ -22,11 +22,17 @@ class EventServiceProvider extends ServiceProvider
 
     /**
      * Register any events for your application.
-     *
-     * @return void
      */
-    public function boot()
+    public function boot(): void
     {
         //
     }
+
+    /**
+     * Determine if events and listeners should be automatically discovered.
+     */
+    public function shouldDiscoverEvents(): bool
+    {
+        return false;
+    }
 }

app/Providers/RouteServiceProvider.php

@@ -11,53 +11,30 @@
 class RouteServiceProvider extends ServiceProvider
 {
     /**
-     * The path to the "home" route for your application.
+     * The path to your application's "home" route.
      *
-     * This is used by Laravel authentication to redirect users after login.
+     * Typically, users are redirected here after authentication.
      *
      * @var string
      */
     public const HOME = '/home';
 
     /**
-     * The controller namespace for the application.
-     *
-     * When present, controller route declarations will automatically be prefixed with this namespace.
-     *
-     * @var string|null
-     */
-    // protected $namespace = 'App\\Http\\Controllers';
-
-    /**
-     * Define your route model bindings, pattern filters, etc.
-     *
-     * @return void
+     * Define your route model bindings, pattern filters, and other route configuration.
      */
-    public function boot()
+    public function boot(): void
     {
-        $this->configureRateLimiting();
+        RateLimiter::for('api', function (Request $request) {
+            return Limit::perMinute(60)->by($request->user()?->id ?: $request->ip());
+        });
 
         $this->routes(function () {
-            Route::prefix('api')
-                ->middleware('api')
-                ->namespace($this->namespace)
+            Route::middleware('api')
+                ->prefix('api')
                 ->group(base_path('routes/api.php'));
 
             Route::middleware('web')
-                ->namespace($this->namespace)
                 ->group(base_path('routes/web.php'));
         });
     }
-
-    /**
-     * Configure the rate limiters for the application.
-     *
-     * @return void
-     */
-    protected function configureRateLimiting()
-    {
-        RateLimiter::for('api', function (Request $request) {
-            return Limit::perMinute(60)->by(optional($request->user())->id ?: $request->ip());
-        });
-    }
 }

composer.json

@@ -17,6 +17,7 @@
         "laravel/framework": "^10.0",
         "laravel/sanctum": "^3.2",
         "laravel/tinker": "^2.5",
+        "laravel/ui": "^4.5",
         "maatwebsite/excel": "^3.1",
         "prettus/l5-repository": "^2.7.9"
     },

config/app.php

@@ -44,11 +44,6 @@
 
     'debug' => (bool) env('APP_DEBUG', false),
 
-    /*
-    Application Version
-     */
-    'version' => env('APP_VERSION'),
-
     /*
     |--------------------------------------------------------------------------
     | Application URL

packages/Webkul/Admin/src/Config/acl.php

@@ -161,7 +161,7 @@
         'name'  => 'admin::app.acl.view',
         'route' => 'admin.contacts.persons.view',
         'sort'  => 5,
-    ],[
+    ], [
         'key'   => 'contacts.organizations',
         'name'  => 'admin::app.acl.organizations',
         'route' => 'admin.contacts.organizations.index',
@@ -201,7 +201,7 @@
         'name'  => 'admin::app.acl.delete',
         'route' => ['admin.products.delete', 'admin.products.mass_delete'],
         'sort'  => 3,
-    ],[
+    ], [
         'key'   => 'products.view',
         'name'  => 'admin::app.acl.view',
         'route' => 'admin.products.view',

packages/Webkul/Admin/src/Http/Controllers/Settings/RoleController.php

@@ -112,7 +112,6 @@ public function update(int $id): RedirectResponse
         session()->flash('success', trans('admin::app.settings.roles.index.update-success'));
 
         return redirect()->back();
-        return redirect()->route('admin.settings.roles.index');
     }
 
     /**

packages/Webkul/Admin/src/Http/Controllers/User/ForgotPasswordController.php

@@ -4,7 +4,6 @@
 
 use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
 use Illuminate\Support\Facades\Password;
-use Illuminate\View\View;
 use Webkul\Admin\Http\Controllers\Controller;
 use Webkul\Admin\Notifications\User\UserResetPassword;
 
@@ -15,7 +14,7 @@ class ForgotPasswordController extends Controller
     /**
      * Show the form for creating a new resource.
      */
-    public function create(): View
+    public function create()
     {
         if (auth()->guard('user')->check()) {
             return redirect()->route('admin.dashboard.index');

packages/Webkul/Admin/src/Providers/AdminServiceProvider.php

@@ -26,7 +26,12 @@ public function boot(Router $router): void
 
         include __DIR__.'/../Http/helpers.php';
 
-        Route::middleware(['web', 'admin_locale'])->group(__DIR__.'/../Routes/web.php');
+        Route::middleware(['web', 'admin_locale', 'user'])
+            ->prefix(config('app.admin_path'))
+            ->group(__DIR__.'/../Routes/Admin/web.php');
+
+        Route::middleware(['web', 'admin_locale'])
+            ->group(__DIR__.'/../Routes/Front/web.php');
 
         $this->loadMigrationsFrom(__DIR__.'/../Database/Migrations');