SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Core/Http/Middleware/CheckPermissions.php

Indentation +58 added lines, -58 removed lines

@@ -11,68 +11,68 @@
 
 class CheckPermissions
 {
-    protected $route;
-    protected $auth;
-    protected $authMiddleware;
-    protected $userService;
-    protected $arr;
+	protected $route;
+	protected $auth;
+	protected $authMiddleware;
+	protected $userService;
+	protected $arr;
     
-    /**
-     * Init new object.
-     *
-     * @param   Route          $route
-     * @param   Auth           $auth
-     * @param   AuthMiddleware $authMiddleware
-     * @param   UserService    $userService
-     * @param   Arr            $arr
-     *
-     * @return  void
-     */
-    public function __construct(Route $route, Auth $auth, AuthMiddleware $authMiddleware, UserService $userService, Arr $arr)
-    {
-        $this->route = $route;
-        $this->auth = $auth;
-        $this->authMiddleware = $authMiddleware;
-        $this->userService = $userService;
-        $this->arr = $arr;
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   Route          $route
+	 * @param   Auth           $auth
+	 * @param   AuthMiddleware $authMiddleware
+	 * @param   UserService    $userService
+	 * @param   Arr            $arr
+	 *
+	 * @return  void
+	 */
+	public function __construct(Route $route, Auth $auth, AuthMiddleware $authMiddleware, UserService $userService, Arr $arr)
+	{
+		$this->route = $route;
+		$this->auth = $auth;
+		$this->authMiddleware = $authMiddleware;
+		$this->userService = $userService;
+		$this->arr = $arr;
+	}
 
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
-     * @return mixed
-     */
-    public function handle($request, Closure $next)
-    {
-        $routeActions        = explode('@', $this->route->currentRouteAction());
-        $reflectionClass     = new \ReflectionClass($routeActions[0]);
-        $classProperties     = $reflectionClass->getDefaultProperties();
-        $skipPermissionCheck = $this->arr->get($classProperties, 'skipPermissionCheck', []);
-        $skipLoginCheck      = $this->arr->get($classProperties, 'skipLoginCheck', []);
-        $modelName           = explode('\\', $routeActions[0]);
-        $modelName           = lcfirst(str_replace('Controller', '', end($modelName)));
-        $permission          = $routeActions[1];
+	/**
+	 * Handle an incoming request.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  \Closure  $next
+	 * @return mixed
+	 */
+	public function handle($request, Closure $next)
+	{
+		$routeActions        = explode('@', $this->route->currentRouteAction());
+		$reflectionClass     = new \ReflectionClass($routeActions[0]);
+		$classProperties     = $reflectionClass->getDefaultProperties();
+		$skipPermissionCheck = $this->arr->get($classProperties, 'skipPermissionCheck', []);
+		$skipLoginCheck      = $this->arr->get($classProperties, 'skipLoginCheck', []);
+		$modelName           = explode('\\', $routeActions[0]);
+		$modelName           = lcfirst(str_replace('Controller', '', end($modelName)));
+		$permission          = $routeActions[1];
 
-        $this->auth->shouldUse('api');
-        if (! in_array($permission, $skipLoginCheck)) {
-            $this->authMiddleware->handle($request, function ($request) use ($modelName, $skipPermissionCheck, $skipLoginCheck, $permission) {
-                $user             = $this->auth->user();
-                $isPasswordClient = $user->token()->client->password_client;
+		$this->auth->shouldUse('api');
+		if (! in_array($permission, $skipLoginCheck)) {
+			$this->authMiddleware->handle($request, function ($request) use ($modelName, $skipPermissionCheck, $skipLoginCheck, $permission) {
+				$user             = $this->auth->user();
+				$isPasswordClient = $user->token()->client->password_client;
     
-                if ($user->blocked) {
-                    \Errors::userIsBlocked();
-                }
+				if ($user->blocked) {
+					\Errors::userIsBlocked();
+				}
     
-                if ($isPasswordClient && (in_array($permission, $skipPermissionCheck) || $this->userService->can($permission, $modelName))) {
-                } elseif (! $isPasswordClient && $user->tokenCan($modelName.'-'.$permission)) {
-                } else {
-                    \Errors::noPermissions();
-                }
-            });
-        }
+				if ($isPasswordClient && (in_array($permission, $skipPermissionCheck) || $this->userService->can($permission, $modelName))) {
+				} elseif (! $isPasswordClient && $user->tokenCan($modelName.'-'.$permission)) {
+				} else {
+					\Errors::noPermissions();
+				}
+			});
+		}
 
-        return $next($request);
-    }
+		return $next($request);
+	}
 }

src/Modules/Core/Http/Middleware/UpdateLocaleAndTimezone.php

Indentation +44 added lines, -44 removed lines

@@ -8,53 +8,53 @@
 
 class UpdateLocaleAndTimezone
 {
-    protected $session;
-    protected $auth;
+	protected $session;
+	protected $auth;
     
-    /**
-     * Init new object.
-     *
-     * @param   Session      $session
-     * @param   Auth         $auth
-     * @param   Errors       $errors
-     *
-     * @return  void
-     */
-    public function __construct(Session $session, Auth $auth)
-    {
-        $this->session = $session;
-        $this->auth = $auth;
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   Session      $session
+	 * @param   Auth         $auth
+	 * @param   Errors       $errors
+	 *
+	 * @return  void
+	 */
+	public function __construct(Session $session, Auth $auth)
+	{
+		$this->session = $session;
+		$this->auth = $auth;
+	}
 
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
-     * @return mixed
-     */
-    public function handle($request, Closure $next)
-    {
-        $update   = false;
-        $user     = $this->auth->user();
-        if ($user) {
-            $locale   = $this->session->get('locale');
-            $timezone = $this->session->get('time-zone');
-            if ($locale && $locale !== 'all' && $locale !== $user->locale) {
-                $user->locale = $locale;
-                $update       = true;
-            }
+	/**
+	 * Handle an incoming request.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @param  \Closure  $next
+	 * @return mixed
+	 */
+	public function handle($request, Closure $next)
+	{
+		$update   = false;
+		$user     = $this->auth->user();
+		if ($user) {
+			$locale   = $this->session->get('locale');
+			$timezone = $this->session->get('time-zone');
+			if ($locale && $locale !== 'all' && $locale !== $user->locale) {
+				$user->locale = $locale;
+				$update       = true;
+			}
     
-            if ($timezone && $timezone !== $user->timezone) {
-                $user->timezone = $timezone;
-                $update       = true;
-            }
+			if ($timezone && $timezone !== $user->timezone) {
+				$user->timezone = $timezone;
+				$update       = true;
+			}
     
-            if ($update) {
-                $user->save();
-            }
-        }
+			if ($update) {
+				$user->save();
+			}
+		}
 
-        return $next($request);
-    }
+		return $next($request);
+	}
 }

src/Modules/Core/Facades/ErrorHandler.php

Indentation +4 added lines, -4 removed lines

@@ -4,8 +4,8 @@
 
 class Errors extends Facade
 {
-    protected static function getFacadeAccessor()
-    {
-        return 'Errors';
-    }
+	protected static function getFacadeAccessor()
+	{
+		return 'Errors';
+	}
 }

src/Modules/Core/Utl/Errors.php

Indentation +119 added lines, -119 removed lines

@@ -2,123 +2,123 @@
 
 class Errors
 {
-    public function unAuthorized()
-    {
-        $error = ['status' => 401, 'message' => trans('core::errors.unAuthorized')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function invalidRefreshToken()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.invalidRefreshToken')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function noPermissions()
-    {
-        $error = ['status' => 403, 'message' => trans('core::errors.noPermissions')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function loginFailed()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.loginFailed')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function noSocialEmail()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.noSocialEmail')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function userAlreadyRegistered()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.userAlreadyRegistered')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function connectionError()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.connectionError')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function redisNotRunning()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.redisNotRunning')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function dbQueryError()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.dbQueryError')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function cannotCreateSetting()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.cannotCreateSetting')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function cannotUpdateSettingKey()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.cannotUpdateSettingKey')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function userIsBlocked()
-    {
-        $error = ['status' => 403, 'message' => trans('core::errors.userIsBlocked')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function emailNotConfirmed()
-    {
-        $error = ['status' => 403, 'message' => trans('core::errors.emailNotConfirmed')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function emailAlreadyConfirmed()
-    {
-        $error = ['status' => 403, 'message' => trans('core::errors.emailAlreadyConfirmed')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function invalidResetToken()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.invalidResetToken')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function invalidResetPassword()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.invalidResetPassword')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function invalidOldPassword()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.invalidOldPassword')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function invalidConfirmationCode()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.invalidConfirmationCode')];
-        abort($error['status'], $error['message']);
-    }
-
-    public function notFound($text)
-    {
-        $error = ['status' => 404, 'message' => trans('core::errors.notFound', ['replace' => $text])];
-        abort($error['status'], $error['message']);
-    }
-
-    public function generalError()
-    {
-        $error = ['status' => 400, 'message' => trans('core::errors.generalError')];
-        abort($error['status'], $error['message']);
-    }
+	public function unAuthorized()
+	{
+		$error = ['status' => 401, 'message' => trans('core::errors.unAuthorized')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function invalidRefreshToken()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.invalidRefreshToken')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function noPermissions()
+	{
+		$error = ['status' => 403, 'message' => trans('core::errors.noPermissions')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function loginFailed()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.loginFailed')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function noSocialEmail()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.noSocialEmail')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function userAlreadyRegistered()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.userAlreadyRegistered')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function connectionError()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.connectionError')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function redisNotRunning()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.redisNotRunning')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function dbQueryError()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.dbQueryError')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function cannotCreateSetting()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.cannotCreateSetting')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function cannotUpdateSettingKey()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.cannotUpdateSettingKey')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function userIsBlocked()
+	{
+		$error = ['status' => 403, 'message' => trans('core::errors.userIsBlocked')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function emailNotConfirmed()
+	{
+		$error = ['status' => 403, 'message' => trans('core::errors.emailNotConfirmed')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function emailAlreadyConfirmed()
+	{
+		$error = ['status' => 403, 'message' => trans('core::errors.emailAlreadyConfirmed')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function invalidResetToken()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.invalidResetToken')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function invalidResetPassword()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.invalidResetPassword')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function invalidOldPassword()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.invalidOldPassword')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function invalidConfirmationCode()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.invalidConfirmationCode')];
+		abort($error['status'], $error['message']);
+	}
+
+	public function notFound($text)
+	{
+		$error = ['status' => 404, 'message' => trans('core::errors.notFound', ['replace' => $text])];
+		abort($error['status'], $error['message']);
+	}
+
+	public function generalError()
+	{
+		$error = ['status' => 400, 'message' => trans('core::errors.generalError')];
+		abort($error['status'], $error['message']);
+	}
 }

src/Modules/Core/Providers/ModuleServiceProvider.php

Indentation +48 added lines, -48 removed lines

@@ -6,53 +6,53 @@
 
 class ModuleServiceProvider extends ServiceProvider
 {
-    /**
-     * Bootstrap the module services.
-     *
-     * @return void
-     */
-    public function boot()
-    {
-        $this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'core');
-        $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'core');
-
-        $this->loadMigrationsFrom(module_path('core', 'Database/Migrations', 'app'));
-        $this->loadFactoriesFrom(module_path('core', 'Database/Factories', 'app'));
-    }
-
-    /**
-     * Register the module services.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        //Bind Core Facade to the Service Container
-        $this->app->singleton('Core', function () {
-            return new \App\Modules\Core\Core;
-        });
-
-        //Bind Errors Facade to the Service Container
-        $this->app->singleton('Errors', function () {
-            return new \App\Modules\Core\Utl\Errors;
-        });
-
-        //Bind CoreConfig Facade to the Service Container
-        $this->app->singleton('CoreConfig', function () {
-            return new \App\Modules\Core\Utl\CoreConfig;
-        });
-
-        //Bind Media Facade to the Service Container
-        $this->app->singleton('Media', function () {
-            return new \App\Modules\Core\Utl\Media;
-        });
-
-        //Bind ApiConsumer Facade to the Service Container
-        $this->app->singleton('ApiConsumer', function () {
-            $app = app();
-            return new \App\Modules\Core\Utl\ApiConsumer($app, $app['request'], $app['router']);
-        });
+	/**
+	 * Bootstrap the module services.
+	 *
+	 * @return void
+	 */
+	public function boot()
+	{
+		$this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'core');
+		$this->loadViewsFrom(__DIR__.'/../Resources/Views', 'core');
+
+		$this->loadMigrationsFrom(module_path('core', 'Database/Migrations', 'app'));
+		$this->loadFactoriesFrom(module_path('core', 'Database/Factories', 'app'));
+	}
+
+	/**
+	 * Register the module services.
+	 *
+	 * @return void
+	 */
+	public function register()
+	{
+		//Bind Core Facade to the Service Container
+		$this->app->singleton('Core', function () {
+			return new \App\Modules\Core\Core;
+		});
+
+		//Bind Errors Facade to the Service Container
+		$this->app->singleton('Errors', function () {
+			return new \App\Modules\Core\Utl\Errors;
+		});
+
+		//Bind CoreConfig Facade to the Service Container
+		$this->app->singleton('CoreConfig', function () {
+			return new \App\Modules\Core\Utl\CoreConfig;
+		});
+
+		//Bind Media Facade to the Service Container
+		$this->app->singleton('Media', function () {
+			return new \App\Modules\Core\Utl\Media;
+		});
+
+		//Bind ApiConsumer Facade to the Service Container
+		$this->app->singleton('ApiConsumer', function () {
+			$app = app();
+			return new \App\Modules\Core\Utl\ApiConsumer($app, $app['request'], $app['router']);
+		});
         
-        $this->app->register(RouteServiceProvider::class);
-    }
+		$this->app->register(RouteServiceProvider::class);
+	}
 }

src/Modules/Core/Console/Commands/MakeModuleCommand.php

Indentation +230 added lines, -230 removed lines

@@ -10,240 +10,240 @@
 
 class MakeModuleCommand extends Command
 {
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'generate:module
+	/**
+	 * The name and signature of the console command.
+	 *
+	 * @var string
+	 */
+	protected $signature = 'generate:module
         {slug : The slug of the module}';
 
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Create a new module';
-
-    /**
-     * The modules instance.
-     *
-     * @var RepositoryManager
-     */
-    protected $module;
-
-    /**
-     * The filesystem instance.
-     *
-     * @var Filesystem
-     */
-    protected $files;
-
-    /**
-     * Array to store the configuration details.
-     *
-     * @var array
-     */
-    protected $container;
-
-    /**
-     * Array of folder mappings.
-     *
-     * @var Array
-     */
-    protected $mapping = [
-        'Database/Factories'  => 'Database/Factories',
-        'Database/Migrations' => 'Database/Migrations',
-        'Database/Seeds'      => 'Database/Seeds',
-        'Http/Controllers'    => 'Http/Controllers',
-        'Http/Requests'       => 'Http/Requests',
-        'Http/Resources'      => 'Http/Resources',
-        'ModelObservers'      => 'ModelObservers',
-        'Providers'           => 'Providers',
-        'Repositories'        => 'Repositories',
-        'Services'            => 'Services',
-        'Routes'              => 'Routes'
-    ];
-
-    /**
-     * Create a new command instance.
-     *
-     * @param Filesystem $files
-     * @param RepositoryManager $module
-     */
-    public function __construct(Filesystem $files, RepositoryManager $module)
-    {
-        parent::__construct();
-
-        $this->files = $files;
-        $this->module = $module;
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-        $this->container['slug']        = Str::slug($this->argument('slug'));
-        $this->container['name']        = Str::studly($this->container['slug']);
-        $this->container['version']     = '1.0';
-        $this->container['description'] = 'This is the description for the ' . $this->container['name'] . ' module.';
-        $this->container['location']    = config('modules.default_location');
-        $this->container['provider']    = config("modules.locations.{$this->container['location']}.provider");
-        $this->container['basename']    = Str::studly($this->container['slug']);
-        $this->container['namespace']   = config("modules.locations.{$this->container['location']}.namespace").$this->container['basename'];
-
-        return $this->generate();
-    }
-
-    /**
-     * Generate the module.
-     */
-    protected function generate()
-    {
-        $steps = [
-            'Generating module...' => 'generateModule',
-            'Optimizing module cache...' => 'optimizeModules',
-            'Generating migrations...' => 'generateMigration',
-        ];
-
-        $progress = new ProgressBar($this->output, count($steps));
-        $progress->start();
-
-        foreach ($steps as $message => $function) {
-            $progress->setMessage($message);
-
-            $this->$function();
-
-            $progress->advance();
-        }
-
-        $progress->finish();
-
-        event($this->container['slug'] . '.module.made');
-
-        $this->info("\nModule generated successfully.");
-    }
-
-    /**
-     * Generate defined module folders.
-     */
-    protected function generateModule()
-    {
-        $location = $this->container['location'];
-        $root     = module_path(null, '', $location);
-        $manifest = config("modules.locations.$location.manifest") ?: 'module.json';
-        $provider = config("modules.locations.$location.provider") ?: 'ModuleServiceProvider';
-
-        if (!$this->files->isDirectory($root)) {
-            $this->files->makeDirectory($root);
-        }
-
-        $directory = module_path(null, $this->container['basename'], $location);
-        $source    = __DIR__ . '/Stubs/Module';
-
-        $this->files->makeDirectory($directory);
-
-        $sourceFiles = $this->files->allFiles($source, true);
-
-        if (!empty($this->mapping)) {
-            $search = array_keys($this->mapping);
-            $replace = array_values($this->mapping);
-        }
-
-        foreach ($sourceFiles as $file) {
-            $contents = $this->replacePlaceholders($file->getContents());
-            $subPath = $file->getRelativePathname();
-
-            if (!empty($this->mapping)) {
-                $subPath = str_replace($search, $replace, $subPath);
-            }
-
-            $filePath = $directory . '/' . $subPath;
+	/**
+	 * The console command description.
+	 *
+	 * @var string
+	 */
+	protected $description = 'Create a new module';
+
+	/**
+	 * The modules instance.
+	 *
+	 * @var RepositoryManager
+	 */
+	protected $module;
+
+	/**
+	 * The filesystem instance.
+	 *
+	 * @var Filesystem
+	 */
+	protected $files;
+
+	/**
+	 * Array to store the configuration details.
+	 *
+	 * @var array
+	 */
+	protected $container;
+
+	/**
+	 * Array of folder mappings.
+	 *
+	 * @var Array
+	 */
+	protected $mapping = [
+		'Database/Factories'  => 'Database/Factories',
+		'Database/Migrations' => 'Database/Migrations',
+		'Database/Seeds'      => 'Database/Seeds',
+		'Http/Controllers'    => 'Http/Controllers',
+		'Http/Requests'       => 'Http/Requests',
+		'Http/Resources'      => 'Http/Resources',
+		'ModelObservers'      => 'ModelObservers',
+		'Providers'           => 'Providers',
+		'Repositories'        => 'Repositories',
+		'Services'            => 'Services',
+		'Routes'              => 'Routes'
+	];
+
+	/**
+	 * Create a new command instance.
+	 *
+	 * @param Filesystem $files
+	 * @param RepositoryManager $module
+	 */
+	public function __construct(Filesystem $files, RepositoryManager $module)
+	{
+		parent::__construct();
+
+		$this->files = $files;
+		$this->module = $module;
+	}
+
+	/**
+	 * Execute the console command.
+	 *
+	 * @return mixed
+	 */
+	public function handle()
+	{
+		$this->container['slug']        = Str::slug($this->argument('slug'));
+		$this->container['name']        = Str::studly($this->container['slug']);
+		$this->container['version']     = '1.0';
+		$this->container['description'] = 'This is the description for the ' . $this->container['name'] . ' module.';
+		$this->container['location']    = config('modules.default_location');
+		$this->container['provider']    = config("modules.locations.{$this->container['location']}.provider");
+		$this->container['basename']    = Str::studly($this->container['slug']);
+		$this->container['namespace']   = config("modules.locations.{$this->container['location']}.namespace").$this->container['basename'];
+
+		return $this->generate();
+	}
+
+	/**
+	 * Generate the module.
+	 */
+	protected function generate()
+	{
+		$steps = [
+			'Generating module...' => 'generateModule',
+			'Optimizing module cache...' => 'optimizeModules',
+			'Generating migrations...' => 'generateMigration',
+		];
+
+		$progress = new ProgressBar($this->output, count($steps));
+		$progress->start();
+
+		foreach ($steps as $message => $function) {
+			$progress->setMessage($message);
+
+			$this->$function();
+
+			$progress->advance();
+		}
+
+		$progress->finish();
+
+		event($this->container['slug'] . '.module.made');
+
+		$this->info("\nModule generated successfully.");
+	}
+
+	/**
+	 * Generate defined module folders.
+	 */
+	protected function generateModule()
+	{
+		$location = $this->container['location'];
+		$root     = module_path(null, '', $location);
+		$manifest = config("modules.locations.$location.manifest") ?: 'module.json';
+		$provider = config("modules.locations.$location.provider") ?: 'ModuleServiceProvider';
+
+		if (!$this->files->isDirectory($root)) {
+			$this->files->makeDirectory($root);
+		}
+
+		$directory = module_path(null, $this->container['basename'], $location);
+		$source    = __DIR__ . '/Stubs/Module';
+
+		$this->files->makeDirectory($directory);
+
+		$sourceFiles = $this->files->allFiles($source, true);
+
+		if (!empty($this->mapping)) {
+			$search = array_keys($this->mapping);
+			$replace = array_values($this->mapping);
+		}
+
+		foreach ($sourceFiles as $file) {
+			$contents = $this->replacePlaceholders($file->getContents());
+			$subPath = $file->getRelativePathname();
+
+			if (!empty($this->mapping)) {
+				$subPath = str_replace($search, $replace, $subPath);
+			}
+
+			$filePath = $directory . '/' . $subPath;
             
-            // if the file is module.json, replace it with the custom manifest file name
-            if ($file->getFilename() === 'module.json' && $manifest) {
-                $filePath = str_replace('module.json', $manifest, $filePath);
-            }
+			// if the file is module.json, replace it with the custom manifest file name
+			if ($file->getFilename() === 'module.json' && $manifest) {
+				$filePath = str_replace('module.json', $manifest, $filePath);
+			}
             
-            // if the file is ModuleServiceProvider.php, replace it with the custom provider file name
-            if ($file->getFilename() === 'ModuleServiceProvider.php') {
-                $filePath = str_replace('ModuleServiceProvider', $provider, $filePath);
-            }
-            $filePath = $this->replacePlaceholders($filePath);
+			// if the file is ModuleServiceProvider.php, replace it with the custom provider file name
+			if ($file->getFilename() === 'ModuleServiceProvider.php') {
+				$filePath = str_replace('ModuleServiceProvider', $provider, $filePath);
+			}
+			$filePath = $this->replacePlaceholders($filePath);
             
-            $dir = dirname($filePath);
+			$dir = dirname($filePath);
             
-            if (! $this->files->isDirectory($dir)) {
-                $this->files->makeDirectory($dir, 0755, true);
-            }
-
-            $this->files->put($filePath, $contents);
-        }
-    }
-
-    protected function replacePlaceholders($contents)
-    {
-        $modelName = \Str::camel($this->container['slug']);
-        $modelNameSingular = \Str::singular($modelName);
-
-        $find = [
-            'DummyFactory',
-            'DummyModelName',
-            'DummyModuleSlug',
-            'DummyModule',
-            'DummyModel',
-            'DummyDatabaseSeeder',
-            'DummyTableSeeder',
-            'DummyController',
-            'DummyService',
-            'DummyRepository',
-            'InsertDummy',
-            'UpdateDummy',
-            'DummyResource',
-            'DummyObserver',
-            'DummyTableName',
-            'DummyRoutePrefix',
-        ];
-
-        $replace = [
-            ucfirst($modelNameSingular) . 'Factory',
-            $modelNameSingular,
-            $this->container['slug'],
-            ucfirst($modelName),
-            ucfirst($modelNameSingular),
-            ucfirst($modelName) . 'DatabaseSeeder',
-            ucfirst($modelName) . 'TableSeeder',
-            ucfirst($modelNameSingular) . 'Controller',
-            ucfirst($modelNameSingular) . 'Service',
-            ucfirst($modelNameSingular) . 'Repository',
-            'Insert' . ucfirst($modelNameSingular),
-            'Update' . ucfirst($modelNameSingular),
-            ucfirst($modelNameSingular),
-            ucfirst($modelNameSingular) . 'Observer',
-            $modelName,
-            $modelName,
-        ];
-
-        return str_replace($find, $replace, $contents);
-    }
-
-    /**
-     * Reset module cache of enabled and disabled modules.
-     */
-    protected function optimizeModules()
-    {
-        return $this->callSilent('module:optimize');
-    }
-
-    /**
-     * Generate table migrations.
-     */
-    protected function generateMigration()
-    {
-        $modelName = $this->container['slug'];
-        return $this->callSilent('make:module:migration', ['slug' => $modelName, 'name' => 'create_' . $modelName . '_table']);
-    }
+			if (! $this->files->isDirectory($dir)) {
+				$this->files->makeDirectory($dir, 0755, true);
+			}
+
+			$this->files->put($filePath, $contents);
+		}
+	}
+
+	protected function replacePlaceholders($contents)
+	{
+		$modelName = \Str::camel($this->container['slug']);
+		$modelNameSingular = \Str::singular($modelName);
+
+		$find = [
+			'DummyFactory',
+			'DummyModelName',
+			'DummyModuleSlug',
+			'DummyModule',
+			'DummyModel',
+			'DummyDatabaseSeeder',
+			'DummyTableSeeder',
+			'DummyController',
+			'DummyService',
+			'DummyRepository',
+			'InsertDummy',
+			'UpdateDummy',
+			'DummyResource',
+			'DummyObserver',
+			'DummyTableName',
+			'DummyRoutePrefix',
+		];
+
+		$replace = [
+			ucfirst($modelNameSingular) . 'Factory',
+			$modelNameSingular,
+			$this->container['slug'],
+			ucfirst($modelName),
+			ucfirst($modelNameSingular),
+			ucfirst($modelName) . 'DatabaseSeeder',
+			ucfirst($modelName) . 'TableSeeder',
+			ucfirst($modelNameSingular) . 'Controller',
+			ucfirst($modelNameSingular) . 'Service',
+			ucfirst($modelNameSingular) . 'Repository',
+			'Insert' . ucfirst($modelNameSingular),
+			'Update' . ucfirst($modelNameSingular),
+			ucfirst($modelNameSingular),
+			ucfirst($modelNameSingular) . 'Observer',
+			$modelName,
+			$modelName,
+		];
+
+		return str_replace($find, $replace, $contents);
+	}
+
+	/**
+	 * Reset module cache of enabled and disabled modules.
+	 */
+	protected function optimizeModules()
+	{
+		return $this->callSilent('module:optimize');
+	}
+
+	/**
+	 * Generate table migrations.
+	 */
+	protected function generateMigration()
+	{
+		$modelName = $this->container['slug'];
+		return $this->callSilent('make:module:migration', ['slug' => $modelName, 'name' => 'create_' . $modelName . '_table']);
+	}
 }

src/Modules/Core/Console/Commands/Stubs/Module/Http/Controllers/DummyController.php

Indentation +48 added lines, -48 removed lines

@@ -10,57 +10,57 @@
 
 class DummyController extends BaseApiController
 {
-    /**
-     * Path of the model resource
-     *
-     * @var string
-     */
-    protected $modelResource = 'App\Modules\DummyModule\Http\Resources\DummyModel';
+	/**
+	 * Path of the model resource
+	 *
+	 * @var string
+	 */
+	protected $modelResource = 'App\Modules\DummyModule\Http\Resources\DummyModel';
 
-    /**
-     * List of all route actions that the base api controller
-     * will skip permissions check for them.
-     * @var array
-     */
-    protected $skipPermissionCheck = [];
+	/**
+	 * List of all route actions that the base api controller
+	 * will skip permissions check for them.
+	 * @var array
+	 */
+	protected $skipPermissionCheck = [];
 
-    /**
-     * List of all route actions that the base api controller
-     * will skip login check for them.
-     * @var array
-     */
-    protected $skipLoginCheck = [];
+	/**
+	 * List of all route actions that the base api controller
+	 * will skip login check for them.
+	 * @var array
+	 */
+	protected $skipLoginCheck = [];
 
-    /**
-     * Init new object.
-     *
-     * @param   DummyService $service
-     * @return  void
-     */
-    public function __construct(DummyService $service)
-    {
-        parent::__construct($service);
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   DummyService $service
+	 * @return  void
+	 */
+	public function __construct(DummyService $service)
+	{
+		parent::__construct($service);
+	}
 
-    /**
-     * Insert the given model to storage.
-     *
-     * @param InsertDummy $request
-     * @return \Illuminate\Http\Response
-     */
-    public function insert(InsertDummy $request)
-    {
-        return new $this->modelResource($this->service->save($request->all()));
-    }
+	/**
+	 * Insert the given model to storage.
+	 *
+	 * @param InsertDummy $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function insert(InsertDummy $request)
+	{
+		return new $this->modelResource($this->service->save($request->all()));
+	}
 
-    /**
-     * Update the given model to storage.
-     *
-     * @param UpdateDummy $request
-     * @return \Illuminate\Http\Response
-     */
-    public function update(UpdateDummy $request)
-    {
-        return new $this->modelResource($this->service->save($request->all()));
-    }
+	/**
+	 * Update the given model to storage.
+	 *
+	 * @param UpdateDummy $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function update(UpdateDummy $request)
+	{
+		return new $this->modelResource($this->service->save($request->all()));
+	}
 }

src/Modules/Core/Console/Commands/Stubs/Module/DummyModel.php

Indentation +24 added lines, -24 removed lines

@@ -6,32 +6,32 @@
 
 class DummyModel extends Model
 {
-    use SoftDeletes;
-    protected $table    = 'DummyTableName';
-    protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden   = ['deleted_at'];
-    protected $guarded  = ['id'];
-    protected $fillable = []; // Add attributes here
-    public $searchable  = []; // Add earchable attributes here
+	use SoftDeletes;
+	protected $table    = 'DummyTableName';
+	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden   = ['deleted_at'];
+	protected $guarded  = ['id'];
+	protected $fillable = []; // Add attributes here
+	public $searchable  = []; // Add earchable attributes here
     
-    public function getCreatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
+	public function getCreatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
 
-    public function getUpdatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
+	public function getUpdatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
 
-    public function getDeletedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
-    }
+	public function getDeletedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
+	}
     
-    public static function boot()
-    {
-        parent::boot();
-        DummyModel::observe(DummyObserver::class);
-    }
+	public static function boot()
+	{
+		parent::boot();
+		DummyModel::observe(DummyObserver::class);
+	}
 }

src/Modules/Core/Console/Commands/Stubs/Module/Services/DummyService.php

Indentation +10 added lines, -10 removed lines

@@ -5,14 +5,14 @@
 
 class DummyService extends BaseService
 {
-    /**
-     * Init new object.
-     *
-     * @param   DummyRepository $repo
-     * @return  void
-     */
-    public function __construct(DummyRepository $repo)
-    {
-        parent::__construct($repo);
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   DummyRepository $repo
+	 * @return  void
+	 */
+	public function __construct(DummyRepository $repo)
+	{
+		parent::__construct($repo);
+	}
 }