Get reply posts rendering. Add ability to make replies
This commit is contained in:
@@ -89,7 +89,7 @@ func GetThreadPosts(db *sql.DB, threadId int) ([]Post, error) {
|
|||||||
return result, rows.Err()
|
return result, rows.Err()
|
||||||
}
|
}
|
||||||
|
|
||||||
func PutBoardThread(db *sql.DB, boardSlug string, subject string, body string) error {
|
func PutThread(db *sql.DB, boardSlug string, subject string, body string) error {
|
||||||
tx, err := db.Begin()
|
tx, err := db.Begin()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -117,3 +117,12 @@ func PutBoardThread(db *sql.DB, boardSlug string, subject string, body string) e
|
|||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func PutPost(db *sql.DB, threadId int, body string) error {
|
||||||
|
_, err := db.Exec(`INSERT INTO posts (thread_id, body) VALUES (?, ?)`, threadId, body)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|||||||
@@ -50,3 +50,7 @@ INSERT INTO boards (slug, name, tag) VALUES
|
|||||||
(SELECT id FROM threads WHERE subject LIKE 'Welcome to /comfy/.%'),
|
(SELECT id FROM threads WHERE subject LIKE 'Welcome to /comfy/.%'),
|
||||||
'Post comfy. Be nice.'
|
'Post comfy. Be nice.'
|
||||||
);
|
);
|
||||||
|
INSERT INTO posts (thread_id, body) VALUES (
|
||||||
|
(SELECT id FROM threads WHERE subject LIKE 'Welcome to /comfy/.%'),
|
||||||
|
'Henlo fren.'
|
||||||
|
);
|
||||||
|
|||||||
+38
-2
@@ -100,21 +100,57 @@ func main() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if len(posts) == 0 {
|
||||||
|
http.Error(w, "Malformed thread", http.StatusInternalServerError)
|
||||||
|
log.Printf("Thread %d has no posts", thread.Id)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
views.Thread(board, thread, posts).Render(r.Context(), w)
|
views.Thread(board, thread, posts).Render(r.Context(), w)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
r.Post("/{slug}/threads/{threadId}", func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
// slug := chi.URLParam(r, "slug")
|
||||||
|
// TODO: use relative thread_nums (see issue #1)
|
||||||
|
threadIdStr := chi.URLParam(r, "threadId")
|
||||||
|
threadId, err := strconv.Atoi(threadIdStr)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, "Invalid thread id", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := r.ParseForm(); err != nil {
|
||||||
|
http.Error(w, "Bad form data", http.StatusBadRequest)
|
||||||
|
log.Printf("ParseForm: %v", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
body := r.FormValue("body")
|
||||||
|
|
||||||
|
if err := database.PutPost(db, threadId, body); err != nil {
|
||||||
|
http.Error(w, "Failed to create post", http.StatusInternalServerError)
|
||||||
|
log.Printf("PutPost: %v", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
r.Post("/{slug}/threads", func(w http.ResponseWriter, r *http.Request) {
|
r.Post("/{slug}/threads", func(w http.ResponseWriter, r *http.Request) {
|
||||||
slug := chi.URLParam(r, "slug")
|
slug := chi.URLParam(r, "slug")
|
||||||
|
|
||||||
if err := r.ParseForm(); err != nil {
|
if err := r.ParseForm(); err != nil {
|
||||||
http.Error(w, "Bad form data", http.StatusBadRequest)
|
http.Error(w, "Bad form data", http.StatusBadRequest)
|
||||||
|
log.Printf("ParseForm: %v", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
subject := r.FormValue("subject")
|
subject := r.FormValue("subject")
|
||||||
body := r.FormValue("body")
|
body := r.FormValue("body")
|
||||||
|
|
||||||
database.PutBoardThread(db, slug, subject, body)
|
if err := database.PutThread(db, slug, subject, body); err != nil {
|
||||||
|
http.Error(w, "Failed to create thread", http.StatusInternalServerError)
|
||||||
|
log.Printf("PutThread: %v", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
// -----------------
|
// -----------------
|
||||||
@@ -143,7 +179,7 @@ func main() {
|
|||||||
|
|
||||||
if len(posts) == 0 {
|
if len(posts) == 0 {
|
||||||
http.Error(w, "Malformed thread", http.StatusInternalServerError)
|
http.Error(w, "Malformed thread", http.StatusInternalServerError)
|
||||||
log.Printf("GetThreadPosts: %v", err)
|
log.Printf("Thread %d has no posts", thread.Id)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+49
-7
@@ -11,7 +11,6 @@ body {
|
|||||||
margin-bottom: 50px;
|
margin-bottom: 50px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* BOARD LIST */
|
/* BOARD LIST */
|
||||||
|
|
||||||
#boardList {
|
#boardList {
|
||||||
@@ -28,7 +27,7 @@ body {
|
|||||||
color: #ff0000;
|
color: #ff0000;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* BOARDS */
|
/* BOARD */
|
||||||
|
|
||||||
.board-header {
|
.board-header {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
@@ -51,11 +50,7 @@ body {
|
|||||||
width: 300px;
|
width: 300px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.new-thread-container {
|
/* THREAD CATALOG */
|
||||||
width: max-content;
|
|
||||||
margin: auto;
|
|
||||||
margin-top: 16px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#catalog {
|
#catalog {
|
||||||
display: grid;
|
display: grid;
|
||||||
@@ -87,6 +82,9 @@ body {
|
|||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* NEW THREAD BUTTON/FORM */
|
||||||
|
|
||||||
#newThreadBtn {
|
#newThreadBtn {
|
||||||
margin-top: 12px;
|
margin-top: 12px;
|
||||||
background: none;
|
background: none;
|
||||||
@@ -102,11 +100,18 @@ body {
|
|||||||
color: #ff0000
|
color: #ff0000
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#newPostForm button,
|
||||||
#newThreadForm button {
|
#newThreadForm button {
|
||||||
display: block;
|
display: block;
|
||||||
margin-left: auto;
|
margin-left: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.new-thread-container {
|
||||||
|
width: max-content;
|
||||||
|
margin: auto;
|
||||||
|
margin-top: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
.new-thread-form-field th {
|
.new-thread-form-field th {
|
||||||
border: 1px solid black;
|
border: 1px solid black;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
@@ -122,6 +127,43 @@ body {
|
|||||||
margin: 2px;
|
margin: 2px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* THREAD/POSTS */
|
||||||
|
|
||||||
|
.thread {
|
||||||
|
margin: 2rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.thread-subject {
|
||||||
|
font-weight: bold;
|
||||||
|
color: #b294bb;
|
||||||
|
margin-right: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.post-header {
|
||||||
|
display: flex;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.post-header span {
|
||||||
|
margin-right: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.post-author {
|
||||||
|
color: #13A82A;
|
||||||
|
}
|
||||||
|
|
||||||
|
.op-post {
|
||||||
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.post {
|
||||||
|
padding: 10px;
|
||||||
|
background-color: #D6DAF0;
|
||||||
|
border: 1px solid #282a2e;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
/* GENERAL LAYOUT */
|
/* GENERAL LAYOUT */
|
||||||
|
|
||||||
.container {
|
.container {
|
||||||
|
|||||||
@@ -1,12 +1,54 @@
|
|||||||
package views
|
package views
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"github.com/dominicf2001/comfychan/internal/database"
|
"github.com/dominicf2001/comfychan/internal/database"
|
||||||
"github.com/dominicf2001/comfychan/web/views/shared"
|
"github.com/dominicf2001/comfychan/web/views/shared"
|
||||||
|
"strconv"
|
||||||
)
|
)
|
||||||
|
|
||||||
templ Thread(board database.Board, thread database.Thread, posts []database.Post) {
|
templ Thread(board database.Board, thread database.Thread, posts []database.Post) {
|
||||||
@shared.Layout() {
|
@shared.Layout() {
|
||||||
@BoardHeader(board)
|
@BoardHeader(board)
|
||||||
|
<div class="new-thread-container">
|
||||||
|
<form id="newPostForm" hx-swap="none" hx-post={ fmt.Sprintf("/%s/threads/%d", board.Slug, thread.Id) }>
|
||||||
|
<table>
|
||||||
|
<tbody>
|
||||||
|
<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>
|
||||||
|
</div>
|
||||||
|
<div class="thread">
|
||||||
|
<article class="op-post">
|
||||||
|
<header class="post-header">
|
||||||
|
<h1 class="thread-subject">{ thread.Subject } -</h1>
|
||||||
|
<span class="post-author">{ posts[0].Author }</span>
|
||||||
|
<span class="post-date">{ posts[0].CreatedAt.Format("01/02/2006") }</span>
|
||||||
|
<span class="post-time">{ posts[0].CreatedAt.Format("15:04") }</span>
|
||||||
|
<span class="post-num">No. { strconv.Itoa(posts[0].Id) }</span>
|
||||||
|
</header>
|
||||||
|
<section>
|
||||||
|
<p>{ posts[0].Body }</p>
|
||||||
|
</section>
|
||||||
|
</article>
|
||||||
|
for _, post := range (posts[1:]) {
|
||||||
|
<article class="post">
|
||||||
|
<header class="post-header">
|
||||||
|
<span class="post-author">{ post.Author }</span>
|
||||||
|
<span class="post-date">{ post.CreatedAt.Format("01/02/2006") }</span>
|
||||||
|
<span class="post-time">{ post.CreatedAt.Format("15:04") }</span>
|
||||||
|
<span class="post-num">No. { strconv.Itoa(post.Id) }</span>
|
||||||
|
</header>
|
||||||
|
<section>
|
||||||
|
<p>{ post.Body }</p>
|
||||||
|
</section>
|
||||||
|
</article>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user