Compare commits

..

5 Commits

10 changed files with 135 additions and 284 deletions
+2 -8
View File
@@ -3,9 +3,6 @@
namespace App\Providers;
use Illuminate\Support\ServiceProvider;
use Spatie\Activitylog\Facades\CauserResolver;
use Illuminate\Support\Facades\View;
use App\Services\ModuleService;
class AppServiceProvider extends ServiceProvider
{
@@ -14,8 +11,7 @@ class AppServiceProvider extends ServiceProvider
*/
public function register(): void
{
//Регистрируем передачу во все blade шаблоны функционал сервиса по определению имени модуля из текущего роута
View::share('moduleName', app(ModuleService::class));
//
}
/**
@@ -23,8 +19,6 @@ class AppServiceProvider extends ServiceProvider
*/
public function boot(): void
{
// Глобально отключаем определение causer для корректной работы пакета activity_log. По умолчанию пакет ожидает получить экземпляр модели Models\User для прописывания в таблицу activity_log значения causer_type и causer_id. Эти значения нельзя руками прописать при логировании. Никакие танцы с бубнами не помогали кроме строки ниже. Данные по инициатору изменения решил записывать в поле properties
//UPD: Решил отказаться, так как все равно для корректной работы аутентификации пришел к фиксации записи в модели users, для отображения истории бизнес-сущностей удобнее будет получать пользователя, совершившего действие, из отдельного поля в модели, а не парсить json из поля properties
// CauserResolver::resolveUsing(fn () => null);
//
}
}
-40
View File
@@ -1,40 +0,0 @@
<?php
/**Сервис для определения модуля
@author dgavrilov
*/
namespace App\Services;
class ModuleService{
/**
* Получаем имя модуля из роута (так как в нем обязательно указывается префикс)
*
* @return string | null
*/
public function getModuleName(): string | null
{
$route = request()->route();
$routePrefix = null;
if ($route && $route->getPrefix()) {
$routePrefix = explode('/', $route->getPrefix())[1];
}
return $routePrefix;
}
/**
* Основываясь на имени модуля из роута получаем имя роута на русском (свойство name_ru), которое обязательное прописывается в конфиге модуля
*
* @return string | null
*/
public function getRuModuleName(): string | null
{
if ($module = $this->getModuleName()) {
return config("$module.name_ru", null);
} else {
return null;
}
}
}
-232
View File
@@ -1,232 +0,0 @@
<?php
use Nwidart\Modules\Activators\FileActivator;
use Nwidart\Modules\Providers\ConsoleServiceProvider;
return [
/*
|--------------------------------------------------------------------------
| Module Namespace
|--------------------------------------------------------------------------
|
| Default module namespace.
|
*/
'namespace' => 'Modules',
/*
|--------------------------------------------------------------------------
| Module Stubs
|--------------------------------------------------------------------------
|
| Default module stubs.
|
*/
'stubs' => [
'enabled' => false,
'path' => base_path('vendor/nwidart/laravel-modules/src/Commands/stubs'),
'files' => [
'routes/web' => 'routes/web.php',
'routes/api' => 'routes/api.php',
'views/index' => 'resources/views/index.blade.php',
'views/master' => 'resources/views/layouts/master.blade.php',
'scaffold/config' => 'config/config.php',
'composer' => 'composer.json',
'assets/js/app' => 'resources/assets/js/app.js',
'assets/sass/app' => 'resources/assets/sass/app.scss',
'vite' => 'vite.config.js',
'package' => 'package.json',
],
'replacements' => [
'routes/web' => ['LOWER_NAME', 'STUDLY_NAME', 'MODULE_NAMESPACE', 'CONTROLLER_NAMESPACE'],
'routes/api' => ['LOWER_NAME', 'STUDLY_NAME'],
'vite' => ['LOWER_NAME'],
'json' => ['LOWER_NAME', 'STUDLY_NAME', 'MODULE_NAMESPACE', 'PROVIDER_NAMESPACE'],
'views/index' => ['LOWER_NAME'],
'views/master' => ['LOWER_NAME', 'STUDLY_NAME'],
'scaffold/config' => ['STUDLY_NAME'],
'composer' => [
'LOWER_NAME',
'STUDLY_NAME',
'VENDOR',
'AUTHOR_NAME',
'AUTHOR_EMAIL',
'MODULE_NAMESPACE',
'PROVIDER_NAMESPACE',
],
],
'gitkeep' => true,
],
'paths' => [
/*
|--------------------------------------------------------------------------
| Modules path
|--------------------------------------------------------------------------
|
| This path is used to save the generated module.
| This path will also be added automatically to the list of scanned folders.
|
*/
'modules' => base_path('Modules'),
/*
|--------------------------------------------------------------------------
| Modules assets path
|--------------------------------------------------------------------------
|
| Here you may update the modules' assets path.
|
*/
'assets' => public_path('modules'),
/*
|--------------------------------------------------------------------------
| The migrations' path
|--------------------------------------------------------------------------
|
| Where you run the 'module:publish-migration' command, where do you publish the
| the migration files?
|
*/
'migration' => base_path('database/migrations'),
/*
|--------------------------------------------------------------------------
| Generator path
|--------------------------------------------------------------------------
| Customise the paths where the folders will be generated.
| Setting the generate key to false will not generate that folder
*/
'generator' => [
'config' => ['path' => 'config', 'generate' => true],
'command' => ['path' => 'App/Console', 'generate' => false],
'channels' => ['path' => 'App/Broadcasting', 'generate' => false],
'migration' => ['path' => 'Database/migrations', 'generate' => false],
'seeder' => ['path' => 'Database/Seeders', 'generate' => true],
'factory' => ['path' => 'Database/Factories', 'generate' => false],
'model' => ['path' => 'App/Models', 'generate' => false],
'observer' => ['path' => 'App/Observers', 'generate' => false],
'routes' => ['path' => 'routes', 'generate' => true],
'controller' => ['path' => 'App/Http/Controllers', 'generate' => true],
'filter' => ['path' => 'App/Http/Middleware', 'generate' => false],
'request' => ['path' => 'App/Http/Requests', 'generate' => false],
'provider' => ['path' => 'App/Providers', 'generate' => true],
'assets' => ['path' => 'resources/assets', 'generate' => false],
'lang' => ['path' => 'lang', 'generate' => false],
'views' => ['path' => 'resources/views', 'generate' => true],
'test' => ['path' => 'tests/Unit', 'generate' => false],
'test-feature' => ['path' => 'tests/Feature', 'generate' => false],
'repository' => ['path' => 'App/Repositories', 'generate' => false],
'event' => ['path' => 'App/Events', 'generate' => false],
'listener' => ['path' => 'App/Listeners', 'generate' => false],
'policies' => ['path' => 'App/Policies', 'generate' => false],
'rules' => ['path' => 'App/Rules', 'generate' => false],
'jobs' => ['path' => 'App/Jobs', 'generate' => false],
'emails' => ['path' => 'App/Emails', 'generate' => false],
'notifications' => ['path' => 'App/Notifications', 'generate' => false],
'resource' => ['path' => 'App/resources', 'generate' => false],
'component-view' => ['path' => 'resources/views/components', 'generate' => false],
'component-class' => ['path' => 'App/View/Components', 'generate' => false],
],
],
/*
|--------------------------------------------------------------------------
| Package commands
|--------------------------------------------------------------------------
|
| Here you can define which commands will be visible and used in your
| application. You can add your own commands to merge section.
|
*/
'commands' => ConsoleServiceProvider::defaultCommands()
->merge([
// New commands go here
])->toArray(),
/*
|--------------------------------------------------------------------------
| Scan Path
|--------------------------------------------------------------------------
|
| Here you define which folder will be scanned. By default will scan vendor
| directory. This is useful if you host the package in packagist website.
|
*/
'scan' => [
'enabled' => false,
'paths' => [
base_path('vendor/*/*'),
],
],
/*
|--------------------------------------------------------------------------
| Composer File Template
|--------------------------------------------------------------------------
|
| Here is the config for the composer.json file, generated by this package
|
*/
'composer' => [
'vendor' => 'nwidart',
'author' => [
'name' => 'Nicolas Widart',
'email' => 'n.widart@gmail.com',
],
'composer-output' => false,
],
/*
|--------------------------------------------------------------------------
| Caching
|--------------------------------------------------------------------------
|
| Here is the config for setting up the caching feature.
|
*/
'cache' => [
'enabled' => false,
'driver' => 'file',
'key' => 'laravel-modules',
'lifetime' => 60,
],
/*
|--------------------------------------------------------------------------
| Choose what laravel-modules will register as custom namespaces.
| Setting one to false will require you to register that part
| in your own Service Provider class.
|--------------------------------------------------------------------------
*/
'register' => [
'translations' => true,
/**
* load files on boot or register method
*/
'files' => 'register',
],
/*
|--------------------------------------------------------------------------
| Activators
|--------------------------------------------------------------------------
|
| You can define new types of activators here, file, database, etc. The only
| required parameter is 'class'.
| The file activator will store the activation status in storage/installed_modules
*/
'activators' => [
'file' => [
'class' => FileActivator::class,
'statuses-file' => base_path('modules_statuses.json'),
'cache-key' => 'activator.installed',
'cache-lifetime' => 604800,
],
],
'activator' => 'file',
];
-4
View File
@@ -1,4 +0,0 @@
{
"Taxi": true,
"Test": true
}
+43
View File
@@ -0,0 +1,43 @@
/* ГАВРИЛОВ. ВЫЯСНИТЬ, ГДЕ ИСПОЛЬЗУЮТСЯ */
#root{
padding: 10px;
}
.form-container{
&.form-container--small-size{
width: 30%;
}
&.form-container--medium-size{
width: 50%;
}
&.form-container--left-pos{
margin-left: 10px;
}
&.form-container--mid-pos{
margin: 25px auto;
}
}
.form__field-block{
margin: 15px 0;
}
.btn-block{
margin: 15px 0;
padding: 15px 0;
display: flex;
justify-content: flex-start;
gap: 10px;
}
/* OVERWRITE */
.renButton{
&.renButton--tertiary{
background: #dfdfdf;
}
}
+27
View File
@@ -0,0 +1,27 @@
#page__content-block{
padding: 10px;
}
#page__header-block{
position: sticky;
top: 0;
z-index: 99;
box-shadow: 0px 2px 9px 3px #8f8d8d;
& .header-block__header-container{
display: flex;
justify-content: space-between;
padding: 10px;
background: var(--color_graphite_main);
& .header-container__block{
display: flex;
gap: 10px;
align-items: center;
& .header-container__block__app-name{
color: white;
}
}
}
}
+7
View File
@@ -0,0 +1,7 @@
:root{
--color_graphite_main: #323e48;
--color_emerald_main: #77cb10;
--color_emerald_light: #95fa77;
--color_ruby_main: #ff0078;
--color_purple_main: #7864eb;
}
+15
View File
@@ -0,0 +1,15 @@
import React from "react";
import { createRoot } from 'react-dom/client';
import { UIKitThemeProvider } from '@SharePoint/rencredit_uikit';
import Header from "./components/header/Header.tsx";
const headerBlock:HTMLElement = document.getElementById('page__header-block')!;
const headerRoot = createRoot(headerBlock);
console.log('da')
headerRoot.render(
<UIKitThemeProvider>
<Header />
</UIKitThemeProvider>
);
+21
View File
@@ -0,0 +1,21 @@
import React, { ReactNode } from "react";
import { UIKitThemeProvider } from '@SharePoint/rencredit_uikit';
import { PopupProvider } from "../contexts/PopupContext.tsx";
import { PreloaderProvider } from "../contexts/PreloaderContext.tsx";
interface AppProviderProps{
children: ReactNode;
}
export function AppProvider({children}: AppProviderProps){
return (
<UIKitThemeProvider>
<PopupProvider>
<PreloaderProvider>
{children}
</PreloaderProvider>
</PopupProvider>
</UIKitThemeProvider>
)
}
+20
View File
@@ -0,0 +1,20 @@
/**
* Сервис для полуения csrt токена для размещения в формах
* @date 24.07.2025
* @author dgavrilov
*/
export const getCsrfToken = ():string => {
const METATAG:HTMLElement|null = document.querySelector('meta[name="csrf-token"]');
if (!METATAG) {
return '';
}
const CSRFTOKEN:string|null = METATAG.getAttribute('content');
if (!CSRFTOKEN) {
return '';
}
return CSRFTOKEN;
}