From bd4a14b38bb64a83617a7a58c34a2320036a540f Mon Sep 17 00:00:00 2001 From: Maxim Lebedev Date: Sun, 19 Nov 2023 19:02:25 +0600 Subject: [PATCH] :art: Format of the code --- internal/cmd/home/home.go | 4 ++-- internal/templateutil/templateutil.go | 4 ++-- internal/theme/usecase/theme_ucase.go | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/internal/cmd/home/home.go b/internal/cmd/home/home.go index f3c93ce..d98c446 100644 --- a/internal/cmd/home/home.go +++ b/internal/cmd/home/home.go @@ -165,7 +165,7 @@ func NewApp(logger *log.Logger, config *domain.Config) (*App, error) { w.Header().Set(common.HeaderContentLanguage, strings.Join(contentLanguage, ", ")) - pageTemplate, err := themer.Do(r.Context(), s, p) + template, err := themer.Do(r.Context(), s, p) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) @@ -173,7 +173,7 @@ func NewApp(logger *log.Logger, config *domain.Config) (*App, error) { } w.Header().Set(common.HeaderContentType, common.MIMETextHTMLCharsetUTF8) - if err = pageTemplate(w); err != nil { + if err = template(w); err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) } }) diff --git a/internal/templateutil/templateutil.go b/internal/templateutil/templateutil.go index 3929786..e3e3745 100644 --- a/internal/templateutil/templateutil.go +++ b/internal/templateutil/templateutil.go @@ -71,9 +71,9 @@ func New(partialsDir fs.FS, site *domain.Site) template.FuncMap { Name: "collections", Handler: func(v ...any) any { return collectionsNamespace }, Methods: template.FuncMap{ - "slice": collectionsNamespace.Slice, - "seq": collectionsNamespace.Seq, "index": collectionsNamespace.Index, + "seq": collectionsNamespace.Seq, + "slice": collectionsNamespace.Slice, }, }) diff --git a/internal/theme/usecase/theme_ucase.go b/internal/theme/usecase/theme_ucase.go index a89ede4..66f0f12 100644 --- a/internal/theme/usecase/theme_ucase.go +++ b/internal/theme/usecase/theme_ucase.go @@ -12,19 +12,19 @@ import ( ) type themeUseCase struct { - dir fs.FS - themes theme.Repository + partials fs.FS + themes theme.Repository } -func NewThemeUseCase(dir fs.FS, themes theme.Repository) theme.UseCase { +func NewThemeUseCase(partials fs.FS, themes theme.Repository) theme.UseCase { return &themeUseCase{ - dir: dir, - themes: themes, + partials: partials, + themes: themes, } } func (ucase *themeUseCase) Do(ctx context.Context, site *domain.Site, page *domain.Page) (theme.Writer, error) { - out, err := ucase.themes.Get(ctx, templateutil.New(ucase.dir, site)) + out, err := ucase.themes.Get(ctx, templateutil.New(ucase.partials, site)) if err != nil { return nil, fmt.Errorf("cannot find theme: %w", err) }