refactor: user views

app/Http/Controllers/User/AchievementsController.php

@@ -32,7 +32,7 @@ class AchievementsController extends Controller
         $achievements = $user->unlockedAchievements();
         $pending = $user->inProgressAchievements();
 
-        return \view('achievement.index', [
+        return \view('user.achievement.index', [
             'route'        => 'achievement',
             'user'         => $user,
             'achievements' => $achievements,
@@ -49,7 +49,7 @@ class AchievementsController extends Controller
 
         $achievements = $user->unlockedAchievements();
 
-        return \view('achievement.show', [
+        return \view('user.achievement.show', [
             'route'        => 'achievement',
             'user'         => $user,
             'achievements' => $achievements,

app/Http/Controllers/User/EarningController.php

@@ -149,7 +149,7 @@ class EarningController extends Controller
             + 1.00 * $mvp
             + 2.00 * $legend;
 
-        return \view('bonus.index', [
+        return \view('user.earning.index', [
             'user'              => $user,
             'userbon'           => $userbon,
             'dying'             => $dying,

app/Http/Controllers/User/GiftController.php

@@ -62,7 +62,7 @@ class GiftController extends Controller
             ->where('name', '=', 'gift')
             ->sum('cost');
 
-        return \view('bonus.gifts', [
+        return \view('user.gift.index', [
             'user'              => $user,
             'gifttransactions'  => $gifttransactions,
             'userbon'           => $userbon,
@@ -82,7 +82,7 @@ class GiftController extends Controller
 
         $userbon = $user->getSeedbonus();
 
-        return \view('bonus.gift', [
+        return \view('user.gift.create', [
             'user'              => $user,
             'userbon'           => $userbon,
         ]);

app/Http/Controllers/User/InviteController.php

@@ -39,7 +39,7 @@ class InviteController extends Controller
 
         $invites = Invite::with(['sender', 'receiver'])->where('user_id', '=', $owner->id)->latest()->paginate(25);
 
-        return \view('user.invites', ['user' => $owner, 'invites' => $invites, 'route' => 'invite']);
+        return \view('user.invite.index', ['user' => $owner, 'invites' => $invites, 'route' => 'invite']);
     }
 
     /**
@@ -64,7 +64,7 @@ class InviteController extends Controller
                 ->withErrors(\trans('user.invites-disabled-group'));
         }
 
-        return \view('user.invite', ['user' => $user, 'route' => 'invite']);
+        return \view('user.invite.create', ['user' => $user, 'route' => 'invite']);
     }
 
     /**

app/Http/Controllers/User/NotificationController.php

@@ -27,7 +27,7 @@ class NotificationController extends Controller
      */
     public function index(Request $request): \Illuminate\Contracts\View\Factory|\Illuminate\View\View
     {
-        return \view('notification.index');
+        return \view('user.notification.index');
     }
 
     /**

app/Http/Controllers/User/PrivateMessageController.php

@@ -33,7 +33,7 @@ class PrivateMessageController extends Controller
             ['subject', 'like', '%'.$request->input('subject').'%'],
         ])->latest()->paginate(20);
 
-        return \view('pm.inbox', ['pms' => $pms, 'user' => $user]);
+        return \view('user.pm.index', ['pms' => $pms, 'user' => $user]);
     }
 
     /**
@@ -46,7 +46,7 @@ class PrivateMessageController extends Controller
             ['subject', 'like', '%'.$request->input('subject').'%'],
         ])->latest()->paginate(20);
 
-        return \view('pm.outbox', ['pms' => $pms, 'user' => $user]);
+        return \view('user.pm.outbox', ['pms' => $pms, 'user' => $user]);
     }
 
     /**
@@ -57,7 +57,7 @@ class PrivateMessageController extends Controller
         $user = $request->user();
         $pms = PrivateMessage::where('receiver_id', '=', $user->id)->latest()->paginate(25);
 
-        return \view('pm.inbox', ['pms' => $pms, 'user' => $user]);
+        return \view('user.pm.index', ['pms' => $pms, 'user' => $user]);
     }
 
     /**
@@ -68,7 +68,7 @@ class PrivateMessageController extends Controller
         $user = $request->user();
         $pms = PrivateMessage::where('sender_id', '=', $user->id)->latest()->paginate(20);
 
-        return \view('pm.outbox', ['pms' => $pms, 'user' => $user]);
+        return \view('user.pm.outbox', ['pms' => $pms, 'user' => $user]);
     }
 
     /**
@@ -85,7 +85,7 @@ class PrivateMessageController extends Controller
                 $pm->save();
             }
 
-            return \view('pm.message', ['pm' => $pm, 'user' => $user]);
+            return \view('user.pm.show', ['pm' => $pm, 'user' => $user]);
         }
 
         return \to_route('inbox')
@@ -99,7 +99,7 @@ class PrivateMessageController extends Controller
     {
         $user = $request->user();
 
-        return \view('pm.send', ['user' => $user, 'receiver_id' => $receiverId, 'username' => $username]);
+        return \view('user.pm.create', ['user' => $user, 'receiver_id' => $receiverId, 'username' => $username]);
     }
 
     /**

app/Http/Controllers/User/SeedboxController.php

@@ -35,7 +35,7 @@ class SeedboxController extends Controller
 
         $seedboxes = Seedbox::where('user_id', '=', $user->id)->paginate(25);
 
-        return \view('seedbox.index', ['user' => $user, 'seedboxes' => $seedboxes]);
+        return \view('user.seedbox.index', ['user' => $user, 'seedboxes' => $seedboxes]);
     }
 
     /**

app/Http/Controllers/User/TipController.php

@@ -59,7 +59,7 @@ class TipController extends Controller
             ->where('name', '=', 'tip')
             ->sum('cost');
 
-        return \view('bonus.tips', [
+        return \view('user.tip.index', [
             'user'              => $user,
             'bontransactions'   => $bontransactions,
             'userbon'           => $userbon,

app/Http/Controllers/User/TransactionController.php

@@ -49,7 +49,7 @@ class TransactionController extends Controller
         $activefl = $user->personalFreeleeches()->exists();
         $items = BonExchange::all();
 
-        return \view('bonus.store', [
+        return \view('user.transaction.create', [
             'user'              => $user,
             'userbon'           => $userbon,
             'activefl'          => $activefl,

app/Http/Controllers/User/UserController.php

@@ -97,7 +97,7 @@ class UserController extends Controller
             ->whereNotNull('unlocked_at')
             ->get();
 
-        return \view('user.profile', [
+        return \view('user.profile.show', [
             'route'        => 'profile',
             'user'         => $user,
             'groups'       => $groups,
@@ -135,7 +135,7 @@ class UserController extends Controller
         $user = User::where('username', '=', $username)->firstOrFail();
         $results = Follow::with('user')->where('target_id', '=', $user->id)->latest()->paginate(25);
 
-        return \view('user.followers', [
+        return \view('user.follower.index', [
             'route'   => 'follower',
             'results' => $results,
             'user'    => $user,
@@ -150,7 +150,7 @@ class UserController extends Controller
         $user = User::where('username', '=', $username)->firstOrFail();
         $results = Topic::where('topics.first_post_user_id', '=', $user->id)->latest()->paginate(25);
 
-        return \view('user.topics', [
+        return \view('user.topic.index', [
             'route'   => 'forum',
             'results' => $results,
             'user'    => $user,
@@ -165,7 +165,7 @@ class UserController extends Controller
         $user = User::where('username', '=', $username)->firstOrFail();
         $results = Post::selectRaw('posts.id as id,posts.*')->with(['topic', 'user'])->leftJoin('topics', 'posts.topic_id', '=', 'topics.id')->where('posts.user_id', '=', $user->id)->latest('posts.created_at')->paginate(25);
 
-        return \view('user.posts', [
+        return \view('user.post.index', [
             'route'   => 'forum',
             'results' => $results,
             'user'    => $user,
@@ -181,7 +181,7 @@ class UserController extends Controller
 
         \abort_unless($request->user()->id == $user->id, 403);
 
-        return \view('user.edit_profile', ['user' => $user, 'route' => 'edit']);
+        return \view('user.profile.edit', ['user' => $user, 'route' => 'edit']);
     }
 
     /**
@@ -249,7 +249,7 @@ class UserController extends Controller
 
         \abort_unless($request->user()->id == $user->id, 403);
 
-        return \view('user.settings', ['user' => $user, 'route' => 'settings']);
+        return \view('user.settings.general.index', ['user' => $user, 'route' => 'settings']);
     }
 
     /**
@@ -306,7 +306,7 @@ class UserController extends Controller
 
         \abort_unless($request->user()->id == $user->id, 403);
 
-        return \view('user.security', ['user' => $user]);
+        return \view('user.settings.security.index', ['user' => $user]);
     }
 
     /**
@@ -1053,7 +1053,7 @@ class UserController extends Controller
 
         $groups = Group::where('level', '>', 0)->latest('level')->get();
 
-        return \view('user.privacy', ['user' => $user, 'groups'=> $groups]);
+        return \view('user.settings.privacy.index', ['user' => $user, 'groups'=> $groups]);
     }
 
     /**
@@ -1067,7 +1067,7 @@ class UserController extends Controller
 
         $groups = Group::where('level', '>', 0)->latest('level')->get();
 
-        return \view('user.notification', ['user' => $user, 'groups'=> $groups]);
+        return \view('user.settings.notification.index', ['user' => $user, 'groups'=> $groups]);
     }
 
     /**
@@ -1141,7 +1141,7 @@ class UserController extends Controller
                     ->paginate(25);
             }
 
-            return \view('user.filters.requests', [
+            return \view('user.request.partials.index', [
                 'user'            => $user,
                 'torrentRequests' => $table,
             ])->render();
@@ -1195,7 +1195,7 @@ class UserController extends Controller
                     ->paginate(50);
             }
 
-            return \view('user.filters.resurrections', [
+            return \view('user.resurrection.partials.index', [
                 'user'          => $user,
                 'resurrections' => $table,
             ])->render();
@@ -1211,7 +1211,7 @@ class UserController extends Controller
     {
         $user = User::where('username', '=', $username)->firstOrFail();
         if (($request->user()->id == $user->id || $request->user()->group->is_modo)) {
-            $logger = 'user.private.requests';
+            $logger = 'user.request.private';
 
             $torrentRequests = TorrentRequest::with(['user', 'category', 'type'])->where('user_id', '=', $user->id)->latest()->paginate(25);
 
@@ -1222,7 +1222,7 @@ class UserController extends Controller
             ]);
         }
 
-        $logger = 'user.requests';
+        $logger = 'user.request.index';
         $torrentRequests = TorrentRequest::with(['user', 'category', 'type'])->where('user_id', '=', $user->id)->where('anon', '!=', 1)->latest()->paginate(25);
 
         return \view($logger, [
@@ -1245,7 +1245,7 @@ class UserController extends Controller
         $hisDownl = History::where('user_id', '=', $user->id)->sum('actual_downloaded');
         $hisDownlCre = History::where('user_id', '=', $user->id)->sum('downloaded');
 
-        return \view('user.private.torrents', [
+        return \view('user.history.index', [
             'route'         => 'torrents',
             'user'          => $user,
             'his_upl'       => $hisUpl,
@@ -1268,7 +1268,7 @@ class UserController extends Controller
         $hisDownl = History::where('user_id', '=', $user->id)->sum('actual_downloaded');
         $hisDownlCre = History::where('user_id', '=', $user->id)->sum('downloaded');
 
-        return \view('user.private.uploads', [
+        return \view('user.torrent.index', [
             'route'         => 'uploads',
             'user'          => $user,
             'his_upl'       => $hisUpl,
@@ -1288,7 +1288,7 @@ class UserController extends Controller
 
         $resurrections = Graveyard::with(['torrent', 'user'])->where('user_id', '=', $user->id)->paginate(50);
 
-        return \view('user.private.resurrections', [
+        return \view('user.resurrection.index', [
             'route'         => 'resurrections',
             'user'          => $user,
             'resurrections' => $resurrections,
@@ -1309,7 +1309,7 @@ class UserController extends Controller
         $hisDownl = History::where('user_id', '=', $user->id)->sum('actual_downloaded');
         $hisDownlCre = History::where('user_id', '=', $user->id)->sum('downloaded');
 
-        return \view('user.private.active', ['user' => $user,
+        return \view('user.peer.index', ['user' => $user,
             'route'                                 => 'active',
             'his_upl'                               => $hisUpl,
             'his_upl_cre'                           => $hisUplCre,
@@ -1328,7 +1328,7 @@ class UserController extends Controller
         $user = User::where('username', '=', $username)->firstOrFail();
         $bans = Ban::where('owned_by', '=', $user->id)->latest()->get();
 
-        return \view('user.banlog', [
+        return \view('user.ban.index', [
             'user'      => $user,
             'bans'      => $bans,
         ]);

app/Http/Controllers/User/WarningController.php

@@ -40,7 +40,7 @@ class WarningController extends Controller
         $softDeletedWarnings = Warning::where('user_id', '=', $user->id)->with(['torrenttitle', 'warneduser'])->latest('created_at')->onlyTrashed()->paginate(25);
         $softDeletedWarningCount = Warning::where('user_id', '=', $user->id)->onlyTrashed()->count();
 
-        return \view('user.warninglog', [
+        return \view('user.warning.index', [
             'warnings'                => $warnings,
             'warningcount'            => $warningcount,
             'softDeletedWarnings'     => $softDeletedWarnings,

app/Http/Controllers/User/WishController.php

@@ -42,7 +42,7 @@ class WishController extends Controller
 
         $wishes = $user->wishes()->latest()->paginate(25);
 
-        return \view('user.wishlist', [
+        return \view('user.wish.index', [
             'user'               => $user,
             'wishes'             => $wishes,
             'route'              => 'wish',

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

@@ -796,5 +796,5 @@
         @endif
     </div>
 
-    @include('user.user_modals', ['user' => $user])
+    @include('user.profile.partials.modals', ['user' => $user])
 @endsection

resources/views/user/rss.blade.php

@@ -1,24 +0,0 @@
-@extends('layout.default')
-
-@section('title')
-    <title>{{ $user->username }} - Rss Configuration - {{ config('other.title') }}</title>
-@endsection
-
-@section('breadcrumb')
-    <li>
-        <a href="#" itemprop="url" class="l-breadcrumb-item-link">
-            <span itemprop="title" class="l-breadcrumb-item-link-title">RSS Configuration</span>
-        </a>
-    </li>
-@endsection
-
-@section('content')
-    <div class="contrainer">
-        @foreach ($labourTypes as $id => $name)
-            <div class="checkbox">
-                <label>
-                    <input type="checkbox" name="labour_types[]" value="{{ $id }}"> {{ $name }}
-                </label>
-                <div>
-    @endforeach
-@endsection

tests/Todo/Feature/Http/Controllers/InviteControllerTest.php

@@ -40,7 +40,7 @@ class InviteControllerTest extends TestCase
         $response = $this->actingAs($user)->get(route('invites.index', ['username' => $invite->username]));
 
         $response->assertOk();
-        $response->assertViewIs('user.invites');
+        $response->assertViewIs('user.invite.index');
         $response->assertViewHas('owner');
         $response->assertViewHas('invites');
         $response->assertViewHas('route');

tests/Todo/Feature/Http/Controllers/UserControllerTest.php

@@ -44,7 +44,7 @@ class UserControllerTest extends TestCase
         $response = $this->actingAs($user)->get(route('user_active', ['username' => $user->username]));
 
         $response->assertOk();
-        $response->assertViewIs('user.private.active');
+        $response->assertViewIs('user.peer.index');
         $response->assertViewHas('user');
         $response->assertViewHas('route');
         $response->assertViewHas('his_upl');
@@ -197,7 +197,7 @@ class UserControllerTest extends TestCase
         $response = $this->actingAs($user)->get(route('user_edit_profile_form', ['username' => $user->username]));
 
         $response->assertOk();
-        $response->assertViewIs('user.edit_profile');
+        $response->assertViewIs('user.profile.edit');
         $response->assertViewHas('user');
         $response->assertViewHas('route');
 
@@ -234,7 +234,7 @@ class UserControllerTest extends TestCase
         $response = $this->actingAs($user)->get(route('user_followers', ['username' => $user->username]));
 
         $response->assertOk();
-        $response->assertViewIs('user.followers');
+        $response->assertViewIs('user.follower.index');
         $response->assertViewHas('route');
         $response->assertViewHas('results');
         $response->assertViewHas('user');
@@ -255,7 +255,7 @@ class UserControllerTest extends TestCase
         $response = $this->actingAs($user)->get(route('banlog', ['username' => $user->username]));
 
         $response->assertOk();
-        $response->assertViewIs('user.banlog');
+        $response->assertViewIs('user.ban.index');
         $response->assertViewHas('user');
         $response->assertViewHas('bans');
 
@@ -363,7 +363,7 @@ class UserControllerTest extends TestCase
         $response = $this->actingAs($user)->get(route('user_notification', ['username' => $user->username]));
 
         $response->assertOk();
-        $response->assertViewIs('user.notification');
+        $response->assertViewIs('user.settings.notification.index');
         $response->assertViewHas('user');
         $response->assertViewHas('groups');
 
@@ -383,7 +383,7 @@ class UserControllerTest extends TestCase
         $response = $this->actingAs($user)->get(route('user_posts', ['username' => $user->username]));
 
         $response->assertOk();
-        $response->assertViewIs('user.posts');
+        $response->assertViewIs('user.post.index');
         $response->assertViewHas('route');
         $response->assertViewHas('results');
         $response->assertViewHas('user');
@@ -404,7 +404,7 @@ class UserControllerTest extends TestCase
         $response = $this->actingAs($user)->get(route('user_privacy', ['username' => $user->username]));
 
         $response->assertOk();
-        $response->assertViewIs('user.privacy');
+        $response->assertViewIs('user.settings.privacy.index');
         $response->assertViewHas('user');
         $response->assertViewHas('groups');
 
@@ -445,7 +445,7 @@ class UserControllerTest extends TestCase
         $response = $this->actingAs($user)->get(route('user_resurrections', ['username' => $user->username]));
 
         $response->assertOk();
-        $response->assertViewIs('user.private.resurrections');
+        $response->assertViewIs('user.resurrection.index');
         $response->assertViewHas('route');
         $response->assertViewHas('user');
         $response->assertViewHas('resurrections');
@@ -466,7 +466,7 @@ class UserControllerTest extends TestCase
         $response = $this->actingAs($user)->get(route('user_security', ['username' => $user->username]));
 
         $response->assertOk();
-        $response->assertViewIs('user.security');
+        $response->assertViewIs('user.settings.security.index');
         $response->assertViewHas('user');
 
         // TODO: perform additional assertions
@@ -485,7 +485,7 @@ class UserControllerTest extends TestCase
         $response = $this->actingAs($user)->get(route('user_settings', ['username' => $user->username]));
 
         $response->assertOk();
-        $response->assertViewIs('user.settings');
+        $response->assertViewIs('user.settings.general.index');
         $response->assertViewHas('user');
         $response->assertViewHas('route');
 
@@ -505,7 +505,7 @@ class UserControllerTest extends TestCase
         $response = $this->actingAs($user)->get(route('users.show', ['username' => $user->username]));
 
         $response->assertOk();
-        $response->assertViewIs('user.profile');
+        $response->assertViewIs('user.profile.show');
         $response->assertViewHas('route');
         $response->assertViewHas('user');
         $response->assertViewHas('groups');
@@ -537,7 +537,7 @@ class UserControllerTest extends TestCase
         $response = $this->actingAs($user)->get(route('user_topics', ['username' => $user->username]));
 
         $response->assertOk();
-        $response->assertViewIs('user.topics');
+        $response->assertViewIs('user.topic.index');
         $response->assertViewHas('route');
         $response->assertViewHas('results');
         $response->assertViewHas('user');
@@ -558,7 +558,7 @@ class UserControllerTest extends TestCase
         $response = $this->actingAs($user)->get(route('user_torrents', ['username' => $user->username]));
 
         $response->assertOk();
-        $response->assertViewIs('user.private.torrents');
+        $response->assertViewIs('user.history.index');
         $response->assertViewHas('route');
         $response->assertViewHas('user');
         $response->assertViewHas('his_upl');

tests/Todo/Feature/Http/Controllers/WarningControllerTest.php

@@ -112,7 +112,7 @@ class WarningControllerTest extends TestCase
         $response = $this->actingAs($user)->get(route('warnings.show', ['username' => $warning->username]));
 
         $response->assertOk();
-        $response->assertViewIs('user.warninglog');
+        $response->assertViewIs('user.warning.index');
         $response->assertViewHas('warnings');
         $response->assertViewHas('warningcount');
         $response->assertViewHas('softDeletedWarnings');

tests/Todo/Feature/Http/Controllers/WishControllerTest.php

@@ -41,7 +41,7 @@ class WishControllerTest extends TestCase
         $response = $this->actingAs($user)->get(route('wishes.index', ['username' => $wish->username]));
 
         $response->assertOk();
-        $response->assertViewIs('user.wishlist');
+        $response->assertViewIs('user.wish.index');
         $response->assertViewHas('user');
         $response->assertViewHas('wishes');
         $response->assertViewHas('route');