Move comments to a turbo frame
This commit is contained in:
parent
7eee7d38c6
commit
849d4f74f2
|
@ -14,10 +14,12 @@ class Ajax::CommentController < AjaxController
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
|
comments = Comment.where(answer:).includes([{user: :profile}, :smiles])
|
||||||
|
|
||||||
@response[:status] = :okay
|
@response[:status] = :okay
|
||||||
@response[:message] = t(".success")
|
@response[:message] = t(".success")
|
||||||
@response[:success] = true
|
@response[:success] = true
|
||||||
@response[:render] = render_to_string(partial: 'answerbox/comments', locals: { a: answer })
|
@response[:render] = render_to_string(partial: 'answerbox/comments', locals: { a: answer, comments: })
|
||||||
@response[:count] = answer.comment_count
|
@response[:count] = answer.comment_count
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
class CommentController < ApplicationController
|
||||||
|
def index
|
||||||
|
answer = Answer.find(params[:id])
|
||||||
|
comments = Comment.where(answer:).includes([{user: :profile}, :smiles])
|
||||||
|
|
||||||
|
render "index", locals: { a: answer, comments: }
|
||||||
|
end
|
||||||
|
end
|
|
@ -1,8 +1,8 @@
|
||||||
- if a.comments.all.count.zero?
|
- if comments.all.count.zero?
|
||||||
= t(".none")
|
= t(".none")
|
||||||
- else
|
- else
|
||||||
%ul.comment__container
|
%ul.comment__container
|
||||||
- a.comments.order(:created_at).each do |comment|
|
- comments.order(:created_at).each do |comment|
|
||||||
%li.comment{ data: { comment_id: comment.id } }
|
%li.comment{ data: { comment_id: comment.id } }
|
||||||
%div{ style: "height: 0; width: 0" }= render "modal/comment_smiles", comment: comment
|
%div{ style: "height: 0; width: 0" }= render "modal/comment_smiles", comment: comment
|
||||||
.d-flex
|
.d-flex
|
||||||
|
@ -24,20 +24,3 @@
|
||||||
%button.btn.btn-link.btn-sm.dropdown-toggle{ data: { bs_toggle: :dropdown }, aria: { expanded: false } }
|
%button.btn.btn-link.btn-sm.dropdown-toggle{ data: { bs_toggle: :dropdown }, aria: { expanded: false } }
|
||||||
%span.caret
|
%span.caret
|
||||||
= render "actions/comment", comment: comment, answer: a
|
= render "actions/comment", comment: comment, answer: a
|
||||||
- if user_signed_in?
|
|
||||||
%button.d-none{ name: "ab-open-and-comment", data: { a_id: a.id, selection_hotkey: "c" } }
|
|
||||||
.comment__compose-wrapper{
|
|
||||||
name: "ab-comment-new-group",
|
|
||||||
data: { a_id: a.id, controller: "character-count", character_count_max_value: 512 }
|
|
||||||
}
|
|
||||||
.form-group.has-feedback.comment__input-group.input-group
|
|
||||||
%textarea.form-control.comment__input{ type: :text, placeholder: t(".placeholder"), name: "ab-comment-new", data: { a_id: a.id, "character-count-target": "input" } }
|
|
||||||
.comment__submit-wrapper
|
|
||||||
%button.btn.btn-primary{
|
|
||||||
type: :button,
|
|
||||||
name: "ab-comment-new-submit",
|
|
||||||
title: t(".action"),
|
|
||||||
data: { a_id: a.id, "character-count-target": "action" }
|
|
||||||
}
|
|
||||||
%i.fa.fa-paper-plane-o
|
|
||||||
%span.text-muted.form-control-feedback.comment__character-count{ id: "ab-comment-charcount-#{a.id}", data: { "character-count-target": "counter" } } 512
|
|
||||||
|
|
|
@ -35,5 +35,24 @@
|
||||||
.col-md-6.d-md-flex.answerbox__actions
|
.col-md-6.d-md-flex.answerbox__actions
|
||||||
= render "answerbox/actions", a:, display_all:, subscribed_answer_ids:
|
= render "answerbox/actions", a:, display_all:, subscribed_answer_ids:
|
||||||
.card-footer{ id: "ab-comments-section-#{a.id}", class: display_all.nil? ? "d-none" : nil }
|
.card-footer{ id: "ab-comments-section-#{a.id}", class: display_all.nil? ? "d-none" : nil }
|
||||||
%div{ id: "ab-smiles-#{a.id}" }= render "answerbox/smiles", a: a
|
= turbo_frame_tag("ab-comments-list-#{a.id}", src: comments_path(a.question, a), loading: :lazy) do
|
||||||
%div{ id: "ab-comments-#{a.id}" }= render "answerbox/comments", a: a
|
.d-flex.justify-content-center
|
||||||
|
.spinner-border{ role: :status }
|
||||||
|
.visually-hidden= t("voc.loading")
|
||||||
|
- if user_signed_in?
|
||||||
|
%button.d-none{ name: "ab-open-and-comment", data: { a_id: a.id, selection_hotkey: "c" } }
|
||||||
|
.comment__compose-wrapper{
|
||||||
|
name: "ab-comment-new-group",
|
||||||
|
data: { a_id: a.id, controller: "character-count", character_count_max_value: 512 }
|
||||||
|
}
|
||||||
|
.form-group.has-feedback.comment__input-group.input-group
|
||||||
|
%textarea.form-control.comment__input{ type: :text, placeholder: t(".comments.placeholder"), name: "ab-comment-new", data: { a_id: a.id, "character-count-target": "input" } }
|
||||||
|
.comment__submit-wrapper
|
||||||
|
%button.btn.btn-primary{
|
||||||
|
type: :button,
|
||||||
|
name: "ab-comment-new-submit",
|
||||||
|
title: t(".comments.action"),
|
||||||
|
data: { a_id: a.id, "character-count-target": "action" }
|
||||||
|
}
|
||||||
|
%i.fa.fa-paper-plane-o
|
||||||
|
%span.text-muted.form-control-feedback.comment__character-count{ id: "ab-comment-charcount-#{a.id}", data: { "character-count-target": "counter" } } 512
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
= turbo_frame_tag "ab-comments-list-#{a.id}" do
|
||||||
|
%div{ id: "ab-smiles-#{a.id}" }= render "answerbox/smiles", a:
|
||||||
|
%div{ id: "ab-comments-#{a.id}" }= render "answerbox/comments", a:, comments:
|
|
@ -117,18 +117,18 @@ en:
|
||||||
actions:
|
actions:
|
||||||
share:
|
share:
|
||||||
title: "Share"
|
title: "Share"
|
||||||
comments:
|
|
||||||
none: "There are no comments yet."
|
|
||||||
placeholder: "Comment..."
|
|
||||||
action: "Post comment"
|
|
||||||
smiles:
|
smiles:
|
||||||
none: "No one smiled this yet."
|
none: "No one smiled this yet."
|
||||||
|
comments:
|
||||||
|
none: "There are no comments yet."
|
||||||
application:
|
application:
|
||||||
answerbox:
|
answerbox:
|
||||||
read: "Read the entire answer"
|
read: "Read the entire answer"
|
||||||
answered: "%{hide} %{user}" # resolves into "Answered by %{user}"
|
answered: "%{hide} %{user}" # resolves into "Answered by %{user}"
|
||||||
hide: "Answered by"
|
hide: "Answered by"
|
||||||
pinned: "Pinned"
|
pinned: "Pinned"
|
||||||
|
comments:
|
||||||
|
placeholder: "Comment…"
|
||||||
questionbox:
|
questionbox:
|
||||||
title: "Ask something!"
|
title: "Ask something!"
|
||||||
placeholder: "Type your question here…"
|
placeholder: "Type your question here…"
|
||||||
|
|
|
@ -12,6 +12,7 @@ en:
|
||||||
follow: "Follow"
|
follow: "Follow"
|
||||||
format_markdown: "Styling with Markdown is supported"
|
format_markdown: "Styling with Markdown is supported"
|
||||||
load: "Load more"
|
load: "Load more"
|
||||||
|
loading: "Loading…"
|
||||||
login: "Sign in"
|
login: "Sign in"
|
||||||
logout: "Sign out"
|
logout: "Sign out"
|
||||||
mute: "Mute"
|
mute: "Mute"
|
||||||
|
|
|
@ -153,6 +153,7 @@ Rails.application.routes.draw do
|
||||||
get "/@:username/a/:id", to: "answer#show", as: :answer
|
get "/@:username/a/:id", to: "answer#show", as: :answer
|
||||||
post "/@:username/a/:id/pin", to: "answer#pin", as: :pin_answer
|
post "/@:username/a/:id/pin", to: "answer#pin", as: :pin_answer
|
||||||
delete "/@:username/a/:id/pin", to: "answer#unpin", as: :unpin_answer
|
delete "/@:username/a/:id/pin", to: "answer#unpin", as: :unpin_answer
|
||||||
|
get "/@:username/a/:id/comments", to: "comment#index", as: :comments
|
||||||
get "/@:username/q/:id", to: "question#show", as: :question
|
get "/@:username/q/:id", to: "question#show", as: :question
|
||||||
get "/@:username/followers", to: "user#followers", as: :show_user_followers
|
get "/@:username/followers", to: "user#followers", as: :show_user_followers
|
||||||
get "/@:username/followings", to: "user#followings", as: :show_user_followings
|
get "/@:username/followings", to: "user#followings", as: :show_user_followings
|
||||||
|
|
Loading…
Reference in New Issue