VENOM: Entity fixed JSON

EntityManger added return value
EntityManager added getFirst
Fixed Some Admin shit :)

.gitignore

@@ -466,3 +466,8 @@ conf/modules.inc.php
 conf/routers.inc.php
 conf/lang.inc.php
 logs/Exception.log
+
+
+z_dome/
+composer.lock
+adminer.php

base/config.base.php

@@ -1,18 +1,18 @@
 <?php
 
 use Venom\Core\Config;
-use Venom\Core\DatabaseHandler;
+use Venom\Core\Database\Database;
 
 $config = Config::getInstance();
 $config->setVersion(1.0);
 $config->setDatabase([
-    DatabaseHandler::DB_TYPE => 'mysql', //please change only if you know what you're doing! this can break a lot.
+    Database::DB_TYPE => 'mysql', //please change only if you know what you're doing! this can break a lot.
-    DatabaseHandler::DB_HOST => '127.0.0.1',
+    Database::DB_HOST => '127.0.0.1',
-    DatabaseHandler::DB_PORT => '3306', //default port is 3306
+    Database::DB_PORT => '3306', //default port is 3306
-    DatabaseHandler::DB_USER => 'venom',
+    Database::DB_USER => 'venom',
-    DatabaseHandler::DB_PASSWORD => 'venomPassword',
+    Database::DB_PASSWORD => 'venomPassword',
-    DatabaseHandler::DB_DB => 'venomCMS',
+    Database::DB_DB => 'venomCMS',
-    DatabaseHandler::DB_EXTRA => '' // need to start with ';'
+    Database::DB_EXTRA => '' // need to start with ';'
 ]);
 
 /**

base/module.base.php

@@ -1,9 +1,4 @@
 <?php
 
-//register modules -> need to have the Module Class at parent with the init function ;)
+//register modules -> only apply Module Path! like Meta now the ModuleLoader search for /modules/Meta/module.php!
 $modules = [];
-
-// register controllers that can handle templates ;) need to have a render function for this
-$controllers = [
-    'test' => \Controllers\TestController::class,
-];

base/router.base.php

@@ -11,19 +11,5 @@ if (!isset($venom)) {
     exit(1);
 }
 
-$router = new Router('defaultRouter', 1.0, 'api/');
+$router = new Router(Router::DEFAULT_ROUTER, 1.0, 'api/');
-$router->addRoutes([
+$venom->addRouter($router);
-    '/test' => [
-        'cl' => Route::class,
-        'roles' => ['ROLE_GUEST'],
-        'routes' => [
-            '*' => [
-                "GET" => 'getAll'
-            ],
-            '1' => [
-                "GET" => 'getAll'
-            ]
-        ]
-    ],
-]);
-$venom->addRouter('defaultRouter', $router);

composer.json

@@ -5,11 +5,19 @@
   "authors": [
     {
       "name": "Maurice Grönwoldt",
-      "email": "mauricegroenwoldt@gmail.com"
+      "email": "mauricegroenwoldt@gmail.com",
+      "role": "founder"
+    },
+    {
+      "name": "Dominic Seela",
+      "email": "kontakt@engineertrooper.com",
+      "role": "friendly developer, supporter"
     }
   ],
   "require": {
-    "ext-pdo": "*"
+    "ext-pdo": "*",
+    "ext-http": "*",
+    "ext-json": "*"
   },
   "autoload": {
     "psr-4": {

install/db.sql

@@ -7,6 +7,14 @@ create table if not exists seoData
 )
     comment 'seo url mapping';
 
+create table if not exists metaTagData
+(
+    id       int(255) auto_increment not null unique primary key,
+    content  JSON                    not null,
+    isActive tinyint(1) default 1    null
+)
+    comment 'Meta Tag File';
+
 create table if not exists language
 (
     id        int(255) auto_increment not null unique primary key,
@@ -27,3 +35,26 @@ create table if not exists data
     datatype  enum ('content', 'form')
 )
     comment 'DataLoader File';
+
+create table if not exists users
+(
+    id        int(255) auto_increment not null unique primary key,
+    username  varchar(255)            not null unique,
+    firstname varchar(255)            not null,
+    lastname  varchar(255)            not null,
+    email     varchar(255)            not null,
+    password  varchar(255)            not null,
+    token     varchar(255)            not null,
+    salt      varchar(255)            not null,
+    roleId    text       default '0'  not null,
+    isActive  tinyint(1) default 1    null
+)
+    comment 'User File';
+
+create table if not exists roles
+(
+    id       int(255) auto_increment not null unique primary key,
+    name     varchar(255)            not null unique,
+    content  JSON                    not null,
+    isActive tinyint(1) default 1    null
+)

public/admin/.htaccess

@@ -1,7 +0,0 @@
-RewriteEngine On
-
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteCond %{REQUEST_FILENAME} !-d
-
-RewriteCond %{REQUEST_URI} (/[^.]*|\.)$ [NC]
-RewriteRule .* index.php [L]

public/admin/index.php

@@ -1,24 +0,0 @@
-<?php
-
-use Venom\Core\Config;
-use Venom\Core\Setup;
-use Venom\Venom;
-
-require_once '../../vendor/autoload.php';
-Setup::loadConfig(true);
-Setup::loadLanguage();
-
-$config = Config::getInstance();
-if ($config->isMaintenance()) {
-    echo 'Currently not available';
-    exit;
-}
-//if devMode is on show all errors!
-if ($config->isDevMode()) {
-    error_reporting(E_ALL);
-    ini_set('error_reporting', E_ALL);
-}
-$venom = new Venom();
-Setup::loadRouters($venom);
-Setup::loadModules($venom);
-$venom->run();

public/index.php

@@ -2,10 +2,12 @@
 
 use Venom\Core\Config;
 use Venom\Core\Setup;
+use Venom\Helper\URLHelper;
 use Venom\Venom;
 
 require_once '../vendor/autoload.php';
-Setup::loadConfig(false);
+session_start();
+Setup::loadConfig(URLHelper::getInstance()->isAdminUrl());
 Setup::loadLanguage();
 
 $config = Config::getInstance();
@@ -21,4 +23,4 @@ if ($config->isDevMode()) {
 $venom = new Venom();
 Setup::loadRouters($venom);
 Setup::loadModules($venom);
-$venom->run();
+$venom->inject();

public/theme/admin/css/admin-panel.css

@@ -0,0 +1 @@
+main{display:flex;height:100vh;overflow:hidden}main h1{margin-top:30px;margin-bottom:20px}main h2{margin-top:35px;margin-bottom:25px}main h3{margin-top:20px;margin-bottom:15px}main h4{margin-top:15px;margin-bottom:10px}main.nav-open .menu{transform:translateX(0)}main.nav-open .app{transform:translateX(220px)}main.nav-open .app .nav-toggle span{transition:width .3s;width:0}main.nav-open .app .nav-toggle span:before{transform:translateY(8px) rotate(-135deg)}main.nav-open .app .nav-toggle span:after{transform:translateY(-8px) rotate(135deg)}.app{transform:translateX(0);transition:transform .4s;flex-grow:1;overflow-y:auto;margin:.6rem .8rem;width:100%;max-height:100%;background:rgba(27,27,27,.5);position:relative}.app .nav-toggle{position:absolute;cursor:pointer;left:1rem;height:25px;width:25px}.app .nav-toggle span{transform:translateY(21px)}.app .nav-toggle span,.app .nav-toggle span:after,.app .nav-toggle span:before{border-radius:1px;height:2px;width:25px;background:#fff;position:absolute;content:'';transition:transform .5s,width .4s ease-in}.app .nav-toggle span:before{top:-8px}.app .nav-toggle span:after{bottom:-8px}.menu{width:220px;background-color:#1b1b1b;box-shadow:0 3px 6px rgba(0,0,0,.16),0 3px 6px rgba(0,0,0,.23);height:100%;position:fixed;z-index:1;top:0;left:0;overflow-x:hidden;transition:.4s;transform:translateX(-220px);display:flex;flex-direction:column}.menu .logo{text-align:center;font-family:monospace}.menu div[data-link]{padding:.75rem .5rem;position:relative}.menu div[data-link]:after{background-color:#3949ab;content:"";position:absolute;left:0;bottom:0;height:3px;width:100%;transform:scaleX(0);transition:transform .4s;transform-origin:left}.menu div[data-link]:hover:after{transform:scaleX(1)}.menu div[data-link]:last-child{margin-top:auto}.menu div[data-link].active{font-weight:700}.content-area{width:calc(100% - 20px);padding-top:30px;margin:0 auto;display:block}.content-area header{display:block;text-align:center}.content-area header h2{margin:25px 0}.content-area .back-arrow{width:36px;height:36px}.content-area textarea{background:rgba(27,27,27,.5);color:#fff;margin:15px 0 0 0;font-family:sans-serif;font-size:1.1rem;min-width:100%}.content-area .modules div{padding:6px 20px 6px 0}.content-area .add-new,.content-area .overview{width:100%}.content-area .overview div[data-link]{margin-right:10px;padding:10px;background-color:rgba(0,0,0,.3)}.content-area .overview div[data-link]:hover{background-color:rgba(0,0,0,.5)}.content-area .overview .icon{display:inline-block}.content-area .add-new{padding-top:25px}@media only screen and (min-width:768px){.content-area{width:calc(100% - 40px)}.content-area .flexbox{display:flex}.content-area .overview{flex-grow:1;width:60%}.content-area .add-new{padding-top:0;flex-grow:1;width:40%}}@media only screen and (min-width:1024px){.content-area{max-width:860px;padding-top:0;margin:0 0 0 20px}}@media only screen and (min-width:1024px){main,main.nav-open{display:flex}main .app,main.nav-open .app{transform:translateX(0)}main .menu,main.nav-open .menu{position:relative;transform:translateX(0)}main .nav-toggle,main.nav-open .nav-toggle{display:none}}.role-edit .privileges .name{font-size:1.15rem}

public/theme/admin/css/login.css

@@ -0,0 +1 @@
+body,html{display:flex;justify-content:center;align-items:center}.hide{display:none!important}#login-background{background-color:rgba(31,31,31,.25);-webkit-filter:blur(10px);filter:blur(10px);position:absolute;top:0;left:0;width:100%;height:100%}login{display:flex;position:relative;max-width:860px;width:90%;height:400px;padding:1rem;border-radius:10px 40px;overflow:hidden;box-shadow:0 10px 20px rgba(0,0,0,.19),0 6px 6px rgba(0,0,0,.23)}#login{z-index:1;display:flex;flex-direction:column;align-items:center;width:100%}#login .logo{width:50%;margin-bottom:20px}#login .error-message{background-color:#c51162;padding:1rem;font-size:.7rem;display:block;width:50%}#login .input-group{width:50%}#login a{text-decoration:none;color:#fff}#login a:hover{color:#3949ab}

public/theme/admin/icon-sprite.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg"><symbol viewBox="0 0 24 24" id="vt-add" xmlns="http://www.w3.org/2000/svg"><path fill="#fff" d="M13 7h-2v4H7v2h4v4h2v-4h4v-2h-4V7zm-1-5C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z"/></symbol><symbol viewBox="0 0 24 24" id="vt-arrow-back" xmlns="http://www.w3.org/2000/svg"><path fill="#fff" d="M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20v-2z"/></symbol><symbol viewBox="0 0 24 24" id="vt-check" xmlns="http://www.w3.org/2000/svg"><path fill="#fff" d="M19 3H5a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2V5a2 2 0 00-2-2zm-9 14l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"/></symbol><symbol viewBox="0 0 24 24" id="vt-delete" xmlns="http://www.w3.org/2000/svg"><path fill="#fff" d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z"/><path d="M0 0h24v24H0z" fill="none"/></symbol><symbol viewBox="0 0 24 24" id="vt-edit" xmlns="http://www.w3.org/2000/svg"><path fill="#fff" d="M3 17.25V21h3.75L17.81 9.94l-3.75-3.75L3 17.25zM20.71 7.04a.996.996 0 000-1.41l-2.34-2.34a.996.996 0 00-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z"/></symbol><symbol viewBox="0 0 24 24" id="vt-visibility" xmlns="http://www.w3.org/2000/svg"><path fill="#fff" d="M12 4.5C7 4.5 2.73 7.61 1 12c1.73 4.39 6 7.5 11 7.5s9.27-3.11 11-7.5c-1.73-4.39-6-7.5-11-7.5zM12 17c-2.76 0-5-2.24-5-5s2.24-5 5-5 5 2.24 5 5-2.24 5-5 5zm0-8c-1.66 0-3 1.34-3 3s1.34 3 3 3 3-1.34 3-3-1.34-3-3-3z"/></symbol></svg>