Skip to content
This repository was archived by the owner on Jan 15, 2024. It is now read-only.

Commit 0a8496e

Browse files
committed
fix: update name for helper functions and routes
1 parent c9d9e6f commit 0a8496e

File tree

6 files changed

+22
-22
lines changed

6 files changed

+22
-22
lines changed

common/helpers.php

+11-11
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22

33
use CSlant\LaraGenAdv\Exceptions\LaravelGeneratorAdvancedException;
44

5-
if (!function_exists('laravel_generator_dist_path')) {
5+
if (!function_exists('lara_gen_adv_dist_path')) {
66
/**
77
* Returns laravel-generator-advanced composer dist path.
88
*
99
* @param string|null $asset
1010
* @return string
1111
*/
12-
function laravel_generator_dist_path(string $asset = null): string
12+
function lara_gen_adv_dist_path(string $asset = null): string
1313
{
1414
$defaultPath = config('lara-gen-adv.defaults.paths.ui_package_path').'/dist/';
15-
$assetPath = config('lara-gen-adv.defaults.paths.laravel_generator_assets_path', $defaultPath);
15+
$assetPath = config('lara-gen-adv.defaults.paths.lara_gen_adv_assets_path', $defaultPath);
1616
if (!str_ends_with($assetPath, '/')) {
1717
$assetPath .= '/';
1818
}
@@ -26,7 +26,7 @@ function laravel_generator_dist_path(string $asset = null): string
2626
}
2727
}
2828

29-
if (!function_exists('laravel_generator_asset')) {
29+
if (!function_exists('lara_gen_adv_asset')) {
3030
/**
3131
* Returns asset from laravel-generator-advanced composer package.
3232
*
@@ -36,21 +36,21 @@ function laravel_generator_dist_path(string $asset = null): string
3636
*
3737
* @throws LaravelGeneratorAdvancedException
3838
*/
39-
function laravel_generator_asset(string $asset): string
39+
function lara_gen_adv_asset(string $asset): string
4040
{
41-
$file = laravel_generator_dist_path($asset);
41+
$file = lara_gen_adv_dist_path($asset);
4242

4343
if (!file_exists($file)) {
4444
throw new LaravelGeneratorAdvancedException(sprintf('%s - this Laravel Generator asset does not exist', $asset));
4545
}
4646

4747
$useAbsolutePath = config('lara-gen-adv.defaults.paths.use_absolute_path');
4848

49-
return route('laravel_generator.asset', ['asset' => $asset], $useAbsolutePath).'?v='.filemtime($file);
49+
return route('lara_gen_adv.asset', ['asset' => $asset], $useAbsolutePath);
5050
}
5151
}
5252

53-
if (!function_exists('laravel_generator_dist_path_allowed')) {
53+
if (!function_exists('lara_gen_adv_dist_path_allowed')) {
5454
/**
5555
* Returns asset allowed from laravel-generator-advanced composer package.
5656
*
@@ -60,17 +60,17 @@ function laravel_generator_asset(string $asset): string
6060
*
6161
* @throws LaravelGeneratorAdvancedException
6262
*/
63-
function laravel_generator_asset_allowed(string $asset): string
63+
function lara_gen_adv_asset_allowed(string $asset): string
6464
{
6565
$allowed_files = [
6666
'favicon-16x16.png',
6767
'favicon-32x32.png',
6868
];
6969

7070
if (!in_array($asset, $allowed_files)) {
71-
throw new LaravelGeneratorAdvancedException(sprintf('%s - this Laravel Generator asset is not allowed', $asset));
71+
throw new LaravelGeneratorAdvancedException(sprintf('%s - this Laravel Generator Advanced asset is not allowed', $asset));
7272
}
7373

74-
return laravel_generator_asset($asset);
74+
return lara_gen_adv_asset($asset);
7575
}
7676
}

config/laravel-generator-advanced.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,24 @@
1111

1212
'routes' => [
1313
/* Route for laravel generator tool */
14-
'tool' => env('TH_LARAVEL_GENERATOR_TOOL_ROUTE', 'laravel-generator-advanced'),
14+
'tool' => env('LARA_GEN_ADV_TOOL_ROUTE', 'laravel-generator-advanced'),
1515
],
1616
],
1717
],
1818

1919
'defaults' => [
2020
'paths' => [
2121
/* Edit to include full URL in ui for assets */
22-
'use_absolute_path' => env('TH_LARAVEL_GENERATOR_USE_ABSOLUTE_PATH', true),
22+
'use_absolute_path' => env('LARA_GEN_ADV_USE_ABSOLUTE_PATH', true),
2323

2424
'views' => base_path('resources/views/vendor/laravel-generator-advanced'),
2525

2626
'ui_package_path' => 'vendor/cslant/laravel-generator-ui',
2727

2828
'assets_folder' => 'dist/',
2929

30-
'laravel_generator_assets_path' => env(
31-
'TH_LARAVEL_GENERATOR_ASSETS_PATH',
30+
'lara_gen_adv_assets_path' => env(
31+
'LARA_GEN_ADV_ASSETS_PATH',
3232
'vendor/cslant/laravel-generator-ui/dist/'
3333
),
3434
],

resources/views/layouts/app.blade.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<!-- Material Icons -->
1919
<link href="https://fonts.googleapis.com/icon?family=Material+Icons+Round" rel="stylesheet">
2020
<!-- CSS Files --><!-- Nucleo Icons -->
21-
<link id="pagestyle" href="{{ laravel_generator_asset('css/main.css') }}" rel="stylesheet"/>
21+
<link href="{{ lara_gen_adv_asset('css/main.css') }}" rel="stylesheet"/>
2222
</head>
2323

2424
<body class="g-sidenav-show bg-gray-200">
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!-- Core JS Files -->
2-
<script src="{{ laravel_generator_asset('js/main.js') }}"></script>
2+
<script src="{{ lara_gen_adv_asset('js/main.js') }}"></script>
33
<script>
44
const win = navigator.platform.indexOf('Win') > -1;
55
if (win && document.querySelector('#sidenav-scrollbar')) {
@@ -9,6 +9,6 @@
99
Scrollbar.init(document.querySelector('#sidenav-scrollbar'), options);
1010
}
1111
</script>
12-
<script src="{{ laravel_generator_asset('js/material-dashboard.min.js') }}"></script>
12+
<script src="{{ lara_gen_adv_asset('js/material-dashboard.min.js') }}"></script>
1313

1414
</html>

routes/web.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
$generatorConfig = $configRepository->generatorConfig();
1313

1414
Route::prefix($generatorConfig['routes']['tool'])->group(function (Router $router) {
15-
Route::get('/', [LaravelGeneratorAdvancedController::class, 'index'])->name('laravel_generator.index');
15+
Route::get('/', [LaravelGeneratorAdvancedController::class, 'index'])->name('lara_gen_adv.index');
1616

1717
Route::get('asset/{asset}', [AssetController::class, 'index'])
18-
->name('laravel_generator.asset')
18+
->name('lara_gen_adv.asset')
1919
->where('asset', '.*');
2020

2121
Route::get('repository', [RepositoryGeneratorController::class, 'index'])
22-
->name('laravel_generator.repository.index');
22+
->name('lara_gen_adv.repository.index');
2323
});
2424
});

src/Http/Controllers/Asset/AssetController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public function index(Request $request): string
2121
$asset = $request->offsetGet('asset');
2222

2323
try {
24-
$path = laravel_generator_dist_path($asset);
24+
$path = lara_gen_adv_dist_path($asset);
2525

2626
return (new Response(
2727
$fileSystem->get($path),

0 commit comments

Comments
 (0)