From 93184589bf5d10cd6216b906788c283e86f55704 Mon Sep 17 00:00:00 2001 From: Niko Abeler Date: Wed, 19 Jul 2023 20:54:18 +0200 Subject: [PATCH] markdown on note --- cmd/owl/media_test.go | 24 ++++++++++++++++++++++++ entry_types/note.go | 12 ++++++++++-- render/templates/entry/Note.tmpl | 1 + render/templates/entry/Page.tmpl | 2 +- 4 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 cmd/owl/media_test.go create mode 100644 render/templates/entry/Note.tmpl diff --git a/cmd/owl/media_test.go b/cmd/owl/media_test.go new file mode 100644 index 0000000..abbaaa8 --- /dev/null +++ b/cmd/owl/media_test.go @@ -0,0 +1,24 @@ +package main + +import ( + "net/http/httptest" + "owl-blogs/test" + "testing" + + "github.com/stretchr/testify/require" +) + +func TestMediaWithSpace(t *testing.T) { + db := test.NewMockDb() + owlApp := App(db) + app := owlApp.FiberApp + + _, err := owlApp.BinaryService.Create("name with space.jpg", []byte("111")) + require.NoError(t, err) + + req := httptest.NewRequest("GET", "/media/name%20with%20space.jpg", nil) + resp, err := app.Test(req) + require.NoError(t, err) + require.Equal(t, 200, resp.StatusCode) + +} diff --git a/entry_types/note.go b/entry_types/note.go index f7fb87d..590e9a5 100644 --- a/entry_types/note.go +++ b/entry_types/note.go @@ -1,6 +1,10 @@ package entrytypes -import "owl-blogs/domain/model" +import ( + "fmt" + "owl-blogs/domain/model" + "owl-blogs/render" +) type Note struct { model.EntryBase @@ -16,7 +20,11 @@ func (e *Note) Title() string { } func (e *Note) Content() model.EntryContent { - return model.EntryContent(e.meta.Content) + str, err := render.RenderTemplateToString("entry/Note", e) + if err != nil { + fmt.Println(err) + } + return model.EntryContent(str) } func (e *Note) MetaData() interface{} { diff --git a/render/templates/entry/Note.tmpl b/render/templates/entry/Note.tmpl new file mode 100644 index 0000000..f9e080a --- /dev/null +++ b/render/templates/entry/Note.tmpl @@ -0,0 +1 @@ +{{.MetaData.Content | markdown }} diff --git a/render/templates/entry/Page.tmpl b/render/templates/entry/Page.tmpl index bac8848..f9e080a 100644 --- a/render/templates/entry/Page.tmpl +++ b/render/templates/entry/Page.tmpl @@ -1 +1 @@ -{{.MetaData.Content}} +{{.MetaData.Content | markdown }}