diff --git a/config/dompdf.php b/config/dompdf.php index bebbc13..8ad2022 100644 --- a/config/dompdf.php +++ b/config/dompdf.php @@ -96,9 +96,9 @@ return array( "https://" => ["rules" => []] ], - /** - * @var string - */ + /** + * @var string + */ 'log_output_file' => null, /** @@ -171,13 +171,13 @@ return array( */ "default_paper_size" => "a4", - /** - * The default paper orientation. - * - * The orientation of the page (portrait or landscape). - * - * @var string - */ + /** + * The default paper orientation. + * + * The orientation of the page (portrait or landscape). + * + * @var string + */ 'default_paper_orientation' => "portrait", /** diff --git a/config/excel.php b/config/excel.php index 49d13f1..16828e7 100644 --- a/config/excel.php +++ b/config/excel.php @@ -14,7 +14,7 @@ return [ | Here you can specify how big the chunk should be. | */ - 'chunk_size' => 1000, + 'chunk_size' => 1000, /* |-------------------------------------------------------------------------- @@ -41,14 +41,15 @@ return [ | Configure e.g. delimiter, enclosure and line ending for CSV exports. | */ - 'csv' => [ - 'delimiter' => ',', - 'enclosure' => '"', - 'line_ending' => PHP_EOL, - 'use_bom' => false, + 'csv' => [ + 'delimiter' => ',', + 'enclosure' => '"', + 'line_ending' => PHP_EOL, + 'use_bom' => false, 'include_separator_line' => false, - 'excel_compatibility' => false, - 'output_encoding' => '', + 'excel_compatibility' => false, + 'output_encoding' => '', + 'test_auto_detect' => true, ], /* @@ -59,20 +60,20 @@ return [ | Configure e.g. default title, creator, subject,... | */ - 'properties' => [ - 'creator' => '', + 'properties' => [ + 'creator' => '', 'lastModifiedBy' => '', - 'title' => '', - 'description' => '', - 'subject' => '', - 'keywords' => '', - 'category' => '', - 'manager' => '', - 'company' => '', + 'title' => '', + 'description' => '', + 'subject' => '', + 'keywords' => '', + 'category' => '', + 'manager' => '', + 'company' => '', ], ], - 'imports' => [ + 'imports' => [ /* |-------------------------------------------------------------------------- @@ -85,7 +86,7 @@ return [ | you can enable it by setting read_only to false. | */ - 'read_only' => true, + 'read_only' => true, /* |-------------------------------------------------------------------------- @@ -109,7 +110,7 @@ return [ | Available options: none|slug|custom | */ - 'heading_row' => [ + 'heading_row' => [ 'formatter' => 'slug', ], @@ -121,12 +122,12 @@ return [ | Configure e.g. delimiter, enclosure and line ending for CSV imports. | */ - 'csv' => [ - 'delimiter' => null, - 'enclosure' => '"', + 'csv' => [ + 'delimiter' => null, + 'enclosure' => '"', 'escape_character' => '\\', - 'contiguous' => false, - 'input_encoding' => 'UTF-8', + 'contiguous' => false, + 'input_encoding' => 'UTF-8', ], /* @@ -137,16 +138,31 @@ return [ | Configure e.g. default title, creator, subject,... | */ - 'properties' => [ - 'creator' => '', + 'properties' => [ + 'creator' => '', 'lastModifiedBy' => '', - 'title' => '', - 'description' => '', - 'subject' => '', - 'keywords' => '', - 'category' => '', - 'manager' => '', - 'company' => '', + 'title' => '', + 'description' => '', + 'subject' => '', + 'keywords' => '', + 'category' => '', + 'manager' => '', + 'company' => '', + ], + + /* + |-------------------------------------------------------------------------- + | Cell Middleware + |-------------------------------------------------------------------------- + | + | Configure middleware that is executed on getting a cell value + | + */ + 'cells' => [ + 'middleware' => [ + //\Maatwebsite\Excel\Middleware\TrimCellValue::class, + //\Maatwebsite\Excel\Middleware\ConvertEmptyCellValuesToNull::class, + ], ], ], @@ -161,21 +177,21 @@ return [ | */ 'extension_detector' => [ - 'xlsx' => Excel::XLSX, - 'xlsm' => Excel::XLSX, - 'xltx' => Excel::XLSX, - 'xltm' => Excel::XLSX, - 'xls' => Excel::XLS, - 'xlt' => Excel::XLS, - 'ods' => Excel::ODS, - 'ots' => Excel::ODS, - 'slk' => Excel::SLK, - 'xml' => Excel::XML, + 'xlsx' => Excel::XLSX, + 'xlsm' => Excel::XLSX, + 'xltx' => Excel::XLSX, + 'xltm' => Excel::XLSX, + 'xls' => Excel::XLS, + 'xlt' => Excel::XLS, + 'ods' => Excel::ODS, + 'ots' => Excel::ODS, + 'slk' => Excel::SLK, + 'xml' => Excel::XML, 'gnumeric' => Excel::GNUMERIC, - 'htm' => Excel::HTML, - 'html' => Excel::HTML, - 'csv' => Excel::CSV, - 'tsv' => Excel::TSV, + 'htm' => Excel::HTML, + 'html' => Excel::HTML, + 'csv' => Excel::CSV, + 'tsv' => Excel::TSV, /* |-------------------------------------------------------------------------- @@ -186,7 +202,7 @@ return [ | Available options: Excel::MPDF | Excel::TCPDF | Excel::DOMPDF | */ - 'pdf' => Excel::DOMPDF, + 'pdf' => Excel::DOMPDF, ], /* @@ -206,11 +222,11 @@ return [ | [x] PhpOffice\PhpSpreadsheet\Cell\AdvancedValueBinder::class | */ - 'value_binder' => [ + 'value_binder' => [ 'default' => Maatwebsite\Excel\DefaultValueBinder::class, ], - 'cache' => [ + 'cache' => [ /* |-------------------------------------------------------------------------- | Default cell caching driver @@ -219,7 +235,7 @@ return [ | By default PhpSpreadsheet keeps all cell values in memory, however when | dealing with large files, this might result into memory issues. If you | want to mitigate that, you can configure a cell caching driver here. - | When using the illuminate driver, it will store each value in a the + | When using the illuminate driver, it will store each value in the | cache store. This can slow down the process, because it needs to | store each value. You can use the "batch" store if you want to | only persist to the store when the memory limit is reached. @@ -227,7 +243,7 @@ return [ | Drivers: memory|illuminate|batch | */ - 'driver' => 'memory', + 'driver' => 'memory', /* |-------------------------------------------------------------------------- @@ -239,7 +255,7 @@ return [ | Here you can tweak the memory limit to your liking. | */ - 'batch' => [ + 'batch' => [ 'memory_limit' => 60000, ], @@ -255,9 +271,23 @@ return [ | at "null" it will use the default store. | */ - 'illuminate' => [ + 'illuminate' => [ 'store' => null, ], + + /* + |-------------------------------------------------------------------------- + | Cache Time-to-live (TTL) + |-------------------------------------------------------------------------- + | + | The TTL of items written to cache. If you want to keep the items cached + | indefinitely, set this to null. Otherwise, set a number of seconds, + | a \DateInterval, or a callable. + | + | Allowable types: callable|\DateInterval|int|null + | + */ + 'default_ttl' => 10800, ], /* @@ -277,7 +307,7 @@ return [ */ 'transactions' => [ 'handler' => 'db', - 'db' => [ + 'db' => [ 'connection' => null, ], ], @@ -291,9 +321,26 @@ return [ | | When exporting and importing files, we use a temporary file, before | storing reading or downloading. Here you can customize that path. + | permissions is an array with the permission flags for the directory (dir) + | and the create file (file). | */ - 'local_path' => storage_path('framework/cache/laravel-excel'), + 'local_path' => storage_path('framework/cache/laravel-excel'), + + /* + |-------------------------------------------------------------------------- + | Local Temporary Path Permissions + |-------------------------------------------------------------------------- + | + | Permissions is an array with the permission flags for the directory (dir) + | and the create file (file). + | If omitted the default permissions of the filesystem will be used. + | + */ + 'local_permissions' => [ + // 'dir' => 0755, + // 'file' => 0644, + ], /* |-------------------------------------------------------------------------- @@ -309,8 +356,8 @@ return [ | in conjunction with queued imports and exports. | */ - 'remote_disk' => null, - 'remote_prefix' => null, + 'remote_disk' => null, + 'remote_prefix' => null, /* |-------------------------------------------------------------------------- diff --git a/config/repository.php b/config/repository.php index fe63a7b..f8498b8 100644 --- a/config/repository.php +++ b/config/repository.php @@ -30,8 +30,8 @@ return [ JsonApiSerializer */ - 'fractal' => [ - 'params' => [ + 'fractal' => [ + 'params' => [ 'include' => 'include' ], 'serializer' => League\Fractal\Serializer\DataArraySerializer::class @@ -43,7 +43,7 @@ return [ |-------------------------------------------------------------------------- | */ - 'cache' => [ + 'cache' => [ /* |-------------------------------------------------------------------------- | Cache Status @@ -52,7 +52,7 @@ return [ | Enable or disable cache | */ - 'enabled' => false, + 'enabled' => false, /* |-------------------------------------------------------------------------- @@ -62,7 +62,7 @@ return [ | Time of expiration cache | */ - 'minutes' => 30, + 'minutes' => 30, /* |-------------------------------------------------------------------------- @@ -82,7 +82,7 @@ return [ | | */ - 'clean' => [ + 'clean' => [ /* |-------------------------------------------------------------------------- @@ -102,14 +102,14 @@ return [ | delete : Clear Cache on delete Entry in repository | */ - 'on' => [ + 'on' => [ 'create' => true, 'update' => true, 'delete' => true, ] ], - 'params' => [ + 'params' => [ /* |-------------------------------------------------------------------------- | Skip Cache Params @@ -137,8 +137,8 @@ return [ | | 'except' =>['find'], */ - 'allowed' => [ - 'only' => null, + 'allowed' => [ + 'only' => null, 'except' => null ] ], @@ -151,7 +151,7 @@ return [ | Settings of request parameters names that will be used by Criteria | */ - 'criteria' => [ + 'criteria' => [ /* |-------------------------------------------------------------------------- | Accepted Conditions @@ -210,15 +210,15 @@ return [ | http://prettus.local/?search=lorem&searchJoin=or | */ - 'params' => [ - 'search' => 'search', + 'params' => [ + 'search' => 'search', 'searchFields' => 'searchFields', - 'filter' => 'filter', - 'orderBy' => 'orderBy', - 'sortedBy' => 'sortedBy', - 'with' => 'with', - 'searchJoin' => 'searchJoin', - 'withCount' => 'withCount' + 'filter' => 'filter', + 'orderBy' => 'orderBy', + 'sortedBy' => 'sortedBy', + 'with' => 'with', + 'searchJoin' => 'searchJoin', + 'withCount' => 'withCount' ] ], /* @@ -227,20 +227,20 @@ return [ |-------------------------------------------------------------------------- | */ - 'generator' => [ - 'basePath' => app()->path(), + 'generator' => [ + 'basePath' => app()->path(), 'rootNamespace' => 'App\\', 'stubsOverridePath' => app()->path(), - 'paths' => [ - 'models' => 'Entities', + 'paths' => [ + 'models' => 'Entities', 'repositories' => 'Repositories', - 'interfaces' => 'Repositories', + 'interfaces' => 'Repositories', 'transformers' => 'Transformers', - 'presenters' => 'Presenters', - 'validators' => 'Validators', - 'controllers' => 'Http/Controllers', - 'provider' => 'RepositoryServiceProvider', - 'criteria' => 'Criteria' + 'presenters' => 'Presenters', + 'validators' => 'Validators', + 'controllers' => 'Http/Controllers', + 'provider' => 'RepositoryServiceProvider', + 'criteria' => 'Criteria' ] ] ]; diff --git a/database/migrations/2019_12_14_000001_create_personal_access_tokens_table.php b/database/migrations/2019_12_14_000001_create_personal_access_tokens_table.php index 3ce0002..e828ad8 100644 --- a/database/migrations/2019_12_14_000001_create_personal_access_tokens_table.php +++ b/database/migrations/2019_12_14_000001_create_personal_access_tokens_table.php @@ -4,33 +4,30 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class CreatePersonalAccessTokensTable extends Migration +return new class extends Migration { /** * Run the migrations. - * - * @return void */ - public function up() + public function up(): void { Schema::create('personal_access_tokens', function (Blueprint $table) { - $table->bigIncrements('id'); + $table->id(); $table->morphs('tokenable'); $table->string('name'); $table->string('token', 64)->unique(); $table->text('abilities')->nullable(); $table->timestamp('last_used_at')->nullable(); + $table->timestamp('expires_at')->nullable(); $table->timestamps(); }); } /** * Reverse the migrations. - * - * @return void */ - public function down() + public function down(): void { Schema::dropIfExists('personal_access_tokens'); } -} +}; diff --git a/resources/views/errors/layout.blade.php b/resources/views/errors/layout.blade.php index d6c1ce0..019c2cd 100644 --- a/resources/views/errors/layout.blade.php +++ b/resources/views/errors/layout.blade.php @@ -1,53 +1,53 @@ - - - + + + - @yield('title') + @yield('title') - - - - -
-
-
- @yield('message') + .title { + font-size: 36px; + padding: 20px; + } + + + +
+
+
+ @yield('message') +
+
-
-
- + diff --git a/resources/views/errors/minimal.blade.php b/resources/views/errors/minimal.blade.php index 70fc05d..db69f25 100644 --- a/resources/views/errors/minimal.blade.php +++ b/resources/views/errors/minimal.blade.php @@ -1,527 +1,34 @@ - - - + + + - @yield('title') + @yield('title') - - body { - margin: 0 - } - - a { - background-color: transparent - } - - code { - font-family: monospace, monospace; - font-size: 1em - } - - [hidden] { - display: none - } - - html { - font-family: system-ui, -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Helvetica Neue, Arial, Noto Sans, sans-serif, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol, Noto Color Emoji; - line-height: 1.5 - } - - *, :after, :before { - box-sizing: border-box; - border: 0 solid #e2e8f0 - } - - a { - color: inherit; - text-decoration: inherit - } - - code { - font-family: Menlo, Monaco, Consolas, Liberation Mono, Courier New, monospace - } - - svg, video { - display: block; - vertical-align: middle - } - - video { - max-width: 100%; - height: auto - } - - .bg-white { - --bg-opacity: 1; - background-color: #fff; - background-color: rgba(255, 255, 255, var(--bg-opacity)) - } - - .bg-gray-100 { - --bg-opacity: 1; - background-color: #f7fafc; - background-color: rgba(247, 250, 252, var(--bg-opacity)) - } - - .border-gray-200 { - --border-opacity: 1; - border-color: #edf2f7; - border-color: rgba(237, 242, 247, var(--border-opacity)) - } - - .border-gray-400 { - --border-opacity: 1; - border-color: #cbd5e0; - border-color: rgba(203, 213, 224, var(--border-opacity)) - } - - .border-t { - border-top-width: 1px - } - - .border-r { - border-right-width: 1px - } - - .flex { - display: flex - } - - .grid { - display: grid - } - - .hidden { - display: none - } - - .items-center { - align-items: center - } - - .justify-center { - justify-content: center - } - - .font-semibold { - font-weight: 600 - } - - .h-5 { - height: 1.25rem - } - - .h-8 { - height: 2rem - } - - .h-16 { - height: 4rem - } - - .text-sm { - font-size: .875rem - } - - .text-lg { - font-size: 1.125rem - } - - .leading-7 { - line-height: 1.75rem - } - - .mx-auto { - margin-left: auto; - margin-right: auto - } - - .ml-1 { - margin-left: .25rem - } - - .mt-2 { - margin-top: .5rem - } - - .mr-2 { - margin-right: .5rem - } - - .ml-2 { - margin-left: .5rem - } - - .mt-4 { - margin-top: 1rem - } - - .ml-4 { - margin-left: 1rem - } - - .mt-8 { - margin-top: 2rem - } - - .ml-12 { - margin-left: 3rem - } - - .-mt-px { - margin-top: -1px - } - - .max-w-xl { - max-width: 36rem - } - - .max-w-6xl { - max-width: 72rem - } - - .min-h-screen { - min-height: 100vh - } - - .overflow-hidden { - overflow: hidden - } - - .p-6 { - padding: 1.5rem - } - - .py-4 { - padding-top: 1rem; - padding-bottom: 1rem - } - - .px-4 { - padding-left: 1rem; - padding-right: 1rem - } - - .px-6 { - padding-left: 1.5rem; - padding-right: 1.5rem - } - - .pt-8 { - padding-top: 2rem - } - - .fixed { - position: fixed - } - - .relative { - position: relative - } - - .top-0 { - top: 0 - } - - .right-0 { - right: 0 - } - - .shadow { - box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .1), 0 1px 2px 0 rgba(0, 0, 0, .06) - } - - .text-center { - text-align: center - } - - .text-gray-200 { - --text-opacity: 1; - color: #edf2f7; - color: rgba(237, 242, 247, var(--text-opacity)) - } - - .text-gray-300 { - --text-opacity: 1; - color: #e2e8f0; - color: rgba(226, 232, 240, var(--text-opacity)) - } - - .text-gray-400 { - --text-opacity: 1; - color: #cbd5e0; - color: rgba(203, 213, 224, var(--text-opacity)) - } - - .text-gray-500 { - --text-opacity: 1; - color: #a0aec0; - color: rgba(160, 174, 192, var(--text-opacity)) - } - - .text-gray-600 { - --text-opacity: 1; - color: #718096; - color: rgba(113, 128, 150, var(--text-opacity)) - } - - .text-gray-700 { - --text-opacity: 1; - color: #4a5568; - color: rgba(74, 85, 104, var(--text-opacity)) - } - - .text-gray-900 { - --text-opacity: 1; - color: #1a202c; - color: rgba(26, 32, 44, var(--text-opacity)) - } - - .uppercase { - text-transform: uppercase - } - - .underline { - text-decoration: underline - } - - .antialiased { - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale - } - - .tracking-wider { - letter-spacing: .05em - } - - .w-5 { - width: 1.25rem - } - - .w-8 { - width: 2rem - } - - .w-auto { - width: auto - } - - .grid-cols-1 { - grid-template-columns:repeat(1, minmax(0, 1fr)) - } - - @-webkit-keyframes spin { - 0% { - transform: rotate(0deg) + + + +
+
+
+
+ @yield('code') +
- @keyframes spin { - 0% { - transform: rotate(0deg) - } - to { - transform: rotate(1turn) - } - } - - @-webkit-keyframes ping { - 0% { - transform: scale(1); - opacity: 1 - } - 75%, to { - transform: scale(2); - opacity: 0 - } - } - - @keyframes ping { - 0% { - transform: scale(1); - opacity: 1 - } - 75%, to { - transform: scale(2); - opacity: 0 - } - } - - @-webkit-keyframes pulse { - 0%, to { - opacity: 1 - } - 50% { - opacity: .5 - } - } - - @keyframes pulse { - 0%, to { - opacity: 1 - } - 50% { - opacity: .5 - } - } - - @-webkit-keyframes bounce { - 0%, to { - transform: translateY(-25%); - -webkit-animation-timing-function: cubic-bezier(.8, 0, 1, 1); - animation-timing-function: cubic-bezier(.8, 0, 1, 1) - } - 50% { - transform: translateY(0); - -webkit-animation-timing-function: cubic-bezier(0, 0, .2, 1); - animation-timing-function: cubic-bezier(0, 0, .2, 1) - } - } - - @keyframes bounce { - 0%, to { - transform: translateY(-25%); - -webkit-animation-timing-function: cubic-bezier(.8, 0, 1, 1); - animation-timing-function: cubic-bezier(.8, 0, 1, 1) - } - 50% { - transform: translateY(0); - -webkit-animation-timing-function: cubic-bezier(0, 0, .2, 1); - animation-timing-function: cubic-bezier(0, 0, .2, 1) - } - } - - @media (min-width: 640px) { - .sm\:rounded-lg { - border-radius: .5rem - } - - .sm\:block { - display: block - } - - .sm\:items-center { - align-items: center - } - - .sm\:justify-start { - justify-content: flex-start - } - - .sm\:justify-between { - justify-content: space-between - } - - .sm\:h-20 { - height: 5rem - } - - .sm\:ml-0 { - margin-left: 0 - } - - .sm\:px-6 { - padding-left: 1.5rem; - padding-right: 1.5rem - } - - .sm\:pt-0 { - padding-top: 0 - } - - .sm\:text-left { - text-align: left - } - - .sm\:text-right { - text-align: right - } - } - - @media (min-width: 768px) { - .md\:border-t-0 { - border-top-width: 0 - } - - .md\:border-l { - border-left-width: 1px - } - - .md\:grid-cols-2 { - grid-template-columns:repeat(2, minmax(0, 1fr)) - } - } - - @media (min-width: 1024px) { - .lg\:px-8 { - padding-left: 2rem; - padding-right: 2rem - } - } - - @media (prefers-color-scheme: dark) { - .dark\:bg-gray-800 { - --bg-opacity: 1; - background-color: #2d3748; - background-color: rgba(45, 55, 72, var(--bg-opacity)) - } - - .dark\:bg-gray-900 { - --bg-opacity: 1; - background-color: #1a202c; - background-color: rgba(26, 32, 44, var(--bg-opacity)) - } - - .dark\:border-gray-700 { - --border-opacity: 1; - border-color: #4a5568; - border-color: rgba(74, 85, 104, var(--border-opacity)) - } - - .dark\:text-white { - --text-opacity: 1; - color: #fff; - color: rgba(255, 255, 255, var(--text-opacity)) - } - - .dark\:text-gray-400 { - --text-opacity: 1; - color: #cbd5e0; - color: rgba(203, 213, 224, var(--text-opacity)) - } - } - - - - - -
-
-
-
- @yield('code') -
- -
- @yield('message') +
+ @yield('message') +
+
-
-
- + diff --git a/resources/views/vendor/breadcrumbs/bulma.blade.php b/resources/views/vendor/breadcrumbs/bulma.blade.php index 7ae46a5..26e478e 100644 --- a/resources/views/vendor/breadcrumbs/bulma.blade.php +++ b/resources/views/vendor/breadcrumbs/bulma.blade.php @@ -5,8 +5,7 @@ @if ($loop->last) @if ($breadcrumb->url) -
  • {{ $breadcrumb->title }}
    • +
  • {{ $breadcrumb->title }}
    • @else
  • {{ $breadcrumb->title }}
    • @endif diff --git a/resources/views/vendor/breadcrumbs/json-ld.php b/resources/views/vendor/breadcrumbs/json-ld.php index fd2d019..5f75225 100644 --- a/resources/views/vendor/breadcrumbs/json-ld.php +++ b/resources/views/vendor/breadcrumbs/json-ld.php @@ -3,18 +3,18 @@ use Illuminate\Support\Facades\Request; $json = [ - '@context' => 'https://schema.org', - '@type' => 'BreadcrumbList', + '@context' => 'https://schema.org', + '@type' => 'BreadcrumbList', 'itemListElement' => [], ]; foreach ($breadcrumbs as $i => $breadcrumb) { $json['itemListElement'][] = [ - '@type' => 'ListItem', + '@type' => 'ListItem', 'position' => $i + 1, - 'item' => [ - '@id' => $breadcrumb->url ?: Request::fullUrl(), - 'name' => $breadcrumb->title, + 'item' => [ + '@id' => $breadcrumb->url ?: Request::fullUrl(), + 'name' => $breadcrumb->title, 'image' => $breadcrumb->image ?? null, ], ]; diff --git a/resources/views/vendor/breadcrumbs/tailwind.blade.php b/resources/views/vendor/breadcrumbs/tailwind.blade.php index dda1179..48eaafe 100644 --- a/resources/views/vendor/breadcrumbs/tailwind.blade.php +++ b/resources/views/vendor/breadcrumbs/tailwind.blade.php @@ -5,8 +5,7 @@ @if ($breadcrumb->url && !$loop->last)
  • - + {{ $breadcrumb->title }}
    • diff --git a/resources/views/vendor/mail/html/button.blade.php b/resources/views/vendor/mail/html/button.blade.php index 2f9d59a..4a9bf7d 100644 --- a/resources/views/vendor/mail/html/button.blade.php +++ b/resources/views/vendor/mail/html/button.blade.php @@ -1,20 +1,24 @@ - - - - +@props([ + 'url', + 'color' => 'primary', + 'align' => 'center', +]) + + + + diff --git a/resources/views/vendor/mail/html/footer.blade.php b/resources/views/vendor/mail/html/footer.blade.php index 33f7dad..3ff41f8 100644 --- a/resources/views/vendor/mail/html/footer.blade.php +++ b/resources/views/vendor/mail/html/footer.blade.php @@ -1,11 +1,11 @@ - - - - - - - + + + + + + + diff --git a/resources/views/vendor/mail/html/header.blade.php b/resources/views/vendor/mail/html/header.blade.php index 34d32af..56197f8 100644 --- a/resources/views/vendor/mail/html/header.blade.php +++ b/resources/views/vendor/mail/html/header.blade.php @@ -1,11 +1,12 @@ +@props(['url']) - - - @if (trim($slot) === 'Laravel') - - @else - {{ $slot }} - @endif - - + + +@if (trim($slot) === 'Laravel') + +@else +{{ $slot }} +@endif + + diff --git a/resources/views/vendor/mail/html/layout.blade.php b/resources/views/vendor/mail/html/layout.blade.php index c3d9bbd..e55f6a6 100644 --- a/resources/views/vendor/mail/html/layout.blade.php +++ b/resources/views/vendor/mail/html/layout.blade.php @@ -1,58 +1,57 @@ - + - - - - - +@media only screen and (max-width: 500px) { +.button { +width: 100% !important; +} +} + - - + diff --git a/resources/views/vendor/mail/html/message.blade.php b/resources/views/vendor/mail/html/message.blade.php index 1ae9ed8..f272460 100644 --- a/resources/views/vendor/mail/html/message.blade.php +++ b/resources/views/vendor/mail/html/message.blade.php @@ -1,27 +1,27 @@ -@component('mail::layout') - {{-- Header --}} - @slot('header') - @component('mail::header', ['url' => config('app.url')]) - {{ config('app.name') }} - @endcomponent - @endslot + +{{-- Header --}} + + +{{ config('app.name') }} + + - {{-- Body --}} - {{ $slot }} +{{-- Body --}} +{{ $slot }} - {{-- Subcopy --}} - @isset($subcopy) - @slot('subcopy') - @component('mail::subcopy') - {{ $subcopy }} - @endcomponent - @endslot - @endisset +{{-- Subcopy --}} +@isset($subcopy) + + +{{ $subcopy }} + + +@endisset - {{-- Footer --}} - @slot('footer') - @component('mail::footer') - © {{ date('Y') }} {{ config('app.name') }}. @lang('All rights reserved.') - @endcomponent - @endslot -@endcomponent +{{-- Footer --}} + + +© {{ date('Y') }} {{ config('app.name') }}. @lang('All rights reserved.') + + + diff --git a/resources/views/vendor/mail/html/panel.blade.php b/resources/views/vendor/mail/html/panel.blade.php index ae97c13..2975a60 100644 --- a/resources/views/vendor/mail/html/panel.blade.php +++ b/resources/views/vendor/mail/html/panel.blade.php @@ -1,14 +1,14 @@ - - - + + + diff --git a/resources/views/vendor/mail/html/subcopy.blade.php b/resources/views/vendor/mail/html/subcopy.blade.php index f559e8f..790ce6c 100644 --- a/resources/views/vendor/mail/html/subcopy.blade.php +++ b/resources/views/vendor/mail/html/subcopy.blade.php @@ -1,7 +1,7 @@ - - - + + + diff --git a/resources/views/vendor/mail/html/table.blade.php b/resources/views/vendor/mail/html/table.blade.php index b3bb3c8..a5f3348 100644 --- a/resources/views/vendor/mail/html/table.blade.php +++ b/resources/views/vendor/mail/html/table.blade.php @@ -1,3 +1,3 @@
    - {{ Illuminate\Mail\Markdown::parse($slot) }} +{{ Illuminate\Mail\Markdown::parse($slot) }}
    diff --git a/resources/views/vendor/mail/html/themes/default.css b/resources/views/vendor/mail/html/themes/default.css index 03d8116..2483b11 100644 --- a/resources/views/vendor/mail/html/themes/default.css +++ b/resources/views/vendor/mail/html/themes/default.css @@ -4,7 +4,7 @@ body, body *:not(html):not(style):not(br):not(tr):not(code) { box-sizing: border-box; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, - 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; + 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; position: relative; } diff --git a/resources/views/vendor/mail/text/layout.blade.php b/resources/views/vendor/mail/text/layout.blade.php index c59d2d8..ec58e83 100644 --- a/resources/views/vendor/mail/text/layout.blade.php +++ b/resources/views/vendor/mail/text/layout.blade.php @@ -1,9 +1,9 @@ -{!! strip_tags($header) !!} +{!! strip_tags($header ?? '') !!} {!! strip_tags($slot) !!} @isset($subcopy) - {!! strip_tags($subcopy) !!} +{!! strip_tags($subcopy) !!} @endisset -{!! strip_tags($footer) !!} +{!! strip_tags($footer ?? '') !!} diff --git a/resources/views/vendor/mail/text/message.blade.php b/resources/views/vendor/mail/text/message.blade.php index 1ae9ed8..80bce21 100644 --- a/resources/views/vendor/mail/text/message.blade.php +++ b/resources/views/vendor/mail/text/message.blade.php @@ -1,27 +1,27 @@ -@component('mail::layout') + {{-- Header --}} - @slot('header') - @component('mail::header', ['url' => config('app.url')]) + + {{ config('app.name') }} - @endcomponent - @endslot + + {{-- Body --}} {{ $slot }} {{-- Subcopy --}} @isset($subcopy) - @slot('subcopy') - @component('mail::subcopy') + + {{ $subcopy }} - @endcomponent - @endslot + + @endisset {{-- Footer --}} - @slot('footer') - @component('mail::footer') + + © {{ date('Y') }} {{ config('app.name') }}. @lang('All rights reserved.') - @endcomponent - @endslot -@endcomponent + + + diff --git a/resources/views/vendor/notifications/email.blade.php b/resources/views/vendor/notifications/email.blade.php index ff4f83f..678e259 100644 --- a/resources/views/vendor/notifications/email.blade.php +++ b/resources/views/vendor/notifications/email.blade.php @@ -1,58 +1,58 @@ -@component('mail::message') - {{-- Greeting --}} - @if (! empty($greeting)) - # {{ $greeting }} - @else - @if ($level === 'error') - # @lang('Whoops!') - @else - # @lang('Hello!') - @endif - @endif + +{{-- Greeting --}} +@if (! empty($greeting)) +# {{ $greeting }} +@else +@if ($level === 'error') +# @lang('Whoops!') +@else +# @lang('Hello!') +@endif +@endif - {{-- Intro Lines --}} - @foreach ($introLines as $line) - {{ $line }} +{{-- Intro Lines --}} +@foreach ($introLines as $line) +{{ $line }} - @endforeach +@endforeach - {{-- Action Button --}} - @isset($actionText) - $level, - default => 'primary', - }; - ?> - @component('mail::button', ['url' => $actionUrl, 'color' => $color]) - {{ $actionText }} - @endcomponent - @endisset +{{-- Action Button --}} +@isset($actionText) + $level, + default => 'primary', + }; +?> + +{{ $actionText }} + +@endisset - {{-- Outro Lines --}} - @foreach ($outroLines as $line) - {{ $line }} +{{-- Outro Lines --}} +@foreach ($outroLines as $line) +{{ $line }} - @endforeach +@endforeach - {{-- Salutation --}} - @if (! empty($salutation)) - {{ $salutation }} - @else - @lang('Regards'),
    - {{ config('app.name') }} - @endif +{{-- Salutation --}} +@if (! empty($salutation)) +{{ $salutation }} +@else +@lang('Regards'),
    +{{ config('app.name') }} +@endif - {{-- Subcopy --}} - @isset($actionText) - @slot('subcopy') - @lang( - "If you're having trouble clicking the \":actionText\" button, copy and paste the URL below\n". - 'into your web browser:', - [ - 'actionText' => $actionText, - ] - ) [{{ $displayableActionUrl }}]({{ $actionUrl }}) - @endslot - @endisset -@endcomponent +{{-- Subcopy --}} +@isset($actionText) + +@lang( + "If you're having trouble clicking the \":actionText\" button, copy and paste the URL below\n". + 'into your web browser:', + [ + 'actionText' => $actionText, + ] +) [{{ $displayableActionUrl }}]({{ $actionUrl }}) + +@endisset +     diff --git a/resources/views/vendor/pagination/bootstrap-4.blade.php b/resources/views/vendor/pagination/bootstrap-4.blade.php index 3be5b8a..63c6f56 100644 --- a/resources/views/vendor/pagination/bootstrap-4.blade.php +++ b/resources/views/vendor/pagination/bootstrap-4.blade.php @@ -8,8 +8,7 @@ @else
  • - +
    • @endif @@ -17,16 +16,14 @@ @foreach ($elements as $element) {{-- "Three Dots" Separator --}} @if (is_string($element)) -
  • {{ $element }} -
    • +
  • {{ $element }}
    • @endif {{-- Array Of Links --}} @if (is_array($element)) @foreach ($element as $page => $url) @if ($page == $paginator->currentPage()) -
  • {{ $page }} -
    • +
  • {{ $page }}
    • @else
  • {{ $page }}
    • @endif @@ -37,8 +34,7 @@ {{-- Next Page Link --}} @if ($paginator->hasMorePages())
  • - +
    • @else
  • diff --git a/resources/views/vendor/pagination/bootstrap-5.blade.php b/resources/views/vendor/pagination/bootstrap-5.blade.php index 7eaa6d1..a1795a4 100644 --- a/resources/views/vendor/pagination/bootstrap-5.blade.php +++ b/resources/views/vendor/pagination/bootstrap-5.blade.php @@ -9,16 +9,14 @@
    • @else
  • - +
    • @endif {{-- Next Page Link --}} @if ($paginator->hasMorePages())
  • - +
    • @else
  • @@ -50,8 +48,7 @@
    • @else
  • - +
    • @endif @@ -59,16 +56,14 @@ @foreach ($elements as $element) {{-- "Three Dots" Separator --}} @if (is_string($element)) -
  • {{ $element }}
    • +
  • {{ $element }}
    • @endif {{-- Array Of Links --}} @if (is_array($element)) @foreach ($element as $page => $url) @if ($page == $paginator->currentPage()) -
  • {{ $page }}
    • +
  • {{ $page }}
    • @else
  • {{ $page }}
    • @endif @@ -79,8 +74,7 @@ {{-- Next Page Link --}} @if ($paginator->hasMorePages())
  • - +
    • @else
  • diff --git a/resources/views/vendor/pagination/default.blade.php b/resources/views/vendor/pagination/default.blade.php index 03e862f..0db70b5 100644 --- a/resources/views/vendor/pagination/default.blade.php +++ b/resources/views/vendor/pagination/default.blade.php @@ -34,8 +34,7 @@ {{-- Next Page Link --}} @if ($paginator->hasMorePages())
  • - +
    • @else
  • diff --git a/resources/views/vendor/pagination/semantic-ui.blade.php b/resources/views/vendor/pagination/semantic-ui.blade.php index 200bb2d..ef0dbb1 100644 --- a/resources/views/vendor/pagination/semantic-ui.blade.php +++ b/resources/views/vendor/pagination/semantic-ui.blade.php @@ -2,11 +2,9 @@ @endif diff --git a/resources/views/vendor/pagination/simple-bootstrap-4.blade.php b/resources/views/vendor/pagination/simple-bootstrap-4.blade.php index 7334a3a..4bb4917 100644 --- a/resources/views/vendor/pagination/simple-bootstrap-4.blade.php +++ b/resources/views/vendor/pagination/simple-bootstrap-4.blade.php @@ -8,8 +8,7 @@
    • @else
  • - +
    • @endif diff --git a/resources/views/vendor/pagination/simple-bootstrap-5.blade.php b/resources/views/vendor/pagination/simple-bootstrap-5.blade.php index bace3e0..a89005e 100644 --- a/resources/views/vendor/pagination/simple-bootstrap-5.blade.php +++ b/resources/views/vendor/pagination/simple-bootstrap-5.blade.php @@ -17,8 +17,7 @@ {{-- Next Page Link --}} @if ($paginator->hasMorePages())
  • - +
    • @else
  • diff --git a/resources/views/vendor/pagination/simple-tailwind.blade.php b/resources/views/vendor/pagination/simple-tailwind.blade.php index f6c09ba..ea02400 100644 --- a/resources/views/vendor/pagination/simple-tailwind.blade.php +++ b/resources/views/vendor/pagination/simple-tailwind.blade.php @@ -2,26 +2,22 @@