diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index 5d8d78422..3fa0f47b6 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -62,7 +62,7 @@ jobs: run: echo "::set-output name=dir::$(composer config cache-files-dir)" - name: Cache Composer vendor directory - uses: actions/cache@v1 + uses: actions/cache@v2 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} @@ -92,7 +92,7 @@ jobs: run: find . - name: Configure WordPress - run: echo '{"port":8880,"plugins":["${{ steps.workflow.outputs.DIST }}/${{ steps.workflow.outputs.PACKAGE }}"]}' > .wp-env.json + run: echo '{"config":{"WP_DEBUG_DISPLAY":false},"plugins":["${{ steps.workflow.outputs.DIST }}/${{ steps.workflow.outputs.PACKAGE }}"]}' > .wp-env.override.json - name: Install WordPress run: npx wp-env start @@ -106,3 +106,18 @@ jobs: with: name: screenshots path: ./tests/cypress/screenshots + + - name: Check if a debug.log file exists + id: hasErrors + run: npx wp-env run wordpress test ! -f /var/www/html/wp-content/debug.log + + - name: Copy debug.log file + if: ${{ steps.hasErrors.outputs.failure }} + run: cat /var/www/html/wp-content/debug.log 1>./debug.log 2>/dev/null + + - name: Store debug.log file + if: ${{ steps.hasErrors.outputs.failure }} + uses: actions/upload-artifact@v2 + with: + name: logs + path: ./debug.log diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 74908b031..dad238b6e 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -43,7 +43,7 @@ jobs: if: "!! env.GIT_DIFF" - name: Cache Composer vendor directory - uses: actions/cache@v1 + uses: actions/cache@v2 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} diff --git a/.github/workflows/upload-artifact-on-push.yml b/.github/workflows/upload-artifact-on-push.yml index db0c0c5c5..75b8937f3 100644 --- a/.github/workflows/upload-artifact-on-push.yml +++ b/.github/workflows/upload-artifact-on-push.yml @@ -50,7 +50,7 @@ jobs: run: echo "::set-output name=dir::$(npm config get cache)" - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v2 with: path: ${{ steps.npm-cache.outputs.dir }} key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} @@ -71,7 +71,7 @@ jobs: run: echo "::set-output name=dir::$(composer config cache-files-dir)" - name: Cache Composer vendor directory - uses: actions/cache@v1 + uses: actions/cache@v2 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} diff --git a/.github/workflows/upload-asset-on-release.yml b/.github/workflows/upload-asset-on-release.yml index dc28dce03..791c82505 100644 --- a/.github/workflows/upload-asset-on-release.yml +++ b/.github/workflows/upload-asset-on-release.yml @@ -51,7 +51,7 @@ jobs: run: echo "::set-output name=dir::$(npm config get cache)" - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v2 with: path: ${{ steps.npm-cache.outputs.dir }} key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} @@ -72,7 +72,7 @@ jobs: run: echo "::set-output name=dir::$(composer config cache-files-dir)" - name: Cache Composer vendor directory - uses: actions/cache@v1 + uses: actions/cache@v2 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} diff --git a/.gitignore b/.gitignore index d510778ea..f52000e07 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,8 @@ cypress.env.json /.docs/* !/assets/bluehost.css !/assets/admin-global.css + +# File Types +*.log +*.sql +*.zip diff --git a/.wp-env.json b/.wp-env.json index 71b31229c..992ecfb72 100644 --- a/.wp-env.json +++ b/.wp-env.json @@ -1,4 +1,10 @@ { + "config": { + "WP_DEBUG": true, + "WP_DEBUG_LOG": true, + "WP_DEBUG_DISPLAY": true + }, + "phpVersion": "5.6", "plugins": [ "." ], diff --git a/assets/images/white-triangle.svg b/assets/images/white-triangle.svg index f4edf6143..f6d080fce 100644 --- a/assets/images/white-triangle.svg +++ b/assets/images/white-triangle.svg @@ -1 +1 @@ - + \ No newline at end of file diff --git a/bluehost-wordpress-plugin.php b/bluehost-wordpress-plugin.php index 69758b58b..dfce99c23 100644 --- a/bluehost-wordpress-plugin.php +++ b/bluehost-wordpress-plugin.php @@ -2,7 +2,7 @@ /** * Plugin Name: Bluehost * Description: This plugin integrates your WordPress site with the Bluehost control panel, including performance, security, and update features. - * Version: 2.5.0 + * Version: 2.5.1 * Requires at least: 4.7 * Requires PHP: 5.6 * Author: Bluehost @@ -27,7 +27,7 @@ } // Define constants -define( 'BLUEHOST_PLUGIN_VERSION', '2.5.0' ); +define( 'BLUEHOST_PLUGIN_VERSION', '2.5.1' ); define( 'BLUEHOST_PLUGIN_FILE', __FILE__ ); define( 'BLUEHOST_PLUGIN_DIR', plugin_dir_path( __FILE__ ) ); define( 'BLUEHOST_PLUGIN_URL', plugin_dir_url( __FILE__ ) ); diff --git a/inc/Notifications/AdminNotices.php b/inc/Notifications/AdminNotices.php index 9227d0ec4..8c9c81732 100644 --- a/inc/Notifications/AdminNotices.php +++ b/inc/Notifications/AdminNotices.php @@ -15,6 +15,9 @@ class AdminNotices { * Render admin notices where appropriate. */ public static function maybeRenderAdminNotices() { + if ( isset( $_GET['page'] ) && 'bluehost' === \filter_input( INPUT_GET, 'page' ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended + return; + } $page = str_replace( admin_url(), '', Url::getCurrentUrl() ); $notifications = new NotificationsRepository(); $collection = $notifications->collection(); diff --git a/inc/RestApi/AdminErrorController.php b/inc/RestApi/AdminErrorController.php index 0d45c99b8..a9dd34adf 100644 --- a/inc/RestApi/AdminErrorController.php +++ b/inc/RestApi/AdminErrorController.php @@ -24,23 +24,23 @@ class AdminErrorController extends \WP_REST_Controller { protected $endpoint = '/error/track'; /** - * Number of Errors stored in Database. + * Number of versions to retain * * @var integer */ - protected $error_count = 10; + protected $retain_versions = 5; /** - * Number of Incidents stored per-error. + * Errors per-version to retain * * @var integer */ - protected $error_incident_count = 5; + protected $errors_per_version = 12; /** - * Undocumented variable + * Unique key for error. * - * @var [type] + * @var string */ protected $key; @@ -79,6 +79,13 @@ class AdminErrorController extends \WP_REST_Controller { */ protected $updated; + /** + * Conditional outcome (for error-tracing this error reporting) + * + * @var integer + */ + protected $condition = 0; + /** * Register routes. */ @@ -104,17 +111,21 @@ public function register_routes() { * @return \WP_REST_Response */ public function error_logging( \WP_REST_Request $request ) { - $this->params = $request->get_body_params(); - unset( $this->params['browser']['versionNumber'] ); + $this->params = $request->get_params(); if ( ! empty( $this->params ) ) { - $code = $this->handle_error_log(); + $this->condition = 0.5; + $this->key = base64_encode( $this->params['message'] ); // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.obfuscation_base64_encode + $response = $this->handle_error_log(); + } else { + $this->condition = 0.25; } return new \WP_REST_Response( array( - 'success' => 'it-the-success', - 'code' => $code, - ) + 'condition' => $this->condition, + 'debug' => $request, + ), + false === $response ? 500 : 200 ); } @@ -124,110 +135,50 @@ public function error_logging( \WP_REST_Request $request ) { * @return int */ protected function handle_error_log() { - $this->saved = $this->database( 'get' ); - - if ( ! $this->should_log( $this->saved ) ) { - if ( ! empty( $this->saved['error_max'] || ! $this->saved['error_max'] ) ) { - $this->database( - 'update', - array_merge( - $this->saved, - array( - 'error_max' => true, - 'date' => new \DateTime(), - ) - ) - ); + $plug_ver = BLUEHOST_PLUGIN_VERSION; + $this->saved = $this->database( 'get' ); + $this->updated = $this->saved; + + if ( isset( $this->saved[ $plug_ver ] ) ) { + if ( count( $this->saved[ $plug_ver ] ) <= $this->errors_per_version ) { + array_unshift( $this->updated[ $plug_ver ], $this->key ); + $this->updated[ $plug_ver ] = array_unique( $this->updated[ $plug_ver ] ); + $this->condition = 1; + } else { + array_pop( $this->updated[ $plug_ver ] ); + array_unshift( $this->updated[ $plug_ver ], $this->key ); + $this->updated[ $plug_ver ] = array_unique( $this->updated[ $plug_ver ] ); + $this->condition = 2; } - - return 0; + } elseif ( count( $this->saved ) <= $this->retain_versions ) { + $this->updated[ $plug_ver ] = array( $this->key ); + $this->condition = 3; + } else { + array_pop( $this->updated ); + $this->updated[ $plug_ver ] = array( $this->key ); + $this->condition = 4; } - $this->updated = $this->saved; // make immutable - $this->key = base64_encode( $this->params['message'] ); // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.obfuscation_base64_encode - $this->browser_key = base64_encode( implode( ',', $this->params['browser'] ) ); // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.obfuscation_base64_encode - - if ( $this->params['browser']['mobile'] ) { - $this->params['browser']['mobile'] = true === $this->params['browser']['mobile'] ? 'mobile' : 'desktop'; - } - - if ( ! empty( $this->updated[ $this->key ] ) && ! empty( $this->updated[ $this->key ]['count'] ) ) { - $count = (int) $this->updated[ $this->key ]['count']; - if ( ! isset( $this->updated['error_max'] ) || 'true' !== $this->updated['error_max'] ) { - if ( ! in_array( implode( ',', $this->params['browser'] ), $this->updated[ $this->key ]['browsers'], true ) ) { - $this->updated[ $this->key ]['browsers'][] = implode( ',', $this->params['browser'] ); - } - $this->make_log_summary(); - $this->limit_log_entries(); - $this->updated[ $this->key ]['max'] = 'true'; - } elseif ( ( (int) $this->error_count - 1 ) >= $count ) { - $this->updated[ $this->key ]['count'] = (int) $this->updated[ $this->key ]['count'] + 1; - if ( ! in_array( implode( ',', $this->params['browser'] ), $this->updated[ $this->key ]['browsers'], true ) ) { - $this->updated[ $this->key ]['browsers'][] = implode( ',', $this->params['browser'] ); - } - $this->make_log_summary(); - $this->limit_log_entries(); - } - } elseif ( ! isset( $this->updated[ $this->key ] ) ) { - $this->updated[ $this->key ] = array( - 'count' => 1, - 'message' => $this->params['message'], - 'browsers' => array( - implode( ',', $this->params['browser'] ), - ), + if ( ! isset( $this->saved[ $plug_ver ][ $this->key ] ) ) { + $request = new \WP_REST_Request( 'POST', '/bluehost/v1/data/events' ); + $request->set_body_params( + array( + 'action' => 'bwa-error', + 'category' => 'AdminError', + 'data' => $this->params, + ) ); - $this->make_log_summary(); - } - - if ( $this->updated !== $this->saved ) { - return $this->database( 'update', $this->updated ) ? 1 : 2; - } + $response = \rest_do_request( $request ); + if ( ! $response->is_error() ) { + $this->database( 'update', $this->updated ); - return 3; - } - - /** - * Make Incident Summary from Available Parameters. - */ - protected function make_log_summary() { - $this->updated[ $this->key ]['incidents'][ $this->params['date'] ] = $this->params['browser']['name'] . ' ' . $this->params['browser']['version'] . ' on ' . $this->params['browser']['os']; - } - - /** - * Limit most log entries per-error based on $this->error_incident_count - * - * @return void - */ - protected function limit_log_entries() { - $this->updated[ $this->key ]['incidents'] = array_slice( - $this->updated[ $this->key ]['incidents'], - - $this->error_incident_count - ); - } - - /** - * Evaluate data to determine if it should be logged. - * - * @param array $saved Collection of saved errors. - * - * @return bool - */ - protected function should_log( $saved = array() ) { - $filter = apply_filters( 'bluehost_admin_error_logging_active', true ); - - if ( - true === ( - ! empty( $saved['error_max'] ) - && is_bool( $saved['error_max'] ) - && true === (bool) $saved['error_max'] - ) || - count( $stored ) >= $this->error_store_count || - ( true || 1 ) !== $filter - ) { - return false; + return $response; + } else { + return false; + } + } else { + return null; } - - return true; } /** @@ -248,7 +199,7 @@ protected function database( $type = 'get', $data = array() ) { case 'read': case 'get': default: - return \get_option( $this->option_key ); + return \get_option( $this->option_key, array() ); } } diff --git a/inc/admin/class-assets.php b/inc/admin/class-assets.php index 8f5332b31..a4ce42721 100644 --- a/inc/admin/class-assets.php +++ b/inc/admin/class-assets.php @@ -6,41 +6,36 @@ class Bluehost_Admin_App_Assets { /** + * Page name. + * * @var string */ protected $page_hook = 'bluehost'; /** + * Current hook. + * * @var string */ protected $current_admin_hook; /** + * Class instance. + * * @var stdClass */ protected static $instance; /** - * @var array - */ - protected $app_dependencies = array( - 'wp-a11y', - 'wp-api-fetch', - 'wp-dom', - 'wp-dom-ready', - 'wp-keycodes', - 'wp-element', - 'wp-components', - 'wp-html-entities', - 'react-router-dom', - ); - - /** + * Assets URL. + * * @var string $url */ protected $url; /** + * Get class instance. + * * @return Bluehost_Admin_App_Assets|stdClass */ public static function return_instance() { @@ -53,7 +48,7 @@ public static function return_instance() { } /** - * + * Initialize class. */ protected function primary_init() { // TODO: restore admin css patch for nav @@ -72,16 +67,20 @@ protected function primary_init() { public function register_global_assets() { $min = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min'; $rand = time(); + wp_register_style( 'bluehost-font', - 'https://fonts.googleapis.com/css?family=Open+Sans:300,400,600' + 'https://fonts.googleapis.com/css?family=Open+Sans:300,400,600', + array(), + empty( $min ) ? $rand : BLUEHOST_PLUGIN_VERSION ); wp_register_script( 'react-router-dom', $this->url . 'react-router-dom' . $min . '.js', array( 'wp-element' ), - empty( $min ) ? $rand : '5.0.0' + empty( $min ) ? $rand : '5.0.0', + true ); wp_register_style( @@ -137,6 +136,8 @@ public function register_global_assets() { } /** + * Register assets. + * * @param string $hook Hook name. */ public function register_assets( $hook ) { @@ -154,12 +155,12 @@ public function register_assets( $hook ) { */ protected function page_css( $assets_url ) { wp_register_style( - 'eig-wp-admin-ui-styles', + 'bwa-styles', $assets_url . 'admin.css', array( 'wp-components', 'animatecss', 'bluehost-font', 'bluehost-brand', 'purecss-grids' ), time() ); - wp_enqueue_style( 'eig-wp-admin-ui-styles' ); + wp_enqueue_style( 'bwa-styles' ); } /** @@ -168,55 +169,63 @@ protected function page_css( $assets_url ) { * @param string $dist_url Base distribution URL. */ protected function page_js( $dist_url ) { + $js_deps = require BLUEHOST_PLUGIN_DIR . '/assets/admin-manifest.asset.php'; wp_register_script( - 'eig-wp-admin-ui-manifest', + 'bwa-manifest', $dist_url . 'admin-manifest.js', - $this->app_dependencies, - time(), + array_merge( $js_deps['dependencies'], array( 'react-router-dom' ) ), + $js_deps['version'], true ); wp_localize_script( - 'eig-wp-admin-ui-manifest', - 'bluehostAppPublicPath', + 'bwa-manifest', + 'bluehostPluginPublicPath', $dist_url ); + wp_localize_script( + 'bwa-manifest', + 'bluehostPluginVersion', + BLUEHOST_PLUGIN_VERSION + ); wp_register_script( - 'eig-wp-admin-ui-vendors', + 'bwa-vendors', $dist_url . 'vendors~admin.js', - array( 'eig-wp-admin-ui-manifest' ), - time(), + array( 'bwa-manifest' ), + $js_deps['version'], true ); wp_register_script( - 'eig-wp-admin-ui-app', + 'bwa-app', $dist_url . 'admin.js', - array( 'eig-wp-admin-ui-vendors' ), - time(), + array( 'bwa-vendors' ), + $js_deps['version'], true ); - wp_enqueue_script( 'eig-wp-admin-ui-app' ); + wp_enqueue_script( 'bwa-app' ); $data = array( - 'app' => array( - 'adminUrl' => \admin_url(), - 'activePage' => '', - 'isTopLevel' => 0, - 'pages' => array_map( 'strtolower', Bluehost_Admin_App_Page::$subpages ), - 'siteId' => mojo_site_bin2hex(), - 'mobileMenuActive' => 0, - 'nonce' => wp_create_nonce( mojo_site_bin2hex() ), + 'app' => array( + 'adminUrl' => \admin_url(), + 'activePage' => '', + 'isTopLevel' => 0, + 'pages' => Bluehost_Admin_App_Page::get_top_level_pages(), + 'noticesPathsDenyList' => Bluehost_Admin_App_Page::$noticesPathsDenyList, // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase + 'accountId' => mojo_site_bin2hex(), + 'nonce' => wp_create_nonce( mojo_site_bin2hex() ), ), - 'env' => array( + 'env' => array( 'isPHP7' => version_compare( phpversion(), '7.0.0' ) >= 0, 'phpVersion' => phpversion(), + 'isStaging' => \Bluehost\Staging::getInstance()->isStaging(), ), - 'wordpress' => array( + 'wordpress' => array( 'hasReusableBlocks' => \wp_count_posts( 'wp_block' )->publish >= 1, 'isJetpackActive' => class_exists( 'Jetpack' ) ? 1 : 0, 'isWooActive' => class_exists( 'woocommerce' ) ? 1 : 0, 'jetpackActiveModules' => get_option( 'jetpack_active_modules', 0 ), 'bluehostPluginDaysSinceInstall' => bh_get_days_since_plugin_install_date(), ), + 'movedToStore' => false, ); // Grab the latest settings using an interal REST API request @@ -226,16 +235,8 @@ protected function page_js( $dist_url ) { $data['settings'] = $server->response_to_data( $response, false ); - wp_localize_script( 'eig-wp-admin-ui-app', 'bluehost', apply_filters( 'bluehost_admin_page_data', $data ) ); + wp_localize_script( 'bwa-app', 'bluehost', apply_filters( 'bluehost_admin_page_data', $data ) ); + wp_localize_script( 'bwa-app', 'bluehostWpAdminUrl', \admin_url() ); - if ( defined( 'WP_LOCAL_DEV' ) && WP_LOCAL_DEV ) { - wp_enqueue_script( - 'livereload', - 'http://localhost:35729/livereload.js', - array( 'eig-wp-admin-ui-app' ), - time(), - true - ); - } } } diff --git a/inc/admin/class-page.php b/inc/admin/class-page.php index 8b37ea354..162dc5ca5 100644 --- a/inc/admin/class-page.php +++ b/inc/admin/class-page.php @@ -13,19 +13,56 @@ class Bluehost_Admin_App_Page { protected static $instance; /** - * Subpage Titles (get lowercased for slugs) + * Paths to never display notices on. Partial matching is used, so be specific! * * @var array */ - public static $subpages = array( - 'Home', - 'Themes', - 'Plugins', - 'Services', - 'Staging', - 'Settings', - 'Help', - ); + public static $noticesPathsDenyList = array(); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.PropertyNotSnakeCase + + /** + * Get top level pages. + * + * @return array[] + */ + public static function get_top_level_pages() { + return array( + array( + 'slug' => 'home', + 'path' => '/home', + 'label' => __( 'Home', 'bluehost-wordpress-plugin' ), + ), + array( + 'slug' => 'themes', + 'path' => '/marketplace/themes', + 'label' => __( 'Themes', 'bluehost-wordpress-plugin' ), + ), + array( + 'slug' => 'plugins', + 'path' => '/marketplace/plugins', + 'label' => __( 'Plugins', 'bluehost-wordpress-plugin' ), + ), + array( + 'slug' => 'services', + 'path' => '/marketplace/services', + 'label' => __( 'Services', 'bluehost-wordpress-plugin' ), + ), + array( + 'slug' => 'staging', + 'path' => '/tools/staging', + 'label' => __( 'Staging', 'bluehost-wordpress-plugin' ), + ), + array( + 'slug' => 'settings', + 'path' => '/settings', + 'label' => __( 'Settings', 'bluehost-wordpress-plugin' ), + ), + array( + 'slug' => 'help', + 'path' => '/help', + 'label' => __( 'Help', 'bluehost-wordpress-plugin' ), + ), + ); + } /** * Return instance @@ -59,7 +96,7 @@ public function add_menu_page() { 'Bluehost', $this->primary_title_markup(), 'manage_options', - 'bluehost', + 'bluehost', // WARNING: Cannot directly recieve hash route with #/home -- handled in augmentWPMenu.js. array( $this, 'menu_page_output' ), 'data:image/svg+xml;base64,PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA1OC4wMyA1OC4xMyI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiNmZmY7fTwvc3R5bGU+PC9kZWZzPjx0aXRsZT5iaC13aGl0ZTwvdGl0bGU+PGcgaWQ9Il9Hcm91cF8iIGRhdGEtbmFtZT0iJmx0O0dyb3VwJmd0OyI+PGcgaWQ9Il9Hcm91cF8yIiBkYXRhLW5hbWU9IiZsdDtHcm91cCZndDsiPjxnIGlkPSJfR3JvdXBfMyIgZGF0YS1uYW1lPSImbHQ7R3JvdXAmZ3Q7Ij48cmVjdCBpZD0iX1BhdGhfIiBkYXRhLW5hbWU9IiZsdDtQYXRoJmd0OyIgY2xhc3M9ImNscy0xIiB3aWR0aD0iMTYuMiIgaGVpZ2h0PSIxNi4yMSIvPjxyZWN0IGlkPSJfUGF0aF8yIiBkYXRhLW5hbWU9IiZsdDtQYXRoJmd0OyIgY2xhc3M9ImNscy0xIiB4PSIyMC45MSIgd2lkdGg9IjE2LjIxIiBoZWlnaHQ9IjE2LjIxIi8+PHJlY3QgaWQ9Il9QYXRoXzMiIGRhdGEtbmFtZT0iJmx0O1BhdGgmZ3Q7IiBjbGFzcz0iY2xzLTEiIHg9IjQxLjgyIiB3aWR0aD0iMTYuMjEiIGhlaWdodD0iMTYuMjEiLz48cmVjdCBpZD0iX1BhdGhfNCIgZGF0YS1uYW1lPSImbHQ7UGF0aCZndDsiIGNsYXNzPSJjbHMtMSIgeT0iMjAuOTYiIHdpZHRoPSIxNi4yIiBoZWlnaHQ9IjE2LjIxIi8+PHJlY3QgaWQ9Il9QYXRoXzUiIGRhdGEtbmFtZT0iJmx0O1BhdGgmZ3Q7IiBjbGFzcz0iY2xzLTEiIHg9IjIwLjkxIiB5PSIyMC45NiIgd2lkdGg9IjE2LjIxIiBoZWlnaHQ9IjE2LjIxIi8+PHJlY3QgaWQ9Il9QYXRoXzYiIGRhdGEtbmFtZT0iJmx0O1BhdGgmZ3Q7IiBjbGFzcz0iY2xzLTEiIHg9IjQxLjgyIiB5PSIyMC45NiIgd2lkdGg9IjE2LjIxIiBoZWlnaHQ9IjE2LjIxIi8+PHJlY3QgaWQ9Il9QYXRoXzciIGRhdGEtbmFtZT0iJmx0O1BhdGgmZ3Q7IiBjbGFzcz0iY2xzLTEiIHk9IjQxLjkyIiB3aWR0aD0iMTYuMiIgaGVpZ2h0PSIxNi4yMSIvPjxyZWN0IGlkPSJfUGF0aF84IiBkYXRhLW5hbWU9IiZsdDtQYXRoJmd0OyIgY2xhc3M9ImNscy0xIiB4PSIyMC45MSIgeT0iNDEuOTIiIHdpZHRoPSIxNi4yMSIgaGVpZ2h0PSIxNi4yMSIvPjxyZWN0IGlkPSJfUGF0aF85IiBkYXRhLW5hbWU9IiZsdDtQYXRoJmd0OyIgY2xhc3M9ImNscy0xIiB4PSI0MS44MiIgeT0iNDEuOTIiIHdpZHRoPSIxNi4yMSIgaGVpZ2h0PSIxNi4yMSIvPjwvZz48L2c+PC9nPjwvc3ZnPg==', 1 @@ -67,17 +104,17 @@ public function add_menu_page() { } /** - * The React-powered Single-Page Applications initializes on #bluehost-app, replacing all inner elements. - * However, until initialization begins, #app-loader is shown so user knows something is happening. + * The React-powered Single-Page Applications initializes on #bwa-root, replacing all inner elements. + * However, until initialization begins, #bwa-centered-loader is shown so user knows something is happening. * * @return void */ public function menu_page_output() { ?> -
-
-