- laravel framework upgrade frpm 7.x to 8. see also: https://laravel.com/docs/8.x/upgrade#assert-exact-json-method

- use  PHP7 null coalesce operator instead of laravel optional method
- change Breadcrumbs::register method to Bredcrumbs::for method
- composer updates
This commit is contained in:
Arno Kaimbacher 2022-08-10 11:18:10 +02:00
parent 1b2e77d907
commit 8ea540a88c
50 changed files with 616 additions and 263 deletions

View File

@ -19,12 +19,23 @@ class Handler extends ExceptionHandler
'password_confirmation',
];
/**
* A list of the inputs that are never flashed for validation exceptions.
*
* @var array<int, string>
*/
protected $dontFlash = [
'current_password',
'password',
'password_confirmation',
];
/**
* Report or log an exception.
*
* This is a great spot to send exceptions to Sentry, Bugsnag, etc.
*
* @param \Throable $exception
* @param \Throwable $exception
* @return void
*/
public function report(Throwable $exception)

View File

@ -2,7 +2,6 @@
namespace App\Http\Controllers;
//use Illuminate\Foundation\Bus\DispatchesCommands;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Foundation\Validation\ValidatesRequests;

View File

@ -37,8 +37,9 @@ class Kernel extends HttpKernel
],
'api' => [
'throttle:60,1',
'bindings',
// \Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful::class,
'throttle:api',
\Illuminate\Routing\Middleware\SubstituteBindings::class,
],
];
@ -53,10 +54,12 @@ class Kernel extends HttpKernel
//'auth' => 'App\Http\Middleware\Authenticate',
'auth' => \Illuminate\Auth\Middleware\Authenticate::class,
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
// 'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
'can' => \Illuminate\Auth\Middleware\Authorize::class,
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
// 'role' => \Spatie\Permission\Middlewares\RoleMiddleware::class,
// 'perm' => \App\Http\Middleware\PermissionMiddleware::class,

View File

@ -1,6 +1,7 @@
<?php
namespace App\Http\Middleware;
use App\Providers\RouteServiceProvider;
use Closure;
use Illuminate\Support\Facades\Auth;
@ -14,10 +15,17 @@ class RedirectIfAuthenticated
* @param \Closure $next
* @return mixed
*/
public function handle($request, Closure $next, $guard = null)
public function handle($request, Closure $next, $guards = [null])
{
if (Auth::guard($guard)->check()) {
return redirect('/home');
$guards = empty($guards) ? [null] : $guards;
// if (Auth::guard($guard)->check()) {
// return redirect('/home');
// }
foreach ($guards as $guard) {
if (Auth::guard($guard)->check()) {
return redirect(RouteServiceProvider::HOME);
}
}
return $next($request);

View File

@ -19,6 +19,7 @@ class TrimStrings extends BaseTrimmer
* @var array
*/
protected $except = [
'current_password',
'password',
'password_confirmation',
];

View File

@ -0,0 +1,28 @@
<?php
namespace App\Http\Middleware;
use Illuminate\Http\Middleware\TrustProxies as Middleware;
use Illuminate\Http\Request;
class TrustProxies extends Middleware
{
/**
* The trusted proxies for this application.
*
* @var array<int, string>|string|null
*/
protected $proxies;
/**
* The headers that should be used to detect proxies.
*
* @var int
*/
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;
}

View File

@ -3,10 +3,13 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use App\Models\Dataset;
class Collection extends Model
{
use HasFactory;
public $timestamps = false;
//mass assignable
protected $fillable = [

View File

@ -3,11 +3,14 @@
namespace App\Models;
use App\Models\Collection;
use App\Models\Dataset;
// use App\Models\Dataset;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Factories\HasFactory;
class CollectionRole extends Model
{
use HasFactory;
protected $table = 'collections_roles';
public $timestamps = false;
protected $fillable = [

View File

@ -2,11 +2,13 @@
namespace App\Models;
use App\Models\Dataset;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use DateTimeInterface;
class Coverage extends Model
{
use HasFactory;
protected $table = 'coverage';
public $timestamps = true;
protected $dateFormat = 'Y-m-d H:i:s';

View File

@ -2,6 +2,7 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use App\Library\Xml\DatasetExtension;
use App\Models\Collection;
use App\Models\Coverage;
@ -20,7 +21,7 @@ use Illuminate\Database\Eloquent\Model;
class Dataset extends Model
{
use DatasetExtension;
use DatasetExtension, HasFactory;
protected $table = 'documents';
//public $timestamps = false; //default true

View File

@ -3,9 +3,11 @@ namespace App\Models;
use App\Models\Dataset;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Factories\HasFactory;
class DatasetIdentifier extends Model
{
use HasFactory;
protected $table = 'dataset_identifiers';
protected $guarded = array();
public $timestamps = true;

View File

@ -4,9 +4,11 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use App\Models\Dataset;
use Illuminate\Database\Eloquent\Factories\HasFactory;
class DatasetReference extends Model
{
use HasFactory;
protected $table = 'document_references';
public $timestamps = false;

View File

@ -3,9 +3,11 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use App\Models\Dataset;
use Illuminate\Database\Eloquent\Factories\HasFactory;
class Description extends Model
{
use HasFactory;
protected $table = 'dataset_abstracts';
public $timestamps = false;

View File

@ -5,9 +5,11 @@ namespace App\Models;
use App\Models\Dataset;
use App\Models\HashValue;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Factories\HasFactory;
class File extends Model
{
use HasFactory;
protected $table = 'document_files';
public $timestamps = true;

View File

@ -3,9 +3,11 @@ namespace App\Models;
use App\Models\Dataset;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Factories\HasFactory;
class GeolocationBox extends Model
{
use HasFactory;
protected $table = 'geolocation_box';
public $timestamps = false;

View File

@ -4,9 +4,11 @@ namespace App\Models;
use App\Models\File;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Factories\HasFactory;
class HashValue extends Model
{
use HasFactory;
protected $table = 'file_hashvalues';
public $timestamps = false;

View File

@ -2,10 +2,11 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Factories\HasFactory;
class Language extends Model
{
use HasFactory;
//protected $table = 'languages';
public $timestamps = false;

View File

@ -3,9 +3,11 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use App\Models\Dataset;
use Illuminate\Database\Eloquent\Factories\HasFactory;
class License extends Model
{
use HasFactory;
protected $table = 'document_licences';
public $timestamps = false;

View File

@ -3,8 +3,9 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Factories\HasFactory;
class Message extends Model
{
//
use HasFactory;
}

View File

@ -2,10 +2,11 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Factories\HasFactory;
class MimeType extends Model
{
use HasFactory;
protected $table = 'mime_types';
// for using $input = $request->all();

View File

@ -8,9 +8,11 @@ use App\Models\User;
use Illuminate\Database\Eloquent\Model;
use Astrotomic\Translatable\Contracts\Translatable as TranslatableContract;
use Astrotomic\Translatable\Translatable;// use Dimsav\Translatable\Translatable;
use Illuminate\Database\Eloquent\Factories\HasFactory;
class Page extends Model implements TranslatableContract
{
use HasFactory;
use ModelTrait;
use Translatable; // 2. To add translation methods

View File

@ -3,9 +3,11 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Factories\HasFactory;
class PageTranslation extends Model
{
Use HasFactory;
public $timestamps = false;
protected $fillable = ['title', 'description'];
protected $guarded = ['id'];

View File

@ -4,9 +4,11 @@ namespace App\Models;
use App\Models\Dataset;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Factories\HasFactory;
class Person extends Model
{
use HasFactory;
protected $fillable = [
'academic_title',
'date_of_birth',

View File

@ -3,10 +3,11 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use App\Models\Dataset;
use Illuminate\Database\Eloquent\Factories\HasFactory;
class Project extends Model
{
use HasFactory;
//protected $table = 'projects';
// for using $input = $request->all();

View File

@ -3,9 +3,11 @@
namespace App\Models;
use Zizaco\Entrust\EntrustRole;
use Illuminate\Database\Eloquent\Factories\HasFactory;
class Role extends EntrustRole
{
use HasFactory;
/**
* The attributes that are mass assignable.
*

View File

@ -4,9 +4,11 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use App\Models\Dataset;
use Illuminate\Database\Eloquent\Factories\HasFactory;
class Subject extends Model
{
Use HasFactory;
// protected $table = 'document_subjects';
protected $table = 'dataset_subjects';
public $timestamps = false;

View File

@ -3,9 +3,11 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use App\Models\Dataset;
use Illuminate\Database\Eloquent\Factories\HasFactory;
class Title extends Model
{
use HasFactory;
protected $table = 'dataset_titles';
public $timestamps = false;

View File

@ -1,9 +1,11 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Notifications\Notifiable;
// use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable;
use Zizaco\Entrust\Traits\EntrustUserTrait;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Collection;
@ -12,7 +14,7 @@ use App\Models\Dataset;
class User extends Authenticatable
{
// use Authenticatable, CanResetPassword, Authorizable;
use Notifiable;
use HasFactory, Notifiable;
// use HasRoles;
use EntrustUserTrait;

View File

@ -2,7 +2,7 @@
namespace App\Providers;
use Illuminate\Support\Facades\Gate;
// use Illuminate\Support\Facades\Gate;
use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
class AuthServiceProvider extends ServiceProvider

View File

@ -3,19 +3,30 @@ namespace App\Providers;
use Illuminate\Support\Facades\Route;
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
use Illuminate\Http\Request;
use Illuminate\Cache\RateLimiting\Limit;
use Illuminate\Support\Facades\RateLimiter;
class RouteServiceProvider extends ServiceProvider
{
/**
* The path to the "home" route for your application.
*
* This is used by Laravel authentication to redirect users after login.
*
* @var string
*/
public const HOME = '/settings';
/**
* This namespace is applied to the controller routes in your routes file.
* If specified, this namespace is automatically applied to your controller routes.
*
* In addition, it is set as the URL generator's root namespace.
*
* @var string
*/
protected $namespace = 'App\Http\Controllers';
public const HOME = '/settings';
/**
* Define your route model bindings, pattern filters, etc.
@ -25,7 +36,19 @@ class RouteServiceProvider extends ServiceProvider
*/
public function boot()
{
parent::boot();
// parent::boot();
$this->configureRateLimiting();
$this->routes(function () {
// Route::prefix('api')
Route::middleware('api')
->namespace($this->namespace)
->group(base_path('routes/api.php'));
Route::middleware('web')
->namespace($this->namespace)
->group(base_path('routes/web.php'));
});
//
}
@ -73,4 +96,17 @@ class RouteServiceProvider extends ServiceProvider
->namespace($this->namespace)
->group(base_path('routes/api.php'));
}
/**
* Configure the rate limiters for the application.
*
* @return void
*/
protected function configureRateLimiting()
{
RateLimiter::for('api', function (Request $request) {
return Limit::perMinute(60)->by(optional($request->user())->id ?: $request->ip());
});
}
}

View File

@ -1,32 +1,32 @@
{
"name": "laravel/laravel",
"type": "project",
"description": "The Laravel Framework.",
"keywords": [
"framework",
"laravel"
],
"license": "MIT",
"type": "project",
"require": {
"php": "^7.2.5||^8.0",
"php": "^7.3||^8.0",
"arifhp86/laravel-clear-expired-cache-file": "^0.0.4",
"astrotomic/laravel-translatable": "^11.1",
"diglactic/laravel-breadcrumbs": "^6.1",
"doctrine/dbal": "2.*",
"diglactic/laravel-breadcrumbs": "7.2",
"doctrine/dbal": "^3.3",
"felixkiss/uniquewith-validator": "^3.1",
"fideloper/proxy": "^4.4",
"gghughunishvili/entrust": "4.0",
"guzzlehttp/guzzle": "^7.2",
"laravel/framework": "^7.29",
"laravel/framework": "^8.75",
"laravel/tinker": "^2.5",
"laravel/ui": "2.0",
"laravel/ui": "^3.4",
"laravelcollective/html": "^6.1",
"mcamara/laravel-localization": "^1.3",
"solarium/solarium": "^6.1",
"yajra/laravel-datatables-oracle": "^9.0"
},
"require-dev": {
"phpunit/phpunit": "^8.5.8|^9.3.3"
"phpunit/phpunit": "^9.5.10"
},
"extra": {
"laravel": {
@ -38,12 +38,11 @@
"app/Helpers/utils.php",
"app/Constants/constants.php"
],
"classmap": [
"database/seeds",
"database/factories"
],
"psr-4": {
"App\\": "app/"
"App\\": "app/",
"Database\\Factories\\": "database/factories/",
"Database\\Seeders\\": "database/seeders/"
}
},
"autoload-dev": {
@ -52,6 +51,10 @@
}
},
"scripts": {
"post-autoload-dump": [
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
"@php artisan package:discover --ansi"
],
"post-install-cmd": [
"@php artisan clear-compiled"
],
@ -59,10 +62,6 @@
"php -r \"copy('.env.example', '.env');\"",
"@php artisan key:generate --ansi"
],
"post-autoload-dump": [
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
"@php artisan package:discover --ansi"
],
"test": "php vendor/phpunit/phpunit/phpunit --testsuite Feature"
},
"config": {

555
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "07b1027e6d94c09bc76363fc33223a25",
"content-hash": "4f77bfed248a8fb79fbb269478c4e686",
"packages": [
{
"name": "arifhp86/laravel-clear-expired-cache-file",
@ -207,28 +207,28 @@
},
{
"name": "diglactic/laravel-breadcrumbs",
"version": "v6.1.1",
"version": "v7.2.0",
"source": {
"type": "git",
"url": "https://github.com/diglactic/laravel-breadcrumbs.git",
"reference": "8f73674f9c5403625154768f8e123a620fc2d7a5"
"reference": "309ec597d047b763d1df3c5113a3932cc771500f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/diglactic/laravel-breadcrumbs/zipball/8f73674f9c5403625154768f8e123a620fc2d7a5",
"reference": "8f73674f9c5403625154768f8e123a620fc2d7a5",
"url": "https://api.github.com/repos/diglactic/laravel-breadcrumbs/zipball/309ec597d047b763d1df3c5113a3932cc771500f",
"reference": "309ec597d047b763d1df3c5113a3932cc771500f",
"shasum": ""
},
"require": {
"facade/ignition-contracts": "^1.0",
"laravel/framework": "^6.0 || ^7.0 || ^8.0",
"laravel/framework": "^6.0 || ^7.0 || ^8.0 || ^9.0",
"php": "^7.2 || ^8.0"
},
"conflict": {
"davejamesmiller/laravel-breadcrumbs": "*"
},
"require-dev": {
"orchestra/testbench": "^4.10 || ^5.9 || ^6.4",
"orchestra/testbench": "^4.10 || ^5.9 || ^6.4 || ^7.0",
"php-coveralls/php-coveralls": "^2.4",
"phpunit/phpunit": "^8.5 || ^9.4",
"spatie/phpunit-snapshot-assertions": "^2.2 || ^4.2"
@ -245,9 +245,6 @@
}
},
"autoload": {
"files": [
"src/deprecated.php"
],
"psr-4": {
"Diglactic\\Breadcrumbs\\": "src/"
}
@ -275,9 +272,9 @@
],
"support": {
"issues": "https://github.com/diglactic/laravel-breadcrumbs/issues",
"source": "https://github.com/diglactic/laravel-breadcrumbs/tree/v6.1.1"
"source": "https://github.com/diglactic/laravel-breadcrumbs/tree/v7.2.0"
},
"time": "2021-04-12T18:06:07+00:00"
"time": "2022-05-03T05:40:37+00:00"
},
{
"name": "doctrine/cache",
@ -374,35 +371,38 @@
},
{
"name": "doctrine/dbal",
"version": "2.13.9",
"version": "3.3.8",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
"reference": "c480849ca3ad6706a39c970cdfe6888fa8a058b8"
"reference": "f873a820227bc352d023791775a01f078a30dfe1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/c480849ca3ad6706a39c970cdfe6888fa8a058b8",
"reference": "c480849ca3ad6706a39c970cdfe6888fa8a058b8",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/f873a820227bc352d023791775a01f078a30dfe1",
"reference": "f873a820227bc352d023791775a01f078a30dfe1",
"shasum": ""
},
"require": {
"doctrine/cache": "^1.0|^2.0",
"composer-runtime-api": "^2",
"doctrine/cache": "^1.11|^2.0",
"doctrine/deprecations": "^0.5.3|^1",
"doctrine/event-manager": "^1.0",
"ext-pdo": "*",
"php": "^7.1 || ^8"
"php": "^7.3 || ^8.0",
"psr/cache": "^1|^2|^3",
"psr/log": "^1|^2|^3"
},
"require-dev": {
"doctrine/coding-standard": "9.0.0",
"jetbrains/phpstorm-stubs": "2021.1",
"phpstan/phpstan": "1.4.6",
"phpunit/phpunit": "^7.5.20|^8.5|9.5.16",
"psalm/plugin-phpunit": "0.16.1",
"squizlabs/php_codesniffer": "3.6.2",
"symfony/cache": "^4.4",
"symfony/console": "^2.0.5|^3.0|^4.0|^5.0",
"vimeo/psalm": "4.22.0"
"jetbrains/phpstorm-stubs": "2022.1",
"phpstan/phpstan": "1.8.2",
"phpstan/phpstan-strict-rules": "^1.3",
"phpunit/phpunit": "9.5.21",
"psalm/plugin-phpunit": "0.17.0",
"squizlabs/php_codesniffer": "3.7.1",
"symfony/cache": "^5.2|^6.0",
"symfony/console": "^2.7|^3.0|^4.0|^5.0|^6.0",
"vimeo/psalm": "4.24.0"
},
"suggest": {
"symfony/console": "For helpful console commands such as SQL execution and import of files."
@ -413,7 +413,7 @@
"type": "library",
"autoload": {
"psr-4": {
"Doctrine\\DBAL\\": "lib/Doctrine/DBAL"
"Doctrine\\DBAL\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
@ -456,14 +456,13 @@
"queryobject",
"sasql",
"sql",
"sqlanywhere",
"sqlite",
"sqlserver",
"sqlsrv"
],
"support": {
"issues": "https://github.com/doctrine/dbal/issues",
"source": "https://github.com/doctrine/dbal/tree/2.13.9"
"source": "https://github.com/doctrine/dbal/tree/3.3.8"
},
"funding": [
{
@ -479,7 +478,7 @@
"type": "tidelift"
}
],
"time": "2022-05-02T20:28:55+00:00"
"time": "2022-08-05T15:35:35+00:00"
},
{
"name": "doctrine/deprecations",
@ -784,30 +783,32 @@
},
{
"name": "dragonmantank/cron-expression",
"version": "v2.3.1",
"version": "v3.3.1",
"source": {
"type": "git",
"url": "https://github.com/dragonmantank/cron-expression.git",
"reference": "65b2d8ee1f10915efb3b55597da3404f096acba2"
"reference": "be85b3f05b46c39bbc0d95f6c071ddff669510fa"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/65b2d8ee1f10915efb3b55597da3404f096acba2",
"reference": "65b2d8ee1f10915efb3b55597da3404f096acba2",
"url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/be85b3f05b46c39bbc0d95f6c071ddff669510fa",
"reference": "be85b3f05b46c39bbc0d95f6c071ddff669510fa",
"shasum": ""
},
"require": {
"php": "^7.0|^8.0"
"php": "^7.2|^8.0",
"webmozart/assert": "^1.0"
},
"replace": {
"mtdowling/cron-expression": "^1.0"
},
"require-dev": {
"phpunit/phpunit": "^6.4|^7.0|^8.0|^9.0"
"phpstan/extension-installer": "^1.0",
"phpstan/phpstan": "^1.0",
"phpstan/phpstan-webmozart-assert": "^1.0",
"phpunit/phpunit": "^7.0|^8.0|^9.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.3-dev"
}
},
"autoload": {
"psr-4": {
"Cron\\": "src/Cron/"
@ -818,11 +819,6 @@
"MIT"
],
"authors": [
{
"name": "Michael Dowling",
"email": "mtdowling@gmail.com",
"homepage": "https://github.com/mtdowling"
},
{
"name": "Chris Tankersley",
"email": "chris@ctankersley.com",
@ -836,7 +832,7 @@
],
"support": {
"issues": "https://github.com/dragonmantank/cron-expression/issues",
"source": "https://github.com/dragonmantank/cron-expression/tree/v2.3.1"
"source": "https://github.com/dragonmantank/cron-expression/tree/v3.3.1"
},
"funding": [
{
@ -844,7 +840,7 @@
"type": "github"
}
],
"time": "2020-10-13T00:52:37+00:00"
"time": "2022-01-18T15:43:28+00:00"
},
{
"name": "egulias/email-validator",
@ -1169,6 +1165,68 @@
},
"time": "2021-03-20T12:02:37+00:00"
},
{
"name": "graham-campbell/result-type",
"version": "v1.1.0",
"source": {
"type": "git",
"url": "https://github.com/GrahamCampbell/Result-Type.git",
"reference": "a878d45c1914464426dc94da61c9e1d36ae262a8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/a878d45c1914464426dc94da61c9e1d36ae262a8",
"reference": "a878d45c1914464426dc94da61c9e1d36ae262a8",
"shasum": ""
},
"require": {
"php": "^7.2.5 || ^8.0",
"phpoption/phpoption": "^1.9"
},
"require-dev": {
"phpunit/phpunit": "^8.5.28 || ^9.5.21"
},
"type": "library",
"autoload": {
"psr-4": {
"GrahamCampbell\\ResultType\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Graham Campbell",
"email": "hello@gjcampbell.co.uk",
"homepage": "https://github.com/GrahamCampbell"
}
],
"description": "An Implementation Of The Result Type",
"keywords": [
"Graham Campbell",
"GrahamCampbell",
"Result Type",
"Result-Type",
"result"
],
"support": {
"issues": "https://github.com/GrahamCampbell/Result-Type/issues",
"source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.0"
},
"funding": [
{
"url": "https://github.com/GrahamCampbell",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/graham-campbell/result-type",
"type": "tidelift"
}
],
"time": "2022-07-30T15:56:11+00:00"
},
{
"name": "guzzlehttp/guzzle",
"version": "7.4.5",
@ -1494,60 +1552,63 @@
},
{
"name": "laravel/framework",
"version": "v7.30.6",
"version": "v8.83.23",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "ecdafad1dda3c790af186a6d18479ea4757ef9ee"
"reference": "bdc707f8b9bcad289b24cd182d98ec7480ac4491"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/ecdafad1dda3c790af186a6d18479ea4757ef9ee",
"reference": "ecdafad1dda3c790af186a6d18479ea4757ef9ee",
"url": "https://api.github.com/repos/laravel/framework/zipball/bdc707f8b9bcad289b24cd182d98ec7480ac4491",
"reference": "bdc707f8b9bcad289b24cd182d98ec7480ac4491",
"shasum": ""
},
"require": {
"doctrine/inflector": "^1.4|^2.0",
"dragonmantank/cron-expression": "^2.3.1",
"dragonmantank/cron-expression": "^3.0.2",
"egulias/email-validator": "^2.1.10",
"ext-json": "*",
"ext-mbstring": "*",
"ext-openssl": "*",
"league/commonmark": "^1.3",
"laravel/serializable-closure": "^1.0",
"league/commonmark": "^1.3|^2.0.2",
"league/flysystem": "^1.1",
"monolog/monolog": "^2.0",
"nesbot/carbon": "^2.31",
"nesbot/carbon": "^2.53.1",
"opis/closure": "^3.6",
"php": "^7.2.5|^8.0",
"php": "^7.3|^8.0",
"psr/container": "^1.0",
"psr/log": "^1.0|^2.0",
"psr/simple-cache": "^1.0",
"ramsey/uuid": "^3.7|^4.0",
"swiftmailer/swiftmailer": "^6.0",
"symfony/console": "^5.0",
"symfony/error-handler": "^5.0",
"symfony/finder": "^5.0",
"symfony/http-foundation": "^5.0",
"symfony/http-kernel": "^5.0",
"symfony/mime": "^5.0",
"symfony/polyfill-php73": "^1.17",
"symfony/process": "^5.0",
"symfony/routing": "^5.0",
"symfony/var-dumper": "^5.0",
"ramsey/uuid": "^4.2.2",
"swiftmailer/swiftmailer": "^6.3",
"symfony/console": "^5.4",
"symfony/error-handler": "^5.4",
"symfony/finder": "^5.4",
"symfony/http-foundation": "^5.4",
"symfony/http-kernel": "^5.4",
"symfony/mime": "^5.4",
"symfony/process": "^5.4",
"symfony/routing": "^5.4",
"symfony/var-dumper": "^5.4",
"tijsverkoyen/css-to-inline-styles": "^2.2.2",
"vlucas/phpdotenv": "^4.0",
"voku/portable-ascii": "^1.4.8"
"vlucas/phpdotenv": "^5.4.1",
"voku/portable-ascii": "^1.6.1"
},
"conflict": {
"tightenco/collect": "<5.5.33"
},
"provide": {
"psr/container-implementation": "1.0"
"psr/container-implementation": "1.0",
"psr/simple-cache-implementation": "1.0"
},
"replace": {
"illuminate/auth": "self.version",
"illuminate/broadcasting": "self.version",
"illuminate/bus": "self.version",
"illuminate/cache": "self.version",
"illuminate/collections": "self.version",
"illuminate/config": "self.version",
"illuminate/console": "self.version",
"illuminate/container": "self.version",
@ -1560,6 +1621,7 @@
"illuminate/hashing": "self.version",
"illuminate/http": "self.version",
"illuminate/log": "self.version",
"illuminate/macroable": "self.version",
"illuminate/mail": "self.version",
"illuminate/notifications": "self.version",
"illuminate/pagination": "self.version",
@ -1575,22 +1637,24 @@
"illuminate/view": "self.version"
},
"require-dev": {
"aws/aws-sdk-php": "^3.155",
"doctrine/dbal": "^2.6",
"filp/whoops": "^2.8",
"guzzlehttp/guzzle": "^6.3.1|^7.0.1",
"aws/aws-sdk-php": "^3.198.1",
"doctrine/dbal": "^2.13.3|^3.1.4",
"filp/whoops": "^2.14.3",
"guzzlehttp/guzzle": "^6.5.5|^7.0.1",
"league/flysystem-cached-adapter": "^1.0",
"mockery/mockery": "~1.3.3|^1.4.2",
"moontoast/math": "^1.1",
"orchestra/testbench-core": "^5.8",
"mockery/mockery": "^1.4.4",
"orchestra/testbench-core": "^6.27",
"pda/pheanstalk": "^4.0",
"phpunit/phpunit": "^8.4|^9.3.3",
"predis/predis": "^1.1.1",
"symfony/cache": "^5.0"
"phpunit/phpunit": "^8.5.19|^9.5.8",
"predis/predis": "^1.1.9",
"symfony/cache": "^5.4"
},
"suggest": {
"aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.155).",
"doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6).",
"ably/ably-php": "Required to use the Ably broadcast driver (^1.0).",
"aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.198.1).",
"brianium/paratest": "Required to run tests in parallel (^6.0).",
"doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.13.3|^3.1.4).",
"ext-bcmath": "Required to use the multiple_of validation rule.",
"ext-ftp": "Required to use the Flysystem FTP driver.",
"ext-gd": "Required to use Illuminate\\Http\\Testing\\FileFactory::image().",
"ext-memcached": "Required to use the memcache cache driver.",
@ -1598,38 +1662,43 @@
"ext-posix": "Required to use all features of the queue worker.",
"ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0).",
"fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).",
"filp/whoops": "Required for friendly error pages in development (^2.8).",
"guzzlehttp/guzzle": "Required to use the HTTP Client, Mailgun mail driver and the ping methods on schedules (^6.3.1|^7.0.1).",
"filp/whoops": "Required for friendly error pages in development (^2.14.3).",
"guzzlehttp/guzzle": "Required to use the HTTP Client, Mailgun mail driver and the ping methods on schedules (^6.5.5|^7.0.1).",
"laravel/tinker": "Required to use the tinker console command (^2.0).",
"league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^1.0).",
"league/flysystem-cached-adapter": "Required to use the Flysystem cache (^1.0).",
"league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0).",
"mockery/mockery": "Required to use mocking (~1.3.3|^1.4.2).",
"moontoast/math": "Required to use ordered UUIDs (^1.1).",
"mockery/mockery": "Required to use mocking (^1.4.4).",
"nyholm/psr7": "Required to use PSR-7 bridging features (^1.2).",
"pda/pheanstalk": "Required to use the beanstalk queue driver (^4.0).",
"phpunit/phpunit": "Required to use assertions and run tests (^8.4|^9.3.3).",
"predis/predis": "Required to use the predis connector (^1.1.2).",
"phpunit/phpunit": "Required to use assertions and run tests (^8.5.19|^9.5.8).",
"predis/predis": "Required to use the predis connector (^1.1.9).",
"psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
"pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^4.0).",
"symfony/cache": "Required to PSR-6 cache bridge (^5.0).",
"symfony/filesystem": "Required to create relative storage directory symbolic links (^5.0).",
"pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^4.0|^5.0|^6.0|^7.0).",
"symfony/cache": "Required to PSR-6 cache bridge (^5.4).",
"symfony/filesystem": "Required to enable support for relative symbolic links (^5.4).",
"symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^2.0).",
"wildbit/swiftmailer-postmark": "Required to use Postmark mail driver (^3.0)."
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "7.x-dev"
"dev-master": "8.x-dev"
}
},
"autoload": {
"files": [
"src/Illuminate/Collections/helpers.php",
"src/Illuminate/Events/functions.php",
"src/Illuminate/Foundation/helpers.php",
"src/Illuminate/Support/helpers.php"
],
"psr-4": {
"Illuminate\\": "src/Illuminate/"
"Illuminate\\": "src/Illuminate/",
"Illuminate\\Support\\": [
"src/Illuminate/Macroable/",
"src/Illuminate/Collections/"
]
}
},
"notification-url": "https://packagist.org/downloads/",
@ -1652,7 +1721,66 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2021-12-07T14:56:47+00:00"
"time": "2022-07-26T13:30:00+00:00"
},
{
"name": "laravel/serializable-closure",
"version": "v1.2.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/serializable-closure.git",
"reference": "09f0e9fb61829f628205b7c94906c28740ff9540"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/serializable-closure/zipball/09f0e9fb61829f628205b7c94906c28740ff9540",
"reference": "09f0e9fb61829f628205b7c94906c28740ff9540",
"shasum": ""
},
"require": {
"php": "^7.3|^8.0"
},
"require-dev": {
"pestphp/pest": "^1.18",
"phpstan/phpstan": "^0.12.98",
"symfony/var-dumper": "^5.3"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.x-dev"
}
},
"autoload": {
"psr-4": {
"Laravel\\SerializableClosure\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Taylor Otwell",
"email": "taylor@laravel.com"
},
{
"name": "Nuno Maduro",
"email": "nuno@laravel.com"
}
],
"description": "Laravel Serializable Closure provides an easy and secure way to serialize closures in PHP.",
"keywords": [
"closure",
"laravel",
"serializable"
],
"support": {
"issues": "https://github.com/laravel/serializable-closure/issues",
"source": "https://github.com/laravel/serializable-closure"
},
"time": "2022-05-16T17:09:47+00:00"
},
{
"name": "laravel/tinker",
@ -1724,30 +1852,33 @@
},
{
"name": "laravel/ui",
"version": "v2.0.0",
"version": "v3.4.6",
"source": {
"type": "git",
"url": "https://github.com/laravel/ui.git",
"reference": "ec838c75ba1886d014c5465b1ecc79b2071f46c7"
"reference": "65ec5c03f7fee2c8ecae785795b829a15be48c2c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/ui/zipball/ec838c75ba1886d014c5465b1ecc79b2071f46c7",
"reference": "ec838c75ba1886d014c5465b1ecc79b2071f46c7",
"url": "https://api.github.com/repos/laravel/ui/zipball/65ec5c03f7fee2c8ecae785795b829a15be48c2c",
"reference": "65ec5c03f7fee2c8ecae785795b829a15be48c2c",
"shasum": ""
},
"require": {
"illuminate/console": "^7.0",
"illuminate/filesystem": "^7.0",
"illuminate/support": "^7.0",
"php": "^7.2.5"
"illuminate/console": "^8.42|^9.0",
"illuminate/filesystem": "^8.42|^9.0",
"illuminate/support": "^8.82|^9.0",
"illuminate/validation": "^8.42|^9.0",
"php": "^7.3|^8.0"
},
"require-dev": {
"mockery/mockery": "^1.0",
"phpunit/phpunit": "^8.0"
"orchestra/testbench": "^6.23|^7.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.x-dev"
},
"laravel": {
"providers": [
"Laravel\\Ui\\UiServiceProvider"
@ -1776,10 +1907,9 @@
"ui"
],
"support": {
"issues": "https://github.com/laravel/ui/issues",
"source": "https://github.com/laravel/ui/tree/v2.0.0"
"source": "https://github.com/laravel/ui/tree/v3.4.6"
},
"time": "2020-03-03T13:43:00+00:00"
"time": "2022-05-20T13:38:08+00:00"
},
{
"name": "laravelcollective/html",
@ -2276,16 +2406,16 @@
},
{
"name": "nesbot/carbon",
"version": "2.60.0",
"version": "2.61.0",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
"reference": "00a259ae02b003c563158b54fb6743252b638ea6"
"reference": "bdf4f4fe3a3eac4de84dbec0738082a862c68ba6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/00a259ae02b003c563158b54fb6743252b638ea6",
"reference": "00a259ae02b003c563158b54fb6743252b638ea6",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/bdf4f4fe3a3eac4de84dbec0738082a862c68ba6",
"reference": "bdf4f4fe3a3eac4de84dbec0738082a862c68ba6",
"shasum": ""
},
"require": {
@ -2374,7 +2504,7 @@
"type": "tidelift"
}
],
"time": "2022-07-27T15:57:48+00:00"
"time": "2022-08-06T12:41:24+00:00"
},
{
"name": "nikic/php-parser",
@ -2572,6 +2702,55 @@
],
"time": "2022-07-30T15:51:26+00:00"
},
{
"name": "psr/cache",
"version": "1.0.1",
"source": {
"type": "git",
"url": "https://github.com/php-fig/cache.git",
"reference": "d11b50ad223250cf17b86e38383413f5a6764bf8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8",
"reference": "d11b50ad223250cf17b86e38383413f5a6764bf8",
"shasum": ""
},
"require": {
"php": ">=5.3.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"autoload": {
"psr-4": {
"Psr\\Cache\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "PHP-FIG",
"homepage": "http://www.php-fig.org/"
}
],
"description": "Common interface for caching libraries",
"keywords": [
"cache",
"psr",
"psr-6"
],
"support": {
"source": "https://github.com/php-fig/cache/tree/master"
},
"time": "2016-08-06T20:24:11+00:00"
},
{
"name": "psr/container",
"version": "1.1.1",
@ -5623,37 +5802,39 @@
},
{
"name": "vlucas/phpdotenv",
"version": "v4.2.2",
"version": "v5.4.1",
"source": {
"type": "git",
"url": "https://github.com/vlucas/phpdotenv.git",
"reference": "77e974614d2ead521f18069dccc571696f52b8dc"
"reference": "264dce589e7ce37a7ba99cb901eed8249fbec92f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/77e974614d2ead521f18069dccc571696f52b8dc",
"reference": "77e974614d2ead521f18069dccc571696f52b8dc",
"url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/264dce589e7ce37a7ba99cb901eed8249fbec92f",
"reference": "264dce589e7ce37a7ba99cb901eed8249fbec92f",
"shasum": ""
},
"require": {
"php": "^5.5.9 || ^7.0 || ^8.0",
"phpoption/phpoption": "^1.7.3",
"symfony/polyfill-ctype": "^1.17"
"ext-pcre": "*",
"graham-campbell/result-type": "^1.0.2",
"php": "^7.1.3 || ^8.0",
"phpoption/phpoption": "^1.8",
"symfony/polyfill-ctype": "^1.23",
"symfony/polyfill-mbstring": "^1.23.1",
"symfony/polyfill-php80": "^1.23.1"
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.4.1",
"ext-filter": "*",
"ext-pcre": "*",
"phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.21"
"phpunit/phpunit": "^7.5.20 || ^8.5.21 || ^9.5.10"
},
"suggest": {
"ext-filter": "Required to use the boolean validator.",
"ext-pcre": "Required to use most of the library."
"ext-filter": "Required to use the boolean validator."
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.2-dev"
"dev-master": "5.4-dev"
}
},
"autoload": {
@ -5685,7 +5866,7 @@
],
"support": {
"issues": "https://github.com/vlucas/phpdotenv/issues",
"source": "https://github.com/vlucas/phpdotenv/tree/v4.2.2"
"source": "https://github.com/vlucas/phpdotenv/tree/v5.4.1"
},
"funding": [
{
@ -5697,7 +5878,7 @@
"type": "tidelift"
}
],
"time": "2021-12-12T23:07:53+00:00"
"time": "2021-12-12T23:22:04+00:00"
},
{
"name": "voku/portable-ascii",
@ -5773,6 +5954,64 @@
],
"time": "2022-01-24T18:55:24+00:00"
},
{
"name": "webmozart/assert",
"version": "1.11.0",
"source": {
"type": "git",
"url": "https://github.com/webmozarts/assert.git",
"reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991",
"reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991",
"shasum": ""
},
"require": {
"ext-ctype": "*",
"php": "^7.2 || ^8.0"
},
"conflict": {
"phpstan/phpstan": "<0.12.20",
"vimeo/psalm": "<4.6.1 || 4.6.2"
},
"require-dev": {
"phpunit/phpunit": "^8.5.13"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.10-dev"
}
},
"autoload": {
"psr-4": {
"Webmozart\\Assert\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Bernhard Schussek",
"email": "bschussek@gmail.com"
}
],
"description": "Assertions to validate method input/output with nice error messages.",
"keywords": [
"assert",
"check",
"validate"
],
"support": {
"issues": "https://github.com/webmozarts/assert/issues",
"source": "https://github.com/webmozarts/assert/tree/1.11.0"
},
"time": "2022-06-03T18:03:27+00:00"
},
{
"name": "yajra/laravel-datatables-oracle",
"version": "v9.21.2",
@ -7760,64 +7999,6 @@
}
],
"time": "2021-07-28T10:34:58+00:00"
},
{
"name": "webmozart/assert",
"version": "1.11.0",
"source": {
"type": "git",
"url": "https://github.com/webmozarts/assert.git",
"reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991",
"reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991",
"shasum": ""
},
"require": {
"ext-ctype": "*",
"php": "^7.2 || ^8.0"
},
"conflict": {
"phpstan/phpstan": "<0.12.20",
"vimeo/psalm": "<4.6.1 || 4.6.2"
},
"require-dev": {
"phpunit/phpunit": "^8.5.13"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.10-dev"
}
},
"autoload": {
"psr-4": {
"Webmozart\\Assert\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Bernhard Schussek",
"email": "bschussek@gmail.com"
}
],
"description": "Assertions to validate method input/output with nice error messages.",
"keywords": [
"assert",
"check",
"validate"
],
"support": {
"issues": "https://github.com/webmozarts/assert/issues",
"source": "https://github.com/webmozarts/assert/tree/1.11.0"
},
"time": "2022-06-03T18:03:27+00:00"
}
],
"aliases": [],
@ -7826,7 +8007,7 @@
"prefer-stable": true,
"prefer-lowest": false,
"platform": {
"php": "^7.2.5||^8.0"
"php": "^7.3||^8.0"
},
"platform-dev": [],
"platform-overrides": {

View File

@ -63,9 +63,9 @@ return [
*/
// Manager
'manager-class' => DaveJamesMiller\Breadcrumbs\BreadcrumbsManager::class,
'manager-class' => Diglactic\Breadcrumbs\Manager::class,
// Generator
'generator-class' => DaveJamesMiller\Breadcrumbs\BreadcrumbsGenerator::class,
'generator-class' => Diglactic\Breadcrumbs\Generator::class,
];

0
database/seeds/.gitkeep → database/seeders/.gitkeep Executable file → Normal file
View File

View File

@ -1,6 +1,8 @@
<?php
use Carbon\Carbon;
namespace Database\Seeders;
use Illuminate\Support\Carbon;
// use Database\DisableForeignKeys;
// use Database\TruncateTable;
use Illuminate\Database\Seeder;
@ -8,9 +10,15 @@ use Illuminate\Support\Facades\DB;
class AccountsTableSeeder extends Seeder
{
public function run()
/**
* Seed the application's database.
*
* @return void
*/
public function run(): void
{
// \App\Models\User::factory(10)->create();
DB::table('accounts')->insert([
[
'login' => "admin",

View File

@ -1,6 +1,8 @@
<?php
use Carbon\Carbon;
namespace Database\Seeders;
// use Carbon\Carbon;
use Illuminate\Database\Seeder;
use Illuminate\Support\Facades\DB;

View File

@ -1,7 +1,9 @@
<?php
namespace Database\Seeders;
use Illuminate\Database\Seeder;
use Carbon\Carbon;
// use Carbon\Carbon;
class DatabaseSeeder extends Seeder
{

View File

@ -1,11 +1,12 @@
<?php
use Carbon\Carbon;
use Database\DisableForeignKeys;
use Database\TruncateTable;
namespace Database\Seeders;
// use Carbon\Carbon;
// use Database\DisableForeignKeys;
// use Database\TruncateTable;
use Illuminate\Database\Seeder;
use Illuminate\Support\Facades\DB;
use Faker\Factory as Faker;
class LanguagesTableSeeder extends Seeder
{

View File

@ -1,5 +1,7 @@
<?php
namespace Database\Seeders;
use Illuminate\Database\Seeder;
use Illuminate\Support\Facades\DB;

View File

@ -1,5 +1,7 @@
<?php
namespace Database\Seeders;
use Carbon\Carbon;
// use Database\DisableForeignKeys;
use Illuminate\Database\Seeder;

View File

@ -1,5 +1,7 @@
<?php
namespace Database\Seeders;
use Carbon\Carbon;
use Illuminate\Database\Seeder;
use Illuminate\Support\Facades\DB;

View File

@ -1,5 +1,7 @@
<?php
namespace Database\Seeders;
use Carbon\Carbon;
// use Database\DisableForeignKeys;
use Illuminate\Database\Seeder;

View File

@ -1,5 +1,7 @@
<?php
namespace Database\Seeders;
use Carbon\Carbon;
use Illuminate\Database\Seeder;
use Illuminate\Support\Facades\DB;

View File

@ -1,7 +1,9 @@
<?php
namespace Database\Seeders;
use Carbon\Carbon;
use Database\DisableForeignKeys;
// use Database\DisableForeignKeys;
use Illuminate\Database\Seeder;
use Illuminate\Support\Facades\DB;

View File

@ -1,4 +1,7 @@
<?php
use Illuminate\Contracts\Http\Kernel;
use Illuminate\Http\Request;
/**
* Laravel - A PHP Framework For Web Artisans
*
@ -18,7 +21,25 @@
|
*/
require __DIR__.'/../bootstrap/autoload.php';
define('LARAVEL_START', microtime(true));
/*
|--------------------------------------------------------------------------
| Check If The Application Is Under Maintenance
|--------------------------------------------------------------------------
|
| If the application is in maintenance / demo mode via the "down" command
| we will load this file so that any pre-rendered content can be shown
| instead of starting the framework, which could cause an exception.
|
*/
if (file_exists($maintenance = __DIR__.'/../storage/framework/maintenance.php')) {
require $maintenance;
}
// require __DIR__.'/../bootstrap/autoload.php';
require __DIR__.'/../vendor/autoload.php';
/*
|--------------------------------------------------------------------------
@ -46,12 +67,12 @@ $app = require_once __DIR__.'/../bootstrap/app.php';
|
*/
$kernel = $app->make('Illuminate\Contracts\Http\Kernel');
// $kernel = $app->make('Illuminate\Contracts\Http\Kernel');
$kernel = $app->make(Kernel::class);
$response = $kernel->handle(
$request = Illuminate\Http\Request::capture()
);
$response->send();
$request = Request::capture()
)->send();
// $response->send();
$kernel->terminate($request, $response);

View File

@ -51,10 +51,10 @@
{{ $dataset->server_state }}
</td>
@if ($dataset->server_state == "released")
{{-- <td>Preferred reviewer: {{ optional($dataset->reviewer)->login }} </td> --}}
{{-- <td>Preferred reviewer: {{ $dataset->reviewer?->login }} </td> --}}
<td>Preferred reviewer: {{ $dataset->preferred_reviewer }} </td>
@elseif ($dataset->server_state == "editor_accepted" || $dataset->server_state == "rejected_reviewer")
<td>in approvement by {{ optional($dataset->editor)->login }} </td>
<td>in approvement by {{ $dataset->editor?->login }} </td>
@endif
<td>
{{ $dataset->server_date_modified }}

View File

@ -46,11 +46,11 @@
</td>
<td>
{{ optional($dataset->editor)->login }}
{{ $dataset->editor?->login }}
</td>
<td>
{{ optional($dataset->reviewer)->login }}
{{ $dataset->reviewer?->login }}
</td>

View File

@ -44,7 +44,7 @@
<td>
{{ $dataset->server_state }}
</td>
<td>editor: {{ optional($dataset->editor)->login }}</td>
<td>editor: {{ $dataset->editor?->login }}</td>
<td>
{{-- @php
$dateDiff = $dataset['server_date_modified']->addDays(14);

View File

@ -53,7 +53,7 @@
{{ $dataset->user->login }}
</td>
{{-- <td>
{{ optional($dataset->editor)->login }}
{{ $dataset->editor?->login }}
</td> --}}
<td>
{{ $dataset->server_state }}

View File

@ -3,75 +3,75 @@
use Diglactic\Breadcrumbs\Breadcrumbs;
// Dashboard
Breadcrumbs::register('settings.dashboard', function ($trail) {
Breadcrumbs::for('settings.dashboard', function ($trail) {
$trail->push('Dashboard', route('settings.dashboard'));
});
Breadcrumbs::register('publish.dataset.create', function ($breadcrumbs) {
Breadcrumbs::for('publish.dataset.create', function ($breadcrumbs) {
$breadcrumbs->parent('settings.dashboard');
$breadcrumbs->push('Publish', route('publish.dataset.create'));
});
Breadcrumbs::register('access.user.index', function ($breadcrumbs) {
Breadcrumbs::for('access.user.index', function ($breadcrumbs) {
$breadcrumbs->parent('settings.dashboard');
$breadcrumbs->push('User Management', route('access.user.index'));
});
Breadcrumbs::register('access.user.edit', function ($breadcrumbs, $id) {
Breadcrumbs::for('access.user.edit', function ($breadcrumbs, $id) {
$breadcrumbs->parent('access.user.index');
$breadcrumbs->push("edit" . $id, route('access.user.edit', $id));
});
Breadcrumbs::register('access.user.create', function ($breadcrumbs) {
Breadcrumbs::for('access.user.create', function ($breadcrumbs) {
$breadcrumbs->parent('access.user.index');
$breadcrumbs->push('users.create', route('access.user.create'));
});
Breadcrumbs::register('access.role.index', function ($breadcrumbs) {
Breadcrumbs::for('access.role.index', function ($breadcrumbs) {
$breadcrumbs->parent('settings.dashboard');
$breadcrumbs->push('Role Management', route('access.role.index'));
});
Breadcrumbs::register('access.role.edit', function ($breadcrumbs, $id) {
Breadcrumbs::for('access.role.edit', function ($breadcrumbs, $id) {
$breadcrumbs->parent('access.role.index');
$breadcrumbs->push('edit ' . $id, route('access.role.edit', $id));
});
Breadcrumbs::register('settings.document', function ($breadcrumbs) {
Breadcrumbs::for('settings.document', function ($breadcrumbs) {
$breadcrumbs->parent('settings.dashboard');
$breadcrumbs->push('Dataset Management', route('settings.document'));
});
Breadcrumbs::register('settings.document.edit', function ($breadcrumbs, $id) {
Breadcrumbs::for('settings.document.edit', function ($breadcrumbs, $id) {
$breadcrumbs->parent('settings.document');
$breadcrumbs->push('edit ' . $id, route('settings.document.edit', $id));
});
Breadcrumbs::register('settings.document.show', function ($breadcrumbs, $id) {
Breadcrumbs::for('settings.document.show', function ($breadcrumbs, $id) {
$breadcrumbs->parent('settings.document');
$breadcrumbs->push('show ' . $id, route('settings.document.show', $id));
});
Breadcrumbs::register('settings.page.index', function ($breadcrumbs) {
Breadcrumbs::for('settings.page.index', function ($breadcrumbs) {
$breadcrumbs->parent('settings.dashboard');
$breadcrumbs->push('Page Management', route('settings.page.index'));
});
Breadcrumbs::register('settings.collectionrole.index', function ($breadcrumbs) {
Breadcrumbs::for('settings.collectionrole.index', function ($breadcrumbs) {
$breadcrumbs->parent('settings.dashboard');
$breadcrumbs->push('Collection Roles', route('settings.collectionrole.index'));
});
Breadcrumbs::register('settings.collectionrole.show', function ($breadcrumbs, $collectionrole) {
Breadcrumbs::for('settings.collectionrole.show', function ($breadcrumbs, $collectionrole) {
$breadcrumbs->parent('settings.collectionrole.index');
$breadcrumbs->push(
'top level collections of role ' . $collectionrole->name,
route('settings.collectionrole.show', $collectionrole)
);
});
Breadcrumbs::register('settings.collection.show', function ($breadcrumbs, $collection) {
Breadcrumbs::for('settings.collection.show', function ($breadcrumbs, $collection) {
// $breadcrumbs->parent('settings.collectionrole.show', $collection->collectionrole);
if ($collection->parent()->exists()) {
$breadcrumbs->parent('settings.collection.show', $collection->parent);
@ -80,7 +80,7 @@ Breadcrumbs::register('settings.collection.show', function ($breadcrumbs, $colle
}
$breadcrumbs->push('show collection: ' . $collection->name, route('settings.collection.show', $collection));
});
Breadcrumbs::register('settings.collection.edit', function ($breadcrumbs, $id) {
Breadcrumbs::for('settings.collection.edit', function ($breadcrumbs, $id) {
$collection = App\Models\Collection::findOrFail($id);
if ($collection->parent()->exists()) {
$breadcrumbs->parent('settings.collection.show', $collection->parent);