diff --git a/composer.json b/composer.json index c91c7c773..cc52c1539 100644 --- a/composer.json +++ b/composer.json @@ -65,7 +65,7 @@ "newfold-labs/wp-module-global-ctb": "^1.0.9", "newfold-labs/wp-module-help-center": "1.0.21", "newfold-labs/wp-module-loader": "^1.0.10", - "newfold-labs/wp-module-marketplace": "^2.0.2", + "newfold-labs/wp-module-marketplace": "^2.1.0", "newfold-labs/wp-module-notifications": "^1.1.6", "newfold-labs/wp-module-onboarding": "^1.11.8", "newfold-labs/wp-module-patterns": "^0.1.8", diff --git a/composer.lock b/composer.lock index 22e6455d6..fc844ca8b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "46ebab28d67d259db3dbb6f58f26173b", + "content-hash": "41ae75c15a31eef7955bac64cb2cacf3", "packages": [ { "name": "doctrine/inflector", @@ -771,16 +771,16 @@ }, { "name": "newfold-labs/wp-module-marketplace", - "version": "2.0.2", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/newfold-labs/wp-module-marketplace.git", - "reference": "e6968198d53c7d4c191cf33d6b76335d32a9bb42" + "reference": "3f836e2ae93e97e91a677e12ceb65fda90ee4d86" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/newfold-labs/wp-module-marketplace/zipball/e6968198d53c7d4c191cf33d6b76335d32a9bb42", - "reference": "e6968198d53c7d4c191cf33d6b76335d32a9bb42", + "url": "https://api.github.com/repos/newfold-labs/wp-module-marketplace/zipball/3f836e2ae93e97e91a677e12ceb65fda90ee4d86", + "reference": "3f836e2ae93e97e91a677e12ceb65fda90ee4d86", "shasum": "" }, "require": { @@ -821,10 +821,10 @@ ], "description": "A module for rendering product data and interacting with the Hiive marketplace API.", "support": { - "source": "https://github.com/newfold-labs/wp-module-marketplace/tree/2.0.2", + "source": "https://github.com/newfold-labs/wp-module-marketplace/tree/2.1.0", "issues": "https://github.com/newfold-labs/wp-module-marketplace/issues" }, - "time": "2023-09-19T22:38:37+00:00" + "time": "2023-11-07T15:19:22+00:00" }, { "name": "newfold-labs/wp-module-notifications", @@ -2356,12 +2356,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "a0f1d0d6b7b035bcca5e427c55954d34d9984bf0" + "reference": "acf687d343a847d98f175a9ce4e16483848246fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/a0f1d0d6b7b035bcca5e427c55954d34d9984bf0", - "reference": "a0f1d0d6b7b035bcca5e427c55954d34d9984bf0", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/acf687d343a847d98f175a9ce4e16483848246fd", + "reference": "acf687d343a847d98f175a9ce4e16483848246fd", "shasum": "" }, "conflict": { @@ -2473,7 +2473,7 @@ "doctrine/mongodb-odm": "<1.0.2", "doctrine/mongodb-odm-bundle": "<3.0.1", "doctrine/orm": ">=2,<2.4.8|>=2.5,<2.5.1|>=2.8.3,<2.8.4", - "dolibarr/dolibarr": "<18", + "dolibarr/dolibarr": "<18.0.2", "dompdf/dompdf": "<2.0.2|==2.0.2", "drupal/core": "<9.4.14|>=9.5,<9.5.8|>=10,<10.0.8", "drupal/drupal": ">=6,<6.38|>=7,<7.80|>=8,<8.9.16|>=9,<9.1.12|>=9.2,<9.2.4", @@ -2498,12 +2498,13 @@ "ezsystems/ezplatform-admin-ui": ">=1.3,<1.3.5|>=1.4,<1.4.6|>=1.5,<1.5.29|>=2.3,<2.3.26", "ezsystems/ezplatform-admin-ui-assets": ">=4,<4.2.1|>=5,<5.0.1|>=5.1,<5.1.1", "ezsystems/ezplatform-graphql": ">=1.0.0.0-RC1-dev,<1.0.13|>=2.0.0.0-beta1,<2.3.12", - "ezsystems/ezplatform-kernel": "<1.2.5.1-dev|>=1.3,<1.3.26", + "ezsystems/ezplatform-kernel": "<1.2.5.1-dev|>=1.3,<1.3.34", "ezsystems/ezplatform-rest": ">=1.2,<=1.2.2|>=1.3,<1.3.8", "ezsystems/ezplatform-richtext": ">=2.3,<2.3.7.1-dev", + "ezsystems/ezplatform-solr-search-engine": ">=1.7,<1.7.12|>=2,<2.0.2|>=3.3,<3.3.15", "ezsystems/ezplatform-user": ">=1,<1.0.1", - "ezsystems/ezpublish-kernel": "<6.13.8.2-dev|>=7,<7.5.30", - "ezsystems/ezpublish-legacy": "<=2017.12.7.3|>=2018.06,<=2019.03.5.1", + "ezsystems/ezpublish-kernel": "<6.13.8.2-dev|>=7,<7.5.31", + "ezsystems/ezpublish-legacy": "<=2017.12.7.3|>=2018.6,<=2019.03.5.1", "ezsystems/platform-ui-assets-bundle": ">=4.2,<4.2.3", "ezsystems/repository-forms": ">=2.3,<2.3.2.1-dev|>=2.5,<2.5.15", "ezyang/htmlpurifier": "<4.1.1", @@ -2524,6 +2525,7 @@ "fluidtypo3/vhs": "<5.1.1", "fof/byobu": ">=0.3.0.0-beta2,<1.1.7", "fof/upload": "<1.2.3", + "foodcoopshop/foodcoopshop": ">=3.2,<3.6.1", "fooman/tcpdf": "<6.2.22", "forkcms/forkcms": "<5.11.1", "fossar/tcpdf-parser": "<6.2.22", @@ -2568,9 +2570,10 @@ "httpsoft/http-message": "<1.0.12", "hyn/multi-tenant": ">=5.6,<5.7.2", "ibexa/admin-ui": ">=4.2,<4.2.3", - "ibexa/core": ">=4,<4.0.7|>=4.1,<4.1.4|>=4.2,<4.2.3", + "ibexa/core": ">=4,<4.0.7|>=4.1,<4.1.4|>=4.2,<4.2.3|>=4.5,<4.5.4", "ibexa/graphql": ">=2.5,<2.5.31|>=3.3,<3.3.28|>=4.2,<4.2.3", "ibexa/post-install": "<=1.0.4", + "ibexa/solr": ">=4.5,<4.5.4", "ibexa/user": ">=4,<4.4.3", "icecoder/icecoder": "<=8.1", "idno/known": "<=1.3.1", @@ -2737,7 +2740,7 @@ "pimcore/data-hub": "<1.2.4", "pimcore/demo": "<10.3", "pimcore/perspective-editor": "<1.5.1", - "pimcore/pimcore": "<10.6.8", + "pimcore/pimcore": "<11.1", "pixelfed/pixelfed": "<=0.11.4", "pocketmine/bedrock-protocol": "<8.0.2", "pocketmine/pocketmine-mp": "<=4.23|>=5,<5.3.1", @@ -3034,7 +3037,7 @@ "type": "tidelift" } ], - "time": "2023-11-01T11:04:03+00:00" + "time": "2023-11-06T17:04:05+00:00" }, { "name": "squizlabs/php_codesniffer", diff --git a/src/app/data/routes.js b/src/app/data/routes.js index 8c3cee31e..10667cd00 100644 --- a/src/app/data/routes.js +++ b/src/app/data/routes.js @@ -16,8 +16,8 @@ import Marketplace from '../pages/marketplace'; import Performance from '../pages/performance'; import Settings from '../pages/settings'; import Staging from '../pages/staging'; -import Example from '../pages/example'; import Help from '../pages/help'; +import { getMarketplaceSubnavRoutes } from '../../../vendor/newfold-labs/wp-module-marketplace/components/marketplaceSubnav'; import { ReactComponent as HelpIcon } from "../components/icons/HelpIcon.svg"; const addPartialMatch = (prefix, path) => @@ -107,33 +107,7 @@ export const routes = [ title: __( 'Marketplace', 'wp-plugin-bluehost' ), Component: Marketplace, Icon: ShoppingBagIcon, - subRoutes: [ - { - name: '/marketplace/featured', - title: __( 'Featured', 'wp-plugin-bluehost' ), - }, - { - name: '/marketplace/services', - title: __( 'Services', 'wp-plugin-bluehost' ), - }, - { - name: '/marketplace/ecommerce', - title: __( 'eCommerce', 'wp-plugin-bluehost' ), - }, - { - name: '/marketplace/seo', - title: __( 'SEO', 'wp-plugin-bluehost' ), - }, - { - name: '/marketplace/security', - title: __( 'Security', 'wp-plugin-bluehost' ), - }, - { - name: '/marketplace/themes', - title: __( 'Themes', 'wp-plugin-bluehost' ), - }, - - ], + subRoutes: await getMarketplaceSubnavRoutes(), }, { name: '/performance',