diff --git a/web/app/app.css b/web/app/app.css index c9252407..ceb2ba69 100644 --- a/web/app/app.css +++ b/web/app/app.css @@ -1,30 +1,45 @@ /* app css stylesheet */ .menu { - list-style: none; - border-bottom: 0.1em solid black; - margin-bottom: 2em; - padding: 0 0 0.5em; + list-style: none; + border-bottom: 0.1em solid black; + margin-bottom: 2em; + padding: 0 0 0.5em; } .menu:before { - content: "["; + content: "["; } .menu:after { - content: "]"; + content: "]"; } -.menu > li { - display: inline; +.menu>li { + display: inline; } -.menu > li:before { - content: "|"; - padding-right: 0.3em; +.menu>li:before { + content: "|"; + padding-right: 0.3em; } -.menu > li:nth-child(1):before { - content: ""; - padding: 0; +.menu>li:nth-child(1):before { + content: ""; + padding: 0; } + +.animate-show-hide.ng-hide { + opacity: 0; +} + +.animate-show-hide.ng-hide-add, +.animate-show-hide.ng-hide-remove { + transition: all linear 0.5s; +} + +.check-element { + border: 1px solid black; + opacity: 1; + padding: 10px; +} \ No newline at end of file diff --git a/web/app/components/enabled-exchanges/enabled-exchanges.js b/web/app/components/enabled-exchanges/enabled-exchanges.js index 537055b7..36d5ddfe 100644 --- a/web/app/components/enabled-exchanges/enabled-exchanges.js +++ b/web/app/components/enabled-exchanges/enabled-exchanges.js @@ -24,6 +24,9 @@ angular.module('myApp.enabledExchanges', []).component('enabledexchanges', { $rootScope.$emit('CurrencyChanged', $scope.selected); }; + + $scope.getDashboardData(); + } }); \ No newline at end of file diff --git a/web/app/views/home/home.html b/web/app/views/home/home.html index 0c8889d0..7c26e822 100644 --- a/web/app/views/home/home.html +++ b/web/app/views/home/home.html @@ -1,40 +1,72 @@ -

Dashboard

-
-
- -
-

Sell orders

-
-
-

Buy orders

-
+
+
+

{{exchange.exchangeName}} Exchange

+

{{currency.CryptoCurrency}}

-
-

Market depth chart

+
+
+ +
+

Sell orders

+
+
+

Buy orders

+
+
+
+

Market depth chart

+
+
+

Buy

+ +
+
+

Sell

+ +
+
+

Wallet quick look

+ See current holding of selected currency +
+
+
+

Trade History

+
+
+

My Open Orders

+
+
-

Buy

- -
-
-

Sell

- -
-
-

Wallet quick look

- See current holding of selected currency -
-
-
-

Trade History

-
-
-

My Open Orders

+
+
+
-
- +
+
+
+
+ + + + + + +
+
+
+
+
+
+
+

D:

+
+

Something went wrong! Make sure Gocryptotrader is running. If things still aren't cool, open a ticket here

+
+
+
\ No newline at end of file diff --git a/web/app/views/home/home.js b/web/app/views/home/home.js index 04978265..94d2a648 100644 --- a/web/app/views/home/home.js +++ b/web/app/views/home/home.js @@ -9,7 +9,19 @@ angular.module('myApp.home', ['ngRoute']) }); }]) -.controller('HomeController', function() { +.controller('HomeController', function($scope, $rootScope, $timeout) { + $scope.loaded = false; + $rootScope.$on('CurrencyChanged', function(event, args) { + $scope.currency = args.Currency; + $scope.exchange = args.Exchange; + }); + $timeout(function() { + if ($scope.currency) { + $scope.loaded = true; + } else { + $scope.loadFailed = true; + } + }, 10000); }); \ No newline at end of file