chore: re-structure

Add the JS and CSS into a single PHP file since it will used only one time

Author: Soare-Robert-Daniel

css/settings.css

@@ -2865,50 +2865,3 @@ button.feedzy-action-button {
 	gap: 1rem;
 	margin-bottom: 20px;
 }
-
-
-.feedzy-notice-dismiss {
-	position: absolute;
-	top: 10px;
-	right: 10px; 
-	background: transparent; 
-	border: none; 
-	cursor: pointer;
-	font-size: 24px;
-}
-
-.feedzy-notice-title {
-	font-size: clamp(28px, 5vw, 42px);
-	margin: 0 0 10px 0;
-}
-
-.feedzy-helper-notice .feedzy-notice-subtitle {
-	font-size: 20px;
-	margin-bottom: 20px;
-}
-
-.feedzy-wrap .feedzy-helper-subscribe {
-	width: 100%;
-	max-width: 600px;
-	padding: 15px; 
-	font-size: 16px;
-	border: none;
-	border-radius: 5px;
-	margin-bottom: 20px;
-}
-
-.feedzy-helper-info {
-	font-size: 18px;
-	font-weight: 600;
-	margin-bottom: 8px;
-}
-
-.feedzy-helper-notice .feedzy-subscribe{
-	background: white;
-	padding: 12px 30px;
-	font-size: 18px;
-	font-weight: 600;
-	border: none;
-	border-radius: 5px;
-	cursor: pointer;
-}

includes/admin/feedzy-rss-feeds-admin.php

@@ -2160,6 +2160,7 @@ private function setup_wizard_subscribe_process() {
 			if ( ! is_wp_error( $request_res ) ) {
 				$body = json_decode( wp_remote_retrieve_body( $request_res ) );
 				if ( 'success' === $body->code ) {
+					update_option( 'feedzy_onboarding_user_subscribed', 'yes' );
 					$this->feedzy_dismiss_wizard( false );
 					wp_send_json( $response );
 				}
@@ -2172,14 +2173,14 @@ private function setup_wizard_subscribe_process() {
 				)
 			);
 		} else {
-			update_option( 'feedzy_rss_feeds_skip_subscribe', 'yes' );
+			
 			$this->feedzy_dismiss_wizard( false );
 			wp_send_json( $response );
 		}
 	}
 
 	/**
-	 * AJAX method to subscribe user to Feedzy newsletter.
+	 * AJAX method to subscribe user to Feedzy newsletter via dashboard notice.
 	 *
 	 * @since 5.1.0
 	 * @access public
@@ -2188,40 +2189,51 @@ private function setup_wizard_subscribe_process() {
 	public function feedzy_dashboard_subscribe() {
 		check_ajax_referer( 'feedzy_subscribe_nonce', '_wpnonce' );
 
-		$with_subscribe = ! empty( $_POST['with_subscribe'] ) ? (bool) $_POST['with_subscribe'] : false;
-		$email          = ! empty( $_POST['email'] ) ? sanitize_email( $_POST['email'] ) : '';
-		$integrate_with = ! empty( $_POST['integrate_with'] ) ? sanitize_text_field( $_POST['integrate_with'] ) : '';
-		
-		if ( $with_subscribe && is_email( $email ) ) {
-			update_option( 'feedzy_rss_feeds_logger_flag', 'yes' );
-			
-			$request_res = wp_remote_post(
-				FEEDZY_SUBSCRIBE_API,
+		$email = ! empty( $_POST['email'] ) ? sanitize_email( $_POST['email'] ) : '';
+		$skip  = ! empty( $_POST['skip'] ) ? sanitize_text_field( wp_unslash( $_POST['skip'] ) ) : '';
+
+		if ( 'yes' === $skip ) {
+			$this->dismiss_subscribe_notice();
+			wp_send_json_success();
+		}
+
+		if ( empty( $email ) || ! is_email( $email ) ) {
+			wp_send_json_error(
 				array(
-					'timeout' => 100, // phpcs:ignore WordPressVIPMinimum.Performance.RemoteRequestTimeout.timeout_timeout
-					'headers' => array(
-						'Content-Type' => 'application/json',
-					),
-					'body'    => wp_json_encode(
-						array(
-							'slug'  => 'feedzy-rss-feeds',
-							'site'  => home_url(),
-							'email' => $email,
-							'data'  => array( 'integration' => $integrate_with ),
-						)
-					),
+					'message' => __( 'Validation failed', 'feedzy-rss-feeds' ),
 				)
 			);
-			
-			if ( ! is_wp_error( $request_res ) ) {
-				$this->dismiss_subscribe_notice();
-				wp_send_json_success();
-			} else {
-				wp_send_json_error();
-			}
-		} else {
+		}
+		
+		update_option( 'feedzy_rss_feeds_logger_flag', 'yes' );
+		
+		$request_res = wp_remote_post(
+			FEEDZY_SUBSCRIBE_API,
+			array(
+				'timeout' => 100, // phpcs:ignore WordPressVIPMinimum.Performance.RemoteRequestTimeout.timeout_timeout
+				'headers' => array(
+					'Content-Type' => 'application/json',
+				),
+				'body'    => wp_json_encode(
+					array(
+						'slug'  => 'feedzy-rss-feeds',
+						'site'  => home_url(),
+						'email' => $email,
+						'data'  => array( 'source' => 'dashboard-notice' ),
+					)
+				),
+			)
+		);
+		
+		if ( ! is_wp_error( $request_res ) ) {
 			$this->dismiss_subscribe_notice();
 			wp_send_json_success();
+		} else {
+			wp_send_json_error( 
+				array(
+					'message' => $request_res->get_error_message(),
+				)
+			);
 		}
 	}
 
@@ -2233,7 +2245,7 @@ public function feedzy_dashboard_subscribe() {
 	 * @return void
 	 */
 	public function dismiss_subscribe_notice() {
-		update_option( 'feedzy_rss_feeds_dismiss_subscribe_notice', 'yes' );
+		update_option( 'feedzy_dismiss_subscribe_notice_dashboard', 'yes' );
 	}
 
 	/**