2.x feature -> 2.x develop | update dashboard localization

Database/Seeders/json/language_strings.json

@@ -762,7 +762,7 @@
         "locale_code_iso_639": "en",
         "category": "dashboard",
         "name": "Welcome to VaahCms",
-        "content": "Welcome to VaahCms"
+        "content": "Welcome to Vaah<b>Cms</b>"
     },
     {
         "locale_code_iso_639": "en",
@@ -870,7 +870,7 @@
         "locale_code_iso_639": "en",
         "category": "dashboard",
         "name": "Run Jobs",
-        "content": "Enable Laravel Queues to run your jobs"
+        "content": "Enable <b>Laravel Queues</b> to run your jobs"
     },
     {
         "locale_code_iso_639": "en",
@@ -3627,7 +3627,7 @@
         "locale_code_iso_639": "es",
         "category": "dashboard",
         "name": "Welcome to VaahCms",
-        "content": "Bienvenido a VaahCms"
+        "content": "Bienvenido a Vaah<b>Cms</b>"
     },
     {
         "locale_code_iso_639": "es",
@@ -3736,7 +3736,7 @@
         "locale_code_iso_639": "es",
         "category": "dashboard",
         "name": "Run Jobs",
-        "content": "Habilite Laravel Queues para ejecutar sus trabajos"
+        "content": "Habilite <b>Laravel Queues</b> para ejecutar sus trabajos"
     },
     {
         "locale_code_iso_639": "es",
@@ -6293,7 +6293,7 @@
         "locale_code_iso_639": "fr",
         "category": "login",
         "name": "Email or Username Limit",
-        "content": "L'e-mail ou le nom d\\'utilisateur ne doit pas dépasser 150 caractères."
+        "content": "L\\'e-mail ou le nom d\\'utilisateur ne doit pas dépasser 150 caractères."
     },
     {
         "locale_code_iso_639": "fr",
@@ -6493,7 +6493,7 @@
         "locale_code_iso_639": "fr",
         "category": "dashboard",
         "name": "Welcome to VaahCms",
-        "content": "Bienvenue sur VaahCms"
+        "content": "Bienvenue sur Vaah<b>Cms</b>"
     },
     {
         "locale_code_iso_639": "fr",
@@ -6601,7 +6601,7 @@
         "locale_code_iso_639": "fr",
         "category": "dashboard",
         "name": "Run Jobs",
-        "content": "Activez les files d\\'attente Laravel pour exécuter vos tâches"
+        "content": "Activez les <b>files d\\'attente Laravel</b> pour exécuter vos tâches"
     },
     {
         "locale_code_iso_639": "fr",

Database/Seeders/json/permissions.json

@@ -429,43 +429,43 @@
     {
         "name": "Has Access Of Taxonomies Section",
         "module": "vaahcms",
-        "section": "user",
+        "section": "taxonomy",
         "details": "This will allow user to see the link of taxonomy section."
     },
     {
         "name": "Can Create Taxonomies",
         "module": "vaahcms",
-        "section": "user",
+        "section": "taxonomy",
         "details": "This will allow user to add anything in the taxonomy section."
     },
     {
         "name": "Can Read Taxonomies",
         "module": "vaahcms",
-        "section": "user",
+        "section": "taxonomy",
         "details": "This will allow user to view anything in the taxonomy section."
     },
     {
         "name": "Can Update Taxonomies",
         "module": "vaahcms",
-        "section": "user",
+        "section": "taxonomy",
         "details": "This will allow user to edit anything in the taxonomy section."
     },
     {
         "name": "Can Delete Taxonomies",
         "module": "vaahcms",
-        "section": "user",
+        "section": "taxonomy",
         "details": "This will allow user to delete anything in the taxonomy section."
     },
     {
         "name": "Can Manage Taxonomies",
         "module": "vaahcms",
-        "section": "user",
+        "section": "taxonomy",
         "details": "This will allow user to manage anything in the taxonomy section."
     },
     {
         "name": "Can Manage Taxonomy Types",
         "module": "vaahcms",
-        "section": "user",
+        "section": "taxonomy",
         "details": "This will allow user to manage anything in the taxonomy type modal."
     }
 ]

Http/Controllers/Backend/Settings/LocalizationController.php

@@ -6,6 +6,7 @@
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Auth;
+use WebReinvent\VaahCms\Database\Seeders\VaahCmsTableSeeder;
 use WebReinvent\VaahCms\Models\Language;
 use WebReinvent\VaahCms\Models\LanguageCategory;
 use WebReinvent\VaahCms\Models\LanguageString;
@@ -230,4 +231,39 @@ public function postActions(Request $request, $action): JsonResponse
         return response()->json($response);
     }
     //----------------------------------------------------------
+    public function runSeeds(Request $request): JsonResponse
+    {
+        if (!Auth::user()->hasPermission('has-access-of-setting-section')) {
+            $response['success'] = false;
+            $response['errors'][] = trans("vaahcms::messages.permission_denied");
+
+            return response()->json($response);
+        }
+
+        try {
+
+            $language_seeder = new VaahCmsTableSeeder();
+
+            $language_seeder->seedLanguages();
+            $language_seeder->seedLanguageCategories();
+            $language_seeder->seedLanguageStrings();
+
+            LanguageString::syncAndGenerateStrings($request);
+
+            $response['messages'][] = "Action was successful";
+
+        } catch (\Exception $e) {
+            $response = [];
+            $response['success'] = false;
+
+            if (env('APP_DEBUG')) {
+                $response['errors'][] = $e->getMessage();
+                $response['hint'][] = $e->getTrace();
+            } else {
+                $response['errors'][] = 'Something went wrong.';
+            }
+        }
+
+        return response()->json($response);
+    }
 }

Http/Controllers/Backend/UsersController.php

@@ -65,8 +65,8 @@ public function getAssets(Request $request): JsonResponse
 
           //---------------------------------------------------
 
-            $data['language_string']['users'] = [
-                "users_title" => trans("vaahcms-user.users_title"),
+            $data['language_strings'] = [
+                "page_title" => trans("vaahcms-user.users_title"),
                 "view_role_active_all_roles" => trans("vaahcms-user.view_role_active_all_roles"),
                 "view_role_inactive_all_roles" => trans("vaahcms-user.view_role_inactive_all_roles"),
                 "view_generate_new_api_token" => trans("vaahcms-user.view_generate_new_api_token"),
@@ -268,7 +268,7 @@ public function updateItem(Request $request,$id): JsonResponse
 
             if (!$item) {
                 $response['success'] = false;
-                $response['errors'] = trans('vaahcms-user.registration_not_found');
+                $response['errors'][] = trans('vaahcms-user.registration_not_found');
                 return response()->json($response);
             }
 
@@ -301,6 +301,14 @@ public function deleteItem(Request $request,$id): JsonResponse
         }
 
         try {
+            $is_restricted = User::restrictedActions('delete', $id);
+
+            if(isset($is_restricted['success']) && !$is_restricted['success'])
+            {
+                $response['success'] = false;
+                $response['errors'] = $is_restricted['errors'];
+                return response()->json($response);
+            }
             $response = User::deleteItem($request, $id);
         } catch (\Exception $e) {
             $response = [];
@@ -332,9 +340,10 @@ public function itemAction(Request $request,$id,$action): JsonResponse
 
             $is_restricted = User::restrictedActions($action, $id);
 
-            if($is_restricted)
+            if(isset($is_restricted['success']) && !$is_restricted['success'])
             {
                 $response =  User::getItem($id);
+                $response['errors'] = $is_restricted['errors'];
                 return response()->json($response);
             }
 

Http/Controllers/DashboardController.php

@@ -39,7 +39,19 @@ public function vaah(Request $request)
     public function getItem(Request $request)
     {
         $response['success'] = true;
+        $response['data'] = [];
         $response['data']['item'] = vh_action('getDashboardItems');
+        $response['data']['language_strings'] = [
+            "greeting" => trans("vaahcms-dashboard.welcome_to_vaahcms"),
+            'message' => trans("vaahcms-dashboard.welcome_message"),
+            'get_started' => trans("vaahcms-dashboard.get_started"),
+            'next_steps' => trans("vaahcms-dashboard.next_steps"),
+            'more_actions' => trans("vaahcms-dashboard.more_actions"),
+            'go_to_theme' => trans("vaahcms-dashboard.go_to_theme"),
+            'activate_theme' => trans("vaahcms-dashboard.activate_theme"),
+            'or' => trans("vaahcms-dashboard.or"),
+            'create_your_own_theme' => trans("vaahcms-dashboard.create_your_own_theme"),
+        ];
 
         return response()->json($response);
 

Http/Controllers/ExtendController.php

@@ -146,7 +146,7 @@ public static function sidebarMenu()
         {
             $list[$n] = [
                 'icon' => "pi pi-box",
-                'label'=> trans("vaahcms-sidebar-menu.advanced"),
+                'label'=> trans("vaahcms-sidebar-menu.extend"),
                 'items'=> [],
             ];
 
@@ -330,32 +330,33 @@ public function getDashboardItems()
         $data = array();
 
         $data['card'] = [
-            "title" => "Users and Roles",
+            "title" => trans("vaahcms-dashboard.users_and_roles"),
+            "link_text" => trans("vaahcms-dashboard.view_details"),
             "list" => [
                 [
                     "count" => User::count(),
-                    "label" => 'Total User',
+                    "label" => trans("vaahcms-dashboard.total_user"),
                     "icon" => "pi-users",
                     "type" => "info",
                     "link" => self::$link."/users/"
                 ],
                 [
                     "count" => Role::count(),
-                    "label" => 'Total Role',
+                    "label" => trans("vaahcms-dashboard.total_role"),
                     "icon" => "pi-tags",
                     "type" => "info",
                     "link" => self::$link."/roles/"
                 ],
                 [
                     "count" => Permission::count(),
-                    "label" => 'Total Permission',
+                    "label" => trans("vaahcms-dashboard.total_permission"),
                     "icon" => "pi-key",
                     "type" => "info",
                     "link" => self::$link."/permissions/"
                 ],
                 [
                     "count" => User::where('is_active',1)->count(),
-                    "label" => 'Active Users',
+                    "label" => trans("vaahcms-dashboard.active_users"),
                     "icon" => "pi-user",
                     "type" => "success",
                     "link" => self::$link."/users?status=active"
@@ -389,23 +390,22 @@ public function getDashboardItems()
 
         $data['expanded_item'] = [
             [
-                'title' => 'Jobs',
+                'title' => trans("vaahcms-dashboard.jobs"),
+                'run_jobs' => trans("vaahcms-dashboard.run_jobs"),
+                'view_settings' => trans("vaahcms-dashboard.view_settings"),
                 'type' => 'content',
-                'description' => 'Tasks that is kept in the queue to be performed one after another.
-                Queues allow you to defer the processing of a time consuming task,
-                such as sending an e-mail, until a later time which drastically
-                speeds up web requests to your application.',
+                'description' => trans("vaahcms-dashboard.content_description"),
                 'is_job_enabled' => $is_job_enabled,
                 'footer' => [
                     [
-                        'name' => 'Pending',
+                        'name' => trans("vaahcms-dashboard.pending_jobs"),
                         'count' => Job::count(),
                         'type' => 'info',
                         'icon' => 'pi pi-envelope',
                         'link' => self::$link."/advanced/jobs/",
                     ],
                     [
-                        'name' => 'Failed',
+                        'name' => trans("vaahcms-dashboard.failed_jobs"),
                         'count' => FailedJob::count(),
                         'type' => 'danger',
                         'icon' => 'pi pi-ban text-red-500',
@@ -414,25 +414,26 @@ public function getDashboardItems()
                 ]
             ],
             [
-                'title' => 'Laravel Logs',
+                'title' => trans("vaahcms-dashboard.laravel_logs"),
+                'view_log' => trans("vaahcms-dashboard.view_log"),
                 'type' => 'list',
                 'list' => $log_list,
                 'list_limit' => 5,
-                'link_text' => "View all recent logs",
+                'link_text' => trans("vaahcms-dashboard.view_all_recent_logs"),
                 'link' => self::$link."/advanced/logs/",
-                'empty_response_note' => "No Error Log Found",
+                'empty_response_note' => trans("vaahcms-dashboard.no_error_log_found"),
             ]
         ];
 
 
         $data['expanded_header_links'] = [
             [
-                'name' => 'Check Updates',
+                'name' => trans("vaahcms-dashboard.check_updates"),
                 'icon' => 'pi pi-refresh',
                 'link' => self::$link."/settings/update"
             ],
             [
-                'name' => 'Getting Started',
+                'name' => trans("vaahcms-dashboard.getting_started"),
                 'icon' => 'pi pi-play',
                 'open_in_new_tab' => true,
                 'link' => 'https://docs.vaah.dev/vaahcms/installation.html'
@@ -446,7 +447,7 @@ public function getDashboardItems()
 
         $data['next_steps'] = [
             [
-                'name' => 'View your Site',
+                'name' => trans("vaahcms-dashboard.view_your_site"),
                 'icon' => 'pi pi-desktop',
                 'link' => url('/')
             ]
@@ -455,7 +456,7 @@ public function getDashboardItems()
 
         $data['actions'] = [
             [
-                'name' => 'Manage your Module',
+                'name' => trans("vaahcms-dashboard.manage_your_module"),
                 'icon' => 'pi pi-box',
                 'link' => self::$link."/modules"
             ]