Skip to content

Instantly share code, notes, and snippets.

@noisy

noisy/gist:1a7e57ddaf3d5f377faf

Created March 23, 2016 11:21
Show Gist options
  • Save noisy/1a7e57ddaf3d5f377faf to your computer and use it in GitHub Desktop.
Save noisy/1a7e57ddaf3d5f377faf to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
diff --git a/README.md b/README.md
index d54a6a4..7d87b07 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,6 @@
Graphene-UI
============
-[![Slack](http://slack.bitshares.org/badge.svg)](http://slack.bitshares.org/)
-
### Getting started
Graphene-UI depends on Node.js. While it should work using versions as old as 0.12.x, it is recommended to use v5.x.
diff --git a/dl/programs/bloom_filter_wallet.js b/dl/programs/bloom_filter_wallet.js
index 5ff7259..9adccaf 100644
--- a/dl/programs/bloom_filter_wallet.js
+++ b/dl/programs/bloom_filter_wallet.js
@@ -98,4 +98,4 @@ fs.readFile('bloom.dat', function (err, data) {
function unsupportedJsonFormat() {
console.error("Unsupported JSON wallet format")
process.exit(1)
-}
\ No newline at end of file
+}
diff --git a/dl/src/chain/config.coffee b/dl/src/chain/config.coffee
index 753a2c3..df32c95 100644
--- a/dl/src/chain/config.coffee
+++ b/dl/src/chain/config.coffee
@@ -3,7 +3,7 @@ module.exports = _this =
address_prefix: "BTS"
expire_in_secs: 15
expire_in_secs_proposal: 24 * 60 * 60
- depositWithdrawDefaultActiveTab: 0
+ depositWithdrawDefaultActiveTab: 1
networks:
BitShares:
core_asset: "BTS"
diff --git a/dl/src/stores/MarketsStore.js b/dl/src/stores/MarketsStore.js
index 3bb5d70..3d9c089 100644
--- a/dl/src/stores/MarketsStore.js
+++ b/dl/src/stores/MarketsStore.js
@@ -162,10 +162,6 @@ class MarketsStore {
this.buckets = result.buckets;
}
- if (result.buckets) {
- this.buckets = result.buckets;
- }
-
if (result.limits) {
// Keep an eye on this as the number of orders increases, it might not scale well
let limitStart = new Date();
diff --git a/dl/src/stores/SettingsStore.js b/dl/src/stores/SettingsStore.js
index 28508d4..80bae04 100644
--- a/dl/src/stores/SettingsStore.js
+++ b/dl/src/stores/SettingsStore.js
@@ -16,7 +16,7 @@ class SettingsStore {
this.settings = Immutable.Map({
locale: "en",
connection: "wss://bitshares.openledger.info/ws",
- faucet_address: "https://bitshares.openledger.info",
+ faucet_address: "http://bitshares.openledger.info",
unit: CORE_ASSET,
showSettles: false,
walletLockTimeout: 60 * 10,
@@ -24,7 +24,7 @@ class SettingsStore {
});
this.viewSettings = Immutable.Map({
- cardView: false
+ cardView: true
});
this.marketDirections = Immutable.Map({
diff --git a/electron/build/package.json b/electron/build/package.json
index 8f5e2dd..fb6836e 100644
--- a/electron/build/package.json
+++ b/electron/build/package.json
@@ -1,10 +1,10 @@
{
- "name": "BitShares-light",
- "productName": "BitShares2-light",
- "identifier": "org.bitshares.graphene",
- "description": "BitShares - cryptocurrency and decentralized exchange",
- "version": "2.0.160309",
- "author": "[email protected]",
+ "name": "Graphene_light",
+ "productName": "Graphene_light",
+ "identifier": "com.cryptonomex.graphene",
+ "description": "Graphene - financial smart contracts platform",
+ "version": "0.0.1",
+ "author": "[email protected]",
"main": "electron.js",
"config": {
"target": "development"
diff --git a/web/app/assets/index-dev.html b/web/app/assets/index-dev.html
index 1104de1..582ea5b 100644
--- a/web/app/assets/index-dev.html
+++ b/web/app/assets/index-dev.html
@@ -6,7 +6,7 @@
<meta name="format-detection" content="telephone=no">
<!--<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>-->
<title>BitShares 2.0</title>
- <link rel="icon" type="image/x-icon" href="favicon.ico">
+ <link rel="icon" type="image/x-icon" href="/favicon.ico">
<style>
body {
background-color: #2a2a2a
diff --git a/web/app/assets/index.html b/web/app/assets/index.html
index ab466a6..d0115e0 100644
--- a/web/app/assets/index.html
+++ b/web/app/assets/index.html
@@ -4,7 +4,6 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width"/>
<meta name="format-detection" content="telephone=no">
- <!--<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>-->
<title>BitShares 2.0</title>
<link rel="icon" type="image/x-icon" href="favicon.ico">
<style>
@@ -37,7 +36,7 @@
</script>
</head>
<body>
- <main id="content">
+ <main id="content" class="olDarkTheme">
<h1 class="centerDiv" style="">Loading...</h1>
</main>
<script src="vendors.js" charset="utf-8"></script>
diff --git a/web/app/assets/locales/locale-cn.js b/web/app/assets/locales/locale-cn.js
index ab573b2..f3d13b6 100644
--- a/web/app/assets/locales/locale-cn.js
+++ b/web/app/assets/locales/locale-cn.js
@@ -9,7 +9,7 @@ module.exports = {
tr: "Turkish"
},
header: {
- title: "Graphene (石墨烯)钱包",
+ title: "OpenLedger (石墨烯)钱包",
dashboard: "概览",
explorer: "浏览",
exchange: "交易",
@@ -674,7 +674,7 @@ module.exports = {
older: "更早"
},
footer: {
- title: "Graphene (石墨烯)",
+ title: "OpenLedger (石墨烯)",
block: "最新区块",
loading: "载入中...",
backup: "需要备份",
@@ -755,7 +755,7 @@ module.exports = {
markets: {
title: "交易所",
filter: "筛选",
- core_rate: "CORE 汇率",
+ core_rate: "BTS 汇率",
supply: "供应量",
search: "搜索",
base: "基准资产",
@@ -920,4 +920,4 @@ module.exports = {
fees: {
title: "费率表"
}
-};
\ No newline at end of file
+};
diff --git a/web/app/assets/locales/locale-de.js b/web/app/assets/locales/locale-de.js
index 6dbc8f1..c5c5114 100644
--- a/web/app/assets/locales/locale-de.js
+++ b/web/app/assets/locales/locale-de.js
@@ -9,7 +9,7 @@ module.exports = {
tr: "Turkish"
},
header: {
- title: "Graphene UI",
+ title: "OpenLedger",
account: "Konto",
dashboard: "Übersicht",
explorer: "Explorer",
diff --git a/web/app/assets/locales/locale-en.js b/web/app/assets/locales/locale-en.js
index 61367b1..7216265 100644
--- a/web/app/assets/locales/locale-en.js
+++ b/web/app/assets/locales/locale-en.js
@@ -10,7 +10,7 @@
},
header: {
- title: "BitShares 2.0",
+ title: "OpenLedger",
account: "Account",
dashboard: "Dashboard",
explorer: "Explore",
@@ -31,7 +31,7 @@
propose: "propose",
cancel: "cancel",
account: {
- welcome: "Welcome to BitShares 2.0",
+ welcome: "Welcome to OpenLedger",
asset: "Asset",
market_value: "Market Value",
hour_24: "24hr Change",
@@ -639,7 +639,7 @@
"olDarkTheme": "Openledger dark"
},
footer: {
- title: "BitShares 2.0",
+ title: "OpenLedger",
block: "Head block",
loading: "Loading...",
backup: "Backup Required",
diff --git a/web/app/assets/locales/locale-es.js b/web/app/assets/locales/locale-es.js
index aa4d257..caacde7 100644
--- a/web/app/assets/locales/locale-es.js
+++ b/web/app/assets/locales/locale-es.js
@@ -489,7 +489,7 @@
faucet_address: "Faucet Address"
},
footer: {
- title: "Graphene",
+ title: "OpenLedger",
block: "Bloque de cabecera",
loading: "Cargando..."
},
diff --git a/web/app/assets/locales/locale-fr.js b/web/app/assets/locales/locale-fr.js
index 5976fe5..bcedb17 100644
--- a/web/app/assets/locales/locale-fr.js
+++ b/web/app/assets/locales/locale-fr.js
@@ -356,7 +356,7 @@ module.exports = {
always_confirm: "Toujours demander une confirmation"
},
footer: {
- title: "Graphene",
+ title: "OpenLedger",
block: "Bloc courant"
},
exchange: {
diff --git a/web/app/assets/locales/locale-tr.js b/web/app/assets/locales/locale-tr.js
index 459e50d..a215d28 100644
--- a/web/app/assets/locales/locale-tr.js
+++ b/web/app/assets/locales/locale-tr.js
@@ -638,7 +638,7 @@
"olDarkTheme": "Openledger koyu"
},
footer: {
- title: "Graphene",
+ title: "OpenLedger",
block: "Baş blok",
loading: "Yüklüyor..."
},
diff --git a/web/app/assets/stylesheets/app.scss b/web/app/assets/stylesheets/app.scss
index da43330..5285629 100644
--- a/web/app/assets/stylesheets/app.scss
+++ b/web/app/assets/stylesheets/app.scss
@@ -1,5 +1,3 @@
-// http://sass-guidelin.es/#the-7-1-pattern
-
@import "vendors/all";
@import "base/all";
diff --git a/web/app/assets/stylesheets/themes/_ol-theme.scss b/web/app/assets/stylesheets/themes/_ol-theme.scss
deleted file mode 100644
index b03d9d4..0000000
--- a/web/app/assets/stylesheets/themes/_ol-theme.scss
+++ /dev/null
@@ -1,605 +0,0 @@
-@import "../utils/utils";
-
-// variables
-
-$light-text-color: #fff;
-$dark-text-color: #444;
-$primary-text-color: #e0e0e0;
-$secondary-text-color: darken($primary-text-color, 20%);
-$link-text-color: #4A90E2;
-$error-text-color: #E3745B;
-
-$bg-color: #191A1F;
-$panel-bg-color: #2C2E37;
-$light-panel-bg-color: #353742;
-$super-light-panel-bg-color: lighten($light-panel-bg-color, 8%);
-$button-bg-color: #4A90E2;
-$secondary-button-bg-color: #546979;
-
-$alert-color: $error-text-color;
-$info-color: #4A90E2;
-$success-color: #18BC9C;
-$warning-color: #FCAB53;
-$fee-color: $secondary-text-color;
-
-// general
-
-body {
- @include color($primary-text-color, $bg-color);
-}
-
-hr {
- border-color: $dark-text-color;
- background-color: $dark-text-color !important;
-}
-
-a {
- color: $link-text-color;
- &:hover, &:focus, &:active {
- color: lighten($link-text-color, 4%);
- }
-}
-
-label, label > span {
- color: $secondary-text-color;
-}
-
-.label.success {
- color: $success-color;
- border-color: $success-color;
-}
-
-.label.info {
- color: $info-color;
- border-color: $info-color;
-}
-
-.label.warning {
- color: $warning-color;
- border-color: $warning-color;
-}
-
-.label.cancel, .label.alert {
- color: $alert-color;
- border-color: $alert-color;
-}
-
-.txtlabel.success {
- color: $success-color;
-}
-
-.txtlabel.info {
- color: $info-color;
-}
-
-.txtlabel.warning {
- color: $warning-color;
-}
-
-.txtlabel.cancel, .label.alert {
- color: $alert-color;
-}
-
-// notification
-
-.notification {
- @include color($primary-text-color, $super-light-panel-bg-color, true);
-}
-
-.notification-dismiss {
- @include color($primary-text-color, $super-light-panel-bg-color, true);
-}
-
-.notification-success {
- border-left-color: $success-color !important;
-}
-
-.action-sheet {
- @include color($light-text-color, $super-light-panel-bg-color);
- &::after {
- border-bottom-color: $super-light-panel-bg-color;
- }
- > ul > li > a {
- color: $light-text-color;
- border-top-color: $panel-bg-color;
- &:hover {
- @include color($light-text-color, lighten($super-light-panel-bg-color, 4%));
- }
- }
-}
-
-.__react_component_tooltip.type-light {
- @include color($light-text-color, $super-light-panel-bg-color, true);
- &.place-bottom:after {
- border-bottom-color: $super-light-panel-bg-color !important;
- }
- &.place-top:after {
- border-top-color: $super-light-panel-bg-color !important;
- }
- &.place-right:after {
- border-right-color: $super-light-panel-bg-color !important;
- }
- &.place-left:after {
- border-left-color: $super-light-panel-bg-color !important;
- }
-}
-
-.json-inspector__key {
- color: $secondary-text-color !important;
-}
-
-h1, h2, h3, h4, h5, h6 {
- color: $primary-text-color;
-}
-
-.modal {
- @include color($light-text-color, $bg-color);
- .close-button {
- color: $secondary-text-color;
- &:hover {
- color: $primary-text-color;
- }
- }
- .modal-header {
- > h6 {
- color: $secondary-text-color;
- }
- &.has-error > h6 {
- color: $error-text-color
- }
- }
- .circle-wrapper {
- .circle:before {
- background-color: $primary-text-color;
- }
- }
- .table {
- > thead > tr > th, > tbody > tr > td {
- border-bottom-color: darken($secondary-text-color, 10%);
- }
- }
-}
-
-.footer {
- @include color($secondary-text-color, lighten($panel-bg-color, 8%));
- svg > path {
- fill: $secondary-text-color;
- }
-}
-
-.panel-left {
- @include color($light-text-color, $light-panel-bg-color);
- .block-list li > a {
- color: $light-text-color;
- &:hover {
- background-color: darken($light-panel-bg-color, 4%);
- }
- }
-}
-
-.tabs {
-@include color($secondary-text-color, $bg-color);
-}
-
-
-.page-layout {
- background-color: $bg-color;
-
- .left-column {
- border-top-color: $bg-color;
- border-bottom-color: $bg-color;
- background-color: $panel-bg-color; //lighten($bg-color, 4%);
-
- }
-
- .left-column-2 {
- border-top-color: $bg-color;
- border-bottom-color: $bg-color;
- background-color: darken($bg-color, 4%);
- }
-
- .main-content {
- background-color: $bg-color;
- }
-
- .right-column {
- border-top-color: $bg-color;
- border-bottom-color: $bg-color;
- background-color: darken($bg-color, 4%);
- }
-
-}
-
-.transfer-top {
- background-color: $light-panel-bg-color;
- label, label > span {
- color: $light-text-color;
- }
-}
-
-// buttons
-
-.button.bucket-button {
- text-transform: none !important;
- font-size: 0.75rem !important;
-}
-
-.button {
- background-color: $button-bg-color;
- &:hover, &:focus, &:active {
- background-color: lighten($button-bg-color, 4%) !important;
- }
- &.outline {
- color: $secondary-text-color;
- border-color: $secondary-text-color;
- &:hover {
- color: $light-text-color;
- border-color: $light-text-color;
- }
- }
-}
-
-.button.secondary {
- @include color($dark-text-color, $secondary-button-bg-color);
- &:hover, &:focus, &:active {
- @include color(lighten($dark-text-color, 4%), lighten($secondary-button-bg-color, 4%), true);
- }
-}
-
-.header .button, .header .button:active {
-background-color: #3E414D !important;
-&:hover, &:focus, &:active {
- background-color: #3E414D !important;
-}
-}
-
-
-
-.grp-menu-item button {
- &:hover, &:focus, &:active {
- background-color: #3E414D !important;
- }
-}
-
-.header {
- @include color($secondary-text-color, $panel-bg-color);
-}
-
-.header .logo {
- color: $secondary-text-color;
-
-}
-
-.menu-group.primary .menu-bar {
-
-}
-
-
-.header-right-menu {
- a > span { color: $secondary-text-color; }
- svg > path { fill: $secondary-text-color; }
- a:hover > span { color: $primary-text-color; }
- svg:hover > path { fill: $primary-text-color; }
-}
-
-// cards
-
-
-.card-section {
- padding-left: 0.5rem;
- > ul {
- color: #FFF;
- list-style: none;
- font-size: 85%;
- margin-left: 0;
- }
-}
-
-
-.card {
- @include color($primary-text-color, $bg-color);
- background-color: $panel-bg-color;
- &:hover {
- background-color: lighten($panel-bg-color, 4%);
- > h4 {
- background-color: lighten($light-panel-bg-color, 4%);
- color: $link-text-color
- }
- }
- a {
- color: $primary-text-color;
- }
- .card-divider {
- @include color($primary-text-color, lighten($bg-color, 12%) );
- }
- > h4 {
- background-color: lighten($bg-color, 24%);
- }
-}
-
-
-// tables
-.table {
- > thead > tr > th {
- border-bottom-color: $dark-text-color;
- color: $secondary-text-color;
- }
- > tbody > tr > td {
- border-bottom-color: $dark-text-color;
- }
- &.table-hover > tbody > tr:hover > td, .table-hover > tbody > tr:hover > th {
- background-color: lighten($bg-color, 4%);
- }
-}
-
-// block-list
-
-.block-list {
- color: $primary-text-color;
- li {
- border-bottom: 1px solid $dark-text-color;
- }
- li > a {
- color: $secondary-text-color;
- }
- li > a:hover, li > label:hover, li select:hover, li.active > a {
- color: $light-text-color;
- background-color: lighten($bg-color, 4%);
- }
- li:first-child {
- border-top: 1px solid $dark-text-color;
- }
- header {
- color: $secondary-text-color;
- }
-}
-
-
-// forms
-
-.has-error, div.has-error > label, div.has-error > label > span {
- color: $error-text-color;
-}
-
-div.has-error > input, div.has-error > input:hover, div.has-error > input:focus {
- border-color: $error-text-color;
-}
-
-.has-error input, .has-error select, .has-error textarea {
- border-color: $error-text-color;
-}
-
-input[type="text"], input[type="password"], input[type="email"], input[type="number"], input[type="search"], textarea, select {
- color: $primary-text-color;
- background-color: $panel-bg-color;
- border: none;
- &:hover, &:focus, &:active {
- color: $primary-text-color;
- background-color: darken($panel-bg-color, 2%);
- border: none;
- }
- &:focus {
- color: $primary-text-color;
- border: none;
- }
-}
-
-
-// Tabs
-
-.tabs {
- border-bottom-color: $dark-text-color;
- > .tab-item {
- color: $secondary-text-color;
- &.is-active {
- color: $primary-text-color;
- border-bottom-color: $button-bg-color;
- }
- &:hover, &:focus, &:active {
- color: $primary-text-color;
- }
- }
-}
-
-
-
-// Exchange
-
-.depthchart {
- background-color: $bg-color;
- &:hover {
- background-color: $bg-color;
- }
- &.area {
- color: #FFF;
- }
-}
-
-.buy-sell-box {
- background-color: lighten($light-panel-bg-color, 12%);
-}
-
-.active-bucket {
- text-transform: none !important;
- font-size: 0.75rem !important;
- background-color: lighten($light-panel-bg-color, 12%);
- text-transform: uppercase;
-}
-
-
-.market-top-bar {
- border-bottom: 1px solid $panel-bg-color;
-}
-
-// Account page
-.account-left-panel {
- h5 {
- color: $primary-text-color;
- }
- h6 {
- color: $secondary-text-color;
- }
- .bottom {
- border-top-color: $bg-color;
- }
-}
-
-.my-account h5, .my-account h4, td.my-account {
- color: $info-color;
-}
-
-.account-left-menu {
- > li > a:hover, > li > label:hover, > li select:hover {
- color: $light-text-color;
- background-color: $panel-bg-color;
- }
- > li > a.active {
- color: $light-text-color;
- background-color: lighten($panel-bg-color, 4%);
- border-left-color: darken($button-bg-color, 4%);
- }
-}
-
-
-.pagination {
- background-color: $panel-bg-color;
-}
-
-.invoice {
- .item-description {
- color: $secondary-text-color;
- }
-}
-
-// Formatted assets
-.facolor-success {
- color: $success-color;
-}
-
-.facolor-alert {
- color: $alert-color;
-}
-
-.facolor-warning {
- color: $warning-color;
-}
-
-.facolor-info {
- color: $info-color;
-}
-
-.facolor-error {
- color: $error-text-color;
-}
-
-.facolor-fee {
- color: $fee-color;
-}
-
-// AccountSelector component
-
-.account-selector {
- .error-area {
- color: $error-text-color;
- }
- .right-label {
- color: $secondary-text-color;
- }
-}
-
-.icon.success {
- padding-right: 1rem;
- > svg > path {
- fill: $success-color;
- }
-}
-
-.circle-wrapper {
- .circle:before {
- background-color: $secondary-text-color;
- }
-}
-
-// Misc
-
-.chart-zoom-dropdown {
- width:24px;
- height: 28px;
- padding: 4px;
- opacity: 0.5;
- overflow: hidden;
- -webkit-transition: all .5s ease;
- -moz-transition: all .5s ease;
- transition: all .5s ease;
-
- &:hover, &:active, &:focus {
- background-color: $bg-color;
- padding: 4px;
- opacity: 0.85;
- border-radius: 2px;
- color: $light-text-color;
- font-size: 60%;
- width:348px;
- height: 48px;
- }
-}
-
-
-
-
-.remove {
- color: $alert-color;
- border: none;
- padding: 2px 4px;
- font-size: 120%;
- background-color: transparent;
- border-radius: 0;
- -webkit-transition: all .5s ease;
- -moz-transition: all .5s ease;
- transition: all .5s ease;
- &:hover, &:active, &:focus {
- color: $light-text-color;
- background-color: $alert-color;
- font-size: 120%;
- border-radius: 2px;
- }
-}
-
-.memo {
- color: $secondary-text-color;
-}
-
-.help-content {
- code {
- color: $primary-text-color;
- background-color: transparent;
- border-color: $dark-text-color;
- }
-}
-
-// Block List (section)
-section input[type="text"] {
- background-color: transparent;
- &:hover, &:active, &:focus {
- color: $primary-text-color;
- background-color: transparent;
- }
-}
-
-
-// Asset Detail
-
-.asset-card {
- .card-divider {
- background: $panel-bg-color;
- }
-}
-
-// Exchange
-.mymarkets-header {
- border-bottom-color: $button-bg-color;
- &.inactive {
- border-bottom-color: transparent;
- color: $secondary-text-color;
- }
-}
diff --git a/web/app/assets/stylesheets/vendors/_foundation_settings.scss b/web/app/assets/stylesheets/vendors/_foundation_settings.scss
index 9c919c3..a29a0c4 100644
--- a/web/app/assets/stylesheets/vendors/_foundation_settings.scss
+++ b/web/app/assets/stylesheets/vendors/_foundation_settings.scss
@@ -95,7 +95,7 @@ $body-font-family: Roboto-Regular, Helvetica, Arial, sans-serif;
// $body-antialiased: true;
// Application Colors
-$primary-color: #3f3f3f;
+$primary-color: #3E414D;
// $secondary-color: #f1f1f1;
// $alert-color: #F04124;
// $info-color: #A0D3E8;
diff --git a/web/app/components/Account/CreateAccount.jsx b/web/app/components/Account/CreateAccount.jsx
index ecf3e2e..9035b59 100644
--- a/web/app/components/Account/CreateAccount.jsx
+++ b/web/app/components/Account/CreateAccount.jsx
@@ -65,6 +65,7 @@ class CreateAccount extends React.Component {
onAccountNameChange(e) {
const state = {};
+ console.log("-- CreateAccount.onAccountNameChange -->", e.value);
if(e.valid !== undefined) state.validAccountName = e.valid;
if(e.value !== undefined) state.accountName = e.value;
if (!this.state.show_identicon) state.show_identicon = true;
@@ -72,6 +73,7 @@ class CreateAccount extends React.Component {
}
onPasswordChange(e) {
+ console.log("-- CreateAccount.onPasswordChange -->", e);
this.setState({validPassword: e.valid});
}
@@ -175,7 +177,8 @@ class CreateAccount extends React.Component {
}
render() {
- let my_accounts = AccountStore.getMyAccounts()
+ console.log("-- CreateAccount.render -->", this.state);
+ let my_accounts = AccountStore.getMyAccounts();
let first_account = my_accounts.length === 0;
let valid = this.isValid();
let buttonClass = classNames("button no-margin", {disabled: !valid});
diff --git a/web/app/components/Exchange/OrderBook.jsx b/web/app/components/Exchange/OrderBook.jsx
index 01fa1e6..a9417f0 100644
--- a/web/app/components/Exchange/OrderBook.jsx
+++ b/web/app/components/Exchange/OrderBook.jsx
@@ -169,7 +169,6 @@ class OrderBook extends React.Component {
let asksContainer = ReactDOM.findDOMNode(this.refs.hor_asks);
Ps.initialize(asksContainer);
}
-
}
psUpdate() {
diff --git a/web/app/components/Explorer/Witnesses.jsx b/web/app/components/Explorer/Witnesses.jsx
index 8bc4b65..304dd3e 100644
--- a/web/app/components/Explorer/Witnesses.jsx
+++ b/web/app/components/Explorer/Witnesses.jsx
@@ -39,10 +39,10 @@ class WitnessCard extends React.Component {
let witness_aslot = witness_data.get('last_aslot')
let color = {};
if( this.props.most_recent - witness_aslot > 100 ) {
- color = {borderLeft: "1px solid #FCAB53"};
+ color = {borderLeft: "1px solid #FCAB53"};
}
else {
- color = {borderLeft: "1px solid #50D2C2"};
+ color = {borderLeft: "1px solid #50D2C2"};
}
let last_aslot_time = new Date(Date.now() - ((this.props.most_recent - witness_aslot ) * ChainStore.getObject( "2.0.0" ).getIn( ["parameters","block_interval"] )*1000));
@@ -57,18 +57,18 @@ class WitnessCard extends React.Component {
<br/>
<table className="table key-value-table">
<tbody>
- <tr>
- <td>Votes</td>
- <td><FormattedAsset amount={total_votes} asset="1.3.0" decimalOffset={5} /></td>
- </tr>
- <tr>
- <td>Last&nbsp;Block</td>
- <td><TimeAgo time={new Date(last_aslot_time)} /></td>
- </tr>
- <tr>
- <td>Missed</td>
- <td>{witness_data.get('total_missed')}</td>
- </tr>
+ <tr>
+ <td>Votes</td>
+ <td><FormattedAsset amount={total_votes} asset="1.3.0" decimalOffset={5} /></td>
+ </tr>
+ <tr>
+ <td>Last&nbsp;Block</td>
+ <td><TimeAgo time={new Date(last_aslot_time)} /></td>
+ </tr>
+ <tr>
+ <td>Missed</td>
+ <td>{witness_data.get('total_missed')}</td>
+ </tr>
</tbody>
</table>
</div>
@@ -103,10 +103,10 @@ class WitnessRow extends React.Component {
let witness_aslot = witness_data.get('last_aslot')
let color = {};
if( this.props.most_recent - witness_aslot > 100 ) {
- color = {borderLeft: "1px solid #FCAB53"};
+ color = {borderLeft: "1px solid #FCAB53"};
}
else {
- color = {borderLeft: "1px solid #50D2C2"};
+ color = {borderLeft: "1px solid #50D2C2"};
}
let last_aslot_time = new Date(Date.now() - ((this.props.most_recent - witness_aslot ) * ChainStore.getObject( "2.0.0" ).getIn( ["parameters","block_interval"] )*1000));
@@ -143,17 +143,17 @@ class WitnessList extends React.Component {
constructor () {
super();
this.state = {
- sortBy: 'rank',
- inverseSort: true
+ sortBy: 'rank',
+ inverseSort: true
};
}
_setSort(field) {
this.setState({
- sortBy: field,
- inverseSort: field === this.state.sortBy ? !this.state.inverseSort : this.state.inverseSort
+ sortBy: field,
+ inverseSort: field === this.state.sortBy ? !this.state.inverseSort : this.state.inverseSort
});
- }
+ }
render() {
@@ -163,27 +163,27 @@ class WitnessList extends React.Component {
let ranks = {};
witnesses
- .filter(a => {
- if (!a) {
- return false;
- }
- return witnessList.indexOf(a.get("id")) !== -1;
- })
- .sort((a, b) => {
- if (a && b) {
- return parseInt(b.get("total_votes"), 10) - parseInt(a.get("total_votes"), 10);
- }
- })
- .forEach( (w, index) => {
- if (w) {
- let s = w.get("last_aslot");
- if( most_recent_aslot < s ) {
- most_recent_aslot = s;
+ .filter(a => {
+ if (!a) {
+ return false;
}
+ return witnessList.indexOf(a.get("id")) !== -1;
+ })
+ .sort((a, b) => {
+ if (a && b) {
+ return parseInt(b.get("total_votes"), 10) - parseInt(a.get("total_votes"), 10);
+ }
+ })
+ .forEach( (w, index) => {
+ if (w) {
+ let s = w.get("last_aslot");
+ if( most_recent_aslot < s ) {
+ most_recent_aslot = s;
+ }
- ranks[w.get("id")] = index + 1;
- }
- });
+ ranks[w.get("id")] = index + 1;
+ }
+ });
let itemRows = null;
if (witnesses.length > 0 && witnesses[1]) {
@@ -247,20 +247,20 @@ class WitnessList extends React.Component {
return (
<table className="table table-hover">
<thead>
- <tr>
- <th className="clickable" onClick={this._setSort.bind(this, 'rank')}><Translate content="explorer.witnesses.rank" /></th>
- <th className="clickable" onClick={this._setSort.bind(this, 'name')}><Translate content="account.votes.name" /></th>
- <th className="clickable" onClick={this._setSort.bind(this, 'last_aslot')}><Translate content="explorer.blocks.last_block" /></th>
- <th className="clickable" onClick={this._setSort.bind(this, 'last_confirmed_block_num')}><Translate content="explorer.witnesses.last_confirmed" /></th>
- <th className="clickable" onClick={this._setSort.bind(this, 'total_missed')}><Translate content="explorer.witnesses.missed" /></th>
- <th className="clickable" onClick={this._setSort.bind(this, 'total_votes')}><Translate content="account.votes.votes" /></th>
- </tr>
+ <tr>
+ <th className="clickable" onClick={this._setSort.bind(this, 'rank')}><Translate content="explorer.witnesses.rank" /></th>
+ <th className="clickable" onClick={this._setSort.bind(this, 'name')}><Translate content="account.votes.name" /></th>
+ <th className="clickable" onClick={this._setSort.bind(this, 'last_aslot')}><Translate content="explorer.blocks.last_block" /></th>
+ <th className="clickable" onClick={this._setSort.bind(this, 'last_confirmed_block_num')}><Translate content="explorer.witnesses.last_confirmed" /></th>
+ <th className="clickable" onClick={this._setSort.bind(this, 'total_missed')}><Translate content="explorer.witnesses.missed" /></th>
+ <th className="clickable" onClick={this._setSort.bind(this, 'total_votes')}><Translate content="account.votes.votes" /></th>
+ </tr>
</thead>
- <tbody>
+ <tbody>
{itemRows}
- </tbody>
+ </tbody>
- </table>
+ </table>
)
}
else {
@@ -334,34 +334,34 @@ class Witnesses extends React.Component {
<br/>
<table className="table key-value-table">
<tbody>
- <tr>
- <td><Translate content="explorer.witnesses.current"/></td>
- <td>{currentAccount ? currentAccount.get("name") : null}</td>
- </tr>
- <tr>
- <td><Translate content="explorer.blocks.active_witnesses"/></td>
- <td>{Object.keys(globalObject.active_witnesses).length}</td>
- </tr>
- <tr>
- <td><Translate content="explorer.witnesses.participation"/></td>
- <td>{dynGlobalObject.participation}%</td>
- </tr>
- <tr>
- <td><Translate content="explorer.witnesses.pay"/></td>
- <td><FormattedAsset amount={globalObject.parameters.witness_pay_per_block} asset="1.3.0" /></td>
- </tr>
- <tr>
- <td><Translate content="explorer.witnesses.budget"/></td>
- <td> <FormattedAsset amount={dynGlobalObject.witness_budget} asset="1.3.0" /></td>
- </tr>
- <tr>
- <td><Translate content="explorer.witnesses.next_vote"/></td>
- <td> <TimeAgo time={new Date(dynGlobalObject.next_maintenance_time)} /></td>
- </tr>
- <tr>
- <td> <Translate component="h4" content="markets.filter" /> </td>
- <td> <input type="text" value={this.state.filterWitness} onChange={this._onFilter.bind(this)} /> </td>
- </tr>
+ <tr>
+ <td><Translate content="explorer.witnesses.current"/></td>
+ <td>{currentAccount ? currentAccount.get("name") : null}</td>
+ </tr>
+ <tr>
+ <td><Translate content="explorer.blocks.active_witnesses"/></td>
+ <td>{Object.keys(globalObject.active_witnesses).length}</td>
+ </tr>
+ <tr>
+ <td><Translate content="explorer.witnesses.participation"/></td>
+ <td>{dynGlobalObject.participation}%</td>
+ </tr>
+ <tr>
+ <td><Translate content="explorer.witnesses.pay"/></td>
+ <td><FormattedAsset amount={globalObject.parameters.witness_pay_per_block} asset="1.3.0" /></td>
+ </tr>
+ <tr>
+ <td><Translate content="explorer.witnesses.budget"/></td>
+ <td> <FormattedAsset amount={dynGlobalObject.witness_budget} asset="1.3.0" /></td>
+ </tr>
+ <tr>
+ <td><Translate content="explorer.witnesses.next_vote"/></td>
+ <td> <TimeAgo time={new Date(dynGlobalObject.next_maintenance_time)} /></td>
+ </tr>
+ <tr>
+ <td> <Translate component="h4" content="markets.filter" /> </td>
+ <td> <input type="text" value={this.state.filterWitness} onChange={this._onFilter.bind(this)} /> </td>
+ </tr>
</tbody>
</table>
<div className="view-switcher">
@@ -370,16 +370,16 @@ class Witnesses extends React.Component {
</div>
</div>
<div className="grid-block">
- <div className="grid-content ">
- <WitnessList
- current_aslot={dynGlobalObject.current_aslot}
- current={current ? current.get("id") : null}
- witnesses={Immutable.List(globalObject.active_witnesses)}
- witnessList={globalObject.active_witnesses}
- filter={this.state.filterWitness}
- cardView={this.state.cardView}
- />
- </div>
+ <div className="grid-content ">
+ <WitnessList
+ current_aslot={dynGlobalObject.current_aslot}
+ current={current ? current.get("id") : null}
+ witnesses={Immutable.List(globalObject.active_witnesses)}
+ witnessList={globalObject.active_witnesses}
+ filter={this.state.filterWitness}
+ cardView={this.state.cardView}
+ />
+ </div>
</div>
</div>
</div>
diff --git a/web/app/components/Layout/Footer.jsx b/web/app/components/Layout/Footer.jsx
index eb7e389..8f92c3b 100644
--- a/web/app/components/Layout/Footer.jsx
+++ b/web/app/components/Layout/Footer.jsx
@@ -77,7 +77,7 @@ class Footer extends React.Component {
<div className="align-justify grid-block">
<div className="grid-block">
<div className="logo">
- <Translate content="footer.title" /><span className="version">{version}</span>
+ <Translate content="footer.title" /> &nbsp; <span className="version">(Powered by BitShares {APP_VERSION})</span>
</div>
</div>
{this.props.synced ? null : <div className="grid-block shrink txtlabel error"><Translate content="footer.nosync" />&nbsp; &nbsp;</div>}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment