diff --git a/engine/app/assets/css/styles.css b/engine/app/assets/css/styles.css index 27dc706..6a65300 100644 --- a/engine/app/assets/css/styles.css +++ b/engine/app/assets/css/styles.css @@ -603,6 +603,10 @@ video { margin-bottom: 1rem; } +.me-2\.5 { + margin-inline-end: 0.625rem; +} + .ms-3 { margin-inline-start: 0.75rem; } @@ -788,6 +792,12 @@ video { gap: 1rem; } +.space-x-1 > :not([hidden]) ~ :not([hidden]) { + --tw-space-x-reverse: 0; + margin-right: calc(0.25rem * var(--tw-space-x-reverse)); + margin-left: calc(0.25rem * calc(1 - var(--tw-space-x-reverse))); +} + .space-x-3 > :not([hidden]) ~ :not([hidden]) { --tw-space-x-reverse: 0; margin-right: calc(0.75rem * var(--tw-space-x-reverse)); @@ -1117,6 +1127,11 @@ video { background-color: rgb(185 28 28 / var(--tw-bg-opacity, 1)); } +.hover\:text-blue-600:hover { + --tw-text-opacity: 1; + color: rgb(37 99 235 / var(--tw-text-opacity, 1)); +} + .hover\:underline:hover { text-decoration-line: underline; } @@ -1203,6 +1218,12 @@ video { flex-direction: row; } + .md\:space-x-2 > :not([hidden]) ~ :not([hidden]) { + --tw-space-x-reverse: 0; + margin-right: calc(0.5rem * var(--tw-space-x-reverse)); + margin-left: calc(0.5rem * calc(1 - var(--tw-space-x-reverse))); + } + .md\:space-x-8 > :not([hidden]) ~ :not([hidden]) { --tw-space-x-reverse: 0; margin-right: calc(2rem * var(--tw-space-x-reverse)); @@ -1230,15 +1251,6 @@ video { --tw-text-opacity: 1; color: rgb(29 78 216 / var(--tw-text-opacity, 1)); } - - .md\:hover\:bg-transparent:hover { - background-color: transparent; - } - - .md\:hover\:text-blue-700:hover { - --tw-text-opacity: 1; - color: rgb(29 78 216 / var(--tw-text-opacity, 1)); - } } @media (min-width: 1024px) { @@ -1349,14 +1361,5 @@ video { --tw-text-opacity: 1; color: rgb(59 130 246 / var(--tw-text-opacity, 1)); } - - .md\:dark\:hover\:bg-transparent:hover { - background-color: transparent; - } - - .md\:dark\:hover\:text-blue-500:hover { - --tw-text-opacity: 1; - color: rgb(59 130 246 / var(--tw-text-opacity, 1)); - } } } \ No newline at end of file diff --git a/engine/app/model/AboutModule.php b/engine/app/model/AboutModule.php index 80b2d21..0a9e8e7 100644 --- a/engine/app/model/AboutModule.php +++ b/engine/app/model/AboutModule.php @@ -5,10 +5,7 @@ class AboutModel static function getData() { $box = []; - if ( - $handle = - opendir('./upload') - ) { + if ($handle = opendir('./upload')) { while (false !== ($entry = readdir($handle))) { $ext = pathinfo($entry, PATHINFO_EXTENSION); @@ -16,7 +13,6 @@ class AboutModel array_push($box, "./upload/$entry"); } } - closedir($handle); } return $box; diff --git a/engine/app/template/login.php b/engine/app/template/login.php index ee24da8..c2b852d 100644 --- a/engine/app/template/login.php +++ b/engine/app/template/login.php @@ -6,7 +6,7 @@ Tailwind CSS 3 Login Page With border Style - + @@ -23,7 +23,6 @@ -

LOGO

diff --git a/engine/core/Router.php b/engine/core/Router.php index e1d6827..49aae9b 100644 --- a/engine/core/Router.php +++ b/engine/core/Router.php @@ -2,29 +2,27 @@ // require_once 'Autoloader.php'; // Autoloader::init(); -require_once __DIR__ . "/../../engine/app/view/View.php"; +// require_once __DIR__ . "/../../engine/app/view/View.php"; class Router { - private $routes; public function __construct() { - $routesPath = __DIR__ . '/../routes.php'; - - $this->routes = include($routesPath); + $this->routes = include_once($routesPath); } public function run() { $uri = $this->getURI(); + if (!$uri) { $obj = new MainController(); $obj->actionIndex(); return null; - var_dump('Роутер пуст'); + // var_dump('Роутер пуст'); } $controllerName = ""; // $actionName = ; @@ -37,16 +35,16 @@ class Router $controllerObject = new $controllerName(); $result = $controllerObject->$actionName(); - break; + // break; // var_dump($controllerFile); } + } - if (!$controllerName) { - // Page not found - $obj = new MainController(); - $obj->actionNotFound(); - // break; - } + if (!$controllerName) { + // Page not found + $obj = new MainController(); + $obj->actionNotFound(); + // break; } }