Merge branch '2.x-release/v2.2.0' into 2.x

Author: themodernpk

Config/vaahcms.php

@@ -8,7 +8,7 @@
 $settings =  [
     'app_name' => 'VaahCMS',
     'app_slug' => 'vaahcms',
-    'version' => '2.1.10',
+    'version' => '2.2.0',
     'php_version_required' => '8.1',
     'get_config_version' => false,
     'website' => 'https://vaah.dev/cms',
@@ -28,6 +28,7 @@
     'public_url' => env('APP_URL'),
     'backend_logo_url' => 'vaahcms/backend/vaahone/images/vaahcms-logo.svg', // vh_backend_logo()
     'per_page' => 20,
+    'build_directory_name' => 'vaahcms',    //config('vaahcms.build_directory_name')
     'minified' => 0,
     'api_route' => 'https://api.vaah.dev/cms/v2/',
     'debug' => 1,

Helpers/backend.php

@@ -16,7 +16,7 @@ function vh_get_assets_base_url()
 //-----------------------------------------------------------------------------------
 function vh_get_backend_assets_url()
 {
-    return url('/vaahcms/backend/');
+    return url('/'.config('vaahcms.build_directory_name','vaahcms').'/backend/');
 }
 //-----------------------------------------------------------------------------------
 function vh_get_backend_theme_url($theme=null)
@@ -26,7 +26,7 @@ function vh_get_backend_theme_url($theme=null)
         $theme = config('vaahcms.backend_theme');
     }
 
-    $path = ('/vaahcms/backend/'.$theme);
+    $path = ('/'.config('vaahcms.build_directory_name','vaahcms').'/backend/'.$theme);
     $url = url($path);
 
     return $url;

Helpers/common.php

@@ -42,6 +42,11 @@ function slug_to_str($slug)
     return $str;
 }
 //-------------------------------------------------------------
+function str_to_slug($string)
+{
+    return \Str::slug($string);;
+}
+//-------------------------------------------------------------
 function generate_random_string($length=8)
 {
     return \Str::random($length);

Helpers/modules.php

@@ -89,7 +89,7 @@ function vh_module_assets_url($name, $file_path)
 {
     $slug = \Str::slug($name);
     $version = config($slug.'.version');
-    $url = url("vaahcms/modules/".$slug."/assets/".$file_path)."?v=".$version;
+    $url = url(config('vaahcms.build_directory_name','vaahcms')."/modules/".$slug."/assets/".$file_path)."?v=".$version;
     return $url;
 }
 //-----------------------------------------------------------------------------------

Http/Controllers/Backend/Advanced/JobsController.php

@@ -95,7 +95,7 @@ public function getList(Request $request): JsonResponse
     public function listAction(Request $request, $type): JsonResponse
     {
         try {
-            Job::listAction($request, $type);
+            $response = Job::listAction($request, $type);
         } catch (\Exception $e) {
             $response = [];
             $response['success'] = false;

Http/Controllers/Backend/TaxonomiesController.php

@@ -413,6 +413,8 @@ public function deleteTaxonomyType(Request $request): JsonResponse
                 self::deletechildrens($item->childrens);
             }
 
+            $item->taxonomies()->update(['vh_taxonomy_type_id' => null]);
+
             $item->forceDelete();
 
             $response['success'] = true;
@@ -439,6 +441,8 @@ public function deletechildrens($types)
                 self::deletechildrens($type->childrens);
             }
 
+            $type->taxonomies()->update(['vh_taxonomy_type_id' => null]);
+
             $type->forceDelete();
         }
     }

Http/Middleware/SetLocale.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace WebReinvent\VaahCms\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\App;
+
+class SetLocale
+{
+    public function handle(Request $request, Closure $next)
+    {
+        if (config('settings.global.language')) {
+            App::setLocale(config('settings.global.language'));
+        }
+        return $next($request);
+    }
+}

Models/ModuleBase.php

@@ -634,7 +634,7 @@ public static function copyAssets($module)
     {
         $module_path = config('vaahcms.modules_path').'/'.$module->name;
         $source = $module_path."/Resources/assets";
-        $dec = public_path('vaahcms/modules/'.$module->slug.'/assets');
+        $dec = public_path(config('vaahcms.build_directory_name','vaahcms').'/modules/'.$module->slug.'/assets');
 
         if(!\File::exists($source)) {
             return false;

Models/TaxonomyType.php

@@ -97,6 +97,14 @@ public function childrens(): HasMany
             'parent_id', 'id'
         )->with(['childrens'])->select('id', 'name', 'slug', 'parent_id');
     }
+
+    //-------------------------------------------------
+    public function taxonomies(): HasMany
+    {
+        return $this->hasMany(Taxonomy::class,
+            'vh_taxonomy_type_id', 'id'
+        );
+    }
     //-------------------------------------------------
     // this method is only used for rendering child nodes on primevue tree component
 

Models/ThemeBase.php

@@ -1037,7 +1037,7 @@ public static function copyAssets($theme)
             return false;
         }
 
-        $dec = public_path('vaahcms/themes/'.$theme->slug.'/assets');
+        $dec = public_path(config('vaahcms.build_directory_name','vaahcms').'/themes/'.$theme->slug.'/assets');
 
         if(!\File::exists($dec)) {
             \File::makeDirectory($dec, 0755, true, true);

Resources/assets/backend/build/vaahtwo.css

@@ -7,7 +7,6 @@
     <title>Vite App</title>
   <script type="module" crossorigin src="/mainExtended.js"></script>
   <link rel="modulepreload" crossorigin href="/Sidebar.js">
-  <link rel="stylesheet" href="/Sidebar.css">
 </head>
 <body>
 <div id="app"></div>

Resources/assets/backend/vaahtwo/build/Sidebar.js

@@ -7,7 +7,6 @@
     <title>Vite App</title>
   <script type="module" crossorigin src="/main.js"></script>
   <link rel="modulepreload" crossorigin href="/Sidebar.js">
-  <link rel="stylesheet" href="/Sidebar.css">
   <link rel="stylesheet" href="/index.css">
 </head>
 <body>