Merge branch 'develop'

avored · Feb 6, 2022 · f98fe66 · f98fe66
2 parents b8e8245 + cbdaffc
commit f98fe66
Show file tree

Hide file tree

Showing 24 changed files with 4,286 additions and 98 deletions.
diff --git 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
@@ -56,3 +55,11 @@ 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
+        with:
+          report: build/logs/clover.xml
+          coverage_badge_path: "badge-coverage.svg"
+          push_badge: true
+          repo_token: ${{ secrets.USER_TOKEN }}
diff --git 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/README.md b/README.md
@@ -7,6 +7,7 @@
     <a href="https://packagist.org/packages/avored/framework"><img src="https://poser.pugx.org/avored/framework/downloads" alt="Total Downloads"></a>
     <a href="https://packagist.org/packages/avored/framework"><img src="https://poser.pugx.org/avored/framework/v/stable" alt="Latest Stable Version"></a>
     <a href="https://packagist.org/packages/avored/framework"><img src="https://poser.pugx.org/avored/framework/license" alt="License"></a>
+    <a href="https://packagist.org/packages/avored/framework"><img src="https://raw.githubusercontent.com/avored/framework/develop/badge-coverage.svg" alt="Test Coverage"></a>
 </p>
 
 
@@ -26,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/badge-coverage.svg b/badge-coverage.svg
diff --git a/build/framework-build b/build/framework-build
@@ -0,0 +1 @@
+framework-build
diff --git a/build/logs/clover.xml b/build/logs/clover.xml
diff --git 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/phpunit.xml b/phpunit.xml
@@ -31,17 +31,17 @@
         <env name="DB_PORT" value="3306" />
     </php>
 
-    <!-- <coverage>
+    <coverage>
         <include>
             <directory suffix=".php">./src</directory>
         </include>
         <report>
-            <html outputDirectory="/build/coverage"/>
+            <html outputDirectory="./build/coverage"/>
             <text outputFile="build/coverage.txt"/>
             <clover outputFile="build/logs/clover.xml"/>
         </report>
-    </coverage> -->
-    <!-- <logging>
+    </coverage>
+    <logging>
         <junit outputFile="build/report.junit.xml"/>
-    </logging> -->
+    </logging>
 </phpunit>
diff --git a/resources/images/avored_logo.ico b/resources/images/avored_logo.ico
diff --git 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/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,21 @@ 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', 'max:255'],
+            'last_name' => ['required', 'max:255'],
+            'email' => ['required', 'email', 'max:255'],
+            'password' => ['required', 'confirmed', 'max:255'],
+        ];
+    }
+
     public function args(): array
     {
         return [
@@ -66,14 +78,16 @@ 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();
 

diff --git 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/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
@@ -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

diff --git 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);
-}
+    public function routes($route = null);
+}
diff --git 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
@@ -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
@@ -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
@@ -9,49 +9,39 @@
 
 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.
      * @param \AvoRed\Framework\Database\Contracts\ConfigurationModelInterface $configurationRepository
      */
     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)
     {