refactorings

3 days ago · 67dc59c0e9
parent 38bab59e0f
commit 67dc59c0e9
4 changed files with 32 additions and 9 deletions
--- a/src/main/kotlin/wanijo/wanijo2/http/controller/ShowController.kt
+++ b/src/main/kotlin/wanijo/wanijo2/http/controller/ShowController.kt
@ -18,6 +18,9 @@ class ShowController(
    val tagDao: TagDao
 ) {

+    val markdownParser: Parser = Parser.builder().build()
+    val htmlRenderer: HtmlRenderer = HtmlRenderer.builder().build()
+
    @GetMapping("/document/{id}")
    fun show(
        model: Model,
@ -26,11 +29,9 @@ class ShowController(
        val document = docDao.findById(id) ?: throw DocumentNotFound()
        model["document"] = document

-
-        val descHtml = Parser.builder().build().parse(document.description).let {
-            HtmlRenderer.builder().build().render(it)
+        model["descHtml"] = markdownParser.parse(document.description).let {
+            htmlRenderer.render(it)
        }
-        model["descHtml"] = descHtml

        val documentTags = tagDao.ofDocument(id)
        model["documentTags"] = documentTags.sortedBy { it.name.lowercase() }
--- a/src/main/resources/static/stylesheet.css
+++ b/src/main/resources/static/stylesheet.css
@ -74,7 +74,10 @@ main {
    .tag-block {
        border: 1px solid var(--light-grey);
        border-left: .5rem solid AccentColor;
-        padding: .2rem .2rem .2rem .5rem;
+
+        [type=submit] {
+            padding: .5rem;
+        }
    }

    fieldset {
@ -132,6 +135,25 @@ form {
    }
 }

+form.vert {
+    display: grid;
+    grid-template-columns: 100%;
+    grid-auto-flow: row;
+    row-gap: 1rem;
+
+    label {
+        grid-column: 1;
+    }
+
+    input, textarea, select, button, .form__widget {
+        grid-column: 1;
+    }
+
+    textarea {
+        min-height: 20rem;
+    }
+}
+
 .form-link {
    display: inline;

--- a/src/main/resources/templates/new.html
+++ b/src/main/resources/templates/new.html
@ -8,7 +8,7 @@
    </head>
    <body>
        <main id="content" layout:fragment="content">
-            <form th:action="@{/document/new}" th:object="${form}" method="post">
+            <form th:action="@{/document/new}" th:object="${form}" method="post" class="vert">
                <label for="name">name</label>
                <input id="name" type="text" th:field="*{name}" required>

@ -24,7 +24,7 @@
                    </label>
                </div>

-                <label for="tags">tags</label>
+                <label for="tags">tags <small>(csv)</small></label>
                <input id="tags" type="text" th:field="*{newTags}">

                <button type="submit">
--- a/src/main/resources/templates/show.html
+++ b/src/main/resources/templates/show.html
@ -71,7 +71,7 @@
                        <form class="form-inline" th:action="@{/document/{id}/field/label/delete(id=${document.id})}" method="post">
                            <input type="hidden" name="labelFieldId" th:value="${field.id}">
                            <input type="hidden" name="documentId" th:value="${document.id}">
-                            <button type="submit" class="warning">weg</button>
+                            <button type="submit" class="warning">löschen</button>
                        </form>
                    </dt>
                    <dd th:text="${field.value}"></dd>
@ -87,7 +87,7 @@
                        <form class="form-inline" th:action="@{/document/{id}/field/date/delete(id=${document.id})}" method="post">
                            <input type="hidden" name="dateFieldId" th:value="${field.id}">
                            <input type="hidden" name="documentId" th:value="${document.id}">
-                            <button type="submit" class="warning">weg</button>
+                            <button type="submit" class="warning">löschen</button>
                        </form>
                    </dt>
                    <dd th:text="${#temporals.format(field.value, 'yyyy-MM-dd HH:mm')}"></dd>