Merge pull request #37 from tanhongit/develop

Develop

README.md

@@ -2,12 +2,12 @@
 
 This package is used to generate models, controllers, views, routes, migrations, seeders, factories, requests, and more for Laravel.
 
-[![Latest Version](https://img.shields.io/github/release/cslant/laravel-generator.svg?style=flat-square)](https://github.com/cslant/laravel-generator/releases)
-[![Total Downloads](https://img.shields.io/packagist/dt/cslant/laravel-generator.svg?style=flat-square)](https://packagist.org/packages/cslant/laravel-generator)
-![Test Status](https://img.shields.io/github/actions/workflow/status/cslant/laravel-generator/setup_test.yml?label=tests&branch=main)
+[![Latest Version](https://img.shields.io/github/release/cslant/laravel-generator-advanced.svg?style=flat-square)](https://github.com/cslant/laravel-generator-advanced/releases)
+[![Total Downloads](https://img.shields.io/packagist/dt/cslant/laravel-generator-advanced.svg?style=flat-square)](https://packagist.org/packages/cslant/laravel-generator-advanced)
+![Test Status](https://img.shields.io/github/actions/workflow/status/cslant/laravel-generator-advanced/setup_test.yml?label=tests&branch=main)
 [![StyleCI](https://styleci.io/repos/605697295/shield)](https://styleci.io/repos/605697295)
-[![Quality Score](https://img.shields.io/scrutinizer/g/cslant/laravel-generator.svg?style=flat-square)](https://scrutinizer-ci.com/g/cslant/laravel-generator)
-[![Maintainability](https://api.codeclimate.com/v1/badges/231c123bfa276fd1ac3c/maintainability)](https://codeclimate.com/github/cslant/laravel-generator/maintainability)
+[![Quality Score](https://img.shields.io/scrutinizer/g/cslant/laravel-generator-advanced.svg?style=flat-square)](https://scrutinizer-ci.com/g/cslant/laravel-generator-advanced)
+[![Maintainability](https://api.codeclimate.com/v1/badges/231c123bfa276fd1ac3c/maintainability)](https://codeclimate.com/github/cslant/laravel-generator-advanced/maintainability)
 
 ## Technology
 
@@ -20,34 +20,34 @@ This package is used to generate models, controllers, views, routes, migrations,
 You can install the package with [Composer](https://getcomposer.org/) using the following command:
 
 ```bash
-composer require cslant/laravel-generator
+composer require cslant/laravel-generator-advanced
 ```
 
 ## Publish the config file, views, and language files
 
 If you want to change the default configuration, the views, or the language files, you can publish them with the following command:
 
 ```bash
- php artisan vendor:publish --provider="CSlant\LaravelGenerator\Providers\LaravelGeneratorServiceProvider" 
+ php artisan vendor:publish --provider="CSlant\LaraGenAdv\Providers\LaravelGeneratorServiceProvider" 
 ```
 
 If you have run the above command, you will see the following files in your project:
 
-- `config/laravel-generator.php`
-- `resources/views/vendor/laravel-generator`
+- `config/laravel-generator-advanced.php`
+- `resources/views/vendor/laravel-generator-advanced`
 
 ---
 
 Also, you can publish only the config file with the following command:
 
 ```bash
- php artisan vendor:publish --provider="CSlant\LaravelGenerator\Providers\LaravelGeneratorServiceProvider" --tag="config" 
+ php artisan vendor:publish --provider="CSlant\LaraGenAdv\Providers\LaravelGeneratorServiceProvider" --tag="config" 
 ```
 
 Similarly, you can publish only the views with the following command:
 
 ```bash
- php artisan vendor:publish --provider="CSlant\LaravelGenerator\Providers\LaravelGeneratorServiceProvider" --tag="views" 
+ php artisan vendor:publish --provider="CSlant\LaraGenAdv\Providers\LaravelGeneratorServiceProvider" --tag="views" 
 ```
 
 
@@ -56,7 +56,7 @@ Similarly, you can publish only the views with the following command:
 The MIT License (MIT). Please see [License File](LICENSE) for more information.
 
 <p align="center">
-    <a href="https://packagist.org/packages/cslant/laravel-generator">
+    <a href="https://packagist.org/packages/cslant/laravel-generator-advanced">
         <img src="https://img.shields.io/packagist/l/doctrine/orm.svg" data-origin="https://img.shields.io/packagist/l/doctrine/orm.svg" alt="license">
     </a>
 </p>

common/helpers.php

@@ -1,18 +1,18 @@
 <?php
 
-use CSlant\LaravelGenerator\Exceptions\LaravelGeneratorException;
+use CSlant\LaraGenAdv\Exceptions\LaravelGeneratorAdvancedException;
 
-if (!function_exists('laravel_generator_dist_path')) {
+if (!function_exists('lara_gen_adv_dist_path')) {
     /**
-     * Returns laravel-generator composer 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('laravel-generator.defaults.paths.ui_package_path').'/dist/';
-        $assetPath = config('laravel-generator.defaults.paths.laravel_generator_assets_path', $defaultPath);
+        $defaultPath = config('lara-gen-adv.defaults.paths.ui_package_path').'/dist/';
+        $assetPath = config('lara-gen-adv.defaults.paths.lara_gen_adv_assets_path', $defaultPath);
         if (!str_ends_with($assetPath, '/')) {
             $assetPath .= '/';
         }
@@ -26,49 +26,51 @@ 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 composer package.
+     * Returns asset from laravel-generator-advanced composer package.
      *
      * @param  string  $asset
+     *
      * @return string
      *
-     * @throws LaravelGeneratorException
+     * @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 LaravelGeneratorException(sprintf('%s - this Laravel Generator asset does not exist', $asset));
+            throw new LaravelGeneratorAdvancedException(sprintf('%s - this Laravel Generator asset does not exist', $asset));
         }
 
-        $useAbsolutePath = config('laravel-generator.defaults.paths.use_absolute_path');
+        $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).'?v='.filemtime($file);
     }
 }
 
-if (!function_exists('laravel_generator_dist_path_allowed')) {
+if (!function_exists('lara_gen_adv_dist_path_allowed')) {
     /**
-     * Returns asset allowed from laravel-generator composer package.
+     * Returns asset allowed from laravel-generator-advanced composer package.
      *
      * @param  string  $asset
+     *
      * @return string
      *
-     * @throws LaravelGeneratorException
+     * @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 LaravelGeneratorException(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);
     }
 }

composer.json

@@ -1,12 +1,12 @@
 {
-    "name": "cslant/laravel-generator",
-    "description": "Laravel Generator",
-    "homepage": "https://github.com/cslant/laravel-generator",
+    "name": "cslant/laravel-generator-advanced",
+    "description": "Laravel Generator Advanced is a package that helps you generate CRUD, Migration, Model, Controller, Repository, Request, Resource, Factory, Seeder, Action, ...",
+    "homepage": "https://github.com/cslant/laravel-generator-advanced",
     "type": "library",
     "license": "MIT",
     "keywords": [
-        "laravel",
-        "generator",
+        "laravel generator",
+        "generator advanced",
         "crud generator",
         "migration generator",
         "model generator",
@@ -17,17 +17,17 @@
         "factory",
         "seeder",
         "action",
-        "laravel generator",
+        "laravel generator advanced",
         "cslant"
     ],
     "autoload": {
         "psr-4": {
-            "CSlant\\LaravelGenerator\\": "src/"
+            "CSlant\\LaraGenAdv\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "CSlant\\LaravelGenerator\\Tests\\": "tests/"
+            "CSlant\\LaraGenAdv\\Tests\\": "tests/"
         }
     },
     "authors": [
@@ -60,12 +60,12 @@
         "format": "vendor/bin/php-cs-fixer fix --allow-risky=yes"
     },
     "support": {
-        "issues": "https://github.com/cslant/laravel-generator/issues"
+        "issues": "https://github.com/cslant/laravel-generator-advanced/issues"
     },
     "extra": {
         "laravel": {
             "providers": [
-                "CSlant\\LaravelGenerator\\Providers\\LaravelGeneratorServiceProvider"
+                "CSlant\\LaraGenAdv\\Providers\\LaravelGeneratorAdvancedServiceProvider"
             ]
         }
     },

config/laravel-generator.php → config/laravel-generator-advanced.php

@@ -3,32 +3,32 @@
 return [
     'default' => 'default',
 
-    'app_name' => 'Laravel Generator',
+    'app_name' => 'Laravel Generator Advanced',
 
     'generators' => [
         'default' => [
             'path' => 'app',
 
             'routes' => [
                 /* Route for laravel generator tool */
-                'tool' => env('TH_LARAVEL_GENERATOR_TOOL_ROUTE', 'laravel-generator'),
+                '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'),
+            '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/'
             ),
         ],

lang/en/generator.php

@@ -1,6 +1,6 @@
 <?php
 
 return [
-    'app_name' => 'Laravel Generator',
-    'dashboard' => 'Laravel Generator Dashboard',
+    'app_name' => 'Laravel Generator Advanced',
+    'dashboard' => 'Laravel Generator Advanced Dashboard',
 ];

lang/en/settings.php

@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'title' => 'Laravel Generator Config',
+    'title' => 'Laravel Generator Advanced Configuration',
     'description' => 'You can change the sidenav type just on desktop view.',
     'see_options' => 'See options.',
     'sidebar' => [

phpunit.xml

@@ -13,7 +13,7 @@
         </include>
     </coverage>
     <testsuites>
-        <testsuite name="CSlant LaravelGenerator Test Suite">
+        <testsuite name="CSlant Laravel Generator Advanced Test Suite">
             <directory>tests</directory>
         </testsuite>
     </testsuites>

resources/views/index.blade.php

@@ -1,7 +1,7 @@
-@extends('laravel-generator::layouts.app')
+@extends('lara-gen-adv::layouts.app')
 
-@section('title', __('laravel-generator::generator.dashboard'))
+@section('title', __('lara-gen-adv::generator.dashboard'))
 
-@section('laravel-generator-content')
+@section('lara-gen-adv-content')
 
 @endsection

resources/views/layouts/app.blade.php

@@ -7,7 +7,7 @@
     <link rel="apple-touch-icon" sizes="76x76" href="#">
     <link rel="icon" type="image/png" href="#">
     <title>
-        @yield('title', config('laravel-generator.app_name', __('laravel-generator::generator.app_name')))
+        @yield('title', config('lara-gen-adv.app_name', __('lara-gen-adv::generator.app_name')))
     </title>
     <!-- Fonts and icons -->
     <link rel="stylesheet" type="text/css"
@@ -18,21 +18,21 @@
     <!-- 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">
-@include('laravel-generator::shared.left_bar')
+@include('lara-gen-adv::shared.left_bar')
 
 <div class="main-content position-relative max-height-vh-100 h-100">
     <!-- Navbar -->
-    @include('laravel-generator::shared.navbar')
+    @include('lara-gen-adv::shared.navbar')
     <!-- End Navbar -->
 
-    @yield('laravel-generator-content')
+    @yield('lara-gen-adv-content')
 </div>
 
-@include('laravel-generator::shared.configurator_settings')
+@include('lara-gen-adv::shared.configurator_settings')
 
-@include('laravel-generator::shared.footer')
+@include('lara-gen-adv::shared.footer')
 </body>

resources/views/shared/configurator_settings.blade.php

@@ -5,8 +5,8 @@
     <div class="card shadow-lg">
         <div class="card-header pb-0 pt-3">
             <div class="float-start">
-                <h5 class="mt-3 mb-0">{{ __('laravel-generator::settings.title') }}</h5>
-                <p>{{ __('laravel-generator::settings.see_options') }}</p>
+                <h5 class="mt-3 mb-0">{{ __('lara-gen-adv::settings.title') }}</h5>
+                <p>{{ __('lara-gen-adv::settings.see_options') }}</p>
             </div>
             <div class="float-end mt-4">
                 <button class="btn btn-link text-dark p-0 fixed-plugin-close-button">
@@ -19,7 +19,7 @@
         <div class="card-body pt-sm-3 pt-0">
             <!-- Sidebar Backgrounds -->
             <div>
-                <h6 class="mb-0">{{ __('laravel-generator::settings.sidebar.color') }}</h6>
+                <h6 class="mb-0">{{ __('lara-gen-adv::settings.sidebar.color') }}</h6>
             </div>
             <a href="javascript:void(0)" class="switch-trigger background-color">
                 <div class="badge-colors my-2 text-start">
@@ -33,30 +33,30 @@
             </a>
             <!-- Sidenav Type -->
             <div class="mt-3">
-                <h6 class="mb-0">{{ __('laravel-generator::settings.sidebar.nav_type') }}</h6>
-                <p class="text-sm">{{ __('laravel-generator::settings.sidebar.nav_description') }}</p>
+                <h6 class="mb-0">{{ __('lara-gen-adv::settings.sidebar.nav_type') }}</h6>
+                <p class="text-sm">{{ __('lara-gen-adv::settings.sidebar.nav_description') }}</p>
             </div>
             <div class="d-flex">
-                <button class="btn bg-gradient-dark px-3 mb-2 active" data-class="bg-gradient-dark" onclick="sidebarType(this)">{{ __('laravel-generator::settings.sidebar.dark') }}</button>
-                <button class="btn bg-gradient-dark px-3 mb-2 ms-2" data-class="bg-transparent" onclick="sidebarType(this)">{{ __('laravel-generator::settings.sidebar.transparent') }}</button>
-                <button class="btn bg-gradient-dark px-3 mb-2 ms-2" data-class="bg-white" onclick="sidebarType(this)">{{ __('laravel-generator::settings.sidebar.light') }}</button>
+                <button class="btn bg-gradient-dark px-3 mb-2 active" data-class="bg-gradient-dark" onclick="sidebarType(this)">{{ __('lara-gen-adv::settings.sidebar.dark') }}</button>
+                <button class="btn bg-gradient-dark px-3 mb-2 ms-2" data-class="bg-transparent" onclick="sidebarType(this)">{{ __('lara-gen-adv::settings.sidebar.transparent') }}</button>
+                <button class="btn bg-gradient-dark px-3 mb-2 ms-2" data-class="bg-white" onclick="sidebarType(this)">{{ __('lara-gen-adv::settings.sidebar.light') }}</button>
             </div>
-            <p class="text-sm d-xl-none d-block mt-2">{{ __('laravel-generator::settings.description') }}</p>
+            <p class="text-sm d-xl-none d-block mt-2">{{ __('lara-gen-adv::settings.description') }}</p>
             <!-- Navbar Fixed -->
             <div class="mt-3 d-flex">
-                <h6 class="mb-0">{{ __('laravel-generator::settings.sidebar.nav_fixed') }}</h6>
+                <h6 class="mb-0">{{ __('lara-gen-adv::settings.sidebar.nav_fixed') }}</h6>
                 <div class="form-check form-switch ps-0 ms-auto my-auto">
                     <label for="navbarFixed"></label><input class="form-check-input mt-1 ms-auto" type="checkbox" id="navbarFixed" onclick="navbarFixed(this)">
                 </div>
             </div>
             <hr class="horizontal dark my-3">
             <div class="mt-2 d-flex">
-                <h6 class="mb-0">{{ __('laravel-generator::settings.sidebar.light') }} / {{ __('laravel-generator::settings.sidebar.dark') }}</h6>
+                <h6 class="mb-0">{{ __('lara-gen-adv::settings.sidebar.light') }} / {{ __('lara-gen-adv::settings.sidebar.dark') }}</h6>
                 <div class="form-check form-switch ps-0 ms-auto my-auto">
                     <label for="dark-version"></label><input class="form-check-input mt-1 ms-auto" type="checkbox" id="dark-version" onclick="darkMode(this)">
                 </div>
             </div>
             <hr class="horizontal dark my-sm-4">
         </div>
     </div>
-</div>
+</div>