fix: update name for helper functions and routes

cslant · Jan 10, 2024 · 0a8496e · 0a8496e
1 parent c9d9e6f
commit 0a8496e
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 22 deletions.
diff --git a/common/helpers.php b/common/helpers.php
@@ -2,17 +2,17 @@
 
 use CSlant\LaraGenAdv\Exceptions\LaravelGeneratorAdvancedException;
 
-if (!function_exists('laravel_generator_dist_path')) {
+if (!function_exists('lara_gen_adv_dist_path')) {
     /**
      * Returns laravel-generator-advanced composer dist path.
      *
      * @param  string|null  $asset
      * @return string
      */
-    function laravel_generator_dist_path(string $asset = null): string
+    function lara_gen_adv_dist_path(string $asset = null): string
     {
         $defaultPath = config('lara-gen-adv.defaults.paths.ui_package_path').'/dist/';
-        $assetPath = config('lara-gen-adv.defaults.paths.laravel_generator_assets_path', $defaultPath);
+        $assetPath = config('lara-gen-adv.defaults.paths.lara_gen_adv_assets_path', $defaultPath);
         if (!str_ends_with($assetPath, '/')) {
             $assetPath .= '/';
         }
@@ -26,7 +26,7 @@ function laravel_generator_dist_path(string $asset = null): string
     }
 }
 
-if (!function_exists('laravel_generator_asset')) {
+if (!function_exists('lara_gen_adv_asset')) {
     /**
      * Returns asset from laravel-generator-advanced composer package.
      *
@@ -36,21 +36,21 @@ function laravel_generator_dist_path(string $asset = null): string
      *
      * @throws LaravelGeneratorAdvancedException
      */
-    function laravel_generator_asset(string $asset): string
+    function lara_gen_adv_asset(string $asset): string
     {
-        $file = laravel_generator_dist_path($asset);
+        $file = lara_gen_adv_dist_path($asset);
 
         if (!file_exists($file)) {
             throw new LaravelGeneratorAdvancedException(sprintf('%s - this Laravel Generator asset does not exist', $asset));
         }
 
         $useAbsolutePath = config('lara-gen-adv.defaults.paths.use_absolute_path');
 
-        return route('laravel_generator.asset', ['asset' => $asset], $useAbsolutePath).'?v='.filemtime($file);
+        return route('lara_gen_adv.asset', ['asset' => $asset], $useAbsolutePath);
     }
 }
 
-if (!function_exists('laravel_generator_dist_path_allowed')) {
+if (!function_exists('lara_gen_adv_dist_path_allowed')) {
     /**
      * Returns asset allowed from laravel-generator-advanced composer package.
      *
@@ -60,17 +60,17 @@ function laravel_generator_asset(string $asset): string
      *
      * @throws LaravelGeneratorAdvancedException
      */
-    function laravel_generator_asset_allowed(string $asset): string
+    function lara_gen_adv_asset_allowed(string $asset): string
     {
         $allowed_files = [
             'favicon-16x16.png',
             'favicon-32x32.png',
         ];
 
         if (!in_array($asset, $allowed_files)) {
-            throw new LaravelGeneratorAdvancedException(sprintf('%s - this Laravel Generator asset is not allowed', $asset));
+            throw new LaravelGeneratorAdvancedException(sprintf('%s - this Laravel Generator Advanced asset is not allowed', $asset));
         }
 
-        return laravel_generator_asset($asset);
+        return lara_gen_adv_asset($asset);
     }
 }
diff --git a/config/laravel-generator-advanced.php b/config/laravel-generator-advanced.php
@@ -11,24 +11,24 @@
 
             'routes' => [
                 /* Route for laravel generator tool */
-                'tool' => env('TH_LARAVEL_GENERATOR_TOOL_ROUTE', 'laravel-generator-advanced'),
+                'tool' => env('LARA_GEN_ADV_TOOL_ROUTE', 'laravel-generator-advanced'),
             ],
         ],
     ],
 
     'defaults' => [
         'paths' => [
             /* Edit to include full URL in ui for assets */
-            'use_absolute_path' => env('TH_LARAVEL_GENERATOR_USE_ABSOLUTE_PATH', true),
+            'use_absolute_path' => env('LARA_GEN_ADV_USE_ABSOLUTE_PATH', true),
 
             'views' => base_path('resources/views/vendor/laravel-generator-advanced'),
 
             'ui_package_path' => 'vendor/cslant/laravel-generator-ui',
 
             'assets_folder' => 'dist/',
 
-            'laravel_generator_assets_path' => env(
-                'TH_LARAVEL_GENERATOR_ASSETS_PATH',
+            'lara_gen_adv_assets_path' => env(
+                'LARA_GEN_ADV_ASSETS_PATH',
                 'vendor/cslant/laravel-generator-ui/dist/'
             ),
         ],

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
@@ -18,7 +18,7 @@
     <!-- Material Icons -->
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons+Round" rel="stylesheet">
     <!-- CSS Files --><!-- Nucleo Icons -->
-    <link id="pagestyle" href="{{ laravel_generator_asset('css/main.css') }}" rel="stylesheet"/>
+    <link href="{{ lara_gen_adv_asset('css/main.css') }}" rel="stylesheet"/>
 </head>
 
 <body class="g-sidenav-show bg-gray-200">

diff --git a/resources/views/shared/footer.blade.php b/resources/views/shared/footer.blade.php
@@ -1,5 +1,5 @@
 <!--   Core JS Files   -->
-<script src="{{ laravel_generator_asset('js/main.js') }}"></script>
+<script src="{{ lara_gen_adv_asset('js/main.js') }}"></script>
 <script>
     const win = navigator.platform.indexOf('Win') > -1;
     if (win && document.querySelector('#sidenav-scrollbar')) {
@@ -9,6 +9,6 @@
         Scrollbar.init(document.querySelector('#sidenav-scrollbar'), options);
     }
 </script>
-<script src="{{ laravel_generator_asset('js/material-dashboard.min.js') }}"></script>
+<script src="{{ lara_gen_adv_asset('js/material-dashboard.min.js') }}"></script>
 
 </html>
diff --git a/routes/web.php b/routes/web.php
@@ -12,13 +12,13 @@
     $generatorConfig = $configRepository->generatorConfig();
 
     Route::prefix($generatorConfig['routes']['tool'])->group(function (Router $router) {
-        Route::get('/', [LaravelGeneratorAdvancedController::class, 'index'])->name('laravel_generator.index');
+        Route::get('/', [LaravelGeneratorAdvancedController::class, 'index'])->name('lara_gen_adv.index');
 
         Route::get('asset/{asset}', [AssetController::class, 'index'])
-            ->name('laravel_generator.asset')
+            ->name('lara_gen_adv.asset')
             ->where('asset', '.*');
 
         Route::get('repository', [RepositoryGeneratorController::class, 'index'])
-            ->name('laravel_generator.repository.index');
+            ->name('lara_gen_adv.repository.index');
     });
 });
diff --git a/src/Http/Controllers/Asset/AssetController.php b/src/Http/Controllers/Asset/AssetController.php
@@ -21,7 +21,7 @@ public function index(Request $request): string
         $asset = $request->offsetGet('asset');
 
         try {
-            $path = laravel_generator_dist_path($asset);
+            $path = lara_gen_adv_dist_path($asset);
 
             return (new Response(
                 $fileSystem->get($path),