Fixed comment count update error

[bookstack] / resources / views / comments / comments.blade.php

diff --git a/resources/views/comments/comments.blade.php b/resources/views/comments/comments.blade.php
index ffa75cfed227638fc72e1615c32803134994045e..140d0d027d7ad1996a6795bec9cb61a9621769d9 100644 (file)
--- a/resources/views/comments/comments.blade.php
+++ b/resources/views/comments/comments.blade.php
@@ -1,18 +1,37 @@
-<script type="text/ng-template" id="comment-list-item.html">
-    @include('comments/list-item')
-</script>
-<script type="text/ng-template" id="comment-reply.html">
-    @include('comments/comment-reply', ['pageId' => $pageId])
-</script>
-<div ng-controller="CommentListController as vm" ng-init="pageId = <?= $page->id ?>" class="comments-list" ng-cloak>
-<h3>@{{vm.totalCommentsStr}}</h3>
-<hr>
-    <div class="comment-box" ng-repeat="comment in vm.comments track by comment.id">
-        <div ng-include src="'comment-list-item.html'">
+<section component="page-comments"
+         option:page-comments:page-id="{{ $page->id }}"
+         option:page-comments:updated-text="{{ trans('entities.comment_updated_success') }}"
+         option:page-comments:deleted-text="{{ trans('entities.comment_deleted_success') }}"
+         option:page-comments:created-text="{{ trans('entities.comment_created_success') }}"
+         option:page-comments:count-text="{{ trans('entities.comment_count') }}"
+         class="comments-list"
+         aria-label="{{ trans('entities.comments') }}">

 
 

-        </div>
+    <div refs="page-comments@commentCountBar" class="grid half left-focus v-center no-row-gap">
+        <h5 comments-title>{{ trans_choice('entities.comment_count', count($page->comments), ['count' => count($page->comments)]) }}</h5>
+        @if (count($page->comments) === 0 && userCan('comment-create-all'))
+            <div class="text-m-right" refs="page-comments@addButtonContainer">
+                <button type="button" action="addComment"
+                        class="button outline">{{ trans('entities.comment_add') }}</button>
+            </div>
+        @endif

     </div>
     </div>

-    <div ng-if="::vm.canComment()">
-        @include('comments/comment-reply', ['pageId' => $pageId])
+
+    <div refs="page-comments@commentContainer" class="comment-container">
+        @foreach($page->comments as $comment)
+            @include('comments.comment', ['comment' => $comment])
+        @endforeach

     </div>
     </div>

-</div>
\ No newline at end of file
+
+    @if(userCan('comment-create-all'))
+        @include('comments.create')
+
+        @if (count($page->comments) > 0)
+            <div refs="page-comments@addButtonContainer" class="text-right">
+                <button type="button" action="addComment"
+                        class="button outline">{{ trans('entities.comment_add') }}</button>
+            </div>
+        @endif
+    @endif
+
+</section>
\ No newline at end of file