Merge branch 'github_master'

# Conflicts: # common/project.js
Flagsmith · Jul 12, 2020 · 46cf709 · 46cf709
2 parents 24a5e63 + 799d8e5
commit 46cf709
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-<img width="100%" src="./hero.png"/>
+[<img alt="Feature Flag, Remote Config and A/B Testing platform, Bullet Train" width="100%" src="./hero.png"/>](https://bullet-train.io/)
 
 [![Donate](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/Bullet-Train/donate)
 

diff --git a/common/project.js b/common/project.js
@@ -1,17 +1,17 @@
 module.exports = global.Project = {
-    api: 'https://api.bullet-train.io/api/v1/',
-    bulletTrain: '4vfqhypYjcPoGGu8ByrBaj', // This is our Bullet Train API key - Bullet Train runs on Bullet Train!
-    env: 'prod', // This is used for Sentry tracking
-    ga: 'UA-120237963-1', // This is our Google Analytics key
-    sentry: 'https://[email protected]/1320942',
+    api: 'https://api-dev.bullet-train.io/api/v1/',
+    bulletTrainClientAPI: 'https://api.bullet-train.io/api/v1/',
+    bulletTrain: '8KzETdDeMY7xkqkSkY3Gsg', // This is our Bullet Train API key - Bullet Train runs on Bullet Train!
+    debug: false,
+    env: 'dev', // This is used for Sentry tracking
+    ga: 'UA-120237963-3', // This is our Google Analytics key
     demoAccount: {
         email: '[email protected]',
         password: 'demo_account',
     },
     chargebee: {
-        site: 'bullettrain',
+        site: 'bullettrain-test',
     },
     crispChat: '8857f89e-0eb5-4263-ab49-a293872b6c19',
-    mixpanel: '9448f5be8a5555c380e5dd4b7ac2c345',
-    assetUrl: 'https://cdn.bullet-train.io', // Location of the static files from build/, should contain a directory called static/
+    mixpanel: '6143f9ceefb1c67640a0771345e8c095',
 };
diff --git a/common/stores/config-store.js b/common/stores/config-store.js
@@ -35,6 +35,7 @@ store.dispatcherIndex = Dispatcher.register(store, (payload) => {
 bulletTrain.init({
     environmentID: Project.bulletTrain,
     onChange: controller.loaded,
+    api: Project.bulletTrainClientAPI,
 });
 
 controller.store = store;

diff --git a/env/project_dev.js b/env/project_dev.js
@@ -1,5 +1,6 @@
 module.exports = global.Project = {
     api: 'https://api-dev.bullet-train.io/api/v1/',
+    bulletTrainClientAPI: 'https://api.bullet-train.io/api/v1/',
     bulletTrain: '8KzETdDeMY7xkqkSkY3Gsg', // This is our Bullet Train API key - Bullet Train runs on Bullet Train!
     debug: false,
     env: 'dev', // This is used for Sentry tracking

diff --git a/env/project_prod.js b/env/project_prod.js
@@ -1,5 +1,6 @@
 module.exports = global.Project = {
     api: 'https://api.bullet-train.io/api/v1/',
+    bulletTrainClientAPI: 'https://api.bullet-train.io/api/v1/',
     bulletTrain: '4vfqhypYjcPoGGu8ByrBaj', // This is our Bullet Train API key - Bullet Train runs on Bullet Train!
     env: 'prod', // This is used for Sentry tracking
     ga: 'UA-120237963-1', // This is our Google Analytics key

diff --git a/env/project_staging.js b/env/project_staging.js
@@ -1,5 +1,6 @@
 module.exports = global.Project = {
     api: 'https://api-staging.bullet-train.io/api/v1/',
+    bulletTrainClientAPI: 'https://api.bullet-train.io/api/v1/',
     bulletTrain: 'ENktaJnfLVbLifybz34JmX', // This is our Bullet Train API key - Bullet Train runs on Bullet Train!
     env: 'staging', // This is used for Sentry tracking
     ga: 'UA-120237963-7', // This is our Google Analytics key

diff --git a/environment.js b/environment.js
@@ -8,5 +8,6 @@ module.exports = {
         sentry: process.env.SENTRY,
         api: process.env.API_URL,
         assetURL: process.env.ASSET_URL,
+        bulletTrainClientAPI: process.env.BULLET_TRAIN_CLIENT_API,
     }),
 };