fix: various fixes after PR reviews

Author: mitulgolakiya

src/Commands/Publish/PublishTablesCommand.php

@@ -67,7 +67,7 @@ protected function publishDataTableViews()
         ];
 
         foreach ($files as $stub => $blade) {
-            $sourceFile = get_file_path('views/scaffold/'.$stub, 'laravel-generator');
+            $sourceFile = get_template_file_path('views/scaffold/'.$stub, 'laravel-generator');
             $destinationFile = $viewsPath.$blade;
             $this->publishFile($sourceFile, $destinationFile, $blade);
         }

src/Commands/Publish/PublishUserCommand.php

@@ -41,7 +41,7 @@ private function copyViews()
         $files = $this->getViews();
 
         foreach ($files as $stub => $blade) {
-            $sourceFile = get_file_path('views/templates/'.$stub, $templateType);
+            $sourceFile = get_template_file_path('views/templates/'.$stub, $templateType);
             $destinationFile = $viewsPath.$blade;
             $this->publishFile($sourceFile, $destinationFile, $blade);
         }
@@ -71,7 +71,7 @@ private function updateRoutes()
 
         $routeContents = g_filesystem()->getFile($path);
         $controllerNamespace = config('laravel_generator.namespace.controller');
-        $routeContents .= "\n\n"."Route::resource('users', '$controllerNamespace\UserController')->middleware('auth');";
+        $routeContents .= infy_nls(2)."Route::resource('users', '$controllerNamespace\UserController')->middleware('auth');";
 
         g_filesystem()->createFile($path, $routeContents);
         $this->comment("\nUser route added");
@@ -83,8 +83,8 @@ private function updateMenu()
         $templateType = config('laravel_generator.templates', 'adminlte-templates');
         $path = $viewsPath.'layouts/menu.blade.php';
         $menuContents = g_filesystem()->getFile($path);
-        $sourceFile = g_filesystem()->getFile(get_file_path('views/templates/users/menu', $templateType));
-        $menuContents .= "\n".$sourceFile;
+        $sourceFile = g_filesystem()->getFile(get_template_file_path('views/templates/users/menu', $templateType));
+        $menuContents .= infy_nl().$sourceFile;
 
         g_filesystem()->createFile($path, $menuContents);
         $this->comment("\nUser Menu added");

src/helpers.php

@@ -65,26 +65,6 @@ function get_template_file_path(string $templateName, string $templateType): str
             return $path;
         }
 
-        return get_templates_package_path($templateType).'/templates/'.$templateName.'.blade.php';
-    }
-}
-
-if (!function_exists('get_file_path')) {
-    function get_file_path(string $templateName, string $templateType): string
-    {
-        $templateName = str_replace('.', '/', $templateName);
-
-        $templatesPath = config(
-            'laravel_generator.path.templates_dir',
-            resource_path('infyom/infyom-generator-templates/')
-        );
-
-        $path = $templatesPath.$templateName.'.blade.php';
-
-        if (file_exists($path)) {
-            return $path;
-        }
-
         return get_templates_package_path($templateType).'/'.$templateName.'.blade.php';
     }
 }
@@ -100,89 +80,29 @@ function get_templates_package_path(string $templateType): string
     }
 }
 
-if (!function_exists('get_template')) {
-    function get_template(string $templateName, string $templateType): string
-    {
-        $path = get_template_file_path($templateName, $templateType);
-
-        return g_filesystem()->getFile($path);
-    }
-}
-
-if (!function_exists('fill_template')) {
-    function fill_template(array $variables, string $template): string
-    {
-        foreach ($variables as $variable => $value) {
-            $template = str_replace($variable, $value, $template);
-        }
-
-        return $template;
-    }
-}
-
-if (!function_exists('fill_field_template')) {
-    function fill_field_template(array $variables, string $template, GeneratorField $field): string
-    {
-        foreach ($variables as $variable => $key) {
-            $template = str_replace($variable, $field->$key, $template);
-        }
-
-        return $template;
-    }
-}
-
-if (!function_exists('fill_template_with_field_data')) {
-    function fill_template_with_field_data(array $variables, array $fieldVariables, string $template, GeneratorField $field): string
+if (!function_exists('model_name_from_table_name')) {
+    function model_name_from_table_name(string $tableName): string
     {
-        $template = fill_template($variables, $template);
-
-        return fill_field_template($fieldVariables, $template, $field);
+        return Str::ucfirst(Str::camel(Str::singular($tableName)));
     }
 }
 
-if (!function_exists('fill_template_with_field_data_locale')) {
-    function fill_template_with_field_data_locale(array $variables, array $fieldVariables, string $template, GeneratorField $field): string
+if (!function_exists('create_resource_route_names')) {
+    function create_resource_route_names($name, $isScaffold = false): array
     {
-        $template = fill_template($variables, $template);
-        $modelName = $variables['$MODEL_NAME_PLURAL_CAMEL$'];
-
-        return fill_field_template_locale($fieldVariables, $template, $field, $modelName);
-    }
-}
+        $result = [
+            "'index' => '$name.index'",
+            "'store' => '$name.store'",
+            "'show' => '$name.show'",
+            "'update' => '$name.update'",
+            "'destroy' => '$name.destroy'",
+        ];
 
-if (!function_exists('fill_field_template_locale')) {
-    function fill_field_template_locale(array $variables, string $template, GeneratorField $field, string $modelName): string
-    {
-        foreach ($variables as $variable => $key) {
-            $value = $field->name;
-            $template = str_replace($variable, "@lang('models/$modelName.fields.$value')", $template);
+        if ($isScaffold) {
+            $result[] = "'create' => '$name.create'";
+            $result[] = "'edit' => '$name.edit'";
         }
 
-        return $template;
+        return $result;
     }
 }
-
-if (!function_exists('model_name_from_table_name')) {
-    function model_name_from_table_name(string $tableName): string
-    {
-        return Str::ucfirst(Str::camel(Str::singular($tableName)));
-    }
-}
-
-function createResourceRouteNames($name, $isScaffold = false)
-{
-    $result = [
-        "'index' => '$name.index'",
-        "'store' => '$name.store'",
-        "'show' => '$name.show'",
-        "'update' => '$name.update'",
-        "'destroy' => '$name.destroy'",
-    ];
-
-    if ($isScaffold) {
-        $result[] = "'create' => '$name.create'";
-        $result[] = "'edit' => '$name.edit'";
-    }
-
-    return $result;
-}

views/api/routes.blade.php

@@ -1,2 +1,2 @@
 Route::resource('{{ $config->prefixes->getRoutePrefixWith('/') }}{{ $config->modelNames->dashedPlural }}', {{ $config->namespaces->apiController }}\{{ $config->modelNames->name }}APIController::class){!! infy_nl_tab() !!}->except(['create', 'edit'])@if(!$config->prefixes->route);@endif
-@if($config->prefixes->route){!! infy_nl_tab().'->names(['.infy_nl_tab(1,2).implode(','.infy_nl_tab(1, 2), createResourceRouteNames($config->prefixes->getRoutePrefixWith('.').$config->modelNames->camelPlural)).infy_nl_tab().']);' !!}@endif
+@if($config->prefixes->route){!! infy_nl_tab().'->names(['.infy_nl_tab(1,2).implode(','.infy_nl_tab(1, 2), create_resource_route_names($config->prefixes->getRoutePrefixWith('.').$config->modelNames->camelPlural)).infy_nl_tab().']);' !!}@endif

views/scaffold/controller/controller_repository.blade.php

@@ -4,7 +4,7 @@
 
 namespace {{ $config->namespaces->controller }};
 
-@if(config('laravel_generator.tables') == 'datatables')
+@if(config('laravel_generator.tables') === 'datatables')
 use {{ $config->namespaces->dataTables }}\{{ $config->modelNames->name }}DataTable;
 @endif
 use {{ $config->namespaces->request }}\Create{{ $config->modelNames->name }}Request;

views/scaffold/routes.blade.php

@@ -1,2 +1,2 @@
 Route::resource('{{ $config->prefixes->getRoutePrefixWith('/') }}{{ $config->modelNames->dashedPlural }}', {{ $config->namespaces->controller }}\{{ $config->modelNames->name }}Controller::class)@if(!$config->prefixes->route);@endif
-@if($config->prefixes->route){!! infy_nl_tab().'->names(['.infy_nl_tab(1, 2).implode(','.infy_nl_tab(1, 2), createResourceRouteNames($config->prefixes->getRoutePrefixWith('.').$config->modelNames->camelPlural, true)).infy_nl_tab().']);' !!}@endif
+@if($config->prefixes->route){!! infy_nl_tab().'->names(['.infy_nl_tab(1, 2).implode(','.infy_nl_tab(1, 2), create_resource_route_names($config->prefixes->getRoutePrefixWith('.').$config->modelNames->camelPlural, true)).infy_nl_tab().']);' !!}@endif