Skip to content
This repository has been archived by the owner on Sep 2, 2023. It is now read-only.

Commit

Permalink
Merge pull request #2141 from ripplelabsben/ticker
Browse files Browse the repository at this point in the history
[FEATURE] add ticker to landing page
  • Loading branch information
mrajvanshy committed Jan 29, 2015
2 parents 2805590 + ac86533 commit 80d4c98
Show file tree
Hide file tree
Showing 7 changed files with 75 additions and 4 deletions.
6 changes: 6 additions & 0 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,17 @@
var debug = true;
</script>
<!-- @endif -->

<!-- TODO: load conditionally and locally -->
<script type="text/javascript" src="//ripplecharts.com/embed/ticker/script.js"></script>

<script type="text/javascript" src="//ripplecharts.com/embed/pricechart/script.js"></script>

<script type="text/javascript">
$.getScript('js/ripple-client' + (debug ? '-debug' : '-'+lang) + '.js');
</script>


<!-- start Mixpanel -->
<script type="text/javascript">
if (Options.mixpanel && Options.mixpanel.track) { (function(e,b){if(!b.__SV){var a,f,i,g;window.mixpanel=b;a=e.createElement("script");a.type="text/javascript";a.async=!0;a.src='js/deps/mixpanel.min.js';f=e.getElementsByTagName("script")[0];f.parentNode.insertBefore(a,f);b._i=[];b.init=function(a,e,d){function f(b,h){var a=h.split(".");2==a.length&&(b=b[a[0]],h=a[1]);b[h]=function(){b.push([h].concat(Array.prototype.slice.call(arguments,0)))}}var c=b;"undefined"!==
Expand Down
4 changes: 4 additions & 0 deletions src/jade/client/index.jade
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,11 @@ div#wrapper
div(ng-if="loginStatus")
!= require("./navbar.jade")()
.landingWrapper(ng-class="{ 'loggedOut container-fluid': !loginStatus, 'container': loginStatus }")

.landingContainer

.tickerWrapper(ng-if="!loginStatus")
rp-ticker#ticker

.loginContainer

Expand Down
39 changes: 38 additions & 1 deletion src/js/config-example.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,44 @@ var Options = {
advanced_feature_switch: false,

// Default gateway max trust amount under 'simplfied' view ie when advanced_feature_switch is false in trust/gateway page
gateway_max_limit: 1000000000
gateway_max_limit: 1000000000,

ticker: {
markets: [
{
base: {currency: "XRP"},
counter: {currency: "USD", issuer: "rMwjYedjc7qqtKYVLiAccJSmCwih4LnE2q"}
},
{
base: {currency: "XRP"},
counter: {currency: "USD", issuer: "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B"}
},
{
base: {currency: "XRP"},
counter: {currency:"BTC", issuer: "rMwjYedjc7qqtKYVLiAccJSmCwih4LnE2q"}
},
{
base: {currency: "XRP"},
counter: {currency:"BTC", issuer: "rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B"}
},
{
base: {currency: "XRP"},
counter: {currency:"CNY", issuer: "razqQKzJRdB4UxFPWf5NEpEG3WMkmwgcXA"}
},
{
base: {currency: "XRP"},
counter: {currency:"JPY", issuer: "rMAz5ZnK73nyNUL4foAvaxdreczCkG3vA6"}
},
{
counter: {currency: "XRP"},
base: {currency: "JPY", issuer: "r94s8px6kSw1uZ1MV98dhSRTvc6VMPoPcN"}
},
{
base: {currency: "CNY", issuer: "rnuF96W4SZoCJmbHYBFoJZpR8eCaxNvekK"},
counter: {currency: "XRP"}
}
]
}
};

// Load client-side overrides
Expand Down
20 changes: 20 additions & 0 deletions src/js/directives/ticker.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
var module = angular.module('app');

/**
* Ticker
*/
module.directive('rpTicker', function() {
return {
restrict: 'E',
link: function() {
var ticker = TickerWidget({
url: API, // TODO not a good idea to have an API global variable
id: "ticker"
});

ticker.load({
markets: Options.ticker.markets
});
}
};
});
1 change: 1 addition & 0 deletions src/js/entry/web.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ require('../directives/datalinks');
require('../directives/errors');
require('../directives/qr');
require('../directives/marketchart');
require('../directives/ticker');
require('../filters/filters');
require('../filters/amountHasIssuer.js');
require('../services/globalwrappers');
Expand Down
4 changes: 1 addition & 3 deletions src/js/tabs/login.js
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,4 @@ LoginTab.prototype.angular = function (module) {
}]);
};



module.exports = LoginTab;
module.exports = LoginTab;
5 changes: 5 additions & 0 deletions src/less/ripple/landing.less
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@ header.loggedOut {
background-size: 100%;
height: 880px;
}

.tickerWrapper {
height: 60px;
background: @lightgray;
}
}

.loginContainer {
Expand Down

0 comments on commit 80d4c98

Please sign in to comment.