Most tests passing except templating ones
This commit is contained in:
parent
792707cd70
commit
ef719f74da
@ -5,11 +5,14 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/a-h/templ"
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
|
||||||
"git.grosinger.net/tgrosinger/saasitone/pkg/page"
|
"git.grosinger.net/tgrosinger/saasitone/pkg/page"
|
||||||
"git.grosinger.net/tgrosinger/saasitone/pkg/tests"
|
"git.grosinger.net/tgrosinger/saasitone/pkg/tests"
|
||||||
|
"git.grosinger.net/tgrosinger/saasitone/templ/pages"
|
||||||
|
"git.grosinger.net/tgrosinger/saasitone/templ/layouts"
|
||||||
"git.grosinger.net/tgrosinger/saasitone/templates"
|
"git.grosinger.net/tgrosinger/saasitone/templates"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -17,14 +20,16 @@ func TestServeCachedPage(t *testing.T) {
|
|||||||
// Cache a page
|
// Cache a page
|
||||||
ctx, rec := tests.NewContext(c.Web, "/cache")
|
ctx, rec := tests.NewContext(c.Web, "/cache")
|
||||||
p := page.New(ctx)
|
p := page.New(ctx)
|
||||||
p.Layout = templates.LayoutHTMX
|
|
||||||
p.Name = templates.PageHome
|
p.Name = templates.PageHome
|
||||||
p.Cache.Enabled = true
|
p.Cache.Enabled = true
|
||||||
p.Cache.Expiration = time.Minute
|
p.Cache.Expiration = time.Minute
|
||||||
p.StatusCode = http.StatusCreated
|
p.StatusCode = http.StatusCreated
|
||||||
p.Headers["a"] = "b"
|
p.Headers["a"] = "b"
|
||||||
p.Headers["c"] = "d"
|
p.Headers["c"] = "d"
|
||||||
err := c.TemplateRenderer.RenderPage(ctx, p)
|
p.LayoutComponent = func(content templ.Component) templ.Component {
|
||||||
|
return layouts.HTMX(p, content)
|
||||||
|
}
|
||||||
|
err := c.TemplateRenderer.RenderPageTempl(ctx, p, pages.Cache(p, &pages.CacheForm{}, nil))
|
||||||
output := rec.Body.Bytes()
|
output := rec.Body.Bytes()
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
package services
|
package models
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"database/sql"
|
"database/sql"
|
||||||
@ -13,7 +13,7 @@ type Post struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type DBPostClient struct {
|
type DBPostClient struct {
|
||||||
db *sql.DB
|
DB *sql.DB
|
||||||
}
|
}
|
||||||
|
|
||||||
// FetchAll is an mock example of fetching posts to illustrate how paging works
|
// FetchAll is an mock example of fetching posts to illustrate how paging works
|
@ -1,9 +1,9 @@
|
|||||||
package services
|
package models
|
||||||
|
|
||||||
import "database/sql"
|
import "database/sql"
|
||||||
|
|
||||||
// UserClient is a struct that can be used to create custom methods for
|
// UserClient is a struct that can be used to create custom methods for
|
||||||
// interacting with users in the database.
|
// interacting with users in the database.
|
||||||
type DBUserClient struct {
|
type DBUserClient struct {
|
||||||
db *sql.DB
|
DB *sql.DB
|
||||||
}
|
}
|
@ -10,6 +10,7 @@ import (
|
|||||||
"github.com/golang-migrate/migrate/v4/source/file"
|
"github.com/golang-migrate/migrate/v4/source/file"
|
||||||
|
|
||||||
"git.grosinger.net/tgrosinger/saasitone/config"
|
"git.grosinger.net/tgrosinger/saasitone/config"
|
||||||
|
"git.grosinger.net/tgrosinger/saasitone/pkg/models"
|
||||||
"git.grosinger.net/tgrosinger/saasitone/pkg/models/sqlc"
|
"git.grosinger.net/tgrosinger/saasitone/pkg/models/sqlc"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -17,8 +18,8 @@ type DBClient struct {
|
|||||||
db *sql.DB
|
db *sql.DB
|
||||||
C *sqlc.Queries
|
C *sqlc.Queries
|
||||||
|
|
||||||
User *DBUserClient
|
User *models.DBUserClient
|
||||||
Post *DBPostClient
|
Post *models.DBPostClient
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewDBClient(cfg *config.Config) (*DBClient, error) {
|
func NewDBClient(cfg *config.Config) (*DBClient, error) {
|
||||||
@ -43,8 +44,8 @@ func NewDBClient(cfg *config.Config) (*DBClient, error) {
|
|||||||
db: db,
|
db: db,
|
||||||
C: sqlc.New(db),
|
C: sqlc.New(db),
|
||||||
}
|
}
|
||||||
client.User = &DBUserClient{db: db}
|
client.User = &models.DBUserClient{DB: db}
|
||||||
client.Post = &DBPostClient{db: db}
|
client.Post = &models.DBPostClient{DB: db}
|
||||||
|
|
||||||
migrationsDirPath := cfg.Storage.MigrationsDir
|
migrationsDirPath := cfg.Storage.MigrationsDir
|
||||||
logger.Info("Loading schema migrations",
|
logger.Info("Loading schema migrations",
|
||||||
|
9
templ/layouts/htmx.templ
Normal file
9
templ/layouts/htmx.templ
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
package layouts
|
||||||
|
|
||||||
|
import (
|
||||||
|
"git.grosinger.net/tgrosinger/saasitone/pkg/page"
|
||||||
|
)
|
||||||
|
|
||||||
|
templ HTMX(p page.Page, content templ.Component) {
|
||||||
|
@content
|
||||||
|
}
|
39
templ/layouts/htmx_templ.go
Normal file
39
templ/layouts/htmx_templ.go
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
// Code generated by templ - DO NOT EDIT.
|
||||||
|
|
||||||
|
// templ: version: v0.2.707
|
||||||
|
package layouts
|
||||||
|
|
||||||
|
//lint:file-ignore SA4006 This context is only used if a nested component is present.
|
||||||
|
|
||||||
|
import "github.com/a-h/templ"
|
||||||
|
import "context"
|
||||||
|
import "io"
|
||||||
|
import "bytes"
|
||||||
|
|
||||||
|
import (
|
||||||
|
"git.grosinger.net/tgrosinger/saasitone/pkg/page"
|
||||||
|
)
|
||||||
|
|
||||||
|
func HTMX(p page.Page, content templ.Component) templ.Component {
|
||||||
|
return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
|
||||||
|
templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
|
||||||
|
if !templ_7745c5c3_IsBuffer {
|
||||||
|
templ_7745c5c3_Buffer = templ.GetBuffer()
|
||||||
|
defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
|
||||||
|
}
|
||||||
|
ctx = templ.InitializeContext(ctx)
|
||||||
|
templ_7745c5c3_Var1 := templ.GetChildren(ctx)
|
||||||
|
if templ_7745c5c3_Var1 == nil {
|
||||||
|
templ_7745c5c3_Var1 = templ.NopComponent
|
||||||
|
}
|
||||||
|
ctx = templ.ClearChildren(ctx)
|
||||||
|
templ_7745c5c3_Err = content.Render(ctx, templ_7745c5c3_Buffer)
|
||||||
|
if templ_7745c5c3_Err != nil {
|
||||||
|
return templ_7745c5c3_Err
|
||||||
|
}
|
||||||
|
if !templ_7745c5c3_IsBuffer {
|
||||||
|
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
|
||||||
|
}
|
||||||
|
return templ_7745c5c3_Err
|
||||||
|
})
|
||||||
|
}
|
@ -4,11 +4,11 @@ import (
|
|||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
"git.grosinger.net/tgrosinger/saasitone/pkg/page"
|
"git.grosinger.net/tgrosinger/saasitone/pkg/page"
|
||||||
"git.grosinger.net/tgrosinger/saasitone/pkg/services"
|
"git.grosinger.net/tgrosinger/saasitone/pkg/models"
|
||||||
"git.grosinger.net/tgrosinger/saasitone/pkg/funcmap"
|
"git.grosinger.net/tgrosinger/saasitone/pkg/funcmap"
|
||||||
)
|
)
|
||||||
|
|
||||||
templ Home(p page.Page, posts []services.Post) {
|
templ Home(p page.Page, posts []models.Post) {
|
||||||
if (p.HTMX.Request.Target != "posts") {
|
if (p.HTMX.Request.Target != "posts") {
|
||||||
@topContent(p)
|
@topContent(p)
|
||||||
}
|
}
|
||||||
|
@ -14,11 +14,11 @@ import (
|
|||||||
"strconv"
|
"strconv"
|
||||||
|
|
||||||
"git.grosinger.net/tgrosinger/saasitone/pkg/funcmap"
|
"git.grosinger.net/tgrosinger/saasitone/pkg/funcmap"
|
||||||
|
"git.grosinger.net/tgrosinger/saasitone/pkg/models"
|
||||||
"git.grosinger.net/tgrosinger/saasitone/pkg/page"
|
"git.grosinger.net/tgrosinger/saasitone/pkg/page"
|
||||||
"git.grosinger.net/tgrosinger/saasitone/pkg/services"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func Home(p page.Page, posts []services.Post) templ.Component {
|
func Home(p page.Page, posts []models.Post) templ.Component {
|
||||||
return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
|
return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
|
||||||
templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
|
templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
|
||||||
if !templ_7745c5c3_IsBuffer {
|
if !templ_7745c5c3_IsBuffer {
|
||||||
|
@ -1,42 +0,0 @@
|
|||||||
{{define "metatags"}}
|
|
||||||
<title>{{ .AppName }}{{ if .Title }} | {{ .Title }}{{ end }}</title>
|
|
||||||
<link rel="icon" href="{{file "favicon.png"}}">
|
|
||||||
<meta charset="utf-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
|
||||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
|
||||||
{{- if .Metatags.Description}}
|
|
||||||
<meta name="description" content="{{.Metatags.Description}}">
|
|
||||||
{{- end}}
|
|
||||||
{{- if .Metatags.Keywords}}
|
|
||||||
<meta name="keywords" content="{{.Metatags.Keywords | join ", "}}">
|
|
||||||
{{- end}}
|
|
||||||
{{end}}
|
|
||||||
|
|
||||||
{{define "css"}}
|
|
||||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.4/css/bulma.min.css">
|
|
||||||
{{end}}
|
|
||||||
|
|
||||||
{{define "js"}}
|
|
||||||
<script src="https://unpkg.com/htmx.org@2.0.0/dist/htmx.min.js"></script>
|
|
||||||
<script defer src="https://unpkg.com/alpinejs@3.x.x/dist/cdn.min.js"></script>
|
|
||||||
{{end}}
|
|
||||||
|
|
||||||
{{define "footer"}}
|
|
||||||
{{- if .CSRF}}
|
|
||||||
<script>
|
|
||||||
document.body.addEventListener('htmx:configRequest', function(evt) {
|
|
||||||
if (evt.detail.verb !== "get") {
|
|
||||||
evt.detail.parameters['csrf'] = '{{.CSRF}}';
|
|
||||||
}
|
|
||||||
})
|
|
||||||
</script>
|
|
||||||
{{end}}
|
|
||||||
<script>
|
|
||||||
document.body.addEventListener('htmx:beforeSwap', function(evt) {
|
|
||||||
if (evt.detail.xhr.status >= 400){
|
|
||||||
evt.detail.shouldSwap = true;
|
|
||||||
evt.detail.target = htmx.find("body");
|
|
||||||
}
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
{{end}}
|
|
@ -1,9 +0,0 @@
|
|||||||
{{define "csrf"}}
|
|
||||||
<input type="hidden" name="csrf" value="{{.CSRF}}"/>
|
|
||||||
{{end}}
|
|
||||||
|
|
||||||
{{define "field-errors"}}
|
|
||||||
{{- range .}}
|
|
||||||
<p class="help is-danger">{{.}}</p>
|
|
||||||
{{- end}}
|
|
||||||
{{end}}
|
|
@ -1,21 +0,0 @@
|
|||||||
{{define "messages"}}
|
|
||||||
{{- range (.GetMessages "success")}}
|
|
||||||
{{template "message" dict "Type" "success" "Text" .}}
|
|
||||||
{{- end}}
|
|
||||||
{{- range (.GetMessages "info")}}
|
|
||||||
{{template "message" dict "Type" "info" "Text" .}}
|
|
||||||
{{- end}}
|
|
||||||
{{- range (.GetMessages "warning")}}
|
|
||||||
{{template "message" dict "Type" "warning" "Text" .}}
|
|
||||||
{{- end}}
|
|
||||||
{{- range (.GetMessages "danger")}}
|
|
||||||
{{template "message" dict "Type" "danger" "Text" .}}
|
|
||||||
{{- end}}
|
|
||||||
{{end}}
|
|
||||||
|
|
||||||
{{define "message"}}
|
|
||||||
<div class="notification is-light is-{{.Type}}" x-data="{show: true}" x-show="show">
|
|
||||||
<button class="delete" @click="show = false"></button>
|
|
||||||
{{.Text}}
|
|
||||||
</div>
|
|
||||||
{{end}}
|
|
@ -1,35 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html lang="en">
|
|
||||||
<head>
|
|
||||||
{{template "metatags" .}}
|
|
||||||
{{template "css" .}}
|
|
||||||
{{template "js" .}}
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<section class="hero is-info is-fullheight">
|
|
||||||
<div class="hero-body">
|
|
||||||
<div class="container">
|
|
||||||
<div class="columns is-centered">
|
|
||||||
<div class="column is-half">
|
|
||||||
{{- if .Title}}
|
|
||||||
<h1 class="title">{{.Title}}</h1>
|
|
||||||
{{- end}}
|
|
||||||
<div class="box">
|
|
||||||
{{template "messages" .}}
|
|
||||||
{{template "content" .}}
|
|
||||||
|
|
||||||
<div class="content is-small has-text-centered" hx-boost="true">
|
|
||||||
<a href="{{url "login"}}">Login</a> ◌
|
|
||||||
<a href="{{url "register"}}">Create an account</a> ◌
|
|
||||||
<a href="{{url "forgot_password"}}">Forgot password?</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
{{template "footer" .}}
|
|
||||||
</body>
|
|
||||||
</html>
|
|
@ -1 +0,0 @@
|
|||||||
{{template "content" .}}
|
|
@ -1,92 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html lang="en" style="height:100%;">
|
|
||||||
<head>
|
|
||||||
{{template "metatags" .}}
|
|
||||||
{{template "css" .}}
|
|
||||||
{{template "js" .}}
|
|
||||||
</head>
|
|
||||||
<body class="has-background-light" style="min-height:100%;">
|
|
||||||
<nav class="navbar is-dark">
|
|
||||||
<div class="container">
|
|
||||||
<div class="navbar-brand" hx-boost="true">
|
|
||||||
<a href="{{url "home"}}" class="navbar-item">{{.AppName}}</a>
|
|
||||||
</div>
|
|
||||||
<div id="navbarMenu" class="navbar-menu">
|
|
||||||
<div class="navbar-end">
|
|
||||||
{{template "search" .}}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</nav>
|
|
||||||
|
|
||||||
<div class="container mt-5">
|
|
||||||
<div class="columns">
|
|
||||||
<div class="column is-2">
|
|
||||||
<aside class="menu" hx-boost="true">
|
|
||||||
<p class="menu-label">General</p>
|
|
||||||
<ul class="menu-list">
|
|
||||||
<li>{{link (url "home") "Dashboard" .Path}}</li>
|
|
||||||
<li>{{link (url "about") "About" .Path}}</li>
|
|
||||||
<li>{{link (url "contact") "Contact" .Path}}</li>
|
|
||||||
<li>{{link (url "cache") "Cache" .Path}}</li>
|
|
||||||
<li>{{link (url "task") "Task" .Path}}</li>
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
<p class="menu-label">Account</p>
|
|
||||||
<ul class="menu-list">
|
|
||||||
{{- if .IsAuth}}
|
|
||||||
<li>{{link (url "logout") "Logout" .Path}}</li>
|
|
||||||
{{- else}}
|
|
||||||
<li>{{link (url "login") "Login" .Path}}</li>
|
|
||||||
<li>{{link (url "register") "Register" .Path}}</li>
|
|
||||||
<li>{{link (url "forgot_password") "Forgot password" .Path}}</li>
|
|
||||||
{{- end}}
|
|
||||||
</ul>
|
|
||||||
</aside>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="column is-10">
|
|
||||||
<div class="box">
|
|
||||||
{{- if .Title}}
|
|
||||||
<h1 class="title">{{.Title}}</h1>
|
|
||||||
{{- end}}
|
|
||||||
|
|
||||||
{{template "messages" .}}
|
|
||||||
{{template "content" .}}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{{template "footer" .}}
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
|
|
||||||
{{define "search"}}
|
|
||||||
<div class="search mr-2 mt-1" x-data="{modal:false}">
|
|
||||||
<input class="input" type="search" placeholder="Search..." @click="modal = true; $nextTick(() => $refs.input.focus());"/>
|
|
||||||
<div class="modal" :class="modal ? 'is-active' : ''" x-show="modal == true">
|
|
||||||
<div class="modal-background"></div>
|
|
||||||
<div class="modal-content" @click.away="modal = false;">
|
|
||||||
<div class="box">
|
|
||||||
<h2 class="subtitle">Search</h2>
|
|
||||||
<p class="control">
|
|
||||||
<input
|
|
||||||
hx-get="{{url "search"}}"
|
|
||||||
hx-trigger="keyup changed delay:500ms"
|
|
||||||
hx-target="#results"
|
|
||||||
name="query"
|
|
||||||
class="input"
|
|
||||||
type="search"
|
|
||||||
placeholder="Search..."
|
|
||||||
x-ref="input"
|
|
||||||
/>
|
|
||||||
</p>
|
|
||||||
<div class="block"></div>
|
|
||||||
<div id="results"></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<button class="modal-close is-large" aria-label="close"></button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{{end}}
|
|
@ -1,18 +1,17 @@
|
|||||||
package templates
|
package templates
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestGet(t *testing.T) {
|
func TestGet(t *testing.T) {
|
||||||
_, err := Get().Open(fmt.Sprintf("pages/%s.gohtml", PageHome))
|
_, err := Get().Open("emails/test.gohtml")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestGetOS(t *testing.T) {
|
func TestGetOS(t *testing.T) {
|
||||||
_, err := GetOS().Open(fmt.Sprintf("pages/%s.gohtml", PageHome))
|
_, err := GetOS().Open("emails/test.gohtml")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user