diff --git a/kernel/modules/post/views/index.php b/kernel/modules/post/views/index.php
index 26eb926..d82ecb5 100644
--- a/kernel/modules/post/views/index.php
+++ b/kernel/modules/post/views/index.php
@@ -13,6 +13,10 @@ use kernel\modules\user\models\User;
use Itguild\EloquentTable\EloquentDataProvider;
use Itguild\EloquentTable\ListEloquentTable;
use kernel\IGTabel\btn\PrimaryBtn;
+use kernel\widgets\IconBtn\IconBtnCreateWidget;
+use kernel\widgets\IconBtn\IconBtnDeleteWidget;
+use kernel\widgets\IconBtn\IconBtnEditWidget;
+use kernel\widgets\IconBtn\IconBtnViewWidget;
$table = new ListEloquentTable(new EloquentDataProvider(Post::class, [
'currentPage' => $page_number,
@@ -20,6 +24,16 @@ $table = new ListEloquentTable(new EloquentDataProvider(Post::class, [
'params' => ["class" => "table table-bordered", "border" => "2"],
'baseUrl' => "/admin/post"
]));
+
+$entityRelation = new \kernel\EntityRelation();
+$additionals = $entityRelation->getEntityRelationsBySlug("post");
+
+foreach ($additionals as $additional) {
+ $table->addColumn($additional, $additional, function ($id) use ($entityRelation, $additional) {
+ return $entityRelation->getAdditionalPropertyByEntityId("post", $id, $additional);
+ });
+}
+
$table->columns([
'created_at' => function ($data) {
if (!$data){
@@ -39,12 +53,18 @@ $table->columns([
return User::find($data)->username;
})
]);
+
$table->beforePrint(function () {
- return PrimaryBtn::create("Создать", "/admin/post/create")->fetch();
- //return (new PrimaryBtn("Создать", "/admin/user/create"))->fetch();
+ return IconBtnCreateWidget::create(['url' => '/admin/post/create'])->run();
+});
+$table->addAction(function($row) {
+ return IconBtnViewWidget::create(['url' => '/admin/post/view/' . $row['id']])->run();
+});
+$table->addAction(function($row) {
+ return IconBtnEditWidget::create(['url' => '/admin/post/update/' . $row['id']])->run();
+});
+$table->addAction(function($row) {
+ return IconBtnDeleteWidget::create(['url' => '/admin/post/delete/' . $row['id']])->run();
});
-$table->addAction(ViewActionColumn::class);
-$table->addAction(EditActionColumn::class);
-$table->addAction(DeleteActionColumn::class);
$table->create();
$table->render();
\ No newline at end of file
diff --git a/kernel/modules/post/views/view.php b/kernel/modules/post/views/view.php
index 13837b1..e3693d1 100644
--- a/kernel/modules/post/views/view.php
+++ b/kernel/modules/post/views/view.php
@@ -10,26 +10,39 @@ use Itguild\EloquentTable\ViewJsonTableEloquentModel;
use kernel\IGTabel\btn\DangerBtn;
use kernel\IGTabel\btn\PrimaryBtn;
use kernel\IGTabel\btn\SuccessBtn;
+use kernel\widgets\IconBtn\IconBtnDeleteWidget;
+use kernel\widgets\IconBtn\IconBtnEditWidget;
+use kernel\widgets\IconBtn\IconBtnListWidget;
$table = new ViewEloquentTable(new ViewJsonTableEloquentModel($content, [
'params' => ["class" => "table table-bordered", "border" => "2"],
'baseUrl' => "/admin/post",
]));
$table->beforePrint(function () use ($content) {
- $btn = PrimaryBtn::create("Список", "/admin/post")->fetch();
- $btn .= SuccessBtn::create("Редактировать", "/admin/post/update/" . $content->id)->fetch();
- $btn .= DangerBtn::create("Удалить", "/admin/post/delete/" . $content->id)->fetch();
+ $btn = IconBtnListWidget::create(['url' => '/admin/post'])->run();
+ $btn .= IconBtnEditWidget::create(['url' => '/admin/post/update/' . $content->id])->run();
+ $btn .= IconBtnDeleteWidget::create(['url' => '/admin/post/delete/' . $content->id])->run();
return $btn;
});
+
+$entityRelation = new \kernel\EntityRelation();
+$additionals = $entityRelation->getEntityAdditionalProperty("post", $content);
+
+foreach ($additionals as $key => $additional) {
+ $table->addRow($key, function () use ($additional) {
+ return $additional;
+ }, ['after' => 'user_id']);
+}
+
$table->rows([
'created_at' => function ($data) {
- if (!$data){
+ if (!$data) {
return null;
}
return (new DateTimeImmutable($data))->format("d-m-Y");
},
'updated_at' => function ($data) {
- if (!$data){
+ if (!$data) {
return null;
}
return (new DateTimeImmutable($data))->format("d-m-Y");
diff --git a/kernel/modules/secure/controllers/SecureController.php b/kernel/modules/secure/controllers/SecureController.php
index 5eac006..8498c77 100644
--- a/kernel/modules/secure/controllers/SecureController.php
+++ b/kernel/modules/secure/controllers/SecureController.php
@@ -4,10 +4,19 @@ namespace kernel\modules\secure\controllers;
use JetBrains\PhpStorm\NoReturn;
use kernel\AdminController;
+use kernel\App;
use kernel\Flash;
use kernel\helpers\Debug;
+use kernel\Mailing;
+use kernel\modules\secure\models\forms\LoginEmailForm;
use kernel\modules\secure\models\forms\LoginForm;
+use kernel\modules\secure\models\forms\RegisterForm;
+use kernel\modules\secure\services\SecureService;
+use kernel\modules\user\models\User;
use kernel\modules\user\service\UserService;
+use kernel\Request;
+use PHPMailer\PHPMailer\Exception;
+use Random\RandomException;
class SecureController extends AdminController
{
@@ -16,7 +25,6 @@ class SecureController extends AdminController
protected function init(): void
{
parent::init();
-// $this->cgView->viewPath = KERNEL_DIR . "/views/secure/";
$this->cgView->viewPath = KERNEL_MODULES_DIR. "/secure/views/";
$this->cgView->layout = "/login.php";
$this->userService = new UserService();
@@ -24,7 +32,12 @@ class SecureController extends AdminController
public function actionLogin(): void
{
- $this->cgView->render('login.php');
+ $this->cgView->render(match (App::$secure['web_auth_type']) {
+ "login_password" => "login.php",
+ "email_code" => "email_login.php",
+ });
+
+// $this->cgView->render('login.php');
}
#[NoReturn] public function actionAuth(): void
@@ -44,8 +57,9 @@ class SecureController extends AdminController
Flash::setMessage("error", "User not found.");
$this->redirect("/admin/login", code: 302);
}
+
if (password_verify($loginForm->getItem("password"), $user->password_hash)) {
- setcookie('user_id', $user->id, time()+60*60*24, '/', $_SERVER['HTTP_HOST'], false);
+ setcookie('user_id', $user->id, time()+60*60*24, '/', $_SERVER['SERVER_NAME'], false);
$this->redirect("/admin", code: 302);
} else {
Flash::setMessage("error", "Username or password incorrect.");
@@ -53,11 +67,107 @@ class SecureController extends AdminController
}
}
+ /**
+ * @throws RandomException
+ * @throws Exception
+ */
+ public function actionEmailAuth(): void
+ {
+ $mailing = new Mailing();
+
+ $loginForm = new LoginEmailForm();
+ $loginForm->load($_REQUEST);
+
+ $email = $loginForm->getItem("email");
+ $user = $this->userService->getByField('email', $email);
+
+ if (!$user){
+ $password = bin2hex(random_bytes(8));
+
+ UserService::createUserByEmailAndPassword($email, $password);
+ $user = $this->userService->getByField('email', $email);
+
+ SecureService::createSecretCode($user);
+ $secretCode = SecureService::getByField("user_id", $user->id);
+
+
+ $mailing->send_html("register_by_code.php", ['code' => $secretCode->code, 'password' => $password], [
+ 'address' => $email,
+ 'subject' => "Код регистрации",
+ "from_name" => $_ENV['APP_NAME']
+ ]);
+ } else {
+ SecureService::updateSecretCode($user);
+ $secretCode = SecureService::getByField("user_id", $user->id);
+ $mailing->send_html("login_by_code.php", ['code' => $secretCode->code], [
+ 'address' => $email,
+ 'subject' => "Код авторизации",
+ "from_name" => $_ENV['APP_NAME']
+ ]);
+ }
+
+ setcookie('user_email', $email, time()+60*15, '/', $_SERVER['SERVER_NAME'], false);
+ $this->cgView->render("enter_code.php", ['email' => $email]);
+ }
+
+ /**
+ * @throws Exception
+ */
+ public function actionCodeCheck(): void
+ {
+ $request = new Request();
+
+ if (isset($_COOKIE['user_email'])) {
+ $user = User::where('email', $_COOKIE["user_email"])->first();
+ if (!$user) {
+ throw new exception("User not found.");
+ }
+ $code = $request->post("code");
+ $secretCode = SecureService::getByField("user_id", $user->id);
+ if ($secretCode->code == $code && time() <= strtotime($secretCode->code_expires_at)) {
+ setcookie('user_id', $user->id, time() + 60 * 60 * 24, '/', $_SERVER['SERVER_NAME'], false);
+ $this->redirect("/admin", code: 302);
+ } else {
+ Flash::setMessage("error", "Wrong code.");
+ $this->cgView->render("enter_code.php", ['email' => $_COOKIE["user_email"]]);
+ }
+
+ }
+ }
+
#[NoReturn] public function actionLogout(): void
{
unset($_COOKIE['user_id']);
setcookie('user_id', "", -1, '/', ".".$_SERVER['SERVER_NAME'], false);
+ setcookie('user_email', "", -1, '/', ".".$_SERVER['SERVER_NAME'], false);
$this->redirect("/", code: 302);
}
+ public function actionRegister(): void
+ {
+ $this->cgView->render('register.php');
+ }
+
+ public function actionRegistration(): void
+ {
+ $regForm = new RegisterForm();
+ $regForm->load($_REQUEST);
+
+ if ($this->userService->getByField('username', $regForm->getItem("username"))) {
+ Flash::setMessage("error", "Username already exists.");
+ $this->redirect("/admin/register", code: 302);
+ }
+
+ if ($this->userService->getByField('email', $regForm->getItem("email"))) {
+ Flash::setMessage("error", "Email already exists.");
+ $this->redirect("/admin/register", code: 302);
+ }
+
+ $user = $this->userService->create($regForm);
+ if ($user){
+ setcookie('user_id', $user->id, time()+60*60*24, '/', $_SERVER['SERVER_NAME'], false);
+ $this->redirect("/admin", code: 302);
+ }
+ }
+
}
\ No newline at end of file
diff --git a/kernel/modules/secure/controllers/SecureRestController.php b/kernel/modules/secure/controllers/SecureRestController.php
index 42ede4a..7e82699 100644
--- a/kernel/modules/secure/controllers/SecureRestController.php
+++ b/kernel/modules/secure/controllers/SecureRestController.php
@@ -7,10 +7,15 @@ use Firebase\JWT\Key;
use JetBrains\PhpStorm\NoReturn;
use kernel\App;
use kernel\helpers\Debug;
+use kernel\Mailing;
+use kernel\modules\secure\models\SecretCode;
+use kernel\modules\secure\services\SecureService;
use kernel\modules\user\models\User;
+use kernel\modules\user\service\UserService;
use kernel\Request;
use kernel\RestController;
use kernel\services\TokenService;
+use PHPMailer\PHPMailer\Exception;
use Random\RandomException;
class SecureRestController extends RestController
@@ -51,4 +56,75 @@ class SecureRestController extends RestController
$this->renderApi($res);
}
-}
\ No newline at end of file
+ /**
+ * @throws Exception
+ * @throws RandomException
+ */
+ #[NoReturn] public function actionEmailAuth(): void
+ {
+ $mailing = new Mailing();
+ $request = new Request();
+ $data = $request->post();
+ $model = $this->model->where('email', $data['email'])->first();
+
+ if (!$model) {
+ $password = bin2hex(random_bytes(8));
+
+ UserService::createUserByEmailAndPassword($data['email'], $password);
+ $model = UserService::getByField('email', $data['email']);
+
+ SecureService::createSecretCode($model);
+ $secretCode = SecureService::getByField("user_id", $model->id);
+
+
+ $mailing->send_html("register_by_code.php", ['code' => $secretCode->code, 'password' => $password], [
+ 'address' => $data['email'],
+ 'subject' => "Код регистрации",
+ "from_name" => $_ENV['APP_NAME']
+ ]);
+ } else {
+ SecureService::updateSecretCode($model);
+ $secretCode = SecureService::getByField("user_id", $model->id);
+
+ $mailing->send_html("login_by_code.php", ['code' => $secretCode->code], [
+ 'address' => $data['email'],
+ 'subject' => "Код авторизации",
+ "from_name" => $_ENV['APP_NAME']
+ ]);
+ }
+
+ $res = [
+ "status" => "success",
+ "code_expires_at" => $secretCode->code_expires_at,
+ ];
+
+ setcookie('user_email', $data['email'], time()+60*15, '/', $_SERVER['SERVER_NAME'], false);
+ $this->renderApi($res);
+ }
+
+ /**
+ * @throws Exception
+ */
+ #[NoReturn] public function actionCodeCheck(): void
+ {
+ $request = new Request();
+ $code = $request->post("code");
+
+ $model = SecretCode::where("code", $code)->first();
+ if (time() <= strtotime($model->code_expires_at)) {
+ $user = $this->model->where("id", $model->user_id)->first();
+ if ($user){
+ $user->access_token_expires_at = date("Y-m-d H:i:s", strtotime(App::$secure['token_expired_time']));
+ $user->access_token = SecureService::generateAccessToken();
+ $user->save();
+ $this->renderApi([
+ "access_token" => $user->access_token,
+ "access_token_expires_at" => $user->access_token_expires_at,
+ ]);
+ }
+ }
+
+ $this->renderApi(['status' => 'error', 'message' => 'incorrect code']);
+ }
+
+}
diff --git a/kernel/modules/secure/migrations/2024_12_09_081420_create_secret_code_table.php b/kernel/modules/secure/migrations/2024_12_09_081420_create_secret_code_table.php
new file mode 100644
index 0000000..c5acce1
--- /dev/null
+++ b/kernel/modules/secure/migrations/2024_12_09_081420_create_secret_code_table.php
@@ -0,0 +1,31 @@
+schema->create('secret_code', function (Blueprint $table) {
+ $table->increments('id');
+ $table->integer('user_id');
+ $table->integer('code');
+ $table->dateTime('code_expires_at')->nullable(true);
+ $table->timestamps();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ */
+ public function down(): void
+ {
+ \kernel\App::$db->schema->dropIfExists('secret_code');
+
+ }
+};
diff --git a/kernel/modules/secure/models/SecretCode.php b/kernel/modules/secure/models/SecretCode.php
new file mode 100644
index 0000000..0caaa60
--- /dev/null
+++ b/kernel/modules/secure/models/SecretCode.php
@@ -0,0 +1,25 @@
+ 'Пользователь',
+ 'code' => 'Код',
+ 'code_expires_at' => 'Срок жизни кода',
+ ];
+ }
+
+}
diff --git a/kernel/modules/secure/models/forms/LoginEmailForm.php b/kernel/modules/secure/models/forms/LoginEmailForm.php
new file mode 100644
index 0000000..201817a
--- /dev/null
+++ b/kernel/modules/secure/models/forms/LoginEmailForm.php
@@ -0,0 +1,17 @@
+ 'required|string|email|max255',
+ ];
+ }
+
+}
\ No newline at end of file
diff --git a/kernel/modules/secure/models/forms/RegisterForm.php b/kernel/modules/secure/models/forms/RegisterForm.php
new file mode 100644
index 0000000..9d4a18e
--- /dev/null
+++ b/kernel/modules/secure/models/forms/RegisterForm.php
@@ -0,0 +1,19 @@
+ 'required|min-str-len:5|max-str-len:50',
+ 'email' => 'required|email|max-str-len:50',
+ 'password' => 'required|min-str-len:6|max-str-len:50',
+ ];
+ }
+
+}
\ No newline at end of file
diff --git a/kernel/modules/secure/routs/secure.php b/kernel/modules/secure/routs/secure.php
index 84b37c3..be041d8 100644
--- a/kernel/modules/secure/routs/secure.php
+++ b/kernel/modules/secure/routs/secure.php
@@ -14,11 +14,17 @@ App::$collector->group(["prefix" => "admin"], function (RouteCollector $router){
App::$collector->get('/login', [\kernel\modules\secure\controllers\SecureController::class, 'actionLogin']);
App::$collector->get('/logout', [\kernel\modules\secure\controllers\SecureController::class, 'actionLogout']);
App::$collector->post('/auth', [\kernel\modules\secure\controllers\SecureController::class, 'actionAuth']);
+ App::$collector->post('/email_auth', [\kernel\modules\secure\controllers\SecureController::class, 'actionEmailAuth']);
+ App::$collector->get('/register', [\kernel\modules\secure\controllers\SecureController::class, 'actionRegister']);
+ App::$collector->post('/registration', [\kernel\modules\secure\controllers\SecureController::class, 'actionRegistration']);
+ App::$collector->post('/code_check', [\kernel\modules\secure\controllers\SecureController::class, 'actionCodeCheck']);
});
App::$collector->group(["prefix" => "api"], function (CgRouteCollector $router){
App::$collector->group(["prefix" => "secure"], function (CgRouteCollector $router) {
App::$collector->post('/auth', [\kernel\modules\secure\controllers\SecureRestController::class, 'actionAuth']);
+ App::$collector->post('/email_auth', [\kernel\modules\secure\controllers\SecureRestController::class, 'actionEmailAuth']);
+ App::$collector->post('/code_check', [\kernel\modules\secure\controllers\SecureRestController::class, 'actionCodeCheck']);
});
});
diff --git a/kernel/modules/secure/services/SecureService.php b/kernel/modules/secure/services/SecureService.php
new file mode 100644
index 0000000..b47f4d4
--- /dev/null
+++ b/kernel/modules/secure/services/SecureService.php
@@ -0,0 +1,54 @@
+user_id = $user->id;
+ $secretCode->code = mt_rand(100000, 999999);
+ $secretCode->code_expires_at = date("Y-m-d H:i:s", strtotime("+5 minutes"));;
+ $secretCode->save();
+ }
+
+ public static function updateSecretCode(User $user): void
+ {
+ $secretCode = SecretCode::where('user_id', $user->id)->first();
+ $secretCode->code = mt_rand(100000, 999999);
+ $secretCode->code_expires_at = date("Y-m-d H:i:s", strtotime("+5 minutes"));;
+ $secretCode->save();
+ }
+
+ public static function getCodeByUserId(int $user_id)
+ {
+ return SecretCode::where('user_id', $user_id)->one()->code;
+ }
+
+ public static function getByField(string $field, mixed $value)
+ {
+ return SecretCode::where($field, $value)->first();
+ }
+
+ public static function generateAccessToken(): string
+ {
+ return match (App::$secure['token_type']) {
+ "JWT" => TokenService::JWT($_ENV['SECRET_KEY'], 'HS256'),
+ "md5" => TokenService::md5(),
+ "crypt" => TokenService::crypt(),
+ "hash" => TokenService::hash('sha256'),
+ default => TokenService::random_bytes(20),
+ };
+ }
+
+}
\ No newline at end of file
diff --git a/kernel/modules/secure/views/email_login.php b/kernel/modules/secure/views/email_login.php
new file mode 100644
index 0000000..eadc71b
--- /dev/null
+++ b/kernel/modules/secure/views/email_login.php
@@ -0,0 +1,48 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/kernel/modules/secure/views/enter_code.php b/kernel/modules/secure/views/enter_code.php
new file mode 100644
index 0000000..57aed3a
--- /dev/null
+++ b/kernel/modules/secure/views/enter_code.php
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/kernel/modules/secure/views/login.php b/kernel/modules/secure/views/login.php
index c6cd7c3..9503fce 100644
--- a/kernel/modules/secure/views/login.php
+++ b/kernel/modules/secure/views/login.php
@@ -24,6 +24,9 @@
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+ Форма авторизации/регистрации
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Введите код, отправленный на почту ""
+
+
+
Авторизация
+
+
+
+
diff --git a/kernel/modules/secure/views/register.php b/kernel/modules/secure/views/register.php
new file mode 100644
index 0000000..ecc8752
--- /dev/null
+++ b/kernel/modules/secure/views/register.php
@@ -0,0 +1,71 @@
+
+
+
+ Регистрация
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Регистрация
+
diff --git a/kernel/modules/user/views/index.php b/kernel/modules/user/views/index.php
index 5876e6c..e492f5e 100644
--- a/kernel/modules/user/views/index.php
+++ b/kernel/modules/user/views/index.php
@@ -12,6 +12,10 @@ use kernel\IGTabel\action_column\EditActionColumn;
use kernel\IGTabel\action_column\ViewActionColumn;
use kernel\IGTabel\btn\PrimaryBtn;
use kernel\modules\user\models\User;
+use kernel\widgets\IconBtn\IconBtnCreateWidget;
+use kernel\widgets\IconBtn\IconBtnDeleteWidget;
+use kernel\widgets\IconBtn\IconBtnEditWidget;
+use kernel\widgets\IconBtn\IconBtnViewWidget;
$table = new ListEloquentTable(new EloquentDataProvider(User::class, [
'currentPage' => $page_number,
@@ -20,6 +24,16 @@ $table = new ListEloquentTable(new EloquentDataProvider(User::class, [
'baseUrl' => "/admin/user",
'filters' => ['email'],
]));
+
+$entityRelation = new \kernel\EntityRelation();
+$additionals = $entityRelation->getEntityRelationsBySlug("user");
+
+foreach ($additionals as $additional) {
+ $table->addColumn($additional, $additional, function ($id) use ($entityRelation, $additional) {
+ return $entityRelation->getAdditionalPropertyByEntityId("user", $id, $additional);
+ });
+}
+
$table->columns([
'username' => [
"filter" => [
@@ -42,11 +56,16 @@ $table->columns([
}
]);
$table->beforePrint(function () {
- return PrimaryBtn::create("Создать", "/admin/user/create")->fetch();
- //return (new PrimaryBtn("Создать", "/admin/user/create"))->fetch();
+ return IconBtnCreateWidget::create(['url' => '/admin/user/create'])->run();
+});
+$table->addAction(function($row) {
+ return IconBtnViewWidget::create(['url' => '/admin/user/view/' . $row['id']])->run();
+});
+$table->addAction(function($row) {
+ return IconBtnEditWidget::create(['url' => '/admin/user/update/' . $row['id']])->run();
+});
+$table->addAction(function($row) {
+ return IconBtnDeleteWidget::create(['url' => '/admin/user/delete/' . $row['id']])->run();
});
-$table->addAction(ViewActionColumn::class);
-$table->addAction(EditActionColumn::class);
-$table->addAction(DeleteActionColumn::class);
$table->create();
$table->render();
\ No newline at end of file
diff --git a/kernel/modules/user/views/view.php b/kernel/modules/user/views/view.php
index fc8293b..856186f 100644
--- a/kernel/modules/user/views/view.php
+++ b/kernel/modules/user/views/view.php
@@ -10,17 +10,30 @@ use Itguild\EloquentTable\ViewJsonTableEloquentModel;
use kernel\IGTabel\btn\DangerBtn;
use kernel\IGTabel\btn\PrimaryBtn;
use kernel\IGTabel\btn\SuccessBtn;
+use kernel\widgets\IconBtn\IconBtnDeleteWidget;
+use kernel\widgets\IconBtn\IconBtnEditWidget;
+use kernel\widgets\IconBtn\IconBtnListWidget;
$table = new ViewEloquentTable(new ViewJsonTableEloquentModel($user, [
'params' => ["class" => "table table-bordered", "border" => "2"],
'baseUrl' => "/admin/user",
]));
$table->beforePrint(function () use ($user) {
- $btn = PrimaryBtn::create("Список", "/admin/user")->fetch();
- $btn .= SuccessBtn::create("Редактировать", "/admin/user/update/" . $user->id)->fetch();
- $btn .= DangerBtn::create("Удалить", "/admin/user/delete/" . $user->id)->fetch();
+ $btn = IconBtnListWidget::create(['url' => '/admin/user'])->run();
+ $btn .= IconBtnEditWidget::create(['url' => '/admin/user/update/' . $user->id])->run();
+ $btn .= IconBtnDeleteWidget::create(['url' => '/admin/user/delete/' . $user->id])->run();
return $btn;
});
+
+$entityRelation = new \kernel\EntityRelation();
+$additionals = $entityRelation->getEntityAdditionalProperty("user", $user);
+
+foreach ($additionals as $key => $additional) {
+ $table->addRow($key, function () use ($additional) {
+ return $additional;
+ }, ['after' => 'email']);
+}
+
$table->rows([
'created_at' => function ($data) {
if (!$data){
diff --git a/kernel/services/MigrationService.php b/kernel/services/MigrationService.php
index 8205fa7..aabee7b 100644
--- a/kernel/services/MigrationService.php
+++ b/kernel/services/MigrationService.php
@@ -23,6 +23,7 @@ class MigrationService
public function runAtPath(string $path = ROOT_DIR . '/migrations'): array
{
$path = getConst($path);
+// Debug::dd($path);
try {
$dmr = new DatabaseMigrationRepository(App::$db->capsule->getDatabaseManager(), 'migration');
@@ -31,7 +32,7 @@ class MigrationService
return $m->run($path);
} catch (\Exception $e) {
- throw new \Exception('Не удалось поднять играции');
+ throw new \Exception('Не удалось поднять миграции');
}
}
diff --git a/kernel/services/ModuleService.php b/kernel/services/ModuleService.php
index 3840192..50a3603 100644
--- a/kernel/services/ModuleService.php
+++ b/kernel/services/ModuleService.php
@@ -3,18 +3,22 @@
namespace kernel\services;
use DirectoryIterator;
-use GuzzleHttp\Client;
+use kernel\EntityRelation;
+use kernel\Flash;
use kernel\helpers\Debug;
use kernel\helpers\Files;
use kernel\helpers\Manifest;
use kernel\helpers\RESTClient;
use kernel\models\Option;
+use MongoDB\Driver\Session;
use ZipArchive;
class ModuleService
{
protected array $errors = [];
+ protected null|bool $serverAvailable = null;
+
/**
* @param string $module
* @return false|array|string
@@ -67,9 +71,9 @@ class ModuleService
{
$active_modules = Option::where("key", "active_modules")->first();
if ($active_modules) {
- $path = json_decode($active_modules->value);
- foreach ($path->modules as $p) {
- if ($p === $slug) {
+ $modules = json_decode($active_modules->value);
+ foreach ($modules->modules as $mod) {
+ if ($mod === $slug) {
return true;
}
}
@@ -109,7 +113,7 @@ class ModuleService
if (isset($module_info['dependence'])) {
$dependence_array = explode(',', $module_info['dependence']);
foreach ($dependence_array as $depend) {
- if (!in_array($depend, $active_modules->modules)) {
+ if (!in_array(trim($depend), $active_modules->modules)) {
$this->addError("first activate the $depend module");
return false;
}
@@ -131,6 +135,10 @@ class ModuleService
public function deactivateModule(string $module): bool
{
$active_modules_info = Option::where("key", "active_modules")->first();
+
+ EntityRelation::removeEntityRelation($module);
+ EntityRelation::removePropertyRelation($module);
+
$active_modules = json_decode($active_modules_info->value);
if (!in_array($module, $active_modules->modules)) {
return true;
@@ -355,8 +363,6 @@ class ModuleService
mkdir(RESOURCES_DIR . '/tmp/modules', 0777, true);
}
$fileHelper->pack($tmpModuleDirFull, RESOURCES_DIR . '/tmp/modules/' . $moduleName . '.igm');
-
- //$fileHelper->recursiveRemoveDir($tmpModuleDirFull);
}
/**
@@ -438,17 +444,19 @@ class ModuleService
public function isLastVersion(string $slug): bool
{
- $modules_info = RESTClient::request($_ENV['MODULE_SHOP_URL'] . '/api/module_shop/gb_slug');
+ if ($this->isServerAvailable()){
+ $modules_info = RESTClient::request($_ENV['MODULE_SHOP_URL'] . '/api/module_shop/gb_slug');
- $modules_info = json_decode($modules_info->getBody()->getContents(), true);
- $mod_info = $this->getModuleInfoBySlug($slug);
- foreach ($modules_info as $mod) {
- if ($mod['slug'] === $mod_info['slug'] && $mod['version'] === $mod_info['version']) {
- return true;
+ $modules_info = json_decode($modules_info->getBody()->getContents(), true);
+ $mod_info = $this->getModuleInfoBySlug($slug);
+ foreach ($modules_info as $mod) {
+ if ($mod['slug'] === $mod_info['slug'] && $mod['version'] === $mod_info['version']) {
+ return true;
+ }
}
}
- return false;
+ return false;
}
public function isKernelModule(string $slug): bool
@@ -463,6 +471,27 @@ class ModuleService
return false;
}
+ public function isShopModule(string $slug): bool
+ {
+ if ($this->isServerAvailable()){
+ $modules_info = RESTClient::request($_ENV['MODULE_SHOP_URL'] . '/api/module_shop/gb_slug');
+
+ if (!$this->issetModuleShopToken()){
+ return false;
+ }
+
+ $modules_info = json_decode($modules_info->getBody()->getContents(), true);
+ $mod_info = $this->getModuleInfoBySlug($slug);
+ foreach ($modules_info as $mod) {
+ if ($mod['slug'] === $mod_info['slug']) {
+ return true;
+ }
+ }
+ }
+
+ return false;
+ }
+
public function getKernelModules(): array
{
$modules_info = [];
@@ -474,4 +503,30 @@ class ModuleService
return $modules_info;
}
+ public function isServerAvailable(): bool
+ {
+ if (null !== $this->serverAvailable){
+ return $this->serverAvailable;
+ }
+
+ try {
+ RESTClient::request($_ENV['MODULE_SHOP_URL'] . '/api/module_shop/gb_slug');
+ $this->serverAvailable = true;
+
+ return true;
+ } catch (\Exception $e) {
+ $this->serverAvailable = false;
+ return false;
+ }
+ }
+
+ public function issetModuleShopToken(): bool
+ {
+ if (!empty($_ENV['MODULE_SHOP_TOKEN'])){
+ return true;
+ }
+
+ return false;
+ }
+
}
\ No newline at end of file
diff --git a/kernel/services/ModuleShopService.php b/kernel/services/ModuleShopService.php
new file mode 100644
index 0000000..72562ad
--- /dev/null
+++ b/kernel/services/ModuleShopService.php
@@ -0,0 +1,36 @@
+url = $_ENV['MODULE_SHOP_URL'];
+ $this->token = $_ENV['MODULE_SHOP_TOKEN'];
+ }
+
+ /**
+ * @throws GuzzleException
+ */
+ public function email_auth(string $email)
+ {
+ $request = RESTClient::post($this->url . "/api/secure/email_auth", ['email' => $email], false);
+
+ return json_decode($request->getBody()->getContents(), true);
+ }
+
+ public function code_check(string $code)
+ {
+ $request = RESTClient::post($this->url . "/api/secure/code_check", ['code' => $code], false);
+
+ return json_decode($request->getBody()->getContents(), true);
+ }
+
+}
\ No newline at end of file
diff --git a/kernel/views/mailing/login_by_code.php b/kernel/views/mailing/login_by_code.php
new file mode 100644
index 0000000..a172e1d
--- /dev/null
+++ b/kernel/views/mailing/login_by_code.php
@@ -0,0 +1,12 @@
+
+
+">
+ ">
label ?>
diff --git a/kernel/views/widgets/admin/module_tabs.php b/kernel/views/widgets/tabs.php
similarity index 100%
rename from kernel/views/widgets/admin/module_tabs.php
rename to kernel/views/widgets/tabs.php
diff --git a/kernel/widgets/ActionButtonWidget.php b/kernel/widgets/ActionButtonWidget.php
index adea90f..13d57d1 100644
--- a/kernel/widgets/ActionButtonWidget.php
+++ b/kernel/widgets/ActionButtonWidget.php
@@ -2,15 +2,24 @@
namespace kernel\widgets;
+use kernel\helpers\Debug;
use kernel\Widget;
class ActionButtonWidget extends Widget
{
- public function run(): void
+
+ public static function create(array $data = []): ActionButtonWidget
{
- $icon = $this->data['icon'];
- $btn = $this->data['btn'];
+ return new static($data);
+ }
+
+ public function run(): string
+ {
+ $label = $this->data['label'];
+ $btn_type = $this->data['btn_type'];
$url = $this->data['url'];
- $this->cgView->render('/admin/action_button.php', ['icon' => $icon, 'btn' => $btn, 'url' => $url]);
+ $title = $this->data['title'] ?? '';
+
+ return $this->cgView->fetch('/action_button.php', ['label' => $label, 'btn_type' => $btn_type, 'url' => $url, 'title' => $title]);
}
}
\ No newline at end of file
diff --git a/kernel/widgets/IconBtn/IconBtnActivateWidget.php b/kernel/widgets/IconBtn/IconBtnActivateWidget.php
new file mode 100644
index 0000000..2665265
--- /dev/null
+++ b/kernel/widgets/IconBtn/IconBtnActivateWidget.php
@@ -0,0 +1,26 @@
+data['url'];
+
+ return ActionButtonWidget::create([
+ 'label' => "",
+ 'url' => $url,
+ 'btn_type' => "success",
+ 'title' => "Активировать"
+ ])->run();
+ }
+}
\ No newline at end of file
diff --git a/kernel/widgets/IconBtn/IconBtnCreateWidget.php b/kernel/widgets/IconBtn/IconBtnCreateWidget.php
new file mode 100644
index 0000000..da3d462
--- /dev/null
+++ b/kernel/widgets/IconBtn/IconBtnCreateWidget.php
@@ -0,0 +1,26 @@
+data['url'];
+
+ return ActionButtonWidget::create([
+ 'label' => "",
+ 'url' => $url,
+ 'btn_type' => "success",
+ 'title' => "Создать"
+ ])->run();
+ }
+}
\ No newline at end of file
diff --git a/kernel/widgets/IconBtn/IconBtnDeactivateWidget.php b/kernel/widgets/IconBtn/IconBtnDeactivateWidget.php
new file mode 100644
index 0000000..005bfbd
--- /dev/null
+++ b/kernel/widgets/IconBtn/IconBtnDeactivateWidget.php
@@ -0,0 +1,26 @@
+data['url'];
+
+ return ActionButtonWidget::create([
+ 'label' => "",
+ 'url' => $url,
+ 'btn_type' => "warning",
+ 'title' => "Деактивировать"
+ ])->run();
+ }
+}
\ No newline at end of file
diff --git a/kernel/widgets/IconBtn/IconBtnDeleteWidget.php b/kernel/widgets/IconBtn/IconBtnDeleteWidget.php
new file mode 100644
index 0000000..e8ba1d0
--- /dev/null
+++ b/kernel/widgets/IconBtn/IconBtnDeleteWidget.php
@@ -0,0 +1,26 @@
+data['url'];
+
+ return ActionButtonWidget::create([
+ 'label' => "",
+ 'url' => $url,
+ 'btn_type' => "danger",
+ 'title' => "Удалить"
+ ])->run();
+ }
+}
\ No newline at end of file
diff --git a/kernel/widgets/IconBtn/IconBtnEditWidget.php b/kernel/widgets/IconBtn/IconBtnEditWidget.php
new file mode 100644
index 0000000..cdf9406
--- /dev/null
+++ b/kernel/widgets/IconBtn/IconBtnEditWidget.php
@@ -0,0 +1,26 @@
+data['url'];
+
+ return ActionButtonWidget::create([
+ 'label' => "",
+ 'url' => $url,
+ 'btn_type' => "success",
+ 'title' => "Редактировать"
+ ])->run();
+ }
+}
\ No newline at end of file
diff --git a/kernel/widgets/IconBtn/IconBtnInstallWidget.php b/kernel/widgets/IconBtn/IconBtnInstallWidget.php
new file mode 100644
index 0000000..7a09f39
--- /dev/null
+++ b/kernel/widgets/IconBtn/IconBtnInstallWidget.php
@@ -0,0 +1,26 @@
+data['url'];
+
+ return ActionButtonWidget::create([
+ 'label' => "",
+ 'url' => $url,
+ 'btn_type' => "success",
+ 'title' => "Установить"
+ ])->run();
+ }
+}
\ No newline at end of file
diff --git a/kernel/widgets/IconBtn/IconBtnListWidget.php b/kernel/widgets/IconBtn/IconBtnListWidget.php
new file mode 100644
index 0000000..e0e0f06
--- /dev/null
+++ b/kernel/widgets/IconBtn/IconBtnListWidget.php
@@ -0,0 +1,26 @@
+data['url'];
+
+ return ActionButtonWidget::create([
+ 'label' => "",
+ 'url' => $url,
+ 'btn_type' => "primary",
+ 'title' => "Список"
+ ])->run();
+ }
+}
\ No newline at end of file
diff --git a/kernel/widgets/IconBtn/IconBtnUpdateWidget.php b/kernel/widgets/IconBtn/IconBtnUpdateWidget.php
new file mode 100644
index 0000000..b421009
--- /dev/null
+++ b/kernel/widgets/IconBtn/IconBtnUpdateWidget.php
@@ -0,0 +1,26 @@
+data['url'];
+
+ return ActionButtonWidget::create([
+ 'label' => "",
+ 'url' => $url,
+ 'btn_type' => "info",
+ 'title' => "Обновить"
+ ])->run();
+ }
+}
\ No newline at end of file
diff --git a/kernel/widgets/IconBtn/IconBtnViewWidget.php b/kernel/widgets/IconBtn/IconBtnViewWidget.php
new file mode 100644
index 0000000..73ee3d8
--- /dev/null
+++ b/kernel/widgets/IconBtn/IconBtnViewWidget.php
@@ -0,0 +1,27 @@
+data['url'];
+
+ return ActionButtonWidget::create([
+ 'btn_type' => "primary",
+ 'label' => "",
+ 'url' => $url,
+ 'title' => "Просмотреть"
+ ])->run();
+ }
+
+}
\ No newline at end of file
diff --git a/kernel/widgets/MenuWidget.php b/kernel/widgets/MenuWidget.php
index 52dfe62..d45da7f 100644
--- a/kernel/widgets/MenuWidget.php
+++ b/kernel/widgets/MenuWidget.php
@@ -11,7 +11,7 @@ class MenuWidget extends Widget
public function run(): void
{
$menu = Menu::where("parent_id", 0)->get()->sortBy("priority");
- $this->cgView->render('/admin/menu.php', ['menu' => $menu]);
+ $this->cgView->render('/menu.php', ['menu' => $menu]);
}
}
\ No newline at end of file
diff --git a/kernel/widgets/ModuleTabsWidget.php b/kernel/widgets/ModuleTabsWidget.php
index 94686f2..d740dcf 100644
--- a/kernel/widgets/ModuleTabsWidget.php
+++ b/kernel/widgets/ModuleTabsWidget.php
@@ -13,6 +13,6 @@ class ModuleTabsWidget extends Widget
'/admin' => 'Локальные',
'/admin/module_shop_client' => 'Каталог'
];
- $this->cgView->render('/admin/module_tabs.php', ['tabs' => $tabs]);
+ $this->cgView->render('/tabs.php', ['tabs' => $tabs]);
}
}
\ No newline at end of file
diff --git a/kernel/widgets/TagTabsWidget.php b/kernel/widgets/TagTabsWidget.php
new file mode 100644
index 0000000..a569dda
--- /dev/null
+++ b/kernel/widgets/TagTabsWidget.php
@@ -0,0 +1,18 @@
+ 'tag',
+ '/admin/tag_entity' => 'tag entity'
+ ];
+ $this->cgView->render('/tabs.php', ['tabs' => $tabs]);
+ }
+}
\ No newline at end of file
+ Код подтверждения: +
++ Если вы не запрашивали код, проигнорируйте данное письмо. +
\ No newline at end of file diff --git a/kernel/views/mailing/register_by_code.php b/kernel/views/mailing/register_by_code.php new file mode 100644 index 0000000..4dc6a54 --- /dev/null +++ b/kernel/views/mailing/register_by_code.php @@ -0,0 +1,15 @@ + + +
+ Код подтверждения:
+ Ваш пароль:
+
+ Если вы не запрашивали код, проигнорируйте данное письмо. +
\ No newline at end of file diff --git a/kernel/views/module/index.php b/kernel/views/module/index.php index aeee0ad..8cb34f8 100644 --- a/kernel/views/module/index.php +++ b/kernel/views/module/index.php @@ -7,6 +7,14 @@ * @var \kernel\services\ModuleService $moduleService */ +use kernel\Flash; +use kernel\widgets\IconBtn\IconBtnActivateWidget; +use kernel\widgets\IconBtn\IconBtnDeactivateWidget; +use kernel\widgets\IconBtn\IconBtnDeleteWidget; +use kernel\widgets\IconBtn\IconBtnUpdateWidget; +use kernel\widgets\IconBtn\IconBtnViewWidget; +use kernel\widgets\ModuleTabsWidget; + $meta = []; $meta['columns'] = [ "name" => "Название", @@ -25,35 +33,32 @@ $info_to_table['data'] = $modules_info; $table = new \Itguild\Tables\ListJsonTable(json_encode($info_to_table, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE)); - $table->addAction(function ($row, $url) use ($moduleService) { $slug = $row['slug']; if ($moduleService->isActive($slug)) { - $label = "Деактивировать"; - $btn_type = "warning"; - $btn = "$label"; + $url = "$url/deactivate/?slug=". $row['slug']; + return IconBtnDeactivateWidget::create(['url' => $url])->run(); } else { - $label = ""; - $btn_type = "success"; - $btn = "$label"; - } + $url = "$url/activate/?slug=". $row['slug']; - return $btn; + return IconBtnActivateWidget::create(['url' => $url])->run(); + } }); + $table->addAction(function ($row, $url) use ($moduleService) { - $slug = $row['slug']; - return "Просмотр"; + $url = "$url/view/?slug=". $row['slug']; + + return IconBtnViewWidget::create(['url' => $url])->run(); }); $table->addAction(function ($row, $url) use ($moduleService){ - $slug = $row['slug']; - if (!$moduleService->isKernelModule($slug)){ - if (!$moduleService->isLastVersion($slug)) { - $label = "Обновить"; - $btn_type = "info"; - return "$label"; + if ($moduleService->isShopModule($row['slug'])){ + if (!$moduleService->isLastVersion($row['slug'])) { + $url = "$url/update/?slug=". $row['slug']; + + return IconBtnUpdateWidget::create(['url' => $url])->run(); } } @@ -62,16 +67,19 @@ $table->addAction(function ($row, $url) use ($moduleService){ $table->addAction(function ($row) use ($moduleService){ $slug = $row['slug']; - if (!$moduleService->isKernelModule($slug)){ - $label = "Удалить"; - $btn_type = "danger"; - return "$label"; + if (!$moduleService->isKernelModule($slug)) { + $url = "admin/module_shop_client/delete/?slug=" . $row['slug']; + + return IconBtnDeleteWidget::create(['url' => $url])->run(); } return false; }); -$table->create(); if ($moduleService->isActive('module_shop_client')) { - \kernel\widgets\ModuleTabsWidget::create()->run(); + ModuleTabsWidget::create()->run(); } + + + +$table->create(); $table->render(); diff --git a/kernel/views/module/view.php b/kernel/views/module/view.php index 168fcf9..ba9e5eb 100644 --- a/kernel/views/module/view.php +++ b/kernel/views/module/view.php @@ -3,9 +3,8 @@ * @var array $data */ -use kernel\IGTabel\btn\DangerBtn; -use kernel\IGTabel\btn\PrimaryBtn; -use kernel\IGTabel\btn\SuccessBtn; +use Itguild\Tables\ViewJsonTable; +use kernel\widgets\IconBtn\IconBtnListWidget; $table_info = [ "meta" => [ @@ -20,11 +19,10 @@ $table_info = [ ], "data" => $data ]; -$table = new \Itguild\Tables\ViewJsonTable(json_encode($table_info, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE)); +$table = new ViewJsonTable(json_encode($table_info, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE)); $table->beforePrint(function () { - $btn = PrimaryBtn::create("Список", "/admin")->fetch(); - return $btn; + return IconBtnListWidget::create(['url' => '/admin'])->run(); }); $table->create(); $table->render(); \ No newline at end of file diff --git a/kernel/views/widgets/action_button.php b/kernel/views/widgets/action_button.php new file mode 100644 index 0000000..b58234d --- /dev/null +++ b/kernel/views/widgets/action_button.php @@ -0,0 +1,10 @@ + + + \ No newline at end of file diff --git a/kernel/views/widgets/admin/action_button.php b/kernel/views/widgets/admin/action_button.php deleted file mode 100644 index 32dee23..0000000 --- a/kernel/views/widgets/admin/action_button.php +++ /dev/null @@ -1,9 +0,0 @@ - - -"$icon"; \ No newline at end of file diff --git a/kernel/views/widgets/admin/menu.php b/kernel/views/widgets/menu.php similarity index 91% rename from kernel/views/widgets/admin/menu.php rename to kernel/views/widgets/menu.php index 124c239..fe5773b 100644 --- a/kernel/views/widgets/admin/menu.php +++ b/kernel/views/widgets/menu.php @@ -18,7 +18,7 @@ -