Some database refactoring
This commit is contained in:
@@ -64,7 +64,7 @@ body {
|
||||
margin: 2rem;
|
||||
}
|
||||
|
||||
.thread-catalog-post {
|
||||
.catalog-post {
|
||||
padding: 10px;
|
||||
border: 2px solid rgba(111, 111, 111, 0.34);
|
||||
min-width: 140px;
|
||||
@@ -72,17 +72,21 @@ body {
|
||||
max-height: 192px;
|
||||
}
|
||||
|
||||
.thread-catalog-post h1 {
|
||||
.catalog-post h1 {
|
||||
font-size: 14px;
|
||||
color: #0F0C5D;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.thread-catalog-post p {
|
||||
.catalog-post p {
|
||||
margin-top: 10px;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.catalog-post-link {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
#newThreadBtn {
|
||||
margin-top: 12px;
|
||||
background: none;
|
||||
@@ -103,8 +107,6 @@ body {
|
||||
margin-left: auto;
|
||||
}
|
||||
|
||||
.new-thread-form-field {}
|
||||
|
||||
.new-thread-form-field th {
|
||||
border: 1px solid black;
|
||||
text-align: left;
|
||||
|
||||
+41
-38
@@ -1,48 +1,51 @@
|
||||
package views
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
database "github.com/dominicf2001/comfychan/internal/database"
|
||||
"github.com/dominicf2001/comfychan/web/views/shared"
|
||||
"fmt"
|
||||
database "github.com/dominicf2001/comfychan/internal/database"
|
||||
"github.com/dominicf2001/comfychan/web/views/shared"
|
||||
)
|
||||
|
||||
templ NewThreadForm(board database.Board) {
|
||||
<form
|
||||
style="display: none;"
|
||||
id="newThreadForm"
|
||||
hx-swap="none"
|
||||
hx-post={ fmt.Sprintf("/boards/%d/threads", board.Id) }
|
||||
_="on htmx:afterRequest hide me then show #newThreadBtn then trigger refreshThreads on body"
|
||||
>
|
||||
<table>
|
||||
<tbody>
|
||||
<tr class="new-thread-form-field">
|
||||
<th>Subject</th>
|
||||
<td><input name="subject"/></td>
|
||||
</tr>
|
||||
<tr class="new-thread-form-field">
|
||||
<th>Comment</th>
|
||||
<td><textarea name="body" required></textarea></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<button type="submit">Submit</button>
|
||||
</form>
|
||||
<form style="display: none;" id="newThreadForm" hx-swap="none" hx-post={ fmt.Sprintf("/%s/threads", board.Slug) } _="on htmx:afterRequest
|
||||
hide me
|
||||
then show #newThreadBtn
|
||||
then trigger refreshThreads on body">
|
||||
<table>
|
||||
<tbody>
|
||||
<tr class="new-thread-form-field">
|
||||
<th>Subject</th>
|
||||
<td><input name="subject" /></td>
|
||||
</tr>
|
||||
<tr class="new-thread-form-field">
|
||||
<th>Comment</th>
|
||||
<td><textarea name="body" required></textarea></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<button type="submit">Submit</button>
|
||||
</form>
|
||||
}
|
||||
|
||||
templ BoardHeader(board database.Board) {
|
||||
<header class="board-header">
|
||||
<img src="/static/img/banner-comfy.png" />
|
||||
<h1>
|
||||
{ fmt.Sprintf("/%s/ - %s", board.Slug, board.Name) }
|
||||
</h1>
|
||||
<p>{ board.Tag }</p>
|
||||
</header>
|
||||
}
|
||||
|
||||
templ Board(board database.Board) {
|
||||
@shared.Layout() {
|
||||
<header class="board-header">
|
||||
<img src="/static/img/banner-comfy.png"/>
|
||||
<h1>
|
||||
{ fmt.Sprintf("/%s/ - %s", board.Slug, board.Name) }
|
||||
</h1>
|
||||
<p>{ board.Tag }</p>
|
||||
</header>
|
||||
<div class="new-thread-container">
|
||||
<button _="on click hide me then show #newThreadForm" id="newThreadBtn">[New Thread]</button>
|
||||
@NewThreadForm(board)
|
||||
</div>
|
||||
<div hx-get={ fmt.Sprintf("/hx/boards/%d/catalog", board.Id) } hx-trigger="load, refreshThreads from:body"></div>
|
||||
}
|
||||
@shared.Layout() {
|
||||
@BoardHeader(board)
|
||||
<div class="new-thread-container">
|
||||
<button _="on click
|
||||
hide me
|
||||
then show #newThreadForm" id="newThreadBtn">[New Thread]</button>
|
||||
@NewThreadForm(board)
|
||||
</div>
|
||||
<div hx-get={ fmt.Sprintf("/hx/%s/catalog", board.Slug) } hx-trigger="load, refreshThreads from:body"></div>
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
package views
|
||||
|
||||
import "github.com/dominicf2001/comfychan/internal/database"
|
||||
|
||||
templ Post(board database.Board) {
|
||||
BoardHeader(board)
|
||||
}
|
||||
@@ -3,17 +3,17 @@ package views
|
||||
import "github.com/dominicf2001/comfychan/internal/database"
|
||||
|
||||
type ThreadGridBoxViewModel struct {
|
||||
Thread database.Thread
|
||||
Posts []database.Post
|
||||
Thread database.Thread
|
||||
Posts []database.Post
|
||||
}
|
||||
|
||||
templ PostsCatalog(vms []ThreadGridBoxViewModel) {
|
||||
<div id="catalog">
|
||||
for _, vm := range vms {
|
||||
<div class="thread-catalog-post">
|
||||
<h1>{ vm.Thread.Subject }</h1>
|
||||
<p>{ vm.Posts[0].Body }</p>
|
||||
</div>
|
||||
}
|
||||
<div id="catalog">
|
||||
for _, vm := range vms {
|
||||
<div class="catalog-post">
|
||||
<h1><a class="catalog-post-link">{ vm.Thread.Subject }</a></h1>
|
||||
<p>{ vm.Posts[0].Body }</p>
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user