chore: telemetry Modal replaced with Multi Step Modal

backend/app/Config.php

@@ -21,7 +21,7 @@ class Config
 
     public const VAR_PREFIX = 'bit_smtp_';
 
-    public const VERSION = '1.1.1';
+    public const VERSION = '1.1.2';
 
     public const DB_VERSION = '1.0';
 

backend/app/HTTP/Controllers/SMTPAnalyticsController.php → backend/app/HTTP/Controllers/TelemetryPopupController.php

@@ -3,10 +3,10 @@
 namespace BitApps\SMTP\HTTP\Controllers;
 
 use BitApps\SMTP\Config;
+use BitApps\SMTP\Deps\BitApps\WPKit\Http\Request\Request;
 use BitApps\SMTP\Deps\BitApps\WPTelemetry\Telemetry\Telemetry;
-use BitApps\SMTP\HTTP\Requests\TelemetryAccessRequest;
 
-final class SMTPAnalyticsController
+class TelemetryPopupController
 {
     public function filterTrackingData($additional_data)
     {
@@ -16,7 +16,7 @@ public function filterTrackingData($additional_data)
         return $additional_data;
     }
 
-    public function telemetryPermissionHandle(TelemetryAccessRequest $request)
+    public function handleTelemetryPermission(Request $request)
     {
         if ($request->isChecked == true) {
             Telemetry::report()->trackingOptIn();
@@ -31,16 +31,16 @@ public function telemetryPermissionHandle(TelemetryAccessRequest $request)
         return false;
     }
 
-    public function telemetryPopupDisableCheck()
+    public function isPopupDisabled()
     {
         $allowed = Telemetry::report()->isTrackingAllowed();
         if ($allowed == true) {
             return true;
         }
 
-        $skipped             = get_option(Config::VAR_PREFIX . 'tracking_skipped');
-        $getOldPluginVersion = get_option(Config::VAR_PREFIX . 'old_version');
+        $popupSkipped             = get_option(Config::VAR_PREFIX . 'tracking_skipped');
+        $getOldPluginVersion      = get_option(Config::VAR_PREFIX . 'old_version');
 
-        return (bool) ($skipped == true && $getOldPluginVersion === Config::VERSION);
+        return (bool) (($popupSkipped == true) && $getOldPluginVersion === Config::VERSION);
     }
 }

backend/app/Providers/HookProvider.php

@@ -6,7 +6,7 @@
 use BitApps\SMTP\Deps\BitApps\WPKit\Hooks\Hooks;
 use BitApps\SMTP\Deps\BitApps\WPKit\Http\RequestType;
 use BitApps\SMTP\Deps\BitApps\WPKit\Http\Router\Router;
-use BitApps\SMTP\HTTP\Controllers\SMTPAnalyticsController;
+use BitApps\SMTP\HTTP\Controllers\TelemetryPopupController;
 use BitApps\SMTP\Plugin;
 
 class HookProvider
@@ -19,7 +19,7 @@ public function __construct()
         $this->loadAppHooks();
         Hooks::addAction('phpmailer_init', [$this, 'mailConfig'], 1000);
         Hooks::addAction('rest_api_init', [$this, 'loadApi']);
-        Hooks::addFilter(Config::VAR_PREFIX . 'telemetry_additional_data', [new SMTPAnalyticsController(), 'filterTrackingData']);
+        Hooks::addFilter(Config::VAR_PREFIX . 'telemetry_additional_data', [new TelemetryPopupController(), 'filterTrackingData']);
     }
 
     /**

backend/hooks/ajax.php

@@ -1,8 +1,8 @@
 <?php
 
 use BitApps\SMTP\Deps\BitApps\WPKit\Http\Router\Route;
-use BitApps\SMTP\HTTP\Controllers\SMTPAnalyticsController;
 use BitApps\SMTP\HTTP\Controllers\SMTPController;
+use BitApps\SMTP\HTTP\Controllers\TelemetryPopupController;
 
 if (!\defined('ABSPATH')) {
     exit;
@@ -12,6 +12,6 @@
     Route::post('save_mail_config', [SMTPController::class, 'saveMailConfig']);
     Route::get('get_mail_config', [SMTPController::class, 'index']);
     Route::post('send_test_mail', [SMTPController::class, 'sendTestEmail']);
-    Route::post('telemetry_permission_handle', [SMTPAnalyticsController::class, 'telemetryPermissionHandle']);
-    Route::get('telemetry_popup_disable_check', [SMTPAnalyticsController::class, 'telemetryPopupDisableCheck']);
+    Route::post('telemetry_permission_handle', [TelemetryPopupController::class, 'handleTelemetryPermission']);
+    Route::get('telemetry_popup_disable_check', [TelemetryPopupController::class, 'isPopupDisabled']);
 })->middleware('nonce:admin');

bit_smtp.php

@@ -4,7 +4,7 @@
  * Plugin Name: BIT SMTP
  * Plugin URI:  https://www.bitapps.pro/bit-smtp
  * Description: Send email via SMTP using BIT SMTP plugin by Bit Apps
- * Version:     1.1.1
+ * Version:     1.1.2
  * Author:      Bit Apps
  * Author URI:  https://bitapps.pro
  * Text Domain: bit-smtp

frontend/src/changeLogs.ts

@@ -0,0 +1,14 @@
+const changeLogs = {
+  improvements: [
+    'SMTP debug enable/disable option added.',
+    'UI modified.',
+    'Improves confirmation message.'
+  ],
+  fixed: [
+    'Namespace conflict issue fixed.',
+    'Illegal string offset (PHP Warning).',
+    'Some minor issue fixed.'
+  ]
+}
+
+export default changeLogs

frontend/src/components/TelemetryPopup/Index.ts

@@ -0,0 +1,3 @@
+import TelemetryPopup from './TelemetryPopup'
+
+export default TelemetryPopup

frontend/src/components/TelemetryPopup/TelemetryPopup.module.css

@@ -0,0 +1,85 @@
+/* stylelint-disable no-descending-specificity */
+.popupContent {
+  margin-block: 20px;
+}
+
+.popupContent ul {
+  list-style-type: disc;
+  margin-left: 15px;
+}
+
+.improvementsTitle {
+  background-color: orange;
+  color: #000;
+  padding: 4px 8px;
+  border-radius: 5px;
+  text-align: center;
+}
+
+.fixedTitle {
+  background-color: #087d08;
+  color: #fff;
+  padding: 4px 8px;
+  border-radius: 5px;
+  text-align: center;
+}
+
+.skipBtn {
+  border: none;
+  box-shadow: none;
+  padding: 0;
+}
+
+.skipBtn span {
+  color: #776d6d;
+}
+
+.skipBtn span:hover {
+  color: #534e4e;
+}
+
+.okBtn span {
+  color: white !important;
+}
+
+.bitSocialReleaseBanner a:focus {
+  box-shadow: none;
+}
+
+.improvements,
+.fixed {
+  display: flex;
+  flex-direction: column;
+  margin: 8px;
+  color: #000;
+}
+
+.improvements span {
+  color: #000;
+}
+
+.telemetryContent span {
+  color: #000;
+}
+
+.telemetryContent h3 {
+  margin-bottom: 0;
+}
+
+.telemetryContent button {
+  margin-top: 10px;
+  border: none;
+  background: none;
+  color: black;
+  padding: 0;
+  cursor: pointer;
+  text-decoration: underline;
+}
+
+.telemetryContent a:hover {
+  color: #1577ff;
+}
+
+.telemetryContent a:focus {
+  box-shadow: none;
+}