commit

degami · degami · commit 03c14b8df4c3 · 2025-03-27T23:01:20.000+01:00
diff --git a/app/App.php b/app/App.php
@@ -70,6 +70,8 @@ class App extends ContainerAwareObject
     public const BASE_CONTROLLERS_NAMESPACE = 'App\Base\Controllers';
     public const BASE_CRON_TASKS_NAMESPACE = 'App\Base\Cron\Tasks';
     public const BASE_ROUTERS_NAMESPACE = 'App\Base\Routers';
+    public const BASE_BLOCKS_NAMESPACE = 'App\Base\Blocks';
+    public const BASE_CRUD_NAMESPACE = 'App\Base\Crud';
     public const ROUTERS_NAMESPACE = 'App\Site\Routers';
     public const CONTROLLERS_NAMESPACE = 'App\Site\Controllers';
     public const CRUD_NAMESPACE = 'App\Site\Crud';
diff --git a/app/base/blocks/AuthorInfo.php b/app/base/blocks/AuthorInfo.php
@@ -11,7 +11,7 @@
  * @link     https://github.com/degami/sitebase
  */
 
-namespace App\Site\Blocks;
+namespace App\Base\Blocks;
 
 use App\Base\Abstracts\Blocks\BaseCodeBlock;
 use App\Base\Abstracts\Controllers\AdminPage;
diff --git a/app/base/blocks/ChangeLanguage.php b/app/base/blocks/ChangeLanguage.php
@@ -11,7 +11,7 @@
  * @link     https://github.com/degami/sitebase
  */
 
-namespace App\Site\Blocks;
+namespace App\Base\Blocks;
 
 use App\Base\Abstracts\Blocks\BaseCodeBlock;
 use App\Base\Abstracts\Controllers\BasePage;
diff --git a/app/base/blocks/CookieNotice.php b/app/base/blocks/CookieNotice.php
@@ -11,7 +11,7 @@
  * @link     https://github.com/degami/sitebase
  */
 
-namespace App\Site\Blocks;
+namespace App\Base\Blocks;
 
 use App\Base\Abstracts\Blocks\BaseCodeBlock;
 use App\Base\Abstracts\Controllers\BasePage;
diff --git a/app/base/blocks/GTM.php b/app/base/blocks/GTM.php
@@ -11,7 +11,7 @@
  * @link     https://github.com/degami/sitebase
  */
 
-namespace App\Site\Blocks;
+namespace App\Base\Blocks;
 
 use App\Base\Abstracts\Blocks\BaseCodeBlock;
 use App\Base\Abstracts\Controllers\BasePage;
diff --git a/app/base/blocks/LinkToUserArea.php b/app/base/blocks/LinkToUserArea.php
@@ -11,7 +11,7 @@
  * @link     https://github.com/degami/sitebase
  */
 
-namespace App\Site\Blocks;
+namespace App\Base\Blocks;
 
 use App\Base\Abstracts\Blocks\BaseCodeBlock;
 use App\Base\Abstracts\Controllers\BasePage;
diff --git a/app/base/blocks/Search.php b/app/base/blocks/Search.php
@@ -11,11 +11,11 @@
  * @link     https://github.com/degami/sitebase
  */
 
-namespace App\Site\Blocks;
+namespace App\Base\Blocks;
 
 use App\Base\Abstracts\Blocks\BaseCodeBlock;
 use App\Base\Abstracts\Controllers\BasePage;
-use App\Site\Controllers\Frontend\Search as SearchController;
+use App\Base\Controllers\Frontend\Search as SearchController;
 use Degami\Basics\Exceptions\BasicException;
 use Degami\Basics\Html\TagElement;
 use Exception;
diff --git a/app/base/blocks/YearCopy.php b/app/base/blocks/YearCopy.php
@@ -11,7 +11,7 @@
  * @link     https://github.com/degami/sitebase
  */
 
-namespace App\Site\Blocks;
+namespace App\Base\Blocks;
 
 use App\Base\Abstracts\Blocks\BaseCodeBlock;
 use App\Base\Abstracts\Controllers\BasePage;
diff --git a/app/base/controllers/Admin/Blocks.php b/app/base/controllers/Admin/Blocks.php
@@ -11,7 +11,7 @@
  * @link     https://github.com/degami/sitebase
  */
 
-namespace App\Site\Controllers\Admin;
+namespace App\Base\Controllers\Admin;
 
 use App\App;
 use App\Base\Exceptions\PermissionDeniedException;
@@ -30,7 +30,7 @@
 use App\Base\Abstracts\Controllers\AdminFormPage;
 use App\Base\Abstracts\Controllers\AdminManageModelsPage;
 use Degami\PHPFormsApi as FAPI;
-use App\Site\Models\Block;
+use App\Base\Models\Block;
 
 /**
  * "Blocks" Admin Page
diff --git a/app/base/controllers/Admin/Dashboard.php b/app/base/controllers/Admin/Dashboard.php
@@ -13,7 +13,7 @@
 
 namespace App\Base\Controllers\Admin;
 
-use App\Site\Models\Block;
+use App\Base\Models\Block;
 use App\Site\Models\Contact;
 use App\Site\Models\ContactSubmission;
 use App\Site\Models\LinkExchange;
diff --git a/app/base/controllers/Frontend/Search.php b/app/base/controllers/Frontend/Search.php
@@ -11,7 +11,7 @@
  * @link     https://github.com/degami/sitebase
  */
 
-namespace App\Site\Controllers\Frontend;
+namespace App\Base\Controllers\Frontend;
 
 use App\Base\Abstracts\Controllers\BasePage;
 use App\Base\Abstracts\Controllers\FrontendPage;
diff --git a/app/base/controllers/Frontend/Users/Index.php b/app/base/controllers/Frontend/Users/Index.php
@@ -11,7 +11,7 @@
  * @link     https://github.com/degami/sitebase
  */
 
-namespace App\Site\Controllers\Frontend\Users;
+namespace App\Base\Controllers\Frontend\Users;
 
 use App\Base\Abstracts\Controllers\BasePage;
 use App\Base\Exceptions\PermissionDeniedException;
diff --git a/app/base/controllers/Frontend/Users/Login.php b/app/base/controllers/Frontend/Users/Login.php
@@ -11,7 +11,7 @@
  * @link     https://github.com/degami/sitebase
  */
 
-namespace App\Site\Controllers\Frontend\Users;
+namespace App\Base\Controllers\Frontend\Users;
 
 use App\Base\Abstracts\Controllers\BasePage;
 use Degami\Basics\Exceptions\BasicException;
diff --git a/app/base/controllers/Frontend/Users/Logout.php b/app/base/controllers/Frontend/Users/Logout.php
@@ -11,7 +11,7 @@
  * @link     https://github.com/degami/sitebase
  */
 
-namespace App\Site\Controllers\Frontend\Users;
+namespace App\Base\Controllers\Frontend\Users;
 
 use App\Base\Abstracts\Controllers\BasePage;
 use Degami\Basics\Exceptions\BasicException;
diff --git a/app/base/controllers/Frontend/Users/PasswordForgot.php b/app/base/controllers/Frontend/Users/PasswordForgot.php
@@ -11,7 +11,7 @@
  * @link     https://github.com/degami/sitebase
  */
 
-namespace App\Site\Controllers\Frontend\Users;
+namespace App\Base\Controllers\Frontend\Users;
 
 use App\Base\Abstracts\Controllers\BasePage;
 use Degami\Basics\Exceptions\BasicException;
diff --git a/app/base/controllers/Frontend/Users/Profile.php b/app/base/controllers/Frontend/Users/Profile.php
@@ -11,7 +11,7 @@
  * @link     https://github.com/degami/sitebase
  */
 
-namespace App\Site\Controllers\Frontend\Users;
+namespace App\Base\Controllers\Frontend\Users;
 
 use App\Base\Models\Role;
 use App\Base\Models\User;
diff --git a/app/base/controllers/Frontend/Users/TwoFa.php b/app/base/controllers/Frontend/Users/TwoFa.php
@@ -11,7 +11,7 @@
  * @link     https://github.com/degami/sitebase
  */
 
-namespace App\Site\Controllers\Frontend\Users;
+namespace App\Base\Controllers\Frontend\Users;
 
 use App\Base\Models\User;
 use App\Base\Models\User2Fa;
diff --git a/app/base/crud/Admin/Blocks.php b/app/base/crud/Admin/Blocks.php
@@ -11,10 +11,10 @@
  * @link     https://github.com/degami/sitebase
  */
 
-namespace App\Site\Crud\Admin;
+namespace App\Base\Crud\Admin;
 
 use App\Base\Abstracts\Controllers\AdminRestPage;
-use App\Site\Models\Block as BlockModel;
+use App\Base\Models\Block as BlockModel;
 
 /**
  * Blocks REST endpoint
diff --git a/app/base/crud/Admin/Configs.php b/app/base/crud/Admin/Configs.php
@@ -11,7 +11,7 @@
  * @link     https://github.com/degami/sitebase
  */
 
-namespace App\Site\Crud\Admin;
+namespace App\Base\Crud\Admin;
 
 use App\Base\Abstracts\Controllers\AdminRestPage;
 use App\Base\Models\Configuration as ConfigurationModel;
diff --git a/app/base/crud/Admin/Languages.php b/app/base/crud/Admin/Languages.php
@@ -11,7 +11,7 @@
  * @link     https://github.com/degami/sitebase
  */
 
-namespace App\Site\Crud\Admin;
+namespace App\Base\Crud\Admin;
 
 use App\Base\Abstracts\Controllers\AdminRestPage;
 use App\Base\Models\Language as LanguageModel;
diff --git a/app/base/crud/Admin/Permissions.php b/app/base/crud/Admin/Permissions.php
@@ -11,7 +11,7 @@
  * @link     https://github.com/degami/sitebase
  */
 
-namespace App\Site\Crud\Admin;
+namespace App\Base\Crud\Admin;
 
 use App\Base\Abstracts\Controllers\AdminRestPage;
 use App\Base\Models\Permission as PermissionModel;
diff --git a/app/base/crud/Admin/Rewrites.php b/app/base/crud/Admin/Rewrites.php
@@ -11,7 +11,7 @@
  * @link     https://github.com/degami/sitebase
  */
 
-namespace App\Site\Crud\Admin;
+namespace App\Base\Crud\Admin;
 
 use App\Base\Abstracts\Controllers\AdminRestPage;
 use App\Base\Models\Rewrite as RewriteModel;
diff --git a/app/base/crud/Admin/Roles.php b/app/base/crud/Admin/Roles.php
@@ -11,7 +11,7 @@
  * @link     https://github.com/degami/sitebase
  */
 
-namespace App\Site\Crud\Admin;
+namespace App\Base\Crud\Admin;
 
 use App\Base\Abstracts\Controllers\AdminRestPage;
 use App\Site\Models\Role as RoleModel;
diff --git a/app/base/crud/Admin/Token.php b/app/base/crud/Admin/Token.php
@@ -11,7 +11,7 @@
  * @link     https://github.com/degami/sitebase
  */
 
-namespace App\Site\Crud\Admin;
+namespace App\Base\Crud\Admin;
 
 use App\Base\Abstracts\Controllers\BaseJsonPage;
 use App\Base\Exceptions\NotAllowedException;
diff --git a/app/base/crud/Admin/UserNotifications.php b/app/base/crud/Admin/UserNotifications.php
@@ -11,7 +11,7 @@
  * @link     https://github.com/degami/sitebase
  */
 
-namespace App\Site\Crud\Admin;
+namespace App\Base\Crud\Admin;
 
 use App\Base\Abstracts\Controllers\AdminRestPage;
 use App\Base\Models\UserNotification as UserNotificationModel;
diff --git a/app/base/crud/Admin/Users.php b/app/base/crud/Admin/Users.php
@@ -11,7 +11,7 @@
  * @link     https://github.com/degami/sitebase
  */
 
-namespace App\Site\Crud\Admin;
+namespace App\Base\Crud\Admin;
 
 use App\Base\Abstracts\Controllers\AdminRestPage;
 use App\Base\Models\User as UserModel;
diff --git a/app/base/crud/Admin/Websites.php b/app/base/crud/Admin/Websites.php
@@ -11,7 +11,7 @@
  * @link     https://github.com/degami/sitebase
  */
 
-namespace App\Site\Crud\Admin;
+namespace App\Base\Crud\Admin;
 
 use App\Base\Abstracts\Controllers\AdminRestPage;
 use App\Base\Models\Website as WebsiteModel;
diff --git a/app/base/crud/UncachableBlock.php b/app/base/crud/UncachableBlock.php
@@ -11,12 +11,12 @@
  * @link     https://github.com/degami/sitebase
  */
 
-namespace App\Site\Crud;
+namespace App\Base\Crud;
 
 use App\Base\Abstracts\Controllers\BasePage;
 use App\Base\Abstracts\Controllers\BaseRestPage;
 use App\Base\Exceptions\NotFoundException;
-use App\Site\Models\Block as BlockModel;
+use App\Base\Models\Block as BlockModel;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\JsonResponse;
diff --git a/app/base/migrations/CreateBlocksRewritesTableMigration.php b/app/base/migrations/CreateBlocksRewritesTableMigration.php
@@ -11,7 +11,7 @@
  * @link     https://github.com/degami/sitebase
  */
 
-namespace App\Site\Migrations;
+namespace App\Base\Migrations;
 
 use App\Base\Abstracts\Migrations\DBMigration;
 use Degami\SqlSchema\Exceptions\DuplicateException;
diff --git a/app/base/migrations/CreateBlocksTableMigration.php b/app/base/migrations/CreateBlocksTableMigration.php
@@ -11,7 +11,7 @@
  * @link     https://github.com/degami/sitebase
  */
 
-namespace App\Site\Migrations;
+namespace App\Base\Migrations;
 
 use App\Base\Abstracts\Migrations\DBMigration;
 use Degami\SqlSchema\Exceptions\DuplicateException;
diff --git a/app/base/models/Block.php b/app/base/models/Block.php
@@ -11,7 +11,7 @@
  * @link     https://github.com/degami/sitebase
  */
 
-namespace App\Site\Models;
+namespace App\Base\Models;
 
 use App\Base\Abstracts\Blocks\BaseCodeBlock;
 use App\Base\Abstracts\Models\BaseModel;
diff --git a/app/base/routers/Crud.php b/app/base/routers/Crud.php
@@ -57,7 +57,10 @@ public function getRoutes(): array
             if (empty($this->routes)) {
                 // collect routes
 
-                $controllerClasses = ClassFinder::getClassesInNamespace(App::CRUD_NAMESPACE, ClassFinder::RECURSIVE_MODE);
+                $controllerClasses = array_unique(array_merge(
+                    ClassFinder::getClassesInNamespace(App::BASE_CRUD_NAMESPACE, ClassFinder::RECURSIVE_MODE),
+                    ClassFinder::getClassesInNamespace(App::CRUD_NAMESPACE, ClassFinder::RECURSIVE_MODE),
+                ));
                 foreach ($controllerClasses as $controllerClass) {
                     if (is_subclass_of($controllerClass, BaseRestPage::class) || is_subclass_of($controllerClass, BaseJsonPage::class)) {
 
@@ -66,7 +69,9 @@ public function getRoutes(): array
                         }
 
                         $group = "/crud";
-                        $path = str_replace("app/site/crud/", "", str_replace("\\", "/", strtolower($controllerClass)));
+                        $path = str_replace("app/site/crud/", "", str_replace("\\", "/", 
+                            str_replace("app/base/crud/", "", str_replace("\\", "/", strtolower($controllerClass)))
+                        ));
                         $route_name = 'crud.' . str_replace("/", ".", trim($path, "/"));
 
                         if (is_callable([$controllerClass, 'getPageRouteName'])) {
diff --git a/app/base/tools/Utils/HtmlPartsRenderer.php b/app/base/tools/Utils/HtmlPartsRenderer.php
@@ -33,7 +33,7 @@
 use App\Base\Abstracts\Controllers\AdminPage;
 use App\Base\Abstracts\Models\BaseCollection;
 use App\Base\Controllers\Admin\Login;
-use App\Site\Models\Block;
+use App\Base\Models\Block;
 use Degami\Basics\Html\TagElement;
 use Degami\Basics\Html\TagList;
 
diff --git a/app/base/tools/Utils/SiteData.php b/app/base/tools/Utils/SiteData.php
@@ -17,7 +17,7 @@
 use App\Base\Abstracts\ContainerAwareObject;
 use App\Base\Abstracts\Controllers\AdminPage;
 use App\Base\Abstracts\Controllers\BasePage;
-use App\Site\Models\Block;
+use App\Base\Models\Block;
 use App\Base\Models\Configuration;
 use App\Site\Models\Menu;
 use App\Base\Models\Redirect;
diff --git a/app/site/commands/Info/Stats.php b/app/site/commands/Info/Stats.php
@@ -14,7 +14,7 @@
 namespace App\Site\Commands\Info;
 
 use App\Base\Abstracts\Commands\BaseCommand;
-use App\Site\Models\Block;
+use App\Base\Models\Block;
 use App\Site\Models\Contact;
 use App\Site\Models\ContactSubmission;
 use App\Site\Models\LinkExchange;
diff --git a/app/site/migrations/optionals/FakeDataMigration.php b/app/site/migrations/optionals/FakeDataMigration.php
@@ -15,7 +15,7 @@
 
 use App\App;
 use App\Base\Abstracts\Migrations\BaseMigration;
-use App\Site\Models\Block;
+use App\Base\Models\Block;
 use App\Base\Models\Configuration;
 use App\Site\Models\Contact;
 use App\Site\Models\LinkExchange;
@@ -491,7 +491,10 @@ public function up() : void
 
 
         // add all blocks
-        $blockClasses = ClassFinder::getClassesInNamespace(App::BLOCKS_NAMESPACE);
+        $blockClasses = array_merge(
+            ClassFinder::getClassesInNamespace(App::BASE_BLOCKS_NAMESPACE), 
+            ClassFinder::getClassesInNamespace(App::BLOCKS_NAMESPACE)
+        );
 
         foreach ($blockClasses as $blockClass) {
             $existing_blocks = Block::getCollection()->where(['instance_class' => $blockClass])->getItems();
@@ -512,13 +515,13 @@ public function up() : void
 
         // update blocks positions
         $this->getDb()->query('UPDATE `block` SET `region` = \'pre_content\', `config` = \'{"add-current":"0"}\', `order` = 1 WHERE instance_class = \'App\\\\Site\\\\Blocks\\\\BreadCrumbs\' LIMIT 1;');
-        $this->getDb()->query('UPDATE `block` SET `region` = \'pre_footer\', `config` = \'{"show-language":"none","show-flags":"1"}\', `order` = 1  WHERE instance_class = \'App\\\\Site\\\\Blocks\\\\ChangeLanguage\' LIMIT 1;');
-        $this->getDb()->query('UPDATE `block` SET `region` = \'before_body_close\', `config` = \'{"rewrite_en":"1","rewrite_fr":"1","rewrite_it":"1","rewrite_ro":"1","background-color":"#CECECE","color":"#000000","sticky":"bottom"}\', `order` = 0 WHERE instance_class = \'App\\\\Site\\\\Blocks\\\\CookieNotice\' LIMIT 1;');
+        $this->getDb()->query('UPDATE `block` SET `region` = \'pre_footer\', `config` = \'{"show-language":"none","show-flags":"1"}\', `order` = 1  WHERE instance_class = \'App\\\\Base\\\\Blocks\\\\ChangeLanguage\' LIMIT 1;');
+        $this->getDb()->query('UPDATE `block` SET `region` = \'before_body_close\', `config` = \'{"rewrite_en":"1","rewrite_fr":"1","rewrite_it":"1","rewrite_ro":"1","background-color":"#CECECE","color":"#000000","sticky":"bottom"}\', `order` = 0 WHERE instance_class = \'App\\\\Base\\\\Blocks\\\\CookieNotice\' LIMIT 1;');
         $this->getDb()->query('UPDATE `block` SET `region` = \'pre_content\', `config` = \'{"fx":"","speed":"","timeout":""}\', `order` = 0 WHERE instance_class = \'App\\\\Site\\\\Blocks\\\\RewriteMedia\' LIMIT 1;');
-        $this->getDb()->query('UPDATE `block` SET `region` = \'post_menu\', `order` = 0 WHERE instance_class = \'App\\\\Site\\\\Blocks\\\\Search\' LIMIT 1;'); 
-        $this->getDb()->query('UPDATE `block` SET `region` = \'post_footer\', `order` = 0 WHERE instance_class = \'App\\\\Site\\\\Blocks\\\\YearCopy\' LIMIT 1;'); 
-        $this->getDb()->query('UPDATE `block` SET `region` = \'post_menu\', `order` = 1 WHERE instance_class = \'App\\\\Site\\\\Blocks\\\\LinkToUserArea\' LIMIT 1;'); 
-        $this->getDb()->query('UPDATE `block` SET `region` = \'post_content\', `order` = 0 WHERE instance_class = \'App\\\\Site\\\\Blocks\\\\AuthorInfo\' LIMIT 1;'); 
+        $this->getDb()->query('UPDATE `block` SET `region` = \'post_menu\', `order` = 0 WHERE instance_class = \'App\\\\Base\\\\Blocks\\\\Search\' LIMIT 1;'); 
+        $this->getDb()->query('UPDATE `block` SET `region` = \'post_footer\', `order` = 0 WHERE instance_class = \'App\\\\Base\\\\Blocks\\\\YearCopy\' LIMIT 1;'); 
+        $this->getDb()->query('UPDATE `block` SET `region` = \'post_menu\', `order` = 1 WHERE instance_class = \'App\\\\Base\\\\Blocks\\\\LinkToUserArea\' LIMIT 1;'); 
+        $this->getDb()->query('UPDATE `block` SET `region` = \'post_content\', `order` = 0 WHERE instance_class = \'App\\\\Base\\\\Blocks\\\\AuthorInfo\' LIMIT 1;'); 
     }
 
     /**
diff --git a/composer.json b/composer.json
