From d3784b0337c3e5053eea3e98b5677e9a171b030b Mon Sep 17 00:00:00 2001
From: Niko Abeler <niko@rerere.org>
Date: Thu, 6 Jul 2023 22:16:52 +0200
Subject: [PATCH] editor list

---
 cmd/owl/editor_test.go               |  48 ++++++++++++++++++++++++
 main.go => cmd/owl/main.go           |  10 +++--
 test/fixtures/test.png               | Bin 0 -> 3118 bytes
 web/app.go                           |  16 ++++----
 web/editor_handler.go                |  31 +++++++++++++---
 web/editor_list_handler.go           |  53 +++++++++++++++++++++++++++
 web/templates/base.tmpl              |  18 +++++++++
 web/templates/views/editor_list.tmpl |  12 ++++++
 8 files changed, 173 insertions(+), 15 deletions(-)
 create mode 100644 cmd/owl/editor_test.go
 rename main.go => cmd/owl/main.go (79%)
 create mode 100644 test/fixtures/test.png
 create mode 100644 web/editor_list_handler.go
 create mode 100644 web/templates/base.tmpl
 create mode 100644 web/templates/views/editor_list.tmpl

diff --git a/cmd/owl/editor_test.go b/cmd/owl/editor_test.go
new file mode 100644
index 0000000..a7735a5
--- /dev/null
+++ b/cmd/owl/editor_test.go
@@ -0,0 +1,48 @@
+package main
+
+import (
+	"bytes"
+	"io"
+	"mime/multipart"
+	"net/http/httptest"
+	"os"
+	"path"
+	"path/filepath"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestEditorFormGet(t *testing.T) {
+	app := App().FiberApp
+
+	req := httptest.NewRequest("GET", "/editor/ImageEntry", nil)
+	resp, err := app.Test(req)
+	require.NoError(t, err)
+	require.Equal(t, 200, resp.StatusCode)
+}
+
+func TestEditorFormPost(t *testing.T) {
+	app := App().FiberApp
+
+	fileDir, _ := os.Getwd()
+	fileName := "../../test/fixtures/test.png"
+	filePath := path.Join(fileDir, fileName)
+
+	file, err := os.Open(filePath)
+	require.NoError(t, err)
+	defer file.Close()
+
+	body := &bytes.Buffer{}
+	writer := multipart.NewWriter(body)
+	part, _ := writer.CreateFormFile("ImagePath", filepath.Base(file.Name()))
+	io.Copy(part, file)
+	part, _ = writer.CreateFormField("Content")
+	io.WriteString(part, "test content")
+	writer.Close()
+
+	req := httptest.NewRequest("POST", "/editor/ImageEntry", nil)
+	resp, err := app.Test(req)
+	require.NoError(t, err)
+	require.Equal(t, 200, resp.StatusCode)
+}
diff --git a/main.go b/cmd/owl/main.go
similarity index 79%
rename from main.go
rename to cmd/owl/main.go
index 6cb60bc..22ae34d 100644
--- a/main.go
+++ b/cmd/owl/main.go
@@ -7,7 +7,7 @@ import (
 	"owl-blogs/web"
 )
 
-func main() {
+func App() *web.WebApp {
 	db := infra.NewSqliteDB("owlblogs.db")
 	registry := app.NewEntryTypeRegistry()
 
@@ -15,6 +15,10 @@ func main() {
 
 	repo := infra.NewEntryRepository(db, registry)
 	entryService := app.NewEntryService(repo)
-	webApp := web.NewWebApp(entryService)
-	webApp.Run()
+	return web.NewWebApp(entryService, registry)
+
+}
+
+func main() {
+	App().Run()
 }
diff --git a/test/fixtures/test.png b/test/fixtures/test.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb234fd01e2b8d41d180101c5e61ed3575fa7b02
GIT binary patch
literal 3118
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
IM6N<$f(GK*5dZ)H

literal 0
HcmV?d00001

diff --git a/web/app.go b/web/app.go
index 6e29301..dd08d47 100644
--- a/web/app.go
+++ b/web/app.go
@@ -7,11 +7,11 @@ import (
 )
 
 type WebApp struct {
-	app          *fiber.App
+	FiberApp     *fiber.App
 	entryService *app.EntryService
 }
 
-func NewWebApp(entryService *app.EntryService) *WebApp {
+func NewWebApp(entryService *app.EntryService, typeRegistry *app.EntryTypeRegistry) *WebApp {
 	app := fiber.New()
 
 	indexHandler := NewIndexHandler(entryService)
@@ -20,7 +20,8 @@ func NewWebApp(entryService *app.EntryService) *WebApp {
 	mediaHandler := NewMediaHandler(entryService)
 	rssHandler := NewRSSHandler(entryService)
 	loginHandler := NewLoginHandler(entryService)
-	editorHandler := NewEditorHandler(entryService)
+	editorListHandler := NewEditorListHandler(typeRegistry)
+	editorHandler := NewEditorHandler(entryService, typeRegistry)
 
 	// app.ServeFiles("/static/*filepath", http.Dir(repo.StaticDir()))
 	app.Get("/", indexHandler.Handle)
@@ -28,8 +29,9 @@ func NewWebApp(entryService *app.EntryService) *WebApp {
 	// Editor
 	app.Get("/editor/auth/", loginHandler.HandleGet)
 	app.Post("/editor/auth/", loginHandler.HandlePost)
-	app.Get("/editor/", editorHandler.HandleGet)
-	app.Post("/editor/", editorHandler.HandlePost)
+	app.Get("/editor/", editorListHandler.Handle)
+	app.Get("/editor/:editor/", editorHandler.HandleGet)
+	app.Post("/editor/:editor/", editorHandler.HandlePost)
 	// Media
 	app.Get("/media/*filepath", mediaHandler.Handle)
 	// RSS
@@ -48,9 +50,9 @@ func NewWebApp(entryService *app.EntryService) *WebApp {
 	// app.Post("/auth/token/", userAuthTokenHandler(repo))
 	// app.Get("/.well-known/oauth-authorization-server", userAuthMetadataHandler(repo))
 	// app.NotFound = http.HandlerFunc(notFoundHandler(repo))
-	return &WebApp{app: app, entryService: entryService}
+	return &WebApp{FiberApp: app, entryService: entryService}
 }
 
 func (w *WebApp) Run() {
-	w.app.Listen(":3000")
+	w.FiberApp.Listen(":3000")
 }
diff --git a/web/editor_handler.go b/web/editor_handler.go
index 47ec8e1..b80675c 100644
--- a/web/editor_handler.go
+++ b/web/editor_handler.go
@@ -11,15 +11,31 @@ import (
 
 type EditorHandler struct {
 	entrySvc *app.EntryService
+	registry *app.EntryTypeRegistry
 }
 
-func NewEditorHandler(entryService *app.EntryService) *EditorHandler {
-	return &EditorHandler{entrySvc: entryService}
+func NewEditorHandler(entryService *app.EntryService, registry *app.EntryTypeRegistry) *EditorHandler {
+	return &EditorHandler{entrySvc: entryService, registry: registry}
+}
+
+func (h *EditorHandler) paramToEntry(c *fiber.Ctx) (model.Entry, error) {
+	typeName := c.Params("editor")
+	entryType, err := h.registry.Type(typeName)
+	if err != nil {
+		return nil, err
+	}
+	return entryType, nil
 }
 
 func (h *EditorHandler) HandleGet(c *fiber.Ctx) error {
 	c.Set(fiber.HeaderContentType, fiber.MIMETextHTML)
-	form := editor.NewEntryForm(&model.ImageEntry{})
+
+	entryType, err := h.paramToEntry(c)
+	if err != nil {
+		return err
+	}
+
+	form := editor.NewEntryForm(entryType)
 	htmlForm, err := form.HtmlForm()
 	if err != nil {
 		return err
@@ -30,7 +46,12 @@ func (h *EditorHandler) HandleGet(c *fiber.Ctx) error {
 func (h *EditorHandler) HandlePost(c *fiber.Ctx) error {
 	c.Set(fiber.HeaderContentType, fiber.MIMETextHTML)
 
-	form := editor.NewEntryForm(&model.ImageEntry{})
+	entryType, err := h.paramToEntry(c)
+	if err != nil {
+		return err
+	}
+
+	form := editor.NewEntryForm(entryType)
 	// get form data
 	metaData, err := form.Parse(c)
 	if err != nil {
@@ -39,7 +60,7 @@ func (h *EditorHandler) HandlePost(c *fiber.Ctx) error {
 
 	// create entry
 	now := time.Now()
-	entry := &model.ImageEntry{}
+	entry := entryType
 	err = h.entrySvc.Create(entry, &now, metaData.MetaData())
 	if err != nil {
 		return err
diff --git a/web/editor_list_handler.go b/web/editor_list_handler.go
new file mode 100644
index 0000000..feafe33
--- /dev/null
+++ b/web/editor_list_handler.go
@@ -0,0 +1,53 @@
+package web
+
+import (
+	"embed"
+	"owl-blogs/app"
+	"text/template"
+
+	"github.com/gofiber/fiber/v2"
+)
+
+//go:embed templates
+var templates embed.FS
+
+type EditorListHandler struct {
+	registry *app.EntryTypeRegistry
+	ts       *template.Template
+}
+
+type EditorListContext struct {
+	Types []string
+}
+
+func NewEditorListHandler(registry *app.EntryTypeRegistry) *EditorListHandler {
+	ts, err := template.ParseFS(
+		templates,
+		"templates/base.tmpl",
+		"templates/views/editor_list.tmpl",
+	)
+
+	if err != nil {
+		panic(err)
+	}
+
+	return &EditorListHandler{
+		registry: registry,
+		ts:       ts,
+	}
+
+}
+
+func (h *EditorListHandler) Handle(c *fiber.Ctx) error {
+	c.Set(fiber.HeaderContentType, fiber.MIMETextHTML)
+
+	types := h.registry.Types()
+	typeNames := []string{}
+
+	for _, t := range types {
+		name, _ := h.registry.TypeName(t)
+		typeNames = append(typeNames, name)
+	}
+
+	return h.ts.ExecuteTemplate(c, "base", &EditorListContext{Types: typeNames})
+}
diff --git a/web/templates/base.tmpl b/web/templates/base.tmpl
new file mode 100644
index 0000000..8e3b572
--- /dev/null
+++ b/web/templates/base.tmpl
@@ -0,0 +1,18 @@
+{{define "base"}}
+<!doctype html>
+<html lang='en'>
+    <head>
+        <meta charset='utf-8'>
+        <title>{{template "title" .}} - Owl Blog</title>
+    </head>
+    <body>
+        <header>
+            Owl Blog
+        </header>
+        <main>
+            {{template "main" .}}
+        </main>
+        <footer>Powered by <a href='https://golang.org/'>Go</a></footer>
+    </body>
+</html>
+{{end}}
\ No newline at end of file
diff --git a/web/templates/views/editor_list.tmpl b/web/templates/views/editor_list.tmpl
new file mode 100644
index 0000000..4af68b6
--- /dev/null
+++ b/web/templates/views/editor_list.tmpl
@@ -0,0 +1,12 @@
+{{define "title"}}Editor List{{end}}
+
+{{define "main"}}
+
+<h1>Editor List</h1>
+
+<ul>
+{{range .Types}}
+<li><a href="/editor/{{.}}">{{.}}</a></li>
+{{end}}
+
+{{end}}
\ No newline at end of file