From 980d0c79f665efe1fe566c713dbcca229a8c7b6c Mon Sep 17 00:00:00 2001 From: indpurvesh Date: Fri, 4 Feb 2022 09:37:25 +1300 Subject: [PATCH 01/14] MINOR CHANGES --- resources/images/avored_logo.ico | Bin 0 -> 112436 bytes .../Mutations/Auth/RegisterMutation.php | 18 +++++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 resources/images/avored_logo.ico diff --git a/resources/images/avored_logo.ico b/resources/images/avored_logo.ico new file mode 100644 index 0000000000000000000000000000000000000000..8fa84e1eae69c5fcc7af131760061c787ddf1e06 GIT binary patch literal 112436 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 literal 0 HcmV?d00001 diff --git a/src/Graphql/Mutations/Auth/RegisterMutation.php b/src/Graphql/Mutations/Auth/RegisterMutation.php index 8dd2270f..01edd2f1 100644 --- a/src/Graphql/Mutations/Auth/RegisterMutation.php +++ b/src/Graphql/Mutations/Auth/RegisterMutation.php @@ -3,12 +3,9 @@ namespace AvoRed\Framework\Graphql\Mutations\Auth; use AvoRed\Framework\Database\Contracts\CustomerModelInterface; -use AvoRed\Framework\Database\Contracts\VisitorModelInterface; -use AvoRed\Framework\Database\Models\Customer; use Closure; use GraphQL\Type\Definition\ResolveInfo; use GraphQL\Type\Definition\Type; -use Illuminate\Support\Str; use Laravel\Passport\Client; use Laravel\Passport\Http\Controllers\AccessTokenController; use Rebing\GraphQL\Support\Facades\GraphQL; @@ -47,6 +44,18 @@ public function type(): Type return GraphQL::type('token'); } + /** + * Setup the Validation rules for register mutation + * + * @return array $rules + */ + protected function rules(array $rules = []): array + { + return [ + 'first_name' => ['required', 'min:64'], + ]; + } + public function args(): array { return [ @@ -71,9 +80,8 @@ public function args(): array public function resolve($root, $args, $context, ResolveInfo $resolveInfo, Closure $getSelectFields) { - + $customer = $this->customerRepository->create($args); - $client = $customer->getPassportClient(); From 9f599e300be7006d0cac412f7af321807c039c81 Mon Sep 17 00:00:00 2001 From: Purvesh Date: Fri, 4 Feb 2022 10:25:09 +1300 Subject: [PATCH 02/14] basic validation added --- src/Graphql/Mutations/Auth/RegisterMutation.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Graphql/Mutations/Auth/RegisterMutation.php b/src/Graphql/Mutations/Auth/RegisterMutation.php index 01edd2f1..85f48b5e 100644 --- a/src/Graphql/Mutations/Auth/RegisterMutation.php +++ b/src/Graphql/Mutations/Auth/RegisterMutation.php @@ -52,7 +52,10 @@ public function type(): Type protected function rules(array $rules = []): array { return [ - 'first_name' => ['required', 'min:64'], + 'first_name' => ['required', 'max:255'], + 'last_name' => ['required', 'max:255'], + 'email' => ['required', 'email', 'max:255'], + 'password' => ['required', 'confirmed', 'max:255'], ]; } @@ -75,12 +78,15 @@ public function args(): array 'name' => 'password', 'type' => Type::nonNull(Type::string()) ], + 'password_confirmation' => [ + 'name' => 'password_confirmation', + 'type' => Type::nonNull(Type::string()) + ], ]; } public function resolve($root, $args, $context, ResolveInfo $resolveInfo, Closure $getSelectFields) { - $customer = $this->customerRepository->create($args); $client = $customer->getPassportClient(); From 915cf808aed9345e87a80123428a8ee3a44ffba6 Mon Sep 17 00:00:00 2001 From: indpurvesh Date: Sat, 5 Feb 2022 12:18:59 +1300 Subject: [PATCH 03/14] category with child support --- src/Graphql/Queries/AllCategoryQuery.php | 2 +- src/Graphql/Types/CategoryType.php | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/Graphql/Queries/AllCategoryQuery.php b/src/Graphql/Queries/AllCategoryQuery.php index d9c0a725..209340f0 100644 --- a/src/Graphql/Queries/AllCategoryQuery.php +++ b/src/Graphql/Queries/AllCategoryQuery.php @@ -64,6 +64,6 @@ public function args(): array */ public function resolve($root, $args, $context, ResolveInfo $resolveInfo, Closure $getSelectFields): Collection { - return $this->categoryRepository->all(); + return $this->categoryRepository->query()->whereNull('parent_id')->get(); } } diff --git a/src/Graphql/Types/CategoryType.php b/src/Graphql/Types/CategoryType.php index 14fc7279..3f10bb80 100644 --- a/src/Graphql/Types/CategoryType.php +++ b/src/Graphql/Types/CategoryType.php @@ -70,7 +70,11 @@ public function fields(): array 'products' => [ 'type' => GraphQL::paginate('product'), 'description' => 'Category Product' - ] + ], + 'children' => [ + 'type' => Type::listOf(GraphQL::type('category')), + 'description' => 'Child Category' + ], ]; } @@ -85,6 +89,16 @@ protected function resolveFilterField($category, $args) return $categoryFilterRepository->findByCategoryId($category->id); } + /** + * @param \AvoRed\Framework\Database\Models\Category $category + * @param array $args + * @return \Illuminate\Support\Collection $titleCollection + */ + protected function resolveChildrenField($category, $args) + { + return $category->children; + } + /** * @param \AvoRed\Framework\Database\Models\Category $category * @param array $args From 0053c4e20ec870c3722cf32c8ce54a6ba21d0e72 Mon Sep 17 00:00:00 2001 From: indpurvesh Date: Sun, 6 Feb 2022 10:06:45 +1300 Subject: [PATCH 04/14] minor change in git action --- .github/workflows/tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5b7914e4..998ea5a2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -56,3 +56,6 @@ jobs: run: vendor/bin/phpunit env: DB_PORT: ${{ job.services.mysql.ports[3306] }} + + - name: phpunit-coverage-badge + uses: timkrase/phpunit-coverage-badge@v1.2.0 From 5b88ede5fb0217dfeacafcbd508564e3e2999764 Mon Sep 17 00:00:00 2001 From: indpurvesh Date: Sun, 6 Feb 2022 10:09:51 +1300 Subject: [PATCH 05/14] php unit changes --- phpunit.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/phpunit.xml b/phpunit.xml index 569a432e..c162ccd4 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -31,17 +31,17 @@ - - + From 1e245d9f25aa2fc53533e5fa27cd5261880656fe Mon Sep 17 00:00:00 2001 From: indpurvesh Date: Sun, 6 Feb 2022 10:18:07 +1300 Subject: [PATCH 06/14] Update tests.yml --- .github/workflows/tests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 998ea5a2..86cdeefe 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -59,3 +59,5 @@ jobs: - name: phpunit-coverage-badge uses: timkrase/phpunit-coverage-badge@v1.2.0 + with: + report: build/logs/clover.xml From 09583d56cf2a462a36f7fdf3187f463905430409 Mon Sep 17 00:00:00 2001 From: indpurvesh Date: Sun, 6 Feb 2022 10:23:29 +1300 Subject: [PATCH 07/14] wip --- .gitignore | 4 +- build/framework-build | 1 + build/logs/clover.xml | 4142 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 4146 insertions(+), 1 deletion(-) create mode 120000 build/framework-build create mode 100644 build/logs/clover.xml diff --git a/.gitignore b/.gitignore index 4295f517..82cb5bb7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ .DS_Store -/build/ +/build/coverage +/build/coverage.txt +/build/report.junit.xml /vendor/ /node_modules/ .phpunit.result.cache diff --git a/build/framework-build b/build/framework-build new file mode 120000 index 00000000..d9780892 --- /dev/null +++ b/build/framework-build @@ -0,0 +1 @@ +framework-build \ No newline at end of file diff --git a/build/logs/clover.xml b/build/logs/clover.xml new file mode 100644 index 00000000..01a38102 --- /dev/null +++ b/build/logs/clover.xml @@ -0,0 +1,4142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 7b2885c973868c6f5f33c09e6e5e826e9986a4de Mon Sep 17 00:00:00 2001 From: indpurvesh Date: Sun, 6 Feb 2022 10:30:54 +1300 Subject: [PATCH 08/14] wip --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 86cdeefe..c578a58a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -61,3 +61,4 @@ jobs: uses: timkrase/phpunit-coverage-badge@v1.2.0 with: report: build/logs/clover.xml + coverage_badge_path: badge.svg From 314a9bdcf8127cbb19b74068a74339bd004e7c37 Mon Sep 17 00:00:00 2001 From: indpurvesh Date: Sun, 6 Feb 2022 10:42:30 +1300 Subject: [PATCH 09/14] wip --- .github/workflows/tests.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c578a58a..997e0f18 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -22,16 +22,15 @@ jobs: name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} - services: mysql: - image: mysql:5.7 - env: - MYSQL_ALLOW_EMPTY_PASSWORD: yes - MYSQL_DATABASE: avored_ecommerce_test - ports: - - 3306 - options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 + image: mysql:5.7 + env: + MYSQL_ALLOW_EMPTY_PASSWORD: yes + MYSQL_DATABASE: avored_ecommerce_test + ports: + - 3306 + options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 steps: - name: Checkout code @@ -61,4 +60,6 @@ jobs: uses: timkrase/phpunit-coverage-badge@v1.2.0 with: report: build/logs/clover.xml - coverage_badge_path: badge.svg + coverage_badge_path: "badge-coverage.svg" + push_badge: true + repo_token: ${{ secrets.USER_TOKEN }} From c2353602738afd52f781c96d4801f2fb8b8da3fc Mon Sep 17 00:00:00 2001 From: Github Actions Bot <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 5 Feb 2022 21:44:13 +0000 Subject: [PATCH 10/14] Update code coverage badge --- badge-coverage.svg | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 badge-coverage.svg diff --git a/badge-coverage.svg b/badge-coverage.svg new file mode 100644 index 00000000..66c28668 --- /dev/null +++ b/badge-coverage.svg @@ -0,0 +1,16 @@ + + + + + + + + + coverage + coverage + + + 55 % + 55 % + + \ No newline at end of file From ec8124928d51db1bf4f38eaf1d769aed92b3836e Mon Sep 17 00:00:00 2001 From: indpurvesh Date: Sun, 6 Feb 2022 10:51:41 +1300 Subject: [PATCH 11/14] wip --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 475e134a..52eba3e0 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@ Total Downloads Latest Stable Version License + Test Coverage

From 0d871433fdcb705cad67272eacfcde028512949f Mon Sep 17 00:00:00 2001 From: indpurvesh Date: Sun, 6 Feb 2022 11:57:08 +1300 Subject: [PATCH 12/14] fixed the subscriber controller bug --- src/User/Controllers/SubscriberController.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/User/Controllers/SubscriberController.php b/src/User/Controllers/SubscriberController.php index 8f4bb669..9e79d313 100644 --- a/src/User/Controllers/SubscriberController.php +++ b/src/User/Controllers/SubscriberController.php @@ -6,6 +6,7 @@ use AvoRed\Framework\Database\Models\Subscriber; use AvoRed\Framework\Tab\Tab; use Illuminate\Http\JsonResponse; +use Illuminate\Http\RedirectResponse; use Illuminate\Routing\Controller; class SubscriberController extends Controller @@ -19,7 +20,7 @@ class SubscriberController extends Controller /** * * @param SubscriberRepositroy $repository - * @param RoleRepositroy $roleRepository + * @param SubscriberRepositroy $repository */ public function __construct( SubscriberModelInterface $repository, @@ -47,7 +48,6 @@ public function index() */ public function create() { - $roles = $this->roleRepository->options(); $tabs = Tab::get('user.subscriber'); return view('avored::user.subscriber.create') @@ -58,7 +58,7 @@ public function create() * Store a newly created resource in storage. * * @param SubscriberRequest $request - * @return \Illuminate\Http\Response + * @return \Illuminate\Http\RedirectResponse */ public function store(SubscriberRequest $request) { @@ -87,9 +87,9 @@ public function edit(Subscriber $subscriber) * * @param SubscriberRequest $request * @param Subscriber $subscriber - * @return \Illuminate\Http\Response + * @return \Illuminate\Http\RedirectResponse */ - public function update(SubscriberRequest $request, Subscriber $subscriber) + public function update(SubscriberRequest $request, Subscriber $subscriber) : RedirectResponse { $subscriber->update($request->all()); @@ -100,7 +100,7 @@ public function update(SubscriberRequest $request, Subscriber $subscriber) * Remove the specified resource from storage. * * @param Subscriber $subscriber - * @return \Illuminate\Http\Response + * @return \Illuminate\Http\JsonResponse */ public function destroy(Subscriber $subscriber) { From a9fec0f2a40cdb1a5b8d454833dd10a091c9b45b Mon Sep 17 00:00:00 2001 From: indpurvesh Date: Sun, 6 Feb 2022 12:33:45 +1300 Subject: [PATCH 13/14] fixed many psalm error --- .../Mutations/Auth/ResetPasswordMutation.php | 8 +++--- src/System/Controllers/RoleController.php | 26 +++++++++---------- .../Controllers/ForgotPasswordController.php | 17 +++++++----- .../Controllers/ResetPasswordController.php | 14 ++++------ src/User/Controllers/StaffController.php | 21 +++++++-------- src/User/Controllers/SubscriberController.php | 17 ++++++------ 6 files changed, 51 insertions(+), 52 deletions(-) diff --git a/src/Graphql/Mutations/Auth/ResetPasswordMutation.php b/src/Graphql/Mutations/Auth/ResetPasswordMutation.php index 54b6e647..d1ca7a27 100644 --- a/src/Graphql/Mutations/Auth/ResetPasswordMutation.php +++ b/src/Graphql/Mutations/Auth/ResetPasswordMutation.php @@ -94,8 +94,8 @@ public function broker() /** * Reset the given user's password. * - * @param \Illuminate\Contracts\Auth\CanResetPassword $user - * @param string $password + * @param \AvoRed\Framework\Database\Models\AdminUser $user + * @param string $password * @return void */ protected function resetPassword($user, $password) @@ -108,8 +108,8 @@ protected function resetPassword($user, $password) /** * Set the user's password. * - * @param \Illuminate\Contracts\Auth\CanResetPassword $user - * @param string $password + * @param \AvoRed\Framework\Database\Models\AdminUser $user + * @param string $password * @return void */ protected function setUserPassword($user, $password) diff --git a/src/System/Controllers/RoleController.php b/src/System/Controllers/RoleController.php index c3a99c9d..a2b1ffdf 100644 --- a/src/System/Controllers/RoleController.php +++ b/src/System/Controllers/RoleController.php @@ -14,12 +14,12 @@ class RoleController extends Controller { /** - * @var RoleRepository $roleRepository + * @var \AvoRed\Framework\Database\Repository\RoleRepository $roleRepository */ protected $roleRepository; /** * - * @param RoleRepositroy $repository + * @param \AvoRed\Framework\Database\Contracts\RoleModelInterface $repository */ public function __construct( RoleModelInterface $repository @@ -30,20 +30,20 @@ public function __construct( /** * Display a listing of the resource. * - * @return \Illuminate\Http\Response + * @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory */ public function index() { $roles = $this->roleRepository->paginate(); return view('avored::system.role.index') - ->with('roles', $roles); + ->with('roles', $roles); } /** * Show the form for creating a new resource. * - * @return \Illuminate\Http\Response + * @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory */ public function create() { @@ -58,8 +58,8 @@ public function create() /** * Store a newly created resource in storage. * - * @param RoleRequest $request - * @return \Illuminate\Http\Response + * @param \AvoRed\Framework\System\Requests\RoleRequest $request + * @return \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse */ public function store(RoleRequest $request) { @@ -72,8 +72,8 @@ public function store(RoleRequest $request) /** * Show the form for editing the specified resource. * - * @param Role $role - * @return \Illuminate\Http\Response + * @param \AvoRed\Framework\Database\Models\Role $role + * @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory */ public function edit(Role $role) { @@ -89,9 +89,9 @@ public function edit(Role $role) /** * Update the specified resource in storage. * - * @param RoleRequest $request - * @param Role $role - * @return \Illuminate\Http\Response + * @param \AvoRed\Framework\System\Requests\RoleRequest $request + * @param \AvoRed\Framework\Database\Models\Role $role + * @return \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse */ public function update(RoleRequest $request, Role $role) { @@ -105,7 +105,7 @@ public function update(RoleRequest $request, Role $role) * Remove the specified resource from storage. * * @param Role $role - * @return \Illuminate\Http\Response + * @return \Illuminate\Http\JsonResponse */ public function destroy(Role $role) { diff --git a/src/User/Controllers/ForgotPasswordController.php b/src/User/Controllers/ForgotPasswordController.php index f32e5116..5bbd665e 100644 --- a/src/User/Controllers/ForgotPasswordController.php +++ b/src/User/Controllers/ForgotPasswordController.php @@ -32,13 +32,18 @@ public function __construct() /** * Show Password Reset Form. - * @return \Illuminate\View\View + * @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory */ public function linkRequestForm() { return view('avored::user.auth.reset'); } + /** + * Set up the admin user guard + * + * @return \Illuminate\Contracts\Auth\Guard|\Illuminate\Contracts\Auth\StatefulGuard $guard + */ protected function guard() { return Auth::guard('admin'); @@ -57,7 +62,7 @@ public function broker() /** * Send a reset link to the given user. * - * @param AvoRed\Framework\User\Requests\ForgotPasswordRequest $request + * @param \AvoRed\Framework\User\Requests\ForgotPasswordRequest $request * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse */ public function sendResetLinkEmail(ForgotPasswordRequest $request) @@ -76,8 +81,8 @@ public function sendResetLinkEmail(ForgotPasswordRequest $request) /** * Get the response for a successful password reset link. * - * @param AvoRed\Framework\User\Requests\ForgotPasswordRequest $request - * @param string $response + * @param \AvoRed\Framework\User\Requests\ForgotPasswordRequest $request + * @param string $response * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse */ protected function sendResetLinkResponse(ForgotPasswordRequest $request, $response) @@ -88,8 +93,8 @@ protected function sendResetLinkResponse(ForgotPasswordRequest $request, $respon /** * Get the response for a failed password reset link. * - * @param AvoRed\Framework\User\Requests\ForgotPasswordRequest $request - * @param string $response + * @param \AvoRed\Framework\User\Requests\ForgotPasswordRequest $request + * @param string $response * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse */ protected function sendResetLinkFailedResponse(ForgotPasswordRequest $request, $response) diff --git a/src/User/Controllers/ResetPasswordController.php b/src/User/Controllers/ResetPasswordController.php index eb30093e..345e4097 100644 --- a/src/User/Controllers/ResetPasswordController.php +++ b/src/User/Controllers/ResetPasswordController.php @@ -1,5 +1,4 @@ setUserPassword($user, $password); - // $user->setRememberToken(Str::random(60)); $user->save(); event(new PasswordReset($user)); @@ -127,7 +123,7 @@ protected function resetPassword($user, $password) /** * Set the user's password. * - * @param \Illuminate\Contracts\Auth\CanResetPassword $user + * @param \AvoRed\Framework\Database\Models\AdminUser $user * @param string $password * @return void */ diff --git a/src/User/Controllers/StaffController.php b/src/User/Controllers/StaffController.php index 45e1a6cd..3c128d6f 100644 --- a/src/User/Controllers/StaffController.php +++ b/src/User/Controllers/StaffController.php @@ -15,19 +15,19 @@ class StaffController extends Controller { /** - * @var AdminUserRepository $adminUserRepository + * @var \AvoRed\Framework\Database\Repository\AdminUserRepository $adminUserRepository */ protected $adminUserRepository; /** - * @var RoleRepository $roleRepository + * @var \AvoRed\Framework\Database\Repository\RoleRepository $roleRepository */ protected $roleRepository; /** * - * @param AdminUserRepositroy $repository - * @param RoleRepositroy $roleRepository + * @param \AvoRed\Framework\Database\Contracts\AdminUserModelInterface $repository + * @param \AvoRed\Framework\Database\Contracts\RoleModelInterface $roleRepository */ public function __construct( AdminUserModelInterface $repository, @@ -40,7 +40,7 @@ public function __construct( /** * Display a listing of the resource. * - * @return \Illuminate\Http\Response + * @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory */ public function index() { @@ -53,7 +53,7 @@ public function index() /** * Show the form for creating a new resource. * - * @return \Illuminate\Http\Response + * @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory */ public function create() { @@ -69,7 +69,7 @@ public function create() * Store a newly created resource in storage. * * @param AdminUserRequest $request - * @return \Illuminate\Http\Response + * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ public function store(AdminUserRequest $request) { @@ -82,11 +82,10 @@ public function store(AdminUserRequest $request) * Show the form for editing the specified resource. * * @param AdminUser $staff - * @return \Illuminate\Http\Response + * @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory */ public function edit(AdminUser $staff) { - // dd($staff->image_path_url); $roles = $this->roleRepository->options(); $tabs = Tab::get('user.staff'); @@ -101,7 +100,7 @@ public function edit(AdminUser $staff) * * @param AdminUserRequest $request * @param AdminUser $staff - * @return \Illuminate\Http\Response + * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ public function update(AdminUserRequest $request, AdminUser $staff) { @@ -119,7 +118,7 @@ public function update(AdminUserRequest $request, AdminUser $staff) * Remove the specified resource from storage. * * @param AdminUser $staff - * @return \Illuminate\Http\Response + * @return \Illuminate\Http\JsonResponse */ public function destroy(AdminUser $staff) { diff --git a/src/User/Controllers/SubscriberController.php b/src/User/Controllers/SubscriberController.php index 9e79d313..ad7adc82 100644 --- a/src/User/Controllers/SubscriberController.php +++ b/src/User/Controllers/SubscriberController.php @@ -13,14 +13,13 @@ class SubscriberController extends Controller { /** - * @var SubscriberRepository $subscriberRepository + * @var \AvoRed\Framework\Database\Repository\SubscriberRepository $subscriberRepository */ protected $subscriberRepository; /** * - * @param SubscriberRepositroy $repository - * @param SubscriberRepositroy $repository + * @param \AvoRed\Framework\Database\Repository\SubscriberRepository $repository */ public function __construct( SubscriberModelInterface $repository, @@ -31,7 +30,7 @@ public function __construct( /** * Display a listing of the resource. * - * @return \Illuminate\Http\Response + * @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory */ public function index() { @@ -44,7 +43,7 @@ public function index() /** * Show the form for creating a new resource. * - * @return \Illuminate\Http\Response + * @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory */ public function create() { @@ -58,7 +57,7 @@ public function create() * Store a newly created resource in storage. * * @param SubscriberRequest $request - * @return \Illuminate\Http\RedirectResponse + * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ public function store(SubscriberRequest $request) { @@ -71,7 +70,7 @@ public function store(SubscriberRequest $request) * Show the form for editing the specified resource. * * @param Subscriber $subscriber - * @return \Illuminate\Http\Response + * @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory */ public function edit(Subscriber $subscriber) { @@ -87,9 +86,9 @@ public function edit(Subscriber $subscriber) * * @param SubscriberRequest $request * @param Subscriber $subscriber - * @return \Illuminate\Http\RedirectResponse + * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ - public function update(SubscriberRequest $request, Subscriber $subscriber) : RedirectResponse + public function update(SubscriberRequest $request, Subscriber $subscriber) { $subscriber->update($request->all()); From cbdaffcabd6b0b230da779f210fb7da2253f8eb3 Mon Sep 17 00:00:00 2001 From: indpurvesh Date: Mon, 7 Feb 2022 10:55:44 +1300 Subject: [PATCH 14/14] few minor changes --- README.md | 2 +- composer.json | 8 ++++++-- resources/lang/en/system.php | 1 + src/Permission/PermissionInterface.php | 4 ++-- src/Permission/PermissionProvider.php | 2 +- src/System/Components/Layout.php | 5 +---- src/System/Console/InstallCommand.php | 2 +- .../Controllers/ConfigurationController.php | 16 +++------------- 8 files changed, 16 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 52eba3e0..b50e530c 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Once this is finished, you will need to run a few commands to finish up and then ## Publish the files Publish the AvoRed E-commerce framework config file and assets (JS/CSS and images): - php artisan vendor:publish --provider="AvoRed\Framework\AvoRedProvider" + php artisan vendor:publish --provider="AvoRed\Framework\AvoRedServiceProvider" Once all the files are published, we can run the command to install the required database tables. diff --git a/composer.json b/composer.json index b81eccb8..05ecd2f5 100644 --- a/composer.json +++ b/composer.json @@ -62,11 +62,15 @@ "AvoRed\\Framework\\AvoRedServiceProvider" ], "aliases": { - "Menu": "AvoRed\\Framework\\Menu\\Menu", + "Module": "AvoRed\\Framework\\Module\\Module", + "Cart": "AvoRed\\Framework\\Cart\\Cart", "Breadcrumb": "AvoRed\\Framework\\Breadcrumb\\Breadcrumb", + "Document": "AvoRed\\Framework\\Document\\Document", + "Menu": "AvoRed\\Framework\\Menu\\Menu", "Payment": "AvoRed\\Framework\\Payment\\Payment", "Permission": "AvoRed\\Framework\\Permission\\Permission", - "Shipping": "AvoRed\\Framework\\Shipping\\Shipping" + "Shipping": "AvoRed\\Framework\\Shipping\\Shipping", + "Tab": "AvoRed\\Framework\\Tab\\Tab" }, "dont-discover": [ "rebing/graphql-laravel" diff --git a/resources/lang/en/system.php b/resources/lang/en/system.php index 43c8c9e6..a7671445 100644 --- a/resources/lang/en/system.php +++ b/resources/lang/en/system.php @@ -14,6 +14,7 @@ */ 'login_to_avored_admin' => 'Login to avored admin', + 'failed' => 'These credentials do not match our records.', 'forgot_password' => 'Forgot your password?', 'remember_me' => 'Remember me', 'email_address' => 'Email Address', diff --git a/src/Permission/PermissionInterface.php b/src/Permission/PermissionInterface.php index ea085d0e..f4f4f647 100644 --- a/src/Permission/PermissionInterface.php +++ b/src/Permission/PermissionInterface.php @@ -23,5 +23,5 @@ public function label($label = null); * @param string $routes * @return $routes|self */ - public function routes($icon = null); -} \ No newline at end of file + public function routes($route = null); +} diff --git a/src/Permission/PermissionProvider.php b/src/Permission/PermissionProvider.php index f9f525cd..cab6a606 100644 --- a/src/Permission/PermissionProvider.php +++ b/src/Permission/PermissionProvider.php @@ -675,7 +675,7 @@ function (PermissionItem $permission) { 'hasPermission', function ($routeName) { $condition = false; - /** @var AdminUser */ + /** @var \AvoRed\Framework\Database\Models\AdminUser $user */ $user = Auth::guard('admin')->user(); if (! $user) { $condition = $user->hasPermission($routeName) ?: false; diff --git a/src/System/Components/Layout.php b/src/System/Components/Layout.php index 15064865..1ed76a3d 100644 --- a/src/System/Components/Layout.php +++ b/src/System/Components/Layout.php @@ -2,11 +2,8 @@ namespace AvoRed\Framework\System\Components; -use AvoRed\Framework\Breadcrumb\Breadcrumb; use AvoRed\Framework\Menu\Menu; -use Illuminate\Support\Facades\Route; use Illuminate\View\Component; - class Layout extends Component { @@ -18,7 +15,7 @@ class Layout extends Component /** * The admin Menus. - * @var collection + * @var \Illuminate\Support\Collection */ public $adminMenus; diff --git a/src/System/Console/InstallCommand.php b/src/System/Console/InstallCommand.php index 1d245932..b0ca0c6c 100644 --- a/src/System/Console/InstallCommand.php +++ b/src/System/Console/InstallCommand.php @@ -45,7 +45,7 @@ public function handle() $this->createRoleAction->handle(['name' => Role::ADMIN]); if ($this->confirm('Would you like to install Dummy Data?')) { - $this->call('avored:module:install', ['identifier' => 'avored-demodata']); + $this->call('avored:module:install', ['identifier' => 'avored-dummy-data']); } $this->call('avored:admin:make'); diff --git a/src/System/Controllers/ConfigurationController.php b/src/System/Controllers/ConfigurationController.php index 8d38af69..d8f77bc7 100644 --- a/src/System/Controllers/ConfigurationController.php +++ b/src/System/Controllers/ConfigurationController.php @@ -9,16 +9,11 @@ class ConfigurationController extends Controller { - /** + /** * Configuration Repository for the Install Command. * @var \AvoRed\Framework\Database\Repository\ConfigurationRepository */ protected $configurationRepository; - /** - * Currency Repository for the Install Command. - * @var \AvoRed\Framework\Database\Repository\CurrencyRepository - */ - protected $currencyRepository; /** * Construct for the AvoRed configuration controller. @@ -26,32 +21,27 @@ class ConfigurationController extends Controller */ public function __construct( ConfigurationModelInterface $configurationRepository - // CurrencyModelInterface $currencyRepository ) { $this->configurationRepository = $configurationRepository; - // $this->currencyRepository = $currencyRepository; } /** * Show Configuration of an AvoRed Admin. - * @return \Illuminate\View\View + * @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory */ public function index() { - // $currencyOptions = $this->currencyRepository->all()->pluck('name', 'id'); - $tabs = Tab::get('system.configuration'); return view('avored::system.configuration.index') ->with('tabs', $tabs) ->with('repository', $this->configurationRepository) - // ->with('currencyOptions', $currencyOptions) ; } /** * Show Configuration of an AvoRed Admin. - * @return \Illuminate\Http\RedirectResponse + * @return \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse */ public function store(Request $request) {