This commit is contained in:
2024-09-24 17:22:09 +03:00
parent cb2c719b1b
commit 349c2992dc
13 changed files with 314 additions and 52 deletions

View File

@ -0,0 +1,34 @@
<?php
/**
* @var $content
* @var string $resources
*/
?>
<!doctype html>
<html lang="en">
<head>
<title>Sidebar 01</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link href="https://fonts.googleapis.com/css?family=Poppins:300,400,500,600,700,800,900" rel="stylesheet">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="<?=$resources?>/css/style.css">
</head>
<body>
<div class="wrapper d-flex align-items-stretch">
<!-- Page Content -->
<div id="content" class="p-4 p-md-5">
<?= $content ?>
</div>
</div>
<script src="<?=$resources?>/js/jquery.min.js"></script>
<script src="<?=$resources?>/js/popper.js"></script>
<script src="<?=$resources?>/js/bootstrap.min.js"></script>
<script src="<?=$resources?>/js/main.js"></script>
</body>
</html>

View File

@ -14,14 +14,18 @@
<link href="https://fonts.googleapis.com/css?family=Poppins:300,400,500,600,700,800,900" rel="stylesheet">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="<?=$resources?>/css/style.css">
<link rel="stylesheet" href="<?= $resources ?>/css/style.css">
</head>
<body>
<div class="wrapper d-flex align-items-stretch">
<nav id="sidebar">
<div class="p-4 pt-5">
<a href="#" class="img logo rounded-circle mb-5" style="background-image: url(/resources/admin_theme/images/logo.jpg);"></a>
<a href="#" class="img logo rounded-circle mb-5"
style="background-image: url(/resources/admin_theme/images/logo.jpg);"></a>
<p>
<?= \kernel\modules\user\service\UserService::getAuthUsername() ?>
</p>
<?php \kernel\widgets\MenuWidget::create()->run(); ?>
<div class="footer">
@ -40,14 +44,16 @@
<i class="fa fa-bars"></i>
<span class="sr-only">Toggle Menu</span>
</button>
<button class="btn btn-dark d-inline-block d-lg-none ml-auto" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<button class="btn btn-dark d-inline-block d-lg-none ml-auto" type="button" data-toggle="collapse"
data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent"
aria-expanded="false" aria-label="Toggle navigation">
<i class="fa fa-bars"></i>
</button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="nav navbar-nav ml-auto">
<li class="nav-item active">
<a class="nav-link" href="#">Home</a>
<a class="nav-link" href="/admin/logout">Выход</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">About</a>
@ -63,13 +69,13 @@
</div>
</nav>
<?= $content ?>
<?= $content ?>
</div>
</div>
<script src="<?=$resources?>/js/jquery.min.js"></script>
<script src="<?=$resources?>/js/popper.js"></script>
<script src="<?=$resources?>/js/bootstrap.min.js"></script>
<script src="<?=$resources?>/js/main.js"></script>
<script src="<?= $resources ?>/js/jquery.min.js"></script>
<script src="<?= $resources ?>/js/popper.js"></script>
<script src="<?= $resources ?>/js/bootstrap.min.js"></script>
<script src="<?= $resources ?>/js/main.js"></script>
</body>
</html>

View File

@ -5,6 +5,9 @@ namespace kernel\console\controllers;
use kernel\console\ConsoleController;
use kernel\modules\menu\service\MenuService;
use kernel\modules\option\service\OptionService;
use kernel\modules\user\models\forms\CreateUserForm;
use kernel\modules\user\models\User;
use kernel\modules\user\service\UserService;
use kernel\services\MigrationService;
class AdminConsoleController extends ConsoleController
@ -13,7 +16,9 @@ class AdminConsoleController extends ConsoleController
protected MigrationService $migrationService;
protected OptionService $optionService;
public MenuService $menuService;
protected MenuService $menuService;
protected UserService $userService;
public function __construct()
{
@ -21,6 +26,7 @@ class AdminConsoleController extends ConsoleController
$this->migrationService = new MigrationService();
$this->optionService = new OptionService();
$this->menuService = new MenuService();
$this->userService = new UserService();
}
/**
@ -73,7 +79,6 @@ class AdminConsoleController extends ConsoleController
"url" => "/admin",
"slug" => "module",
"priority" => 1,
"status" => 2
]);
$this->out->r("create item menu module", "green");
@ -91,6 +96,16 @@ class AdminConsoleController extends ConsoleController
"parent_slug" => "settings"
]);
$this->out->r("create item menu admin-themes", "green");
$user = new CreateUserForm();
$user->load([
'username' => 'admin',
'password' => 'ChangeMe',
'email' => 'admin@test.ru',
'role' => User::ADMIN_USER_ROLE,
]);
$this->userService->create($user);
$this->out->r("create user with username admin", "green");
}
}

View File

@ -0,0 +1,60 @@
<?php
namespace kernel\controllers;
use JetBrains\PhpStorm\NoReturn;
use kernel\AdminController;
use kernel\helpers\Debug;
use kernel\models\forms\LoginForm;
use kernel\modules\user\service\UserService;
class SecureController extends AdminController
{
protected UserService $userService;
protected function init(): void
{
parent::init();
$this->cgView->viewPath = KERNEL_DIR . "/views/secure/";
$this->cgView->layout = "/login.php";
$this->userService = new UserService();
}
public function actionLogin(): void
{
$this->cgView->render('login.php');
}
public function actionAuth(): void
{
$loginForm = new LoginForm();
$loginForm->load($_REQUEST);
if(filter_var($loginForm->getItem("username"), FILTER_VALIDATE_EMAIL)) {
$field = "email";
}
else {
$field = "username";
}
$user = $this->userService->getByField($field, $loginForm->getItem("username"));
if (!$user){
throw new \Exception(message: "User not found");
}
if (password_verify($loginForm->getItem("password"), $user->password_hash)) {
setcookie('user_id', $user->id, time()+60*60*24, '/', $_SERVER['SERVER_NAME'], false);
$this->redirect("/admin");
} else {
$this->redirect("/admin/login");
}
}
#[NoReturn] public function actionLogout(): void
{
unset($_COOKIE['user_id']);
setcookie('user_id', "", time() - 3600, '/');
$this->redirect("/");
}
}

View File

@ -0,0 +1,18 @@
<?php
namespace kernel\models\forms;
use kernel\FormModel;
class LoginForm extends FormModel
{
public function rules(): array
{
return [
'username' => 'required|min-str-len:5|max-str-len:50',
'password' => 'required|min-str-len:6|max-str-len:50',
];
}
}

View File

@ -20,6 +20,7 @@ class AdminThemeController extends AdminController
public function actionIndex(): void
{
$admin_theme_paths = Option::where("key", "admin_theme_paths")->first();
$dirs = [];
if ($admin_theme_paths){
$path = json_decode($admin_theme_paths->value);

View File

@ -14,9 +14,9 @@ $table->columns([
]);
$table->addAction(function ($row, $url){
$path = $row['path'];
$active_admin_theme = Option::where("key", "active_admin_theme")->first();
$active_admin_theme = \kernel\modules\option\service\OptionService::getItem('active_admin_theme');
$btn = "<a class='btn btn-primary' href='$url/activate/?p=$path' style='margin: 3px; width: 150px;' >Активировать</a>";
if ($path === $active_admin_theme->value){
if ($path === $active_admin_theme){
$btn = "Активна";
}

View File

@ -49,6 +49,20 @@ class OptionService
return false;
}
/**
* @param $key
* @return false|array|string
*/
public static function getItem($key): false|array|string
{
$item = Option::where("key", $key)->first();
if ($item){
return getConst($item->value);
}
return false;
}
// public function createOptionArr(): array
// {
// foreach (Option::all()->toArray() as $option) {

View File

@ -7,10 +7,13 @@ use Illuminate\Database\Eloquent\Model;
* @property string $username
* @property string $email
* @property string $password_hash
* @method static where(int[] $array)
* @method static find($id)
*/
class User extends Model {
const DEFAULT_USER_ROLE = 1;
const ADMIN_USER_ROLE = 9;
protected $table = 'user';
protected $fillable = ['username', 'email', 'password_hash', 'role'];
protected array $dates = ['deleted at'];

View File

@ -33,6 +33,11 @@ class UserService
return false;
}
public function getByField(string $field, string $value)
{
return User::where($field, $value)->first();
}
public static function createUsernameArr(): array
{
foreach (User::all()->toArray() as $user) {
@ -45,4 +50,26 @@ class UserService
return [];
}
public static function getAuthUser()
{
if (isset($_COOKIE['user_id'])){
$user = User::where("id", $_COOKIE['user_id'])->first();
if ($user){
return $user;
}
}
return false;
}
public static function getAuthUsername(): string
{
$user = self::getAuthUser();
if ($user){
return $user->username;
}
return '';
}
}

View File

@ -5,12 +5,26 @@ use kernel\App;
use kernel\modules\admin_themes\controllers\AdminThemeController;
use Phroute\Phroute\RouteCollector;
App::$collector->filter("auth", function (){
if(!isset($_COOKIE['user_id']))
{
header('Location: /admin/login');
return false;
}
});
App::$collector->group(["prefix" => "admin"], function (RouteCollector $router){
App::$collector->get('/', [\kernel\controllers\ModuleController::class, 'actionIndex']);
App::$collector->group(["prefix" => "module"], function (RouteCollector $router){
App::$collector->group(["before" => "auth"], function (RouteCollector $router){
App::$collector->get('/', [\kernel\controllers\ModuleController::class, 'actionIndex']);
App::$collector->get('/activate', [\kernel\controllers\ModuleController::class, 'actionActivate']);
});
App::$collector->get('/login', [\kernel\controllers\SecureController::class, 'actionLogin']);
App::$collector->get('/logout', [\kernel\controllers\SecureController::class, 'actionLogout']);
App::$collector->post('/auth', [\kernel\controllers\SecureController::class, 'actionAuth']);
App::$collector->group(["before" => "auth"], function (RouteCollector $router){
App::$collector->group(["prefix" => "module"], function (RouteCollector $router){
App::$collector->get('/', [\kernel\controllers\ModuleController::class, 'actionIndex']);
App::$collector->get('/activate', [\kernel\controllers\ModuleController::class, 'actionActivate']);
});
});
});

View File

@ -0,0 +1,67 @@
<!-- Section: Design Block -->
<section class=" text-center text-lg-start">
<style>
.rounded-t-5 {
border-top-left-radius: 0.5rem;
border-top-right-radius: 0.5rem;
}
@media (min-width: 992px) {
.rounded-tr-lg-0 {
border-top-right-radius: 0;
}
.rounded-bl-lg-5 {
border-bottom-left-radius: 0.5rem;
}
}
</style>
<div class="card mb-3">
<div class="row g-0 d-flex align-items-center">
<div class="col-lg-4 d-none d-lg-flex">
<img src="https://mdbootstrap.com/img/new/ecommerce/vertical/004.jpg" alt="Trendy Pants and Shoes"
class="w-100 rounded-t-5 rounded-tr-lg-0 rounded-bl-lg-5" />
</div>
<div class="col-lg-8">
<div class="card-body py-5 px-md-5">
<form action="/admin/auth" method="post">
<!-- Email input -->
<div data-mdb-input-init class="form-outline mb-4">
<input type="text" id="form2Example1" class="form-control" name="username" />
<label class="form-label" for="form2Example1">Username или Email</label>
</div>
<!-- Password input -->
<div data-mdb-input-init class="form-outline mb-4">
<input type="password" id="form2Example2" class="form-control" name="password" />
<label class="form-label" for="form2Example2">Пароль</label>
</div>
<!-- 2 column grid layout for inline styling -->
<div class="row mb-4">
<div class="col d-flex justify-content-center">
<!-- Checkbox -->
<div class="form-check">
<input class="form-check-input" type="checkbox" value="" id="form2Example31" checked />
<label class="form-check-label" for="form2Example31"> Запомнить </label>
</div>
</div>
<div class="col">
<!-- Simple link -->
<a href="#!">Забыл пароль?</a>
</div>
</div>
<!-- Submit button -->
<button type="submit" data-mdb-button-init data-mdb-ripple-init class="btn btn-primary btn-block mb-4">Вход</button>
</form>
</div>
</div>
</div>
</div>
</section>
<!-- Section: Design Block -->