Merge branch 'master' of https://github.com/PPMESSAGE/ppmessage

Author: anxiaoyi

README.md

@@ -1,9 +1,20 @@
 # PPMessage
-A Open Source Plug & Play Online Customer Communication Platform. Base on PPMessage, you can chat with your customer via Web and mobile real time.
+A Open Source Plug & Play Online Customer Communication Platform. On PPMessage, you can chat with your customer via Web or mobile App. As open source [Intercom](http://intercom.io) alternative, nothing needs change, you can start a SAAS with PPMessage.
 
-## Run PPMessage on Mac OS X
+PPMessage targets to be deployed on Linux, Mac OS X and Windows systems. And PPMessage is a clearly API system which could be integrated with any open source Content Management System like Wordpress, Drupal and any commercial system even a e-commerce system.
+
+PPMessage includes a backend system which exposes oauth and web service APIs, a frontend SDK named PPCom, a frontend App named PPKefu.
+
+PPCom run in customer user side, and can be integrated in Web site via a single line Javascript code or integrated in mobile App with PPCom mobile API. Customer use PPCom to communicate with service user.
+
+PPKefu run in service user side, service user can use PPKefu application to communicate with customer user. PPKefu can run on Windows, Mac OS X, Android, iOS and Web.
 
-> Want to know more (install PPMessage on other OS platform, configuration etc.), please go to [PPMessage Site](http://ppmessage.com) get more documents about PPMessage.
+PPConsole is Web user interface of PPMessage and open sourced. After PPMessage backend running, PPConsole provided a Web interface to help the service team leader to setup the PPMessage system. 
+
+ 
+> In the following, it is a simple guide to help developer delopy PPMessage backend and generate Web version of PPCom and PPKefu on Mac OS X. Want to know more, please go to [PPMessage Site](http://ppmessage.com) get more detail documents about PPMessage.
+
+## Run PPMessage on Mac OS X
 
 ### Requirements
 

dist.sh

@@ -275,6 +275,30 @@ function ppmessage_app_ios()
     
 }
 
+function ppmessage_gulp()
+{
+    echo "generate PPCom/PPKefu/PPConsole js";
+    cd ppmessage/ppkefu/ppkefu; gulp; cd -;
+    cd ppmessage/ppcom/web/gulp; gulp; cd -;
+    cd ppmessage/ppconsole/gulp; gulp; cd -;
+}
+
+function ppmessage_bower()
+{
+    echo "install PPCom/PPKefu/PPConsole js bower depends";
+    cd ppmessage/ppcom/web; bower install; cd -;
+    cd ppmessage/ppkefu/ppkefu; bower install; cd -;
+    cd ppmessage/ppconsole; bower install; cd -;
+}
+
+function ppmessage_npm()
+{
+    echo "install PPCom/PPKefu/PPConsole js node depends";
+    cd ppmessage/ppcom/web/gulp; npm install; cd -;
+    cd ppmessage/ppkefu/ppkefu; npm install; cd -;
+    cd ppmessage/ppconsole/gulp; npm install; cd -;
+}
+
 
 ### MAIN ###
 
@@ -340,12 +364,16 @@ case "$1" in
         ppmessage_log
         ;;
     
-    ppmessage)
-        ppmessage_ppmessage
+    gulp)
+        ppmessage_gulp
+        ;;
+
+    bower)
+        ppmessage_bower
         ;;
 
-    localhost)
-        ppmessage_localhost
+    npm)
+        ppmessage_npm
         ;;
 
     app-win32)

ppmessage/ppconsole/static/js/controllers/app.js

@@ -122,7 +122,7 @@ angular.module("this_app")
             if (in_this) {
                 self.location = url;
             } else {
-                window.open(url, "ppmessage");
+                window.open(url, "ppmessage" + "-" + userEmail);
             }
         };
 

ppmessage/ppkefu/ppkefu/www/js/controllers/app.js

@@ -23,7 +23,10 @@ function ($scope, yvDB, yvLog, yvSys, yvNav, yvBase, yvLogin) {
         console.log("appctrl onloaded....");
     });
 
-
+    $scope.isInAndroidApp = function () {
+        return yvSys.in_android_app();
+    };
+    
     $scope.isInMobileNative = function () {
         if (yvSys.in_mobile_app()) {
             return true;

ppmessage/ppkefu/ppkefu/www/js/controllers/auto-login.js

@@ -2,10 +2,11 @@ ppmessageModule.controller("AutoLoginCtrl", [
     "$scope",
     "$state",
     "$stateParams",
+    "$ionicHistory",
     "yvNav",
     "yvMain",
     "yvLogin",
-function ($scope, $state, $stateParams, yvNav, yvMain, yvLogin) {
+function ($scope, $state, $stateParams, $ionicHistory, yvNav, yvMain, yvLogin) {
 
     function login_success() {
         console.log("login successfully...");
@@ -37,6 +38,11 @@ function ($scope, $state, $stateParams, yvNav, yvMain, yvLogin) {
 
         $scope.user.user_email = _body.user_email;
         $scope.user.user_password = _body.user_password;
+        var current_session = yvLogin.current_session();
+        if (current_session && current_session.user_email == _body.user_email) {
+            $ionicHistory.goBack();
+            return;
+        }
         yvMain.init_yvdb(function (user) {
             yvLogin.login($scope.user);
         });

ppmessage/ppkefu/ppkefu/www/js/controllers/change-avatar.js

@@ -106,12 +106,11 @@ function ($scope, $timeout, FileUploader, $ionicLoading, yvSys, yvAPI, yvUser, y
     }
 
 
-    function cropAvatarCallback(blob, file) {
+    function cropAvatarCallback(blob) {
         if (!fileItem) {
             return;
         }
         fileItem._file = blob;
-        fileItem.file = file;
         fileItem.upload();
         return;
     }

ppmessage/ppkefu/ppkefu/www/js/controllers/contact-list.js

@@ -37,13 +37,6 @@ function ($scope, $timeout, $rootScope, $stateParams, yvSys, yvUser, yvLink, yvB
             });
         }
 
-        $scope.$on("event:online", function(event, params) {
-            console.log("receive online message in contact-list");
-            //params.type: online, params.online: true/false, params.user_uuid: user_uuid
-            console.log("params %o", params);
-            //FIXME: should load contact online which already set in yvObject
-        });
-
     }
 
     _init();