dependencies-upgrade
This commit is contained in:
@@ -11,8 +11,8 @@
|
||||
<form method="POST" action="{{ route('login') }}">
|
||||
@csrf
|
||||
|
||||
<div class="form-group row">
|
||||
<label for="email" class="col-md-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label>
|
||||
<div class="row mb-3">
|
||||
<label for="email" class="col-md-4 col-form-label text-md-end">{{ __('Email Address') }}</label>
|
||||
|
||||
<div class="col-md-6">
|
||||
<input id="email" type="email" class="form-control @error('email') is-invalid @enderror" name="email" value="{{ old('email') }}" required autocomplete="email" autofocus>
|
||||
@@ -25,8 +25,8 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<label for="password" class="col-md-4 col-form-label text-md-right">{{ __('Password') }}</label>
|
||||
<div class="row mb-3">
|
||||
<label for="password" class="col-md-4 col-form-label text-md-end">{{ __('Password') }}</label>
|
||||
|
||||
<div class="col-md-6">
|
||||
<input id="password" type="password" class="form-control @error('password') is-invalid @enderror" name="password" required autocomplete="current-password">
|
||||
@@ -39,7 +39,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<div class="row mb-3">
|
||||
<div class="col-md-6 offset-md-4">
|
||||
<div class="form-check">
|
||||
<input class="form-check-input" type="checkbox" name="remember" id="remember" {{ old('remember') ? 'checked' : '' }}>
|
||||
@@ -51,7 +51,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row mb-0">
|
||||
<div class="row mb-0">
|
||||
<div class="col-md-8 offset-md-4">
|
||||
<button type="submit" class="btn btn-primary">
|
||||
{{ __('Login') }}
|
||||
|
@@ -13,8 +13,8 @@
|
||||
<form method="POST" action="{{ route('password.confirm') }}">
|
||||
@csrf
|
||||
|
||||
<div class="form-group row">
|
||||
<label for="password" class="col-md-4 col-form-label text-md-right">{{ __('Password') }}</label>
|
||||
<div class="row mb-3">
|
||||
<label for="password" class="col-md-4 col-form-label text-md-end">{{ __('Password') }}</label>
|
||||
|
||||
<div class="col-md-6">
|
||||
<input id="password" type="password" class="form-control @error('password') is-invalid @enderror" name="password" required autocomplete="current-password">
|
||||
@@ -27,7 +27,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row mb-0">
|
||||
<div class="row mb-0">
|
||||
<div class="col-md-8 offset-md-4">
|
||||
<button type="submit" class="btn btn-primary">
|
||||
{{ __('Confirm Password') }}
|
||||
|
@@ -17,8 +17,8 @@
|
||||
<form method="POST" action="{{ route('password.email') }}">
|
||||
@csrf
|
||||
|
||||
<div class="form-group row">
|
||||
<label for="email" class="col-md-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label>
|
||||
<div class="row mb-3">
|
||||
<label for="email" class="col-md-4 col-form-label text-md-end">{{ __('Email Address') }}</label>
|
||||
|
||||
<div class="col-md-6">
|
||||
<input id="email" type="email" class="form-control @error('email') is-invalid @enderror" name="email" value="{{ old('email') }}" required autocomplete="email" autofocus>
|
||||
@@ -31,7 +31,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row mb-0">
|
||||
<div class="row mb-0">
|
||||
<div class="col-md-6 offset-md-4">
|
||||
<button type="submit" class="btn btn-primary">
|
||||
{{ __('Send Password Reset Link') }}
|
||||
|
@@ -13,8 +13,8 @@
|
||||
|
||||
<input type="hidden" name="token" value="{{ $token }}">
|
||||
|
||||
<div class="form-group row">
|
||||
<label for="email" class="col-md-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label>
|
||||
<div class="row mb-3">
|
||||
<label for="email" class="col-md-4 col-form-label text-md-end">{{ __('Email Address') }}</label>
|
||||
|
||||
<div class="col-md-6">
|
||||
<input id="email" type="email" class="form-control @error('email') is-invalid @enderror" name="email" value="{{ $email ?? old('email') }}" required autocomplete="email" autofocus>
|
||||
@@ -27,8 +27,8 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<label for="password" class="col-md-4 col-form-label text-md-right">{{ __('Password') }}</label>
|
||||
<div class="row mb-3">
|
||||
<label for="password" class="col-md-4 col-form-label text-md-end">{{ __('Password') }}</label>
|
||||
|
||||
<div class="col-md-6">
|
||||
<input id="password" type="password" class="form-control @error('password') is-invalid @enderror" name="password" required autocomplete="new-password">
|
||||
@@ -41,15 +41,15 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<label for="password-confirm" class="col-md-4 col-form-label text-md-right">{{ __('Confirm Password') }}</label>
|
||||
<div class="row mb-3">
|
||||
<label for="password-confirm" class="col-md-4 col-form-label text-md-end">{{ __('Confirm Password') }}</label>
|
||||
|
||||
<div class="col-md-6">
|
||||
<input id="password-confirm" type="password" class="form-control" name="password_confirmation" required autocomplete="new-password">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row mb-0">
|
||||
<div class="row mb-0">
|
||||
<div class="col-md-6 offset-md-4">
|
||||
<button type="submit" class="btn btn-primary">
|
||||
{{ __('Reset Password') }}
|
||||
|
@@ -11,8 +11,8 @@
|
||||
<form method="POST" action="{{ route('register') }}">
|
||||
@csrf
|
||||
|
||||
<div class="form-group row">
|
||||
<label for="name" class="col-md-4 col-form-label text-md-right">{{ __('Name') }}</label>
|
||||
<div class="row mb-3">
|
||||
<label for="name" class="col-md-4 col-form-label text-md-end">{{ __('Name') }}</label>
|
||||
|
||||
<div class="col-md-6">
|
||||
<input id="name" type="text" class="form-control @error('name') is-invalid @enderror" name="name" value="{{ old('name') }}" required autocomplete="name" autofocus>
|
||||
@@ -25,8 +25,8 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<label for="email" class="col-md-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label>
|
||||
<div class="row mb-3">
|
||||
<label for="email" class="col-md-4 col-form-label text-md-end">{{ __('Email Address') }}</label>
|
||||
|
||||
<div class="col-md-6">
|
||||
<input id="email" type="email" class="form-control @error('email') is-invalid @enderror" name="email" value="{{ old('email') }}" required autocomplete="email">
|
||||
@@ -39,8 +39,8 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<label for="password" class="col-md-4 col-form-label text-md-right">{{ __('Password') }}</label>
|
||||
<div class="row mb-3">
|
||||
<label for="password" class="col-md-4 col-form-label text-md-end">{{ __('Password') }}</label>
|
||||
|
||||
<div class="col-md-6">
|
||||
<input id="password" type="password" class="form-control @error('password') is-invalid @enderror" name="password" required autocomplete="new-password">
|
||||
@@ -53,15 +53,15 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<label for="password-confirm" class="col-md-4 col-form-label text-md-right">{{ __('Confirm Password') }}</label>
|
||||
<div class="row mb-3">
|
||||
<label for="password-confirm" class="col-md-4 col-form-label text-md-end">{{ __('Confirm Password') }}</label>
|
||||
|
||||
<div class="col-md-6">
|
||||
<input id="password-confirm" type="password" class="form-control" name="password_confirmation" required autocomplete="new-password">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row mb-0">
|
||||
<div class="row mb-0">
|
||||
<div class="col-md-6 offset-md-4">
|
||||
<button type="submit" class="btn btn-primary">
|
||||
{{ __('Register') }}
|
||||
|
@@ -26,23 +26,26 @@
|
||||
<a class="navbar-brand" href="{{ url('/') }}">
|
||||
{{ config('app.name', 'Laravel') }}
|
||||
</a>
|
||||
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="{{ __('Toggle navigation') }}">
|
||||
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="{{ __('Toggle navigation') }}">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
</button>
|
||||
|
||||
<div class="collapse navbar-collapse" id="navbarSupportedContent">
|
||||
<!-- Left Side Of Navbar -->
|
||||
<ul class="navbar-nav mr-auto">
|
||||
<ul class="navbar-nav me-auto">
|
||||
|
||||
</ul>
|
||||
|
||||
<!-- Right Side Of Navbar -->
|
||||
<ul class="navbar-nav ml-auto">
|
||||
<ul class="navbar-nav ms-auto">
|
||||
<!-- Authentication Links -->
|
||||
@guest
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="{{ route('login') }}">{{ __('Login') }}</a>
|
||||
</li>
|
||||
@if (Route::has('login'))
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="{{ route('login') }}">{{ __('Login') }}</a>
|
||||
</li>
|
||||
@endif
|
||||
|
||||
@if (Route::has('register'))
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="{{ route('register') }}">{{ __('Register') }}</a>
|
||||
@@ -50,11 +53,11 @@
|
||||
@endif
|
||||
@else
|
||||
<li class="nav-item dropdown">
|
||||
<a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
|
||||
<a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
|
||||
{{ Auth::user()->name }}
|
||||
</a>
|
||||
|
||||
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
|
||||
<div class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdown">
|
||||
<a class="dropdown-item" href="{{ route('logout') }}"
|
||||
onclick="event.preventDefault();
|
||||
document.getElementById('logout-form').submit();">
|
||||
|
2
vendor/laravel/ui/src/Auth/stubs/routes.stub
vendored
2
vendor/laravel/ui/src/Auth/stubs/routes.stub
vendored
@@ -1,4 +1,4 @@
|
||||
|
||||
Auth::routes();
|
||||
|
||||
Route::get('/home', 'HomeController@index')->name('home');
|
||||
Route::get('/home', [App\Http\Controllers\HomeController::class, 'index'])->name('home');
|
||||
|
66
vendor/laravel/ui/src/AuthRouteMethods.php
vendored
66
vendor/laravel/ui/src/AuthRouteMethods.php
vendored
@@ -13,45 +13,49 @@ class AuthRouteMethods
|
||||
public function auth()
|
||||
{
|
||||
return function ($options = []) {
|
||||
// Login Routes...
|
||||
if ($options['login'] ?? true) {
|
||||
$this->get('login', 'Auth\LoginController@showLoginForm')->name('login');
|
||||
$this->post('login', 'Auth\LoginController@login');
|
||||
}
|
||||
|
||||
// Logout Routes...
|
||||
if ($options['logout'] ?? true) {
|
||||
$this->post('logout', 'Auth\LoginController@logout')->name('logout');
|
||||
}
|
||||
$namespace = class_exists($this->prependGroupNamespace('Auth\LoginController')) ? null : 'App\Http\Controllers';
|
||||
|
||||
// Registration Routes...
|
||||
if ($options['register'] ?? true) {
|
||||
$this->get('register', 'Auth\RegisterController@showRegistrationForm')->name('register');
|
||||
$this->post('register', 'Auth\RegisterController@register');
|
||||
}
|
||||
$this->group(['namespace' => $namespace], function() use($options) {
|
||||
// Login Routes...
|
||||
if ($options['login'] ?? true) {
|
||||
$this->get('login', 'Auth\LoginController@showLoginForm')->name('login');
|
||||
$this->post('login', 'Auth\LoginController@login');
|
||||
}
|
||||
|
||||
// Password Reset Routes...
|
||||
if ($options['reset'] ?? true) {
|
||||
$this->resetPassword();
|
||||
}
|
||||
// Logout Routes...
|
||||
if ($options['logout'] ?? true) {
|
||||
$this->post('logout', 'Auth\LoginController@logout')->name('logout');
|
||||
}
|
||||
|
||||
// Password Confirmation Routes...
|
||||
if ($options['confirm'] ??
|
||||
class_exists($this->prependGroupNamespace('Auth\ConfirmPasswordController'))) {
|
||||
$this->confirmPassword();
|
||||
}
|
||||
// Registration Routes...
|
||||
if ($options['register'] ?? true) {
|
||||
$this->get('register', 'Auth\RegisterController@showRegistrationForm')->name('register');
|
||||
$this->post('register', 'Auth\RegisterController@register');
|
||||
}
|
||||
|
||||
// Email Verification Routes...
|
||||
if ($options['verify'] ?? false) {
|
||||
$this->emailVerification();
|
||||
}
|
||||
// Password Reset Routes...
|
||||
if ($options['reset'] ?? true) {
|
||||
$this->resetPassword();
|
||||
}
|
||||
|
||||
// Password Confirmation Routes...
|
||||
if ($options['confirm'] ??
|
||||
class_exists($this->prependGroupNamespace('Auth\ConfirmPasswordController'))) {
|
||||
$this->confirmPassword();
|
||||
}
|
||||
|
||||
// Email Verification Routes...
|
||||
if ($options['verify'] ?? false) {
|
||||
$this->emailVerification();
|
||||
}
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Register the typical reset password routes for an application.
|
||||
*
|
||||
* @return void
|
||||
* @return callable
|
||||
*/
|
||||
public function resetPassword()
|
||||
{
|
||||
@@ -66,7 +70,7 @@ class AuthRouteMethods
|
||||
/**
|
||||
* Register the typical confirm password routes for an application.
|
||||
*
|
||||
* @return void
|
||||
* @return callable
|
||||
*/
|
||||
public function confirmPassword()
|
||||
{
|
||||
@@ -79,7 +83,7 @@ class AuthRouteMethods
|
||||
/**
|
||||
* Register the typical email verification routes for an application.
|
||||
*
|
||||
* @return void
|
||||
* @return callable
|
||||
*/
|
||||
public function emailVerification()
|
||||
{
|
||||
|
9
vendor/laravel/ui/src/Presets/Bootstrap.php
vendored
9
vendor/laravel/ui/src/Presets/Bootstrap.php
vendored
@@ -29,11 +29,10 @@ class Bootstrap extends Preset
|
||||
protected static function updatePackageArray(array $packages)
|
||||
{
|
||||
return [
|
||||
'bootstrap' => '^4.0.0',
|
||||
'jquery' => '^3.2',
|
||||
'popper.js' => '^1.12',
|
||||
'sass' => '^1.15.2',
|
||||
'sass-loader' => '^8.0.0',
|
||||
'bootstrap' => '^5.1.3',
|
||||
'@popperjs/core' => '^2.10.2',
|
||||
'sass' => '^1.32.11',
|
||||
'sass-loader' => '^11.0.1',
|
||||
] + $packages;
|
||||
}
|
||||
|
||||
|
6
vendor/laravel/ui/src/Presets/React.php
vendored
6
vendor/laravel/ui/src/Presets/React.php
vendored
@@ -31,9 +31,9 @@ class React extends Preset
|
||||
protected static function updatePackageArray(array $packages)
|
||||
{
|
||||
return [
|
||||
'@babel/preset-react' => '^7.0.0',
|
||||
'react' => '^16.2.0',
|
||||
'react-dom' => '^16.2.0',
|
||||
'@babel/preset-react' => '^7.13.13',
|
||||
'react' => '^17.0.2',
|
||||
'react-dom' => '^17.0.2',
|
||||
] + Arr::except($packages, ['vue', 'vue-template-compiler']);
|
||||
}
|
||||
|
||||
|
10
vendor/laravel/ui/src/Presets/Vue.php
vendored
10
vendor/laravel/ui/src/Presets/Vue.php
vendored
@@ -31,11 +31,11 @@ class Vue extends Preset
|
||||
protected static function updatePackageArray(array $packages)
|
||||
{
|
||||
return [
|
||||
'resolve-url-loader' => '^2.3.1',
|
||||
'sass' => '^1.20.1',
|
||||
'sass-loader' => '^8.0.0',
|
||||
'vue' => '^2.5.17',
|
||||
'vue-template-compiler' => '^2.6.10',
|
||||
'resolve-url-loader' => '^3.1.2',
|
||||
'sass' => '^1.32.11',
|
||||
'sass-loader' => '^11.0.1',
|
||||
'vue' => '^2.6.12',
|
||||
'vue-template-compiler' => '^2.6.12',
|
||||
] + Arr::except($packages, [
|
||||
'@babel/preset-react',
|
||||
'react',
|
||||
|
@@ -5,15 +5,3 @@ $body-bg: #f8fafc;
|
||||
$font-family-sans-serif: 'Nunito', sans-serif;
|
||||
$font-size-base: 0.9rem;
|
||||
$line-height-base: 1.6;
|
||||
|
||||
// Colors
|
||||
$blue: #3490dc;
|
||||
$indigo: #6574cd;
|
||||
$purple: #9561e2;
|
||||
$pink: #f66d9b;
|
||||
$red: #e3342f;
|
||||
$orange: #f6993f;
|
||||
$yellow: #ffed4a;
|
||||
$green: #38c172;
|
||||
$teal: #4dc0b5;
|
||||
$cyan: #6cb2eb;
|
||||
|
@@ -1,15 +1,6 @@
|
||||
window._ = require('lodash');
|
||||
|
||||
/**
|
||||
* We'll load jQuery and the Bootstrap jQuery plugin which provides support
|
||||
* for JavaScript based Bootstrap features such as modals and tabs. This
|
||||
* code may be modified to fit the specific needs of your application.
|
||||
*/
|
||||
|
||||
try {
|
||||
window.Popper = require('popper.js').default;
|
||||
window.$ = window.jQuery = require('jquery');
|
||||
|
||||
require('bootstrap');
|
||||
} catch (e) {}
|
||||
|
||||
|
@@ -12,4 +12,5 @@ const mix = require('laravel-mix');
|
||||
*/
|
||||
|
||||
mix.js('resources/js/app.js', 'public/js')
|
||||
.sass('resources/sass/app.scss', 'public/css');
|
||||
.sass('resources/sass/app.scss', 'public/css')
|
||||
.sourceMaps();
|
||||
|
@@ -11,5 +11,6 @@ const mix = require('laravel-mix');
|
||||
|
|
||||
*/
|
||||
|
||||
mix.react('resources/js/app.js', 'public/js')
|
||||
mix.js('resources/js/app.js', 'public/js')
|
||||
.react()
|
||||
.sass('resources/sass/app.scss', 'public/css');
|
||||
|
@@ -6,7 +6,7 @@
|
||||
|
||||
require('./bootstrap');
|
||||
|
||||
window.Vue = require('vue');
|
||||
window.Vue = require('vue').default;
|
||||
|
||||
/**
|
||||
* The following block of code may be used to automatically register your
|
||||
|
@@ -12,4 +12,5 @@ const mix = require('laravel-mix');
|
||||
*/
|
||||
|
||||
mix.js('resources/js/app.js', 'public/js')
|
||||
.vue()
|
||||
.sass('resources/sass/app.scss', 'public/css');
|
||||
|
Reference in New Issue
Block a user