diff --git a/app/modules/tag/manifest.json b/app/modules/tag/manifest.json
index e0c74b6..974f984 100644
--- a/app/modules/tag/manifest.json
+++ b/app/modules/tag/manifest.json
@@ -4,8 +4,9 @@
"author": "ITGuild",
"slug": "tag",
"description": "Tags module",
- "module_path": "{APP}/modules/{slug}",
+ "app_module_path": "{APP}/modules/{slug}",
+ "kernel_module_path": "{KERNEL_APP_MODULES}/{slug}",
"module_class": "app\\modules\\tag\\TagModule",
"module_class_file": "{APP}/modules/tag/TagModule.php",
"routs": "routs/tag.php"
-}
\ No newline at end of file
+}
diff --git a/kernel/console/controllers/ModuleController.php b/kernel/console/controllers/ModuleController.php
index d9e3aac..67417d7 100644
--- a/kernel/console/controllers/ModuleController.php
+++ b/kernel/console/controllers/ModuleController.php
@@ -34,13 +34,14 @@ class ModuleController extends ConsoleController
$this->out->r('Message: Ошибка чтения архива', 'red');
}
- if (file_exists($tmpModuleDirFull . "manifest.json")){
- $manifestJson = getConst(file_get_contents($tmpModuleDirFull . "manifest.json"));
+ if (file_exists($tmpModuleDirFull . "/app/manifest.json")){
+ $manifestJson = getConst(file_get_contents($tmpModuleDirFull . "/app/manifest.json"));
$manifest = Manifest::getWithVars($manifestJson);
$this->out->r('manifest.json инициализирован', 'green');
$fileHelper = new Files();
- $fileHelper->copy_folder($tmpModuleDirFull, $manifest['module_path']);
+ $fileHelper->copy_folder($tmpModuleDirFull . '/app', $manifest['app_module_path']);
+ $fileHelper->copy_folder($tmpModuleDirFull . '/kernel', $manifest['kernel_module_path']);
$this->out->r("Удаляем временные файлы", 'green');
$fileHelper->recursiveRemoveDir($tmpModuleDirFull);
@@ -60,18 +61,21 @@ class ModuleController extends ConsoleController
if (file_exists(ROOT_DIR . $this->argv['path'])) {
$moduleService = new ModuleService();
- $moduleInfo = $moduleService->getModuleInfo(ROOT_DIR . $this->argv['path']);
+ $moduleInfo = $moduleService->getModuleInfo(APP_DIR . '/modules/' . basename($this->argv['path']));
if ($moduleService->isActive($moduleInfo['slug'])) {
$moduleService->setActiveModule($moduleInfo['slug']);
}
$fileHelper = new Files();
- $fileHelper->recursiveRemoveDir(ROOT_DIR . $this->argv['path']);
-
+ if (file_exists(APP_DIR . '/modules/' . $moduleInfo['slug'])) {
+ $fileHelper->recursiveRemoveDir(APP_DIR . '/modules/'. $moduleInfo['slug']);
+ }
+ if (file_exists(KERNEL_APP_MODULES_DIR . '/' . $moduleInfo['slug'])) {
+ $fileHelper->recursiveRemoveDir(KERNEL_APP_MODULES_DIR . '/' . $moduleInfo['slug']);
+ }
$this->out->r("Модуль удален", 'green');
} else {
- var_dump($this->argv['path']);
$this->out->r("Модуль не найден", 'red');
}
}
@@ -91,17 +95,13 @@ class ModuleController extends ConsoleController
$fileHelper->copy_folder(APP_DIR . '/modules/' . $moduleName, $tmpModuleDirFull . 'app/');
$fileHelper->copy_folder(KERNEL_APP_MODULES_DIR . '/' . $moduleName, $tmpModuleDirFull . 'kernel/');
- $this->out->r("Модуль собран в одну папку", 'green');
+ $this->out->r("Модуль собран во временную папку", 'green');
-
-// $fileHelper->pack($zip, RESOURCES_DIR . '/tmp/modules/' . $moduleName . '.zip');
- $fileHelper->pack($tmpModuleDirFull, RESOURCES_DIR . '/tmp/modules/' . $moduleName . '.zip');
-
-// $zip->addEmptyDir($moduleName);
-// $zip->close();
-// $this->out->r("zip закрыт", 'green');
+ $fileHelper->pack($tmpModuleDirFull, RESOURCES_DIR . '/tmp/modules/' . $moduleName . '.itguild');
$this->out->r("Архив создан", 'green');
+ $fileHelper->recursiveRemoveDir($tmpModuleDirFull);
+ $this->out->r("Временная папка удалена", 'green');
}
}
diff --git a/kernel/helpers/Files.php b/kernel/helpers/Files.php
index f70ef16..10f91bd 100644
--- a/kernel/helpers/Files.php
+++ b/kernel/helpers/Files.php
@@ -43,13 +43,13 @@ class Files
rmdir($dir);
}
- public function pack(string $source, string $destination, bool $include_source = true): void
+ public function pack(string $source, string $destination/*, bool $include_source = true*/): void
{
$zip = new ZipArchive();
$zip->open($destination, ZipArchive::CREATE | ZipArchive::OVERWRITE);
- if ($include_source) {
- $zip->addEmptyDir(basename($source));
- }
+// if ($include_source) {
+// $zip->addEmptyDir(basename($source));
+// }
if (is_file($source)) {
$zip->addFile(basename($source));
@@ -62,24 +62,22 @@ class Files
$zip->close();
}
- private function recursiveAddFile(ZipArchive $zip, string $dir): void
+ private function recursiveAddFile(ZipArchive $zip, string $dir, string $folder = ''): void
{
$includes = new FilesystemIterator($dir);
-// Debug::prn($includes);
+
foreach ($includes as $include) {
-// var_dump($include->getFilename());
- if(is_dir($include)/* && !is_link($include)*/) {
- var_dump('ЭТО ПАПКА');
-// $d = dir($include);
-// $entry = $d->read();
-// if ($entry == '.' || $entry == '..') continue;
- $zip->addEmptyDir(basename($include));
- $this->recursiveAddFile($zip, $include);
+ if(is_dir($include)) {
+// $folder .= '/' . $include->getFilename() . '/';
+// $this->recursiveAddFile($zip, $include, $folder);
+
+ $tmpFolder = $folder . '/' . $include->getFilename() . '/';
+ $this->recursiveAddFile($zip, $include, $tmpFolder);
}
- else {
- var_dump("ЭТО ФАЙЛ");
- $zip->addFile($include);
+ if (is_file($include)) {
+ $zip->addFile($include->getPathName(), $folder . $include->getFilename());
}
}
}
+
}
\ No newline at end of file
diff --git a/resources/tmp/ad/tag/app/TagModule.php b/resources/tmp/ad/tag/app/TagModule.php
deleted file mode 100644
index b2f0ffd..0000000
--- a/resources/tmp/ad/tag/app/TagModule.php
+++ /dev/null
@@ -1,38 +0,0 @@
-menuService = new MenuService();
- $this->migrationService = new MigrationService();
- }
-
- /**
- * @throws \Exception
- */
- public function init(): void
- {
- $this->migrationService->runAtPath("{KERNEL_APP_MODULES}/tag/migrations");
-
- $this->menuService->createItem([
- "label" => "Тэги",
- "url" => "/admin/tag",
- "slug" => "tag",
- ]);
- }
-
- public function deactivate(): void
- {
- $this->menuService->removeItemBySlug("tag");
- }
-}
\ No newline at end of file
diff --git a/resources/tmp/ad/tag/app/controllers/TagController.php b/resources/tmp/ad/tag/app/controllers/TagController.php
deleted file mode 100644
index 4598872..0000000
--- a/resources/tmp/ad/tag/app/controllers/TagController.php
+++ /dev/null
@@ -1,8 +0,0 @@
-cgView->viewPath = KERNEL_APP_MODULES_DIR . "/tag/views/";
- $this->tagService = new TagService();
- }
-
- public function actionCreate(): void
- {
- $this->cgView->render("form.php");
- }
-
- #[NoReturn] public function actionAdd(): void
- {
- $tagForm = new CreateTagForm();
- $tagForm->load($_REQUEST);
- if ($tagForm->validate()){
- $tag = $this->tagService->create($tagForm);
- if ($tag){
- $this->redirect("/admin/tag/" . $tag->id);
- }
- }
- $this->redirect("/admin/tag/create");
- }
-
- public function actionIndex($page_number = 1): void
- {
- $this->cgView->render("index.php", ['page_number' => $page_number]);
- }
-
- /**
- * @throws Exception
- */
- public function actionView($id): void
- {
- $tag = Tag::find($id);
-
- if (!$tag){
- throw new Exception(message: "The tag not found");
- }
- $this->cgView->render("view.php", ['tag' => $tag]);
- }
-
- /**
- * @throws Exception
- */
- public function actionUpdate($id): void
- {
- $model = Tag::find($id);
- if (!$model){
- throw new Exception(message: "The tag not found");
- }
-
- $this->cgView->render("form.php", ['model' => $model]);
- }
-
- /**
- * @throws Exception
- */
- public function actionEdit($id): void
- {
- $tag = Tag::find($id);
- if (!$tag){
- throw new Exception(message: "The tag not found");
- }
- $tagForm = new CreateTagForm();
- $tagService = new TagService();
- $tagForm->load($_REQUEST);
- if ($tagForm->validate()) {
- $tag = $tagService->update($tagForm, $tag);
- if ($tag) {
- $this->redirect("/admin/tag/" . $tag->id);
- }
- }
- $this->redirect("/admin/tag/update/" . $id);
- }
-
- #[NoReturn] public function actionDelete($id): void
- {
- $post = Tag::find($id)->first();
- $post->delete();
- $this->redirect("/admin/tag/");
- }
-
-}
\ No newline at end of file
diff --git a/resources/tmp/ad/tag/kernel/migrations/2024_10_08_093710_create_tag_table.php b/resources/tmp/ad/tag/kernel/migrations/2024_10_08_093710_create_tag_table.php
deleted file mode 100644
index 37c4be5..0000000
--- a/resources/tmp/ad/tag/kernel/migrations/2024_10_08_093710_create_tag_table.php
+++ /dev/null
@@ -1,31 +0,0 @@
-schema->create('tag', function (Blueprint $table) {
- $table->increments('id');
- $table->string('label', 255)->nullable(false);
- $table->string('entity', 255)->nullable(false);
- $table->string('slug', 255)->unique();
- $table->integer('status')->default(1);
- $table->timestamps();
- });
- }
-
- /**
- * Reverse the migrations.
- */
- public function down(): void
- {
- \kernel\App::$db->schema->dropIfExists('tag');
- }
-};
diff --git a/resources/tmp/ad/tag/kernel/models/Tag.php b/resources/tmp/ad/tag/kernel/models/Tag.php
deleted file mode 100644
index 49e1bb4..0000000
--- a/resources/tmp/ad/tag/kernel/models/Tag.php
+++ /dev/null
@@ -1,46 +0,0 @@
- 'Заголовок',
- 'entity' => 'Сущность',
- 'slug' => 'Slug',
- 'status' => 'Статус',
- ];
- }
-
- /**
- * @return string[]
- */
- public static function getStatus(): array
- {
- return [
- self::DISABLE_STATUS => "Не активный",
- self::ACTIVE_STATUS => "Активный",
- ];
- }
-
-}
\ No newline at end of file
diff --git a/resources/tmp/ad/tag/kernel/models/forms/CreateTagForm.php b/resources/tmp/ad/tag/kernel/models/forms/CreateTagForm.php
deleted file mode 100644
index 82fd893..0000000
--- a/resources/tmp/ad/tag/kernel/models/forms/CreateTagForm.php
+++ /dev/null
@@ -1,20 +0,0 @@
- 'required|min-str-len:5|max-str-len:30',
- 'entity' => 'required|min-str-len:1|max-str-len:50',
- 'slug' => '',
- 'status' => ''
- ];
- }
-
-}
\ No newline at end of file
diff --git a/resources/tmp/ad/tag/kernel/routs/tag.php b/resources/tmp/ad/tag/kernel/routs/tag.php
deleted file mode 100644
index 6ec41fe..0000000
--- a/resources/tmp/ad/tag/kernel/routs/tag.php
+++ /dev/null
@@ -1,18 +0,0 @@
-group(["prefix" => "admin"], function (CgRouteCollector $router) {
- App::$collector->group(["prefix" => "tag"], function (CGRouteCollector $router){
- App::$collector->get('/', [\app\modules\tag\controllers\TagController::class, 'actionIndex']);
- App::$collector->get('/page/{page_number}', [\app\modules\tag\controllers\TagController::class, 'actionIndex']);
- App::$collector->get('/create', [\app\modules\tag\controllers\TagController::class, 'actionCreate']);
- App::$collector->post("/", [\app\modules\tag\controllers\TagController::class, 'actionAdd']);
- App::$collector->get('/{id}', [\app\modules\tag\controllers\TagController::class, 'actionView']);
- App::$collector->any('/update/{id}', [\app\modules\tag\controllers\TagController::class, 'actionUpdate']);
- App::$collector->any("/edit/{id}", [\app\modules\tag\controllers\TagController::class, 'actionEdit']);
- App::$collector->get('/delete/{id}', [\app\modules\tag\controllers\TagController::class, 'actionDelete']);
- });
-});
\ No newline at end of file
diff --git a/resources/tmp/ad/tag/kernel/services/TagService.php b/resources/tmp/ad/tag/kernel/services/TagService.php
deleted file mode 100644
index 9407f0a..0000000
--- a/resources/tmp/ad/tag/kernel/services/TagService.php
+++ /dev/null
@@ -1,42 +0,0 @@
-label = $form_model->getItem('label');
- $model->entity = $form_model->getItem('entity');
- $model->status = $form_model->getItem('status');
- $model->slug = Slug::createSlug($form_model->getItem('label'), Tag::class);
- if ($model->save()){
- return $model;
- }
-
- return false;
- }
-
- public function update(FormModel $form_model, Tag $tag): false|Tag
- {
- if ($tag->label !== $form_model->getItem('label')) {
- $tag->slug = Slug::createSlug($form_model->getItem('label'), Tag::class);
- }
- $tag->label = $form_model->getItem('label');
- $tag->entity = $form_model->getItem('entity');
- $tag->status = $form_model->getItem('status');
-
- if ($tag->save()){
- return $tag;
- }
-
- return false;
- }
-
-}
\ No newline at end of file
diff --git a/resources/tmp/ad/tag/kernel/views/form.php b/resources/tmp/ad/tag/kernel/views/form.php
deleted file mode 100644
index 3a37b96..0000000
--- a/resources/tmp/ad/tag/kernel/views/form.php
+++ /dev/null
@@ -1,58 +0,0 @@
-beginForm(isset($model) ? "/admin/tag/edit/" . $model->id : "/admin/tag");
-
-$form->field(class: \itguild\forms\inputs\TextInput::class, name: "label", params: [
- 'class' => "form-control",
- 'placeholder' => 'Заголовок',
- 'value' => $model->label ?? ''
-])
- ->setLabel("Заголовок")
- ->render();
-
-$form->field(class: \itguild\forms\inputs\TextInput::class, name: "entity", params: [
- 'class' => "form-control",
- 'placeholder' => 'Сущность',
- 'value' => $model->entity ?? ''
-])
- ->setLabel("Сущность")
- ->render();
-
-$form->field(\itguild\forms\inputs\Select::class, 'status', [
- 'class' => "form-control",
- 'value' => $model->status ?? ''
-])
- ->setLabel("Статус")
- ->setOptions(Tag::getStatus())
- ->render();
-?>
-
-
- field(\itguild\forms\inputs\Button::class, name: "btn-submit", params: [
- 'class' => "btn btn-primary ",
- 'value' => 'Отправить',
- 'typeInput' => 'submit'
- ])
- ->render();
- ?>
-
-
- field(\itguild\forms\inputs\Button::class, name: "btn-reset", params: [
- 'class' => "btn btn-warning",
- 'value' => 'Сбросить',
- 'typeInput' => 'reset'
- ])
- ->render();
- ?>
-
-
-
- field(\itguild\forms\inputs\Button::class, name: "btn-submit", params: [
- 'class' => "btn btn-primary ",
- 'value' => 'Отправить',
- 'typeInput' => 'submit'
- ])
- ->render();
- ?>
-
-
- field(\itguild\forms\inputs\Button::class, name: "btn-reset", params: [
- 'class' => "btn btn-warning",
- 'value' => 'Сбросить',
- 'typeInput' => 'reset'
- ])
- ->render();
- ?>
-
-