krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-15 05:37:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Node 8 (WIP) (#9946)

Browse Source 
* start upgrade to node 8

* upgrade travis

* improve travis

* Remove bluebird, babel (except for modules) from server (WIP) (#9947)

* remove bluebird, babel from server (except for modules)

* fixes

* fix path

* fix path

* fix export

* fix export

* fix test

* fix tests

* remove plugin for transform-object-rest-spread since it is supported in node8

* babel: correct syntax rest spread

* remove bluebird

* update migrations archive readme

* fix package-lock.json

* fix typo

* add package-loc
This commit is contained in:
Matteo Pagliazzi
2018-03-15 19:59:36 +01:00
committed by GitHub
parent b1b1e512f5
commit cb42a31c43
68 changed files with 786 additions and 1536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
website/server/libs/analyticsService.js
View File

@@ -1,7 +1,6 @@
/* eslint-disable camelcase */
import nconf from 'nconf';
import Amplitude from 'amplitude';
import Bluebird from 'bluebird';
import googleAnalytics from 'universal-analytics';
import useragent from 'useragent';
import {
@@ -171,7 +170,7 @@ let _sendDataToAmplitude = (eventType, data) => {
amplitudeData.event_type = eventType;
return new Bluebird((resolve, reject) => {
return new Promise((resolve, reject) => {
amplitude.track(amplitudeData)
.then(resolve)
.catch(() => reject('Error while sending data to Amplitude.'));
@@ -222,7 +221,7 @@ let _sendDataToGoogle = (eventType, data) => {
eventData.ev = value;
}
return new Bluebird((resolve, reject) => {
return new Promise((resolve, reject) => {
ga.event(eventData, (err) => {
if (err) return reject(err);
resolve();
@@ -236,7 +235,7 @@ let _sendPurchaseDataToAmplitude = (data) => {
amplitudeData.event_type = 'purchase';
amplitudeData.revenue = data.purchaseValue;
return new Bluebird((resolve, reject) => {
return new Promise((resolve, reject) => {
amplitude.track(amplitudeData)
.then(resolve)
.catch(reject);
@@ -261,7 +260,7 @@ let _sendPurchaseDataToGoogle = (data) => {
ev: price,
};
return new Bluebird((resolve) => {
return new Promise((resolve) => {
ga.event(eventData).send();
ga.transaction(data.uuid, price)
@@ -273,14 +272,14 @@ let _sendPurchaseDataToGoogle = (data) => {
};
function track (eventType, data) {
return Bluebird.all([
return Promise.all([
_sendDataToAmplitude(eventType, data),
_sendDataToGoogle(eventType, data),
]);
}
function trackPurchase (data) {
return Bluebird.all([
return Promise.all([
_sendPurchaseDataToAmplitude(data),
_sendPurchaseDataToGoogle(data),
]);