From 2302c94c1ac116e6d1a4d6231052fbf9e1553fc6 Mon Sep 17 00:00:00 2001 From: wpalani Date: Wed, 21 Aug 2024 21:45:57 -0700 Subject: [PATCH 1/5] Update version to 3.15.0 --- bluehost-wordpress-plugin.php | 4 ++-- package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bluehost-wordpress-plugin.php b/bluehost-wordpress-plugin.php index d31f3f67a..ebf08cafa 100644 --- a/bluehost-wordpress-plugin.php +++ b/bluehost-wordpress-plugin.php @@ -12,7 +12,7 @@ * Plugin URI: https://bluehost.com * Update URI: https://github.com/bluehost/bluehost-wordpress-plugin * Description: WordPress plugin that integrates a WordPress site with the Bluehost control panel, including performance, security, and update features. - * Version: 3.14.6 + * Version: 3.15.0 * Requires at least: 6.4 * Requires PHP: 7.3 * Tested up to: 6.6.1 @@ -32,7 +32,7 @@ } // Define constants -define( 'BLUEHOST_PLUGIN_VERSION', '3.14.6' ); +define( 'BLUEHOST_PLUGIN_VERSION', '3.15.0' ); define( 'BLUEHOST_PLUGIN_FILE', __FILE__ ); define( 'BLUEHOST_PLUGIN_DIR', plugin_dir_path( __FILE__ ) ); define( 'BLUEHOST_PLUGIN_URL', plugin_dir_url( __FILE__ ) ); diff --git a/package-lock.json b/package-lock.json index 03510ed24..9bab39d81 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "bluehost-wordpress-plugin", - "version": "3.14.6", + "version": "3.15.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "bluehost-wordpress-plugin", - "version": "3.14.6", + "version": "3.15.0", "license": "GPL-2.0-or-later", "dependencies": { "@heroicons/react": "^2.1.5", diff --git a/package.json b/package.json index 4d3fce87f..b3cf70601 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bluehost-wordpress-plugin", - "version": "3.14.6", + "version": "3.15.0", "description": "WordPress plugin that integrates your WordPress site with the Bluehost control panel, including performance, security, and update features.", "author": { "name": "Bluehost", From bc83ff95a8b2d60eb30427ebaf68975c54e169f0 Mon Sep 17 00:00:00 2001 From: wpalani Date: Thu, 22 Aug 2024 15:35:00 -0700 Subject: [PATCH 2/5] Bump my products module to 1.0.3 --- composer.json | 2 +- composer.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index efa79b77d..a46a3cb7a 100644 --- a/composer.json +++ b/composer.json @@ -86,7 +86,7 @@ "newfold-labs/wp-module-loader": "^1.0.10", "newfold-labs/wp-module-marketplace": "^2.4.0", "newfold-labs/wp-module-migration": "^1.0.11", - "newfold-labs/wp-module-my-products": "^1.0.2", + "newfold-labs/wp-module-my-products": "^1.0.3", "newfold-labs/wp-module-notifications": "^1.5.0", "newfold-labs/wp-module-onboarding": "^2.3.11", "newfold-labs/wp-module-patterns": "^2.3.1", diff --git a/composer.lock b/composer.lock index 3f5ed182e..6fd0e6ae6 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": "554a2c571f2ca68d4729edc817bb26a0", + "content-hash": "f6e0ff3ece4cdd6275d5fa174fe2e4af", "packages": [ { "name": "doctrine/inflector", @@ -1156,16 +1156,16 @@ }, { "name": "newfold-labs/wp-module-my-products", - "version": "1.0.2", + "version": "1.0.3", "source": { "type": "git", "url": "https://github.com/newfold-labs/wp-module-my-products.git", - "reference": "95705b1772f79b034800e02cd1a69f95a0316417" + "reference": "e0796b9087f5d4349ad0403a3bf55046ec620eb1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/newfold-labs/wp-module-my-products/zipball/95705b1772f79b034800e02cd1a69f95a0316417", - "reference": "95705b1772f79b034800e02cd1a69f95a0316417", + "url": "https://api.github.com/repos/newfold-labs/wp-module-my-products/zipball/e0796b9087f5d4349ad0403a3bf55046ec620eb1", + "reference": "e0796b9087f5d4349ad0403a3bf55046ec620eb1", "shasum": "" }, "require": { @@ -1208,10 +1208,10 @@ ], "description": "A module for rendering user-specific product data utilizing the Hiive Users API, which integrates with the Fulfilment Gateway API.", "support": { - "source": "https://github.com/newfold-labs/wp-module-my-products/tree/1.0.2", + "source": "https://github.com/newfold-labs/wp-module-my-products/tree/1.0.3", "issues": "https://github.com/newfold-labs/wp-module-my-products/issues" }, - "time": "2024-08-22T04:14:26+00:00" + "time": "2024-08-22T21:57:38+00:00" }, { "name": "newfold-labs/wp-module-notifications", From 52877729e842e41d3105ecfe8b488fd7a46a1fb5 Mon Sep 17 00:00:00 2001 From: wpalani Date: Mon, 26 Aug 2024 11:50:21 -0700 Subject: [PATCH 3/5] Update version to 3.14.7 --- bluehost-wordpress-plugin.php | 4 ++-- package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bluehost-wordpress-plugin.php b/bluehost-wordpress-plugin.php index ebf08cafa..61c79a47d 100644 --- a/bluehost-wordpress-plugin.php +++ b/bluehost-wordpress-plugin.php @@ -12,7 +12,7 @@ * Plugin URI: https://bluehost.com * Update URI: https://github.com/bluehost/bluehost-wordpress-plugin * Description: WordPress plugin that integrates a WordPress site with the Bluehost control panel, including performance, security, and update features. - * Version: 3.15.0 + * Version: 3.14.7 * Requires at least: 6.4 * Requires PHP: 7.3 * Tested up to: 6.6.1 @@ -32,7 +32,7 @@ } // Define constants -define( 'BLUEHOST_PLUGIN_VERSION', '3.15.0' ); +define( 'BLUEHOST_PLUGIN_VERSION', '3.14.7' ); define( 'BLUEHOST_PLUGIN_FILE', __FILE__ ); define( 'BLUEHOST_PLUGIN_DIR', plugin_dir_path( __FILE__ ) ); define( 'BLUEHOST_PLUGIN_URL', plugin_dir_url( __FILE__ ) ); diff --git a/package-lock.json b/package-lock.json index 9bab39d81..f890ffea5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "bluehost-wordpress-plugin", - "version": "3.15.0", + "version": "3.14.7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "bluehost-wordpress-plugin", - "version": "3.15.0", + "version": "3.14.7", "license": "GPL-2.0-or-later", "dependencies": { "@heroicons/react": "^2.1.5", diff --git a/package.json b/package.json index b3cf70601..060f4c5b8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bluehost-wordpress-plugin", - "version": "3.15.0", + "version": "3.14.7", "description": "WordPress plugin that integrates your WordPress site with the Bluehost control panel, including performance, security, and update features.", "author": { "name": "Bluehost", From 92ec80cfd963e5dd8c5ac078ad198e86a762f358 Mon Sep 17 00:00:00 2001 From: wpalani Date: Mon, 26 Aug 2024 11:53:48 -0700 Subject: [PATCH 4/5] Remove my products module --- composer.json | 1 - composer.lock | 61 +------------------------ src/app/pages/home/index.js | 6 --- src/app/pages/home/myProductsSection.js | 53 --------------------- 4 files changed, 1 insertion(+), 120 deletions(-) delete mode 100644 src/app/pages/home/myProductsSection.js diff --git a/composer.json b/composer.json index a46a3cb7a..a1b75ec79 100644 --- a/composer.json +++ b/composer.json @@ -86,7 +86,6 @@ "newfold-labs/wp-module-loader": "^1.0.10", "newfold-labs/wp-module-marketplace": "^2.4.0", "newfold-labs/wp-module-migration": "^1.0.11", - "newfold-labs/wp-module-my-products": "^1.0.3", "newfold-labs/wp-module-notifications": "^1.5.0", "newfold-labs/wp-module-onboarding": "^2.3.11", "newfold-labs/wp-module-patterns": "^2.3.1", diff --git a/composer.lock b/composer.lock index 6fd0e6ae6..0a7cc593e 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": "f6e0ff3ece4cdd6275d5fa174fe2e4af", + "content-hash": "460a529c9817ae719ddd78ed07ff66fc", "packages": [ { "name": "doctrine/inflector", @@ -1154,65 +1154,6 @@ }, "time": "2024-08-21T14:04:06+00:00" }, - { - "name": "newfold-labs/wp-module-my-products", - "version": "1.0.3", - "source": { - "type": "git", - "url": "https://github.com/newfold-labs/wp-module-my-products.git", - "reference": "e0796b9087f5d4349ad0403a3bf55046ec620eb1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/newfold-labs/wp-module-my-products/zipball/e0796b9087f5d4349ad0403a3bf55046ec620eb1", - "reference": "e0796b9087f5d4349ad0403a3bf55046ec620eb1", - "shasum": "" - }, - "require": { - "newfold-labs/wp-module-context": "^1.0", - "newfold-labs/wp-module-data": "^2.6.1", - "newfold-labs/wp-module-features": "^1.3.0" - }, - "require-dev": { - "newfold-labs/wp-php-standards": "^1.2" - }, - "type": "library", - "autoload": { - "psr-4": { - "NewfoldLabs\\WP\\Module\\MyProducts\\": "includes" - }, - "files": [ - "bootstrap.php" - ] - }, - "scripts": { - "fix": [ - "vendor/bin/phpcbf --standard=phpcs.xml ." - ], - "lint": [ - "vendor/bin/phpcs --standard=phpcs.xml -s ." - ] - }, - "license": [ - "GPL-2.0-or-later" - ], - "authors": [ - { - "name": "Vara Prasad Maruboina", - "email": "varaprasad.maruboina@newfold.com" - }, - { - "name": "Girish Lokapure", - "email": "girish.lokapure@newfold.com" - } - ], - "description": "A module for rendering user-specific product data utilizing the Hiive Users API, which integrates with the Fulfilment Gateway API.", - "support": { - "source": "https://github.com/newfold-labs/wp-module-my-products/tree/1.0.3", - "issues": "https://github.com/newfold-labs/wp-module-my-products/issues" - }, - "time": "2024-08-22T21:57:38+00:00" - }, { "name": "newfold-labs/wp-module-notifications", "version": "1.5.0", diff --git a/src/app/pages/home/index.js b/src/app/pages/home/index.js index 7598c1bc9..396a958c4 100644 --- a/src/app/pages/home/index.js +++ b/src/app/pages/home/index.js @@ -1,15 +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 abTestShowMyProducts = NewfoldRuntime.hasCapability( - 'abTestShowMyProducts' -); - const Home = () => { return ( @@ -23,7 +18,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 39be23d3e..000000000 --- a/src/app/pages/home/myProductsSection.js +++ /dev/null @@ -1,53 +0,0 @@ -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 f574a849e84d61e6d29eb7d5138c0d97f1e01b63 Mon Sep 17 00:00:00 2001 From: wpalani Date: Mon, 26 Aug 2024 11:56:33 -0700 Subject: [PATCH 5/5] Remove MyProductSection --- src/app/pages/home/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/pages/home/index.js b/src/app/pages/home/index.js index 396a958c4..bd7f2254c 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'; const Home = () => { return (