diff --git a/public/js/app.js b/public/js/app.js index a7820a8a8..e32bd8ddc 100644 Binary files a/public/js/app.js and b/public/js/app.js differ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index c58ecdb81..7b6dca63c 100644 Binary files a/public/mix-manifest.json and b/public/mix-manifest.json differ diff --git a/resources/assets/js/components/commentform.js b/resources/assets/js/components/commentform.js index 159a91531..a0b56332c 100644 --- a/resources/assets/js/components/commentform.js +++ b/resources/assets/js/components/commentform.js @@ -24,7 +24,7 @@ $(document).ready(function() { if($('.status-container').length == 1) { var comments = el.parents().eq(3).find('.comments'); } else { - var comments = el.parents().eq(2).find('.comments'); + var comments = el.parents().eq(1).find('.comments'); } var comment = '

' + username + ''+ commenttext + '1s

'; diff --git a/resources/assets/js/components/likebutton.js b/resources/assets/js/components/likebutton.js index 4283fcf1d..1de310f7f 100644 --- a/resources/assets/js/components/likebutton.js +++ b/resources/assets/js/components/likebutton.js @@ -35,7 +35,7 @@ $(document).ready(function() { .then(function (res) { var likes = ls.get('likes'); var action = false; - var counter = el.parents().eq(2).find('.like-count'); + var counter = el.parents().eq(1).find('.like-count'); var count = res.data.count; var heart = el.find('.status-heart'); @@ -54,7 +54,7 @@ $(document).ready(function() { } ls.set('likes', likes); - console.log(action + ' - ' + $(this).data('id') + ' like event'); + console.log(action + ' - ' + id + ' like event'); }); }); }); \ No newline at end of file diff --git a/resources/views/layouts/partial/nav.blade.php b/resources/views/layouts/partial/nav.blade.php index 50b481cc0..49ee3da13 100644 --- a/resources/views/layouts/partial/nav.blade.php +++ b/resources/views/layouts/partial/nav.blade.php @@ -1,15 +1,12 @@ -