Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 2de3e54b30 | |||
| 3e5bbed09c | |||
| f23bca90fd | |||
| e261c55a47 | |||
| bcdaaa214d | |||
| 1ff87d2403 | |||
| 8dc2f787f5 |
+30
-24
@@ -4,26 +4,45 @@ APP_KEY=
|
|||||||
APP_DEBUG=true
|
APP_DEBUG=true
|
||||||
APP_URL=http://localhost
|
APP_URL=http://localhost
|
||||||
|
|
||||||
|
APP_LOCALE=en
|
||||||
|
APP_FALLBACK_LOCALE=en
|
||||||
|
APP_FAKER_LOCALE=en_US
|
||||||
|
|
||||||
|
APP_MAINTENANCE_DRIVER=file
|
||||||
|
# APP_MAINTENANCE_STORE=database
|
||||||
|
|
||||||
|
# PHP_CLI_SERVER_WORKERS=4
|
||||||
|
|
||||||
|
BCRYPT_ROUNDS=12
|
||||||
|
|
||||||
LOG_CHANNEL=stack
|
LOG_CHANNEL=stack
|
||||||
|
LOG_STACK=single
|
||||||
LOG_DEPRECATIONS_CHANNEL=null
|
LOG_DEPRECATIONS_CHANNEL=null
|
||||||
LOG_LEVEL=debug
|
LOG_LEVEL=debug
|
||||||
|
|
||||||
DB_CONNECTION=mysql
|
DB_CONNECTION=sqlite
|
||||||
DB_HOST=127.0.0.1
|
# DB_HOST=127.0.0.1
|
||||||
DB_PORT=3306
|
# DB_PORT=3306
|
||||||
DB_DATABASE=laravel
|
# DB_DATABASE=laravel
|
||||||
DB_USERNAME=root
|
# DB_USERNAME=root
|
||||||
DB_PASSWORD=
|
# DB_PASSWORD=
|
||||||
|
|
||||||
BROADCAST_DRIVER=log
|
SESSION_DRIVER=database
|
||||||
CACHE_DRIVER=file
|
|
||||||
FILESYSTEM_DISK=local
|
|
||||||
QUEUE_CONNECTION=sync
|
|
||||||
SESSION_DRIVER=file
|
|
||||||
SESSION_LIFETIME=120
|
SESSION_LIFETIME=120
|
||||||
|
SESSION_ENCRYPT=false
|
||||||
|
SESSION_PATH=/
|
||||||
|
SESSION_DOMAIN=null
|
||||||
|
|
||||||
|
BROADCAST_CONNECTION=log
|
||||||
|
FILESYSTEM_DISK=local
|
||||||
|
QUEUE_CONNECTION=database
|
||||||
|
|
||||||
|
CACHE_STORE=database
|
||||||
|
# CACHE_PREFIX=
|
||||||
|
|
||||||
MEMCACHED_HOST=127.0.0.1
|
MEMCACHED_HOST=127.0.0.1
|
||||||
|
|
||||||
|
REDIS_CLIENT=phpredis
|
||||||
REDIS_HOST=127.0.0.1
|
REDIS_HOST=127.0.0.1
|
||||||
REDIS_PASSWORD=null
|
REDIS_PASSWORD=null
|
||||||
REDIS_PORT=6379
|
REDIS_PORT=6379
|
||||||
@@ -43,17 +62,4 @@ AWS_DEFAULT_REGION=us-east-1
|
|||||||
AWS_BUCKET=
|
AWS_BUCKET=
|
||||||
AWS_USE_PATH_STYLE_ENDPOINT=false
|
AWS_USE_PATH_STYLE_ENDPOINT=false
|
||||||
|
|
||||||
PUSHER_APP_ID=
|
|
||||||
PUSHER_APP_KEY=
|
|
||||||
PUSHER_APP_SECRET=
|
|
||||||
PUSHER_HOST=
|
|
||||||
PUSHER_PORT=443
|
|
||||||
PUSHER_SCHEME=https
|
|
||||||
PUSHER_APP_CLUSTER=mt1
|
|
||||||
|
|
||||||
VITE_APP_NAME="${APP_NAME}"
|
VITE_APP_NAME="${APP_NAME}"
|
||||||
VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
|
|
||||||
VITE_PUSHER_HOST="${PUSHER_HOST}"
|
|
||||||
VITE_PUSHER_PORT="${PUSHER_PORT}"
|
|
||||||
VITE_PUSHER_SCHEME="${PUSHER_SCHEME}"
|
|
||||||
VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
|
|
||||||
|
|||||||
+15
-10
@@ -1,19 +1,24 @@
|
|||||||
|
*.log
|
||||||
|
.DS_Store
|
||||||
|
.env
|
||||||
|
.env.backup
|
||||||
|
.env.production
|
||||||
|
.phpactor.json
|
||||||
|
.phpunit.result.cache
|
||||||
|
/.fleet
|
||||||
|
/.idea
|
||||||
|
/.nova
|
||||||
/.phpunit.cache
|
/.phpunit.cache
|
||||||
|
/.vscode
|
||||||
|
/.zed
|
||||||
|
/auth.json
|
||||||
/node_modules
|
/node_modules
|
||||||
/public/build
|
/public/build
|
||||||
/public/hot
|
/public/hot
|
||||||
/public/storage
|
/public/storage
|
||||||
/storage/*.key
|
/storage/*.key
|
||||||
|
/storage/pail
|
||||||
/vendor
|
/vendor
|
||||||
.env
|
|
||||||
.env.backup
|
|
||||||
.env.production
|
|
||||||
.phpunit.result.cache
|
|
||||||
Homestead.json
|
Homestead.json
|
||||||
Homestead.yaml
|
Homestead.yaml
|
||||||
auth.json
|
Thumbs.db
|
||||||
npm-debug.log
|
|
||||||
yarn-error.log
|
|
||||||
/.fleet
|
|
||||||
/.idea
|
|
||||||
/.vscode
|
|
||||||
|
|||||||
@@ -1,83 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Http;
|
|
||||||
|
|
||||||
use App\Http\Middleware\CheckUserAppAccess;
|
|
||||||
use Illuminate\Foundation\Http\Kernel as HttpKernel;
|
|
||||||
|
|
||||||
class Kernel extends HttpKernel
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* The application's global HTTP middleware stack.
|
|
||||||
*
|
|
||||||
* These middleware are run during every request to your application.
|
|
||||||
*
|
|
||||||
* @var array<int, class-string|string>
|
|
||||||
*/
|
|
||||||
protected $middleware = [
|
|
||||||
// \App\Http\Middleware\TrustHosts::class,
|
|
||||||
\App\Http\Middleware\TrustProxies::class,
|
|
||||||
\Illuminate\Http\Middleware\HandleCors::class,
|
|
||||||
\App\Http\Middleware\PreventRequestsDuringMaintenance::class,
|
|
||||||
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
|
|
||||||
\App\Http\Middleware\TrimStrings::class,
|
|
||||||
\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
|
|
||||||
];
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The application's route middleware groups.
|
|
||||||
*
|
|
||||||
* @var array<string, array<int, class-string|string>>
|
|
||||||
*/
|
|
||||||
protected $middlewareGroups = [
|
|
||||||
'web' => [
|
|
||||||
\App\Http\Middleware\EncryptCookies::class,
|
|
||||||
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
|
|
||||||
\Illuminate\Session\Middleware\StartSession::class,
|
|
||||||
\App\Http\Middleware\AuthenticateMagic::class,
|
|
||||||
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
|
|
||||||
\App\Http\Middleware\VerifyCsrfToken::class,
|
|
||||||
\Illuminate\Routing\Middleware\SubstituteBindings::class,
|
|
||||||
],
|
|
||||||
|
|
||||||
'api' => [
|
|
||||||
\App\Http\Middleware\EncryptCookies::class,
|
|
||||||
//\Illuminate\Session\Middleware\StartSession::class,
|
|
||||||
//\Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful::class,
|
|
||||||
'throttle:api',
|
|
||||||
//\Illuminate\Routing\Middleware\SubstituteBindings::class,
|
|
||||||
//\Illuminate\Session\Middleware\AuthenticateSession::class, // Опционально
|
|
||||||
//\Illuminate\Auth\Middleware\Authenticate::class.':sanctum', // Глобальная аутентификация
|
|
||||||
//Кастомный посредник аутентификации, который наследует стандартному посреднику аутентификации с передачей guarda sanctum. Сначала в кастомном посреднике будет проведена аутентификация sanctum, если будет выброшена ошибка, она будет обработана кастомным посредником (с возвратом сообщения об ошибке и корректного статуса). Без этой реализации стандартный посредник аутентификации пытался редиректить на роут login, которого не должно быть при обращении к api ендпоинту
|
|
||||||
\App\Http\Middleware\AuthenticateMagicApi::class.':sanctum',
|
|
||||||
\Illuminate\Routing\Middleware\ThrottleRequests::class.':api',
|
|
||||||
\Illuminate\Routing\Middleware\SubstituteBindings::class,
|
|
||||||
],
|
|
||||||
];
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The application's middleware aliases.
|
|
||||||
*
|
|
||||||
* Aliases may be used instead of class names to conveniently assign middleware to routes and groups.
|
|
||||||
*
|
|
||||||
* @var array<string, class-string|string>
|
|
||||||
*/
|
|
||||||
protected $middlewareAliases = [
|
|
||||||
'auth' => \App\Http\Middleware\Authenticate::class,
|
|
||||||
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
|
|
||||||
'auth.session' => \Illuminate\Session\Middleware\AuthenticateSession::class,
|
|
||||||
'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
|
|
||||||
'can' => \Illuminate\Auth\Middleware\Authorize::class,
|
|
||||||
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
|
|
||||||
'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class,
|
|
||||||
'precognitive' => \Illuminate\Foundation\Http\Middleware\HandlePrecognitiveRequests::class,
|
|
||||||
'signed' => \App\Http\Middleware\ValidateSignature::class,
|
|
||||||
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
|
|
||||||
'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
|
|
||||||
//Посредник проверки доступных ролей в приложении
|
|
||||||
'checkPermission' => \App\Http\Middleware\CheckUserPermission::class,
|
|
||||||
//Посредник проверки доступа к приложению
|
|
||||||
'checkAppAccess' => \App\Http\Middleware\CheckUserAppAccess::class,
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Http\Middleware;
|
|
||||||
|
|
||||||
use Illuminate\Cookie\Middleware\EncryptCookies as Middleware;
|
|
||||||
|
|
||||||
class EncryptCookies extends Middleware
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* The names of the cookies that should not be encrypted.
|
|
||||||
*
|
|
||||||
* @var array<int, string>
|
|
||||||
*/
|
|
||||||
protected $except = [
|
|
||||||
//
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Http\Middleware;
|
|
||||||
|
|
||||||
use Illuminate\Foundation\Http\Middleware\PreventRequestsDuringMaintenance as Middleware;
|
|
||||||
|
|
||||||
class PreventRequestsDuringMaintenance extends Middleware
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* The URIs that should be reachable while maintenance mode is enabled.
|
|
||||||
*
|
|
||||||
* @var array<int, string>
|
|
||||||
*/
|
|
||||||
protected $except = [
|
|
||||||
//
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Http\Middleware;
|
|
||||||
|
|
||||||
use App\Providers\RouteServiceProvider;
|
|
||||||
use Closure;
|
|
||||||
use Illuminate\Http\Request;
|
|
||||||
use Illuminate\Support\Facades\Auth;
|
|
||||||
use Symfony\Component\HttpFoundation\Response;
|
|
||||||
|
|
||||||
class RedirectIfAuthenticated
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Handle an incoming request.
|
|
||||||
*
|
|
||||||
* @param \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response) $next
|
|
||||||
*/
|
|
||||||
public function handle(Request $request, Closure $next, string ...$guards): Response
|
|
||||||
{
|
|
||||||
$guards = empty($guards) ? [null] : $guards;
|
|
||||||
|
|
||||||
foreach ($guards as $guard) {
|
|
||||||
if (Auth::guard($guard)->check()) {
|
|
||||||
return redirect(RouteServiceProvider::HOME);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return $next($request);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Http\Middleware;
|
|
||||||
|
|
||||||
use Illuminate\Foundation\Http\Middleware\TrimStrings as Middleware;
|
|
||||||
|
|
||||||
class TrimStrings extends Middleware
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* The names of the attributes that should not be trimmed.
|
|
||||||
*
|
|
||||||
* @var array<int, string>
|
|
||||||
*/
|
|
||||||
protected $except = [
|
|
||||||
'current_password',
|
|
||||||
'password',
|
|
||||||
'password_confirmation',
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Http\Middleware;
|
|
||||||
|
|
||||||
use Illuminate\Http\Middleware\TrustHosts as Middleware;
|
|
||||||
|
|
||||||
class TrustHosts extends Middleware
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Get the host patterns that should be trusted.
|
|
||||||
*
|
|
||||||
* @return array<int, string|null>
|
|
||||||
*/
|
|
||||||
public function hosts(): array
|
|
||||||
{
|
|
||||||
return [
|
|
||||||
$this->allSubdomainsOfApplicationUrl(),
|
|
||||||
];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Http\Middleware;
|
|
||||||
|
|
||||||
use Illuminate\Http\Middleware\TrustProxies as Middleware;
|
|
||||||
use Illuminate\Http\Request;
|
|
||||||
|
|
||||||
class TrustProxies extends Middleware
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* The trusted proxies for this application.
|
|
||||||
*
|
|
||||||
* @var array<int, string>|string|null
|
|
||||||
*/
|
|
||||||
protected $proxies;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The headers that should be used to detect proxies.
|
|
||||||
*
|
|
||||||
* @var int
|
|
||||||
*/
|
|
||||||
protected $headers =
|
|
||||||
Request::HEADER_X_FORWARDED_FOR |
|
|
||||||
Request::HEADER_X_FORWARDED_HOST |
|
|
||||||
Request::HEADER_X_FORWARDED_PORT |
|
|
||||||
Request::HEADER_X_FORWARDED_PROTO |
|
|
||||||
Request::HEADER_X_FORWARDED_AWS_ELB;
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Mail;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Базовый класс объекта параметров отправляемого мэджиком писем
|
||||||
|
*/
|
||||||
|
class BaseMailerObj
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
public array $to, //адресаты письма
|
||||||
|
public string $subject, //тема письма
|
||||||
|
public string $body, //основной текст письма
|
||||||
|
public string $appName, //кто будет в копии
|
||||||
|
public array $copy = [], //шапка письма, например, для заголовка
|
||||||
|
public ?string $header = '', //подвал письма, например для технической информации
|
||||||
|
public ?string $footer = '', //название приложения назмещается под названием платформы Magic в футере письма
|
||||||
|
public string $mailLayout = 'mail\mailer_default', //используемый blade шаблон для отправки
|
||||||
|
){
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#Гаврилов
|
||||||
|
//УДАЛИ ЕСЛИ НЕ ПОНАДОБИТСЯ
|
||||||
|
// /**
|
||||||
|
// * Фабричный метод для создания экземпляра родительского класса
|
||||||
|
// *
|
||||||
|
// * @param [type] $to
|
||||||
|
// * @param [type] $subject
|
||||||
|
// * @param [type] $body
|
||||||
|
// * @param [type] $appName
|
||||||
|
// * @param array $copy
|
||||||
|
// * @param string|null $header
|
||||||
|
// * @param string|null $footer
|
||||||
|
// * @param string $mailLayout
|
||||||
|
// * @return void
|
||||||
|
// */
|
||||||
|
// public static function create($to, $subject, $body, $appName, array $copy = [], ?string $header = '', ?string $footer = '', string $mailLayout = 'mail\mailer_default')
|
||||||
|
// {
|
||||||
|
// return new self(
|
||||||
|
// $to,
|
||||||
|
// $subject,
|
||||||
|
// $body,
|
||||||
|
// $appName,
|
||||||
|
// $copy,
|
||||||
|
// $header,
|
||||||
|
// $footer,
|
||||||
|
// $mailLayout
|
||||||
|
// );
|
||||||
|
// }
|
||||||
|
}
|
||||||
@@ -0,0 +1,145 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Mail;
|
||||||
|
|
||||||
|
use Illuminate\Bus\Queueable;
|
||||||
|
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||||
|
use Illuminate\Mail\Mailable;
|
||||||
|
use Illuminate\Mail\Mailables\Content;
|
||||||
|
use Illuminate\Mail\Mailables\Envelope;
|
||||||
|
use Illuminate\Queue\SerializesModels;
|
||||||
|
use App\Mail\BaseMailerObj;
|
||||||
|
|
||||||
|
class Mailer extends Mailable
|
||||||
|
{
|
||||||
|
#Гаврилов
|
||||||
|
//ЗАЧЕМ ОНИ СЮДА ДОБАВИЛИСЬ? ТЕСТИРОВАЛ ОТПРАВКУ ОЧЕРЕДЕЙ? УДАЛИ ЕСЛИ НЕ НУЖНЫ ОТСЮДА И ИЗ USE
|
||||||
|
use Queueable, SerializesModels;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var array данные для письма
|
||||||
|
*/
|
||||||
|
public $mailData;
|
||||||
|
/**
|
||||||
|
* @var string имя blade шаблона
|
||||||
|
*/
|
||||||
|
public $mailLayout;
|
||||||
|
/**
|
||||||
|
* @var string название приложения, которое отправляет сообщение
|
||||||
|
*/
|
||||||
|
public $appName;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Конструктор
|
||||||
|
*
|
||||||
|
* @param array $to - адресаты письма
|
||||||
|
* @param string $subject - тема письма
|
||||||
|
* @param string $body - основной текст письма
|
||||||
|
* @param array $copy - кто будет в копии
|
||||||
|
* @param string $header - шапка письма, например, для заголовка
|
||||||
|
* @param string $footer - подвал письма, например для технической информации
|
||||||
|
* @param string $appName название приложения назмещается под названием платформы Magic в футере письма
|
||||||
|
* @param string $mailLayout используемый blade шаблон для отправки
|
||||||
|
*/
|
||||||
|
public function __construct(BaseMailerObj $mailerObject)
|
||||||
|
{
|
||||||
|
//Преобразуем передаваемых адресатов, добавляя им логин
|
||||||
|
$this->mailData['to'] = $this->addDomain($mailerObject->to);
|
||||||
|
//$this->mailData['to'] = $to;
|
||||||
|
$this->mailData['copy'] = !empty($copy) ? $this->addDomain($mailerObject->copy) : [];
|
||||||
|
$this->mailData['subject'] = $mailerObject->subject;
|
||||||
|
$this->mailData['body'] = $mailerObject->body;
|
||||||
|
$this->mailData['header'] = $mailerObject->header;
|
||||||
|
$this->mailData['footer'] = $mailerObject->footer;
|
||||||
|
$this->checkTestEnv();
|
||||||
|
$this->appName = $mailerObject->appName;
|
||||||
|
$this->mailLayout = $mailerObject->mailLayout;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Метод корректирует свойства отправляемого письма, если среда разработки тестовая
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
private function checkTestEnv()
|
||||||
|
{
|
||||||
|
//Если тестировщик аутентифицирован, берется его логин из сессии, в противном случае берется закрепленный в глобальных конфигах тестовый адрес (который разработчик указывает для своего локального тестирования сам). Можно в будущем улучшить логику с определением тестового емейла, например, передавая к api ендпоинту заголовок с тестовым емейлом, но на старте пока так
|
||||||
|
// if (auth()->user()->login) {
|
||||||
|
if (session()->has('_auth_login')) {
|
||||||
|
$userLogin = session()->get('_auth_login');
|
||||||
|
} else {
|
||||||
|
$userLogin = config('app.mail_test_addressee');
|
||||||
|
}
|
||||||
|
// echo '<pre>'; var_dump($userLogin); echo'</pre>';
|
||||||
|
// $test = config('app.test_env');
|
||||||
|
// $test2 = config('app.mail_test_addressee');
|
||||||
|
// echo '<pre>'; var_dump($test); echo'</pre>';
|
||||||
|
// echo '<pre>'; var_dump($test2); echo'</pre>';
|
||||||
|
//}
|
||||||
|
// $userLogin = auth()->user()->login ? auth()->user()->login : (session()->has('_auth_login') ? session()->get('_auth_login')) : config('MAIL_TEST_ADRESSEE');
|
||||||
|
//Если работаем из под тестовой среды
|
||||||
|
if (config('app.test_env')) {
|
||||||
|
//Информация для тестирования будет добавлена в футер сообщения. В нее включаем информацию об адресатах и копии, если бы письмо отправлялось на проде
|
||||||
|
$testInfo = "На проде письмо отправится: " . implode(", ", $this->mailData['to']) . ". В копии: " . implode(", ", $this->mailData['copy']);
|
||||||
|
$this->mailData['footer'] .= $testInfo;
|
||||||
|
//Копию очищаем
|
||||||
|
$this->cc('');
|
||||||
|
//echo '<pre>'; var_dump(['dgavrilov@rencredit.ru']); echo'</pre>';
|
||||||
|
//echo '<pre>'; var_dump($this->addDomain([$userLogin])); echo'</pre>';
|
||||||
|
$this->to($this->addDomain([$userLogin]));
|
||||||
|
//$this->to(['dgavrilov@rencredit.ru']);
|
||||||
|
} else {
|
||||||
|
//ГАВРИЛОВ. ДОБАВЬ ДОМЕН К ЛОГИНАМ
|
||||||
|
$this->to($this->mailData['to']);
|
||||||
|
$this->to($this->mailData['copy']);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Хэлпер преобразует всех адресатов, добавляя им почтовый домен
|
||||||
|
*
|
||||||
|
* @param array $addresseesArr адресаты
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
private function addDomain(array $addresseesArr): array
|
||||||
|
{
|
||||||
|
$domain = config('mail.mail_domain');
|
||||||
|
|
||||||
|
return array_map(function($el) use($domain) {return $el . "@" . $domain;}, $addresseesArr);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the message envelope.
|
||||||
|
*/
|
||||||
|
public function envelope(): Envelope
|
||||||
|
{
|
||||||
|
return new Envelope(
|
||||||
|
subject: $this->mailData['subject'],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the message content definition.
|
||||||
|
*/
|
||||||
|
public function content(): Content
|
||||||
|
{
|
||||||
|
return new Content(
|
||||||
|
// view: 'view.name',
|
||||||
|
view: $this->mailLayout,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the attachments for the message.
|
||||||
|
*
|
||||||
|
* @return array<int, \Illuminate\Mail\Mailables\Attachment>
|
||||||
|
*/
|
||||||
|
public function attachments(): array
|
||||||
|
{
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,53 +1,18 @@
|
|||||||
#!/usr/bin/env php
|
#!/usr/bin/env php
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Foundation\Application;
|
||||||
|
use Symfony\Component\Console\Input\ArgvInput;
|
||||||
|
|
||||||
define('LARAVEL_START', microtime(true));
|
define('LARAVEL_START', microtime(true));
|
||||||
|
|
||||||
/*
|
// Register the Composer autoloader...
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Register The Auto Loader
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| Composer provides a convenient, automatically generated class loader
|
|
||||||
| for our application. We just need to utilize it! We'll require it
|
|
||||||
| into the script here so that we do not have to worry about the
|
|
||||||
| loading of any of our classes manually. It's great to relax.
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
require __DIR__.'/vendor/autoload.php';
|
require __DIR__.'/vendor/autoload.php';
|
||||||
|
|
||||||
|
// Bootstrap Laravel and handle the command...
|
||||||
|
/** @var Application $app */
|
||||||
$app = require_once __DIR__.'/bootstrap/app.php';
|
$app = require_once __DIR__.'/bootstrap/app.php';
|
||||||
|
|
||||||
/*
|
$status = $app->handleCommand(new ArgvInput);
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Run The Artisan Application
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| When we run the console application, the current CLI command will be
|
|
||||||
| executed in this console and the response sent back to a terminal
|
|
||||||
| or another output device for the developers. Here goes nothing!
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
$kernel = $app->make(Illuminate\Contracts\Console\Kernel::class);
|
|
||||||
|
|
||||||
$status = $kernel->handle(
|
|
||||||
$input = new Symfony\Component\Console\Input\ArgvInput,
|
|
||||||
new Symfony\Component\Console\Output\ConsoleOutput
|
|
||||||
);
|
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Shutdown The Application
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| Once Artisan has finished running, we will fire off the shutdown events
|
|
||||||
| so that any final work may be done by the application before we shut
|
|
||||||
| down the process. This is the last thing to happen to the request.
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
$kernel->terminate($input, $status);
|
|
||||||
|
|
||||||
exit($status);
|
exit($status);
|
||||||
|
|||||||
+15
-52
@@ -1,55 +1,18 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
/*
|
use Illuminate\Foundation\Application;
|
||||||
|--------------------------------------------------------------------------
|
use Illuminate\Foundation\Configuration\Exceptions;
|
||||||
| Create The Application
|
use Illuminate\Foundation\Configuration\Middleware;
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| The first thing we will do is create a new Laravel application instance
|
|
||||||
| which serves as the "glue" for all the components of Laravel, and is
|
|
||||||
| the IoC container for the system binding all of the various parts.
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
$app = new Illuminate\Foundation\Application(
|
return Application::configure(basePath: dirname(__DIR__))
|
||||||
$_ENV['APP_BASE_PATH'] ?? dirname(__DIR__)
|
->withRouting(
|
||||||
);
|
web: __DIR__.'/../routes/web.php',
|
||||||
|
commands: __DIR__.'/../routes/console.php',
|
||||||
/*
|
health: '/up',
|
||||||
|--------------------------------------------------------------------------
|
)
|
||||||
| Bind Important Interfaces
|
->withMiddleware(function (Middleware $middleware): void {
|
||||||
|--------------------------------------------------------------------------
|
//
|
||||||
|
|
})
|
||||||
| Next, we need to bind some important interfaces into the container so
|
->withExceptions(function (Exceptions $exceptions): void {
|
||||||
| we will be able to resolve them when needed. The kernels serve the
|
//
|
||||||
| incoming requests to this application from both the web and CLI.
|
})->create();
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
$app->singleton(
|
|
||||||
Illuminate\Contracts\Http\Kernel::class,
|
|
||||||
App\Http\Kernel::class
|
|
||||||
);
|
|
||||||
|
|
||||||
$app->singleton(
|
|
||||||
Illuminate\Contracts\Console\Kernel::class,
|
|
||||||
App\Console\Kernel::class
|
|
||||||
);
|
|
||||||
|
|
||||||
$app->singleton(
|
|
||||||
Illuminate\Contracts\Debug\ExceptionHandler::class,
|
|
||||||
App\Exceptions\Handler::class
|
|
||||||
);
|
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Return The Application
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| This script returns the application instance. The instance is given to
|
|
||||||
| the calling script so we can separate the building of the instances
|
|
||||||
| from the actual running of the application and sending responses.
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
return $app;
|
|
||||||
|
|||||||
+33
-19
@@ -1,34 +1,27 @@
|
|||||||
{
|
{
|
||||||
|
"$schema": "https://getcomposer.org/schema.json",
|
||||||
"name": "laravel/laravel",
|
"name": "laravel/laravel",
|
||||||
"type": "project",
|
"type": "project",
|
||||||
"description": "The skeleton application for the Laravel framework.",
|
"description": "The skeleton application for the Laravel framework.",
|
||||||
"keywords": ["laravel", "framework"],
|
"keywords": ["laravel", "framework"],
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"require": {
|
"require": {
|
||||||
"php": "^8.1",
|
"php": "^8.2",
|
||||||
"directorytree/ldaprecord-laravel": "^3.4",
|
"laravel/framework": "^12.0",
|
||||||
"guzzlehttp/guzzle": "^7.2",
|
"laravel/tinker": "^2.10.1"
|
||||||
"laravel/framework": "^10.10",
|
|
||||||
"laravel/sanctum": "^3.3",
|
|
||||||
"laravel/tinker": "^2.8",
|
|
||||||
"laravel/ui": "^4.6",
|
|
||||||
"nwidart/laravel-modules": "^10.0",
|
|
||||||
"spatie/laravel-activitylog": "^4.10"
|
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"fakerphp/faker": "^1.9.1",
|
"fakerphp/faker": "^1.23",
|
||||||
"laravel/pint": "^1.0",
|
"laravel/pail": "^1.2.2",
|
||||||
"laravel/sail": "^1.18",
|
"laravel/pint": "^1.24",
|
||||||
"mockery/mockery": "^1.4.4",
|
"laravel/sail": "^1.41",
|
||||||
"nunomaduro/collision": "^7.0",
|
"mockery/mockery": "^1.6",
|
||||||
"php-debugbar/php-debugbar": "^2.1",
|
"nunomaduro/collision": "^8.6",
|
||||||
"phpunit/phpunit": "^10.1",
|
"phpunit/phpunit": "^11.5.3"
|
||||||
"spatie/laravel-ignition": "^2.0"
|
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
"psr-4": {
|
"psr-4": {
|
||||||
"App\\": "app/",
|
"App\\": "app/",
|
||||||
"Modules\\": "Modules/",
|
|
||||||
"Database\\Factories\\": "database/factories/",
|
"Database\\Factories\\": "database/factories/",
|
||||||
"Database\\Seeders\\": "database/seeders/"
|
"Database\\Seeders\\": "database/seeders/"
|
||||||
}
|
}
|
||||||
@@ -39,6 +32,22 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
"setup": [
|
||||||
|
"composer install",
|
||||||
|
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\"",
|
||||||
|
"@php artisan key:generate",
|
||||||
|
"@php artisan migrate --force",
|
||||||
|
"npm install",
|
||||||
|
"npm run build"
|
||||||
|
],
|
||||||
|
"dev": [
|
||||||
|
"Composer\\Config::disableProcessTimeout",
|
||||||
|
"npx concurrently -c \"#93c5fd,#c4b5fd,#fb7185,#fdba74\" \"php artisan serve\" \"php artisan queue:listen --tries=1 --timeout=0\" \"php artisan pail --timeout=0\" \"npm run dev\" --names=server,queue,logs,vite --kill-others"
|
||||||
|
],
|
||||||
|
"test": [
|
||||||
|
"@php artisan config:clear --ansi",
|
||||||
|
"@php artisan test"
|
||||||
|
],
|
||||||
"post-autoload-dump": [
|
"post-autoload-dump": [
|
||||||
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
|
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
|
||||||
"@php artisan package:discover --ansi"
|
"@php artisan package:discover --ansi"
|
||||||
@@ -50,7 +59,12 @@
|
|||||||
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
|
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
|
||||||
],
|
],
|
||||||
"post-create-project-cmd": [
|
"post-create-project-cmd": [
|
||||||
"@php artisan key:generate --ansi"
|
"@php artisan key:generate --ansi",
|
||||||
|
"@php -r \"file_exists('database/database.sqlite') || touch('database/database.sqlite');\"",
|
||||||
|
"@php artisan migrate --graceful --ansi"
|
||||||
|
],
|
||||||
|
"pre-package-uninstall": [
|
||||||
|
"Illuminate\\Foundation\\ComposerScripts::prePackageUninstall"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"extra": {
|
"extra": {
|
||||||
|
|||||||
Generated
+1783
-2041
File diff suppressed because it is too large
Load Diff
+22
-94
@@ -1,8 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
use Illuminate\Support\Facades\Facade;
|
|
||||||
use Illuminate\Support\ServiceProvider;
|
|
||||||
|
|
||||||
return [
|
return [
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -10,9 +7,9 @@ return [
|
|||||||
| Application Name
|
| Application Name
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
|
||||||
| This value is the name of your application. This value is used when the
|
| This value is the name of your application, which will be used when the
|
||||||
| framework needs to place the application's name in a notification or
|
| framework needs to place the application's name in a notification or
|
||||||
| any other location as required by the application or its packages.
|
| other UI elements where an application name needs to be displayed.
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@@ -51,28 +48,24 @@ return [
|
|||||||
|
|
|
|
||||||
| This URL is used by the console to properly generate URLs when using
|
| This URL is used by the console to properly generate URLs when using
|
||||||
| the Artisan command line tool. You should set this to the root of
|
| the Artisan command line tool. You should set this to the root of
|
||||||
| your application so that it is used when running Artisan tasks.
|
| the application so that it's available within Artisan commands.
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
'url' => env('APP_URL', 'http://localhost'),
|
'url' => env('APP_URL', 'http://localhost'),
|
||||||
|
|
||||||
'asset_url' => env('ASSET_URL'),
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
| Application Timezone
|
| Application Timezone
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
|
||||||
| Here you may specify the default timezone for your application, which
|
| Here you may specify the default timezone for your application, which
|
||||||
| will be used by the PHP date and date-time functions. We have gone
|
| will be used by the PHP date and date-time functions. The timezone
|
||||||
| ahead and set this to a sensible default for you out of the box.
|
| is set to "UTC" by default as it is suitable for most use cases.
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#Гаврилов
|
'timezone' => 'UTC',
|
||||||
//ПОМЕНЯТЬ НА ПРОДЕ
|
|
||||||
'timezone' => 'Europe/Moscow',
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
@@ -80,54 +73,37 @@ return [
|
|||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
|
||||||
| The application locale determines the default locale that will be used
|
| The application locale determines the default locale that will be used
|
||||||
| by the translation service provider. You are free to set this value
|
| by Laravel's translation / localization methods. This option can be
|
||||||
| to any of the locales which will be supported by the application.
|
| set to any locale for which you plan to have translation strings.
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
'locale' => 'ru',
|
'locale' => env('APP_LOCALE', 'en'),
|
||||||
'fallback_locale' => 'en', // Резервный язык (если перевод отсутствует)
|
|
||||||
|
|
||||||
/*
|
'fallback_locale' => env('APP_FALLBACK_LOCALE', 'en'),
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Application Fallback Locale
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| The fallback locale determines the locale to use when the current one
|
|
||||||
| is not available. You may change the value to correspond to any of
|
|
||||||
| the language folders that are provided through your application.
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
'fallback_locale' => 'en',
|
'faker_locale' => env('APP_FAKER_LOCALE', 'en_US'),
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Faker Locale
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| This locale will be used by the Faker PHP library when generating fake
|
|
||||||
| data for your database seeds. For example, this will be used to get
|
|
||||||
| localized telephone numbers, street address information and more.
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
'faker_locale' => 'en_US',
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
| Encryption Key
|
| Encryption Key
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
|
||||||
| This key is used by the Illuminate encrypter service and should be set
|
| This key is utilized by Laravel's encryption services and should be set
|
||||||
| to a random, 32 character string, otherwise these encrypted strings
|
| to a random, 32 character string to ensure that all encrypted values
|
||||||
| will not be safe. Please do this before deploying an application!
|
| are secure. You should do this prior to deploying the application.
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
'cipher' => 'AES-256-CBC',
|
||||||
|
|
||||||
'key' => env('APP_KEY'),
|
'key' => env('APP_KEY'),
|
||||||
|
|
||||||
'cipher' => 'AES-256-CBC',
|
'previous_keys' => [
|
||||||
|
...array_filter(
|
||||||
|
explode(',', (string) env('APP_PREVIOUS_KEYS', ''))
|
||||||
|
),
|
||||||
|
],
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
@@ -143,53 +119,5 @@ return [
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
'maintenance' => [
|
'maintenance' => [
|
||||||
'driver' => 'file',
|
'mail_test_addressee' => env('MAIL_TEST_ADDRESSEE'),
|
||||||
// 'store' => 'redis',
|
|
||||||
],
|
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Autoloaded Service Providers
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| The service providers listed here will be automatically loaded on the
|
|
||||||
| request to your application. Feel free to add your own services to
|
|
||||||
| this array to grant expanded functionality to your applications.
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
'providers' => ServiceProvider::defaultProviders()->merge([
|
|
||||||
/*
|
|
||||||
* Package Service Providers...
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Application Service Providers...
|
|
||||||
*/
|
|
||||||
App\Providers\AppServiceProvider::class,
|
|
||||||
App\Providers\AuthServiceProvider::class,
|
|
||||||
App\Providers\AuthorizationServiceProvider::class,
|
|
||||||
// App\Providers\BroadcastServiceProvider::class,
|
|
||||||
App\Providers\EventServiceProvider::class,
|
|
||||||
App\Providers\RouteServiceProvider::class,
|
|
||||||
])->toArray(),
|
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Class Aliases
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| This array of class aliases will be registered when this application
|
|
||||||
| is started. However, feel free to register as many as you wish as
|
|
||||||
| the aliases are "lazy" loaded so they don't hinder performance.
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
'aliases' => Facade::defaultAliases()->merge([
|
|
||||||
// 'Example' => App\Facades\Example::class,
|
|
||||||
])->toArray(),
|
|
||||||
|
|
||||||
'test_env' => env('TEST_ENV'),
|
|
||||||
//Время жизни сессии
|
|
||||||
'session_life_time' => env('SESSION_LIFETIME'),
|
|
||||||
];
|
];
|
||||||
|
|||||||
+22
-16
@@ -9,13 +9,13 @@ return [
|
|||||||
| Default Cache Store
|
| Default Cache Store
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
|
||||||
| This option controls the default cache connection that gets used while
|
| This option controls the default cache store that will be used by the
|
||||||
| using this caching library. This connection is used when another is
|
| framework. This connection is utilized if another isn't explicitly
|
||||||
| not explicitly specified when executing a given caching function.
|
| specified when running a cache operation inside the application.
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
'default' => env('CACHE_DRIVER', 'file'),
|
'default' => env('CACHE_STORE', 'database'),
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
@@ -26,17 +26,14 @@ return [
|
|||||||
| well as their drivers. You may even define multiple stores for the
|
| well as their drivers. You may even define multiple stores for the
|
||||||
| same cache driver to group types of items stored in your caches.
|
| same cache driver to group types of items stored in your caches.
|
||||||
|
|
|
|
||||||
| Supported drivers: "apc", "array", "database", "file",
|
| Supported drivers: "array", "database", "file", "memcached",
|
||||||
| "memcached", "redis", "dynamodb", "octane", "null"
|
| "redis", "dynamodb", "octane",
|
||||||
|
| "failover", "null"
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
'stores' => [
|
'stores' => [
|
||||||
|
|
||||||
'apc' => [
|
|
||||||
'driver' => 'apc',
|
|
||||||
],
|
|
||||||
|
|
||||||
'array' => [
|
'array' => [
|
||||||
'driver' => 'array',
|
'driver' => 'array',
|
||||||
'serialize' => false,
|
'serialize' => false,
|
||||||
@@ -44,9 +41,10 @@ return [
|
|||||||
|
|
||||||
'database' => [
|
'database' => [
|
||||||
'driver' => 'database',
|
'driver' => 'database',
|
||||||
'table' => 'cache',
|
'connection' => env('DB_CACHE_CONNECTION'),
|
||||||
'connection' => null,
|
'table' => env('DB_CACHE_TABLE', 'cache'),
|
||||||
'lock_connection' => null,
|
'lock_connection' => env('DB_CACHE_LOCK_CONNECTION'),
|
||||||
|
'lock_table' => env('DB_CACHE_LOCK_TABLE'),
|
||||||
],
|
],
|
||||||
|
|
||||||
'file' => [
|
'file' => [
|
||||||
@@ -93,6 +91,14 @@ return [
|
|||||||
'driver' => 'octane',
|
'driver' => 'octane',
|
||||||
],
|
],
|
||||||
|
|
||||||
|
'failover' => [
|
||||||
|
'driver' => 'failover',
|
||||||
|
'stores' => [
|
||||||
|
'database',
|
||||||
|
'array',
|
||||||
|
],
|
||||||
|
],
|
||||||
|
|
||||||
],
|
],
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -100,12 +106,12 @@ return [
|
|||||||
| Cache Key Prefix
|
| Cache Key Prefix
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
|
||||||
| When utilizing the APC, database, memcached, Redis, or DynamoDB cache
|
| When utilizing the APC, database, memcached, Redis, and DynamoDB cache
|
||||||
| stores there might be other applications using the same cache. For
|
| stores, there might be other applications using the same cache. For
|
||||||
| that reason, you may prefix every cache key to avoid collisions.
|
| that reason, you may prefix every cache key to avoid collisions.
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache_'),
|
'prefix' => env('CACHE_PREFIX', Str::slug((string) env('APP_NAME', 'laravel')).'-cache-'),
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|||||||
+43
-40
@@ -10,26 +10,22 @@ return [
|
|||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
|
||||||
| Here you may specify which of the database connections below you wish
|
| Here you may specify which of the database connections below you wish
|
||||||
| to use as your default connection for all database work. Of course
|
| to use as your default connection for database operations. This is
|
||||||
| you may use many connections at once using the Database library.
|
| the connection which will be utilized unless another connection
|
||||||
|
| is explicitly specified when you execute a query / statement.
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
'default' => env('DB_CONNECTION', 'mysql'),
|
'default' => env('DB_CONNECTION', 'sqlite'),
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
| Database Connections
|
| Database Connections
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
|
||||||
| Here are each of the database connections setup for your application.
|
| Below are all of the database connections defined for your application.
|
||||||
| Of course, examples of configuring each database platform that is
|
| An example configuration is provided for each database system which
|
||||||
| supported by Laravel is shown below to make development simple.
|
| is supported by Laravel. You're free to add / remove connections.
|
||||||
|
|
|
||||||
|
|
|
||||||
| All database work in Laravel is done through the PHP PDO facilities
|
|
||||||
| so make sure you have the driver for your particular database of
|
|
||||||
| choice installed on your machine before you begin development.
|
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@@ -37,76 +33,80 @@ return [
|
|||||||
|
|
||||||
'sqlite' => [
|
'sqlite' => [
|
||||||
'driver' => 'sqlite',
|
'driver' => 'sqlite',
|
||||||
'url' => env('DATABASE_URL'),
|
'url' => env('DB_URL'),
|
||||||
'database' => env('DB_DATABASE', database_path('database.sqlite')),
|
'database' => env('DB_DATABASE', database_path('database.sqlite')),
|
||||||
'prefix' => '',
|
'prefix' => '',
|
||||||
'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true),
|
'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true),
|
||||||
|
'busy_timeout' => null,
|
||||||
|
'journal_mode' => null,
|
||||||
|
'synchronous' => null,
|
||||||
|
'transaction_mode' => 'DEFERRED',
|
||||||
],
|
],
|
||||||
|
|
||||||
'mysql' => [
|
'mysql' => [
|
||||||
'driver' => 'mysql',
|
'driver' => 'mysql',
|
||||||
'url' => env('DATABASE_URL'),
|
'url' => env('DB_URL'),
|
||||||
'host' => env('DB_HOST', '127.0.0.1'),
|
'host' => env('DB_HOST', '127.0.0.1'),
|
||||||
'port' => env('DB_PORT', '3306'),
|
'port' => env('DB_PORT', '3306'),
|
||||||
'database' => env('DB_DATABASE'),
|
'database' => env('DB_DATABASE', 'laravel'),
|
||||||
'username' => env('DB_USERNAME', 'root'),
|
'username' => env('DB_USERNAME', 'root'),
|
||||||
'password' => env('DB_PASSWORD', ''),
|
'password' => env('DB_PASSWORD', ''),
|
||||||
'unix_socket' => env('DB_SOCKET', ''),
|
'unix_socket' => env('DB_SOCKET', ''),
|
||||||
'charset' => 'utf8mb4',
|
'charset' => env('DB_CHARSET', 'utf8mb4'),
|
||||||
'collation' => 'utf8mb4_unicode_ci',
|
'collation' => env('DB_COLLATION', 'utf8mb4_unicode_ci'),
|
||||||
'prefix' => '',
|
'prefix' => '',
|
||||||
'prefix_indexes' => true,
|
'prefix_indexes' => true,
|
||||||
'strict' => true,
|
'strict' => true,
|
||||||
'engine' => null,
|
'engine' => null,
|
||||||
'options' => extension_loaded('pdo_mysql') ? array_filter([
|
'options' => extension_loaded('pdo_mysql') ? array_filter([
|
||||||
PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
|
(PHP_VERSION_ID >= 80500 ? \Pdo\Mysql::ATTR_SSL_CA : \PDO::MYSQL_ATTR_SSL_CA) => env('MYSQL_ATTR_SSL_CA'),
|
||||||
]) : [],
|
]) : [],
|
||||||
],
|
],
|
||||||
|
|
||||||
'magic_old' => [
|
'mariadb' => [
|
||||||
'driver' => 'mysql',
|
'driver' => 'mariadb',
|
||||||
'url' => env('DATABASE_URL'),
|
'url' => env('DB_URL'),
|
||||||
'host' => env('DB_OLD_HOST'),
|
'host' => env('DB_HOST', '127.0.0.1'),
|
||||||
'port' => env('DB_OLD_PORT', '3306'),
|
'port' => env('DB_PORT', '3306'),
|
||||||
'database' => env('DB_OLD_DATABASE'),
|
'database' => env('DB_DATABASE', 'laravel'),
|
||||||
'username' => env('DB_OLD_USERNAME'),
|
'username' => env('DB_USERNAME', 'root'),
|
||||||
'password' => env('DB_OLD_PASSWORD'),
|
'password' => env('DB_PASSWORD', ''),
|
||||||
'unix_socket' => env('DB_OLD_SOCKET', ''),
|
'unix_socket' => env('DB_SOCKET', ''),
|
||||||
'charset' => 'utf8mb4',
|
'charset' => env('DB_CHARSET', 'utf8mb4'),
|
||||||
'collation' => 'utf8mb4_unicode_ci',
|
'collation' => env('DB_COLLATION', 'utf8mb4_unicode_ci'),
|
||||||
'prefix' => '',
|
'prefix' => '',
|
||||||
'prefix_indexes' => true,
|
'prefix_indexes' => true,
|
||||||
'strict' => true,
|
'strict' => true,
|
||||||
'engine' => null,
|
'engine' => null,
|
||||||
'options' => extension_loaded('pdo_mysql') ? array_filter([
|
'options' => extension_loaded('pdo_mysql') ? array_filter([
|
||||||
PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
|
(PHP_VERSION_ID >= 80500 ? \Pdo\Mysql::ATTR_SSL_CA : \PDO::MYSQL_ATTR_SSL_CA) => env('MYSQL_ATTR_SSL_CA'),
|
||||||
]) : [],
|
]) : [],
|
||||||
],
|
],
|
||||||
|
|
||||||
'pgsql' => [
|
'pgsql' => [
|
||||||
'driver' => 'pgsql',
|
'driver' => 'pgsql',
|
||||||
'url' => env('DATABASE_URL'),
|
'url' => env('DB_URL'),
|
||||||
'host' => env('DB_HOST', '127.0.0.1'),
|
'host' => env('DB_HOST', '127.0.0.1'),
|
||||||
'port' => env('DB_PORT', '5432'),
|
'port' => env('DB_PORT', '5432'),
|
||||||
'database' => env('DB_DATABASE', 'forge'),
|
'database' => env('DB_DATABASE', 'laravel'),
|
||||||
'username' => env('DB_USERNAME', 'forge'),
|
'username' => env('DB_USERNAME', 'root'),
|
||||||
'password' => env('DB_PASSWORD', ''),
|
'password' => env('DB_PASSWORD', ''),
|
||||||
'charset' => 'utf8',
|
'charset' => env('DB_CHARSET', 'utf8'),
|
||||||
'prefix' => '',
|
'prefix' => '',
|
||||||
'prefix_indexes' => true,
|
'prefix_indexes' => true,
|
||||||
'search_path' => 'public',
|
'search_path' => 'public',
|
||||||
'sslmode' => 'prefer',
|
'sslmode' => env('DB_SSLMODE', 'prefer'),
|
||||||
],
|
],
|
||||||
|
|
||||||
'sqlsrv' => [
|
'sqlsrv' => [
|
||||||
'driver' => 'sqlsrv',
|
'driver' => 'sqlsrv',
|
||||||
'url' => env('DATABASE_URL'),
|
'url' => env('DB_URL'),
|
||||||
'host' => env('DB_HOST', 'localhost'),
|
'host' => env('DB_HOST', 'localhost'),
|
||||||
'port' => env('DB_PORT', '1433'),
|
'port' => env('DB_PORT', '1433'),
|
||||||
'database' => env('DB_DATABASE', 'forge'),
|
'database' => env('DB_DATABASE', 'laravel'),
|
||||||
'username' => env('DB_USERNAME', 'forge'),
|
'username' => env('DB_USERNAME', 'root'),
|
||||||
'password' => env('DB_PASSWORD', ''),
|
'password' => env('DB_PASSWORD', ''),
|
||||||
'charset' => 'utf8',
|
'charset' => env('DB_CHARSET', 'utf8'),
|
||||||
'prefix' => '',
|
'prefix' => '',
|
||||||
'prefix_indexes' => true,
|
'prefix_indexes' => true,
|
||||||
// 'encrypt' => env('DB_ENCRYPT', 'yes'),
|
// 'encrypt' => env('DB_ENCRYPT', 'yes'),
|
||||||
@@ -122,11 +122,14 @@ return [
|
|||||||
|
|
|
|
||||||
| This table keeps track of all the migrations that have already run for
|
| This table keeps track of all the migrations that have already run for
|
||||||
| your application. Using this information, we can determine which of
|
| your application. Using this information, we can determine which of
|
||||||
| the migrations on disk haven't actually been run in the database.
|
| the migrations on disk haven't actually been run on the database.
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
'migrations' => 'migrations',
|
'migrations' => [
|
||||||
|
'table' => 'migrations',
|
||||||
|
'update_date_on_publish' => true,
|
||||||
|
],
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|||||||
+11
-7
@@ -9,7 +9,7 @@ return [
|
|||||||
|
|
|
|
||||||
| Here you may specify the default filesystem disk that should be used
|
| Here you may specify the default filesystem disk that should be used
|
||||||
| by the framework. The "local" disk, as well as a variety of cloud
|
| by the framework. The "local" disk, as well as a variety of cloud
|
||||||
| based disks are available to your application. Just store away!
|
| based disks are available to your application for file storage.
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@@ -20,11 +20,11 @@ return [
|
|||||||
| Filesystem Disks
|
| Filesystem Disks
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
|
||||||
| Here you may configure as many filesystem "disks" as you wish, and you
|
| Below you may configure as many filesystem disks as necessary, and you
|
||||||
| may even configure multiple disks of the same driver. Defaults have
|
| may even configure multiple disks for the same driver. Examples for
|
||||||
| been set up for each driver as an example of the required values.
|
| most supported storage drivers are configured here for reference.
|
||||||
|
|
|
|
||||||
| Supported Drivers: "local", "ftp", "sftp", "s3"
|
| Supported drivers: "local", "ftp", "sftp", "s3"
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@@ -32,16 +32,19 @@ return [
|
|||||||
|
|
||||||
'local' => [
|
'local' => [
|
||||||
'driver' => 'local',
|
'driver' => 'local',
|
||||||
'root' => storage_path('app'),
|
'root' => storage_path('app/private'),
|
||||||
|
'serve' => true,
|
||||||
'throw' => false,
|
'throw' => false,
|
||||||
|
'report' => false,
|
||||||
],
|
],
|
||||||
|
|
||||||
'public' => [
|
'public' => [
|
||||||
'driver' => 'local',
|
'driver' => 'local',
|
||||||
'root' => storage_path('app/public'),
|
'root' => storage_path('app/public'),
|
||||||
'url' => env('APP_URL').'/storage',
|
'url' => rtrim(env('APP_URL', 'http://localhost'), '/').'/storage',
|
||||||
'visibility' => 'public',
|
'visibility' => 'public',
|
||||||
'throw' => false,
|
'throw' => false,
|
||||||
|
'report' => false,
|
||||||
],
|
],
|
||||||
|
|
||||||
's3' => [
|
's3' => [
|
||||||
@@ -54,6 +57,7 @@ return [
|
|||||||
'endpoint' => env('AWS_ENDPOINT'),
|
'endpoint' => env('AWS_ENDPOINT'),
|
||||||
'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false),
|
'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false),
|
||||||
'throw' => false,
|
'throw' => false,
|
||||||
|
'report' => false,
|
||||||
],
|
],
|
||||||
|
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -1,54 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
return [
|
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Default Hash Driver
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| This option controls the default hash driver that will be used to hash
|
|
||||||
| passwords for your application. By default, the bcrypt algorithm is
|
|
||||||
| used; however, you remain free to modify this option if you wish.
|
|
||||||
|
|
|
||||||
| Supported: "bcrypt", "argon", "argon2id"
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
'driver' => 'bcrypt',
|
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Bcrypt Options
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| Here you may specify the configuration options that should be used when
|
|
||||||
| passwords are hashed using the Bcrypt algorithm. This will allow you
|
|
||||||
| to control the amount of time it takes to hash the given password.
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
'bcrypt' => [
|
|
||||||
'rounds' => env('BCRYPT_ROUNDS', 12),
|
|
||||||
'verify' => true,
|
|
||||||
],
|
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Argon Options
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| Here you may specify the configuration options that should be used when
|
|
||||||
| passwords are hashed using the Argon algorithm. These will allow you
|
|
||||||
| to control the amount of time it takes to hash the given password.
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
'argon' => [
|
|
||||||
'memory' => 65536,
|
|
||||||
'threads' => 1,
|
|
||||||
'time' => 4,
|
|
||||||
'verify' => true,
|
|
||||||
],
|
|
||||||
|
|
||||||
];
|
|
||||||
+44
-24
@@ -7,14 +7,13 @@ return [
|
|||||||
| Default Mailer
|
| Default Mailer
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
|
||||||
| This option controls the default mailer that is used to send all email
|
| This option controls the default mailer that is used to send any email
|
||||||
| messages unless another mailer is explicitly specified when sending
|
| messages sent by your application. Alternative mailers may be setup
|
||||||
| the message. All additional mailers can be configured within the
|
| and used as needed; however, this mailer will be used by default.
|
||||||
| "mailers" array. Examples of each type of mailer are provided.
|
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
'default' => env('MAIL_MAILER', 'log'),
|
'default' => env('MAIL_MAILER', 'smtp'),
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
@@ -25,28 +24,28 @@ return [
|
|||||||
| their respective settings. Several examples have been configured for
|
| their respective settings. Several examples have been configured for
|
||||||
| you and you are free to add your own as your application requires.
|
| you and you are free to add your own as your application requires.
|
||||||
|
|
|
|
||||||
| Laravel supports a variety of mail "transport" drivers that can be used
|
| Laravel supports a variety of mail "transport" drivers to be used while
|
||||||
| when delivering an email. You may specify which one you're using for
|
| sending an e-mail. You will specify which one you are using for your
|
||||||
| your mailers below. You may also add additional mailers if needed.
|
| mailers below. You are free to add additional mailers as required.
|
||||||
|
|
|
|
||||||
| Supported: "smtp", "sendmail", "mailgun", "ses", "ses-v2",
|
| Supported: "smtp", "sendmail", "mailgun", "ses", "ses-v2",
|
||||||
| "postmark", "resend", "log", "array",
|
| "postmark", "log", "array", "failover", "roundrobin"
|
||||||
| "failover", "roundrobin"
|
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
'mailers' => [
|
'mailers' => [
|
||||||
|
|
||||||
'smtp' => [
|
'smtp' => [
|
||||||
'transport' => 'smtp',
|
'transport' => 'smtp',
|
||||||
'scheme' => env('MAIL_SCHEME'),
|
|
||||||
'url' => env('MAIL_URL'),
|
'url' => env('MAIL_URL'),
|
||||||
'host' => env('MAIL_HOST', '127.0.0.1'),
|
'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
|
||||||
'port' => env('MAIL_PORT', 2525),
|
'port' => env('MAIL_PORT', 587),
|
||||||
|
// 'encryption' => env('MAIL_ENCRYPTION', 'tls'),
|
||||||
'username' => env('MAIL_USERNAME'),
|
'username' => env('MAIL_USERNAME'),
|
||||||
'password' => env('MAIL_PASSWORD'),
|
'password' => env('MAIL_PASSWORD'),
|
||||||
'timeout' => null,
|
'timeout' => null,
|
||||||
'local_domain' => env('MAIL_EHLO_DOMAIN', parse_url((string) env('APP_URL', 'http://localhost'), PHP_URL_HOST)),
|
//'local_domain' => env('MAIL_EHLO_DOMAIN'),
|
||||||
|
'auth_mode' => null,
|
||||||
|
'verify_peer' => false,
|
||||||
],
|
],
|
||||||
|
|
||||||
'ses' => [
|
'ses' => [
|
||||||
@@ -55,14 +54,17 @@ return [
|
|||||||
|
|
||||||
'postmark' => [
|
'postmark' => [
|
||||||
'transport' => 'postmark',
|
'transport' => 'postmark',
|
||||||
// 'message_stream_id' => env('POSTMARK_MESSAGE_STREAM_ID'),
|
// 'message_stream_id' => null,
|
||||||
// 'client' => [
|
// 'client' => [
|
||||||
// 'timeout' => 5,
|
// 'timeout' => 5,
|
||||||
// ],
|
// ],
|
||||||
],
|
],
|
||||||
|
|
||||||
'resend' => [
|
'mailgun' => [
|
||||||
'transport' => 'resend',
|
'transport' => 'mailgun',
|
||||||
|
// 'client' => [
|
||||||
|
// 'timeout' => 5,
|
||||||
|
// ],
|
||||||
],
|
],
|
||||||
|
|
||||||
'sendmail' => [
|
'sendmail' => [
|
||||||
@@ -85,7 +87,6 @@ return [
|
|||||||
'smtp',
|
'smtp',
|
||||||
'log',
|
'log',
|
||||||
],
|
],
|
||||||
'retry_after' => 60,
|
|
||||||
],
|
],
|
||||||
|
|
||||||
'roundrobin' => [
|
'roundrobin' => [
|
||||||
@@ -94,9 +95,7 @@ return [
|
|||||||
'ses',
|
'ses',
|
||||||
'postmark',
|
'postmark',
|
||||||
],
|
],
|
||||||
'retry_after' => 60,
|
|
||||||
],
|
],
|
||||||
|
|
||||||
],
|
],
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -104,9 +103,9 @@ return [
|
|||||||
| Global "From" Address
|
| Global "From" Address
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
|
||||||
| You may wish for all emails sent by your application to be sent from
|
| You may wish for all e-mails sent by your application to be sent from
|
||||||
| the same address. Here you may specify a name and address that is
|
| the same address. Here, you may specify a name and address that is
|
||||||
| used globally for all emails that are sent by your application.
|
| used globally for all e-mails that are sent by your application.
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@@ -115,4 +114,25 @@ return [
|
|||||||
'name' => env('MAIL_FROM_NAME', 'Example'),
|
'name' => env('MAIL_FROM_NAME', 'Example'),
|
||||||
],
|
],
|
||||||
|
|
||||||
|
/*
|
||||||
|
|--------------------------------------------------------------------------
|
||||||
|
| Markdown Mail Settings
|
||||||
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
||||||
|
| If you are using Markdown based email rendering, you may configure your
|
||||||
|
| theme and component paths here, allowing you to customize the design
|
||||||
|
| of the emails. Or, you may simply stick with the Laravel defaults!
|
||||||
|
|
|
||||||
|
*/
|
||||||
|
|
||||||
|
'markdown' => [
|
||||||
|
'theme' => 'default',
|
||||||
|
|
||||||
|
'paths' => [
|
||||||
|
resource_path('views/vendor/mail'),
|
||||||
|
],
|
||||||
|
],
|
||||||
|
|
||||||
|
'mail_domain' => env('MAIL_DOMAIN'),
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|||||||
+7
-11
@@ -14,12 +14,15 @@ return [
|
|||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
'postmark' => [
|
'mailgun' => [
|
||||||
'key' => env('POSTMARK_API_KEY'),
|
'domain' => env('MAILGUN_DOMAIN'),
|
||||||
|
'secret' => env('MAILGUN_SECRET'),
|
||||||
|
'endpoint' => env('MAILGUN_ENDPOINT', 'api.mailgun.net'),
|
||||||
|
'scheme' => 'https',
|
||||||
],
|
],
|
||||||
|
|
||||||
'resend' => [
|
'postmark' => [
|
||||||
'key' => env('RESEND_API_KEY'),
|
'token' => env('POSTMARK_TOKEN'),
|
||||||
],
|
],
|
||||||
|
|
||||||
'ses' => [
|
'ses' => [
|
||||||
@@ -28,11 +31,4 @@ return [
|
|||||||
'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
|
'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
|
||||||
],
|
],
|
||||||
|
|
||||||
'slack' => [
|
|
||||||
'notifications' => [
|
|
||||||
'bot_user_oauth_token' => env('SLACK_BOT_USER_OAUTH_TOKEN'),
|
|
||||||
'channel' => env('SLACK_BOT_USER_DEFAULT_CHANNEL'),
|
|
||||||
],
|
|
||||||
],
|
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -1,36 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
return [
|
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| View Storage Paths
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| Most templating systems load templates from disk. Here you may specify
|
|
||||||
| an array of paths that should be checked for your views. Of course
|
|
||||||
| the usual Laravel view path has already been registered for you.
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
'paths' => [
|
|
||||||
resource_path('views'),
|
|
||||||
],
|
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Compiled View Path
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| This option determines where all the compiled Blade templates will be
|
|
||||||
| stored for your application. Typically, this is within the storage
|
|
||||||
| directory. However, as usual, you are free to change this value.
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
'compiled' => env(
|
|
||||||
'VIEW_COMPILED_PATH',
|
|
||||||
realpath(storage_path('framework/views'))
|
|
||||||
),
|
|
||||||
|
|
||||||
];
|
|
||||||
@@ -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' => 'Поле :attribute должно быть принято.',
|
|
||||||
'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' => 'Некорректный формат поля :attribute. Допускается следующий формат: :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' => 'Недопустимое значение поля :attribute.',
|
|
||||||
'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' => 'Значение поля :attribute не должно быть больше :max символов.',
|
|
||||||
],
|
|
||||||
'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' => 'Поле :attribute не должно передаваться.',
|
|
||||||
'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' => 'Недопустимый формат поля :attribute.',
|
|
||||||
'required' => 'Поле :attribute обязательно должно быть заполнено.',
|
|
||||||
'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' => [],
|
|
||||||
|
|
||||||
];
|
|
||||||
Generated
-3555
File diff suppressed because it is too large
Load Diff
+9
-30
@@ -1,38 +1,17 @@
|
|||||||
{
|
{
|
||||||
|
"$schema": "https://www.schemastore.org/package.json",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"build": "vite build",
|
||||||
"build": "vite build"
|
"dev": "vite"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@popperjs/core": "^2.11.6",
|
"@tailwindcss/vite": "^4.0.0",
|
||||||
"@types/react": "^19.1.8",
|
"axios": "^1.11.0",
|
||||||
"@types/react-dom": "^19.1.6",
|
"concurrently": "^9.0.1",
|
||||||
"@vitejs/plugin-react": "^4.3.4",
|
"laravel-vite-plugin": "^2.0.0",
|
||||||
"axios": "^1.13.2",
|
"tailwindcss": "^4.0.0",
|
||||||
"bootstrap": "^5.2.3",
|
"vite": "^7.0.7"
|
||||||
"globby": "^14.1.0",
|
|
||||||
"laravel-vite-plugin": "^1.2.0",
|
|
||||||
"react": "18.2.0",
|
|
||||||
"react-dom": "18.2.0",
|
|
||||||
"resolve-url-loader": "^5.0.0",
|
|
||||||
"typescript": "^5.8.3",
|
|
||||||
"vite": "^6.2.1"
|
|
||||||
},
|
|
||||||
"dependencies": {
|
|
||||||
"@date-io/date-fns": "^2.14.0",
|
|
||||||
"@emotion/react": "^11.14.0",
|
|
||||||
"@emotion/styled": "^11.14.1",
|
|
||||||
"@fortawesome/fontawesome-free": "^7.0.1",
|
|
||||||
"@mui/material": "^5.18.0",
|
|
||||||
"@mui/x-tree-view": "^6.17.0",
|
|
||||||
"@SharePoint/rencredit_uikit": "^1.0.234",
|
|
||||||
"date-fns": "^2.30.0",
|
|
||||||
"dompurify": "^3.2.6",
|
|
||||||
"react-dropzone": "^14.3.8",
|
|
||||||
"react-imask": "^6.6.3",
|
|
||||||
"react-number-format": "^5.4.4",
|
|
||||||
"uuid": "^9.0.0"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,6 +9,10 @@
|
|||||||
RewriteCond %{HTTP:Authorization} .
|
RewriteCond %{HTTP:Authorization} .
|
||||||
RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
|
RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
|
||||||
|
|
||||||
|
# Handle X-XSRF-Token Header
|
||||||
|
RewriteCond %{HTTP:x-xsrf-token} .
|
||||||
|
RewriteRule .* - [E=HTTP_X_XSRF_TOKEN:%{HTTP:X-XSRF-Token}]
|
||||||
|
|
||||||
# Redirect Trailing Slashes If Not A Folder...
|
# Redirect Trailing Slashes If Not A Folder...
|
||||||
RewriteCond %{REQUEST_FILENAME} !-d
|
RewriteCond %{REQUEST_FILENAME} !-d
|
||||||
RewriteCond %{REQUEST_URI} (.+)/$
|
RewriteCond %{REQUEST_URI} (.+)/$
|
||||||
|
|||||||
@@ -1,664 +0,0 @@
|
|||||||
<mxfile>
|
|
||||||
<diagram id="YrEqY51DlFa1ZGKHTR-x" name="Страница — 1">
|
|
||||||
<mxGraphModel dx="1852" dy="1862" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
|
|
||||||
<root>
|
|
||||||
<mxCell id="0" />
|
|
||||||
<mxCell id="1" parent="0" />
|
|
||||||
<mxCell id="10" value="Middleware\web\<br>AuthetnticateMagic" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="370" y="10" width="120" height="60" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="12" value="" style="endArrow=none;dashed=1;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" parent="1" source="18" target="10" edge="1">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="430" y="170" as="sourcePoint" />
|
|
||||||
<mxPoint x="205" y="70" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="18" value="Сессия <br>стартована" style="rhombus;whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="375" y="200" width="110" height="70" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="20" value="" style="endArrow=none;html=1;edgeStyle=orthogonalEdgeStyle;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;strokeColor=#000000;fillColor=#d5e8d4;strokeWidth=1;" parent="1" source="18" target="28" edge="1">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="510" y="280" as="sourcePoint" />
|
|
||||||
<mxPoint x="540" y="350" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="21" value="Да" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=13;" parent="20" vertex="1" connectable="0">
|
|
||||||
<mxGeometry x="-0.3625" y="8" relative="1" as="geometry">
|
|
||||||
<mxPoint x="12" y="-2" as="offset" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="23" value="" style="endArrow=none;html=1;edgeStyle=orthogonalEdgeStyle;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;fillColor=#fff2cc;strokeColor=#000000;strokeWidth=1;" parent="1" source="18" target="77" edge="1">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="250" y="360" as="sourcePoint" />
|
|
||||||
<mxPoint x="320" y="350" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="24" value="Нет" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=13;" parent="23" vertex="1" connectable="0">
|
|
||||||
<mxGeometry x="-0.3625" y="8" relative="1" as="geometry">
|
|
||||||
<mxPoint x="17" y="-77" as="offset" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="29" value="" style="endArrow=none;html=1;edgeStyle=orthogonalEdgeStyle;exitX=0;exitY=0.5;exitDx=0;exitDy=0;strokeColor=light-dark(#000000, #446e2c);fillColor=#d5e8d4;strokeWidth=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="28" target="31" edge="1">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="460" y="590" as="sourcePoint" />
|
|
||||||
<mxPoint x="420" y="520" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="30" value="Нет" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=13;" parent="29" vertex="1" connectable="0">
|
|
||||||
<mxGeometry x="-0.3625" y="8" relative="1" as="geometry">
|
|
||||||
<mxPoint x="-30" y="-14" as="offset" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="31" value="" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="347.5" y="440" width="20" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="33" value="" style="endArrow=classic;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;endFill=1;edgeStyle=orthogonalEdgeStyle;" parent="1" source="31" target="77" edge="1">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="440" y="1075" as="sourcePoint" />
|
|
||||||
<mxPoint x="205" y="560" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="36" value="" style="endArrow=none;html=1;edgeStyle=orthogonalEdgeStyle;exitX=0.5;exitY=1;exitDx=0;exitDy=0;fillColor=#fff2cc;strokeColor=#000000;strokeWidth=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="28" target="39" edge="1">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="665" y="580" as="sourcePoint" />
|
|
||||||
<mxPoint x="670" y="560" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="37" value="Да" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=13;" parent="36" vertex="1" connectable="0">
|
|
||||||
<mxGeometry x="-0.3625" y="8" relative="1" as="geometry">
|
|
||||||
<mxPoint x="14" y="-27" as="offset" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="38" value="Controller\<br>LoginController" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="740" y="10" width="120" height="60" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="39" value="" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="420" y="500" width="20" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="40" value="" style="endArrow=classic;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;edgeStyle=orthogonalEdgeStyle;" parent="1" source="39" target="43" edge="1">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="825" y="620" as="sourcePoint" />
|
|
||||||
<mxPoint x="840" y="560" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="41" value="Проводим аутентификацию<br>&nbsp;через LDAP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="40" vertex="1" connectable="0">
|
|
||||||
<mxGeometry x="0.1298" y="-2" relative="1" as="geometry">
|
|
||||||
<mxPoint x="-130" y="-22" as="offset" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="43" value="Аутентификация <br>LDAP успешна" style="rhombus;whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="728.75" y="560" width="142.5" height="70" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="44" value="" style="endArrow=none;html=1;edgeStyle=orthogonalEdgeStyle;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;strokeColor=light-dark(#000000, #446e2c);fillColor=#d5e8d4;strokeWidth=1;" parent="1" source="43" target="51" edge="1">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="880" y="660" as="sourcePoint" />
|
|
||||||
<mxPoint x="918" y="720" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="45" value="Да" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=13;" parent="44" vertex="1" connectable="0">
|
|
||||||
<mxGeometry x="-0.3625" y="8" relative="1" as="geometry">
|
|
||||||
<mxPoint x="-28" y="-7" as="offset" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="46" value="" style="endArrow=classicThin;html=1;edgeStyle=orthogonalEdgeStyle;fillColor=#fff2cc;strokeColor=light-dark(#000000, #6d5100);strokeWidth=1;endFill=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="43" target="77" edge="1">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="770" y="640" as="sourcePoint" />
|
|
||||||
<mxPoint x="849.375" y="685" as="targetPoint" />
|
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="760" y="595" />
|
|
||||||
<mxPoint x="760" y="595" />
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="47" value="Нет" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=13;" parent="46" vertex="1" connectable="0">
|
|
||||||
<mxGeometry x="-0.3625" y="8" relative="1" as="geometry">
|
|
||||||
<mxPoint x="118" y="-18" as="offset" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="50" value="Session" style="rounded=1;whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="1100" y="10" width="120" height="60" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="51" value="" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="789.38" y="665" width="20" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="52" value="" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="1150" y="665" width="20" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="53" value="" style="endArrow=classic;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" parent="1" source="51" target="52" edge="1">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="1000" y="674.5" as="sourcePoint" />
|
|
||||||
<mxPoint x="1170" y="674.5" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="54" value="Помещаем логин и <br>группы пользователя <br>в сессию" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="53" vertex="1" connectable="0">
|
|
||||||
<mxGeometry x="0.1298" y="-2" relative="1" as="geometry">
|
|
||||||
<mxPoint x="-83" y="-27" as="offset" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="55" value="" style="endArrow=none;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" parent="1" source="150" target="136" edge="1">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="920" y="850" as="sourcePoint" />
|
|
||||||
<mxPoint x="909" y="820" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="60" value="" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="1150" y="315" width="20" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="65" value="" style="endArrow=classic;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" parent="1" source="60" target="28" edge="1">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="990" y="760" as="sourcePoint" />
|
|
||||||
<mxPoint x="550" y="380" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="66" value="web/api" style="rhombus;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="-240" y="95" width="80" height="80" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="67" value="Middleware\web\<br>AuthetnticateMagicApi" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="130" y="5" width="135" height="60" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="70" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="187.5" y="115" width="20" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="71" value="" style="endArrow=none;dashed=1;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="1" source="70" target="67">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="250" y="230" as="sourcePoint" />
|
|
||||||
<mxPoint x="240" y="100" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="72" value="" style="endArrow=classic;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;edgeStyle=orthogonalEdgeStyle;" edge="1" parent="1" source="66" target="70">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="110" y="120" as="sourcePoint" />
|
|
||||||
<mxPoint x="90" y="200" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="73" value="api ендпоинт" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="72">
|
|
||||||
<mxGeometry x="0.1298" y="-2" relative="1" as="geometry">
|
|
||||||
<mxPoint x="-156" y="-12" as="offset" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="74" value="" style="endArrow=classic;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;edgeStyle=orthogonalEdgeStyle;jumpStyle=arc;" edge="1" parent="1" source="66" target="18">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="130" y="160" as="sourcePoint" />
|
|
||||||
<mxPoint x="420" y="190" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="75" value="web роут" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="74">
|
|
||||||
<mxGeometry x="0.1298" y="-2" relative="1" as="geometry">
|
|
||||||
<mxPoint x="-317" y="-14" as="offset" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="76" value="" style="endArrow=none;dashed=1;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="1" source="155" target="70">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="245" y="500" as="sourcePoint" />
|
|
||||||
<mxPoint x="244.5" y="220" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="77" value="views\login" style="shape=parallelogram;perimeter=parallelogramPerimeter;whiteSpace=wrap;html=1;fixedSize=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="240" y="585" width="140" height="50" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="87" value="" style="endArrow=none;dashed=1;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="1" source="43" target="38">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="800" y="530" as="sourcePoint" />
|
|
||||||
<mxPoint x="390" y="80" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="88" value="" style="endArrow=none;dashed=1;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="1" source="60" target="50">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="860" y="540" as="sourcePoint" />
|
|
||||||
<mxPoint x="860" y="80" as="targetPoint" />
|
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="1160" y="220" />
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="89" value="" style="endArrow=none;dashed=1;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="113" target="52">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="1170" y="385" as="sourcePoint" />
|
|
||||||
<mxPoint x="1150" y="510" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="141" value="" style="edgeStyle=orthogonalEdgeStyle;html=1;entryX=0.375;entryY=0;entryDx=0;entryDy=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;exitPerimeter=0;endArrow=none;endFill=0;dashed=1;" edge="1" parent="1" source="90" target="142">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<mxPoint x="1560" y="40" as="sourcePoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="90" value="users" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="1490" width="60" height="80" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="91" value="" style="endArrow=none;dashed=1;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;entryPerimeter=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="1" source="92" target="90">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="1260" y="600" as="sourcePoint" />
|
|
||||||
<mxPoint x="1100" y="80" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="205" value="" style="edgeStyle=none;html=1;dashed=1;endArrow=none;endFill=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="92" target="206">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<mxPoint x="1537.2727272727275" y="930" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="92" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="1510" y="745" width="20" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="96" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="790" y="745" width="20" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="97" value="" style="endArrow=none;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="1" source="96" target="51">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="930" y="850" as="sourcePoint" />
|
|
||||||
<mxPoint x="930" y="660" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="98" value="" style="endArrow=classic;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;jumpStyle=arc;" edge="1" parent="1" source="96" target="92">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="990" y="640" as="sourcePoint" />
|
|
||||||
<mxPoint x="1160" y="640" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="99" value="Создаем запись с логином пользователя в модели users, <br>если аутентификация проходит впервые<br>(нужно для работы Sanctum)" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=light-dark(#FFFFFF,#EDEDED);" vertex="1" connectable="0" parent="98">
|
|
||||||
<mxGeometry x="0.1298" y="-2" relative="1" as="geometry">
|
|
||||||
<mxPoint x="-235" y="-27" as="offset" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="101" value="personal_access_tokens" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="1640" y="5" width="160" height="70" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="102" value="модель с токенами <br>доступа Sanctum" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="1655" y="-40" width="130" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="137" value="" style="edgeStyle=none;html=1;endArrow=none;endFill=0;" edge="1" parent="1" source="103" target="136">
|
|
||||||
<mxGeometry relative="1" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="103" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="789.38" y="860" width="20" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="104" value="" style="endArrow=none;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" edge="1" parent="1" source="96" target="103">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="930" y="970" as="sourcePoint" />
|
|
||||||
<mxPoint x="1020" y="890" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="105" value="" style="endArrow=none;dashed=1;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;entryPerimeter=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="1" source="106" target="101">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="1320" y="730" as="sourcePoint" />
|
|
||||||
<mxPoint x="1320" y="80" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="193" value="" style="edgeStyle=none;html=1;endArrow=none;endFill=0;dashed=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="106" target="194">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<mxPoint x="1720" y="930" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="106" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="1710" y="860" width="20" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="107" value="" style="endArrow=classic;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;jumpStyle=arc;" edge="1" parent="1" source="103" target="106">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="990" y="750" as="sourcePoint" />
|
|
||||||
<mxPoint x="1380" y="750" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="108" value="Создаем запись с токеном доступа Sanctum.<br>Их надо указывать если делается запрос к api.<br>Если запрос делается с фронта (через fetch, например), <br>токен подставится в заголовки автоматически на бэке" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="107">
|
|
||||||
<mxGeometry x="0.1298" y="-2" relative="1" as="geometry">
|
|
||||||
<mxPoint x="-349" y="-32" as="offset" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="114" value="" style="endArrow=classic;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;endFill=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;jumpStyle=arc;" edge="1" parent="1" source="31" target="113">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="440" y="1040" as="sourcePoint" />
|
|
||||||
<mxPoint x="1122" y="920" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="115" value="Кладем в сессию параметр _<b><font style="font-size: 13px;">auth_prev_page</font></b> со значением URL, <br>на который&nbsp;<span style="color: rgb(0, 0, 0);">перекинем пользователя&nbsp;</span>после аутентификации&nbsp;" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="114">
|
|
||||||
<mxGeometry x="0.1298" y="-2" relative="1" as="geometry">
|
|
||||||
<mxPoint x="-259" y="-22" as="offset" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="220" value="" style="edgeStyle=orthogonalEdgeStyle;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" edge="1" parent="1" source="117" target="132">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<mxPoint x="717" y="1320" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="117" value="views\menu" style="shape=parallelogram;perimeter=parallelogramPerimeter;whiteSpace=wrap;html=1;fixedSize=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="600" y="1247" width="120" height="34.5" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="120" value="адрес страницы <br>есть?" style="rhombus;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="728.13" y="1115" width="142.5" height="70" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="121" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="1150" y="1130" width="20" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="122" value="" style="endArrow=none;dashed=1;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" edge="1" parent="1" source="134" target="121">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="1170" y="900" as="sourcePoint" />
|
|
||||||
<mxPoint x="1170" y="660" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="123" value="" style="endArrow=classic;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;jumpStyle=arc;startArrow=classic;startFill=1;" edge="1" parent="1" source="120" target="121">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="990" y="750" as="sourcePoint" />
|
|
||||||
<mxPoint x="1380" y="750" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="124" value="Запрашиваем url страницы <br>откуда пришел пользователь<br><b><font style="font-size: 13px;">auth_prev_page</font></b>" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=none;textShadow=0;" vertex="1" connectable="0" parent="123">
|
|
||||||
<mxGeometry x="0.1298" y="-2" relative="1" as="geometry">
|
|
||||||
<mxPoint x="-49" y="-37" as="offset" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="126" value="Нет" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="688.75" y="1115" width="40" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="128" value="" style="endArrow=none;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" edge="1" parent="1" source="130" target="120">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="918.62" y="1238" as="sourcePoint" />
|
|
||||||
<mxPoint x="921" y="1190" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="133" value="" style="edgeStyle=orthogonalEdgeStyle;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="130" target="132">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="801" y="1337" />
|
|
||||||
<mxPoint x="725" y="1337" />
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="130" value="views\{url}" style="shape=parallelogram;perimeter=parallelogramPerimeter;whiteSpace=wrap;html=1;fixedSize=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="740" y="1246.5" width="121.25" height="33.5" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="131" value="Редирект на url откуда <br>пришел пользователь" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="860" y="1243.25" width="150" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="132" value="" style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;fillColor=#d5e8d4;strokeColor=#82b366;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="700" y="1390" width="50" height="50" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="134" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="1150" y="940" width="20" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="136" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="790" y="940" width="20" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="138" value="" style="endArrow=classic;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;jumpStyle=arc;startArrow=none;startFill=0;" edge="1" parent="1" source="136" target="134">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="1051" y="1094" as="sourcePoint" />
|
|
||||||
<mxPoint x="1160" y="1094" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="139" value="Кладем в сессию <br>параметр <font style="font-size: 13px;"><b>is_admin</b></font>" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=light-dark(#FFFFFF,#EDEDED);" vertex="1" connectable="0" parent="138">
|
|
||||||
<mxGeometry x="0.1298" y="-2" relative="1" as="geometry">
|
|
||||||
<mxPoint x="-84" y="-22" as="offset" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="142" value="id &lt;=&gt; tokenable_id" style="shape=hexagon;perimeter=hexagonPerimeter2;whiteSpace=wrap;html=1;fixedSize=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="1530" y="125" width="140" height="50" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="143" value="" style="edgeStyle=orthogonalEdgeStyle;html=1;entryX=0.625;entryY=0;entryDx=0;entryDy=0;endArrow=none;endFill=0;dashed=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;exitPerimeter=0;" edge="1" parent="1" source="101" target="142">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<mxPoint x="1560" y="63" as="sourcePoint" />
|
|
||||||
<mxPoint x="1571" y="165" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="145" value="Cookie" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="1300" y="10" width="120" height="60" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="147" value="" style="endArrow=none;dashed=1;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="1" source="148" target="156">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="1270" y="330" as="sourcePoint" />
|
|
||||||
<mxPoint x="1130" y="80" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="148" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="1350" y="1030" width="20" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="236" value="" style="edgeStyle=none;html=1;" edge="1" parent="1" source="150" target="120">
|
|
||||||
<mxGeometry relative="1" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="150" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="789.38" y="1030" width="20" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="152" value="" style="endArrow=classic;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;jumpStyle=arc;startArrow=none;startFill=0;" edge="1" parent="1" source="150" target="148">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="990" y="970" as="sourcePoint" />
|
|
||||||
<mxPoint x="1160" y="970" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="153" value="Кладем в куки <b><font style="font-size: 13px;">sanctum_token</font></b><br>для автоматической подстановки его в заголовки <br>при api запросах с фронта" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=light-dark(#FFFFFF,#EDEDED);" vertex="1" connectable="0" parent="152">
|
|
||||||
<mxGeometry x="0.1298" y="-2" relative="1" as="geometry">
|
|
||||||
<mxPoint x="-159" y="-37" as="offset" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="155" value="запрос содержит api/ &amp;&amp; <br>в куках есть sanctum_token&nbsp;" style="rhombus;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="85" y="752.5" width="230" height="105" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="156" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="1350" y="785" width="20" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="159" value="" style="endArrow=none;dashed=1;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" edge="1" parent="1" source="145" target="156">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="1420" y="350" as="sourcePoint" />
|
|
||||||
<mxPoint x="1380" y="660" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="160" value="" style="endArrow=classic;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;jumpStyle=arc;exitX=1;exitY=0.5;exitDx=0;exitDy=0;startArrow=classic;startFill=1;" edge="1" parent="1" source="155" target="156">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="950" y="690" as="sourcePoint" />
|
|
||||||
<mxPoint x="1590" y="750" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="163" value="Заголовки запроса" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="-70" y="10" width="120" height="60" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="164" value="" style="endArrow=none;dashed=1;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="1" source="165" target="163">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="80" y="340" as="sourcePoint" />
|
|
||||||
<mxPoint x="255" y="80" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="180" value="" style="edgeStyle=none;html=1;dashed=1;endArrow=none;endFill=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="165" target="181">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<mxPoint x="80" y="850" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="165" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="-19" y="796" width="20" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="178" value="" style="edgeStyle=none;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="166" target="182">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<mxPoint x="245" y="910" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="166" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="190" y="920" width="20" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="167" value="Стандартная <br>аутентификация <br>Sanctum" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="200" y="900" width="120" height="60" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="168" value="" style="endArrow=none;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" edge="1" parent="1" source="166" target="155">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="90" y="720" as="sourcePoint" />
|
|
||||||
<mxPoint x="140" y="470" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="170" value="" style="endArrow=classic;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.25;entryDx=0;entryDy=0;jumpStyle=arc;" edge="1" parent="1" source="155" target="165">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="415" y="750" as="sourcePoint" />
|
|
||||||
<mxPoint x="40" y="680" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="171" value="Добавляем в заголовки <br>запроса sanctum_token, <br>без него аутентификация <br>Sanctum не пройдет" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="170">
|
|
||||||
<mxGeometry x="0.1298" y="-2" relative="1" as="geometry">
|
|
||||||
<mxPoint x="-138" y="12" as="offset" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="172" value="Да" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="35" y="780" width="40" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="173" value="Нет" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="200" y="850" width="40" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="174" value="" style="endArrow=classic;html=1;edgeStyle=orthogonalEdgeStyle;entryX=0.5;entryY=0;entryDx=0;entryDy=0;jumpStyle=arc;exitX=1;exitY=0.75;exitDx=0;exitDy=0;" edge="1" parent="1" source="165" target="166">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="90" y="740" as="sourcePoint" />
|
|
||||||
<mxPoint x="80" y="740" as="targetPoint" />
|
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="1" y="827" />
|
|
||||||
<mxPoint x="30" y="827" />
|
|
||||||
<mxPoint x="30" y="900" />
|
|
||||||
<mxPoint x="200" y="900" />
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="181" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="-20" y="1030" width="20" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="182" value="В заголовках есть <br>sanctum_token?" style="rhombus;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="100" y="1015" width="200" height="70" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="185" value="" style="edgeStyle=none;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;startArrow=classic;startFill=1;" edge="1" parent="1" source="182" target="181">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<mxPoint x="255" y="860" as="sourcePoint" />
|
|
||||||
<mxPoint x="255" y="920" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="186" value="" style="edgeStyle=orthogonalEdgeStyle;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" edge="1" parent="1" source="182" target="188">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<mxPoint x="235" y="1040" as="sourcePoint" />
|
|
||||||
<mxPoint x="235" y="1100" as="targetPoint" />
|
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="200" y="1120" />
|
|
||||||
<mxPoint x="85" y="1120" />
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="187" value="Нет" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="147.5" y="1085" width="40" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="188" value="" style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;fillColor=#f8cecc;strokeColor=#b85450;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="60" y="1390" width="50" height="50" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="189" value="response <br>с 401 ошибкой" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="35" y="1440" width="100" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="190" value="" style="edgeStyle=orthogonalEdgeStyle;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="182" target="196">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<mxPoint x="255" y="990" as="sourcePoint" />
|
|
||||||
<mxPoint x="300" y="1250" as="targetPoint" />
|
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="355" y="1050" />
|
|
||||||
<mxPoint x="355" y="1130" />
|
|
||||||
<mxPoint x="200" y="1130" />
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="191" value="Да" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="290" y="1055" width="40" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="208" value="" style="edgeStyle=orthogonalEdgeStyle;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;startArrow=classic;startFill=1;" edge="1" parent="1" source="194" target="206">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<mxPoint x="1720" y="1290" as="targetPoint" />
|
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="1720" y="1280" />
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="194" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="1710" y="1190.25" width="20" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="198" value="" style="edgeStyle=none;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" edge="1" parent="1" source="196" target="194">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<mxPoint x="1200" y="1230" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="196" value="" style="rhombus;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="165" y="1179" width="70" height="62.5" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="199" value="" style="edgeStyle=orthogonalEdgeStyle;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="1" source="196" target="188">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<mxPoint x="255" y="990" as="sourcePoint" />
|
|
||||||
<mxPoint x="75" y="1100" as="targetPoint" />
|
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="85" y="1210" />
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="200" value="Нет" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="135" y="1179" width="40" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="206" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="1510" y="1260" width="20" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="209" value="Если токен найден, запрашиваем <br>id юзера по tokenable_id" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="1530" y="1290" width="210" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="211" value="<span style="color: rgb(0, 0, 0); text-wrap-mode: wrap;">В таблице с токенами есть</span><br style="text-wrap-mode: wrap;"><span style="color: rgb(0, 0, 0); text-wrap-mode: wrap;">запись с токеном из&nbsp;</span><span style="color: rgb(0, 0, 0); text-wrap-mode: wrap;">заголовка, <br>а также в таблице users <br>есть связанная запись <br>(пользователя) к этому токену ?</span>" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="190" y="1275" width="200" height="90" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="212" value="" style="endArrow=classic;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;endFill=1;" edge="1" parent="1" target="214" source="196">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="152.5" y="1110" as="sourcePoint" />
|
|
||||||
<mxPoint x="-82.5" y="760" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="213" value="Аутентификация <br>успешна" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="212">
|
|
||||||
<mxGeometry x="0.1298" y="-2" relative="1" as="geometry">
|
|
||||||
<mxPoint y="135" as="offset" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="214" value="" style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;fillColor=#d5e8d4;strokeColor=#82b366;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="175" y="1390" width="50" height="50" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="215" value="" style="endArrow=classic;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;endFill=1;" edge="1" parent="1" target="217" source="77">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="350" y="437" as="sourcePoint" />
|
|
||||||
<mxPoint x="22.5" y="-35" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="216" value="Редирект на страницу <br>аутентификации" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="215">
|
|
||||||
<mxGeometry x="0.1298" y="-2" relative="1" as="geometry">
|
|
||||||
<mxPoint x="-18" y="-92" as="offset" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="217" value="" style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;fillColor=#d5e8d4;strokeColor=#82b366;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="285" y="665" width="50" height="50" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="218" value="" style="endArrow=classic;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;edgeStyle=orthogonalEdgeStyle;endFill=1;" edge="1" parent="1" source="120" target="117">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="930" y="1030" as="sourcePoint" />
|
|
||||||
<mxPoint x="930" y="990" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="221" value="Редирект на вьюху <br>с меню Magic" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="485" y="1240" width="130" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="228" value="" style="edgeStyle=none;html=1;" edge="1" parent="1" source="222" target="66">
|
|
||||||
<mxGeometry relative="1" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="222" value="Запрос" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;fillColor=#e1d5e7;strokeColor=#9673a6;strokeWidth=3;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="-215" y="-30" width="30" height="60" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="237" value="Да" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="810" y="1179" width="40" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="238" value="" style="endArrow=none;dashed=1;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="60" target="113">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="1160" y="315" as="sourcePoint" />
|
|
||||||
<mxPoint x="1160" y="610" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="113" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="1150" y="440" width="20" height="40" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="239" value="" style="endArrow=none;dashed=1;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="52" target="134">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="1170" y="440" as="sourcePoint" />
|
|
||||||
<mxPoint x="1170" y="620" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="28" value="В сесси есть&nbsp;<br>_auth_login" style="rhombus;whiteSpace=wrap;html=1;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="367.5" y="300" width="125" height="70" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="252" value="Да" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="195" y="1240" width="40" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
</root>
|
|
||||||
</mxGraphModel>
|
|
||||||
</diagram>
|
|
||||||
</mxfile>
|
|
||||||
@@ -1,701 +0,0 @@
|
|||||||
<mxfile host="65bd71144e">
|
|
||||||
<diagram id="YrEqY51DlFa1ZGKHTR-x" name="Страница — 1">
|
|
||||||
<mxGraphModel dx="1474" dy="1569" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
|
|
||||||
<root>
|
|
||||||
<mxCell id="0"/>
|
|
||||||
<mxCell id="1" parent="0"/>
|
|
||||||
<mxCell id="685" value="Middleware\<br>AuthetnticateMagic" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="370" y="10" width="120" height="60" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="686" value="" style="endArrow=none;dashed=1;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="1" source="687" target="685">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="430" y="170" as="sourcePoint"/>
|
|
||||||
<mxPoint x="205" y="70" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="687" value="Сессия <br>стартована" style="rhombus;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="375" y="200" width="110" height="70" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="688" value="" style="endArrow=none;html=1;edgeStyle=orthogonalEdgeStyle;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;strokeColor=#000000;fillColor=#d5e8d4;strokeWidth=1;" edge="1" parent="1" source="687" target="818">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="510" y="280" as="sourcePoint"/>
|
|
||||||
<mxPoint x="540" y="350" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="689" value="Да" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=13;" vertex="1" connectable="0" parent="688">
|
|
||||||
<mxGeometry x="-0.3625" y="8" relative="1" as="geometry">
|
|
||||||
<mxPoint x="22" y="90" as="offset"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="690" value="" style="endArrow=none;html=1;edgeStyle=orthogonalEdgeStyle;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;fillColor=#fff2cc;strokeColor=#000000;strokeWidth=1;" edge="1" parent="1" source="687" target="721">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="250" y="360" as="sourcePoint"/>
|
|
||||||
<mxPoint x="320" y="350" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="691" value="Нет" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=13;" vertex="1" connectable="0" parent="690">
|
|
||||||
<mxGeometry x="-0.3625" y="8" relative="1" as="geometry">
|
|
||||||
<mxPoint x="17" y="-77" as="offset"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="692" value="" style="endArrow=none;html=1;edgeStyle=orthogonalEdgeStyle;exitX=0;exitY=0.5;exitDx=0;exitDy=0;strokeColor=light-dark(#000000, #446e2c);fillColor=#d5e8d4;strokeWidth=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="818" target="694">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="460" y="590" as="sourcePoint"/>
|
|
||||||
<mxPoint x="420" y="520" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="693" value="Нет" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=13;" vertex="1" connectable="0" parent="692">
|
|
||||||
<mxGeometry x="-0.3625" y="8" relative="1" as="geometry">
|
|
||||||
<mxPoint x="-35" y="-27" as="offset"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="694" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="347.5" y="460" width="20" height="40" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="695" value="" style="endArrow=classic;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;endFill=1;edgeStyle=orthogonalEdgeStyle;" edge="1" parent="1" source="694" target="721">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="440" y="1075" as="sourcePoint"/>
|
|
||||||
<mxPoint x="205" y="560" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="696" value="" style="endArrow=classic;html=1;edgeStyle=orthogonalEdgeStyle;exitX=0.5;exitY=1;exitDx=0;exitDy=0;fillColor=#fff2cc;strokeColor=#000000;strokeWidth=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;endFill=1;" edge="1" parent="1" source="818" target="822">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="665" y="580" as="sourcePoint"/>
|
|
||||||
<mxPoint x="520" y="510" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="697" value="Да" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=13;" vertex="1" connectable="0" parent="696">
|
|
||||||
<mxGeometry x="-0.3625" y="8" relative="1" as="geometry">
|
|
||||||
<mxPoint x="12" y="-55" as="offset"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="698" value="Controller\<br>LoginController" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="740" y="10" width="120" height="60" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="699" value="" style="endArrow=classic;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;edgeStyle=orthogonalEdgeStyle;" edge="1" parent="1" source="721" target="701">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="505" y="550" as="sourcePoint"/>
|
|
||||||
<mxPoint x="840" y="560" as="targetPoint"/>
|
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="370" y="550"/>
|
|
||||||
<mxPoint x="800" y="550"/>
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="700" value="Проводим аутентификацию<br>&nbsp;через LDAP" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="699">
|
|
||||||
<mxGeometry x="0.1298" y="-2" relative="1" as="geometry">
|
|
||||||
<mxPoint x="-129" y="-17" as="offset"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="701" value="Аутентификация <br>LDAP успешна" style="rhombus;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="728.75" y="560" width="142.5" height="70" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="702" value="" style="endArrow=none;html=1;edgeStyle=orthogonalEdgeStyle;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;strokeColor=light-dark(#000000, #446e2c);fillColor=#d5e8d4;strokeWidth=1;" edge="1" parent="1" source="701" target="705">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="880" y="660" as="sourcePoint"/>
|
|
||||||
<mxPoint x="918" y="720" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="703" value="Да" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=13;" vertex="1" connectable="0" parent="702">
|
|
||||||
<mxGeometry x="-0.3625" y="8" relative="1" as="geometry">
|
|
||||||
<mxPoint x="-28" y="-7" as="offset"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="704" value="Session" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="1100" y="10" width="120" height="60" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="705" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="789.38" y="665" width="20" height="40" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="706" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="1150" y="665" width="20" height="40" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="707" value="" style="endArrow=classic;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="1" source="705" target="706">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="1000" y="674.5" as="sourcePoint"/>
|
|
||||||
<mxPoint x="1170" y="674.5" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="708" value="Помещаем <b><font style="font-size: 13px;">_auth_login</font></b> и <br><b><font style="font-size: 13px;">_auth_groups</font></b>&nbsp;в сессию" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="707">
|
|
||||||
<mxGeometry x="0.1298" y="-2" relative="1" as="geometry">
|
|
||||||
<mxPoint x="-83" y="-27" as="offset"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="709" value="" style="endArrow=none;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="1" source="769" target="760">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="920" y="850" as="sourcePoint"/>
|
|
||||||
<mxPoint x="909" y="820" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="710" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="1150" y="315" width="20" height="40" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="711" value="" style="endArrow=classic;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" edge="1" parent="1" source="710" target="818">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="990" y="760" as="sourcePoint"/>
|
|
||||||
<mxPoint x="550" y="380" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="712" value="web/api" style="rhombus;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="-240" y="95" width="80" height="80" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="713" value="Middleware\<br>AuthetnticateMagicApi" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="130" y="5" width="135" height="60" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="714" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="187.5" y="115" width="20" height="40" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="715" value="" style="endArrow=none;dashed=1;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="1" source="714" target="713">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="250" y="230" as="sourcePoint"/>
|
|
||||||
<mxPoint x="240" y="100" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="716" value="" style="endArrow=classic;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;edgeStyle=orthogonalEdgeStyle;" edge="1" parent="1" source="712" target="714">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="110" y="120" as="sourcePoint"/>
|
|
||||||
<mxPoint x="90" y="200" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="717" value="api ендпоинт" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="716">
|
|
||||||
<mxGeometry x="0.1298" y="-2" relative="1" as="geometry">
|
|
||||||
<mxPoint x="-156" y="-12" as="offset"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="718" value="" style="endArrow=classic;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;edgeStyle=orthogonalEdgeStyle;jumpStyle=arc;" edge="1" parent="1" source="712" target="687">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="130" y="160" as="sourcePoint"/>
|
|
||||||
<mxPoint x="420" y="190" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="719" value="web роут" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="718">
|
|
||||||
<mxGeometry x="0.1298" y="-2" relative="1" as="geometry">
|
|
||||||
<mxPoint x="-317" y="-14" as="offset"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="720" value="" style="endArrow=none;dashed=1;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="1" source="772" target="714">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="245" y="500" as="sourcePoint"/>
|
|
||||||
<mxPoint x="244.5" y="220" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="721" value="views\login" style="shape=parallelogram;perimeter=parallelogramPerimeter;whiteSpace=wrap;html=1;fixedSize=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="240" y="535" width="140" height="50" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="722" value="" style="endArrow=none;dashed=1;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="1" source="701" target="698">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="800" y="530" as="sourcePoint"/>
|
|
||||||
<mxPoint x="390" y="80" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="723" value="" style="endArrow=none;dashed=1;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="1" source="710" target="704">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="860" y="540" as="sourcePoint"/>
|
|
||||||
<mxPoint x="860" y="80" as="targetPoint"/>
|
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="1160" y="220"/>
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="724" value="" style="endArrow=none;dashed=1;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="816" target="706">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="1170" y="385" as="sourcePoint"/>
|
|
||||||
<mxPoint x="1150" y="510" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="725" value="" style="edgeStyle=orthogonalEdgeStyle;html=1;entryX=0.375;entryY=0;entryDx=0;entryDy=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;exitPerimeter=0;endArrow=none;endFill=0;dashed=1;" edge="1" parent="1" source="726" target="763">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<mxPoint x="1560" y="40" as="sourcePoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="726" value="users" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="1490" width="60" height="80" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="727" value="" style="endArrow=none;dashed=1;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;entryPerimeter=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="1" source="729" target="726">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="1260" y="600" as="sourcePoint"/>
|
|
||||||
<mxPoint x="1100" y="80" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="728" value="" style="edgeStyle=none;html=1;dashed=1;endArrow=none;endFill=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="729" target="805">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<mxPoint x="1537.2727272727275" y="930" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="729" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="1510" y="745" width="20" height="40" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="730" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="790" y="745" width="20" height="40" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="731" value="" style="endArrow=none;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="1" source="730" target="705">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="930" y="850" as="sourcePoint"/>
|
|
||||||
<mxPoint x="930" y="660" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="732" value="" style="endArrow=classic;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;jumpStyle=arc;" edge="1" parent="1" source="730" target="729">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="990" y="640" as="sourcePoint"/>
|
|
||||||
<mxPoint x="1160" y="640" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="733" value="Создаем запись с логином пользователя в модели users, <br>если аутентификация проходит впервые<br>(нужно для работы Sanctum)" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=light-dark(#FFFFFF,#EDEDED);" vertex="1" connectable="0" parent="732">
|
|
||||||
<mxGeometry x="0.1298" y="-2" relative="1" as="geometry">
|
|
||||||
<mxPoint x="-235" y="-27" as="offset"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="734" value="personal_access_tokens" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="1640" y="5" width="160" height="70" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="735" value="модель с токенами <br>доступа Sanctum" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="1655" y="-40" width="130" height="40" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="736" value="" style="edgeStyle=none;html=1;endArrow=none;endFill=0;" edge="1" parent="1" source="737" target="760">
|
|
||||||
<mxGeometry relative="1" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="737" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="790.62" y="830" width="20" height="70" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="738" value="" style="endArrow=none;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" edge="1" parent="1" source="730" target="737">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="930" y="970" as="sourcePoint"/>
|
|
||||||
<mxPoint x="1020" y="890" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="739" value="" style="endArrow=none;dashed=1;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;entryPerimeter=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="1" source="741" target="734">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="1320" y="730" as="sourcePoint"/>
|
|
||||||
<mxPoint x="1320" y="80" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="740" value="" style="edgeStyle=none;html=1;endArrow=none;endFill=0;dashed=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="741" target="800">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<mxPoint x="1720" y="930" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="741" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="1710" y="830" width="20" height="65" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="742" value="" style="endArrow=classic;html=1;entryX=0;entryY=0.25;entryDx=0;entryDy=0;exitX=1;exitY=0.25;exitDx=0;exitDy=0;jumpStyle=arc;" edge="1" parent="1" source="737" target="741">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="990" y="750" as="sourcePoint"/>
|
|
||||||
<mxPoint x="1380" y="750" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="743" value="Создаем запись с токеном доступа Sanctum.<br>" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="742">
|
|
||||||
<mxGeometry x="0.1298" y="-2" relative="1" as="geometry">
|
|
||||||
<mxPoint x="-369" y="-19" as="offset"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="744" value="" style="endArrow=classic;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;endFill=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;jumpStyle=arc;" edge="1" parent="1" source="694" target="816">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="440" y="1040" as="sourcePoint"/>
|
|
||||||
<mxPoint x="1122" y="920" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="745" value="Кладем в сессию параметр _<b><font style="font-size: 13px;">auth_prev_page</font></b> со значением URL, <br>на который&nbsp;<span style="color: rgb(0, 0, 0);">перекинем пользователя&nbsp;</span>после аутентификации&nbsp;" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="744">
|
|
||||||
<mxGeometry x="0.1298" y="-2" relative="1" as="geometry">
|
|
||||||
<mxPoint x="-259" y="-22" as="offset"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="746" value="" style="edgeStyle=orthogonalEdgeStyle;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" edge="1" parent="1" source="747" target="758">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<mxPoint x="717" y="1320" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="747" value="views\menu" style="shape=parallelogram;perimeter=parallelogramPerimeter;whiteSpace=wrap;html=1;fixedSize=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="600" y="1247" width="120" height="34.5" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="748" value="адрес страницы <br>есть?" style="rhombus;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="728.13" y="1115" width="142.5" height="70" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="749" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="1150" y="1130" width="20" height="40" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="750" value="" style="endArrow=none;dashed=1;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" edge="1" parent="1" source="759" target="749">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="1170" y="900" as="sourcePoint"/>
|
|
||||||
<mxPoint x="1170" y="660" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="751" value="" style="endArrow=classic;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;jumpStyle=arc;startArrow=classic;startFill=1;" edge="1" parent="1" source="748" target="749">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="990" y="750" as="sourcePoint"/>
|
|
||||||
<mxPoint x="1380" y="750" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="752" value="Запрашиваем url страницы <br>откуда пришел пользователь<br><b><font style="font-size: 13px;">auth_prev_page</font></b>" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=none;textShadow=0;" vertex="1" connectable="0" parent="751">
|
|
||||||
<mxGeometry x="0.1298" y="-2" relative="1" as="geometry">
|
|
||||||
<mxPoint x="-49" y="-37" as="offset"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="753" value="Нет" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="688.75" y="1115" width="40" height="30" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="754" value="" style="endArrow=none;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" edge="1" parent="1" source="756" target="748">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="918.62" y="1238" as="sourcePoint"/>
|
|
||||||
<mxPoint x="921" y="1190" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="755" value="" style="edgeStyle=orthogonalEdgeStyle;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="756" target="758">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="801" y="1360"/>
|
|
||||||
<mxPoint x="725" y="1360"/>
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="756" value="views\{url}" style="shape=parallelogram;perimeter=parallelogramPerimeter;whiteSpace=wrap;html=1;fixedSize=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="740" y="1246.5" width="121.25" height="33.5" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="757" value="Редирект на url откуда <br>пришел пользователь" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="860" y="1243.25" width="150" height="40" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="758" value="" style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;fillColor=#d5e8d4;strokeColor=#82b366;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="700" y="1435" width="50" height="50" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="759" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="1150" y="940" width="20" height="40" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="760" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="790" y="940" width="20" height="40" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="761" value="" style="endArrow=classic;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;jumpStyle=arc;startArrow=none;startFill=0;" edge="1" parent="1" source="760" target="759">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="1051" y="1094" as="sourcePoint"/>
|
|
||||||
<mxPoint x="1160" y="1094" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="762" value="Кладем в сессию <br>параметр <font style="font-size: 13px;"><b>is_admin</b></font>" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=light-dark(#FFFFFF,#EDEDED);" vertex="1" connectable="0" parent="761">
|
|
||||||
<mxGeometry x="0.1298" y="-2" relative="1" as="geometry">
|
|
||||||
<mxPoint x="-84" y="-22" as="offset"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="763" value="id &lt;=&gt; tokenable_id" style="shape=hexagon;perimeter=hexagonPerimeter2;whiteSpace=wrap;html=1;fixedSize=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="1530" y="125" width="140" height="50" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="764" value="" style="edgeStyle=orthogonalEdgeStyle;html=1;entryX=0.625;entryY=0;entryDx=0;entryDy=0;endArrow=none;endFill=0;dashed=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;exitPerimeter=0;" edge="1" parent="1" source="734" target="763">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<mxPoint x="1560" y="63" as="sourcePoint"/>
|
|
||||||
<mxPoint x="1571" y="165" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="765" value="Cookie" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="1300" y="10" width="120" height="60" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="766" value="" style="endArrow=none;dashed=1;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="1" source="767" target="773">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="1270" y="330" as="sourcePoint"/>
|
|
||||||
<mxPoint x="1130" y="80" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="767" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="1350" y="1030" width="20" height="40" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="768" value="" style="edgeStyle=none;html=1;" edge="1" parent="1" source="769" target="748">
|
|
||||||
<mxGeometry relative="1" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="769" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="789.38" y="1030" width="20" height="40" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="770" value="" style="endArrow=classic;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;jumpStyle=arc;startArrow=none;startFill=0;" edge="1" parent="1" source="769" target="767">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="990" y="970" as="sourcePoint"/>
|
|
||||||
<mxPoint x="1160" y="970" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="771" value="Кладем в куки <b><font style="font-size: 13px;">sanctum_token</font></b><br>для автоматической подстановки его в заголовки <br>при api запросах с фронта" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=light-dark(#FFFFFF,#EDEDED);" vertex="1" connectable="0" parent="770">
|
|
||||||
<mxGeometry x="0.1298" y="-2" relative="1" as="geometry">
|
|
||||||
<mxPoint x="-159" y="-37" as="offset"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="772" value="URL запроса содержит api/ &amp;&amp; <br>в куках есть sanctum_token&nbsp;" style="rhombus;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="85" y="752.5" width="230" height="105" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="773" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="1350" y="785" width="20" height="40" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="774" value="" style="endArrow=none;dashed=1;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" edge="1" parent="1" source="765" target="773">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="1420" y="350" as="sourcePoint"/>
|
|
||||||
<mxPoint x="1380" y="660" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="775" value="" style="endArrow=classic;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;jumpStyle=arc;exitX=1;exitY=0.5;exitDx=0;exitDy=0;startArrow=classic;startFill=1;" edge="1" parent="1" source="772" target="773">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="950" y="690" as="sourcePoint"/>
|
|
||||||
<mxPoint x="1590" y="750" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="776" value="Заголовки запроса" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="-70" y="10" width="120" height="60" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="777" value="" style="endArrow=none;dashed=1;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" parent="1" source="779" target="776">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="80" y="340" as="sourcePoint"/>
|
|
||||||
<mxPoint x="255" y="80" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="778" value="" style="edgeStyle=none;html=1;dashed=1;endArrow=none;endFill=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="779" target="789">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<mxPoint x="80" y="850" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="779" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="-19" y="796" width="20" height="40" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="780" value="" style="edgeStyle=none;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="781" target="790">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<mxPoint x="245" y="910" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="781" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="190" y="890" width="20" height="40" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="782" value="Стандартная <br>аутентификация <br>Sanctum" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="207.5" y="870" width="120" height="60" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="783" value="" style="endArrow=none;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" edge="1" parent="1" source="781" target="772">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="90" y="720" as="sourcePoint"/>
|
|
||||||
<mxPoint x="140" y="470" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="784" value="" style="endArrow=classic;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.25;entryDx=0;entryDy=0;jumpStyle=arc;" edge="1" parent="1" source="772" target="779">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="415" y="750" as="sourcePoint"/>
|
|
||||||
<mxPoint x="40" y="680" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="785" value="Добавляем в заголовки <br>запроса sanctum_token, <br>без него аутентификация <br>Sanctum не пройдет" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="784">
|
|
||||||
<mxGeometry x="0.1298" y="-2" relative="1" as="geometry">
|
|
||||||
<mxPoint x="-138" y="12" as="offset"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="786" value="Да" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="35" y="780" width="40" height="30" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="787" value="Нет" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="200" y="850" width="40" height="30" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="788" value="" style="endArrow=classic;html=1;edgeStyle=orthogonalEdgeStyle;entryX=0.5;entryY=0;entryDx=0;entryDy=0;jumpStyle=arc;exitX=1;exitY=0.75;exitDx=0;exitDy=0;" edge="1" parent="1" source="779" target="781">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="90" y="740" as="sourcePoint"/>
|
|
||||||
<mxPoint x="80" y="740" as="targetPoint"/>
|
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="1" y="827"/>
|
|
||||||
<mxPoint x="30" y="827"/>
|
|
||||||
<mxPoint x="30" y="870"/>
|
|
||||||
<mxPoint x="200" y="870"/>
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="789" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="-19" y="975" width="20" height="40" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="790" value="В заголовках есть <br>Authorization токен sanctum?" style="rhombus;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="100" y="960" width="200" height="70" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="791" value="" style="edgeStyle=none;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;startArrow=classic;startFill=1;" edge="1" parent="1" source="790" target="789">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<mxPoint x="255" y="860" as="sourcePoint"/>
|
|
||||||
<mxPoint x="255" y="920" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="792" value="" style="edgeStyle=orthogonalEdgeStyle;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" edge="1" parent="1" source="790" target="794">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<mxPoint x="235" y="1040" as="sourcePoint"/>
|
|
||||||
<mxPoint x="235" y="1100" as="targetPoint"/>
|
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="200" y="1050"/>
|
|
||||||
<mxPoint x="85" y="1050"/>
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="793" value="Нет" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="130" y="1025" width="40" height="30" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="794" value="" style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;fillColor=#f8cecc;strokeColor=#b85450;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="60" y="1440" width="50" height="50" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="795" value="response <br>с 401 ошибкой" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="30" y="1490" width="100" height="40" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="796" value="" style="edgeStyle=orthogonalEdgeStyle;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="790" target="802">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<mxPoint x="255" y="990" as="sourcePoint"/>
|
|
||||||
<mxPoint x="300" y="1250" as="targetPoint"/>
|
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="355" y="995"/>
|
|
||||||
<mxPoint x="355" y="1060"/>
|
|
||||||
<mxPoint x="200" y="1060"/>
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="797" value="Да" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="300" y="970" width="40" height="30" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="798" value="" style="edgeStyle=orthogonalEdgeStyle;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;startArrow=classic;startFill=1;" edge="1" parent="1" source="800" target="805">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<mxPoint x="1720" y="1290" as="targetPoint"/>
|
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="1760" y="1210"/>
|
|
||||||
<mxPoint x="1760" y="1280"/>
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="799" value="" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=none;endFill=0;dashed=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="800" target="827">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<mxPoint x="1721" y="1400" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="800" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="1710" y="1190.25" width="20" height="40" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="801" value="" style="edgeStyle=orthogonalEdgeStyle;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" edge="1" parent="1" source="802" target="800">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<mxPoint x="1200" y="1230" as="targetPoint"/>
|
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="510" y="1114"/>
|
|
||||||
<mxPoint x="510" y="1210"/>
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="802" value="" style="rhombus;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="165" y="1082.5" width="70" height="62.5" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="803" value="" style="edgeStyle=orthogonalEdgeStyle;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="1" source="802" target="794">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<mxPoint x="255" y="990" as="sourcePoint"/>
|
|
||||||
<mxPoint x="75" y="1100" as="targetPoint"/>
|
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="85" y="1114"/>
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="804" value="Нет" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="130" y="1082.5" width="40" height="30" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="805" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="1510" y="1260" width="20" height="40" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="806" value="Если токен найден, запрашиваем <br>id юзера по tokenable_id" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="1530" y="1243.25" width="210" height="40" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="807" value="<span style="color: rgb(0, 0, 0); text-wrap-mode: wrap;">В таблице с токенами есть</span><br style="text-wrap-mode: wrap;"><span style="color: rgb(0, 0, 0); text-wrap-mode: wrap;">запись с токеном из&nbsp;</span><span style="color: rgb(0, 0, 0); text-wrap-mode: wrap;">заголовка, <br>а также в таблице users <br>есть связанная запись <br>(пользователя) к этому токену ?</span>" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="210" y="1130" width="200" height="90" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="808" value="" style="endArrow=none;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;endFill=0;" edge="1" parent="1" source="802" target="829">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="152.5" y="1110" as="sourcePoint"/>
|
|
||||||
<mxPoint x="-82.5" y="760" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="809" value="" style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;fillColor=#d5e8d4;strokeColor=#82b366;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="175" y="1440" width="50" height="50" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="810" value="" style="endArrow=classic;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;edgeStyle=orthogonalEdgeStyle;endFill=1;" edge="1" parent="1" source="748" target="747">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="930" y="1030" as="sourcePoint"/>
|
|
||||||
<mxPoint x="930" y="990" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="811" value="Редирект на вьюху <br>с меню Magic" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="485" y="1240" width="130" height="40" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="812" value="" style="edgeStyle=none;html=1;" edge="1" parent="1" source="813" target="712">
|
|
||||||
<mxGeometry relative="1" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="813" value="Запрос" style="shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;html=1;outlineConnect=0;fillColor=#e1d5e7;strokeColor=#9673a6;strokeWidth=3;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="-215" y="-30" width="30" height="60" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="814" value="Да" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="810" y="1179" width="40" height="30" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="815" value="" style="endArrow=none;dashed=1;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="710" target="816">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="1160" y="315" as="sourcePoint"/>
|
|
||||||
<mxPoint x="1160" y="610" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="816" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="1150" y="460" width="20" height="40" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="817" value="" style="endArrow=none;dashed=1;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="706" target="759">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="1170" y="440" as="sourcePoint"/>
|
|
||||||
<mxPoint x="1170" y="620" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="818" value="В сесси есть&nbsp;<br>_auth_login" style="rhombus;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="367.5" y="300" width="125" height="70" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="819" value="Да" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="150" y="1140" width="40" height="30" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="820" value="" style="endArrow=classicThin;html=1;edgeStyle=orthogonalEdgeStyle;fillColor=#fff2cc;strokeColor=light-dark(#000000, #6d5100);strokeWidth=1;endFill=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="1" source="701" target="721">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="710" y="690" as="sourcePoint"/>
|
|
||||||
<mxPoint x="370" y="610" as="targetPoint"/>
|
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="729" y="630"/>
|
|
||||||
<mxPoint x="310" y="630"/>
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="821" value="Нет" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];fontSize=13;" vertex="1" connectable="0" parent="820">
|
|
||||||
<mxGeometry x="-0.3625" y="8" relative="1" as="geometry">
|
|
||||||
<mxPoint x="104" y="-28" as="offset"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="822" value="" style="ellipse;whiteSpace=wrap;html=1;aspect=fixed;fillColor=#d5e8d4;strokeColor=#82b366;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="405" y="390" width="50" height="50" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="823" value="Посредник пропускает <br>запрос дальше" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="450" y="390" width="150" height="40" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="824" value="Аутентификация <br>успешна" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="1">
|
|
||||||
<mxGeometry x="725" y="1505" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="825" value="" style="endArrow=classic;html=1;entryX=0;entryY=0.75;entryDx=0;entryDy=0;exitX=0.969;exitY=0.671;exitDx=0;exitDy=0;jumpStyle=arc;exitPerimeter=0;" edge="1" parent="1" source="737" target="741">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="820.6199999999999" y="857.5" as="sourcePoint"/>
|
|
||||||
<mxPoint x="1720" y="860" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="826" value="Записываем в поле abilities <br>permsissions пользователя для авторизации" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="825">
|
|
||||||
<mxGeometry x="0.1298" y="-2" relative="1" as="geometry">
|
|
||||||
<mxPoint x="-368" y="15" as="offset"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="827" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="1710" y="1359.25" width="20" height="40" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="828" value="" style="edgeStyle=none;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;endArrow=classic;endFill=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="829" target="827">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<mxPoint x="1670" y="1390" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="829" value="" style="rhombus;whiteSpace=wrap;html=1;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="170" y="1350" width="60" height="58.5" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="830" value="" style="endArrow=classic;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;endFill=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="1" source="829" target="809">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="210" y="1155" as="sourcePoint"/>
|
|
||||||
<mxPoint x="200" y="1450" as="targetPoint"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="831" value="Аутентификация <br>успешна" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="830">
|
|
||||||
<mxGeometry x="0.1298" y="-2" relative="1" as="geometry">
|
|
||||||
<mxPoint x="2" y="92" as="offset"/>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="832" value="Проверяем срок жизни <br>sanctum токена.<br>Если остается менее часа,<br>продлеваем на 2 часа<br>" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
|
|
||||||
<mxGeometry x="210" y="1310" width="170" height="60" as="geometry"/>
|
|
||||||
</mxCell>
|
|
||||||
</root>
|
|
||||||
</mxGraphModel>
|
|
||||||
</diagram>
|
|
||||||
</mxfile>
|
|
||||||
+6
-41
@@ -1,55 +1,20 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
use Illuminate\Contracts\Http\Kernel;
|
use Illuminate\Foundation\Application;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
define('LARAVEL_START', microtime(true));
|
define('LARAVEL_START', microtime(true));
|
||||||
|
|
||||||
/*
|
// Determine if the application is in maintenance mode...
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Check If The Application Is Under Maintenance
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| If the application is in maintenance / demo mode via the "down" command
|
|
||||||
| we will load this file so that any pre-rendered content can be shown
|
|
||||||
| instead of starting the framework, which could cause an exception.
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
if (file_exists($maintenance = __DIR__.'/../storage/framework/maintenance.php')) {
|
if (file_exists($maintenance = __DIR__.'/../storage/framework/maintenance.php')) {
|
||||||
require $maintenance;
|
require $maintenance;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
// Register the Composer autoloader...
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Register The Auto Loader
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| Composer provides a convenient, automatically generated class loader for
|
|
||||||
| this application. We just need to utilize it! We'll simply require it
|
|
||||||
| into the script here so we don't need to manually load our classes.
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
require __DIR__.'/../vendor/autoload.php';
|
require __DIR__.'/../vendor/autoload.php';
|
||||||
|
|
||||||
/*
|
// Bootstrap Laravel and handle the request...
|
||||||
|--------------------------------------------------------------------------
|
/** @var Application $app */
|
||||||
| Run The Application
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| Once we have the application, we can handle the incoming request using
|
|
||||||
| the application's HTTP kernel. Then, we will send the response back
|
|
||||||
| to this client's browser, allowing them to enjoy our application.
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
$app = require_once __DIR__.'/../bootstrap/app.php';
|
$app = require_once __DIR__.'/../bootstrap/app.php';
|
||||||
|
|
||||||
$kernel = $app->make(Kernel::class);
|
$app->handleRequest(Request::capture());
|
||||||
|
|
||||||
$response = $kernel->handle(
|
|
||||||
$request = Request::capture()
|
|
||||||
)->send();
|
|
||||||
|
|
||||||
$kernel->terminate($request, $response);
|
|
||||||
|
|||||||
-48249
File diff suppressed because it is too large
Load Diff
Vendored
-30
@@ -1,34 +1,4 @@
|
|||||||
import 'bootstrap';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* We'll load the axios HTTP library which allows us to easily issue requests
|
|
||||||
* to our Laravel back-end. This library automatically handles sending the
|
|
||||||
* CSRF token as a header based on the value of the "XSRF" token cookie.
|
|
||||||
*/
|
|
||||||
|
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
window.axios = axios;
|
window.axios = axios;
|
||||||
|
|
||||||
window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
|
window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
|
||||||
|
|
||||||
/**
|
|
||||||
* Echo exposes an expressive API for subscribing to channels and listening
|
|
||||||
* for events that are broadcast by Laravel. Echo and event broadcasting
|
|
||||||
* allows your team to easily build robust real-time web applications.
|
|
||||||
*/
|
|
||||||
|
|
||||||
// import Echo from 'laravel-echo';
|
|
||||||
|
|
||||||
// import Pusher from 'pusher-js';
|
|
||||||
// window.Pusher = Pusher;
|
|
||||||
|
|
||||||
// window.Echo = new Echo({
|
|
||||||
// broadcaster: 'pusher',
|
|
||||||
// key: import.meta.env.VITE_PUSHER_APP_KEY,
|
|
||||||
// cluster: import.meta.env.VITE_PUSHER_APP_CLUSTER ?? 'mt1',
|
|
||||||
// wsHost: import.meta.env.VITE_PUSHER_HOST ?? `ws-${import.meta.env.VITE_PUSHER_APP_CLUSTER}.pusher.com`,
|
|
||||||
// wsPort: import.meta.env.VITE_PUSHER_PORT ?? 80,
|
|
||||||
// wssPort: import.meta.env.VITE_PUSHER_PORT ?? 443,
|
|
||||||
// forceTLS: (import.meta.env.VITE_PUSHER_SCHEME ?? 'https') === 'https',
|
|
||||||
// enabledTransports: ['ws', 'wss'],
|
|
||||||
// });
|
|
||||||
|
|||||||
@@ -1,28 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html lang="ru">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<title>Laravel + React</title>
|
|
||||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
|
|
||||||
<link rel="stylesheet" href="https://intranet.rencredit.ru/Departments/CS/technical_library/css/normalize-SP.css?v={{ rand(111111, 999999); }}" type="text/css">
|
|
||||||
<link rel="stylesheet" href="https://intranet.rencredit.ru/Departments/CS/technical_library/css/choices.min.css?v={{ rand(111111, 999999); }}" type="text/css">
|
|
||||||
<link rel="stylesheet" href="https://intranet.rencredit.ru/Departments/CS/technical_library/css/style.css?v={{ rand(111111, 999999); }}" type="text/css">
|
|
||||||
<link rel="stylesheet" href="https://intranet.rencredit.ru/Departments/CS/components/css/style.css?v={{ rand(111111, 999999); }}" type="text/css">
|
|
||||||
<link rel="stylesheet" href="./../css/general.css?v={{ rand(111111, 999999); }}" type="text/css">
|
|
||||||
<!-- Без команды ниже корректно не обрабатывается React скрипт -->
|
|
||||||
@viteReactRefresh
|
|
||||||
<!-- Общие React компоненты для всех страниц -->
|
|
||||||
@vite(['resources/js/main_script.tsx'])
|
|
||||||
<!-- Общие React компоненты для всех страниц -->
|
|
||||||
@vite(['resources/css/main_styles.css'])
|
|
||||||
@yield('app_styles')
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<div id=page__header-block data-app_name="{{ $moduleName->getRuModuleName() }}"></div>
|
|
||||||
<div id=page__content-block>
|
|
||||||
@yield('app_content')
|
|
||||||
</div>
|
|
||||||
@yield('app_scripts')
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<title><h3>{!! $mailData['header'] !!}</h3></title>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<p style="margin: 15px 0 50px 0">{!! $mailData['body'] !!}</p>
|
||||||
|
<p>{!! $mailData['footer'] !!}</p>
|
||||||
|
<p><img width="150" height="34" alt="" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJYAAAAiCAYAAAC9WiCBAAAAIGNIUk0AAHomAACAhAAA+gAAAIDoAAB1MAAA6mAAADqYAAAXcJy6UTwAAAAGYktHRAD/AP8A/6C9p5MAAAAJcEhZcwAACxMAAAsTAQCanBgAAAAHdElNRQfpCA4ROwLiaJtLAAAJOklEQVR42u3be4wdVR0H8M/cbbcPCuVVQJ5toRBQgfhAwSKBqAQRVMSoSIIooZJIEKMEjBGJIhQVLEgViaDhIWh9gCKg1igPUXkEEQqoRaAUbKu0S6F0t+29/vGbYefOzL13dyvsbtlvMtm7Z875zTlnfuf8fr/v70yijK6KsjoaBo9aeuXbNlJ5oxJ1Z2Y/90v4OL6CFQ11NRcMd/dGDJLC/7vgTEzVrww1/A7fG6Ts7XAWpuVkdeEuXGqUKVfD2RrWZlM2PuFinIxP03VJw3okas4f7q6OCBQV6zDcjO5C+SN4F5YMQvaJQhmLz7gDR+D54R78QFF3lkRdQ6Kh0VWTzMEF2AxPCQW7uX8ljilXrfD/rhhXUW9PHDkIuVPwEWWlgu3FjjgasXtNchHmCqWCncUCOgPbDHcHRwqKijWzoiyr9yEDV4iDcGCLe9sI5RpFaKAh4QScKhZOHq/B2QmHJoOWvWmiVvg9o03dAzB7ADLH4Tjlyc8wBTsN98AHg0Qi3Xy/jS/h2UKVxfgUbh3uvo4U5BVrMnZrU3eyUJjxHWS+VvhjrdCtvQKPZDyzt/PPwWlYlZYtxsdIrsTqoYTOmyLyirUlduhQ/x3Yt0OdY4VpaIeZwz3wwSBxnsRcNDzsTHXJtbgCG3Ae7qAuKIcxx51mxdoB23aovx0+2Ob+LjhmAM+drhx5jngk5mog0ag3uASnY0HGpozxWNV4H/pknmrr6xGhGFWYI1ZxJxn3YKtB9G0LEX3NEMq9sUpZw9bC9O8mdutB+d0fto/5DneIXQfTbIIIXGak49liI8cxYpGnFmYo+089gm/KO9sZ9XBpoe5UQTHkd8H1+Bf20PzithO748o2fevGW/F+EThsn/ZvNf4uHOUbhK9zKi+94YX4eQuZk4U5fy/2F8oFK3AffoLfp/U+mfZxFS7H8rRuguOus2j/6yyqp+N9FN9Px1uFmWLhHordBVWxHstwL36GO9E7tNc4svEt5Z3lfnwB6wrlt4lVnseReKFQbxE+n05Yvnw1Dm7Tl50xXyheq12vLsjW04ViZOXfaCFzD1yDNW1k9ogFc2quz8uwT05OFxYU2i3ExIpnduMTeFj7HbwHVwql26QwAb+oGPBNmIW/FcrXiFWfn8BrKtp/VfBZPYXy9Ti+RV+mi92okznNrl79ucwGvlYhcxZuH4TM53O/n8beOVld+FGh/q+VFatbLMo1g3juHdjrlX31Lw8yszVF7BJFLME/0onMY5KgHjJfZ1+8s1DnGVwvXkzR5HWpphw2w5dV0xV1rBW7Zx7d2vtHU0SiuIqDe0Hsdi9U9GNjcbzYrSdV3OtTbTbfJqLMUe97ZYq1rfB7ingi/bsATxbuHSb8FCJSnFa4fyseFLvV8grZM5QV4kjlqHOdyF/OwbsFnXEh/j3AMR4t/Js8VuGbOEr4XEeLpHLP/2leZ+Kzykp1Hz4nIueP4jv4b6HOUdpH3qMKhyj7RxuEM04oQJUPNleYrkeVfYbD0rbjhXNabLtQOMkZJuGXhTrrhDmtWsGHi8CgKDdvCifiRmUzd5KyUtdwSsU8DMUUnlbRr18pR9OJCE6erpibVpmLUYUTNPspDTyn2XwcKFZXkXq4SGzr+fIbNa/WC5UnepFmInUvcVIgX+cW7c3CycqBRV6xdhe7bv7+9cKnrMIE/NjGKVa3iFbz95fiDW3GcQruxl/SvzdpnwUZ8cjohpnKK7hH+EkZ7sNvRDI6wywR5ucPB/YJR/7FXNkTypgmzG/2jF31h//EC/mpUPBWuCWV3Sqa2lGZL1uodVjfK86eHbsRc7qlcmbhTjzQps13cXVh7C8axagJpZhecW+ZZqe7Nx38mkL7oh9xj1DAPB5Xdro318yPbaWZR+sTpq4dVmrva03UzNXVdfajntWajxoIJimbscc7yNwgKJjsej4tG7WoCT9nesW9pekg8/gD/thGXh3XKmf/lyof7JtQeG5mTvN9q+KG8hintVmTPrOvILPTkZ2dVJ9JGyjqykoxYSiCRjNqWp+Pelx5l1ktFKfV6ntU8GFFLFNWNpoph+WCTsgwXnu/hDA509vcf0rQCXkcobVjvEV6f2PwXMUz9xM7dCvsK0jZ7JqjcyJ/xOMgZae8IRjtKuwg/K0qgu+cFm02F+Rfsf4C/eZvR+HQF4OD17WQOVGkWtpFheOVidte1fxSxncVg4HBOu8JLivcX6M/wi5iqjI5/ZjRe7ToJRwnHMX8wPrwgTZtzlB+oUu0VoIuXFfR5s/6U0OtKI3b8Xb9ilATu9RFYodrp1gELVFk/teIvOBJIoMwR1AdvRXyhkI3HF0xp4+lc5pRLImI/C5TjqqvUP211KjC2RWTuRJvbtNmFv5ZaHOZ6mPNGc6veM4TmiOoA5Q5nQb+IyLAy4WCPlJRp5VijRdkaFXdutih6m3kDUWxNhcRbVHWc2ndS/EDPFRRZ5lg4Ec9rq4Y3GLtfRf4umZFPLhD/ZMrntMjTHGGBJ9RvXMM9KrKFU5Lx1kfgryh5gr3Vzbtna4+8fndqD86X1Od9Fyh2tnO44didRHc0N0d6i9R5o+m0HSgqSFONZyrHJFWIXvxnb5RXCHOpH9ROTWVl/WAMIkbCuUN7VGlCPeLozd/HcA4CMZ/LuYN4HkjHuPEas52iKxssc4E3QOCIT4GV2mO6KrwlDBp2+aeVVNOfq8VaZwHRWrkTZpTP3l5Vwnycb4gV7u0Jj9XCef8epHkfqP+j2mfEQvjZrwnvTL0aubu6E8ir0/nKz9/edwm8n6ni3xlVaS3VgRDFwvzuc4mgESYsFqh7GlxmK4Tdkyvh3RWxInCPOQ5nUTsII+1aLOV8LveIna2icLsPiSc+oeFMr1evylaqp/pT0Rie0+xq9XEorkhvZ/1pTdX/0qR4spwl6AgenJ19hZZg0b6/7NiIbTaOcelbWanf7dOn7lEKPSflJPRY3iFkBhapHSuZj9mufJpB0LpThQ7W77+vJdhLF02AT/q1Y4DRNqnGHldIqiG2eKoynxlpVopTn6MYQwl1MRHplURYa9I+7SKQufp/B3lGF7FmCp2pIF8hZTxW9coH14cwxhKmCy4tHuVWfHsWifynWcZ3OdpYyjg1ehA7iz8ptniy53JQqGeFCmm3wrlGsNG4H8h23sE7JXaQwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAyNS0wOC0xNFQxNzo1ODo0MSswMDowML3iBaUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMjUtMDgtMTRUMTc6NTg6NDErMDA6MDDMv70ZAAAAKHRFWHRkYXRlOnRpbWVzdGFtcAAyMDI1LTA4LTE0VDE3OjU5OjAyKzAwOjAwwcrjnwAAAABJRU5ErkJggg=="></p>
|
||||||
|
<br><h2>{{ $appName }}</h2>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
*
|
*
|
||||||
|
!private/
|
||||||
!public/
|
!public/
|
||||||
!.gitignore
|
!.gitignore
|
||||||
|
|||||||
+13
-24
@@ -1,29 +1,18 @@
|
|||||||
import { defineConfig } from 'vite';
|
import { defineConfig } from 'vite';
|
||||||
import laravel from 'laravel-vite-plugin';
|
import laravel from 'laravel-vite-plugin';
|
||||||
import react from '@vitejs/plugin-react'; // Подключите плагин React
|
import tailwindcss from '@tailwindcss/vite';
|
||||||
import { globbySync } from 'globby'; //Пакет для универсального указания файлов разлиных модулей
|
|
||||||
|
|
||||||
// Ищем все JS/CS точки входа во всех модулях
|
|
||||||
const moduleEntries = globbySync([
|
|
||||||
'Modules/*/resources/js/app.{jsx,tsx}', // Все app.jsx и app.tsx в подпапках Modules
|
|
||||||
'Modules/*/resources/css/app.css', // Все app.css
|
|
||||||
]);
|
|
||||||
|
|
||||||
export default defineConfig({
|
export default defineConfig({
|
||||||
plugins: [
|
plugins: [
|
||||||
laravel({
|
laravel({
|
||||||
// Укажите входные точки
|
input: ['resources/css/app.css', 'resources/js/app.js'],
|
||||||
input: [
|
refresh: true,
|
||||||
'resources/css/app.css',
|
}),
|
||||||
'resources/js/app.tsx',
|
tailwindcss(),
|
||||||
//Благодаря переменной ниже, мы можем не указывать каждый входной jsx и css скрипты для каждого модуля
|
],
|
||||||
...moduleEntries,
|
server: {
|
||||||
],
|
watch: {
|
||||||
refresh: true,
|
ignored: ['**/storage/framework/views/**'],
|
||||||
}),
|
},
|
||||||
react(), // Подключаем плагин React
|
},
|
||||||
],
|
|
||||||
esbuild: {
|
|
||||||
loader: 'tsx', // Важно для обработки TypeScript
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user