Merge branch 'tao-staging' into mix-staging

This commit is contained in:
Afri Schoedon 2018-12-01 20:10:50 +01:00 committed by GitHub
commit 574461c021
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 17 deletions

View File

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

View File

@ -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 EXPOSE 3000
CMD ["npm", "start"] CMD ["npm", "start"]

View File

@ -22,14 +22,14 @@ npm install
sudo npm install -g grunt-cli 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. 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 ```bash
grunt grunt
``` ```
##Run ## Run
```bash ```bash
WS_SECRET="asdf" npm start WS_SECRET="asdf" npm start

View File

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

View File

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

View File

@ -3,18 +3,12 @@ doctype html
html(ng-app="netStatsApp") html(ng-app="netStatsApp")
head head
meta(name="viewport", content="width=device-width, initial-scale=1.0, maximum-scale=1.0") 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; } 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='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='robots', content='index,follow')
meta(name='googlebot', content='index,follow') meta(name='googlebot', content='index,follow')
link(rel='shortcut icon', type="image/x-icon", href="/favicon.ico")
body body
block content block content
script(src="/js/netstats.min.js") script(src="/js/netstats.min.js")