Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Solutions #1347

Merged
merged 68 commits into from
Oct 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
658e25d
Import WP Solutions Banner on Home page
aratidgr8 Sep 11, 2024
abba1e4
ESLint fix
aratidgr8 Sep 11, 2024
a6265d0
Merge branch 'solutions' into PRESS0-2212
wpscholar Sep 18, 2024
4ac5661
Increase wait time in Home & Help page cypress tests
aratidgr8 Sep 19, 2024
6b1622d
Create page linked WP module Solutions in BH
aratidgr8 Sep 19, 2024
45398e1
Add menu icon for My plugins & tools
aratidgr8 Sep 19, 2024
8dfcac7
ESLint fix
aratidgr8 Sep 23, 2024
01c36fe
update to use buildless component
circlecube Oct 2, 2024
f5c3e66
fix renamed route
circlecube Oct 2, 2024
40aa209
Merge pull request #1321 from bluehost/PRESS0-1723
circlecube Oct 2, 2024
dd2f9cc
Merge branch 'solutions' into add/solutions-component
circlecube Oct 2, 2024
f1bd5c8
update to dev release of solutions module
circlecube Oct 3, 2024
a7a89f6
Merge pull request #1338 from bluehost/add/solutions-component
circlecube Oct 3, 2024
992ec0f
Merge branch 'develop' into solutions
circlecube Oct 3, 2024
3c5d839
Merge branch 'develop' into solutions
circlecube Oct 3, 2024
54e14ae
Merge branch 'develop' into PRESS0-2212
ramyakrishnai Oct 7, 2024
961151d
removes my active product section from home page
girish-lokapure Oct 7, 2024
f2e635d
Merge remote-tracking branch 'origin/solutions' into PRESS0-2212
aratidgr8 Oct 8, 2024
d4ea238
Merge pull request #1343 from girish-lokapure/revert/active-product-s…
circlecube Oct 8, 2024
0c60a3a
update to latest solutions module with plugins and tools plugin tab
circlecube Oct 8, 2024
cad33cb
Merge branch 'solutions' of https://github.com/bluehost/bluehost-word…
circlecube Oct 8, 2024
17d84b2
update solutions module to dev release 0.3.0
circlecube Oct 9, 2024
bae4759
Undo cypress tests changes
aratidgr8 Oct 9, 2024
f13a4ec
Merge branch 'solutions' into PRESS0-2212
circlecube Oct 9, 2024
b67f8df
Merge pull request #1307 from bluehost/PRESS0-2212
circlecube Oct 9, 2024
5258fc4
update solutions, pls, and installer modules to latest solutions rela…
circlecube Oct 9, 2024
ed407fe
update ecommerce module to solutions release 1.4.0-beta
circlecube Oct 9, 2024
312527f
PRESS0-2277, PRESS0-2282 - fixed
aratidgr8 Oct 10, 2024
514ca94
Eslint fix src/app/pages/solutions/index.js
aratidgr8 Oct 10, 2024
38af4c0
Merge pull request #1346 from bluehost/fix/solutions-bug-fixes
circlecube Oct 10, 2024
552b822
update to latest solutions module 0.6.0
circlecube Oct 10, 2024
17c1820
Small screen alignment fix for accountCard - PRESS0-2276
aratidgr8 Oct 10, 2024
5d57d57
clean up submenu building
circlecube Oct 10, 2024
3e53236
linting
circlecube Oct 10, 2024
a0bef0a
update ecom and installer modules to latest beta versions, update sol…
circlecube Oct 10, 2024
c108417
clean up phpcs comment
circlecube Oct 10, 2024
de87dc9
Don’t use “entitlements” in customer-facing messages
wpscholar Oct 14, 2024
f8f4dd4
Update dependencies
wpscholar Oct 16, 2024
a220a2c
Update dependencies
arunshenoy99 Oct 16, 2024
c8d0559
Update composer dependencies
wpscholar Oct 16, 2024
80e037c
Bump versions
wpscholar Oct 16, 2024
0119a65
Fix composer hash
wpscholar Oct 16, 2024
91e8752
Update dependencies
arunshenoy99 Oct 17, 2024
6929e63
fix version typo
circlecube Oct 17, 2024
25b5e55
Merge branch 'develop' into feature/solutions
circlecube Oct 17, 2024
d6035e1
Merge pull request #1348 from bluehost/fix/solutions-bug-fixes
circlecube Oct 17, 2024
d1ae73b
bring back installer beta version
circlecube Oct 17, 2024
b2a6d19
update ecommerce module to 1.4.0-beta.6
circlecube Oct 17, 2024
864ed4e
update to latest ecommerce module `1.4.0-beta.7`
circlecube Oct 18, 2024
2758950
update beta modules:
circlecube Oct 21, 2024
92bfd0d
update plugin to `3.15.0-beta` version
circlecube Oct 21, 2024
b778501
enqueue installer scripts
circlecube Oct 21, 2024
015c5e6
update solutions module to 0.8.1
circlecube Oct 21, 2024
246cd90
move class import before function imports
circlecube Oct 21, 2024
fcb552a
update modules to latest beta/dev releases
circlecube Oct 22, 2024
87fd70e
Revert "update modules to latest beta/dev releases"
circlecube Oct 22, 2024
bc35b3d
update modules to latest beta releases
circlecube Oct 22, 2024
be7b953
Update PLS
arunshenoy99 Oct 22, 2024
e5d206a
updated composer packages
abhijitb Oct 23, 2024
3e0ace1
update plugin version to 3.15.0
circlecube Oct 23, 2024
237e2f2
solutions module 1.0.1
circlecube Oct 23, 2024
cc234b5
exclude broken migration test
circlecube Oct 23, 2024
0e83371
update to ecomerce 1.4.1 in composer and npm
circlecube Oct 23, 2024
9b33da2
update plugin header to 3.15.0 too
circlecube Oct 23, 2024
eec42cf
i18n pot update
circlecube Oct 23, 2024
5445077
solutions module 1.0.2
circlecube Oct 23, 2024
1cf9eea
update onboarding module
circlecube Oct 23, 2024
b308d43
installer 1.2.1 to fix php issue
circlecube Oct 23, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bluehost-wordpress-plugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.14
* Version: 3.15.0
* Requires at least: 6.4
* Requires PHP: 7.3
* Tested up to: 6.6.2
Expand All @@ -32,7 +32,7 @@
}

// Define constants
define( 'BLUEHOST_PLUGIN_VERSION', '3.14.14' );
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__ ) );
Expand Down
16 changes: 10 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,31 +68,35 @@
"require-dev": {
"roave/security-advisories": "dev-latest",
"newfold-labs/wp-php-standards": "^1.2.4",
"wp-cli/i18n-command": "^2.6.2",
"wp-cli/i18n-command": "^2.6.3",
"wp-phpunit/wp-phpunit": "^6.6.2"
},
"require": {
"newfold-labs/wp-module-activation": "^1.0.4",
"newfold-labs/wp-module-atomic": "^1.3.0",
"newfold-labs/wp-module-coming-soon": "^1.2.6",
"newfold-labs/wp-module-context": "^1.0.1",
"newfold-labs/wp-module-data": "^2.6.4",
"newfold-labs/wp-module-data": "^2.6.5",
"newfold-labs/wp-module-deactivation": "^1.2.3",
"newfold-labs/wp-module-ecommerce": "^1.3.44",
"newfold-labs/wp-module-ecommerce": "^1.4.1",
"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",
"newfold-labs/wp-module-help-center": "^2.1.1",
"newfold-labs/wp-module-installer": "^1.2.1",
"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-migration": "^1.0.12",
"newfold-labs/wp-module-my-products": "^1.0.6",
"newfold-labs/wp-module-notifications": "^1.6.1",
"newfold-labs/wp-module-onboarding": "^2.4.2",
"newfold-labs/wp-module-patterns": "^2.4.1",
"newfold-labs/wp-module-onboarding": "^2.5.0",
"newfold-labs/wp-module-onboarding-data": "^1.2.1",
"newfold-labs/wp-module-patterns": "^2.6.0",
"newfold-labs/wp-module-performance": "2.0.1 as 1.9.9",
"newfold-labs/wp-module-pls": "^1.0.0",
"newfold-labs/wp-module-runtime": "^1.0.11",
"newfold-labs/wp-module-secure-passwords": "^1.1.1",
"newfold-labs/wp-module-solutions": "^1.0.2",
"newfold-labs/wp-module-sso": "^1.0.6",
"newfold-labs/wp-module-staging": "^2.1.1",
"wp-forge/wp-update-handler": "^1.0.2",
Expand Down
311 changes: 211 additions & 100 deletions composer.lock

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions cypress.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ module.exports = defineConfig( {
testIsolation: false,
excludeSpecPattern: [
'vendor/newfold-labs/**/tests/cypress/integration/wp-module-support/*.cy.js', // skip any module's wp-module-support files
'vendor/newfold-labs/wp-module-migration/**/*.cy.js', // temporarily skip the broken migration test
],
experimentalRunAllSpecs: true,
},
Expand Down
12 changes: 12 additions & 0 deletions inc/Admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

namespace Bluehost;

use NewfoldLabs\WP\Module\Data\SiteCapabilities;
use function NewfoldLabs\WP\Context\getContext;
use function NewfoldLabs\WP\Module\Features\isEnabled;

Expand Down Expand Up @@ -65,6 +66,7 @@ public static function add_to_runtime( $sdk ) {
*/
public static function subpages() {
global $bluehost_module_container;
$capability = new SiteCapabilities();

$home = array(
'bluehost#/home' => __( 'Home', 'wp-plugin-bluehost' ),
Expand All @@ -78,6 +80,12 @@ public static function subpages() {
$marketplace = array(
'bluehost#/marketplace' => __( 'Marketplace', 'wp-plugin-bluehost' ),
);
// add plugins and tools if has solution
$mypluginsandtools = $capability->get( 'hasSolution' )
? array(
'bluehost#/my_plugins_and_tools' => __( 'My Plugins & Tools', 'wp-plugin-bluehost' ),
)
: array();
// add performance if enabled
$performance = isEnabled( 'performance' )
? array(
Expand All @@ -102,6 +110,7 @@ public static function subpages() {
$pagesAndPosts,
$store,
$marketplace,
$mypluginsandtools,
$performance,
$settings,
$staging,
Expand Down Expand Up @@ -203,6 +212,9 @@ public static function assets( $hook ) {
return;
}

// TODO: update this to a dependency script
do_action( 'newfold/installer/enqueue_scripts' );

\wp_register_script(
'bluehost-script',
BLUEHOST_BUILD_URL . '/index.js',
Expand Down
Loading
Loading