Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 9b4c68022d | |||
| a0dad6e138 | |||
| 2ffcf73d86 |
@@ -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) {
|
|
||||||
//
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -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'));
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -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,
|
|
||||||
|
|
||||||
];
|
|
||||||
@@ -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,121 @@
|
|||||||
|
@import url('./../variables.css');
|
||||||
|
|
||||||
|
/* #modal-window__background{
|
||||||
|
position: fixed;
|
||||||
|
display: block;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
background: #6a6a6ab5;
|
||||||
|
top: 0;
|
||||||
|
z-index: 99;
|
||||||
|
} */
|
||||||
|
|
||||||
|
.entity-hist-container{
|
||||||
|
position: fixed;
|
||||||
|
width: 50%;
|
||||||
|
top: 10%;
|
||||||
|
left: 25%;
|
||||||
|
z-index: 100;
|
||||||
|
background: white;
|
||||||
|
border-radius: 10px;
|
||||||
|
box-shadow: 0px 0px 15px 1px #9b9999;
|
||||||
|
|
||||||
|
&>.hist__header-block{
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
background: var(--color_graphite_main);
|
||||||
|
min-height: 7%;
|
||||||
|
height: auto;
|
||||||
|
border-radius: 10px;
|
||||||
|
color: white;
|
||||||
|
padding: 10px;
|
||||||
|
|
||||||
|
&>.hist__header__buttons{
|
||||||
|
|
||||||
|
&>.header__buttons__close{
|
||||||
|
transform: rotate(45deg);
|
||||||
|
font-size: 2rem;
|
||||||
|
color: var(--color_ruby_main);
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&>.hist__content-block{
|
||||||
|
overflow-y: scroll;
|
||||||
|
padding: 10px;
|
||||||
|
max-height: 500px;
|
||||||
|
|
||||||
|
&>.hist-container__date-block{
|
||||||
|
display: flex;
|
||||||
|
|
||||||
|
&>.date-block__date{
|
||||||
|
flex-basis: 15%;
|
||||||
|
|
||||||
|
&>div{
|
||||||
|
position: sticky;
|
||||||
|
top: 0px;
|
||||||
|
padding: 3px;
|
||||||
|
background: var(--color_purple_main);
|
||||||
|
border-radius: 5px 0 0 5px;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
&>.date-block__changes{
|
||||||
|
flex-basis: 85%;
|
||||||
|
border-left: 2px solid black;
|
||||||
|
padding: 0 10px;
|
||||||
|
|
||||||
|
&>.changes__action-block{
|
||||||
|
|
||||||
|
& .action-block__action-name{
|
||||||
|
padding: 3px;
|
||||||
|
border-radius: 3px;
|
||||||
|
font-size: 1.2rem;
|
||||||
|
/* border-bottom: 3px solid var(--color_purple_main); */
|
||||||
|
background: color-mix(in srgb, var(--color_purple_main) 20%, transparent);
|
||||||
|
box-shadow: 0px 2px 3px 0px #c0bdd3;
|
||||||
|
}
|
||||||
|
|
||||||
|
&:last-child{
|
||||||
|
margin-bottom: 30px;
|
||||||
|
}
|
||||||
|
|
||||||
|
&>.changes__date-time-block{
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
margin: 5px 0px 10px 0px;
|
||||||
|
color: rgb(173 173 173);
|
||||||
|
}
|
||||||
|
|
||||||
|
&>.changes__details{
|
||||||
|
margin-bottom: 15px;
|
||||||
|
|
||||||
|
& .changes__details__el{
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-between;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
|
||||||
|
&>.changes__details__el__prop-name{
|
||||||
|
flex-basis: 30%;
|
||||||
|
font-weight: 500;
|
||||||
|
}
|
||||||
|
|
||||||
|
&>.changes__details__el__prop-val{
|
||||||
|
flex-basis: 70%;
|
||||||
|
background: #91919121;
|
||||||
|
border-radius: 5px;
|
||||||
|
padding: 5px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -0,0 +1,120 @@
|
|||||||
|
|
||||||
|
import React, { useEffect, useMemo, useState, useContext } from "react";
|
||||||
|
import { createPortal } from "react-dom";
|
||||||
|
import './../../../css/components/entityHistory.css';
|
||||||
|
import { HistoryContext } from "../../contexts/HistoryContext";
|
||||||
|
|
||||||
|
//Тип с параметрами сущности, история по которой будет выводиться
|
||||||
|
export type EntityHistoryProps = {
|
||||||
|
changeAction: string, //Совершенное действие: создание, удаление, редактирование, архивирование и т.д.
|
||||||
|
changeAuthor: string, //Автор изменения: логин, сервисная УЗ
|
||||||
|
changeDate: Date //Объект даты изменения. В объекте будет либо время (тогда показываем), либо время будет отсутствовать (тогда не показываем) //что будем передавать? объект new Date или библиотечный объект для работы с датами?
|
||||||
|
changeTime?: string //Время изменений. Передавать не нужно, на этабе сборки компонента будет формироваться на основе пропса changeDate
|
||||||
|
// changeDetails?: HistoryEntityElDetails[] //Массив объектов с деталями изменений формата: изменяемое свойство(поле, например) - значение изменяемого свойства
|
||||||
|
changeDetails?: Record<string, string> //Массив объектов с деталями изменений формата: изменяемое свойство(поле, например) - значение изменяемого свойства
|
||||||
|
};
|
||||||
|
|
||||||
|
//Тип с деталями изменений
|
||||||
|
// type HistoryEntityElDetails = {
|
||||||
|
// propName: string, //Имя измененного свойства
|
||||||
|
// propValue: string //Значение измененного свойства
|
||||||
|
// }
|
||||||
|
|
||||||
|
//Компонент отображения истории изменений сущности
|
||||||
|
export default function EntityHistory ()
|
||||||
|
{
|
||||||
|
//ГАВРИЛОВ
|
||||||
|
//ИДЕНТИЧНЫЙ СПРАВОЧНИК УКАЗАН НА СТОРОНЕ ЛАРАВЕЛЬ APP/ENUMS/LOGBUSINESSEVENTS. ЕСТЬ ВОЗМОЖНОСТЬ ОБЪЕДИНИТЬ ИХ?
|
||||||
|
const HistoryActions = {
|
||||||
|
create: 'создание',
|
||||||
|
edit: 'редактирование',
|
||||||
|
archive: 'архивация',
|
||||||
|
restore: 'восстановление',
|
||||||
|
delete: 'удаление',
|
||||||
|
cancel: 'отмена',
|
||||||
|
}
|
||||||
|
const historyContext = useContext(HistoryContext);
|
||||||
|
//Перестраиваем объект с изменениями, группируя их по датам
|
||||||
|
const groupDataByDate = useMemo( () => {
|
||||||
|
let changesByDate = {},
|
||||||
|
historyContent = historyContext.content.length ? historyContext.content : []
|
||||||
|
//Сортируем все изменения от большего к меньшему по дате и времени
|
||||||
|
//ГАВРИЛОВ. или нужно отсортировать от меньшего к большему? мы хотим сверху самые актуальные данные а ниже менее актуальные или наоборот?
|
||||||
|
//ПРОВЕРИТЬ СОРТИРУЕТСЯ ЛИ ПО ДАТАМ
|
||||||
|
historyContent.sort( (a, b) => {return b.changeDate - a.changeDate} )
|
||||||
|
//console.log(historyContext)
|
||||||
|
historyContent.forEach( (changeEl: EntityHistoryProps) => {
|
||||||
|
let dateToString = changeEl.changeDate.toLocaleString('ru-RU').split(',')[0];
|
||||||
|
if ( !(dateToString in changesByDate) ) {
|
||||||
|
changesByDate[dateToString] = [];
|
||||||
|
}
|
||||||
|
changesByDate[dateToString].push(changeEl);
|
||||||
|
});
|
||||||
|
|
||||||
|
return changesByDate;
|
||||||
|
}, [historyContext.content]);
|
||||||
|
|
||||||
|
|
||||||
|
//Сокрытие блока показа истории
|
||||||
|
function hideHistoryBlock(){
|
||||||
|
historyContext.hideHistory()
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
historyContext.content && historyContext.visible ?
|
||||||
|
createPortal(
|
||||||
|
<div>
|
||||||
|
<div className="entity-hist-container">
|
||||||
|
<div className="hist__header-block">
|
||||||
|
<div className="hist__header__title">
|
||||||
|
<h3>{ historyContext.headerText.length ? historyContext.headerText : `История изменений запроса ${historyContext.entityId}` }</h3>
|
||||||
|
</div>
|
||||||
|
<div className="hist__header__buttons" onClick={hideHistoryBlock}>
|
||||||
|
<i className="fa fa-plus header__buttons__close"></i>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="hist__content-block">
|
||||||
|
{Object.entries(groupDataByDate).map( (dateChanges, dateIndex) =>
|
||||||
|
<div key={dateIndex} className="hist-container__date-block">
|
||||||
|
<div className="date-block__date">
|
||||||
|
<div>{ dateChanges[0] }</div>
|
||||||
|
</div>
|
||||||
|
<div className="date-block__changes">
|
||||||
|
{ dateChanges[1].map( (changeEl: EntityHistoryProps, elIndex: number) =>
|
||||||
|
<div className="changes__action-block" key={ elIndex }>
|
||||||
|
<div className="action-block__action-name">
|
||||||
|
{ HistoryActions[changeEl.changeAction] }
|
||||||
|
</div>
|
||||||
|
<div className="changes__date-time-block">
|
||||||
|
<div>
|
||||||
|
{ changeEl.changeAuthor }
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
{ changeEl.changeTime }
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="changes__details">
|
||||||
|
{Object.entries(changeEl.changeDetails).map( (detail, detailIndex) =>
|
||||||
|
<div className="changes__details__el" key={ detailIndex }>
|
||||||
|
<div className="changes__details__el__prop-name">
|
||||||
|
{ (historyContext.dataFields && historyContext.dataFields[detail[0]]) ? historyContext.dataFields[detail[0]] : detail[0] }
|
||||||
|
</div>
|
||||||
|
<div className="changes__details__el__prop-val">
|
||||||
|
{ detail[1] }
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>,
|
||||||
|
document.body
|
||||||
|
)
|
||||||
|
: ''
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,97 @@
|
|||||||
|
import React, { createContext, useState, useContext } from "react";
|
||||||
|
import EntityHistory, { EntityHistoryProps } from "../components/entityHistory/EntityHistory";
|
||||||
|
import api from "../api";
|
||||||
|
import { PreloaderContext } from "./PreloaderContext";
|
||||||
|
|
||||||
|
//Тип с пропсами для взаимодействия с контекстом
|
||||||
|
interface HistoryContextType {
|
||||||
|
visible: boolean, //Пропс видимости компонента
|
||||||
|
historyDataFields: HistoryDataFields, //Объект с названиями полей, по которым было совершено изменение. В БД они будут храниться, скорее всего, на латинице, на фронте их надо расшифровать
|
||||||
|
hideHistory: () => void, //Колбек для сокрытия блока с историей
|
||||||
|
content: Record<string, string> | null, //Контент для отображения истории
|
||||||
|
headerText: string, //Текст в заголовке окна с историей
|
||||||
|
entityId: number, //Уникальный идентификатор сущности, по которой показываем историю (заявки, запрос и т.д.)
|
||||||
|
showHistory: (entityId: number, content: EntityHistoryProps[], windowHeader?: string) => void, //Колбек для вызова окна с историей
|
||||||
|
getHistoryFromMagic: (appname: string, subjectId: string | number, historyDataFields: HistoryDataFields, windowHeader?: string) => void //Метод получения истории из приложения Magic
|
||||||
|
}
|
||||||
|
|
||||||
|
type HistoryDataFields = Record<string, string>;
|
||||||
|
|
||||||
|
export const HistoryContext = createContext<HistoryContextType | null>(null);
|
||||||
|
|
||||||
|
export const HistoryProvider = ( {children} ) => {
|
||||||
|
const [historyVisible, setHistoryVisible] = useState<boolean>(false);
|
||||||
|
const [historyContent, setHistoryContent] = useState<EntityHistoryProps[] | []>( [] );
|
||||||
|
const [historyWindowHeader, setHistoryWindowHeader] = useState<string>('');
|
||||||
|
const [historyEntityId, setHistoryEntityId] = useState<number>();
|
||||||
|
const [historyDataFields, setHistoryDataFields] = useState<HistoryDataFields | null>( null );
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Сокрытие окна с историей
|
||||||
|
*/
|
||||||
|
function hideHistoryBlock() {
|
||||||
|
setHistoryVisible(false);
|
||||||
|
setHistoryWindowHeader('');
|
||||||
|
setHistoryContent( [] );
|
||||||
|
setHistoryEntityId(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
const preloaderContext = useContext(PreloaderContext);
|
||||||
|
|
||||||
|
//ГАВРИЛОВ. ПРАВИЛЬНО ЛИ В КОНТЕКСТЕ РЕАЛИЗОВЫВАТЬ ЛОГИКУ ФУНКЦИОНАЛА? ИЛИ ПРАВИЛЬНЕЕ ЕЕ РАЗМЕСТИТЬ В ФАЙЛЕ КОМПОНЕНТА?
|
||||||
|
async function getHistoryFromMagic(appName: string, subjectId: number | string, historyDataFields: HistoryDataFields, windowHeader?: string){
|
||||||
|
preloaderContext.setPreloaderVisible(true)
|
||||||
|
const appHistory = await api.get(`${appName}/history/${subjectId}`).then(history => history.data.data);
|
||||||
|
|
||||||
|
// console.log(appHistory)
|
||||||
|
|
||||||
|
if (appHistory) {
|
||||||
|
appHistory.forEach( changeData => {
|
||||||
|
changeData.changeDetails = JSON.parse(changeData.changeDetails)
|
||||||
|
});
|
||||||
|
//appHistory.changeDetails = JSON.parse(appHistory.changeDetails)
|
||||||
|
}
|
||||||
|
//ГАВРИЛОВ
|
||||||
|
//ПРОВЕРКА НА НАЛИЧИЕ НУЖНЫХ СВОЙСТВ. ЧТОБЫ ОБЪЕКТ СООТВЕТСТВОВАЛ ТИПУ
|
||||||
|
//УБРАТЬ CHANGE. ПРОСТО AUTHOR,DETAILS и так далее
|
||||||
|
|
||||||
|
// console.log(appHistory)
|
||||||
|
|
||||||
|
showHistoryBlock(subjectId, appHistory, historyDataFields, windowHeader)
|
||||||
|
|
||||||
|
// return appHistory;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Показываем историю
|
||||||
|
* @param entityId идентификатор бизнес-сущности
|
||||||
|
* @param content контент для отображения
|
||||||
|
* @param windowHeader заголовок для окна с историей
|
||||||
|
*/
|
||||||
|
//ГАВРИЛОВ. сделать пропс historyDataFields необязательным (пустой объект по умолчанию), так как details могут не передаваться, тогда и словарь не нужен (В ТОМ ЧИСЛЕ И В МЕТОДЕ getHistoryFromMagic). сделай интерфейс для аргументов идентичным
|
||||||
|
function showHistoryBlock(subjectId: number | string, content: EntityHistoryProps[], historyDataFields: HistoryDataFields, windowHeader?: string){
|
||||||
|
preloaderContext.setPreloaderVisible(true)
|
||||||
|
setHistoryVisible(true);
|
||||||
|
setHistoryEntityId(subjectId);
|
||||||
|
setHistoryContent(content);
|
||||||
|
windowHeader ? setHistoryWindowHeader(windowHeader) : true;
|
||||||
|
historyDataFields ? setHistoryDataFields(historyDataFields) : true;
|
||||||
|
preloaderContext.setPreloaderVisible(false)
|
||||||
|
}
|
||||||
|
|
||||||
|
const value = {
|
||||||
|
getHistoryFromMagic: getHistoryFromMagic,
|
||||||
|
showHistory: showHistoryBlock,
|
||||||
|
hideHistory: hideHistoryBlock,
|
||||||
|
visible: historyVisible,
|
||||||
|
content: historyContent,
|
||||||
|
headerText: historyWindowHeader,
|
||||||
|
entityId: historyEntityId,
|
||||||
|
dataFields: historyDataFields
|
||||||
|
};
|
||||||
|
|
||||||
|
return <HistoryContext.Provider value={value}>
|
||||||
|
{children}
|
||||||
|
<EntityHistory/>
|
||||||
|
</HistoryContext.Provider>
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
<?php
|
||||||
|
use Illuminate\Support\Facades\Route;
|
||||||
|
use \App\Http\Controllers;
|
||||||
|
|
||||||
|
|
||||||
|
//Получение истории по сущности приложения
|
||||||
|
Route::get('{app_name}/history/{subject_id}', [Controllers\AppHistoryController::class, 'getAppHistory']);
|
||||||
|
|
||||||
Reference in New Issue
Block a user