Compare commits

...

39 Commits

Author SHA1 Message Date
a64ed080bb v0.1.7 2025-01-28 16:44:34 +03:00
6242304843 flash msg fix 2025-01-28 12:47:44 +03:00
2655a793f5 some fix 2025-01-24 16:47:37 +03:00
de0354f9cb add dependencies to view module shop client 2025-01-24 16:26:11 +03:00
4a4d5b083f some fix 2025-01-24 16:20:15 +03:00
68b5741f46 some fix 2025-01-24 15:14:36 +03:00
fc70051761 theme service fix 2025-01-24 15:00:22 +03:00
b1dacff877 Merge branch 'master' of https://git.itguild.info/ItGuild/igmf 2025-01-24 14:30:49 +03:00
e904cedf40 some 2025-01-24 14:28:07 +03:00
64a6cc4340 Merge branch 'master' of https://git.itguild.info/ItGuild/igmf 2025-01-24 13:59:55 +03:00
b79483dafd some 2025-01-24 13:59:03 +03:00
7ab241daa2 app_themes ad to kernel 2025-01-24 13:53:05 +03:00
c69314b531 Merge branch 'master' of https://git.itguild.info/ItGuild/igmf 2025-01-24 12:15:48 +03:00
e448ffa6b6 manifest kernel version update 2025-01-24 12:15:18 +03:00
3c025a4cbc Merge branch 'master' of https://git.itguild.info/ItGuild/igmf 2025-01-24 11:56:47 +03:00
6a7cde15e9 some fix 2025-01-24 11:56:29 +03:00
2b2c99cd17 some fix 2025-01-24 11:29:04 +03:00
b6ba8f8718 recusive activate dependencies 2025-01-23 16:57:03 +03:00
11c99be0f6 theme dependence 2025-01-21 16:41:48 +03:00
f421e0c649 theme dependences 2025-01-21 14:14:26 +03:00
3120795eab theme fix 2025-01-20 13:52:29 +03:00
50c6ca98d8 Theme module and them to igfs add 2025-01-19 21:23:53 +03:00
dac4db96af default theme 2025-01-16 16:14:43 +03:00
c228a70468 add default theme 2025-01-15 16:57:03 +03:00
3e178f6633 kernel version 0.1.4 2025-01-15 15:00:30 +03:00
64dad0aaf9 assets class 2025-01-09 17:13:22 +03:00
32d1e93e73 Merge branch 'master' of https://git.itguild.info/stasbilay02/MicroFrameWork 2025-01-09 16:27:54 +03:00
dd231b0c07 rest and post 2025-01-09 16:27:34 +03:00
88114ae9f2 fix profile edit route 2025-01-09 14:51:15 +03:00
6a07e5cdde admin themes to ms 2025-01-09 12:17:32 +03:00
7489e999ef add profile routs 2024-12-27 15:16:21 +03:00
1a54003030 some fix 2024-12-27 13:50:37 +03:00
28c8e24847 some 2024-12-26 14:04:35 +03:00
b5b7befd34 user photo add 2024-12-25 16:32:23 +03:00
2790105a7d custom select fix 2024-12-25 11:40:33 +03:00
f0bda2ee24 post filters 2024-12-24 16:38:28 +03:00
04bd134e3e some 2024-12-23 16:41:47 +03:00
c23b84bcea some 2024-12-23 15:47:03 +03:00
de690dfd39 admin theme pack 2024-12-23 14:14:59 +03:00
630 changed files with 25281 additions and 197 deletions

0
app/admin_themes/custom/layout/main.php Normal file → Executable file
View File

5
app/admin_themes/custom/manifest.json Normal file → Executable file
View File

@ -3,10 +3,11 @@
"version": "0.1", "version": "0.1",
"author": "Kavalar", "author": "Kavalar",
"slug": "custom", "slug": "custom",
"type": "admin_theme",
"description": "Custom admin theme", "description": "Custom admin theme",
"preview": "nrnv2024_640x360.jpg", "preview": "nrnv2024_640x360.jpg",
"resource": "/resources/custom", "resource": "/resources/admin_themes/custom",
"resource_path": "{RESOURCES}/custom", "resource_path": "{RESOURCES}/admin_themes/custom",
"layout": "main.php", "layout": "main.php",
"theme_path": "{APP}/admin_themes/{slug}", "theme_path": "{APP}/admin_themes/{slug}",
"layout_path": "{APP}/admin_themes/{slug}/layout" "layout_path": "{APP}/admin_themes/{slug}/layout"

View File

@ -1,6 +1,6 @@
{ {
"name": "Photo", "name": "Photo",
"version": "0.1", "version": "0.2",
"author": "ITGuild", "author": "ITGuild",
"slug": "photo", "slug": "photo",
"type": "additional_property", "type": "additional_property",

View File

@ -1,6 +1,6 @@
{ {
"name": "Tags", "name": "Tags",
"version": "0.1", "version": "0.1.1",
"author": "ITGuild", "author": "ITGuild",
"slug": "tag", "slug": "tag",
"type": "additional_property", "type": "additional_property",

View File

@ -0,0 +1,8 @@
<?php
namespace app\themes\custom;
class CustomTheme extends \kernel\app_themes\custom\CustomTheme
{
}

View File

@ -0,0 +1,18 @@
<?php
namespace app\themes\custom\assets;
use kernel\Assets;
class CustomThemesAssets extends Assets
{
protected function createCSS(): void
{
$this->registerCSS(slug: "main", resource: "/css/styles.css");
}
protected function createJS(): void
{
$this->registerJS(slug: "webpack", resource: "/js/scripts.js");
}
}

View File

@ -0,0 +1,28 @@
<?php
namespace app\themes\custom\controllers;
use kernel\Controller;
class MainController extends Controller
{
protected function init(): void
{
parent::init();
$this->cgView->viewPath = APP_DIR . "/themes/custom/views/main/";
$this->cgView->layout = "main.php";
$this->cgView->layoutPath = APP_DIR . "/themes/custom/views/layout/";
$this->cgView->addVarToLayout("resources", "/resources/themes/custom");
}
public function actionIndex(): void
{
$this->cgView->render("index.php");
}
public function actionAbout(): void
{
$this->cgView->render("about.php");
}
}

View File

@ -0,0 +1,15 @@
{
"name": "Custom",
"version": "0.1",
"author": "ItGuild",
"slug": "custom",
"type": "theme",
"description": "Custom theme",
"preview": "preview.png",
"resource": "/resources/themes/custom",
"resource_path": "{RESOURCES}/themes/custom",
"theme_class": "app\\themes\\custom\\CustomTheme",
"theme_class_file": "{APP}/themes/custom/CustomTheme.php",
"routs": "routs/custom.php",
"dependence": "photo,tag"
}

View File

@ -0,0 +1,12 @@
<?php
use kernel\App;
App::$collector->get('/', [\app\themes\custom\controllers\MainController::class, 'actionIndex']);
App::$collector->get('/about', [\app\themes\custom\controllers\MainController::class, 'actionAbout']);
//App::$collector->get('/page/{page_number}', [\app\modules\tag\controllers\TagController::class, 'actionIndex']);
//App::$collector->get('/create', [\app\modules\tag\controllers\TagController::class, 'actionCreate']);

View File

@ -0,0 +1,92 @@
<?php
/**
* @var string $content
* @var string $resources
* @var string $title
* @var \kernel\CgView $view
*/
$assets = new \app\themes\custom\assets\CustomThemesAssets($resources);
?>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
<?php $assets->getCSSAsSTR(); ?>
<meta name="description" content=""/>
<meta name="author" content=""/>
<title><?= $title ?></title>
<?= $view->getMeta() ?>
<link rel="icon" type="image/x-icon" href="<?= $resources ?>/assets/favicon.ico"/>
<!-- Font Awesome icons (free version)-->
<script src="https://use.fontawesome.com/releases/v6.3.0/js/all.js" crossorigin="anonymous"></script>
<!-- Google fonts-->
<link href="https://fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic" rel="stylesheet"
type="text/css"/>
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800"
rel="stylesheet" type="text/css"/>
<!-- Core theme CSS (includes Bootstrap)-->
</head>
<body>
<!-- Navigation-->
<nav class="navbar navbar-expand-lg navbar-light" id="mainNav">
<div class="container px-4 px-lg-5">
<a class="navbar-brand" href="/">Custom theme</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarResponsive"
aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
Menu
<i class="fas fa-bars"></i>
</button>
<div class="collapse navbar-collapse" id="navbarResponsive">
<ul class="navbar-nav ms-auto py-4 py-lg-0">
<li class="nav-item"><a class="nav-link px-lg-3 py-3 py-lg-4" href="/">На главную</a></li>
<li class="nav-item"><a class="nav-link px-lg-3 py-3 py-lg-4" href="/about">О нас</a></li>
</ul>
</div>
</div>
</nav>
<?= $content ?>
<!-- Footer-->
<footer class="border-top">
<div class="container px-4 px-lg-5">
<div class="row gx-4 gx-lg-5 justify-content-center">
<div class="col-md-10 col-lg-8 col-xl-7">
<ul class="list-inline text-center">
<li class="list-inline-item">
<a href="#!">
<span class="fa-stack fa-lg">
<i class="fas fa-circle fa-stack-2x"></i>
<i class="fab fa-twitter fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
<li class="list-inline-item">
<a href="#!">
<span class="fa-stack fa-lg">
<i class="fas fa-circle fa-stack-2x"></i>
<i class="fab fa-facebook-f fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
<li class="list-inline-item">
<a href="#!">
<span class="fa-stack fa-lg">
<i class="fas fa-circle fa-stack-2x"></i>
<i class="fab fa-github fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
</ul>
<div class="small text-center text-muted fst-italic">Copyright &copy; IT Guild Micro Framework</div>
</div>
</div>
</div>
</footer>
<!-- Bootstrap core JS-->
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js"></script>
<!-- Core theme JS-->
<?php $assets->getJSAsStr(); ?>
</body>
</html>

View File

@ -0,0 +1,36 @@
<?php
/**
* @var string $resources;
* @var \kernel\CgView $view
*/
$view->setTitle("Старт Bootstrap");
$view->setMeta([
'description' => 'Дефолтная bootstrap тема'
]);
?>
<!-- Page Header-->
<header class="masthead" style="background-image: url('<?= $resources ?>/assets/img/about-bg.jpeg')">
<div class="container position-relative px-4 px-lg-5">
<div class="row gx-4 gx-lg-5 justify-content-center">
<div class="col-md-10 col-lg-8 col-xl-7">
<div class="page-heading">
<h1>About Me</h1>
<span class="subheading">This is what I do.</span>
</div>
</div>
</div>
</div>
</header>
<!-- Main Content-->
<main class="mb-4">
<div class="container px-4 px-lg-5">
<div class="row gx-4 gx-lg-5 justify-content-center">
<div class="col-md-10 col-lg-8 col-xl-7">
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Saepe nostrum ullam eveniet pariatur voluptates odit, fuga atque ea nobis sit soluta odio, adipisci quas excepturi maxime quae totam ducimus consectetur?</p>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Eius praesentium recusandae illo eaque architecto error, repellendus iusto reprehenderit, doloribus, minus sunt. Numquam at quae voluptatum in officia voluptas voluptatibus, minus!</p>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Aut consequuntur magnam, excepturi aliquid ex itaque esse est vero natus quae optio aperiam soluta voluptatibus corporis atque iste neque sit tempora!</p>
</div>
</div>
</div>
</main>

View File

@ -0,0 +1,86 @@
<?php
/**
* @var string $resources;
* @var \kernel\CgView $view
*/
$view->setTitle("IT Guild Micro Framework");
$view->setMeta([
'description' => 'Default IT Guild Micro Framework theme'
]);
?>
<!-- Page Header-->
<header class="masthead" style="background-image: url('<?= $resources ?>/assets/img/home-bg.jpeg')">
<div class="container position-relative px-4 px-lg-5">
<div class="row gx-4 gx-lg-5 justify-content-center">
<div class="col-md-10 col-lg-8 col-xl-7">
<div class="site-heading">
<h1>Clean Blog</h1>
<span class="subheading">A Blog Theme by IT Guild Micro Framework</span>
</div>
</div>
</div>
</div>
</header>
<!-- Main Content-->
<div class="container px-4 px-lg-5">
<div class="row gx-4 gx-lg-5 justify-content-center">
<div class="col-md-10 col-lg-8 col-xl-7">
<!-- Post preview-->
<div class="post-preview">
<a href="#!">
<h2 class="post-title">Man must explore, and this is exploration at its greatest</h2>
<h3 class="post-subtitle">Problems look mighty small from 150 miles up</h3>
</a>
<p class="post-meta">
Posted by
<a href="#!">Start Bootstrap</a>
on September 24, 2023
</p>
</div>
<!-- Divider-->
<hr class="my-4" />
<!-- Post preview-->
<div class="post-preview">
<a href="#!"><h2 class="post-title">I believe every human has a finite number of heartbeats. I don't intend to waste any of mine.</h2></a>
<p class="post-meta">
Posted by
<a href="#!">Start Bootstrap</a>
on September 18, 2023
</p>
</div>
<!-- Divider-->
<hr class="my-4" />
<!-- Post preview-->
<div class="post-preview">
<a href="#!">
<h2 class="post-title">Science has not yet mastered prophecy</h2>
<h3 class="post-subtitle">We predict too much for the next year and yet far too little for the next ten.</h3>
</a>
<p class="post-meta">
Posted by
<a href="#!">Start Bootstrap</a>
on August 24, 2023
</p>
</div>
<!-- Divider-->
<hr class="my-4" />
<!-- Post preview-->
<div class="post-preview">
<a href="#!">
<h2 class="post-title">Failure is not an option</h2>
<h3 class="post-subtitle">Many say exploration is part of our destiny, but its actually our duty to future generations.</h3>
</a>
<p class="post-meta">
Posted by
<a href="#!">Start Bootstrap</a>
on July 8, 2023
</p>
</div>
<!-- Divider-->
<hr class="my-4" />
<!-- Pager-->
<div class="d-flex justify-content-end mb-4"><a class="btn btn-primary text-uppercase" href="#!">Older Posts →</a></div>
</div>
</div>
</div>

View File

@ -5,14 +5,17 @@ namespace kernel;
use kernel\Controller; use kernel\Controller;
use kernel\helpers\Debug; use kernel\helpers\Debug;
use kernel\services\AdminThemeService; use kernel\services\AdminThemeService;
use kernel\services\ThemeService;
class AdminController extends Controller class AdminController extends Controller
{ {
protected AdminThemeService $adminThemeService; protected AdminThemeService $adminThemeService;
protected ThemeService $themeService;
protected function init(): void protected function init(): void
{ {
$this->adminThemeService = new AdminThemeService(); $this->adminThemeService = new AdminThemeService();
$this->themeService = new ThemeService();
$active_theme = $this->adminThemeService->getActiveAdminThemeInfo(); $active_theme = $this->adminThemeService->getActiveAdminThemeInfo();
$this->cgView->layoutPath = getConst($active_theme['layout_path']); $this->cgView->layoutPath = getConst($active_theme['layout_path']);
$this->cgView->layout = "/" . $active_theme['layout']; $this->cgView->layout = "/" . $active_theme['layout'];

View File

@ -7,6 +7,7 @@ namespace kernel;
use kernel\helpers\Debug; use kernel\helpers\Debug;
use kernel\modules\user\models\User; use kernel\modules\user\models\User;
use kernel\services\ModuleService; use kernel\services\ModuleService;
use kernel\services\ThemeService;
use Phroute\Phroute\Dispatcher; use Phroute\Phroute\Dispatcher;
class App class App
@ -24,6 +25,8 @@ class App
public ModuleService $moduleService; public ModuleService $moduleService;
public ThemeService $themeService;
public static Database $db; public static Database $db;
public function run(): void public function run(): void
@ -53,6 +56,12 @@ class App
foreach ($modules_routs as $rout){ foreach ($modules_routs as $rout){
include "$rout"; include "$rout";
} }
$themeService = new ThemeService();
$activeTheme = getConst($themeService->getActiveTheme());
if (!empty($activeTheme)){
include $activeTheme . "/" . $themeService->getThemeRout($activeTheme);
}
} }
public static function create(): App public static function create(): App

66
kernel/Assets.php Normal file
View File

@ -0,0 +1,66 @@
<?php
namespace kernel;
class Assets
{
protected array $jsHeader = [];
protected array $jsBody = [];
protected array $css = [];
protected string $resourceURI = "/resource";
public function __construct(string $resourceURI)
{
$this->setResourceURI($resourceURI);
$this->createCSS();
$this->createJS();
}
protected function createCSS(){}
protected function createJS(){}
public function setResourceURI(string $resourceURI): void
{
$this->resourceURI = $resourceURI;
}
public function registerJS(string $slug, string $resource, bool $body = true, bool $addResourceURI = true): void
{
$resource = $addResourceURI ? $this->resourceURI . $resource : $resource;
if ($body) {
$this->jsBody[$slug] = $resource;
} else {
$this->jsHeader[$slug] = $resource;
}
}
public function registerCSS(string $slug, string $resource, bool $addResourceURI = true): void
{
$resource = $addResourceURI ? $this->resourceURI . $resource : $resource;
$this->css[$slug] = $resource;
}
public function getJSAsStr(bool $body = true): void
{
if ($body) {
foreach ($this->jsBody as $key => $item){
echo "<script src='$item'></script>";
}
}
else {
foreach ($this->jsHeader as $key => $item){
echo "<script src='$item'></script>";
}
}
}
public function getCSSAsSTR(): void
{
foreach ($this->css as $key => $item){
echo "<link rel='stylesheet' href='$item'>";
}
}
}

View File

@ -2,6 +2,8 @@
namespace kernel; namespace kernel;
use kernel\helpers\Debug;
class CgView class CgView
{ {
public string $viewPath = ''; public string $viewPath = '';
@ -61,6 +63,13 @@ class CgView
private function createContent(string $viewFile, array $data = []): false|string private function createContent(string $viewFile, array $data = []): false|string
{ {
ob_start(); ob_start();
if ($this->varToLayout){
foreach ($this->varToLayout as $key => $datum) {
${"$key"} = $datum;
}
}
$view = $this; $view = $this;
foreach ($data as $key => $datum) { foreach ($data as $key => $datum) {
${"$key"} = $datum; ${"$key"} = $datum;

View File

@ -36,7 +36,9 @@ class FileUpload
$newFileName = md5(time() . $this->fileName) . '.' . $this->fileExtension; $newFileName = md5(time() . $this->fileName) . '.' . $this->fileExtension;
if (in_array($this->fileExtension, $this->allowedFileExtensions)) { if (in_array($this->fileExtension, $this->allowedFileExtensions)) {
$this->uploadDir = $uploadDir . mb_substr($newFileName, 0, 2) . '/' . mb_substr($newFileName, 2, 2) . '/'; $this->uploadDir = $uploadDir . mb_substr($newFileName, 0, 2) . '/' . mb_substr($newFileName, 2, 2) . '/';
mkdir(ROOT_DIR . $this->uploadDir, 0777, true); $oldMask = umask(0);
mkdir(ROOT_DIR . $this->uploadDir, 0775, true);
umask($oldMask);
$uploadFileDir = ROOT_DIR . $this->uploadDir; $uploadFileDir = ROOT_DIR . $this->uploadDir;
$this->destPath = $uploadFileDir . $newFileName; $this->destPath = $uploadFileDir . $newFileName;
$this->uploadFile = $this->uploadDir . $newFileName; $this->uploadFile = $this->uploadDir . $newFileName;
@ -49,7 +51,9 @@ class FileUpload
} else { } else {
if (in_array($this->fileExtension, $this->allowedFileExtensions)) { if (in_array($this->fileExtension, $this->allowedFileExtensions)) {
$this->uploadDir = $uploadDir; $this->uploadDir = $uploadDir;
mkdir(ROOT_DIR . $this->uploadDir, 0777, true); $oldMask = umask(0);
mkdir(ROOT_DIR . $this->uploadDir, 0775, true);
umask($oldMask);
$uploadFileDir = ROOT_DIR . $this->uploadDir; $uploadFileDir = ROOT_DIR . $this->uploadDir;
$this->destPath = $uploadFileDir . $this->fileName; $this->destPath = $uploadFileDir . $this->fileName;
$this->uploadFile = $this->uploadDir . $this->fileName; $this->uploadFile = $this->uploadDir . $this->fileName;

View File

@ -9,12 +9,13 @@ class Flash
public static function setMessage(string $type, string $msg): void public static function setMessage(string $type, string $msg): void
{ {
Session::start(); self::start();
Session::set($type, $msg); Session::set($type, $msg);
} }
public static function getMessage(string $type): string public static function getMessage(string $type): string
{ {
self::start();
$msg = Session::get($type, false); $msg = Session::get($type, false);
Session::remove($type); Session::remove($type);
@ -23,7 +24,16 @@ class Flash
public static function hasMessage(string $type): bool public static function hasMessage(string $type): bool
{ {
self::start();
return Session::has($type); return Session::has($type);
} }
public static function start()
{
if (!Session::isStarted()){
Session::start();
}
}
} }

View File

@ -17,13 +17,32 @@ class RestController
return []; return [];
} }
protected function filters(): array
{
return [];
}
#[NoReturn] public function actionIndex(): void #[NoReturn] public function actionIndex(): void
{ {
$request = new Request(); $request = new Request();
$get = $request->get();
$page = $request->get('page') ?? 1; $page = $request->get('page') ?? 1;
$perPage = $request->get('per_page') ?? 10; $perPage = $request->get('per_page') ?? 10;
$query = $this->model->query(); $query = $this->model->query();
if ($this->filters()) {
foreach ($this->filters() as $filter){
if (key_exists($filter, $get)){
if (is_numeric($get[$filter])){
$query->where($filter, $get[$filter]);
}
elseif (is_string($get[$filter])){
$query->where($filter,'like', '%' . $get[$filter] . '%');
}
}
}
}
if ($page > 1) { if ($page > 1) {
$query->skip(($page - 1) * $perPage)->take($perPage); $query->skip(($page - 1) * $perPage)->take($perPage);
} else { } else {
@ -31,7 +50,7 @@ class RestController
} }
$expand = $this->expand(); $expand = $this->expand();
$expandParams = explode( ",", $request->get('expand') ?? ""); $expandParams = explode(",", $request->get('expand') ?? "");
$finalExpand = array_intersect($expandParams, $expand); $finalExpand = array_intersect($expandParams, $expand);
if ($finalExpand) { if ($finalExpand) {
$res = $query->get()->load($finalExpand)->toArray(); $res = $query->get()->load($finalExpand)->toArray();
@ -46,14 +65,14 @@ class RestController
{ {
$expand = $this->expand(); $expand = $this->expand();
$request = new Request(); $request = new Request();
$expandParams = explode( ",", $request->get('expand') ?? ""); $expandParams = explode(",", $request->get('expand') ?? "");
$model = $this->model->where("id", $id)->first(); $model = $this->model->where("id", $id)->first();
$finalExpand = array_intersect($expandParams, $expand); $finalExpand = array_intersect($expandParams, $expand);
if ($finalExpand){ if ($finalExpand) {
$model->load($finalExpand); $model->load($finalExpand);
} }
$res = []; $res = [];
if ($model){ if ($model) {
$res = $model->toArray(); $res = $model->toArray();
} }
@ -64,7 +83,7 @@ class RestController
{ {
$model = $this->model->where("id", $id)->first(); $model = $this->model->where("id", $id)->first();
$res = []; $res = [];
if ($model){ if ($model) {
$res = $model->toArray(); $res = $model->toArray();
} }
@ -78,7 +97,7 @@ class RestController
{ {
$request = new Request(); $request = new Request();
$data = $request->post(); $data = $request->post();
foreach ($this->model->getFillable() as $item){ foreach ($this->model->getFillable() as $item) {
$this->model->{$item} = $data[$item] ?? null; $this->model->{$item} = $data[$item] ?? null;
} }
$this->model->save(); $this->model->save();
@ -93,8 +112,8 @@ class RestController
$model = $this->model->where('id', $id)->first(); $model = $this->model->where('id', $id)->first();
foreach ($model->getFillable() as $item){ foreach ($model->getFillable() as $item) {
if (!empty($data[$item])){ if (!empty($data[$item])) {
$model->{$item} = $data[$item] ?? null; $model->{$item} = $data[$item] ?? null;
} }
} }
@ -117,5 +136,4 @@ class RestController
} }
} }

View File

@ -0,0 +1,25 @@
<?php
namespace kernel\admin_themes\default;
use kernel\Assets;
class DefaultAdminThemeAssets extends Assets
{
protected function createJS(): void
{
$this->registerJS(slug: "jquery", resource: "/js/jquery.min.js");
$this->registerJS(slug: "popper", resource: "/js/popper.js");
$this->registerJS(slug: "bootstrap", resource: "/js/bootstrap.min.js");
$this->registerJS(slug: "main", resource: "/js/main.js");
}
protected function createCSS()
{
$this->registerCSS(slug: "font-awesome", resource: "https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.6.0/css/all.min.css", addResourceURI: false);
$this->registerCSS(slug: "bootstrap", resource: "/css/bootstrap.min.css");
$this->registerCSS(slug: "style", resource: "/css/style.css");
}
}

View File

@ -6,6 +6,7 @@
* @var \kernel\CgView $view * @var \kernel\CgView $view
*/ */
\Josantonius\Session\Facades\Session::start(); \Josantonius\Session\Facades\Session::start();
$assets = new \kernel\admin_themes\default\DefaultAdminThemeAssets($resources)
?> ?>
<!doctype html> <!doctype html>
<html lang="en"> <html lang="en">
@ -17,19 +18,21 @@
<link href="https://fonts.googleapis.com/css?family=Poppins:300,400,500,600,700,800,900" rel="stylesheet"> <link href="https://fonts.googleapis.com/css?family=Poppins:300,400,500,600,700,800,900" rel="stylesheet">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.6.0/css/all.min.css"> <?php $assets->getCSSAsSTR(); ?>
<link rel="stylesheet" href="<?= $resources ?>/css/bootstrap.min.css"> <?php $assets->getJSAsStr(body: false); ?>
<link rel="stylesheet" href="<?= $resources ?>/css/style.css">
</head> </head>
<body> <body>
<div class="wrapper d-flex align-items-stretch"> <div class="wrapper d-flex align-items-stretch">
<nav id="sidebar"> <nav id="sidebar">
<div class="p-4 pt-5"> <div class="p-4 pt-5">
<a href="#" class="img logo rounded-circle mb-5" <a href="<?= '/admin/user/profile' ?>" class="img logo rounded-circle mb-5"
style="background-image: url(/resources/admin_theme/images/logo.jpg);"></a> style="background-image: url(<?= \kernel\modules\user\service\UserService::getAuthUserPhoto() ?? '/resources/default_user_photo/noPhoto.png' ?>);">
</a>
<p> <p>
<a href="<?= '/admin/user/profile' ?>">
<?= \kernel\modules\user\service\UserService::getAuthUsername() ?> <?= \kernel\modules\user\service\UserService::getAuthUsername() ?>
</a>
</p> </p>
<?php \kernel\widgets\MenuWidget::create()->run(); ?> <?php \kernel\widgets\MenuWidget::create()->run(); ?>
<div class="footer"> <div class="footer">
@ -82,16 +85,13 @@
<?php if (\kernel\Flash::hasMessage("success")): ?> <?php if (\kernel\Flash::hasMessage("success")): ?>
<div class="alert alert-success alert-dismissible"> <div class="alert alert-success alert-dismissible">
<?= \kernel\Flash::getMessage("success"); ?> <?= \kernel\Flash::getMessage("success"); ?>
<button type="button" class="btn-close closeAlertBtn" ></button> <button type="button" class="btn-close closeAlertBtn"></button>
</div> </div>
<?php endif; ?> <?php endif; ?>
<?= $content ?> <?= $content ?>
</div> </div>
</div> </div>
<script src="<?= $resources ?>/js/jquery.min.js"></script> <?php $assets->getJSAsStr(); ?>
<script src="<?= $resources ?>/js/popper.js"></script>
<script src="<?= $resources ?>/js/bootstrap.min.js"></script>
<script src="<?= $resources ?>/js/main.js"></script>
</body> </body>
</html> </html>

View File

@ -3,10 +3,11 @@
"version": "0.1", "version": "0.1",
"author": "ItGuild", "author": "ItGuild",
"slug": "default", "slug": "default",
"type": "admin_theme",
"description": "Default admin theme", "description": "Default admin theme",
"preview": "preview.png", "preview": "preview.png",
"resource": "/resources/default", "resource": "/resources/admin_themes/default",
"resource_path": "{RESOURCES}/default", "resource_path": "{RESOURCES}/admin_themes/default",
"layout": "main.php", "layout": "main.php",
"layout_path": "{KERNEL_ADMIN_THEMES}/default/layout" "layout_path": "{KERNEL_ADMIN_THEMES}/default/layout"
} }

View File

@ -5,8 +5,8 @@
"slug": "simple", "slug": "simple",
"description": "Simple admin theme", "description": "Simple admin theme",
"preview": "preview.png", "preview": "preview.png",
"resource": "/resources/simple", "resource": "/resources/admin_themes/simple",
"resource_path": "{RESOURCES}/simple", "resource_path": "{RESOURCES}/admin_themes/simple",
"layout": "main.php", "layout": "main.php",
"layout_path": "{KERNEL_ADMIN_THEMES}/simple/layout" "layout_path": "{KERNEL_ADMIN_THEMES}/simple/layout"
} }

0
kernel/app_modules/tag/controllers/TagController.php Executable file → Normal file
View File

View File

0
kernel/app_modules/tag/models/Tag.php Executable file → Normal file
View File

0
kernel/app_modules/tag/models/TagEntity.php Executable file → Normal file
View File

View File

0
kernel/app_modules/tag/models/forms/CreateTagForm.php Executable file → Normal file
View File

0
kernel/app_modules/tag/routs/tag.php Executable file → Normal file
View File

0
kernel/app_modules/tag/service/TagEntityService.php Executable file → Normal file
View File

0
kernel/app_modules/tag/service/TagService.php Executable file → Normal file
View File

0
kernel/app_modules/tag/views/tag/form.php Executable file → Normal file
View File

0
kernel/app_modules/tag/views/tag/index.php Executable file → Normal file
View File

0
kernel/app_modules/tag/views/tag/view.php Executable file → Normal file
View File

0
kernel/app_modules/tag/views/tag_entity/index.php Executable file → Normal file
View File

0
kernel/app_modules/tag/views/tag_entity/view.php Executable file → Normal file
View File

View File

@ -0,0 +1,31 @@
<?php
namespace kernel\app_themes\custom;
use kernel\modules\menu\service\MenuService;
use kernel\services\MigrationService;
class CustomTheme
{
public MenuService $menuService;
public MigrationService $migrationService;
public function __construct()
{
$this->menuService = new MenuService();
$this->migrationService = new MigrationService();
}
/**
* @throws \Exception
*/
public function init(): void
{
//TODO
}
public function deactivate(): void
{
//TODO
}
}

View File

@ -0,0 +1,8 @@
<?php
namespace kernel\app_themes\custom\services;
class CustomThemeService
{
}

View File

@ -63,6 +63,20 @@ class AdminConsoleController extends ConsoleController
); );
$this->out->r("create option active_admin_theme", "green"); $this->out->r("create option active_admin_theme", "green");
$this->optionService->createFromParams(
key: "theme_paths",
value: "{\"paths\": [\"{KERNEL}/themes\", \"{APP}/themes\"]}",
label: "Пути к темам сайта"
);
$this->out->r("create option theme_paths", "green");
$this->optionService->createFromParams(
key: "active_theme",
value: "{KERNEL}/themes/default",
label: "Активная тема сайта"
);
$this->out->r("create option active_theme", "green");
$this->optionService->createFromParams( $this->optionService->createFromParams(
key: "module_paths", key: "module_paths",
value: "{\"paths\": [\"{KERNEL_MODULES}\", \"{APP}/modules\"]}", value: "{\"paths\": [\"{KERNEL_MODULES}\", \"{APP}/modules\"]}",
@ -72,7 +86,7 @@ class AdminConsoleController extends ConsoleController
$this->optionService->createFromParams( $this->optionService->createFromParams(
key: "active_modules", key: "active_modules",
value: "{\"modules\":[\"admin_themes\", \"secure\", \"user\", \"menu\", \"post\", \"option\"]}", value: "{\"modules\":[\"admin_themes\",\"themes\",\"secure\", \"user\", \"menu\", \"post\", \"option\"]}",
label: "Активные модули" label: "Активные модули"
); );
$this->out->r("create option active_modules", "green"); $this->out->r("create option active_modules", "green");
@ -133,6 +147,14 @@ class AdminConsoleController extends ConsoleController
]); ]);
$this->out->r("create item menu admin-themes", "green"); $this->out->r("create item menu admin-themes", "green");
$this->menuService->createItem([
"label" => "Темы сайта",
"url" => "/admin/settings/themes",
"slug" => "themes",
"parent_slug" => "settings"
]);
$this->out->r("create item menu themes", "green");
$this->menuService->createItem([ $this->menuService->createItem([
"label" => "Меню", "label" => "Меню",
"url" => "/admin/settings/menu", "url" => "/admin/settings/menu",

View File

@ -18,31 +18,15 @@ class AdminThemeController extends ConsoleController
throw new \Exception('Missing admin theme path "--path" specified'); throw new \Exception('Missing admin theme path "--path" specified');
} }
$zip = new ZipArchive; if (file_exists(ROOT_DIR . $this->argv['path'])) {
$tmpThemeDir = md5(time()); $adminThemeService = new AdminThemeService();
$res = $zip->open(ROOT_DIR . $this->argv['path']); if ($adminThemeService->install($this->argv['path'])) {
if ($res === TRUE) { $this->out->r("Тема админ-панели установлена", 'green');
$tmpThemeDirFull = RESOURCES_DIR . '/tmp/ad/' . $tmpThemeDir . "/";
$zip->extractTo($tmpThemeDirFull);
$zip->close();
$this->out->r('Архив распакован', 'green');
} else { } else {
$this->out->r('Message: Ошибка чтения архива', 'red'); $this->out->r("Ошибка установки темы админ-панели", 'red');
} }
} else {
if (file_exists($tmpThemeDirFull . "meta/manifest.json")){ $this->out->r("Тема админ-панели не найдена", 'red');
$manifestJson = getConst(file_get_contents($tmpThemeDirFull . "meta/manifest.json"));
$manifest = Manifest::getWithVars($manifestJson);
$this->out->r('manifest.json инициализирован', 'green');
$fileHelper = new Files();
$fileHelper->copy_folder($tmpThemeDirFull . "meta", $manifest['theme_path']);
$fileHelper->copy_folder($tmpThemeDirFull . "resources", $manifest['resource_path']);
$this->out->r("Удаляем временные файлы", 'green');
$fileHelper->recursiveRemoveDir($tmpThemeDirFull);
$this->out->r("Тема " . $manifest['name'] . " установлена", 'green');
} }
} }
@ -53,17 +37,11 @@ class AdminThemeController extends ConsoleController
} }
if (file_exists(ROOT_DIR . $this->argv['path'])) { if (file_exists(ROOT_DIR . $this->argv['path'])) {
$themeName = basename($this->argv['path']);
$active_admin_theme = Option::where("key", "active_admin_theme")->first();
if ($active_admin_theme->value === ROOT_DIR . $this->argv['path']) {
$this->out->r("Меняем тему на базовую", 'green');
$adminThemeService = new AdminThemeService(); $adminThemeService = new AdminThemeService();
$adminThemeService->setActiveAdminTheme(KERNEL_ADMIN_THEMES_DIR . '/default'); $adminThemeService->uninstall($this->argv['path']);
$this->out->r("Тема изменена", 'green');
}
$fileHelper = new Files();
$fileHelper->recursiveRemoveDir(ROOT_DIR . $this->argv['path']);
$fileHelper->recursiveRemoveDir(RESOURCES_DIR . '/' . $themeName);
$this->out->r("Тема удалена", 'green'); $this->out->r("Тема удалена", 'green');
} else { } else {
@ -71,4 +49,22 @@ class AdminThemeController extends ConsoleController
} }
} }
/**
* @throws \Exception
*/
public function actionPackTheme(): void
{
if (!isset($this->argv['path'])) {
throw new \Exception('Missing admin theme path "--path" specified');
}
if (file_exists(ROOT_DIR . $this->argv['path'])) {
$adminThemeService = new AdminThemeService();
$adminThemeService->pack($this->argv['path']);
$this->out->r("Тема админ-панели заархивирована", 'green');
} else {
$this->out->r("Тема админ-панели не найдена", 'red');
}
}
} }

View File

@ -71,11 +71,16 @@ class MigrationController extends ConsoleController
$dmr = new DatabaseMigrationRepository(App::$db->capsule->getDatabaseManager(), 'migration'); $dmr = new DatabaseMigrationRepository(App::$db->capsule->getDatabaseManager(), 'migration');
$m = new Migrator($dmr, App::$db->capsule->getDatabaseManager(), new Filesystem()); $m = new Migrator($dmr, App::$db->capsule->getDatabaseManager(), new Filesystem());
if (isset($this->argv['path'])){
$migrationPaths = [ROOT_DIR . $this->argv['path']];
}
else {
if (\kernel\App::$db->schema->hasTable('option')) { if (\kernel\App::$db->schema->hasTable('option')) {
$migrationPaths = array_merge($this->moduleService->getModulesMigrationsPaths(), [ROOT_DIR . '/migrations']); $migrationPaths = array_merge($this->moduleService->getModulesMigrationsPaths(), [ROOT_DIR . '/migrations']);
} else { } else {
$migrationPaths = [ROOT_DIR . '/migrations']; $migrationPaths = [ROOT_DIR . '/migrations'];
} }
}
$res = $m->run($migrationPaths); $res = $m->run($migrationPaths);
foreach ($res as $re) { foreach ($res as $re) {
@ -94,7 +99,13 @@ class MigrationController extends ConsoleController
$m = new Migrator($dmr, App::$db->capsule->getDatabaseManager(), new Filesystem()); $m = new Migrator($dmr, App::$db->capsule->getDatabaseManager(), new Filesystem());
//$migrationPaths = array_merge(App::$migrationsPaths, [WORKSPACE_DIR . '/console/migrations']); //$migrationPaths = array_merge(App::$migrationsPaths, [WORKSPACE_DIR . '/console/migrations']);
if (isset($this->argv['path'])){
$migrationPaths = [ROOT_DIR . $this->argv['path']];
}
else {
$migrationPaths = [ROOT_DIR . '/migrations']; $migrationPaths = [ROOT_DIR . '/migrations'];
}
$res = $m->rollback($migrationPaths, ['step' => $step]); $res = $m->rollback($migrationPaths, ['step' => $step]);
print_r($step); print_r($step);
foreach ($res as $re) { foreach ($res as $re) {

View File

@ -0,0 +1,73 @@
<?php
namespace kernel\console\controllers;
use kernel\console\ConsoleController;
use kernel\helpers\Files;
use kernel\helpers\Manifest;
use kernel\models\Option;
use kernel\services\AdminThemeService;
use kernel\services\ThemeService;
use ZipArchive;
class ThemeController extends ConsoleController
{
/**
* @throws \Exception
*/
public function actionInstallTheme(): void
{
if (!isset($this->argv['path'])) {
throw new \Exception('Missing theme path "--path" specified');
}
if (file_exists(ROOT_DIR . $this->argv['path'])) {
$themeService = new ThemeService();
if ($themeService->install($this->argv['path'])) {
$this->out->r("Тема сайта установлена", 'green');
} else {
$this->out->r("Ошибка установки темы сайта", 'red');
}
} else {
$this->out->r("Тема сайта не найдена", 'red');
}
}
/**
* @throws \Exception
*/
public function actionUninstallTheme(): void
{
if (!isset($this->argv['path'])) {
throw new \Exception('Missing theme path "--path" specified');
}
if (file_exists(ROOT_DIR . $this->argv['path'])) {
$themeService = new ThemeService();
$themeService->uninstall($this->argv['path']);
$this->out->r("Тема сайта удалена", 'green');
} else {
$this->out->r("Тема сайта не найдена", 'red');
}
}
/**
* @throws \Exception
*/
public function actionPackTheme(): void
{
if (!isset($this->argv['path'])) {
throw new \Exception('Missing theme path "--path" specified');
}
if (file_exists(ROOT_DIR . $this->argv['path'])) {
$themeService = new ThemeService();
$themeService->pack($this->argv['path']);
$this->out->r("Тема сайта заархивирована", 'green');
} else {
$this->out->r("Тема сайта не найдена", 'red');
}
}
}

View File

@ -35,6 +35,25 @@ App::$collector->group(["prefix" => "admin-theme"], callback: function (RouteCol
[\kernel\console\controllers\AdminThemeController::class, 'actionUninstallTheme'], [\kernel\console\controllers\AdminThemeController::class, 'actionUninstallTheme'],
additionalInfo: ['description' => 'Удалить тему админ-панели', 'params' => ['--path' => 'Путь к удаляемой теме']] additionalInfo: ['description' => 'Удалить тему админ-панели', 'params' => ['--path' => 'Путь к удаляемой теме']]
); );
App::$collector->console('pack',
[\kernel\console\controllers\AdminThemeController::class, 'actionPackTheme'],
additionalInfo: ['description' => 'Заархивировать тему админ-панели', 'params' => ['--path' => 'Путь к теме, которую нужно заархивировать']]
);
});
App::$collector->group(["prefix" => "theme"], callback: function (RouteCollector $router){
App::$collector->console('install',
[\kernel\console\controllers\ThemeController::class, 'actionInstallTheme'],
additionalInfo: ['description' => 'Установить тему сайта', 'params' => ['--path' => 'Путь к устанавливаемой теме']]
);
App::$collector->console('uninstall',
[\kernel\console\controllers\ThemeController::class, 'actionUninstallTheme'],
additionalInfo: ['description' => 'Удалить тему сайта', 'params' => ['--path' => 'Путь к удаляемой теме']]
);
App::$collector->console('pack',
[\kernel\console\controllers\ThemeController::class, 'actionPackTheme'],
additionalInfo: ['description' => 'Заархивировать тему сайта', 'params' => ['--path' => 'Путь к теме, которую нужно заархивировать']]
);
}); });
App::$collector->group(["prefix" => "secure"], callback: function (RouteCollector $router){ App::$collector->group(["prefix" => "secure"], callback: function (RouteCollector $router){

View File

@ -0,0 +1,23 @@
<?php
namespace kernel\filters;
use itguild\forms\builders\SelectBuilder;
use Itguild\Tables\Filter\Filter;
use kernel\helpers\Debug;
class BootstrapSelectFilter extends Filter
{
public function fetch(): string
{
$select = SelectBuilder::build($this->name, [
'class' => 'form-control',
'options' => $this->params['options'],
'value' => $this->value,
'prompt' => $this->params['prompt'] ?? null,
]);
return "<td>" . $select->create()->fetch() . "</td>";
}
}

View File

@ -0,0 +1,21 @@
<?php
namespace kernel\filters;
use itguild\forms\builders\TextInputBuilder;
use Itguild\Tables\Filter\Filter;
class BootstrapTextFilter extends Filter
{
public function fetch()
{
$textInput = TextInputBuilder::build($this->name, [
'value' => $this->value,
'class' => "form-control"
]);
return "<td>" . $textInput->create()->fetch() . "</td>";
}
}

View File

@ -0,0 +1,48 @@
<?php
namespace kernel\helpers;
class ImageGD
{
public \GdImage $img;
public function __construct(string $resource = '', int $width = 200, int $height = 200)
{
if ($resource){
$this->img = imagecreatefrompng($resource);
}
else {
$this->img = imagecreatetruecolor($width, $height);
}
imagesavealpha($this->img, true);
}
public function addText(string $font_size, int $degree, int $x, int $y, string $color, string $font, string $text): void
{
$rgbArr = $this->hexToRgb($color);
$color = imagecolorallocate($this->img, $rgbArr[0], $rgbArr[1], $rgbArr[2]);
imagettftext($this->img, $font_size, $degree, $x, $y, $color, $font, $text);
}
public function addImg(\GdImage $gdImage, int $location_x, int $location_y, int $offset_src_x, int $offset_src_y, int $src_width, int $src_height, int $no_transparent): void
{
imagecopymerge($this->img, $gdImage, $location_x, $location_y, $offset_src_x, $offset_src_y, $src_width, $src_height, $no_transparent);
}
public function getImg()
{
return $this->img;
}
public function save(string $path): void
{
imagepng($this->img, $path);
imagedestroy($this->img);
}
protected function hexToRgb(string $hex)
{
return sscanf($hex, "#%02x%02x%02x");
}
}

View File

@ -1,6 +1,6 @@
{ {
"name": "Kernel", "name": "Kernel",
"version": "0.1.1", "version": "0.1.7",
"author": "ITGuild", "author": "ITGuild",
"slug": "kernel", "slug": "kernel",
"type": "kernel", "type": "kernel",

View File

@ -19,12 +19,15 @@ $table = new ListEloquentTable(new EloquentDataProvider(Menu::class, [
'baseUrl' => "/admin/settings/menu", 'baseUrl' => "/admin/settings/menu",
])); ]));
$table->columns([ $table->columns([
'parent_id' => (function ($data) { 'parent_id' => function ($data) {
if ($data == 0) return null; if ($data == 0) return null;
return Menu::find($data)->label; return Menu::find($data)->label;
}), },
'icon_file' => function ($data) { 'icon_file' => function ($data) {
return $data ? "<img src='$data' width='150px'>" : ""; return $data ? "<img src='$data' width='150px'>" : "";
},
'status' => function ($data) {
return Menu::getStatus()[$data];
} }
]); ]);
$table->beforePrint(function () { $table->beforePrint(function () {

View File

@ -5,19 +5,19 @@ namespace kernel\modules\module_shop_client\controllers;
use GuzzleHttp\Client; use GuzzleHttp\Client;
use GuzzleHttp\Exception\GuzzleException; use GuzzleHttp\Exception\GuzzleException;
use JetBrains\PhpStorm\NoReturn; use JetBrains\PhpStorm\NoReturn;
use Josantonius\Session\Facades\Session;
use kernel\AdminController; use kernel\AdminController;
use kernel\Flash; use kernel\Flash;
use kernel\helpers\Debug; use kernel\helpers\Debug;
use kernel\helpers\Files; use kernel\helpers\Files;
use kernel\helpers\RESTClient; use kernel\helpers\RESTClient;
use kernel\helpers\SMTP; use kernel\modules\module_shop_client\services\ModuleShopClientService;
use kernel\Mailing;
use kernel\Request; use kernel\Request;
use kernel\services\AdminThemeService; use kernel\services\AdminThemeService;
use kernel\services\KernelService; use kernel\services\KernelService;
use kernel\services\ModuleService; use kernel\services\ModuleService;
use kernel\services\ModuleShopService; use kernel\services\ModuleShopService;
use kernel\services\TokenService; use kernel\services\ThemeService;
use PHPMailer\PHPMailer\Exception; use PHPMailer\PHPMailer\Exception;
class ModuleShopClientController extends AdminController class ModuleShopClientController extends AdminController
@ -26,6 +26,7 @@ class ModuleShopClientController extends AdminController
protected Client $client; protected Client $client;
protected ModuleService $moduleService; protected ModuleService $moduleService;
protected KernelService $kernelService; protected KernelService $kernelService;
protected ModuleShopClientService $moduleShopClientService;
protected function init(): void protected function init(): void
{ {
@ -35,6 +36,7 @@ class ModuleShopClientController extends AdminController
$this->client = new Client(); $this->client = new Client();
$this->moduleService = new ModuleService(); $this->moduleService = new ModuleService();
$this->kernelService = new KernelService(); $this->kernelService = new KernelService();
$this->moduleShopClientService = new ModuleShopClientService();
} }
/** /**
@ -42,7 +44,6 @@ class ModuleShopClientController extends AdminController
*/ */
public function actionIndex(int $page_number = 1): void public function actionIndex(int $page_number = 1): void
{ {
if ($this->moduleService->issetModuleShopToken()) { if ($this->moduleService->issetModuleShopToken()) {
if ($this->moduleService->isServerAvailable()) { if ($this->moduleService->isServerAvailable()) {
@ -60,6 +61,7 @@ class ModuleShopClientController extends AdminController
'per_page' => $per_page, 'per_page' => $per_page,
'kernelService' => new KernelService(), 'kernelService' => new KernelService(),
'adminThemeService' => new AdminThemeService(), 'adminThemeService' => new AdminThemeService(),
'themeService' => new ThemeService(),
]); ]);
} else { } else {
$this->cgView->render("module_shop_error_connection.php"); $this->cgView->render("module_shop_error_connection.php");
@ -90,7 +92,7 @@ class ModuleShopClientController extends AdminController
Files::uploadByUrl($_ENV['MODULE_SHOP_URL'] . $module_info['path_to_archive'], RESOURCES_DIR . "/tmp/modules"); Files::uploadByUrl($_ENV['MODULE_SHOP_URL'] . $module_info['path_to_archive'], RESOURCES_DIR . "/tmp/modules");
$this->moduleService->installModule('/resources/tmp/modules/' . basename($module_info['path_to_archive'])); $this->moduleService->installModule('/resources/tmp/modules/' . basename($module_info['path_to_archive']));
Flash::setMessage("success", "Модуль успешно установлен."); Flash::setMessage("success", "Модуль успешно загружен.");
$this->redirect('/admin/module_shop_client', 302); $this->redirect('/admin/module_shop_client', 302);
} }
@ -163,18 +165,22 @@ class ModuleShopClientController extends AdminController
$filters = $request->get(); $filters = $request->get();
if ($this->moduleService->issetModuleShopToken()) { if ($this->moduleService->issetModuleShopToken()) {
if ($this->moduleService->isServerAvailable()) { if ($this->moduleService->isServerAvailable()) {
$modules_info = []; // $modules_info = [];
$per_page = 8; $per_page = 8;
$modules = RESTClient::request($_ENV['MODULE_SHOP_URL'] . '/api/module_shop/gb_slug'); $modules_info = RESTClient::request($_ENV['MODULE_SHOP_URL'] . '/api/module_shop/gb_slug');
$modules = json_decode($modules->getBody()->getContents(), true); $modules_info = json_decode($modules_info->getBody()->getContents(), true);
foreach ($modules as $module) { foreach ($modules_info as $key => $module) {
foreach ($filters as $key => $value) { foreach ($filters as $column => $value) {
if ($value === '') continue; if ($value === '') continue;
if ($module[$key] !== $value) { if (is_numeric($value)) {
break; if ($module[$column] !== $value) {
unset($modules_info[$key]);
}
} elseif (is_string($value)) {
if (!str_contains($module[$column], $value)) {
unset($modules_info[$key]);
}
} }
$modules_info[] = $module;
} }
} }
$module_count = count($modules_info); $module_count = count($modules_info);
@ -188,6 +194,7 @@ class ModuleShopClientController extends AdminController
'per_page' => $per_page, 'per_page' => $per_page,
'kernelService' => new KernelService(), 'kernelService' => new KernelService(),
'adminThemeService' => new AdminThemeService(), 'adminThemeService' => new AdminThemeService(),
'filterValues' => $filters
]); ]);
} else { } else {
$this->cgView->render("module_shop_error_connection.php"); $this->cgView->render("module_shop_error_connection.php");
@ -209,7 +216,7 @@ class ModuleShopClientController extends AdminController
$moduleShopService = new ModuleShopService(); $moduleShopService = new ModuleShopService();
$result = $moduleShopService->email_auth($address); $result = $moduleShopService->email_auth($address);
if ($result['status'] == 'success'){ if ($result['status'] == 'success') {
$this->cgView->render('enter_code.php', ['email' => $address]); $this->cgView->render('enter_code.php', ['email' => $address]);
} }
@ -224,7 +231,7 @@ class ModuleShopClientController extends AdminController
$moduleShopService = new ModuleShopService(); $moduleShopService = new ModuleShopService();
$result = $moduleShopService->code_check($code); $result = $moduleShopService->code_check($code);
if (isset($result['access_token'])){ if (isset($result['access_token'])) {
$envFile = \EnvEditor\EnvFile::loadFrom(ROOT_DIR . "/.env"); $envFile = \EnvEditor\EnvFile::loadFrom(ROOT_DIR . "/.env");
@ -238,4 +245,107 @@ class ModuleShopClientController extends AdminController
$this->cgView->render('module_shop_error_connection.php'); $this->cgView->render('module_shop_error_connection.php');
} }
#[NoReturn] public function actionAdminThemeInstall(): void
{
$request = new Request();
$id = $request->get("id");
$adminThemeInfo = RESTClient::request($_ENV['MODULE_SHOP_URL'] . '/api/module_shop/install/' . $id);
$adminThemeInfo = json_decode($adminThemeInfo->getBody()->getContents(), true);
Files::uploadByUrl($_ENV['MODULE_SHOP_URL'] . $adminThemeInfo['path_to_archive'], RESOURCES_DIR . "/tmp/admin_themes");
if ($this->adminThemeService->install('/resources/tmp/admin_themes/' . basename($adminThemeInfo['path_to_archive']))) {
Flash::setMessage("success", "Тема админ-панели успешно загружена.");
} else {
Flash::setMessage("error", implode(";", $this->adminThemeService->getErrors()));
}
$this->redirect('/admin/module_shop_client', 302);
}
#[NoReturn] public function actionAdminThemeUpdate(): void
{
$request = new Request();
$slug = $request->get("slug");
$modules_info = RESTClient::request($_ENV['MODULE_SHOP_URL'] . '/api/module_shop/gb_slug');
$modules_info = json_decode($modules_info->getBody()->getContents(), true);
foreach ($modules_info as $module) {
if ($module['slug'] === $slug) {
$path = $module['path_to_archive'];
}
}
if (isset($path)) {
Files::uploadByUrl($_ENV['MODULE_SHOP_URL'] . $path, RESOURCES_DIR . "/tmp/admin_themes");
$this->adminThemeService->update('/resources/tmp/admin_themes/' . basename($path));
Flash::setMessage("success", "Тема админ-панели успешно обновлена.");
} else {
Flash::setMessage("error", "Ошибка обновления темы админ-панели.");
}
$this->redirect('/admin/module_shop_client', 302);
}
#[NoReturn] public function actionAdminThemeDelete(): void
{
$request = new Request();
$slug = $request->get("slug");
$adminThemeInfo = $this->adminThemeService->getAdminThemeInfoBySlug($slug);
$this->adminThemeService->uninstall($adminThemeInfo['path']);
Flash::setMessage("success", "Тема админ-панели успешно удалена.");
$this->redirect('/admin/module_shop_client', 302);
}
#[NoReturn] public function actionThemeInstall(): void
{
$request = new Request();
$id = $request->get("id");
$themeInfo = RESTClient::request($_ENV['MODULE_SHOP_URL'] . '/api/module_shop/install/' . $id);
$themeInfo = json_decode($themeInfo->getBody()->getContents(), true);
Files::uploadByUrl($_ENV['MODULE_SHOP_URL'] . $themeInfo['path_to_archive'], RESOURCES_DIR . "/tmp/themes");
if ($this->themeService->install('/resources/tmp/themes/' . basename($themeInfo['path_to_archive']))) {
Flash::setMessage("success", "Тема сайта успешно загружена.");
} else {
Session::start();
Session::set("error", implode(";", $this->themeService->getErrors()));
}
$this->redirect('/admin/module_shop_client', 302);
}
#[NoReturn] public function actionThemeUpdate(): void
{
$request = new Request();
$slug = $request->get("slug");
$modules_info = RESTClient::request($_ENV['MODULE_SHOP_URL'] . '/api/module_shop/gb_slug');
$modules_info = json_decode($modules_info->getBody()->getContents(), true);
foreach ($modules_info as $module) {
if ($module['slug'] === $slug) {
$path = $module['path_to_archive'];
}
}
if (isset($path)) {
Files::uploadByUrl($_ENV['MODULE_SHOP_URL'] . $path, RESOURCES_DIR . "/tmp/themes");
$this->themeService->update('/resources/tmp/themes/' . basename($path));
Flash::setMessage("success", "Тема сайта успешно обновлена.");
} else {
Flash::setMessage("error", "Ошибка обновления темы сайта.");
}
$this->redirect('/admin/module_shop_client', 302);
}
#[NoReturn] public function actionThemeDelete(): void
{
$request = new Request();
$slug = $request->get("slug");
$themeInfo = $this->themeService->getThemeInfoBySlug($slug);
$this->themeService->uninstall($themeInfo['path']);
Flash::setMessage("success", "Тема сайта успешно удалена.");
$this->redirect('/admin/module_shop_client', 302);
}
} }

View File

@ -24,7 +24,13 @@ App::$collector->group(["prefix" => "admin"], function (RouteCollector $router){
}); });
App::$collector->group(["prefix" => "admin_theme"], function (RouteCollector $router) { App::$collector->group(["prefix" => "admin_theme"], function (RouteCollector $router) {
App::$collector->get('/install', [\kernel\modules\module_shop_client\controllers\ModuleShopClientController::class, 'actionAdminThemeInstall']); App::$collector->get('/install', [\kernel\modules\module_shop_client\controllers\ModuleShopClientController::class, 'actionAdminThemeInstall']);
App::$collector->post('/update', [\kernel\modules\module_shop_client\controllers\ModuleShopClientController::class, 'actionAdminThemeUpdate']); App::$collector->get('/update', [\kernel\modules\module_shop_client\controllers\ModuleShopClientController::class, 'actionAdminThemeUpdate']);
App::$collector->get('/delete', [\kernel\modules\module_shop_client\controllers\ModuleShopClientController::class, 'actionAdminThemeDelete']);
});
App::$collector->group(["prefix" => "theme"], function (RouteCollector $router) {
App::$collector->get('/install', [\kernel\modules\module_shop_client\controllers\ModuleShopClientController::class, 'actionThemeInstall']);
App::$collector->get('/update', [\kernel\modules\module_shop_client\controllers\ModuleShopClientController::class, 'actionThemeUpdate']);
App::$collector->get('/delete', [\kernel\modules\module_shop_client\controllers\ModuleShopClientController::class, 'actionThemeDelete']);
}); });
}); });
}); });

View File

@ -0,0 +1,22 @@
<?php
namespace kernel\modules\module_shop_client\services;
use kernel\helpers\RESTClient;
class ModuleShopClientService
{
// public function getModulesInfo(string $url, int $perPage, int $pageNumber): \Psr\Http\Message\ResponseInterface
// {
// $modules_info = RESTClient::request($url);
// $modules_info = json_decode($modules_info->getBody()->getContents(), true);
// return array_slice($modules_info, $perPage * ($pageNumber - 1), $perPage);
// }
//
// public function getModulesInfoWithFilters(string $url, int $perPage, int $pageNumber): \Psr\Http\Message\ResponseInterface
// {
// $modules_info = RESTClient::request($url);
// $modules_info = json_decode($modules_info->getBody()->getContents(), true);
// return array_slice($modules_info, $perPage * ($pageNumber - 1), $perPage);
// }
}

View File

@ -7,6 +7,8 @@
* @var \kernel\services\ModuleService $moduleService * @var \kernel\services\ModuleService $moduleService
* @var \kernel\services\KernelService $kernelService * @var \kernel\services\KernelService $kernelService
* @var \kernel\services\AdminThemeService $adminThemeService * @var \kernel\services\AdminThemeService $adminThemeService
* @var \kernel\services\ThemeService $themeService
* @var array $filterValues
*/ */
use Itguild\Tables\ListJsonTable; use Itguild\Tables\ListJsonTable;
@ -42,15 +44,21 @@ $table->addAction(function ($row, $url) use ($moduleService) {
$table->columns([ $table->columns([
'type' => [ 'type' => [
'filter' => [ 'filter' => [
'class' => \Itguild\Tables\Filter\SelectFilter::class, 'class' => \kernel\filters\BootstrapSelectFilter::class,
'param' => ['kernel', 'entity'], 'params' => [
'value' => "kernel" 'options' => [
'kernel' => 'kernel',
'entity' => 'entity',
],
'prompt' => 'Не выбрано'
],
'value' => $filterValues['type'] ?? ''
], ],
] ]
]); ]);
$table->addAction(function ($row, $url) use ($moduleService){ $table->addAction(function ($row, $url) use ($moduleService) {
if ($row['slug'] !== 'kernel') { if ($row['type'] === 'entity' || $row['type'] === 'additional_property') {
if ($moduleService->isInstall($row['slug'])) { if ($moduleService->isInstall($row['slug'])) {
$url = "$url/delete/?slug=" . $row['slug']; $url = "$url/delete/?slug=" . $row['slug'];
@ -61,10 +69,12 @@ $table->addAction(function ($row, $url) use ($moduleService){
return \kernel\widgets\IconBtn\IconBtnInstallWidget::create(['url' => $url])->run(); return \kernel\widgets\IconBtn\IconBtnInstallWidget::create(['url' => $url])->run();
} }
} }
return null;
return false;
}); });
$table->addAction(function ($row, $url) use ($moduleService) { $table->addAction(function ($row, $url) use ($moduleService) {
if ($row['type'] === 'entity' || $row['type'] === 'additional_property') {
$slug = $row['slug']; $slug = $row['slug'];
if ($moduleService->isInstall($slug)) { if ($moduleService->isInstall($slug)) {
if (!$moduleService->isLastVersion($slug)) { if (!$moduleService->isLastVersion($slug)) {
@ -73,13 +83,13 @@ $table->addAction(function ($row, $url) use ($moduleService) {
return \kernel\widgets\IconBtn\IconBtnUpdateWidget::create(['url' => $url])->run(); return \kernel\widgets\IconBtn\IconBtnUpdateWidget::create(['url' => $url])->run();
} }
} }
}
return false; return false;
}); });
$table->addAction(function ($row, $url) use ($kernelService) { $table->addAction(function ($row, $url) use ($kernelService) {
$slug = $row['slug']; if ($row['type'] === 'kernel') {
if ($slug === 'kernel') {
if (!$kernelService->isLastVersion()) { if (!$kernelService->isLastVersion()) {
$url = "$url/kernel/update_form/"; $url = "$url/kernel/update_form/";
@ -91,12 +101,11 @@ $table->addAction(function ($row, $url) use ($kernelService) {
}); });
$table->addAction(function ($row, $url) use ($adminThemeService) { $table->addAction(function ($row, $url) use ($adminThemeService) {
$type = $row['type']; if ($row['type'] === 'admin_theme') {
$slug = $row['slug']; $slug = $row['slug'];
if ($type === 'admin_theme') {
if ($adminThemeService->isInstall($slug)) { if ($adminThemeService->isInstall($slug)) {
if (!$adminThemeService->isLastVersion($slug)) { if (!$adminThemeService->isLastVersion($slug)) {
$url = "$url/admin_theme/update/"; $url = "$url/admin_theme/update/?slug=" . $row['slug'];
return \kernel\widgets\IconBtn\IconBtnUpdateWidget::create(['url' => $url])->run(); return \kernel\widgets\IconBtn\IconBtnUpdateWidget::create(['url' => $url])->run();
} }
@ -106,6 +115,53 @@ $table->addAction(function ($row, $url) use ($adminThemeService) {
return false; return false;
}); });
$table->addAction(function ($row, $url) use ($adminThemeService) {
if ($row['type'] === 'admin_theme') {
if ($adminThemeService->isInstall($row['slug'])) {
$url = "$url/admin_theme/delete/?slug=" . $row['slug'];
return \kernel\widgets\IconBtn\IconBtnDeleteWidget::create(['url' => $url])->run();
} else {
$url = "$url/admin_theme/install/?id=" . $row['id'];
return \kernel\widgets\IconBtn\IconBtnInstallWidget::create(['url' => $url])->run();
}
}
return false;
});
$table->addAction(function ($row, $url) use ($themeService) {
if ($row['type'] === 'theme') {
$slug = $row['slug'];
if ($themeService->isInstall($slug)) {
if (!$themeService->isLastVersion($slug)) {
$url = "$url/theme/update/?slug=" . $row['slug'];
return \kernel\widgets\IconBtn\IconBtnUpdateWidget::create(['url' => $url])->run();
}
}
}
return false;
});
$table->addAction(function ($row, $url) use ($themeService) {
if ($row['type'] === 'theme') {
if ($themeService->isInstall($row['slug'])) {
$url = "$url/theme/delete/?slug=" . $row['slug'];
return \kernel\widgets\IconBtn\IconBtnDeleteWidget::create(['url' => $url])->run();
} else {
$url = "$url/theme/install/?id=" . $row['id'];
return \kernel\widgets\IconBtn\IconBtnInstallWidget::create(['url' => $url])->run();
}
}
return false;
});
$table->afterPrint(function () { $table->afterPrint(function () {
return \kernel\IGTabel\btn\PrimaryBtn::create('Сбросить все фильтры', '/admin/module_shop_client')->fetch(); return \kernel\IGTabel\btn\PrimaryBtn::create('Сбросить все фильтры', '/admin/module_shop_client')->fetch();
}); });

View File

@ -15,7 +15,8 @@ $table_info = [
"version" => "Версия", "version" => "Версия",
"description" => "Описание", "description" => "Описание",
"installations" => "Установки", "installations" => "Установки",
"views" => "Просмотры" "views" => "Просмотры",
"dependence" => "Зависимости"
], ],
"params" => ["class" => "table table-bordered"], "params" => ["class" => "table table-bordered"],
"baseUrl" => "/admin/module_shop_client", "baseUrl" => "/admin/module_shop_client",

View File

@ -15,11 +15,15 @@ use kernel\widgets\IconBtn\IconBtnDeleteWidget;
use kernel\widgets\IconBtn\IconBtnEditWidget; use kernel\widgets\IconBtn\IconBtnEditWidget;
use kernel\widgets\IconBtn\IconBtnViewWidget; use kernel\widgets\IconBtn\IconBtnViewWidget;
$get = (new \kernel\Request())->get();
$table = new ListEloquentTable(new EloquentDataProvider(Post::class, [ $table = new ListEloquentTable(new EloquentDataProvider(Post::class, [
'currentPage' => $page_number, 'currentPage' => $page_number,
'perPage' => 3, 'perPage' => 3,
'params' => ["class" => "table table-bordered", "border" => "2"], 'params' => ["class" => "table table-bordered", "border" => "2"],
'baseUrl' => "/admin/post" 'baseUrl' => "/admin/post",
'searchPrefix' => "",
'searchParams' => $get,
])); ]));
$view->setTitle("Список постов"); $view->setTitle("Список постов");
@ -36,36 +40,57 @@ foreach ($additionals as $additional) {
}); });
} }
//\kernel\helpers\Debug::dd($request);
$table->columns([ $table->columns([
'created_at' => function ($data) { 'title' => [
if (!$data){ 'filter' => [
return null; 'class' => \kernel\filters\BootstrapTextFilter::class,
} 'value' => $get['title'] ?? ''
]
return (new DateTimeImmutable($data))->format("d-m-Y"); ],
}, 'content' => [
'filter' => [
'class' => \kernel\filters\BootstrapTextFilter::class,
'value' => $get['content'] ?? ''
]
],
'created_at' => [
'format' => 'date:d-m-Y',
],
'updated_at' => function ($data) { 'updated_at' => function ($data) {
if (!$data){ if (!$data) {
return null; return null;
} }
return (new DateTimeImmutable($data))->format("d-m-Y"); return (new DateTimeImmutable($data))->format("d-m-Y");
}, },
'user_id' => (function ($data) { 'user_id' => [
'value' => function ($data) {
return User::find($data)->username; return User::find($data)->username;
}) },
'filter' => [
'class' => \kernel\filters\BootstrapSelectFilter::class,
'params' => [
'options' => \kernel\modules\user\service\UserService::createUsernameArr(),
'prompt' => 'Не выбрано'
],
'value' => $get['user_id'] ?? '',
],
]
]); ]);
$table->beforePrint(function () { $table->beforePrint(function () {
return IconBtnCreateWidget::create(['url' => '/admin/post/create'])->run(); return IconBtnCreateWidget::create(['url' => '/admin/post/create'])->run();
}); });
$table->addAction(function($row) { $table->addAction(function ($row) {
return IconBtnViewWidget::create(['url' => '/admin/post/view/' . $row['id']])->run(); return IconBtnViewWidget::create(['url' => '/admin/post/view/' . $row['id']])->run();
}); });
$table->addAction(function($row) { $table->addAction(function ($row) {
return IconBtnEditWidget::create(['url' => '/admin/post/update/' . $row['id']])->run(); return IconBtnEditWidget::create(['url' => '/admin/post/update/' . $row['id']])->run();
}); });
$table->addAction(function($row) { $table->addAction(function ($row) {
return IconBtnDeleteWidget::create(['url' => '/admin/post/delete/' . $row['id']])->run(); return IconBtnDeleteWidget::create(['url' => '/admin/post/delete/' . $row['id']])->run();
}); });
$table->create(); $table->create();

View File

@ -13,21 +13,28 @@ use kernel\services\TokenService;
class SecureService class SecureService
{ {
public static function createSecretCode(User $user): void public static function createSecretCode(User $user): SecretCode
{ {
$secretCode = new SecretCode(); $secretCode = new SecretCode();
$secretCode->user_id = $user->id; $secretCode->user_id = $user->id;
$secretCode->code = mt_rand(100000, 999999); $secretCode->code = mt_rand(100000, 999999);
$secretCode->code_expires_at = date("Y-m-d H:i:s", strtotime("+5 minutes"));; $secretCode->code_expires_at = date("Y-m-d H:i:s", strtotime("+5 minutes"));;
$secretCode->save(); $secretCode->save();
return $secretCode;
} }
public static function updateSecretCode(User $user): void public static function updateSecretCode(User $user): SecretCode
{ {
$secretCode = SecretCode::where('user_id', $user->id)->first(); $secretCode = SecretCode::where('user_id', $user->id)->first();
if(!$secretCode){
return self::createSecretCode($user);
}
$secretCode->code = mt_rand(100000, 999999); $secretCode->code = mt_rand(100000, 999999);
$secretCode->code_expires_at = date("Y-m-d H:i:s", strtotime("+5 minutes"));; $secretCode->code_expires_at = date("Y-m-d H:i:s", strtotime("+5 minutes"));;
$secretCode->save(); $secretCode->save();
return $secretCode;
} }
public static function getCodeByUserId(int $user_id) public static function getCodeByUserId(int $user_id)

View File

@ -0,0 +1,33 @@
<?php
namespace kernel\modules\themes;
use kernel\Module;
use kernel\modules\menu\service\MenuService;
class ThemesModule extends Module
{
public MenuService $menuService;
public function __construct()
{
$this->menuService = new MenuService();
}
/**
* @throws \Exception
*/
public function init(): void
{
$this->menuService->createItem([
"label" => "Темы сайта",
"url" => "/admin/settings/themes",
"slug" => "themes",
"parent_slug" => "settings"
]);
}
public function deactivate(): void
{
$this->menuService->removeItemBySlug("themes");
}
}

View File

@ -0,0 +1,95 @@
<?php
namespace kernel\modules\themes\controllers;
use DirectoryIterator;
use GuzzleHttp\Exception\GuzzleException;
use JetBrains\PhpStorm\NoReturn;
use Josantonius\Session\Exceptions\HeadersSentException;
use Josantonius\Session\Exceptions\SessionNotStartedException;
use Josantonius\Session\Exceptions\SessionStartedException;
use Josantonius\Session\Exceptions\WrongSessionOptionException;
use Josantonius\Session\Facades\Session;
use kernel\AdminController;
use kernel\helpers\Debug;
use kernel\models\Option;
use kernel\Request;
use kernel\services\ModuleService;
use kernel\services\ThemeService;
class ThemeController extends AdminController
{
public ThemeService $themeService;
public ModuleService $moduleService;
protected function init(): void
{
parent::init();
$this->cgView->viewPath = KERNEL_MODULES_DIR . "/themes/views/";
$this->themeService = new ThemeService();
$this->moduleService = new ModuleService();
}
public function actionIndex(): void
{
$themePaths = Option::where("key", "theme_paths")->first();
$dirs = [];
if ($themePaths){
$path = json_decode($themePaths->value);
foreach ($path->paths as $p){
$dirs[] = getConst($p);
}
}
$infoToTable = [];
$meta = [];
$meta['columns'] = [
"preview" => "Превью",
"name" => "Название",
"author" => "Автор",
"version" => "Версия",
"description" => "Описание"
];
$meta['params'] = ["class" => "table table-bordered"];
$meta['perPage'] = 10;
$meta['baseUrl'] = "/admin/settings/themes";
$meta['currentPage'] = 1;
$infoToTable['meta'] = $meta;
$themesInfo = [];
foreach ($dirs as $dir){
$i = 1;
foreach (new DirectoryIterator($dir) as $fileInfo) {
$info = [];
if($fileInfo->isDot()) continue;
$info['id'] = $i;
$themesInfo[] = array_merge($info, $this->themeService->getThemeInfo($fileInfo->getPathname()));
$i++;
}
}
$infoToTable['meta']['total'] = count($themesInfo);
$infoToTable['data'] = $themesInfo;
$this->cgView->render("index.php", ['json' => json_encode($infoToTable, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE)]);
}
/**
* @throws HeadersSentException
* @throws WrongSessionOptionException
* @throws SessionStartedException
* @throws GuzzleException
* @throws SessionNotStartedException
*/
#[NoReturn] public function actionActivate(): void
{
$request = new Request();
if(!$this->themeService->setActiveTheme($request->get("p"))){
$this->redirect("/admin/settings/themes/", 302);
}
$this->cgView->render("view.php", ['data' => $this->themeService->getThemeInfo($request->get("p"))]);
}
}

View File

@ -0,0 +1,10 @@
{
"name": "Themes",
"version": "0.1",
"author": "ITGuild",
"slug": "themes",
"description": "Themes module",
"module_class": "kernel\\modules\\themes\\ThemesModule",
"module_class_file": "{KERNEL_MODULES}/themes/ThemesModule.php",
"routs": "routs/themes.php"
}

View File

@ -0,0 +1,16 @@
<?php
use kernel\App;
use kernel\modules\admin_themes\controllers\AdminThemeController;
use Phroute\Phroute\RouteCollector;
App::$collector->group(["prefix" => "admin"], function (RouteCollector $router){
App::$collector->group(["before" => "auth"], function (RouteCollector $router) {
App::$collector->group(["prefix" => "settings"], function (RouteCollector $router) {
App::$collector->group(["prefix" => "themes"], function (RouteCollector $router) {
App::$collector->get('/', [\kernel\modules\themes\controllers\ThemeController::class, 'actionIndex']);
App::$collector->get('/activate', [\kernel\modules\themes\controllers\ThemeController::class, 'actionActivate']);
});
});
});
});

View File

@ -0,0 +1,25 @@
<?php
/**
* @var $json string
*/
$table = new \Itguild\Tables\ListJsonTable($json);
$table->columns([
'preview' => function ($data) {
return "<img src='$data' width='200px'>";
}
]);
$table->addAction(function ($row, $url){
$active_admin_theme = \kernel\modules\option\service\OptionService::getItem('active_theme');
if ($row['path'] === $active_admin_theme){
return "Активна";
} else {
$url = "$url/activate/?p=" . $row['path'];
return \kernel\widgets\IconBtn\IconBtnActivateWidget::create(['url' => $url])->run();
}
});
$table->create();
$table->render();

View File

@ -0,0 +1,25 @@
<?php
/**
* @var array $data
*/
$table_info = [
"meta" => [
"rows" => ["preview" => "Превью", "name" => "Название", "version" => "Версия", "description" => "Описание"],
"params" => ["class" => "table table-bordered"],
"baseUrl" => "/admin/settings/themes",
],
"data" => $data
];
$table = new \Itguild\Tables\ViewJsonTable(json_encode($table_info, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE));
$table->rows([
'preview' => function ($data) {
return "<img src='$data' width='500px'>";
}
]);
$table->beforePrint(function () {
return \kernel\widgets\IconBtn\IconBtnListWidget::create(['url' => '/admin/settings/themes'])->run();
});
$table->create();
$table->render();

View File

@ -6,6 +6,8 @@ use Exception;
use JetBrains\PhpStorm\NoReturn; use JetBrains\PhpStorm\NoReturn;
use kernel\AdminController; use kernel\AdminController;
use kernel\EntityRelation; use kernel\EntityRelation;
use kernel\FileUpload;
use kernel\helpers\Debug;
use kernel\modules\user\models\forms\CreateUserForm; use kernel\modules\user\models\forms\CreateUserForm;
use kernel\modules\user\models\User; use kernel\modules\user\models\User;
use kernel\modules\user\service\UserService; use kernel\modules\user\service\UserService;
@ -35,10 +37,17 @@ class UserController extends AdminController
{ {
$userForm = new CreateUserForm(); $userForm = new CreateUserForm();
$userForm->load($_REQUEST); $userForm->load($_REQUEST);
if (isset($_FILES['user_photo']) && $_FILES['user_photo']['error'] === UPLOAD_ERR_OK) {
$file = new FileUpload($_FILES['user_photo'], ['jpg', 'jpeg', 'png']);
$file->upload();
$userForm->setItem('user_photo', $file->getUploadFile());
}
if ($userForm->validate()){ if ($userForm->validate()){
$user = $this->userService->create($userForm); $user = $this->userService->create($userForm);
$entityRelation = new EntityRelation(); $entityRelation = new EntityRelation();
$entityRelation->saveEntityRelation(entity: "user", model: $user, request: new Request()); $entityRelation->saveEntityRelation(entity: "user", model: $user, request: new Request());
@ -98,6 +107,13 @@ class UserController extends AdminController
$userForm = new CreateUserForm(); $userForm = new CreateUserForm();
$userService = new UserService(); $userService = new UserService();
$userForm->load($_REQUEST); $userForm->load($_REQUEST);
if (isset($_FILES['user_photo']) && $_FILES['user_photo']['error'] === UPLOAD_ERR_OK) {
$file = new FileUpload($_FILES['user_photo'], ['jpg', 'jpeg', 'png']);
$file->upload();
$userForm->setItem('user_photo', $file->getUploadFile());
}
if ($userForm->validateForUpdate()){ if ($userForm->validateForUpdate()){
$user = $userService->update($userForm, $user); $user = $userService->update($userForm, $user);
@ -128,4 +144,53 @@ class UserController extends AdminController
$this->redirect("/admin/user/"); $this->redirect("/admin/user/");
} }
public function actionProfile(): void
{
$user = UserService::getAuthUser();
if (!$user){
throw new Exception(message: "The user not found");
}
$this->cgView->render("view_profile.php", ['user' => $user]);
}
public function actionProfileUpdate(): void
{
$model = UserService::getAuthUser();
if (!$model){
throw new Exception(message: "The user not found");
}
$this->cgView->render("form_profile.php", ['model' => $model]);
}
public function actionProfileEdit(): void
{
$user = UserService::getAuthUser();
if (!$user){
throw new Exception(message: "The user not found");
}
$userForm = new CreateUserForm();
$userService = new UserService();
$userForm->load($_REQUEST);
if (isset($_FILES['user_photo']) && $_FILES['user_photo']['error'] === UPLOAD_ERR_OK) {
$file = new FileUpload($_FILES['user_photo'], ['jpg', 'jpeg', 'png']);
$file->upload();
$userForm->setItem('user_photo', $file->getUploadFile());
}
if ($userForm->validateForUpdate()){
$user = $userService->update($userForm, $user);
$entityRelation = new EntityRelation();
$entityRelation->saveEntityRelation(entity: "user", model: $user, request: new Request());
if ($user){
$this->redirect("/admin/user/profile");
}
}
$this->redirect("/admin/user/profile/update");
}
} }

View File

@ -20,6 +20,7 @@ return new class extends Migration
$table->string('username', 255)->nullable(false); $table->string('username', 255)->nullable(false);
$table->string('email', 255); $table->string('email', 255);
$table->string('password_hash', 255); $table->string('password_hash', 255);
$table->string('user_photo', 255)->nullable();
$table->integer('role')->default(1); $table->integer('role')->default(1);
$table->string('access_token', 255)->nullable(true); $table->string('access_token', 255)->nullable(true);
$table->dateTime('access_token_expires_at')->nullable(true); $table->dateTime('access_token_expires_at')->nullable(true);

View File

@ -7,6 +7,7 @@ use Illuminate\Database\Eloquent\Model;
* @property string $username * @property string $username
* @property string $email * @property string $email
* @property string $password_hash * @property string $password_hash
* @property string $user_photo
* @property string $access_token * @property string $access_token
* @property string $access_token_expires_at * @property string $access_token_expires_at
* @method static find($id) * @method static find($id)
@ -17,7 +18,7 @@ class User extends Model {
const ADMIN_USER_ROLE = 9; const ADMIN_USER_ROLE = 9;
protected $table = 'user'; protected $table = 'user';
protected $fillable = ['username', 'email', 'password_hash', 'role', 'access_token', 'access_token_expires_at']; protected $fillable = ['username', 'email', 'password_hash', 'user_photo', 'role', 'access_token', 'access_token_expires_at'];
protected array $dates = ['deleted at']; protected array $dates = ['deleted at'];
public static function labels(): array public static function labels(): array
@ -25,6 +26,7 @@ class User extends Model {
return [ return [
'username' => 'Логин', 'username' => 'Логин',
'email' => 'Email', 'email' => 'Email',
'user_photo' => 'Фото профиля',
'created_at' => 'Создан', 'created_at' => 'Создан',
'updated_at' => 'Обновлен', 'updated_at' => 'Обновлен',
]; ];

View File

@ -12,7 +12,8 @@ class CreateUserForm extends FormModel
return [ return [
'username' => 'required|min-str-len:5|max-str-len:30', 'username' => 'required|min-str-len:5|max-str-len:30',
'password' => 'required|min-str-len:5|max-str-len:30', 'password' => 'required|min-str-len:5|max-str-len:30',
'email' => 'required|email' 'email' => 'required|email',
'user_photo' => ''
]; ];
} }
@ -21,7 +22,9 @@ class CreateUserForm extends FormModel
return [ return [
'username' => 'required|min-str-len:5|max-str-len:30', 'username' => 'required|min-str-len:5|max-str-len:30',
'password' => '', 'password' => '',
'email' => 'required|email' 'email' => 'required|email',
'user_photo' => ''
]; ];
} }

View File

@ -17,6 +17,11 @@ App::$collector->group(["prefix" => "admin"], function (RouteCollector $router){
App::$collector->any('/update/{id}', [\kernel\modules\user\controllers\UserController::class, 'actionUpdate']); App::$collector->any('/update/{id}', [\kernel\modules\user\controllers\UserController::class, 'actionUpdate']);
App::$collector->any("/edit/{id}", [\kernel\modules\user\controllers\UserController::class, 'actionEdit']); App::$collector->any("/edit/{id}", [\kernel\modules\user\controllers\UserController::class, 'actionEdit']);
App::$collector->get('/delete/{id}', [\kernel\modules\user\controllers\UserController::class, 'actionDelete']); App::$collector->get('/delete/{id}', [\kernel\modules\user\controllers\UserController::class, 'actionDelete']);
App::$collector->group(["prefix" => "profile"], callback: function (RouteCollector $router) {
App::$collector->get('/', [\kernel\modules\user\controllers\UserController::class, 'actionProfile']);
App::$collector->get('/update', [\kernel\modules\user\controllers\UserController::class, 'actionProfileUpdate']);
App::$collector->any('/edit', [\kernel\modules\user\controllers\UserController::class, 'actionProfileEdit']);
});
}); });
}); });
}); });

View File

@ -11,10 +11,15 @@ class UserService
public function create(FormModel $form_model): false|User public function create(FormModel $form_model): false|User
{ {
$model = User::where("username", $form_model->getItem('username'))->first();
if ($model){
return $model;
}
$model = new User(); $model = new User();
$model->username = $form_model->getItem('username'); $model->username = $form_model->getItem('username');
$model->email = $form_model->getItem('email'); $model->email = $form_model->getItem('email');
$model->password_hash = password_hash($form_model->getItem('password'), PASSWORD_DEFAULT); $model->password_hash = password_hash($form_model->getItem('password'), PASSWORD_DEFAULT);
$model->user_photo = $form_model->getItem('user_photo');
if ($model->save()){ if ($model->save()){
return $model; return $model;
} }
@ -29,6 +34,7 @@ class UserService
if ($form_model->getItem('password')) { if ($form_model->getItem('password')) {
$user->password_hash = password_hash($form_model->getItem('password'), PASSWORD_DEFAULT); $user->password_hash = password_hash($form_model->getItem('password'), PASSWORD_DEFAULT);
} }
$user->user_photo = $form_model->getItem('user_photo');
if ($user->save()){ if ($user->save()){
return $user; return $user;
} }
@ -80,6 +86,28 @@ class UserService
return ''; return '';
} }
public static function getAuthUserId(): string
{
$user = self::getAuthUser();
if ($user){
return $user->id;
}
return '';
}
public static function getAuthUserPhoto(): string|null
{
$user = self::getAuthUser();
if ($user){
if ($user->user_photo) {
return $user->user_photo;
}
}
return null;
}
public function getByAccessToken(string $token) public function getByAccessToken(string $token)
{ {
return $this->getByField("access_token", $token); return $this->getByField("access_token", $token);

View File

@ -32,6 +32,16 @@ $form->field(class: \itguild\forms\inputs\TextInput::class, name: "email", param
->setLabel("Email") ->setLabel("Email")
->render(); ->render();
if (!empty($model->user_photo)){
echo "<div><img src='$model->user_photo' width='200px'></div>";
}
$form->field(class: \itguild\forms\inputs\File::class, name: "user_photo", params: [
'class' => "form-control",
'value' => $model->user_photo ?? ''
])
->setLabel("Фото профиля")
->render();
$entityRelations = new \kernel\EntityRelation(); $entityRelations = new \kernel\EntityRelation();
if (!isset($model)) { if (!isset($model)) {
$model = new User(); $model = new User();

View File

@ -0,0 +1,74 @@
<?php
/**
* @var User $model
*/
use kernel\modules\user\models\User;
$form = new \itguild\forms\ActiveForm();
$form->beginForm("/admin/user/profile/edit", enctype: 'multipart/form-data');
$form->field(class: \itguild\forms\inputs\TextInput::class, name: "username", params: [
'class' => "form-control",
'placeholder' => 'Логин',
'value' => $model->username ?? ''
])
->setLabel("Логин")
->render();
$form->field(class: \itguild\forms\inputs\TextInput::class, name: "password", params: [
'class' => "form-control",
'type' => "password",
])
->setLabel("Пароль")
->render();
$form->field(class: \itguild\forms\inputs\TextInput::class, name: "email", params: [
'class' => "form-control",
'type' => "email",
'placeholder' => 'test@mail.ru',
'value' => $model->email ?? ''
])
->setLabel("Email")
->render();
if (!empty($model->user_photo)){
echo "<div><img src='$model->user_photo' width='200px'></div>";
}
$form->field(class: \itguild\forms\inputs\File::class, name: "user_photo", params: [
'class' => "form-control",
'value' => $model->user_photo ?? ''
])
->setLabel("Фото профиля")
->render();
$entityRelations = new \kernel\EntityRelation();
if (!isset($model)) {
$model = new User();
}
$entityRelations->renderEntityAdditionalPropertyFormBySlug("user", $model);
?>
<div class="row">
<div class="col-sm-2">
<?php
$form->field(\itguild\forms\inputs\Button::class, name: "btn-submit", params: [
'class' => "btn btn-primary ",
'value' => 'Отправить',
'typeInput' => 'submit'
])
->render();
?>
</div>
<div class="col-sm-2">
<?php
$form->field(\itguild\forms\inputs\Button::class, name: "btn-reset", params: [
'class' => "btn btn-warning",
'value' => 'Сбросить',
'typeInput' => 'reset'
])
->render();
?>
</div>
</div>
<?php
$form->endForm();

View File

@ -17,13 +17,15 @@ use kernel\widgets\IconBtn\IconBtnDeleteWidget;
use kernel\widgets\IconBtn\IconBtnEditWidget; use kernel\widgets\IconBtn\IconBtnEditWidget;
use kernel\widgets\IconBtn\IconBtnViewWidget; use kernel\widgets\IconBtn\IconBtnViewWidget;
$get = (new \kernel\Request())->get();
$table = new ListEloquentTable(new EloquentDataProvider(User::class, [ $table = new ListEloquentTable(new EloquentDataProvider(User::class, [
'currentPage' => $page_number, 'currentPage' => $page_number,
'perPage' => 3, 'perPage' => 3,
'params' => ["class" => "table table-bordered", "border" => "2"], 'params' => ["class" => "table table-bordered", "border" => "2"],
'baseUrl' => "/admin/user", 'baseUrl' => "/admin/user",
'filters' => ['email'], 'searchPrefix' => "",
])); 'searchParams' => $get,]));
$entityRelation = new \kernel\EntityRelation(); $entityRelation = new \kernel\EntityRelation();
$additionals = $entityRelation->getEntityRelationsBySlug("user"); $additionals = $entityRelation->getEntityRelationsBySlug("user");
@ -37,9 +39,13 @@ foreach ($additionals as $additional) {
$table->columns([ $table->columns([
'username' => [ 'username' => [
"filter" => [ "filter" => [
'class' => \Itguild\Tables\Filter\InputTextFilter::class 'class' => \kernel\filters\BootstrapTextFilter::class,
'value' => $get['username'] ?? null,
] ]
], ],
'user_photo' => function ($data) {
return $data ? "<img src='$data' width='150px'>" : "";
},
'created_at' => function ($data) { 'created_at' => function ($data) {
if (!$data){ if (!$data){
return null; return null;

View File

@ -35,6 +35,9 @@ foreach ($additionals as $key => $additional) {
} }
$table->rows([ $table->rows([
'user_photo' => function ($data) {
return $data ? "<img src='$data' width='300px'>" : "";
},
'created_at' => function ($data) { 'created_at' => function ($data) {
if (!$data){ if (!$data){
return null; return null;

View File

@ -0,0 +1,56 @@
<?php
/**
* @var \Illuminate\Database\Eloquent\Collection $user
*/
use kernel\modules\user\models\User;
use Itguild\EloquentTable\ViewEloquentTable;
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 = IconBtnEditWidget::create(['url' => '/admin/user/profile/edit'])->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([
'user_photo' => function ($data) {
return $data ? "<img src='$data' width='300px'>" : "";
},
'created_at' => function ($data) {
if (!$data){
return null;
}
return (new DateTimeImmutable($data))->format("d-m-Y");
},
'updated_at' => function ($data) {
if (!$data){
return null;
}
return (new DateTimeImmutable($data))->format("d-m-Y");
}
]);
$table->create();
$table->render();

View File

@ -4,14 +4,19 @@ namespace kernel\services;
use DirectoryIterator; use DirectoryIterator;
use kernel\helpers\Debug; use kernel\helpers\Debug;
use kernel\helpers\Files;
use kernel\helpers\Manifest; use kernel\helpers\Manifest;
use kernel\helpers\RESTClient; use kernel\helpers\RESTClient;
use kernel\models\Option; use kernel\models\Option;
use ZipArchive;
class AdminThemeService class AdminThemeService
{ {
protected array $errors = [];
protected Option $option; protected Option $option;
protected string $active_theme; protected string $active_theme;
protected ModuleService $moduleService; protected ModuleService $moduleService;
@ -22,6 +27,24 @@ class AdminThemeService
$this->moduleService = new ModuleService(); $this->moduleService = new ModuleService();
} }
/**
* @return array
*/
public function getErrors(): array
{
return $this->errors;
}
/**
* @param $msg
* @return void
*/
public function addError($msg): void
{
$this->errors[] = $msg;
}
public function findActiveAdminTheme(): void public function findActiveAdminTheme(): void
{ {
$model = Option::where("key", "active_admin_theme")->first(); $model = Option::where("key", "active_admin_theme")->first();
@ -50,7 +73,7 @@ class AdminThemeService
$info = []; $info = [];
$theme = getConst($theme); $theme = getConst($theme);
$info['path'] = $theme; $info['path'] = $theme;
if (file_exists($theme . "/manifest.json")){ if (file_exists($theme . "/manifest.json")) {
$manifest = file_get_contents($theme . "/manifest.json"); $manifest = file_get_contents($theme . "/manifest.json");
$manifest = Manifest::getWithVars($manifest); $manifest = Manifest::getWithVars($manifest);
$manifest['preview'] = $manifest['resource'] . "/" . $manifest['preview']; $manifest['preview'] = $manifest['resource'] . "/" . $manifest['preview'];
@ -60,16 +83,42 @@ class AdminThemeService
return $info; return $info;
} }
public function isInstall(string $slug): bool public function getAdminThemeInfoBySlug(string $slug): false|array|string
{
$dirs = $this->getAdminThemeDirs();
foreach ($dirs as $dir) {
foreach (new DirectoryIterator($dir) as $fileInfo) {
if ($fileInfo->isDot()) continue;
if ($this->getAdminThemeInfo($fileInfo->getPathname())['slug'] === $slug) {
return $this->getAdminThemeInfo($fileInfo->getPathname());
}
}
}
return false;
}
public function getAdminThemeDirs(): array
{ {
$adminThemePaths = Option::where("key", "admin_theme_paths")->first(); $adminThemePaths = Option::where("key", "admin_theme_paths")->first();
$dirs = []; $dirs = [];
if ($adminThemePaths) { if ($adminThemePaths) {
$path = json_decode($adminThemePaths->value); $path = json_decode($adminThemePaths->value);
foreach ($path->paths as $p) { foreach ($path->paths as $p) {
if (!is_dir(getConst($p))){
$old_mask = umask(0);
mkdir(getConst($p), permissions: 0775, recursive: true);
umask($old_mask);
}
$dirs[] = getConst($p); $dirs[] = getConst($p);
} }
} }
return $dirs;
}
public function isInstall(string $slug): bool
{
$dirs = $this->getAdminThemeDirs();
foreach ($dirs as $dir) { foreach ($dirs as $dir) {
foreach (new DirectoryIterator($dir) as $fileInfo) { foreach (new DirectoryIterator($dir) as $fileInfo) {
if ($fileInfo->isDot()) continue; if ($fileInfo->isDot()) continue;
@ -85,12 +134,12 @@ class AdminThemeService
public function isLastVersion(string $slug): bool public function isLastVersion(string $slug): bool
{ {
if ($this->moduleService->isServerAvailable()) { if ($this->moduleService->isServerAvailable()) {
$modules_info = RESTClient::request($_ENV['MODULE_SHOP_URL'] . '/api/module_shop/gb_slug'); $modulesInfo = RESTClient::request($_ENV['MODULE_SHOP_URL'] . '/api/module_shop/gb_slug');
$modules_info = json_decode($modules_info->getBody()->getContents(), true); $modulesInfo = json_decode($modulesInfo->getBody()->getContents(), true);
$themeInfo = $this->getAdminThemeInfo($slug); $themeInfo = $this->getAdminThemeInfoBySlug($slug);
foreach ($modules_info as $mod) { foreach ($modulesInfo as $mod) {
if ($mod['slug'] === $themeInfo['slug'] && $mod['version'] === $themeInfo['version']) { if ($mod['slug'] === $themeInfo['slug'] && $mod['version'] === $themeInfo['version']) {
return true; return true;
} }
@ -99,4 +148,88 @@ class AdminThemeService
return false; return false;
} }
public function pack(string $path): void
{
$themeName = basename($path);
$tmpThemeDirFull = RESOURCES_DIR . '/tmp/ad/' . $themeName . "/";
$fileHelper = new Files();
$fileHelper->copy_folder(ROOT_DIR . $path, $tmpThemeDirFull . 'meta/');
$fileHelper->copy_folder(RESOURCES_DIR . '/admin_themes/' . $themeName, $tmpThemeDirFull . 'resources/');
if (!is_dir(RESOURCES_DIR . '/tmp/admin_themes')) {
$old_mask = umask(0);
mkdir(RESOURCES_DIR . '/tmp/admin_themes', 0775, true);
umask($old_mask);
}
$fileHelper->pack($tmpThemeDirFull, RESOURCES_DIR . '/tmp/admin_themes/' . $themeName . '.igt');
}
public function install(string $path): bool
{
$zip = new ZipArchive;
$tmpThemeDir = md5(time());
$res = $zip->open(ROOT_DIR . $path);
if ($res === TRUE) {
$tmpThemeDirFull = RESOURCES_DIR . '/tmp/ad/' . $tmpThemeDir . "/";
$zip->extractTo($tmpThemeDirFull);
$zip->close();
} else {
$this->addError('unable to open zip archive');
return false;
}
if (!file_exists($tmpThemeDirFull . "meta/manifest.json")){
$this->addError('manifest.json not found');
return false;
}
$manifestJson = getConst(file_get_contents($tmpThemeDirFull . "meta/manifest.json"));
$manifest = Manifest::getWithVars($manifestJson);
$fileHelper = new Files();
if (isset($manifest['theme_path'])) {
$fileHelper->copy_folder($tmpThemeDirFull . "meta", $manifest['theme_path']);
} else {
$fileHelper->copy_folder($tmpThemeDirFull . "meta", APP_DIR . '/admin_themes/' . $manifest['slug']);
}
if (isset($manifest['resource_path'])) {
$fileHelper->copy_folder($tmpThemeDirFull . "resources", $manifest['resource_path']);
} else {
$fileHelper->copy_folder($tmpThemeDirFull . "resources", RESOURCES_DIR . '/admin_themes/' . $manifest['slug']);
}
$fileHelper->recursiveRemoveDir($tmpThemeDirFull);
unlink(ROOT_DIR . $path);
return true;
}
public function uninstall(string $path): void
{
$themeInfo = $this->getAdminThemeInfo(APP_DIR . '/admin_themes/' . basename($path));
$active_admin_theme = Option::where("key", "active_admin_theme")->first();
if ($active_admin_theme->value === ROOT_DIR . $path) {
$this->setActiveAdminTheme(KERNEL_ADMIN_THEMES_DIR . '/default');
}
$fileHelper = new Files();
if (file_exists($path)) {
$fileHelper->recursiveRemoveDir($path);
}
if (file_exists(RESOURCES_DIR . '/admin_themes/' . $themeInfo['slug'])) {
$fileHelper->recursiveRemoveDir(RESOURCES_DIR . '/admin_themes/' . $themeInfo['slug']);
}
}
public function update(string $path): bool
{
if ($this->install($path)) {
return true;
}
return false;
}
} }

View File

@ -0,0 +1,10 @@
<?php
namespace kernel\services;
class Dependencies
{
}

View File

@ -3,6 +3,7 @@
namespace kernel\services; namespace kernel\services;
use DirectoryIterator; use DirectoryIterator;
use GuzzleHttp\Exception\GuzzleException;
use kernel\EntityRelation; use kernel\EntityRelation;
use kernel\Flash; use kernel\Flash;
use kernel\helpers\Debug; use kernel\helpers\Debug;
@ -19,6 +20,13 @@ class ModuleService
protected null|bool $serverAvailable = null; protected null|bool $serverAvailable = null;
public ModuleShopService $moduleShopService;
public function __construct()
{
$this->moduleShopService = new ModuleShopService();
}
/** /**
* @param string $module * @param string $module
* @return false|array|string * @return false|array|string
@ -177,6 +185,11 @@ class ModuleService
if ($module_paths) { if ($module_paths) {
$path = json_decode($module_paths->value); $path = json_decode($module_paths->value);
foreach ($path->paths as $p) { foreach ($path->paths as $p) {
if (!is_dir(getConst($p))){
$old_mask = umask(0);
mkdir(getConst($p), permissions: 0775, recursive: true);
umask($old_mask);
}
$dirs[] = getConst($p); $dirs[] = getConst($p);
} }
} }
@ -362,11 +375,15 @@ class ModuleService
if (file_exists(KERNEL_APP_MODULES_DIR . '/' . $moduleName)) { if (file_exists(KERNEL_APP_MODULES_DIR . '/' . $moduleName)) {
$fileHelper->copy_folder(KERNEL_APP_MODULES_DIR . '/' . $moduleName, $tmpModuleDirFull . 'kernel/'); $fileHelper->copy_folder(KERNEL_APP_MODULES_DIR . '/' . $moduleName, $tmpModuleDirFull . 'kernel/');
} else { } else {
mkdir($tmpModuleDirFull . 'kernel/'); $old_mask = umask(0);
mkdir($tmpModuleDirFull . 'kernel/', 0775, true);
umask($old_mask);
} }
if (!is_dir(RESOURCES_DIR . '/tmp/modules')) { if (!is_dir(RESOURCES_DIR . '/tmp/modules')) {
mkdir(RESOURCES_DIR . '/tmp/modules', 0777, true); $old_mask = umask(0);
mkdir(RESOURCES_DIR . '/tmp/modules', 0775, true);
umask($old_mask);
} }
$fileHelper->pack($tmpModuleDirFull, RESOURCES_DIR . '/tmp/modules/' . $moduleName . '.igm'); $fileHelper->pack($tmpModuleDirFull, RESOURCES_DIR . '/tmp/modules/' . $moduleName . '.igm');
} }
@ -454,12 +471,13 @@ class ModuleService
return false; return false;
} }
/**
* @throws GuzzleException
*/
public function isLastVersion(string $slug): bool public function isLastVersion(string $slug): bool
{ {
if ($this->isServerAvailable()) { if ($this->isServerAvailable()) {
$modules_info = RESTClient::request($_ENV['MODULE_SHOP_URL'] . '/api/module_shop/gb_slug'); $modules_info = $this->moduleShopService->getGroupedBySlugModules();
$modules_info = json_decode($modules_info->getBody()->getContents(), true);
$mod_info = $this->getModuleInfoBySlug($slug); $mod_info = $this->getModuleInfoBySlug($slug);
@ -487,16 +505,18 @@ class ModuleService
return false; return false;
} }
/**
* @throws GuzzleException
*/
public function isShopModule(string $slug): bool public function isShopModule(string $slug): bool
{ {
if ($this->isServerAvailable()) { if ($this->isServerAvailable()) {
$modules_info = RESTClient::request($_ENV['MODULE_SHOP_URL'] . '/api/module_shop/gb_slug'); $modules_info = $this->moduleShopService->getGroupedBySlugModules();
if (!$this->issetModuleShopToken()) { if (!$this->issetModuleShopToken()) {
return false; return false;
} }
$modules_info = json_decode($modules_info->getBody()->getContents(), true);
if (isset($modules_info)) { if (isset($modules_info)) {
$mod_info = $this->getModuleInfoBySlug($slug); $mod_info = $this->getModuleInfoBySlug($slug);
foreach ($modules_info as $mod) { foreach ($modules_info as $mod) {
@ -587,11 +607,41 @@ class ModuleService
{ {
$data = file_get_contents($templatePath); $data = file_get_contents($templatePath);
foreach ($params as $key => $param){ foreach ($params as $key => $param) {
$data = str_replace("{" . $key . "}", $param, $data); $data = str_replace("{" . $key . "}", $param, $data);
} }
file_put_contents($filePath, $data); file_put_contents($filePath, $data);
} }
/**
* @throws GuzzleException
*/
public function recursiveActivateDependencies(array $dependencies): bool
{
$notActiveDependencies = [];
foreach ($dependencies as $depend) {
if (!$this->isInstall($depend)) {
$this->moduleShopService->installModule($depend);
if (!$this->setActiveModule($depend)) {
$notActiveDependencies[] = $depend;
}
} else {
if (!$this->isActive($depend)) {
if (!$this->setActiveModule($depend)) {
$notActiveDependencies[] = $depend;
}
}
}
}
if ($notActiveDependencies) {
if (!$this->recursiveActivateDependencies($notActiveDependencies)) {
return false;
}
}
return true;
}
} }

View File

@ -3,7 +3,11 @@
namespace kernel\services; namespace kernel\services;
use GuzzleHttp\Exception\GuzzleException; use GuzzleHttp\Exception\GuzzleException;
use kernel\Flash;
use kernel\helpers\Debug;
use kernel\helpers\Files;
use kernel\helpers\RESTClient; use kernel\helpers\RESTClient;
use kernel\Request;
class ModuleShopService class ModuleShopService
{ {
@ -17,20 +21,88 @@ class ModuleShopService
} }
/** /**
* @param string $email
* @return mixed
* @throws GuzzleException * @throws GuzzleException
*/ */
public function email_auth(string $email) public function email_auth(string $email): mixed
{ {
$request = RESTClient::post($this->url . "/api/secure/email_auth", ['email' => $email], false); $request = RESTClient::post($this->url . "/api/secure/email_auth", ['email' => $email], false);
return json_decode($request->getBody()->getContents(), true); return json_decode($request->getBody()->getContents(), true);
} }
public function code_check(string $code) /**
* @param string $code
* @return mixed
* @throws GuzzleException
*/
public function code_check(string $code): mixed
{ {
$request = RESTClient::post($this->url . "/api/secure/code_check", ['code' => $code], false); $request = RESTClient::post($this->url . "/api/secure/code_check", ['code' => $code], false);
return json_decode($request->getBody()->getContents(), true); return json_decode($request->getBody()->getContents(), true);
} }
/**
* @return mixed
* @throws GuzzleException
*/
public function getGroupedBySlugModules(): mixed
{
$modulesInfo = RESTClient::request($_ENV['MODULE_SHOP_URL'] . '/api/module_shop/gb_slug');
return json_decode($modulesInfo->getBody()->getContents(), true);
}
/**
* @param string $slug
* @return void
* @throws GuzzleException
*/
public function installModule(string $slug): void
{
$moduleInfo = $this->getModuleInfoBySlug($slug);
$moduleInfo = RESTClient::request($_ENV['MODULE_SHOP_URL'] . '/api/module_shop/install/' . $moduleInfo['id']);
$moduleInfo = json_decode($moduleInfo->getBody()->getContents(), true);
Files::uploadByUrl($_ENV['MODULE_SHOP_URL'] . $moduleInfo['path_to_archive'], RESOURCES_DIR . "/tmp/modules");
(new ModuleService())->installModule('/resources/tmp/modules/' . basename($moduleInfo['path_to_archive']));
}
/**
* @param string $slug
* @return false|mixed
* @throws GuzzleException
*/
public function getModuleInfoBySlug(string $slug): mixed
{
$modulesInfo = $this->getGroupedBySlugModules();
foreach ($modulesInfo as $module) {
if ($module['slug'] === $slug) {
return $module;
}
}
return false;
}
/**
* @param string $slug
* @return bool
* @throws GuzzleException
*/
public function existsInModuleShop(string $slug): bool
{
$modulesInfo = $this->getGroupedBySlugModules();
foreach ($modulesInfo as $module) {
if ($module['slug'] === $slug) {
return true;
}
}
return false;
}
} }

View File

@ -0,0 +1,340 @@
<?php
namespace kernel\services;
use DirectoryIterator;
use Josantonius\Session\Facades\Session;
use kernel\Flash;
use kernel\helpers\Debug;
use kernel\helpers\Files;
use kernel\helpers\Manifest;
use kernel\helpers\RESTClient;
use kernel\models\Option;
use ZipArchive;
class ThemeService
{
protected array $errors = [];
protected Option $option;
protected string $active_theme = "";
protected ModuleService $moduleService;
protected ModuleShopService $moduleShopService;
public function __construct()
{
$this->option = new Option();
$this->findActiveTheme();
$this->moduleService = new ModuleService();
$this->moduleShopService = new ModuleShopService();
}
/**
* @return array
*/
public function getErrors(): array
{
return $this->errors;
}
/**
* @param $msg
* @return void
*/
public function addError($msg): void
{
$this->errors[] = $msg;
}
public function findActiveTheme(): void
{
$model = $this->option::where("key", "active_theme")->first();
$this->active_theme = $model->value;
}
public function getActiveTheme(): string
{
return $this->active_theme;
}
/**
* @param string $theme
* @return bool
* @throws \GuzzleHttp\Exception\GuzzleException
*/
public function setActiveTheme(string $theme): bool
{
$activeTheme = $this->option::where("key", "active_theme")->first();
$themeInfo = $this->getThemeInfo(getConst($theme));
$dependenceArray = RESTClient::request($_ENV['MODULE_SHOP_URL'] . '/api/module_shop/get_all_dependencies/' . $themeInfo['slug']);
$dependenceArray = json_decode($dependenceArray->getBody()->getContents(), true);
foreach ($dependenceArray as $depend) {
if (!$this->moduleService->isInstall($depend)) {
if (!$this->moduleShopService->existsInModuleShop($depend)) {
Flash::setMessage('error', "Модуль $depend не найден в IT Guild Framework Shop.");
return false;
}
}
}
if (!$this->moduleService->recursiveActivateDependencies($dependenceArray)){
return false;
}
$this->runDeactivateScript($this->getActiveThemeInfo());
$this->runInitScript($themeInfo);
$activeTheme->value = getConst($theme);
$activeTheme->save();
return true;
}
public function runInitScript($themeInfo): void
{
if (isset($themeInfo['theme_class'])) {
if (isset($themeInfo['theme_class_file'])) {
require_once getConst($themeInfo['theme_class_file']);
}
$themeClass = new $themeInfo['theme_class']();
$themeClass->init();
}
}
/**
* @param $themeInfo
* @return void
*/
public function runDeactivateScript($themeInfo): void
{
if (isset($themeInfo['theme_class'])) {
if (isset($themeInfo['theme_class_file'])) {
require_once getConst($themeInfo['theme_class_file']);
}
$themeClass = new $themeInfo['theme_class']();
$themeClass->deactivate();
}
}
public function getActiveThemeInfo(): false|array|string
{
return $this->getThemeInfo($this->active_theme);
}
public function getThemeInfo(string $theme): false|array|string
{
$info = [];
$theme = getConst($theme);
$info['path'] = $theme;
if (file_exists($theme . "/manifest.json")) {
$manifest = file_get_contents($theme . "/manifest.json");
$manifest = Manifest::getWithVars($manifest);
$manifest['preview'] = $manifest['resource'] . "/" . $manifest['preview'];
$info = array_merge($info, $manifest);
}
return $info;
}
public function getThemeInfoBySlug(string $slug): false|array|string
{
$dirs = $this->getThemeDirs();
foreach ($dirs as $dir) {
foreach (new DirectoryIterator($dir) as $fileInfo) {
if ($fileInfo->isDot()) continue;
if ($this->getThemeInfo($fileInfo->getPathname())['slug'] === $slug) {
return $this->getThemeInfo($fileInfo->getPathname());
}
}
}
return false;
}
public function getThemeDirs(): array
{
$ThemePaths = Option::where("key", "theme_paths")->first();
$dirs = [];
if ($ThemePaths) {
$path = json_decode($ThemePaths->value);
foreach ($path->paths as $p) {
if (!is_dir(getConst($p))){
$old_mask = umask(0);
mkdir(getConst($p), permissions: 0775, recursive: true);
umask($old_mask);
}
$dirs[] = getConst($p);
}
}
return $dirs;
}
public function isInstall(string $slug): bool
{
$dirs = $this->getThemeDirs();
foreach ($dirs as $dir) {
foreach (new DirectoryIterator($dir) as $fileInfo) {
if ($fileInfo->isDot()) continue;
if ($this->getThemeInfo($fileInfo->getPathname())['slug'] === $slug) {
return true;
}
}
}
return false;
}
public function isLastVersion(string $slug): bool
{
if ($this->moduleService->isServerAvailable()) {
$modulesInfo = RESTClient::request($_ENV['MODULE_SHOP_URL'] . '/api/module_shop/gb_slug');
$modulesInfo = json_decode($modulesInfo->getBody()->getContents(), true);
$themeInfo = $this->getThemeInfoBySlug($slug);
foreach ($modulesInfo as $mod) {
if ($mod['slug'] === $themeInfo['slug'] && $mod['version'] === $themeInfo['version']) {
return true;
}
}
}
return false;
}
public function pack(string $path): void
{
$themeName = basename($path);
$tmpThemeDirFull = RESOURCES_DIR . '/tmp/ad/' . $themeName . "/";
$fileHelper = new Files();
$fileHelper->copy_folder(ROOT_DIR . $path, $tmpThemeDirFull . 'meta/app/');
$fileHelper->copy_folder(KERNEL_DIR . '/app_themes/' . $themeName, $tmpThemeDirFull . 'meta/kernel/');
$fileHelper->copy_folder(RESOURCES_DIR . '/themes/' . $themeName, $tmpThemeDirFull . 'resources/');
if (!is_dir(RESOURCES_DIR . '/tmp/themes')) {
$old_mask = umask(0);
mkdir(RESOURCES_DIR . '/tmp/themes', 0775, true);
umask($old_mask);
}
$fileHelper->pack($tmpThemeDirFull, RESOURCES_DIR . '/tmp/themes/' . $themeName . '.igt');
}
public function install(string $path): bool
{
$zip = new ZipArchive;
$tmpThemeDir = md5(time());
$res = $zip->open(ROOT_DIR . $path);
if ($res === TRUE) {
$tmpThemeDirFull = RESOURCES_DIR . '/tmp/ad/' . $tmpThemeDir . "/";
$zip->extractTo($tmpThemeDirFull);
$zip->close();
} else {
$this->addError('unable to open zip archive');
return false;
}
if (!file_exists($tmpThemeDirFull . "meta/app/manifest.json")){
$this->addError('manifest.json not found');
return false;
}
$manifestJson = getConst(file_get_contents($tmpThemeDirFull . "meta/app/manifest.json"));
$manifest = Manifest::getWithVars($manifestJson);
$fileHelper = new Files();
if (isset($manifest['theme_app_path'])) {
$fileHelper->copy_folder($tmpThemeDirFull . "meta/app", $manifest['theme_app_path']);
} else {
$fileHelper->copy_folder($tmpThemeDirFull . "meta/app", APP_DIR . '/themes/' . $manifest['slug']);
}
if (isset($manifest['theme_kernel_path'])) {
$fileHelper->copy_folder($tmpThemeDirFull . "meta/kernel", $manifest['theme_kernel_path']);
} else {
$fileHelper->copy_folder($tmpThemeDirFull . "meta/kernel", KERNEL_DIR . '/app_themes/' . $manifest['slug']);
}
if (isset($manifest['resource_path'])) {
$fileHelper->copy_folder($tmpThemeDirFull . "resources", $manifest['resource_path']);
} else {
$fileHelper->copy_folder($tmpThemeDirFull . "resources", RESOURCES_DIR . '/themes/' . $manifest['slug']);
}
$fileHelper->recursiveRemoveDir($tmpThemeDirFull);
unlink(ROOT_DIR . $path);
return true;
}
public function uninstall(string $path): void
{
$themeInfo = $this->getThemeInfo(APP_DIR . '/themes/' . basename($path));
$active_theme = $this->option::where("key", "active_theme")->first();
if ($active_theme->value === ROOT_DIR . $path) {
$this->setActiveTheme(KERNEL_DIR . '/themes/default');
}
$fileHelper = new Files();
if (file_exists($path)) {
$fileHelper->recursiveRemoveDir($path);
}
if (file_exists(KERNEL_DIR . '/app_themes/' . $themeInfo['slug'])) {
$fileHelper->recursiveRemoveDir(KERNEL_DIR . '/app_themes/' . $themeInfo['slug']);
}
if (file_exists(RESOURCES_DIR . '/themes/' . $themeInfo['slug'])) {
$fileHelper->recursiveRemoveDir(RESOURCES_DIR . '/themes/' . $themeInfo['slug']);
}
}
public function update(string $path): bool
{
$zip = new ZipArchive;
$tmpThemeDir = md5(time());
$res = $zip->open(ROOT_DIR . $path);
if ($res === TRUE) {
$tmpThemeDirFull = RESOURCES_DIR . '/tmp/ad/' . $tmpThemeDir . "/";
$zip->extractTo($tmpThemeDirFull);
$zip->close();
} else {
$this->addError('unable to open zip archive');
return false;
}
if (!file_exists($tmpThemeDirFull . "meta/manifest.json")){
$this->addError('manifest.json not found');
return false;
}
$manifestJson = getConst(file_get_contents($tmpThemeDirFull . "meta/manifest.json"));
$manifest = Manifest::getWithVars($manifestJson);
$fileHelper = new Files();
if (isset($manifest['theme_kernel_path'])) {
$fileHelper->copy_folder($tmpThemeDirFull . "meta/kernel", $manifest['theme_app_path']);
} else {
$fileHelper->copy_folder($tmpThemeDirFull . "meta/kernel", APP_DIR . '/themes/' . $manifest['slug']);
}
$fileHelper->recursiveRemoveDir($tmpThemeDirFull);
unlink(ROOT_DIR . $path);
return true;
}
public function getThemeRout(string $path)
{
if (file_exists($path . "/manifest.json")){
$manifest = json_decode(file_get_contents($path . "/manifest.json"), true);
if ($manifest['routs']) {
return $manifest['routs'];
}
}
return false;
}
}

View File

@ -51,6 +51,16 @@ $table = new \Itguild\Tables\ListJsonTable(json_encode(
] ]
)); ));
// Пример фильтра
$table->columns([
'title' => [
'filter' => [
'class' => \Itguild\Tables\Filter\InputTextFilter::class,
'value' => $get['title'] ?? ''
]
],
]
$table->beforePrint(function () { $table->beforePrint(function () {
return IconBtnCreateWidget::create(['url' => '/admin/{slug}/create'])->run(); return IconBtnCreateWidget::create(['url' => '/admin/{slug}/create'])->run();
}); });

View File

@ -0,0 +1,18 @@
<?php
namespace kernel\themes\default\assets;
use kernel\Assets;
class DefaultThemesAssets extends Assets
{
protected function createCSS(): void
{
$this->registerCSS(slug: "main", resource: "/css/styles.css");
}
protected function createJS(): void
{
$this->registerJS(slug: "webpack", resource: "/js/scripts.js");
}
}

View File

@ -0,0 +1,28 @@
<?php
namespace kernel\themes\default\controllers;
use kernel\Controller;
class MainController extends Controller
{
protected function init(): void
{
parent::init();
$this->cgView->viewPath = KERNEL_DIR . "/themes/default/views/main/";
$this->cgView->layout = "main.php";
$this->cgView->layoutPath = KERNEL_DIR . "/themes/default/views/layout/";
$this->cgView->addVarToLayout("resources", "/resources/themes/default");
}
public function actionIndex(): void
{
$this->cgView->render("index.php");
}
public function actionAbout(): void
{
$this->cgView->render("about.php");
}
}

View File

@ -0,0 +1,13 @@
{
"name": "Default",
"version": "0.1",
"author": "ItGuild",
"slug": "default",
"type": "theme",
"description": "Default theme",
"preview": "preview.png",
"resource": "/resources/themes/default",
"resource_path": "{RESOURCES}/themes/default",
"routs": "routs/default.php",
"dependence": ""
}

View File

@ -0,0 +1,12 @@
<?php
use kernel\App;
App::$collector->get('/', [\kernel\themes\default\controllers\MainController::class, 'actionIndex']);
App::$collector->get('/about', [\kernel\themes\default\controllers\MainController::class, 'actionAbout']);
//App::$collector->get('/page/{page_number}', [\app\modules\tag\controllers\TagController::class, 'actionIndex']);
//App::$collector->get('/create', [\app\modules\tag\controllers\TagController::class, 'actionCreate']);

View File

@ -0,0 +1,92 @@
<?php
/**
* @var string $content
* @var string $resources
* @var string $title
* @var \kernel\CgView $view
*/
$assets = new \kernel\themes\default\assets\DefaultThemesAssets($resources);
?>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
<?php $assets->getCSSAsSTR(); ?>
<meta name="description" content=""/>
<meta name="author" content=""/>
<title><?= $title ?></title>
<?= $view->getMeta() ?>
<link rel="icon" type="image/x-icon" href="<?= $resources ?>/assets/favicon.ico"/>
<!-- Font Awesome icons (free version)-->
<script src="https://use.fontawesome.com/releases/v6.3.0/js/all.js" crossorigin="anonymous"></script>
<!-- Google fonts-->
<link href="https://fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic" rel="stylesheet"
type="text/css"/>
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800"
rel="stylesheet" type="text/css"/>
<!-- Core theme CSS (includes Bootstrap)-->
</head>
<body>
<!-- Navigation-->
<nav class="navbar navbar-expand-lg navbar-light" id="mainNav">
<div class="container px-4 px-lg-5">
<a class="navbar-brand" href="/">Main IT Guild Micro Framework theme</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarResponsive"
aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
Menu
<i class="fas fa-bars"></i>
</button>
<div class="collapse navbar-collapse" id="navbarResponsive">
<ul class="navbar-nav ms-auto py-4 py-lg-0">
<li class="nav-item"><a class="nav-link px-lg-3 py-3 py-lg-4" href="/">Home</a></li>
<li class="nav-item"><a class="nav-link px-lg-3 py-3 py-lg-4" href="/about">About</a></li>
</ul>
</div>
</div>
</nav>
<?= $content ?>
<!-- Footer-->
<footer class="border-top">
<div class="container px-4 px-lg-5">
<div class="row gx-4 gx-lg-5 justify-content-center">
<div class="col-md-10 col-lg-8 col-xl-7">
<ul class="list-inline text-center">
<li class="list-inline-item">
<a href="#!">
<span class="fa-stack fa-lg">
<i class="fas fa-circle fa-stack-2x"></i>
<i class="fab fa-twitter fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
<li class="list-inline-item">
<a href="#!">
<span class="fa-stack fa-lg">
<i class="fas fa-circle fa-stack-2x"></i>
<i class="fab fa-facebook-f fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
<li class="list-inline-item">
<a href="#!">
<span class="fa-stack fa-lg">
<i class="fas fa-circle fa-stack-2x"></i>
<i class="fab fa-github fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
</ul>
<div class="small text-center text-muted fst-italic">Copyright &copy; IT Guild Micro Framework</div>
</div>
</div>
</div>
</footer>
<!-- Bootstrap core JS-->
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js"></script>
<!-- Core theme JS-->
<?php $assets->getJSAsStr(); ?>
</body>
</html>

View File

@ -0,0 +1,36 @@
<?php
/**
* @var string $resources;
* @var \kernel\CgView $view
*/
$view->setTitle("Старт Bootstrap");
$view->setMeta([
'description' => 'Дефолтная bootstrap тема'
]);
?>
<!-- Page Header-->
<header class="masthead" style="background-image: url('<?= $resources ?>/assets/img/about-bg.jpeg')">
<div class="container position-relative px-4 px-lg-5">
<div class="row gx-4 gx-lg-5 justify-content-center">
<div class="col-md-10 col-lg-8 col-xl-7">
<div class="page-heading">
<h1>About Me</h1>
<span class="subheading">This is what I do.</span>
</div>
</div>
</div>
</div>
</header>
<!-- Main Content-->
<main class="mb-4">
<div class="container px-4 px-lg-5">
<div class="row gx-4 gx-lg-5 justify-content-center">
<div class="col-md-10 col-lg-8 col-xl-7">
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Saepe nostrum ullam eveniet pariatur voluptates odit, fuga atque ea nobis sit soluta odio, adipisci quas excepturi maxime quae totam ducimus consectetur?</p>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Eius praesentium recusandae illo eaque architecto error, repellendus iusto reprehenderit, doloribus, minus sunt. Numquam at quae voluptatum in officia voluptas voluptatibus, minus!</p>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Aut consequuntur magnam, excepturi aliquid ex itaque esse est vero natus quae optio aperiam soluta voluptatibus corporis atque iste neque sit tempora!</p>
</div>
</div>
</div>
</main>

View File

@ -0,0 +1,86 @@
<?php
/**
* @var string $resources;
* @var \kernel\CgView $view
*/
$view->setTitle("IT Guild Micro Framework");
$view->setMeta([
'description' => 'Default IT Guild Micro Framework theme'
]);
?>
<!-- Page Header-->
<header class="masthead" style="background-image: url('<?= $resources ?>/assets/img/home-bg.jpeg')">
<div class="container position-relative px-4 px-lg-5">
<div class="row gx-4 gx-lg-5 justify-content-center">
<div class="col-md-10 col-lg-8 col-xl-7">
<div class="site-heading">
<h1>Clean Blog</h1>
<span class="subheading">A Blog Theme by IT Guild Micro Framework</span>
</div>
</div>
</div>
</div>
</header>
<!-- Main Content-->
<div class="container px-4 px-lg-5">
<div class="row gx-4 gx-lg-5 justify-content-center">
<div class="col-md-10 col-lg-8 col-xl-7">
<!-- Post preview-->
<div class="post-preview">
<a href="#!">
<h2 class="post-title">Man must explore, and this is exploration at its greatest</h2>
<h3 class="post-subtitle">Problems look mighty small from 150 miles up</h3>
</a>
<p class="post-meta">
Posted by
<a href="#!">Start Bootstrap</a>
on September 24, 2023
</p>
</div>
<!-- Divider-->
<hr class="my-4" />
<!-- Post preview-->
<div class="post-preview">
<a href="#!"><h2 class="post-title">I believe every human has a finite number of heartbeats. I don't intend to waste any of mine.</h2></a>
<p class="post-meta">
Posted by
<a href="#!">Start Bootstrap</a>
on September 18, 2023
</p>
</div>
<!-- Divider-->
<hr class="my-4" />
<!-- Post preview-->
<div class="post-preview">
<a href="#!">
<h2 class="post-title">Science has not yet mastered prophecy</h2>
<h3 class="post-subtitle">We predict too much for the next year and yet far too little for the next ten.</h3>
</a>
<p class="post-meta">
Posted by
<a href="#!">Start Bootstrap</a>
on August 24, 2023
</p>
</div>
<!-- Divider-->
<hr class="my-4" />
<!-- Post preview-->
<div class="post-preview">
<a href="#!">
<h2 class="post-title">Failure is not an option</h2>
<h3 class="post-subtitle">Many say exploration is part of our destiny, but its actually our duty to future generations.</h3>
</a>
<p class="post-meta">
Posted by
<a href="#!">Start Bootstrap</a>
on July 8, 2023
</p>
</div>
<!-- Divider-->
<hr class="my-4" />
<!-- Pager-->
<div class="d-flex justify-content-end mb-4"><a class="btn btn-primary text-uppercase" href="#!">Older Posts →</a></div>
</div>
</div>
</div>

View File

@ -79,7 +79,5 @@ if ($moduleService->isActive('module_shop_client')) {
ModuleTabsWidget::create()->run(); ModuleTabsWidget::create()->run();
} }
$table->create(); $table->create();
$table->render(); $table->render();

View File

@ -1,9 +1,9 @@
// Responsive images (ensure images don't scale beyond their parents) // Responsive default_user_photo (ensure default_user_photo don't scale beyond their parents)
// //
// This is purposefully opt-in via an explicit class rather than being the default for all `<img>`s. // This is purposefully opt-in via an explicit class rather than being the default for all `<img>`s.
// We previously tried the "images are responsive by default" approach in Bootstrap v2, // We previously tried the "default_user_photo are responsive by default" approach in Bootstrap v2,
// and abandoned it in Bootstrap v3 because it breaks lots of third-party widgets (including Google Maps) // and abandoned it in Bootstrap v3 because it breaks lots of third-party widgets (including Google Maps)
// which weren't expecting the images within themselves to be involuntarily resized. // which weren't expecting the default_user_photo within themselves to be involuntarily resized.
// See also https://github.com/twbs/bootstrap/issues/18178 // See also https://github.com/twbs/bootstrap/issues/18178
.img-fluid { .img-fluid {
@include img-fluid; @include img-fluid;

View File

@ -249,7 +249,7 @@ figure {
img { img {
vertical-align: middle; vertical-align: middle;
border-style: none; // Remove the border on images inside links in IE 10-. border-style: none; // Remove the border on default_user_photo inside links in IE 10-.
} }
svg { svg {

View File

@ -5,12 +5,12 @@
// Responsive image // Responsive image
// //
// Keep images from scaling beyond the width of their parents. // Keep default_user_photo from scaling beyond the width of their parents.
@mixin img-fluid { @mixin img-fluid {
// Part 1: Set a maximum relative to the parent // Part 1: Set a maximum relative to the parent
max-width: 100%; max-width: 100%;
// Part 2: Override the height to auto, otherwise images will be stretched // Part 2: Override the height to auto, otherwise default_user_photo will be stretched
// when setting a width and height attribute on the img element. // when setting a width and height attribute on the img element.
height: auto; height: auto;
} }

View File

Before

Width:  |  Height:  |  Size: 120 KiB

After

Width:  |  Height:  |  Size: 120 KiB

View File

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 36 KiB

Some files were not shown because too many files have changed in this diff Show More