fixed private services showing to non-auth users

pull/168/head^2
hunterlong 2019-04-29 11:11:44 -07:00
parent babe0c791c
commit d9fef62026
12 changed files with 322 additions and 154 deletions

View File

@ -65,7 +65,10 @@ func main() {
parseFlags() parseFlags()
loadDotEnvs() loadDotEnvs()
source.Assets() source.Assets()
utils.InitLogs() if err := utils.InitLogs(); err != nil {
fmt.Printf("Statping Log Error: \n %v\n", err)
os.Exit(2)
}
args := flag.Args() args := flag.Args()
if len(args) >= 1 { if len(args) >= 1 {

View File

@ -45,6 +45,21 @@ func (g *Group) Services() []*Service {
return services return services
} }
// VisibleServices returns all services based on authentication
func (g *Group) VisibleServices(auth bool) []*Service {
var services []*Service
for _, g := range g.Services() {
if !g.Public.Bool {
if auth {
services = append(services, g)
}
} else {
services = append(services, g)
}
}
return services
}
// SelectGroups returns all groups // SelectGroups returns all groups
func SelectGroups(includeAll bool, auth bool) []*Group { func SelectGroups(includeAll bool, auth bool) []*Group {
var groups []*Group var groups []*Group

View File

@ -55,6 +55,21 @@ func SelectService(id int64) *Service {
return nil return nil
} }
func SelectServices(auth bool) []*Service {
var validServices []*Service
for _, sr := range CoreApp.Services {
s := sr.(*Service)
if !s.Public.Bool {
if auth {
validServices = append(validServices, s)
}
} else {
validServices = append(validServices, s)
}
}
return validServices
}
// SelectServiceLink returns a *core.Service from the service permalink // SelectServiceLink returns a *core.Service from the service permalink
func SelectServiceLink(permalink string) *Service { func SelectServiceLink(permalink string) *Service {
for _, s := range Services() { for _, s := range Services() {

View File

@ -38,6 +38,14 @@ var handlerFuncs = func(w http.ResponseWriter, r *http.Request) template.FuncMap
"Services": func() []types.ServiceInterface { "Services": func() []types.ServiceInterface {
return core.CoreApp.Services return core.CoreApp.Services
}, },
"VisibleServices": func() []*core.Service {
auth := IsUser(r)
return core.SelectServices(auth)
},
"VisibleGroupServices": func(group *core.Group) []*core.Service {
auth := IsUser(r)
return group.VisibleServices(auth)
},
"Groups": func(includeAll bool) []*core.Group { "Groups": func(includeAll bool) []*core.Group {
auth := IsUser(r) auth := IsUser(r)
return core.SelectGroups(includeAll, auth) return core.SelectGroups(includeAll, auth)

View File

@ -4710,7 +4710,7 @@ func (ec *executionContext) ___Type_ofType(ctx context.Context, field graphql.Co
var checkinImplementors = []string{"Checkin"} var checkinImplementors = []string{"Checkin"}
func (ec *executionContext) _Checkin(ctx context.Context, sel ast.SelectionSet, obj *types.Checkin) graphql.Marshaler { func (ec *executionContext) _Checkin(ctx context.Context, sel ast.SelectionSet, obj *types.Checkin) graphql.Marshaler {
fields := graphql.CollectFields(ctx, sel, checkinImplementors) fields := graphql.CollectFields(ec.RequestContext, sel, checkinImplementors)
out := graphql.NewFieldSet(fields) out := graphql.NewFieldSet(fields)
invalid := false invalid := false
@ -4804,7 +4804,7 @@ func (ec *executionContext) _Checkin(ctx context.Context, sel ast.SelectionSet,
var checkinHitImplementors = []string{"CheckinHit"} var checkinHitImplementors = []string{"CheckinHit"}
func (ec *executionContext) _CheckinHit(ctx context.Context, sel ast.SelectionSet, obj *types.CheckinHit) graphql.Marshaler { func (ec *executionContext) _CheckinHit(ctx context.Context, sel ast.SelectionSet, obj *types.CheckinHit) graphql.Marshaler {
fields := graphql.CollectFields(ctx, sel, checkinHitImplementors) fields := graphql.CollectFields(ec.RequestContext, sel, checkinHitImplementors)
out := graphql.NewFieldSet(fields) out := graphql.NewFieldSet(fields)
invalid := false invalid := false
@ -4841,7 +4841,7 @@ func (ec *executionContext) _CheckinHit(ctx context.Context, sel ast.SelectionSe
var coreImplementors = []string{"Core"} var coreImplementors = []string{"Core"}
func (ec *executionContext) _Core(ctx context.Context, sel ast.SelectionSet, obj *types.Core) graphql.Marshaler { func (ec *executionContext) _Core(ctx context.Context, sel ast.SelectionSet, obj *types.Core) graphql.Marshaler {
fields := graphql.CollectFields(ctx, sel, coreImplementors) fields := graphql.CollectFields(ec.RequestContext, sel, coreImplementors)
out := graphql.NewFieldSet(fields) out := graphql.NewFieldSet(fields)
invalid := false invalid := false
@ -4940,7 +4940,7 @@ func (ec *executionContext) _Core(ctx context.Context, sel ast.SelectionSet, obj
var failureImplementors = []string{"Failure"} var failureImplementors = []string{"Failure"}
func (ec *executionContext) _Failure(ctx context.Context, sel ast.SelectionSet, obj *types.Failure) graphql.Marshaler { func (ec *executionContext) _Failure(ctx context.Context, sel ast.SelectionSet, obj *types.Failure) graphql.Marshaler {
fields := graphql.CollectFields(ctx, sel, failureImplementors) fields := graphql.CollectFields(ec.RequestContext, sel, failureImplementors)
out := graphql.NewFieldSet(fields) out := graphql.NewFieldSet(fields)
invalid := false invalid := false
@ -4997,7 +4997,7 @@ func (ec *executionContext) _Failure(ctx context.Context, sel ast.SelectionSet,
var groupImplementors = []string{"Group"} var groupImplementors = []string{"Group"}
func (ec *executionContext) _Group(ctx context.Context, sel ast.SelectionSet, obj *types.Group) graphql.Marshaler { func (ec *executionContext) _Group(ctx context.Context, sel ast.SelectionSet, obj *types.Group) graphql.Marshaler {
fields := graphql.CollectFields(ctx, sel, groupImplementors) fields := graphql.CollectFields(ec.RequestContext, sel, groupImplementors)
out := graphql.NewFieldSet(fields) out := graphql.NewFieldSet(fields)
invalid := false invalid := false
@ -5058,7 +5058,7 @@ func (ec *executionContext) _Group(ctx context.Context, sel ast.SelectionSet, ob
var messageImplementors = []string{"Message"} var messageImplementors = []string{"Message"}
func (ec *executionContext) _Message(ctx context.Context, sel ast.SelectionSet, obj *types.Message) graphql.Marshaler { func (ec *executionContext) _Message(ctx context.Context, sel ast.SelectionSet, obj *types.Message) graphql.Marshaler {
fields := graphql.CollectFields(ctx, sel, messageImplementors) fields := graphql.CollectFields(ec.RequestContext, sel, messageImplementors)
out := graphql.NewFieldSet(fields) out := graphql.NewFieldSet(fields)
invalid := false invalid := false
@ -5162,7 +5162,7 @@ func (ec *executionContext) _Message(ctx context.Context, sel ast.SelectionSet,
var queryImplementors = []string{"Query"} var queryImplementors = []string{"Query"}
func (ec *executionContext) _Query(ctx context.Context, sel ast.SelectionSet) graphql.Marshaler { func (ec *executionContext) _Query(ctx context.Context, sel ast.SelectionSet) graphql.Marshaler {
fields := graphql.CollectFields(ctx, sel, queryImplementors) fields := graphql.CollectFields(ec.RequestContext, sel, queryImplementors)
ctx = graphql.WithResolverContext(ctx, &graphql.ResolverContext{ ctx = graphql.WithResolverContext(ctx, &graphql.ResolverContext{
Object: "Query", Object: "Query",
@ -5328,7 +5328,7 @@ func (ec *executionContext) _Query(ctx context.Context, sel ast.SelectionSet) gr
var serviceImplementors = []string{"Service"} var serviceImplementors = []string{"Service"}
func (ec *executionContext) _Service(ctx context.Context, sel ast.SelectionSet, obj *types.Service) graphql.Marshaler { func (ec *executionContext) _Service(ctx context.Context, sel ast.SelectionSet, obj *types.Service) graphql.Marshaler {
fields := graphql.CollectFields(ctx, sel, serviceImplementors) fields := graphql.CollectFields(ec.RequestContext, sel, serviceImplementors)
out := graphql.NewFieldSet(fields) out := graphql.NewFieldSet(fields)
invalid := false invalid := false
@ -5563,7 +5563,7 @@ func (ec *executionContext) _Service(ctx context.Context, sel ast.SelectionSet,
var userImplementors = []string{"User"} var userImplementors = []string{"User"}
func (ec *executionContext) _User(ctx context.Context, sel ast.SelectionSet, obj *types.User) graphql.Marshaler { func (ec *executionContext) _User(ctx context.Context, sel ast.SelectionSet, obj *types.User) graphql.Marshaler {
fields := graphql.CollectFields(ctx, sel, userImplementors) fields := graphql.CollectFields(ec.RequestContext, sel, userImplementors)
out := graphql.NewFieldSet(fields) out := graphql.NewFieldSet(fields)
invalid := false invalid := false
@ -5634,7 +5634,7 @@ func (ec *executionContext) _User(ctx context.Context, sel ast.SelectionSet, obj
var __DirectiveImplementors = []string{"__Directive"} var __DirectiveImplementors = []string{"__Directive"}
func (ec *executionContext) ___Directive(ctx context.Context, sel ast.SelectionSet, obj *introspection.Directive) graphql.Marshaler { func (ec *executionContext) ___Directive(ctx context.Context, sel ast.SelectionSet, obj *introspection.Directive) graphql.Marshaler {
fields := graphql.CollectFields(ctx, sel, __DirectiveImplementors) fields := graphql.CollectFields(ec.RequestContext, sel, __DirectiveImplementors)
out := graphql.NewFieldSet(fields) out := graphql.NewFieldSet(fields)
invalid := false invalid := false
@ -5673,7 +5673,7 @@ func (ec *executionContext) ___Directive(ctx context.Context, sel ast.SelectionS
var __EnumValueImplementors = []string{"__EnumValue"} var __EnumValueImplementors = []string{"__EnumValue"}
func (ec *executionContext) ___EnumValue(ctx context.Context, sel ast.SelectionSet, obj *introspection.EnumValue) graphql.Marshaler { func (ec *executionContext) ___EnumValue(ctx context.Context, sel ast.SelectionSet, obj *introspection.EnumValue) graphql.Marshaler {
fields := graphql.CollectFields(ctx, sel, __EnumValueImplementors) fields := graphql.CollectFields(ec.RequestContext, sel, __EnumValueImplementors)
out := graphql.NewFieldSet(fields) out := graphql.NewFieldSet(fields)
invalid := false invalid := false
@ -5709,7 +5709,7 @@ func (ec *executionContext) ___EnumValue(ctx context.Context, sel ast.SelectionS
var __FieldImplementors = []string{"__Field"} var __FieldImplementors = []string{"__Field"}
func (ec *executionContext) ___Field(ctx context.Context, sel ast.SelectionSet, obj *introspection.Field) graphql.Marshaler { func (ec *executionContext) ___Field(ctx context.Context, sel ast.SelectionSet, obj *introspection.Field) graphql.Marshaler {
fields := graphql.CollectFields(ctx, sel, __FieldImplementors) fields := graphql.CollectFields(ec.RequestContext, sel, __FieldImplementors)
out := graphql.NewFieldSet(fields) out := graphql.NewFieldSet(fields)
invalid := false invalid := false
@ -5755,7 +5755,7 @@ func (ec *executionContext) ___Field(ctx context.Context, sel ast.SelectionSet,
var __InputValueImplementors = []string{"__InputValue"} var __InputValueImplementors = []string{"__InputValue"}
func (ec *executionContext) ___InputValue(ctx context.Context, sel ast.SelectionSet, obj *introspection.InputValue) graphql.Marshaler { func (ec *executionContext) ___InputValue(ctx context.Context, sel ast.SelectionSet, obj *introspection.InputValue) graphql.Marshaler {
fields := graphql.CollectFields(ctx, sel, __InputValueImplementors) fields := graphql.CollectFields(ec.RequestContext, sel, __InputValueImplementors)
out := graphql.NewFieldSet(fields) out := graphql.NewFieldSet(fields)
invalid := false invalid := false
@ -5791,7 +5791,7 @@ func (ec *executionContext) ___InputValue(ctx context.Context, sel ast.Selection
var __SchemaImplementors = []string{"__Schema"} var __SchemaImplementors = []string{"__Schema"}
func (ec *executionContext) ___Schema(ctx context.Context, sel ast.SelectionSet, obj *introspection.Schema) graphql.Marshaler { func (ec *executionContext) ___Schema(ctx context.Context, sel ast.SelectionSet, obj *introspection.Schema) graphql.Marshaler {
fields := graphql.CollectFields(ctx, sel, __SchemaImplementors) fields := graphql.CollectFields(ec.RequestContext, sel, __SchemaImplementors)
out := graphql.NewFieldSet(fields) out := graphql.NewFieldSet(fields)
invalid := false invalid := false
@ -5832,7 +5832,7 @@ func (ec *executionContext) ___Schema(ctx context.Context, sel ast.SelectionSet,
var __TypeImplementors = []string{"__Type"} var __TypeImplementors = []string{"__Type"}
func (ec *executionContext) ___Type(ctx context.Context, sel ast.SelectionSet, obj *introspection.Type) graphql.Marshaler { func (ec *executionContext) ___Type(ctx context.Context, sel ast.SelectionSet, obj *introspection.Type) graphql.Marshaler {
fields := graphql.CollectFields(ctx, sel, __TypeImplementors) fields := graphql.CollectFields(ec.RequestContext, sel, __TypeImplementors)
out := graphql.NewFieldSet(fields) out := graphql.NewFieldSet(fields)
invalid := false invalid := false

View File

@ -1,3 +1,4 @@
//go:generate go run github.com/99designs/gqlgen
package graphql package graphql
import ( import (

View File

@ -38,7 +38,7 @@ func Router() *mux.Router {
dir := utils.Directory dir := utils.Directory
CacheStorage = NewStorage() CacheStorage = NewStorage()
r := mux.NewRouter() r := mux.NewRouter()
r.Handle("/", cached("60s", "text/html", http.HandlerFunc(indexHandler))) r.Handle("/", http.HandlerFunc(indexHandler))
if source.UsingAssets(dir) { if source.UsingAssets(dir) {
indexHandler := http.FileServer(http.Dir(dir + "/assets/")) indexHandler := http.FileServer(http.Dir(dir + "/assets/"))
r.PathPrefix("/css/").Handler(http.StripPrefix("/css/", http.FileServer(http.Dir(dir+"/assets/css")))) r.PathPrefix("/css/").Handler(http.StripPrefix("/css/", http.FileServer(http.Dir(dir+"/assets/css"))))

View File

@ -7,54 +7,66 @@
/* Mobile Service Container */ /* Mobile Service Container */
HTML, BODY { HTML, BODY {
background-color: #fcfcfc; background-color: #fcfcfc;
padding-bottom: 10px; } padding-bottom: 10px;
}
.container { .container {
padding-top: 20px; padding-top: 20px;
padding-bottom: 25px; padding-bottom: 25px;
max-width: 860px; max-width: 860px;
box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15) !important; } box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15) !important;
}
.header-title { .header-title {
color: #464646; } color: #464646;
}
.header-desc { .header-desc {
color: #939393; } color: #939393;
}
.btn { .btn {
border-radius: 0.2rem; } border-radius: 0.2rem;
}
.online_list .badge { .online_list .badge {
margin-top: 0.2rem; } margin-top: 0.2rem;
}
.navbar { .navbar {
margin-bottom: 30px; } margin-bottom: 30px;
}
.btn-sm { .btn-sm {
line-height: 1.3; line-height: 1.3;
font-size: 0.75rem; } font-size: 0.75rem;
}
.view_service_btn { .view_service_btn {
position: absolute; position: absolute;
bottom: -40px; bottom: -40px;
right: 40px; } right: 40px;
}
.service_lower_info { .service_lower_info {
position: absolute; position: absolute;
bottom: -40px; bottom: -40px;
left: 40px; left: 40px;
color: #d1ffca; color: #d1ffca;
font-size: 0.85rem; } font-size: 0.85rem;
}
.lg_number { .lg_number {
font-size: 2.3rem; font-size: 2.3rem;
font-weight: bold; font-weight: bold;
display: block; display: block;
color: #4f4f4f; } color: #4f4f4f;
}
.stats_area { .stats_area {
text-align: center; text-align: center;
color: #a5a5a5; } color: #a5a5a5;
}
.lower_canvas { .lower_canvas {
height: 3.4rem; height: 3.4rem;
@ -62,82 +74,101 @@ HTML, BODY {
background-color: #48d338; background-color: #48d338;
padding: 15px 10px; padding: 15px 10px;
margin-left: 0px !important; margin-left: 0px !important;
margin-right: 0px !important; } margin-right: 0px !important;
}
.lower_canvas SPAN { .lower_canvas SPAN {
font-size: 1rem; font-size: 1rem;
color: #fff; } color: #fff;
}
.footer { .footer {
text-decoration: none; text-decoration: none;
margin-top: 20px; } margin-top: 20px;
}
.footer A { .footer A {
color: #8d8d8d; color: #8d8d8d;
text-decoration: none; } text-decoration: none;
}
.footer A:HOVER { .footer A:HOVER {
color: #6d6d6d; } color: #6d6d6d;
}
.badge { .badge {
color: white; color: white;
border-radius: 0.2rem; } border-radius: 0.2rem;
}
.btn-group { .btn-group {
height: 25px; } height: 25px;
.btn-group A { }
padding: 0.1rem .75rem; .btn-group A {
font-size: 0.8rem; } padding: 0.1rem 0.75rem;
font-size: 0.8rem;
}
.card-body .badge { .card-body .badge {
color: #fff; } color: #fff;
}
.nav-pills .nav-link { .nav-pills .nav-link {
border-radius: 0.2rem; } border-radius: 0.2rem;
}
.form-control { .form-control {
border-radius: 0.2rem; } border-radius: 0.2rem;
}
.card { .card {
background-color: #ffffff; background-color: #ffffff;
border: 1px solid rgba(0, 0, 0, 0.125); } border: 1px solid rgba(0, 0, 0, 0.125);
}
.card-body { .card-body {
overflow: hidden; } overflow: hidden;
}
.card-body H4 A { .card-body H4 A {
color: #444444; color: #444444;
text-decoration: none; } text-decoration: none;
}
.chart-container { .chart-container {
position: relative; position: relative;
height: 170px; height: 170px;
width: 100%; width: 100%;
overflow: hidden; } overflow: hidden;
}
.service-chart-container { .service-chart-container {
position: relative; position: relative;
height: 400px; height: 400px;
width: 100%; } width: 100%;
}
.service-chart-heatmap { .service-chart-heatmap {
position: relative; position: relative;
height: 300px; height: 300px;
width: 100%; } width: 100%;
}
.inputTags-field { .inputTags-field {
border: 0; border: 0;
background-color: transparent; background-color: transparent;
padding-top: .13rem; } padding-top: 0.13rem;
}
input.inputTags-field:focus { input.inputTags-field:focus {
outline-width: 0; } outline-width: 0;
}
.inputTags-list { .inputTags-list {
display: block; display: block;
width: 100%; width: 100%;
min-height: calc(2.25rem + 2px); min-height: calc(2.25rem + 2px);
padding: .2rem .35rem; padding: 0.2rem 0.35rem;
font-size: 1rem; font-size: 1rem;
font-weight: 400; font-weight: 400;
line-height: 1.5; line-height: 1.5;
@ -145,8 +176,9 @@ input.inputTags-field:focus {
background-color: #fff; background-color: #fff;
background-clip: padding-box; background-clip: padding-box;
border: 1px solid #ced4da; border: 1px solid #ced4da;
border-radius: .25rem; border-radius: 0.25rem;
transition: border-color .15s ease-in-out,box-shadow .15s ease-in-out; } transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
}
.inputTags-item { .inputTags-item {
background-color: #3aba39; background-color: #3aba39;
@ -154,63 +186,81 @@ input.inputTags-field:focus {
padding: 5px 8px; padding: 5px 8px;
font-size: 10pt; font-size: 10pt;
color: white; color: white;
border-radius: 4px; } border-radius: 4px;
}
.inputTags-item .close-item { .inputTags-item .close-item {
margin-left: 6px; margin-left: 6px;
font-size: 13pt; font-size: 13pt;
font-weight: bold; font-weight: bold;
cursor: pointer; } cursor: pointer;
}
.btn-primary { .btn-primary {
background-color: #3e9bff; background-color: #3e9bff;
border-color: #006fe6; border-color: #006fe6;
color: white; } color: white;
.btn-primary.dyn-dark { }
background-color: #32a825 !important; .btn-primary.dyn-dark {
border-color: #2c9320 !important; } background-color: #32a825 !important;
.btn-primary.dyn-light { border-color: #2c9320 !important;
background-color: #75de69 !important; }
border-color: #88e37e !important; } .btn-primary.dyn-light {
background-color: #75de69 !important;
border-color: #88e37e !important;
}
.btn-success { .btn-success {
background-color: #47d337; } background-color: #47d337;
.btn-success.dyn-dark { }
background-color: #32a825 !important; .btn-success.dyn-dark {
border-color: #2c9320 !important; } background-color: #32a825 !important;
.btn-success.dyn-light { border-color: #2c9320 !important;
background-color: #75de69 !important; }
border-color: #88e37e !important; } .btn-success.dyn-light {
background-color: #75de69 !important;
border-color: #88e37e !important;
}
.btn-danger { .btn-danger {
background-color: #dd3545; } background-color: #dd3545;
.btn-danger.dyn-dark { }
background-color: #b61f2d !important; .btn-danger.dyn-dark {
border-color: #a01b28 !important; } background-color: #b61f2d !important;
.btn-danger.dyn-light { border-color: #a01b28 !important;
background-color: #e66975 !important; }
border-color: #e97f89 !important; } .btn-danger.dyn-light {
background-color: #e66975 !important;
border-color: #e97f89 !important;
}
.bg-success { .bg-success {
background-color: #47d337 !important; } background-color: #47d337 !important;
}
.bg-danger { .bg-danger {
background-color: #dd3545 !important; } background-color: #dd3545 !important;
}
.bg-success .dyn-dark { .bg-success .dyn-dark {
background-color: #35b027 !important; } background-color: #35b027 !important;
}
.bg-danger .dyn-dark { .bg-danger .dyn-dark {
background-color: #bf202f !important; } background-color: #bf202f !important;
}
.nav-pills .nav-link.active, .nav-pills .show > .nav-link { .nav-pills .nav-link.active, .nav-pills .show > .nav-link {
background-color: #13a00d; } background-color: #13a00d;
}
.nav-pills A { .nav-pills A {
color: #424242; } color: #424242;
}
.nav-pills I { .nav-pills I {
margin-right: 10px; } margin-right: 10px;
}
.CodeMirror { .CodeMirror {
/* Bootstrap Settings */ /* Bootstrap Settings */
@ -230,23 +280,26 @@ input.inputTags-field:focus {
border: 1px solid #ccc; border: 1px solid #ccc;
border-radius: 4px; border-radius: 4px;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
/* Code Mirror Settings */ /* Code Mirror Settings */
font-family: monospace; font-family: monospace;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
height: 80vh; } height: 80vh;
}
.CodeMirror-focused { .CodeMirror-focused {
/* Bootstrap Settings */ /* Bootstrap Settings */
border-color: #66afe9; border-color: #66afe9;
outline: 0; outline: 0;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6);
transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; } transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
}
.switch { .switch {
font-size: 1rem; font-size: 1rem;
position: relative; } position: relative;
}
.switch input { .switch input {
position: absolute; position: absolute;
@ -257,7 +310,8 @@ input.inputTags-field:focus {
clip: rect(0 0 0 0); clip: rect(0 0 0 0);
clip-path: inset(50%); clip-path: inset(50%);
overflow: hidden; overflow: hidden;
padding: 0; } padding: 0;
}
.switch input + label { .switch input + label {
position: relative; position: relative;
@ -270,23 +324,26 @@ input.inputTags-field:focus {
outline: none; outline: none;
user-select: none; user-select: none;
vertical-align: middle; vertical-align: middle;
text-indent: calc(calc(calc(2.375rem * .8) * 2) + .5rem); } text-indent: calc(calc(calc(2.375rem * .8) * 2) + .5rem);
}
.switch input + label::before, .switch input + label::before,
.switch input + label::after { .switch input + label::after {
content: ''; content: "";
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
width: calc(calc(2.375rem * .8) * 2); width: calc(calc(2.375rem * .8) * 2);
bottom: 0; bottom: 0;
display: block; } display: block;
}
.switch input + label::before { .switch input + label::before {
right: 0; right: 0;
background-color: #dee2e6; background-color: #dee2e6;
border-radius: calc(2.375rem * .8); border-radius: calc(2.375rem * .8);
transition: 0.2s all; } transition: 0.2s all;
}
.switch input + label::after { .switch input + label::after {
top: 2px; top: 2px;
@ -295,120 +352,154 @@ input.inputTags-field:focus {
height: calc(calc(2.375rem * .8) - calc(2px * 2)); height: calc(calc(2.375rem * .8) - calc(2px * 2));
border-radius: 50%; border-radius: 50%;
background-color: white; background-color: white;
transition: 0.2s all; } transition: 0.2s all;
}
.switch input:checked + label::before { .switch input:checked + label::before {
background-color: #08d; } background-color: #08d;
}
.switch input:checked + label::after { .switch input:checked + label::after {
margin-left: calc(2.375rem * .8); } margin-left: calc(2.375rem * .8);
}
.switch input:focus + label::before { .switch input:focus + label::before {
outline: none; outline: none;
box-shadow: 0 0 0 0.2rem rgba(0, 136, 221, 0.25); } box-shadow: 0 0 0 0.2rem rgba(0, 136, 221, 0.25);
}
.switch input:disabled + label { .switch input:disabled + label {
color: #868e96; color: #868e96;
cursor: not-allowed; } cursor: not-allowed;
}
.switch input:disabled + label::before { .switch input:disabled + label::before {
background-color: #e9ecef; } background-color: #e9ecef;
}
.switch.switch-sm { .switch.switch-sm {
font-size: 0.875rem; } font-size: 0.875rem;
}
.switch.switch-sm input + label { .switch.switch-sm input + label {
min-width: calc(calc(1.9375rem * .8) * 2); min-width: calc(calc(1.9375rem * .8) * 2);
height: calc(1.9375rem * .8); height: calc(1.9375rem * .8);
line-height: calc(1.9375rem * .8); line-height: calc(1.9375rem * .8);
text-indent: calc(calc(calc(1.9375rem * .8) * 2) + .5rem); } text-indent: calc(calc(calc(1.9375rem * .8) * 2) + .5rem);
}
.switch.switch-sm input + label::before { .switch.switch-sm input + label::before {
width: calc(calc(1.9375rem * .8) * 2); } width: calc(calc(1.9375rem * .8) * 2);
}
.switch.switch-sm input + label::after { .switch.switch-sm input + label::after {
width: calc(calc(1.9375rem * .8) - calc(2px * 2)); width: calc(calc(1.9375rem * .8) - calc(2px * 2));
height: calc(calc(1.9375rem * .8) - calc(2px * 2)); } height: calc(calc(1.9375rem * .8) - calc(2px * 2));
}
.switch.switch-sm input:checked + label::after { .switch.switch-sm input:checked + label::after {
margin-left: calc(1.9375rem * .8); } margin-left: calc(1.9375rem * .8);
}
.switch.switch-lg { .switch.switch-lg {
font-size: 1.25rem; } font-size: 1.25rem;
}
.switch.switch-lg input + label { .switch.switch-lg input + label {
min-width: calc(calc(3rem * .8) * 2); min-width: calc(calc(3rem * .8) * 2);
height: calc(3rem * .8); height: calc(3rem * .8);
line-height: calc(3rem * .8); line-height: calc(3rem * .8);
text-indent: calc(calc(calc(3rem * .8) * 2) + .5rem); } text-indent: calc(calc(calc(3rem * .8) * 2) + .5rem);
}
.switch.switch-lg input + label::before { .switch.switch-lg input + label::before {
width: calc(calc(3rem * .8) * 2); } width: calc(calc(3rem * .8) * 2);
}
.switch.switch-lg input + label::after { .switch.switch-lg input + label::after {
width: calc(calc(3rem * .8) - calc(2px * 2)); width: calc(calc(3rem * .8) - calc(2px * 2));
height: calc(calc(3rem * .8) - calc(2px * 2)); } height: calc(calc(3rem * .8) - calc(2px * 2));
}
.switch.switch-lg input:checked + label::after { .switch.switch-lg input:checked + label::after {
margin-left: calc(3rem * .8); } margin-left: calc(3rem * .8);
}
.switch + .switch { .switch + .switch {
margin-left: 1rem; } margin-left: 1rem;
}
@keyframes pulse_animation { @keyframes pulse_animation {
0% { 0% {
transform: scale(1); } transform: scale(1);
}
30% { 30% {
transform: scale(1); } transform: scale(1);
}
40% { 40% {
transform: scale(1.02); } transform: scale(1.02);
}
50% { 50% {
transform: scale(1); } transform: scale(1);
}
60% { 60% {
transform: scale(1); } transform: scale(1);
}
70% { 70% {
transform: scale(1.05); } transform: scale(1.05);
}
80% { 80% {
transform: scale(1); } transform: scale(1);
}
100% { 100% {
transform: scale(1); } } transform: scale(1);
}
}
.pulse { .pulse {
animation-name: pulse_animation; animation-name: pulse_animation;
animation-duration: 1500ms; animation-duration: 1500ms;
transform-origin: 70% 70%; transform-origin: 70% 70%;
animation-iteration-count: infinite; animation-iteration-count: infinite;
animation-timing-function: linear; } animation-timing-function: linear;
}
@keyframes glow-grow { @keyframes glow-grow {
0% { 0% {
opacity: 0; opacity: 0;
transform: scale(1); } transform: scale(1);
}
80% { 80% {
opacity: 1; } opacity: 1;
}
100% { 100% {
transform: scale(2); transform: scale(2);
opacity: 0; } } opacity: 0;
}
}
.pulse-glow { .pulse-glow {
animation-name: glow-grown; animation-name: glow-grown;
animation-duration: 100ms; animation-duration: 100ms;
transform-origin: 70% 30%; transform-origin: 70% 30%;
animation-iteration-count: infinite; animation-iteration-count: infinite;
animation-timing-function: linear; } animation-timing-function: linear;
}
.pulse-glow:before, .pulse-glow:before,
.pulse-glow:after { .pulse-glow:after {
position: absolute; position: absolute;
content: ''; content: "";
height: 0.5rem; height: 0.5rem;
width: 1.75rem; width: 1.75rem;
top: 1.2rem; top: 1.2rem;
right: 2.15rem; right: 2.15rem;
border-radius: 0; border-radius: 0;
box-shadow: 0 0 7px #47d337; box-shadow: 0 0 7px #47d337;
animation: glow-grow 2s ease-out infinite; } animation: glow-grow 2s ease-out infinite;
}
.sortable_drag { .sortable_drag {
background-color: #0000000f; } background-color: #0000000f;
}
.drag_icon { .drag_icon {
cursor: move; cursor: move;
@ -422,106 +513,132 @@ input.inputTags-field:focus {
margin-right: 5px; margin-right: 5px;
margin-left: -10px; margin-left: -10px;
text-align: center; text-align: center;
color: #b1b1b1; } color: #b1b1b1;
}
/* (Optional) Apply a "closed-hand" cursor during drag operation. */ /* (Optional) Apply a "closed-hand" cursor during drag operation. */
.drag_icon:active { .drag_icon:active {
cursor: grabbing; cursor: grabbing;
cursor: -moz-grabbing; cursor: -moz-grabbing;
cursor: -webkit-grabbing; } cursor: -webkit-grabbing;
}
.switch_btn { .switch_btn {
float: right; float: right;
margin: -1px 0px 0px 0px; margin: -1px 0px 0px 0px;
display: block; } display: block;
}
#start_container { #start_container {
position: absolute; position: absolute;
z-index: 99999; z-index: 99999;
margin-top: 20px; } margin-top: 20px;
}
#end_container { #end_container {
position: absolute; position: absolute;
z-index: 99999; z-index: 99999;
margin-top: 20px; margin-top: 20px;
right: 0; } right: 0;
}
.pointer { .pointer {
cursor: pointer; } cursor: pointer;
}
.jumbotron { .jumbotron {
background-color: white; } background-color: white;
}
@media (max-width: 767px) { @media (max-width: 767px) {
HTML, BODY { HTML, BODY {
background-color: #fcfcfc; } background-color: #fcfcfc;
}
.sm-container { .sm-container {
margin-top: 0px !important; margin-top: 0px !important;
padding: 0 !important; } padding: 0 !important;
}
.list-group-item H5 { .list-group-item H5 {
font-size: 0.9rem; } font-size: 0.9rem;
}
.container { .container {
padding: 0px !important; padding: 0px !important;
padding-top: 15px !important; } padding-top: 15px !important;
}
.group_header { .group_header {
margin-left: 15px; } margin-left: 15px;
}
.navbar { .navbar {
margin-left: 0px; margin-left: 0px;
margin-top: 0px; margin-top: 0px;
width: 100%; width: 100%;
margin-bottom: 0; } margin-bottom: 0;
}
.btn-sm { .btn-sm {
line-height: 0.9rem; line-height: 0.9rem;
font-size: 0.65rem; } font-size: 0.65rem;
}
.full-col-12 { .full-col-12 {
padding-left: 0px; padding-left: 0px;
padding-right: 0px; } padding-right: 0px;
}
.card { .card {
border: 0; border: 0;
border-radius: 0rem; border-radius: 0rem;
padding: 0; padding: 0;
background-color: #ffffff; } background-color: #ffffff;
}
.card-body { .card-body {
font-size: 10pt; font-size: 10pt;
padding: 0px 10px; } padding: 0px 10px;
}
.lg_number { .lg_number {
font-size: 7.8vw; } font-size: 7.8vw;
}
.stats_area { .stats_area {
margin-top: 1.5rem !important; margin-top: 1.5rem !important;
margin-bottom: 1.5rem !important; } margin-bottom: 1.5rem !important;
}
.stats_area .col-4 { .stats_area .col-4 {
padding-left: 0; padding-left: 0;
padding-right: 0; padding-right: 0;
font-size: 0.6rem; } font-size: 0.6rem;
}
.list-group-item { .list-group-item {
border-top: 1px solid #e4e4e4; border-top: 1px solid #e4e4e4;
border: 0px; } border: 0px;
}
.list-group-item:first-child { .list-group-item:first-child {
border-top-left-radius: 0; border-top-left-radius: 0;
border-top-right-radius: 0; } border-top-right-radius: 0;
}
.list-group-item:last-child { .list-group-item:last-child {
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
border-bottom-left-radius: 0; } border-bottom-left-radius: 0;
}
.list-group-item P { .list-group-item P {
font-size: 0.7rem; } font-size: 0.7rem;
}
.service-chart-container { .service-chart-container {
height: 200px; } } height: 200px;
}
}
/*# sourceMappingURL=base.css.map */ /*# sourceMappingURL=base.css.map */

View File

@ -101,6 +101,15 @@ $('select#service_type').on('change', function() {
$('#post_data').parent().parent().addClass('d-none'); $('#post_data').parent().parent().addClass('d-none');
$('#service_response').parent().parent().addClass('d-none'); $('#service_response').parent().parent().addClass('d-none');
$('#service_response_code').parent().parent().addClass('d-none'); $('#service_response_code').parent().parent().addClass('d-none');
$('#headers').parent().parent().removeClass('d-none');
} else if (selected === 'icmp') {
$('#service_port').parent().parent().removeClass('d-none');
$('#headers').parent().parent().addClass('d-none');
$('#service_check_type').parent().parent().addClass('d-none');
$('#service_url').attr('placeholder', '192.168.1.1');
$('#post_data').parent().parent().addClass('d-none');
$('#service_response').parent().parent().addClass('d-none');
$('#service_response_code').parent().parent().addClass('d-none');
} else { } else {
$('#post_data').parent().parent().removeClass('d-none'); $('#post_data').parent().parent().removeClass('d-none');
$('#service_response').parent().parent().removeClass('d-none'); $('#service_response').parent().parent().removeClass('d-none');

View File

@ -13,7 +13,7 @@
<div class="col-12 full-col-12"> <div class="col-12 full-col-12">
<h4 class="group_header">{{.Name}}</h4> <h4 class="group_header">{{.Name}}</h4>
<div class="list-group online_list mb-3"> <div class="list-group online_list mb-3">
{{ range .Services }} {{ range VisibleGroupServices . }}
<a href="#" class="service_li list-group-item list-group-item-action {{if not .Online}}bg-danger text-white{{ end }}" data-id="{{.Id}}"> <a href="#" class="service_li list-group-item list-group-item-action {{if not .Online}}bg-danger text-white{{ end }}" data-id="{{.Id}}">
{{ .Name }} {{ .Name }}
{{if .Online}} {{if .Online}}
@ -53,7 +53,7 @@
</div> </div>
{{end}} {{end}}
{{ range .Services }} {{ range VisibleServices }}
{{$avgTime := .AvgTime}} {{$avgTime := .AvgTime}}
<div class="mb-4" id="service_id_{{.Id}}"> <div class="mb-4" id="service_id_{{.Id}}">
<div class="card"> <div class="card">

View File

@ -1,6 +1,6 @@
// Code generated by go generate; DO NOT EDIT. // Code generated by go generate; DO NOT EDIT.
// This file was generated by robots at // This file was generated by robots at
// 2019-04-19 21:42:16.46651 -0700 PDT m=+0.559109073 // 2019-04-29 11:08:37.958335 -0700 PDT m=+0.699554798
// //
// This contains the most recently Markdown source for the Statping Wiki. // This contains the most recently Markdown source for the Statping Wiki.
package source package source

View File

@ -1 +1 @@
0.80.55 0.80.56