Merge pull request #1 from InfyOmLabs/develop

Update from fork...
henrypalacios · Jan 25, 2021 · 00760ce · 00760ce
2 parents 69c2eb1 + 262e40a
commit 00760ce
Show file tree

Hide file tree

Showing 122 changed files with 3,572 additions and 2,310 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+open_collective: infyomlabs
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -0,0 +1,32 @@
+name: Run tests
+
+on: push
+
+jobs:
+  php-tests:
+    runs-on: ubuntu-latest
+
+    name: Run Package Tests
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v2
+
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: ~/.composer/cache/files
+          key: dependencies-composer-${{ hashFiles('composer.json') }}
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v1
+        with:
+          php-version: 7.3
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite
+          coverage: none
+
+      - name: Install Composer dependencies
+        run: composer install --prefer-dist --no-interaction --no-suggest
+
+      - name: Execute tests
+        run: vendor/bin/phpunit --verbose
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,5 @@ composer.phar
 composer.lock
 .DS_Store
 Thumbs.db
-.idea
+.idea
+.phpunit.result.cache
diff --git a/.travis.yml b/.travis.yml
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -7,3 +7,6 @@ As this package is related to laravel, we are follows the PSR-2 coding standard
 
 #### StyleCI
 We've integrated StyleCI. So when you submit a PR, it will automatically suggest the fix of styling. Fix it and re-submit the PR if needed.
+
+#### Pull Requests
+Please make all pull requests to the `develop` branch of the project.
diff --git a/README.md b/README.md
@@ -1,5 +1,4 @@
-<h1 align="center"><img src="http://infyom.com/images/logo-red-black.png" alt="InfyOm"></h1>
-
+<h1 align="center"><img src="https://assets.infyom.com/open-source/infyom-logo.png" alt="InfyOm"></h1>
 
 InfyOm Laravel Generator
 ==========================
@@ -8,8 +7,46 @@ InfyOm Laravel Generator
 [![Monthly Downloads](https://poser.pugx.org/infyomlabs/laravel-generator/d/monthly)](https://packagist.org/packages/infyomlabs/laravel-generator)
 [![Daily Downloads](https://poser.pugx.org/infyomlabs/laravel-generator/d/daily)](https://packagist.org/packages/infyomlabs/laravel-generator)
 [![License](https://poser.pugx.org/infyomlabs/laravel-generator/license)](https://packagist.org/packages/infyomlabs/laravel-generator)
-[![Build Status](https://travis-ci.org/InfyOmLabs/laravel-generator.svg?branch=test-cases)](https://travis-ci.org/InfyOmLabs/laravel-generator)
 
-Documentation is located [here](http://labs.infyom.com/laravelgenerator)
+Generate Admin Panels CRUDs and APIs in Minutes with tons of other features and customizations with 3 different themes.  
+Read [Documentation](https://www.infyom.com/open-source) for detailed installation steps and usage.
+
+## Support Us
+
+We have created [14+ Laravel packages](https://github.com/InfyOmLabs) and invested a lot of resources into creating these all packages and maintaining them.
+
+You can support us by either sponsoring us or buying one of our paid products. Or help us by spreading the word about us on social platforms via tweets and posts.
+
+### Sponsors
+
+[Become a sponsor](https://opencollective.com/infyomlabs#sponsor) and get your logo on our README on Github with a link to your site.
+
+<a href="https://opencollective.com/infyomlabs#sponsor"><img src="https://opencollective.com/infyomlabs/sponsors.svg?width=890"></a>
+
+### Backers
+
+[Become a backer](https://opencollective.com/infyomlabs#backer) and get your image on our README on Github with a link to your site.
+
+<a href="https://opencollective.com/infyomlabs#backer"><img src="https://opencollective.com/infyomlabs/backers.svg?width=890"></a>
+
+### Buy our Paid Products
+
+[![InfyChat](https://assets.infyom.com/open-source/infychat-banner.png)](https://bit.ly/3gYLWny)
+
+You can also check out our other paid products on [CodeCanyon](https://codecanyon.net/user/infyomlabs/portfolio).
+
+### Follow Us
+
+- [Twitter](https://twitter.com/infyom)
+- [Facebook](https://www.facebook.com/infyom)
+- [LinkedIn](https://in.linkedin.com/company/infyom-technologies)
+- [Youtube](https://www.youtube.com/channel/UC8IvwfChD6i7Wp4yZp3tNsQ)
+- [Contact Us](https://infyom.com/contact-us)
+
+## Made with InfyOm Generator
+
+Also, Do not forget to add your website to [Made with InfyOm Generator List](https://github.com/InfyOmLabs/laravel-generator/blob/develop/made-with-generator.md) list.
+
+## Video Tutorials
 
-Add your website to [Made with InfyOm Generator](https://github.com/InfyOmLabs/laravel-generator/blob/develop/made-with-generator.md) list.
+Checkout [Video Tutorials](https://github.com/shailesh-ladumor/infyom-laravel-generator-tutorial) - **By**: [Shailesh Ladumor](https://github.com/shailesh-ladumor)
diff --git a/composer.json b/composer.json
@@ -1,5 +1,6 @@
 {
     "name": "infyomlabs/laravel-generator",
+    "type": "library",
     "description": "InfyOm Laravel Generator",
     "keywords": [
         "laravel",
@@ -23,13 +24,13 @@
         }
     ],
     "require": {
-        "php": ">=7.2",
-        "illuminate/support": "^6.0.0",
-        "laracasts/flash": "~3.0"
+        "php": "^7.3|^8.0",
+        "illuminate/support": "^8.0",
+        "laracasts/flash": "^3.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "~5.0",
-        "mockery/mockery": "~0.9"
+        "phpunit/phpunit": "^9.0|^9.3.3",
+        "mockery/mockery": "^1.3.1"
     },
     "autoload": {
         "psr-4": {
@@ -50,5 +51,11 @@
                 "\\InfyOm\\Generator\\InfyOmGeneratorServiceProvider"
             ]
         }
-    }    
+    },
+    "funding": [
+        {
+            "type": "opencollective",
+            "url": "https://opencollective.com/infyomlabs"
+        }
+    ]
 }
diff --git a/config/laravel_generator.php b/config/laravel_generator.php
@@ -31,6 +31,8 @@
 
         'api_controller'    => app_path('Http/Controllers/API/'),
 
+        'api_resource'      => app_path('Http/Resources/'),
+
         'repository_test'   => base_path('tests/Repositories/'),
 
         'api_test'          => base_path('tests/APIs/'),
@@ -43,13 +45,13 @@
 
         'templates_dir'     => resource_path('infyom/infyom-generator-templates/'),
 
-        'seeder'            => database_path('seeds/'),
-
-        'database_seeder'   => database_path('seeds/DatabaseSeeder.php'),
+        'seeder'            => database_path('seeders/'),
 
-        'modelJs'           => resource_path('assets/js/models/'),
+        'database_seeder'   => database_path('seeders/DatabaseSeeder.php'),
 
         'factory'           => database_path('factories/'),
+
+        'view_provider'     => app_path('Providers/ViewServiceProvider.php'),
     ],
 
     /*
@@ -71,10 +73,16 @@
 
         'api_controller'    => 'App\Http\Controllers\API',
 
+        'api_resource'      => 'App\Http\Resources',
+
         'request'           => 'App\Http\Requests',
 
         'api_request'       => 'App\Http\Requests\API',
 
+        'seeder'            => 'Database\Seeders',
+
+        'factory'           => 'Database\Factories',
+
         'repository_test'   => 'Tests\Repositories',
 
         'api_test'          => 'Tests\APIs',
@@ -124,10 +132,14 @@
 
         'save_schema_file' => true,
 
+        'localized' => false,
+
         'tables_searchable_default' => false,
 
         'repository_pattern' => true,
 
+        'resources' => false,
+
         'excluded_fields' => ['id'], // Array of columns that doesn't required while creating module
     ],
 

diff --git a/locale/en/auth.php b/locale/en/auth.php
@@ -0,0 +1,71 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Authentication Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used during authentication for various
+    | messages that we need to display to the user. You are free to modify
+    | these language lines according to your application's requirements.
+    |
+    */
+
+    'failed'   => 'These credentials do not match our records.',
+    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+
+    'full_name'        => 'Full Name',
+    'email'            => 'Email',
+    'password'         => 'Password',
+    'confirm_password' => 'Confirm Password',
+    'remember_me'      => 'Remember Me',
+    'sign_in'          => 'Sign In',
+    'sign_out'         => 'Sign out',
+    'register'         => 'Register',
+
+    'login' => [
+        'title'               => 'Sign in to start your session',
+        'forgot_password'     => 'I forgot my password',
+        'register_membership' => 'Register a new membership',
+    ],
+
+    'registration' => [
+        'title'           => 'Register a new membership',
+        'i_agree'         => 'I agree to',
+        'terms'           => 'the terms',
+        'have_membership' => 'I already have a membership',
+    ],
+
+    'forgot_password' => [
+        'title'          => 'Enter Email to reset password',
+        'send_pwd_reset' => 'Send Password Reset Link',
+    ],
+
+    'reset_password' => [
+        'title'         => 'Reset your password',
+        'reset_pwd_btn' => 'Reset Password',
+    ],
+
+    'emails' => [
+        'password' => [
+            'reset_link' => 'Click here to reset your password',
+        ],
+    ],
+
+    'app' => [
+        'member_since' => 'Member since',
+        'messages'     => 'Messages',
+        'settings'     => 'Settings',
+        'lock_account' => 'Lock Account',
+        'profile'      => 'Profile',
+        'online'       => 'Online',
+        'search'       => 'Search',
+        'create'       => 'Create',
+        'export'       => 'Export',
+        'print'        => 'Print',
+        'reset'        => 'Reset',
+        'reload'       => 'Reload',
+    ],
+];
diff --git a/locale/en/crud.php b/locale/en/crud.php
@@ -0,0 +1,17 @@
+<?php
+
+return [
+
+    'add_new'      => 'Add New',
+    'cancel'       => 'Cancel',
+    'save'         => 'Save',
+    'edit'         => 'Edit',
+    'detail'       => 'Detail',
+    'back'         => 'Back',
+    'action'       => 'Action',
+    'id'           => 'Id',
+    'created_at'   => 'Created At',
+    'updated_at'   => 'Updated At',
+    'deleted_at'   => 'Deleted At',
+    'are_you_sure' => 'Are you sure?',
+];
diff --git a/locale/en/messages.php b/locale/en/messages.php
@@ -0,0 +1,11 @@
+<?php
+
+return [
+
+    'retrieved' => ':model retrieved successfully.',
+    'saved'     => ':model saved successfully.',
+    'updated'   => ':model updated successfully.',
+    'deleted'   => ':model deleted successfully.',
+    'not_found' => ':model not found',
+
+];
diff --git a/made-with-generator.md b/made-with-generator.md
@@ -8,3 +8,5 @@ Comment on this [issue](https://github.com/InfyOmLabs/laravel-generator/issues/6
 - [Kavlinge Zoo](http://kavlingezoo.se/)
 - [TinkerTool](https://www.tinkertool.in/)
 - [Reantamchet](https://reantamchet.com/)
+- [Get Free Bitcoin](http://getfreebitco.in)
+- [InfyLMS](https://codecanyon.net/item/infylms-library-management-system-laravel-reactjs/24884824)
diff --git a/samples/fields_sample.json b/samples/fields_sample.json
@@ -8,7 +8,8 @@
         "fillable": false,
         "primary": true,
         "inForm": false,
-        "inIndex": false
+        "inIndex": false,
+        "inView": false
     },
     {
         "name": "title",
@@ -34,15 +35,17 @@
         "htmlType": "password",
         "searchable": false,
         "inForm": false,
-        "inIndex": false
+        "inIndex": false,
+        "inView": false
     },
     {
         "name": "token",
         "dbType": "string",
         "htmlType": "hidden",
         "searchable": false,
         "inForm": false,
-        "inIndex": false
+        "inIndex": false,
+        "inView": false
     },
     {
         "name": "email",
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# These are supported funding model platforms

		open_collective: infyomlabs