Merge pull request #512 from avored/developed

Developed

.github/CONTRIBUTING.md

@@ -13,22 +13,22 @@
 
 #### **Did you fix a bug?**
 
-* To provide a code contribution for an issue you will need to set up your own fork of the Avored repository, make your code changes, commit the changes and make a Pull Request to the dev branch on the Avored repository. 
+* To provide a code contribution for an issue you will need to set up your own fork of the Avored repository, make your code changes, commit the changes and make a Pull Request to the `developed` branch on the Avored repository. 
 * Separate each fix into a new branch in your repository and name it with the issue ID e.g. bugfix_3062 or issue-1234.
 * When committing to your individual bugfix branch, please try and use the following as your commit message 
 ```Fixed #1234 - <the subject of the issue>```. By using this format we can easily include all bug fixes within major and minor release notes in our [Changelog](https://github.com/avored/laravel-ecommerce/blob/master/CHANGELOG.md).
 * If you are new to writing commit messages in git, follow the guide [here.](http://chris.beams.io/posts/git-commit/#seven-rules)
 * After you have made your commits and pushed them up to your forked repository you then create a [Pull Request](https://help.github.com/articles/about-pull-requests/) to be reviewed and merged into the Avored repository. Make a new Pull Request for each issue you fix.    **do not combine multiple bugfixes into one Pull Request**.
-* Ensure that you send your Pull Request to the dev.
+* Ensure that you send your Pull Request to the `developed`.
 
 
 #### **Did you create a new feature or enhancement?**
 
-* Changes that can be considered a new feature or enhancement should be made to the dev branch.
+* Changes that can be considered a new feature or enhancement should be made to the `developed` branch.
 * To contribute a feature you must create a fork of Avored and set up your git and development environment.
-  Once done, create a new branch from **dev** and name it relevant to the feature's purpose.
+  Once done, create a new branch from **developed** and name it relevant to the feature's purpose.
   Make sure your commit messages are relevant and descriptive. When ready to submit for review, make a Pull Request detailing your feature's functionality.
-  Ensure that your Pull Requests base fork is **avored/laravel-ecommerce**, the base branch is **dev**, the head fork is your repository, and the base branch is your feature branch.
+  Ensure that your Pull Requests base fork is **avored/laravel-ecommerce**, the base branch is **developed**, the head fork is your repository, and the base branch is your feature branch.
 * Add any new PHPUnit tests to the new feature branch if required.
 
 ## Issue and Pull Request Labels

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -20,9 +20,5 @@ Steps to reproduce the behavior:
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
-**Desktop (please complete the following information):**
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
 **Additional context**
 Add any other context about the problem here.

README.md

@@ -35,7 +35,7 @@ Please read our [contributing guide](.github/CONTRIBUTING.md) if you want to con
 
 ## Contributors
 
-[AvoRed](https://avored.com/) exists thanks to all the people who contribute. [[Contribute]](CONTRIBUTING.md).
+[AvoRed](https://avored.com/) exists thanks to all the people who contribute. [[Contribute]](.github/CONTRIBUTING.md).
 <a href="https://github.com/avored/laravel-ecommerce/graphs/contributors"><img src="https://opencollective.com/laravel-ecommerce/contributors.svg?width=890" title="contributors" alt="contributors" /></a>
 
 ## Sponsors

app/Http/Controllers/Category/CategoryController.php

@@ -20,24 +20,17 @@ class CategoryController extends Controller
      */
     protected $categoryFilterRepository;
 
-    /**
-     * @var \AvoRed\Wishlist\Database\Repository\WishlistRepository
-     */
-    protected $wishlistRepository;
-
     /**
      * home controller construct.
      * @param \AvoRed\Framework\Database\Repository\CategoryRepository $categoryRepository
      * @param \AvoRed\Framework\Database\Repository\CategoryFilterRepository $categoryFilterRepository
      */
     public function __construct(
         CategoryModelInterface $categoryRepository,
-        CategoryFilterModelInterface $categoryFilterRepository,
-        WishlistModelInterface $wishlistRepository
+        CategoryFilterModelInterface $categoryFilterRepository
     ) {
         $this->categoryRepository = $categoryRepository;
         $this->categoryFilterRepository = $categoryFilterRepository;
-        $this->wishlistRepository = $wishlistRepository;
     }
 
     /**
@@ -46,13 +39,12 @@ public function __construct(
      */
     public function show(Request $request, string $slug)
     {
-        $wishlists = $this->wishlistRepository->userWishlists();
         $request->merge(['slug' => $slug]);
         $category = $this->categoryRepository->findBySlug($slug);
         $categoryProducts = $this->categoryRepository->getCategoryProducts($request);
         $categoryFilters = $this->categoryFilterRepository->findByCategoryId($category->id);
 
         return view('category.show')
-            ->with(compact('categoryFilters', 'categoryProducts', 'category', 'wishlists'));
+            ->with(compact('categoryFilters', 'categoryProducts', 'category'));
     }
 }

composer.json

@@ -8,7 +8,7 @@
     ],
     "license": "MIT",
     "require": {
-        "php": ">=7.2",
+        "php": ">=7.3",
         "avored/framework": "^3.1",
         "fideloper/proxy": "^4.0"
     },
@@ -38,7 +38,8 @@
     "autoload": {
         "psr-4": {
             "App\\": "app/",
-            "AvoRed\\Framework\\": "packages/avored/framework/src/"
+            "AvoRed\\Framework\\": "packages/avored/framework/src/",
+            "AvoRed\\Assets\\": "packages/avored/assets/src/"
         },
         "classmap": [
             "database/seeds",
@@ -48,7 +49,7 @@
     "autoload-dev": {
         "psr-4": {
             "Tests\\": "tests/",
-            "AvoRed\\Framework\\Tests\\": "packages/framework/tests/"
+            "AvoRed\\Framework\\Tests\\": "packages/avored/framework/tests/"
 
         }
     },

config/app.php

@@ -239,6 +239,7 @@
         'Permission' => \AvoRed\Framework\Support\Facades\Permission::class,
         'Cart' => \AvoRed\Framework\Support\Facades\Cart::class,
         'Tab' => \AvoRed\Framework\Support\Facades\Tab::class,
+        'Asset' => \AvoRed\Assets\Support\Facades\Asset::class,
     ],
 
 ];

package.json

@@ -18,7 +18,7 @@
         "less": "^3.11.3",
         "less-loader": "^6.2.0",
         "lodash": "^4.17.19",
-        "tailwindcss": "^1.4.6",
+        "tailwindcss": "^1.8.10",
         "vddl": "^0.7.1",
         "vue": "^2.5",
         "vue-i18n": "^8.18.2",

public/vendor/avored/js/app.js.LICENSE.txt

@@ -1,11 +1,18 @@
 /*!
- * Vue.js v2.6.11
- * (c) 2014-2019 Evan You
+ * Chart.js v2.9.3
+ * https://www.chartjs.org
+ * (c) 2019 Chart.js Contributors
+ * Released under the MIT License
+ */
+
+/*!
+ * Vue.js v2.6.12
+ * (c) 2014-2020 Evan You
  * Released under the MIT License.
  */
 
 /*!
- * vue-i18n v8.21.0 
+ * vue-i18n v8.22.0 
  * (c) 2020 kazuya kawaguchi
  * Released under the MIT License.
  */
@@ -992,6 +999,10 @@
   !*** ./node_modules/core-js/internals/well-known-symbol.js ***!
   \*************************************************************/
 
+/*!*************************************************************!*\
+  !*** ./node_modules/core-js/modules/es.array.find-index.js ***!
+  \*************************************************************/
+
 /*!*************************************************************!*\
   !*** ./node_modules/core-js/modules/es.object.to-string.js ***!
   \*************************************************************/
@@ -1359,3 +1370,7 @@
 /*!*****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/vue-style-loader??ref--6-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!./node_modules/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/src??ref--6-oneOf-1-2!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/AvoRedSelect.vue?vue&type=style&index=0&id=5277343a&scoped=true&lang=css& ***!
   \*****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+
+//! moment.js
+
+//! moment.js locale configuration

public/vendor/avored/js/avored.js.LICENSE.txt

@@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.6.11
- * (c) 2014-2019 Evan You
+ * Vue.js v2.6.12
+ * (c) 2014-2020 Evan You
  * Released under the MIT License.
  */