Assets adding

.editorconfig

@@ -3,7 +3,7 @@ root = true
 
 [*]
 indent_style = space
-indent_size = 2
+indent_size = 4
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true

.eslintignore

@@ -1 +1,2 @@
 dist/
+src/env-consts.js

.eslintrc.json

@@ -0,0 +1,28 @@
+{
+  "extends": "airbnb",
+  "globals": {
+    "StellarSdk": true,
+    "window": true,
+    "document": true,
+    "localStorage": true,
+    "fetch": true
+  },
+  "rules": {
+    "max-len": ["error", {
+      "code": 120,
+      "ignoreStrings": true,
+      "ignoreTemplateLiterals": true,
+      "ignoreUrls": true
+    }],
+    "react/require-default-props": 0,
+    "react/jsx-indent": 0,
+    "react/jsx-indent-props": ["error", 4],
+    "react/jsx-closing-bracket-location": ["error", "after-props"],
+    "jsx-a11y/no-static-element-interactions": 0,
+    "indent": ["error", 4],
+    "new-cap": "warn",
+    "no-underscore-dangle": "off",
+    "semi": "error",
+    "curly": ["error", "all"]
+  }
+}

.gitignore

@@ -2,9 +2,11 @@ node_modules/
 dist/
 .sass-cache/
 src/images.js
+src/env-consts.js
 
 npm-debug.log
 package-lock.json
+api/package-lock.json
 
 # OSX
 *.DS_Store
@@ -13,3 +15,9 @@ package-lock.json
 ._*
 
 .idea
+
+directory/logos.json
+directory/directory.json
+
+api/setEnvironment.sh
+api/setStagingEnvironment.sh

.travis.yml

@@ -2,24 +2,17 @@ language: node_js
 
 git:
   depth: 10000
+branches:
+  only:
+    - master
 node_js:
-  - node
+  - "8"
 install:
   - npm run setup
 before_script:
   # - npm run lint || true
 script:
   - npm run production
   - npm run test
-  - cd dist; echo "./fetchTravisBuild.sh stellarterm-build-output/irisli/stellarterm/${TRAVIS_BUILD_NUMBER}/${TRAVIS_JOB_NUMBER}/dist/index.html $(openssl dgst -sha256 index.html | sed 's/^.* //')"
+  - cd dist; echo "./fetchTravisBuild.sh stellarterm-build-output/stellarterm/stellarterm/${TRAVIS_BUILD_NUMBER}/${TRAVIS_JOB_NUMBER}/dist/index.html $(openssl dgst -sha256 index.html | sed 's/^.* //')"
   - npm run hash
-
-addons:
-  artifacts:
-    secret:
-      secure: K+WCWifkX+7AMZ73tspCU2/pS50tPYnH6DtZGQInoxSZHR44WO29aqF0l3kpmLv86We4FzD/hqt4zibOavvtV7+Fk9qRuwnFMfDcFaaneYbuQnKlvW5IRO0+PQkNKYkgxSK6RJISaclZ8D/ua/jjtFkuP7Cvnnfgs0HUEI/3mIn+EZfyzSvzLZBY0nM8hHcBwkdJheexIDxe6vv463g/eEOJDPQYjlgYyVCgchIXfW5UTeNoRkIJNe6UmjyNBWNFQMt/J0+dk/ryphj1o+tNpvHO5Jgh2UEPHTuTXvCFVk//+89QWyk8taAIql87+fEGlZ2wecUmVgjHpE0natpEmar5lExzAQN7YAgm8QMtxEKmOqWKebp9Ahp8Ws1QtuDDQJUPejkHBSYtkeA7OqDpMOFD5u4s6eentu/AJ9MOIsl5wW+ib7pHu+Q9zD/D9yxFH/G5VuJK0pqWmCvKShn+9zP8XE/dmhh+P80GBBGW4Q40r61g5D3/ShtP8Q/rwW07JG8v2AZXFMj6yezuKIkh7Vo/Q5gciuF7UKOAo5SH73HBOJwpFOPWP7A21Hu+0QggloCR3wD4QYKfvVwqK0EMVHrKzBjam0q4BGqisrTE1A4fo+LutTC1Juzd/D4tXdqM3wMjTss9SLIdCa7A+hQu9gckUMAkXcJVhV870QY9LEA=
-    bucket: stellarterm-build-output
-    key:
-      secure: C4xjYYkzvHRuy+0KiDL21/J4T39rClfZFFLYPI+i21TeL1pclkNSFZSyqLFk8ToMfp3tgVv8D9hbUu/Glxg0kyUSkrUAGYRahGMlZC8+cfP+WFiFUR5gAfCkQAr/sx+y8kRgMlMwzD3SwRqoDH42riGFvCv0f9MScPZVxTeQIkLri7yPoXcv1ZiEPt7nCL3B/mJmm7iPebuFzcYMNiITIggoOnOHq+V5lq8BMWB1Y1pK9d/RoVDFJVKgExJpLdUZyg5agq8h4OByXCFN6zWk4f0ombch0wt1liGDrrKK59J8rbS8L7aXrp5jJyy4/sHIhf7bziSmmA8k5nFJmyNtaVqWMv8osMwwYtVnAavOushKbabzxImAc9kaKbNb3R3sUiwqecKDoC2DDyYihyEZeKgrb5+37xTpYgcSLqZWm/aZHkgeM7pjmP58sAQ9VgCWzoGSnn12A9rBCD+sLRQ0Wqtfh5HmheiIELx4TN4a6TZpt4wDV5debza1nzV46DO6zuDYbQ3vO62LKS8xa5elpy+662QmuVyfuPe56eQnYI7r/hUTINspnfbbur4qRrzO+ZXgsc15vAf5P+Sop95C43ZcQo9lk2V8T+nsr4a7GWlM6zY+TZ8y9NIKJ4P4poXryCEdAcc6WQJdnzStoFyPGcTCIq8urhX9KFciyAroOLA=
-    paths:
-      - /home/travis/build/irisli/stellarterm/dist/index.html

CONTRIBUTING.md

@@ -1,8 +1,5 @@
 # Contributing to StellarTerm
-StellarTerm is primarily written by and maintained by [Iris Li](https://iris.li/). If you would like to make a code contribution, please make a pull request and we can discuss further details on there.
-
-## How to request inclusion in the Markets tab
-If you would like your asset listed in StellarTerm, please send me an email at **stellarterm@iris.li**.
+StellarTerm is maintained by Ultra Stellar, LLC. If you would like to make a code contribution, please make a pull request and we can discuss further details on there.
 
 ## License
 The project is licensed under the [Apache-2.0 license](./LICENSE-2.0.txt). By contributing, you are agreeing to the terms in the project's [LICENSE file](./LICENSE-2.0.txt).

LICENSE-2.0.txt

@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2017 Iris Li
+   Copyright 2017 Ultra Stellar, LLC
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.md

@@ -1,6 +1,6 @@
-[![Travis CI status](https://travis-ci.org/irisli/stellarterm.svg?branch=master)](https://travis-ci.org/irisli/stellarterm)
+[![Travis CI status](https://travis-ci.org/stellarterm/stellarterm.svg?branch=master)](https://travis-ci.org/stellarterm/stellarterm)
 
-# StellarTerm ecosystem - [client](https://stellarterm.com/) | [api](https://github.com/irisli/stellarterm/tree/master/api) | [directory](https://github.com/irisli/stellarterm/blob/master/directory/)
+# StellarTerm ecosystem - [client](https://stellarterm.com/) | [api](https://github.com/stellarterm/stellarterm/tree/master/api) | [directory](https://github.com/stellarterm/stellarterm/blob/master/directory/)
 This StellarTerm monorepo consists of multiple projects built for the [Stellar network](https://www.stellar.org/) including a [trading client](https://stellarterm.com/). The projects are in this monorepo to enable faster development speed.
 
 ## Web Client
@@ -13,8 +13,8 @@ The API uses the [Serverless framework](https://serverless.com/) for deployment
 
 It is currently under active development and is not yet finished. See it in action here: [https://api.stellarterm.com/](https://api.stellarterm.com/)
 
-## [Directory](https://github.com/irisli/stellarterm/blob/master/directory/README.md)
-StellarTerm maintains a manually curated directory file with a listing of well known anchors and assets on the Stellar network. For more information, see the [directory README](https://github.com/irisli/stellarterm/blob/master/directory/README.md).
+## [Directory](https://github.com/stellarterm/stellarterm/blob/master/directory/README.md)
+StellarTerm maintains a manually curated directory file with a listing of well known anchors and assets on the Stellar network. For more information, see the [directory README](https://github.com/stellarterm/stellarterm/blob/master/directory/README.md).
 
 -------------------------------------------------------------------------------
 
@@ -50,7 +50,7 @@ node --version
 ### Environment Setup
 ```sh
 # Clone the project
-git clone https://github.com/irisli/stellarterm.git
+git clone https://github.com/stellarterm/stellarterm.git
 cd stellarterm
 
 # Install the npm and bower dependencies
@@ -71,7 +71,7 @@ npm run production
 ```
 
 ## License
-Products in the StellarTerm ecosystem is open source software and is licensed under the [Apache-2.0 license](https://github.com/irisli/stellarterm/blob/master/LICENSE-2.0.txt). Please understand the license carefully before using StellarTerm.
+Products in the StellarTerm ecosystem is open source software and is licensed under the [Apache-2.0 license](https://github.com/stellarterm/stellarterm/blob/master/LICENSE-2.0.txt). Please understand the license carefully before using StellarTerm.
 
 ## Credits
 - Started the project using the super helpful [react-gulp-browserify yeoman generator](https://github.com/randylien/generator-react-gulp-browserify)

api/.gitignore

@@ -1,9 +1,11 @@
 # package directories
 node_modules
 jspm_packages
+package-lock.json
 
 
 setEnvironment.sh
+setStagingEnvironment.sh
 
 # Serverless directories
 .serverless

api/deploy.sh

@@ -1,13 +1,35 @@
 if [ -z "$STELLARTERM_S3_BUCKET" ]; then
-    echo "Environment variable STELLARTERM_S3_BUCKET must be set. Take a look at setEnvironment.example.sh for an example."
-    echo "Run: source setEnvironment.sh"
+    printf "\033[1;31mERROR: \033[0;31mEnvironment variable STELLARTERM_S3_BUCKET must be set.\033[0;33m \nTake a look at setEnvironment.example.sh for an example.\n"
+    printf "Run: source setEnvironment.sh\033[0m\n"
     exit 1
 fi
 if [ -z "$STELLARTERM_AWS_PROFILE" ]; then
-    echo "Environment variable STELLARTERM_AWS_PROFILE must be set. Take a look at setEnvironment.example.sh for an example."
-    echo "Run: source setEnvironment.sh"
+    printf "\033[1;31mERROR: \033[0;31mEnvironment variable STELLARTERM_AWS_PROFILE must be set.\033[0;33m Take a look at setEnvironment.example.sh for an example.\n"
+    echo "Run: source setEnvironment.sh\033[0m\n"
     exit 1
 fi
 
+(cd ./../directory/ && ./checkBuild.sh)
+if [ $? == 1 ]
+then
+    exit 1
+fi
+
+export BRANCH="$(git branch | grep \* | cut -d ' ' -f2)"
+
+if [ $BRANCH != "master" ] && [ $BRANCH != "staging" ]
+then
+    printf "\033[1;31mERROR: \033[0;31mYou must be at staging or master branch.\033[0m\n"
+    exit 1
+fi
+
+if [ $BRANCH == "master" ]
+then
+    BRANCH="dev"
+fi
+
+printf "\033[1;33mStarting API deploy\n"
+printf "Stage for deploy is $BRANCH\033[0m\n"
+
 serverless --aws-profile $STELLARTERM_AWS_PROFILE deploy
 # serverless --aws-profile $STELLARTERM_AWS_PROFILE deploy function -f ticker

api/functions/history.js

@@ -7,11 +7,13 @@ const PQueue = require('p-queue');
 const queue = new PQueue({concurrency: 20});
 const run = queue.add;
 
+const { HORIZON_SERVER } = require('./horizon-server.constant');
+
 const directory = require('../directory.json');
 
 StellarSdk.Network.usePublicNetwork();
 
-S = new StellarSdk.Server('https://horizon.stellar.org');
+S = new StellarSdk.Server(HORIZON_SERVER);
 StellarSdk.Network.usePublicNetwork();
 
 function historyGenerator() {
@@ -167,7 +169,7 @@ function getLumenPrice() {
 }
 
 function getHorizonMain() {
-  return rp('https://horizon.stellar.org/')
+  return rp(HORIZON_SERVER)
     .then(horizonMain => {
       return JSON.parse(horizonMain);
     })

api/functions/horizon-server.constant.js

@@ -0,0 +1,3 @@
+// const HORIZON_SERVER = 'https://horizon.stellar.org';
+const HORIZON_SERVER = 'https://horizon.stellar.lobstr.co';
+module.exports = { HORIZON_SERVER };

api/functions/ticker.js

@@ -9,9 +9,11 @@ const PQueue = require('p-queue');
 const queue = new PQueue({concurrency: 20});
 const run = queue.add;
 
+const { HORIZON_SERVER } = require('./horizon-server.constant');
+
 const directory = require('../directory.json');
 
-Server = new StellarSdk.Server('https://horizon.stellar.org');
+Server = new StellarSdk.Server(HORIZON_SERVER);
 StellarSdk.Network.usePublicNetwork();
 
 function medianOf3(a,b,c) {
@@ -27,15 +29,18 @@ function tickerGenerator() {
       apiLicense: 'Apache-2.0',
     },
   };
+  const feeData = {};
 
   let tickerPromise = Promise.resolve()
+    .then(() => fetchFeeData(feeData))
     .then(() => phase1(ticker))
     .then(() => loadAssets(ticker))
     .then(() => phase3(ticker))
     .then(() => phase4(ticker))
     .then(() => {
       return {
-        'v1/ticker.json': JSON.stringify(ticker, null, 2)
+        'v1/ticker.json': JSON.stringify(ticker),
+        'v1/feeData.json': JSON.stringify(feeData),
       };
     })
 
@@ -425,14 +430,38 @@ function getLumenPrice() {
 }
 
 function getHorizonMain() {
-  return rp('https://horizon.stellar.org/')
+  return rp(HORIZON_SERVER)
     .then(horizonMainJson => {
       let horizonMain = JSON.parse(horizonMainJson);
       console.log('Phase 1: Horizon at ledger #' + horizonMain.core_latest_ledger);
       return horizonMain;
     })
 }
 
+function fetchFeeData(feeData) {
+    console.log('Starting to load fee stats');
+    return rp('https://horizon.stellar.org/fee_stats')
+        .then((response) => {
+            const feeStats = JSON.parse(response);
+            const {
+                ledger_capacity_usage: ledgerCapacityUsage,
+                min_accepted_fee: minAcceptedFee,
+                p10_accepted_fee: p10AcceptedFee,
+            } = feeStats;
+
+            if (ledgerCapacityUsage >= 0.8) {
+                const feeValue = Math.max(minAcceptedFee * 1.5, p10AcceptedFee);
+                feeData.fee_value = Math.min(feeValue, 10000);
+            } else {
+                feeData.fee_value = 100;
+            }
+            console.log('Fee stats loaded');
+        })
+        .catch(() => {
+            console.log('Unable to load fee stats!');
+        });
+}
+
 function getStellarTermDotComVersion() {
   console.log('Phase 1: Fetching stellarterm.com')
   return rp('https://stellarterm.com/')

api/functions/utils/testWalker.js

@@ -2,8 +2,9 @@ const _ = require('lodash');
 const StellarSdk = require('stellar-sdk');
 const directory = require('../../directory.json');
 const tradeWalker = require('./tradeWalker');
+const { HORIZON_SERVER } = require('../horizon-server.constant');
 
-Server = new StellarSdk.Server('https://horizon.stellar.org');
+Server = new StellarSdk.Server(HORIZON_SERVER);
 StellarSdk.Network.usePublicNetwork();
 
 

api/handler.js

@@ -17,7 +17,7 @@ module.exports.ticker = (event, context, callback) => {
           Body: contents,
           ContentType: 'application/json',
           ACL: 'public-read',
-          CacheControl: 'public, max-age=5',
+          CacheControl: 'public, max-age=50',
         }).promise()
       }))
     })

api/serverless.yml

@@ -8,7 +8,7 @@ custom:
 provider:
   name: aws
   runtime: nodejs6.10
-  stage: dev
+  stage: ${env:BRANCH}
   region: us-west-2
   timeout: 180
   memorySize: 256