magnus/smon
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 6 Wiki Activity

Compare commits

base: magnus:aa9376ac134711b9326611d0e90db647e028f10d
Branches Tags
magnus:main
magnus:v41
magnus:v40
magnus:v39
magnus:v38
magnus:v37
magnus:v36
magnus:v35
magnus:v34
magnus:v33
magnus:v32
magnus:v31
magnus:v30
magnus:v29
magnus:v28
magnus:v27
magnus:v26
magnus:v24
magnus:v22
magnus:v21
magnus:v20
magnus:v19
magnus:v18
magnus:v17
magnus:v16
magnus:v15
magnus:v14
magnus:v13
magnus:v12
magnus:v11
magnus:v10
magnus:v9
magnus:v7
magnus:v6
magnus:v5
magnus:v4
magnus:v3
magnus:v2
..
compare: magnus:db21b01589562d7250386980b18195adf3ab6209
Branches Tags
magnus:main
magnus:v41
magnus:v40
magnus:v39
magnus:v38
magnus:v37
magnus:v36
magnus:v35
magnus:v34
magnus:v33
magnus:v32
magnus:v31
magnus:v30
magnus:v29
magnus:v28
magnus:v27
magnus:v26
magnus:v24
magnus:v22
magnus:v21
magnus:v20
magnus:v19
magnus:v18
magnus:v17
magnus:v16
magnus:v15
magnus:v14
magnus:v13
magnus:v12
magnus:v11
magnus:v10
magnus:v9
magnus:v7
magnus:v6
magnus:v5
magnus:v4
magnus:v3
magnus:v2

No commits in common. "aa9376ac134711b9326611d0e90db647e028f10d" and "db21b01589562d7250386980b18195adf3ab6209" have entirely different histories.
aa9376ac13 ... db21b01589

13 changed files with 84 additions and 183 deletions
Show Stats Expand all files Collapse all files

21
main.go
View File

@ -26,7 +26,7 @@ import (
"time" "time"
) )
const VERSION = "v14" const VERSION = "v13"
var ( var (
logger *slog.Logger logger *slog.Logger
@ -443,25 +443,8 @@ func pageProblems(w http.ResponseWriter, _ *http.Request, _ *session.T) { // {{{
return return
} }
var found bool
problemsGrouped := make(map[string]map[string][]Problem)
for _, problem := range problems {
if _, found = problemsGrouped[problem.AreaName]; !found {
problemsGrouped[problem.AreaName] = make(map[string][]Problem)
}
if _, found = problemsGrouped[problem.AreaName][problem.SectionName]; !found {
problemsGrouped[problem.AreaName][problem.SectionName] = []Problem{}
}
problemsGrouped[problem.AreaName][problem.SectionName] = append(
problemsGrouped[problem.AreaName][problem.SectionName],
problem,
)
}
page.Data = map[string]any{ page.Data = map[string]any{
"Problems": problems, "Problems": problems,
"ProblemsGrouped": problemsGrouped,
} }
page.Render(w) page.Render(w)
return return

10
static/css/datapoints.css
View File

@ -35,12 +35,12 @@ h2:first-child {
h1 { h1 {
font-size: 1.5em; font-size: 1.5em;
color: #fb4934; color: #fb4934;
font-weight: 800; font-weight: 500;
} }
h2 { h2 {
font-size: 1.25em; font-size: 1.25em;
color: #b8bb26; color: #b8bb26;
font-weight: 800; font-weight: 500;
} }
a { a {
color: #3f9da1; color: #3f9da1;
@ -50,7 +50,7 @@ a:hover {
text-decoration: underline; text-decoration: underline;
} }
b { b {
font-weight: 800; font-weight: 500;
} }
input[type="text"], input[type="text"],
textarea, textarea,
@ -80,7 +80,7 @@ button:focus {
} }
span.date { span.date {
color: #d5c4a1; color: #d5c4a1;
font-weight: 800; font-weight: 500;
} }
span.time { span.time {
font-size: 0.9em; font-size: 0.9em;
@ -119,7 +119,7 @@ label {
border-bottom: unset; border-bottom: unset;
} }
#datapoints .header { #datapoints .header {
font-weight: 800; font-weight: 500;
font-size: 0.85em; font-size: 0.85em;
color: #d5c4a1; color: #d5c4a1;
} }

8
static/css/index.css
View File

@ -35,12 +35,12 @@ h2:first-child {
h1 { h1 {
font-size: 1.5em; font-size: 1.5em;
color: #fb4934; color: #fb4934;
font-weight: 800; font-weight: 500;
} }
h2 { h2 {
font-size: 1.25em; font-size: 1.25em;
color: #b8bb26; color: #b8bb26;
font-weight: 800; font-weight: 500;
} }
a { a {
color: #3f9da1; color: #3f9da1;
@ -50,7 +50,7 @@ a:hover {
text-decoration: underline; text-decoration: underline;
} }
b { b {
font-weight: 800; font-weight: 500;
} }
input[type="text"], input[type="text"],
textarea, textarea,
@ -80,7 +80,7 @@ button:focus {
} }
span.date { span.date {
color: #d5c4a1; color: #d5c4a1;
font-weight: 800; font-weight: 500;
} }
span.time { span.time {
font-size: 0.9em; font-size: 0.9em;

16
static/css/main.css
View File

@ -35,12 +35,12 @@ h2:first-child {
h1 { h1 {
font-size: 1.5em; font-size: 1.5em;
color: #fb4934; color: #fb4934;
font-weight: 800; font-weight: 500;
} }
h2 { h2 {
font-size: 1.25em; font-size: 1.25em;
color: #b8bb26; color: #b8bb26;
font-weight: 800; font-weight: 500;
} }
a { a {
color: #3f9da1; color: #3f9da1;
@ -50,7 +50,7 @@ a:hover {
text-decoration: underline; text-decoration: underline;
} }
b { b {
font-weight: 800; font-weight: 500;
} }
input[type="text"], input[type="text"],
textarea, textarea,
@ -80,7 +80,7 @@ button:focus {
} }
span.date { span.date {
color: #d5c4a1; color: #d5c4a1;
font-weight: 800; font-weight: 500;
} }
span.time { span.time {
font-size: 0.9em; font-size: 0.9em;
@ -152,7 +152,7 @@ label {
margin-bottom: 32px; margin-bottom: 32px;
} }
#page .page-label div { #page .page-label div {
font-weight: 800; font-weight: 500;
font-size: 1.5em; font-size: 1.5em;
color: #fb4934; color: #fb4934;
} }
@ -172,7 +172,7 @@ label {
#areas .area > .name { #areas .area > .name {
background: #fb4934; background: #fb4934;
color: #fff; color: #fff;
font-weight: 800; font-weight: 500;
padding: 4px 16px; padding: 4px 16px;
border-top-left-radius: 4px; border-top-left-radius: 4px;
border-top-right-radius: 4px; border-top-right-radius: 4px;
@ -196,10 +196,10 @@ label {
white-space: nowrap; white-space: nowrap;
} }
#areas .area .section .create .new { #areas .area .section .create .new {
font-weight: 800; font-weight: 500;
} }
#areas .area .section > .name { #areas .area .section > .name {
font-weight: 800; font-weight: 500;
} }
#areas .area .section .triggers .trigger { #areas .area .section .triggers .trigger {
display: grid; display: grid;

35
static/css/problems.css
View File

@ -35,12 +35,12 @@ h2:first-child {
h1 { h1 {
font-size: 1.5em; font-size: 1.5em;
color: #fb4934; color: #fb4934;
font-weight: 800; font-weight: 500;
} }
h2 { h2 {
font-size: 1.25em; font-size: 1.25em;
color: #b8bb26; color: #b8bb26;
font-weight: 800; font-weight: 500;
} }
a { a {
color: #3f9da1; color: #3f9da1;
@ -50,7 +50,7 @@ a:hover {
text-decoration: underline; text-decoration: underline;
} }
b { b {
font-weight: 800; font-weight: 500;
} }
input[type="text"], input[type="text"],
textarea, textarea,
@ -80,7 +80,7 @@ button:focus {
} }
span.date { span.date {
color: #d5c4a1; color: #d5c4a1;
font-weight: 800; font-weight: 500;
} }
span.time { span.time {
font-size: 0.9em; font-size: 0.9em;
@ -116,12 +116,12 @@ label {
} }
#problems-list .header, #problems-list .header,
#acknowledged-list .header { #acknowledged-list .header {
font-weight: 800; font-weight: 500;
} }
#problems-list .trigger, #problems-list .trigger,
#acknowledged-list .trigger { #acknowledged-list .trigger {
color: #fb4934; color: #fb4934;
font-weight: 800; font-weight: 500;
} }
#problems-list .acknowledge img, #problems-list .acknowledge img,
#acknowledged-list .acknowledge img { #acknowledged-list .acknowledge img {
@ -130,26 +130,3 @@ label {
#acknowledged-list.hidden { #acknowledged-list.hidden {
display: none; display: none;
} }
#areas {
display: flex;
flex-wrap: wrap;
gap: 12px;
margin-top: 16px;
}
#areas .area .section {
display: grid;
grid-template-columns: repeat(2, min-content);
grid-gap: 8px 12px;
}
#areas .area .section .name {
color: #f7edd7;
grid-column: 1 / -1;
font-weight: bold !important;
line-height: 24px;
}
#areas .area .section div {
white-space: nowrap;
}
.hidden {
display: none;
}

8
static/css/theme.css
View File

@ -35,12 +35,12 @@ h2:first-child {
h1 { h1 {
font-size: 1.5em; font-size: 1.5em;
color: #fb4934; color: #fb4934;
font-weight: 800; font-weight: 500;
} }
h2 { h2 {
font-size: 1.25em; font-size: 1.25em;
color: #b8bb26; color: #b8bb26;
font-weight: 800; font-weight: 500;
} }
a { a {
color: #3f9da1; color: #3f9da1;
@ -50,7 +50,7 @@ a:hover {
text-decoration: underline; text-decoration: underline;
} }
b { b {
font-weight: 800; font-weight: 500;
} }
input[type="text"], input[type="text"],
textarea, textarea,
@ -80,7 +80,7 @@ button:focus {
} }
span.date { span.date {
color: #d5c4a1; color: #d5c4a1;
font-weight: 800; font-weight: 500;
} }
span.time { span.time {
font-size: 0.9em; font-size: 0.9em;

8
static/css/trigger_edit.css
View File

@ -35,12 +35,12 @@ h2:first-child {
h1 { h1 {
font-size: 1.5em; font-size: 1.5em;
color: #fb4934; color: #fb4934;
font-weight: 800; font-weight: 500;
} }
h2 { h2 {
font-size: 1.25em; font-size: 1.25em;
color: #b8bb26; color: #b8bb26;
font-weight: 800; font-weight: 500;
} }
a { a {
color: #3f9da1; color: #3f9da1;
@ -50,7 +50,7 @@ a:hover {
text-decoration: underline; text-decoration: underline;
} }
b { b {
font-weight: 800; font-weight: 500;
} }
input[type="text"], input[type="text"],
textarea, textarea,
@ -80,7 +80,7 @@ button:focus {
} }
span.date { span.date {
color: #d5c4a1; color: #d5c4a1;
font-weight: 800; font-weight: 500;
} }
span.time { span.time {
font-size: 0.9em; font-size: 0.9em;

9
static/js/problems.mjs
View File

@ -20,13 +20,4 @@ export class UI {
localStorage.setItem('show_acknowledged', false) localStorage.setItem('show_acknowledged', false)
} }
} }
displayList() {
document.querySelector('.display-list').classList.remove('hidden')
document.querySelector('.display-areas').classList.add('hidden')
}
displayAreas() {
document.querySelector('.display-list').classList.add('hidden')
document.querySelector('.display-areas').classList.remove('hidden')
}
} }

2
static/less/main.less
View File

@ -83,7 +83,7 @@
&>.name { &>.name {
background: @color1; background: @color1;
color: #fff; color: #fff;
font-weight: @bold; font-weight: 500;
padding: 4px 16px; padding: 4px 16px;
border-top-left-radius: 4px; border-top-left-radius: 4px;
border-top-right-radius: 4px; border-top-right-radius: 4px;

30
static/less/problems.less
View File

@ -30,33 +30,3 @@
#acknowledged-list.hidden{ #acknowledged-list.hidden{
display: none; display: none;
} }
#areas {
display: flex;
flex-wrap: wrap;
gap: 12px;
margin-top: 16px;
.area {
.section {
display: grid;
grid-template-columns: repeat(2, min-content);
grid-gap: 8px 12px;
.name {
color: @text2;
grid-column: 1 / -1;
font-weight: bold !important;
line-height: 24px;
}
div {
white-space: nowrap;
}
}
}
}
.hidden {
display: none;
}

2
static/less/theme.less
View File

@ -12,7 +12,7 @@
@color4: #3f9da1; @color4: #3f9da1;
@color5: #fe8019; @color5: #fe8019;
@bold: 800; @bold: 500;
.lighterOrDarker(@color, @amount) { .lighterOrDarker(@color, @amount) {
@result: lighten(@color, @amount); @result: lighten(@color, @amount);

2
views/pages/index.gotmpl
View File

@ -10,7 +10,7 @@
<h2>{{ .VERSION }}</h2> <h2>{{ .VERSION }}</h2>
<div class="graph"> <div class="graph">
<img src="/images/{{ .VERSION }}/graph.svg"> <img src="/images/{{ .VERSION }}/graph.svg">
</div> </div>
</div> </div>

112
views/pages/problems.gotmpl
View File

@ -9,88 +9,68 @@
{{ block "page_label" . }}{{end}} {{ block "page_label" . }}{{end}}
<div> <input type="checkbox" id="show-acked" onclick="_ui.toggleAcknowledged(event)"> <label for="show-acked">Show acknowledged</label>
<input type="radio" name="display" id="display-table" onclick="_ui.displayAreas()" checked> <label for="display-table">Areas</label>
<input type="radio" name="display" id="display-list" onclick="_ui.displayList()"> <label for="display-list">List</label>
</div>
<div class="display-list hidden"> <div id="problems-list">
<div id="problems-list"> <div style="grid-column: 1/-1; margin-top: 32px;"><h2>Current</h2></div>
<div style="grid-column: 1/-1; margin-top: 32px;"><h2>Current</h2></div>
<div class="header">Trigger</div> <div class="header">Trigger</div>
<div class="header">Area</div> <div class="header">Area</div>
<div class="header">Section</div> <div class="header">Section</div>
<div class="header">Since</div> <div class="header">Since</div>
{{ range .Data.Problems }} {{ range .Data.Problems }}
{{ if .Acknowledged }} {{ if .Acknowledged }}
{{ continue }} {{ continue }}
{{ end }}
<div class="line"></div>
{{ if eq .TriggerID -1 }}
<div class="trigger">{{ .TriggerName }}</div>
<div class="area">{{ .AreaName }}</div>
<div class="section">{{ .SectionName }}</div>
<div class="start"></div>
<div class="acknowledge"><img src="/images/{{ $version }}/acknowledge.svg"></div>
{{ else }}
<div class="trigger"><a href="/trigger/edit/{{ .TriggerID }}">{{ .TriggerName }}</a></div>
<div class="area">{{ .AreaName }}</div>
<div class="section">{{ .SectionName }}</div>
<div class="start">{{ format_time .Start }}</div>
<div class="acknowledge"><a href="/problem/acknowledge/{{ .ID }}"><img src="/images/{{ $version }}/acknowledge-filled.svg"></a></div>
{{ end }}
{{ end }} {{ end }}
</div> <div class="line"></div>
<input type="checkbox" id="show-acked" onclick="_ui.toggleAcknowledged(event)"> <label for="show-acked">Show acknowledged</label> {{ if eq .TriggerID -1 }}
<div class="trigger">{{ .TriggerName }}</div>
<div id="acknowledged-list" class="hidden"> <div class="area">{{ .AreaName }}</div>
<div style="grid-column: 1/-1; margin-top: 32px;"><h2>Acknowledged</h2></div> <div class="section">{{ .SectionName }}</div>
<div class="header">Trigger</div> <div class="start"></div>
<div class="header">Area</div> <div class="acknowledge"><img src="/images/{{ $version }}/acknowledge.svg"></div>
<div class="header">Section</div> {{ else }}
<div class="header">Since</div>
{{ range .Data.Problems }}
{{ if not .Acknowledged }}
{{ continue }}
{{ end }}
<div class="line"></div>
<div class="trigger"><a href="/trigger/edit/{{ .TriggerID }}">{{ .TriggerName }}</a></div> <div class="trigger"><a href="/trigger/edit/{{ .TriggerID }}">{{ .TriggerName }}</a></div>
<div class="area">{{ .AreaName }}</div> <div class="area">{{ .AreaName }}</div>
<div class="section">{{ .SectionName }}</div> <div class="section">{{ .SectionName }}</div>
<div class="start">{{ format_time .Start }}</div> <div class="start">{{ format_time .Start }}</div>
<div class="acknowledge"><a href="/problem/unacknowledge/{{ .ID }}"><img src="/images/{{ $version }}/acknowledge-outline.svg"></a></div> <div class="acknowledge"><a href="/problem/acknowledge/{{ .ID }}"><img src="/images/{{ $version }}/acknowledge-filled.svg"></a></div>
{{ end }} {{ end }}
</div> {{ end }}
</div> </div>
<div class="display-areas"> <div id="acknowledged-list" class="hidden">
<div id="areas"> <div style="grid-column: 1/-1; margin-top: 32px;"><h2>Acknowledged</h2></div>
{{ range $areaName, $sections := .Data.ProblemsGrouped }} <div class="header">Trigger</div>
<div class="area"> <div class="header">Area</div>
<div class="name">{{ $areaName }}</div> <div class="header">Section</div>
<div class="header">Since</div>
{{ range $sectionName, $problems := $sections }} {{ range .Data.Problems }}
<div class="section problems"> {{ if not .Acknowledged }}
<div class="name">{{ $sectionName }}</div> {{ continue }}
{{ end }}
<div class="line"></div>
<div class="trigger"><a href="/trigger/edit/{{ .TriggerID }}">{{ .TriggerName }}</a></div>
<div class="area">{{ .AreaName }}</div>
<div class="section">{{ .SectionName }}</div>
<div class="start">{{ format_time .Start }}</div>
<div class="acknowledge"><a href="/problem/unacknowledge/{{ .ID }}"><img src="/images/{{ $version }}/acknowledge-outline.svg"></a></div>
{{ end }}
</div>
{{ range $problems }} <div id="areas">
<div class="trigger">{{ .TriggerName }}</div> {{ range .Data.Areas }}
<div class="area">
{{ if eq (.Start | html) "0001-01-01 00:00:00 +0000 UTC" }} <div class="name">{{ .Name }}</div>
<div class="since"></div> {{ range .SortedSections }}
{{ else }} <div class="section">
<div class="since">{{ format_time .Start }}</div> <div class="name">{{ .Name }}</div>
{{ end }}
{{ end }}
</div>
{{ end }}
</div> </div>
{{ end }} {{ end }}
</div> </div>
{{ end }}
</div> </div>
{{ end }} {{ end }}