Skip to content

Commit 3097949

Browse files
authored
Merge pull request #4632 from Roardom/remove-group-index
(Remove) Public view of all users in group
2 parents 6e3b34b + 9d478c9 commit 3097949

File tree

9 files changed

+10
-106
lines changed

9 files changed

+10
-106
lines changed

app/Http/Controllers/StatsController.php

-11
Original file line numberDiff line numberDiff line change
@@ -261,17 +261,6 @@ public function groups(): \Illuminate\Contracts\View\Factory|\Illuminate\View\Vi
261261
]);
262262
}
263263

264-
/**
265-
* Show Extra-Stats Groups.
266-
*/
267-
public function group(int $id): \Illuminate\Contracts\View\Factory|\Illuminate\View\View
268-
{
269-
return view('stats.groups.group', [
270-
'group' => Group::findOrFail($id),
271-
'users' => User::with(['group'])->withTrashed()->where('group_id', '=', $id)->latest()->paginate(100),
272-
]);
273-
}
274-
275264
/**
276265
* Show Group Requirements.
277266
*/

resources/views/blocks/online.blade.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,13 @@ class="{{ config('other.font-awesome') }} fa-exclamation-circle text-orange"
2727
<ul style="column-width: 200px; column-gap: 1rem; list-style-type: none; padding: 0">
2828
@foreach ($groups as $group)
2929
<span class="user-tag" style="padding: 4px 8px; display: block">
30-
<a
30+
<span
3131
class="user-tag__link {{ $group->icon }}"
32-
href="{{ route('group', ['id' => $group->id]) }}"
3332
style="color: {{ $group->color }}"
3433
title="{{ $group->name }}"
3534
>
3635
{{ $group->name }}
37-
</a>
36+
</span>
3837
</span>
3938
@endforeach
4039
</ul>

resources/views/stats/groups/group.blade.php

-60
This file was deleted.

resources/views/stats/groups/groups-requirements.blade.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,15 @@
4040
@foreach ($groups as $group)
4141
<tr>
4242
<td style="min-width: 20%">
43-
<a
44-
href="{{ route('group', ['id' => $group->id]) }}"
43+
<span
4544
style="
4645
color: {{ $group->color }};
4746
background-image: {{ $group->effect }};
4847
"
4948
>
5049
<i class="{{ $group->icon }}"></i>
5150
{{ $group->name }}
52-
</a>
51+
</span>
5352
</td>
5453
<td>
5554
@if ($group->autogroup)

resources/views/stats/groups/groups.blade.php

+2-5
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,10 @@
3636
@foreach ($groups as $group)
3737
<tr>
3838
<td>
39-
<a
40-
href="{{ route('group', ['id' => $group->id]) }}"
41-
style="color: {{ $group->color }}"
42-
>
39+
<span style="color: {{ $group->color }}">
4340
<i class="{{ $group->icon }}"></i>
4441
{{ $group->name }}
45-
</a>
42+
</span>
4643
</td>
4744
<td>{{ $group->users_count }}</td>
4845
</tr>

resources/views/user/invite-tree/index.blade.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -309,14 +309,13 @@ class="form__button form__button--text"
309309
<tr>
310310
<td>
311311
<span class="user-tag">
312-
<a
312+
<span
313313
class="user-tag__link {{ $groups->first()->icon }}"
314-
href="{{ route('group', ['id' => $groups->first()->id]) }}"
315314
style="color: {{ $groups->first()->color }}"
316315
title="{{ $groups->first()->name }}"
317316
>
318317
{{ $groups->first()->name }}
319-
</a>
318+
</span>
320319
</span>
321320
</td>
322321
<td style="text-align: right">{{ $groups->count() }}</td>

resources/views/user/profile/show.blade.php

+2-3
Original file line numberDiff line numberDiff line change
@@ -905,14 +905,13 @@ class="{{ config('other.font-awesome') }} fa-times text-red"
905905
<dd>
906906
@if (null !== ($group = \App\Models\Group::find($externalUser['group_id'])))
907907
<span class="user-tag">
908-
<a
908+
<span
909909
class="user-tag__link {{ $group->icon }}"
910-
href="{{ route('group', ['id' => $group->id]) }}"
911910
style="color: {{ $group->color }}"
912911
title="{{ $group->name }}"
913912
>
914913
{{ $group->name }}
915-
</a>
914+
</span>
916915
</span>
917916
@else
918917
Unrecognized group_id: {{ $externalUser['group_id'] }}

routes/web.php

-1
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@
200200
Route::get('/torrent/dead', [App\Http\Controllers\StatsController::class, 'dead'])->name('dead');
201201
Route::get('/request/bountied', [App\Http\Controllers\StatsController::class, 'bountied'])->name('bountied');
202202
Route::get('/groups', [App\Http\Controllers\StatsController::class, 'groups'])->name('groups');
203-
Route::get('/groups/group/{id}', [App\Http\Controllers\StatsController::class, 'group'])->name('group')->whereNumber('id');
204203
Route::get('/groups/requirements', [App\Http\Controllers\StatsController::class, 'groupsRequirements'])->name('groups_requirements');
205204
Route::get('/languages', [App\Http\Controllers\StatsController::class, 'languages'])->name('languages');
206205
Route::get('/themes', [App\Http\Controllers\StatsController::class, 'themes'])->name('themes');

tests/Feature/Http/Controllers/StatsControllerTest.php

-17
Original file line numberDiff line numberDiff line change
@@ -125,23 +125,6 @@
125125
// TODO: perform additional assertions
126126
});
127127

128-
test('group returns an ok response', function (): void {
129-
$this->markTestIncomplete('This test case was generated by Shift. When you are ready, remove this line and complete this test case.');
130-
131-
$group = Group::factory()->create();
132-
$users = User::factory()->times(3)->create();
133-
$user = User::factory()->create();
134-
135-
$response = $this->actingAs($user)->get(route('group', ['id' => $id]));
136-
137-
$response->assertOk();
138-
$response->assertViewIs('stats.groups.group');
139-
$response->assertViewHas('users', $users);
140-
$response->assertViewHas('group', $group);
141-
142-
// TODO: perform additional assertions
143-
});
144-
145128
test('groups returns an ok response', function (): void {
146129
$this->markTestIncomplete('This test case was generated by Shift. When you are ready, remove this line and complete this test case.');
147130

0 commit comments

Comments
 (0)