Commit 8ccef3e6 authored by hashworks's avatar hashworks

Merge branch 'dev'

parents a1b35852 2d77f528
Pipeline #298 passed with stages
in 1 minute and 57 seconds
module github.com/hashworks/hashworksNET
require (
github.com/UnnoTed/fileb0x v1.1.3 // indirect
github.com/UnnoTed/fileb0x v1.1.4 // indirect
github.com/blend/go-sdk v0.0.0-20180925002442-beb974d6e9e5 // indirect
github.com/bradfitz/gomemcache v0.0.0-20180710155616-bc664df96737 // indirect
github.com/codegangsta/negroni v1.0.0 // indirect
github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
github.com/ekyoung/gin-nice-recovery v0.0.0-20160510022553-1654dca486db
github.com/gin-contrib/cache v0.0.0-20180925013901-031ec46e6ce8
github.com/gin-contrib/gzip v0.0.0-20180827025821-1c01330167a8
github.com/gin-contrib/multitemplate v0.0.0-20180827023943-5799bbbb6dce
github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7 // indirect
github.com/gin-gonic/gin v1.3.0
github.com/gin-contrib/cache v1.1.0
github.com/gin-contrib/gzip v0.0.1
github.com/gin-contrib/multitemplate v0.0.0-20190914010127-bba2ccfe37ec
github.com/gin-contrib/sse v0.1.0 // indirect
github.com/gin-gonic/gin v1.4.0
github.com/go-errors/errors v1.0.1
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
github.com/gomodule/redigo v2.0.0+incompatible // indirect
github.com/golang/protobuf v1.3.2 // indirect
github.com/hashworks/go-chart v2.0.2-0.20181012215714-9fd7836f84d7+incompatible
github.com/influxdata/influxdb v1.6.3
github.com/json-iterator/go v1.1.5 // indirect
github.com/memcachier/mc v2.0.1+incompatible // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/robfig/go-cache v0.0.0-20130306151617-9fc39e0dbf62 // indirect
github.com/securego/gosec v0.0.0-20190912120752-140048b2a218 // indirect
github.com/influxdata/influxdb v1.7.9
github.com/json-iterator/go v1.1.8 // indirect
github.com/kr/pretty v0.1.0 // indirect
github.com/mattn/go-isatty v0.0.10 // indirect
github.com/stretchr/testify v1.4.0
github.com/ugorji/go/codec v0.0.0-20180831062425-e253f1f20942 // indirect
github.com/unrolled/secure v0.0.0-20180914162101-439d7b25425f
github.com/urfave/cli v1.20.0
github.com/ugorji/go v1.1.7 // indirect
github.com/unrolled/secure v1.0.4
github.com/urfave/cli v1.22.1
github.com/wcharczuk/go-chart v2.0.1+incompatible
golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81 // indirect
golang.org/x/net v0.0.0-20190909003024-a7b16738d86b
gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
gopkg.in/go-playground/validator.v8 v8.18.2 // indirect
golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 // indirect
golang.org/x/net v0.0.0-20191028085509-fe3aa8a45271
golang.org/x/sys v0.0.0-20191029155521-f43be2a4598c // indirect
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
gopkg.in/yaml.v2 v2.2.4 // indirect
)
go 1.13
This diff is collapsed.
......@@ -7,10 +7,11 @@ package main
import (
"fmt"
"os"
"github.com/gin-gonic/gin"
"github.com/hashworks/hashworksNET/server"
"github.com/urfave/cli"
"os"
)
var (
......
@import 'configuration';
html { // Required for the footer, see https://stackoverflow.com/a/23442814
html {
// Required for the footer, see https://stackoverflow.com/a/23442814
min-height: 100%;
position: relative;
}
......@@ -176,4 +177,4 @@ footer {
text-transform: capitalize;
}
}
}
}
\ No newline at end of file
......@@ -14,4 +14,4 @@ $small-screen-max-width: 720px;
$header-height: 64px;
$footer-height: $header-height / 2;
$content-spacing: 64px / 2;
$content-spacing: 64px / 2;
\ No newline at end of file
......@@ -15,4 +15,4 @@ h4,
h5,
h6 {
margin: 0;
}
}
\ No newline at end of file
......@@ -8,4 +8,4 @@
//.bold {
// font-weight: bold;
//}
//}
\ No newline at end of file
......@@ -73,6 +73,7 @@ svg {
.fill {
$transparentize-value: .6;
&.ok {
fill: transparentize($status-color-ok, $transparentize-value);
}
......
@import 'fixes';
@import 'globalClasses';
@import 'base';
@import 'base';
\ No newline at end of file
......@@ -64,6 +64,7 @@
background: url('data:image/svg+xml;charset=UTF-8,<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" height="40" viewBox="0 0 50 50"><path fill="white" d="M25.251,6.461c-10.318,0-18.683,8.365-18.683,18.683h4.068c0-8.071,6.543-14.615,14.615-14.615V6.461z"><animateTransform attributeType="xml" attributeName="transform" type="rotate" from="0 25 25" to="360 25 25" dur="0.6s" repeatCount="indefinite"></animateTransform></path></svg>') no-repeat center top;
$minimum-width: 380px;
@media screen and (max-width: $minimum-width) {
background: none;
}
......@@ -73,13 +74,7 @@
background-size: contain;
height: 200px;
$sizes: (1550 620 200)
(1350 520 200)
(1200 440 200)
(1000 750 200)
(750 600 200)
(600 380 200)
(400 200 115);
$sizes: (1550 620 200) (1350 520 200) (1200 440 200) (1000 750 200) (750 600 200) (600 380 200) (400 200 115);
@each $i in $sizes {
@media screen and (max-width: #{nth($i, 1)}px) {
......
......@@ -3,16 +3,17 @@ package server
import (
"encoding/json"
"fmt"
"github.com/gin-gonic/gin"
"github.com/go-errors/errors"
"github.com/hashworks/go-chart"
"github.com/influxdata/influxdb/client/v2"
"github.com/wcharczuk/go-chart/drawing"
"log"
"math"
"net/http"
"strings"
"time"
"github.com/gin-gonic/gin"
"github.com/go-errors/errors"
"github.com/hashworks/go-chart"
"github.com/influxdata/influxdb/client/v2"
"github.com/wcharczuk/go-chart/drawing"
)
var svgLoadDimensions = [][]int{
......
......@@ -5,16 +5,18 @@ import (
"encoding/base64"
"errors"
"fmt"
"github.com/ekyoung/gin-nice-recovery"
"github.com/hashworks/hashworksNET/server/bindata"
"regexp"
"time"
nice "github.com/ekyoung/gin-nice-recovery"
"github.com/hashworks/hashworksNET/server/bindata"
"html/template"
"net/http"
"github.com/gin-contrib/cache/persistence"
"github.com/gin-contrib/gzip"
"github.com/gin-gonic/gin"
"html/template"
"net/http"
)
// I'm using this struct to pass stuff around. Like database connections etc
......
......@@ -2,12 +2,13 @@ package server
import (
"fmt"
"github.com/gin-contrib/multitemplate"
"github.com/hashworks/hashworksNET/server/bindata"
"html/template"
"runtime"
"strings"
"time"
"github.com/gin-contrib/multitemplate"
"github.com/hashworks/hashworksNET/server/bindata"
)
func (s Server) templateFunctionMap() template.FuncMap {
......
{{define "error404"}}
{{template "header" . }}
<div class="page">
<section class="cards">
<article class="card">
<div class=page>
<section class=cards>
<article class=card>
<h3>Error 404</h3>
<p>not found</p>
</article>
......
{{define "footer"}}
</div>
<footer>
<div class="right">{{ if .PageStartTime }}{{LoadTimes .PageStartTime}} | {{ end }}v{{ version }} | {{ GoVer }}</div>
<div class=right>{{ if .PageStartTime }}{{LoadTimes .PageStartTime}} | {{ end }}v{{ version }} | {{ GoVer }}</div>
</footer>
</body>
</html>
{{end}}
\ No newline at end of file
This diff is collapsed.
{{define "index"}}
{{template "header" . }}
<div class="page">
<section class="cards">
<div class=page>
<section class=cards>
<article class="card full">
<h1>Contact</h1>
<p>You can contact me by mail using <a href="mailto:mail@hashworks.net">mail@hashworks.net</a>.</p>
<p>My PGP public key is available <a href="/static/pgp_public_key.asc">here</a>.</p>
<br/>
<p>Additionally you can find me as `hashworks` on the <a href="https://freenode.net/" rel="nofollow" target="_blank">freenode irc network</a>.</p>
<br />
<p>Additionally you can find me as `hashworks` on the <a href="https://freenode.net/" rel=nofollow
target=_blank>freenode irc network</a>.</p>
</article>
</section>
</div>
......
{{define "status"}}
{{template "header" . }}
<div class="page">
<section class="cards">
<article class="card">
<div class="tag">{{ LoadHost }}</div>
<div class=page>
<section class=cards>
<article class=card>
<div class=tag>{{ LoadHost }}</div>
<h1>Server Load</h1>
<table class="load">
<tr>
{{range .Loads }}
<table class=load>
<tr>
{{range .Loads }}
<td class="{{ .Status }}">{{printf "%.02f" .Value}}</td>
{{else}}
<div class="status error">No data!</div>
{{end}}
</tr>
{{else}}
<div class="status error">No data!</div>
{{end}}
</tr>
</table>
<div class="status-svg">
<div class="load"></div>
<div class=status-svg>
<div class=load></div>
</div>
</article>
<article class="card">
<div class="tag">{{ LoadHost }}</div>
<article class=card>
<div class=tag>{{ LoadHost }}</div>
<h1>Public Services</h1>
{{range .Services }}
<h4>{{.Name}}:</h4>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment