Compare commits

..

1 Commits

45 changed files with 269 additions and 897 deletions
+1 -1
View File
@@ -14,5 +14,5 @@ trim_trailing_whitespace = false
[*.{yml,yaml}]
indent_size = 2
[docker-compose.yml]
[compose.yaml]
indent_size = 4
@@ -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)
{
//
}
}
View File
@@ -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([]);
}
}
-31
View File
@@ -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/"
}
}
}
View File
-5
View File
@@ -1,5 +0,0 @@
<?php
return [
'name' => 'Test',
];
-11
View File
@@ -1,11 +0,0 @@
{
"name": "Test",
"alias": "test",
"description": "",
"keywords": [],
"priority": 0,
"providers": [
"Modules\\Test\\App\\Providers\\TestServiceProvider"
],
"files": []
}
-15
View File
@@ -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>
View File
-19
View File
@@ -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');
});
-19
View File
@@ -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');
});
-26
View File
@@ -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',
//];
-34
View File
@@ -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);
}
}
-53
View File
@@ -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');
}
}
-17
View File
@@ -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';
}
-13
View File
@@ -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';
}
-13
View File
@@ -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';
}
-29
View File
@@ -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');
}
}
-38
View File
@@ -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;
}
}
+9 -6
View File
@@ -2,21 +2,24 @@
namespace Database\Seeders;
// use Illuminate\Database\Console\Seeds\WithoutModelEvents;
use App\Models\User;
use Illuminate\Database\Console\Seeds\WithoutModelEvents;
use Illuminate\Database\Seeder;
class DatabaseSeeder extends Seeder
{
use WithoutModelEvents;
/**
* Seed the application's database.
*/
public function run(): void
{
// \App\Models\User::factory(10)->create();
// User::factory(10)->create();
// \App\Models\User::factory()->create([
// 'name' => 'Test User',
// 'email' => 'test@example.com',
// ]);
User::factory()->create([
'name' => 'Test User',
'email' => 'test@example.com',
]);
}
}
+7 -4
View File
@@ -19,14 +19,17 @@
</source>
<php>
<env name="APP_ENV" value="testing"/>
<env name="APP_MAINTENANCE_DRIVER" value="file"/>
<env name="BCRYPT_ROUNDS" value="4"/>
<env name="CACHE_DRIVER" value="array"/>
<!-- <env name="DB_CONNECTION" value="sqlite"/> -->
<!-- <env name="DB_DATABASE" value=":memory:"/> -->
<env name="BROADCAST_CONNECTION" value="null"/>
<env name="CACHE_STORE" value="array"/>
<env name="DB_CONNECTION" value="sqlite"/>
<env name="DB_DATABASE" value=":memory:"/>
<env name="MAIL_MAILER" value="array"/>
<env name="PULSE_ENABLED" value="false"/>
<env name="QUEUE_CONNECTION" value="sync"/>
<env name="SESSION_DRIVER" value="array"/>
<env name="PULSE_ENABLED" value="false"/>
<env name="TELESCOPE_ENABLED" value="false"/>
<env name="NIGHTWATCH_ENABLED" value="false"/>
</php>
</phpunit>
+173
View File
@@ -0,0 +1,173 @@
@import url('./../variables.css');
#preloader_container {
position: fixed;
width: 100%;
height: 100%;
top: 0;
left: 0;
background: rgba(0, 0, 0, 0.3);
z-index: 900;
backdrop-filter: blur(5px);
&.hide {
display: none;
}
&>#preloader{
width: 200px;
height: 200px;
background: none;
position: relative;
top: 30%;
left: 0;
right: 0;
margin-left: auto;
margin-right: auto;
&>.circle {
position: absolute;
border-radius: 50%;
box-sizing: border-box;
border: 10px solid transparent;
}
&>#circle_one {
width: 80%;
height: 80%;
border-top-width: 10px;
left: 5%;
top: 5%;
animation: roll_one 4.5s;
animation-fill-mode: forwards;
animation-iteration-count: infinite;
animation-timing-function: linear;
&.preloader-emerald-circle{
border-top-color: var(--color_emerald_light);
}
&.preloader-ruby-circle{
border-top-color: var(--color_ruby_main);
}
&.preloader-graphite-circle{
border-top-color: var(--color_graphite_main);
}
}
&>#circle_two {
width: 70%;
height: 70%;
left: 10%;
top: 10%;
border-right-width: 10px;
animation: roll_two 2.5s;
animation-fill-mode: forwards;
animation-iteration-count: infinite;
animation-timing-function: linear;
&.preloader-emerald-circle{
border-right-color: var(--color_emerald_light);
}
&.preloader-ruby-circle{
border-right-color: var(--color_ruby_main);
}
&.preloader-graphite-circle{
border-right-color: var(--color_graphite_main);
}
}
&>#circle_three {
width: 60%;
height: 60%;
left: 15%;
top: 15%;
border-bottom-width: 10px;
animation: roll_three 3s;
animation-fill-mode: forwards;
animation-iteration-count: infinite;
animation-timing-function: linear;
&.preloader-emerald-circle{
border-bottom-color: var(--color_emerald_light);
}
&.preloader-ruby-circle{
border-bottom-color: var(--color_ruby_main);
}
&.preloader-graphite-circle{
border-bottom-color: var(--color_graphite_main);
}
}
&>#preloader_text {
width: 150%;
left: -25%;
font-size: 1.5rem;
position: absolute;
bottom: -50px;
text-align: center;
color: white;
}
&>#logo {
position: absolute;
background: none;
width: 40%;
height: 40%;
top: 25%;
left: 25%;
&>.logo_square {
position: absolute;
box-sizing: border-box;
}
&>#left-top {
width: 60%;
height: 70%;
top: 15%;
left: 20%;
border-left: 7px solid white;
border-top: 7px solid white;
border-top-left-radius: 45%;
}
&>#right-bottom {
width: 40%;
height: 50%;
top: 15%;
left: 40%;
border-right: 7px solid white;
border-bottom: 7px solid white;
border-bottom-right-radius: 45%;
border-bottom-left-radius: 10%;
}
}
}
}
@keyframes roll_one {
0% {
transform: rotate(0deg);
}
100% {
transform: rotate(360deg);
}
}
@keyframes roll_two {
0% {
transform: rotate(0deg);
}
100% {
transform: rotate(-360deg);
}
}
@keyframes roll_three {
0% {
transform: rotate(0deg);
}
100% {
transform: rotate(720deg);
}
}
@@ -0,0 +1,39 @@
import "./../../../css/components/preloader.css";
import React from "react";
export default function Preloader ( props: {visible: boolean, text?: string | null}) {
const {text = 'загрузка'} = props;
let preloaderColorArray: string[] = ['preloader-ruby-circle', 'preloader-emerald-circle', 'preloader-graphite-circle'],
//Код ниже реализует возможность присваивать каждую перезагрузку разные классы с цветом полос
//Рандомное число, по которому получим первый класс
firstColorIndex: number = Math.floor(Math.random() * 3),
firstCircleClass: typeof preloaderColorArray[number] = preloaderColorArray[firstColorIndex],
secondCircleClass: typeof preloaderColorArray[number],
thirdCircleClass: typeof preloaderColorArray[number];
//Удалим уже используемый класс цвета из массива
preloaderColorArray.splice(firstColorIndex, 1);
//Оставшиеся 2 класса распределеяем в зависимости от проостой проверки четности/нечетности
if (Math.floor(Math.random() * 2) % 2 === 0) {
secondCircleClass = preloaderColorArray[0];
thirdCircleClass = preloaderColorArray[1];
} else {
secondCircleClass = preloaderColorArray[1];
thirdCircleClass = preloaderColorArray[0];
}
return (
props.visible ?
<div id='preloader_container'>
<div id='preloader'>
<div className={'circle ' + firstCircleClass} id='circle_one'></div>
<div className={'circle ' + secondCircleClass} id='circle_two'></div>
<div className={'circle ' + thirdCircleClass} id='circle_three'></div>
<div id='logo'>
<div className='logo_square' id='right-bottom'></div>
<div className='logo_square' id='left-top'></div>
</div>
<div id='preloader_text'>{ text }</div>
</div>
</div>
: null
)
}
@@ -0,0 +1,40 @@
import React, { createContext, useState } from "react";
import Preloader from "../components/preloader/Preloader";
interface PreloaderProps{
setPreloaderVisible: (preloaderVisible: boolean) => void;
setPreloaderText: (preloaderText: string) => void;
}
export const PreloaderContext = createContext<PreloaderProps>({
setPreloaderVisible: () => {},
setPreloaderText: () => {},
});
export function PreloaderProvider({ children }){
const [visible, setVisible] = useState<boolean>(true);
const [text, setText] = useState<string>('Страница загружается');
function setPreloaderVisible(preloaderVisible: boolean){
setVisible(preloaderVisible);
}
function setPreloaderText(preloaderText: string){
setText(preloaderText);
}
let value = {
setPreloaderVisible: setPreloaderVisible,
setPreloaderText: setPreloaderText
}
return (
<PreloaderContext.Provider value={value}>
<Preloader
visible={visible}
text={text}
/>
{children}
</PreloaderContext.Provider>
)
}
@@ -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}
/>
)
}
}
-22
View File
@@ -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>
-16
View File
@@ -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>
-40
View File
@@ -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>
-18
View File
@@ -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>
-18
View File
@@ -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;
});