From 22ec27f1673f7126f43fa7cac041c90f773ae879 Mon Sep 17 00:00:00 2001 From: aulisius Date: Fri, 26 May 2023 23:14:28 +0530 Subject: [PATCH 1/3] Bump newfold-labs/wp-module-ecommerce to 0.9.1 --- composer.json | 2 +- composer.lock | 58 ++++++++++++++++++++++++++++++++++++++++------- package-lock.json | 10 ++++---- package.json | 2 +- 4 files changed, 57 insertions(+), 15 deletions(-) diff --git a/composer.json b/composer.json index 57047d766..342dec15b 100644 --- a/composer.json +++ b/composer.json @@ -72,7 +72,7 @@ "newfold-labs/wp-module-ctb": "^1.0.0", "newfold-labs/wp-module-customer-bluehost": "^1.5.3", "newfold-labs/wp-module-data": "^2.3", - "newfold-labs/wp-module-ecommerce": "0.9.0", + "newfold-labs/wp-module-ecommerce": "0.9.1", "newfold-labs/wp-module-loader": "^1.0.10", "newfold-labs/wp-module-marketplace": "^1.5.1", "newfold-labs/wp-module-notifications": "^1.1.2", diff --git a/composer.lock b/composer.lock index dabaa570e..9384468d5 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": "5773f4cf68161406534aaaa5465234fe", + "content-hash": "886042b49ac41a23488f40608f2f3edc", "packages": [ { "name": "doctrine/inflector", @@ -393,20 +393,23 @@ }, { "name": "newfold-labs/wp-module-ecommerce", - "version": "v0.9.0", + "version": "v0.9.1", "source": { "type": "git", "url": "https://github.com/newfold-labs/wp-module-ecommerce.git", - "reference": "d1be252f9662e48eb00c8d7bc48d32a16c656597" + "reference": "3d60452d65e90f207e9551eeb49e6d944b22ed75" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/newfold-labs/wp-module-ecommerce/zipball/d1be252f9662e48eb00c8d7bc48d32a16c656597", - "reference": "d1be252f9662e48eb00c8d7bc48d32a16c656597", + "url": "https://api.github.com/repos/newfold-labs/wp-module-ecommerce/zipball/3d60452d65e90f207e9551eeb49e6d944b22ed75", + "reference": "3d60452d65e90f207e9551eeb49e6d944b22ed75", "shasum": "" }, + "require": { + "newfold-labs/wp-module-installer": "0.0.1" + }, "require-dev": { - "bluehost/wp-php-standards": "@stable", + "newfold-labs/wp-php-standards": "@stable", "wp-cli/i18n-command": "@stable", "wp-cli/wp-cli-bundle": "@stable" }, @@ -441,10 +444,49 @@ ], "description": "Brand Agnostic eCommerce Experience", "support": { - "source": "https://github.com/newfold-labs/wp-module-ecommerce/tree/v0.9.0", + "source": "https://github.com/newfold-labs/wp-module-ecommerce/tree/v0.9.1", "issues": "https://github.com/newfold-labs/wp-module-ecommerce/issues" }, - "time": "2023-05-18T02:13:36+00:00" + "time": "2023-05-26T17:33:09+00:00" + }, + { + "name": "newfold-labs/wp-module-installer", + "version": "0.0.1", + "source": { + "type": "git", + "url": "https://github.com/newfold-labs/wp-module-installer.git", + "reference": "c7e6370f469750e5699f42966d6686049e644c07" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/newfold-labs/wp-module-installer/zipball/c7e6370f469750e5699f42966d6686049e644c07", + "reference": "c7e6370f469750e5699f42966d6686049e644c07", + "shasum": "" + }, + "type": "library", + "autoload": { + "psr-4": { + "NewfoldLabs\\WP\\Module\\Installer\\": "includes" + }, + "files": [ + "bootstrap.php" + ] + }, + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "Micah Wood", + "email": "micah.wood@newfold.com" + } + ], + "description": "An installer for WordPress plugins and themes.", + "support": { + "source": "https://github.com/newfold-labs/wp-module-installer/tree/0.0.1", + "issues": "https://github.com/newfold-labs/wp-module-installer/issues" + }, + "time": "2023-05-26T06:25:08+00:00" }, { "name": "newfold-labs/wp-module-loader", diff --git a/package-lock.json b/package-lock.json index 1d62e7255..26a1abb71 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,7 +7,7 @@ "name": "bluehost-wordpress-plugin", "license": "GPL-2.0-or-later", "dependencies": { - "@newfold-labs/wp-module-ecommerce": "github:newfold-labs/wp-module-ecommerce#v0.9.0", + "@newfold-labs/wp-module-ecommerce": "github:newfold-labs/wp-module-ecommerce#v0.9.1", "@wordpress/a11y": "^3.30.0", "@wordpress/api-fetch": "^3.6.2", "@wordpress/components": "^23.7.0", @@ -3253,8 +3253,8 @@ } }, "node_modules/@newfold-labs/wp-module-ecommerce": { - "version": "0.8.0", - "resolved": "git+ssh://git@github.com/newfold-labs/wp-module-ecommerce.git#d1be252f9662e48eb00c8d7bc48d32a16c656597", + "version": "0.9.1", + "resolved": "git+ssh://git@github.com/newfold-labs/wp-module-ecommerce.git#3d60452d65e90f207e9551eeb49e6d944b22ed75", "license": "GPL-2.0-or-later", "dependencies": { "@reduxjs/toolkit": "1.9.5", @@ -24659,8 +24659,8 @@ } }, "@newfold-labs/wp-module-ecommerce": { - "version": "git+ssh://git@github.com/newfold-labs/wp-module-ecommerce.git#d1be252f9662e48eb00c8d7bc48d32a16c656597", - "from": "@newfold-labs/wp-module-ecommerce@github:newfold-labs/wp-module-ecommerce#v0.9.0", + "version": "git+ssh://git@github.com/newfold-labs/wp-module-ecommerce.git#3d60452d65e90f207e9551eeb49e6d944b22ed75", + "from": "@newfold-labs/wp-module-ecommerce@github:newfold-labs/wp-module-ecommerce#v0.9.1", "requires": { "@reduxjs/toolkit": "1.9.5", "@wordpress/api-fetch": "^3.6.2", diff --git a/package.json b/package.json index 5152a7cf2..4f6a9b489 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "npm": ">=7" }, "dependencies": { - "@newfold-labs/wp-module-ecommerce": "github:newfold-labs/wp-module-ecommerce#v0.9.0", + "@newfold-labs/wp-module-ecommerce": "github:newfold-labs/wp-module-ecommerce#v0.9.1", "@wordpress/a11y": "^3.30.0", "@wordpress/api-fetch": "^3.6.2", "@wordpress/components": "^23.7.0", From 742df61f657fc586c00b4c4eee8f21a09e29efae Mon Sep 17 00:00:00 2001 From: Micah Wood Date: Fri, 26 May 2023 14:59:17 -0400 Subject: [PATCH 2/3] Bump version --- bluehost-wordpress-plugin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bluehost-wordpress-plugin.php b/bluehost-wordpress-plugin.php index 80227335f..dd80479f1 100644 --- a/bluehost-wordpress-plugin.php +++ b/bluehost-wordpress-plugin.php @@ -2,7 +2,7 @@ /** * Plugin Name: The Bluehost Plugin * Description: This plugin integrates your WordPress site with the Bluehost control panel, including performance, security, and update features. - * Version: 2.13.7 + * Version: 2.13.8 * Tested up to: 6.2 * Requires at least: 6.0 * Requires PHP: 7.1 @@ -36,7 +36,7 @@ } // Define constants -define( 'BLUEHOST_PLUGIN_VERSION', '2.13.7' ); +define( 'BLUEHOST_PLUGIN_VERSION', '2.13.8' ); define( 'BLUEHOST_PLUGIN_FILE', __FILE__ ); define( 'BLUEHOST_PLUGIN_DIR', plugin_dir_path( __FILE__ ) ); define( 'BLUEHOST_PLUGIN_URL', plugin_dir_url( __FILE__ ) ); From 21d127e520c8a5908ecb92c644c0560e60e8cbf2 Mon Sep 17 00:00:00 2001 From: Evan Mullins Date: Mon, 16 Oct 2023 16:25:31 -0400 Subject: [PATCH 3/3] update account links and labels for jarvis --- src/app/pages/home/accountCard.js | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/src/app/pages/home/accountCard.js b/src/app/pages/home/accountCard.js index df1078933..986575c3f 100644 --- a/src/app/pages/home/accountCard.js +++ b/src/app/pages/home/accountCard.js @@ -8,7 +8,7 @@ import { } from "@heroicons/react/24/outline"; import { NewfoldRuntime } from "@newfold-labs/wp-module-runtime"; import { Card, Title } from "@newfold/ui-component-library"; -import { addUtmParams, getPlatformBaseUrl, getPlatformPathUrl } from "../../util/helpers"; +import { addUtmParams, getPlatformPathUrl, getPlatformBaseUrl } from "../../util/helpers"; import classNames from "classnames"; const isJarvis = NewfoldRuntime.sdk.isJarvis; @@ -17,35 +17,43 @@ const base = [ { icon: CpuChipIcon, id: "account_link", - href: addUtmParams( getPlatformPathUrl("home", "app") ), - label: __("Control Panel", "bluehost-wordpress-plugin"), + href: addUtmParams( getPlatformPathUrl("hosting/list", "app") ), + label: isJarvis + ? __("Hosting", "bluehost-wordpress-plugin") + : __("Control Panel", "bluehost-wordpress-plugin"), color: "nfd-fill-gray", }, { icon: GiftIcon, id: "products_link", - href: addUtmParams( getPlatformPathUrl("market-place", "account_center#products") ), - label: __("Products", "bluehost-wordpress-plugin"), + href: addUtmParams( getPlatformPathUrl("renewal-center", "account_center#products") ), + label: isJarvis + ? __("Renewal Center", "bluehost-wordpress-plugin") + : __("Products", "bluehost-wordpress-plugin"), color: "nfd-fill-primary-dark", }, { icon: CreditCardIcon, id: "billing_link", - href: addUtmParams( getPlatformPathUrl("renewal-center", "account_center#billing") ), - label: __("Billing", "bluehost-wordpress-plugin"), + href: addUtmParams( getPlatformPathUrl("billing-center", "account_center#billing") ), + label: isJarvis + ? __("Payment Methods", "bluehost-wordpress-plugin") + : __("Billing", "bluehost-wordpress-plugin"), color: "nfd-fill-primary", }, { icon: EnvelopeIcon, id: "mail_link", href: addUtmParams( getPlatformPathUrl("home", "app#/email-office") ), - label: __("Mail & Office", "bluehost-wordpress-plugin"), + label: isJarvis + ? __("Mail", "bluehost-wordpress-plugin") + : __("Mail & Office", "bluehost-wordpress-plugin"), color: "nfd-fill-[#5b5b5b]", }, { icon: ShieldCheckIcon, id: "security_link", - href: addUtmParams( getPlatformPathUrl("security", "account_center#security") ), + href: addUtmParams( getPlatformPathUrl("account-center", "account_center#security") ), label: __("Security", "bluehost-wordpress-plugin"), color: "nfd-fill-[#17b212]", }, @@ -55,7 +63,9 @@ const base = [ href: isJarvis ? addUtmParams( getPlatformPathUrl("account-center") ) : addUtmParams( getPlatformBaseUrl("/cgi/token") ), - label: __("Validation Token", "bluehost-wordpress-plugin"), + label: isJarvis + ? __("Profile", "bluehost-wordpress-plugin") + : __("Validation Token", "bluehost-wordpress-plugin"), color: "nfd-fill-[#f89c24]", }, ];