From 3ee9c5c10d763b8293c0e04c806346d7d4e3115d Mon Sep 17 00:00:00 2001 From: Nasir Khan Saikat Date: Thu, 27 Jul 2023 20:42:55 +0600 Subject: [PATCH 1/4] footer update --- .../views/backend/backups/backups.blade.php | 25 ++++++++++--------- .../views/backend/includes/footer.blade.php | 14 ++++++----- resources/views/backend/users/index.blade.php | 3 --- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/resources/views/backend/backups/backups.blade.php b/resources/views/backend/backups/backups.blade.php index c69e8fc09..7663fa46d 100644 --- a/resources/views/backend/backups/backups.blade.php +++ b/resources/views/backend/backups/backups.blade.php @@ -14,18 +14,19 @@ @section('content')
-
-
-

- {{ __($module_title) }} - {{ __($module_action) }} -

-
@lang(":module_name Management Dashboard", ['module_name'=>Str::title($module_name)])
-
- -
+ + + {{ __($module_title) }} {{ __($module_action) }} + + + @lang(":module_name Management Dashboard", ['module_name'=>Str::title($module_name)]) + + + @can('add_'.$module_name) + + @endcan + +
diff --git a/resources/views/backend/includes/footer.blade.php b/resources/views/backend/includes/footer.blade.php index a64ac9381..52d2fba69 100644 --- a/resources/views/backend/includes/footer.blade.php +++ b/resources/views/backend/includes/footer.blade.php @@ -1,9 +1,11 @@ -
+
- {{app_name()}}. - @if(setting('show_copyright')) - @lang('Copyright') © {{ date('Y') }} - @endif + + {{app_name()}}. + @if(setting('show_copyright')) + @lang('Copyright') © {{ date('Y') }} + @endif +
-
{!! setting('footer_text') !!}
+
{!! setting('footer_text') !!}
\ No newline at end of file diff --git a/resources/views/backend/users/index.blade.php b/resources/views/backend/users/index.blade.php index 8a50bd235..2edf83286 100644 --- a/resources/views/backend/users/index.blade.php +++ b/resources/views/backend/users/index.blade.php @@ -34,9 +34,6 @@ View trash -
@endcan From eff469592e87e5420aae0907260907464d757cb9 Mon Sep 17 00:00:00 2001 From: Nasir Khan Saikat Date: Thu, 27 Jul 2023 20:56:00 +0600 Subject: [PATCH 2/4] translation enabled --- composer.lock | 228 ++++++++------- config/backup1.php | 274 ++++++++++++++++++ config/setting_fields.php | 15 +- .../backend/settings/fields/email.blade.php | 2 +- .../backend/settings/fields/number.blade.php | 2 +- .../backend/settings/fields/select.blade.php | 2 +- .../backend/settings/fields/text.blade.php | 2 +- .../settings/fields/textarea.blade.php | 2 +- 8 files changed, 409 insertions(+), 118 deletions(-) create mode 100644 config/backup1.php diff --git a/composer.lock b/composer.lock index 05e579f47..b4464d393 100644 --- a/composer.lock +++ b/composer.lock @@ -1324,16 +1324,16 @@ }, { "name": "laravel/framework", - "version": "v10.14.1", + "version": "v10.16.1", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "6f89a2b74b232d8bf2e1d9ed87e311841263dfcb" + "reference": "5c93d2795c393b462481179ce42dedfb30cc19b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/6f89a2b74b232d8bf2e1d9ed87e311841263dfcb", - "reference": "6f89a2b74b232d8bf2e1d9ed87e311841263dfcb", + "url": "https://api.github.com/repos/laravel/framework/zipball/5c93d2795c393b462481179ce42dedfb30cc19b5", + "reference": "5c93d2795c393b462481179ce42dedfb30cc19b5", "shasum": "" }, "require": { @@ -1520,7 +1520,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2023-06-28T14:25:16+00:00" + "time": "2023-07-26T03:30:46+00:00" }, { "name": "laravel/sanctum", @@ -1590,16 +1590,16 @@ }, { "name": "laravel/serializable-closure", - "version": "v1.3.0", + "version": "v1.3.1", "source": { "type": "git", "url": "https://github.com/laravel/serializable-closure.git", - "reference": "f23fe9d4e95255dacee1bf3525e0810d1a1b0f37" + "reference": "e5a3057a5591e1cfe8183034b0203921abe2c902" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/f23fe9d4e95255dacee1bf3525e0810d1a1b0f37", - "reference": "f23fe9d4e95255dacee1bf3525e0810d1a1b0f37", + "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/e5a3057a5591e1cfe8183034b0203921abe2c902", + "reference": "e5a3057a5591e1cfe8183034b0203921abe2c902", "shasum": "" }, "require": { @@ -1646,7 +1646,7 @@ "issues": "https://github.com/laravel/serializable-closure/issues", "source": "https://github.com/laravel/serializable-closure" }, - "time": "2023-01-30T18:31:20+00:00" + "time": "2023-07-14T13:56:28+00:00" }, { "name": "laravel/slack-notification-channel", @@ -1711,16 +1711,16 @@ }, { "name": "laravel/socialite", - "version": "v5.6.3", + "version": "v5.8.0", "source": { "type": "git", "url": "https://github.com/laravel/socialite.git", - "reference": "00ea7f8630673ea49304fc8a9fca5a64eb838c7e" + "reference": "50148edf24b6cd3e428aa9bc06a5d915b24376bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/socialite/zipball/00ea7f8630673ea49304fc8a9fca5a64eb838c7e", - "reference": "00ea7f8630673ea49304fc8a9fca5a64eb838c7e", + "url": "https://api.github.com/repos/laravel/socialite/zipball/50148edf24b6cd3e428aa9bc06a5d915b24376bb", + "reference": "50148edf24b6cd3e428aa9bc06a5d915b24376bb", "shasum": "" }, "require": { @@ -1777,7 +1777,7 @@ "issues": "https://github.com/laravel/socialite/issues", "source": "https://github.com/laravel/socialite" }, - "time": "2023-06-06T13:42:43+00:00" + "time": "2023-07-14T14:22:58+00:00" }, { "name": "laravel/tinker", @@ -3725,16 +3725,16 @@ }, { "name": "psy/psysh", - "version": "v0.11.18", + "version": "v0.11.19", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "4f00ee9e236fa6a48f4560d1300b9c961a70a7ec" + "reference": "1724ceff278daeeac5a006744633bacbb2dc4706" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/4f00ee9e236fa6a48f4560d1300b9c961a70a7ec", - "reference": "4f00ee9e236fa6a48f4560d1300b9c961a70a7ec", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/1724ceff278daeeac5a006744633bacbb2dc4706", + "reference": "1724ceff278daeeac5a006744633bacbb2dc4706", "shasum": "" }, "require": { @@ -3795,9 +3795,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.11.18" + "source": "https://github.com/bobthecow/psysh/tree/v0.11.19" }, - "time": "2023-05-23T02:31:11+00:00" + "time": "2023-07-15T19:42:19+00:00" }, { "name": "ralouphie/getallheaders", @@ -4089,16 +4089,16 @@ }, { "name": "spatie/image", - "version": "2.2.6", + "version": "2.2.7", "source": { "type": "git", "url": "https://github.com/spatie/image.git", - "reference": "f72ca52acd77ca03b7843a0f86e2411ce90aecfc" + "reference": "2f802853aab017aa615224daae1588054b5ab20e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/image/zipball/f72ca52acd77ca03b7843a0f86e2411ce90aecfc", - "reference": "f72ca52acd77ca03b7843a0f86e2411ce90aecfc", + "url": "https://api.github.com/repos/spatie/image/zipball/2f802853aab017aa615224daae1588054b5ab20e", + "reference": "2f802853aab017aa615224daae1588054b5ab20e", "shasum": "" }, "require": { @@ -4107,7 +4107,7 @@ "ext-mbstring": "*", "league/glide": "^2.2.2", "php": "^8.0", - "spatie/image-optimizer": "^1.1", + "spatie/image-optimizer": "^1.7", "spatie/temporary-directory": "^1.0|^2.0", "symfony/process": "^3.0|^4.0|^5.0|^6.0" }, @@ -4142,7 +4142,7 @@ "spatie" ], "support": { - "source": "https://github.com/spatie/image/tree/2.2.6" + "source": "https://github.com/spatie/image/tree/2.2.7" }, "funding": [ { @@ -4154,20 +4154,20 @@ "type": "github" } ], - "time": "2023-05-06T10:20:33+00:00" + "time": "2023-07-24T13:54:13+00:00" }, { "name": "spatie/image-optimizer", - "version": "1.6.4", + "version": "1.7.1", "source": { "type": "git", "url": "https://github.com/spatie/image-optimizer.git", - "reference": "d997e01ba980b2769ddca2f00badd3b80c2a2512" + "reference": "af179994e2d2413e4b3ba2d348d06b4eaddbeb30" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/image-optimizer/zipball/d997e01ba980b2769ddca2f00badd3b80c2a2512", - "reference": "d997e01ba980b2769ddca2f00badd3b80c2a2512", + "url": "https://api.github.com/repos/spatie/image-optimizer/zipball/af179994e2d2413e4b3ba2d348d06b4eaddbeb30", + "reference": "af179994e2d2413e4b3ba2d348d06b4eaddbeb30", "shasum": "" }, "require": { @@ -4207,9 +4207,9 @@ ], "support": { "issues": "https://github.com/spatie/image-optimizer/issues", - "source": "https://github.com/spatie/image-optimizer/tree/1.6.4" + "source": "https://github.com/spatie/image-optimizer/tree/1.7.1" }, - "time": "2023-03-10T08:43:19+00:00" + "time": "2023-07-27T07:57:32+00:00" }, { "name": "spatie/laravel-activitylog", @@ -4403,16 +4403,16 @@ }, { "name": "spatie/laravel-html", - "version": "3.2.1", + "version": "3.2.2", "source": { "type": "git", "url": "https://github.com/spatie/laravel-html.git", - "reference": "bf7bdb55cc5ce15c4ec8134aa1df709c0397c397" + "reference": "f9dac9f250735dd01d80e023f5acf6f3d10d3b3f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-html/zipball/bf7bdb55cc5ce15c4ec8134aa1df709c0397c397", - "reference": "bf7bdb55cc5ce15c4ec8134aa1df709c0397c397", + "url": "https://api.github.com/repos/spatie/laravel-html/zipball/f9dac9f250735dd01d80e023f5acf6f3d10d3b3f", + "reference": "f9dac9f250735dd01d80e023f5acf6f3d10d3b3f", "shasum": "" }, "require": { @@ -4469,7 +4469,7 @@ "spatie" ], "support": { - "source": "https://github.com/spatie/laravel-html/tree/3.2.1" + "source": "https://github.com/spatie/laravel-html/tree/3.2.2" }, "funding": [ { @@ -4477,20 +4477,20 @@ "type": "custom" } ], - "time": "2023-01-24T23:47:16+00:00" + "time": "2023-07-20T18:59:53+00:00" }, { "name": "spatie/laravel-medialibrary", - "version": "10.10.1", + "version": "10.11.2", "source": { "type": "git", "url": "https://github.com/spatie/laravel-medialibrary.git", - "reference": "84f7bb253bc7b9498ff2cd0d74f82e88d299c517" + "reference": "bac32801073bd9446277cdeb174cf4327ea28aef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-medialibrary/zipball/84f7bb253bc7b9498ff2cd0d74f82e88d299c517", - "reference": "84f7bb253bc7b9498ff2cd0d74f82e88d299c517", + "url": "https://api.github.com/repos/spatie/laravel-medialibrary/zipball/bac32801073bd9446277cdeb174cf4327ea28aef", + "reference": "bac32801073bd9446277cdeb174cf4327ea28aef", "shasum": "" }, "require": { @@ -4506,7 +4506,7 @@ "intervention/image": "^2.7", "maennchen/zipstream-php": "^2.0|^3.0", "php": "^8.0", - "spatie/image": "^2.2.2", + "spatie/image": "^2.2.7", "spatie/temporary-directory": "^2.0", "symfony/console": "^6.0" }, @@ -4574,7 +4574,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-medialibrary/issues", - "source": "https://github.com/spatie/laravel-medialibrary/tree/10.10.1" + "source": "https://github.com/spatie/laravel-medialibrary/tree/10.11.2" }, "funding": [ { @@ -4586,7 +4586,7 @@ "type": "github" } ], - "time": "2023-06-29T07:18:20+00:00" + "time": "2023-07-27T08:00:59+00:00" }, { "name": "spatie/laravel-package-tools", @@ -7458,16 +7458,16 @@ }, { "name": "yajra/laravel-datatables-oracle", - "version": "v10.6.1", + "version": "v10.6.2", "source": { "type": "git", "url": "https://github.com/yajra/laravel-datatables.git", - "reference": "cd684c1827c6540a911226e77779477cbb86fc25" + "reference": "6662926a7ac52cdf3d52508b0d4f6c41cc8618bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yajra/laravel-datatables/zipball/cd684c1827c6540a911226e77779477cbb86fc25", - "reference": "cd684c1827c6540a911226e77779477cbb86fc25", + "url": "https://api.github.com/repos/yajra/laravel-datatables/zipball/6662926a7ac52cdf3d52508b0d4f6c41cc8618bf", + "reference": "6662926a7ac52cdf3d52508b0d4f6c41cc8618bf", "shasum": "" }, "require": { @@ -7530,7 +7530,7 @@ ], "support": { "issues": "https://github.com/yajra/laravel-datatables/issues", - "source": "https://github.com/yajra/laravel-datatables/tree/v10.6.1" + "source": "https://github.com/yajra/laravel-datatables/tree/v10.6.2" }, "funding": [ { @@ -7538,7 +7538,7 @@ "type": "github" } ], - "time": "2023-07-05T01:30:07+00:00" + "time": "2023-07-15T04:00:38+00:00" } ], "packages-dev": [ @@ -7696,16 +7696,16 @@ }, { "name": "filp/whoops", - "version": "2.15.2", + "version": "2.15.3", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "aac9304c5ed61bf7b1b7a6064bf9806ab842ce73" + "reference": "c83e88a30524f9360b11f585f71e6b17313b7187" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/aac9304c5ed61bf7b1b7a6064bf9806ab842ce73", - "reference": "aac9304c5ed61bf7b1b7a6064bf9806ab842ce73", + "url": "https://api.github.com/repos/filp/whoops/zipball/c83e88a30524f9360b11f585f71e6b17313b7187", + "reference": "c83e88a30524f9360b11f585f71e6b17313b7187", "shasum": "" }, "require": { @@ -7755,7 +7755,7 @@ ], "support": { "issues": "https://github.com/filp/whoops/issues", - "source": "https://github.com/filp/whoops/tree/2.15.2" + "source": "https://github.com/filp/whoops/tree/2.15.3" }, "funding": [ { @@ -7763,7 +7763,7 @@ "type": "github" } ], - "time": "2023-04-12T12:00:00+00:00" + "time": "2023-07-13T12:00:00+00:00" }, { "name": "hamcrest/hamcrest-php", @@ -7818,16 +7818,16 @@ }, { "name": "laravel/breeze", - "version": "v1.21.1", + "version": "v1.21.2", "source": { "type": "git", "url": "https://github.com/laravel/breeze.git", - "reference": "1cb124f74debc1d5914a7bf2856b793c44ba396d" + "reference": "08f4c2e3567ded8a2f8ad80ddb8f016fce57d6ee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/breeze/zipball/1cb124f74debc1d5914a7bf2856b793c44ba396d", - "reference": "1cb124f74debc1d5914a7bf2856b793c44ba396d", + "url": "https://api.github.com/repos/laravel/breeze/zipball/08f4c2e3567ded8a2f8ad80ddb8f016fce57d6ee", + "reference": "08f4c2e3567ded8a2f8ad80ddb8f016fce57d6ee", "shasum": "" }, "require": { @@ -7876,20 +7876,20 @@ "issues": "https://github.com/laravel/breeze/issues", "source": "https://github.com/laravel/breeze" }, - "time": "2023-06-16T21:23:43+00:00" + "time": "2023-06-21T23:07:25+00:00" }, { "name": "laravel/pint", - "version": "v1.10.3", + "version": "v1.10.5", "source": { "type": "git", "url": "https://github.com/laravel/pint.git", - "reference": "c472786bca01e4812a9bb7933b23edfc5b6877b7" + "reference": "a458fb057bfa2f5a09888a8aa349610be807b0c3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/pint/zipball/c472786bca01e4812a9bb7933b23edfc5b6877b7", - "reference": "c472786bca01e4812a9bb7933b23edfc5b6877b7", + "url": "https://api.github.com/repos/laravel/pint/zipball/a458fb057bfa2f5a09888a8aa349610be807b0c3", + "reference": "a458fb057bfa2f5a09888a8aa349610be807b0c3", "shasum": "" }, "require": { @@ -7900,9 +7900,9 @@ "php": "^8.1.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^3.18.0", + "friendsofphp/php-cs-fixer": "^3.21.1", "illuminate/view": "^10.5.1", - "laravel-zero/framework": "^10.0.2", + "laravel-zero/framework": "^10.1.1", "mockery/mockery": "^1.5.1", "nunomaduro/larastan": "^2.5.1", "nunomaduro/termwind": "^1.15.1", @@ -7942,20 +7942,20 @@ "issues": "https://github.com/laravel/pint/issues", "source": "https://github.com/laravel/pint" }, - "time": "2023-06-20T15:55:03+00:00" + "time": "2023-07-14T10:26:01+00:00" }, { "name": "laravel/sail", - "version": "v1.23.0", + "version": "v1.23.1", "source": { "type": "git", "url": "https://github.com/laravel/sail.git", - "reference": "a2e046f748e87d3ef8b2b381e0e5c5a11f34e46b" + "reference": "62582606f80466aa81fba40b193b289106902853" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/sail/zipball/a2e046f748e87d3ef8b2b381e0e5c5a11f34e46b", - "reference": "a2e046f748e87d3ef8b2b381e0e5c5a11f34e46b", + "url": "https://api.github.com/repos/laravel/sail/zipball/62582606f80466aa81fba40b193b289106902853", + "reference": "62582606f80466aa81fba40b193b289106902853", "shasum": "" }, "require": { @@ -8007,7 +8007,7 @@ "issues": "https://github.com/laravel/sail/issues", "source": "https://github.com/laravel/sail" }, - "time": "2023-06-16T21:20:12+00:00" + "time": "2023-06-28T18:31:28+00:00" }, { "name": "maximebf/debugbar", @@ -8077,37 +8077,33 @@ }, { "name": "mockery/mockery", - "version": "1.6.2", + "version": "1.6.4", "source": { "type": "git", "url": "https://github.com/mockery/mockery.git", - "reference": "13a7fa2642c76c58fa2806ef7f565344c817a191" + "reference": "d1413755e26fe56a63455f7753221c86cbb88f66" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/13a7fa2642c76c58fa2806ef7f565344c817a191", - "reference": "13a7fa2642c76c58fa2806ef7f565344c817a191", + "url": "https://api.github.com/repos/mockery/mockery/zipball/d1413755e26fe56a63455f7753221c86cbb88f66", + "reference": "d1413755e26fe56a63455f7753221c86cbb88f66", "shasum": "" }, "require": { "hamcrest/hamcrest-php": "^2.0.1", "lib-pcre": ">=7.0", - "php": "^7.4 || ^8.0" + "php": ">=7.4,<8.3" }, "conflict": { "phpunit/phpunit": "<8.0" }, "require-dev": { "phpunit/phpunit": "^8.5 || ^9.3", - "psalm/plugin-phpunit": "^0.18", - "vimeo/psalm": "^5.9" + "psalm/plugin-phpunit": "^0.18.4", + "symplify/easy-coding-standard": "^11.5.0", + "vimeo/psalm": "^5.13.1" }, "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.6.x-dev" - } - }, "autoload": { "files": [ "library/helpers.php", @@ -8125,12 +8121,20 @@ { "name": "Pádraic Brady", "email": "padraic.brady@gmail.com", - "homepage": "http://blog.astrumfutura.com" + "homepage": "https://github.com/padraic", + "role": "Author" }, { "name": "Dave Marshall", "email": "dave.marshall@atstsolutions.co.uk", - "homepage": "http://davedevelopment.co.uk" + "homepage": "https://davedevelopment.co.uk", + "role": "Developer" + }, + { + "name": "Nathanael Esayeas", + "email": "nathanael.esayeas@protonmail.com", + "homepage": "https://github.com/ghostwriter", + "role": "Lead Developer" } ], "description": "Mockery is a simple yet flexible PHP mock object framework", @@ -8148,10 +8152,13 @@ "testing" ], "support": { + "docs": "https://docs.mockery.io/", "issues": "https://github.com/mockery/mockery/issues", - "source": "https://github.com/mockery/mockery/tree/1.6.2" + "rss": "https://github.com/mockery/mockery/releases.atom", + "security": "https://github.com/mockery/mockery/security/advisories", + "source": "https://github.com/mockery/mockery" }, - "time": "2023-06-07T09:07:52+00:00" + "time": "2023-07-19T15:51:02+00:00" }, { "name": "myclabs/deep-copy", @@ -8421,16 +8428,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "10.1.2", + "version": "10.1.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "db1497ec8dd382e82c962f7abbe0320e4882ee4e" + "reference": "be1fe461fdc917de2a29a452ccf2657d325b443d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/db1497ec8dd382e82c962f7abbe0320e4882ee4e", - "reference": "db1497ec8dd382e82c962f7abbe0320e4882ee4e", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/be1fe461fdc917de2a29a452ccf2657d325b443d", + "reference": "be1fe461fdc917de2a29a452ccf2657d325b443d", "shasum": "" }, "require": { @@ -8487,7 +8494,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.2" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.3" }, "funding": [ { @@ -8495,7 +8502,7 @@ "type": "github" } ], - "time": "2023-05-22T09:04:27+00:00" + "time": "2023-07-26T13:45:28+00:00" }, { "name": "phpunit/php-file-iterator", @@ -8741,16 +8748,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.2.4", + "version": "10.2.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "68484779b5a2ed711fbdeba6ca01910d87acdff2" + "reference": "1c17815c129f133f3019cc18e8d0c8622e6d9bcd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/68484779b5a2ed711fbdeba6ca01910d87acdff2", - "reference": "68484779b5a2ed711fbdeba6ca01910d87acdff2", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1c17815c129f133f3019cc18e8d0c8622e6d9bcd", + "reference": "1c17815c129f133f3019cc18e8d0c8622e6d9bcd", "shasum": "" }, "require": { @@ -8822,7 +8829,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.2.4" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.2.6" }, "funding": [ { @@ -8838,7 +8845,7 @@ "type": "tidelift" } ], - "time": "2023-07-10T04:06:08+00:00" + "time": "2023-07-17T12:08:28+00:00" }, { "name": "sebastian/cli-parser", @@ -9350,16 +9357,16 @@ }, { "name": "sebastian/global-state", - "version": "6.0.0", + "version": "6.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "aab257c712de87b90194febd52e4d184551c2d44" + "reference": "7ea9ead78f6d380d2a667864c132c2f7b83055e4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/aab257c712de87b90194febd52e4d184551c2d44", - "reference": "aab257c712de87b90194febd52e4d184551c2d44", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/7ea9ead78f6d380d2a667864c132c2f7b83055e4", + "reference": "7ea9ead78f6d380d2a667864c132c2f7b83055e4", "shasum": "" }, "require": { @@ -9399,7 +9406,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/6.0.0" + "security": "https://github.com/sebastianbergmann/global-state/security/policy", + "source": "https://github.com/sebastianbergmann/global-state/tree/6.0.1" }, "funding": [ { @@ -9407,7 +9415,7 @@ "type": "github" } ], - "time": "2023-02-03T07:07:38+00:00" + "time": "2023-07-19T07:19:23+00:00" }, { "name": "sebastian/lines-of-code", diff --git a/config/backup1.php b/config/backup1.php new file mode 100644 index 000000000..7f2771739 --- /dev/null +++ b/config/backup1.php @@ -0,0 +1,274 @@ + [ + + /* + * The name of this application. You can use this name to monitor + * the backups. + */ + 'name' => env('APP_NAME', 'laravel-backup'), + + 'source' => [ + + 'files' => [ + + /* + * The list of directories and files that will be included in the backup. + */ + 'include' => [ + base_path(), + ], + + /* + * These directories and files will be excluded from the backup. + * + * Directories used by the backup process will automatically be excluded. + */ + 'exclude' => [ + base_path('vendor'), + base_path('node_modules'), + ], + + /* + * Determines if symlinks should be followed. + */ + 'follow_links' => false, + + /* + * Determines if it should avoid unreadable folders. + */ + 'ignore_unreadable_directories' => false, + + /* + * This path is used to make directories in resulting zip-file relative + * Set to `null` to include complete absolute path + * Example: base_path() + */ + 'relative_path' => null, + ], + + /* + * The names of the connections to the databases that should be backed up + * MySQL, PostgreSQL, SQLite and Mongo databases are supported. + * + * The content of the database dump may be customized for each connection + * by adding a 'dump' key to the connection settings in config/database.php. + * E.g. + * 'mysql' => [ + * ... + * 'dump' => [ + * 'excludeTables' => [ + * 'table_to_exclude_from_backup', + * 'another_table_to_exclude' + * ] + * ], + * ], + * + * If you are using only InnoDB tables on a MySQL server, you can + * also supply the useSingleTransaction option to avoid table locking. + * + * E.g. + * 'mysql' => [ + * ... + * 'dump' => [ + * 'useSingleTransaction' => true, + * ], + * ], + * + * For a complete list of available customization options, see https://github.com/spatie/db-dumper + */ + 'databases' => [ + 'mysql', + ], + ], + + /* + * The database dump can be compressed to decrease diskspace usage. + * + * Out of the box Laravel-backup supplies + * Spatie\DbDumper\Compressors\GzipCompressor::class. + * + * You can also create custom compressor. More info on that here: + * https://github.com/spatie/db-dumper#using-compression + * + * If you do not want any compressor at all, set it to null. + */ + 'database_dump_compressor' => null, + + /* + * The file extension used for the database dump files. + * + * If not specified, the file extension will be .archive for MongoDB and .sql for all other databases + * The file extension should be specified without a leading . + */ + 'database_dump_file_extension' => '', + + 'destination' => [ + + /* + * The filename prefix used for the backup zip file. + */ + 'filename_prefix' => '', + + /* + * The disk names on which the backups will be stored. + */ + 'disks' => [ + 'local', + ], + ], + + /* + * The directory where the temporary files will be stored. + */ + 'temporary_directory' => storage_path('app/backup-temp'), + + /* + * The password to be used for archive encryption. + * Set to `null` to disable encryption. + */ + 'password' => env('BACKUP_ARCHIVE_PASSWORD'), + + /* + * The encryption algorithm to be used for archive encryption. + * You can set it to `null` or `false` to disable encryption. + * + * When set to 'default', we'll use ZipArchive::EM_AES_256 if it is + * available on your system. + */ + 'encryption' => 'default', + ], + + /* + * You can get notified when specific events occur. Out of the box you can use 'mail' and 'slack'. + * For Slack you need to install laravel/slack-notification-channel. + * + * You can also use your own notification classes, just make sure the class is named after one of + * the `Spatie\Backup\Notifications\Notifications` classes. + */ + 'notifications' => [ + + 'notifications' => [ + \Spatie\Backup\Notifications\Notifications\BackupHasFailedNotification::class => ['mail'], + \Spatie\Backup\Notifications\Notifications\UnhealthyBackupWasFoundNotification::class => ['mail'], + \Spatie\Backup\Notifications\Notifications\CleanupHasFailedNotification::class => ['mail'], + \Spatie\Backup\Notifications\Notifications\BackupWasSuccessfulNotification::class => ['mail'], + \Spatie\Backup\Notifications\Notifications\HealthyBackupWasFoundNotification::class => ['mail'], + \Spatie\Backup\Notifications\Notifications\CleanupWasSuccessfulNotification::class => ['mail'], + ], + + /* + * Here you can specify the notifiable to which the notifications should be sent. The default + * notifiable will use the variables specified in this config file. + */ + 'notifiable' => \Spatie\Backup\Notifications\Notifiable::class, + + 'mail' => [ + 'to' => 'your@example.com', + + 'from' => [ + 'address' => env('MAIL_FROM_ADDRESS', 'hello@example.com'), + 'name' => env('MAIL_FROM_NAME', 'Example'), + ], + ], + + 'slack' => [ + 'webhook_url' => '', + + /* + * If this is set to null the default channel of the webhook will be used. + */ + 'channel' => null, + + 'username' => null, + + 'icon' => null, + + ], + + 'discord' => [ + 'webhook_url' => '', + + 'username' => null, + + 'avatar_url' => null, + ], + ], + + /* + * Here you can specify which backups should be monitored. + * If a backup does not meet the specified requirements the + * UnHealthyBackupWasFound event will be fired. + */ + 'monitor_backups' => [ + [ + 'name' => env('APP_NAME', 'laravel-backup'), + 'disks' => ['local'], + 'health_checks' => [ + \Spatie\Backup\Tasks\Monitor\HealthChecks\MaximumAgeInDays::class => 1, + \Spatie\Backup\Tasks\Monitor\HealthChecks\MaximumStorageInMegabytes::class => 5000, + ], + ], + + /* + [ + 'name' => 'name of the second app', + 'disks' => ['local', 's3'], + 'health_checks' => [ + \Spatie\Backup\Tasks\Monitor\HealthChecks\MaximumAgeInDays::class => 1, + \Spatie\Backup\Tasks\Monitor\HealthChecks\MaximumStorageInMegabytes::class => 5000, + ], + ], + */ + ], + + 'cleanup' => [ + /* + * The strategy that will be used to cleanup old backups. The default strategy + * will keep all backups for a certain amount of days. After that period only + * a daily backup will be kept. After that period only weekly backups will + * be kept and so on. + * + * No matter how you configure it the default strategy will never + * delete the newest backup. + */ + 'strategy' => \Spatie\Backup\Tasks\Cleanup\Strategies\DefaultStrategy::class, + + 'default_strategy' => [ + + /* + * The number of days for which backups must be kept. + */ + 'keep_all_backups_for_days' => 7, + + /* + * The number of days for which daily backups must be kept. + */ + 'keep_daily_backups_for_days' => 16, + + /* + * The number of weeks for which one weekly backup must be kept. + */ + 'keep_weekly_backups_for_weeks' => 8, + + /* + * The number of months for which one monthly backup must be kept. + */ + 'keep_monthly_backups_for_months' => 4, + + /* + * The number of years for which one yearly backup must be kept. + */ + 'keep_yearly_backups_for_years' => 2, + + /* + * After cleaning up the backups remove the oldest backup until + * this amount of megabytes has been reached. + */ + 'delete_oldest_backups_when_using_more_megabytes_than' => 5000, + ], + ], + +]; diff --git a/config/setting_fields.php b/config/setting_fields.php index 42209d7c2..d31a64966 100644 --- a/config/setting_fields.php +++ b/config/setting_fields.php @@ -56,10 +56,19 @@ ], 'social' => [ 'title' => 'Social Profiles', - 'desc' => 'Link of all the social profiles.', + 'desc' => 'Link of all the online/social profiles.', 'icon' => 'fas fa-users', 'elements' => [ + [ + 'type' => 'text', // input fields type + 'data' => 'string', // data type, string, int, boolean + 'name' => 'website_url', // unique name for field + 'label' => 'Website URL', // you know what label it is + 'rules' => 'required|nullable|max:191', // validation rule of laravel + 'class' => '', // any class for input + 'value' => '#', // default value if you want + ], [ 'type' => 'text', // input fields type 'data' => 'string', // data type, string, int, boolean @@ -166,7 +175,7 @@ 'label' => 'Meta Twitter Site Account', // you know what label it is 'rules' => '', // validation rule of laravel 'class' => '', // any class for input - 'value' => '@nasir8891', // default value if you want + 'value' => '@nasirkhansaikat', // default value if you want ], [ 'type' => 'text', // input fields type @@ -175,7 +184,7 @@ 'label' => 'Meta Twitter Creator Account', // you know what label it is 'rules' => '', // validation rule of laravel 'class' => '', // any class for input - 'value' => '@nasir8891', // default value if you want + 'value' => '@nasirkhansaikat', // default value if you want ], ], ], diff --git a/resources/views/backend/settings/fields/email.blade.php b/resources/views/backend/settings/fields/email.blade.php index dc56684f3..d8af95aeb 100644 --- a/resources/views/backend/settings/fields/email.blade.php +++ b/resources/views/backend/settings/fields/email.blade.php @@ -4,7 +4,7 @@ @endphp
- {!! $required_mark !!} + {!! $required_mark !!} - {!! $required_mark !!} + {!! $required_mark !!} - {!! $required_mark !!} + {!! $required_mark !!} - {!! $required_mark !!} + {!! $required_mark !!}