diff --git a/composer.json b/composer.json index 6d8c5fa..d6623cc 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "App\\": "app/", "Database\\Factories\\": "database/factories/", "Database\\Seeders\\": "database/seeders/", - "modules\\": "modules/" + "App\\Modules\\": "modules/" } }, "autoload-dev": { diff --git a/composer.lock b/composer.lock index 440f4db..0b2797d 100644 --- a/composer.lock +++ b/composer.lock @@ -8,11 +8,11 @@ "packages": [ { "name": "a7kz/platform", - "version": "1.3.188", + "version": "1.3.189", "source": { "type": "git", "url": "ssh://git@git.a7.kz:22022/A7/package.platform.git", - "reference": "a9f3c7954713207710355a71064fc53a38768fdf" + "reference": "8171f7ed775a851f1ad55a054f10e967bf154bd7" }, "require": { "doctrine/dbal": "^3.5", @@ -41,7 +41,7 @@ } ], "description": "LowCode platform", - "time": "2024-12-20T10:52:32+00:00" + "time": "2024-12-24T11:09:26+00:00" }, { "name": "brick/math", @@ -886,16 +886,16 @@ }, { "name": "egulias/email-validator", - "version": "4.0.2", + "version": "4.0.3", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "ebaaf5be6c0286928352e054f2d5125608e5405e" + "reference": "b115554301161fa21467629f1e1391c1936de517" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ebaaf5be6c0286928352e054f2d5125608e5405e", - "reference": "ebaaf5be6c0286928352e054f2d5125608e5405e", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/b115554301161fa21467629f1e1391c1936de517", + "reference": "b115554301161fa21467629f1e1391c1936de517", "shasum": "" }, "require": { @@ -941,7 +941,7 @@ ], "support": { "issues": "https://github.com/egulias/EmailValidator/issues", - "source": "https://github.com/egulias/EmailValidator/tree/4.0.2" + "source": "https://github.com/egulias/EmailValidator/tree/4.0.3" }, "funding": [ { @@ -949,7 +949,7 @@ "type": "github" } ], - "time": "2023-10-06T06:47:41+00:00" + "time": "2024-12-27T00:36:43+00:00" }, { "name": "ezyang/htmlpurifier", @@ -2042,13 +2042,13 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-master": "4.x-dev" - }, "laravel": { "providers": [ "Laravel\\Ui\\UiServiceProvider" ] + }, + "branch-alias": { + "dev-master": "4.x-dev" } }, "autoload": { @@ -2079,16 +2079,16 @@ }, { "name": "league/commonmark", - "version": "2.6.0", + "version": "2.6.1", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "d150f911e0079e90ae3c106734c93137c184f932" + "reference": "d990688c91cedfb69753ffc2512727ec646df2ad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/d150f911e0079e90ae3c106734c93137c184f932", - "reference": "d150f911e0079e90ae3c106734c93137c184f932", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/d990688c91cedfb69753ffc2512727ec646df2ad", + "reference": "d990688c91cedfb69753ffc2512727ec646df2ad", "shasum": "" }, "require": { @@ -2182,7 +2182,7 @@ "type": "tidelift" } ], - "time": "2024-12-07T15:34:16+00:00" + "time": "2024-12-29T14:10:59+00:00" }, { "name": "league/config", @@ -3043,16 +3043,16 @@ }, { "name": "nesbot/carbon", - "version": "2.72.5", + "version": "2.72.6", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "afd46589c216118ecd48ff2b95d77596af1e57ed" + "reference": "1e9d50601e7035a4c61441a208cb5bed73e108c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/afd46589c216118ecd48ff2b95d77596af1e57ed", - "reference": "afd46589c216118ecd48ff2b95d77596af1e57ed", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/1e9d50601e7035a4c61441a208cb5bed73e108c5", + "reference": "1e9d50601e7035a4c61441a208cb5bed73e108c5", "shasum": "" }, "require": { @@ -3072,7 +3072,7 @@ "doctrine/orm": "^2.7 || ^3.0", "friendsofphp/php-cs-fixer": "^3.0", "kylekatarnls/multi-tester": "^2.0", - "ondrejmirtes/better-reflection": "*", + "ondrejmirtes/better-reflection": "<6", "phpmd/phpmd": "^2.9", "phpstan/extension-installer": "^1.0", "phpstan/phpstan": "^0.12.99 || ^1.7.14", @@ -3146,7 +3146,7 @@ "type": "tidelift" } ], - "time": "2024-06-03T19:18:41+00:00" + "time": "2024-12-27T09:28:11+00:00" }, { "name": "nette/schema", @@ -3298,16 +3298,16 @@ }, { "name": "nikic/php-parser", - "version": "v5.3.1", + "version": "v5.4.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b" + "reference": "447a020a1f875a434d62f2a401f53b82a396e494" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b", - "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/447a020a1f875a434d62f2a401f53b82a396e494", + "reference": "447a020a1f875a434d62f2a401f53b82a396e494", "shasum": "" }, "require": { @@ -3350,9 +3350,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.4.0" }, - "time": "2024-10-08T18:51:32+00:00" + "time": "2024-12-30T11:07:19+00:00" }, { "name": "nunomaduro/termwind", @@ -3633,16 +3633,16 @@ }, { "name": "phpoffice/phpspreadsheet", - "version": "1.29.6", + "version": "1.29.7", "source": { "type": "git", "url": "https://github.com/PHPOffice/PhpSpreadsheet.git", - "reference": "08597725b84570cd6f32bf0ea92e75a803ef28c2" + "reference": "02c8625411dcb96e1f63d58c47460284e15b2e80" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/08597725b84570cd6f32bf0ea92e75a803ef28c2", - "reference": "08597725b84570cd6f32bf0ea92e75a803ef28c2", + "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/02c8625411dcb96e1f63d58c47460284e15b2e80", + "reference": "02c8625411dcb96e1f63d58c47460284e15b2e80", "shasum": "" }, "require": { @@ -3732,9 +3732,9 @@ ], "support": { "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues", - "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.29.6" + "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.29.7" }, - "time": "2024-12-08T05:49:00+00:00" + "time": "2024-12-27T05:10:37+00:00" }, { "name": "phpoffice/phpword", @@ -4824,16 +4824,16 @@ }, { "name": "symfony/console", - "version": "v6.4.15", + "version": "v6.4.17", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "f1fc6f47283e27336e7cebb9e8946c8de7bff9bd" + "reference": "799445db3f15768ecc382ac5699e6da0520a0a04" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/f1fc6f47283e27336e7cebb9e8946c8de7bff9bd", - "reference": "f1fc6f47283e27336e7cebb9e8946c8de7bff9bd", + "url": "https://api.github.com/repos/symfony/console/zipball/799445db3f15768ecc382ac5699e6da0520a0a04", + "reference": "799445db3f15768ecc382ac5699e6da0520a0a04", "shasum": "" }, "require": { @@ -4898,7 +4898,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.15" + "source": "https://github.com/symfony/console/tree/v6.4.17" }, "funding": [ { @@ -4914,7 +4914,7 @@ "type": "tidelift" } ], - "time": "2024-11-06T14:19:14+00:00" + "time": "2024-12-07T12:07:30+00:00" }, { "name": "symfony/css-selector", @@ -5000,12 +5000,12 @@ }, "type": "library", "extra": { + "thanks": { + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, "branch-alias": { "dev-main": "3.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" } }, "autoload": { @@ -5050,16 +5050,16 @@ }, { "name": "symfony/error-handler", - "version": "v6.4.14", + "version": "v6.4.17", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "9e024324511eeb00983ee76b9aedc3e6ecd993d9" + "reference": "37ad2380e8c1a8cf62a1200a5c10080b679b446c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/9e024324511eeb00983ee76b9aedc3e6ecd993d9", - "reference": "9e024324511eeb00983ee76b9aedc3e6ecd993d9", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/37ad2380e8c1a8cf62a1200a5c10080b679b446c", + "reference": "37ad2380e8c1a8cf62a1200a5c10080b679b446c", "shasum": "" }, "require": { @@ -5105,7 +5105,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v6.4.14" + "source": "https://github.com/symfony/error-handler/tree/v6.4.17" }, "funding": [ { @@ -5121,7 +5121,7 @@ "type": "tidelift" } ], - "time": "2024-11-05T15:34:40+00:00" + "time": "2024-12-06T13:30:51+00:00" }, { "name": "symfony/event-dispatcher", @@ -5223,12 +5223,12 @@ }, "type": "library", "extra": { + "thanks": { + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, "branch-alias": { "dev-main": "3.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" } }, "autoload": { @@ -5281,16 +5281,16 @@ }, { "name": "symfony/finder", - "version": "v6.4.13", + "version": "v6.4.17", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "daea9eca0b08d0ed1dc9ab702a46128fd1be4958" + "reference": "1d0e8266248c5d9ab6a87e3789e6dc482af3c9c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/daea9eca0b08d0ed1dc9ab702a46128fd1be4958", - "reference": "daea9eca0b08d0ed1dc9ab702a46128fd1be4958", + "url": "https://api.github.com/repos/symfony/finder/zipball/1d0e8266248c5d9ab6a87e3789e6dc482af3c9c7", + "reference": "1d0e8266248c5d9ab6a87e3789e6dc482af3c9c7", "shasum": "" }, "require": { @@ -5325,7 +5325,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v6.4.13" + "source": "https://github.com/symfony/finder/tree/v6.4.17" }, "funding": [ { @@ -5341,7 +5341,7 @@ "type": "tidelift" } ], - "time": "2024-10-01T08:30:56+00:00" + "time": "2024-12-29T13:51:37+00:00" }, { "name": "symfony/http-foundation", @@ -5422,16 +5422,16 @@ }, { "name": "symfony/http-kernel", - "version": "v6.4.16", + "version": "v6.4.17", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "8838b5b21d807923b893ccbfc2cbeda0f1bc00f0" + "reference": "c5647393c5ce11833d13e4b70fff4b571d4ac710" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/8838b5b21d807923b893ccbfc2cbeda0f1bc00f0", - "reference": "8838b5b21d807923b893ccbfc2cbeda0f1bc00f0", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/c5647393c5ce11833d13e4b70fff4b571d4ac710", + "reference": "c5647393c5ce11833d13e4b70fff4b571d4ac710", "shasum": "" }, "require": { @@ -5516,7 +5516,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v6.4.16" + "source": "https://github.com/symfony/http-kernel/tree/v6.4.17" }, "funding": [ { @@ -5532,7 +5532,7 @@ "type": "tidelift" } ], - "time": "2024-11-27T12:49:36+00:00" + "time": "2024-12-31T14:49:31+00:00" }, { "name": "symfony/mailer", @@ -5616,16 +5616,16 @@ }, { "name": "symfony/mime", - "version": "v6.4.13", + "version": "v6.4.17", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "1de1cf14d99b12c7ebbb850491ec6ae3ed468855" + "reference": "ea87c8850a54ff039d3e0ab4ae5586dd4e6c0232" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/1de1cf14d99b12c7ebbb850491ec6ae3ed468855", - "reference": "1de1cf14d99b12c7ebbb850491ec6ae3ed468855", + "url": "https://api.github.com/repos/symfony/mime/zipball/ea87c8850a54ff039d3e0ab4ae5586dd4e6c0232", + "reference": "ea87c8850a54ff039d3e0ab4ae5586dd4e6c0232", "shasum": "" }, "require": { @@ -5681,7 +5681,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v6.4.13" + "source": "https://github.com/symfony/mime/tree/v6.4.17" }, "funding": [ { @@ -5697,7 +5697,7 @@ "type": "tidelift" } ], - "time": "2024-10-25T15:07:50+00:00" + "time": "2024-12-02T11:09:41+00:00" }, { "name": "symfony/polyfill-ctype", @@ -6503,12 +6503,12 @@ }, "type": "library", "extra": { + "thanks": { + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, "branch-alias": { "dev-main": "3.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" } }, "autoload": { @@ -6763,12 +6763,12 @@ }, "type": "library", "extra": { + "thanks": { + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, "branch-alias": { "dev-main": "3.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" } }, "autoload": { @@ -7441,16 +7441,16 @@ }, { "name": "laravel/pint", - "version": "v1.18.3", + "version": "v1.19.0", "source": { "type": "git", "url": "https://github.com/laravel/pint.git", - "reference": "cef51821608239040ab841ad6e1c6ae502ae3026" + "reference": "8169513746e1bac70c85d6ea1524d9225d4886f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/pint/zipball/cef51821608239040ab841ad6e1c6ae502ae3026", - "reference": "cef51821608239040ab841ad6e1c6ae502ae3026", + "url": "https://api.github.com/repos/laravel/pint/zipball/8169513746e1bac70c85d6ea1524d9225d4886f0", + "reference": "8169513746e1bac70c85d6ea1524d9225d4886f0", "shasum": "" }, "require": { @@ -7461,10 +7461,10 @@ "php": "^8.1.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^3.65.0", - "illuminate/view": "^10.48.24", - "larastan/larastan": "^2.9.11", - "laravel-zero/framework": "^10.4.0", + "friendsofphp/php-cs-fixer": "^3.66.0", + "illuminate/view": "^10.48.25", + "larastan/larastan": "^2.9.12", + "laravel-zero/framework": "^10.48.25", "mockery/mockery": "^1.6.12", "nunomaduro/termwind": "^1.17.0", "pestphp/pest": "^2.36.0" @@ -7503,7 +7503,7 @@ "issues": "https://github.com/laravel/pint/issues", "source": "https://github.com/laravel/pint" }, - "time": "2024-11-26T15:34:00+00:00" + "time": "2024-12-30T16:20:10+00:00" }, { "name": "laravel/sail", diff --git a/config/a7modules.php b/config/a7modules.php index 411cc0f..84f04f7 100644 --- a/config/a7modules.php +++ b/config/a7modules.php @@ -6,13 +6,13 @@ return [ \A7kz\Platform\Modules\Platform\Core\CoreModule::class, \A7kz\Platform\Modules\Platform\Navigation\NavigationModule::class, \A7kz\Platform\Modules\Platform\Acl\AclModule::class, - \modules\Home\HomeModule::class, + App\Modules\Home\HomeModule::class, \A7kz\Platform\Modules\Platform\Cms\CmsModule::class, \A7kz\Platform\Modules\Platform\DbBuilder\DbBuilderModule::class, - \modules\Auth\AuthModule::class, + App\Modules\Auth\AuthModule::class, \A7kz\Platform\Modules\Platform\EventBus\EventBusModule::class, \A7kz\Platform\Modules\Platform\Schedule\ScheduleModule::class, - \modules\UserProfile\UserProfileModule::class, + App\Modules\UserProfile\UserProfileModule::class, \A7kz\Platform\Modules\Platform\Flow\FlowModule::class, \A7kz\Platform\Modules\Platform\Segment\SegmentModule::class, \A7kz\Platform\Modules\Platform\Company\CompanyModule::class, diff --git a/modules/Auth/AuthModule.php b/modules/Auth/AuthModule.php index 2daa5e0..b9c776a 100644 --- a/modules/Auth/AuthModule.php +++ b/modules/Auth/AuthModule.php @@ -7,7 +7,7 @@ * Астана */ -namespace modules\Auth; +namespace App\Modules\Auth; use A7kz\Platform\Modules\Module; diff --git a/modules/Auth/Commands/AuthInstallCommand.php b/modules/Auth/Commands/AuthInstallCommand.php index ae73f54..76003dd 100644 --- a/modules/Auth/Commands/AuthInstallCommand.php +++ b/modules/Auth/Commands/AuthInstallCommand.php @@ -7,7 +7,7 @@ * Астана */ -namespace modules\Auth\Commands; +namespace App\Modules\Auth\Commands; use A7kz\Platform\Commands\InstallCommand; diff --git a/modules/Auth/Http/Controllers/ConfirmPasswordController.php b/modules/Auth/Http/Controllers/ConfirmPasswordController.php index 67fa10a..e1e71ce 100644 --- a/modules/Auth/Http/Controllers/ConfirmPasswordController.php +++ b/modules/Auth/Http/Controllers/ConfirmPasswordController.php @@ -7,7 +7,7 @@ * Астана */ -namespace modules\Auth\Http\Controllers; +namespace App\Modules\Auth\Http\Controllers; use A7kz\Platform\Http\Controllers\Controller; use App\Providers\RouteServiceProvider; diff --git a/modules/Auth/Http/Controllers/ForgotPasswordController.php b/modules/Auth/Http/Controllers/ForgotPasswordController.php index 5d57b2e..7057fa3 100644 --- a/modules/Auth/Http/Controllers/ForgotPasswordController.php +++ b/modules/Auth/Http/Controllers/ForgotPasswordController.php @@ -7,7 +7,7 @@ * Астана */ -namespace modules\Auth\Http\Controllers; +namespace App\Modules\Auth\Http\Controllers; use A7kz\Platform\Http\Controllers\Controller; use Illuminate\Foundation\Auth\SendsPasswordResetEmails; diff --git a/modules/Auth/Http/Controllers/LoginController.php b/modules/Auth/Http/Controllers/LoginController.php index 47d3add..3d09a2a 100644 --- a/modules/Auth/Http/Controllers/LoginController.php +++ b/modules/Auth/Http/Controllers/LoginController.php @@ -7,9 +7,8 @@ * Астана */ -namespace modules\Auth\Http\Controllers; +namespace App\Modules\Auth\Http\Controllers; -use A7kz\Accounting\Facades\Accounting; use A7kz\Platform\Http\Controllers\Controller; use A7kz\Platform\Models\UniModel; use A7kz\Platform\Modules\Platform\Acl\Facades\Acl; diff --git a/modules/Auth/Http/Controllers/RegisterController.php b/modules/Auth/Http/Controllers/RegisterController.php index 0af13f9..942fed4 100644 --- a/modules/Auth/Http/Controllers/RegisterController.php +++ b/modules/Auth/Http/Controllers/RegisterController.php @@ -7,7 +7,7 @@ * Астана */ -namespace modules\Auth\Http\Controllers; +namespace App\Modules\Auth\Http\Controllers; use A7kz\Platform\Http\Controllers\Controller; use A7kz\Platform\Models\UniModel; diff --git a/modules/Auth/Http/Controllers/ResetPasswordController.php b/modules/Auth/Http/Controllers/ResetPasswordController.php index e37c602..5225d48 100644 --- a/modules/Auth/Http/Controllers/ResetPasswordController.php +++ b/modules/Auth/Http/Controllers/ResetPasswordController.php @@ -7,7 +7,7 @@ * Астана */ -namespace modules\Auth\Http\Controllers; +namespace App\Modules\Auth\Http\Controllers; use A7kz\Platform\Http\Controllers\Controller; use App\Providers\RouteServiceProvider; diff --git a/modules/Auth/Http/Controllers/VerificationController.php b/modules/Auth/Http/Controllers/VerificationController.php index b9245e4..219705e 100644 --- a/modules/Auth/Http/Controllers/VerificationController.php +++ b/modules/Auth/Http/Controllers/VerificationController.php @@ -7,7 +7,7 @@ * Астана */ -namespace modules\Auth\Http\Controllers; +namespace App\Modules\Auth\Http\Controllers; use A7kz\Platform\Http\Controllers\Controller; use App\Providers\RouteServiceProvider; diff --git a/modules/Home/Applications/Home.php b/modules/Home/Applications/Home.php index 7c46f71..259118a 100644 --- a/modules/Home/Applications/Home.php +++ b/modules/Home/Applications/Home.php @@ -7,10 +7,8 @@ * Астана */ -namespace modules\Home\Applications; +namespace App\Modules\Home\Applications; -use A7kz\Platform\Models\UniModel; -use A7kz\Platform\Modules\Platform\Acl\Facades\Acl; use A7kz\Platform\Modules\Platform\Core\Services\Application\BaseApplication; use Illuminate\Support\Facades\Auth; @@ -24,7 +22,7 @@ class Home extends BaseApplication public function default() { if(Auth::check()){ - return redirect(lurl('app/accounting.main')); + return redirect(lurl('/')); } else { return redirect(lurl('login')); } diff --git a/modules/Home/Commands/HomeInstallCommand.php b/modules/Home/Commands/HomeInstallCommand.php index 06c91d2..af7bc31 100644 --- a/modules/Home/Commands/HomeInstallCommand.php +++ b/modules/Home/Commands/HomeInstallCommand.php @@ -7,7 +7,7 @@ * Астана */ -namespace modules\Home\Commands; +namespace App\Modules\Home\Commands; use A7kz\Platform\Commands\InstallCommand; use A7kz\Platform\Modules\Platform\Acl\Facades\Acl; @@ -20,13 +20,13 @@ class HomeInstallCommand extends InstallCommand protected $module_name = "home"; protected $module_version = "1.0.0"; - public function seeds() + public function seeds(): void { Acl::addRoleAction("guest","app.home"); Acl::addRoleAction("user","app.home"); } - public function apps() + public function apps(): void { Core::registerApp( "app.home", diff --git a/modules/Home/HomeModule.php b/modules/Home/HomeModule.php index 314874c..1b340ed 100644 --- a/modules/Home/HomeModule.php +++ b/modules/Home/HomeModule.php @@ -7,10 +7,10 @@ * Астана */ -namespace modules\Home; +namespace App\Modules\Home; use A7kz\Platform\Modules\Module; -use A7kz\Platform\Modules\Platform\Home\Commands\HomeInstallCommand; +use App\Modules\Home\Commands\HomeInstallCommand; class HomeModule extends Module { diff --git a/modules/UserProfile/Applications/UserProfileApplication.php b/modules/UserProfile/Applications/UserProfileApplication.php index 8b6e202..d93bd67 100644 --- a/modules/UserProfile/Applications/UserProfileApplication.php +++ b/modules/UserProfile/Applications/UserProfileApplication.php @@ -7,9 +7,8 @@ * Астана */ -namespace modules\UserProfile\Applications; +namespace App\Modules\UserProfile\Applications; -use A7kz\Accounting\Facades\Accounting; use A7kz\Platform\Models\UniModel; use A7kz\Platform\Modules\Platform\Acl\Facades\Acl; use A7kz\Platform\Modules\Platform\Core\Services\Application\BaseApplication; diff --git a/modules/UserProfile/Commands/UserProfileInstallCommand.php b/modules/UserProfile/Commands/UserProfileInstallCommand.php index 964fe64..ca9fe47 100644 --- a/modules/UserProfile/Commands/UserProfileInstallCommand.php +++ b/modules/UserProfile/Commands/UserProfileInstallCommand.php @@ -7,7 +7,7 @@ * Астана */ -namespace modules\UserProfile\Commands; +namespace App\Modules\UserProfile\Commands; use A7kz\Platform\Commands\InstallCommand; use A7kz\Platform\Helpers\Facade\Helper; diff --git a/modules/UserProfile/UserProfileModule.php b/modules/UserProfile/UserProfileModule.php index 4c1ceaa..8c6b3da 100644 --- a/modules/UserProfile/UserProfileModule.php +++ b/modules/UserProfile/UserProfileModule.php @@ -7,7 +7,7 @@ * Астана */ -namespace modules\UserProfile; +namespace App\Modules\UserProfile; use A7kz\Platform\Modules\Module;