Compare commits
7 Commits
trash
..
2de3e54b30
| Author | SHA1 | Date | |
|---|---|---|---|
| 2de3e54b30 | |||
| 3e5bbed09c | |||
| f23bca90fd | |||
| e261c55a47 | |||
| bcdaaa214d | |||
| 1ff87d2403 | |||
| 8dc2f787f5 |
+1
-1
@@ -14,5 +14,5 @@ trim_trailing_whitespace = false
|
|||||||
[*.{yml,yaml}]
|
[*.{yml,yaml}]
|
||||||
indent_size = 2
|
indent_size = 2
|
||||||
|
|
||||||
[docker-compose.yml]
|
[compose.yaml]
|
||||||
indent_size = 4
|
indent_size = 4
|
||||||
|
|||||||
+4
-4
@@ -47,12 +47,12 @@ REDIS_HOST=127.0.0.1
|
|||||||
REDIS_PASSWORD=null
|
REDIS_PASSWORD=null
|
||||||
REDIS_PORT=6379
|
REDIS_PORT=6379
|
||||||
|
|
||||||
MAIL_MAILER=log
|
MAIL_MAILER=smtp
|
||||||
MAIL_SCHEME=null
|
MAIL_HOST=mailpit
|
||||||
MAIL_HOST=127.0.0.1
|
MAIL_PORT=1025
|
||||||
MAIL_PORT=2525
|
|
||||||
MAIL_USERNAME=null
|
MAIL_USERNAME=null
|
||||||
MAIL_PASSWORD=null
|
MAIL_PASSWORD=null
|
||||||
|
MAIL_ENCRYPTION=null
|
||||||
MAIL_FROM_ADDRESS="hello@example.com"
|
MAIL_FROM_ADDRESS="hello@example.com"
|
||||||
MAIL_FROM_NAME="${APP_NAME}"
|
MAIL_FROM_NAME="${APP_NAME}"
|
||||||
|
|
||||||
|
|||||||
@@ -1,67 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace Modules\Test\App\Http\Controllers;
|
|
||||||
|
|
||||||
use App\Http\Controllers\Controller;
|
|
||||||
use Illuminate\Http\RedirectResponse;
|
|
||||||
use Illuminate\Http\Request;
|
|
||||||
use Illuminate\Http\Response;
|
|
||||||
|
|
||||||
class TestController extends Controller
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Display a listing of the resource.
|
|
||||||
*/
|
|
||||||
public function index()
|
|
||||||
{
|
|
||||||
return view('test::index');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Show the form for creating a new resource.
|
|
||||||
*/
|
|
||||||
public function create()
|
|
||||||
{
|
|
||||||
return view('test::create');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Store a newly created resource in storage.
|
|
||||||
*/
|
|
||||||
public function store(Request $request): RedirectResponse
|
|
||||||
{
|
|
||||||
//
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Show the specified resource.
|
|
||||||
*/
|
|
||||||
public function show($id)
|
|
||||||
{
|
|
||||||
return view('test::show');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Show the form for editing the specified resource.
|
|
||||||
*/
|
|
||||||
public function edit($id)
|
|
||||||
{
|
|
||||||
return view('test::edit');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Update the specified resource in storage.
|
|
||||||
*/
|
|
||||||
public function update(Request $request, $id): RedirectResponse
|
|
||||||
{
|
|
||||||
//
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Remove the specified resource from storage.
|
|
||||||
*/
|
|
||||||
public function destroy($id)
|
|
||||||
{
|
|
||||||
//
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,59 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace Modules\Test\App\Providers;
|
|
||||||
|
|
||||||
use Illuminate\Support\Facades\Route;
|
|
||||||
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
|
|
||||||
|
|
||||||
class RouteServiceProvider extends ServiceProvider
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* The module namespace to assume when generating URLs to actions.
|
|
||||||
*/
|
|
||||||
protected string $moduleNamespace = 'Modules\Test\App\Http\Controllers';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Called before routes are registered.
|
|
||||||
*
|
|
||||||
* Register any model bindings or pattern based filters.
|
|
||||||
*/
|
|
||||||
public function boot(): void
|
|
||||||
{
|
|
||||||
parent::boot();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Define the routes for the application.
|
|
||||||
*/
|
|
||||||
public function map(): void
|
|
||||||
{
|
|
||||||
$this->mapApiRoutes();
|
|
||||||
|
|
||||||
$this->mapWebRoutes();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Define the "web" routes for the application.
|
|
||||||
*
|
|
||||||
* These routes all receive session state, CSRF protection, etc.
|
|
||||||
*/
|
|
||||||
protected function mapWebRoutes(): void
|
|
||||||
{
|
|
||||||
Route::middleware('web')
|
|
||||||
->namespace($this->moduleNamespace)
|
|
||||||
->group(module_path('Test', '/routes/web.php'));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Define the "api" routes for the application.
|
|
||||||
*
|
|
||||||
* These routes are typically stateless.
|
|
||||||
*/
|
|
||||||
protected function mapApiRoutes(): void
|
|
||||||
{
|
|
||||||
Route::prefix('api')
|
|
||||||
->middleware('api')
|
|
||||||
->namespace($this->moduleNamespace)
|
|
||||||
->group(module_path('Test', '/routes/api.php'));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,114 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace Modules\Test\App\Providers;
|
|
||||||
|
|
||||||
use Illuminate\Support\Facades\Blade;
|
|
||||||
use Illuminate\Support\ServiceProvider;
|
|
||||||
|
|
||||||
class TestServiceProvider extends ServiceProvider
|
|
||||||
{
|
|
||||||
protected string $moduleName = 'Test';
|
|
||||||
|
|
||||||
protected string $moduleNameLower = 'test';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Boot the application events.
|
|
||||||
*/
|
|
||||||
public function boot(): void
|
|
||||||
{
|
|
||||||
$this->registerCommands();
|
|
||||||
$this->registerCommandSchedules();
|
|
||||||
$this->registerTranslations();
|
|
||||||
$this->registerConfig();
|
|
||||||
$this->registerViews();
|
|
||||||
$this->loadMigrationsFrom(module_path($this->moduleName, 'Database/migrations'));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Register the service provider.
|
|
||||||
*/
|
|
||||||
public function register(): void
|
|
||||||
{
|
|
||||||
$this->app->register(RouteServiceProvider::class);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Register commands in the format of Command::class
|
|
||||||
*/
|
|
||||||
protected function registerCommands(): void
|
|
||||||
{
|
|
||||||
// $this->commands([]);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Register command Schedules.
|
|
||||||
*/
|
|
||||||
protected function registerCommandSchedules(): void
|
|
||||||
{
|
|
||||||
// $this->app->booted(function () {
|
|
||||||
// $schedule = $this->app->make(Schedule::class);
|
|
||||||
// $schedule->command('inspire')->hourly();
|
|
||||||
// });
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Register translations.
|
|
||||||
*/
|
|
||||||
public function registerTranslations(): void
|
|
||||||
{
|
|
||||||
$langPath = resource_path('lang/modules/'.$this->moduleNameLower);
|
|
||||||
|
|
||||||
if (is_dir($langPath)) {
|
|
||||||
$this->loadTranslationsFrom($langPath, $this->moduleNameLower);
|
|
||||||
$this->loadJsonTranslationsFrom($langPath);
|
|
||||||
} else {
|
|
||||||
$this->loadTranslationsFrom(module_path($this->moduleName, 'lang'), $this->moduleNameLower);
|
|
||||||
$this->loadJsonTranslationsFrom(module_path($this->moduleName, 'lang'));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Register config.
|
|
||||||
*/
|
|
||||||
protected function registerConfig(): void
|
|
||||||
{
|
|
||||||
$this->publishes([module_path($this->moduleName, 'config/config.php') => config_path($this->moduleNameLower.'.php')], 'config');
|
|
||||||
$this->mergeConfigFrom(module_path($this->moduleName, 'config/config.php'), $this->moduleNameLower);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Register views.
|
|
||||||
*/
|
|
||||||
public function registerViews(): void
|
|
||||||
{
|
|
||||||
$viewPath = resource_path('views/modules/'.$this->moduleNameLower);
|
|
||||||
$sourcePath = module_path($this->moduleName, 'resources/views');
|
|
||||||
|
|
||||||
$this->publishes([$sourcePath => $viewPath], ['views', $this->moduleNameLower.'-module-views']);
|
|
||||||
|
|
||||||
$this->loadViewsFrom(array_merge($this->getPublishableViewPaths(), [$sourcePath]), $this->moduleNameLower);
|
|
||||||
|
|
||||||
$componentNamespace = str_replace('/', '\\', config('modules.namespace').'\\'.$this->moduleName.'\\'.config('modules.paths.generator.component-class.path'));
|
|
||||||
Blade::componentNamespace($componentNamespace, $this->moduleNameLower);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the services provided by the provider.
|
|
||||||
*/
|
|
||||||
public function provides(): array
|
|
||||||
{
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
|
|
||||||
private function getPublishableViewPaths(): array
|
|
||||||
{
|
|
||||||
$paths = [];
|
|
||||||
foreach (config('view.paths') as $path) {
|
|
||||||
if (is_dir($path.'/modules/'.$this->moduleNameLower)) {
|
|
||||||
$paths[] = $path.'/modules/'.$this->moduleNameLower;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return $paths;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace Modules\Test\Database\Seeders;
|
|
||||||
|
|
||||||
use Illuminate\Database\Seeder;
|
|
||||||
|
|
||||||
class TestDatabaseSeeder extends Seeder
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Run the database seeds.
|
|
||||||
*/
|
|
||||||
public function run(): void
|
|
||||||
{
|
|
||||||
// $this->call([]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "nwidart/test",
|
|
||||||
"description": "",
|
|
||||||
"authors": [
|
|
||||||
{
|
|
||||||
"name": "Nicolas Widart",
|
|
||||||
"email": "n.widart@gmail.com"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"extra": {
|
|
||||||
"laravel": {
|
|
||||||
"providers": [],
|
|
||||||
"aliases": {
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"autoload": {
|
|
||||||
"psr-4": {
|
|
||||||
"Modules\\Test\\": "",
|
|
||||||
"Modules\\Test\\App\\": "app/",
|
|
||||||
"Modules\\Test\\Database\\Factories\\": "database/factories/",
|
|
||||||
"Modules\\Test\\Database\\Seeders\\": "database/seeders/"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"autoload-dev": {
|
|
||||||
"psr-4": {
|
|
||||||
"Modules\\Test\\Tests\\": "tests/"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
return [
|
|
||||||
'name' => 'Test',
|
|
||||||
];
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "Test",
|
|
||||||
"alias": "test",
|
|
||||||
"description": "",
|
|
||||||
"keywords": [],
|
|
||||||
"priority": 0,
|
|
||||||
"providers": [
|
|
||||||
"Modules\\Test\\App\\Providers\\TestServiceProvider"
|
|
||||||
],
|
|
||||||
"files": []
|
|
||||||
}
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
{
|
|
||||||
"private": true,
|
|
||||||
"type": "module",
|
|
||||||
"scripts": {
|
|
||||||
"dev": "vite",
|
|
||||||
"build": "vite build"
|
|
||||||
},
|
|
||||||
"devDependencies": {
|
|
||||||
"axios": "^1.1.2",
|
|
||||||
"laravel-vite-plugin": "^0.7.5",
|
|
||||||
"sass": "^1.69.5",
|
|
||||||
"postcss": "^8.3.7",
|
|
||||||
"vite": "^4.0.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
@extends('test::layouts.master')
|
|
||||||
|
|
||||||
@section('content')
|
|
||||||
<h1>Hello World</h1>
|
|
||||||
|
|
||||||
<p>Module: {!! config('test.name') !!}</p>
|
|
||||||
@endsection
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
|
|
||||||
|
|
||||||
<head>
|
|
||||||
<meta charset="utf-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
|
||||||
<meta name="csrf-token" content="{{ csrf_token() }}">
|
|
||||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
|
||||||
|
|
||||||
<title>Test Module - {{ config('app.name', 'Laravel') }}</title>
|
|
||||||
|
|
||||||
<meta name="description" content="{{ $description ?? '' }}">
|
|
||||||
<meta name="keywords" content="{{ $keywords ?? '' }}">
|
|
||||||
<meta name="author" content="{{ $author ?? '' }}">
|
|
||||||
|
|
||||||
<!-- Fonts -->
|
|
||||||
<link rel="preconnect" href="https://fonts.bunny.net">
|
|
||||||
<link href="https://fonts.bunny.net/css?family=figtree:400,500,600&display=swap" rel="stylesheet" />
|
|
||||||
|
|
||||||
{{-- Vite CSS --}}
|
|
||||||
{{-- {{ module_vite('build-test', 'resources/assets/sass/app.scss') }} --}}
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body>
|
|
||||||
@yield('content')
|
|
||||||
|
|
||||||
{{-- Vite JS --}}
|
|
||||||
{{-- {{ module_vite('build-test', 'resources/assets/js/app.js') }} --}}
|
|
||||||
</body>
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
use Illuminate\Http\Request;
|
|
||||||
use Illuminate\Support\Facades\Route;
|
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| API Routes
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| Here is where you can register API routes for your application. These
|
|
||||||
| routes are loaded by the RouteServiceProvider within a group which
|
|
||||||
| is assigned the "api" middleware group. Enjoy building your API!
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
Route::middleware(['auth:sanctum'])->prefix('v1')->name('api.')->group(function () {
|
|
||||||
Route::get('test', fn (Request $request) => $request->user())->name('test');
|
|
||||||
});
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
use Illuminate\Support\Facades\Route;
|
|
||||||
use Modules\Test\App\Http\Controllers\TestController;
|
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Web Routes
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| Here is where you can register web routes for your application. These
|
|
||||||
| routes are loaded by the RouteServiceProvider within a group which
|
|
||||||
| contains the "web" middleware group. Now create something great!
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
Route::group([], function () {
|
|
||||||
Route::resource('test', TestController::class)->names('test');
|
|
||||||
});
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
import { defineConfig } from 'vite';
|
|
||||||
import laravel from 'laravel-vite-plugin';
|
|
||||||
|
|
||||||
export default defineConfig({
|
|
||||||
build: {
|
|
||||||
outDir: '../../public/build-test',
|
|
||||||
emptyOutDir: true,
|
|
||||||
manifest: true,
|
|
||||||
},
|
|
||||||
plugins: [
|
|
||||||
laravel({
|
|
||||||
publicDirectory: '../../public',
|
|
||||||
buildDirectory: 'build-test',
|
|
||||||
input: [
|
|
||||||
__dirname + '/resources/assets/sass/app.scss',
|
|
||||||
__dirname + '/resources/assets/js/app.js'
|
|
||||||
],
|
|
||||||
refresh: true,
|
|
||||||
}),
|
|
||||||
],
|
|
||||||
});
|
|
||||||
|
|
||||||
//export const paths = [
|
|
||||||
// 'Modules/$STUDLY_NAME$/resources/assets/sass/app.scss',
|
|
||||||
// 'Modules/$STUDLY_NAME$/resources/assets/js/app.js',
|
|
||||||
//];
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Console\Commands;
|
|
||||||
|
|
||||||
use Illuminate\Console\Command;
|
|
||||||
use App\Models\TestData;
|
|
||||||
|
|
||||||
class testDataCommand extends Command
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* The name and signature of the console command.
|
|
||||||
*
|
|
||||||
* @var string
|
|
||||||
*/
|
|
||||||
protected $signature = 'data_base:test-data-command';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The console command description.
|
|
||||||
*
|
|
||||||
* @var string
|
|
||||||
*/
|
|
||||||
protected $description = 'Тестовая команда';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Execute the console command.
|
|
||||||
*/
|
|
||||||
public function handle()
|
|
||||||
{
|
|
||||||
$testDataModel = new TestData;
|
|
||||||
$test = TestData::where('test_char', 'hellos')->get();
|
|
||||||
var_dump($test);
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Http\Controllers;
|
|
||||||
|
|
||||||
use Illuminate\Http\Request;
|
|
||||||
use App\Models\AccessModel;
|
|
||||||
|
|
||||||
class AccessListController extends Controller
|
|
||||||
{
|
|
||||||
public function getAccess($id = null)
|
|
||||||
{
|
|
||||||
$accessListModel = new AccessModel();
|
|
||||||
$accessListData = $accessListModel::where(['access_id' => $id])->select('access_id')->get();
|
|
||||||
if ($id) {
|
|
||||||
echo '<pre>'; var_dump($accessListData->toArray()); echo'</pre>';
|
|
||||||
} else {
|
|
||||||
var_dump($accessListModel::all());
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public function postAccess(Request $rqst)
|
|
||||||
{
|
|
||||||
$accessListModel = new AccessModel();
|
|
||||||
$accessListModel->role = $rqst['role'];
|
|
||||||
$accessListModel->title = $rqst['title'];
|
|
||||||
$accessListModel->save();
|
|
||||||
}
|
|
||||||
|
|
||||||
public function delAccess($id)
|
|
||||||
{
|
|
||||||
$accessListModel = new AccessModel();
|
|
||||||
//$accessListModel::where(['access_id' => $id])->delete();
|
|
||||||
$accessListModel::destroy($id);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,53 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Http\Controllers;
|
|
||||||
|
|
||||||
use Illuminate\Http\Request;
|
|
||||||
use Illuminate\Http\Response;
|
|
||||||
use Illuminate\Support\Facades\DB;
|
|
||||||
|
|
||||||
class TestController extends Controller
|
|
||||||
{
|
|
||||||
public function getRoles()
|
|
||||||
{
|
|
||||||
$roles = DB::connection('mysql')->table('arch_lk_access_list')->select(['*'])->get();
|
|
||||||
return view('roles', ['roles' => $roles]);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public function getAccess($id)
|
|
||||||
{
|
|
||||||
$roles = DB::connection('mysql')->table('arch_lk_access_list')->select(['*'])->where('access_id', '=', $id)->get();
|
|
||||||
$response = new Response(json_encode($roles[0]));
|
|
||||||
$response->header('Content-type', 'text/plain');
|
|
||||||
$response->header('Access-Control-Allow-Methods', 'POST');
|
|
||||||
|
|
||||||
return $response;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public function redirect()
|
|
||||||
{
|
|
||||||
// return redirect()->away('https://google.com');
|
|
||||||
//return redirect()->action([TestController::class, 'getAccess'], ['id' => 3]);
|
|
||||||
return redirect()->route('getAccessById', ['id' => 2]);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getParam(Request $rqst)
|
|
||||||
{
|
|
||||||
//echo '<pre>'; var_dump($rqst->cookie('test_cookie')); echo'</pre>';
|
|
||||||
//return response('test')->cookie('test_cookie', $rqst->id);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function setRole(Request $rqst)
|
|
||||||
{
|
|
||||||
$lastInsert = DB::connection('mysql')->table('arch_lk_access_list')->insertGetId(['role' => $rqst->roleName, 'title' => $rqst->roleTitle]);
|
|
||||||
return redirect()->route('get_role');
|
|
||||||
}
|
|
||||||
|
|
||||||
public function delRole(Request $rqst)
|
|
||||||
{
|
|
||||||
$lastInsert = DB::connection('mysql')->table('arch_lk_access_list')->where('access_id', '=', $rqst->access_id)->delete();
|
|
||||||
return redirect()->route('get_role');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Http\Controllers;
|
|
||||||
|
|
||||||
use Illuminate\Http\Request;
|
|
||||||
use App\Models\TestData;
|
|
||||||
|
|
||||||
class TestDataController extends Controller
|
|
||||||
{
|
|
||||||
public function insertNewData(Request $rqst)
|
|
||||||
{
|
|
||||||
$model = new TestData;
|
|
||||||
$model->test_int = $rqst->int;
|
|
||||||
$model->test_char = $rqst->char;
|
|
||||||
|
|
||||||
$model->save();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Http\Controllers;
|
|
||||||
|
|
||||||
use App\Models\TestFormModel;
|
|
||||||
use Illuminate\Http\Request;
|
|
||||||
|
|
||||||
class TestFormController extends Controller
|
|
||||||
{
|
|
||||||
public function getForm()
|
|
||||||
{
|
|
||||||
return view('test_form');
|
|
||||||
}
|
|
||||||
|
|
||||||
public function setForm(Request $rqst)
|
|
||||||
{
|
|
||||||
$testTable = new TestFormModel;
|
|
||||||
$testTable->first_name = $rqst->first_name;
|
|
||||||
$testTable->last_name = $rqst->last_name;
|
|
||||||
$testTable->department_name = $rqst->department_name;
|
|
||||||
$testTable->save();
|
|
||||||
|
|
||||||
return redirect('/test_table');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -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,17 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Models;
|
|
||||||
|
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
|
||||||
|
|
||||||
class AccessModel extends Model
|
|
||||||
{
|
|
||||||
use HasFactory;
|
|
||||||
|
|
||||||
protected $connection = 'mysql';
|
|
||||||
protected $table = 'tm_lk_access_list';
|
|
||||||
public $timestamps = false;
|
|
||||||
protected $primaryKey = 'access_id';
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Models;
|
|
||||||
|
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
|
||||||
|
|
||||||
class TestData extends Model
|
|
||||||
{
|
|
||||||
use HasFactory;
|
|
||||||
protected $table = 'test_data';
|
|
||||||
protected $connection = 'mysql';
|
|
||||||
}
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Models;
|
|
||||||
|
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
|
||||||
|
|
||||||
class TestFormModel extends Model
|
|
||||||
{
|
|
||||||
use HasFactory;
|
|
||||||
|
|
||||||
protected $connection = 'mysql';
|
|
||||||
}
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Providers;
|
|
||||||
|
|
||||||
// use Illuminate\Support\Facades\Gate;
|
|
||||||
use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Провайдер для регистрации сервиса аутентификации
|
|
||||||
*/
|
|
||||||
class AuthServiceProvider extends ServiceProvider
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* The model to policy mappings for the application.
|
|
||||||
*
|
|
||||||
* @var array<class-string, class-string>
|
|
||||||
*/
|
|
||||||
protected $policies = [
|
|
||||||
//
|
|
||||||
];
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Register any authentication / authorization services.
|
|
||||||
*/
|
|
||||||
public function boot(): void
|
|
||||||
{
|
|
||||||
//
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Providers;
|
|
||||||
|
|
||||||
use Illuminate\Support\Facades\Broadcast;
|
|
||||||
use Illuminate\Support\ServiceProvider;
|
|
||||||
|
|
||||||
class BroadcastServiceProvider extends ServiceProvider
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Bootstrap any application services.
|
|
||||||
*/
|
|
||||||
public function boot(): void
|
|
||||||
{
|
|
||||||
Broadcast::routes();
|
|
||||||
|
|
||||||
require base_path('routes/channels.php');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Providers;
|
|
||||||
|
|
||||||
use Illuminate\Auth\Events\Registered;
|
|
||||||
use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
|
|
||||||
use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
|
|
||||||
use Illuminate\Support\Facades\Event;
|
|
||||||
|
|
||||||
class EventServiceProvider extends ServiceProvider
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* The event to listener mappings for the application.
|
|
||||||
*
|
|
||||||
* @var array<class-string, array<int, class-string>>
|
|
||||||
*/
|
|
||||||
protected $listen = [
|
|
||||||
Registered::class => [
|
|
||||||
SendEmailVerificationNotification::class,
|
|
||||||
],
|
|
||||||
];
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Register any events for your application.
|
|
||||||
*/
|
|
||||||
public function boot(): void
|
|
||||||
{
|
|
||||||
//
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Determine if events and listeners should be automatically discovered.
|
|
||||||
*/
|
|
||||||
public function shouldDiscoverEvents(): bool
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+1
-4
@@ -119,8 +119,5 @@ return [
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
'maintenance' => [
|
'maintenance' => [
|
||||||
'driver' => env('APP_MAINTENANCE_DRIVER', 'file'),
|
'mail_test_addressee' => env('MAIL_TEST_ADDRESSEE'),
|
||||||
'store' => env('APP_MAINTENANCE_STORE', 'database'),
|
|
||||||
],
|
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|||||||
+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'),
|
|
||||||
],
|
|
||||||
],
|
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -2,21 +2,24 @@
|
|||||||
|
|
||||||
namespace Database\Seeders;
|
namespace Database\Seeders;
|
||||||
|
|
||||||
// use Illuminate\Database\Console\Seeds\WithoutModelEvents;
|
use App\Models\User;
|
||||||
|
use Illuminate\Database\Console\Seeds\WithoutModelEvents;
|
||||||
use Illuminate\Database\Seeder;
|
use Illuminate\Database\Seeder;
|
||||||
|
|
||||||
class DatabaseSeeder extends Seeder
|
class DatabaseSeeder extends Seeder
|
||||||
{
|
{
|
||||||
|
use WithoutModelEvents;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Seed the application's database.
|
* Seed the application's database.
|
||||||
*/
|
*/
|
||||||
public function run(): void
|
public function run(): void
|
||||||
{
|
{
|
||||||
// \App\Models\User::factory(10)->create();
|
// User::factory(10)->create();
|
||||||
|
|
||||||
// \App\Models\User::factory()->create([
|
User::factory()->create([
|
||||||
// 'name' => 'Test User',
|
'name' => 'Test User',
|
||||||
// 'email' => 'test@example.com',
|
'email' => 'test@example.com',
|
||||||
// ]);
|
]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+7
-4
@@ -19,14 +19,17 @@
|
|||||||
</source>
|
</source>
|
||||||
<php>
|
<php>
|
||||||
<env name="APP_ENV" value="testing"/>
|
<env name="APP_ENV" value="testing"/>
|
||||||
|
<env name="APP_MAINTENANCE_DRIVER" value="file"/>
|
||||||
<env name="BCRYPT_ROUNDS" value="4"/>
|
<env name="BCRYPT_ROUNDS" value="4"/>
|
||||||
<env name="CACHE_DRIVER" value="array"/>
|
<env name="BROADCAST_CONNECTION" value="null"/>
|
||||||
<!-- <env name="DB_CONNECTION" value="sqlite"/> -->
|
<env name="CACHE_STORE" value="array"/>
|
||||||
<!-- <env name="DB_DATABASE" value=":memory:"/> -->
|
<env name="DB_CONNECTION" value="sqlite"/>
|
||||||
|
<env name="DB_DATABASE" value=":memory:"/>
|
||||||
<env name="MAIL_MAILER" value="array"/>
|
<env name="MAIL_MAILER" value="array"/>
|
||||||
<env name="PULSE_ENABLED" value="false"/>
|
|
||||||
<env name="QUEUE_CONNECTION" value="sync"/>
|
<env name="QUEUE_CONNECTION" value="sync"/>
|
||||||
<env name="SESSION_DRIVER" value="array"/>
|
<env name="SESSION_DRIVER" value="array"/>
|
||||||
|
<env name="PULSE_ENABLED" value="false"/>
|
||||||
<env name="TELESCOPE_ENABLED" value="false"/>
|
<env name="TELESCOPE_ENABLED" value="false"/>
|
||||||
|
<env name="NIGHTWATCH_ENABLED" value="false"/>
|
||||||
</php>
|
</php>
|
||||||
</phpunit>
|
</phpunit>
|
||||||
|
|||||||
@@ -1,32 +0,0 @@
|
|||||||
import { useState } from 'react';
|
|
||||||
import { MagicPopupType } from '../../components/MagicPopupContainer';
|
|
||||||
|
|
||||||
export const MagicPopupHook = () => {
|
|
||||||
// //Стейт с набором попапов для отрисовки
|
|
||||||
// const [popupArr, setPopupArr] = useState<MagicPopupType[] | []>( [] );
|
|
||||||
// //ИСПОЛЬЗОВАНИЕ USECALLBACK? я не использую его для функций удаления и добавления новых попапов в этом хуке, что должно приводить к созданию новых экземпляров функций каждый вызов хука (удаление, добавления попапа). Функция добавления попапа является пропсом для TaxiForm, значит, содание нового экземпляра функции добавления попапа в хуке должно вызывать перерендер TaxiForm? Но я его не замечаю (нет мигания в дом дереве элемента где рендерится TaxiForm ни при создании, не при удалении попапа)
|
|
||||||
|
|
||||||
// //Колбэк для добавление нового попапа. Его нужно передавать в каждый компонент, где планируется вызывать попапы. В аргументы этого колбэка передаются объекты с информацией для каждого попапа (текст, таймер и т.д.)
|
|
||||||
// function addPopup (newPopupArrData: MagicPopupType[]) {
|
|
||||||
// setPopupArr(prev => {
|
|
||||||
// //Конкатенируем предыдущее состояние набора попапов и новые попапы, присваивая новому попапу параметр id с уникальным рандомным значением
|
|
||||||
// return [...prev, ...newPopupArrData].map(popup => popup.id ? popup : {...popup, id: getRandomId()})
|
|
||||||
// });
|
|
||||||
// };
|
|
||||||
|
|
||||||
// //Колбэк для удаления попапа из набора
|
|
||||||
// function delPopup (popupDelKey: number) {
|
|
||||||
// setPopupArr(prev => {
|
|
||||||
// return prev.filter(popup => popup.id !== popupDelKey);
|
|
||||||
// });
|
|
||||||
// };
|
|
||||||
|
|
||||||
// //Функция генерации случайного числа для формирования на его основе уникального идентификатора для каждого компонента попаппа
|
|
||||||
// function getRandomId(): number { return Date.now() - Math.random() };
|
|
||||||
|
|
||||||
// return {
|
|
||||||
// popupArr,
|
|
||||||
// addPopup,
|
|
||||||
// delPopup,
|
|
||||||
// }
|
|
||||||
}
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
import React, { useState } from "react";
|
|
||||||
import Preloader from "../../components/preloader/Preloader";
|
|
||||||
|
|
||||||
//Хук для формирования пропсов управления состояний прелоадера, экспортируемых в компоненты страницы, где планируется вызывать прелоадер
|
|
||||||
export const MagicPreloaderHook = () => {
|
|
||||||
//Стейт для видимости прелоадера
|
|
||||||
const [preloaderVisibleState, setPreloaderVisibleState] = useState<boolean>(true);
|
|
||||||
//Стейт для текста прелоадера
|
|
||||||
const [preloaderTextState, setPreloaderTextState] = useState<string>('загрузка');
|
|
||||||
//Сеттер для смены состояний прелоадера
|
|
||||||
function setPreloaderParams (visibleState: boolean, textState?: string)
|
|
||||||
{
|
|
||||||
setPreloaderVisibleState(visibleState)
|
|
||||||
textState ? setPreloaderTextState(textState) : true, []
|
|
||||||
};
|
|
||||||
|
|
||||||
return {
|
|
||||||
setPreloaderParams,
|
|
||||||
PreloaderComponent: ( {preloaderVisible = preloaderVisibleState, preloaderText = preloaderTextState} ) => (
|
|
||||||
<Preloader
|
|
||||||
visible={preloaderVisible}
|
|
||||||
text={preloaderText}
|
|
||||||
/>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
<html>
|
|
||||||
<head>
|
|
||||||
@vite(['resources/js/app.js', 'resources/css/app.css'])
|
|
||||||
<title>Страница с ролями</title>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<p>{{ $roleData }}</p>
|
|
||||||
<!-- <div id='root'></div>
|
|
||||||
<div id='counter'></div> -->
|
|
||||||
|
|
||||||
|
|
||||||
<script type="module">
|
|
||||||
//import Example from './Example.js';
|
|
||||||
// Передаем данные напрямую в компонент
|
|
||||||
const props = {!! $roleData !!};
|
|
||||||
console.log(props)
|
|
||||||
console.log('da')
|
|
||||||
//ReactDOM.render(<App {...props} />, document.getElementById('root'));
|
|
||||||
</script>
|
|
||||||
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html lang="en">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<title>Laravel + React + Inertia</title>
|
|
||||||
@viteReactRefresh <!-- без это директивы возникает ошибка "React refresh preamble was not loaded. Something is wrong" Эта директива подключает скрипт горячей перезагрузки, но вообще этот скрипт должен подключаться при использовании плагина @vitejs/plugin-react -->
|
|
||||||
@vite(['resources/js/app.jsx']) <!-- Подключение Inertia и React -->
|
|
||||||
<!-- Гаврилов. нам не нужна больше inertia. Убрать? -->
|
|
||||||
@inertiaHead <!-- попробовать убрать, получится ли тянуть css стили без явного указания -->
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<!-- Гаврилов. нам не нужна больше inertia. Убрать? -->
|
|
||||||
@inertia
|
|
||||||
</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,40 +0,0 @@
|
|||||||
<html>
|
|
||||||
|
|
||||||
<head>
|
|
||||||
<title>Страница с ролями</title>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<table style=border:1px solid black>
|
|
||||||
<tr>
|
|
||||||
<th>id роли</th>
|
|
||||||
<th>имя роли</th>
|
|
||||||
<th>заголовок роли</th>
|
|
||||||
<th>удалить</th>
|
|
||||||
</tr>
|
|
||||||
@foreach($roles as $role)
|
|
||||||
<tr>
|
|
||||||
<td>{{ $role->access_id }}</td>
|
|
||||||
<td>{{ $role->role }}</td>
|
|
||||||
<td>{{ $role->title }}</td>
|
|
||||||
<td>
|
|
||||||
<form method="POST" action="{{ url('role_del') }}">
|
|
||||||
@csrf
|
|
||||||
<input type="hidden" name="access_id" value="{{ $role->access_id }}">
|
|
||||||
<button type='submit'>Удалить</button>
|
|
||||||
</form>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
@endforeach
|
|
||||||
|
|
||||||
</table>
|
|
||||||
|
|
||||||
<form method="POST" action="{{ url('role') }}">
|
|
||||||
@csrf
|
|
||||||
<label for="input-email">Имя</label>
|
|
||||||
<input type="text" id="input-name" name="roleName" placeholder="Введите имя роли">
|
|
||||||
<label for="input-email">Заголовок</label>
|
|
||||||
<input type="text" id="input-title" name="roleTitle" placeholder="Введите заголовок роли">
|
|
||||||
<button type="submit">Отправить</button>
|
|
||||||
</form>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
<html>
|
|
||||||
|
|
||||||
<head>
|
|
||||||
<title>Страница с ролями</title>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<form method="POST" action="{{ url('test_table') }}">
|
|
||||||
@csrf
|
|
||||||
<label for="first_name">Имя</label>
|
|
||||||
<input type="text" id="first_name" name="first_name" placeholder="Введите имя">
|
|
||||||
<label for="last_name">Фамилия</label>
|
|
||||||
<input type="text" id="last_name" name="last_name" placeholder="Введите фамилию">
|
|
||||||
<label for="department">Отдел</label>
|
|
||||||
<input type="text" id="department_name" name="department_name" placeholder="Введите отдел">
|
|
||||||
<button type="submit">Отправить</button>
|
|
||||||
</form>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
use Illuminate\Support\Facades\Broadcast;
|
|
||||||
|
|
||||||
/*
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
| Broadcast Channels
|
|
||||||
|--------------------------------------------------------------------------
|
|
||||||
|
|
|
||||||
| Here you may register all of the event broadcasting channels that your
|
|
||||||
| application supports. The given channel authorization callbacks are
|
|
||||||
| used to check if an authenticated user can listen to the channel.
|
|
||||||
|
|
|
||||||
*/
|
|
||||||
|
|
||||||
Broadcast::channel('App.Models.User.{id}', function ($user, $id) {
|
|
||||||
return (int) $user->id === (int) $id;
|
|
||||||
});
|
|
||||||
Reference in New Issue
Block a user