From 4e715ab1e1053698c3eb02c13cc726ce9bd26667 Mon Sep 17 00:00:00 2001 From: Steven Le Rouzic Date: Tue, 16 Apr 2024 22:48:07 +0200 Subject: DB migration & timer token --- view/login.templ | 2 +- view/login_templ.go | 4 ++-- view/timers_list.templ | 8 ++++---- view/timers_list_templ.go | 16 ++++++++++------ 4 files changed, 17 insertions(+), 13 deletions(-) (limited to 'view') diff --git a/view/login.templ b/view/login.templ index f8ea6e3..3450e01 100644 --- a/view/login.templ +++ b/view/login.templ @@ -13,7 +13,7 @@ templ LoginFormError(currentUser *model.User, err string) { if err != "" { - { err } + { err } }

diff --git a/view/login_templ.go b/view/login_templ.go index db3d53e..0a5c79b 100644 --- a/view/login_templ.go +++ b/view/login_templ.go @@ -37,14 +37,14 @@ func LoginFormError(currentUser *model.User, err string) templ.Component { return templ_7745c5c3_Err } if err != "" { - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } var templ_7745c5c3_Var2 string templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(err) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `view\login.templ`, Line: 16, Col: 50} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `view\login.templ`, Line: 16, Col: 45} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2)) if templ_7745c5c3_Err != nil { diff --git a/view/timers_list.templ b/view/timers_list.templ index c68979c..3deb7e3 100644 --- a/view/timers_list.templ +++ b/view/timers_list.templ @@ -37,11 +37,11 @@ templ TimerCreateForm(timerName string, err string) { templ TimersList(timers []model.Timer, isSignedIn bool) {
-

Timers

- for _, t := range timers { - @timer(t) - } if isSignedIn { +

Timers

+ for _, t := range timers { + @timer(t) + }

Create timer

@TimerCreateForm("", "") } diff --git a/view/timers_list_templ.go b/view/timers_list_templ.go index 007febe..60ce8ac 100644 --- a/view/timers_list_templ.go +++ b/view/timers_list_templ.go @@ -147,18 +147,22 @@ func TimersList(timers []model.Timer, isSignedIn bool) templ.Component { templ_7745c5c3_Var8 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("

Timers

") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - for _, t := range timers { - templ_7745c5c3_Err = timer(t).Render(ctx, templ_7745c5c3_Buffer) + if isSignedIn { + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("

Timers

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - } - if isSignedIn { - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("

Create timer

") + for _, t := range timers { + templ_7745c5c3_Err = timer(t).Render(ctx, templ_7745c5c3_Buffer) + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("

Create timer

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } -- cgit