Whats pro

.drone.yml

@@ -8,17 +8,19 @@ pipeline:
   test:
     image: erxes/runner:latest
     environment:
+      - MONGO_URL=mongodb://mongo/erxes
       - TEST_MONGO_URL=mongodb://mongo/test
       - JWT_TOKEN_SECRET=token
+      - MAIN_APP_DOMAIN=http://localhost:3000
     commands:
       - node -v
       - npm -v
       - yarn --version
       - yarn install
       - yarn lint
       - yarn tsc
-      - mkdir src/private/xlsTemplateOutputs
       - yarn test
+      - mkdir src/private/xlsTemplateOutputs
 
   build:
     image: erxes/runner:latest

.env.sample

@@ -18,18 +18,5 @@ RABBITMQ_HOST=amqp://localhost
 # ELASTICSEARCH
 ELASTICSEARCH_URL=http://localhost:9200
 
-# cron
-PORT_CRONS=3600
-
-# workers
-PORT_WORKERS=3700
-
-# erxes public facing domains
-DOMAIN=http://localhost:3300
-MAIN_APP_DOMAIN=http://localhost:3000
-WIDGETS_DOMAIN=http://localhost:3200
-INTEGRATIONS_API_DOMAIN=http://localhost:3400
-CRONS_API_DOMAIN=
-WORKERS_API_DOMAIN=
-LOGS_API_DOMAIN=
-ENGAGES_API_DOMAIN=
+# frontend domain
+MAIN_APP_DOMAIN=http://localhost:3000

.snyk

@@ -10,6 +10,56 @@ ignore:
     - firebase-admin > @google-cloud/firestore > lodash.merge:
         reason: None given
         expires: '2019-11-28T23:30:03.061Z'
+  SNYK-JS-MINIMIST-559764:
+    - '@axelspringer/graphql-google-pubsub > @google-cloud/pubsub > google-gax > grpc > node-pre-gyp > mkdirp > minimist':
+        reason: None given
+        expires: '2020-04-25T09:17:23.755Z'
+    - '@axelspringer/graphql-google-pubsub > @google-cloud/pubsub > google-gax > grpc > node-pre-gyp > tar > mkdirp > minimist':
+        reason: None given
+        expires: '2020-04-25T09:17:23.755Z'
+    - '@axelspringer/graphql-google-pubsub > @google-cloud/pubsub > google-gax > grpc-gcp > grpc > node-pre-gyp > mkdirp > minimist':
+        reason: None given
+        expires: '2020-04-25T09:17:23.755Z'
+    - '@axelspringer/graphql-google-pubsub > @google-cloud/pubsub > google-gax > grpc-gcp > grpc > node-pre-gyp > tar > mkdirp > minimist':
+        reason: None given
+        expires: '2020-04-25T09:17:23.755Z'
+    - '@axelspringer/graphql-google-pubsub > @google-cloud/pubsub > google-gax > grpc > node-pre-gyp > rc > minimist':
+        reason: None given
+        expires: '2020-04-25T09:17:23.755Z'
+    - '@axelspringer/graphql-google-pubsub > @google-cloud/pubsub > google-gax > grpc-gcp > grpc > node-pre-gyp > rc > minimist':
+        reason: None given
+        expires: '2020-04-25T09:17:23.755Z'
+    - minimist:
+        reason: None given
+        expires: '2020-04-25T09:17:23.755Z'
+    - mkdirp > minimist:
+        reason: None given
+        expires: '2020-04-25T09:17:23.755Z'
+    - node-pre-gyp > mkdirp > minimist:
+        reason: None given
+        expires: '2020-04-25T09:17:23.756Z'
+    - node-pre-gyp > tar > mkdirp > minimist:
+        reason: None given
+        expires: '2020-04-25T09:17:23.756Z'
+    - node-pre-gyp > rc > minimist:
+        reason: None given
+        expires: '2020-04-25T09:17:23.756Z'
+    - snyk > @snyk/update-notifier > latest-version > package-json > registry-auth-token > rc > minimist:
+        reason: None given
+        expires: '2020-04-25T09:17:23.756Z'
+    - snyk > @snyk/update-notifier > latest-version > package-json > registry-url > rc > minimist:
+        reason: None given
+        expires: '2020-04-25T09:17:23.756Z'
+    - handlebars > optimist > minimist:
+        reason: None given
+        expires: '2020-04-25T09:17:23.756Z'
+  SNYK-JS-BSON-561052:
+    - mongoose > bson:
+        reason: None given
+        expires: '2020-04-25T09:17:23.755Z'
+    - mongoose > mongodb > bson:
+        reason: None given
+        expires: '2020-04-25T09:17:23.755Z'
 # patches apply the minimum changes required to fix a vulnerability
 patch:
   SNYK-JS-HTTPSPROXYAGENT-469131:
@@ -74,8 +124,6 @@ patch:
   SNYK-JS-LODASH-450202:
     - apollo-server-express > apollo-server-core > apollo-engine-reporting > lodash:
         patched: '2019-10-29T23:28:52.891Z'
-      '@snyk/dep-graph > graphlib > lodash':
-        patched: '2020-01-08T11:18:38.625Z'
     - apollo-server-express > apollo-server-core > lodash:
         patched: '2019-10-29T23:28:52.891Z'
     - firebase-admin > @google-cloud/storage > async > lodash:
@@ -98,6 +146,8 @@ patch:
         patched: '2019-10-29T23:34:16.286Z'
     - snyk > snyk-go-plugin > graphlib > lodash:
         patched: '2019-10-29T23:34:16.286Z'
+    - '@snyk/dep-graph > graphlib > lodash':
+        patched: '2020-01-08T11:18:38.625Z'
   SNYK-JS-TREEKILL-536781:
     - snyk > snyk-sbt-plugin > tree-kill:
         patched: '2020-01-08T11:06:24.493Z'

CHANGELOG.md

@@ -1,3 +1,27 @@
+# [0.13.0](https://github.com/erxes/erxes-api/compare/0.12.5...0.13.0) (2020-03-17)
+
+
+### Bug Fixes
+
+* **activity-log:**  checked empty content ([ce3daea](https://github.com/erxes/erxes-api/commit/ce3daeac23631dceb745ec4be20127b46097f7c9))
+* **conversation:** counting left, joined messages in messsageCount field ([9f8201d](https://github.com/erxes/erxes-api/commit/9f8201d9e4e57e07a5b07ea030e929139bd76ddd)), closes [#694](https://github.com/erxes/erxes-api/issues/694)
+* **importHistory:** cannot remove contacts if there are too many contacts ([be6ee64](https://github.com/erxes/erxes-api/commit/be6ee64d0602b230b0230de12ce3686a287729fd)), closes [erxes/erxes#1681](https://github.com/erxes/erxes/issues/1681)
+* remove account only when there is no integration ([1e33a60](https://github.com/erxes/erxes-api/commit/1e33a60256d2d2ee10534803e57dea7172383281))
+
+
+### Features
+
+* **board:** add archive functionality ([49e09f7](https://github.com/erxes/erxes-api/commit/49e09f7eb23dde1c5c0211b9b20240d52feecca3)), closes [erxes/erxes#1625](https://github.com/erxes/erxes/issues/1625)
+* **email-verification:** added email verification service ([d509e99](https://github.com/erxes/erxes-api/commit/d509e999f04b961ef38e0eb9c98cf64cdf656d3d)), closes [#1662](https://github.com/erxes/erxes-api/issues/1662)
+* **users:** filter by brand ([9dca98e](https://github.com/erxes/erxes-api/commit/9dca98e9e4ff369fea01c2a3272b534a077396d3)), closes [#681](https://github.com/erxes/erxes-api/issues/681)
+* **videoCall:** add video call integration using daily.co ([bb25bf9](https://github.com/erxes/erxes-api/commit/bb25bf96e70df43b0ee572f4b1e9eef6d490980d)), closes [erxes/erxes#1638](https://github.com/erxes/erxes/issues/1638)
+
+
+### Performance Improvements
+
+* **customer:** export pop-ups data for customer list when filtering by pop ups ([9fb2574](https://github.com/erxes/erxes-api/commit/9fb25749c0c75b35b5968aa29acbd05bc084a787)), closes [erxes/erxes#1674](https://github.com/erxes/erxes/issues/1674)
+* **merge-repos:** merged logger & engage-mail-sender repos ([6d2d8dd](https://github.com/erxes/erxes-api/commit/6d2d8dd85510f475d13ad49ea986fa4d9d89f276)), closes [#736](https://github.com/erxes/erxes-api/issues/736)
+
 ## [0.12.5](https://github.com/erxes/erxes-api/compare/0.12.4...0.12.5) (2020-03-06)
 
 

README.md

@@ -2,66 +2,35 @@
 
 erxes is an open source growth marketing platform. Marketing, sales, and customer service platform designed to help your business attract more engaged customers. Replace Hubspot with the mission and community-driven ecosystem.
 
-<a href="https://demo.erxes.io/">Live demo</a> <b>| </b> <a href="https://rocketchat.erxes.io/register/Gw4WRJnk9fSbyAXTq">Join us on RocketChat</a>
+<a href="https://demo.erxes.io/">Live demo</a> <b>| </b> <a href="https://community.erxes.io/register/Gw4WRJnk9fSbyAXTq">Join us on RocketChat</a>
 
 ![Docker Pulls](https://img.shields.io/docker/pulls/erxes/erxes-api)
 ![Build Status](https://drone.erxes.io/api/badges/erxes/erxes-api/status.svg?branch=master)
 [![Coverage Status](https://coveralls.io/repos/github/erxes/erxes-api/badge.svg?branch=master)](https://coveralls.io/github/erxes/erxes-widgets-api?branch=master)
 [![Known Vulnerabilities](https://snyk.io/test/github/erxes/erxes-api/badge.svg)](https://snyk.io/test/github/erxes/erxes-api)
 
-## Running the server
+<a href="https://erxes.io" target="_blank"><img src="https://s3.amazonaws.com/erxes/github/git-erxes.gif" alt="Open Source Growth Marketing Platform "></a>
 
-#### 1. Node (version >= 4) and NPM need to be installed.
+## Features
 
-Make sure your MongoDB and Redis server is running.
+<img src="https://s3.amazonaws.com/erxes/github/features-transparent.png" width="400" align="right" style="max-width: 50%">
 
-#### 2. Clone and install dependencies.
+erxes helps you attract and engage more customers while giving you high lead conversion. With erxes, all your marketing, sales and customer service tools are merged into one platform for greater output. Replace Hubspot with the mission and community-driven ecosystem.
 
-```Shell
-git clone https://github.com/erxes/erxes-api.git
-cd erxes-api
-yarn install
-```
-
-#### 3. Create configuration from sample file. We use [dotenv](https://github.com/motdotla/dotenv) for this.
-
-```Shell
-cp .env.sample .env
-```
-
-.env file description
-
-```.env
-NODE_ENV=development                        (Node environment: development | production)
-PORT=3300                                   (Server port)
-
-MONGO_URL=mongodb://localhost/erxes         (MongoDB url)
-TEST_MONGO_URL=mongodb://localhost/test
-
-REDIS_HOST=localhost                        (Redis server url)
-REDIS_PORT=6379                             (Redis server port)
-
-MAIN_APP_DOMAIN=http://localhost:3000       (erxes project url)
-```
-
-#### 4. Start the server.
-
-For development:
-
-```Shell
-yarn dev
-```
-
-For production:
-
-```Shell
-yarn build
-yarn start
-```
-
-#### 5. Running servers
-- GraphQL server: [http://localhost:3300/graphql](http://localhost:3300/graphql)
-- Websocket subscriptions server: [ws://localhost:3300/subscriptions](ws://localhost:3300/subscriptions)
+* **Growth Hacking:** Managing your entire growth operation made easy. From ideas to actual performance, making sure everything recorded, prioritized and centralized in the single platform to get tested with pool of analysis and learnings, which made the growing as pleasure.
+* **Email & SMS Marketing:** Reach your customer with personalized messaging. Keeping your customers hooked is definitely a challenge. Start converting your prospects into potential customers through email, SMS, Live chat, and In-app-messaging or more interactions to drive them to a successful close. You can connect to your customers in a whole new way with Erxes!
+* **Pop-ups & Forms:** Create Stylish Pop-ups and Forms that Bring Leads. Turn regular visitors into qualified leads by capturing them with a customizable pop-ups, forms, and embedded placements. Erxes helps you to create stylish and contextual pop-ups, banners and bars fit all your marketing needs.
+* **Sales Pipeline:** Track your entire sales pipeline from one dashboard. All your customer information and sales process in one board to follow up flawlessly. Have your sales managers to know everything needed to deliver increased levels of personalization before they contact customers.
+* **Contact Management:** Manage Visitors, Customers, and Companies. Access our all-in-one CRM system in one go so that it’s easier to coordinate and manage your contacts and interactions with your customers. Erxes Contacts provides whole segmentation tools for you to work more effiecently.
+* **Lead Scoring:** Identify and Target Sales-Ready Leads.
+* **Shared Team Inbox:** Communicate faster and easier with your customers via one truly omnichannel platform. Combine real-time client and team communication with in-app messaging, live chat, email and form, so your customers can reach you however and wherever they want. 
+* **Messenger:** Talk to Your Customers in Continuous Omnichannel Conversations. Enable businesses to capture every single customer feedback and communicate in real time. You can educate your customers through knowledge-base from the erxes Messenger.
+* **Knowledge base:** Create Help Articles for Customer Self-service. Educate both your customers and staff by creating a help center related to your brands, products and services to reach higher level of satisfactions.
+* **Task Management:** Work More Collaboratively and Get More Done. Save time, manage your projects, monitor your team and increase your productivity in just a few clicks. Erxes helps to turn chaos into clarity and make everything perfect. 
+## Documentation
+  * <a href="https://docs.erxes.io/installation/docker">Install erxes</a> <br>
+  * <a href="https://docs.erxes.io">erxes documentation</a> <br>
+  * <a href="https://docs.erxes.io/developer/contributing">Contributing to erxes</a> <br>
 
 ## Contributors
 
@@ -75,7 +44,6 @@ Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com
 
 <a href="https://opencollective.com/erxes#backers" target="_blank"><img src="https://opencollective.com/erxes/backers.svg?width=890"></a>
 
-
 ## Sponsors
 
 Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/erxes#sponsor)]
@@ -85,11 +53,8 @@ Support this project by becoming a sponsor. Your logo will show up here with a l
 <a href="https://opencollective.com/erxes/sponsor/2/website" target="_blank"><img src="https://opencollective.com/erxes/sponsor/2/avatar.svg"></a>
 <a href="https://opencollective.com/erxes/sponsor/3/website" target="_blank"><img src="https://opencollective.com/erxes/sponsor/3/avatar.svg"></a>
 <a href="https://opencollective.com/erxes/sponsor/4/website" target="_blank"><img src="https://opencollective.com/erxes/sponsor/4/avatar.svg"></a>
-<a href="https://opencollective.com/erxes/sponsor/5/website" target="_blank"><img src="https://opencollective.com/erxes/sponsor/5/avatar.svg"></a>
 <a href="https://opencollective.com/erxes/sponsor/6/website" target="_blank"><img src="https://opencollective.com/erxes/sponsor/6/avatar.svg"></a>
-<a href="https://opencollective.com/erxes/sponsor/7/website" target="_blank"><img src="https://opencollective.com/erxes/sponsor/7/avatar.svg"></a>
 <a href="https://opencollective.com/erxes/sponsor/8/website" target="_blank"><img src="https://opencollective.com/erxes/sponsor/8/avatar.svg"></a>
-<a href="https://opencollective.com/erxes/sponsor/9/website" target="_blank"><img src="https://opencollective.com/erxes/sponsor/9/avatar.svg"></a>
 
 ## In-kind sponsors
 
@@ -100,4 +65,4 @@ Support this project by becoming a sponsor. Your logo will show up here with a l
 <a href="https://www.browserstack.com/" target="_blank"><img src="https://s3.amazonaws.com/erxes/github/browserstack.png" width="130px;" /></a>
 
 ## License
-<a href="https://github.com/erxes/erxes-api/blob/master/LICENSE.md">GNU General Public License v3.0</a>
+<a href="https://github.com/erxes/erxes/blob/master/LICENSE.md">GNU General Public License v3.0</a>

app.json

@@ -21,10 +21,6 @@
       "description": "A port number that erxes api will be running on",
       "value": "3300"
     },
-    "DOMAIN": {
-      "description": "Erxes API URL",
-      "value": "https://erxes-api.herokuapp.com"
-    },
     "MAIN_APP_DOMAIN": {
       "description": "Erxes URL",
       "value": "https://erxes.herokuapp.com"

elkSyncer/main.py

@@ -14,6 +14,9 @@
 client = Elasticsearch([ELASTICSEARCH_URL])
 
 customer_mapping = {
+    'state': {
+        'type': 'keyword',
+    },
     'primaryEmail': {
         'type': 'text',
         'analyzer': 'uax_url_email_analyzer',
@@ -36,9 +39,6 @@
     'leadStatus': {
         'type': 'keyword',
     },
-    'lifecycleState': {
-        'type': 'keyword',
-    },
     'tagIds': {
         'type': 'keyword',
     },
@@ -51,6 +51,9 @@
     'status': {
         'type': 'keyword',
     },
+    'emailValidationStatus': {
+        'type': 'keyword',
+    },
 }
 
 company_mapping = {
@@ -73,12 +76,6 @@
     'ownerId': {
         'type': 'keyword',
     },
-    'leadStatus': {
-        'type': 'keyword',
-    },
-    'lifecycleState': {
-        'type': 'keyword',
-    },
     'tagIds': {
         'type': 'keyword',
     },

email-verifier/.env.sample

@@ -0,0 +1,11 @@
+# general
+NODE_ENV=development
+PORT=4100
+
+# MongoDB
+MONGO_URL=mongodb://localhost/erxes-email-verifier
+
+# RabbitMQ
+RABBITMQ_HOST=amqp://localhost
+
+TRUE_MAIL_API_KEY=

email-verifier/Dockerfile

@@ -0,0 +1,7 @@
+FROM node:10.16.0-slim
+WORKDIR /erxes-email-verifier
+RUN chown -R node:node /erxes-email-verifier
+COPY --chown=node:node . /erxes-email-verifier
+USER node
+EXPOSE 4100
+ENTRYPOINT ["node", "--max_old_space_size=8192", "dist"]

email-verifier/package.json

@@ -0,0 +1,35 @@
+{
+  "name": "erxes-email-verifier",
+  "private": true,
+  "scripts": {
+    "start": "node dist",
+    "dev": "NODE_ENV=development DEBUG=erxes-email-verifier:* node_modules/.bin/ts-node-dev --experimental-worker --respawn src",
+    "build": "tsc -p tsconfig.prod.json",
+    "checkAndGetBulkEmails": "ts-node ./src/commands/checkAndGetBulkEmails.ts"
+  },
+  "dependencies": {
+    "amqplib": "^0.5.5",
+    "body-parser": "^1.19.0",
+    "debug": "^4.1.1",
+    "dotenv": "^4.0.0",
+    "email-deep-validator": "^3.3.0",
+    "express": "^4.16.4",
+    "mongoose": "5.7.5",
+    "requestify": "^0.2.5",
+    "xss": "^1.0.6"
+  },
+  "peerOptionalDependencies": {
+    "kerberos": "^1.0.0"
+  },
+  "devDependencies": {
+    "@types/dotenv": "^4.0.3",
+    "@types/express": "^4.16.0",
+    "@types/mongodb": "^3.1.2",
+    "@types/mongoose": "^5.2.1",
+    "@types/node": "^10.12.18",
+    "@types/q": "^1.5.0",
+    "ts-node": "8.0.3",
+    "ts-node-dev": "^1.0.0-pre.32",
+    "typescript": "^3.7.2"
+  }
+}