Changeset 2029975

Timestamp:

02/13/2019 02:48:23 PM (7 years ago)

Author:

kranthitech

Message:

Added API Key for Connecting with Yeloni Web Services

Location:

yeloni-free-exit-popup/trunk

Files:

• admin-interface/dist/admin.min.js (modified) (8 diffs)
• admin-interface/loader/admin_dev.json (modified) (1 diff)
• admin-interface/src/partials/build.apikey.html (added)
• admin-interface/src/partials/build.html (modified) (1 diff)
• admin-interface/src/partials/list.html (modified) (1 diff)
• client/dist/client.min.js (modified) (1 diff)
• wordpress/admin-wordpress.js (modified) (6 diffs)
• yetience-plugin.php (modified) (1 diff)

yeloni-free-exit-popup/trunk/admin-interface/dist/admin.min.js

@@ -526 +526 @@
                 controller: 'widgetTypeController'
             })
-
             .state('build.select', {
                 url: '/select',
@@ -541 +540 @@
                 templateUrl: yetience.adminPath + '/src/partials/build.integrate.html',
                 controller: 'buildIntegrateController'
+            })
+            .state('build.apikey', {
+                url: '/apikey',
+                templateUrl: yetience.adminPath + '/src/partials/build.apikey.html',
+                controller: 'buildAPIKeyController'
             })
             .state('extensions', {
@@ -2368 +2372 @@
 
 angular.module('yetienceApp')
+    .controller('buildAPIKeyController', ['$scope', 'SettingsService', '$state', '$rootScope', '$stateParams', '$location', 'WidgetUpdate', 'localStorageService', 'UtilsService', function ($scope, SettingsService, $state, $rootScope, $stateParams, $location, WidgetUpdate, localStorageService, UtilsService) {
+        //console.log('INSIDE BUIlD APIKEY CONTROLLER')
+
+        $scope.SS = SettingsService
+
+
+        $scope.submitCode = function (apikey) {
+            if (apikey.trim() == SettingsService.setup().id) {
+                //WidgetUpdate.operations.saveTemplate()
+                console.log('widget is ', $scope.widget)
+                WidgetUpdate.savePopup($scope.widget)
+            } else {
+                alert('Invalid API Key')
+            }
+        }
+    }])
+angular.module('yetienceApp')
     .directive('tag', [function() {
         // Runs during compile
@@ -4717 +4738 @@
                 show: true,
                 title: function (widget) {
+                    return (firstWidget()) ? 'Generate API Key' : 'Save my Design'
+
                     /*
                         If email subscription theme, then button title is 'Integrate'
                         Otherwise, button title is 'Save my Design'
                     */
-                    if (isEmailPopup(widget)) {
-                        return 'Autoresponse'
-                    } else {
-                        return 'Save my Design'
-                    }
+                    // // if (isEmailPopup(widget)) {
+                    // //     return 'Autoresponse'
+                    // // } else {
+                    // return 'Save my Design'
+                    // //}
                 },
                 tabTitle: 'Customize',
@@ -4735 +4758 @@
                     //if it's an email widget, don't save
 
-                    if (isEmailPopup(widget)) {
-                        return false
-                    } else {
-                        return true
-                    }
-                }
-            },
-            integrate: {
+                    // if (isEmailPopup(widget)) {
+                    //     return false
+                    // } else {
+                    //return true
+                    // }
+                    return !firstWidget()
+                }
+            },
+            apikey: {
                 show: false,
-                title: 'Save Popup',
-                operation: 'saveEmailTemplate',
-                tabTitle: 'Autoresponse',
-                create: function (widget) {
-                    //if email sub widget - retur
-                    if (widget) {
-                        $rootScope.isEmailTheme = ($rootScope.themes[widget.theme].categories.indexOf('subscribe') >= 0)
-                        return ($rootScope.themes[widget.theme].categories.indexOf('subscribe') >= 0)
-                    } else {
-                        $rootScope.isEmailTheme = false
-                        return false
-                    }
+                tabTitle: 'Generate API Key',
+                title: 'Save my Design',
+                create: function () {
+                    //show this only if no widget has been created yet
+                    return SettingsService.setup().widgets.length == 0
                 },
-                edit: function (widget) {
-                    //if email sub widget - retur
-                    if (widget) {
-                        return ($rootScope.themes[widget.theme].categories.indexOf('subscribe') >= 0)
-                    } else {
-                        return false
-                    }
-                },
-                saveOnCompletion: true
-            }
+                edit: false,
+                saveOnCompletion: true,
+                operation: 'saveAPIKey'
+            }
+            /*,
+                        integrate: {
+                            show: false,
+                            title: 'Save Popup',
+                            operation: 'saveEmailTemplate',
+                            tabTitle: 'Autoresponse',
+                            create: function (widget) {
+                                //if email sub widget - retur
+                                if (widget) {
+                                    $rootScope.isEmailTheme = ($rootScope.themes[widget.theme].categories.indexOf('subscribe') >= 0)
+                                    return ($rootScope.themes[widget.theme].categories.indexOf('subscribe') >= 0)
+                                } else {
+                                    $rootScope.isEmailTheme = false
+                                    return false
+                                }
+                            },
+                            edit: function (widget) {
+                                //if email sub widget - retur
+                                if (widget) {
+                                    return ($rootScope.themes[widget.theme].categories.indexOf('subscribe') >= 0)
+                                } else {
+                                    return false
+                                }
+                            },
+                            saveOnCompletion: true
+                        }*/
+
             /*,
                         launch: {
@@ -4797 +4835 @@
             "build.placement": "build.select",
             "build.select": "build.design",
-            "build.design": "build.integrate"
+            "build.design": "build.apikey"
+            //"build.design": "build.integrate"
 
             //before we had goals
@@ -4895 +4934 @@
         }
 
+        this.operations = operations
+
         function getWidget() {
             var html = document.getElementById('widget-design').innerHTML
@@ -4930 +4971 @@
         }
 
+        this.savePopup = savePopup
+
         this.isEmailPopup = isEmailPopup
+        this.firstWidget = firstWidget
+
+        function firstWidget() {
+            return SettingsService.setup().widgets.length == 0
+        }
 
         function isEmailPopup(widget) {

yeloni-free-exit-popup/trunk/admin-interface/loader/admin_dev.json

@@ -9 +9 @@
     }, {
         "base": "/src/scripts/controllers",
-        "items": ["gopremium", "list", "main", "start", "auth.form", "build", "build.business.goal", "build.widget.type", "build.select", "build.design", "build.configure", "build.activate", "build.launch", "build.launch.statistics", "build.integrate", "build.launch.package", "email.list", "extension.sale", "modal.feedback", "affiliate"],
+        "items": ["gopremium", "list", "main", "start", "auth.form", "build", "build.business.goal", "build.widget.type", "build.select", "build.design", "build.configure", "build.activate", "build.launch", "build.launch.statistics", "build.integrate", "build.launch.package", "email.list", "extension.sale", "modal.feedback", "affiliate", "build.apikey"],
         "suffix": ".controller"
     }, {

yeloni-free-exit-popup/trunk/admin-interface/src/partials/build.html

@@ -17 +17 @@
             </a>
         </li>
-        <button class="btn btn-primary pull-right btn-disabled" ng-disabled="disableSave()" ng-show="W.states[W.current.state].title && W.compute(W.states[W.current.state],'show') && !W.current.working" ng-click="W.nextFunction(widget,customer)">
+        <button class="btn btn-primary pull-right btn-disabled" ng-disabled="disableSave()" ng-show="W.states[W.current.state].title && W.compute(W.states[W.current.state],'show') && !W.current.working"
+            ng-click="W.nextFunction(widget,customer)">
             <span>Next: {{W.compute(W.states[W.current.state],'title',widget)}} &#8594</span>
         </button>

yeloni-free-exit-popup/trunk/admin-interface/src/partials/list.html

@@ -99 +99 @@
             </div>
 
-            <div class="checkbox" class="add-yel-badge" ng-click="WU.changePoweredBy()" ng-show="!R.SETUP.poweredBy||R.SETUP.customPoweredBy">
+            <!-- <div class="checkbox" class="add-yel-badge" ng-click="WU.changePoweredBy()" ng-show="!R.SETUP.poweredBy||R.SETUP.customPoweredBy">
                 <label><input class="form-control" ng-model="R.SETUP.poweredBy" type="checkbox">
                     Add Yeloni Badge
                 </label>
-            </div>
+            </div> -->
 
         </div>

yeloni-free-exit-popup/trunk/client/dist/client.min.js

@@ -807 +807 @@
     })
 
+    Autience.lifecycle.render.push(function (widget) {
+        var extensions = Autience.utils.nestedValue(Autience, ['setup', 'extensions'])
+        if (!extensions || Object.keys(extensions).length == 0) {
+            return
+        }
+
+        if (widget.goalType != 'subscribe') {
+            return
+        }
+        if (document.getElementsByClassName('logged-in').length > 0) {
+            return
+        }
+
+        var widget_element = document.getElementById(widget.code)
+        var poweredBy = document.createElement('div')
+        var url = 'https://convertiply.com'
+        url = url + '?utm_source=' + window.location.hostname + '&utm_campaign=poweredby'
+        poweredBy.innerHTML = "<a href='" + url + "' target='_blank'>Get an <b>Email Optin</b> for your Website</a>"
+        var style = poweredBy.style,
+            astyle = poweredBy.getElementsByTagName('a')[0].style
+        Object.assign(style, {
+            color: 'white',
+            fontSize: '15px',
+            fontFamily: 'arial',
+            textAlign: 'center'
+        })
+        Object.assign(astyle, {
+            color: 'white'
+        })
+        widget_element.appendChild(poweredBy)
+    })
     /*
     //showing the affiliate link if applicable

yeloni-free-exit-popup/trunk/wordpress/admin-wordpress.js

@@ -1 +1 @@
 //this file has functions to read from the wp-config setting textbox
 
-window.defineAdminYetience = function() {
-    yetience.loadApp(yetience.path + "/admin-interface", function() {
+window.defineAdminYetience = function () {
+    yetience.loadApp(yetience.path + "/admin-interface", function () {
         //console.log('Scripts and styles loaded in ' + (Date.now() - autience_initiated_at) + ' milliseconds')
-        angular.element(document).ready(function() {
+        angular.element(document).ready(function () {
             angular.bootstrap(document, ['yetienceApp'])
 
@@ -14 +14 @@
 
     yetience.website_saved = false
-    yetience.readFromPlatform = function() {
+    yetience.readFromPlatform = function () {
         var encoded_setup = yetience.encoded_setup //document.getElementById('yetience_setup').value
         if (encoded_setup && encoded_setup.length > 1) {
@@ -23 +23 @@
         } else {
             return {
+                need_api_key: true,
                 widgets: []
             }
@@ -29 +30 @@
 
 
-    yetience.saveToPlatform = function(setup, message, label, disable_undo) {
+    yetience.saveToPlatform = function (setup, message, label, disable_undo) {
         //if (!yetience.isCyclic(setup)) {
         document.getElementById('yetience_setup').value = window.btoa(encodeURIComponent(JSON.stringify(setup)))
@@ -41 +42 @@
         document.getElementById('yetience_submit_button').getElementsByTagName('input')[0].value = label
         yetience.readyToSave()
-            //}
+        //}
 
     }
 
-    yetience.readyToSave = function() {
+    yetience.readyToSave = function () {
         document.getElementById("yetience_submit_button").style.display = 'block'
 
@@ -52 +53 @@
     }
 
-    yetience.isCyclic = function(obj) {
+    yetience.isCyclic = function (obj) {
         var seenObjects = [];
 

yeloni-free-exit-popup/trunk/yetience-plugin.php

@@ -4 +4 @@
 Plugin URI: #
 Description: Exit Popups are the best way to engage visitors leaving your website. Show offers, social buttons, email signup forms or customize it as you like.
-Version: 9.0.1
+Version: 9.0.2
 Author: Jayasri Nagrale
 Author URI: http://www.yeloni.com