mainnika
/
nikita-tokarch-uk
mirror of https://github.com/mainnika/nikita-tokarch-uk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Restructure the go package

Browse Source
main
Nikita Tokarchuk 2 years ago
parent a9b5ac4df2
commit 39ef200967
Signed by: mainnika
GPG Key ID: A595FB7E3E56911C
26 changed files with 111 additions and 98 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      Dockerfile
  2. 15
      cmd/renderer/main.go
  3. 13
      frontend/ghost/ghost.go
  4. 0
      pkg/config/config.go
  5. 8
      pkg/content/blog.go
  6. 0
      pkg/content/error.go
  7. 10
      pkg/content/index.go
  8. 4
      pkg/ghost/data/data.go
  9. 42
      pkg/ghost/data/data_easyjson.go
  10. 16
      pkg/ghost/ghost.go
  11. 2
      pkg/ghost/params/params.go
  12. 36
      pkg/ghost/v4api/httpclient/client.go
  13. 14
      pkg/routes/blog.go
  14. 9
      pkg/routes/error.go
  15. 15
      pkg/routes/index.go
  16. 7
      pkg/routes/output.go
  17. 16
      pkg/routes/routes.go
  18. 0
      pkg/templates/blog.go.tmpl
  19. 0
      pkg/templates/error.go.tmpl
  20. 0
      pkg/templates/funcs.go
  21. 0
      pkg/templates/head.go.tmpl
  22. 0
      pkg/templates/index.go.tmpl
  23. 0
      pkg/templates/menu.go.tmpl
  24. 0
      pkg/templates/post.go.tmpl
  25. 0
      pkg/templates/templates.go
  26. 0
      pkg/templates/urls.go

2
Dockerfile
Unescape View File

@ -22,7 +22,7 @@ RUN --mount=type=cache,id=gopath,target=${GOPATH} \
go build \ go build \
-o nikita-tokarch-uk-frontend \ -o nikita-tokarch-uk-frontend \
-ldflags "-X main.Version=${APP_VERSION}" \ -ldflags "-X main.Version=${APP_VERSION}" \
code.tokarch.uk/mainnika/nikita-tokarch-uk/frontend code.tokarch.uk/mainnika/nikita-tokarch-uk/cmd/renderer
FROM registry.access.redhat.com/ubi8/ubi as js-builder FROM registry.access.redhat.com/ubi8/ubi as js-builder

15
frontend/main.go → cmd/renderer/main.go
Unescape View File

@ -9,11 +9,10 @@ import (
"github.com/spf13/viper" "github.com/spf13/viper"
"github.com/valyala/fasthttp" "github.com/valyala/fasthttp"
"code.tokarch.uk/mainnika/nikita-tokarch-uk/frontend/config" "code.tokarch.uk/mainnika/nikita-tokarch-uk/pkg/config"
"code.tokarch.uk/mainnika/nikita-tokarch-uk/frontend/ghost" "code.tokarch.uk/mainnika/nikita-tokarch-uk/pkg/ghost/v4api/httpclient"
"code.tokarch.uk/mainnika/nikita-tokarch-uk/frontend/renderer" "code.tokarch.uk/mainnika/nikita-tokarch-uk/pkg/routes"
_ "code.tokarch.uk/mainnika/nikita-tokarch-uk/pkg/templates"
_ "code.tokarch.uk/mainnika/nikita-tokarch-uk/frontend/templates"
) )
var Version = "nightly" var Version = "nightly"
@ -53,7 +52,7 @@ func main() {
logrus.Fatal(err) logrus.Fatal(err)
} }
ghostClient := &ghost.HTTPClient{ ghostClient := &httpclient.HTTPClient{
Addr: config.Content.Backend.Addr, Addr: config.Content.Backend.Addr,
Secured: config.Content.Backend.Secured, Secured: config.Content.Backend.Secured,
Headers: config.Content.Backend.Headers, Headers: config.Content.Backend.Headers,
@ -61,7 +60,7 @@ func main() {
QueryTimeout: time.Second, QueryTimeout: time.Second,
} }
rendererHandler := &renderer.Renderer{ apiRoutes := &routes.Routes{
GhostClient: ghostClient, GhostClient: ghostClient,
ContentConfig: config.Content, ContentConfig: config.Content,
Base: config.Base, Base: config.Base,
@ -69,7 +68,7 @@ func main() {
httpServer := fasthttp.Server{ httpServer := fasthttp.Server{
Logger: logrus.StandardLogger(), Logger: logrus.StandardLogger(),
Handler: rendererHandler.Handler, Handler: apiRoutes.Handler,
Name: frontendServerIdentity, Name: frontendServerIdentity,
GetOnly: true, GetOnly: true,
} }

13
frontend/ghost/ghost.go
Unescape View File

@ -1,13 +0,0 @@
package ghost
//go:generate $GOPATH/bin/easyjson -pkg -no_std_marshalers
// Client is the ghost backend client
type Client interface {
// GetPosts returns blog posts according to query params
GetPosts(queryParams ...Modifier) (posts *Posts, err error)
// GetPostBySlug returns a single post by its slug title and query params
GetPostBySlug(slug string, queryParams ...Modifier) (posts *Posts, err error)
// GetPageBySlug returns a single page by its slug title and query params
GetPageBySlug(slug string, queryParams ...Modifier) (pages *Pages, err error)
}

0
frontend/config/config.go → pkg/config/config.go
Unescape View File

8
frontend/content/blog.go → pkg/content/blog.go
Unescape View File

@ -3,15 +3,15 @@ package content
import ( import (
"fmt" "fmt"
"code.tokarch.uk/mainnika/nikita-tokarch-uk/frontend/ghost" "code.tokarch.uk/mainnika/nikita-tokarch-uk/pkg/ghost/data"
) )
// Blog content data // Blog content data
type Blog struct { type Blog struct {
_ interface{} `template:"blog.go.tmpl"` _ interface{} `template:"blog.go.tmpl"`
ghost.Meta data.Meta
Pinned []ghost.Post Pinned []data.Post
Posts []ghost.Post Posts []data.Post
} }
// Title returns blog content title // Title returns blog content title

0
frontend/content/error.go → pkg/content/error.go
Unescape View File

10
frontend/content/index.go → pkg/content/index.go
Unescape View File

@ -1,15 +1,13 @@
package content package content
import ( import "code.tokarch.uk/mainnika/nikita-tokarch-uk/pkg/ghost/data"
"code.tokarch.uk/mainnika/nikita-tokarch-uk/frontend/ghost"
)
// Index content data // Index content data
type Index struct { type Index struct {
_ interface{} `template:"index.go.tmpl"` _ interface{} `template:"index.go.tmpl"`
ghost.Meta data.Meta
Pinned []ghost.Post Pinned []data.Post
Posts []ghost.Post Posts []data.Post
} }
// Title returns index title // Title returns index title

4
frontend/ghost/data.go → pkg/ghost/data/data.go
Unescape View File

@ -1,4 +1,6 @@
package ghost package data
//go:generate $GOPATH/bin/easyjson -pkg -no_std_marshalers
import "html/template" import "html/template"

42
frontend/ghost/ghost_easyjson.go → pkg/ghost/data/data_easyjson.go
Unescape View File

@ -1,6 +1,6 @@
// Code generated by easyjson for marshaling/unmarshaling. DO NOT EDIT. // Code generated by easyjson for marshaling/unmarshaling. DO NOT EDIT.
package ghost package data
import ( import (
json "encoding/json" json "encoding/json"
@ -18,7 +18,7 @@ var (
_ easyjson.Marshaler _ easyjson.Marshaler
) )
func easyjson72852e1bDecodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhost(in *jlexer.Lexer, out *Posts) { func easyjson794297d0DecodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhostData(in *jlexer.Lexer, out *Posts) {
isTopLevel := in.IsStart() isTopLevel := in.IsStart()
if in.IsNull() { if in.IsNull() {
if isTopLevel { if isTopLevel {
@ -72,7 +72,7 @@ func easyjson72852e1bDecodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhost(in
in.Consumed() in.Consumed()
} }
} }
func easyjson72852e1bEncodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhost(out *jwriter.Writer, in Posts) { func easyjson794297d0EncodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhostData(out *jwriter.Writer, in Posts) {
out.RawByte('{') out.RawByte('{')
first := true first := true
_ = first _ = first
@ -102,14 +102,14 @@ func easyjson72852e1bEncodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhost(out
// MarshalEasyJSON supports easyjson.Marshaler interface // MarshalEasyJSON supports easyjson.Marshaler interface
func (v Posts) MarshalEasyJSON(w *jwriter.Writer) { func (v Posts) MarshalEasyJSON(w *jwriter.Writer) {
easyjson72852e1bEncodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhost(w, v) easyjson794297d0EncodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhostData(w, v)
} }
// UnmarshalEasyJSON supports easyjson.Unmarshaler interface // UnmarshalEasyJSON supports easyjson.Unmarshaler interface
func (v *Posts) UnmarshalEasyJSON(l *jlexer.Lexer) { func (v *Posts) UnmarshalEasyJSON(l *jlexer.Lexer) {
easyjson72852e1bDecodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhost(l, v) easyjson794297d0DecodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhostData(l, v)
} }
func easyjson72852e1bDecodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhost1(in *jlexer.Lexer, out *Post) { func easyjson794297d0DecodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhostData1(in *jlexer.Lexer, out *Post) {
isTopLevel := in.IsStart() isTopLevel := in.IsStart()
if in.IsNull() { if in.IsNull() {
if isTopLevel { if isTopLevel {
@ -148,7 +148,7 @@ func easyjson72852e1bDecodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhost1(in
in.Consumed() in.Consumed()
} }
} }
func easyjson72852e1bEncodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhost1(out *jwriter.Writer, in Post) { func easyjson794297d0EncodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhostData1(out *jwriter.Writer, in Post) {
out.RawByte('{') out.RawByte('{')
first := true first := true
_ = first _ = first
@ -182,14 +182,14 @@ func easyjson72852e1bEncodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhost1(ou
// MarshalEasyJSON supports easyjson.Marshaler interface // MarshalEasyJSON supports easyjson.Marshaler interface
func (v Post) MarshalEasyJSON(w *jwriter.Writer) { func (v Post) MarshalEasyJSON(w *jwriter.Writer) {
easyjson72852e1bEncodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhost1(w, v) easyjson794297d0EncodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhostData1(w, v)
} }
// UnmarshalEasyJSON supports easyjson.Unmarshaler interface // UnmarshalEasyJSON supports easyjson.Unmarshaler interface
func (v *Post) UnmarshalEasyJSON(l *jlexer.Lexer) { func (v *Post) UnmarshalEasyJSON(l *jlexer.Lexer) {
easyjson72852e1bDecodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhost1(l, v) easyjson794297d0DecodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhostData1(l, v)
} }
func easyjson72852e1bDecodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhost2(in *jlexer.Lexer, out *Pagination) { func easyjson794297d0DecodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhostData2(in *jlexer.Lexer, out *Pagination) {
isTopLevel := in.IsStart() isTopLevel := in.IsStart()
if in.IsNull() { if in.IsNull() {
if isTopLevel { if isTopLevel {
@ -226,7 +226,7 @@ func easyjson72852e1bDecodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhost2(in
in.Consumed() in.Consumed()
} }
} }
func easyjson72852e1bEncodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhost2(out *jwriter.Writer, in Pagination) { func easyjson794297d0EncodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhostData2(out *jwriter.Writer, in Pagination) {
out.RawByte('{') out.RawByte('{')
first := true first := true
_ = first _ = first
@ -255,14 +255,14 @@ func easyjson72852e1bEncodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhost2(ou
// MarshalEasyJSON supports easyjson.Marshaler interface // MarshalEasyJSON supports easyjson.Marshaler interface
func (v Pagination) MarshalEasyJSON(w *jwriter.Writer) { func (v Pagination) MarshalEasyJSON(w *jwriter.Writer) {
easyjson72852e1bEncodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhost2(w, v) easyjson794297d0EncodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhostData2(w, v)
} }
// UnmarshalEasyJSON supports easyjson.Unmarshaler interface // UnmarshalEasyJSON supports easyjson.Unmarshaler interface
func (v *Pagination) UnmarshalEasyJSON(l *jlexer.Lexer) { func (v *Pagination) UnmarshalEasyJSON(l *jlexer.Lexer) {
easyjson72852e1bDecodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhost2(l, v) easyjson794297d0DecodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhostData2(l, v)
} }
func easyjson72852e1bDecodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhost3(in *jlexer.Lexer, out *Pages) { func easyjson794297d0DecodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhostData3(in *jlexer.Lexer, out *Pages) {
isTopLevel := in.IsStart() isTopLevel := in.IsStart()
if in.IsNull() { if in.IsNull() {
if isTopLevel { if isTopLevel {
@ -316,7 +316,7 @@ func easyjson72852e1bDecodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhost3(in
in.Consumed() in.Consumed()
} }
} }
func easyjson72852e1bEncodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhost3(out *jwriter.Writer, in Pages) { func easyjson794297d0EncodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhostData3(out *jwriter.Writer, in Pages) {
out.RawByte('{') out.RawByte('{')
first := true first := true
_ = first _ = first
@ -346,14 +346,14 @@ func easyjson72852e1bEncodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhost3(ou
// MarshalEasyJSON supports easyjson.Marshaler interface // MarshalEasyJSON supports easyjson.Marshaler interface
func (v Pages) MarshalEasyJSON(w *jwriter.Writer) { func (v Pages) MarshalEasyJSON(w *jwriter.Writer) {
easyjson72852e1bEncodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhost3(w, v) easyjson794297d0EncodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhostData3(w, v)
} }
// UnmarshalEasyJSON supports easyjson.Unmarshaler interface // UnmarshalEasyJSON supports easyjson.Unmarshaler interface
func (v *Pages) UnmarshalEasyJSON(l *jlexer.Lexer) { func (v *Pages) UnmarshalEasyJSON(l *jlexer.Lexer) {
easyjson72852e1bDecodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhost3(l, v) easyjson794297d0DecodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhostData3(l, v)
} }
func easyjson72852e1bDecodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhost4(in *jlexer.Lexer, out *Meta) { func easyjson794297d0DecodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhostData4(in *jlexer.Lexer, out *Meta) {
isTopLevel := in.IsStart() isTopLevel := in.IsStart()
if in.IsNull() { if in.IsNull() {
if isTopLevel { if isTopLevel {
@ -384,7 +384,7 @@ func easyjson72852e1bDecodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhost4(in
in.Consumed() in.Consumed()
} }
} }
func easyjson72852e1bEncodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhost4(out *jwriter.Writer, in Meta) { func easyjson794297d0EncodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhostData4(out *jwriter.Writer, in Meta) {
out.RawByte('{') out.RawByte('{')
first := true first := true
_ = first _ = first
@ -398,10 +398,10 @@ func easyjson72852e1bEncodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhost4(ou
// MarshalEasyJSON supports easyjson.Marshaler interface // MarshalEasyJSON supports easyjson.Marshaler interface
func (v Meta) MarshalEasyJSON(w *jwriter.Writer) { func (v Meta) MarshalEasyJSON(w *jwriter.Writer) {
easyjson72852e1bEncodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhost4(w, v) easyjson794297d0EncodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhostData4(w, v)
} }
// UnmarshalEasyJSON supports easyjson.Unmarshaler interface // UnmarshalEasyJSON supports easyjson.Unmarshaler interface
func (v *Meta) UnmarshalEasyJSON(l *jlexer.Lexer) { func (v *Meta) UnmarshalEasyJSON(l *jlexer.Lexer) {
easyjson72852e1bDecodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhost4(l, v) easyjson794297d0DecodeCodeTokarchUkMainnikaNikitaTokarchUkFrontendGhostData4(l, v)
} }

16
pkg/ghost/ghost.go
Unescape View File

@ -0,0 +1,16 @@
package ghost
import (
"code.tokarch.uk/mainnika/nikita-tokarch-uk/pkg/ghost/data"
"code.tokarch.uk/mainnika/nikita-tokarch-uk/pkg/ghost/params"
)
// Client is the ghost backend client
type Client interface {
// GetPosts returns blog posts according to query params
GetPosts(queryParams ...params.Modifier) (posts *data.Posts, err error)
// GetPostBySlug returns a single post by its slug title and query params
GetPostBySlug(slug string, queryParams ...params.Modifier) (posts *data.Posts, err error)
// GetPageBySlug returns a single page by its slug title and query params
GetPageBySlug(slug string, queryParams ...params.Modifier) (pages *data.Pages, err error)
}

2
frontend/ghost/params.go → pkg/ghost/params/params.go
Unescape View File

@ -1,4 +1,4 @@
package ghost package params
// Params are generics query argument // Params are generics query argument
type Params struct { type Params struct {

36
frontend/ghost/client.go → pkg/ghost/v4api/httpclient/client.go
Unescape View File

@ -1,4 +1,4 @@
package ghost package httpclient
import ( import (
"fmt" "fmt"
@ -8,9 +8,13 @@ import (
"github.com/mailru/easyjson" "github.com/mailru/easyjson"
"github.com/valyala/fasthttp" "github.com/valyala/fasthttp"
"code.tokarch.uk/mainnika/nikita-tokarch-uk/pkg/ghost"
"code.tokarch.uk/mainnika/nikita-tokarch-uk/pkg/ghost/data"
"code.tokarch.uk/mainnika/nikita-tokarch-uk/pkg/ghost/params"
) )
var _ Client = (*HTTPClient)(nil) var _ ghost.Client = (*HTTPClient)(nil)
// Ghost content data URIs: // Ghost content data URIs:
const ( const (
@ -46,7 +50,7 @@ func (g *HTTPClient) setupClient() {
} }
// doQuery does the method and unmarshals the result into the easyjson Unmarshaler // doQuery does the method and unmarshals the result into the easyjson Unmarshaler
func (g *HTTPClient) doQuery(method string, v easyjson.Unmarshaler, params Params) (err error) { func (g *HTTPClient) doQuery(path string, v easyjson.Unmarshaler, params params.Params) (err error) {
g.setupClientOnce.Do(g.setupClient) g.setupClientOnce.Do(g.setupClient)
@ -57,7 +61,7 @@ func (g *HTTPClient) doQuery(method string, v easyjson.Unmarshaler, params Param
fasthttp.ReleaseRequest(req) fasthttp.ReleaseRequest(req)
}() }()
g.setupRequest(method, req) g.setupRequest(path, req)
g.applyParams(params, req) g.applyParams(params, req)
err = g.client.DoTimeout(req, res, g.QueryTimeout) err = g.client.DoTimeout(req, res, g.QueryTimeout)
@ -103,7 +107,7 @@ func (g *HTTPClient) setupRequest(path string, req *fasthttp.Request) {
} }
// applyParams function additionally configure the http request using params // applyParams function additionally configure the http request using params
func (g *HTTPClient) applyParams(p Params, req *fasthttp.Request) (err error) { func (g *HTTPClient) applyParams(p params.Params, req *fasthttp.Request) (err error) {
uri := req.URI() uri := req.URI()
@ -121,10 +125,10 @@ func (g *HTTPClient) applyParams(p Params, req *fasthttp.Request) (err error) {
} }
// GetPageBySlug returns the only one page using slug filter // GetPageBySlug returns the only one page using slug filter
func (g *HTTPClient) GetPageBySlug(slug string) (pages *Pages, err error) { func (g *HTTPClient) GetPageBySlug(slug string, queryModifiers ...params.Modifier) (pages *data.Pages, err error) {
pages = &Pages{} pages = &data.Pages{}
defaultParams := Params{} defaultParams := params.Params{}
method := fmt.Sprintf(ghostAPIGetPageBySlug, slug) method := fmt.Sprintf(ghostAPIGetPageBySlug, slug)
err = g.doQuery(method, pages, defaultParams) err = g.doQuery(method, pages, defaultParams)
@ -136,11 +140,11 @@ func (g *HTTPClient) GetPageBySlug(slug string) (pages *Pages, err error) {
} }
// GetPosts returns posts // GetPosts returns posts
func (g *HTTPClient) GetPosts(queryModifiers ...Modifier) (posts *Posts, err error) { func (g *HTTPClient) GetPosts(queryModifiers ...params.Modifier) (posts *data.Posts, err error) {
posts = &Posts{} posts = &data.Posts{}
defaultParams := Params{} defaultParams := params.Params{}
combinedParams := Modifiers(queryModifiers).Apply(defaultParams) combinedParams := params.Modifiers(queryModifiers).Apply(defaultParams)
err = g.doQuery(ghostAPIGetPosts, posts, combinedParams) err = g.doQuery(ghostAPIGetPosts, posts, combinedParams)
if err != nil { if err != nil {
@ -151,11 +155,11 @@ func (g *HTTPClient) GetPosts(queryModifiers ...Modifier) (posts *Posts, err err
} }
// GetPostBySlug returns the only one post using slug filter // GetPostBySlug returns the only one post using slug filter
func (g *HTTPClient) GetPostBySlug(slug string, queryModifiers ...Modifier) (posts *Posts, err error) { func (g *HTTPClient) GetPostBySlug(slug string, queryModifiers ...params.Modifier) (posts *data.Posts, err error) {
posts = &Posts{} posts = &data.Posts{}
defaultParams := Params{} defaultParams := params.Params{}
combinedParams := Modifiers(queryModifiers).Apply(defaultParams) combinedParams := params.Modifiers(queryModifiers).Apply(defaultParams)
method := fmt.Sprintf(ghostAPIGetPostBySlug, slug) method := fmt.Sprintf(ghostAPIGetPostBySlug, slug)
err = g.doQuery(method, posts, combinedParams) err = g.doQuery(method, posts, combinedParams)

14
frontend/renderer/blog.go → pkg/routes/blog.go
Unescape View File

@ -1,18 +1,22 @@
package renderer package routes
import ( import (
"code.tokarch.uk/mainnika/nikita-tokarch-uk/frontend/content"
"code.tokarch.uk/mainnika/nikita-tokarch-uk/frontend/ghost"
routing "github.com/jackwhelpton/fasthttp-routing/v2" routing "github.com/jackwhelpton/fasthttp-routing/v2"
"code.tokarch.uk/mainnika/nikita-tokarch-uk/pkg/content"
"code.tokarch.uk/mainnika/nikita-tokarch-uk/pkg/ghost/params"
) )
// blog handler renders blog data // blog handler renders blog data
func (r *Renderer) blog(c *routing.Context) (err error) { func (r *Routes) blog(c *routing.Context) (err error) {
postsPerPage := r.ContentConfig.PostsPerPage postsPerPage := r.ContentConfig.PostsPerPage
currentPage := c.QueryArgs().GetUintOrZero("page") currentPage := c.QueryArgs().GetUintOrZero("page")
latestPosts, err := r.GhostClient.GetPosts(ghost.QueryLimit(postsPerPage), ghost.QueryPage(currentPage)) latestPosts, err := r.GhostClient.GetPosts(
params.WithLimit(postsPerPage),
params.WithPage(currentPage),
)
if err != nil { if err != nil {
return return
} }

9
frontend/renderer/error.go → pkg/routes/error.go
Unescape View File

@ -1,16 +1,17 @@
package renderer package routes
import ( import (
"fmt" "fmt"
"net/http" "net/http"
"code.tokarch.uk/mainnika/nikita-tokarch-uk/frontend/content"
routing "github.com/jackwhelpton/fasthttp-routing/v2" routing "github.com/jackwhelpton/fasthttp-routing/v2"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"code.tokarch.uk/mainnika/nikita-tokarch-uk/pkg/content"
) )
// errorNotFound renders http error-404 template // errorNotFound renders http error-404 template
func (r *Renderer) errorNotFound(c *routing.Context) (err error) { func (r *Routes) errorNotFound(c *routing.Context) (err error) {
errorContent := content.Error{Message: "not found"} errorContent := content.Error{Message: "not found"}
@ -18,7 +19,7 @@ func (r *Renderer) errorNotFound(c *routing.Context) (err error) {
} }
// useErrorHandler is the middleware that catch handlers errors and render error template // useErrorHandler is the middleware that catch handlers errors and render error template
func (r *Renderer) useErrorHandler(c *routing.Context) (err error) { func (r *Routes) useErrorHandler(c *routing.Context) (err error) {
worker := func() (err error) { worker := func() (err error) {

15
frontend/renderer/index.go → pkg/routes/index.go
Unescape View File

@ -1,16 +1,17 @@
package renderer package routes
import ( import (
"net/http" "net/http"
"code.tokarch.uk/mainnika/nikita-tokarch-uk/frontend/content"
"code.tokarch.uk/mainnika/nikita-tokarch-uk/frontend/ghost"
"code.tokarch.uk/mainnika/nikita-tokarch-uk/frontend/templates"
routing "github.com/jackwhelpton/fasthttp-routing/v2" routing "github.com/jackwhelpton/fasthttp-routing/v2"
"code.tokarch.uk/mainnika/nikita-tokarch-uk/pkg/content"
"code.tokarch.uk/mainnika/nikita-tokarch-uk/pkg/ghost/params"
"code.tokarch.uk/mainnika/nikita-tokarch-uk/pkg/templates"
) )
// rootRedirect redirects the root url to the index using http redirect // rootRedirect redirects the root url to the index using http redirect
func (r *Renderer) rootRedirect(c *routing.Context) (err error) { func (r *Routes) rootRedirect(c *routing.Context) (err error) {
c.Redirect(templates.URLIndex, http.StatusFound) c.Redirect(templates.URLIndex, http.StatusFound)
@ -18,7 +19,7 @@ func (r *Renderer) rootRedirect(c *routing.Context) (err error) {
} }
// index handler renders index data // index handler renders index data
func (r *Renderer) index(c *routing.Context) (err error) { func (r *Routes) index(c *routing.Context) (err error) {
pinnedPageSlug := r.ContentConfig.Pinned pinnedPageSlug := r.ContentConfig.Pinned
postsPerPage := r.ContentConfig.PostsPerPage postsPerPage := r.ContentConfig.PostsPerPage
@ -28,7 +29,7 @@ func (r *Renderer) index(c *routing.Context) (err error) {
return return
} }
latestPosts, err := r.GhostClient.GetPosts(ghost.QueryLimit(postsPerPage)) latestPosts, err := r.GhostClient.GetPosts(params.WithLimit(postsPerPage))
if err != nil { if err != nil {
return return
} }

7
frontend/renderer/output.go → pkg/routes/output.go
Unescape View File

@ -1,11 +1,12 @@
package renderer package routes
import ( import (
"io" "io"
"code.tokarch.uk/mainnika/nikita-tokarch-uk/frontend/templates"
routing "github.com/jackwhelpton/fasthttp-routing/v2" routing "github.com/jackwhelpton/fasthttp-routing/v2"
"github.com/valyala/fasthttp" "github.com/valyala/fasthttp"
"code.tokarch.uk/mainnika/nikita-tokarch-uk/pkg/templates"
) )
var _ routing.DataWriter = (*TemplateWriter)(nil) var _ routing.DataWriter = (*TemplateWriter)(nil)
@ -30,7 +31,7 @@ func (tw *TemplateWriter) Write(w io.Writer, content interface{}) error {
} }
// useTemplateWriter is the routing middleware to set the default data writer // useTemplateWriter is the routing middleware to set the default data writer
func (r *Renderer) useTemplateWriter(c *routing.Context) (err error) { func (r *Routes) useTemplateWriter(c *routing.Context) (err error) {
c.SetDataWriter(staticWriter) c.SetDataWriter(staticWriter)

16
frontend/renderer/renderer.go → pkg/routes/routes.go
Unescape View File

@ -1,4 +1,4 @@
package renderer package routes
import ( import (
"sync" "sync"
@ -6,13 +6,13 @@ import (
routing "github.com/jackwhelpton/fasthttp-routing/v2" routing "github.com/jackwhelpton/fasthttp-routing/v2"
"github.com/valyala/fasthttp" "github.com/valyala/fasthttp"
"code.tokarch.uk/mainnika/nikita-tokarch-uk/frontend/config" "code.tokarch.uk/mainnika/nikita-tokarch-uk/pkg/config"
"code.tokarch.uk/mainnika/nikita-tokarch-uk/frontend/ghost" "code.tokarch.uk/mainnika/nikita-tokarch-uk/pkg/ghost"
"code.tokarch.uk/mainnika/nikita-tokarch-uk/frontend/templates" "code.tokarch.uk/mainnika/nikita-tokarch-uk/pkg/templates"
) )
// Renderer is the main handler that contains all routes handlers // Routes is the main handler that contains all routes handlers
type Renderer struct { type Routes struct {
GhostClient ghost.Client GhostClient ghost.Client
ContentConfig config.Content ContentConfig config.Content
@ -25,13 +25,13 @@ type Renderer struct {
} }
// Handler invokes the lazy once-initializer and then does the request // Handler invokes the lazy once-initializer and then does the request
func (r *Renderer) Handler(ctx *fasthttp.RequestCtx) { func (r *Routes) Handler(ctx *fasthttp.RequestCtx) {
r.initOnce.Do(r.init) r.initOnce.Do(r.init)
r.handler(ctx) r.handler(ctx)
} }
// init has the renderer initialization // init has the renderer initialization
func (r *Renderer) init() { func (r *Routes) init() {
router := routing.New() router := routing.New()

0
frontend/templates/blog.go.tmpl → pkg/templates/blog.go.tmpl
Unescape View File

0
frontend/templates/error.go.tmpl → pkg/templates/error.go.tmpl
Unescape View File

0
frontend/templates/funcs.go → pkg/templates/funcs.go
Unescape View File

0
frontend/templates/head.go.tmpl → pkg/templates/head.go.tmpl
Unescape View File

0
frontend/templates/index.go.tmpl → pkg/templates/index.go.tmpl
Unescape View File

0
frontend/templates/menu.go.tmpl → pkg/templates/menu.go.tmpl
Unescape View File

0
frontend/templates/post.go.tmpl → pkg/templates/post.go.tmpl
Unescape View File

0
frontend/templates/templates.go → pkg/templates/templates.go
Unescape View File

0
frontend/templates/urls.go → pkg/templates/urls.go
Unescape View File

Write Preview
Loading…
Cancel
Save