From b1678736328667e21be8e8fb5a51b48da1187a6a Mon Sep 17 00:00:00 2001 From: Dan Church Date: Mon, 27 Sep 2021 12:00:48 -0500 Subject: [PATCH 1/5] Fix grouping error in PostgreSQL --- app/Services/AdminStatsService.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Services/AdminStatsService.php b/app/Services/AdminStatsService.php index 6c389e0ca..a3ae6b2af 100644 --- a/app/Services/AdminStatsService.php +++ b/app/Services/AdminStatsService.php @@ -68,8 +68,8 @@ class AdminStatsService { $ttl = now()->addHours(12); return Cache::remember('admin:dashboard:home:data-postsGraph:v0.1:24hr', $ttl, function() { - $gb = config('database.default') == 'pgsql' ? ['statuses.id', DB::raw('Date(created_at)')] : DB::raw('Date(created_at)'); - $s = Status::selectRaw('Date(created_at) as date, count(statuses.id) as count, statuses.*') + $gb = config('database.default') == 'pgsql' ? ['statuses.id', 'created_at'] : DB::raw('Date(created_at)'); + $s = Status::selectRaw('Date(created_at) as date, count(statuses.id) as count') ->where('created_at', '>=', now()->subWeek()) ->groupBy($gb) ->orderBy('created_at', 'DESC') @@ -86,7 +86,7 @@ class AdminStatsService $dates = collect($dates)->merge($s); - $s = Status::selectRaw('Date(created_at) as date, count(statuses.id) as count, statuses.*') + $s = Status::selectRaw('Date(created_at) as date, count(statuses.id) as count') ->where('created_at', '>=', now()->subWeeks(2)) ->where('created_at', '<=', now()->subWeeks(1)) ->groupBy($gb) From 345d7eed2c51b815f25184e857d6fca52fc89b5b Mon Sep 17 00:00:00 2001 From: Scott O'Hara Date: Sat, 6 Nov 2021 10:25:46 -0400 Subject: [PATCH 2/5] fix broken accessibility for search field This PR fixes the incorrect use of `role=search` on the `` element. The `search` role is not a type of text input, and its use here was negating the semantics of the text field's ability to announce itself as a text field to screen readers. The proper place for a `role=search` is on the `
` element that contains this input, so I have placed it there in this fix. There are likely other accessibility improvements that could be made in this file, but this was an easy fix that I figured I could make a quick PR for. Thanks --- resources/views/layouts/partial/nav.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/layouts/partial/nav.blade.php b/resources/views/layouts/partial/nav.blade.php index 032474f9b..0cd1405e5 100644 --- a/resources/views/layouts/partial/nav.blade.php +++ b/resources/views/layouts/partial/nav.blade.php @@ -8,8 +8,8 @@
@auth
- - + +
@endauth From 4cb956aea296b96aa2cb564d139a0b86af4b8e13 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Wed, 10 Nov 2021 21:54:50 -0700 Subject: [PATCH 3/5] Update AdminStatsService, add storage() method --- app/Services/AdminStatsService.php | 38 ++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/app/Services/AdminStatsService.php b/app/Services/AdminStatsService.php index a3ae6b2af..3f1f1a74c 100644 --- a/app/Services/AdminStatsService.php +++ b/app/Services/AdminStatsService.php @@ -6,6 +6,7 @@ use Cache; use DB; use App\Util\Lexer\PrettyNumber; use App\{ + Avatar, Contact, FailedJob, Hashtag, @@ -31,6 +32,43 @@ class AdminStatsService ); } + public static function storage() + { + return Cache::remember('admin:dashboard:storage:stats', 120000, function() { + $res = []; + + $res['last_updated'] = now()->format('c'); + + $avatars = Avatar::count(); + $avatarsLocal = Avatar::whereNull('cdn_url')->count(); + $res['avatar'] = [ + 'count' => $avatars, + 'local_count' => $avatarsLocal, + 'cloud_count' => ($avatars - $avatarsLocal), + 'total_sum' => Avatar::sum('size') + ]; + + $media = Media::count(); + $mediaSum = Media::sum('size'); + $mediaLocalSum = Media::whereNotNull('user_id')->sum('size'); + $mediaLocal = Media::whereNotNull('user_id')->count(); + $res['media'] = [ + 'count' => $media, + 'local_count' => $mediaLocal, + 'cloud_count' => ($media - $mediaLocal), + 'total_sum' => $mediaSum, + 'local_sum' => $mediaLocalSum, + 'local_30d' => Media::whereNotNull('user_id')->where('created_at', '>', now()->subDays(30))->sum('size'), + 'cloud_30d' => Media::whereNull('user_id')->where('created_at', '>', now()->subDays(30))->sum('size'), + 'cloud_sum' => ($mediaSum - $mediaLocalSum), + 'avg_size' => Media::avg('size'), + 'avg_mime' => Media::groupBy('mime')->orderByRaw('COUNT(*) DESC')->first()->mime, + ]; + + return $res; + }); + } + protected static function recentData() { $day = config('database.default') == 'pgsql' ? 'DATE_PART(\'day\',' : 'day('; From 9811dda7a7779833284f280468592246a88493f3 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Wed, 10 Nov 2021 22:09:06 -0700 Subject: [PATCH 4/5] Update login view --- resources/views/auth/login.blade.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 827cbdb19..5661acc5b 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -8,7 +8,7 @@
{{ __('Login') }}
-
+ @csrf
@@ -42,7 +42,7 @@
@@ -58,7 +58,7 @@
- @@ -68,7 +68,7 @@
-

+

{{ __('Forgot Password') }} From d02a8f005fb4c367789b3374df9de7ea5c779898 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Wed, 10 Nov 2021 22:12:46 -0700 Subject: [PATCH 5/5] Update login view --- resources/views/auth/login.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 5661acc5b..549c55ad6 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -5,7 +5,7 @@

-
{{ __('Login') }}
+
{{ __('Login') }}