diff --git a/.github/workflows/avored-test.yml b/.github/workflows/avored-test.yml index 8fa91b39a..799747de2 100644 --- a/.github/workflows/avored-test.yml +++ b/.github/workflows/avored-test.yml @@ -9,8 +9,8 @@ jobs: fail-fast: true matrix: # php: ['7.2', '7.3', '7.4'] - php: ['7.2'] - laravel: ['5.8.*', '6.*', '7.*'] + php: ['7.3'] + laravel: ['5.8.*', '6.*', '7.*', '8.*'] include: - laravel: '5.8.*' testbench: '3.8.*' @@ -18,6 +18,8 @@ jobs: testbench: '4.*' - laravel: '7.*' testbench: '5.*' + - laravel: '8.*' + testbench: '6.*' name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} diff --git a/composer.json b/composer.json index e7007a79a..c1ebbbac6 100644 --- a/composer.json +++ b/composer.json @@ -21,28 +21,30 @@ ], "type" : "library", "require" : { - "php" : ">=7.2", + "php" : ">=7.3.5", "symfony/yaml": "^4.2", - "laravel/passport": "^7.4|^8.0|^9.0", + "laravel/passport": "^7.4|^8.0|^9.0|^10.0", "barryvdh/laravel-dompdf": "^0.8.4", "laravel/helpers": "^1.1", - "laravel/framework" : "^5.8.15|^6.0|^7.0", + "laravel/framework" : "^5.8.15|^6.0|^7.0|^8.0", "rebing/graphql-laravel": "^5.1", "laravel/ui": "^2.0|^1.0", - "doctrine/dbal": "^2.10" + "doctrine/dbal": "^2.10", + "laravel/legacy-factories": "^1.0", + "illuminate/macroable": "^8.0", + "symfony/finder": "^3.4|^4.0|^5.0" }, "require-dev" : { "phpunit/phpunit": "^8.0|^9.0", - "orchestra/testbench": "^3.8|^4.0|^5.0", + "orchestra/testbench": "^3.8|^4.0|^5.0|^6.0", "phpstan/phpstan": "^0.12.27" }, "autoload" : { - "classmap": [ - "database/factories" - ], "psr-4" : { - "AvoRed\\Framework\\" : "src/" - + "AvoRed\\Framework\\" : "src/", + "AvoRed\\Framework\\App\\": "app/", + "AvoRed\\Framework\\Database\\Factories\\": "database/factories/", + "AvoRed\\Framework\\Database\\Seeders\\": "database/seeders/" } }, "autoload-dev" : { diff --git a/resources/views/user/auth/login.blade.php b/resources/views/user/auth/login.blade.php index 71f40ff51..efefe81ba 100644 --- a/resources/views/user/auth/login.blade.php +++ b/resources/views/user/auth/login.blade.php @@ -10,7 +10,7 @@ @yield('meta_title', 'AvoRed E commerce') - +
@@ -103,11 +103,12 @@ class="h-5 w-5 text-red-500 group-hover:text-red-400"
@if(file_exists(public_path('mix-manifest.json'))) - - + + + @else - - + + @endif @stack('scripts') diff --git a/resources/views/user/auth/password/new.blade.php b/resources/views/user/auth/password/new.blade.php index e60ed0e58..d701da299 100644 --- a/resources/views/user/auth/password/new.blade.php +++ b/resources/views/user/auth/password/new.blade.php @@ -9,10 +9,8 @@ @yield('meta_title', 'AvoRed E commerce') - - - - + +
@@ -78,7 +76,7 @@ -
+
+ @if(file_exists(public_path('mix-manifest.json'))) + + + + @else + + + @endif @stack('scripts') diff --git a/resources/views/user/auth/reset.blade.php b/resources/views/user/auth/reset.blade.php index 0c5f05809..105c6ca4c 100644 --- a/resources/views/user/auth/reset.blade.php +++ b/resources/views/user/auth/reset.blade.php @@ -9,10 +9,8 @@ @yield('meta_title', 'AvoRed E commerce') - - - +
@@ -53,9 +51,6 @@ >
- - -
+ @if(file_exists(public_path('mix-manifest.json'))) + + + + @else + + + @endif @stack('scripts') diff --git a/src/User/Notifications/ResetPassword.php b/src/User/Notifications/ResetPassword.php index 3003a0136..b7af7f668 100644 --- a/src/User/Notifications/ResetPassword.php +++ b/src/User/Notifications/ResetPassword.php @@ -46,7 +46,7 @@ public function toMail($notifiable) { return (new MailMessage) ->line('You are receiving this email because we received a password reset request for your account.') - ->action('Reset Password', url('/password/reset', $this->token)) + ->action('Reset Password', route('admin.password.reset', $this->token)) ->line('If you did not request a password reset, no further action is required.'); } }