Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f504c50c9b |
@@ -0,0 +1,27 @@
|
||||
<?php
|
||||
|
||||
namespace App\Dto;
|
||||
|
||||
class ApiResponseDto
|
||||
{
|
||||
public function __construct(
|
||||
public readonly ?string $message = null,
|
||||
// public readonly ?int $statusCode = 200,
|
||||
public readonly mixed $data = null,
|
||||
public readonly mixed $meta = null,
|
||||
)
|
||||
{
|
||||
// return new self($this->message, $this->statusCode, $this->data, $this->meta);
|
||||
}
|
||||
|
||||
// public static function success()
|
||||
// {
|
||||
// return new self($message, $data, $statusCode = 200);
|
||||
// }
|
||||
|
||||
// public static function error()
|
||||
// {
|
||||
// return new self($message, $data, $statusCode = 400);
|
||||
// }
|
||||
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
<?php
|
||||
|
||||
namespace App\Providers;
|
||||
|
||||
use Illuminate\Support\ServiceProvider;
|
||||
use App\Services\ApiResponder;
|
||||
|
||||
class ApiResponderProvider extends ServiceProvider
|
||||
{
|
||||
/**
|
||||
* Register services.
|
||||
*/
|
||||
public function register(): void
|
||||
{
|
||||
$this->app->bind(ApiResponder::class, function($app){
|
||||
return new ApiResponder();
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Bootstrap services.
|
||||
*/
|
||||
public function boot(): void
|
||||
{
|
||||
//
|
||||
}
|
||||
}
|
||||
@@ -3,9 +3,6 @@
|
||||
namespace App\Providers;
|
||||
|
||||
use Illuminate\Support\ServiceProvider;
|
||||
use Spatie\Activitylog\Facades\CauserResolver;
|
||||
use Illuminate\Support\Facades\View;
|
||||
use App\Services\ModuleService;
|
||||
|
||||
class AppServiceProvider extends ServiceProvider
|
||||
{
|
||||
@@ -14,8 +11,7 @@ class AppServiceProvider extends ServiceProvider
|
||||
*/
|
||||
public function register(): void
|
||||
{
|
||||
//Регистрируем передачу во все blade шаблоны функционал сервиса по определению имени модуля из текущего роута
|
||||
View::share('moduleName', app(ModuleService::class));
|
||||
//
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -23,8 +19,6 @@ class AppServiceProvider extends ServiceProvider
|
||||
*/
|
||||
public function boot(): void
|
||||
{
|
||||
// Глобально отключаем определение causer для корректной работы пакета activity_log. По умолчанию пакет ожидает получить экземпляр модели Models\User для прописывания в таблицу activity_log значения causer_type и causer_id. Эти значения нельзя руками прописать при логировании. Никакие танцы с бубнами не помогали кроме строки ниже. Данные по инициатору изменения решил записывать в поле properties
|
||||
//UPD: Решил отказаться, так как все равно для корректной работы аутентификации пришел к фиксации записи в модели users, для отображения истории бизнес-сущностей удобнее будет получать пользователя, совершившего действие, из отдельного поля в модели, а не парсить json из поля properties
|
||||
// CauserResolver::resolveUsing(fn () => null);
|
||||
//
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
<?php
|
||||
|
||||
namespace App\Services;
|
||||
|
||||
use App\Dto\ApiResponseDto;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
|
||||
class ApiResponder{
|
||||
public $dto;
|
||||
|
||||
|
||||
public function __construct(
|
||||
)
|
||||
{}
|
||||
|
||||
public function success(): JsonResponse
|
||||
{
|
||||
return $this->buildResponse();
|
||||
}
|
||||
|
||||
public function error()
|
||||
{
|
||||
return $this->buildResponse();
|
||||
}
|
||||
|
||||
public function setDto(ApiResponseDto $dto)
|
||||
{
|
||||
$this->dto = $dto;
|
||||
}
|
||||
|
||||
// public function fromDTO(ApiResponseDto $dto)
|
||||
// {
|
||||
// return $dto;
|
||||
// }
|
||||
|
||||
#Гаврилов
|
||||
//СБОР СТАТИСТИКИ ПО ВЫЗЫВАЕМЫМ API ЕНДПОИНТАМ. ВНЕСТИ В TODO ПРОЕКТА
|
||||
private function setStatistics()
|
||||
{
|
||||
}
|
||||
|
||||
#Гаврилов
|
||||
//ДОБАВЬ ЛОГИРОВАНИЕ ОШИБОК В TRY CATCH В .LOG ФАЙЛ
|
||||
|
||||
private function buildResponse(): JsonResponse
|
||||
{
|
||||
//echo '<pre>'; var_dump((array)$this->dto); echo'</pre>';
|
||||
//return (array) $this->dto;
|
||||
return response()->json((array) $this->dto);
|
||||
}
|
||||
}
|
||||
@@ -1,40 +0,0 @@
|
||||
<?php
|
||||
|
||||
/**Сервис для определения модуля
|
||||
@author dgavrilov
|
||||
*/
|
||||
|
||||
namespace App\Services;
|
||||
|
||||
class ModuleService{
|
||||
/**
|
||||
* Получаем имя модуля из роута (так как в нем обязательно указывается префикс)
|
||||
*
|
||||
* @return string | null
|
||||
*/
|
||||
public function getModuleName(): string | null
|
||||
{
|
||||
$route = request()->route();
|
||||
$routePrefix = null;
|
||||
if ($route && $route->getPrefix()) {
|
||||
$routePrefix = explode('/', $route->getPrefix())[1];
|
||||
}
|
||||
|
||||
return $routePrefix;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Основываясь на имени модуля из роута получаем имя роута на русском (свойство name_ru), которое обязательное прописывается в конфиге модуля
|
||||
*
|
||||
* @return string | null
|
||||
*/
|
||||
public function getRuModuleName(): string | null
|
||||
{
|
||||
if ($module = $this->getModuleName()) {
|
||||
return config("$module.name_ru", null);
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,232 +0,0 @@
|
||||
<?php
|
||||
|
||||
use Nwidart\Modules\Activators\FileActivator;
|
||||
use Nwidart\Modules\Providers\ConsoleServiceProvider;
|
||||
|
||||
return [
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Module Namespace
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| Default module namespace.
|
||||
|
|
||||
*/
|
||||
|
||||
'namespace' => 'Modules',
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Module Stubs
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| Default module stubs.
|
||||
|
|
||||
*/
|
||||
|
||||
'stubs' => [
|
||||
'enabled' => false,
|
||||
'path' => base_path('vendor/nwidart/laravel-modules/src/Commands/stubs'),
|
||||
'files' => [
|
||||
'routes/web' => 'routes/web.php',
|
||||
'routes/api' => 'routes/api.php',
|
||||
'views/index' => 'resources/views/index.blade.php',
|
||||
'views/master' => 'resources/views/layouts/master.blade.php',
|
||||
'scaffold/config' => 'config/config.php',
|
||||
'composer' => 'composer.json',
|
||||
'assets/js/app' => 'resources/assets/js/app.js',
|
||||
'assets/sass/app' => 'resources/assets/sass/app.scss',
|
||||
'vite' => 'vite.config.js',
|
||||
'package' => 'package.json',
|
||||
],
|
||||
'replacements' => [
|
||||
'routes/web' => ['LOWER_NAME', 'STUDLY_NAME', 'MODULE_NAMESPACE', 'CONTROLLER_NAMESPACE'],
|
||||
'routes/api' => ['LOWER_NAME', 'STUDLY_NAME'],
|
||||
'vite' => ['LOWER_NAME'],
|
||||
'json' => ['LOWER_NAME', 'STUDLY_NAME', 'MODULE_NAMESPACE', 'PROVIDER_NAMESPACE'],
|
||||
'views/index' => ['LOWER_NAME'],
|
||||
'views/master' => ['LOWER_NAME', 'STUDLY_NAME'],
|
||||
'scaffold/config' => ['STUDLY_NAME'],
|
||||
'composer' => [
|
||||
'LOWER_NAME',
|
||||
'STUDLY_NAME',
|
||||
'VENDOR',
|
||||
'AUTHOR_NAME',
|
||||
'AUTHOR_EMAIL',
|
||||
'MODULE_NAMESPACE',
|
||||
'PROVIDER_NAMESPACE',
|
||||
],
|
||||
],
|
||||
'gitkeep' => true,
|
||||
],
|
||||
'paths' => [
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Modules path
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| This path is used to save the generated module.
|
||||
| This path will also be added automatically to the list of scanned folders.
|
||||
|
|
||||
*/
|
||||
|
||||
'modules' => base_path('Modules'),
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Modules assets path
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| Here you may update the modules' assets path.
|
||||
|
|
||||
*/
|
||||
|
||||
'assets' => public_path('modules'),
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| The migrations' path
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| Where you run the 'module:publish-migration' command, where do you publish the
|
||||
| the migration files?
|
||||
|
|
||||
*/
|
||||
|
||||
'migration' => base_path('database/migrations'),
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Generator path
|
||||
|--------------------------------------------------------------------------
|
||||
| Customise the paths where the folders will be generated.
|
||||
| Setting the generate key to false will not generate that folder
|
||||
*/
|
||||
'generator' => [
|
||||
'config' => ['path' => 'config', 'generate' => true],
|
||||
'command' => ['path' => 'App/Console', 'generate' => false],
|
||||
'channels' => ['path' => 'App/Broadcasting', 'generate' => false],
|
||||
'migration' => ['path' => 'Database/migrations', 'generate' => false],
|
||||
'seeder' => ['path' => 'Database/Seeders', 'generate' => true],
|
||||
'factory' => ['path' => 'Database/Factories', 'generate' => false],
|
||||
'model' => ['path' => 'App/Models', 'generate' => false],
|
||||
'observer' => ['path' => 'App/Observers', 'generate' => false],
|
||||
'routes' => ['path' => 'routes', 'generate' => true],
|
||||
'controller' => ['path' => 'App/Http/Controllers', 'generate' => true],
|
||||
'filter' => ['path' => 'App/Http/Middleware', 'generate' => false],
|
||||
'request' => ['path' => 'App/Http/Requests', 'generate' => false],
|
||||
'provider' => ['path' => 'App/Providers', 'generate' => true],
|
||||
'assets' => ['path' => 'resources/assets', 'generate' => false],
|
||||
'lang' => ['path' => 'lang', 'generate' => false],
|
||||
'views' => ['path' => 'resources/views', 'generate' => true],
|
||||
'test' => ['path' => 'tests/Unit', 'generate' => false],
|
||||
'test-feature' => ['path' => 'tests/Feature', 'generate' => false],
|
||||
'repository' => ['path' => 'App/Repositories', 'generate' => false],
|
||||
'event' => ['path' => 'App/Events', 'generate' => false],
|
||||
'listener' => ['path' => 'App/Listeners', 'generate' => false],
|
||||
'policies' => ['path' => 'App/Policies', 'generate' => false],
|
||||
'rules' => ['path' => 'App/Rules', 'generate' => false],
|
||||
'jobs' => ['path' => 'App/Jobs', 'generate' => false],
|
||||
'emails' => ['path' => 'App/Emails', 'generate' => false],
|
||||
'notifications' => ['path' => 'App/Notifications', 'generate' => false],
|
||||
'resource' => ['path' => 'App/resources', 'generate' => false],
|
||||
'component-view' => ['path' => 'resources/views/components', 'generate' => false],
|
||||
'component-class' => ['path' => 'App/View/Components', 'generate' => false],
|
||||
],
|
||||
],
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Package commands
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| Here you can define which commands will be visible and used in your
|
||||
| application. You can add your own commands to merge section.
|
||||
|
|
||||
*/
|
||||
'commands' => ConsoleServiceProvider::defaultCommands()
|
||||
->merge([
|
||||
// New commands go here
|
||||
])->toArray(),
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Scan Path
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| Here you define which folder will be scanned. By default will scan vendor
|
||||
| directory. This is useful if you host the package in packagist website.
|
||||
|
|
||||
*/
|
||||
|
||||
'scan' => [
|
||||
'enabled' => false,
|
||||
'paths' => [
|
||||
base_path('vendor/*/*'),
|
||||
],
|
||||
],
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Composer File Template
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| Here is the config for the composer.json file, generated by this package
|
||||
|
|
||||
*/
|
||||
|
||||
'composer' => [
|
||||
'vendor' => 'nwidart',
|
||||
'author' => [
|
||||
'name' => 'Nicolas Widart',
|
||||
'email' => 'n.widart@gmail.com',
|
||||
],
|
||||
'composer-output' => false,
|
||||
],
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Caching
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| Here is the config for setting up the caching feature.
|
||||
|
|
||||
*/
|
||||
'cache' => [
|
||||
'enabled' => false,
|
||||
'driver' => 'file',
|
||||
'key' => 'laravel-modules',
|
||||
'lifetime' => 60,
|
||||
],
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Choose what laravel-modules will register as custom namespaces.
|
||||
| Setting one to false will require you to register that part
|
||||
| in your own Service Provider class.
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
'register' => [
|
||||
'translations' => true,
|
||||
/**
|
||||
* load files on boot or register method
|
||||
*/
|
||||
'files' => 'register',
|
||||
],
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
| Activators
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
||||
| You can define new types of activators here, file, database, etc. The only
|
||||
| required parameter is 'class'.
|
||||
| The file activator will store the activation status in storage/installed_modules
|
||||
*/
|
||||
'activators' => [
|
||||
'file' => [
|
||||
'class' => FileActivator::class,
|
||||
'statuses-file' => base_path('modules_statuses.json'),
|
||||
'cache-key' => 'activator.installed',
|
||||
'cache-lifetime' => 604800,
|
||||
],
|
||||
],
|
||||
|
||||
'activator' => 'file',
|
||||
];
|
||||
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"Taxi": true,
|
||||
"Test": true
|
||||
}
|
||||
Reference in New Issue
Block a user