Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 vasya
|
99f78bc570 | ||
|
vasya
|
bfa7520908 | ||
|
vasya
|
fcfb9ce81e | ||
|
vasya
|
cc048a47ba |
@@ -1,30 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Exceptions;
|
|
||||||
|
|
||||||
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
|
|
||||||
use Throwable;
|
|
||||||
|
|
||||||
class Handler extends ExceptionHandler
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* The list of the inputs that are never flashed to the session on validation exceptions.
|
|
||||||
*
|
|
||||||
* @var array<int, string>
|
|
||||||
*/
|
|
||||||
protected $dontFlash = [
|
|
||||||
'current_password',
|
|
||||||
'password',
|
|
||||||
'password_confirmation',
|
|
||||||
];
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Register the exception handling callbacks for the application.
|
|
||||||
*/
|
|
||||||
public function register(): void
|
|
||||||
{
|
|
||||||
$this->reportable(function (Throwable $e) {
|
|
||||||
//
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -3,6 +3,9 @@
|
|||||||
namespace App\Providers;
|
namespace App\Providers;
|
||||||
|
|
||||||
use Illuminate\Support\ServiceProvider;
|
use Illuminate\Support\ServiceProvider;
|
||||||
|
use Spatie\Activitylog\Facades\CauserResolver;
|
||||||
|
use Illuminate\Support\Facades\View;
|
||||||
|
use App\Services\ModuleService;
|
||||||
|
|
||||||
class AppServiceProvider extends ServiceProvider
|
class AppServiceProvider extends ServiceProvider
|
||||||
{
|
{
|
||||||
@@ -11,7 +14,8 @@ class AppServiceProvider extends ServiceProvider
|
|||||||
*/
|
*/
|
||||||
public function register(): void
|
public function register(): void
|
||||||
{
|
{
|
||||||
//
|
//Регистрируем передачу во все blade шаблоны функционал сервиса по определению имени модуля из текущего роута
|
||||||
|
View::share('moduleName', app(ModuleService::class));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -19,6 +23,8 @@ class AppServiceProvider extends ServiceProvider
|
|||||||
*/
|
*/
|
||||||
public function boot(): void
|
public function boot(): void
|
||||||
{
|
{
|
||||||
//
|
// Глобально отключаем определение causer для корректной работы пакета activity_log. По умолчанию пакет ожидает получить экземпляр модели Models\User для прописывания в таблицу activity_log значения causer_type и causer_id. Эти значения нельзя руками прописать при логировании. Никакие танцы с бубнами не помогали кроме строки ниже. Данные по инициатору изменения решил записывать в поле properties
|
||||||
|
//UPD: Решил отказаться, так как все равно для корректной работы аутентификации пришел к фиксации записи в модели users, для отображения истории бизнес-сущностей удобнее будет получать пользователя, совершившего действие, из отдельного поля в модели, а не парсить json из поля properties
|
||||||
|
// CauserResolver::resolveUsing(fn () => null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,40 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Providers;
|
|
||||||
|
|
||||||
use Illuminate\Cache\RateLimiting\Limit;
|
|
||||||
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
|
|
||||||
use Illuminate\Http\Request;
|
|
||||||
use Illuminate\Support\Facades\RateLimiter;
|
|
||||||
use Illuminate\Support\Facades\Route;
|
|
||||||
|
|
||||||
class RouteServiceProvider extends ServiceProvider
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* The path to your application's "home" route.
|
|
||||||
*
|
|
||||||
* Typically, users are redirected here after authentication.
|
|
||||||
*
|
|
||||||
* @var string
|
|
||||||
*/
|
|
||||||
public const HOME = '/home';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Define your route model bindings, pattern filters, and other route configuration.
|
|
||||||
*/
|
|
||||||
public function boot(): void
|
|
||||||
{
|
|
||||||
RateLimiter::for('api', function (Request $request) {
|
|
||||||
return Limit::perMinute(60)->by($request->user()?->id ?: $request->ip());
|
|
||||||
});
|
|
||||||
|
|
||||||
$this->routes(function () {
|
|
||||||
Route::middleware('api')
|
|
||||||
->prefix('api')
|
|
||||||
->group(base_path('routes/api.php'));
|
|
||||||
|
|
||||||
Route::middleware('web')
|
|
||||||
->group(base_path('routes/web.php'));
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
<?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,71 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
return [
|
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Default Broadcaster
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| This option controls the default broadcaster that will be used by the
|
|
||||||
| framework when an event needs to be broadcast. You may set this to
|
|
||||||
| any of the connections defined in the "connections" array below.
|
|
||||||
|
|
|
||||||
| Supported: "pusher", "ably", "redis", "log", "null"
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
'default' => env('BROADCAST_DRIVER', 'null'),
|
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Broadcast Connections
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| Here you may define all of the broadcast connections that will be used
|
|
||||||
| to broadcast events to other systems or over websockets. Samples of
|
|
||||||
| each available type of connection are provided inside this array.
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
'connections' => [
|
|
||||||
|
|
||||||
'pusher' => [
|
|
||||||
'driver' => 'pusher',
|
|
||||||
'key' => env('PUSHER_APP_KEY'),
|
|
||||||
'secret' => env('PUSHER_APP_SECRET'),
|
|
||||||
'app_id' => env('PUSHER_APP_ID'),
|
|
||||||
'options' => [
|
|
||||||
'cluster' => env('PUSHER_APP_CLUSTER'),
|
|
||||||
'host' => env('PUSHER_HOST') ?: 'api-'.env('PUSHER_APP_CLUSTER', 'mt1').'.pusher.com',
|
|
||||||
'port' => env('PUSHER_PORT', 443),
|
|
||||||
'scheme' => env('PUSHER_SCHEME', 'https'),
|
|
||||||
'encrypted' => true,
|
|
||||||
'useTLS' => env('PUSHER_SCHEME', 'https') === 'https',
|
|
||||||
],
|
|
||||||
'client_options' => [
|
|
||||||
// Guzzle client options: https://docs.guzzlephp.org/en/stable/request-options.html
|
|
||||||
],
|
|
||||||
],
|
|
||||||
|
|
||||||
'ably' => [
|
|
||||||
'driver' => 'ably',
|
|
||||||
'key' => env('ABLY_KEY'),
|
|
||||||
],
|
|
||||||
|
|
||||||
'redis' => [
|
|
||||||
'driver' => 'redis',
|
|
||||||
'connection' => 'default',
|
|
||||||
],
|
|
||||||
|
|
||||||
'log' => [
|
|
||||||
'driver' => 'log',
|
|
||||||
],
|
|
||||||
|
|
||||||
'null' => [
|
|
||||||
'driver' => 'null',
|
|
||||||
],
|
|
||||||
|
|
||||||
],
|
|
||||||
|
|
||||||
];
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
return [
|
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Cross-Origin Resource Sharing (CORS) Configuration
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| Here you may configure your settings for cross-origin resource sharing
|
|
||||||
| or "CORS". This determines what cross-origin operations may execute
|
|
||||||
| in web browsers. You are free to adjust these settings as needed.
|
|
||||||
|
|
|
||||||
| To learn more: https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
'paths' => ['api/*', 'sanctum/csrf-cookie'],
|
|
||||||
|
|
||||||
'allowed_methods' => ['*'],
|
|
||||||
|
|
||||||
'allowed_origins' => ['*'],
|
|
||||||
|
|
||||||
'allowed_origins_patterns' => [],
|
|
||||||
|
|
||||||
'allowed_headers' => ['*'],
|
|
||||||
|
|
||||||
'exposed_headers' => [],
|
|
||||||
|
|
||||||
'max_age' => 0,
|
|
||||||
|
|
||||||
'supports_credentials' => false,
|
|
||||||
|
|
||||||
];
|
|
||||||
@@ -0,0 +1,232 @@
|
|||||||
|
<?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,20 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
return [
|
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Authentication Language Lines
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| The following language lines are used during authentication for various
|
|
||||||
| messages that we need to display to the user. You are free to modify
|
|
||||||
| these language lines according to your application's requirements.
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
'failed' => 'These credentials do not match our records.',
|
|
||||||
'password' => 'The provided password is incorrect.',
|
|
||||||
'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
|
|
||||||
|
|
||||||
];
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
return [
|
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Pagination Language Lines
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| The following language lines are used by the paginator library to build
|
|
||||||
| the simple pagination links. You are free to change them to anything
|
|
||||||
| you want to customize your views to better match your application.
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
'previous' => '« Previous',
|
|
||||||
'next' => 'Next »',
|
|
||||||
|
|
||||||
];
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
return [
|
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Password Reset Language Lines
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| The following language lines are the default lines which match reasons
|
|
||||||
| that are given by the password broker for a password update attempt
|
|
||||||
| has failed, such as for an invalid token or invalid new password.
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
'reset' => 'Your password has been reset.',
|
|
||||||
'sent' => 'We have emailed your password reset link.',
|
|
||||||
'throttled' => 'Please wait before retrying.',
|
|
||||||
'token' => 'This password reset token is invalid.',
|
|
||||||
'user' => "We can't find a user with that email address.",
|
|
||||||
|
|
||||||
];
|
|
||||||
@@ -1,191 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
return [
|
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Validation Language Lines
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| The following language lines contain the default error messages used by
|
|
||||||
| the validator class. Some of these rules have multiple versions such
|
|
||||||
| as the size rules. Feel free to tweak each of these messages here.
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
'accepted' => 'The :attribute field must be accepted.',
|
|
||||||
'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
|
|
||||||
'active_url' => 'The :attribute field must be a valid URL.',
|
|
||||||
'after' => 'The :attribute field must be a date after :date.',
|
|
||||||
'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
|
|
||||||
'alpha' => 'The :attribute field must only contain letters.',
|
|
||||||
'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
|
|
||||||
'alpha_num' => 'The :attribute field must only contain letters and numbers.',
|
|
||||||
'array' => 'The :attribute field must be an array.',
|
|
||||||
'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
|
|
||||||
'before' => 'The :attribute field must be a date before :date.',
|
|
||||||
'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
|
|
||||||
'between' => [
|
|
||||||
'array' => 'The :attribute field must have between :min and :max items.',
|
|
||||||
'file' => 'The :attribute field must be between :min and :max kilobytes.',
|
|
||||||
'numeric' => 'The :attribute field must be between :min and :max.',
|
|
||||||
'string' => 'The :attribute field must be between :min and :max characters.',
|
|
||||||
],
|
|
||||||
'boolean' => 'The :attribute field must be true or false.',
|
|
||||||
'can' => 'The :attribute field contains an unauthorized value.',
|
|
||||||
'confirmed' => 'The :attribute field confirmation does not match.',
|
|
||||||
'current_password' => 'The password is incorrect.',
|
|
||||||
'date' => 'The :attribute field must be a valid date.',
|
|
||||||
'date_equals' => 'The :attribute field must be a date equal to :date.',
|
|
||||||
'date_format' => 'The :attribute field must match the format :format.',
|
|
||||||
'decimal' => 'The :attribute field must have :decimal decimal places.',
|
|
||||||
'declined' => 'The :attribute field must be declined.',
|
|
||||||
'declined_if' => 'The :attribute field must be declined when :other is :value.',
|
|
||||||
'different' => 'The :attribute field and :other must be different.',
|
|
||||||
'digits' => 'The :attribute field must be :digits digits.',
|
|
||||||
'digits_between' => 'The :attribute field must be between :min and :max digits.',
|
|
||||||
'dimensions' => 'The :attribute field has invalid image dimensions.',
|
|
||||||
'distinct' => 'The :attribute field has a duplicate value.',
|
|
||||||
'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
|
|
||||||
'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
|
|
||||||
'email' => 'The :attribute field must be a valid email address.',
|
|
||||||
'ends_with' => 'The :attribute field must end with one of the following: :values.',
|
|
||||||
'enum' => 'The selected :attribute is invalid.',
|
|
||||||
'exists' => 'The selected :attribute is invalid.',
|
|
||||||
'extensions' => 'The :attribute field must have one of the following extensions: :values.',
|
|
||||||
'file' => 'The :attribute field must be a file.',
|
|
||||||
'filled' => 'The :attribute field must have a value.',
|
|
||||||
'gt' => [
|
|
||||||
'array' => 'The :attribute field must have more than :value items.',
|
|
||||||
'file' => 'The :attribute field must be greater than :value kilobytes.',
|
|
||||||
'numeric' => 'The :attribute field must be greater than :value.',
|
|
||||||
'string' => 'The :attribute field must be greater than :value characters.',
|
|
||||||
],
|
|
||||||
'gte' => [
|
|
||||||
'array' => 'The :attribute field must have :value items or more.',
|
|
||||||
'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
|
|
||||||
'numeric' => 'The :attribute field must be greater than or equal to :value.',
|
|
||||||
'string' => 'The :attribute field must be greater than or equal to :value characters.',
|
|
||||||
],
|
|
||||||
'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
|
|
||||||
'image' => 'The :attribute field must be an image.',
|
|
||||||
'in' => 'The selected :attribute is invalid.',
|
|
||||||
'in_array' => 'The :attribute field must exist in :other.',
|
|
||||||
'integer' => 'The :attribute field must be an integer.',
|
|
||||||
'ip' => 'The :attribute field must be a valid IP address.',
|
|
||||||
'ipv4' => 'The :attribute field must be a valid IPv4 address.',
|
|
||||||
'ipv6' => 'The :attribute field must be a valid IPv6 address.',
|
|
||||||
'json' => 'The :attribute field must be a valid JSON string.',
|
|
||||||
'lowercase' => 'The :attribute field must be lowercase.',
|
|
||||||
'lt' => [
|
|
||||||
'array' => 'The :attribute field must have less than :value items.',
|
|
||||||
'file' => 'The :attribute field must be less than :value kilobytes.',
|
|
||||||
'numeric' => 'The :attribute field must be less than :value.',
|
|
||||||
'string' => 'The :attribute field must be less than :value characters.',
|
|
||||||
],
|
|
||||||
'lte' => [
|
|
||||||
'array' => 'The :attribute field must not have more than :value items.',
|
|
||||||
'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
|
|
||||||
'numeric' => 'The :attribute field must be less than or equal to :value.',
|
|
||||||
'string' => 'The :attribute field must be less than or equal to :value characters.',
|
|
||||||
],
|
|
||||||
'mac_address' => 'The :attribute field must be a valid MAC address.',
|
|
||||||
'max' => [
|
|
||||||
'array' => 'The :attribute field must not have more than :max items.',
|
|
||||||
'file' => 'The :attribute field must not be greater than :max kilobytes.',
|
|
||||||
'numeric' => 'The :attribute field must not be greater than :max.',
|
|
||||||
'string' => 'The :attribute field must not be greater than :max characters.',
|
|
||||||
],
|
|
||||||
'max_digits' => 'The :attribute field must not have more than :max digits.',
|
|
||||||
'mimes' => 'The :attribute field must be a file of type: :values.',
|
|
||||||
'mimetypes' => 'The :attribute field must be a file of type: :values.',
|
|
||||||
'min' => [
|
|
||||||
'array' => 'The :attribute field must have at least :min items.',
|
|
||||||
'file' => 'The :attribute field must be at least :min kilobytes.',
|
|
||||||
'numeric' => 'The :attribute field must be at least :min.',
|
|
||||||
'string' => 'The :attribute field must be at least :min characters.',
|
|
||||||
],
|
|
||||||
'min_digits' => 'The :attribute field must have at least :min digits.',
|
|
||||||
'missing' => 'The :attribute field must be missing.',
|
|
||||||
'missing_if' => 'The :attribute field must be missing when :other is :value.',
|
|
||||||
'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
|
|
||||||
'missing_with' => 'The :attribute field must be missing when :values is present.',
|
|
||||||
'missing_with_all' => 'The :attribute field must be missing when :values are present.',
|
|
||||||
'multiple_of' => 'The :attribute field must be a multiple of :value.',
|
|
||||||
'not_in' => 'The selected :attribute is invalid.',
|
|
||||||
'not_regex' => 'The :attribute field format is invalid.',
|
|
||||||
'numeric' => 'The :attribute field must be a number.',
|
|
||||||
'password' => [
|
|
||||||
'letters' => 'The :attribute field must contain at least one letter.',
|
|
||||||
'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
|
|
||||||
'numbers' => 'The :attribute field must contain at least one number.',
|
|
||||||
'symbols' => 'The :attribute field must contain at least one symbol.',
|
|
||||||
'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
|
|
||||||
],
|
|
||||||
'present' => 'The :attribute field must be present.',
|
|
||||||
'present_if' => 'The :attribute field must be present when :other is :value.',
|
|
||||||
'present_unless' => 'The :attribute field must be present unless :other is :value.',
|
|
||||||
'present_with' => 'The :attribute field must be present when :values is present.',
|
|
||||||
'present_with_all' => 'The :attribute field must be present when :values are present.',
|
|
||||||
'prohibited' => 'The :attribute field is prohibited.',
|
|
||||||
'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
|
|
||||||
'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
|
|
||||||
'prohibits' => 'The :attribute field prohibits :other from being present.',
|
|
||||||
'regex' => 'The :attribute field format is invalid.',
|
|
||||||
'required' => 'The :attribute field is required.',
|
|
||||||
'required_array_keys' => 'The :attribute field must contain entries for: :values.',
|
|
||||||
'required_if' => 'The :attribute field is required when :other is :value.',
|
|
||||||
'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
|
|
||||||
'required_unless' => 'The :attribute field is required unless :other is in :values.',
|
|
||||||
'required_with' => 'The :attribute field is required when :values is present.',
|
|
||||||
'required_with_all' => 'The :attribute field is required when :values are present.',
|
|
||||||
'required_without' => 'The :attribute field is required when :values is not present.',
|
|
||||||
'required_without_all' => 'The :attribute field is required when none of :values are present.',
|
|
||||||
'same' => 'The :attribute field must match :other.',
|
|
||||||
'size' => [
|
|
||||||
'array' => 'The :attribute field must contain :size items.',
|
|
||||||
'file' => 'The :attribute field must be :size kilobytes.',
|
|
||||||
'numeric' => 'The :attribute field must be :size.',
|
|
||||||
'string' => 'The :attribute field must be :size characters.',
|
|
||||||
],
|
|
||||||
'starts_with' => 'The :attribute field must start with one of the following: :values.',
|
|
||||||
'string' => 'The :attribute field must be a string.',
|
|
||||||
'timezone' => 'The :attribute field must be a valid timezone.',
|
|
||||||
'unique' => 'The :attribute has already been taken.',
|
|
||||||
'uploaded' => 'The :attribute failed to upload.',
|
|
||||||
'uppercase' => 'The :attribute field must be uppercase.',
|
|
||||||
'url' => 'The :attribute field must be a valid URL.',
|
|
||||||
'ulid' => 'The :attribute field must be a valid ULID.',
|
|
||||||
'uuid' => 'The :attribute field must be a valid UUID.',
|
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Custom Validation Language Lines
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| Here you may specify custom validation messages for attributes using the
|
|
||||||
| convention "attribute.rule" to name the lines. This makes it quick to
|
|
||||||
| specify a specific custom language line for a given attribute rule.
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
'custom' => [
|
|
||||||
'attribute-name' => [
|
|
||||||
'rule-name' => 'custom-message',
|
|
||||||
],
|
|
||||||
],
|
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Custom Validation Attributes
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| The following language lines are used to swap our attribute placeholder
|
|
||||||
| with something more reader friendly such as "E-Mail Address" instead
|
|
||||||
| of "email". This simply helps us make our message more expressive.
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
'attributes' => [],
|
|
||||||
|
|
||||||
];
|
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
{
|
||||||
|
"Taxi": true,
|
||||||
|
"Test": true
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user