Skip to content

Commit 472dba6

Browse files
Staging (#268)
* Import Data * Import Data * Import Data * Import API Update * Import API Fix * Update * Updates Import API * Updates Import API * Updates Import API * Import API Update * Update * Import API Update * Import API Update * chaging rolling update to api * Import API Fix * Import API Fix * Import API Test * Import API Test * Import API Fix * Update README.md * Import Export API (#262) * Import Export API (#263) * Import Export API * Import Export API * Import API
1 parent dbb8631 commit 472dba6

File tree

10 files changed

+1224
-416
lines changed

10 files changed

+1224
-416
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ after_success:
4444
openssl enc -in config_staging.enc -out config -d -aes256 -k $KUBE_ENC;
4545
mkdir ~/.kube;
4646
mv config ~/.kube/;
47-
kubectl rolling-update cloudboost-engine-staging --image=cloudboost/cloudboost:staging --image-pull-policy=Always;
47+
kubectl rolling-update cloudboost-api-staging --image=cloudboost/cloudboost:staging --image-pull-policy=Always;
4848
fi
4949
before_deploy:
5050
- git config --global user.email "[email protected]"
@@ -71,7 +71,7 @@ after_deploy:
7171
openssl enc -in config.enc -out config -d -aes256 -k $KUBE_ENC;
7272
mkdir ~/.kube;
7373
mv config ~/.kube/;
74-
kubectl rolling-update cloudboost-engine --image=cloudboost/cloudboost:latest --image-pull-policy=Always;
74+
kubectl rolling-update cloudboost-api --image=cloudboost/cloudboost:latest --image-pull-policy=Always;
7575
fi
7676
branches:
7777
except:

README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[![Build Status](https://travis-ci.org/CloudBoost/cloudboost.svg?branch=master)](https://travis-ci.org/CloudBoost/cloudboost)
44
[![OpenCollective](https://opencollective.com/cloudboost/backers/badge.svg)](#backers)
55

6-
CloudBoost is the complete serverless platform for your app. **Think of CloudBoost as Parse + Firebase + Algolia + Iron.io all combined into one** :
6+
CloudBoost is the complete cloud platform for your app. **Think of CloudBoost as Parse + Firebase + Algolia + Iron.io all combined into one** :
77
- Data-Storage / JSON Storage / BLOB Storage
88
- 100% data ownership
99
- Realtime
@@ -12,6 +12,7 @@ CloudBoost is the complete serverless platform for your app. **Think of CloudBoo
1212
- Queues
1313
- More - ACL's, User Authentication, Server-less apps and more.
1414

15+
CloudBoost also has a [managed service](https://www.cloudboost.io), so you don't have to install or configure anything. You can sign up for the managed service [here.](https://www.cloudboost.io)
1516

1617

1718
## Deploy with Docker (recommended)
@@ -156,6 +157,10 @@ To read more about app settings, check [Click here](https://github.com/CloudBoos
156157
157158
- Twitter: [@cloudboostio](https://twitter.com/cloudboostio)
158159

160+
# Tests
161+
162+
Tests are in a seperate repository. You can find them [here.](https://www.github.com/cloudboost/javascriptsdk)
163+
159164
# Contributing
160165

161166
[Pull requests](https://help.github.com/articles/about-pull-requests/) are very welcome!

api/app/App.js

Lines changed: 150 additions & 110 deletions
Large diffs are not rendered by default.

api/file/CloudFiles.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ module.exports = function() {
4040
}).then(function(file) {
4141
return res.status(200).send(file);
4242
}, function(err) {
43+
console.log(err, "++++++++++++++++++++++")
4344
return res.status(500).send(err);
4445
});
4546
});

myBinaryFile

5.64 KB
Binary file not shown.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"cors": "^2.7.1",
2323
"cron": "^1.1.0",
2424
"crypto": "^0.0.3",
25+
"csvtojson": "^1.1.7",
2526
"ejs": "^2.4.1",
2627
"elasticsearch": "^8.0.0",
2728
"express": "^4.13.4",
@@ -44,11 +45,11 @@
4445
"mandrill-api": "^1.0.45",
4546
"mongodb": "^2.1.11",
4647
"mongoose": "^4.4.10",
47-
"multer": "^0.1.8",
4848
"node-gcm": "^0.14.0",
4949
"node-linkedin": "^0.5.3",
5050
"node-twitter-api": "^1.7.1",
5151
"node-uuid": "^1.4.7",
52+
"node-xlsx": "^0.11.0",
5253
"nodemailer": "^2.4.1",
5354
"nodemailer-mailgun-transport": "^1.0.2",
5455
"oauth": "^0.9.14",

server.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ global.fileService = null;
125125
global.queueService = null;
126126
global.serverService = null;
127127
global.mailService = null;
128+
global.helperService = null;
128129

129130
global.mongoUtil = null;
130131

@@ -324,6 +325,7 @@ function attachServices() {
324325
global.pushService = require('./services/cloudPush.js')();
325326
global.emailService = require('./services/cloudEmail.js')();
326327
global.authService = require('./services/auth.js')();
328+
global.importHelpers = require('./services/importHelpers.js')();
327329

328330
console.log('+++++++++++ Services Status : OK. ++++++++++++++++++');
329331
} catch (e) {

0 commit comments

Comments
 (0)