From 135d9fc1eba165b6c50c0aa30f41a7518cc59347 Mon Sep 17 00:00:00 2001 From: HolgerHatGarKeineNode Date: Sat, 11 Mar 2023 10:22:33 +0100 Subject: [PATCH] voting added --- .../Livewire/Tables/ProjectProposalTable.php | 8 +++++-- .../project_proposals/action.blade.php | 21 ++++++++++++------- .../project_proposals/author.blade.php | 6 ++++++ 3 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 resources/views/columns/project_proposals/author.blade.php diff --git a/app/Http/Livewire/Tables/ProjectProposalTable.php b/app/Http/Livewire/Tables/ProjectProposalTable.php index 40fa7832..eb276513 100644 --- a/app/Http/Livewire/Tables/ProjectProposalTable.php +++ b/app/Http/Livewire/Tables/ProjectProposalTable.php @@ -16,7 +16,7 @@ class ProjectProposalTable extends DataTableComponent public function configure(): void { $this->setPrimaryKey('id') - ->setAdditionalSelects(['project_proposals.id', 'project_proposals.created_by', 'project_proposals.slug']) + ->setAdditionalSelects(['project_proposals.id', 'project_proposals.created_by', 'project_proposals.slug', 'project_proposals.user_id']) ->setThAttributes(function (Column $column) { return [ 'class' => 'px-6 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider dark:bg-gray-800 dark:text-gray-400', @@ -45,6 +45,10 @@ class ProjectProposalTable extends DataTableComponent return [ Column::make("Id", "id") ->sortable(), + Column::make(__('From')) + ->label( + fn ($row, Column $column) => view('columns.project_proposals.author')->withRow($row) + ), Column::make("Name", "name") ->sortable(), Column::make(__('Intended support in sats'), "support_in_sats") @@ -61,6 +65,6 @@ class ProjectProposalTable extends DataTableComponent public function builder(): Builder { - return ProjectProposal::query(); + return ProjectProposal::query()->with(['user']); } } diff --git a/resources/views/columns/project_proposals/action.blade.php b/resources/views/columns/project_proposals/action.blade.php index d7bc44d5..55b9f32b 100644 --- a/resources/views/columns/project_proposals/action.blade.php +++ b/resources/views/columns/project_proposals/action.blade.php @@ -1,16 +1,23 @@
@can('update', $row)
- + {{ __('Edit') }}
@endcan -
- - - {{ __('Vote') }} [0] - -
+ @auth +
+ + + {{ __('Vote') }} [0] + +
+ @else +
+ {{ __('for voting you have to be logged in') }} +
+ @endauth
diff --git a/resources/views/columns/project_proposals/author.blade.php b/resources/views/columns/project_proposals/author.blade.php new file mode 100644 index 00000000..6b65ce30 --- /dev/null +++ b/resources/views/columns/project_proposals/author.blade.php @@ -0,0 +1,6 @@ +
+ {{ $row->user->name }} +
+ {{ $row->user->name }} +
+