Merge branch 'tao-staging' into mix-staging

.travis.yml

@@ -2,6 +2,7 @@ language: node_js
 sudo: required
 dist: trusty
 node_js: '8'
+before_install: npm install -g grunt-cli
 install:
   - npm install
   - npm run dist

Dockerfile

@@ -1,9 +1,10 @@
-FROM mhart/alpine-node:latest
+FROM node
 
-ADD . /eth-netstats
+RUN git clone https://github.com/goerli/netstats-server /netstats-server
-WORKDIR /eth-netstats
+WORKDIR /netstats-server
-
+RUN npm install
-RUN npm install && npm install -g grunt-cli && grunt
+RUN npm install -g grunt-cli
+RUN grunt
 
 EXPOSE  3000
 CMD ["npm", "start"]

README.md

@@ -22,14 +22,14 @@ npm install
 sudo npm install -g grunt-cli
 ```
 
-##Build the resources
+## Build the resources
 In order to build the static files you have to run grunt tasks which will generate dist directories containing the js and css files, fonts and images.
 
 ```bash
 grunt
 ```
 
-##Run
+## Run
 
 ```bash
 WS_SECRET="asdf" npm start

package.json

@@ -1,6 +1,6 @@
 {
   "name": "netstats-server",
-  "description": "POA Network Intelligence dashboard",
+  "description": "Görli Network Dashboard",
   "version": "0.1.0",
   "private": true,
   "engines": {

src/css/style.css

@@ -546,7 +546,6 @@ svg .y.axis .tick:first-child text {
 	}
 }
 
-
 @media (max-width: 600px) {
 	.blocks-holder div.small-title-miner {
 		font-size: 10px;

src/views/layout.jade

@@ -3,18 +3,12 @@ doctype html
 html(ng-app="netStatsApp")
   head
     meta(name="viewport", content="width=device-width, initial-scale=1.0, maximum-scale=1.0")
-    title MIX Network Stats
+    title Görli Network Status
     style(type="text/css") [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak { display: none !important; }
     link(rel='stylesheet', href='/css/netstats.min.css')
-    link(rel='shortcut icon', href='/mix-logo-thick.svg', sizes='any' type='image/svg+xml')
-    link(rel='shortcut icon', href='/mix-logo-thick-1024.png', sizes='1024x1024' type='image/png')
-    link(rel='shortcut icon', href='/mix-logo-thick-512.png', sizes='512x512' type='image/png')
-    link(rel='shortcut icon', href='/mix-logo-thick-256.png', sizes='256x256' type='image/png')
-    link(rel='shortcut icon', href='/mix-logo-thick-128.png', sizes='128x128' type='image/png')
-    link(rel='shortcut icon', href='/mix-logo-thick-64.png', sizes='64x64' type='image/png')
     meta(name='robots', content='index,follow')
     meta(name='googlebot', content='index,follow')
+    link(rel='shortcut icon', type="image/x-icon", href="/favicon.ico")
   body
     block content
-
     script(src="/js/netstats.min.js")