Merge branch 'master' of https://github.com/themesberg/volt-laravel-d…

…ashboard into develop
themesberg · Apr 1, 2022 · 37c3d7c · 37c3d7c
2 parents 1f1c1b9 + cf36ff4
commit 37c3d7c
Show file tree

Hide file tree

Showing 8 changed files with 1,944 additions and 1,474 deletions.
diff --git a/.env.example b/.env.example
@@ -35,15 +35,4 @@ MAIL_USERNAME=
 MAIL_PASSWORD=
 MAIL_ENCRYPTION=tls
 
-AWS_ACCESS_KEY_ID=
-AWS_SECRET_ACCESS_KEY=
-AWS_DEFAULT_REGION=us-east-1
-AWS_BUCKET=
-
-PUSHER_APP_ID=
-PUSHER_APP_KEY=
-PUSHER_APP_SECRET=
-PUSHER_APP_CLUSTER=mt1
-
-MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
-MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+IS_DEMO=false
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,4 +6,8 @@
 - Volt Dashboard Free
 - Login
 - Register
-- Profile edit
+- Profile edit
+- Recover password
+
+## Version 1.0.0
+- Upgrade to Laravel 9.x
diff --git a/README.md b/README.md
@@ -4,9 +4,9 @@
 [![version](https://img.shields.io/npm/v/@themesberg/volt-bootstrap-5-dashboard)](https://www.npmjs.com/package/@themesberg/volt-laravel-admin-dashboard)
 [![license](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE.md)
 [![GitHub issues open](https://img.shields.io/github/issues/themesberg/volt-laravel-admin-dashboard.svg)](https://github.com/themesberg/volt-laravel-admin-dashboard/issues?q=is%3Aopen+is%3Aissue)
-[![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/themesberg/volt-bootstrap-5-dashboard.svg)](https://github.com/themesberg/volt-laravel-admin-dashboard/issues?q=is%3Aissue+is%3Aclosed)
+[![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/themesberg/volt-laravel-admin-dashboard.svg)](https://github.com/themesberg/volt-laravel-admin-dashboard/issues?q=is%3Aissue+is%3Aclosed)
 
-[![Volt Laravel Dashboard Preview](https://i.imgur.com/6CL95QK.gif)](https://volt-laravel-admin-dashboard.updivision.com/dashboard)
+[![Volt Laravel Dashboard Preview](https://themesberg.s3.us-east-2.amazonaws.com/public/products/volt-laravel-dashboard/volt-free-laravel-dashboard.jpg)](https://volt-laravel-admin-dashboard.updivision.com/dashboard)
 
 Never start a development project from scratch again. We've partnered with UPDIVISION to create the ultimate design & development toolbox, free for personal and commercial projects. 
 
@@ -20,7 +20,7 @@ You're getting a lean, mean, app-building machine made of:
 - 100+ handcrafted UI components tailored for Bootstrap 5 with Vanilla JS. This means buttons, alerts, modals, datepickers and everything in between
 - 11 example pages to get you started 
 - 3 lightweight plugins: datepicker, notification and charts library
-- SaaS files & Gulp commands
+- Sass files & Gulp commands
 - fully-functional authentication system, register and user profile editing features built with Laravel
 - Livewire & Alpine.js integration
 

diff --git a/app/Http/Livewire/Profile.php b/app/Http/Livewire/Profile.php
@@ -15,17 +15,17 @@ class Profile extends Component
 
     public function rules() {
 
-    return [
-        'user.first_name' => 'max:15',
-        'user.last_name' => 'max:20',
-        'user.email' => 'email',
-        'user.gender' => ['required', Rule::in(['Male', 'Female', 'Other'])],
-        'user.address' => 'max:40',
-        'user.number' => 'numeric',
-        'user.city' => 'max:20',
-        'user.ZIP' => 'numeric',
-    ];
-}
+        return [
+            'user.first_name' => 'max:15',
+            'user.last_name' => 'max:20',
+            'user.email' => 'email',
+            'user.gender' => ['required', Rule::in(['Male', 'Female', 'Other'])],
+            'user.address' => 'max:40',
+            'user.number' => 'numeric',
+            'user.city' => 'max:20',
+            'user.ZIP' => 'numeric',
+        ];
+    }
 
     public function mount() { $this->user = auth()->user(); }
 
@@ -39,7 +39,7 @@ public function save()
 
         $this->user->save();
 
-        $this->showSavedAlert = true;   
+        $this->showSavedAlert = true;
         }
     }
 

diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php
@@ -2,7 +2,7 @@
 
 namespace App\Http\Middleware;
 
-use Fideloper\Proxy\TrustProxies as Middleware;
+use Illuminate\Http\Middleware\TrustProxies as Middleware;
 use Illuminate\Http\Request;
 
 class TrustProxies extends Middleware
@@ -19,5 +19,9 @@ class TrustProxies extends Middleware
      *
      * @var int
      */
-    protected $headers = Request::HEADER_X_FORWARDED_FOR | Request::HEADER_X_FORWARDED_HOST | Request::HEADER_X_FORWARDED_PORT | Request::HEADER_X_FORWARDED_PROTO | Request::HEADER_X_FORWARDED_AWS_ELB;
+    protected $headers = Request::HEADER_X_FORWARDED_FOR |
+                        Request::HEADER_X_FORWARDED_HOST |
+                        Request::HEADER_X_FORWARDED_PORT |
+                        Request::HEADER_X_FORWARDED_PROTO |
+                        Request::HEADER_X_FORWARDED_AWS_ELB;
 }
diff --git a/composer.json b/composer.json
@@ -6,20 +6,19 @@
     "license": "MIT",
     "require": {
         "php": "^7.3|^8.0",
-        "fideloper/proxy": "^4.4",
         "fruitcake/laravel-cors": "^2.0",
-        "guzzlehttp/guzzle": "^7.0.1",
-        "laravel/framework": "^8.12",
-        "laravel/tinker": "^2.5",
-        "livewire/livewire": "^2.4"
+        "guzzlehttp/guzzle": "^7.4",
+        "laravel/framework": "^9.0",
+        "laravel/tinker": "^2.6",
+        "livewire/livewire": "^2.8"
     },
     "require-dev": {
-        "facade/ignition": "^2.5",
-        "fakerphp/faker": "^1.9.1",
-        "laravel/sail": "^1.0.1",
-        "mockery/mockery": "^1.4.2",
-        "nunomaduro/collision": "^5.0",
-        "phpunit/phpunit": "^9.3.3"
+        "spatie/laravel-ignition": "^1.0",
+        "fakerphp/faker": "^1.17",
+        "laravel/sail": "^1.12",
+        "mockery/mockery": "^1.4.4",
+        "nunomaduro/collision": "^6.1",
+        "phpunit/phpunit": "^9.5.10"
     },
     "autoload": {
         "psr-4": {