From 4d17167403a6f1e8bb1fabd558aa12a7cbe2f373 Mon Sep 17 00:00:00 2001 From: Anichur Rahaman <38912435+anisAronno@users.noreply.github.com> Date: Sun, 31 Dec 2023 20:03:57 +0600 Subject: [PATCH] Blade File Formate and SVG Icon separate (#18) * Add Media Gallery Package - Add Media Gallery Package - Remove image column from the User model - Remove Media Helper Package (It's Already included in media gallery package) - Remove Cache Controler - Add Avatar attribute in user model and return user image - Add Gravatar API for default image in user model * Blade File Formate and SVG Icon separate (#17) * Blade File Formate and SVG Icon seperate * Fix styling by bot --- .php-cs-fixer.cache | 2 +- .php-cs-fixer.dist.php | 1 - app/Http/Resources/UserResource.php | 55 +- app/Models/User.php | 4 +- database/factories/UserFactory.php | 1 - database/seeders/RolePermissionSeeder.php | 1 - database/seeders/UsersTableSeeder.php | 20 +- resources/views/Message.blade.php | 25 +- .../views/auth/confirm-password.blade.php | 6 +- .../views/auth/forgot-password.blade.php | 3 +- resources/views/auth/login.blade.php | 16 +- resources/views/auth/register.blade.php | 20 +- resources/views/auth/reset-password.blade.php | 11 +- resources/views/auth/verify-email.blade.php | 3 +- .../views/components/admin-header.blade.php | 110 +- .../components/application-logo.blade.php | 3 +- resources/views/components/apps.blade.php | 336 ++--- .../views/components/danger-button.blade.php | 3 +- .../views/components/dark-mode.blade.php | 51 +- .../views/components/dropdown-link.blade.php | 3 +- resources/views/components/dropdown.blade.php | 49 +- .../views/components/header-menu.blade.php | 131 +- .../views/components/icons/bag.blade.php | 7 + .../views/components/icons/blog.blade.php | 6 +- .../views/components/icons/cart.blade.php | 3 + .../views/components/icons/category.blade.php | 5 +- .../views/components/icons/client.blade.php | 9 +- .../components/icons/component.blade.php | 14 +- .../views/components/icons/docs.blade.php | 8 +- .../views/components/icons/doller.blade.php | 6 +- .../components/icons/down-arrow.blade.php | 5 + .../views/components/icons/edit.blade.php | 5 +- .../views/components/icons/eye.blade.php | 5 +- .../components/icons/file-docs.blade.php | 7 + .../views/components/icons/global.blade.php | 16 +- .../views/components/icons/invoice.blade.php | 16 +- .../views/components/icons/lock.blade.php | 7 + .../views/components/icons/media.blade.php | 20 + .../views/components/icons/message.blade.php | 10 + .../views/components/icons/money.blade.php | 13 +- .../views/components/icons/order.blade.php | 58 +- .../views/components/icons/pages.blade.php | 9 +- .../views/components/icons/pie.blade.php | 6 + .../views/components/icons/product.blade.php | 8 +- .../views/components/icons/report.blade.php | 70 +- .../views/components/icons/sales.blade.php | 9 +- .../views/components/icons/setting.blade.php | 5 + .../views/components/icons/sheild.blade.php | 5 +- .../views/components/icons/support.blade.php | 27 +- .../views/components/icons/tags.blade.php | 12 +- .../views/components/icons/trash.blade.php | 7 +- .../views/components/icons/user.blade.php | 8 +- .../components/language-dropdown.blade.php | 117 ++ resources/views/components/modal.blade.php | 105 +- resources/views/components/nav-link.blade.php | 4 +- .../views/components/notification.blade.php | 156 +-- .../views/components/primary-button.blade.php | 3 +- .../components/responsive-nav-link.blade.php | 4 +- .../components/secondary-button.blade.php | 3 +- resources/views/components/sidebar.blade.php | 733 +++-------- .../views/components/text-input.blade.php | 5 +- resources/views/dashboard/index.blade.php | 2 +- .../views/dashboard/roles/create.blade.php | 188 +-- .../views/dashboard/roles/edit.blade.php | 212 ++-- .../views/dashboard/roles/index.blade.php | 279 +++-- .../views/dashboard/roles/view.blade.php | 132 +- .../views/dashboard/user/index.blade.php | 296 +++-- resources/views/layouts/app.blade.php | 106 +- resources/views/layouts/guest.blade.php | 48 +- resources/views/layouts/navigation.blade.php | 26 +- .../partials/delete-user-form.blade.php | 15 +- .../partials/update-password-form.blade.php | 18 +- .../update-profile-information-form.blade.php | 20 +- .../vendor/pagination/bootstrap-4.blade.php | 15 +- .../vendor/pagination/bootstrap-5.blade.php | 18 +- .../views/vendor/pagination/default.blade.php | 3 +- .../vendor/pagination/semantic-ui.blade.php | 12 +- .../pagination/simple-bootstrap-5.blade.php | 3 +- .../pagination/simple-tailwind.blade.php | 12 +- .../vendor/pagination/tailwind.blade.php | 54 +- resources/views/welcome.blade.php | 1098 +++++++++++++++-- 81 files changed, 2868 insertions(+), 2059 deletions(-) create mode 100644 resources/views/components/icons/bag.blade.php create mode 100644 resources/views/components/icons/cart.blade.php create mode 100644 resources/views/components/icons/down-arrow.blade.php create mode 100644 resources/views/components/icons/file-docs.blade.php create mode 100644 resources/views/components/icons/lock.blade.php create mode 100644 resources/views/components/icons/media.blade.php create mode 100644 resources/views/components/icons/message.blade.php create mode 100644 resources/views/components/icons/pie.blade.php create mode 100644 resources/views/components/icons/setting.blade.php create mode 100644 resources/views/components/language-dropdown.blade.php diff --git a/.php-cs-fixer.cache b/.php-cs-fixer.cache index 222248f..7bd4779 100644 --- a/.php-cs-fixer.cache +++ b/.php-cs-fixer.cache @@ -1 +1 @@ -{"php":"8.3.1","version":"3.45.0","indent":" ","lineEnding":"\n","rules":{"array_syntax":{"syntax":"short"},"blank_line_after_namespace":true,"blank_line_after_opening_tag":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true,"position_after_anonymous_constructs":"next"},"cast_spaces":true,"concat_space":{"spacing":"none"},"declare_equal_normalize":true,"elseif":true,"encoding":true,"full_opening_tag":true,"fully_qualified_strict_types":true,"function_declaration":true,"function_typehint_space":true,"heredoc_to_nowdoc":true,"include":true,"increment_style":{"style":"post"},"indentation_type":true,"linebreak_after_opening_tag":true,"line_ending":true,"lowercase_cast":true,"lowercase_keywords":true,"lowercase_static_reference":true,"magic_method_casing":true,"magic_constant_casing":true,"method_argument_space":true,"native_function_casing":true,"no_alias_functions":true,"no_extra_blank_lines":{"tokens":["extra","throw","use","use_trait"]},"no_blank_lines_after_class_opening":true,"no_blank_lines_after_phpdoc":true,"no_closing_tag":true,"no_empty_phpdoc":true,"no_empty_statement":true,"no_leading_import_slash":true,"no_leading_namespace_whitespace":true,"no_mixed_echo_print":{"use":"echo"},"no_multiline_whitespace_around_double_arrow":true,"multiline_whitespace_before_semicolons":{"strategy":"no_multi_line"},"no_short_bool_cast":true,"no_singleline_whitespace_before_semicolons":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_comma_in_list_call":true,"no_trailing_comma_in_singleline_array":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"no_unreachable_default_argument_value":true,"no_useless_return":true,"no_whitespace_before_comma_in_array":true,"no_whitespace_in_blank_line":true,"normalize_index_brace":true,"not_operator_with_successor_space":true,"object_operator_without_whitespace":true,"phpdoc_indent":true,"phpdoc_no_access":true,"phpdoc_no_package":true,"phpdoc_no_useless_inheritdoc":true,"phpdoc_scalar":true,"phpdoc_single_line_var_spacing":true,"phpdoc_summary":true,"phpdoc_to_comment":true,"phpdoc_trim":true,"phpdoc_types":true,"phpdoc_var_without_name":true,"self_accessor":true,"short_scalar_cast":true,"single_blank_line_at_eof":true,"single_blank_line_before_namespace":true,"single_import_per_statement":true,"single_line_after_imports":true,"single_line_comment_style":{"comment_types":["hash"]},"single_quote":true,"space_after_semicolon":true,"standardize_not_equals":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"ternary_operator_spaces":true,"trim_array_spaces":true,"unary_operator_spaces":true,"whitespace_after_comma_in_array":true,"constant_case":{"case":"lower"},"general_phpdoc_tag_rename":true,"phpdoc_inline_tag_normalizer":true,"phpdoc_tag_type":true,"psr_autoloading":true,"trailing_comma_in_multiline":{"elements":["arrays"]},"binary_operator_spaces":{"default":"align","operators":{"=>":"align","=":"align"}},"blank_line_before_statement":{"statements":["return","if","for","foreach","while","do","switch","case","break","continue"]},"class_attributes_separation":{"elements":{"const":"one","method":"one","property":"one"}},"class_definition":{"multi_line_extends_each_single_line":true,"single_item_single_line":true,"single_line":true},"ordered_imports":{"sort_algorithm":"alpha"},"no_unneeded_control_parentheses":{"statements":["break","clone","continue","echo_print","return","switch_case","yield"]},"no_spaces_around_offset":{"positions":["inside","outside"]},"visibility_required":{"elements":["property","method","const"]}},"hashes":{"app\/Providers\/BroadcastServiceProvider.php":"2ec8fd9c95c859ab7299b84344e1e854","app\/Providers\/RouteServiceProvider.php":"c72927c73fb854178a327e3ae71e9ab2","app\/Providers\/AppServiceProvider.php":"c1ee34980f5cb7106b805c820ea6f1ef","app\/Providers\/TelescopeServiceProvider.php":"0469ce3b909c8031b3f22944d69a4928","app\/Providers\/AuthServiceProvider.php":"3d7c521bbdf44c2422f0629c10141498","app\/Providers\/EventServiceProvider.php":"afa340e8a5db618a7d82e54c2b8334e4","app\/Providers\/HorizonServiceProvider.php":"d520f3a0ee90ec7c622bd4e9ee8c0b5b","app\/View\/Components\/AppLayout.php":"b9778de9551cc2b9f166fe7e6629b9a5","app\/View\/Components\/GuestLayout.php":"aefcd0a8c6a6a8b4d88313ff2998fbb5","app\/Traits\/EnumToArray.php":"26f2b8ce429e7c7114cd0e730a70403b","app\/Models\/User.php":"e8ee360ad26fc39b9dbe2eebdbc007f3","app\/Notifications\/ResetPasswordNotification.php":"0e3cc5095146f48d068623628f8782ab","app\/Notifications\/VerifyEmailQueued.php":"113ea218b3504f8c9c53f4fbdcaad88b","app\/Notifications\/NewUserNotification.php":"0c15af6d4b4a6fc87b59b169e8201f70","app\/Http\/Requests\/ProfileUpdateRequest.php":"609b846d4d93357cd485705a43d0fcad","app\/Http\/Requests\/Role\/RoleStoreRequest.php":"99e5a6d10053fb32038ed585dc51a548","app\/Http\/Requests\/Role\/RoleUpdateRequest.php":"1df36836a40f5bbf69c2bc1ef3468466","app\/Http\/Requests\/Auth\/RegistrationRequest.php":"28eba25816fea8d4db85ad98d4c9fb19","app\/Http\/Requests\/Auth\/LoginRequest.php":"47aad8474e3cb4ea2fc6ab4d8cf406c7","app\/Http\/Middleware\/VerifyCsrfToken.php":"f940a35a715b792ecc6c36e1da1adbc1","app\/Http\/Middleware\/RedirectIfAuthenticated.php":"6f1e84f13732fd90870d4e54fc59be28","app\/Http\/Middleware\/TrustHosts.php":"fce96fbb877f69fdf32aec84f52c79ce","app\/Http\/Middleware\/PreventRequestsDuringMaintenance.php":"9bf727a4eeaabad8fde5110106356d60","app\/Http\/Middleware\/ValidateSignature.php":"77676d93770a50e14db60bb5e06a8c86","app\/Http\/Middleware\/TrustProxies.php":"0a40a3bcc49063aa45024721ff69e572","app\/Http\/Middleware\/EncryptCookies.php":"aa3be31badc36cd9d7a5ea08eef245e7","app\/Http\/Middleware\/Authenticate.php":"ce8076b44a6c8969f342b62c1173917e","app\/Http\/Middleware\/TrimStrings.php":"016f82bc302a0b8801eeb48edea87cdf","app\/Http\/Resources\/AddressResource.php":"bfa1b05f7c2c51903113065b0b5e639f","app\/Http\/Resources\/PermissionResource.php":"8df8c32db2b48e3de6d3d0dc9b5ea641","app\/Http\/Resources\/TestResource.php":"abb8da0e99a33aa307a5cb0fbbd1f2b7","app\/Http\/Resources\/UserResource.php":"ee4d72c4eeadac117443085d62b97707","app\/Http\/Resources\/RoleResource.php":"771321ca9fc2f45c7febd0e4eba4005d","app\/Http\/Kernel.php":"163b8321e8d9a559bf9e05b7c6663ff1","app\/Http\/Controllers\/Controller.php":"c93e356d909152be9ccdf94a17e149b8","app\/Http\/Controllers\/Auth\/RegisteredUserController.php":"406c91ba10e686b2b2c0d2a1490b0c97","app\/Http\/Controllers\/Auth\/VerifyEmailController.php":"9f8de57a44e3151b0826416eb19fa28c","app\/Http\/Controllers\/Auth\/ConfirmablePasswordController.php":"bacb38c3aad8fd054eb07e1cc6abf654","app\/Http\/Controllers\/Auth\/PasswordController.php":"0672f6ef52b937f0b12199354a1eb622","app\/Http\/Controllers\/Auth\/NewPasswordController.php":"a9248e1a6b2f67bc5f4f1ca56373044a","app\/Http\/Controllers\/Auth\/AuthenticatedSessionController.php":"e6d792caffeea1ae6ef23b9867d5daf0","app\/Http\/Controllers\/Auth\/EmailVerificationNotificationController.php":"a1f3ddac46c4d78bce82c02050c5239e","app\/Http\/Controllers\/Auth\/EmailVerificationPromptController.php":"e86a9dacb03cf8a97225ef8f142a3c9e","app\/Http\/Controllers\/Auth\/PasswordResetLinkController.php":"20059c80810872dd8be60647393740ee","app\/Http\/Controllers\/Api\/V1\/AuthController.php":"5ccccfd2f6fb1c00e4060f32a5ec743f","app\/Http\/Controllers\/ProfileController.php":"2951d93e0803ea1aba041d8d7ed264c8","app\/Http\/Controllers\/Admin\/NotificationController.php":"937ee746043fce8c7afc89206bf43418","app\/Http\/Controllers\/Admin\/RolesController.php":"2a779f3155654c3db7e24f31101ad720","app\/Http\/Controllers\/Admin\/UserController.php":"0411d7b3fb015626a64f591683154e62","app\/Http\/Controllers\/Admin\/DashboardController.php":"ad978b6a256cf396bf95e6ed8aae34c3","app\/Exceptions\/Handler.php":"ec37959b92a81287608ef379ee4910d4","app\/Console\/Kernel.php":"6d806581c8e37a5ba4d47e652981ff1f","app\/Enums\/UserGender.php":"aef9501ddb80cd0c50133213a2935df4","app\/Enums\/UserStatus.php":"3a9cb8f834f87d22cbac705b29d474b9","app\/Observers\/UserObserver.php":"19bd877f0337caddd390862633cc1974","app\/Helpers\/CacheKey.php":"646e26d223fa1faa7173ab129ceacc02","app\/Helpers\/UniqueSlug.php":"4b22c2ae80f34302b0446245a78e78af","config\/telescope.php":"26ead243e16274f1420453b567c724b2","config\/hashing.php":"0b12588776d51ff6155537da921703a8","config\/cache.php":"9c1f2b8ddc4e3885222815dafcb69ed8","config\/gallery.php":"3398fd7fdc2056d9d6aac01c42704cc1","config\/broadcasting.php":"a7a3fc65b26b2678cd1a648cfd0c060e","config\/database.php":"66b8eca260f50ce3354ca0e7efe8db5d","config\/permission.php":"673fb82f1e32a02d96f8b5ee200ede3f","config\/mail.php":"4eabe31375f7eefe52a0c1256e8bd587","config\/log-viewer.php":"fbe1b3fe10c738c6375448a03358f438","config\/pulse.php":"538e7ad513c48555d17308c71952b877","config\/horizon.php":"42553ec79e084d884785d182d6b2046f","config\/cors.php":"7e46f4152490ce5bf22fe42d2b57a63a","config\/services.php":"32898baaef9bef2da646b2ec4edc2479","config\/queue.php":"7e3314dc5be5f171d7c237796fda45e9","config\/filesystems.php":"0dd6675c5944e42f65e05517741935e5","config\/logging.php":"f08ce95c6e37cb19a170b075d3e67cd6","config\/auth.php":"f48cb370e423856596e30ef7f4a6e18f","config\/app.php":"2ed4934c584242bc54494313be9779e1","config\/session.php":"804a9a29ab22247b00b89c573778c7c6","config\/view.php":"24e00ccca17634d028fbbfdafd9e7461","config\/sanctum.php":"15b27b5d9faf0688c4126df711c31ab8","config\/sweetalert.php":"01944762a758907604703e2cd509df63","database\/seeders\/UsersTableSeeder.php":"70b7af1c7317fc47125e53ddc252d53b","database\/seeders\/DatabaseSeeder.php":"0df8b26d09f92a0c36c1e22940e06e29","database\/seeders\/RolePermissionSeeder.php":"26d1bc898697c8f65b653e64f4dc345d","database\/seeders\/ImageSeeder.php":"07e13b4f003f9c57254ed22561fd7fda","database\/seeders\/LaravelSettingsSeeder.php":"767354555dbffb8bc047633e1455369a","database\/migrations\/2023_12_30_195404_create_imageables_table.php":"ee51665d28b1fdb47ddac21132c783fb","database\/migrations\/2019_08_19_000000_create_failed_jobs_table.php":"ff1dec3002aef48fd12541da804d381c","database\/migrations\/2023_12_26_112615_create_permission_tables.php":"c479fcd33d4aaa7d8b83147d6e807841","database\/migrations\/2014_10_12_100000_create_password_reset_tokens_table.php":"caaaedd92aa0fab89375a5f94a1c613d","database\/migrations\/2023_12_30_195304_create_images_table.php":"c3f47346338cd1446aba7fb1e0c8d9e4","database\/migrations\/2023_01_09_185200_add_batch_uuid_column_to_activity_log_table.php":"c8d5a1fb0a006522a5a260aa16f4c3d9","database\/migrations\/2023_01_09_185158_create_activity_log_table.php":"09f8c11cccbbd2ae1807faca8d6555d3","database\/migrations\/2023_01_09_185159_add_event_column_to_activity_log_table.php":"32a5637958981bf1e519210a378f1ca1","database\/migrations\/2023_12_20_164709_create_notifications_table.php":"dcb8e3021ef665faea234b08f2949835","database\/migrations\/2014_10_12_000000_create_users_table.php":"64318a320d59a946285d048f73358857","database\/migrations\/2023_12_21_042243_create_settings_table.php":"156976b9baa848e2dbb3e10dabfa2a1a","database\/migrations\/2019_12_14_000001_create_personal_access_tokens_table.php":"ea623343a81f24b1fb95ebedae70335e","database\/migrations\/2023_06_07_000001_create_pulse_tables.php":"47fbc6e3dedf3d6916e75f4bf9e28339","database\/factories\/ImageFactory.php":"ef4e4f9a93ad90a2640a6e9c020b404b","database\/factories\/UserFactory.php":"f1e8056f076b67647117fd8caad7f4ad","routes\/channels.php":"9df37803e0a46587c5555cbcf54c3378","routes\/web.php":"b8566019f1425aea3ba2b2165bdbadab","routes\/api.php":"7d1e16006f1784f9fa9ed040d711d95a","routes\/console.php":"581322fa9c8ac82b9fec9a031a4efa8e","routes\/auth.php":"66ae3a01c38b32d498a5951ba0d5333a","routes\/admin.php":"cfa112839dd2645844f4ea25975c1d04","tests\/CreatesApplication.php":"2940b3284d19aae1af6a5d2af9291bc4","tests\/Unit\/ExampleTest.php":"3f679e9508c834f0ad95943455fcd836","tests\/TestCase.php":"93519c98470fc8240aed892b40c5a9fc","tests\/Feature\/ExampleTest.php":"cde8eef0fa78c0b03b3509d63c558735","tests\/Feature\/Auth\/PasswordResetTest.php":"4029daf14f44a0ee26ff3f944f7b2271","tests\/Feature\/Auth\/PasswordConfirmationTest.php":"09d4aff025e225f393864cfad9401b1a","tests\/Feature\/Auth\/RegistrationTest.php":"b1b2680627cee7a52c745d7507da105b","tests\/Feature\/Auth\/EmailVerificationTest.php":"6451e51694b1c7af781361527ee47f07","tests\/Feature\/Auth\/PasswordUpdateTest.php":"c7a291e698a29708b8fcce882349b626","tests\/Feature\/Auth\/AuthenticationTest.php":"0000dbcfffa3a1086fb97fe8f73140ba","tests\/Feature\/ProfileTest.php":"c03c343fd63ccdf19035af87ee4eb843"}} \ No newline at end of file +{"php":"8.3.1","version":"3.45.0","indent":" ","lineEnding":"\n","rules":{"array_syntax":{"syntax":"short"},"blank_line_after_namespace":true,"blank_line_after_opening_tag":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true,"position_after_anonymous_constructs":"next"},"cast_spaces":true,"concat_space":{"spacing":"none"},"declare_equal_normalize":true,"elseif":true,"encoding":true,"full_opening_tag":true,"fully_qualified_strict_types":true,"function_declaration":true,"function_typehint_space":true,"heredoc_to_nowdoc":true,"include":true,"increment_style":{"style":"post"},"indentation_type":true,"linebreak_after_opening_tag":true,"line_ending":true,"lowercase_cast":true,"lowercase_keywords":true,"lowercase_static_reference":true,"magic_method_casing":true,"magic_constant_casing":true,"method_argument_space":true,"native_function_casing":true,"no_alias_functions":true,"no_extra_blank_lines":{"tokens":["extra","throw","use","use_trait"]},"no_blank_lines_after_class_opening":true,"no_blank_lines_after_phpdoc":true,"no_closing_tag":true,"no_empty_phpdoc":true,"no_empty_statement":true,"no_leading_import_slash":true,"no_leading_namespace_whitespace":true,"no_mixed_echo_print":{"use":"echo"},"no_multiline_whitespace_around_double_arrow":true,"multiline_whitespace_before_semicolons":{"strategy":"no_multi_line"},"no_short_bool_cast":true,"no_singleline_whitespace_before_semicolons":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_comma_in_list_call":true,"no_trailing_comma_in_singleline_array":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"no_unreachable_default_argument_value":true,"no_useless_return":true,"no_whitespace_before_comma_in_array":true,"no_whitespace_in_blank_line":true,"normalize_index_brace":true,"not_operator_with_successor_space":true,"object_operator_without_whitespace":true,"phpdoc_indent":true,"phpdoc_no_access":true,"phpdoc_no_package":true,"phpdoc_no_useless_inheritdoc":true,"phpdoc_scalar":true,"phpdoc_single_line_var_spacing":true,"phpdoc_summary":true,"phpdoc_to_comment":true,"phpdoc_trim":true,"phpdoc_types":true,"phpdoc_var_without_name":true,"self_accessor":true,"short_scalar_cast":true,"single_blank_line_at_eof":true,"single_blank_line_before_namespace":true,"single_import_per_statement":true,"single_line_after_imports":true,"single_line_comment_style":{"comment_types":["hash"]},"single_quote":true,"space_after_semicolon":true,"standardize_not_equals":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"ternary_operator_spaces":true,"trim_array_spaces":true,"unary_operator_spaces":true,"whitespace_after_comma_in_array":true,"constant_case":{"case":"lower"},"general_phpdoc_tag_rename":true,"phpdoc_inline_tag_normalizer":true,"phpdoc_tag_type":true,"psr_autoloading":true,"trailing_comma_in_multiline":{"elements":["arrays"]},"binary_operator_spaces":{"default":"align","operators":{"=>":"align","=":"align"}},"blank_line_before_statement":{"statements":["return","if","for","foreach","while","do","switch","case","break","continue"]},"class_attributes_separation":{"elements":{"const":"one","method":"one","property":"one"}},"class_definition":{"multi_line_extends_each_single_line":true,"single_item_single_line":true,"single_line":true},"ordered_imports":{"sort_algorithm":"alpha"},"no_unneeded_control_parentheses":{"statements":["break","clone","continue","echo_print","return","switch_case","yield"]},"no_spaces_around_offset":{"positions":["inside","outside"]},"visibility_required":{"elements":["property","method","const"]}},"hashes":{"app\/Providers\/BroadcastServiceProvider.php":"2ec8fd9c95c859ab7299b84344e1e854","app\/Providers\/RouteServiceProvider.php":"c72927c73fb854178a327e3ae71e9ab2","app\/Providers\/AppServiceProvider.php":"c1ee34980f5cb7106b805c820ea6f1ef","app\/Providers\/TelescopeServiceProvider.php":"0469ce3b909c8031b3f22944d69a4928","app\/Providers\/AuthServiceProvider.php":"3d7c521bbdf44c2422f0629c10141498","app\/Providers\/EventServiceProvider.php":"afa340e8a5db618a7d82e54c2b8334e4","app\/Providers\/HorizonServiceProvider.php":"d520f3a0ee90ec7c622bd4e9ee8c0b5b","app\/View\/Components\/AppLayout.php":"b9778de9551cc2b9f166fe7e6629b9a5","app\/View\/Components\/GuestLayout.php":"aefcd0a8c6a6a8b4d88313ff2998fbb5","app\/Traits\/EnumToArray.php":"26f2b8ce429e7c7114cd0e730a70403b","app\/Models\/User.php":"9c18bc347807c1505c527b5a08a057d9","app\/Notifications\/ResetPasswordNotification.php":"0e3cc5095146f48d068623628f8782ab","app\/Notifications\/VerifyEmailQueued.php":"113ea218b3504f8c9c53f4fbdcaad88b","app\/Notifications\/NewUserNotification.php":"0c15af6d4b4a6fc87b59b169e8201f70","app\/Http\/Requests\/ProfileUpdateRequest.php":"609b846d4d93357cd485705a43d0fcad","app\/Http\/Requests\/Role\/RoleStoreRequest.php":"99e5a6d10053fb32038ed585dc51a548","app\/Http\/Requests\/Role\/RoleUpdateRequest.php":"1df36836a40f5bbf69c2bc1ef3468466","app\/Http\/Requests\/Auth\/RegistrationRequest.php":"28eba25816fea8d4db85ad98d4c9fb19","app\/Http\/Requests\/Auth\/LoginRequest.php":"47aad8474e3cb4ea2fc6ab4d8cf406c7","app\/Http\/Middleware\/VerifyCsrfToken.php":"f940a35a715b792ecc6c36e1da1adbc1","app\/Http\/Middleware\/RedirectIfAuthenticated.php":"6f1e84f13732fd90870d4e54fc59be28","app\/Http\/Middleware\/TrustHosts.php":"fce96fbb877f69fdf32aec84f52c79ce","app\/Http\/Middleware\/PreventRequestsDuringMaintenance.php":"9bf727a4eeaabad8fde5110106356d60","app\/Http\/Middleware\/ValidateSignature.php":"77676d93770a50e14db60bb5e06a8c86","app\/Http\/Middleware\/TrustProxies.php":"0a40a3bcc49063aa45024721ff69e572","app\/Http\/Middleware\/EncryptCookies.php":"aa3be31badc36cd9d7a5ea08eef245e7","app\/Http\/Middleware\/Authenticate.php":"ce8076b44a6c8969f342b62c1173917e","app\/Http\/Middleware\/TrimStrings.php":"016f82bc302a0b8801eeb48edea87cdf","app\/Http\/Resources\/AddressResource.php":"bfa1b05f7c2c51903113065b0b5e639f","app\/Http\/Resources\/PermissionResource.php":"8df8c32db2b48e3de6d3d0dc9b5ea641","app\/Http\/Resources\/TestResource.php":"abb8da0e99a33aa307a5cb0fbbd1f2b7","app\/Http\/Resources\/UserResource.php":"5deec8be666b14a858e9da5d4fc65863","app\/Http\/Resources\/RoleResource.php":"771321ca9fc2f45c7febd0e4eba4005d","app\/Http\/Kernel.php":"163b8321e8d9a559bf9e05b7c6663ff1","app\/Http\/Controllers\/Controller.php":"c93e356d909152be9ccdf94a17e149b8","app\/Http\/Controllers\/Auth\/RegisteredUserController.php":"406c91ba10e686b2b2c0d2a1490b0c97","app\/Http\/Controllers\/Auth\/VerifyEmailController.php":"9f8de57a44e3151b0826416eb19fa28c","app\/Http\/Controllers\/Auth\/ConfirmablePasswordController.php":"bacb38c3aad8fd054eb07e1cc6abf654","app\/Http\/Controllers\/Auth\/PasswordController.php":"0672f6ef52b937f0b12199354a1eb622","app\/Http\/Controllers\/Auth\/NewPasswordController.php":"a9248e1a6b2f67bc5f4f1ca56373044a","app\/Http\/Controllers\/Auth\/AuthenticatedSessionController.php":"e6d792caffeea1ae6ef23b9867d5daf0","app\/Http\/Controllers\/Auth\/EmailVerificationNotificationController.php":"a1f3ddac46c4d78bce82c02050c5239e","app\/Http\/Controllers\/Auth\/EmailVerificationPromptController.php":"e86a9dacb03cf8a97225ef8f142a3c9e","app\/Http\/Controllers\/Auth\/PasswordResetLinkController.php":"20059c80810872dd8be60647393740ee","app\/Http\/Controllers\/Api\/V1\/AuthController.php":"5ccccfd2f6fb1c00e4060f32a5ec743f","app\/Http\/Controllers\/ProfileController.php":"2951d93e0803ea1aba041d8d7ed264c8","app\/Http\/Controllers\/Admin\/NotificationController.php":"937ee746043fce8c7afc89206bf43418","app\/Http\/Controllers\/Admin\/RolesController.php":"2a779f3155654c3db7e24f31101ad720","app\/Http\/Controllers\/Admin\/UserController.php":"0411d7b3fb015626a64f591683154e62","app\/Http\/Controllers\/Admin\/DashboardController.php":"ad978b6a256cf396bf95e6ed8aae34c3","app\/Exceptions\/Handler.php":"ec37959b92a81287608ef379ee4910d4","app\/Console\/Kernel.php":"6d806581c8e37a5ba4d47e652981ff1f","app\/Enums\/UserGender.php":"aef9501ddb80cd0c50133213a2935df4","app\/Enums\/UserStatus.php":"3a9cb8f834f87d22cbac705b29d474b9","app\/Observers\/UserObserver.php":"19bd877f0337caddd390862633cc1974","app\/Helpers\/CacheKey.php":"646e26d223fa1faa7173ab129ceacc02","app\/Helpers\/UniqueSlug.php":"4b22c2ae80f34302b0446245a78e78af","config\/telescope.php":"26ead243e16274f1420453b567c724b2","config\/hashing.php":"0b12588776d51ff6155537da921703a8","config\/cache.php":"9c1f2b8ddc4e3885222815dafcb69ed8","config\/gallery.php":"3398fd7fdc2056d9d6aac01c42704cc1","config\/broadcasting.php":"a7a3fc65b26b2678cd1a648cfd0c060e","config\/database.php":"66b8eca260f50ce3354ca0e7efe8db5d","config\/permission.php":"673fb82f1e32a02d96f8b5ee200ede3f","config\/mail.php":"4eabe31375f7eefe52a0c1256e8bd587","config\/log-viewer.php":"fbe1b3fe10c738c6375448a03358f438","config\/pulse.php":"538e7ad513c48555d17308c71952b877","config\/horizon.php":"42553ec79e084d884785d182d6b2046f","config\/cors.php":"7e46f4152490ce5bf22fe42d2b57a63a","config\/services.php":"32898baaef9bef2da646b2ec4edc2479","config\/queue.php":"7e3314dc5be5f171d7c237796fda45e9","config\/filesystems.php":"0dd6675c5944e42f65e05517741935e5","config\/logging.php":"f08ce95c6e37cb19a170b075d3e67cd6","config\/auth.php":"f48cb370e423856596e30ef7f4a6e18f","config\/app.php":"2ed4934c584242bc54494313be9779e1","config\/session.php":"804a9a29ab22247b00b89c573778c7c6","config\/view.php":"24e00ccca17634d028fbbfdafd9e7461","config\/sanctum.php":"15b27b5d9faf0688c4126df711c31ab8","config\/sweetalert.php":"01944762a758907604703e2cd509df63","database\/seeders\/UsersTableSeeder.php":"f0d996cf6d8fcfc5996ded829196fb02","database\/seeders\/DatabaseSeeder.php":"0df8b26d09f92a0c36c1e22940e06e29","database\/seeders\/RolePermissionSeeder.php":"64c515df7d64f88905432861cf9b35c4","database\/seeders\/ImageSeeder.php":"07e13b4f003f9c57254ed22561fd7fda","database\/seeders\/LaravelSettingsSeeder.php":"767354555dbffb8bc047633e1455369a","database\/migrations\/2023_12_30_195404_create_imageables_table.php":"ee51665d28b1fdb47ddac21132c783fb","database\/migrations\/2019_08_19_000000_create_failed_jobs_table.php":"ff1dec3002aef48fd12541da804d381c","database\/migrations\/2023_12_26_112615_create_permission_tables.php":"c479fcd33d4aaa7d8b83147d6e807841","database\/migrations\/2014_10_12_100000_create_password_reset_tokens_table.php":"caaaedd92aa0fab89375a5f94a1c613d","database\/migrations\/2023_12_30_195304_create_images_table.php":"c3f47346338cd1446aba7fb1e0c8d9e4","database\/migrations\/2023_01_09_185200_add_batch_uuid_column_to_activity_log_table.php":"c8d5a1fb0a006522a5a260aa16f4c3d9","database\/migrations\/2023_01_09_185158_create_activity_log_table.php":"09f8c11cccbbd2ae1807faca8d6555d3","database\/migrations\/2023_01_09_185159_add_event_column_to_activity_log_table.php":"32a5637958981bf1e519210a378f1ca1","database\/migrations\/2023_12_20_164709_create_notifications_table.php":"dcb8e3021ef665faea234b08f2949835","database\/migrations\/2014_10_12_000000_create_users_table.php":"64318a320d59a946285d048f73358857","database\/migrations\/2023_12_21_042243_create_settings_table.php":"156976b9baa848e2dbb3e10dabfa2a1a","database\/migrations\/2019_12_14_000001_create_personal_access_tokens_table.php":"ea623343a81f24b1fb95ebedae70335e","database\/migrations\/2023_06_07_000001_create_pulse_tables.php":"47fbc6e3dedf3d6916e75f4bf9e28339","database\/factories\/ImageFactory.php":"ef4e4f9a93ad90a2640a6e9c020b404b","database\/factories\/UserFactory.php":"148c41b76f91d1fb92d6539d5e18e6e7","routes\/channels.php":"9df37803e0a46587c5555cbcf54c3378","routes\/web.php":"b8566019f1425aea3ba2b2165bdbadab","routes\/api.php":"7d1e16006f1784f9fa9ed040d711d95a","routes\/console.php":"581322fa9c8ac82b9fec9a031a4efa8e","routes\/auth.php":"66ae3a01c38b32d498a5951ba0d5333a","routes\/admin.php":"cfa112839dd2645844f4ea25975c1d04","tests\/CreatesApplication.php":"2940b3284d19aae1af6a5d2af9291bc4","tests\/Unit\/ExampleTest.php":"3f679e9508c834f0ad95943455fcd836","tests\/TestCase.php":"93519c98470fc8240aed892b40c5a9fc","tests\/Feature\/ExampleTest.php":"cde8eef0fa78c0b03b3509d63c558735","tests\/Feature\/Auth\/PasswordResetTest.php":"4029daf14f44a0ee26ff3f944f7b2271","tests\/Feature\/Auth\/PasswordConfirmationTest.php":"09d4aff025e225f393864cfad9401b1a","tests\/Feature\/Auth\/RegistrationTest.php":"b1b2680627cee7a52c745d7507da105b","tests\/Feature\/Auth\/EmailVerificationTest.php":"6451e51694b1c7af781361527ee47f07","tests\/Feature\/Auth\/PasswordUpdateTest.php":"c7a291e698a29708b8fcce882349b626","tests\/Feature\/Auth\/AuthenticationTest.php":"0000dbcfffa3a1086fb97fe8f73140ba","tests\/Feature\/ProfileTest.php":"c03c343fd63ccdf19035af87ee4eb843","resources\/views\/components\/input-error.blade.php":"cfbf79c518c7e31cb39735b0547611a4","resources\/views\/components\/dropdown-link.blade.php":"59fb04917e39e492fdfdfcb23ecd52c7","resources\/views\/components\/scripts\/role.blade.php":"abf53cccd235929726b84a538278eaa6","resources\/views\/components\/danger-button.blade.php":"752ca48364495e0fcfd842e66761967a","resources\/views\/components\/secondary-button.blade.php":"b05d6fddb58d5e94b3ad9b520cba04d2","resources\/views\/components\/auth-session-status.blade.php":"66333bbc268c13c2cfffd33bb035bdd7","resources\/views\/components\/responsive-nav-link.blade.php":"7fc2aa7c5a7601ef8a523307b4a4fdd0","resources\/views\/components\/language-dropdown.blade.php":"e2dadc548203215d0498be2a5b4157a3","resources\/views\/components\/primary-button.blade.php":"e4e5a7ed96dd49840f582c91aa8d5434","resources\/views\/components\/modal.blade.php":"2ac68072a9fd9d02ffe195b1df54defd","resources\/views\/components\/text-input.blade.php":"886c022deb41a5144eeaeddd49405c42","resources\/views\/components\/dropdown.blade.php":"577953c4a9105c5b14e0a8eab4bebcdc","resources\/views\/components\/notification.blade.php":"4d99aa7320f9eca682d22c3d456000de","resources\/views\/components\/sidebar.blade.php":"270f2b845a271887a1133db2ce5d3ed6","resources\/views\/components\/application-logo.blade.php":"cf1c32a8663c01159d1acb9064ebff5d","resources\/views\/components\/admin-header.blade.php":"ffaa8c322bc8bd52d04e5ab2a593572d","resources\/views\/components\/dark-mode.blade.php":"744ba6bb5bdb74b92a3df81280832512","resources\/views\/components\/apps.blade.php":"3ea63ffb40c86e38e4994543ab1f6b9b","resources\/views\/components\/nav-link.blade.php":"c41e18df1546f357db859ad4f270032c","resources\/views\/components\/input-label.blade.php":"ca69dd99d594c253f5aaec3e953d66a9","resources\/views\/components\/header-menu.blade.php":"496b686e6687cd68746a9573f3468e55","resources\/views\/components\/icons\/report.blade.php":"22fee36e8722ebcaebcdc423883d8083","resources\/views\/components\/icons\/lock.blade.php":"1a0540b0edc6ada3bca690523070e1e6","resources\/views\/components\/icons\/user.blade.php":"8cbf63ca99ad1db3bc5ac6330edfe1ad","resources\/views\/components\/icons\/money.blade.php":"4bc8c76373056338b3f005c297b47d0d","resources\/views\/components\/icons\/global.blade.php":"9f5f39b5df71d678d6c92a754830f64b","resources\/views\/components\/icons\/category.blade.php":"5304d806172f609278520b7050125571","resources\/views\/components\/icons\/down-arrow.blade.php":"732f3725262c5e99ba87e3488df70e00","resources\/views\/components\/icons\/support.blade.php":"c90c59ddb256f1124450d70ceff650e4","resources\/views\/components\/icons\/order.blade.php":"7e5ded46c2b0ae5d08ba2596ac5d8e5b","resources\/views\/components\/icons\/sales.blade.php":"73202ad0a2609fef0a2ed4cc09f157eb","resources\/views\/components\/icons\/trash.blade.php":"8c668cb92fcc1cb32f6110b6efa2c591","resources\/views\/components\/icons\/edit.blade.php":"95a7c0ee9d85efd1da1ed37c348efc17","resources\/views\/components\/icons\/setting.blade.php":"31c6b44822938207903a158f6e733b4a","resources\/views\/components\/icons\/docs.blade.php":"cfc6ad3e9119ca6a7539663d644db087","resources\/views\/components\/icons\/doller.blade.php":"6a6b77c816f57c36f40501681f80e975","resources\/views\/components\/icons\/pages.blade.php":"d0a360ada8bcefaff3dc9c3853dd6b26","resources\/views\/components\/icons\/cart.blade.php":"66615ca02475383a47afc484b81de331","resources\/views\/components\/icons\/file-docs.blade.php":"456434e378358a9733a39ccf0b7c9109","resources\/views\/components\/icons\/client.blade.php":"17c70004991423ea7ca4b524250430af","resources\/views\/components\/icons\/media.blade.php":"ce44dc72261699f105b5495cc2fb5816","resources\/views\/components\/icons\/blog.blade.php":"b73605b7512bb169f48ddb9750a4f57e","resources\/views\/components\/icons\/eye.blade.php":"87f8beb664c0eec11a32fb5d2d717a6e","resources\/views\/components\/icons\/product.blade.php":"8ff9054caeb409322220ba31caf8b7e5","resources\/views\/components\/icons\/message.blade.php":"f47e3c04526ee224b0a457b20c844eea","resources\/views\/components\/icons\/component.blade.php":"2a182cc7b04de3a6376c9cc2ac90fdec","resources\/views\/components\/icons\/tags.blade.php":"e63d1518a4d3e4986d0a6f4b360c5913","resources\/views\/components\/icons\/bag.blade.php":"4d48211bbe30e2fe5c11f049803966a6","resources\/views\/components\/icons\/pie.blade.php":"a24099306f68f68669b9b1f2a8790587","resources\/views\/components\/icons\/invoice.blade.php":"c9cb7391de2565a1355f6830a599c09b","resources\/views\/components\/icons\/sheild.blade.php":"974256d56a86c7eee4b0efcd1d8557f6","resources\/views\/Message.blade.php":"9d5cbcf8b87ef1f381eb60c27b5a4dc9","resources\/views\/auth\/register.blade.php":"1760d80a96bd3bec1dbdd2615f3b5941","resources\/views\/auth\/confirm-password.blade.php":"1c978f656cf9d89d6507f3842bea8231","resources\/views\/auth\/login.blade.php":"53b6d957c06109e471f15c1b3e0c3f6f","resources\/views\/auth\/forgot-password.blade.php":"258ca557fd46b28c261abca11e8648dd","resources\/views\/auth\/verify-email.blade.php":"0d34dc7ca2a73a0ec28f6028d67f5b18","resources\/views\/auth\/reset-password.blade.php":"3cb42891b14f8ad412ca335d37b190e1","resources\/views\/welcome.blade.php":"a16016a36a1bfb469113c3f71b25b9f3","resources\/views\/layouts\/navigation.blade.php":"4d482bd12c1e393019231731f08208ff","resources\/views\/layouts\/guest.blade.php":"6d48bcc76d6d1abc40c1f78114c0e0b4","resources\/views\/layouts\/app.blade.php":"c9b6e64a33a0af5d9afa56ae76fbaafe","resources\/views\/profile\/partials\/update-password-form.blade.php":"4c8949509ff9b02c32e9742a8404ae27","resources\/views\/profile\/partials\/delete-user-form.blade.php":"b70ee8830c8521511766cf932b267109","resources\/views\/profile\/partials\/update-profile-information-form.blade.php":"1e8009cf3b646013b326143aa222736b","resources\/views\/profile\/edit.blade.php":"2496c86f883971726062bc5250598f41","resources\/views\/dashboard\/user\/index.blade.php":"0841a8438d760e7e59921463e86c1742","resources\/views\/dashboard\/index.blade.php":"94fe449ea1f7122916c3ebeda4c59322","resources\/views\/dashboard\/roles\/view.blade.php":"8a8e82aa409719ab9bc90ed6693c28c5","resources\/views\/dashboard\/roles\/edit.blade.php":"e5adccb7b92ee0aad51321beffe53619","resources\/views\/dashboard\/roles\/index.blade.php":"a7a69394d211e8102da07efd759d55e4","resources\/views\/dashboard\/roles\/create.blade.php":"1267220b2e1b0cf7496c8a0ac58273a2"}} \ No newline at end of file diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index 3f1ab10..bb3417a 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -159,7 +159,6 @@ __DIR__.'/tests', ]) ->name('*.php') - ->notName('*.blade.php') ->ignoreDotFiles(true) ->ignoreVCS(true); diff --git a/app/Http/Resources/UserResource.php b/app/Http/Resources/UserResource.php index 4eabcb7..2f36a47 100644 --- a/app/Http/Resources/UserResource.php +++ b/app/Http/Resources/UserResource.php @@ -2,9 +2,6 @@ namespace App\Http\Resources; -use App\Http\Resources\AddressResource; -use App\Http\Resources\PermissionResource; -use App\Http\Resources\RoleResource; use Illuminate\Http\Request; use Illuminate\Http\Resources\Json\JsonResource; use Illuminate\Support\Carbon; @@ -19,32 +16,32 @@ class UserResource extends JsonResource public function toArray(Request $request): array { return [ - 'id' => $this->id, - 'name' => $this->name, - 'username' => $this->username, - 'email' => $this->email, - 'avatar' => $this->avatar, - 'gender' => $this->gender, - 'email_verified_at' => $this->email_verified_at, - 'ip' => $this->ip, - 'latitude' => $this->latitude, - 'longitude' => $this->longitude, - 'time_zone' => $this->time_zone, - 'language' => $this->language, - 'status' => $this->status, - 'is_deletable' => $this->is_deletable, - 'is_editable' => $this->is_editable, - 'unreadNotifications' => $this->whenLoaded('unreadNotifications'), - 'roles' => $this->whenLoaded('roles', function () - { - return RoleResource::collection($this->roles)->pluck('name'); - }), - 'permissions' => $this->whenLoaded('permissions', function () - { - return PermissionResource::collection($this->getAllPermissions())->pluck('name'); - }), - 'addresses' => AddressResource::collection($this->whenLoaded('addresses')), - 'created_at' => Carbon::parse($this->created_at)->diffForHumans(), + 'id' => $this->id, + 'name' => $this->name, + 'username' => $this->username, + 'email' => $this->email, + 'avatar' => $this->avatar, + 'gender' => $this->gender, + 'email_verified_at' => $this->email_verified_at, + 'ip' => $this->ip, + 'latitude' => $this->latitude, + 'longitude' => $this->longitude, + 'time_zone' => $this->time_zone, + 'language' => $this->language, + 'status' => $this->status, + 'is_deletable' => $this->is_deletable, + 'is_editable' => $this->is_editable, + 'unreadNotifications' => $this->whenLoaded('unreadNotifications'), + 'roles' => $this->whenLoaded('roles', function () + { + return RoleResource::collection($this->roles)->pluck('name'); + }), + 'permissions' => $this->whenLoaded('permissions', function () + { + return PermissionResource::collection($this->getAllPermissions())->pluck('name'); + }), + 'addresses' => AddressResource::collection($this->whenLoaded('addresses')), + 'created_at' => Carbon::parse($this->created_at)->diffForHumans(), ]; } } diff --git a/app/Models/User.php b/app/Models/User.php index c4f56b1..63f9efb 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -23,11 +23,11 @@ class User extends Authenticatable implements MustVerifyEmail { use HasApiTokens; use HasFactory; + use HasMedia; use HasRoles; use LogsActivity; use Notifiable; use SoftDeletes; - use HasMedia; /** * The attributes that are mass assignable. @@ -142,7 +142,7 @@ public function hasAdministrativeRole(): bool protected $appends = ['avatar']; - public function getAvatarAttribute() : string + public function getAvatarAttribute(): string { return $this->image[0]?->url ?? 'https://www.gravatar.com/avatar/'.md5(strtolower(trim($this->email))); } diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index 675cc52..225a047 100644 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -2,7 +2,6 @@ namespace Database\Factories; -use AnisAronno\MediaHelper\Facades\Media; use App\Enums\UserGender; use Illuminate\Database\Eloquent\Factories\Factory; use Illuminate\Support\Facades\Hash; diff --git a/database/seeders/RolePermissionSeeder.php b/database/seeders/RolePermissionSeeder.php index 2907a93..1953e9c 100644 --- a/database/seeders/RolePermissionSeeder.php +++ b/database/seeders/RolePermissionSeeder.php @@ -2,7 +2,6 @@ namespace Database\Seeders; -use AnisAronno\MediaHelper\Facades\Media; use App\Enums\UserGender; use App\Enums\UserStatus; use App\Models\User; diff --git a/database/seeders/UsersTableSeeder.php b/database/seeders/UsersTableSeeder.php index 9d72b27..6b28e6d 100644 --- a/database/seeders/UsersTableSeeder.php +++ b/database/seeders/UsersTableSeeder.php @@ -14,15 +14,15 @@ class UsersTableSeeder extends Seeder public function run(): void { User::factory(20) - ->has(ImageFactory::new()->count(5), 'images') - ->afterCreating(function ($user) - { - $user->images->first()->pivot->is_featured = 1; - $user->images->first()->pivot->save(); - }) - ->create()->each(function ($user) - { - $user->assignRole('user'); - }); + ->has(ImageFactory::new()->count(5), 'images') + ->afterCreating(function ($user) + { + $user->images->first()->pivot->is_featured = 1; + $user->images->first()->pivot->save(); + }) + ->create()->each(function ($user) + { + $user->assignRole('user'); + }); } } diff --git a/resources/views/Message.blade.php b/resources/views/Message.blade.php index 6645ad8..a29bf0b 100644 --- a/resources/views/Message.blade.php +++ b/resources/views/Message.blade.php @@ -1,20 +1,21 @@ @if ($errors->any())
- @if (count($errors) > 1 ) - + @if (count($errors) > 1) + @else - {{$errors->first()}} + {{ $errors->first() }} @endif
@endif -@if(session()->has('message')) -
- {{ session('message') }} -
-@endif \ No newline at end of file +@if (session()->has('message')) +
+ {{ session('message') }} +
+@endif diff --git a/resources/views/auth/confirm-password.blade.php b/resources/views/auth/confirm-password.blade.php index 3cbbe08..ab1042f 100644 --- a/resources/views/auth/confirm-password.blade.php +++ b/resources/views/auth/confirm-password.blade.php @@ -10,10 +10,8 @@
- +
diff --git a/resources/views/auth/forgot-password.blade.php b/resources/views/auth/forgot-password.blade.php index 3c70788..b54602c 100644 --- a/resources/views/auth/forgot-password.blade.php +++ b/resources/views/auth/forgot-password.blade.php @@ -12,7 +12,8 @@
- +
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 80e1b39..d8521b3 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -8,7 +8,8 @@
- +
@@ -16,10 +17,8 @@
- +
@@ -27,14 +26,17 @@
@if (Route::has('password.request')) - + {{ __('Forgot your password?') }} @endif diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index d4b3d58..9ce6919 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -5,14 +5,16 @@
- +
- +
@@ -20,10 +22,8 @@
- +
@@ -32,15 +32,15 @@
- +
- + {{ __('Already registered?') }} diff --git a/resources/views/auth/reset-password.blade.php b/resources/views/auth/reset-password.blade.php index a6494cc..f7ef24c 100644 --- a/resources/views/auth/reset-password.blade.php +++ b/resources/views/auth/reset-password.blade.php @@ -8,14 +8,16 @@
- +
- +
@@ -23,9 +25,8 @@
- +
diff --git a/resources/views/auth/verify-email.blade.php b/resources/views/auth/verify-email.blade.php index 4e4222f..7d4ea80 100644 --- a/resources/views/auth/verify-email.blade.php +++ b/resources/views/auth/verify-email.blade.php @@ -23,7 +23,8 @@
@csrf -
diff --git a/resources/views/components/admin-header.blade.php b/resources/views/components/admin-header.blade.php index c73e4db..ccaf212 100644 --- a/resources/views/components/admin-header.blade.php +++ b/resources/views/components/admin-header.blade.php @@ -1,70 +1,50 @@ @use('AnisAronno\MediaHelper\Facades\Media') -