From c7ba81eb83bbb84eb452fe287a1ec902316ee578 Mon Sep 17 00:00:00 2001 From: Nasir Khan Saikat Date: Fri, 11 Oct 2024 02:11:03 +0600 Subject: [PATCH 1/3] code cleanup --- resources/views/backend/users/create.blade.php | 2 +- resources/views/components/backend/layouts/create.blade.php | 2 +- resources/views/components/backend/layouts/edit.blade.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/backend/users/create.blade.php b/resources/views/backend/users/create.blade.php index 2837200aa..9d44be503 100644 --- a/resources/views/backend/users/create.blade.php +++ b/resources/views/backend/users/create.blade.php @@ -28,7 +28,7 @@ class="text-muted">{{ __($module_action) }}
- {{ html()->form('POST', route("backend.$module_name.store"))->class('form')->acceptsFiles()->open() }} + {{ html()->form('POST', route("backend.$module_name.store"))->acceptsFiles()->open() }}
diff --git a/resources/views/components/backend/layouts/create.blade.php b/resources/views/components/backend/layouts/create.blade.php index ee37fb401..9861bf71c 100644 --- a/resources/views/components/backend/layouts/create.blade.php +++ b/resources/views/components/backend/layouts/create.blade.php @@ -11,7 +11,7 @@
- {{ html()->form('POST', route("backend.$module_name.store"))->class('form')->acceptsFiles()->open() }} + {{ html()->form('POST', route("backend.$module_name.store"))->acceptsFiles()->open() }} @include ("$module_path.$module_name.form") diff --git a/resources/views/components/backend/layouts/edit.blade.php b/resources/views/components/backend/layouts/edit.blade.php index 33f7b1678..9219b7bb6 100644 --- a/resources/views/components/backend/layouts/edit.blade.php +++ b/resources/views/components/backend/layouts/edit.blade.php @@ -11,7 +11,7 @@
- {{ html()->modelForm($data, 'PATCH', route("backend.$module_name.update", $data))->class('form')->acceptsFiles()->open() }} + {{ html()->modelForm($data, 'PATCH', route("backend.$module_name.update", $data))->acceptsFiles()->open() }} @include ("$module_path.$module_name.form") From 78217ed09ddd8cfcf740a6f806bf857c0698f75c Mon Sep 17 00:00:00 2001 From: Nasir Khan Saikat Date: Mon, 14 Oct 2024 01:25:30 +0600 Subject: [PATCH 2/3] prettier formatter added, code format --- .prettierignore | 10 + .prettierrc | 15 + .../views/backend/categories/create.blade.php | 20 +- .../views/backend/categories/edit.blade.php | 21 +- .../views/backend/categories/form.blade.php | 59 +-- .../views/backend/categories/trash.blade.php | 13 +- .../views/frontend/categories/show.blade.php | 2 - .../views/backend/posts/form.blade.php | 1 - .../views/backend/posts/trash.blade.php | 4 +- .../views/backend/tags/create.blade.php | 20 +- .../views/backend/tags/edit.blade.php | 21 +- .../views/backend/tags/form.blade.php | 48 +- .../views/backend/tags/trash.blade.php | 15 +- .../views/frontend/tags/show.blade.php | 1 - package.json | 6 +- .../views/auth/confirm-password.blade.php | 6 +- .../views/auth/forgot-password.blade.php | 3 +- resources/views/auth/register.blade.php | 20 +- resources/views/auth/reset-password.blade.php | 11 +- resources/views/auth/verify-email.blade.php | 3 +- .../views/backend/backups/backups.blade.php | 168 +++---- .../backend/includes/action_column.blade.php | 8 +- .../backend/includes/activitylog.blade.php | 105 +++-- .../includes/dashboard_demo_data.blade.php | 41 +- .../views/backend/includes/header.blade.php | 7 +- .../views/backend/includes/show.blade.php | 24 +- .../views/backend/includes/sidebar.blade.php | 66 +-- .../backend/includes/user_actions.blade.php | 24 +- .../backend/includes/user_roles.blade.php | 4 +- resources/views/backend/index.blade.php | 42 +- .../views/backend/layouts/app-copy.blade.php | 14 +- resources/views/backend/layouts/app.blade.php | 112 ++--- .../backend/notifications/index.blade.php | 168 +++---- .../backend/notifications/show.blade.php | 128 ++--- resources/views/backend/roles/edit.blade.php | 2 +- resources/views/backend/roles/show.blade.php | 7 +- .../backend/settings/fields/email.blade.php | 21 +- .../backend/settings/fields/number.blade.php | 21 +- .../backend/settings/fields/select.blade.php | 20 +- .../backend/settings/fields/text.blade.php | 21 +- .../settings/fields/textarea.blade.php | 37 +- .../views/backend/settings/index.blade.php | 46 +- .../backend/users/index_datatable.blade.php | 152 +++--- resources/views/backend/users/show.blade.php | 3 +- .../components/application-logo.blade.php | 2 +- .../components/auth-social-login.blade.php | 50 +- .../backend/breadcrumb-item.blade.php | 30 +- .../components/backend/breadcrumbs.blade.php | 5 +- .../backend/buttons/cancel.blade.php | 6 +- .../backend/buttons/create.blade.php | 4 +- .../components/backend/buttons/edit.blade.php | 4 +- .../backend/buttons/return-back.blade.php | 6 +- .../components/backend/buttons/save.blade.php | 4 +- .../backend/includes/header.blade.php | 6 +- .../backend/includes/menu-user.blade.php | 7 +- .../backend/layouts/create.blade.php | 65 +-- .../components/backend/layouts/edit.blade.php | 72 +-- .../components/backend/layouts/show.blade.php | 44 +- .../backend/layouts/trash.blade.php | 3 +- .../components/backend/page-wrapper.blade.php | 1 - .../backend/section-footer.blade.php | 2 +- .../backend/section-header.blade.php | 9 +- .../backend/section-show-table.blade.php | 26 +- resources/views/components/button-a.blade.php | 3 +- resources/views/components/button.blade.php | 3 +- .../views/components/buttons/cancel.blade.php | 5 +- .../views/components/buttons/create.blade.php | 28 +- .../views/components/buttons/edit.blade.php | 28 +- .../components/buttons/return-back.blade.php | 5 +- .../views/components/buttons/show.blade.php | 28 +- .../views/components/danger-button.blade.php | 3 +- .../views/components/dropdown-link.blade.php | 3 +- resources/views/components/dropdown.blade.php | 49 +- .../views/components/frontend/card.blade.php | 23 +- .../frontend/flash-message.blade.php | 53 ++- .../frontend/footer-credit.blade.php | 2 +- .../components/frontend/nav-item.blade.php | 6 +- .../components/google-analytics.blade.php | 29 +- .../views/components/layouts/app.blade.php | 12 +- .../components/library/lightbox.blade.php | 10 +- .../components/library/select2.blade.php | 32 +- resources/views/components/modal.blade.php | 105 ++--- resources/views/components/nav-link.blade.php | 3 +- .../views/components/primary-button.blade.php | 3 +- .../components/responsive-nav-link.blade.php | 3 +- .../components/secondary-button.blade.php | 3 +- .../views/components/selected-theme.blade.php | 9 +- .../views/components/text-input.blade.php | 5 +- .../views/frontend/includes/errors.blade.php | 22 +- .../views/frontend/includes/footer.blade.php | 6 +- .../frontend/includes/messages.blade.php | 24 +- .../views/frontend/includes/meta.blade.php | 69 ++- .../views/frontend/layouts/app.blade.php | 64 +-- .../frontend/users/profileEdit.blade.php | 1 - resources/views/layouts/app.blade.php | 57 +-- resources/views/layouts/guest.blade.php | 46 +- resources/views/layouts/navigation.blade.php | 26 +- resources/views/livewire/privacy.blade.php | 3 +- .../views/livewire/users-index.blade.php | 3 +- .../partials/delete-user-form.blade.php | 15 +- .../partials/update-password-form.blade.php | 18 +- .../update-profile-information-form.blade.php | 20 +- yarn.lock | 439 +++++++++++++++++- 103 files changed, 1866 insertions(+), 1286 deletions(-) create mode 100644 .prettierignore create mode 100644 .prettierrc diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 000000000..1fd4782f5 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,10 @@ +node_modules +dist +.env* +vendor/ +/vendor +public/ +.git +**/.git +package-lock.json +composer.lock \ No newline at end of file diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 000000000..baa60171c --- /dev/null +++ b/.prettierrc @@ -0,0 +1,15 @@ +{ + "printWidth": 120, + "semi": true, + "tabWidth": 4, + "trailingComma": "all", + "plugins": ["@shufo/prettier-plugin-blade", "prettier-plugin-tailwindcss"], + "overrides": [ + { + "files": ["*.blade.php"], + "options": { + "parser": "blade" + } + } + ] +} diff --git a/Modules/Category/Resources/views/backend/categories/create.blade.php b/Modules/Category/Resources/views/backend/categories/create.blade.php index e18f963ba..2b59040b1 100644 --- a/Modules/Category/Resources/views/backend/categories/create.blade.php +++ b/Modules/Category/Resources/views/backend/categories/create.blade.php @@ -1,16 +1,18 @@ @extends('backend.layouts.app') -@section('title') {{ __($module_action) }} {{ __($module_title) }} @endsection +@section('title') + {{ __($module_action) }} {{ __($module_title) }} +@endsection @section('breadcrumbs') - - - {{ __($module_title) }} - - {{ __($module_action) }} - + + + {{ __($module_title) }} + + {{ __($module_action) }} + @endsection @section('content') - -@endsection \ No newline at end of file + +@endsection diff --git a/Modules/Category/Resources/views/backend/categories/edit.blade.php b/Modules/Category/Resources/views/backend/categories/edit.blade.php index 96d75290c..b384b3335 100644 --- a/Modules/Category/Resources/views/backend/categories/edit.blade.php +++ b/Modules/Category/Resources/views/backend/categories/edit.blade.php @@ -1,16 +1,19 @@ @extends('backend.layouts.app') -@section('title') {{ __($module_action) }} {{ __($module_title) }} @endsection +@section('title') + {{ __($module_action) }} {{ __($module_title) }} +@endsection @section('breadcrumbs') - - - {{ __($module_title) }} - - {{ __($module_action) }} - + + + {{ __($module_title) }} + + {{ __($module_action) }} + @endsection @section('content') - -@endsection \ No newline at end of file + +@endsection diff --git a/Modules/Category/Resources/views/backend/categories/form.blade.php b/Modules/Category/Resources/views/backend/categories/form.blade.php index 6117af248..5f85ab65b 100644 --- a/Modules/Category/Resources/views/backend/categories/form.blade.php +++ b/Modules/Category/Resources/views/backend/categories/form.blade.php @@ -5,7 +5,7 @@ $field_name = 'name'; $field_lable = label_case($field_name); $field_placeholder = $field_lable; - $required = "required"; + $required = 'required'; ?> {{ html()->label($field_lable, $field_name)->class('form-label') }} {!! field_required($required) !!} {{ html()->text($field_name)->placeholder($field_placeholder)->class('form-control')->attributes(["$required"]) }} @@ -17,7 +17,7 @@ $field_name = 'slug'; $field_lable = label_case($field_name); $field_placeholder = $field_lable; - $required = ""; + $required = ''; ?> {{ html()->label($field_lable, $field_name)->class('form-label') }} {!! field_required($required) !!} {{ html()->text($field_name)->placeholder($field_placeholder)->class('form-control')->attributes(["$required"]) }} @@ -29,7 +29,7 @@ $field_name = 'group_name'; $field_lable = label_case($field_name); $field_placeholder = $field_lable; - $required = ""; + $required = ''; ?> {{ html()->label($field_lable, $field_name)->class('form-label') }} {!! field_required($required) !!} {{ html()->text($field_name)->placeholder($field_placeholder)->class('form-control')->attributes(["$required"]) }} @@ -43,31 +43,34 @@ $field_name = 'image'; $field_lable = label_case($field_name); $field_placeholder = $field_lable; - $required = ""; + $required = ''; ?> {{ html()->label($field_lable, $field_name)->class('form-label') }} {!! field_required($required) !!} - {{ html()->input("file", $field_name)->class('form-control')->attributes(["$required"]) }} + {{ html()->input('file', $field_name)->class('form-control')->attributes(["$required"]) }}
- @if($data && $data->getMedia($module_name)->first()) -
-
-
- - - - -
-
- - + @if ($data && $data->getMedia($module_name)->first()) +
+
+
+ + + + +
+
+ + +
-
- + @endif
@@ -77,7 +80,7 @@ $field_name = 'description'; $field_lable = label_case($field_name); $field_placeholder = $field_lable; - $required = ""; + $required = ''; ?> {{ html()->label($field_lable, $field_name)->class('form-label') }} {!! field_required($required) !!} {{ html()->textarea($field_name)->placeholder($field_placeholder)->class('form-control')->attributes(["$required"]) }} @@ -92,7 +95,7 @@ $field_name = 'meta_title'; $field_lable = label_case($field_name); $field_placeholder = $field_lable; - $required = ""; + $required = ''; ?> {{ html()->label($field_lable, $field_name)->class('form-label') }} {!! field_required($required) !!} {{ html()->text($field_name)->placeholder($field_placeholder)->class('form-control')->attributes(["$required"]) }} @@ -104,7 +107,7 @@ $field_name = 'meta_keyword'; $field_lable = label_case($field_name); $field_placeholder = $field_lable; - $required = ""; + $required = ''; ?> {{ html()->label($field_lable, $field_name)->class('form-label') }} {!! field_required($required) !!} {{ html()->text($field_name)->placeholder($field_placeholder)->class('form-control')->attributes(["$required"]) }} @@ -116,7 +119,7 @@ $field_name = 'meta_description'; $field_lable = label_case($field_name); $field_placeholder = $field_lable; - $required = ""; + $required = ''; ?> {{ html()->label($field_lable, $field_name)->class('form-label') }} {!! field_required($required) !!} {{ html()->text($field_name)->placeholder($field_placeholder)->class('form-control')->attributes(["$required"]) }} @@ -130,12 +133,12 @@ {{ html()->label($field_lable, $field_name)->class('form-label') }} {!! field_required($required) !!} {{ html()->select($field_name, $select_options)->class('form-select')->attributes(["$required"]) }}
-
\ No newline at end of file +
diff --git a/Modules/Category/Resources/views/backend/categories/trash.blade.php b/Modules/Category/Resources/views/backend/categories/trash.blade.php index cc895031c..33aa1fc68 100644 --- a/Modules/Category/Resources/views/backend/categories/trash.blade.php +++ b/Modules/Category/Resources/views/backend/categories/trash.blade.php @@ -1,13 +1,16 @@ @extends ('backend.layouts.app') -@section('title') {{ __($module_action) }} {{ __($module_title) }} @endsection +@section('title') + {{ __($module_action) }} {{ __($module_title) }} +@endsection @section('breadcrumbs') - - {{ __($module_title) }} - + + {{ __($module_title) }} + @endsection @section('content') - + @endsection diff --git a/Modules/Category/Resources/views/frontend/categories/show.blade.php b/Modules/Category/Resources/views/frontend/categories/show.blade.php index 1bce93da9..d9f972243 100644 --- a/Modules/Category/Resources/views/frontend/categories/show.blade.php +++ b/Modules/Category/Resources/views/frontend/categories/show.blade.php @@ -20,8 +20,6 @@

- -
diff --git a/Modules/Post/Resources/views/backend/posts/form.blade.php b/Modules/Post/Resources/views/backend/posts/form.blade.php index 4171ffa85..0c69624f3 100644 --- a/Modules/Post/Resources/views/backend/posts/form.blade.php +++ b/Modules/Post/Resources/views/backend/posts/form.blade.php @@ -260,7 +260,6 @@
- @push('after-styles') @livewireStyles - + @stack('after-styles') @@ -73,10 +73,10 @@ @livewireScripts - + @stack('after-scripts') - \ No newline at end of file + diff --git a/resources/views/backend/layouts/app.blade.php b/resources/views/backend/layouts/app.blade.php index 2b0794b78..bcf1cf393 100644 --- a/resources/views/backend/layouts/app.blade.php +++ b/resources/views/backend/layouts/app.blade.php @@ -1,82 +1,82 @@ - - - - - - - - + + + + + + + + - - - + + + - - + + - @yield('title') | {{ config('app.name') }} + @yield('title') | {{ config('app.name') }} - + - @vite(['resources/sass/app-backend.scss', 'resources/js/app-backend.js']) + @vite(['resources/sass/app-backend.scss', 'resources/js/app-backend.js']) - - - + + + - @stack('after-styles') + @stack('after-styles') - + - @livewireStyles + @livewireStyles - + - - - - - @include('backend.includes.sidebar') - + + -
- - {{-- header --}} - @include('backend.includes.header') - -
-
+ + @include('backend.includes.sidebar') + - @include('flash::message') +
- - @include('backend.includes.errors') - + {{-- header --}} + @include('backend.includes.header') - - @yield('content') - +
+
-
-
+ @include('flash::message') - {{-- Footer block --}} - + + @include('backend.includes.errors') + + + + @yield('content') + + +
- - @livewireScripts + {{-- Footer block --}} + +
+ + + @livewireScripts - @stack('after-scripts') - + @stack('after-scripts') + - + diff --git a/resources/views/backend/notifications/index.blade.php b/resources/views/backend/notifications/index.blade.php index 1710bb538..524348a81 100644 --- a/resources/views/backend/notifications/index.blade.php +++ b/resources/views/backend/notifications/index.blade.php @@ -1,96 +1,106 @@ @extends('backend.layouts.app') -@section('title') {{ __($module_action) }} {{ __($module_title) }} @endsection +@section('title') + {{ __($module_action) }} {{ __($module_title) }} +@endsection @section('breadcrumbs') - - {{ __($module_title) }} - + + {{ __($module_title) }} + @endsection @section('content') -
-
- - {{ __($module_title) }} - @if ($unread_notifications_count) - (@lang(":count unread", ['count'=>$unread_notifications_count])) - @endif - {{ __($module_action) }} +
+
+ + {{ __($module_title) }} + @if ($unread_notifications_count) + (@lang(':count unread', ['count' => $unread_notifications_count])) + @endif + {{ __($module_action) }} - - @lang('Mark all as read') - - - + + + @lang('Mark all as read') + + + -
-
- - - - - - - - - +
+
+
- @lang('Text') - - @lang('Module') - - @lang('Updated At') - - @lang('Action') -
+ + + + + + + + - - @foreach($$module_name as $module_name_singular) - read_at == '') { - $row_class = 'table-info'; - $span_class = 'font-weight-bold'; - } - ?> - - - - - - - @endforeach - -
+ @lang('Text') + + @lang('Module') + + @lang('Updated At') + + @lang('Action') +
- id) }}"> - - {{ $module_name_singular->data['title'] }} - - - - {{ $module_name_singular->data['module'] }} - - {{ $module_name_singular->updated_at->diffForHumans() }} - - -
+ + @foreach ($$module_name as $module_name_singular) + read_at == '') { + $row_class = 'table-info'; + $span_class = 'font-weight-bold'; + } + ?> + + + id) }}"> + + {{ $module_name_singular->data['title'] }} + + + + + {{ $module_name_singular->data['module'] }} + + + {{ $module_name_singular->updated_at->diffForHumans() }} + + + + + + @endforeach + + +
-
-
-
-
-
- @lang('Total') {{ $$module_name->total() }} {{ ucwords($module_name) }} +
+
+
+
+ @lang('Total') {{ $$module_name->total() }} {{ ucwords($module_name) }} +
-
-
-
- {!! $$module_name->render() !!} +
+
+ {!! $$module_name->render() !!} +
-
-@endsection \ No newline at end of file +@endsection diff --git a/resources/views/backend/notifications/show.blade.php b/resources/views/backend/notifications/show.blade.php index 2fda09b1c..bc3edf8a8 100644 --- a/resources/views/backend/notifications/show.blade.php +++ b/resources/views/backend/notifications/show.blade.php @@ -1,78 +1,82 @@ @extends('backend.layouts.app') -@section('title') {{ __($module_action) }} {{ __($module_title) }} @endsection +@section('title') + {{ __($module_action) }} {{ __($module_title) }} +@endsection @section('breadcrumbs') - - - {{ __($module_title) }} - - {{ __($module_action) }} - + + + {{ __($module_title) }} + + {{ __($module_action) }} + @endsection @section('content') -
-
- - {{ __($module_title) }} {{ __($module_action) }} +
+
+ + {{ __($module_title) }} {{ __($module_action) }} - - List - - + + + List + + -
-
-
- - data); ?> - - - - - - - - - - @if($data->url_backend != '') - - - - - @endif - @if($data->url_frontend != '') - - - - - @endif - -
Title - {{ $data->title }} -
Text - {!! $data->text !!} -
URL Backend - Backend: {{$data->url_backend}} -
URL Frontend - Frontend: {{$data->url_frontend}} -
+
+
+
+ + data); ?> + + + + + + + + + + @if ($data->url_backend != '') + + + + + @endif + @if ($data->url_frontend != '') + + + + + @endif + +
Title + {{ $data->title }} +
Text + {!! $data->text !!} +
URL Backend + Backend: {{ $data->url_backend }} +
URL Frontend + Frontend: {{ $data->url_frontend }} +
+
-
-
-
-
- - Updated: {{$$module_name_singular->updated_at->diffForHumans()}}, - Created at: {{$$module_name_singular->created_at->isoFormat('LLLL')}} - +
+
+
+ + Updated: {{ $$module_name_singular->updated_at->diffForHumans() }}, + Created at: {{ $$module_name_singular->created_at->isoFormat('LLLL') }} + +
-
- -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/backend/roles/edit.blade.php b/resources/views/backend/roles/edit.blade.php index 84237cb9f..f34dd2103 100644 --- a/resources/views/backend/roles/edit.blade.php +++ b/resources/views/backend/roles/edit.blade.php @@ -66,7 +66,7 @@ class="text-muted">{{ __($module_action) }}
{{ __('Select permissions from the list:') }} - + @if ($permissions->count()) @foreach ($permissions as $permission)
diff --git a/resources/views/backend/roles/show.blade.php b/resources/views/backend/roles/show.blade.php index cafc5faf3..c8c56ea48 100644 --- a/resources/views/backend/roles/show.blade.php +++ b/resources/views/backend/roles/show.blade.php @@ -22,8 +22,8 @@ class="text-muted">{{ __($module_title) }} + title="{{ __('Edit') }} {{ ucwords(Str::singular($module_name)) }}" route='{!! route("backend.$module_name.edit", $$module_name_singular) !!}' + :small=true /> @@ -76,7 +76,8 @@ class="text-muted">{{ __($module_title) }} @foreach ($users as $user) {{ $user->name }} - {!! $user->status_label !!} + {!! $user->status_label !!} + @endforeach diff --git a/resources/views/backend/settings/fields/email.blade.php b/resources/views/backend/settings/fields/email.blade.php index 82eb4899d..581126fb6 100644 --- a/resources/views/backend/settings/fields/email.blade.php +++ b/resources/views/backend/settings/fields/email.blade.php @@ -1,16 +1,17 @@ @php -$required = (Str::contains($field['rules'], 'required')) ? "required" : ""; -$required_mark = ($required != "") ? ' * ' : ''; + $required = Str::contains($field['rules'], 'required') ? 'required' : ''; + $required_mark = $required != '' ? ' * ' : ''; @endphp
- {!! $required_mark !!} - + {!! $required_mark !!} + - @if ($errors->has($field['name'])) {{ $errors->first($field['name']) }} @endif + @if ($errors->has($field['name'])) + {{ $errors->first($field['name']) }} + @endif
diff --git a/resources/views/backend/settings/fields/number.blade.php b/resources/views/backend/settings/fields/number.blade.php index 82eb4899d..581126fb6 100644 --- a/resources/views/backend/settings/fields/number.blade.php +++ b/resources/views/backend/settings/fields/number.blade.php @@ -1,16 +1,17 @@ @php -$required = (Str::contains($field['rules'], 'required')) ? "required" : ""; -$required_mark = ($required != "") ? ' * ' : ''; + $required = Str::contains($field['rules'], 'required') ? 'required' : ''; + $required_mark = $required != '' ? ' * ' : ''; @endphp
- {!! $required_mark !!} - + {!! $required_mark !!} + - @if ($errors->has($field['name'])) {{ $errors->first($field['name']) }} @endif + @if ($errors->has($field['name'])) + {{ $errors->first($field['name']) }} + @endif
diff --git a/resources/views/backend/settings/fields/select.blade.php b/resources/views/backend/settings/fields/select.blade.php index 2c30ff7b8..918d524fe 100644 --- a/resources/views/backend/settings/fields/select.blade.php +++ b/resources/views/backend/settings/fields/select.blade.php @@ -1,14 +1,20 @@ @php -$required = (Str::contains($field['rules'], 'required')) ? "required" : ""; -$required_mark = ($required != "") ? ' * ' : ''; + $required = Str::contains($field['rules'], 'required') ? 'required' : ''; + $required_mark = $required != '' ? ' * ' : ''; @endphp
- {!! $required_mark !!} - + @foreach (Arr::get($field, 'options', []) as $val => $label) + @endforeach - @if ($errors->has($field['name'])) {{ $errors->first($field['name']) }} @endif + @if ($errors->has($field['name'])) + {{ $errors->first($field['name']) }} + @endif
diff --git a/resources/views/backend/settings/fields/text.blade.php b/resources/views/backend/settings/fields/text.blade.php index 82eb4899d..581126fb6 100644 --- a/resources/views/backend/settings/fields/text.blade.php +++ b/resources/views/backend/settings/fields/text.blade.php @@ -1,16 +1,17 @@ @php -$required = (Str::contains($field['rules'], 'required')) ? "required" : ""; -$required_mark = ($required != "") ? ' * ' : ''; + $required = Str::contains($field['rules'], 'required') ? 'required' : ''; + $required_mark = $required != '' ? ' * ' : ''; @endphp
- {!! $required_mark !!} - + {!! $required_mark !!} + - @if ($errors->has($field['name'])) {{ $errors->first($field['name']) }} @endif + @if ($errors->has($field['name'])) + {{ $errors->first($field['name']) }} + @endif
diff --git a/resources/views/backend/settings/fields/textarea.blade.php b/resources/views/backend/settings/fields/textarea.blade.php index b287392b1..66a228bf4 100644 --- a/resources/views/backend/settings/fields/textarea.blade.php +++ b/resources/views/backend/settings/fields/textarea.blade.php @@ -1,22 +1,29 @@ @php -$required = (Str::contains($field['rules'], 'required')) ? "required" : ""; -$required_mark = ($required != "") ? ' * ' : ''; + $required = Str::contains($field['rules'], 'required') ? 'required' : ''; + $required_mark = $required != '' ? ' * ' : ''; @endphp
- {!! $required_mark !!} - - @if ($errors->has($field['name'])) {{ $errors->first($field['name']) }} @endif - @if(isset($field['help'])){{ $field['help'] }} @endif -
\ No newline at end of file + @if ($errors->has($field['name'])) + {{ $errors->first($field['name']) }} + @endif + @if (isset($field['help'])) + {{ $field['help'] }} + @endif +
diff --git a/resources/views/backend/settings/index.blade.php b/resources/views/backend/settings/index.blade.php index aa7aa623c..e5915f938 100644 --- a/resources/views/backend/settings/index.blade.php +++ b/resources/views/backend/settings/index.blade.php @@ -19,36 +19,36 @@
- + {{ html()->form('POST', route("backend.$module_name.store"))->open() }} - @if (count(config('setting_fields', []))) - @foreach (config('setting_fields') as $section => $fields) -
-
- -  {{ $fields['title'] }} -
-
-

{{ $fields['desc'] }}

- -
-
- @foreach ($fields['elements'] as $field) - @includeIf('backend.settings.fields.' . $field['type']) - @endforeach -
+ @if (count(config('setting_fields', []))) + @foreach (config('setting_fields') as $section => $fields) +
+
+ +  {{ $fields['title'] }} +
+
+

{{ $fields['desc'] }}

+ +
+
+ @foreach ($fields['elements'] as $field) + @includeIf('backend.settings.fields.' . $field['type']) + @endforeach
- @endforeach - @endif - -
-
-
+ @endforeach + @endif + +
+
+
+
{{ html()->form()->close() }}
diff --git a/resources/views/backend/users/index_datatable.blade.php b/resources/views/backend/users/index_datatable.blade.php index b395bbffd..82b06709e 100644 --- a/resources/views/backend/users/index_datatable.blade.php +++ b/resources/views/backend/users/index_datatable.blade.php @@ -1,99 +1,101 @@ @extends ('backend.layouts.app') -@section('title') {{ __($module_action) }} {{ __($module_title) }} @endsection +@section('title') + {{ __($module_action) }} {{ __($module_title) }} +@endsection @section('breadcrumbs') - - {{ __($module_title) }} - + + {{ __($module_title) }} + @endsection @section('content') -
-
+
+
- + -
-
-
- - - - - - - - - - - -
#{{ __('labels.backend.users.fields.name') }}{{ __('labels.backend.users.fields.email') }}{{ __('labels.backend.users.fields.status') }}{{ __('labels.backend.users.fields.roles') }}{{ __('labels.backend.action') }}
+
+
+
+ + + + + + + + + + + +
#{{ __('labels.backend.users.fields.name') }}{{ __('labels.backend.users.fields.email') }}{{ __('labels.backend.users.fields.status') }}{{ __('labels.backend.users.fields.roles') }}{{ __('labels.backend.action') }}
+
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
-
@endsection -@push ('after-styles') - - - +@push('after-styles') + + @endpush -@push ('after-scripts') - - +@push('after-scripts') + + - -@endpush \ No newline at end of file + +@endpush diff --git a/resources/views/backend/users/show.blade.php b/resources/views/backend/users/show.blade.php index 169812872..4f575dea3 100644 --- a/resources/views/backend/users/show.blade.php +++ b/resources/views/backend/users/show.blade.php @@ -20,7 +20,8 @@ - {{ $$module_name_singular->name }} {{ __($module_title) }} + {{ $$module_name_singular->name }} {{ __($module_title) }} {{ __($module_action) }} diff --git a/resources/views/components/application-logo.blade.php b/resources/views/components/application-logo.blade.php index 93e22ff8d..3b4a9b173 100644 --- a/resources/views/components/application-logo.blade.php +++ b/resources/views/components/application-logo.blade.php @@ -1 +1 @@ - \ No newline at end of file + diff --git a/resources/views/components/auth-social-login.blade.php b/resources/views/components/auth-social-login.blade.php index 2a11efc4c..163c9e094 100644 --- a/resources/views/components/auth-social-login.blade.php +++ b/resources/views/components/auth-social-login.blade.php @@ -1,29 +1,29 @@ -@if(env('FACEBOOK_ACTIVE') || env('GITHUB_ACTIVE') || env('GOOGLE_ACTIVE')) -
-
- Sign in with social profiles -
+@if (env('FACEBOOK_ACTIVE') || env('GITHUB_ACTIVE') || env('GOOGLE_ACTIVE')) +
+
+ Sign in with social profiles +
-
- @if(env('FACEBOOK_ACTIVE')) - - Facebook - - @endif +
+ @if (env('FACEBOOK_ACTIVE')) + + Facebook + + @endif - @if(env('GITHUB_ACTIVE')) - - Github - - @endif + @if (env('GITHUB_ACTIVE')) + + Github + + @endif - @if(env('GOOGLE_ACTIVE')) - - Google - - @endif -
+ @if (env('GOOGLE_ACTIVE')) + + Google + + @endif +
-
-
-@endif \ No newline at end of file +
+
+@endif diff --git a/resources/views/components/backend/breadcrumb-item.blade.php b/resources/views/components/backend/breadcrumb-item.blade.php index b10deacca..70ac6e63a 100644 --- a/resources/views/components/backend/breadcrumb-item.blade.php +++ b/resources/views/components/backend/breadcrumb-item.blade.php @@ -1,17 +1,19 @@ -@props(["route"=>"#", "icon"=>"", "title"=>"", "type"=>""]) +@props(['route' => '#', 'icon' => '', 'title' => '', 'type' => '']) -@if($type) -
  • - - @if($icon)@endif - {{ $slot }} - -
    • +@if ($type) +
  • + + @if ($icon) + + @endif + {{ $slot }} + +
    • @else -
  • - - - {{ $slot }} - -
    • +
  • + + + {{ $slot }} + +
    • @endif diff --git a/resources/views/components/backend/breadcrumbs.blade.php b/resources/views/components/backend/breadcrumbs.blade.php index ed25d76f8..3f22ebc04 100644 --- a/resources/views/components/backend/breadcrumbs.blade.php +++ b/resources/views/components/backend/breadcrumbs.blade.php @@ -1,3 +1,4 @@ -
  •  {{__('Dashboard')}}
    • +
  •  {{ __('Dashboard') }}
    • -{!! $slot !!} \ No newline at end of file +{!! $slot !!} diff --git a/resources/views/components/backend/buttons/cancel.blade.php b/resources/views/components/backend/buttons/cancel.blade.php index f3c320f79..af708ea62 100644 --- a/resources/views/components/backend/buttons/cancel.blade.php +++ b/resources/views/components/backend/buttons/cancel.blade.php @@ -1,2 +1,4 @@ -@props(["small"=>""]) - \ No newline at end of file +@props(['small' => '']) + diff --git a/resources/views/components/backend/buttons/create.blade.php b/resources/views/components/backend/buttons/create.blade.php index af2cc7b88..6395655be 100644 --- a/resources/views/components/backend/buttons/create.blade.php +++ b/resources/views/components/backend/buttons/create.blade.php @@ -4,12 +4,12 @@ - {!! ($slot != "") ? ' ' . $slot : '' !!} + {!! $slot != '' ? ' ' . $slot : '' !!} @else @endif diff --git a/resources/views/components/backend/buttons/edit.blade.php b/resources/views/components/backend/buttons/edit.blade.php index c77f09079..855b3bbeb 100644 --- a/resources/views/components/backend/buttons/edit.blade.php +++ b/resources/views/components/backend/buttons/edit.blade.php @@ -4,12 +4,12 @@ - {!! ($slot != "") ? ' ' . $slot : '' !!} + {!! $slot != '' ? ' ' . $slot : '' !!} @else @endif diff --git a/resources/views/components/backend/buttons/return-back.blade.php b/resources/views/components/backend/buttons/return-back.blade.php index dc0425e96..646640bfb 100644 --- a/resources/views/components/backend/buttons/return-back.blade.php +++ b/resources/views/components/backend/buttons/return-back.blade.php @@ -1,2 +1,4 @@ -@props(["small"=>"true"]) - \ No newline at end of file +@props(['small' => 'true']) + diff --git a/resources/views/components/backend/buttons/save.blade.php b/resources/views/components/backend/buttons/save.blade.php index 2c472d668..25bdbb645 100644 --- a/resources/views/components/backend/buttons/save.blade.php +++ b/resources/views/components/backend/buttons/save.blade.php @@ -1,2 +1,2 @@ -@props(["small"=>""]) -{{ html()->submit($text = icon('fa-solid fa-floppy-disk fa-fw')." ".__('Save'))->class('btn btn-success m-1'.(($small=='true')? ' btn-sm' : '')) }} +@props(['small' => '']) +{{ html()->submit($text = icon('fa-solid fa-floppy-disk fa-fw') . ' ' . __('Save'))->class('btn btn-success m-1' . ($small == 'true' ? ' btn-sm' : '')) }} diff --git a/resources/views/components/backend/includes/header.blade.php b/resources/views/components/backend/includes/header.blade.php index 6af14763f..fc55a95e2 100644 --- a/resources/views/components/backend/includes/header.blade.php +++ b/resources/views/components/backend/includes/header.blade.php @@ -18,7 +18,8 @@
    - +  {{ Auth::user()->name }} @@ -23,9 +23,10 @@ @endif
    - +  @lang('Logout') -
    +
    diff --git a/resources/views/components/backend/layouts/create.blade.php b/resources/views/components/backend/layouts/create.blade.php index 9861bf71c..af6edbcec 100644 --- a/resources/views/components/backend/layouts/create.blade.php +++ b/resources/views/components/backend/layouts/create.blade.php @@ -1,48 +1,55 @@ -@props(["data"=>"", "module_name", "module_path", "module_title"=>"", "module_icon"=>"", "module_action"=>""]) +@props([ + 'data' => '', + 'module_name', + 'module_path', + 'module_title' => '', + 'module_icon' => '', + 'module_action' => '', +])
    - @if ($slot != "") -
    - {{ $slot }} -
    + @if ($slot != '') +
    + {{ $slot }} +
    @else -
    - - +
    -
    -
    - {{ html()->form('POST', route("backend.$module_name.store"))->acceptsFiles()->open() }} + - @include ("$module_path.$module_name.form") +
    +
    + {{ html()->form('POST', route("backend.$module_name.store"))->acceptsFiles()->open() }} -
    -
    - Create -
    -
    -
    - + @include ("$module_path.$module_name.form") + +
    +
    + Create +
    +
    +
    + +
    -
    - {{ html()->form()->close() }} + {{ html()->form()->close() }} +
    -
    @endif
    - @if ($data != "") - - @lang('Updated at'): {{$data->updated_at->diffForHumans()}}, -
    - @lang('Created at'): {{$data->created_at->isoFormat('LLLL')}} -     + @if ($data != '') + + @lang('Updated at'): {{ $data->updated_at->diffForHumans() }}, +
    + @lang('Created at'): {{ $data->created_at->isoFormat('LLLL') }} +     @endif
    -
    \ No newline at end of file +
    diff --git a/resources/views/components/backend/layouts/edit.blade.php b/resources/views/components/backend/layouts/edit.blade.php index 9219b7bb6..2094f44ea 100644 --- a/resources/views/components/backend/layouts/edit.blade.php +++ b/resources/views/components/backend/layouts/edit.blade.php @@ -1,52 +1,62 @@ -@props(["data"=>"", "module_name", "module_path", "module_title"=>"", "module_icon"=>"", "module_action"=>""]) +@props([ + 'data' => '', + 'module_name', + 'module_path', + 'module_title' => '', + 'module_icon' => '', + 'module_action' => '', +])
    - @if ($slot != "") -
    - {{ $slot }} -
    + @if ($slot != '') +
    + {{ $slot }} +
    @else -
    +
    - + -
    -
    - {{ html()->modelForm($data, 'PATCH', route("backend.$module_name.update", $data))->acceptsFiles()->open() }} +
    +
    + {{ html()->modelForm($data, 'PATCH', route("backend.$module_name.update", $data))->acceptsFiles()->open() }} - @include ("$module_path.$module_name.form") + @include ("$module_path.$module_name.form") -
    -
    - -
    +
    +
    + +
    -
    -
    - @can('delete_'.$module_name) - - @endcan - +
    +
    + @can('delete_' . $module_name) + + @endcan + +
    -
    - {{ html()->closeModelForm() }} + {{ html()->closeModelForm() }} +
    -
    @endif
    - @if ($data != "") - - @lang('Updated at'): {{$data->updated_at->diffForHumans()}}, -
    - @lang('Created at'): {{$data->created_at->isoFormat('LLLL')}} -     + @if ($data != '') + + @lang('Updated at'): {{ $data->updated_at->diffForHumans() }}, +
    + @lang('Created at'): {{ $data->created_at->isoFormat('LLLL') }} +     @endif
    -
    \ No newline at end of file +
    diff --git a/resources/views/components/backend/layouts/show.blade.php b/resources/views/components/backend/layouts/show.blade.php index bee6d197b..b555ef97a 100644 --- a/resources/views/components/backend/layouts/show.blade.php +++ b/resources/views/components/backend/layouts/show.blade.php @@ -1,35 +1,43 @@ -@props(["data"=>"", "module_name", "module_path", "module_title"=>"", "module_icon"=>"", "module_action"=>""]) +@props([ + 'data' => '', + 'module_name', + 'module_path', + 'module_title' => '', + 'module_icon' => '', + 'module_action' => '', +])
    - @if ($slot != "") -
    - {{ $slot }} -
    + @if ($slot != '') +
    + {{ $slot }} +
    @else -
    +
    - + -
    -
    +
    +
    - + +
    -
    @endif
    - @if ($data != "") - - @lang('Updated at'): {{$data->updated_at->diffForHumans()}}, -
    - @lang('Created at'): {{$data->created_at->isoFormat('LLLL')}} -     + @if ($data != '') + + @lang('Updated at'): {{ $data->updated_at->diffForHumans() }}, +
    + @lang('Created at'): {{ $data->created_at->isoFormat('LLLL') }} +     @endif
    -
    \ No newline at end of file +
    diff --git a/resources/views/components/backend/layouts/trash.blade.php b/resources/views/components/backend/layouts/trash.blade.php index 95d120f11..2d1b04c56 100644 --- a/resources/views/components/backend/layouts/trash.blade.php +++ b/resources/views/components/backend/layouts/trash.blade.php @@ -20,7 +20,8 @@ class="text-muted">{{ __($module_action) }}     - @lang('List') diff --git a/resources/views/components/backend/page-wrapper.blade.php b/resources/views/components/backend/page-wrapper.blade.php index 5ce5854c5..8af7413c3 100644 --- a/resources/views/components/backend/page-wrapper.blade.php +++ b/resources/views/components/backend/page-wrapper.blade.php @@ -66,7 +66,6 @@
    - {{-- footer --}}
    diff --git a/resources/views/components/backend/section-footer.blade.php b/resources/views/components/backend/section-footer.blade.php index 67c2fda00..76f4490d6 100644 --- a/resources/views/components/backend/section-footer.blade.php +++ b/resources/views/components/backend/section-footer.blade.php @@ -4,4 +4,4 @@ {{ $slot }}
    -
    \ No newline at end of file +
    diff --git a/resources/views/components/backend/section-header.blade.php b/resources/views/components/backend/section-header.blade.php index 4f1cf5d00..634a67188 100644 --- a/resources/views/components/backend/section-header.blade.php +++ b/resources/views/components/backend/section-header.blade.php @@ -37,11 +37,11 @@ class="text-muted">{{ __($module_action) }} @if (Str::endsWith(Route::currentRouteName(), 'index')) - @if (auth()->user()->can('add_' . $module_name) && Route::has('backend.'.$module_name.'.create')) + @if (auth()->user()->can('add_' . $module_name) && Route::has('backend.' . $module_name . '.create')) @endif - @if (auth()->user()->can('restore_' . $module_name) && Route::has('backend.'.$module_name.'.create')) + @if (auth()->user()->can('restore_' . $module_name) && Route::has('backend.' . $module_name . '.create'))
    diff --git a/resources/views/components/buttons/cancel.blade.php b/resources/views/components/buttons/cancel.blade.php index ab17f1d6f..cc46583d9 100644 --- a/resources/views/components/buttons/cancel.blade.php +++ b/resources/views/components/buttons/cancel.blade.php @@ -1,2 +1,3 @@ -@props(["small"=>""]) - \ No newline at end of file +@props(['small' => '']) + diff --git a/resources/views/components/buttons/create.blade.php b/resources/views/components/buttons/create.blade.php index 82bbc8dc2..7f31f7fc1 100644 --- a/resources/views/components/buttons/create.blade.php +++ b/resources/views/components/buttons/create.blade.php @@ -1,19 +1,15 @@ -@props(["route"=>"", "icon"=>"fas fa-plus-circle", "title", "small"=>"", "class"=>""]) +@props(['route' => '', 'icon' => 'fas fa-plus-circle', 'title', 'small' => '', 'class' => '']) -@if($route) - - - {{ $slot }} - +@if ($route) + + + {{ $slot }} + @else - + @endif diff --git a/resources/views/components/buttons/edit.blade.php b/resources/views/components/buttons/edit.blade.php index abbfc4483..a04c88dbc 100644 --- a/resources/views/components/buttons/edit.blade.php +++ b/resources/views/components/buttons/edit.blade.php @@ -1,19 +1,15 @@ -@props(["route"=>"", "icon"=>"fas fa-wrench", "title", "small"=>"", "class"=>""]) +@props(['route' => '', 'icon' => 'fas fa-wrench', 'title', 'small' => '', 'class' => '']) -@if($route) - - - {{ $slot }} - +@if ($route) + + + {{ $slot }} + @else - + @endif diff --git a/resources/views/components/buttons/return-back.blade.php b/resources/views/components/buttons/return-back.blade.php index 22788782c..ffd8b0c4c 100644 --- a/resources/views/components/buttons/return-back.blade.php +++ b/resources/views/components/buttons/return-back.blade.php @@ -1,2 +1,3 @@ -@props(["small"=>""]) - \ No newline at end of file +@props(['small' => '']) + diff --git a/resources/views/components/buttons/show.blade.php b/resources/views/components/buttons/show.blade.php index f20b55947..59cdbb882 100644 --- a/resources/views/components/buttons/show.blade.php +++ b/resources/views/components/buttons/show.blade.php @@ -1,19 +1,15 @@ -@props(["route"=>"", "icon"=>"fas fa-desktop", "title", "small"=>"", "class"=>""]) +@props(['route' => '', 'icon' => 'fas fa-desktop', 'title', 'small' => '', 'class' => '']) -@if($route) - - - {{ $slot }} - +@if ($route) + + + {{ $slot }} + @else - + @endif diff --git a/resources/views/components/danger-button.blade.php b/resources/views/components/danger-button.blade.php index d7417b210..422df9260 100644 --- a/resources/views/components/danger-button.blade.php +++ b/resources/views/components/danger-button.blade.php @@ -1,3 +1,4 @@ - diff --git a/resources/views/components/dropdown-link.blade.php b/resources/views/components/dropdown-link.blade.php index 6d5279d8b..e226da53b 100644 --- a/resources/views/components/dropdown-link.blade.php +++ b/resources/views/components/dropdown-link.blade.php @@ -1 +1,2 @@ -merge(['class' => 'block w-full px-4 py-2 text-start text-sm leading-5 text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-800 focus:outline-none focus:bg-gray-100 dark:focus:bg-gray-800 transition duration-150 ease-in-out']) }}>{{ $slot }} +merge(['class' => 'block w-full px-4 py-2 text-start text-sm leading-5 text-gray-700 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-800 focus:outline-none focus:bg-gray-100 dark:focus:bg-gray-800 transition duration-150 ease-in-out']) }}>{{ $slot }} diff --git a/resources/views/components/dropdown.blade.php b/resources/views/components/dropdown.blade.php index 65d29d88d..e9e2dc93d 100644 --- a/resources/views/components/dropdown.blade.php +++ b/resources/views/components/dropdown.blade.php @@ -1,24 +1,24 @@ @props(['align' => 'right', 'width' => '48', 'contentClasses' => 'py-1 bg-white dark:bg-gray-700']) @php -switch ($align) { - case 'left': - $alignmentClasses = 'ltr:origin-top-left rtl:origin-top-right start-0'; - break; - case 'top': - $alignmentClasses = 'origin-top'; - break; - case 'right': - default: - $alignmentClasses = 'ltr:origin-top-right rtl:origin-top-left end-0'; - break; -} + switch ($align) { + case 'left': + $alignmentClasses = 'ltr:origin-top-left rtl:origin-top-right start-0'; + break; + case 'top': + $alignmentClasses = 'origin-top'; + break; + case 'right': + default: + $alignmentClasses = 'ltr:origin-top-right rtl:origin-top-left end-0'; + break; + } -switch ($width) { - case '48': - $width = 'w-48'; - break; -} + switch ($width) { + case '48': + $width = 'w-48'; + break; + } @endphp
    @@ -26,16 +26,11 @@ {{ $trigger }}
    - diff --git a/resources/views/components/frontend/flash-message.blade.php b/resources/views/components/frontend/flash-message.blade.php index 94c6660fb..0e3d934f6 100644 --- a/resources/views/components/frontend/flash-message.blade.php +++ b/resources/views/components/frontend/flash-message.blade.php @@ -1,29 +1,32 @@ @foreach (session('flash_notification', collect())->toArray() as $message) + @if ($message['level'] == 'success') + + @elseif ($message['level'] == 'danger') + + @elseif ($message['level'] == 'warning') + + @elseif ($message['level'] == 'info') + + @else + + @endif @endforeach -{{ session()->forget('flash_notification') }} \ No newline at end of file +{{ session()->forget('flash_notification') }} diff --git a/resources/views/components/frontend/footer-credit.blade.php b/resources/views/components/frontend/footer-credit.blade.php index 7a7b0d8c0..82058c66e 100644 --- a/resources/views/components/frontend/footer-credit.blade.php +++ b/resources/views/components/frontend/footer-credit.blade.php @@ -1,3 +1,3 @@
    {!! setting('footer_text') !!} -
    \ No newline at end of file +
    diff --git a/resources/views/components/frontend/nav-item.blade.php b/resources/views/components/frontend/nav-item.blade.php index e5e4d18f3..65624dd88 100644 --- a/resources/views/components/frontend/nav-item.blade.php +++ b/resources/views/components/frontend/nav-item.blade.php @@ -3,10 +3,10 @@ $active_classes = 'border-transparent dark:border-transparent'; if ($active) { - $active_classes = "bg-gray-200 dark:bg-gray-700 rounded sm:bg-transparent sm:rounded-none dark:sm:bg-transparent dark:sm:rounded-none border-gray-700 dark:border-gray-300 hover:opacity-75"; + $active_classes = 'bg-gray-200 dark:bg-gray-700 rounded sm:bg-transparent sm:rounded-none dark:sm:bg-transparent dark:sm:rounded-none border-gray-700 dark:border-gray-300 hover:opacity-75'; } ?>
  • - {{ $slot }} + {{ $slot }}
    • diff --git a/resources/views/components/google-analytics.blade.php b/resources/views/components/google-analytics.blade.php index 9ee2dff45..91bdc5053 100644 --- a/resources/views/components/google-analytics.blade.php +++ b/resources/views/components/google-analytics.blade.php @@ -1,13 +1,16 @@ -@if (setting('google_analytics') !== "") -@php -$google_analytics = setting('google_analytics'); -@endphp - - - -@endif \ No newline at end of file +@if (setting('google_analytics') !== '') + @php + $google_analytics = setting('google_analytics'); + @endphp + + + +@endif diff --git a/resources/views/components/layouts/app.blade.php b/resources/views/components/layouts/app.blade.php index 1e3cded46..594acb466 100644 --- a/resources/views/components/layouts/app.blade.php +++ b/resources/views/components/layouts/app.blade.php @@ -3,8 +3,8 @@ - - + + {{ $title ?? '' }} | {{ config('app.name') }} @@ -13,8 +13,8 @@ @include('frontend.includes.meta') - - + + @@ -42,7 +42,7 @@ @livewireScripts @stack('after-scripts') - + - \ No newline at end of file + diff --git a/resources/views/components/library/lightbox.blade.php b/resources/views/components/library/lightbox.blade.php index 7ff7e1399..db849605d 100644 --- a/resources/views/components/library/lightbox.blade.php +++ b/resources/views/components/library/lightbox.blade.php @@ -1,9 +1,9 @@ @push('after-styles') - - + + @endpush @push('after-scripts') - - -@endpush \ No newline at end of file + + +@endpush diff --git a/resources/views/components/library/select2.blade.php b/resources/views/components/library/select2.blade.php index c1ef76df5..c674c63f4 100644 --- a/resources/views/components/library/select2.blade.php +++ b/resources/views/components/library/select2.blade.php @@ -1,21 +1,23 @@ @push('after-styles') - -@if(language_direction() == 'rtl') - -@else - -@endif + + @if (language_direction() == 'rtl') + + @else + + @endif @endpush @push('after-scripts') - + - -@endpush \ No newline at end of file + +@endpush diff --git a/resources/views/components/modal.blade.php b/resources/views/components/modal.blade.php index 384662a1f..948b07dfb 100644 --- a/resources/views/components/modal.blade.php +++ b/resources/views/components/modal.blade.php @@ -1,78 +1,57 @@ -@props([ - 'name', - 'show' => false, - 'maxWidth' => '2xl' -]) +@props(['name', 'show' => false, 'maxWidth' => '2xl']) @php -$maxWidth = [ - 'sm' => 'sm:max-w-sm', - 'md' => 'sm:max-w-md', - 'lg' => 'sm:max-w-lg', - 'xl' => 'sm:max-w-xl', - '2xl' => 'sm:max-w-2xl', -][$maxWidth]; + $maxWidth = [ + 'sm' => 'sm:max-w-sm', + 'md' => 'sm:max-w-md', + 'lg' => 'sm:max-w-lg', + 'xl' => 'sm:max-w-xl', + '2xl' => 'sm:max-w-2xl', + ][$maxWidth]; @endphp -
    -
    + x-on:close-modal.window="$event.detail == '{{ $name }}' ? show = false : null" x-on:close.stop="show = false" + x-on:keydown.escape.window="show = false" x-on:keydown.tab.prevent="$event.shiftKey || nextFocusable().focus()" + x-on:keydown.shift.tab.prevent="prevFocusable().focus()" x-show="show" + class="fixed inset-0 overflow-y-auto px-4 py-6 sm:px-0 z-50" style="display: {{ $show ? 'block' : 'none' }};"> +
    -
    + x-transition:leave-end="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"> {{ $slot }}
    diff --git a/resources/views/components/nav-link.blade.php b/resources/views/components/nav-link.blade.php index 37bad5542..17fbb6e2c 100644 --- a/resources/views/components/nav-link.blade.php +++ b/resources/views/components/nav-link.blade.php @@ -1,7 +1,8 @@ @props(['active']) @php -$classes = ($active ?? false) + $classes = + $active ?? false ? 'inline-flex items-center px-1 pt-1 border-b-2 border-indigo-400 dark:border-indigo-600 text-sm font-medium leading-5 text-gray-900 dark:text-gray-100 focus:outline-none focus:border-indigo-700 transition duration-150 ease-in-out' : 'inline-flex items-center px-1 pt-1 border-b-2 border-transparent text-sm font-medium leading-5 text-gray-500 dark:text-gray-400 hover:text-gray-700 dark:hover:text-gray-300 hover:border-gray-300 dark:hover:border-gray-700 focus:outline-none focus:text-gray-700 dark:focus:text-gray-300 focus:border-gray-300 dark:focus:border-gray-700 transition duration-150 ease-in-out'; @endphp diff --git a/resources/views/components/primary-button.blade.php b/resources/views/components/primary-button.blade.php index 99bf38907..4686202e1 100644 --- a/resources/views/components/primary-button.blade.php +++ b/resources/views/components/primary-button.blade.php @@ -1,3 +1,4 @@ - diff --git a/resources/views/components/responsive-nav-link.blade.php b/resources/views/components/responsive-nav-link.blade.php index 98b55d19e..69aee7de4 100644 --- a/resources/views/components/responsive-nav-link.blade.php +++ b/resources/views/components/responsive-nav-link.blade.php @@ -1,7 +1,8 @@ @props(['active']) @php -$classes = ($active ?? false) + $classes = + $active ?? false ? 'block w-full ps-3 pe-4 py-2 border-l-4 border-indigo-400 dark:border-indigo-600 text-start text-base font-medium text-indigo-700 dark:text-indigo-300 bg-indigo-50 dark:bg-indigo-900/50 focus:outline-none focus:text-indigo-800 dark:focus:text-indigo-200 focus:bg-indigo-100 dark:focus:bg-indigo-900 focus:border-indigo-700 dark:focus:border-indigo-300 transition duration-150 ease-in-out' : 'block w-full ps-3 pe-4 py-2 border-l-4 border-transparent text-start text-base font-medium text-gray-600 dark:text-gray-400 hover:text-gray-800 dark:hover:text-gray-200 hover:bg-gray-50 dark:hover:bg-gray-700 hover:border-gray-300 dark:hover:border-gray-600 focus:outline-none focus:text-gray-800 dark:focus:text-gray-200 focus:bg-gray-50 dark:focus:bg-gray-700 focus:border-gray-300 dark:focus:border-gray-600 transition duration-150 ease-in-out'; @endphp diff --git a/resources/views/components/secondary-button.blade.php b/resources/views/components/secondary-button.blade.php index fa1c54918..83efc741f 100644 --- a/resources/views/components/secondary-button.blade.php +++ b/resources/views/components/secondary-button.blade.php @@ -1,3 +1,4 @@ - diff --git a/resources/views/components/selected-theme.blade.php b/resources/views/components/selected-theme.blade.php index b1f982fb2..7158a5bed 100644 --- a/resources/views/components/selected-theme.blade.php +++ b/resources/views/components/selected-theme.blade.php @@ -1 +1,8 @@ - + diff --git a/resources/views/components/text-input.blade.php b/resources/views/components/text-input.blade.php index 7779a13ad..92804a5f6 100644 --- a/resources/views/components/text-input.blade.php +++ b/resources/views/components/text-input.blade.php @@ -1,3 +1,6 @@ @props(['disabled' => false]) -merge(['class' => 'border-gray-300 dark:border-gray-700 dark:bg-gray-900 dark:text-gray-300 focus:border-indigo-500 dark:focus:border-indigo-600 focus:ring-indigo-500 dark:focus:ring-indigo-600 rounded-md shadow-sm']) !!}> +merge([ + 'class' => + 'border-gray-300 dark:border-gray-700 dark:bg-gray-900 dark:text-gray-300 focus:border-indigo-500 dark:focus:border-indigo-600 focus:ring-indigo-500 dark:focus:ring-indigo-600 rounded-md shadow-sm', +]) !!}> diff --git a/resources/views/frontend/includes/errors.blade.php b/resources/views/frontend/includes/errors.blade.php index 57ba33395..6a13f375e 100644 --- a/resources/views/frontend/includes/errors.blade.php +++ b/resources/views/frontend/includes/errors.blade.php @@ -1,12 +1,12 @@ @if ($errors->any()) - -@endif \ No newline at end of file + +@endif diff --git a/resources/views/frontend/includes/footer.blade.php b/resources/views/frontend/includes/footer.blade.php index e470a2d02..aef69c02f 100644 --- a/resources/views/frontend/includes/footer.blade.php +++ b/resources/views/frontend/includes/footer.blade.php @@ -11,10 +11,12 @@ @lang('About')
  • - @lang('Privacy') + @lang('Privacy')
  • - @lang('Terms') + @lang('Terms')
  • @lang('FAQs') diff --git a/resources/views/frontend/includes/messages.blade.php b/resources/views/frontend/includes/messages.blade.php index c28734149..4461f56d9 100644 --- a/resources/views/frontend/includes/messages.blade.php +++ b/resources/views/frontend/includes/messages.blade.php @@ -1,18 +1,18 @@ @if ($errors->any()) - + @endif @if (session('status')) -

    {{ session('status') }}

    -@endif \ No newline at end of file +

    {{ session('status') }}

    +@endif diff --git a/resources/views/frontend/includes/meta.blade.php b/resources/views/frontend/includes/meta.blade.php index ffa724e58..3cfbda23c 100644 --- a/resources/views/frontend/includes/meta.blade.php +++ b/resources/views/frontend/includes/meta.blade.php @@ -1,43 +1,42 @@ @php -if(!isset($meta_page_type)){ -$meta_page_type = 'website'; -} + if (!isset($meta_page_type)) { + $meta_page_type = 'website'; + } @endphp @switch($meta_page_type) -@case('website') - -@break - -@case('article') -{{-- Facebook Meta --}} - - - - - -@foreach ($$module_name_singular->tags as $tag) - -@endforeach - -@break - -@case('profile') - - - - - -@break - -@default - + @case('website') + + @break + + @case('article') + {{-- Facebook Meta --}} + + + + + + @foreach ($$module_name_singular->tags as $tag) + + @endforeach + @break + + @case('profile') + + + + + + @break + + @default @endswitch - + - + @@ -46,13 +45,13 @@ - + - + - \ No newline at end of file + diff --git a/resources/views/frontend/layouts/app.blade.php b/resources/views/frontend/layouts/app.blade.php index 57b90db3c..a5a11af5b 100644 --- a/resources/views/frontend/layouts/app.blade.php +++ b/resources/views/frontend/layouts/app.blade.php @@ -1,47 +1,47 @@ - - - - - - @yield('title') | {{ config('app.name') }} - - - - @include('frontend.includes.meta') + + + + + + @yield('title') | {{ config('app.name') }} + + + + @include('frontend.includes.meta') - - - + + + - - + + - @vite(['resources/css/app-frontend.css', 'resources/js/app-frontend.js']) + @vite(['resources/css/app-frontend.css', 'resources/js/app-frontend.js']) - @livewireStyles + @livewireStyles - @stack('after-styles') + @stack('after-styles') - - + + - - - - @include('frontend.includes.header') + + -
    - @yield('content') -
    + @include('frontend.includes.header') - @include('frontend.includes.footer') +
    + @yield('content') +
    - - @livewireScripts - @stack('after-scripts') - + @include('frontend.includes.footer') + + + @livewireScripts + @stack('after-scripts') + diff --git a/resources/views/frontend/users/profileEdit.blade.php b/resources/views/frontend/users/profileEdit.blade.php index fba0c32b9..cbece15c7 100644 --- a/resources/views/frontend/users/profileEdit.blade.php +++ b/resources/views/frontend/users/profileEdit.blade.php @@ -153,7 +153,6 @@ class="w-full rounded border-2 border-gray-900 px-6 py-2 text-sm font-semibold t {{ $user->name }} - diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 6076cdee2..982b12f7b 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -1,34 +1,37 @@ - - - - - {{ config('app.name', 'Laravel') }} + + + + - - @vite(['resources/css/app-frontend.css']) - @vite(['resources/js/app-frontend.js']) - - - -
    - @include('layouts.navigation') + {{ config('app.name', 'Laravel') }} - - @if (isset($header)) -
    -
    - {{ $header }} -
    -
    - @endif + + @vite(['resources/css/app-frontend.css']) + @vite(['resources/js/app-frontend.js']) + + + + +
    + @include('layouts.navigation') + + + @if (isset($header)) +
    +
    + {{ $header }} +
    +
    + @endif + + +
    + {{ $slot }} +
    +
    + - -
    - {{ $slot }} -
    -
    - diff --git a/resources/views/layouts/guest.blade.php b/resources/views/layouts/guest.blade.php index 8176785aa..b496d7ae5 100644 --- a/resources/views/layouts/guest.blade.php +++ b/resources/views/layouts/guest.blade.php @@ -1,28 +1,32 @@ - - - - - {{ config('app.name', 'Laravel') }} + + + + - - @vite(['resources/css/app-frontend.css']) - @vite(['resources/js/app-frontend.js']) - - - -
    -
    - - - -
    + {{ config('app.name', 'Laravel') }} -
    - {{ $slot }} -
    + + @vite(['resources/css/app-frontend.css']) + @vite(['resources/js/app-frontend.js']) + + + + +
    +
    + + + +
    + +
    + {{ $slot }}
    - +
    + + diff --git a/resources/views/layouts/navigation.blade.php b/resources/views/layouts/navigation.blade.php index c64bf6460..bf49fb111 100644 --- a/resources/views/layouts/navigation.blade.php +++ b/resources/views/layouts/navigation.blade.php @@ -22,12 +22,16 @@ -