Changeset 2179244

Timestamp:

10/24/2019 11:31:03 AM (5 years ago)

Author:

lucastidio

Message:

Simplify login flow for users with only one project; Set widget as installed immediately after user connected project

Location:

tidio-live-chat/trunk

Files:

• media/css/options.css (modified) (6 diffs)
• media/js/options.js (modified) (5 diffs)
• options.php (modified) (2 diffs)
• readme.txt (modified) (2 diffs)
• tidio-elements.php (modified) (3 diffs)

tidio-live-chat/trunk/media/css/options.css

@@ -57 +57 @@
 }
 
-.tidio-box-advert {
+.tidio-box-george {
     text-align: center;
     position: relative;
@@ -75 +75 @@
 }
 
-.tidio-box-advert h2, .tidio-box-actions h1 {
+.tidio-box-george h2, .tidio-box-actions h1 {
     font-size: 24px;
     line-height: 34px;
@@ -97 +97 @@
 }
 
-.tidio-box-advert-image {
+.tidio-box-george-image {
     position: absolute;
     left: 0;
@@ -210 +210 @@
     }
 
-    .tidio-box-advert h2 {
+    .tidio-box-george h2 {
         margin-top: 24px;
     }
@@ -229 +229 @@
     }
 
-    .tidio-box-advert h2 {
+    .tidio-box-george h2 {
         margin-top: 32px;
     }
@@ -237 +237 @@
     }
 
-    .tidio-box-advert {
+    .tidio-box-george {
         flex-basis: 680px;
     }

tidio-live-chat/trunk/media/js/options.js

@@ -75 +75 @@
                 return false;
             }
-            if (passwordField.is(':invalid')) {
-                this.showError('Password must be at least 6 characters long!');
+            if (passwordField.val() === '') {
+                this.showError('Password can’t be empty!');
                 return false;
             }
@@ -131 +131 @@
             select_project.children().remove();
             select_project.append(defaultOption);
+            var selected = false;
+            if (data.value.length === 1) {
+                selected = true;
+            }
             for (var i in data.value) {
                 var project = data.value[i];
@@ -140 +144 @@
 
                 var option = $(
-                    '<option value="' + project.id + '">' + project.name +
+                    '<option value="' + project.id + '" ' + (selected ? 'selected="selected"' : '') + '>' + project.name +
                     '</option>');
                 option.data('value', value);
@@ -152 +156 @@
                 api_token: token,
             }, (function (response) {
-                this.form.hide();
-                this.form = $('#tidio-project');
-                this.form.show();
-                this.renderProjects(response);
-                this.form.off().submit(this.onProjectSubmit.bind(this));
-                var startOver = $('#start-over');
-                startOver.click(this.startOver.bind(this));
+                if (response.value.length === 1) {
+                    this.renderProjects(response);
+                    this.onProjectSubmit();
+                } else {
+                    this.form.hide();
+                    this.form = $('#tidio-project');
+                    this.form.show();
+                    this.renderProjects(response);
+                    this.form.off().submit(this.onProjectSubmit.bind(this));
+                    var startOver = $('#start-over');
+                    startOver.click(this.startOver.bind(this));
+                }
             }).bind(this), 'json');
         },
@@ -164 +173 @@
             var details = $('#select-tidio-project option:selected').
                 data('value');
-            $.extend(details, { 'action': 'get_project_keys' });
+            $.extend(details, { 'action': 'set_project_keys', 'api_token': TidioChatWP.token });
             $.post(ajaxurl, details, (function (response) {
                 window.open(response, '_blank');

tidio-live-chat/trunk/options.php

@@ -25 +25 @@
                 <label>
                     Password
-                    <input type="password" id="password" minlength="6" required placeholder="Type your password&hellip;"/>
+                    <input type="password" id="password" placeholder="Type your password&hellip;" required/>
                 </label>
 
@@ -53 +53 @@
             </form>
         </div>
-        <div class="tidio-box tidio-box-advert">
+        <div class="tidio-box tidio-box-george">
             <h2>Join 300 000+ websites using Tidio - Live Chat boosted with Bots</h2>
             <p>Increase sales by skyrocketing communication with customers.</p>
-            <div class="tidio-box-advert-image"></div>
+            <div class="tidio-box-george-image"></div>
         </div>
     </div>

tidio-live-chat/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 3.0
 Tested up to: 5.2
-Stable tag: trunk
+Stable tag: 4.1.0
 License: GPLv2
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -122 +122 @@
 == Changelog ==
 
+= 4.1.0 =
+* Simplify login flow for users with only one project
+* Set widget as installed immediately after user connected project
+
 = 4.0.1 =
 * Fix saving project data after creating new project

tidio-live-chat/trunk/tidio-elements.php

@@ -5 +5 @@
  * Plugin URI: http://www.tidiochat.com
  * Description: Tidio Live Chat - Live chat for your website. No logging in, no signing up - integrates with your website in less than 20 seconds.
- * Version: 4.0.1
+ * Version: 4.1.0
  * Author: Tidio Ltd.
  * Author URI: http://www.tidiochat.com
  * License: GPL2
  */
-define('TIDIOCHAT_VERSION', '4.0.1');
+define('TIDIOCHAT_VERSION', '4.1.0');
 define('AFFILIATE_CONFIG_FILE_PATH', get_template_directory().'/tidio_affiliate_ref_id.txt');
 
@@ -53 +53 @@
 
             add_action('wp_ajax_tidio_chat_save_keys', array($this, 'ajaxTidioChatSaveKeys'));
-            add_action('wp_ajax_get_project_keys', array($this, 'ajaxGetProjectKeys'));
+            add_action('wp_ajax_set_project_keys', array($this, 'ajaxSetProjectKeys'));
             add_action('wp_ajax_get_private_key', array($this, 'ajaxGetPrivateKey'));
 
@@ -217 +217 @@
     }
 
-    public function ajaxGetProjectKeys()
+    public function ajaxSetProjectKeys()
     {
         update_option(TidioLiveChat::PUBLIC_KEY_OPTION, $_POST['public_key']);
         update_option(TidioLiveChat::PRIVATE_KEY_OPTION, $_POST['private_key']);
+
+        $query = http_build_query(array(
+            'api_token' => $_POST['api_token'],
+            'project_public_key' => $_POST['public_key']
+        ));
+
+        $options = array('http' => array('method' => 'POST'));
+
+        $context = stream_context_create($options);
+        @file_get_contents(TidioLiveChat::API_URL . '/access/connectWordpress?' . $query, false, $context);
+
         echo TidioLiveChat::getRedirectUrl($_POST['private_key']);
         exit();