Skip to content

Commit 37c3d7c

Browse files
Merge branch 'master' of https://github.com/themesberg/volt-laravel-dashboard into develop
2 parents 1f1c1b9 + cf36ff4 commit 37c3d7c

File tree

8 files changed

+1944
-1474
lines changed

8 files changed

+1944
-1474
lines changed

.env.example

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,4 @@ MAIL_USERNAME=
3535
MAIL_PASSWORD=
3636
MAIL_ENCRYPTION=tls
3737

38-
AWS_ACCESS_KEY_ID=
39-
AWS_SECRET_ACCESS_KEY=
40-
AWS_DEFAULT_REGION=us-east-1
41-
AWS_BUCKET=
42-
43-
PUSHER_APP_ID=
44-
PUSHER_APP_KEY=
45-
PUSHER_APP_SECRET=
46-
PUSHER_APP_CLUSTER=mt1
47-
48-
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
49-
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
38+
IS_DEMO=false

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,8 @@
66
- Volt Dashboard Free
77
- Login
88
- Register
9-
- Profile edit
9+
- Profile edit
10+
- Recover password
11+
12+
## Version 1.0.0
13+
- Upgrade to Laravel 9.x

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
[![version](https://img.shields.io/npm/v/@themesberg/volt-bootstrap-5-dashboard)](https://www.npmjs.com/package/@themesberg/volt-laravel-admin-dashboard)
55
[![license](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE.md)
66
[![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)
7-
[![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)
7+
[![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)
88

9-
[![Volt Laravel Dashboard Preview](https://i.imgur.com/6CL95QK.gif)](https://volt-laravel-admin-dashboard.updivision.com/dashboard)
9+
[![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)
1010

1111
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.
1212

@@ -20,7 +20,7 @@ You're getting a lean, mean, app-building machine made of:
2020
- 100+ handcrafted UI components tailored for Bootstrap 5 with Vanilla JS. This means buttons, alerts, modals, datepickers and everything in between
2121
- 11 example pages to get you started
2222
- 3 lightweight plugins: datepicker, notification and charts library
23-
- SaaS files & Gulp commands
23+
- Sass files & Gulp commands
2424
- fully-functional authentication system, register and user profile editing features built with Laravel
2525
- Livewire & Alpine.js integration
2626

app/Http/Livewire/Profile.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ class Profile extends Component
1515

1616
public function rules() {
1717

18-
return [
19-
'user.first_name' => 'max:15',
20-
'user.last_name' => 'max:20',
21-
'user.email' => 'email',
22-
'user.gender' => ['required', Rule::in(['Male', 'Female', 'Other'])],
23-
'user.address' => 'max:40',
24-
'user.number' => 'numeric',
25-
'user.city' => 'max:20',
26-
'user.ZIP' => 'numeric',
27-
];
28-
}
18+
return [
19+
'user.first_name' => 'max:15',
20+
'user.last_name' => 'max:20',
21+
'user.email' => 'email',
22+
'user.gender' => ['required', Rule::in(['Male', 'Female', 'Other'])],
23+
'user.address' => 'max:40',
24+
'user.number' => 'numeric',
25+
'user.city' => 'max:20',
26+
'user.ZIP' => 'numeric',
27+
];
28+
}
2929

3030
public function mount() { $this->user = auth()->user(); }
3131

@@ -39,7 +39,7 @@ public function save()
3939

4040
$this->user->save();
4141

42-
$this->showSavedAlert = true;
42+
$this->showSavedAlert = true;
4343
}
4444
}
4545

app/Http/Middleware/TrustProxies.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace App\Http\Middleware;
44

5-
use Fideloper\Proxy\TrustProxies as Middleware;
5+
use Illuminate\Http\Middleware\TrustProxies as Middleware;
66
use Illuminate\Http\Request;
77

88
class TrustProxies extends Middleware
@@ -19,5 +19,9 @@ class TrustProxies extends Middleware
1919
*
2020
* @var int
2121
*/
22-
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;
22+
protected $headers = Request::HEADER_X_FORWARDED_FOR |
23+
Request::HEADER_X_FORWARDED_HOST |
24+
Request::HEADER_X_FORWARDED_PORT |
25+
Request::HEADER_X_FORWARDED_PROTO |
26+
Request::HEADER_X_FORWARDED_AWS_ELB;
2327
}

composer.json

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,19 @@
66
"license": "MIT",
77
"require": {
88
"php": "^7.3|^8.0",
9-
"fideloper/proxy": "^4.4",
109
"fruitcake/laravel-cors": "^2.0",
11-
"guzzlehttp/guzzle": "^7.0.1",
12-
"laravel/framework": "^8.12",
13-
"laravel/tinker": "^2.5",
14-
"livewire/livewire": "^2.4"
10+
"guzzlehttp/guzzle": "^7.4",
11+
"laravel/framework": "^9.0",
12+
"laravel/tinker": "^2.6",
13+
"livewire/livewire": "^2.8"
1514
},
1615
"require-dev": {
17-
"facade/ignition": "^2.5",
18-
"fakerphp/faker": "^1.9.1",
19-
"laravel/sail": "^1.0.1",
20-
"mockery/mockery": "^1.4.2",
21-
"nunomaduro/collision": "^5.0",
22-
"phpunit/phpunit": "^9.3.3"
16+
"spatie/laravel-ignition": "^1.0",
17+
"fakerphp/faker": "^1.17",
18+
"laravel/sail": "^1.12",
19+
"mockery/mockery": "^1.4.4",
20+
"nunomaduro/collision": "^6.1",
21+
"phpunit/phpunit": "^9.5.10"
2322
},
2423
"autoload": {
2524
"psr-4": {

0 commit comments

Comments
 (0)