From a20e2ace25c363658d59346358339011fe8ef934 Mon Sep 17 00:00:00 2001 From: Alexander Neonxp Kiryukhin Date: Tue, 8 Oct 2024 18:48:55 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D1=81=D1=82=D0=B8?= =?UTF-8?q?=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/tpl/layout.templ | 20 +++++++++----------- pkg/tpl/layout_templ.go | 2 +- pkg/tpl/list.templ | 6 +++--- pkg/tpl/list_templ.go | 8 ++++---- pkg/tpl/random.templ | 3 +-- pkg/tpl/random_templ.go | 2 +- static/css/style.css | 11 +++++++++++ 7 files changed, 30 insertions(+), 22 deletions(-) diff --git a/pkg/tpl/layout.templ b/pkg/tpl/layout.templ index d96aa50..40c1b04 100644 --- a/pkg/tpl/layout.templ +++ b/pkg/tpl/layout.templ @@ -21,18 +21,16 @@ templ Layout(params HeaderParams) {
- + Главная + Рандом + Топ + Добавить + + { children... }
diff --git a/pkg/tpl/layout_templ.go b/pkg/tpl/layout_templ.go index 10b0bfc..b394b79 100644 --- a/pkg/tpl/layout_templ.go +++ b/pkg/tpl/layout_templ.go @@ -68,7 +68,7 @@ func Layout(params HeaderParams) templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">ШОргРу
") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">ШОргРу
ШОргРу
Загрузка... Главная Рандом Топ Добавить
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/pkg/tpl/list.templ b/pkg/tpl/list.templ index 014a2db..daf7ad8 100644 --- a/pkg/tpl/list.templ +++ b/pkg/tpl/list.templ @@ -22,7 +22,7 @@ templ List(quotes []model.Quote, page, count int) { diff --git a/pkg/tpl/list_templ.go b/pkg/tpl/list_templ.go index 2ed9497..7cb3705 100644 --- a/pkg/tpl/list_templ.go +++ b/pkg/tpl/list_templ.go @@ -65,7 +65,7 @@ func List(quotes []model.Quote, page, count int) templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var3 templ.SafeURL = templ.URL(fmt.Sprintf("/?page=%d", page-1)) + var templ_7745c5c3_Var3 templ.SafeURL = templ.URL(fmt.Sprintf("?page=%d", page-1)) _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(string(templ_7745c5c3_Var3))) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err @@ -104,7 +104,7 @@ func List(quotes []model.Quote, page, count int) templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var5 templ.SafeURL = templ.URL(fmt.Sprintf("/?page=%s", p)) + var templ_7745c5c3_Var5 templ.SafeURL = templ.URL(fmt.Sprintf("?page=%s", p)) _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(string(templ_7745c5c3_Var5))) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err @@ -116,7 +116,7 @@ func List(quotes []model.Quote, page, count int) templ.Component { var templ_7745c5c3_Var6 string templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(p) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/tpl/list.templ`, Line: 33, Col: 64} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/tpl/list.templ`, Line: 33, Col: 63} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6)) if templ_7745c5c3_Err != nil { @@ -133,7 +133,7 @@ func List(quotes []model.Quote, page, count int) templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var7 templ.SafeURL = templ.URL(fmt.Sprintf("/?page=%d", page+1)) + var templ_7745c5c3_Var7 templ.SafeURL = templ.URL(fmt.Sprintf("?page=%d", page+1)) _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(string(templ_7745c5c3_Var7))) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err diff --git a/pkg/tpl/random.templ b/pkg/tpl/random.templ index 2d25a03..d0dd7a0 100644 --- a/pkg/tpl/random.templ +++ b/pkg/tpl/random.templ @@ -22,12 +22,11 @@ templ Random(quotes []model.Quote) { hx-get="/random" hx-swap="outerHTML" hx-select="#random" - hx-target="#random" hx-indicator="#loader" > Загрузить ещё... - Загрузка... + Загрузка... } } diff --git a/pkg/tpl/random_templ.go b/pkg/tpl/random_templ.go index 803bf22..2f4ccc8 100644 --- a/pkg/tpl/random_templ.go +++ b/pkg/tpl/random_templ.go @@ -58,7 +58,7 @@ func Random(quotes []model.Quote) templ.Component { return templ_7745c5c3_Err } } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("Загрузить ещё... Загрузка...") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("Загрузить ещё...Загрузка...") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/static/css/style.css b/static/css/style.css index db74cac..3380fa9 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -22,4 +22,15 @@ article footer { } .htmx-request.htmx-indicator{ opacity:1; +} + +.header { + display: flex; + flex-direction: row; + justify-content: space-between; + margin-bottom: var(--pico-block-spacing-vertical); +} + +.top-menu { + text-align: end; } \ No newline at end of file