From e86526761c81f3aed7a43b33ea5ba0be88573a17 Mon Sep 17 00:00:00 2001 From: Marco Realacci Date: Mon, 12 Dec 2022 18:06:56 +0100 Subject: [PATCH 01/73] Add comments under posts and fix user profile --- service/api/comments.go | 4 +- service/database/db-comments.go | 1 + webui/src/App.vue | 19 ++++++++- webui/src/components/Modal.vue | 27 ++++++++++++ webui/src/components/PostCard.vue | 64 ++++++++++++++++++++++++++-- webui/src/components/UserCard.vue | 61 +++++++++++++++++++++----- webui/src/main.js | 2 + webui/src/services/authentication.js | 4 ++ webui/src/services/axios.js | 3 +- webui/src/views/HomeView.vue | 5 +-- webui/src/views/LoginView.vue | 20 ++++++--- webui/src/views/ProfileView.vue | 28 +++++++----- webui/src/views/SearchView.vue | 5 +-- 13 files changed, 201 insertions(+), 42 deletions(-) create mode 100644 webui/src/components/Modal.vue create mode 100644 webui/src/services/authentication.js diff --git a/service/api/comments.go b/service/api/comments.go index b7f502f..aade789 100644 --- a/service/api/comments.go +++ b/service/api/comments.go @@ -89,14 +89,14 @@ func (rt *_router) PostComment(w http.ResponseWriter, r *http.Request, ps httpro } // check if the comment is valid (should not contain newlines and at be between 5 and 255 characters) - stat, err := regexp.Match(`^[*]{5, 255}$`, []byte(request_body.Comment)) + stat, err := regexp.Match(`^(.*)*`, []byte(request_body.Comment)) if err != nil { helpers.SendInternalError(err, "Error matching regex", w, rt.baseLogger) return } - if !stat { + if !stat || len(request_body.Comment) < 5 || len(request_body.Comment) > 255 { helpers.SendBadRequest(w, "Invalid comment", rt.baseLogger) return } diff --git a/service/database/db-comments.go b/service/database/db-comments.go index 9e4ff0c..3708732 100644 --- a/service/database/db-comments.go +++ b/service/database/db-comments.go @@ -103,6 +103,7 @@ func (db *appdbimpl) GetComments(uid string, photo_id int64, requesting_uid stri AND "bans"."ban" = ? ) AND "u"."uid" = "c"."user" + ORDER BY "c"."date" DESC LIMIT ? OFFSET ?`, photo_id, requesting_uid, limit, start_index) diff --git a/webui/src/App.vue b/webui/src/App.vue index 39dfa1f..f46c62f 100644 --- a/webui/src/App.vue +++ b/webui/src/App.vue @@ -1,13 +1,28 @@ + @@ -69,7 +84,7 @@ export default { - + diff --git a/webui/src/components/Modal.vue b/webui/src/components/Modal.vue new file mode 100644 index 0000000..b53788b --- /dev/null +++ b/webui/src/components/Modal.vue @@ -0,0 +1,27 @@ + + + \ No newline at end of file diff --git a/webui/src/components/PostCard.vue b/webui/src/components/PostCard.vue index 3c1db9a..6e23e4d 100644 --- a/webui/src/components/PostCard.vue +++ b/webui/src/components/PostCard.vue @@ -1,18 +1,53 @@ - - diff --git a/webui/src/components/PostCard.vue b/webui/src/components/PostCard.vue index 6e23e4d..9673fa1 100644 --- a/webui/src/components/PostCard.vue +++ b/webui/src/components/PostCard.vue @@ -1,12 +1,9 @@ - - + \ No newline at end of file diff --git a/webui/src/views/LoginView.vue b/webui/src/views/LoginView.vue index b39a68a..5489cea 100644 --- a/webui/src/views/LoginView.vue +++ b/webui/src/views/LoginView.vue @@ -1,6 +1,4 @@ diff --git a/webui/src/views/ProfileView.vue b/webui/src/views/ProfileView.vue index dc5ee1c..51f7640 100644 --- a/webui/src/views/ProfileView.vue +++ b/webui/src/views/ProfileView.vue @@ -1,5 +1,4 @@ @@ -90,7 +85,7 @@ export default { :name = "user_data['name']" :followed = "user_data['followed']" :banned = "user_data['banned']" - :my_id = "getCurrentSession" + :my_id = "this.$currentSession" :show_new_post = "true" @updateInfo = "getMainData" @updatePosts = "refresh" /> @@ -128,9 +123,7 @@ export default { - - diff --git a/webui/src/views/SearchView.vue b/webui/src/views/SearchView.vue index bebfd5a..63bc581 100644 --- a/webui/src/views/SearchView.vue +++ b/webui/src/views/SearchView.vue @@ -1,50 +1,47 @@