Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added ajax #18

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/controllers/comments_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ def new
def edit
respond_to do |format|
format.html
format.js
end
end

Expand All @@ -33,6 +34,7 @@ def create
if @comment.save
format.html { redirect_back fallback_location: root_path, notice: "Comment was successfully created." }
format.json { render :show, status: :created, location: @comment }
format.js
else
format.html { render :new, status: :unprocessable_entity }
format.json { render json: @comment.errors, status: :unprocessable_entity }
Expand All @@ -46,6 +48,7 @@ def update
if @comment.update(comment_params)
format.html { redirect_to root_url, notice: "Comment was successfully updated." }
format.json { render :show, status: :ok, location: @comment }
format.js
else
format.html { render :edit, status: :unprocessable_entity }
format.json { render json: @comment.errors, status: :unprocessable_entity }
Expand All @@ -59,6 +62,7 @@ def destroy
respond_to do |format|
format.html { redirect_back fallback_location: root_url, notice: "Comment was successfully destroyed." }
format.json { head :no_content }
format.js
end
end

Expand Down
2 changes: 2 additions & 0 deletions app/controllers/follow_requests_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ def create
if @follow_request.save
format.html { redirect_back fallback_location: root_url, notice: "Follow request was successfully created." }
format.json { render :show, status: :created, location: @follow_request }
format.js
else
format.html { render :new, status: :unprocessable_entity }
format.json { render json: @follow_request.errors, status: :unprocessable_entity }
Expand All @@ -54,6 +55,7 @@ def destroy
respond_to do |format|
format.html { redirect_back fallback_location: root_url, notice: "Follow request was successfully destroyed." }
format.json { head :no_content }
format.js
end
end

Expand Down
2 changes: 2 additions & 0 deletions app/controllers/likes_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ def create
if @like.save
format.html { redirect_back fallback_location: root_url, notice: "Like was successfully created." }
format.json { render :show, status: :created, location: @like }
format.js
else
format.html { render :new, status: :unprocessable_entity }
format.json { render json: @like.errors, status: :unprocessable_entity }
Expand All @@ -53,6 +54,7 @@ def destroy
respond_to do |format|
format.html { redirect_back fallback_location: root_url, notice: "Like was successfully destroyed." }
format.json { head :no_content }
format.js
end
end

Expand Down
6 changes: 3 additions & 3 deletions app/views/comments/_comment.html.erb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<li class="list-group-item">
<li id="<%= dom_id(comment)%>" class="list-group-item">
<div class="d-flex">
<div class="flex-shrink-0">
<%= image_tag comment.author.avatar_image, class: "rounded-circle mr-2", width: 36 %>
Expand All @@ -11,11 +11,11 @@
</div>
<div>
<% if current_user == comment.author %>
<%= link_to edit_comment_path(comment), class: "btn btn-link btn-sm text-muted" do %>
<%= link_to edit_comment_path(comment), class: "btn btn-link btn-sm text-muted", remote: true do %>
<i class="fas fa-edit fa-fw"></i>
<% end %>

<%= link_to comment, data: { turbo_method: :delete }, class: "btn btn-link btn-sm text-muted" do %>
<%= link_to comment, method: :delete, class: "btn btn-link btn-sm text-muted", remote: true do %>
<i class="fas fa-trash fa-fw"></i>
<% end %>
<% end %>
Expand Down
4 changes: 2 additions & 2 deletions app/views/comments/_form.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<li class="list-group-item">
<%= form_with(model: comment) do |form| %>
<li id="<%= dom_id(comment.photo) %>_<%= dom_id(comment) %>_form" class="list-group-item">
<%= form_with(model: comment, local: false) do |form| %>
<% if comment.errors.any? %>
<div id="error_explanation">
<ul class="list-unstyled">
Expand Down
9 changes: 9 additions & 0 deletions app/views/comments/create.js.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
var added_comment = $("<%= j(render @comment) %>");

added_comment.hide();

$("#<%= dom_id(@comment.photo) %>_new_comment_form").before(added_comment);

added_comment.slideDown();

$("#<%= dom_id(@comment.photo) %>_new_comment_form #comment_body").val("");
3 changes: 3 additions & 0 deletions app/views/comments/destroy.js.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
$("#<%= dom_id(@comment) %>").fadeOut(500, function() {
$(this).remove();
});
1 change: 1 addition & 0 deletions app/views/comments/edit.js.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
$("#<%= dom_id(@comment) %>").replaceWith("<%= j(render "comments/form", comment: @comment) %>");
2 changes: 2 additions & 0 deletions app/views/comments/update.js.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
$("#<%= dom_id(@comment.photo) %>_<%= dom_id(@comment) %>_form").replaceWith("<%= j(render @comment) %>");

4 changes: 2 additions & 2 deletions app/views/follow_requests/_follow_unfollow.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@

<% if follow_request %>
<% if follow_request.pending? %>
<%= link_to follow_request, data: { turbo_method: :delete }, class: "btn btn-outline-secondary" do %>
<%= link_to follow_request, remote: true, method: :delete, class: "#{dom_id(follow_request)} btn btn-outline-secondary" do %>
Un-request
<% end %>
<% elsif follow_request.accepted? %>
<%= link_to follow_request, data: { turbo_method: :delete }, class: "btn btn-outline-secondary" do %>
<%= link_to follow_request, remote: true, method: :delete, class: "#{dom_id(follow_request)} btn btn-outline-secondary" do %>
Un-follow
<% end %>
<% end %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/follow_requests/_form.html.erb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<%= form_with(model: follow_request, class: "d-inline-block") do |form| %>
<%= form_with(model: follow_request, local: false, class: "#{dom_id(follow_request.recipient)} d-inline-block") do |form| %>
<% if follow_request.errors.any? %>
<div id="error_explanation">
<h2><%= pluralize(follow_request.errors.count, "error") %> prohibited this follow_request from being saved:</h2>
Expand Down
8 changes: 8 additions & 0 deletions app/views/follow_requests/create.js.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
console.log("Followed")


var existingFollowRequest = $(".<%= dom_id(@follow_request.recipient)%>")

var unRequestLink = $("<%= j(render "follow_requests/follow_unfollow", sender: @follow_request.sender, recipient: @follow_request.recipient) %>" )

existingFollowRequest.replaceWith(unRequestLink)
7 changes: 7 additions & 0 deletions app/views/follow_requests/destroy.js.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
console.log("Unfollowed")

var existingFollowRequest = $(".<%= dom_id(@follow_request) %>")

var followForm = $("<%= j(render "follow_requests/form", follow_request: @follow_request.recipient.received_follow_requests.build) %>")

existingFollowRequest.replaceWith(followForm)
4 changes: 2 additions & 2 deletions app/views/likes/_form.html.erb
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<%= form_with(model: like, class: "d-inline-block") do |form| %>
<%= form_with(model: like, local: false, class: "d-inline-block") do |form| %>
<%= form.hidden_field :fan_id %>

<%= form.hidden_field :photo_id %>

<%= form.button class: "btn btn-link link-underline link-underline-opacity-0 link-underline-opacity-100-hover" do %>
<i class="far fa-heart fa-fw"></i>
<i id="<%= dom_id(like.photo) %>_likes_icon" class="far fa-heart fa-fw"></i>

Like
<% end %>
Expand Down
11 changes: 11 additions & 0 deletions app/views/likes/create.js.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
console.log("Created!!!");

var existingPhoto = $("#<%= dom_id(@like.photo) %>_likes");

var updatedLikeVal = $("<%= j(render "photos/likes", photo: @like.photo) %>");

existingPhoto.replaceWith(updatedLikeVal)

var icon = $("#<%= dom_id(@like.photo) %>_likes_icon")
icon.addClass("fa-beat")
icon.css("--fa-animation-iteration-count", 1)
7 changes: 7 additions & 0 deletions app/views/likes/destroy.js.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
console.log("Deleted!!!");

var existingLikes = $("#<%= dom_id(@like.photo) %>_likes");

var updatedLikes = $("<%= j(render "photos/likes", photo: @like.photo) %>");

existingLikes.replaceWith(updatedLikes)
4 changes: 2 additions & 2 deletions app/views/photos/_likes.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<% like = current_user.likes.find_by(photo: photo) %>

<% if like %>
<%= link_to like, class: "btn btn-link link-underline-dark link-underline link-underline-opacity-0 link-underline-opacity-100-hover", data: { turbo_method: :delete } do %>
<i class="fas fa-heart fa-fw"></i>
<%= link_to like, remote: true, class: "btn btn-link link-underline-dark link-underline link-underline-opacity-0 link-underline-opacity-100-hover", method: :delete do %>
<i class="fas fa-heart fa-fw"></i>

Un-like
<% end %>
Expand Down