stasbilay02/MicroFrameWork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

login

Browse Source
This commit is contained in:
Kavalar 2024-09-24 17:22:09 +03:00
parent cb2c719b1b
commit 349c2992dc
13 changed files with 314 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "45dd495df00abd36d94dc7ca02dce256",
"content-hash": "89f7ae78ea05c4cc22cc32f405d736ac",
"packages": [
{
"name": "brick/math",
@ -337,16 +337,16 @@
},
{
"name": "illuminate/collections",
"version": "v11.22.0",
"version": "v11.23.5",
"source": {
"type": "git",
"url": "https://github.com/illuminate/collections.git",
"reference": "66d2c9bdf5641599735d402c1c504b54734a9cca"
"reference": "cbea9d7a82984bbc1a9376498533cc77513f9a09"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/collections/zipball/66d2c9bdf5641599735d402c1c504b54734a9cca",
"reference": "66d2c9bdf5641599735d402c1c504b54734a9cca",
"url": "https://api.github.com/repos/illuminate/collections/zipball/cbea9d7a82984bbc1a9376498533cc77513f9a09",
"reference": "cbea9d7a82984bbc1a9376498533cc77513f9a09",
"shasum": ""
},
"require": {
@ -388,11 +388,11 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2024-08-23T18:49:36+00:00"
"time": "2024-09-12T14:50:04+00:00"
},
{
"name": "illuminate/conditionable",
"version": "v11.22.0",
"version": "v11.23.5",
"source": {
"type": "git",
"url": "https://github.com/illuminate/conditionable.git",
@ -438,16 +438,16 @@
},
{
"name": "illuminate/container",
"version": "v11.22.0",
"version": "v11.23.5",
"source": {
"type": "git",
"url": "https://github.com/illuminate/container.git",
"reference": "85e3396fde3139eae3f37128222c9a7746ca4bbb"
"reference": "66d20471c8c55ef056044dc1ff16da90d7b4d649"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/container/zipball/85e3396fde3139eae3f37128222c9a7746ca4bbb",
"reference": "85e3396fde3139eae3f37128222c9a7746ca4bbb",
"url": "https://api.github.com/repos/illuminate/container/zipball/66d20471c8c55ef056044dc1ff16da90d7b4d649",
"reference": "66d20471c8c55ef056044dc1ff16da90d7b4d649",
"shasum": ""
},
"require": {
@ -485,20 +485,20 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2024-08-21T16:01:30+00:00"
"time": "2024-09-11T20:15:17+00:00"
},
{
"name": "illuminate/contracts",
"version": "v11.22.0",
"version": "v11.23.5",
"source": {
"type": "git",
"url": "https://github.com/illuminate/contracts.git",
"reference": "af9b459f195d57f279ec30a45446ddaeb3337bcb"
"reference": "5a4c6dcf633c1f69e1b70bbea1ef1b7d2186d3da"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/contracts/zipball/af9b459f195d57f279ec30a45446ddaeb3337bcb",
"reference": "af9b459f195d57f279ec30a45446ddaeb3337bcb",
"url": "https://api.github.com/repos/illuminate/contracts/zipball/5a4c6dcf633c1f69e1b70bbea1ef1b7d2186d3da",
"reference": "5a4c6dcf633c1f69e1b70bbea1ef1b7d2186d3da",
"shasum": ""
},
"require": {
@ -533,7 +533,7 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2024-08-21T16:02:16+00:00"
"time": "2024-09-12T15:25:08+00:00"
},
{
"name": "illuminate/database",
@ -672,7 +672,7 @@
},
{
"name": "illuminate/macroable",
"version": "v11.22.0",
"version": "v11.23.5",
"source": {
"type": "git",
"url": "https://github.com/illuminate/macroable.git",
@ -718,16 +718,16 @@
},
{
"name": "illuminate/support",
"version": "v11.22.0",
"version": "v11.23.5",
"source": {
"type": "git",
"url": "https://github.com/illuminate/support.git",
"reference": "51efc0516526413b4be641a1731d15d4394de2ff"
"reference": "8199097b4e24b05e8a035a6ea2fb5aeba645d71b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/illuminate/support/zipball/51efc0516526413b4be641a1731d15d4394de2ff",
"reference": "51efc0516526413b4be641a1731d15d4394de2ff",
"url": "https://api.github.com/repos/illuminate/support/zipball/8199097b4e24b05e8a035a6ea2fb5aeba645d71b",
"reference": "8199097b4e24b05e8a035a6ea2fb5aeba645d71b",
"shasum": ""
},
"require": {
@ -751,6 +751,7 @@
},
"suggest": {
"illuminate/filesystem": "Required to use the composer class (^11.0).",
"laravel/serializable-closure": "Required to use the once function (^1.3).",
"league/commonmark": "Required to use Str::markdown() and Stringable::markdown() (^2.0.2).",
"ramsey/uuid": "Required to use Str::uuid() (^4.7).",
"symfony/process": "Required to use the composer class (^7.0).",
@ -788,7 +789,7 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2024-09-03T13:21:20+00:00"
"time": "2024-09-12T15:25:39+00:00"
},
{
"name": "itguild/eloquent-table",
@ -886,11 +887,11 @@
},
{
"name": "itguild/tables",
"version": "1.0.6",
"version": "1.0.7",
"source": {
"type": "git",
"url": "https://git.itguild.info/ItGuild/tables",
"reference": "d747203d99871ab39a5f18c449727f150b937c44"
"reference": "02a3e52b7d365c44a32b7580a2246d47ea032736"
},
"type": "library",
"autoload": {
@ -908,7 +909,7 @@
"email": "apuc06@mail.ru"
}
],
"time": "2024-09-02T19:34:25+00:00"
"time": "2024-09-24T12:42:55+00:00"
},
{
"name": "madesimple/php-arrays",
@ -2027,16 +2028,16 @@
},
{
"name": "symfony/translation",
"version": "v7.1.3",
"version": "v7.1.5",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
"reference": "8d5e50c813ba2859a6dfc99a0765c550507934a1"
"reference": "235535e3f84f3dfbdbde0208ede6ca75c3a489ea"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/8d5e50c813ba2859a6dfc99a0765c550507934a1",
"reference": "8d5e50c813ba2859a6dfc99a0765c550507934a1",
"url": "https://api.github.com/repos/symfony/translation/zipball/235535e3f84f3dfbdbde0208ede6ca75c3a489ea",
"reference": "235535e3f84f3dfbdbde0208ede6ca75c3a489ea",
"shasum": ""
},
"require": {
@ -2101,7 +2102,7 @@
"description": "Provides tools to internationalize your application",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/translation/tree/v7.1.3"
"source": "https://github.com/symfony/translation/tree/v7.1.5"
},
"funding": [
{
@ -2117,7 +2118,7 @@
"type": "tidelift"
}
],
"time": "2024-07-26T12:41:01+00:00"
"time": "2024-09-16T06:30:38+00:00"
},
{
"name": "symfony/translation-contracts",
@ -2493,7 +2494,9 @@
},
"prefer-stable": false,
"prefer-lowest": false,
"platform": [],
"platform": {
"ext-zip": "*"
},
"platform-dev": [],
"plugin-api-version": "2.6.0"
"plugin-api-version": "2.3.0"
}

34
kernel/admin_themes/default/layout/login.php Normal file
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>

24
kernel/admin_themes/default/layout/main.php
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>

19
kernel/console/controllers/AdminConsoleController.php
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");
}
}

60
kernel/controllers/SecureController.php Normal file
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("/");
}
}

18
kernel/models/forms/LoginForm.php Normal file
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',
];
}
}

1
kernel/modules/admin_themes/controllers/AdminThemeController.php
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);

4
kernel/modules/admin_themes/views/index.php
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 = "Активна";
}

14
kernel/modules/option/service/OptionService.php
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) {

5
kernel/modules/user/models/User.php
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'];

27
kernel/modules/user/service/UserService.php
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 '';
}
}

22
kernel/routs/admin.php
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']);
});
});
});

67
kernel/views/secure/login.php Normal file
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 -->