From 658e25d2a689ee5109ff11aa8099134adc23b771 Mon Sep 17 00:00:00 2001 From: aratidgr8 Date: Wed, 11 Sep 2024 20:30:07 +0530 Subject: [PATCH 01/53] Import WP Solutions Banner on Home page --- src/app/pages/home/index.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/app/pages/home/index.js b/src/app/pages/home/index.js index bd7f2254c..0b1a23c20 100644 --- a/src/app/pages/home/index.js +++ b/src/app/pages/home/index.js @@ -3,12 +3,14 @@ import WebinarsBanner from 'App/components/webinars-banner'; import AccountCard from './accountCard'; import HelpCard from './helpCard'; import WelcomeSection from './welcomeSection'; +import { WPSolutionsBanner } from '@newfold-labs/wp-module-ecommerce' const Home = () => { return ( +
From abba1e41a109a5cc39110b05bcce5324216b2257 Mon Sep 17 00:00:00 2001 From: aratidgr8 Date: Wed, 11 Sep 2024 20:43:48 +0530 Subject: [PATCH 02/53] ESLint fix --- src/app/pages/home/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/home/index.js b/src/app/pages/home/index.js index 0b1a23c20..ada303571 100644 --- a/src/app/pages/home/index.js +++ b/src/app/pages/home/index.js @@ -3,7 +3,7 @@ import WebinarsBanner from 'App/components/webinars-banner'; import AccountCard from './accountCard'; import HelpCard from './helpCard'; import WelcomeSection from './welcomeSection'; -import { WPSolutionsBanner } from '@newfold-labs/wp-module-ecommerce' +import { WPSolutionsBanner } from '@newfold-labs/wp-module-ecommerce'; const Home = () => { return ( From 4ac5661d317581104bc068cd449cf41c2279e199 Mon Sep 17 00:00:00 2001 From: aratidgr8 Date: Thu, 19 Sep 2024 15:16:28 +0530 Subject: [PATCH 03/53] Increase wait time in Home & Help page cypress tests --- tests/cypress/integration/help.cy.js | 2 +- tests/cypress/integration/home.cy.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/cypress/integration/help.cy.js b/tests/cypress/integration/help.cy.js index 54c12ca24..bbd2318af 100644 --- a/tests/cypress/integration/help.cy.js +++ b/tests/cypress/integration/help.cy.js @@ -27,7 +27,7 @@ describe( 'Help Page', function () { it( 'Is Accessible', () => { cy.injectAxe(); - cy.wait( 500 ); + cy.wait( 1000 ); cy.checkA11y( '.wppbh-app-body' ); } ); diff --git a/tests/cypress/integration/home.cy.js b/tests/cypress/integration/home.cy.js index 54cf10f97..a13a98bc4 100644 --- a/tests/cypress/integration/home.cy.js +++ b/tests/cypress/integration/home.cy.js @@ -23,7 +23,7 @@ describe( 'Home Page', function () { } ); it( 'Is Accessible', () => { - cy.wait( 500 ); + cy.wait( 1000 ); cy.checkA11y( '.wppbh-app-body' ); } ); From 6b1622d55dc4db65061460e7009a31538195cccc Mon Sep 17 00:00:00 2001 From: aratidgr8 Date: Thu, 19 Sep 2024 20:17:05 +0530 Subject: [PATCH 04/53] Create page linked WP module Solutions in BH --- src/app/data/routes.js | 9 +++++++++ src/app/pages/wpsolutions/index.js | 21 +++++++++++++++++++++ src/app/pages/wpsolutions/style.scss | 12 ++++++++++++ 3 files changed, 42 insertions(+) create mode 100644 src/app/pages/wpsolutions/index.js create mode 100644 src/app/pages/wpsolutions/style.scss diff --git a/src/app/data/routes.js b/src/app/data/routes.js index 2c96452dc..e10d0a6c2 100644 --- a/src/app/data/routes.js +++ b/src/app/data/routes.js @@ -15,6 +15,7 @@ import Home from '../pages/home'; import PagesAndPosts from '../pages/pages-and-posts'; import Store from '../pages/ecommerce/page'; import Marketplace from '../pages/marketplace'; +import WPSolution from '../pages/wpsolutions'; import Performance from '../pages/performance'; import Settings from '../pages/settings'; import Staging from '../pages/staging'; @@ -69,6 +70,7 @@ const topRoutePaths = [ '/pages-and-posts', '/store', '/marketplace', + '/my_plugins_and_tools', '/performance', '/settings', '/staging', @@ -135,6 +137,13 @@ export const routes = [ subRoutes: await getMarketplaceSubnavRoutes(), condition: true, }, + { + name: '/my_plugins_and_tools', + title: __( 'My Plugins & Tools', 'wp-plugin-bluehost' ), + Component: WPSolution, + Icon: ShoppingBagIcon, + condition: true, + }, { name: '/performance', title: __( 'Performance', 'wp-plugin-bluehost' ), diff --git a/src/app/pages/wpsolutions/index.js b/src/app/pages/wpsolutions/index.js new file mode 100644 index 000000000..28158a00a --- /dev/null +++ b/src/app/pages/wpsolutions/index.js @@ -0,0 +1,21 @@ +import './styles.scss'; +import { Page } from '@newfold/ui-component-library'; +import { NewfoldSolutions } from '@newfold-labs/wp-module-solutions'; +import '@newfold-labs/wp-module-ecommerce/bluehost.css'; +import { useNavigate } from 'react-router-dom'; +import { useNotification } from '../../components/notifications'; + +const WPSolutions = () => { + + const navigate = useNavigate(); + const notify = useNotification(); + const wpModules = { navigate, notify }; + + return ( + + + + ); +}; + +export default WPSolutions; diff --git a/src/app/pages/wpsolutions/style.scss b/src/app/pages/wpsolutions/style.scss new file mode 100644 index 000000000..f0988190a --- /dev/null +++ b/src/app/pages/wpsolutions/style.scss @@ -0,0 +1,12 @@ +.nfd-root { + .nfd-modal.no-overlay { + .nfd-modal__overlay { + display: none; + } + } + .nfd-feature-upsell.hide-html { + .nfd-flex { + background-color: rgb(255 255 255 / 0.5); + } + } +} \ No newline at end of file From 45398e1bf30b37c89614534fd9194b472954d0f5 Mon Sep 17 00:00:00 2001 From: aratidgr8 Date: Thu, 19 Sep 2024 20:23:02 +0530 Subject: [PATCH 05/53] Add menu icon for My plugins & tools --- src/app/data/routes.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/data/routes.js b/src/app/data/routes.js index e10d0a6c2..68231eccc 100644 --- a/src/app/data/routes.js +++ b/src/app/data/routes.js @@ -6,6 +6,7 @@ import { AdjustmentsHorizontalIcon, BuildingStorefrontIcon, DocumentDuplicateIcon, + PuzzlePieceIcon } from '@heroicons/react/24/outline'; import { ReactComponent as HelpIcon } from '../components/icons/HelpIcon.svg'; import { NewfoldRuntime } from '@newfold-labs/wp-module-runtime'; @@ -141,7 +142,7 @@ export const routes = [ name: '/my_plugins_and_tools', title: __( 'My Plugins & Tools', 'wp-plugin-bluehost' ), Component: WPSolution, - Icon: ShoppingBagIcon, + Icon: PuzzlePieceIcon, condition: true, }, { From 8dfcac7039ba40c2c58658a2322dd4f6cdaa9189 Mon Sep 17 00:00:00 2001 From: aratidgr8 Date: Mon, 23 Sep 2024 21:05:51 +0530 Subject: [PATCH 06/53] ESLint fix --- src/app/data/routes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/data/routes.js b/src/app/data/routes.js index 68231eccc..148b7aea3 100644 --- a/src/app/data/routes.js +++ b/src/app/data/routes.js @@ -6,7 +6,7 @@ import { AdjustmentsHorizontalIcon, BuildingStorefrontIcon, DocumentDuplicateIcon, - PuzzlePieceIcon + PuzzlePieceIcon, } from '@heroicons/react/24/outline'; import { ReactComponent as HelpIcon } from '../components/icons/HelpIcon.svg'; import { NewfoldRuntime } from '@newfold-labs/wp-module-runtime'; From 01c36fe25f7e9526513bfce24dfc7a0c828f739a Mon Sep 17 00:00:00 2001 From: Evan Mullins Date: Wed, 2 Oct 2024 14:21:11 -0400 Subject: [PATCH 07/53] update to use buildless component --- composer.json | 1 + composer.lock | 50 +++++++++++++++- src/app/data/routes.js | 2 +- src/app/pages/solutions/index.js | 58 +++++++++++++++++++ .../{wpsolutions => solutions}/style.scss | 0 src/app/pages/wpsolutions/index.js | 21 ------- 6 files changed, 109 insertions(+), 23 deletions(-) create mode 100644 src/app/pages/solutions/index.js rename src/app/pages/{wpsolutions => solutions}/style.scss (100%) delete mode 100644 src/app/pages/wpsolutions/index.js diff --git a/composer.json b/composer.json index be79c8a95..3208128be 100644 --- a/composer.json +++ b/composer.json @@ -93,6 +93,7 @@ "newfold-labs/wp-module-performance": "2.0.1 as 1.9.9", "newfold-labs/wp-module-runtime": "^1.0.11", "newfold-labs/wp-module-secure-passwords": "^1.1.1", + "newfold-labs/wp-module-solutions": "dev-update/buildless-component", "newfold-labs/wp-module-sso": "^1.0.6", "newfold-labs/wp-module-staging": "^2.1.0", "wp-forge/wp-update-handler": "^1.0.2", diff --git a/composer.lock b/composer.lock index 24988f423..88aed476f 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": "b1b36c7b3a5d00dd3305d0769b6f80c4", + "content-hash": "cd36857f0019c125c67cafa8ea9862d3", "packages": [ { "name": "doctrine/inflector", @@ -1905,6 +1905,53 @@ }, "time": "2024-01-31T18:14:24+00:00" }, + { + "name": "newfold-labs/wp-module-solutions", + "version": "dev-update/buildless-component", + "source": { + "type": "git", + "url": "git@github.com:newfold-labs/wp-module-solutions.git", + "reference": "835364c1bd3117c8fabb6b3fc07c60ff5b4655b5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/newfold-labs/wp-module-solutions/zipball/835364c1bd3117c8fabb6b3fc07c60ff5b4655b5", + "reference": "835364c1bd3117c8fabb6b3fc07c60ff5b4655b5", + "shasum": "" + }, + "require": { + "newfold-labs/wp-module-data": "^2.6.3", + "newfold-labs/wp-module-loader": "^1.0.10" + }, + "require-dev": { + "newfold-labs/wp-php-standards": "^1.2", + "wp-cli/i18n-command": "^2.4.3" + }, + "type": "library", + "autoload": { + "psr-4": { + "NewfoldLabs\\WP\\Module\\Solutions\\": "includes" + }, + "files": [ + "bootstrap.php" + ] + }, + "license": [ + "GPL-3.0-or-later" + ], + "authors": [ + { + "name": "arati bhandare AKA aratidgr8", + "email": "aratidgr8@gmail.com" + } + ], + "description": "A Newfold module that handles integration of WordPress Solutions Addon packages (content creator/ service / ecommerce) for BlueHost & HostGator customers", + "support": { + "source": "https://github.com/newfold-labs/wp-module-solutions/tree/update/buildless-component", + "issues": "https://github.com/newfold-labs/wp-module-solutions/issues" + }, + "time": "2024-10-02T17:57:59+00:00" + }, { "name": "newfold-labs/wp-module-sso", "version": "1.0.6", @@ -4935,6 +4982,7 @@ ], "minimum-stability": "stable", "stability-flags": { + "newfold-labs/wp-module-solutions": 20, "roave/security-advisories": 20 }, "prefer-stable": false, diff --git a/src/app/data/routes.js b/src/app/data/routes.js index 148b7aea3..39f10ca74 100644 --- a/src/app/data/routes.js +++ b/src/app/data/routes.js @@ -16,7 +16,7 @@ import Home from '../pages/home'; import PagesAndPosts from '../pages/pages-and-posts'; import Store from '../pages/ecommerce/page'; import Marketplace from '../pages/marketplace'; -import WPSolution from '../pages/wpsolutions'; +import Solutions from '../pages/solutions'; import Performance from '../pages/performance'; import Settings from '../pages/settings'; import Staging from '../pages/staging'; diff --git a/src/app/pages/solutions/index.js b/src/app/pages/solutions/index.js new file mode 100644 index 000000000..58600dab4 --- /dev/null +++ b/src/app/pages/solutions/index.js @@ -0,0 +1,58 @@ +import './style.scss'; +import apiFetch from '@wordpress/api-fetch'; +import { useState, useEffect } from '@wordpress/element'; +import { useLocation, useMatch, useNavigate } from 'react-router-dom'; +import { Container, Page, Title } from '@newfold/ui-component-library'; +import { NewfoldRuntime } from '@newfold-labs/wp-module-runtime'; +import { default as NewfoldEntitlements } from '@modules/wp-module-solutions/components/entitlements'; + +const Solutions = () => { + + // constants to pass to module + const moduleConstants = { + text: { + title: __( 'Solution', 'bluehost-wordpress-plugin' ), + subTitle: __( + 'Explore the entitlements available with your solution.', + 'bluehost-wordpress-plugin' + ), + error: __( + 'Oops, there was an error loading the entitlements, please try again later.', + 'bluehost-wordpress-plugin' + ), + noEntitlements: __( + 'Sorry, no current entitlements. Please, try again later.', + 'bluehost-wordpress-plugin' + ), + }, + }; + + // methods to pass to module + const moduleMethods = { + apiFetch, + classNames, + useState, + useEffect, + useLocation, + useMatch, + useNavigate, + NewfoldRuntime, + }; + + return ( + + + + + + ); +}; + +export default Solutions; diff --git a/src/app/pages/wpsolutions/style.scss b/src/app/pages/solutions/style.scss similarity index 100% rename from src/app/pages/wpsolutions/style.scss rename to src/app/pages/solutions/style.scss diff --git a/src/app/pages/wpsolutions/index.js b/src/app/pages/wpsolutions/index.js deleted file mode 100644 index 28158a00a..000000000 --- a/src/app/pages/wpsolutions/index.js +++ /dev/null @@ -1,21 +0,0 @@ -import './styles.scss'; -import { Page } from '@newfold/ui-component-library'; -import { NewfoldSolutions } from '@newfold-labs/wp-module-solutions'; -import '@newfold-labs/wp-module-ecommerce/bluehost.css'; -import { useNavigate } from 'react-router-dom'; -import { useNotification } from '../../components/notifications'; - -const WPSolutions = () => { - - const navigate = useNavigate(); - const notify = useNotification(); - const wpModules = { navigate, notify }; - - return ( - - - - ); -}; - -export default WPSolutions; From f5c3e66c410f47d7c1d2a34e46331b72ab2b73f9 Mon Sep 17 00:00:00 2001 From: Evan Mullins Date: Wed, 2 Oct 2024 15:45:40 -0400 Subject: [PATCH 08/53] fix renamed route --- src/app/data/routes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/data/routes.js b/src/app/data/routes.js index 39f10ca74..334a7ecbc 100644 --- a/src/app/data/routes.js +++ b/src/app/data/routes.js @@ -141,7 +141,7 @@ export const routes = [ { name: '/my_plugins_and_tools', title: __( 'My Plugins & Tools', 'wp-plugin-bluehost' ), - Component: WPSolution, + Component: Solutions, Icon: PuzzlePieceIcon, condition: true, }, From f1bd5c82d8b4c7d298fb209d7ba5096de580ab4f Mon Sep 17 00:00:00 2001 From: Evan Mullins Date: Thu, 3 Oct 2024 12:38:22 -0400 Subject: [PATCH 09/53] update to dev release of solutions module --- composer.json | 2 +- composer.lock | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 147c439f0..31fa8e3cb 100644 --- a/composer.json +++ b/composer.json @@ -93,7 +93,7 @@ "newfold-labs/wp-module-performance": "2.0.1 as 1.9.9", "newfold-labs/wp-module-runtime": "^1.0.11", "newfold-labs/wp-module-secure-passwords": "^1.1.1", - "newfold-labs/wp-module-solutions": "dev-update/buildless-component", + "newfold-labs/wp-module-solutions": "^0.1.0", "newfold-labs/wp-module-sso": "^1.0.6", "newfold-labs/wp-module-staging": "^2.1.1", "wp-forge/wp-update-handler": "^1.0.2", diff --git a/composer.lock b/composer.lock index 54695e86c..04e2e59e1 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": "3bf91854bcfd1a318855705fd1524811", + "content-hash": "1167cfa5eecc85cb4a812a64d60918b5", "packages": [ { "name": "doctrine/inflector", @@ -1907,16 +1907,16 @@ }, { "name": "newfold-labs/wp-module-solutions", - "version": "dev-update/buildless-component", + "version": "0.1.0", "source": { "type": "git", "url": "git@github.com:newfold-labs/wp-module-solutions.git", - "reference": "835364c1bd3117c8fabb6b3fc07c60ff5b4655b5" + "reference": "594739553c8d1a5d281cc432c7bdbd64200d4c0d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/newfold-labs/wp-module-solutions/zipball/835364c1bd3117c8fabb6b3fc07c60ff5b4655b5", - "reference": "835364c1bd3117c8fabb6b3fc07c60ff5b4655b5", + "url": "https://api.github.com/repos/newfold-labs/wp-module-solutions/zipball/594739553c8d1a5d281cc432c7bdbd64200d4c0d", + "reference": "594739553c8d1a5d281cc432c7bdbd64200d4c0d", "shasum": "" }, "require": { @@ -1947,10 +1947,10 @@ ], "description": "A Newfold module that handles integration of WordPress Solutions Addon packages (content creator/ service / ecommerce) for BlueHost & HostGator customers", "support": { - "source": "https://github.com/newfold-labs/wp-module-solutions/tree/update/buildless-component", + "source": "https://github.com/newfold-labs/wp-module-solutions/tree/0.1.0", "issues": "https://github.com/newfold-labs/wp-module-solutions/issues" }, - "time": "2024-10-02T17:57:59+00:00" + "time": "2024-10-03T16:27:00+00:00" }, { "name": "newfold-labs/wp-module-sso", @@ -4985,7 +4985,6 @@ ], "minimum-stability": "stable", "stability-flags": { - "newfold-labs/wp-module-solutions": 20, "roave/security-advisories": 20 }, "prefer-stable": false, From 961151d4c88818df1faf761621e147cef127a9cb Mon Sep 17 00:00:00 2001 From: "lokapure.girish" Date: Mon, 7 Oct 2024 18:48:15 +0530 Subject: [PATCH 10/53] removes my active product section from home page --- src/app/pages/home/index.js | 7 ---- src/app/pages/home/myProductsSection.js | 54 ------------------------- 2 files changed, 61 deletions(-) delete mode 100644 src/app/pages/home/myProductsSection.js diff --git a/src/app/pages/home/index.js b/src/app/pages/home/index.js index 5b41b28f6..bd7f2254c 100644 --- a/src/app/pages/home/index.js +++ b/src/app/pages/home/index.js @@ -1,16 +1,10 @@ import { Container, Page } from '@newfold/ui-component-library'; -import { NewfoldRuntime } from '@newfold-labs/wp-module-runtime'; import WebinarsBanner from 'App/components/webinars-banner'; import AccountCard from './accountCard'; import HelpCard from './helpCard'; import WelcomeSection from './welcomeSection'; -import MyProductSection from './myProductsSection'; const Home = () => { - const abTestShowMyProducts = NewfoldRuntime.hasCapability( - 'abTestShowMyProducts' - ); - return ( @@ -23,7 +17,6 @@ const Home = () => {
- { abTestShowMyProducts && } ); }; diff --git a/src/app/pages/home/myProductsSection.js b/src/app/pages/home/myProductsSection.js deleted file mode 100644 index c379d7970..000000000 --- a/src/app/pages/home/myProductsSection.js +++ /dev/null @@ -1,54 +0,0 @@ -/* eslint-disable @wordpress/i18n-no-flanking-whitespace */ -import apiFetch from '@wordpress/api-fetch'; -import { useState, useEffect } from '@wordpress/element'; -import { NewfoldRuntime } from '@newfold-labs/wp-module-runtime'; -import { isJarvis } from '../../util/helpers'; -import { default as NewfoldMyProducts } from '@modules/wp-module-my-products/components/myProducts'; - -// constants to pass to module -const moduleConstants = { - text: { - error: __( - 'Oops, there was an error loading products, please try again later.', - 'bluehost-wordpress-plugin' - ), - noProducts: __( - 'Sorry, no products. Please, try again later.', - 'bluehost-wordpress-plugin' - ), - jarvisText: __( - 'Please login to your account manager to see products.', - 'bluehost-wordpress-plugin' - ), - title: __( 'My Products', 'bluehost-wordpress-plugin' ), - subTitle: __( - 'A list of products associated with your Bluehost hosting package. For more information, check out the ', - 'bluehost-wordpress-plugin' - ), - renewalText: __( - 'Bluehost Account Manager', - 'bluehost-wordpress-plugin' - ), - renewalCenterUrl: 'https://www.bluehost.com/my-account/renewal-center', - }, -}; - -// methods to pass to module -const moduleMethods = { - apiFetch, - useState, - useEffect, - NewfoldRuntime, - isJarvis, -}; - -const MyProductsSection = () => { - return ( - - ); -}; - -export default MyProductsSection; From 0c60a3a73123fa11171ab65b0275316f71423700 Mon Sep 17 00:00:00 2001 From: Evan Mullins Date: Tue, 8 Oct 2024 11:37:14 -0400 Subject: [PATCH 11/53] update to latest solutions module with plugins and tools plugin tab --- composer.json | 2 +- composer.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index c3bb1eb05..dc5da55f7 100644 --- a/composer.json +++ b/composer.json @@ -93,7 +93,7 @@ "newfold-labs/wp-module-performance": "2.0.1 as 1.9.9", "newfold-labs/wp-module-runtime": "^1.0.11", "newfold-labs/wp-module-secure-passwords": "^1.1.1", - "newfold-labs/wp-module-solutions": "^0.1.0", + "newfold-labs/wp-module-solutions": "^0.2.0", "newfold-labs/wp-module-sso": "^1.0.6", "newfold-labs/wp-module-staging": "^2.1.1", "wp-forge/wp-update-handler": "^1.0.2", diff --git a/composer.lock b/composer.lock index 40dc69dfb..8d8b644ec 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": "5369ac1fd4a07939fe22b95d97694435", + "content-hash": "7a24e851a7e1eb5ed4094d81ce276cf9", "packages": [ { "name": "doctrine/inflector", @@ -1907,16 +1907,16 @@ }, { "name": "newfold-labs/wp-module-solutions", - "version": "0.1.0", + "version": "0.2.0", "source": { "type": "git", - "url": "git@github.com:newfold-labs/wp-module-solutions.git", - "reference": "594739553c8d1a5d281cc432c7bdbd64200d4c0d" + "url": "https://github.com/newfold-labs/wp-module-solutions.git", + "reference": "c562ec4992c7b1f54056a741fefe3a64c3cb3c52" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/newfold-labs/wp-module-solutions/zipball/594739553c8d1a5d281cc432c7bdbd64200d4c0d", - "reference": "594739553c8d1a5d281cc432c7bdbd64200d4c0d", + "url": "https://api.github.com/repos/newfold-labs/wp-module-solutions/zipball/c562ec4992c7b1f54056a741fefe3a64c3cb3c52", + "reference": "c562ec4992c7b1f54056a741fefe3a64c3cb3c52", "shasum": "" }, "require": { @@ -1947,10 +1947,10 @@ ], "description": "A Newfold module that handles integration of WordPress Solutions Addon packages (content creator/ service / ecommerce) for BlueHost & HostGator customers", "support": { - "source": "https://github.com/newfold-labs/wp-module-solutions/tree/0.1.0", + "source": "https://github.com/newfold-labs/wp-module-solutions/tree/0.2.0", "issues": "https://github.com/newfold-labs/wp-module-solutions/issues" }, - "time": "2024-10-03T16:27:00+00:00" + "time": "2024-10-08T15:24:39+00:00" }, { "name": "newfold-labs/wp-module-sso", From 17d84b2446b9f790facbe1d63651381d3d088bd2 Mon Sep 17 00:00:00 2001 From: Evan Mullins Date: Tue, 8 Oct 2024 20:13:51 -0400 Subject: [PATCH 12/53] update solutions module to dev release 0.3.0 --- composer.json | 2 +- composer.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index dc5da55f7..e59c25b4d 100644 --- a/composer.json +++ b/composer.json @@ -93,7 +93,7 @@ "newfold-labs/wp-module-performance": "2.0.1 as 1.9.9", "newfold-labs/wp-module-runtime": "^1.0.11", "newfold-labs/wp-module-secure-passwords": "^1.1.1", - "newfold-labs/wp-module-solutions": "^0.2.0", + "newfold-labs/wp-module-solutions": "^0.3.0", "newfold-labs/wp-module-sso": "^1.0.6", "newfold-labs/wp-module-staging": "^2.1.1", "wp-forge/wp-update-handler": "^1.0.2", diff --git a/composer.lock b/composer.lock index 8d8b644ec..094cd3b77 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": "7a24e851a7e1eb5ed4094d81ce276cf9", + "content-hash": "19173d8aadda4fc8862bddbb9b8b6f8d", "packages": [ { "name": "doctrine/inflector", @@ -1907,16 +1907,16 @@ }, { "name": "newfold-labs/wp-module-solutions", - "version": "0.2.0", + "version": "0.3.0", "source": { "type": "git", "url": "https://github.com/newfold-labs/wp-module-solutions.git", - "reference": "c562ec4992c7b1f54056a741fefe3a64c3cb3c52" + "reference": "4a2f363e9d9dba0a0402d8ec2530259d4913199e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/newfold-labs/wp-module-solutions/zipball/c562ec4992c7b1f54056a741fefe3a64c3cb3c52", - "reference": "c562ec4992c7b1f54056a741fefe3a64c3cb3c52", + "url": "https://api.github.com/repos/newfold-labs/wp-module-solutions/zipball/4a2f363e9d9dba0a0402d8ec2530259d4913199e", + "reference": "4a2f363e9d9dba0a0402d8ec2530259d4913199e", "shasum": "" }, "require": { @@ -1947,10 +1947,10 @@ ], "description": "A Newfold module that handles integration of WordPress Solutions Addon packages (content creator/ service / ecommerce) for BlueHost & HostGator customers", "support": { - "source": "https://github.com/newfold-labs/wp-module-solutions/tree/0.2.0", + "source": "https://github.com/newfold-labs/wp-module-solutions/tree/0.3.0", "issues": "https://github.com/newfold-labs/wp-module-solutions/issues" }, - "time": "2024-10-08T15:24:39+00:00" + "time": "2024-10-09T00:09:59+00:00" }, { "name": "newfold-labs/wp-module-sso", From bae47590cbca26b75c403b082fe6b9ff5aaaceda Mon Sep 17 00:00:00 2001 From: aratidgr8 Date: Wed, 9 Oct 2024 18:50:44 +0530 Subject: [PATCH 13/53] Undo cypress tests changes --- tests/cypress/integration/help.cy.js | 2 +- tests/cypress/integration/home.cy.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/cypress/integration/help.cy.js b/tests/cypress/integration/help.cy.js index bbd2318af..54c12ca24 100644 --- a/tests/cypress/integration/help.cy.js +++ b/tests/cypress/integration/help.cy.js @@ -27,7 +27,7 @@ describe( 'Help Page', function () { it( 'Is Accessible', () => { cy.injectAxe(); - cy.wait( 1000 ); + cy.wait( 500 ); cy.checkA11y( '.wppbh-app-body' ); } ); diff --git a/tests/cypress/integration/home.cy.js b/tests/cypress/integration/home.cy.js index a13a98bc4..54cf10f97 100644 --- a/tests/cypress/integration/home.cy.js +++ b/tests/cypress/integration/home.cy.js @@ -23,7 +23,7 @@ describe( 'Home Page', function () { } ); it( 'Is Accessible', () => { - cy.wait( 1000 ); + cy.wait( 500 ); cy.checkA11y( '.wppbh-app-body' ); } ); From 5258fc460413ae963eae33bd0960866719c27d50 Mon Sep 17 00:00:00 2001 From: Evan Mullins Date: Wed, 9 Oct 2024 10:22:30 -0400 Subject: [PATCH 14/53] update solutions, pls, and installer modules to latest solutions related releases --- composer.json | 4 ++- composer.lock | 80 ++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 69 insertions(+), 15 deletions(-) diff --git a/composer.json b/composer.json index e59c25b4d..bf06aac9d 100644 --- a/composer.json +++ b/composer.json @@ -83,6 +83,7 @@ "newfold-labs/wp-module-features": "^1.4.2", "newfold-labs/wp-module-global-ctb": "^1.0.13", "newfold-labs/wp-module-help-center": "^2.1.0", + "newfold-labs/wp-module-installer": "^1.2.0-beta", "newfold-labs/wp-module-loader": "^1.0.10", "newfold-labs/wp-module-marketplace": "^2.4.0", "newfold-labs/wp-module-migration": "^1.0.11", @@ -91,9 +92,10 @@ "newfold-labs/wp-module-onboarding": "^2.4.2", "newfold-labs/wp-module-patterns": "^2.4.1", "newfold-labs/wp-module-performance": "2.0.1 as 1.9.9", + "newfold-labs/wp-module-pls": "^0.1.0", "newfold-labs/wp-module-runtime": "^1.0.11", "newfold-labs/wp-module-secure-passwords": "^1.1.1", - "newfold-labs/wp-module-solutions": "^0.3.0", + "newfold-labs/wp-module-solutions": "^0.5.0", "newfold-labs/wp-module-sso": "^1.0.6", "newfold-labs/wp-module-staging": "^2.1.1", "wp-forge/wp-update-handler": "^1.0.2", diff --git a/composer.lock b/composer.lock index 094cd3b77..5744b478f 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": "19173d8aadda4fc8862bddbb9b8b6f8d", + "content-hash": "f4d3ff61ca3811709aa79e3b9d611d4d", "packages": [ { "name": "doctrine/inflector", @@ -1284,20 +1284,24 @@ }, { "name": "newfold-labs/wp-module-installer", - "version": "1.1.5", + "version": "1.2.0-beta", "source": { "type": "git", "url": "https://github.com/newfold-labs/wp-module-installer.git", - "reference": "b418c3aa8c192e805930abd9871b301d16671ba8" + "reference": "ac8d961df8e6826df952d08eeb3f5a7f9b171db0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/newfold-labs/wp-module-installer/zipball/b418c3aa8c192e805930abd9871b301d16671ba8", - "reference": "b418c3aa8c192e805930abd9871b301d16671ba8", + "url": "https://api.github.com/repos/newfold-labs/wp-module-installer/zipball/ac8d961df8e6826df952d08eeb3f5a7f9b171db0", + "reference": "ac8d961df8e6826df952d08eeb3f5a7f9b171db0", "shasum": "" }, + "require": { + "newfold-labs/wp-module-pls": "^0.1.0" + }, "require-dev": { - "newfold-labs/wp-php-standards": "^1.2" + "newfold-labs/wp-php-standards": "^1.2", + "wp-cli/wp-cli": "^2.11" }, "type": "library", "autoload": { @@ -1319,10 +1323,10 @@ ], "description": "An installer for WordPress plugins and themes.", "support": { - "source": "https://github.com/newfold-labs/wp-module-installer/tree/1.1.5", + "source": "https://github.com/newfold-labs/wp-module-installer/tree/1.2.0-beta", "issues": "https://github.com/newfold-labs/wp-module-installer/issues" }, - "time": "2024-08-28T06:37:38+00:00" + "time": "2024-10-09T08:34:34+00:00" }, { "name": "newfold-labs/wp-module-loader", @@ -1804,6 +1808,53 @@ }, "time": "2024-08-15T22:17:47+00:00" }, + { + "name": "newfold-labs/wp-module-pls", + "version": "0.1.0", + "source": { + "type": "git", + "url": "https://github.com/newfold-labs/wp-module-pls.git", + "reference": "ffa1517c18da067dd830c809f74aee597f05dc17" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/newfold-labs/wp-module-pls/zipball/ffa1517c18da067dd830c809f74aee597f05dc17", + "reference": "ffa1517c18da067dd830c809f74aee597f05dc17", + "shasum": "" + }, + "require": { + "newfold-labs/wp-module-data": "^2.0" + }, + "require-dev": { + "newfold-labs/wp-php-standards": "^1.2", + "wp-cli/i18n-command": "^2.4.3", + "wp-cli/wp-cli": "^2.11" + }, + "type": "library", + "autoload": { + "psr-4": { + "NewfoldLabs\\WP\\Module\\PLS\\": "includes" + }, + "files": [ + "bootstrap.php" + ] + }, + "license": [ + "GPL-3.0-or-later" + ], + "authors": [ + { + "name": "arunshenoy99", + "email": "devarunshenoy99@gmail.com" + } + ], + "description": "A Newfold module that handles license key provisioning, validation, and other lifecycle events for registered plugins using the PLS API via Hiive.", + "support": { + "source": "https://github.com/newfold-labs/wp-module-pls/tree/0.1.0", + "issues": "https://github.com/newfold-labs/wp-module-pls/issues" + }, + "time": "2024-10-09T08:23:27+00:00" + }, { "name": "newfold-labs/wp-module-runtime", "version": "v1.0.11", @@ -1907,16 +1958,16 @@ }, { "name": "newfold-labs/wp-module-solutions", - "version": "0.3.0", + "version": "0.5.0", "source": { "type": "git", "url": "https://github.com/newfold-labs/wp-module-solutions.git", - "reference": "4a2f363e9d9dba0a0402d8ec2530259d4913199e" + "reference": "ee8a4e469828391332fc8c0ad1507ed75b0b2ae3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/newfold-labs/wp-module-solutions/zipball/4a2f363e9d9dba0a0402d8ec2530259d4913199e", - "reference": "4a2f363e9d9dba0a0402d8ec2530259d4913199e", + "url": "https://api.github.com/repos/newfold-labs/wp-module-solutions/zipball/ee8a4e469828391332fc8c0ad1507ed75b0b2ae3", + "reference": "ee8a4e469828391332fc8c0ad1507ed75b0b2ae3", "shasum": "" }, "require": { @@ -1947,10 +1998,10 @@ ], "description": "A Newfold module that handles integration of WordPress Solutions Addon packages (content creator/ service / ecommerce) for BlueHost & HostGator customers", "support": { - "source": "https://github.com/newfold-labs/wp-module-solutions/tree/0.3.0", + "source": "https://github.com/newfold-labs/wp-module-solutions/tree/0.5.0", "issues": "https://github.com/newfold-labs/wp-module-solutions/issues" }, - "time": "2024-10-09T00:09:59+00:00" + "time": "2024-10-09T14:17:16+00:00" }, { "name": "newfold-labs/wp-module-sso", @@ -4985,6 +5036,7 @@ ], "minimum-stability": "stable", "stability-flags": { + "newfold-labs/wp-module-installer": 10, "roave/security-advisories": 20 }, "prefer-stable": false, From ed407fed778ae1d4bb36525fc19622cb6c1a0c4c Mon Sep 17 00:00:00 2001 From: Evan Mullins Date: Wed, 9 Oct 2024 10:49:07 -0400 Subject: [PATCH 15/53] update ecommerce module to solutions release 1.4.0-beta remove old component import --- composer.json | 2 +- composer.lock | 15 ++++++++------- package-lock.json | 8 ++++---- package.json | 2 +- src/app/pages/home/index.js | 1 - 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/composer.json b/composer.json index bf06aac9d..78871137c 100644 --- a/composer.json +++ b/composer.json @@ -78,7 +78,7 @@ "newfold-labs/wp-module-context": "^1.0.1", "newfold-labs/wp-module-data": "^2.6.3", "newfold-labs/wp-module-deactivation": "^1.2.3", - "newfold-labs/wp-module-ecommerce": "^1.3.44", + "newfold-labs/wp-module-ecommerce": "^1.4.0-beta", "newfold-labs/wp-module-facebook": "^1.0.9", "newfold-labs/wp-module-features": "^1.4.2", "newfold-labs/wp-module-global-ctb": "^1.0.13", diff --git a/composer.lock b/composer.lock index 5744b478f..b71ef66e6 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": "f4d3ff61ca3811709aa79e3b9d611d4d", + "content-hash": "ceb7171074eebdf0c687f82ed740b576", "packages": [ { "name": "doctrine/inflector", @@ -989,16 +989,16 @@ }, { "name": "newfold-labs/wp-module-ecommerce", - "version": "v1.3.44", + "version": "v1.4.0-beta", "source": { "type": "git", "url": "https://github.com/newfold-labs/wp-module-ecommerce.git", - "reference": "af885e2ea3a9bb55d5543bf2ef61b74b3b8c6e2f" + "reference": "981c25bf763959a2126c0faad992662b9b614513" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/newfold-labs/wp-module-ecommerce/zipball/af885e2ea3a9bb55d5543bf2ef61b74b3b8c6e2f", - "reference": "af885e2ea3a9bb55d5543bf2ef61b74b3b8c6e2f", + "url": "https://api.github.com/repos/newfold-labs/wp-module-ecommerce/zipball/981c25bf763959a2126c0faad992662b9b614513", + "reference": "981c25bf763959a2126c0faad992662b9b614513", "shasum": "" }, "require": { @@ -1041,10 +1041,10 @@ ], "description": "Brand Agnostic eCommerce Experience", "support": { - "source": "https://github.com/newfold-labs/wp-module-ecommerce/tree/v1.3.44", + "source": "https://github.com/newfold-labs/wp-module-ecommerce/tree/v1.4.0-beta", "issues": "https://github.com/newfold-labs/wp-module-ecommerce/issues" }, - "time": "2024-09-19T06:45:48+00:00" + "time": "2024-10-09T14:36:51+00:00" }, { "name": "newfold-labs/wp-module-facebook", @@ -5036,6 +5036,7 @@ ], "minimum-stability": "stable", "stability-flags": { + "newfold-labs/wp-module-ecommerce": 10, "newfold-labs/wp-module-installer": 10, "roave/security-advisories": 20 }, diff --git a/package-lock.json b/package-lock.json index 596c8516f..15e7b4953 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "GPL-2.0-or-later", "dependencies": { "@heroicons/react": "^2.1.5", - "@newfold-labs/wp-module-ecommerce": "^1.3.44", + "@newfold-labs/wp-module-ecommerce": "^1.4.0-beta", "@newfold-labs/wp-module-facebook": "^1.0.9", "@newfold-labs/wp-module-runtime": "^1.0.10", "@newfold/ui-component-library": "^1.1.0", @@ -3421,9 +3421,9 @@ } }, "node_modules/@newfold-labs/wp-module-ecommerce": { - "version": "1.3.44", - "resolved": "https://npm.pkg.github.com/download/@newfold-labs/wp-module-ecommerce/1.3.44/b1cb130523270d3d96028c4bcd57faf6dd7670a3", - "integrity": "sha512-TMkYrvaQsKT4QS/Drzsriu/1OHeb5e+zhjZTZiciL3nTMronnVta151WA94HFMVWOPuL9u1nORWPkKk4SLwJrQ==", + "version": "1.4.0-beta", + "resolved": "https://npm.pkg.github.com/download/@newfold-labs/wp-module-ecommerce/1.4.0-beta/435bbd662fa9b5c08e4599d3a80958c9f8244faa", + "integrity": "sha512-viawkn7OiuCc+O+zTV/KcnwkpQ4H3G83B5ukwOPMwx9+Zhl91c3aS01a5DDJcDDjOfsRckgDDmkKqWQoXiuxBQ==", "license": "GPL-2.0-or-later", "dependencies": { "@faizaanceg/pandora": "^1.1.1", diff --git a/package.json b/package.json index 369d56e4a..8c5eaf2b1 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ }, "dependencies": { "@heroicons/react": "^2.1.5", - "@newfold-labs/wp-module-ecommerce": "^1.3.44", + "@newfold-labs/wp-module-ecommerce": "^1.4.0-beta", "@newfold-labs/wp-module-facebook": "^1.0.9", "@newfold-labs/wp-module-runtime": "^1.0.10", "@newfold/ui-component-library": "^1.1.0", diff --git a/src/app/pages/home/index.js b/src/app/pages/home/index.js index 10869741e..ada303571 100644 --- a/src/app/pages/home/index.js +++ b/src/app/pages/home/index.js @@ -3,7 +3,6 @@ import WebinarsBanner from 'App/components/webinars-banner'; import AccountCard from './accountCard'; import HelpCard from './helpCard'; import WelcomeSection from './welcomeSection'; -import MyProductSection from './myProductsSection'; import { WPSolutionsBanner } from '@newfold-labs/wp-module-ecommerce'; const Home = () => { From 312527f11fec03b76cd6ce1a2679e2c04b84b343 Mon Sep 17 00:00:00 2001 From: aratidgr8 Date: Thu, 10 Oct 2024 13:50:58 +0530 Subject: [PATCH 16/53] PRESS0-2277, PRESS0-2282 - fixed --- inc/Admin.php | 43 ++++++++++++++++++++++++-------- src/app/data/routes.js | 6 ++--- src/app/pages/solutions/index.js | 7 ++---- 3 files changed, 38 insertions(+), 18 deletions(-) diff --git a/inc/Admin.php b/inc/Admin.php index 2659a5b30..d95cdb58e 100644 --- a/inc/Admin.php +++ b/inc/Admin.php @@ -9,6 +9,7 @@ use function NewfoldLabs\WP\Context\getContext; use function NewfoldLabs\WP\Module\Features\isEnabled; +use NewfoldLabs\WP\Module\Data\SiteCapabilities; /** * \Bluehost\Admin @@ -66,6 +67,10 @@ public static function add_to_runtime( $sdk ) { public static function subpages() { global $bluehost_module_container; + $capability = new SiteCapabilities(); + + $hasSolution = $capability->get( 'hasSolution' ); + $home = array( 'bluehost#/home' => __( 'Home', 'wp-plugin-bluehost' ), ); @@ -78,6 +83,9 @@ public static function subpages() { $marketplace = array( 'bluehost#/marketplace' => __( 'Marketplace', 'wp-plugin-bluehost' ), ); + $mypluginsandtools = array( + 'bluehost#/my_plugins_and_tools' => __( 'My Plugins & Tools', 'wp-plugin-bluehost' ), + ); // add performance if enabled $performance = isEnabled( 'performance' ) ? array( @@ -97,16 +105,31 @@ public static function subpages() { 'bluehost#/help' => __( 'Help', 'wp-plugin-bluehost' ), ); - return array_merge( - $home, - $pagesAndPosts, - $store, - $marketplace, - $performance, - $settings, - $staging, - $help - ); + if($hasSolution){ + return array_merge( + $home, + $pagesAndPosts, + $store, + $marketplace, + $mypluginsandtools, + $performance, + $settings, + $staging, + $help + ); + } + else{ + return array_merge( + $home, + $pagesAndPosts, + $store, + $marketplace, + $performance, + $settings, + $staging, + $help + ); + } } /** diff --git a/src/app/data/routes.js b/src/app/data/routes.js index 6500e42e5..392280d14 100644 --- a/src/app/data/routes.js +++ b/src/app/data/routes.js @@ -71,7 +71,7 @@ const topRoutePaths = [ '/pages-and-posts', '/store', '/marketplace', - '/my_plugins_and_tools', + '/my_plugins_and_tools', '/performance', '/settings', '/staging', @@ -138,13 +138,13 @@ export const routes = [ subRoutes: await getMarketplaceSubnavRoutes(), condition: true, }, - { + NewfoldRuntime.hasCapability( 'hasSolution' ) && { name: '/my_plugins_and_tools', title: __( 'My Plugins & Tools', 'wp-plugin-bluehost' ), Component: Solutions, Icon: PuzzlePieceIcon, condition: true, - }, + }, { name: '/performance', title: __( 'Performance', 'wp-plugin-bluehost' ), diff --git a/src/app/pages/solutions/index.js b/src/app/pages/solutions/index.js index 58600dab4..733bcd4fa 100644 --- a/src/app/pages/solutions/index.js +++ b/src/app/pages/solutions/index.js @@ -7,7 +7,6 @@ import { NewfoldRuntime } from '@newfold-labs/wp-module-runtime'; import { default as NewfoldEntitlements } from '@modules/wp-module-solutions/components/entitlements'; const Solutions = () => { - // constants to pass to module const moduleConstants = { text: { @@ -38,13 +37,11 @@ const Solutions = () => { useNavigate, NewfoldRuntime, }; - + return ( Date: Thu, 10 Oct 2024 17:59:40 +0530 Subject: [PATCH 17/53] Eslint fix src/app/pages/solutions/index.js --- src/app/pages/solutions/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/solutions/index.js b/src/app/pages/solutions/index.js index 733bcd4fa..778befa18 100644 --- a/src/app/pages/solutions/index.js +++ b/src/app/pages/solutions/index.js @@ -2,7 +2,7 @@ import './style.scss'; import apiFetch from '@wordpress/api-fetch'; import { useState, useEffect } from '@wordpress/element'; import { useLocation, useMatch, useNavigate } from 'react-router-dom'; -import { Container, Page, Title } from '@newfold/ui-component-library'; +import { Container, Page } from '@newfold/ui-component-library'; import { NewfoldRuntime } from '@newfold-labs/wp-module-runtime'; import { default as NewfoldEntitlements } from '@modules/wp-module-solutions/components/entitlements'; From 552b822e080086092e6aea12122ea323d33e9576 Mon Sep 17 00:00:00 2001 From: Evan Mullins Date: Thu, 10 Oct 2024 08:36:28 -0400 Subject: [PATCH 18/53] update to latest solutions module 0.6.0 --- composer.json | 2 +- composer.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index 78871137c..ec3d47211 100644 --- a/composer.json +++ b/composer.json @@ -95,7 +95,7 @@ "newfold-labs/wp-module-pls": "^0.1.0", "newfold-labs/wp-module-runtime": "^1.0.11", "newfold-labs/wp-module-secure-passwords": "^1.1.1", - "newfold-labs/wp-module-solutions": "^0.5.0", + "newfold-labs/wp-module-solutions": "^0.6.0", "newfold-labs/wp-module-sso": "^1.0.6", "newfold-labs/wp-module-staging": "^2.1.1", "wp-forge/wp-update-handler": "^1.0.2", diff --git a/composer.lock b/composer.lock index b71ef66e6..e22286af5 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": "ceb7171074eebdf0c687f82ed740b576", + "content-hash": "fc884c859d54a2a88968977037daaf1e", "packages": [ { "name": "doctrine/inflector", @@ -1958,16 +1958,16 @@ }, { "name": "newfold-labs/wp-module-solutions", - "version": "0.5.0", + "version": "0.6.0", "source": { "type": "git", "url": "https://github.com/newfold-labs/wp-module-solutions.git", - "reference": "ee8a4e469828391332fc8c0ad1507ed75b0b2ae3" + "reference": "8021fd6f530762606a13576213a33aa4930493aa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/newfold-labs/wp-module-solutions/zipball/ee8a4e469828391332fc8c0ad1507ed75b0b2ae3", - "reference": "ee8a4e469828391332fc8c0ad1507ed75b0b2ae3", + "url": "https://api.github.com/repos/newfold-labs/wp-module-solutions/zipball/8021fd6f530762606a13576213a33aa4930493aa", + "reference": "8021fd6f530762606a13576213a33aa4930493aa", "shasum": "" }, "require": { @@ -1998,10 +1998,10 @@ ], "description": "A Newfold module that handles integration of WordPress Solutions Addon packages (content creator/ service / ecommerce) for BlueHost & HostGator customers", "support": { - "source": "https://github.com/newfold-labs/wp-module-solutions/tree/0.5.0", + "source": "https://github.com/newfold-labs/wp-module-solutions/tree/0.6.0", "issues": "https://github.com/newfold-labs/wp-module-solutions/issues" }, - "time": "2024-10-09T14:17:16+00:00" + "time": "2024-10-10T12:24:08+00:00" }, { "name": "newfold-labs/wp-module-sso", From 17c1820e8c17f6f60902a5b8e2ffc06c98702537 Mon Sep 17 00:00:00 2001 From: aratidgr8 Date: Thu, 10 Oct 2024 18:40:08 +0530 Subject: [PATCH 19/53] Small screen alignment fix for accountCard - PRESS0-2276 --- src/app/pages/home/accountCard.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/app/pages/home/accountCard.js b/src/app/pages/home/accountCard.js index 6b813ede6..ba371e8ad 100644 --- a/src/app/pages/home/accountCard.js +++ b/src/app/pages/home/accountCard.js @@ -13,6 +13,7 @@ import { getPlatformBaseUrl, isJarvis, } from '../../util/helpers'; +import classNames from 'classnames'; const base = [ { @@ -82,11 +83,19 @@ const AccountCard = ( { props } ) => { Bluehost Account -