Merge pull request #7 from laravel-frontend-presets/master

Update to Laravel 9.x

changelog.md

@@ -28,3 +28,6 @@ All notable changes to `Argon` frontend preset for Laravel will be documented in
 ## Version 1.1.1 - 2020-09-23
   - Update to Laravel 8.x
 
+## Version 1.1.2 - 2022-03-25
+  - Update to Laravel 9.x
+

composer.json

@@ -1,11 +1,11 @@
 {
     "name": "laravel-frontend-presets/argon",
-    "description": "Laravel 8.x Front-end preset for argon",
+    "description": "Laravel 9.x Front-end preset for argon",
     "license": "MIT",
     "homepage": "https://github.com/creativetimofficial/argon-dashboard-laravel",
     "keywords": ["Laravel", "Preset", "Argon"],
     "require": {
-        "laravel/framework": "^8.0",
+        "laravel/framework": "^9.0",
         "laravel/legacy-factories": "^1.0"
     },
     "autoload": {

license.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 [Updivision](https://updivision.com)  [Creative Tim](https://www.creative-tim.com) 
+Copyright (c) 2022 [Updivision](https://updivision.com)  [Creative Tim](https://www.creative-tim.com) 
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

readme.md

@@ -1,11 +1,10 @@
-# Argon Frontend Preset For Laravel Framework 8.x and Up
+# Argon Frontend Preset For Laravel Framework 9.x and Up
 
 ![version](https://img.shields.io/badge/version-1.0.12-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/laravel-frontend-presets/argon.svg?maxAge=2592000)](https://github.com/laravel-frontend-presets/argon/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/laravel-frontend-presets/argon.svg?maxAge=2592000)](https://github.com/laravel-frontend-presets/argon/issues?q=is%3Aissue+is%3Aclosed)
 
-*Current version*: Argon v1.0.10. More info at https://www.creative-tim.com/product/argon-dashboard-laravel.
+*Current version*: Argon v1.1.2. More info at https://www.creative-tim.com/product/argon-dashboard-laravel.
 
-
-[<img src="/screens/Dashboard.png" width="100%" />](https://www.creative-tim.com/live/argon-dashboard-laravel)
+[<img src="https://s3.amazonaws.com/creativetim_bucket/products/140/original/opt_ad_laravel_thumbnail.jpg" width="100%" />](https://www.creative-tim.com/live/argon-dashboard-laravel) 
 
 ## Note
 
@@ -20,7 +19,7 @@ If you don't already have an Apache local environment with PHP and MySQL, use on
  - Mac: https://wpshout.com/quick-guides/how-to-install-mamp-on-your-mac/
 
 Also, you will need to install Composer: https://getcomposer.org/doc/00-intro.md   
-And Laravel: https://laravel.com/docs/8.x/installation
+And Laravel: https://laravel.com/docs/9.x/installation
 
 ## Installation
 
@@ -30,7 +29,7 @@ After initializing a fresh instance of Laravel (and making all the necessary con
 
 1. `Cd` to your Laravel app  
 2. Type in your terminal: `composer require laravel/ui` and `php artisan ui vue --auth`
-3. Install this preset via `composer require laravel-frontend-presets/argon`. No need to register the service provider. Laravel 8.x & up can auto detect the package.
+3. Install this preset via `composer require laravel-frontend-presets/argon`. No need to register the service provider. Laravel 9.x & up can auto detect the package.
 4. Run `php artisan ui argon` command to install the Argon preset. This will install all the necessary assets and also the custom auth views, it will also add the auth route in `routes/web.php`
 (NOTE: If you run this command several times, be sure to clean up the duplicate Auth entries in routes/web.php)
 5. In your terminal run `composer dump-autoload`

src/argon-stubs/app/Http/Middleware/TrustProxies.php

@@ -3,7 +3,7 @@
 namespace App\Http\Middleware;
 
 use Illuminate\Http\Request;
-use Fideloper\Proxy\TrustProxies as Middleware;
+use Illuminate\Http\Middleware\TrustProxies as Middleware;
 
 class TrustProxies extends Middleware
 {
@@ -19,5 +19,9 @@ class TrustProxies extends Middleware
      *
      * @var int
      */
-    protected $headers = 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;
 }