diff --git a/backend/src/db.mjs b/backend/src/db.mjs index 033d2a3..fc3e2f0 100644 --- a/backend/src/db.mjs +++ b/backend/src/db.mjs @@ -46,7 +46,7 @@ export class DB { * @param {!string} site url. * @param {!string} page path. * @param {!ObjType} comment. - * @return {!ObjType} inserted comment. + * @return {!Array} page comments. */ insertPageComment(site_url, path, comment) { return insertPageComment(this.my_db, site_url, path, comment); @@ -123,7 +123,7 @@ function insertPageComment(db, site_url, path, comment) { @message, @reply_to RETURNING - id as id, + id, user, user_website, message, @@ -131,7 +131,11 @@ function insertPageComment(db, site_url, path, comment) { reply_to ; `); - return stmt.all(object); + stmt.all(object); + + // return all comments because a new comment might have been added + // since the user loaded the page. + return getPageComments(db, site_url, path); } function getPageComments(db, site_url, path) { diff --git a/frontend/dist/index.html b/frontend/dist/index.html deleted file mode 100644 index 759b804..0000000 --- a/frontend/dist/index.html +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - ucs - - - - -
- - diff --git a/frontend/index.html b/frontend/index.html index 2047cce..be21494 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -7,12 +7,14 @@ ucs -
+ +
+ diff --git a/frontend/src/CommentForm.jsx b/frontend/src/CommentForm.jsx index 36877f3..bc5162f 100644 --- a/frontend/src/CommentForm.jsx +++ b/frontend/src/CommentForm.jsx @@ -2,20 +2,15 @@ import { useState } from "react"; import './style.css' function isValidHttpUrl(string) { - let url; - try { - url = new URL(string); + let url = new URL(string); + return url.protocol === "http:" || url.protocol === "https:"; } catch (_) { return false; } - - return url.protocol === "http:" || url.protocol === "https:"; } -export default function CommentForm({ url, site, path }) { - const [error, setError] = useState(null); - +export default function CommentForm({ url, site, path, setComments, setError }) { const handleSubmit = e => { e.preventDefault(); @@ -43,6 +38,7 @@ export default function CommentForm({ url, site, path }) { return; } + setError(null); fetch(url + '/api/' + site + '/' + path, { method: 'POST', headers: { @@ -52,18 +48,24 @@ export default function CommentForm({ url, site, path }) { }) .then(response => { if (response.ok) { - window.location.reload(); + response.json().then(comments => { + document.getElementById("ucs-comment-form").reset(); + setComments(comments); + // Not sure if I want to paste the comments or refresh the page. + // window.location.reload(); + }); } else { response.json().then((err) => { console.log(err); setError(err); }); } }) .catch(error => { console.log(error); + setError("שגיאת התחברות"); }); }; return ( -
+

כתיבת תגובה