Merge pull request #358 from viralsolani/develop

Merge Develop branch

.env.example

@@ -6,6 +6,7 @@ APP_DEBUG=true
 APP_LOG_LEVEL=debug
 APP_URL=http://localhost
 
+
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
 DB_PORT=3306

.gitignore

@@ -34,4 +34,5 @@ composer.lock
 public/img/backend/blog_images/*
 public/mix-manifest.json
 public/access.log
-public/error.log
+public/error.log
+!public/js/jquerysession.min.js

README.md

@@ -61,9 +61,6 @@ Generate a new application key
 
     php artisan key:generate
 
-Generate a new JWT secret key (If you want to use API)
-    php artisan jwt:secret
-
 Generate a new JWT authentication secret key
 
     php artisan jwt:secret
@@ -113,6 +110,10 @@ You can now access the server at http://localhost:8000
     php artisan jwt:secret
     php artisan vendor:publish --tag=lfm_public
 
+## Please note
+
+- To run test cases, add SQLite support to your php
+
 ## Logging In
 
 `php artisan db:seed` adds three users with respective roles. The credentials are as follows:
@@ -139,7 +140,11 @@ Password: `1234`
 If you come across any issues please report them [here](https://github.com/viralsolani/laravel-adminpanel/issues).
 
 ## Contributing
-Feel free to create any pull requests for the project. For proposing any new changes or features you want to add to the project, you can send us an email at viral.solani@gmail.com or basapativipulkumar@gmail.com.
+Feel free to create any pull requests for the project. For proposing any new changes or features you want to add to the project, you can send us an email at following addresses.
+
+    (1) Viral Solani - viral.solani@gmail.com
+    (2) Vipulkumar Basapati - basapativipulkumar@gmail.com
+    (3) Vallabh Kansagara - vrkansagara@gmail.com
 
 ## License
 

app/Console/Commands/InstallAppCommand.php

@@ -2,6 +2,7 @@
 
 namespace App\Console\Commands;
 
+use Exception;
 use Illuminate\Console\Command;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Facades\Artisan;
@@ -39,6 +40,31 @@ class InstallAppCommand extends Command
      */
     protected $files;
 
+    /**
+     * host for the database.
+     */
+    protected $host;
+
+    /**
+     * port for the database.
+     */
+    protected $port;
+
+    /**
+     * Database name.
+     */
+    protected $database;
+
+    /**
+     * Username of database.
+     */
+    protected $username;
+
+    /**
+     * Password for the Database.
+     */
+    protected $password;
+
     /**
      * InstallAppCommand constructor.
      *
@@ -210,7 +236,9 @@ protected function getKeyFile()
     }
 
     /**
-     * @param $database
+     * Create the Database.
+     *
+     * @param object $database
      */
     protected function createDatabase($database)
     {
@@ -237,7 +265,9 @@ protected function createDatabase($database)
     }
 
     /**
-     * @param $database
+     * Dump the DB.
+     *
+     * @param object $database
      */
     protected function dumpDB($database)
     {
@@ -258,7 +288,9 @@ protected function dumpDB($database)
     }
 
     /**
-     * @param $database
+     * Migrate Tables.
+     *
+     * @param object $database
      */
     protected function migrateTables($database)
     {

app/Http/Breadcrumbs/Backend/Backend.php

@@ -1,7 +1,7 @@
 <?php
 
 Breadcrumbs::register('admin.dashboard', function ($breadcrumbs) {
-    $breadcrumbs->push('Dashboard', route('admin.dashboard'));
+    $breadcrumbs->push(__('navs.backend.dashboard'), route('admin.dashboard'));
 });
 
 require __DIR__.'/Search.php';

app/Providers/AppServiceProvider.php

@@ -10,8 +10,6 @@ class AppServiceProvider extends ServiceProvider
 {
     /**
      * Bootstrap any application services.
-     *
-     * @return void
      */
     public function boot()
     {
@@ -53,8 +51,6 @@ public function boot()
 
     /**
      * Register any application services.
-     *
-     * @return void
      */
     public function register()
     {

app/Providers/TelescopeServiceProvider.php

@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Providers;
+
+use Illuminate\Support\Facades\Gate;
+use Laravel\Telescope\IncomingEntry;
+use Laravel\Telescope\Telescope;
+use Laravel\Telescope\TelescopeApplicationServiceProvider;
+
+class TelescopeServiceProvider extends TelescopeApplicationServiceProvider
+{
+    /**
+     * Register any application services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        // Telescope::night();
+
+        $this->hideSensitiveRequestDetails();
+
+        Telescope::filter(function (IncomingEntry $entry) {
+            if ($this->app->isLocal()) {
+                return true;
+            }
+
+            return $entry->isReportableException() ||
+                   $entry->isFailedJob() ||
+                   $entry->isScheduledTask() ||
+                   $entry->hasMonitoredTag();
+        });
+    }
+
+    /**
+     * Prevent sensitive request details from being logged by Telescope.
+     *
+     * @return void
+     */
+    protected function hideSensitiveRequestDetails()
+    {
+        if ($this->app->isLocal()) {
+            return;
+        }
+
+        Telescope::hideRequestParameters(['_token']);
+
+        Telescope::hideRequestHeaders([
+            'cookie',
+            'x-csrf-token',
+            'x-xsrf-token',
+        ]);
+    }
+
+    /**
+     * Register the Telescope gate.
+     *
+     * This gate determines who can access Telescope in non-local environments.
+     *
+     * @return void
+     */
+    protected function gate()
+    {
+        Gate::define('viewTelescope', function ($user) {
+            return in_array($user->email, [
+                //
+            ]);
+        });
+    }
+}

composer.json

@@ -16,26 +16,28 @@
         "arcanedev/no-captcha": "^5.0",
         "creativeorange/gravatar": "~1.0",
         "davejamesmiller/laravel-breadcrumbs": "^5.0",
-        "doctrine/dbal": "^2.6",
+        "doctrine/dbal": "^2.9",
         "fideloper/proxy": "^4.0",
         "hieu-le/active": "^3.5",
         "laravel/framework": "5.7.*",
         "laravel/socialite": "^3.0",
         "laravel/tinker": "~1.0",
         "laravelcollective/html": "^5.4.0",
         "spatie/laravel-cors": "^1.2",
-        "tymon/jwt-auth":"1.0.0-rc.3",
+        "tymon/jwt-auth": "1.0.0-rc.3",
         "unisharp/laravel-filemanager": "~1.8",
         "yajra/laravel-datatables-oracle": "~8.0"
     },
     "require-dev": {
+        "laravel/telescope": "^1.0",
         "barryvdh/laravel-debugbar": "^3.0",
-        "codedungeon/phpunit-result-printer": "^0.19.10",
         "bvipul/generator": "^5.6",
+        "codedungeon/phpunit-result-printer": "^0.19.10",
         "filp/whoops": "~2.0",
         "fzaninotto/faker": "~1.4",
         "laravel/browser-kit-testing": "^4.0.0",
         "mockery/mockery": "0.9.*",
+        "nunomaduro/larastan": "^0.3.8",
         "phpunit/phpunit": "~7.0",
         "xethron/migrations-generator": "2.0.2"
     },