Skip to content

Commit 378af76

Browse files
HDVinnieHDVinnie
committed
add: #3636
- closes #3636
1 parent 04f5ecb commit 378af76

File tree

4 files changed

+205
-97
lines changed

4 files changed

+205
-97
lines changed

‎app/Http/Controllers/Staff/ApplicationController.php

+1-6
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,7 @@ class ApplicationController extends Controller
3535
*/
3636
public function index(): \Illuminate\Contracts\View\Factory|\Illuminate\View\View
3737
{
38-
return view('Staff.application.index', [
39-
'applications' => Application::withoutGlobalScope(ApprovedScope::class)
40-
->with(['user.group', 'moderated.group', 'imageProofs', 'urlProofs'])
41-
->latest()
42-
->paginate(25),
43-
]);
38+
return view('Staff.application.index');
4439
}
4540

4641
/**

‎app/Http/Livewire/ApplicationSearch.php

+71
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
<?php
2+
/**
3+
* NOTICE OF LICENSE.
4+
*
5+
* UNIT3D Community Edition is open-sourced software licensed under the GNU Affero General Public License v3.0
6+
* The details is bundled with this project in the file LICENSE.txt.
7+
*
8+
* @project UNIT3D Community Edition
9+
*
10+
* @author HDVinnie <hdinnovations@protonmail.com>
11+
* @license https://www.gnu.org/licenses/agpl-3.0.en.html/ GNU Affero General Public License v3.0
12+
*/
13+
14+
namespace App\Http\Livewire;
15+
16+
use App\Models\Application;
17+
use App\Models\Scopes\ApprovedScope;
18+
use App\Traits\LivewireSort;
19+
use Livewire\Attributes\Computed;
20+
use Livewire\Attributes\Url;
21+
use Livewire\Component;
22+
use Livewire\WithPagination;
23+
24+
class ApplicationSearch extends Component
25+
{
26+
use LivewireSort;
27+
use WithPagination;
28+
29+
#TODO: Update URL attributes once Livewire 3 fixes upstream bug. See: https://github.com/livewire/livewire/discussions/7746
30+
31+
#[Url(history: true)]
32+
public string $email = '';
33+
34+
#[Url(history: true)]
35+
public bool $show = false;
36+
37+
#[Url(history: true)]
38+
public string $sortField = 'created_at';
39+
40+
#[Url(history: true)]
41+
public string $sortDirection = 'desc';
42+
43+
#[Url(history: true)]
44+
public int $perPage = 25;
45+
46+
final public function toggleProperties($property): void
47+
{
48+
if ($property === 'show') {
49+
$this->show = !$this->show;
50+
}
51+
}
52+
53+
#[Computed]
54+
final public function applications(): \Illuminate\Contracts\Pagination\LengthAwarePaginator
55+
{
56+
return Application::withoutGlobalScope(ApprovedScope::class)->with([
57+
'user.group', 'moderated.group', 'imageProofs', 'urlProofs'
58+
])
59+
->when($this->email, fn ($query) => $query->where('email', 'LIKE', '%'.$this->email.'%'))
60+
->when($this->show === true, fn ($query) => $query->where('status', '=', Application::PENDING))
61+
->orderBy($this->sortField, $this->sortDirection)
62+
->paginate($this->perPage);
63+
}
64+
65+
final public function render(): \Illuminate\Contracts\View\View|\Illuminate\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\Foundation\Application
66+
{
67+
return view('livewire.application-search', [
68+
'applications' => $this->applications
69+
]);
70+
}
71+
}

‎resources/views/Staff/application/index.blade.php

+1-91
Original file line numberDiff line numberDiff line change
@@ -22,95 +22,5 @@
2222
@section('page', 'page__application--index')
2323

2424
@section('main')
25-
<section class="panelV2">
26-
<h2 class="panel__heading">{{ __('staff.applications') }}</h2>
27-
<div class="data-table-wrapper">
28-
<table class="data-table">
29-
<thead>
30-
<tr>
31-
<th>#</th>
32-
<th>{{ __('common.user') }}</th>
33-
<th>{{ __('common.email') }}</th>
34-
<th>{{ __('staff.application-type') }}</th>
35-
<th>{{ __('common.image') }}</th>
36-
<th>{{ __('staff.links') }}</th>
37-
<th>{{ __('common.created_at') }}</th>
38-
<th>{{ __('common.status') }}</th>
39-
<th>{{ __('common.moderated-by') }}</th>
40-
<th>{{ __('common.action') }}</th>
41-
</tr>
42-
</thead>
43-
<tbody>
44-
@forelse ($applications as $application)
45-
<tr>
46-
<td>{{ $application->id }}</td>
47-
<td>
48-
@if ($application->user === null)
49-
N/A
50-
@else
51-
<x-user_tag :anon="false" :user="$application->user" />
52-
@endif
53-
</td>
54-
<td>{{ $application->email }}</td>
55-
<td>{{ $application->type }}</td>
56-
<td>{{ $application->imageProofs->count() }}</td>
57-
<td>{{ $application->urlProofs->count() }}</td>
58-
<td>
59-
<time
60-
datetime="{{ $application->created_at }}"
61-
title="{{ $application->created_at }}"
62-
>
63-
{{ $application->created_at->diffForHumans() }}
64-
</time>
65-
</td>
66-
<td>
67-
@switch($application->status)
68-
@case(\App\Models\Application::PENDING)
69-
<span class="application--pending">Pending</span>
70-
71-
@break
72-
@case(\App\Models\Application::APPROVED)
73-
<span class="application--approved">Approved</span>
74-
75-
@break
76-
@case(\App\Models\Application::REJECTED)
77-
<span class="application--rejected">Rejected</span>
78-
79-
@break
80-
@default
81-
<span class="application--unknown">Unknown</span>
82-
@endswitch
83-
</td>
84-
<td>
85-
@if ($application->moderated === null)
86-
N/A
87-
@else
88-
<x-user_tag :anon="false" :user="$application->moderated" />
89-
@endif
90-
</td>
91-
<td>
92-
<menu class="data-table__actions">
93-
<li class="data-table__action">
94-
<a
95-
class="form__button form__button--text"
96-
href="{{ route('staff.applications.show', ['id' => $application->id]) }}"
97-
>
98-
{{ __('common.view') }}
99-
</a>
100-
</li>
101-
</menu>
102-
</td>
103-
</tr>
104-
@empty
105-
<tr class="applications--empty">
106-
<td colspan="10">
107-
{{ __('common.no') }} {{ __('staff.applications') }}
108-
</td>
109-
</tr>
110-
@endforelse
111-
</tbody>
112-
</table>
113-
</div>
114-
{{ $applications->links('partials.pagination') }}
115-
</section>
25+
@livewire('application-search')
11626
@endsection

‎resources/views/livewire/application-search.blade.php

+132
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
<section class="panelV2">
2+
<header class="panel__header">
3+
<h2 class="panel__heading">{{ __('staff.applications') }}</h2>
4+
<div class="panel__actions">
5+
<div class="panel__action">
6+
<div class="form__group">
7+
<input
8+
id="show"
9+
class="form__checkbox"
10+
type="checkbox"
11+
wire:click="toggleProperties('show')"
12+
/>
13+
<label class="form__label" for="show">Show Pending Only</label>
14+
</div>
15+
</div>
16+
<div class="panel__action">
17+
<div class="form__group">
18+
<input
19+
id="receiver"
20+
class="form__text"
21+
type="text"
22+
wire:model.live="email"
23+
placeholder=" "
24+
/>
25+
<label class="form__label form__label--floating" for="receiver">
26+
{{ __('common.email') }}
27+
</label>
28+
</div>
29+
</div>
30+
<div class="panel__action">
31+
<div class="form__group">
32+
<select id="quantity" class="form__select" wire:model.live="perPage" required>
33+
<option>25</option>
34+
<option>50</option>
35+
<option>100</option>
36+
</select>
37+
<label class="form__label form__label--floating" for="quantity">
38+
{{ __('common.quantity') }}
39+
</label>
40+
</div>
41+
</div>
42+
</div>
43+
</header>
44+
<div class="data-table-wrapper">
45+
<table class="data-table">
46+
<thead>
47+
<tr>
48+
<th>#</th>
49+
<th>{{ __('common.user') }}</th>
50+
<th>{{ __('common.email') }}</th>
51+
<th>{{ __('staff.application-type') }}</th>
52+
<th>{{ __('common.image') }}</th>
53+
<th>{{ __('staff.links') }}</th>
54+
<th>{{ __('common.created_at') }}</th>
55+
<th>{{ __('common.status') }}</th>
56+
<th>{{ __('common.moderated-by') }}</th>
57+
<th>{{ __('common.action') }}</th>
58+
</tr>
59+
</thead>
60+
<tbody>
61+
@forelse ($applications as $application)
62+
<tr>
63+
<td>{{ $application->id }}</td>
64+
<td>
65+
@if ($application->user === null)
66+
N/A
67+
@else
68+
<x-user_tag :anon="false" :user="$application->user" />
69+
@endif
70+
</td>
71+
<td>{{ $application->email }}</td>
72+
<td>{{ $application->type }}</td>
73+
<td>{{ $application->imageProofs->count() }}</td>
74+
<td>{{ $application->urlProofs->count() }}</td>
75+
<td>
76+
<time
77+
datetime="{{ $application->created_at }}"
78+
title="{{ $application->created_at }}"
79+
>
80+
{{ $application->created_at->diffForHumans() }}
81+
</time>
82+
</td>
83+
<td>
84+
@switch($application->status)
85+
@case(\App\Models\Application::PENDING)
86+
<span class="application--pending">Pending</span>
87+
88+
@break
89+
@case(\App\Models\Application::APPROVED)
90+
<span class="application--approved">Approved</span>
91+
92+
@break
93+
@case(\App\Models\Application::REJECTED)
94+
<span class="application--rejected">Rejected</span>
95+
96+
@break
97+
@default
98+
<span class="application--unknown">Unknown</span>
99+
@endswitch
100+
</td>
101+
<td>
102+
@if ($application->moderated === null)
103+
N/A
104+
@else
105+
<x-user_tag :anon="false" :user="$application->moderated" />
106+
@endif
107+
</td>
108+
<td>
109+
<menu class="data-table__actions">
110+
<li class="data-table__action">
111+
<a
112+
class="form__button form__button--text"
113+
href="{{ route('staff.applications.show', ['id' => $application->id]) }}"
114+
>
115+
{{ __('common.view') }}
116+
</a>
117+
</li>
118+
</menu>
119+
</td>
120+
</tr>
121+
@empty
122+
<tr class="applications--empty">
123+
<td colspan="10">
124+
{{ __('common.no') }} {{ __('staff.applications') }}
125+
</td>
126+
</tr>
127+
@endforelse
128+
</tbody>
129+
</table>
130+
</div>
131+
{{ $applications->links('partials.pagination') }}
132+
</section>

0 commit comments

Comments
 (0)