From c3b66fc95102b36bf21eacdc960183216683c270 Mon Sep 17 00:00:00 2001 From: Steven Le Rouzic Date: Sat, 13 Apr 2024 23:48:00 +0200 Subject: Show timer, set time on create --- view/main.templ | 1 + view/main_templ.go | 2 +- view/timer.templ | 18 ++++++++++++++-- view/timer_templ.go | 53 ++++++++++++++++++++++++++++++++++++++++------- view/timers_list.templ | 2 ++ view/timers_list_templ.go | 4 ++-- 6 files changed, 68 insertions(+), 12 deletions(-) (limited to 'view') diff --git a/view/main.templ b/view/main.templ index b6d94d8..64a365c 100644 --- a/view/main.templ +++ b/view/main.templ @@ -6,6 +6,7 @@ templ Main(contents templ.Component) { Cool timer app + diff --git a/view/main_templ.go b/view/main_templ.go index 109be9c..5b3831d 100644 --- a/view/main_templ.go +++ b/view/main_templ.go @@ -23,7 +23,7 @@ func Main(contents templ.Component) templ.Component { templ_7745c5c3_Var1 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("Cool timer app") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("Cool timer app") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/view/timer.templ b/view/timer.templ index fa258eb..8d20933 100644 --- a/view/timer.templ +++ b/view/timer.templ @@ -7,6 +7,20 @@ import ( templ TimerView(timer model.Timer) {

This is timer { timer.Name }

Back to list

Start time: { timer.StartTime.String() }

End time: { timer.EndTime.String() }

Start time: { timer.StartTime.AsUTCString() }

End time: { timer.EndTime.AsUTCString() }

+ Total time: + +

+ Remaining time: + +

} + diff --git a/view/timer_templ.go b/view/timer_templ.go index 7fee7d3..55e5346 100644 --- a/view/timer_templ.go +++ b/view/timer_templ.go @@ -40,33 +40,72 @@ func TimerView(timer model.Timer) templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("

Back to list

Start time: ") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("

Back to list

Start time: ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } var templ_7745c5c3_Var3 string - templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(timer.StartTime.String()) + templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(timer.StartTime.AsUTCString()) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `view\timer.templ`, Line: 10, Col: 45} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `view\timer.templ`, Line: 10, Col: 62} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("

End time: ") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("

End time: ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } var templ_7745c5c3_Var4 string - templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(timer.EndTime.String()) + templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(timer.EndTime.AsUTCString()) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `view\timer.templ`, Line: 11, Col: 41} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `view\timer.templ`, Line: 11, Col: 58} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("

") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("

Total time:\r

Remaining time:\r

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/view/timers_list.templ b/view/timers_list.templ index 2d71a52..92d7013 100644 --- a/view/timers_list.templ +++ b/view/timers_list.templ @@ -25,6 +25,8 @@ templ TimerCreateForm(timerName string, err string) { >

+ +

if err != "" { diff --git a/view/timers_list_templ.go b/view/timers_list_templ.go index af4922d..955ab9a 100644 --- a/view/timers_list_templ.go +++ b/view/timers_list_templ.go @@ -100,7 +100,7 @@ func TimerCreateForm(timerName string, err string) templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" placeholder=\"Name\">

") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" placeholder=\"Name\">

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -112,7 +112,7 @@ func TimerCreateForm(timerName string, err string) templ.Component { var templ_7745c5c3_Var7 string templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(err) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `view\timers_list.templ`, Line: 31, Col: 34} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `view\timers_list.templ`, Line: 33, Col: 34} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7)) if templ_7745c5c3_Err != nil { -- cgit