diff --git a/main.go b/main.go index 859e59f..1dcfe3f 100644 --- a/main.go +++ b/main.go @@ -26,7 +26,7 @@ import ( "time" ) -const VERSION = "v14" +const VERSION = "v13" var ( logger *slog.Logger @@ -443,25 +443,8 @@ func pageProblems(w http.ResponseWriter, _ *http.Request, _ *session.T) { // {{{ 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{ - "Problems": problems, - "ProblemsGrouped": problemsGrouped, + "Problems": problems, } page.Render(w) return diff --git a/static/css/datapoints.css b/static/css/datapoints.css index f882929..54d331a 100644 --- a/static/css/datapoints.css +++ b/static/css/datapoints.css @@ -35,12 +35,12 @@ h2:first-child { h1 { font-size: 1.5em; color: #fb4934; - font-weight: 800; + font-weight: 500; } h2 { font-size: 1.25em; color: #b8bb26; - font-weight: 800; + font-weight: 500; } a { color: #3f9da1; @@ -50,7 +50,7 @@ a:hover { text-decoration: underline; } b { - font-weight: 800; + font-weight: 500; } input[type="text"], textarea, @@ -80,7 +80,7 @@ button:focus { } span.date { color: #d5c4a1; - font-weight: 800; + font-weight: 500; } span.time { font-size: 0.9em; @@ -119,7 +119,7 @@ label { border-bottom: unset; } #datapoints .header { - font-weight: 800; + font-weight: 500; font-size: 0.85em; color: #d5c4a1; } diff --git a/static/css/index.css b/static/css/index.css index 97b1882..1cb2413 100644 --- a/static/css/index.css +++ b/static/css/index.css @@ -35,12 +35,12 @@ h2:first-child { h1 { font-size: 1.5em; color: #fb4934; - font-weight: 800; + font-weight: 500; } h2 { font-size: 1.25em; color: #b8bb26; - font-weight: 800; + font-weight: 500; } a { color: #3f9da1; @@ -50,7 +50,7 @@ a:hover { text-decoration: underline; } b { - font-weight: 800; + font-weight: 500; } input[type="text"], textarea, @@ -80,7 +80,7 @@ button:focus { } span.date { color: #d5c4a1; - font-weight: 800; + font-weight: 500; } span.time { font-size: 0.9em; diff --git a/static/css/main.css b/static/css/main.css index eda60f3..67e2da9 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -35,12 +35,12 @@ h2:first-child { h1 { font-size: 1.5em; color: #fb4934; - font-weight: 800; + font-weight: 500; } h2 { font-size: 1.25em; color: #b8bb26; - font-weight: 800; + font-weight: 500; } a { color: #3f9da1; @@ -50,7 +50,7 @@ a:hover { text-decoration: underline; } b { - font-weight: 800; + font-weight: 500; } input[type="text"], textarea, @@ -80,7 +80,7 @@ button:focus { } span.date { color: #d5c4a1; - font-weight: 800; + font-weight: 500; } span.time { font-size: 0.9em; @@ -152,7 +152,7 @@ label { margin-bottom: 32px; } #page .page-label div { - font-weight: 800; + font-weight: 500; font-size: 1.5em; color: #fb4934; } @@ -172,7 +172,7 @@ label { #areas .area > .name { background: #fb4934; color: #fff; - font-weight: 800; + font-weight: 500; padding: 4px 16px; border-top-left-radius: 4px; border-top-right-radius: 4px; @@ -196,10 +196,10 @@ label { white-space: nowrap; } #areas .area .section .create .new { - font-weight: 800; + font-weight: 500; } #areas .area .section > .name { - font-weight: 800; + font-weight: 500; } #areas .area .section .triggers .trigger { display: grid; diff --git a/static/css/problems.css b/static/css/problems.css index afbf302..820b6e0 100644 --- a/static/css/problems.css +++ b/static/css/problems.css @@ -35,12 +35,12 @@ h2:first-child { h1 { font-size: 1.5em; color: #fb4934; - font-weight: 800; + font-weight: 500; } h2 { font-size: 1.25em; color: #b8bb26; - font-weight: 800; + font-weight: 500; } a { color: #3f9da1; @@ -50,7 +50,7 @@ a:hover { text-decoration: underline; } b { - font-weight: 800; + font-weight: 500; } input[type="text"], textarea, @@ -80,7 +80,7 @@ button:focus { } span.date { color: #d5c4a1; - font-weight: 800; + font-weight: 500; } span.time { font-size: 0.9em; @@ -116,12 +116,12 @@ label { } #problems-list .header, #acknowledged-list .header { - font-weight: 800; + font-weight: 500; } #problems-list .trigger, #acknowledged-list .trigger { color: #fb4934; - font-weight: 800; + font-weight: 500; } #problems-list .acknowledge img, #acknowledged-list .acknowledge img { @@ -130,26 +130,3 @@ label { #acknowledged-list.hidden { 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; -} diff --git a/static/css/theme.css b/static/css/theme.css index 98f3fa0..215acbb 100644 --- a/static/css/theme.css +++ b/static/css/theme.css @@ -35,12 +35,12 @@ h2:first-child { h1 { font-size: 1.5em; color: #fb4934; - font-weight: 800; + font-weight: 500; } h2 { font-size: 1.25em; color: #b8bb26; - font-weight: 800; + font-weight: 500; } a { color: #3f9da1; @@ -50,7 +50,7 @@ a:hover { text-decoration: underline; } b { - font-weight: 800; + font-weight: 500; } input[type="text"], textarea, @@ -80,7 +80,7 @@ button:focus { } span.date { color: #d5c4a1; - font-weight: 800; + font-weight: 500; } span.time { font-size: 0.9em; diff --git a/static/css/trigger_edit.css b/static/css/trigger_edit.css index 070964d..71cbb6a 100644 --- a/static/css/trigger_edit.css +++ b/static/css/trigger_edit.css @@ -35,12 +35,12 @@ h2:first-child { h1 { font-size: 1.5em; color: #fb4934; - font-weight: 800; + font-weight: 500; } h2 { font-size: 1.25em; color: #b8bb26; - font-weight: 800; + font-weight: 500; } a { color: #3f9da1; @@ -50,7 +50,7 @@ a:hover { text-decoration: underline; } b { - font-weight: 800; + font-weight: 500; } input[type="text"], textarea, @@ -80,7 +80,7 @@ button:focus { } span.date { color: #d5c4a1; - font-weight: 800; + font-weight: 500; } span.time { font-size: 0.9em; diff --git a/static/js/problems.mjs b/static/js/problems.mjs index e3e2587..54c4e3c 100644 --- a/static/js/problems.mjs +++ b/static/js/problems.mjs @@ -20,13 +20,4 @@ export class UI { 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') - } } diff --git a/static/less/main.less b/static/less/main.less index 0f061e2..bd42096 100644 --- a/static/less/main.less +++ b/static/less/main.less @@ -83,7 +83,7 @@ &>.name { background: @color1; color: #fff; - font-weight: @bold; + font-weight: 500; padding: 4px 16px; border-top-left-radius: 4px; border-top-right-radius: 4px; diff --git a/static/less/problems.less b/static/less/problems.less index a6b6551..c0dc6d9 100644 --- a/static/less/problems.less +++ b/static/less/problems.less @@ -30,33 +30,3 @@ #acknowledged-list.hidden{ 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; -} diff --git a/static/less/theme.less b/static/less/theme.less index 9a27b23..93872ea 100644 --- a/static/less/theme.less +++ b/static/less/theme.less @@ -12,7 +12,7 @@ @color4: #3f9da1; @color5: #fe8019; -@bold: 800; +@bold: 500; .lighterOrDarker(@color, @amount) { @result: lighten(@color, @amount); diff --git a/views/pages/index.gotmpl b/views/pages/index.gotmpl index 718cc72..413e8b8 100644 --- a/views/pages/index.gotmpl +++ b/views/pages/index.gotmpl @@ -10,7 +10,7 @@