move admin bar code to new architecture

wp-media · Sep 30, 2024 · 18ff070 · 18ff070
1 parent 4639199
commit 18ff070
Show file tree

Hide file tree

Showing 2 changed files with 116 additions and 13 deletions.
diff --git a/classes/Admin/AdminBar.php b/classes/Admin/AdminBar.php
@@ -6,11 +6,28 @@
 use Imagify\EventManagement\SubscriberInterface;
 use Imagify\User\User;
 use Imagify_Views;
+use WP_Admin_Bar;
 
 /**
  * Admin bar handler
  */
 class AdminBar implements SubscriberInterface {
+	/**
+	 * User instance.
+	 *
+	 * @var User
+	 */
+	private $user;
+
+	/**
+	 * AdminBar constructor.
+	 *
+	 * @param User $user User instance.
+	 */
+	public function __construct( User $user ) {
+		$this->user = $user;
+	}
+
 	/**
 	 * Returns an array of events this subscriber listens to
 	 *
@@ -19,9 +36,96 @@ class AdminBar implements SubscriberInterface {
 	public static function get_subscribed_events(): array {
 		return [
 			'wp_ajax_imagify_get_admin_bar_profile' => 'get_admin_bar_profile_callback',
+			'admin_bar_menu'                        => [ 'add_imagify_admin_bar_menu', IMAGIFY_INT_MAX ],
 		];
 	}
 
+	/**
+	 * Add Imagify menu in the admin bar.
+	 *
+	 * @param WP_Admin_Bar $wp_admin_bar WP_Admin_Bar instance, passed by reference.
+	 */
+	public function add_imagify_admin_bar_menu( $wp_admin_bar ) {
+		if ( ! imagify_get_context( 'wp' )->current_user_can( 'manage' ) ) {
+			return;
+		}
+
+		if ( ! get_imagify_option( 'admin_bar_menu' ) ) {
+			return;
+		}
+
+		// Parent.
+		$wp_admin_bar->add_menu( array(
+			'id'    => 'imagify',
+			'title' => 'Imagify',
+			'href'  => get_imagify_admin_url(),
+		) );
+
+		// Settings.
+		$wp_admin_bar->add_menu(array(
+			'parent' => 'imagify',
+			'id'     => 'imagify-settings',
+			'title'  => __( 'Settings' ),
+			'href'   => get_imagify_admin_url(),
+		) );
+
+		// Bulk Optimization.
+		if ( ! is_network_admin() ) {
+			$wp_admin_bar->add_menu(array(
+				'parent' => 'imagify',
+				'id'     => 'imagify-bulk-optimization',
+				'title'  => __( 'Bulk Optimization', 'imagify' ),
+				'href'   => get_imagify_admin_url( 'bulk-optimization' ),
+			) );
+		}
+
+		// Documentation.
+		$wp_admin_bar->add_menu(array(
+			'parent' => 'imagify',
+			'id'     => 'imagify-documentation',
+			'title'  => __( 'Documentation', 'imagify' ),
+			'href'   => imagify_get_external_url( 'documentation' ),
+			'meta'   => array(
+				'target' => '_blank',
+			),
+		) );
+
+		// Rate it.
+		$wp_admin_bar->add_menu(array(
+			'parent' => 'imagify',
+			'id'     => 'imagify-rate-it',
+			/* translators: %s is WordPress.org. */
+			'title'  => sprintf( __( 'Rate Imagify on %s', 'imagify' ), 'WordPress.org' ),
+			'href'   => imagify_get_external_url( 'rate' ),
+			'meta'   => array(
+				'target' => '_blank',
+			),
+		) );
+
+		// Quota & Profile informations.
+		if ( defined( 'IMAGIFY_HIDDEN_ACCOUNT' ) && IMAGIFY_HIDDEN_ACCOUNT || ! get_imagify_option( 'api_key' ) ) {
+			return;
+		}
+
+		if (
+			$this->user->is_free()
+			&&
+			$this->user->get_percent_unconsumed_quota() > 20
+		) {
+			$wp_admin_bar->add_menu( [
+				'parent' => 'imagify',
+				'id'     => 'imagify-upgrade-plan',
+				'title'  => '<button data-nonce="' . wp_create_nonce( 'imagify_get_pricing_' . get_current_user_id() ) . '" data-target="#imagify-pricing-modal" type="button" class="imagify-get-pricing-modal imagify-modal-trigger imagify-admin-bar-upgrade-plan">' . __( 'Upgrade Plan', 'imagify' ) . '</button>',
+			] );
+		}
+
+		$wp_admin_bar->add_menu( array(
+			'parent' => 'imagify',
+			'id'     => 'imagify-profile',
+			'title'  => wp_nonce_field( 'imagify-get-admin-bar-profile', 'imagifygetadminbarprofilenonce', false, false ) . '<div id="wp-admin-bar-imagify-profile-loading" class="hide-if-no-js">' . __( 'Loading...', 'imagify' ) . '</div><div id="wp-admin-bar-imagify-profile-content" class="hide-if-no-js"></div>',
+		) );
+	}
+
 	/**
 	 * Get admin bar profile output.
 	 *
@@ -34,27 +138,22 @@ public function get_admin_bar_profile_callback() {
 			imagify_die();
 		}
 
-		$user             = new User();
 		$views            = Imagify_Views::get_instance();
 		$unconsumed_quota = $views->get_quota_percent();
 		$text             = '';
 		$button_text      = '';
 		$upgrade_link     = '';
 		$upgrade_button   = '';
 
-		if ( $user->is_free() ) {
+		if ( $this->user->is_free() ) {
 			$text         = esc_html__( 'Upgrade your plan now for more!', 'rocket' ) . '<br>' .
 			esc_html__( 'From $5.99/month only, keep going with image optimization!', 'rocket' );
 			$button_text  = esc_html__( 'Upgrade My Plan', 'rocket' );
 			$upgrade_link = IMAGIFY_APP_DOMAIN . '/subscription/?utm_source=plugin&utm_medium=notification';
-
-			if ( $user->get_percent_unconsumed_quota() > 20 ) {
-				$upgrade_button = '<button id="imagify-get-pricing-modal" data-nonce="' . wp_create_nonce( 'imagify_get_pricing_' . get_current_user_id() ) . '" data-target="#imagify-pricing-modal" type="button" class="imagify-modal-trigger imagify-admin-bar-upgrade-plan">' . __( 'Upgrade Plan', 'imagify' ) . '</button>';
-			}
-		} elseif ( $user->is_growth() ) {
+		} elseif ( $this->user->is_growth() ) {
 			$text = esc_html__( 'Switch to Infinite plan for unlimited optimization:', 'rocket' ) . '<br>';
 
-			if ( $user->is_monthly ) {
+			if ( $this->user->is_monthly ) {
 				$text         .= esc_html__( 'For $9.99/month, optimize as many images as you like!', 'rocket' );
 				$upgrade_link = IMAGIFY_APP_DOMAIN . '/subscription/plan_switch/?label=infinite&payment_plan=1&utm_source=plugin&utm_medium=notification ';
 			} else {
@@ -68,11 +167,11 @@ public function get_admin_bar_profile_callback() {
 		$data = [
 			'quota_icon'       => $views->get_quota_icon(),
 			'quota_class'      => $views->get_quota_class(),
-			'plan_label'       => $user->plan_label,
-			'plan_with_quota'  => $user->is_free() || $user->is_growth(),
+			'plan_label'       => $this->user->plan_label,
+			'plan_with_quota'  => $this->user->is_free() || $this->user->is_growth(),
 			'unconsumed_quota' => $unconsumed_quota,
-			'user_quota'       => $user->quota,
-			'next_update'      => $user->next_date_update,
+			'user_quota'       => $this->user->quota,
+			'next_update'      => $this->user->next_date_update,
 			'text'             => $text,
 			'button_text'      => $button_text,
 			'upgrade_link'     => $upgrade_link,

diff --git a/classes/Admin/ServiceProvider.php b/classes/Admin/ServiceProvider.php
@@ -4,6 +4,7 @@
 namespace Imagify\Admin;
 
 use Imagify\Dependencies\League\Container\ServiceProvider\AbstractServiceProvider;
+use Imagify\User\User;
 
 /**
  * Service provider for Admin
@@ -16,6 +17,7 @@ class ServiceProvider extends AbstractServiceProvider {
 	 */
 	protected $provides = [
 		'admin_bar',
+		'user',
 	];
 
 	/**
@@ -33,7 +35,9 @@ class ServiceProvider extends AbstractServiceProvider {
 	 * @return void
 	 */
 	public function register() {
-		$this->getContainer()->share( 'admin_bar', AdminBar::class );
+		$this->getContainer()->add( 'user', User::class );
+		$this->getContainer()->share( 'admin_bar', AdminBar::class )
+			->addArgument( $this->getContainer()->get( 'user' ) );
 	}
 
 	/**