From 474e1f541d85c952738e9ed511ec1e926bd10e1d Mon Sep 17 00:00:00 2001 From: Sean Aery Date: Mon, 5 May 2025 16:28:57 -0400 Subject: [PATCH 1/2] Essentially skip the success page altogether by removing the 250ms timeout. Just take the user to their desired page as soon as they pass challenge. --- web/js/main.mjs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web/js/main.mjs b/web/js/main.mjs index c50ed2bc9..c6ef3443d 100644 --- a/web/js/main.mjs +++ b/web/js/main.mjs @@ -247,7 +247,10 @@ function showContinueBar(hash, nonce, t0, t1) { elapsedTime: t1 - t0 }), ); - }, 250); + // DUL CUSTOMIZATION: we set this timeout to 0 to avoid displaying a + // "success" screen altogether. For debugging, it may be useful to + // set this to e.g., 10000 to see the success screen for 10 sec. + }, 0); } } catch (err) { From 7a8a2ed671b15cd6b09d96bf93d8a83387833908 Mon Sep 17 00:00:00 2001 From: Sean Aery Date: Mon, 5 May 2025 16:32:14 -0400 Subject: [PATCH 2/2] Add DUL colors & fonts, and a basic blue masthead. Hide the extraneous text. Advances DOK-174. - retains the default mascot images and attribution lines in the footer - note this is done in a way that accounts for light-mode & dark-mode browsers - takes an approach to modify as little as possible to try to ease future updates --- web/index.templ | 86 ++++++++++++++++++++++++++++++++++++++++++++++ web/index_templ.go | 24 ++++++------- 2 files changed, 98 insertions(+), 12 deletions(-) diff --git a/web/index.templ b/web/index.templ index 872c8b160..9e87828cb 100644 --- a/web/index.templ +++ b/web/index.templ @@ -16,6 +16,7 @@ templ base(title string, body templ.Component, challenge any, ogTags map[string] for key, value := range ogTags { } + + + + + + + + + + + + @templ.JSONScript("anubis_version", anubis.Version) if challenge != nil { @templ.JSONScript("anubis_challenge", challenge) @@ -62,6 +143,10 @@ templ base(title string, body templ.Component, challenge any, ogTags map[string] @templ.JSONScript("anubis_base_prefix", anubis.BasePrefix) + +
+ +

{ title }

@@ -76,6 +161,7 @@ templ base(title string, body templ.Component, challenge any, ogTags map[string]

Mascot design by CELPHASE.

+
diff --git a/web/index_templ.go b/web/index_templ.go index 35638b309..16da2614b 100644 --- a/web/index_templ.go +++ b/web/index_templ.go @@ -96,7 +96,7 @@ func base(title string, body templ.Component, challenge any, ogTags map[string]s return templ_7745c5c3_Err } } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 7, "") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -114,14 +114,14 @@ func base(title string, body templ.Component, challenge any, ogTags map[string]s if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "

") + templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 8, "

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } var templ_7745c5c3_Var6 string templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(title) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 67, Col: 49} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 152, Col: 49} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6)) if templ_7745c5c3_Err != nil { @@ -171,7 +171,7 @@ func index() templ.Component { var templ_7745c5c3_Var8 string templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(anubis.BasePrefix + "/.within.website/x/cmd/anubis/static/img/pensive.webp?cacheBuster=" + anubis.Version) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 87, Col: 165} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 173, Col: 165} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8)) if templ_7745c5c3_Err != nil { @@ -184,7 +184,7 @@ func index() templ.Component { var templ_7745c5c3_Var9 string templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(anubis.BasePrefix + "/.within.website/x/cmd/anubis/static/img/happy.webp?cacheBuster=" + anubis.Version) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 88, Col: 174} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 174, Col: 174} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9)) if templ_7745c5c3_Err != nil { @@ -197,7 +197,7 @@ func index() templ.Component { var templ_7745c5c3_Var10 string templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(anubis.BasePrefix + "/.within.website/x/cmd/anubis/static/js/main.mjs?cacheBuster=" + anubis.Version) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 90, Col: 136} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 176, Col: 136} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10)) if templ_7745c5c3_Err != nil { @@ -239,7 +239,7 @@ func errorPage(message string, mail string) templ.Component { var templ_7745c5c3_Var12 string templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(anubis.BasePrefix + "/.within.website/x/cmd/anubis/static/img/reject.webp?cacheBuster=" + anubis.Version) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 140, Col: 181} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 226, Col: 181} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12)) if templ_7745c5c3_Err != nil { @@ -252,7 +252,7 @@ func errorPage(message string, mail string) templ.Component { var templ_7745c5c3_Var13 string templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(message) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 141, Col: 14} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 227, Col: 14} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13)) if templ_7745c5c3_Err != nil { @@ -279,7 +279,7 @@ func errorPage(message string, mail string) templ.Component { var templ_7745c5c3_Var15 string templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(mail) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 147, Col: 11} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 233, Col: 11} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15)) if templ_7745c5c3_Err != nil { @@ -332,7 +332,7 @@ func StaticHappy() templ.Component { templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs("/.within.website/x/cmd/anubis/static/img/happy.webp?cacheBuster=" + anubis.Version) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 162, Col: 18} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 248, Col: 18} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17)) if templ_7745c5c3_Err != nil { @@ -374,7 +374,7 @@ func bench() templ.Component { var templ_7745c5c3_Var19 string templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs(anubis.BasePrefix + "/.within.website/x/cmd/anubis/static/img/pensive.webp?cacheBuster=" + anubis.Version) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 191, Col: 166} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 277, Col: 166} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var19)) if templ_7745c5c3_Err != nil { @@ -387,7 +387,7 @@ func bench() templ.Component { var templ_7745c5c3_Var20 string templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.JoinStringErrs(anubis.BasePrefix + "/.within.website/x/cmd/anubis/static/js/bench.mjs?cacheBuster=" + anubis.Version) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 193, Col: 138} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `index.templ`, Line: 279, Col: 138} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var20)) if templ_7745c5c3_Err != nil {