mirror
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Merge pull request #187 from dansup/frontend-ui-refactor 

Fix like count
This commit is contained in:
daniel 2018-06-03 20:48:32 -06:00 committed by GitHub
parent 357382ba6c dfe451db70
commit 3953fb0c42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 42 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/Http/Controllers/LikeController.php
View File

@ -21,21 +21,30 @@ class LikeController extends Controller
]); ]);
$profile = Auth::user()->profile; $profile = Auth::user()->profile;
$status = Status::findOrFail($request->input('item')); $status = Status::withCount('likes')->findOrFail($request->input('item'));
$count = $status->likes_count;
if($status->likes()->whereProfileId($profile->id)->count() !== 0) { if($status->likes()->whereProfileId($profile->id)->count() !== 0) {
$like = Like::whereProfileId($profile->id)->whereStatusId($status->id)->firstOrFail(); $like = Like::whereProfileId($profile->id)->whereStatusId($status->id)->firstOrFail();
$like->delete(); $like->delete();
return redirect()->back(); $count--;
} else {
$like = new Like;
$like->profile_id = $profile->id;
$like->status_id = $status->id;
$like->save();
$count++;
} }
$like = new Like;
$like->profile_id = $profile->id;
$like->status_id = $status->id;
$like->save();
LikePipeline::dispatch($like); LikePipeline::dispatch($like);
return redirect($status->url()); if($request->ajax()) {
$response = ['code' => 200, 'msg' => 'Like saved', 'count' => $count];
} else {
$response = redirect($status->url());
}
return $response;
} }
} }

2
public/js/app.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View File

@ -1,5 +1,5 @@
{ {
"/js/app.js": "/js/app.js?id=a688664f2a2b0ff3b7c3", "/js/app.js": "/js/app.js?id=478eacc17a0ea6fba319",
"/css/app.css": "/css/app.css?id=ede5557443f098707138", "/css/app.css": "/css/app.css?id=ede5557443f098707138",
"/js/timeline.js": "/js/timeline.js?id=fcc86a9419b33a821c23" "/js/timeline.js": "/js/timeline.js?id=fcc86a9419b33a821c23"
} }

46
resources/assets/js/components/likebutton.js vendored
View File

@ -30,30 +30,30 @@ $(document).ready(function() {
e.preventDefault(); e.preventDefault();
var el = $(this); var el = $(this);
var id = el.data('id'); var id = el.data('id');
var res = axios.post('/i/like', {item: id}); axios.post('/i/like', {item: id})
var likes = ls.get('likes'); .then(function (res) {
var action = false; var likes = ls.get('likes');
var counter = el.parents().eq(2).find('.like-count'); var action = false;
var count = parseInt(counter.text()); var counter = el.parents().eq(2).find('.like-count');
var heart = el.find('.status-heart'); var count = res.data.count;
var heart = el.find('.status-heart');
if(likes.indexOf(id) > -1) { if(likes.indexOf(id) > -1) {
heart.addClass('far fa-heart').removeClass('fas fa-heart'); heart.addClass('far fa-heart').removeClass('fas fa-heart');
likes = likes.filter(function(item) { likes = likes.filter(function(item) {
return item !== id return item !== id
}); });
count = count == 0 ? 0 : count--; counter.text(count);
counter.text(count); action = 'unlike';
action = 'unlike'; } else {
} else { heart.addClass('fas fa-heart').removeClass('far fa-heart');
heart.addClass('fas fa-heart').removeClass('far fa-heart'); likes.push(id);
likes.push(id); counter.text(count);
count++; action = 'like';
counter.text(count); }
action = 'like';
}
ls.set('likes', likes); ls.set('likes', likes);
console.log(action + ' - ' + $(this).data('id') + ' like event'); console.log(action + ' - ' + $(this).data('id') + ' like event');
});
}); });
}); });