added some item counts to the dashboard

CaffeineSheep · Mar 23, 2023 · 000b712 · 000b712
1 parent 8147bdf
commit 000b712
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 23 deletions.
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
@@ -23,7 +23,7 @@ public function index(Request $request, ActivityQueries $activities)
         $newSymbols = Page::getVisiblePagesInBookshelf('symbols')
             ->orderBy('created_at', 'desc')
             ->take(10)
-            // ->select(Page::$listAttributes)
+            // ->select(Page::$listAtt  ributes)
             ->get();
 
         $latestDrafts = Page::getVisiblePagesInBookshelf('contribute')
@@ -33,21 +33,14 @@ public function index(Request $request, ActivityQueries $activities)
             // ->select(Page::$listAttributes)
             ->get();
 
-        $latestDraftHelp = Page::getVisiblePagesInBookshelf('contribute')
-            // ->where('book_id', '=', '5')
+        $draftHelp = Page::getVisiblePagesInBookshelf('contribute')
             ->where('book_id', '=',  Book::getBySlug('draft-help', true)->id)
-            ->orderBy('created_at', 'desc')
-            ->take(3)
-            // ->select(Page::$listAttributes)
-            ->get();
+            ->orderBy('created_at', 'desc');
 
-        $latestCommunityReviews = Page::getVisiblePagesInBookshelf('contribute')
-            // ->where('book_id', '=', '5')
+        $communityReviews = Page::getVisiblePagesInBookshelf('contribute')
             ->where('book_id', '=',  Book::getBySlug('community-review', true)->id)
-            ->orderBy('created_at', 'desc')
-            ->take(3)
-            // ->select(Page::$listAttributes)
-            ->get();
+            ->orderBy('created_at', 'desc');
+
 
         $quickLinks = collect([
             new BasicListItem('/shelves/symbols', 'All Symbols', 'See all of the official symbols', 'star-circle'),
@@ -56,12 +49,6 @@ public function index(Request $request, ActivityQueries $activities)
             ...Bookshelf::getBySlug('contribute')->visibleBooks()->get()->all(),
         ]);
 
-        // $test = Book::getBySlug('drafts', true);
-
-        // $recentUpdates = Page::getAllVisiblePages()
-        // ->orderBy('created_at', 'desc')
-        // ->take(2)
-        // ->get();
         $recentUpdates = Page::getVisiblePagesInBookshelf('symbols')
         ->orderBy('updated_at', 'desc')
         ->where('revision_count', '>', 1)
@@ -77,11 +64,14 @@ public function index(Request $request, ActivityQueries $activities)
             $homepageOption = 'default';
         }
 
+
         $commonData = [
             'activeUsers' => $activeUsers,
             'latestDrafts' => $latestDrafts,
-            'latestCommunityReviews' => $latestCommunityReviews,
-            'latestDraftHelp' => $latestDraftHelp,
+            'latestCommunityReviews' => $communityReviews->take(3)->get(),
+            'numCommunityReviews' => $communityReviews->count(),
+            'latestDraftHelp' => $draftHelp->take(3)->get(),
+            'numDraftHelp' => $draftHelp->count(),
             'newSymbols' => $newSymbols,
             'quickLinks' => $quickLinks,
             'symbolTypesList' => $symbolTypesList,

diff --git a/resources/views/home/default.blade.php b/resources/views/home/default.blade.php
@@ -70,7 +70,8 @@ class="card-footer-link">{{ trans('common.view_all') }}</a>
                         ])
                     </div>
                     <a href="{{ url('/books/community-review') }}"
-                        class="card-footer-link">{{ trans('common.view_all') }}</a>
+                        class="card-footer-link">{{ trans('common.view_all').' ('.$numCommunityReviews.')' }}</a>
+                        {{-- class="card-footer-link">{{ trans('common.view_all').' ('.$latestCommunityReviews.total().')' }}</a> --}}
                 </div>
                 <div id="recent-pages" class="card mb-xl">
                     <h3 class="card-title">Looking for help 🙋‍♂️</h3>
@@ -82,7 +83,7 @@ class="card-footer-link">{{ trans('common.view_all') }}</a>
                         ])
                     </div>
                     <a href="{{ url('/books/draft-help') }}"
-                        class="card-footer-link">{{ trans('common.view_all') }}</a>
+                        class="card-footer-link">{{ trans('common.view_all').' ('.$numDraftHelp.')' }}</a>
                 </div>
             </div>
             <div>