final tweaks

Author: Cannonb4ll

app/Filament/Resources/Changelogs/ChangelogResource.php

@@ -2,9 +2,7 @@
 
 namespace App\Filament\Resources\Changelogs;
 
-use App\Filament\Resources\Changelogs\RelationManagers\ItemsRelationManager;
 use Exception;
-use App\Models\Item;
 use App\Models\Changelog;
 use Filament\Tables\Table;
 use Filament\Schemas\Schema;
@@ -24,6 +22,7 @@
 use App\Filament\Resources\Changelogs\Pages\EditChangelog;
 use App\Filament\Resources\Changelogs\Pages\ListChangelogs;
 use App\Filament\Resources\Changelogs\Pages\CreateChangelog;
+use App\Filament\Resources\Changelogs\RelationManagers\ItemsRelationManager;
 
 class ChangelogResource extends Resource
 {

app/Filament/Resources/Changelogs/RelationManagers/ItemsRelationManager.php

@@ -2,13 +2,13 @@
 
 namespace App\Filament\Resources\Changelogs\RelationManagers;
 
-use App\Filament\Resources\Items\ItemResource;
+use Filament\Tables\Table;
 use Filament\Actions\AttachAction;
-use Filament\Actions\BulkActionGroup;
 use Filament\Actions\DetachAction;
+use Filament\Actions\BulkActionGroup;
 use Filament\Actions\DetachBulkAction;
+use App\Filament\Resources\Items\ItemResource;
 use Filament\Resources\RelationManagers\RelationManager;
-use Filament\Tables\Table;
 
 class ItemsRelationManager extends RelationManager
 {

app/Filament/Resources/Users/Pages/CreateUser.php

@@ -4,8 +4,8 @@
 
 use App\Mail\UserCreated;
 use Illuminate\Support\Str;
-use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Mail;
 use Filament\Resources\Pages\CreateRecord;
 use App\Filament\Resources\Users\UserResource;
 

app/Filament/Widgets/VoteHistoryChart.php

@@ -12,6 +12,8 @@ class VoteHistoryChart extends ChartWidget
 
     public ?Item $item = null;
 
+    public ?string $filter = 'all';
+
     public function getHeading(): ?string
     {
         return trans('items.vote-history');
@@ -22,16 +24,36 @@ public function getDescription(): ?string
         return trans('items.vote-history-description');
     }
 
+    protected function getFilters(): ?array
+    {
+        return [
+            'all' => trans('items.filter-all-time'),
+            '7' => trans('items.filter-last-7-days'),
+            '30' => trans('items.filter-last-30-days'),
+            '90' => trans('items.filter-last-90-days'),
+            '365' => trans('items.filter-last-year'),
+            '730' => trans('items.filter-last-2-years'),
+            '1095' => trans('items.filter-last-3-years'),
+        ];
+    }
+
     protected function getData(): array
     {
-        if (!$this->item) {
+        if (! $this->item) {
             return [
                 'datasets' => [],
                 'labels' => [],
             ];
         }
 
-        $votes = $this->item->votes()
+        $query = $this->item->votes();
+
+        if ($this->filter && $this->filter !== 'all') {
+            $days = (int) $this->filter;
+            $query->where('created_at', '>=', Carbon::now()->subDays($days));
+        }
+
+        $votes = $query
             ->selectRaw('DATE(created_at) as date, COUNT(*) as count')
             ->groupByRaw('DATE(created_at)')
             ->orderBy('date')
@@ -54,7 +76,7 @@ protected function getData(): array
         $currentDate = $startDate->copy();
         while ($currentDate->lte($endDate)) {
             $dateKey = $currentDate->format('Y-m-d');
-            $labels[] = $currentDate->format('M d');
+            $labels[] = $currentDate->format('M d, Y');
             $data[] = $votesMap[$dateKey] ?? 0;
             $currentDate->addDay();
         }

app/Livewire/SpotlightSearch.php

@@ -4,9 +4,8 @@
 
 use App\Models\Item;
 use App\Models\Project;
-use Illuminate\Support\Collection;
-use Livewire\Attributes\On;
 use Livewire\Component;
+use Livewire\Attributes\On;
 
 class SpotlightSearch extends Component
 {

app/Mail/UserCreated.php

@@ -4,11 +4,11 @@
 
 use App\Models\User;
 use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Mail\Mailable;
 use Illuminate\Mail\Mailables\Content;
-use Illuminate\Mail\Mailables\Envelope;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Mail\Mailables\Envelope;
+use Illuminate\Contracts\Queue\ShouldQueue;
 
 class UserCreated extends Mailable implements ShouldQueue
 {

lang/en/items.php

@@ -35,9 +35,16 @@
     'update-board-success' => 'Successfully moved the item to board :board',
     'view-on-github' => 'View issue on GitHub',
     'search-shortcut' => 'CMD + K to search',
-    'view-vote-history' => 'View vote history',
-    'vote-history' => 'Vote history',
+    'view-vote-history' => 'View voting history',
+    'vote-history' => 'Voting history',
     'vote-history-description' => 'See how votes have been added over time.',
     'votes-per-day' => 'Votes',
     'no-vote-history' => 'No votes have been recorded yet.',
+    'filter-all-time' => 'All time',
+    'filter-last-7-days' => 'Last 7 days',
+    'filter-last-30-days' => 'Last 30 days',
+    'filter-last-90-days' => 'Last 90 days',
+    'filter-last-year' => 'Last year',
+    'filter-last-2-years' => 'Last 2 years',
+    'filter-last-3-years' => 'Last 3 years',
 ];

lang/en/mail.php

@@ -14,4 +14,4 @@
         'help-text' => 'If you have any questions or need assistance, feel free to reach out to our support team.',
         'closing' => 'Best regards',
     ],
-];
+];

lang/nl/mail.php

@@ -14,4 +14,4 @@
         'help-text' => 'Als je vragen hebt of hulp nodig hebt, neem gerust contact op met ons supportteam.',
         'closing' => 'Met vriendelijke groet',
     ],
-];
+];

resources/views/livewire/item/vote-button.blade.php

@@ -25,7 +25,9 @@
         <span
             class="text-sm">{{ trans_choice('messages.total-votes', $model->total_votes, ['votes' => $model->total_votes]) }}</span>
 
-        <livewire:item.vote-history :item="$model" />
+        @if($model instanceof \App\Models\Item)
+            <livewire:item.vote-history :item="$model" />
+        @endif
 
         @if($vote && $showSubscribeOption)
             @if($vote->subscribed)