конфиг со статусом модуля?

app/Providers/AppServiceProvider.php

@@ -3,6 +3,9 @@
 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
 {
@@ -11,7 +14,8 @@ class AppServiceProvider extends ServiceProvider
      */
     public function register(): void
     {
-        //
+        //Регистрируем передачу во все blade шаблоны функционал сервиса по определению имени модуля из текущего роута
+        View::share('moduleName', app(ModuleService::class));
     }
 
     /**
@@ -19,6 +23,8 @@ 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);
     }
 }

app/Services/ModuleService.php

@@ -0,0 +1,40 @@
+<?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;
+    }
+  }
+}

config/modules.php

@@ -0,0 +1,232 @@
+<?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',
+];

modules_statuses.json

@@ -0,0 +1,4 @@
+{
+    "Taxi": true,
+    "Test": true
+}

resources/css/components/preloader.css

@@ -1,173 +0,0 @@
-@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);
-  }
-}

resources/js/components/preloader/Preloader.tsx

@@ -1,39 +0,0 @@
-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
-  )
-}

resources/js/contexts/PreloaderContext.tsx

@@ -1,40 +0,0 @@
-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>
-  )
-}