From 281fa0eb2c3ada15bcf8ddfaca9cd842438876df Mon Sep 17 00:00:00 2001 From: Ibrahim Khalil Shakil Date: Fri, 24 Nov 2023 20:47:56 +0600 Subject: [PATCH] 24 nov 2023 --- composer.lock | 112 +++++++++--------- public/images/d-logo.png | Bin 0 -> 3802 bytes .../Courses/courseCategory/index.blade.php | 30 +++-- resources/views/backend/layouts/app.blade.php | 6 +- resources/views/backend/role/index.blade.php | 8 +- resources/views/backend/user/create.blade.php | 2 +- resources/views/backend/user/edit.blade.php | 2 +- resources/views/backend/user/index.blade.php | 37 ++++-- 8 files changed, 112 insertions(+), 85 deletions(-) create mode 100644 public/images/d-logo.png diff --git a/composer.lock b/composer.lock index 366940e..03c2c93 100644 --- a/composer.lock +++ b/composer.lock @@ -1034,16 +1034,16 @@ }, { "name": "laravel/framework", - "version": "v10.31.0", + "version": "v10.33.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "507ce9b28bce4b5e4140c28943092ca38e9a52e4" + "reference": "4536872e3e5b6be51b1f655dafd12c9a4fa0cfe8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/507ce9b28bce4b5e4140c28943092ca38e9a52e4", - "reference": "507ce9b28bce4b5e4140c28943092ca38e9a52e4", + "url": "https://api.github.com/repos/laravel/framework/zipball/4536872e3e5b6be51b1f655dafd12c9a4fa0cfe8", + "reference": "4536872e3e5b6be51b1f655dafd12c9a4fa0cfe8", "shasum": "" }, "require": { @@ -1144,7 +1144,7 @@ "league/flysystem-sftp-v3": "^3.0", "mockery/mockery": "^1.5.1", "nyholm/psr7": "^1.2", - "orchestra/testbench-core": "^8.12", + "orchestra/testbench-core": "^8.15.1", "pda/pheanstalk": "^4.0", "phpstan/phpstan": "^1.4.7", "phpunit/phpunit": "^10.0.7", @@ -1232,7 +1232,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2023-11-07T13:48:30+00:00" + "time": "2023-11-21T14:49:31+00:00" }, { "name": "laravel/prompts", @@ -1359,16 +1359,16 @@ }, { "name": "laravel/serializable-closure", - "version": "v1.3.2", + "version": "v1.3.3", "source": { "type": "git", "url": "https://github.com/laravel/serializable-closure.git", - "reference": "076fe2cf128bd54b4341cdc6d49b95b34e101e4c" + "reference": "3dbf8a8e914634c48d389c1234552666b3d43754" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/076fe2cf128bd54b4341cdc6d49b95b34e101e4c", - "reference": "076fe2cf128bd54b4341cdc6d49b95b34e101e4c", + "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/3dbf8a8e914634c48d389c1234552666b3d43754", + "reference": "3dbf8a8e914634c48d389c1234552666b3d43754", "shasum": "" }, "require": { @@ -1415,7 +1415,7 @@ "issues": "https://github.com/laravel/serializable-closure/issues", "source": "https://github.com/laravel/serializable-closure" }, - "time": "2023-10-17T13:38:16+00:00" + "time": "2023-11-08T14:08:06+00:00" }, { "name": "laravel/tinker", @@ -1676,16 +1676,16 @@ }, { "name": "league/flysystem", - "version": "3.19.0", + "version": "3.21.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "1b2aa10f2326e0351399b8ce68e287d8e9209a83" + "reference": "a326d8a2d007e4ca327a57470846e34363789258" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/1b2aa10f2326e0351399b8ce68e287d8e9209a83", - "reference": "1b2aa10f2326e0351399b8ce68e287d8e9209a83", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a326d8a2d007e4ca327a57470846e34363789258", + "reference": "a326d8a2d007e4ca327a57470846e34363789258", "shasum": "" }, "require": { @@ -1750,7 +1750,7 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem/issues", - "source": "https://github.com/thephpleague/flysystem/tree/3.19.0" + "source": "https://github.com/thephpleague/flysystem/tree/3.21.0" }, "funding": [ { @@ -1762,20 +1762,20 @@ "type": "github" } ], - "time": "2023-11-07T09:04:28+00:00" + "time": "2023-11-18T13:59:15+00:00" }, { "name": "league/flysystem-local", - "version": "3.19.0", + "version": "3.21.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-local.git", - "reference": "8d868217f9eeb4e9a7320db5ccad825e9a7a4076" + "reference": "470eb1c09eaabd49ebd908ae06f23983ba3ecfe7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/8d868217f9eeb4e9a7320db5ccad825e9a7a4076", - "reference": "8d868217f9eeb4e9a7320db5ccad825e9a7a4076", + "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/470eb1c09eaabd49ebd908ae06f23983ba3ecfe7", + "reference": "470eb1c09eaabd49ebd908ae06f23983ba3ecfe7", "shasum": "" }, "require": { @@ -1810,7 +1810,7 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem-local/issues", - "source": "https://github.com/thephpleague/flysystem-local/tree/3.19.0" + "source": "https://github.com/thephpleague/flysystem-local/tree/3.21.0" }, "funding": [ { @@ -1822,7 +1822,7 @@ "type": "github" } ], - "time": "2023-11-06T20:35:28+00:00" + "time": "2023-11-18T13:41:42+00:00" }, { "name": "league/mime-type-detection", @@ -3326,7 +3326,7 @@ }, { "name": "symfony/deprecation-contracts", - "version": "v3.3.0", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", @@ -3373,7 +3373,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.3.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0" }, "funding": [ { @@ -3547,7 +3547,7 @@ }, { "name": "symfony/event-dispatcher-contracts", - "version": "v3.3.0", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", @@ -3603,7 +3603,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.3.0" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.4.0" }, "funding": [ { @@ -4923,16 +4923,16 @@ }, { "name": "symfony/service-contracts", - "version": "v3.3.0", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "40da9cc13ec349d9e4966ce18b5fbcd724ab10a4" + "reference": "b3313c2dbffaf71c8de2934e2ea56ed2291a3838" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/40da9cc13ec349d9e4966ce18b5fbcd724ab10a4", - "reference": "40da9cc13ec349d9e4966ce18b5fbcd724ab10a4", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/b3313c2dbffaf71c8de2934e2ea56ed2291a3838", + "reference": "b3313c2dbffaf71c8de2934e2ea56ed2291a3838", "shasum": "" }, "require": { @@ -4985,7 +4985,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v3.3.0" + "source": "https://github.com/symfony/service-contracts/tree/v3.4.0" }, "funding": [ { @@ -5001,7 +5001,7 @@ "type": "tidelift" } ], - "time": "2023-05-23T14:45:45+00:00" + "time": "2023-07-30T20:28:31+00:00" }, { "name": "symfony/string", @@ -5186,16 +5186,16 @@ }, { "name": "symfony/translation-contracts", - "version": "v3.3.0", + "version": "v3.4.0", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "02c24deb352fb0d79db5486c0c79905a85e37e86" + "reference": "dee0c6e5b4c07ce851b462530088e64b255ac9c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/02c24deb352fb0d79db5486c0c79905a85e37e86", - "reference": "02c24deb352fb0d79db5486c0c79905a85e37e86", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/dee0c6e5b4c07ce851b462530088e64b255ac9c5", + "reference": "dee0c6e5b4c07ce851b462530088e64b255ac9c5", "shasum": "" }, "require": { @@ -5244,7 +5244,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v3.3.0" + "source": "https://github.com/symfony/translation-contracts/tree/v3.4.0" }, "funding": [ { @@ -5260,7 +5260,7 @@ "type": "tidelift" } ], - "time": "2023-05-30T17:17:10+00:00" + "time": "2023-07-25T15:08:44+00:00" }, { "name": "symfony/uid", @@ -6033,16 +6033,16 @@ }, { "name": "laravel/sail", - "version": "v1.26.0", + "version": "v1.26.1", "source": { "type": "git", "url": "https://github.com/laravel/sail.git", - "reference": "c60fe037004e272efd0d81f416ed2bfc623d70b4" + "reference": "7a82f5aa364dbee3fd9c52fc464cf0bdd11150ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/sail/zipball/c60fe037004e272efd0d81f416ed2bfc623d70b4", - "reference": "c60fe037004e272efd0d81f416ed2bfc623d70b4", + "url": "https://api.github.com/repos/laravel/sail/zipball/7a82f5aa364dbee3fd9c52fc464cf0bdd11150ed", + "reference": "7a82f5aa364dbee3fd9c52fc464cf0bdd11150ed", "shasum": "" }, "require": { @@ -6094,7 +6094,7 @@ "issues": "https://github.com/laravel/sail/issues", "source": "https://github.com/laravel/sail" }, - "time": "2023-10-18T13:57:15+00:00" + "time": "2023-11-20T15:56:47+00:00" }, { "name": "maximebf/debugbar", @@ -6515,16 +6515,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "10.1.7", + "version": "10.1.9", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "355324ca4980b8916c18b9db29f3ef484078f26e" + "reference": "a56a9ab2f680246adcf3db43f38ddf1765774735" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/355324ca4980b8916c18b9db29f3ef484078f26e", - "reference": "355324ca4980b8916c18b9db29f3ef484078f26e", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/a56a9ab2f680246adcf3db43f38ddf1765774735", + "reference": "a56a9ab2f680246adcf3db43f38ddf1765774735", "shasum": "" }, "require": { @@ -6581,7 +6581,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.7" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/10.1.9" }, "funding": [ { @@ -6589,7 +6589,7 @@ "type": "github" } ], - "time": "2023-10-04T15:34:17+00:00" + "time": "2023-11-23T12:23:20+00:00" }, { "name": "phpunit/php-file-iterator", @@ -8231,16 +8231,16 @@ }, { "name": "theseer/tokenizer", - "version": "1.2.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e" + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96", + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96", "shasum": "" }, "require": { @@ -8269,7 +8269,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.1" + "source": "https://github.com/theseer/tokenizer/tree/1.2.2" }, "funding": [ { @@ -8277,7 +8277,7 @@ "type": "github" } ], - "time": "2021-07-28T10:34:58+00:00" + "time": "2023-11-20T00:12:19+00:00" } ], "aliases": [], diff --git a/public/images/d-logo.png b/public/images/d-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..00eed6505569877cf4558faf70d5fabc34b97038 GIT binary patch literal 3802 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 literal 0 HcmV?d00001 diff --git a/resources/views/backend/Courses/courseCategory/index.blade.php b/resources/views/backend/Courses/courseCategory/index.blade.php index cc88e6a..ac350be 100644 --- a/resources/views/backend/Courses/courseCategory/index.blade.php +++ b/resources/views/backend/Courses/courseCategory/index.blade.php @@ -26,7 +26,7 @@
  • Home
  • Categories
  • All Category
    • - + @@ -65,16 +65,21 @@ class="nav-link btn-primary mr-1 show active">List View {{$d->id}} {{$d->category_name}} - @if($d->category_status==1){{__('Active')}} @else{{__('Inactive')}} @endif + @if($d->category_status==1){{__('Active')}} + @else{{__('Inactive')}}@endif - + + alt=""> + + class="btn btn-sm btn-primary" title="Edit">
    - +

    {{$d->category_name}}

      @@ -126,12 +132,14 @@ class="la la-trash-o"> #Sl.{{$d->id}}
    • - Status. - :@if($d->category_status==1){{__('Active')}} @else{{__('Inactive')}} @endif + Status: + @if($d->category_status==1){{__('Active')}} + @else{{__('Inactive')}} @endif
    • - Created At. - :{{$d->created_at}} + Created At : + {{$d->created_at}}
    @@ -136,7 +136,7 @@ class="ti-arrow-right">
  • - + diff --git a/resources/views/backend/role/index.blade.php b/resources/views/backend/role/index.blade.php index a79650a..9470093 100644 --- a/resources/views/backend/role/index.blade.php +++ b/resources/views/backend/role/index.blade.php @@ -63,11 +63,13 @@ class="nav-link btn-primary mr-1 show active">List View
    • {{$d->identity}} + class="btn btn-sm btn-primary" title="Edit"> + class="btn btn-sm btn-dark" title="Permissions"> @forelse ($role as $r) + {{$r->name}} @empty @endforelse diff --git a/resources/views/backend/user/edit.blade.php b/resources/views/backend/user/edit.blade.php index 5683148..d5a45d0 100644 --- a/resources/views/backend/user/edit.blade.php +++ b/resources/views/backend/user/edit.blade.php @@ -99,7 +99,7 @@ @forelse ($role as $r) + {{$r->name}} @empty @endforelse diff --git a/resources/views/backend/user/index.blade.php b/resources/views/backend/user/index.blade.php index 8426878..f5eefd0 100644 --- a/resources/views/backend/user/index.blade.php +++ b/resources/views/backend/user/index.blade.php @@ -54,6 +54,7 @@ class="nav-link btn-primary mr-1 show active">List View {{__('Email')}} {{__('Contact')}} {{__('Role')}} + {{__('Full Access')}} {{__('Status')}} {{__('Action')}} @@ -67,12 +68,22 @@ class="nav-link btn-primary mr-1 show active">List View {{$d->email}} {{$d->contact_en}} {{$d->role?->name}} - @if($d->status==1){{__('Active')}} @else{{__('Inactive')}} @endif + + @if($d->full_access==1){{__('Yes')}} + @else{{__('No')}} @endif + + + @if($d->status==1){{__('Active')}} + @else{{__('Inactive')}} @endif - + height="100" class="rounded-circle" alt="">

    {{$d->name_en}}

    -

    {{$d->role?->type}}

    +

    {{$d->role?->name}}

    • - #Sl.{{$d->id}} + Phone No. : + {{$d->contact_en}}
    • - Phone No. - :{{$d->contact_en}} + Email : + {{$d->email}}
    • - Email:{{$d->email}} + Status : + @if($d->status==1){{__('Active')}} + @else{{__('Inactive')}} @endif
    • - Created At. - :{{$d->created_at}} + Full Access : + @if($d->full_access==1){{__('Yes')}} + @else{{__('No')}} @endif