🎨 Format home module due recent changes
This commit is contained in:
parent
542348f635
commit
16491e58aa
|
@ -18,10 +18,10 @@ import (
|
||||||
|
|
||||||
"source.toby3d.me/toby3d/home/internal/common"
|
"source.toby3d.me/toby3d/home/internal/common"
|
||||||
"source.toby3d.me/toby3d/home/internal/domain"
|
"source.toby3d.me/toby3d/home/internal/domain"
|
||||||
|
"source.toby3d.me/toby3d/home/internal/entry"
|
||||||
|
pagefsrepo "source.toby3d.me/toby3d/home/internal/entry/repository/fs"
|
||||||
|
pageucase "source.toby3d.me/toby3d/home/internal/entry/usecase"
|
||||||
"source.toby3d.me/toby3d/home/internal/middleware"
|
"source.toby3d.me/toby3d/home/internal/middleware"
|
||||||
"source.toby3d.me/toby3d/home/internal/page"
|
|
||||||
pagefsrepo "source.toby3d.me/toby3d/home/internal/page/repository/fs"
|
|
||||||
pageucase "source.toby3d.me/toby3d/home/internal/page/usecase"
|
|
||||||
resourcefsrepo "source.toby3d.me/toby3d/home/internal/resource/repository/fs"
|
resourcefsrepo "source.toby3d.me/toby3d/home/internal/resource/repository/fs"
|
||||||
resourceucase "source.toby3d.me/toby3d/home/internal/resource/usecase"
|
resourceucase "source.toby3d.me/toby3d/home/internal/resource/usecase"
|
||||||
servercase "source.toby3d.me/toby3d/home/internal/server/usecase"
|
servercase "source.toby3d.me/toby3d/home/internal/server/usecase"
|
||||||
|
@ -40,11 +40,11 @@ type App struct {
|
||||||
|
|
||||||
func NewApp(logger *log.Logger, config *domain.Config) (*App, error) {
|
func NewApp(logger *log.Logger, config *domain.Config) (*App, error) {
|
||||||
themeDir := os.DirFS(config.ThemeDir)
|
themeDir := os.DirFS(config.ThemeDir)
|
||||||
|
|
||||||
partialsDir, err := fs.Sub(themeDir, "partials")
|
partialsDir, err := fs.Sub(themeDir, "partials")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("cannot substitute into partials subdirectory: %w", err)
|
return nil, fmt.Errorf("cannot substitute into partials subdirectory: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
contentDir := os.DirFS(config.ContentDir)
|
contentDir := os.DirFS(config.ContentDir)
|
||||||
resources := resourcefsrepo.NewFileServerResourceRepository(contentDir)
|
resources := resourcefsrepo.NewFileServerResourceRepository(contentDir)
|
||||||
sites := sitefsrepo.NewFileSystemSiteRepository(contentDir)
|
sites := sitefsrepo.NewFileSystemSiteRepository(contentDir)
|
||||||
|
@ -55,8 +55,8 @@ func NewApp(logger *log.Logger, config *domain.Config) (*App, error) {
|
||||||
resourcer := resourceucase.NewResourceUseCase(resources)
|
resourcer := resourceucase.NewResourceUseCase(resources)
|
||||||
themes := themefsrepo.NewFileSystemThemeRepository(themeDir)
|
themes := themefsrepo.NewFileSystemThemeRepository(themeDir)
|
||||||
themer := themeucase.NewThemeUseCase(partialsDir, themes)
|
themer := themeucase.NewThemeUseCase(partialsDir, themes)
|
||||||
pages := pagefsrepo.NewFileSystemPageRepository(contentDir)
|
entries := pagefsrepo.NewFileSystemPageRepository(contentDir)
|
||||||
pager := pageucase.NewPageUseCase(pages, resources)
|
entrier := pageucase.NewEntryUseCase(entries, resources)
|
||||||
serverer := servercase.NewServerUseCase(sites)
|
serverer := servercase.NewServerUseCase(sites)
|
||||||
handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
// INFO(toby3d): any static file is public and unprotected by design, so it's safe to search it
|
// INFO(toby3d): any static file is public and unprotected by design, so it's safe to search it
|
||||||
|
@ -115,9 +115,9 @@ func NewApp(logger *log.Logger, config *domain.Config) (*App, error) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
p, err := pager.Do(r.Context(), lang, r.URL.Path)
|
e, err := entrier.Do(r.Context(), lang, r.URL.Path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if !errors.Is(err, page.ErrNotExist) {
|
if !errors.Is(err, entry.ErrNotExist) {
|
||||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||||
|
|
||||||
return
|
return
|
||||||
|
@ -158,14 +158,14 @@ func NewApp(logger *log.Logger, config *domain.Config) (*App, error) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
contentLanguage := make([]string, len(p.Translations))
|
contentLanguage := make([]string, len(e.Translations))
|
||||||
for i := range p.Translations {
|
for i := range e.Translations {
|
||||||
contentLanguage[i] = p.Translations[i].Language.Code()
|
contentLanguage[i] = e.Translations[i].Language.Code()
|
||||||
}
|
}
|
||||||
|
|
||||||
w.Header().Set(common.HeaderContentLanguage, strings.Join(contentLanguage, ", "))
|
w.Header().Set(common.HeaderContentLanguage, strings.Join(contentLanguage, ", "))
|
||||||
|
|
||||||
template, err := themer.Do(r.Context(), s, p)
|
template, err := themer.Do(r.Context(), s, e)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue