Merge pull request #255 from skycoin/develop

Merge to master

Author: gz-c

.travis.yml

@@ -1,7 +1,6 @@
 language: go
 
 go:
-  - "1.8"
   - "1.9"
   - "1.10"
 
@@ -28,6 +27,7 @@ install:
 
 script:
   - make check
+  - make lint-ts
   - make build-ng
   - make check-ui
 

Makefile

@@ -48,6 +48,9 @@ install-linters: ## Install linters
 format: ## Formats the code. Must have goimports installed (use make install-linters).
 	goimports -w explorer.go
 
+lint-ts: ## runs ts lint
+	npm run lint
+
 check-ui: ## runs e2e tests connecting to a containerized node
 	go run explorer.go &>/dev/null &
 	sleep 10

README.md

@@ -141,6 +141,22 @@ Run linters:
 make lint
 ```
 
+### e2e Tests
+
+If you are running a Skycoin node normally, you can run the e2e tests with:
+
+```sh
+npm run e2e
+```
+
+If you are running a Skycoin node using the test database (`blockchain-180.db`), you can run the e2e tests with:
+
+```sh
+npm run e2e-blockchain-180
+```
+
+The second method is the one used in Travis.
+
 ### Customization
 
 [CUSTOMIZATION.md](CUSTOMIZATION.md)

dist/0.4ff8f23d9b9631142fe3.js

@@ -252,6 +252,10 @@ [email protected]
 MIT
 MIT
 
+[email protected]
+MIT
+MIT
+
 [email protected]
 Apache-2.0
 Apache License

dist/0.a76c7ccd3867033d76b2.js

@@ -3,6 +3,10 @@
     "coinIdentifier": "SKY",
     "address": "Address",
     "coins": "Coins",
+    "iniialHours": "Initial Hours",
+    "calculatedHours": "Final Hours",
+    "currentHours": "Current Hours",
+    "hours": "Hours",
     "loadingMsg": "Loading...",
     "shortLoadingErrorMsg": "Loading error",
     "longLoadingErrorMsg": "Error loading data, try again later...",
@@ -15,12 +19,13 @@
     "outputs": "Outputs",
     "pending": "pending",
     "date": "Date",
-    "balance": "Balance",
-    "initialBalance": "Initial address balance",
-    "finalBalance": "Final address balance",
-    "initialBalanceShort": "Initial",
-    "finalBalanceShort": "Final",
-    "firstSeen": "First seen at"
+    "balance": "More info",
+    "fee": "Transaction fee (in hours)",
+    "initialBalance": "Initial coins balance",
+    "finalBalance": "Final coins balance",
+    "firstSeen": "First seen at",
+    "loadAll": "Show all {{total}} elements",
+    "loading": "Loading, please wait..."
   },
   "blocks": {
     "blocksTitle": "Blocks",
@@ -55,7 +60,9 @@
     "title": "Address",
     "txsNumber": "# of Transactions",
     "totalReceived": "Total Received",
-    "currentBalance": "Current Balance",
+    "totalSent": "Total Sent",
+    "currentBalance": "Current Coins",
+    "hoursBalance": "Current Hours",
     "tools": "Tools",
     "unspentOutputs": "Unspent outputs",
     "withoutTransactions": "Without transactions"
@@ -64,7 +71,8 @@
     "title": "Unspent Outputs",
     "address": "Address",
     "outputsNumber": "# of outputs",
-    "total": "Total",
+    "totalCoins": "Total Coins",
+    "totalHours": "Total Hours",
     "origin": "Origin",
     "date": "Date",
     "withoutOutputs": "Without outputs"