Minor framework updates, and updates from other projects

This commit is contained in:
Deon George 2021-07-09 12:41:15 +10:00
parent a9f81373fa
commit 7e150e6cf6
No known key found for this signature in database
GPG Key ID: 7670E8DC27415254
9 changed files with 169 additions and 116 deletions

View File

@ -1,4 +1,4 @@
FROM registry.leenooks.net/leenooks/php:8.0-fpm-ext
FROM registry.leenooks.net/leenooks/php:8.0-fpm-image
COPY . /var/www/html/
@ -6,7 +6,7 @@ RUN mkdir /var/www/.composer \
&& ([ -r auth.json ] && mv auth.json /var/www/.composer/) || true \
&& touch .composer.refresh \
&& mv .env.example .env \
&& FORCE_PERMS=1 /sbin/init \
&& FORCE_PERMS=1 NGINX_START=FALSE /sbin/init \
&& chmod +x /var/www/html/artisan \
&& touch .migrate \
&& rm -rf /var/www/.composer/*

View File

@ -22,7 +22,6 @@ class Handler extends ExceptionHandler
* @var array
*/
protected $dontFlash = [
'current_password',
'password',
'password_confirmation',
];

View File

@ -4,6 +4,8 @@ namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Password;
class ForgotPasswordController extends Controller
{
@ -24,4 +26,24 @@ class ForgotPasswordController extends Controller
{
return view('adminlte::auth.passwords.email');
}
public function sendResetLinkEmail(Request $request)
{
$this->validateEmail($request);
// If the account is not active, or doesnt exist, we'll send a fake "sent" message.
if (! ($x=$this->broker()->getUser($this->credentials($request))) || (! $x->active))
return $this->sendResetLinkResponse($request, Password::RESET_LINK_SENT);
// We will send the password reset link to this user. Once we have attempted
// to send the link, we will examine the response then see the message we
// need to show to the user. Finally, we'll send out a proper response.
$response = $this->broker()->sendResetLink(
$this->credentials($request)
);
return $response == Password::RESET_LINK_SENT
? $this->sendResetLinkResponse($request, $response)
: $this->sendResetLinkFailedResponse($request, $response);
}
}

View File

@ -4,7 +4,11 @@ namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Providers\RouteServiceProvider;
use Carbon\Carbon;
use Illuminate\Foundation\Auth\AuthenticatesUsers;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Schema;
class LoginController extends Controller
{
@ -38,6 +42,27 @@ class LoginController extends Controller
$this->middleware('guest')->except('logout');
}
public function login(Request $request)
{
$this->validateLogin($request);
if (Auth::attempt(array_merge($this->credentials($request),['active'=>TRUE]))) {
$request->session()->regenerate();
return $this->sendLoginResponse($request);
}
return $this->sendFailedLoginResponse($request);
}
protected function authenticated(Request $request, $user)
{
if (Schema::hasColumn($user->getTable(),'last_on')) {
$user->last_on = Carbon::now();
$user->save();
}
}
/**
* Show our themed login page
*/

View File

@ -3,11 +3,11 @@
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Providers\RouteServiceProvider;
use App\Models\User;
use Illuminate\Foundation\Auth\RegistersUsers;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Validator;
use Illuminate\Foundation\Auth\RegistersUsers;
use App\Models\User;
class RegisterController extends Controller
{
@ -29,7 +29,7 @@ class RegisterController extends Controller
*
* @var string
*/
protected $redirectTo = '/home';
protected $redirectTo = RouteServiceProvider::HOME;
/**
* Create a new controller instance.
@ -50,12 +50,10 @@ class RegisterController extends Controller
protected function validator(array $data)
{
return Validator::make($data, [
'name' => 'required|string|max:255',
'email' => 'required|string|email|max:255|unique:users',
'password' => 'required|string|min:6|confirmed',
'token' => 'required|doorman:email',
'password' => 'required|min:6|confirmed',
'terms' => 'required',
'name' => ['required', 'string', 'min:3', 'max:255'],
'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
'password' => ['required', 'string', 'min:8', 'confirmed'],
'token' => 'required|doorman:email',
]);
}

View File

@ -2,11 +2,10 @@
namespace App\Http\Controllers\Auth;
use Illuminate\Foundation\Auth\ResetsPasswords;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Providers\RouteServiceProvider;
use Illuminate\Foundation\Auth\ResetsPasswords;
use Illuminate\Http\Request;
class ResetPasswordController extends Controller
{
@ -30,6 +29,16 @@ class ResetPasswordController extends Controller
*/
protected $redirectTo = RouteServiceProvider::HOME;
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('guest');
}
public function showResetForm(Request $request, $token = null)
{
return view('adminlte::auth.passwords.reset')->with(

View File

@ -2,10 +2,10 @@
namespace App\Http\Controllers;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Routing\Controller as BaseController;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
class Controller extends BaseController
{

192
composer.lock generated
View File

@ -1832,16 +1832,16 @@
},
{
"name": "laravel/framework",
"version": "v8.48.2",
"version": "v8.49.2",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "4c50ebbb7d1a66c5f3511261413cd499d30ba4cd"
"reference": "d9b43ee080b4d51344b2e578aa667f85040471a2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/4c50ebbb7d1a66c5f3511261413cd499d30ba4cd",
"reference": "4c50ebbb7d1a66c5f3511261413cd499d30ba4cd",
"url": "https://api.github.com/repos/laravel/framework/zipball/d9b43ee080b4d51344b2e578aa667f85040471a2",
"reference": "d9b43ee080b4d51344b2e578aa667f85040471a2",
"shasum": ""
},
"require": {
@ -1996,7 +1996,7 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2021-06-25T23:57:38+00:00"
"time": "2021-07-06T14:06:38+00:00"
},
{
"name": "laravel/passport",
@ -2722,16 +2722,16 @@
},
{
"name": "league/oauth1-client",
"version": "v1.9.0",
"version": "v1.9.1",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/oauth1-client.git",
"reference": "1e7e6be2dc543bf466236fb171e5b20e1b06aee6"
"reference": "19a3ce488bb1547c906209e8293199ec34eaa5b1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/thephpleague/oauth1-client/zipball/1e7e6be2dc543bf466236fb171e5b20e1b06aee6",
"reference": "1e7e6be2dc543bf466236fb171e5b20e1b06aee6",
"url": "https://api.github.com/repos/thephpleague/oauth1-client/zipball/19a3ce488bb1547c906209e8293199ec34eaa5b1",
"reference": "19a3ce488bb1547c906209e8293199ec34eaa5b1",
"shasum": ""
},
"require": {
@ -2791,9 +2791,9 @@
],
"support": {
"issues": "https://github.com/thephpleague/oauth1-client/issues",
"source": "https://github.com/thephpleague/oauth1-client/tree/v1.9.0"
"source": "https://github.com/thephpleague/oauth1-client/tree/v1.9.1"
},
"time": "2021-01-20T01:40:53+00:00"
"time": "2021-07-07T22:54:46+00:00"
},
{
"name": "league/oauth2-server",
@ -2884,11 +2884,11 @@
},
{
"name": "leenooks/laravel",
"version": "9.0.7",
"version": "9.0.8",
"source": {
"type": "git",
"url": "https://dev.leenooks.net/leenooks/laravel",
"reference": "1f114667aad9c023716516e19a292fbc0748f9a8"
"reference": "2eaf000ce0093581a520ae51ddd25206c8f6e680"
},
"require": {
"creativeorange/gravatar": "^1.0",
@ -2925,20 +2925,20 @@
"laravel",
"leenooks"
],
"time": "2021-07-01T23:09:31+00:00"
"time": "2021-07-09T01:53:04+00:00"
},
{
"name": "monolog/monolog",
"version": "2.2.0",
"version": "2.3.0",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
"reference": "1cb1cde8e8dd0f70cc0fe51354a59acad9302084"
"reference": "df991fd88693ab703aa403413d83e15f688dae33"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/1cb1cde8e8dd0f70cc0fe51354a59acad9302084",
"reference": "1cb1cde8e8dd0f70cc0fe51354a59acad9302084",
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/df991fd88693ab703aa403413d83e15f688dae33",
"reference": "df991fd88693ab703aa403413d83e15f688dae33",
"shasum": ""
},
"require": {
@ -2957,7 +2957,7 @@
"php-amqplib/php-amqplib": "~2.4",
"php-console/php-console": "^3.1.3",
"phpspec/prophecy": "^1.6.1",
"phpstan/phpstan": "^0.12.59",
"phpstan/phpstan": "^0.12.91",
"phpunit/phpunit": "^8.5",
"predis/predis": "^1.1",
"rollbar/rollbar": "^1.3",
@ -3009,7 +3009,7 @@
],
"support": {
"issues": "https://github.com/Seldaek/monolog/issues",
"source": "https://github.com/Seldaek/monolog/tree/2.2.0"
"source": "https://github.com/Seldaek/monolog/tree/2.3.0"
},
"funding": [
{
@ -3021,20 +3021,20 @@
"type": "tidelift"
}
],
"time": "2020-12-14T13:15:25+00:00"
"time": "2021-07-05T11:34:13+00:00"
},
{
"name": "nesbot/carbon",
"version": "2.49.0",
"version": "2.50.0",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
"reference": "93d9db91c0235c486875d22f1e08b50bdf3e6eee"
"reference": "f47f17d17602b2243414a44ad53d9f8b9ada5fdb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/93d9db91c0235c486875d22f1e08b50bdf3e6eee",
"reference": "93d9db91c0235c486875d22f1e08b50bdf3e6eee",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/f47f17d17602b2243414a44ad53d9f8b9ada5fdb",
"reference": "f47f17d17602b2243414a44ad53d9f8b9ada5fdb",
"shasum": ""
},
"require": {
@ -3086,15 +3086,15 @@
{
"name": "Brian Nesbitt",
"email": "brian@nesbot.com",
"homepage": "http://nesbot.com"
"homepage": "https://markido.com"
},
{
"name": "kylekatarnls",
"homepage": "http://github.com/kylekatarnls"
"homepage": "https://github.com/kylekatarnls"
}
],
"description": "An API extension for DateTime that supports 281 different languages.",
"homepage": "http://carbon.nesbot.com",
"homepage": "https://carbon.nesbot.com",
"keywords": [
"date",
"datetime",
@ -3114,20 +3114,20 @@
"type": "tidelift"
}
],
"time": "2021-06-02T07:31:40+00:00"
"time": "2021-06-28T22:38:45+00:00"
},
{
"name": "nyholm/psr7",
"version": "1.4.0",
"version": "1.4.1",
"source": {
"type": "git",
"url": "https://github.com/Nyholm/psr7.git",
"reference": "23ae1f00fbc6a886cbe3062ca682391b9cc7c37b"
"reference": "2212385b47153ea71b1c1b1374f8cb5e4f7892ec"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Nyholm/psr7/zipball/23ae1f00fbc6a886cbe3062ca682391b9cc7c37b",
"reference": "23ae1f00fbc6a886cbe3062ca682391b9cc7c37b",
"url": "https://api.github.com/repos/Nyholm/psr7/zipball/2212385b47153ea71b1c1b1374f8cb5e4f7892ec",
"reference": "2212385b47153ea71b1c1b1374f8cb5e4f7892ec",
"shasum": ""
},
"require": {
@ -3141,7 +3141,7 @@
"psr/http-message-implementation": "1.0"
},
"require-dev": {
"http-interop/http-factory-tests": "^0.8",
"http-interop/http-factory-tests": "^0.9",
"php-http/psr7-integration-tests": "^1.0",
"phpunit/phpunit": "^7.5 || 8.5 || 9.4",
"symfony/error-handler": "^4.4"
@ -3179,7 +3179,7 @@
],
"support": {
"issues": "https://github.com/Nyholm/psr7/issues",
"source": "https://github.com/Nyholm/psr7/tree/1.4.0"
"source": "https://github.com/Nyholm/psr7/tree/1.4.1"
},
"funding": [
{
@ -3191,7 +3191,7 @@
"type": "github"
}
],
"time": "2021-02-18T15:41:32+00:00"
"time": "2021-07-02T08:32:20+00:00"
},
{
"name": "opis/closure",
@ -4642,16 +4642,16 @@
},
{
"name": "romanzipp/laravel-queue-monitor",
"version": "2.1.3",
"version": "2.1.4",
"source": {
"type": "git",
"url": "https://github.com/romanzipp/Laravel-Queue-Monitor.git",
"reference": "831ad1c0fca053080a75f13f545701347c83d36e"
"reference": "15ce5952a79e47dbebed5ca69d5cd4a53e53b3d0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/romanzipp/Laravel-Queue-Monitor/zipball/831ad1c0fca053080a75f13f545701347c83d36e",
"reference": "831ad1c0fca053080a75f13f545701347c83d36e",
"url": "https://api.github.com/repos/romanzipp/Laravel-Queue-Monitor/zipball/15ce5952a79e47dbebed5ca69d5cd4a53e53b3d0",
"reference": "15ce5952a79e47dbebed5ca69d5cd4a53e53b3d0",
"shasum": ""
},
"require": {
@ -4698,9 +4698,9 @@
"description": "Queue Monitoring for Laravel Database Job Queue",
"support": {
"issues": "https://github.com/romanzipp/Laravel-Queue-Monitor/issues",
"source": "https://github.com/romanzipp/Laravel-Queue-Monitor/tree/2.1.3"
"source": "https://github.com/romanzipp/Laravel-Queue-Monitor/tree/2.1.4"
},
"time": "2021-06-17T06:52:35+00:00"
"time": "2021-06-30T17:06:23+00:00"
},
{
"name": "spatie/laravel-demo-mode",
@ -5139,16 +5139,16 @@
},
{
"name": "symfony/error-handler",
"version": "v5.3.0",
"version": "v5.3.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/error-handler.git",
"reference": "0e6768b8c0dcef26df087df2bbbaa143867a59b2"
"reference": "43323e79c80719e8a4674e33484bca98270d223f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/error-handler/zipball/0e6768b8c0dcef26df087df2bbbaa143867a59b2",
"reference": "0e6768b8c0dcef26df087df2bbbaa143867a59b2",
"url": "https://api.github.com/repos/symfony/error-handler/zipball/43323e79c80719e8a4674e33484bca98270d223f",
"reference": "43323e79c80719e8a4674e33484bca98270d223f",
"shasum": ""
},
"require": {
@ -5188,7 +5188,7 @@
"description": "Provides tools to manage errors and ease debugging PHP code",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/error-handler/tree/v5.3.0"
"source": "https://github.com/symfony/error-handler/tree/v5.3.3"
},
"funding": [
{
@ -5204,7 +5204,7 @@
"type": "tidelift"
}
],
"time": "2021-05-26T17:43:10+00:00"
"time": "2021-06-24T08:13:00+00:00"
},
{
"name": "symfony/event-dispatcher",
@ -5511,16 +5511,16 @@
},
{
"name": "symfony/http-foundation",
"version": "v5.3.2",
"version": "v5.3.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
"reference": "7b6dd714d95106b831aaa7f3c9c612ab886516bd"
"reference": "0e45ab1574caa0460d9190871a8ce47539e40ccf"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/7b6dd714d95106b831aaa7f3c9c612ab886516bd",
"reference": "7b6dd714d95106b831aaa7f3c9c612ab886516bd",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/0e45ab1574caa0460d9190871a8ce47539e40ccf",
"reference": "0e45ab1574caa0460d9190871a8ce47539e40ccf",
"shasum": ""
},
"require": {
@ -5564,7 +5564,7 @@
"description": "Defines an object-oriented layer for the HTTP specification",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/http-foundation/tree/v5.3.2"
"source": "https://github.com/symfony/http-foundation/tree/v5.3.3"
},
"funding": [
{
@ -5580,20 +5580,20 @@
"type": "tidelift"
}
],
"time": "2021-06-12T10:15:17+00:00"
"time": "2021-06-27T09:19:40+00:00"
},
{
"name": "symfony/http-kernel",
"version": "v5.3.2",
"version": "v5.3.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
"reference": "e7021165d9dbfb4051296b8de827e92c8a7b5c87"
"reference": "90ad9f4b21ddcb8ebe9faadfcca54929ad23f9f8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/e7021165d9dbfb4051296b8de827e92c8a7b5c87",
"reference": "e7021165d9dbfb4051296b8de827e92c8a7b5c87",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/90ad9f4b21ddcb8ebe9faadfcca54929ad23f9f8",
"reference": "90ad9f4b21ddcb8ebe9faadfcca54929ad23f9f8",
"shasum": ""
},
"require": {
@ -5676,7 +5676,7 @@
"description": "Provides a structured process for converting a Request into a Response",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/http-kernel/tree/v5.3.2"
"source": "https://github.com/symfony/http-kernel/tree/v5.3.3"
},
"funding": [
{
@ -5692,7 +5692,7 @@
"type": "tidelift"
}
],
"time": "2021-06-17T14:18:27+00:00"
"time": "2021-06-30T08:27:49+00:00"
},
{
"name": "symfony/mime",
@ -6827,16 +6827,16 @@
},
{
"name": "symfony/string",
"version": "v5.3.2",
"version": "v5.3.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
"reference": "0732e97e41c0a590f77e231afc16a327375d50b0"
"reference": "bd53358e3eccec6a670b5f33ab680d8dbe1d4ae1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/string/zipball/0732e97e41c0a590f77e231afc16a327375d50b0",
"reference": "0732e97e41c0a590f77e231afc16a327375d50b0",
"url": "https://api.github.com/repos/symfony/string/zipball/bd53358e3eccec6a670b5f33ab680d8dbe1d4ae1",
"reference": "bd53358e3eccec6a670b5f33ab680d8dbe1d4ae1",
"shasum": ""
},
"require": {
@ -6890,7 +6890,7 @@
"utf8"
],
"support": {
"source": "https://github.com/symfony/string/tree/v5.3.2"
"source": "https://github.com/symfony/string/tree/v5.3.3"
},
"funding": [
{
@ -6906,20 +6906,20 @@
"type": "tidelift"
}
],
"time": "2021-06-06T09:51:56+00:00"
"time": "2021-06-27T11:44:38+00:00"
},
{
"name": "symfony/translation",
"version": "v5.3.2",
"version": "v5.3.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
"reference": "7e2603bcc598e14804c4d2359d8dc4ee3c40391b"
"reference": "380b8c9e944d0e364b25f28e8e555241eb49c01c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/7e2603bcc598e14804c4d2359d8dc4ee3c40391b",
"reference": "7e2603bcc598e14804c4d2359d8dc4ee3c40391b",
"url": "https://api.github.com/repos/symfony/translation/zipball/380b8c9e944d0e364b25f28e8e555241eb49c01c",
"reference": "380b8c9e944d0e364b25f28e8e555241eb49c01c",
"shasum": ""
},
"require": {
@ -6985,7 +6985,7 @@
"description": "Provides tools to internationalize your application",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/translation/tree/v5.3.2"
"source": "https://github.com/symfony/translation/tree/v5.3.3"
},
"funding": [
{
@ -7001,7 +7001,7 @@
"type": "tidelift"
}
],
"time": "2021-06-06T09:51:56+00:00"
"time": "2021-06-27T12:22:47+00:00"
},
{
"name": "symfony/translation-contracts",
@ -7083,16 +7083,16 @@
},
{
"name": "symfony/var-dumper",
"version": "v5.3.2",
"version": "v5.3.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
"reference": "905a22c68b292ffb6f20d7636c36b220d1fba5ae"
"reference": "46aa709affb9ad3355bd7a810f9662d71025c384"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/905a22c68b292ffb6f20d7636c36b220d1fba5ae",
"reference": "905a22c68b292ffb6f20d7636c36b220d1fba5ae",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/46aa709affb9ad3355bd7a810f9662d71025c384",
"reference": "46aa709affb9ad3355bd7a810f9662d71025c384",
"shasum": ""
},
"require": {
@ -7151,7 +7151,7 @@
"dump"
],
"support": {
"source": "https://github.com/symfony/var-dumper/tree/v5.3.2"
"source": "https://github.com/symfony/var-dumper/tree/v5.3.3"
},
"funding": [
{
@ -7167,7 +7167,7 @@
"type": "tidelift"
}
],
"time": "2021-06-06T09:51:56+00:00"
"time": "2021-06-24T08:13:00+00:00"
},
{
"name": "tijsverkoyen/css-to-inline-styles",
@ -8396,16 +8396,16 @@
},
{
"name": "fakerphp/faker",
"version": "v1.14.1",
"version": "v1.15.0",
"source": {
"type": "git",
"url": "https://github.com/FakerPHP/Faker.git",
"reference": "ed22aee8d17c7b396f74a58b1e7fefa4f90d5ef1"
"reference": "89c6201c74db25fa759ff16e78a4d8f32547770e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/FakerPHP/Faker/zipball/ed22aee8d17c7b396f74a58b1e7fefa4f90d5ef1",
"reference": "ed22aee8d17c7b396f74a58b1e7fefa4f90d5ef1",
"url": "https://api.github.com/repos/FakerPHP/Faker/zipball/89c6201c74db25fa759ff16e78a4d8f32547770e",
"reference": "89c6201c74db25fa759ff16e78a4d8f32547770e",
"shasum": ""
},
"require": {
@ -8455,9 +8455,9 @@
],
"support": {
"issues": "https://github.com/FakerPHP/Faker/issues",
"source": "https://github.com/FakerPHP/Faker/tree/v.1.14.1"
"source": "https://github.com/FakerPHP/Faker/tree/v1.15.0"
},
"time": "2021-03-30T06:27:33+00:00"
"time": "2021-07-06T20:39:40+00:00"
},
{
"name": "filp/whoops",
@ -8848,16 +8848,16 @@
},
{
"name": "nikic/php-parser",
"version": "v4.10.5",
"version": "v4.11.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
"reference": "4432ba399e47c66624bc73c8c0f811e5c109576f"
"reference": "fe14cf3672a149364fb66dfe11bf6549af899f94"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4432ba399e47c66624bc73c8c0f811e5c109576f",
"reference": "4432ba399e47c66624bc73c8c0f811e5c109576f",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/fe14cf3672a149364fb66dfe11bf6549af899f94",
"reference": "fe14cf3672a149364fb66dfe11bf6549af899f94",
"shasum": ""
},
"require": {
@ -8898,9 +8898,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
"source": "https://github.com/nikic/PHP-Parser/tree/v4.10.5"
"source": "https://github.com/nikic/PHP-Parser/tree/v4.11.0"
},
"time": "2021-05-03T19:11:20+00:00"
"time": "2021-07-03T13:36:55+00:00"
},
{
"name": "nunomaduro/collision",
@ -10943,16 +10943,16 @@
},
{
"name": "symfony/filesystem",
"version": "v5.3.0",
"version": "v5.3.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
"reference": "348116319d7fb7d1faa781d26a48922428013eb2"
"reference": "19b71c8f313b411172dd5f470fd61f24466d79a9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/348116319d7fb7d1faa781d26a48922428013eb2",
"reference": "348116319d7fb7d1faa781d26a48922428013eb2",
"url": "https://api.github.com/repos/symfony/filesystem/zipball/19b71c8f313b411172dd5f470fd61f24466d79a9",
"reference": "19b71c8f313b411172dd5f470fd61f24466d79a9",
"shasum": ""
},
"require": {
@ -10985,7 +10985,7 @@
"description": "Provides basic utilities for the filesystem",
"homepage": "https://symfony.com",
"support": {
"source": "https://github.com/symfony/filesystem/tree/v5.3.0"
"source": "https://github.com/symfony/filesystem/tree/v5.3.3"
},
"funding": [
{
@ -11001,7 +11001,7 @@
"type": "tidelift"
}
],
"time": "2021-05-26T17:43:10+00:00"
"time": "2021-06-30T07:27:52+00:00"
},
{
"name": "theseer/tokenizer",

View File

@ -18,7 +18,7 @@
<div class="row">
<div class="col-12">
<div class="card">
<div class="card card-dark">
<div class="card-header">
<h1 class="card-title">Setup Configuration</h1>
@if(session()->has('success'))
@ -42,7 +42,7 @@
{{ $message }}
@else
Organisation Name is required.
@enderror
@enderror
</span>
<span class="input-helper">System Name used everywhere.</span>
</div>