From 420e049415c8ec7f7a209a03110eecbe0c83e9e0 Mon Sep 17 00:00:00 2001 From: Alexander Neonxp Kiryukhin Date: Mon, 7 Oct 2024 01:06:55 +0300 Subject: Мелкие правки MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/handler/admin.go | 18 +++++++++++++++++ pkg/tpl/add.templ | 21 ++----------------- pkg/tpl/add_templ.go | 19 +++-------------- pkg/tpl/quote.templ | 17 ++++++++++++---- pkg/tpl/quote_templ.go | 55 +++++++++++++++++++++++++++++++++++--------------- 5 files changed, 75 insertions(+), 55 deletions(-) (limited to 'pkg') diff --git a/pkg/handler/admin.go b/pkg/handler/admin.go index 8531011..75fb650 100644 --- a/pkg/handler/admin.go +++ b/pkg/handler/admin.go @@ -55,3 +55,21 @@ func (h *Handler) AdminAction(c echo.Context) error { return c.Redirect(http.StatusFound, "/admin/") } + +func (h *Handler) AdminExport(c echo.Context) error { + quotes := []model.Quote{} + err := h.DB.NewSelect(). + Model((*model.Quote)(nil)). + Order("id ASC"). + Scan(c.Request().Context(), "es) + if err != nil { + return err + } + + quotesString := make([]string, 0, len(quotes)) + for _, q := range quotes { + quotesString = append(quotesString, q.Quote) + } + + return c.JSON(http.StatusOK, quotesString) +} diff --git a/pkg/tpl/add.templ b/pkg/tpl/add.templ index 0611d1b..14b57eb 100644 --- a/pkg/tpl/add.templ +++ b/pkg/tpl/add.templ @@ -14,27 +14,10 @@ templ AddQuotePage(form *AddQuoteForm, err string) {
-
- - - Прослушать - -
+ +
- } } diff --git a/pkg/tpl/add_templ.go b/pkg/tpl/add_templ.go index 04fb615..d47582b 100644 --- a/pkg/tpl/add_templ.go +++ b/pkg/tpl/add_templ.go @@ -92,33 +92,20 @@ func AddQuotePage(form *AddQuoteForm, err string) 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/quote.templ b/pkg/tpl/quote.templ index 58c0d4f..34429d1 100644 --- a/pkg/tpl/quote.templ +++ b/pkg/tpl/quote.templ @@ -8,13 +8,22 @@ import ( templ Quote(quote *model.Quote) {
-
#{ strconv.Itoa(int(quote.ID)) }
+
+ #{ strconv.Itoa(int(quote.ID)) } + { quote.CreatedAt.Format("02.01.06") } +
@templ.Raw(quote.Text())
- Поделиться:  -   -   + +  ·  +  ·  + + + if quote.Archive { + Архив + } +
} diff --git a/pkg/tpl/quote_templ.go b/pkg/tpl/quote_templ.go index 3aa96a1..fa139cd 100644 --- a/pkg/tpl/quote_templ.go +++ b/pkg/tpl/quote_templ.go @@ -51,48 +51,71 @@ func Quote(quote *model.Quote) templ.Component { var templ_7745c5c3_Var3 string templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(int(quote.ID))) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/tpl/quote.templ`, Line: 11, Col: 98} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/tpl/quote.templ`, Line: 12, Col: 91} } _, 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("") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templ.Raw(quote.Text()).Render(ctx, templ_7745c5c3_Buffer) + var templ_7745c5c3_Var4 string + templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(quote.CreatedAt.Format("02.01.06")) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `pkg/tpl/quote.templ`, Line: 13, Col: 92} + } + _, 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("\"> ·  ") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + if quote.Archive { + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("Архив") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -116,12 +139,12 @@ func QuotePage(quote *model.Quote) templ.Component { }() } ctx = templ.InitializeContext(ctx) - templ_7745c5c3_Var7 := templ.GetChildren(ctx) - if templ_7745c5c3_Var7 == nil { - templ_7745c5c3_Var7 = templ.NopComponent + templ_7745c5c3_Var8 := templ.GetChildren(ctx) + if templ_7745c5c3_Var8 == nil { + templ_7745c5c3_Var8 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - templ_7745c5c3_Var8 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { + templ_7745c5c3_Var9 := templruntime.GeneratedTemplate(func(templ_7745c5c3_Input templruntime.GeneratedComponentInput) (templ_7745c5c3_Err error) { templ_7745c5c3_W, ctx := templ_7745c5c3_Input.Writer, templ_7745c5c3_Input.Context templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templruntime.GetBuffer(templ_7745c5c3_W) if !templ_7745c5c3_IsBuffer { @@ -143,7 +166,7 @@ func QuotePage(quote *model.Quote) templ.Component { Title: "Цитата #" + strconv.Itoa(int(quote.ID)), URL: fmt.Sprintf("https://sh.org.ru/quote/%d", quote.ID), Description: templ.EscapeString(quote.Quote), - }).Render(templ.WithChildren(ctx, templ_7745c5c3_Var8), templ_7745c5c3_Buffer) + }).Render(templ.WithChildren(ctx, templ_7745c5c3_Var9), templ_7745c5c3_Buffer) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } -- cgit v1.2.3