Refactoring app structure

ttimot24 · Jan 9, 2025 · 47f236c · 47f236c
1 parent d7c175a
commit 47f236c
Show file tree

Hide file tree

Showing 26 changed files with 132 additions and 237 deletions.
diff --git a/app/Console/Commands/InstallCommand.php b/app/Console/Commands/InstallCommand.php
@@ -117,7 +117,7 @@ public function handle()
 
         $this->info("3. Generating .env file...");
 
-        $dotenv = new \App\Libs\DotEnvGenerator();
+        $dotenv = new \App\Services\DotEnvGenerator();
         $dotenv->addEnvVar('DB_HOST', '127.0.0.1');
         $dotenv->addEnvVar('DB_CONNECTION', $database['driver']);
         $dotenv->addEnvVar('DB_USERNAME', $database['username']);

diff --git a/app/Controllers/InstallController.php b/app/Controllers/InstallController.php
@@ -179,7 +179,7 @@ public function step4()
     {
 
         if (!Session::has('error')) {
-            $dotenv = new \App\Libs\DotEnvGenerator();
+            $dotenv = new \App\Services\DotEnvGenerator(); //TODO Inject
             $dotenv->addEnvVar('DB_HOST', Session::get('step2.server'));
             $dotenv->addEnvVar('DB_CONNECTION',  Session::get('step2.db_driver'));
             $dotenv->addEnvVar('DB_USERNAME',  Session::get('step2.username'));

diff --git a/app/Controllers/PageController.php b/app/Controllers/PageController.php
@@ -55,7 +55,7 @@ public function create(Request $request)
 
         return view('pages.form', [
             'all_page' => Page::all(),
-            'page_templates' => (new \App\Libs\Theme($request->settings['theme']))->templates(),
+            'page_templates' => (new \App\Services\Theme($request->settings['theme']))->templates(),
         ]);
     }
 
@@ -112,7 +112,7 @@ public function edit(Request $request, Page $page)
         return view('pages.form', [
             'page' => $page,
             'all_page' => Page::all(),
-            'page_templates' => (new \App\Libs\Theme($request->settings['theme']))->templates(),
+            'page_templates' => (new \App\Services\Theme($request->settings['theme']))->templates(),
         ]);
     }
 

diff --git a/app/Controllers/SearchController.php b/app/Controllers/SearchController.php
@@ -4,7 +4,7 @@
 
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
-use App\Libs\SearchEngine;
+use App\Services\SearchEngine;
 
 class SearchController extends Controller
 {

diff --git a/app/Controllers/ThemeController.php b/app/Controllers/ThemeController.php
@@ -5,6 +5,7 @@
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
 
+use App\Services\Theme;
 use App\Model\Settings;
 
 class ThemeController extends Controller
@@ -19,9 +20,9 @@ class ThemeController extends Controller
     public function index(Request $request)
     {
         return view("theme.index", [
-            'active_theme' => new \App\Libs\Theme($request->settings['theme']),
+            'active_theme' => new Theme($request->settings['theme']),
             'all_themes' => collect(array_slice(scandir("themes"), 2))->map(function ($theme) {
-                return new \App\Libs\Theme($theme);
+                return new Theme($theme);
             })
         ]);
     }
@@ -48,15 +49,15 @@ public function config($slug)
         $websiteController = new \App\Controllers\WebsiteController(request());
         $websiteController->before();
 
-        $theme_engine = new \App\Libs\ThemeEngine(request());
-        $theme_engine->setTheme(new \App\Libs\Theme(request()->settings['theme']));
+        $theme_engine = new \App\Services\ThemeEngine(request());
+        $theme_engine->setTheme(new Theme(request()->settings['theme']));
 
         $theme_engine->boot();
 
         \Website::initalize($theme_engine);
 
         return view("theme.config", [
-            'active_theme' => new \App\Libs\Theme(request()->settings['theme']),
+            'active_theme' => new Theme(request()->settings['theme']),
             'website_content' => $websiteController->index(request()->input('page')),
         ]);
     }
@@ -73,7 +74,7 @@ public function options($theme)
             $theme_css->save();
         }
 
-        $theme = new \App\Libs\Theme($theme == null ? request()->settings['theme'] : $theme);
+        $theme = new Theme($theme == null ? request()->settings['theme'] : $theme);
 
         $translations = [];
 
@@ -90,7 +91,7 @@ public function updateTranslations($theme)
         if (request()->isMethod('POST')) {
 
             try {
-                $theme = new \App\Libs\Theme($theme == null ? request()->settings['theme'] : $theme);
+                $theme = new Theme($theme == null ? request()->settings['theme'] : $theme);
 
                 $translations = [];
 

diff --git a/app/Controllers/WebsiteController.php b/app/Controllers/WebsiteController.php
@@ -12,14 +12,14 @@ class WebsiteController extends Controller
     private $request;
 
     private $engines = [
-        'hcms' => \App\Libs\ThemeEngine::class,
-        'blade' => \App\Libs\BladeThemeEngine::class,
-        //'twig' => \App\Libs\TwigThemeEngine::class,
+        'hcms' => \App\Services\ThemeEngine::class,
+        'blade' => \App\Services\BladeThemeEngine::class,
+        //'twig' => \App\Services\TwigThemeEngine::class,
     ];
 
     private $theme;
 
-    public function __construct(Request $request, \App\Libs\Theme $theme){
+    public function __construct(Request $request, \App\Services\Theme $theme){
         $this->request = $request;
         $this->theme = $theme;
     }
@@ -140,7 +140,7 @@ public function search()
             }
 
 
-            $search_engine = new \App\Libs\SearchEngine();
+            $search_engine = new \App\Services\SearchEngine();
 
             $search_engine->registerModel(\App\Model\Blogpost::class);
             $search_engine->registerModel(\App\Model\Page::class);

diff --git a/app/Http/Middleware/WebsiteMiddleware.php b/app/Http/Middleware/WebsiteMiddleware.php
@@ -11,7 +11,7 @@ class WebsiteMiddleware
 
     private $widgets;
 
-    public function __construct(\App\Libs\ShortCode $shortcode_engine){
+    public function __construct(\App\Services\ShortCode $shortcode_engine){
         $this->widgets = $shortcode_engine;
     }
 

diff --git a/app/Libs/PluginInterface.php → app/Interfaces/PluginInterface.php b/app/Libs/PluginInterface.php → app/Interfaces/PluginInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Libs;
+namespace App\Interfaces;
 
 interface PluginInterface {
 

diff --git a/app/Libs/BladeThemeEngine.php b/app/Libs/BladeThemeEngine.php
diff --git a/app/Libs/Controller.php b/app/Libs/Controller.php
diff --git a/app/Libs/ViewResolver.php b/app/Libs/ViewResolver.php
diff --git a/app/Model/Plugin.php b/app/Model/Plugin.php
@@ -181,7 +181,7 @@ public function getRegister($register, $default = null)
 
 			$instance = new $plugin_namespace();
 
-			if ($instance instanceof \App\Libs\PluginInterface) {
+			if ($instance instanceof \App\Interfaces\PluginInterface) {
 				return $instance->$register();
 			}
 		}

diff --git a/app/Providers/ThemeServiceProvider.php b/app/Providers/ThemeServiceProvider.php
@@ -4,7 +4,7 @@
 
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Facades\Route;
-use \App\Libs\Theme;
+use \App\Services\Theme;
 
 class ThemeServiceProvider extends ServiceProvider
 {