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

Develop #38

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .styleci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ preset: laravel

disabled:
- not_operator_with_successor_space
- laravel_phpdoc_separation
- laravel_phpdoc_alignment
17 changes: 3 additions & 14 deletions config/laravel-generator-advanced.php
Original file line number Diff line number Diff line change
@@ -1,22 +1,11 @@
<?php

return [
'default' => 'default',

'app_name' => 'Laravel Generator Advanced',

'generators' => [
'default' => [
'path' => 'app',

'routes' => [
/* Route for laravel generator tool */
'tool' => env('LARA_GEN_ADV_TOOL_ROUTE', 'laravel-generator-advanced'),
],
],
],
'tool_name' => 'Laravel Generator Advanced',

'defaults' => [
'route_prefix' => env('LARA_GEN_ADV_ROUTE_PREFIX', 'laravel-generator-advanced'),

'paths' => [
/* Edit to include full URL in ui for assets */
'use_absolute_path' => env('LARA_GEN_ADV_USE_ABSOLUTE_PATH', true),
Expand Down
2 changes: 1 addition & 1 deletion lang/en/generator.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

return [
'app_name' => 'Laravel Generator Advanced',
'tool_name' => 'Laravel Generator Advanced',
'dashboard' => 'Laravel Generator Advanced Dashboard',
];
2 changes: 1 addition & 1 deletion lang/ja/generator.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

return [
'app_name' => 'Laravel ジェネレーター',
'tool_name' => 'Laravel ジェネレーター',
'dashboard' => 'Laravel ジェネレーター ダッシュボード',
];
2 changes: 1 addition & 1 deletion lang/vi/generator.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

return [
'app_name' => 'Laravel Generator',
'tool_name' => 'Laravel Generator',
'dashboard' => 'Laravel Generator Dashboard',
];
7 changes: 7 additions & 0 deletions phpstan-baseline.neon
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
parameters:
ignoreErrors:
- message: '#Parameter \#1 \$prefix of static method Illuminate\\Support\\Facades\\Route::prefix\(\) expects string, mixed given\.#'
path: routes/web.php

- message: '#Parameter \#1 \$asset of function lara_gen_adv_dist_path expects string\|null, mixed given#'
path: src/Http/Controllers/Asset/AssetController.php
1 change: 1 addition & 0 deletions phpstan.neon.dist
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ parameters:
checkOctaneCompatibility: true
checkModelProperties: true
checkMissingIterableValueType: false
checkGenericClassInNonGenericObjectType: false
2 changes: 1 addition & 1 deletion resources/views/layouts/app.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<link rel="apple-touch-icon" sizes="76x76" href="#">
<link rel="icon" type="image/png" href="#">
<title>
@yield('title', config('lara-gen-adv.app_name', __('lara-gen-adv::generator.app_name')))
@yield('title', config('lara-gen-adv.tool_name', __('lara-gen-adv::generator.tool_name')))
</title>
<!-- Fonts and icons -->
<link rel="stylesheet" type="text/css"
Expand Down
2 changes: 1 addition & 1 deletion resources/views/shared/left_bar.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<i class="fas fa-times p-3 cursor-pointer text-white opacity-5 position-absolute end-0 top-0 d-none d-xl-none" aria-hidden="true" id="iconSidenav"></i>
<a class="navbar-brand m-0" href="https://github.com/cslant/laravel-generator-advanced" target="_blank">
<img src="../assets/img/logo-ct.png" class="navbar-brand-img h-100" alt="main logo">
<span class="ms-1 font-weight-bold text-white">{{ __('lara-gen-adv::generator.app_name') }}</span>
<span class="ms-1 font-weight-bold text-white">{{ __('lara-gen-adv::generator.tool_name') }}</span>
</a>
</div>
<hr class="horizontal light mt-0 mb-2">
Expand Down
4 changes: 2 additions & 2 deletions resources/views/shared/navbar.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<nav aria-label="breadcrumb">
<ol class="breadcrumb bg-transparent mb-0 pb-0 pt-1 px-0 me-sm-6 me-5">
<li class="breadcrumb-item text-sm">
<a class="opacity-5 text-dark" href="javascript:void(0);">{{ config('lara-gen-adv.app_name') }}</a>
<a class="opacity-5 text-dark" href="javascript:void(0);">{{ config('lara-gen-adv.tool_name') }}</a>
</li>
<li class="breadcrumb-item text-sm text-dark active" aria-current="page">@yield('title', config('lara-gen-adv.app_name', __('lara-gen-adv::generator.app_name')))</li>
<li class="breadcrumb-item text-sm text-dark active" aria-current="page">@yield('title', config('lara-gen-adv.tool_name', __('lara-gen-adv::generator.tool_name')))</li>
</ol>
</nav>
<div class="collapse navbar-collapse mt-sm-0 mt-2 me-md-0 me-sm-4" id="navbar">
Expand Down
20 changes: 7 additions & 13 deletions routes/web.php
Original file line number Diff line number Diff line change
@@ -1,24 +1,18 @@
<?php

use CSlant\LaraGenAdv\Helpers\ConfigHelper;
use CSlant\LaraGenAdv\Http\Controllers\Asset\AssetController;
use CSlant\LaraGenAdv\Http\Controllers\Generator\RepositoryGeneratorController;
use CSlant\LaraGenAdv\Http\Controllers\LaravelGeneratorAdvancedController;
use Illuminate\Routing\Router;
use Illuminate\Support\Facades\Route;

Route::namespace('CSlant\LaraGenAdv\Http\Controllers')->group(function () {
$configRepository = resolve(ConfigHelper::class);
$generatorConfig = $configRepository->generatorConfig();
$routePrefix = config('lara-gen-adv.defaults.route_prefix');

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

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

Route::get('repository', [RepositoryGeneratorController::class, 'index'])
->name('lara_gen_adv.repository.index');
});
Route::get('repository', [RepositoryGeneratorController::class, 'index'])->name('lara_gen_adv.repository.index');
});
71 changes: 0 additions & 71 deletions src/Helpers/ConfigHelper.php

This file was deleted.

2 changes: 1 addition & 1 deletion src/Http/Controllers/Asset/AssetController.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public function index(Request $request): Response
$fileSystem->get($path),
200,
[
'Content-Type' => pathinfo($asset, PATHINFO_EXTENSION) == 'css'
'Content-Type' => pathinfo($path, PATHINFO_EXTENSION) == 'css'
? 'text/css'
: 'application/javascript',
]
Expand Down
Loading