mag/WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

structure and style updates

Browse Source
This commit is contained in:
Mark Gregory
2026-06-16 23:21:49 +01:00
parent 80991208af
commit 2c2af4c50e
60 changed files with 209 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/AuditTrail/Config/config.php
+2 -3
View File
@@ -2,7 +2,6 @@
return [
'name' => 'AuditTrail',
'features' =>
[
],
'features' => [
],
];
Modules/AuditTrail/Helpers/Helper.php
+1
View File
@@ -1,4 +1,5 @@
<?php
use Modules\AuditTrail\Support\ModuleInfo;
if (! function_exists('audittrail_feature_enabled')) {
Modules/AuditTrail/Http/Controllers/AuditTrailController.php
+11 -6
View File
@@ -10,6 +10,7 @@ class AuditTrailController extends Controller
{
/**
* Display a listing of the resource.
*
* @return Renderable
*/
public function index()
@@ -19,6 +20,7 @@ class AuditTrailController extends Controller
/**
* Show the form for creating a new resource.
*
* @return Renderable
*/
public function create()
@@ -28,7 +30,7 @@ class AuditTrailController extends Controller
/**
* Store a newly created resource in storage.
* @param Request $request
*
* @return Renderable
*/
public function store(Request $request)
@@ -38,7 +40,8 @@ class AuditTrailController extends Controller
/**
* Show the specified resource.
* @param int $id
*
* @param int $id
* @return Renderable
*/
public function show($id)
@@ -48,7 +51,8 @@ class AuditTrailController extends Controller
/**
* Show the form for editing the specified resource.
* @param int $id
*
* @param int $id
* @return Renderable
*/
public function edit($id)
@@ -58,8 +62,8 @@ class AuditTrailController extends Controller
/**
* Update the specified resource in storage.
* @param Request $request
* @param int $id
*
* @param int $id
* @return Renderable
*/
public function update(Request $request, $id)
@@ -69,7 +73,8 @@ class AuditTrailController extends Controller
/**
* Remove the specified resource from storage.
* @param int $id
*
* @param int $id
* @return Renderable
*/
public function destroy($id)
Modules/AuditTrail/Providers/AuditTrailServiceProvider.php
+37 -60
View File
@@ -2,41 +2,29 @@
namespace Modules\AuditTrail\Providers;
use Illuminate\Support\ServiceProvider;
use Illuminate\Database\Eloquent\Factory;
use Illuminate\Support\Facades\File;
use Modules\AuditTrail\Support\ModuleInfo;
use Config;
use Illuminate\Support\Facades\File;
use Illuminate\Support\ServiceProvider;
use Modules\AuditTrail\Support\ModuleInfo;
class AuditTrailServiceProvider extends ServiceProvider
{
/**
* @var string $moduleName
*/
protected string $moduleName = 'AuditTrail';
/**
* @var string $moduleNameLower
*/
protected string $moduleNameLower = 'audittrail';
/**
* Get the services provided by the provider.
*
* @return array
*/
public function provides():array
/**
* Get the services provided by the provider.
*/
public function provides(): array
{
return [];
}
/**
* Boot the application events.
*
* @return void
*/
public function boot() : void
public function boot(): void
{
$this->registerTranslations();
$this->registerConfig();
@@ -48,8 +36,6 @@ class AuditTrailServiceProvider extends ServiceProvider
/**
* Register the service provider.
*
* @return void
*/
public function register(): void
{
@@ -58,8 +44,6 @@ class AuditTrailServiceProvider extends ServiceProvider
/**
* Register the helpers.
*
* @return void
*/
protected function registerHelpers(): void
{
@@ -68,71 +52,64 @@ class AuditTrailServiceProvider extends ServiceProvider
}
}
/**
/**
* Dynamically Register Commands.
*
* @return void
*/
public function registerCommands(): void
{
if (!$this->app->runningInConsole()) {
return;
}
$commandPath = __DIR__ . '/../Console';
$commands = collect(File::allFiles($commandPath))
->map(function ($file) {
$class = 'Modules\\' . $this->moduleName . '\\Console\\' . $file->getFilenameWithoutExtension();
return $class;
})
->filter(function ($class) {
return class_exists($class);
})
->values()
->all();
$this->commands($commands);
{
if (! $this->app->runningInConsole()) {
return;
}
$commandPath = __DIR__.'/../Console';
$commands = collect(File::allFiles($commandPath))
->map(function ($file) {
$class = 'Modules\\'.$this->moduleName.'\\Console\\'.$file->getFilenameWithoutExtension();
return $class;
})
->filter(function ($class) {
return class_exists($class);
})
->values()
->all();
$this->commands($commands);
}
/**
* Register config.
*
* @return void
*/
protected function registerConfig(): void
{
$this->publishes([
module_path(ModuleInfo::name(), 'Config/config.php') => config_path( ModuleInfo::nameLower(). '.php'),
module_path(ModuleInfo::name(), 'Config/config.php') => config_path(ModuleInfo::nameLower().'.php'),
], 'config');
$this->mergeConfigFrom(
module_path(ModuleInfo::name(), 'Config/config.php'), ModuleInfo::nameLower()
module_path(ModuleInfo::name(), 'Config/config.php'), ModuleInfo::nameLower()
);
}
/**
* Register views.
*
* @return void
*/
public function registerViews(): void
{
$viewPath = resource_path('views/modules/' . ModuleInfo::nameLower());
$viewPath = resource_path('views/modules/'.ModuleInfo::nameLower());
$sourcePath = module_path(ModuleInfo::name(), 'Resources/views');
$this->publishes([
$sourcePath => $viewPath
], ['views', ModuleInfo::nameLower() . '-module-views']);
$this->loadViewsFrom(array_merge($this->getPublishableViewPaths(), [$sourcePath]), ModuleInfo::nameLower());
$sourcePath => $viewPath,
], ['views', ModuleInfo::nameLower().'-module-views']);
$this->loadViewsFrom(array_merge($this->getPublishableViewPaths(), [$sourcePath]), ModuleInfo::nameLower());
}
/**
* Register translations.
*
* @return void
*/
public function registerTranslations(): void
{
$langPath = resource_path('lang/modules/' . ModuleInfo::nameLower());
$langPath = resource_path('lang/modules/'.ModuleInfo::nameLower());
if (is_dir($langPath)) {
$this->loadTranslationsFrom($langPath, ModuleInfo::nameLower());
$this->loadTranslationsFrom($langPath, ModuleInfo::nameLower());
} else {
$this->loadTranslationsFrom(module_path(ModuleInfo::name(), 'Resources/lang'), ModuleInfo::nameLower());
}
@@ -140,16 +117,16 @@ class AuditTrailServiceProvider extends ServiceProvider
/**
* Regsiter View Paths
* @return array
*/
private function getPublishableViewPaths(): array
{
$paths = [];
foreach (Config::get('view.paths') as $path) {
if (is_dir($path . '/modules/' . ModuleInfo::nameLower())) {
$paths[] = $path . '/modules/' . ModuleInfo::nameLower();
if (is_dir($path.'/modules/'.ModuleInfo::nameLower())) {
$paths[] = $path.'/modules/'.ModuleInfo::nameLower();
}
}
return $paths;
}
}
Modules/AuditTrail/Providers/RouteServiceProvider.php
+1 -1
View File
@@ -2,8 +2,8 @@
namespace Modules\AuditTrail\Providers;
use Illuminate\Support\Facades\Route;
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
use Illuminate\Support\Facades\Route;
class RouteServiceProvider extends ServiceProvider
{
Modules/AuditTrail/Routes/api.php
+1 -1
View File
@@ -15,4 +15,4 @@ use Illuminate\Http\Request;
Route::middleware('auth:api')->get('/audittrail', function (Request $request) {
return $request->user();
});
});
Modules/AuditTrail/Routes/web.php
+1 -1
View File
@@ -11,6 +11,6 @@
|
*/
Route::prefix('audittrail')->group(function() {
Route::prefix('audittrail')->group(function () {
Route::get('/', 'AuditTrailController@index');
});
Modules/AuditTrail/Support/ModuleInfo.php
+1 -3
View File
@@ -4,11 +4,10 @@ namespace Modules\AuditTrail\Support;
class ModuleInfo
{
protected static string $moduleName = 'AuditTrail';
protected static string $moduleName = 'AuditTrail';
/**
* defines the Module Name
* @return string
*/
public static function name(): string
{
@@ -17,7 +16,6 @@ class ModuleInfo
/**
* define the lowercase version
* @return string
*/
public static function nameLower(): string
{