diff --git a/.blade.format.json b/.blade.format.json new file mode 100644 index 000000000..7e3ef46ad --- /dev/null +++ b/.blade.format.json @@ -0,0 +1,9 @@ +{ + "attributeJsOptions": { + "semi": true + }, + "phpOptions": { + "singleQuote": true + }, + "useLaravelPint": false +} diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 000000000..5ffce2432 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*.blade.php] +indent_style = space +indent_size = 4 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 000000000..46089d865 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,14 @@ +# ignore all files +/* + +# except /resources/views/**/*.blade.php +!/resources/ +/resources/* +!/resources/views/ +/resources/views/**/*.* +!/resources/views/**/*.blade.php + +# ignored +resources/views/emails +resources/views/rss/show.blade.php +resources/views/vendor diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 000000000..d4539defc --- /dev/null +++ b/.prettierrc @@ -0,0 +1,18 @@ +{ + "plugins": [ + "prettier-plugin-blade" + ], + "overrides": [ + { + "files": [ + "*.blade.php" + ], + "options": { + "parser": "blade", + "printWidth": 100, + "semi": true, + "singleQuote": true + } + } + ] +} diff --git a/package-lock.json b/package-lock.json index 0590d474c..cd030a1d8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "UNIT3D_PUBLIC", + "name": "www", "lockfileVersion": 3, "requires": true, "packages": { @@ -25,6 +25,9 @@ "vue": "^2.6.14", "vue-loader": "^15.9.8", "vue-template-compiler": "^2.6.14" + }, + "devDependencies": { + "prettier-plugin-blade": "^2.0.0" } }, "node_modules/@ampproject/remapping": { @@ -2314,6 +2317,21 @@ "url": "https://opencollective.com/postcss/" } }, + "node_modules/@vue/component-compiler-utils/node_modules/prettier": { + "version": "2.8.8", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", + "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "optional": true, + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, "node_modules/@vue/component-compiler-utils/node_modules/yallist": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", @@ -7657,20 +7675,33 @@ "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==" }, "node_modules/prettier": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", - "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", - "optional": true, + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.1.tgz", + "integrity": "sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw==", + "dev": true, + "peer": true, "bin": { - "prettier": "bin-prettier.js" + "prettier": "bin/prettier.cjs" }, "engines": { - "node": ">=10.13.0" + "node": ">=14" }, "funding": { "url": "https://github.com/prettier/prettier?sponsor=1" } }, + "node_modules/prettier-plugin-blade": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/prettier-plugin-blade/-/prettier-plugin-blade-2.0.0.tgz", + "integrity": "sha512-9x7hBfGHSKsJG2UNTzFdAadLCMnsgGbLI/cUsb0+leV37yw1ojUedSAhkE1K0TleKXBXgaYpVY+71T3ClYW8WA==", + "dev": true, + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "prettier": ">=3" + } + }, "node_modules/pretty-time": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/pretty-time/-/pretty-time-1.1.0.tgz", diff --git a/package.json b/package.json index 3dbb58ace..1e0886379 100644 --- a/package.json +++ b/package.json @@ -28,5 +28,8 @@ "vue": "^2.6.14", "vue-loader": "^15.9.8", "vue-template-compiler": "^2.6.14" + }, + "devDependencies": { + "prettier-plugin-blade": "^2.0.0" } } \ No newline at end of file diff --git a/resources/views/Staff/announce/index.blade.php b/resources/views/Staff/announce/index.blade.php index e5656b1b7..db34a8c51 100644 --- a/resources/views/Staff/announce/index.blade.php +++ b/resources/views/Staff/announce/index.blade.php @@ -10,9 +10,7 @@ {{ __('staff.staff-dashboard') }} -
  • - Announces -
    • +
  • Announces
    • @endsection @section('page', 'page__history--index') diff --git a/resources/views/Staff/apikey/index.blade.php b/resources/views/Staff/apikey/index.blade.php index 8a9c13667..235dc08d6 100644 --- a/resources/views/Staff/apikey/index.blade.php +++ b/resources/views/Staff/apikey/index.blade.php @@ -1,11 +1,17 @@ @extends('layout.default') @section('title') - {{ __('common.user') }} {{ __('user.apikeys') }} - {{ __('staff.staff-dashboard') }} - {{ config('other.title') }} + + {{ __('common.user') }} {{ __('user.apikeys') }} - {{ __('staff.staff-dashboard') }} - + {{ config('other.title') }} + @endsection @section('meta') - + @endsection @section('breadcrumbs') diff --git a/resources/views/Staff/application/index.blade.php b/resources/views/Staff/application/index.blade.php index bad60f340..eb4d16bb3 100644 --- a/resources/views/Staff/application/index.blade.php +++ b/resources/views/Staff/application/index.blade.php @@ -5,7 +5,7 @@ @endsection @section('meta') - + @endsection @section('breadcrumbs') @@ -58,7 +58,7 @@ @@ -67,12 +67,15 @@ @switch($application->status) @case(\App\Models\Application::PENDING) Pending + @break @case(\App\Models\Application::APPROVED) Approved + @break @case(\App\Models\Application::REJECTED) Rejected + @break @default Unknown @@ -90,7 +93,8 @@
  • + href="{{ route('staff.applications.show', ['id' => $application->id]) }}" + > {{ __('common.view') }}
    • @@ -100,7 +104,7 @@ @empty - {{ __('common.no')}} {{__('staff.applications') }} + {{ __('common.no') }} {{ __('staff.applications') }} @endforelse diff --git a/resources/views/Staff/application/show.blade.php b/resources/views/Staff/application/show.blade.php index fd5809002..c4ee2386c 100644 --- a/resources/views/Staff/application/show.blade.php +++ b/resources/views/Staff/application/show.blade.php @@ -5,7 +5,7 @@ @endsection @section('meta') - + @endsection @section('breadcrumbs') @@ -31,7 +31,7 @@

    {{ __('common.image') }}

    -

    - {{ __('user.profile') }} {{ __('staff.links') }} -

    +

    {{ __('user.profile') }} {{ __('staff.links') }}

    - @if($application->status !== \App\Models\Application::PENDING) + @if ($application->status !== \App\Models\Application::PENDING)

    {{ __('common.moderated-by') }}

    @@ -106,93 +110,115 @@ @else

    {{ __('common.action') }}

    -
    -

    - -

    - -

    - {{ __('request.approve') }} - {{ __('common.this') }} - {{ __('staff.application') }} -

    -
    - @csrf - +

    + +

    + +

    + {{ __('request.approve') }} + {{ __('common.this') }} + {{ __('staff.application') }} +

    + + @csrf + +

    + - -

    -

    - - -

    - -
    -
    -
    -

    - -

    - -

    - {{ __('request.reject') }} - {{ __('common.this') }} - {{ __('staff.application') }} -

    -
    - @csrf - -

    - - -

    -

    - - -

    -
    -     -
    + +

    +

    + + +

    + + +
    +
    +

    + +

    + +

    + {{ __('request.reject') }} + {{ __('common.this') }} + {{ __('staff.application') }} +

    +
    + @csrf + +

    + + +

    +

    + + +

    +
    +     +
    @endif
    diff --git a/resources/views/Staff/article/create.blade.php b/resources/views/Staff/article/create.blade.php index 7b55bdcfb..6eec83170 100644 --- a/resources/views/Staff/article/create.blade.php +++ b/resources/views/Staff/article/create.blade.php @@ -34,29 +34,20 @@ > @csrf

    - +

    - +

    @livewire('bbcode-input', ['name' => 'content', 'label' => __('content'), 'required' => true ])

    - +

    diff --git a/resources/views/Staff/article/edit.blade.php b/resources/views/Staff/article/edit.blade.php index 116e3f002..6edb6dd78 100644 --- a/resources/views/Staff/article/edit.blade.php +++ b/resources/views/Staff/article/edit.blade.php @@ -27,7 +27,9 @@ @section('main')
    -

    {{ __('common.edit') }} {{ __('common.article') }}: {{ $article->title }}

    +

    + {{ __('common.edit') }} {{ __('common.article') }}: {{ $article->title }} +

    + />

    - +

    @livewire('bbcode-input', ['name' => 'content', 'label' => __('content'), 'required' => true, 'content' => $article->content ])

    - +

    diff --git a/resources/views/Staff/article/index.blade.php b/resources/views/Staff/article/index.blade.php index 0a7a76feb..5d06d7735 100644 --- a/resources/views/Staff/article/index.blade.php +++ b/resources/views/Staff/article/index.blade.php @@ -32,13 +32,13 @@ - - - - - - - + + + + + + + @foreach ($articles as $article) @@ -54,7 +54,10 @@ @@ -85,19 +88,24 @@ > @csrf @method('DELETE') - diff --git a/resources/views/Staff/audit/index.blade.php b/resources/views/Staff/audit/index.blade.php index 1f2d3fc36..8c81fdd64 100644 --- a/resources/views/Staff/audit/index.blade.php +++ b/resources/views/Staff/audit/index.blade.php @@ -5,7 +5,7 @@ @endsection @section('meta') - + @endsection @section('breadcrumbs') diff --git a/resources/views/Staff/authentication/index.blade.php b/resources/views/Staff/authentication/index.blade.php index 3b136cac9..0aa06aec8 100644 --- a/resources/views/Staff/authentication/index.blade.php +++ b/resources/views/Staff/authentication/index.blade.php @@ -1,11 +1,13 @@ @extends('layout.default') @section('title') - Failed Login Log - {{ __('staff.staff-dashboard') }} - {{ config('other.title') }} + + Failed Login Log - {{ __('staff.staff-dashboard') }} - {{ config('other.title') }} + @endsection @section('meta') - + @endsection @section('breadcrumbs') diff --git a/resources/views/Staff/backup/index.blade.php b/resources/views/Staff/backup/index.blade.php index 66451c625..e38e3060d 100644 --- a/resources/views/Staff/backup/index.blade.php +++ b/resources/views/Staff/backup/index.blade.php @@ -1,12 +1,17 @@ @extends('layout.default') @section('title') - {{ __('backup.backup') }} {{ __('backup.manager') }} - {{ __('staff.staff-dashboard') }} - - {{ config('other.title') }} + + {{ __('backup.backup') }} {{ __('backup.manager') }} - {{ __('staff.staff-dashboard') }} + - {{ config('other.title') }} + @endsection @section('meta') - + @endsection @section('breadcrumbs') @@ -15,9 +20,7 @@ {{ __('staff.staff-dashboard') }} -
  • - {{ __('backup.backup') }} {{ __('backup.manager') }} -
    • +
  • {{ __('backup.backup') }} {{ __('backup.manager') }}
    • @endsection @section('page', 'page__backup-manager--index') diff --git a/resources/views/Staff/ban/index.blade.php b/resources/views/Staff/ban/index.blade.php index 6ef3fd07a..52bd60817 100644 --- a/resources/views/Staff/ban/index.blade.php +++ b/resources/views/Staff/ban/index.blade.php @@ -5,7 +5,7 @@ @endsection @section('meta') - + @endsection @section('breadcrumbs') @@ -54,21 +54,25 @@ @empty - + @endforelse diff --git a/resources/views/Staff/blacklist/clients/create.blade.php b/resources/views/Staff/blacklist/clients/create.blade.php index 08e9d16a2..b99ab7ad5 100644 --- a/resources/views/Staff/blacklist/clients/create.blade.php +++ b/resources/views/Staff/blacklist/clients/create.blade.php @@ -38,8 +38,10 @@ required type="text" value="{{ old('name') }}" - > - + /> +

    + /> @@ -62,4 +64,4 @@ -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/Staff/blacklist/clients/edit.blade.php b/resources/views/Staff/blacklist/clients/edit.blade.php index 7eae31fa4..8fb6670be 100644 --- a/resources/views/Staff/blacklist/clients/edit.blade.php +++ b/resources/views/Staff/blacklist/clients/edit.blade.php @@ -39,8 +39,10 @@ required type="text" value="{{ $client->name }}" - > - + /> +

    + /> @@ -63,4 +65,4 @@ -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/Staff/blacklist/clients/index.blade.php b/resources/views/Staff/blacklist/clients/index.blade.php index 8cc98478a..9e9f9e592 100644 --- a/resources/views/Staff/blacklist/clients/index.blade.php +++ b/resources/views/Staff/blacklist/clients/index.blade.php @@ -6,9 +6,7 @@ {{ __('staff.staff-dashboard') }} -

  • - Client Blacklist -
    • +
  • Client Blacklist
    • @endsection @section('main') @@ -17,7 +15,10 @@

    Blacklisted Clients

    - + {{ __('common.add') }}
    @@ -56,7 +57,8 @@ @csrf @method('DELETE') @@ -81,4 +84,4 @@
    TitleAuthorDate{{ __('common.comments') }}{{ __('common.action') }}
    TitleAuthorDate{{ __('common.comments') }}{{ __('common.action') }}
    - {{ $ban->ban_reason }} {{ $ban->unban_reason }} - -
    - No bans - No bans
    -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/Staff/blocked_ip/index.blade.php b/resources/views/Staff/blocked_ip/index.blade.php index 03ebad531..128bb26a6 100644 --- a/resources/views/Staff/blocked_ip/index.blade.php +++ b/resources/views/Staff/blocked_ip/index.blade.php @@ -1,11 +1,17 @@ @extends('layout.default') @section('title') - {{ __('staff.blocked-ips') }} - {{ __('staff.staff-dashboard') }} - {{ config('other.title') }} + + {{ __('staff.blocked-ips') }} - {{ __('staff.staff-dashboard') }} - + {{ config('other.title') }} + @endsection @section('meta') - + @endsection @section('breadcrumbs') @@ -23,4 +29,4 @@ @section('main') @livewire('block-ip-address') -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/Staff/bon_exchange/create.blade.php b/resources/views/Staff/bon_exchange/create.blade.php index d9e8548e1..9546f2eec 100644 --- a/resources/views/Staff/bon_exchange/create.blade.php +++ b/resources/views/Staff/bon_exchange/create.blade.php @@ -20,7 +20,7 @@

    {{ __('common.add') }} - {{ trans_choice('common.a-an-art',false) }} + {{ trans_choice('common.a-an-art', false) }} {{ __('bon.bon') }} {{ __('bon.exchange') }}

    @@ -40,8 +40,10 @@ class="form__text" value="{{ old('description') }}" required - > - + /> +

    + /> @@ -68,18 +70,13 @@ pattern="[0-9]*" value="{{ old('cost') }}" required - > + />

    -

    {{ __('common.edit') }} - {{ trans_choice('common.a-an-art',false) }} + {{ trans_choice('common.a-an-art', false) }} {{ __('bon.bon') }} {{ __('bon.exchange') }}

    @@ -41,8 +41,10 @@ class="form__text" value="{{ $bonExchange->description }}" required - > - + /> +

    + /> @@ -69,29 +71,40 @@ pattern="[0-9]*" value="{{ $bonExchange->cost }}" required - > + />

    - - - - - diff --git a/resources/views/Staff/bon_exchange/index.blade.php b/resources/views/Staff/bon_exchange/index.blade.php index 743e8b1be..b4b939f79 100644 --- a/resources/views/Staff/bon_exchange/index.blade.php +++ b/resources/views/Staff/bon_exchange/index.blade.php @@ -6,9 +6,7 @@ {{ __('staff.staff-dashboard') }} -

  • - {{ __('bon.bon') }} {{ __('bon.exchange') }} -
    • +
  • {{ __('bon.bon') }} {{ __('bon.exchange') }}
    • @endsection @section('content') @@ -18,7 +16,7 @@
    {{ __('common.add') }} - {{ trans_choice('common.a-an-art',true) }} + {{ trans_choice('common.a-an-art', true) }} {{ __('bon.exchange') }}
    @@ -26,64 +24,76 @@
    - - - - - - - + + + + + + + - @foreach ($bonExchanges as $bonExchange) - - - - - - + + + + - - @endforeach + @csrf + @method('DELETE') + + {{ __('common.edit') }} + + + + + + @endforeach
    {{ __('common.name') }}{{ __('value') }}{{ __('bon.points') }}{{ __('common.type') }}{{ __('common.actions') }}
    {{ __('common.name') }}{{ __('value') }}{{ __('bon.points') }}{{ __('common.type') }}{{ __('common.actions') }}
    {{ $bonExchange->description }}{{ $bonExchange->value }}{{ $bonExchange->cost }} - @switch (1) - @case ($bonExchange->upload) - {{ __('common.add') }} {{ __('common.upload') }} - @break - @case ($bonExchange->download) - {{ __('common.remove') }} {{ __('common.download') }} - @break - @case ($bonExchange->personal_freeleech) - {{ __('torrent.personal-freeleech') }} - @break - @case ($bonExchange->invite) - {{ __('user.invites') }} - @break - @endswitch - -
    - @csrf - @method('DELETE') - - {{ __('common.edit') }} - -
    		{{ $bonExchange->description }}{{ $bonExchange->value }}{{ $bonExchange->cost }} + @switch(1) + @case($bonExchange->upload) + {{ __('common.add') }} {{ __('common.upload') }} + + @break + @case($bonExchange->download) + {{ __('common.remove') }} {{ __('common.download') }} + + @break + @case($bonExchange->personal_freeleech) + {{ __('torrent.personal-freeleech') }} + + @break + @case($bonExchange->invite) + {{ __('user.invites') }} + + @break + @endswitch + + - {{ __('common.delete') }} - - -
    diff --git a/resources/views/Staff/category/create.blade.php b/resources/views/Staff/category/create.blade.php index 813a06052..5924fd196 100644 --- a/resources/views/Staff/category/create.blade.php +++ b/resources/views/Staff/category/create.blade.php @@ -22,7 +22,7 @@

    {{ __('common.add') }} - {{ trans_choice('common.a-an-art',false) }} + {{ trans_choice('common.a-an-art', false) }} {{ __('torrent.category') }}

    @@ -34,13 +34,7 @@ > @csrf

    - + @@ -52,19 +46,13 @@ type="text" name="position" placeholder=" " - > + />

    - + @@ -72,44 +60,22 @@

    - +

    - - - - - - + + + + + - +

    +

    diff --git a/resources/views/Staff/forum/index.blade.php b/resources/views/Staff/forum/index.blade.php index 7ee6f1bad..8485e0024 100644 --- a/resources/views/Staff/forum/index.blade.php +++ b/resources/views/Staff/forum/index.blade.php @@ -5,7 +5,7 @@ @endsection @section('meta') - + @endsection @section('breadcrumbs') @@ -32,73 +32,29 @@
    - - - - - - + + + + + + - @foreach ($categories as $category) - - - - - - - @foreach ($category->forums as $forum) + @foreach ($categories as $category) - - - + + + @foreach ($category->forums as $forum) + + + + + + + @endforeach @endforeach - @endforeach
    {{ __('common.name') }}Type{{ __('common.position') }}{{ __('common.action') }}
    {{ __('common.name') }}Type{{ __('common.position') }}{{ __('common.action') }}
    - {{ $category->name }} - Category{{ $category->position }} - -
  • - - {{ __('common.edit') }} - -
    • -
  • -
    - @csrf - @method('DELETE') - -
    -
    • -     -
    - {{ $forum->name }} + + + {{ $category->name }} + Forum{{ $forum->position }}Category{{ $category->position }}
  • {{ __('common.edit') }} @@ -106,23 +62,27 @@
  • @csrf @method('DELETE')
    • + + {{ $forum->name }} + + Forum{{ $forum->position }} + +
  • + + {{ __('common.edit') }} + +
    • +
  • + + @csrf + @method('DELETE') + + +
    • +     +
    diff --git a/resources/views/Staff/gift/index.blade.php b/resources/views/Staff/gift/index.blade.php index 681a8dd7e..df5092b3e 100644 --- a/resources/views/Staff/gift/index.blade.php +++ b/resources/views/Staff/gift/index.blade.php @@ -1,11 +1,14 @@ @extends('layout.default') @section('title') - {{ __('staff.gifts-log') }} - {{ __('staff.staff-dashboard') }} - {{ config('other.title') }} + + {{ __('staff.gifts-log') }} - {{ __('staff.staff-dashboard') }} - + {{ config('other.title') }} + @endsection @section('meta') - + @endsection @section('breadcrumbs') diff --git a/resources/views/Staff/group/create.blade.php b/resources/views/Staff/group/create.blade.php index 67c17f27d..0bf5cf6a4 100644 --- a/resources/views/Staff/group/create.blade.php +++ b/resources/views/Staff/group/create.blade.php @@ -25,13 +25,7 @@
    @csrf

    - + @@ -49,16 +43,8 @@

    - - + +

    - +

    - + @@ -110,160 +84,136 @@

    - + - + /> +

    - + - + /> +

    - + - + /> +

    - + - + /> +

    - + - + /> +

    - + - + /> +

    - + - + /> +

    - + - + /> +

    - + - + id="is_refundable" + class="form__checkbox" + name="is_refundable" + type="checkbox" + value="1" + /> +

    - + - + /> +

    - + - + /> +

    - + - + /> +

    -

    diff --git a/resources/views/Staff/moderation/partials/_postpone_dialog.blade.php b/resources/views/Staff/moderation/partials/_postpone_dialog.blade.php index 5d571653d..f7e4b1d9f 100644 --- a/resources/views/Staff/moderation/partials/_postpone_dialog.blade.php +++ b/resources/views/Staff/moderation/partials/_postpone_dialog.blade.php @@ -5,7 +5,8 @@

    - {{ __('common.moderation-postpone') }} {{ __('torrent.torrent') }}: {{ $torrent->name }} + {{ __('common.moderation-postpone') }} {{ __('torrent.torrent') }}: + {{ $torrent->name }}

    @csrf - - - - + + + +

    - - + +

    -

    diff --git a/resources/views/Staff/moderation/partials/_reject_dialog.blade.php b/resources/views/Staff/moderation/partials/_reject_dialog.blade.php index 6d141ea34..307fa4074 100644 --- a/resources/views/Staff/moderation/partials/_reject_dialog.blade.php +++ b/resources/views/Staff/moderation/partials/_reject_dialog.blade.php @@ -5,28 +5,37 @@

    - {{ __('common.moderation-reject') }} {{ __('torrent.torrent') }}: {{ $torrent->name }} + {{ __('common.moderation-reject') }} {{ __('torrent.torrent') }}: + {{ $torrent->name }}

    $torrent->id]) }}" + action="{{ route('staff.moderation.update', ['id' => $torrent->id]) }}" x-on:click.outside="$refs.dialog.close()" > @csrf - - - - + + + +

    - - + +

    -

    diff --git a/resources/views/Staff/note/index.blade.php b/resources/views/Staff/note/index.blade.php index 9a60d8a9c..c81fdfd91 100644 --- a/resources/views/Staff/note/index.blade.php +++ b/resources/views/Staff/note/index.blade.php @@ -1,11 +1,14 @@ @extends('layout.default') @section('title') - {{ __('common.user') }} Notes - {{ __('staff.staff-dashboard') }} - {{ config('other.title') }} + + {{ __('common.user') }} Notes - {{ __('staff.staff-dashboard') }} - + {{ config('other.title') }} + @endsection @section('meta') - + @endsection @section('nav-tabs') diff --git a/resources/views/Staff/page/create.blade.php b/resources/views/Staff/page/create.blade.php index ec6e70ae3..8491fb8ef 100644 --- a/resources/views/Staff/page/create.blade.php +++ b/resources/views/Staff/page/create.blade.php @@ -22,7 +22,7 @@

    {{ __('common.add') }} - {{ trans_choice('common.a-an-art',false) }} + {{ trans_choice('common.a-an-art', false) }} {{ __('common.new-adj') }} {{ __('staff.page') }}

    @@ -30,13 +30,7 @@ @csrf

    - + diff --git a/resources/views/Staff/page/edit.blade.php b/resources/views/Staff/page/edit.blade.php index 83efe5fce..69ba4491a 100644 --- a/resources/views/Staff/page/edit.blade.php +++ b/resources/views/Staff/page/edit.blade.php @@ -42,7 +42,7 @@ required type="text" value="{{ $page->name }}" - > + /> diff --git a/resources/views/Staff/page/index.blade.php b/resources/views/Staff/page/index.blade.php index e1d6f75db..1d8c9a5a6 100644 --- a/resources/views/Staff/page/index.blade.php +++ b/resources/views/Staff/page/index.blade.php @@ -18,7 +18,10 @@

    {{ __('staff.pages') }}

    - + {{ __('common.add') }}
    @@ -26,77 +29,84 @@
    - - - - - + + + + + - @forelse ($pages as $page) - - - - + + - - @empty - - - - @endforelse + {{ __('common.view') }} + + +
  • + + {{ __('common.edit') }} + +
    • +
  • +
    + @csrf + @method('DELETE') + + +
    • + + + + @empty + + + + @endforelse
    {{ __('common.title') }}{{ __('common.date') }}{{ __('common.actions') }}
    {{ __('common.title') }}{{ __('common.date') }}{{ __('common.actions') }}
    - - {{ $page->name }} - - - - - -
  • - - {{ __('common.view') }} - -
    • -
  • - - {{ __('common.edit') }} - -
    • -
  • - - @csrf - @method('DELETE') -
    		• + + {{ $page->name }} + + + + + +
  • + - {{ __('common.delete') }} - - -
    • -     -
    No pages
    No pages
    diff --git a/resources/views/Staff/partials/user-info-search.blade.php b/resources/views/Staff/partials/user-info-search.blade.php index 8c7f96e3f..2ddfbf447 100644 --- a/resources/views/Staff/partials/user-info-search.blade.php +++ b/resources/views/Staff/partials/user-info-search.blade.php @@ -5,7 +5,8 @@ > {{ __('common.users') }} -
  • +
    • +
  • Peers -
    • \ No newline at end of file + diff --git a/resources/views/Staff/passkey/index.blade.php b/resources/views/Staff/passkey/index.blade.php index be730fb8e..803f57e32 100644 --- a/resources/views/Staff/passkey/index.blade.php +++ b/resources/views/Staff/passkey/index.blade.php @@ -1,11 +1,17 @@ @extends('layout.default') @section('title') - {{ __('common.user') }} {{ __('staff.passkeys') }} - {{ __('staff.staff-dashboard') }} - {{ config('other.title') }} + + {{ __('common.user') }} {{ __('staff.passkeys') }} - {{ __('staff.staff-dashboard') }} - + {{ config('other.title') }} + @endsection @section('meta') - + @endsection @section('breadcrumbs') diff --git a/resources/views/Staff/peer/index.blade.php b/resources/views/Staff/peer/index.blade.php index 697803df1..b6fbbbab4 100644 --- a/resources/views/Staff/peer/index.blade.php +++ b/resources/views/Staff/peer/index.blade.php @@ -10,9 +10,7 @@ {{ __('staff.staff-dashboard') }} -
  • - Peers -
    • +
  • Peers
    • @endsection @section('nav-tabs') diff --git a/resources/views/Staff/poll/create.blade.php b/resources/views/Staff/poll/create.blade.php index 798c917dc..e2b37a3b0 100644 --- a/resources/views/Staff/poll/create.blade.php +++ b/resources/views/Staff/poll/create.blade.php @@ -42,7 +42,7 @@ required type="text" value="{{ old('title') }}" - > + /> @@ -56,8 +56,11 @@ required type="text" placeholder=" " + /> +
    @endsection diff --git a/resources/views/Staff/rss/edit.blade.php b/resources/views/Staff/rss/edit.blade.php index ff7f1222c..d5611c82f 100644 --- a/resources/views/Staff/rss/edit.blade.php +++ b/resources/views/Staff/rss/edit.blade.php @@ -26,428 +26,454 @@

    {{ __('rss.edit-public-feed') }}

    -
    - @csrf - @method('PATCH') -

    - - -

    -

    - - -

    -

    - - -

    -

    - - -

    -

    - - -

    -
    + + @csrf + @method('PATCH')

    -

    -

    -

    - -

    -
    -
    -
    -
    - {{ __('torrent.category') }} -
    - @foreach ($categories as $category) +

    + + +

    +
    +

    + + +

    +

    + + +

    +

    + + +

    +

    + + + +

    +
    +
    +
    +
    + {{ __('torrent.category') }} +
    + @foreach ($categories as $category) +

    + +

    + @endforeach +
    +
    +
    +
    +
    + {{ __('torrent.type') }} +
    + @foreach ($types as $type) +

    + +

    + @endforeach +
    +
    +
    +
    +
    + {{ __('torrent.resolution') }} +
    + @foreach ($resolutions as $resolution) +

    + +

    + @endforeach +
    +
    +
    +
    +
    + {{ __('torrent.genre') }} +
    + @foreach ($genres as $genre) +

    + +

    + @endforeach +
    +
    +
    +
    +
    + {{ __('torrent.discounts') }} +

    - @endforeach -
    -
    -
    -
    -
    - {{ __('torrent.type') }} -
    - @foreach ($types as $type)

    - @endforeach -
    -
    -
    -
    -
    - {{ __('torrent.resolution') }} -
    - @foreach ($resolutions as $resolution)

    - @endforeach -
    -
    -
    -
    -
    - {{ __('torrent.genre') }} -
    - @foreach ($genres as $genre) +
    +
    +
    +
    +
    + {{ __('torrent.special') }} +

    - @endforeach -
    -
    +

    + +

    +

    + +

    +

    + +

    +

    + +

    +

    + +

    +
    +
    +
    +
    +
    + {{ __('torrent.health') }} +
    +

    + +

    +

    + +

    +

    + +

    +
    +
    +
    -
    -
    - {{ __('torrent.discounts') }} -
    -

    - -

    -

    - -

    -

    - -

    -
    -
    -
    -
    -
    - {{ __('torrent.special') }} -
    -

    - -

    -

    - -

    -

    - -

    -

    - -

    -

    - -

    -

    - -

    -
    -
    -
    -
    -
    - {{ __('torrent.health') }} -
    -

    - -

    -

    - -

    -

    - -

    -
    -
    -
    -
    -

    - -

    - +

    + +

    +
    @endsection diff --git a/resources/views/Staff/rss/index.blade.php b/resources/views/Staff/rss/index.blade.php index 28fd788e5..64b958da1 100644 --- a/resources/views/Staff/rss/index.blade.php +++ b/resources/views/Staff/rss/index.blade.php @@ -18,10 +18,7 @@

    {{ __('rss.public') }} {{ __('rss.rss-feed') }}

    - + {{ __('common.add') }}
    @@ -29,128 +26,158 @@
    - - - - - - - - - - - - + + + + + + + + + + + + - @foreach($public_rss as $rss) - - - - - - - - - - - + + + + + + + + + - - @endforeach + {{ __('common.edit') }} + + +
  • +
    + @csrf + @method('DELETE') + + +
    • + + + + @endforeach
    {{ __('common.name') }}{{ __('common.position') }}{{ __('common.categories') }}{{ __('common.types') }}{{ __('common.resolutions') }}{{ __('common.genres') }}{{ __('torrent.discounts') }}{{ __('common.special') }}{{ __('torrent.health') }}{{ __('common.action') }}
    {{ __('common.name') }}{{ __('common.position') }}{{ __('common.categories') }}{{ __('common.types') }}{{ __('common.resolutions') }}{{ __('common.genres') }}{{ __('torrent.discounts') }}{{ __('common.special') }}{{ __('torrent.health') }}{{ __('common.action') }}
    - - {{ $rss->name }} - - {{ $rss->position }} - @if ($rss->object_torrent?->categories) - - @else - - @endif - - @if ($rss->object_torrent?->types) - - @else - - @endif - - @if ($rss->object_torrent?->resolutions) - - @else - - @endif - - @if ($rss->object_torrent?->genres) - - @else - - @endif - - @if ($rss->object_torrent?->freeleech || $rss->object_torrent?->doubleupload || $rss->object_torrent?->featured) - - @else - - @endif - - @if ($rss->object_torrent?->stream || $rss->object_torrent?->highspeed || $rss->object_torrent?->sd || $rss->object_torrent?->internal || $rss->object_torrent->personalrelease || $rss->object_torrent?->bookmark) - - @else - - @endif - - @if ($rss->object_torrent->alive || $rss->object_torrent->dying || $rss->object_torrent->dead) - - @else - - @endif - - -
  • - - {{ __('common.view') }} - -
    • -
  • - - {{ __('common.edit') }} - -
    • -
  • -
    - @csrf - @method('DELETE') -
    		• + + {{ $rss->name }} + + {{ $rss->position }} + @if ($rss->object_torrent?->categories) + + @else + + @endif + + @if ($rss->object_torrent?->types) + + @else + + @endif + + @if ($rss->object_torrent?->resolutions) + + @else + + @endif + + @if ($rss->object_torrent?->genres) + + @else + + @endif + + @if ($rss->object_torrent?->freeleech || $rss->object_torrent?->doubleupload || $rss->object_torrent?->featured) + + @else + + @endif + + @if ($rss->object_torrent?->stream || $rss->object_torrent?->highspeed || $rss->object_torrent?->sd || $rss->object_torrent?->internal || $rss->object_torrent->personalrelease || $rss->object_torrent?->bookmark) + + @else + + @endif + + @if ($rss->object_torrent->alive || $rss->object_torrent->dying || $rss->object_torrent->dead) + + @else + + @endif + + +
  • + + {{ __('common.view') }} + +
    • +
  • + - {{ __('common.delete') }} - - -
    • -     -
    diff --git a/resources/views/Staff/rsskey/index.blade.php b/resources/views/Staff/rsskey/index.blade.php index 94e5e2c2c..4c3aa9128 100644 --- a/resources/views/Staff/rsskey/index.blade.php +++ b/resources/views/Staff/rsskey/index.blade.php @@ -1,11 +1,17 @@ @extends('layout.default') @section('title') - {{ __('common.user') }} {{ __('user.rsskeys') }} - {{ __('staff.staff-dashboard') }} - {{ config('other.title') }} + + {{ __('common.user') }} {{ __('user.rsskeys') }} - {{ __('staff.staff-dashboard') }} - + {{ config('other.title') }} + @endsection @section('meta') - + @endsection @section('breadcrumbs') diff --git a/resources/views/Staff/seedbox/index.blade.php b/resources/views/Staff/seedbox/index.blade.php index 5c803dffc..d19b8721e 100644 --- a/resources/views/Staff/seedbox/index.blade.php +++ b/resources/views/Staff/seedbox/index.blade.php @@ -1,11 +1,17 @@ @extends('layout.default') @section('title') - {{ __('staff.seedboxes') }} - {{ __('staff.staff-dashboard') }} - {{ config('other.title') }} + + {{ __('staff.seedboxes') }} - {{ __('staff.staff-dashboard') }} - + {{ config('other.title') }} + @endsection @section('meta') - + @endsection @section('breadcrumbs') @@ -27,63 +33,70 @@
    - - - - - - - + + + + + + + - @forelse ($seedboxes as $seedbox) - - - - - - + + + + - - @empty - - - - @endforelse + @csrf + @method('DELETE') + + + + + + + @empty + + + + @endforelse
    {{ __('common.no') }}{{ __('common.user') }}{{ __('common.ip') }}{{ __('user.created-on') }}{{ __('common.action') }}
    {{ __('common.no') }}{{ __('common.user') }}{{ __('common.ip') }}{{ __('user.created-on') }}{{ __('common.action') }}
    {{ $loop->iteration }} - - {{ $seedbox->ip }} - - - -
  • -
    - @csrf - @method('DELETE') -
    		• {{ $loop->iteration }} + + {{ $seedbox->ip }} + + + +
  • + - {{ __('common.delete') }} - - -
    • -     -
    No seedboxes
    No seedboxes
    diff --git a/resources/views/Staff/type/create.blade.php b/resources/views/Staff/type/create.blade.php index f5ffe082c..087129fb9 100644 --- a/resources/views/Staff/type/create.blade.php +++ b/resources/views/Staff/type/create.blade.php @@ -22,25 +22,15 @@

    {{ __('common.add') }} - {{ trans_choice('common.a-an-art',false) }} + {{ trans_choice('common.a-an-art', false) }} {{ __('torrent.torrent') }} {{ __('common.type') }}

    -
    + @csrf

    - + @@ -54,7 +44,7 @@ pattern="[0-9]*" required type="text" - > + /> diff --git a/resources/views/Staff/type/edit.blade.php b/resources/views/Staff/type/edit.blade.php index 0aa54ebc8..a73f3b9f1 100644 --- a/resources/views/Staff/type/edit.blade.php +++ b/resources/views/Staff/type/edit.blade.php @@ -45,7 +45,7 @@ required type="text" value="{{ $type->name }}" - > + /> @@ -60,7 +60,7 @@ required type="text" value="{{ $type->position }}" - > + /> diff --git a/resources/views/Staff/type/index.blade.php b/resources/views/Staff/type/index.blade.php index 0b94099a8..04a938137 100644 --- a/resources/views/Staff/type/index.blade.php +++ b/resources/views/Staff/type/index.blade.php @@ -29,61 +29,65 @@

    - - - - - + + + + + - @foreach ($types as $type) - - - - + + - - @endforeach + {{ __('common.edit') }} + + +
  • +
    + @csrf + @method('DELETE') + + +
    • + + + + @endforeach
    {{ __('common.position') }}{{ __('common.name') }}{{ __('common.action') }}
    {{ __('common.position') }}{{ __('common.name') }}{{ __('common.action') }}
    {{ $type->position }} - - {{ $type->name }} - - - -
  • - - {{ __('common.edit') }} - -
    • -
  • - - @csrf - @method('DELETE') -
    		• {{ $type->position }} + + {{ $type->name }} + + + +
  • + - {{ __('common.delete') }} - - -
    • -     -
    diff --git a/resources/views/Staff/user/edit.blade.php b/resources/views/Staff/user/edit.blade.php index 7a5b6531d..e48a843f2 100644 --- a/resources/views/Staff/user/edit.blade.php +++ b/resources/views/Staff/user/edit.blade.php @@ -1,12 +1,17 @@ @extends('layout.default') @section('title') - {{ __('common.user') }} {{ __('common.edit') }} - {{ __('staff.staff-dashboard') }} - - {{ config('other.title') }} + + {{ __('common.user') }} {{ __('common.edit') }} - {{ __('staff.staff-dashboard') }} - + {{ config('other.title') }} + @endsection @section('meta') - + @endsection @section('breadcrumbs') @@ -52,7 +57,7 @@ required type="text" value="{{ $user->username }}" - > + /> @@ -68,7 +73,7 @@ required type="text" value="{{ $user->uploaded }}" - > + /> @@ -84,7 +89,7 @@ required type="text" value="{{ $user->downloaded }}" - > + /> @@ -97,18 +102,14 @@ placeholder=" " type="text" value="{{ $user->title }}" - > + />

    @livewire('bbcode-input', ['name' => 'about', 'label' => __('user.about-me'), 'required' => false, 'content' => $user->about])

    - @@ -123,16 +124,13 @@

    - @if ($user->internal != null) @endif + @foreach ($internals as $internal)

    - + can_upload) - > + />

    - + can_download) - > + />

    - + can_comment) - > + />

    - + can_invite) - > + />

    - + can_request) - > + />

    - + can_chat) - > + />

    diff --git a/resources/views/Staff/user/index.blade.php b/resources/views/Staff/user/index.blade.php index c0cc32dc1..26c1295b6 100644 --- a/resources/views/Staff/user/index.blade.php +++ b/resources/views/Staff/user/index.blade.php @@ -1,12 +1,14 @@ @extends('layout.default') @section('title') - {{ __('common.user') }} {{ __('common.search') }} - {{ __('staff.staff-dashboard') }} - - {{ config('other.title') }} + + {{ __('common.user') }} {{ __('common.search') }} - {{ __('staff.staff-dashboard') }} - + {{ config('other.title') }} + @endsection @section('meta') - + @endsection @section('nav-tabs') diff --git a/resources/views/Staff/warning/index.blade.php b/resources/views/Staff/warning/index.blade.php index f18bce5b7..b9b72a7ba 100644 --- a/resources/views/Staff/warning/index.blade.php +++ b/resources/views/Staff/warning/index.blade.php @@ -5,7 +5,7 @@ @endsection @section('meta') - + @endsection @section('breadcrumbs') diff --git a/resources/views/Staff/watchlist/index.blade.php b/resources/views/Staff/watchlist/index.blade.php index 9d4629634..c91c397b5 100644 --- a/resources/views/Staff/watchlist/index.blade.php +++ b/resources/views/Staff/watchlist/index.blade.php @@ -1,11 +1,14 @@ @extends('layout.default') @section('title') - Watchlist {{ __('common.search') }} - {{ __('staff.staff-dashboard') }} - {{ config('other.title') }} + + Watchlist {{ __('common.search') }} - {{ __('staff.staff-dashboard') }} - + {{ config('other.title') }} + @endsection @section('meta') - + @endsection @section('breadcrumbs') @@ -14,9 +17,7 @@ {{ __('staff.staff-dashboard') }} -

  • - Watchlist -
    • +
  • Watchlist
    • @endsection @section('page', 'page__watchlist--index') diff --git a/resources/views/article/index.blade.php b/resources/views/article/index.blade.php index 67a51fc1d..e8b6b7ab1 100644 --- a/resources/views/article/index.blade.php +++ b/resources/views/article/index.blade.php @@ -5,7 +5,7 @@ @endsection @section('meta') - + @endsection @section('breadcrumbs') @@ -37,17 +37,21 @@ + />

    @joypixels(preg_replace('#\[[^\]]+\]#', '', Str::limit($article->content, 500, '...'), 150))

    - + {{ __('articles.read-more') }} @endforeach + {{ $articles->links('partials.pagination') }} @endsection diff --git a/resources/views/article/show.blade.php b/resources/views/article/show.blade.php index 130cb3dce..65f21eb24 100644 --- a/resources/views/article/show.blade.php +++ b/resources/views/article/show.blade.php @@ -1,11 +1,13 @@ @extends('layout.default') @section('title') - {{ $article->title }} - {{ __('articles.articles') }} - {{ config('other.title') }} + + {{ $article->title }} - {{ __('articles.articles') }} - {{ config('other.title') }} + @endsection @section('meta') - + @endsection @section('breadcrumbs') @@ -22,22 +24,22 @@ @section('page', 'page__articles--show') @section('main') -
    -
    -

    {{ $article->title }}

    -
    - +
    +
    +

    {{ $article->title }}

    +
    + +
    +
    +
    + @joypixels($article->getContentHtml())
    -
    -
    - @joypixels($article->getContentHtml()) -
    -
    - + + @endsection diff --git a/resources/views/auth/application/create.blade.php b/resources/views/auth/application/create.blade.php index d9c77d0b8..27a753793 100644 --- a/resources/views/auth/application/create.blade.php +++ b/resources/views/auth/application/create.blade.php @@ -1,167 +1,175 @@ - - - Application - {{ config('other.title') }} - - - - - - - - - - - - - - - - -
    -
    -
    - @csrf - - - - - @if(config('other.application_signups')) -
      -
    • {{ config('other.title') }} {{ __('auth.appl-intro') }}
      • - @if (Session::has('warning')) -
    • Warning: {{ Session::get('warning') }}
      • - @endif - @if (Session::has('info')) -
    • Info: {{ Session::get('info') }}
      • - @endif - @if (Session::has('success')) -
    • Success: {{ Session::get('success') }}
      • - @endif -
    -

    - - -

    -

    - - -

    -

    - - -

    - - -

    - - -

    - @if (config('captcha.enabled')) - @hiddencaptcha - @endif - - @if (Session::has('errors')) -
      - @foreach ($errors->all() as $error) -
    • {{ $error }}
      • - @endforeach -
    - @endif - @else -
      -
    • {{ __('auth.appl-closed') }}
      • -
    • {{ __('auth.check-later') }}
      • -
    - @endif -
    -
    -
    - - -@livewireScripts(['nonce' => HDVinnie\SecureHeaders\SecureHeaders::nonce()]) - + + +

    + + +

    + @if (config('captcha.enabled')) + @hiddencaptcha + @endif + + + @if (Session::has('errors')) + + @endif + @else + + @endif + + + + + + @livewireScripts(['nonce' => HDVinnie\SecureHeaders\SecureHeaders::nonce()]) + diff --git a/resources/views/auth/confirm-password.blade.php b/resources/views/auth/confirm-password.blade.php index f01ab4224..616eb8a97 100644 --- a/resources/views/auth/confirm-password.blade.php +++ b/resources/views/auth/confirm-password.blade.php @@ -5,7 +5,10 @@ @endsection @section('meta') - + @endsection @section('breadcrumbs') @@ -18,11 +21,7 @@

    {{ __('auth.password-confirmation') }}

    -
    + @csrf

    {{ __('auth.password-confirm-desc') }}

    @@ -32,7 +31,7 @@ id="password" name="password" required - > + /> diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index c5aa43d7d..13fa4260a 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -1,118 +1,129 @@ - - - {{ __('auth.login') }} - {{ config('other.title') }} - @section('meta') + + + {{ __('auth.login') }} - {{ config('other.title') }} + @section('meta') - - - - - - - - - - @show - - - - - - -

    - -
    -
    - - @csrf - - - - - @if (Session::has('warning') || Session::has('success') || Session::has('info')) -
      - @if (Session::has('warning')) -
    • Warning: {{ Session::get('warning') }}
      • + /> + + + + + + + + + + @show + + + + + + + + +
      +
      + + @csrf + + + + + @if (Session::has('warning') || Session::has('success') || Session::has('info')) +
        + @if (Session::has('warning')) +
      • + Warning: {{ Session::get('warning') }} +
        • + @endif + + @if (Session::has('info')) +
      • + Info: {{ Session::get('info') }} +
        • + @endif + + @if (Session::has('success')) +
      • + Success: {{ Session::get('success') }} +
        • + @endif +
      @endif - @if (Session::has('info')) -
    • Info: {{ Session::get('info') }}
      • + +

      + + +

      +

      + + +

      +

      + + +

      + @if (config('captcha.enabled')) + @hiddencaptcha @endif - @if (Session::has('success')) -
    • Success: {{ Session::get('success') }}
      • + + + @if (Session::has('errors')) +
        + @foreach ($errors->all() as $error) +
      • {{ $error }}
        • + @endforeach +
      @endif -
    - @endif -

    - - -

    -

    - - -

    -

    - - -

    - @if (config('captcha.enabled')) - @hiddencaptcha - @endif - - @if (Session::has('errors')) -
      - @foreach ($errors->all() as $error) -
    • {{ $error }}
      • - @endforeach -
    - @endif - - -
    -
    - + + +
    + + diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php index 279722efb..e705db36a 100644 --- a/resources/views/auth/passwords/email.blade.php +++ b/resources/views/auth/passwords/email.blade.php @@ -1,79 +1,92 @@ - - - {{ __('auth.lost-password') }} - {{ config('other.title') }} - @section('meta') + + + {{ __('auth.lost-password') }} - {{ config('other.title') }} + @section('meta') - - - - - - - - - - @show - - - - - -
    -
    -
    - @csrf - - - - - @if (Session::has('warning') || Session::has('success') || Session::has('info')) -
      - @if (Session::has('warning')) -
    • Warning: {{ Session::get('warning') }}
      • + /> + + + + + + + + + + @show + + + + + +
      +
      + + @csrf + + + + + @if (Session::has('warning') || Session::has('success') || Session::has('info')) +
        + @if (Session::has('warning')) +
      • + Warning: {{ Session::get('warning') }} +
        • + @endif + + @if (Session::has('info')) +
      • + Info: {{ Session::get('info') }} +
        • + @endif + + @if (Session::has('success')) +
      • + Success: {{ Session::get('success') }} +
        • + @endif +
      @endif - @if (Session::has('info')) -
    • Info: {{ Session::get('info') }}
      • + +

      + + +

      + @if (config('captcha.enabled')) + @hiddencaptcha @endif - @if (Session::has('success')) -
    • Success: {{ Session::get('success') }}
      • + + + @if (Session::has('errors') || Session::has('status')) +
        + @foreach ($errors->all() as $error) +
      • {{ $error }}
        • + @endforeach + + @if (Session::has('status')) +
      • {{ Session::get('status') }}
        • + @endif +
      @endif -
    - @endif -

    - - -

    - @if (config('captcha.enabled')) - @hiddencaptcha - @endif - - @if (Session::has('errors') || Session::has('status')) -
      - @foreach ($errors->all() as $error) -
    • {{ $error }}
      • - @endforeach - @if (Session::has('status')) -
    • {{ Session::get('status') }}
      • - @endif -
    - @endif -
    -
    -
    - + + + + diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php index 9c91a8235..94a32fb0a 100644 --- a/resources/views/auth/passwords/reset.blade.php +++ b/resources/views/auth/passwords/reset.blade.php @@ -1,105 +1,115 @@ - - - {{ __('auth.lost-password') }} - {{ config('other.title') }} - @section('meta') + + + {{ __('auth.lost-password') }} - {{ config('other.title') }} + @section('meta') - - - - - - - - - - @show - - - - - -
    -
    -
    - @csrf - - - - - - @if (Session::has('warning') || Session::has('success') || Session::has('info')) -
      - @if (Session::has('warning')) -
    • Warning: {{ Session::get('warning') }}
      • - @endif - @if (Session::has('info')) -
    • Info: {{ Session::get('info') }}
      • - @endif - @if (Session::has('success')) -
    • Success: {{ Session::get('success') }}
      • - @endif -
    - @endif -

    - - -

    -

    - - -

    -

    - - -

    - @if (config('captcha.enabled')) - @hiddencaptcha - @endif - - @if (Session::has('errors')) -
      - @foreach ($errors->all() as $error) -
    • {{ $error }}
      • - @endforeach -
    - @endif -
    -
    -
    - + /> + + + + + + + + + + @show + + + + + +
    +
    +
    + @csrf + + + + + + @if (Session::has('warning') || Session::has('success') || Session::has('info')) +
      + @if (Session::has('warning')) +
    • Warning: {{ Session::get('warning') }}
      • + @endif + + @if (Session::has('info')) +
    • Info: {{ Session::get('info') }}
      • + @endif + + @if (Session::has('success')) +
    • Success: {{ Session::get('success') }}
      • + @endif +
    + @endif + +

    + + +

    +

    + + +

    +

    + + +

    + @if (config('captcha.enabled')) + @hiddencaptcha + @endif + + + @if (Session::has('errors')) +
      + @foreach ($errors->all() as $error) +
    • {{ $error }}
      • + @endforeach +
    + @endif +
    +
    +
    + diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index a3a8908d6..4428f8ed8 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -1,123 +1,137 @@ - - - {{ __('auth.signup') }} - {{ config('other.title') }} - @section('meta') + + + {{ __('auth.signup') }} - {{ config('other.title') }} + @section('meta') - - - - - - - - - - @show - - - - - -
    -
    -
    - @csrf - - - - - @if ((config('other.invite-only') && ! request()->has('code')) || Session::has('warning') || Session::has('success') || Session::has('info')) -
      - @if (config('other.invite-only') && ! request()->has('code')) -
    • - {{ __('auth.need-invite') }} -
      • + /> + + + + + + + + + + @show + + + + + +
      +
      + + @csrf + + + + + @if ((config('other.invite-only') && ! request()->has('code')) || Session::has('warning') || Session::has('success') || Session::has('info')) +
        + @if (config('other.invite-only') && ! request()->has('code')) +
      • + {{ __('auth.need-invite') }} +
        • + @endif + + @if (Session::has('warning')) +
      • + Warning: {{ Session::get('warning') }} +
        • + @endif + + @if (Session::has('info')) +
      • + Info: {{ Session::get('info') }} +
        • + @endif + + @if (Session::has('success')) +
      • + Success: {{ Session::get('success') }} +
        • + @endif +
      + @else +

      + + +

      +

      + + +

      +

      + + +

      +

      + + +

      + @if (config('captcha.enabled')) + @hiddencaptcha + @endif + + + @if (Session::has('errors')) +
        + @foreach ($errors->all() as $error) +
      • {{ $error }}
        • + @endforeach +
      + @endif @endif - @if (Session::has('warning')) -
    • Warning: {{ Session::get('warning') }}
      • - @endif - @if (Session::has('info')) -
    • Info: {{ Session::get('info') }}
      • - @endif - @if (Session::has('success')) -
    • Success: {{ Session::get('success') }}
      • - @endif -
    - @else -

    - - -

    -

    - - -

    -

    - - -

    -

    - - -

    - @if (config('captcha.enabled')) - @hiddencaptcha - @endif - - @if (Session::has('errors')) -
      - @foreach ($errors->all() as $error) -
    • {{ $error }}
      • - @endforeach -
    - @endif - @endif -
    -
    -
    - + + + + diff --git a/resources/views/auth/two-factor-challenge.blade.php b/resources/views/auth/two-factor-challenge.blade.php index c3667da03..5ed938ce6 100644 --- a/resources/views/auth/two-factor-challenge.blade.php +++ b/resources/views/auth/two-factor-challenge.blade.php @@ -1,104 +1,120 @@ - - - {{ __('Two Factor Authentication') }} - {{ config('other.title') }} - - - - - -
    -
    -
    - - -
    -
    - @csrf - - - - -
      -
    • - {{ __('auth.enter-totp') }} -
      • -
    • - {{ __('auth.enter-recovery') }} -
      • - @if (Session::has('warning')) -
    • Warning: {{ Session::get('warning') }}
      • - @endif - @if (Session::has('info')) -
    • Info: {{ Session::get('info') }}
      • - @endif - @if (Session::has('success')) -
    • Success: {{ Session::get('success') }}
      • - @endif -
    -

    - - + + {{ __('Two Factor Authentication') }} - {{ config('other.title') }} + + + + + +

    +
    +
    + + +
    + -

    -

    - - -

    - @if (config('captcha.enabled')) - @hiddencaptcha - @endif + @csrf + + + + +
      +
    • + {{ __('auth.enter-totp') }} +
      • +
    • + {{ __('auth.enter-recovery') }} +
      • + @if (Session::has('warning')) +
    • + Warning: {{ Session::get('warning') }} +
      • + @endif - - @if (Session::has('errors')) -
        - @foreach ($errors->all() as $error) -
      • {{ $error }}
        • - @endforeach -
      - @endif - -
    -
    - - + @if (Session::has('info')) +
  • + Info: {{ Session::get('info') }} +
    • + @endif + + @if (Session::has('success')) +
  • + Success: {{ Session::get('success') }} +
    • + @endif + +

    + + +

    +

    + + +

    + @if (config('captcha.enabled')) + @hiddencaptcha + @endif + + + @if (Session::has('errors')) +
      + @foreach ($errors->all() as $error) +
    • {{ $error }}
      • + @endforeach +
    + @endif + +
    +
    + + diff --git a/resources/views/auth/verify-email.blade.php b/resources/views/auth/verify-email.blade.php index f34dfd55b..776b2b259 100644 --- a/resources/views/auth/verify-email.blade.php +++ b/resources/views/auth/verify-email.blade.php @@ -1,63 +1,88 @@ - - - {{ __('auth.verify-email') }} - {{ config('other.title') }} - @section('meta') - - - - - - - - - - - @show - - - - - -
    -
    -
    - @csrf - - - - -
      -
    • Almost done...
      • -
    • Click the button below and we'll email you shortly.
      • -
    • Open it up to activate your account.
      • - @if (Session::has('warning')) -
    • Warning: {{ Session::get('warning') }}
      • - @endif - @if (Session::has('info')) -
    • Info: {{ Session::get('info') }}
      • - @endif - @if (Session::has('success')) -
    • Success: {{ Session::get('success') }}
      • - @endif -
    - @if (config('captcha.enabled')) - @hiddencaptcha - @endif - - @if (Session::has('errors') || Session::has('status')) -
      - @foreach ($errors->all() as $error) -
    • {{ $error }}
      • - @endforeach - @if (session('status') == 'verification-link-sent') -
    • {{ __('auth.email-verification-link') }}
      • + + + {{ __('auth.verify-email') }} - {{ config('other.title') }} + @section('meta') + + + + + + + + + + + @show + + + + + +
      +
      + + @csrf + + + + +
        +
      • Almost done...
        • +
      • + Click the button below and we'll email you shortly. +
        • +
      • + Open it up to activate your account. +
        • + @if (Session::has('warning')) +
      • + Warning: {{ Session::get('warning') }} +
        • + @endif + + @if (Session::has('info')) +
      • + Info: {{ Session::get('info') }} +
        • + @endif + + @if (Session::has('success')) +
      • + Success: {{ Session::get('success') }} +
        • + @endif +
      + @if (config('captcha.enabled')) + @hiddencaptcha @endif -
    - @endif -
    -
    -
    - + + + @if (Session::has('errors') || Session::has('status')) + + @endif + + + + diff --git a/resources/views/blocks/chat.blade.php b/resources/views/blocks/chat.blade.php index de9b96b6d..b67b17df8 100644 --- a/resources/views/blocks/chat.blade.php +++ b/resources/views/blocks/chat.blade.php @@ -1 +1,3 @@ - + diff --git a/resources/views/blocks/featured.blade.php b/resources/views/blocks/featured.blade.php index cb05279aa..aa5c3183a 100644 --- a/resources/views/blocks/featured.blade.php +++ b/resources/views/blocks/featured.blade.php @@ -8,26 +8,46 @@ diff --git a/resources/views/blocks/latest_topics.blade.php b/resources/views/blocks/latest_topics.blade.php index f15cdcdec..994c060ec 100644 --- a/resources/views/blocks/latest_topics.blade.php +++ b/resources/views/blocks/latest_topics.blade.php @@ -6,7 +6,7 @@ - @if($topics->count() > 0) + @if ($topics->count() > 0) @else -
    - No topics. -
    +
    No topics.
    @endif diff --git a/resources/views/blocks/news.blade.php b/resources/views/blocks/news.blade.php index 1a7e6d39a..cd7594126 100644 --- a/resources/views/blocks/news.blade.php +++ b/resources/views/blocks/news.blade.php @@ -1,9 +1,10 @@ @foreach ($articles as $article)
    -
    +

    @if ($article->newNews) - @joypixels(':rotating_light:') {{ __('blocks.new-news') }} {{ $article->created_at->diffForHumans() }} + @joypixels(':rotating_light:') + {{ __('blocks.new-news') }} {{ $article->created_at->diffForHumans() }} @joypixels(':rotating_light:') @else {{ __('blocks.check-news') }} {{ $article->created_at->diffForHumans() }} @@ -11,7 +12,10 @@

    - + {{ __('common.view-all') }}
    @@ -37,14 +41,17 @@ + />

    @joypixels(preg_replace('#\[[^\]]+\]#', '', Str::limit($article->content, 500, '...'), 150))

    - + {{ __('articles.read-more') }} diff --git a/resources/views/blocks/online.blade.php b/resources/views/blocks/online.blade.php index 416979b4c..4fbfbc18d 100644 --- a/resources/views/blocks/online.blade.php +++ b/resources/views/blocks/online.blade.php @@ -7,21 +7,24 @@
      @foreach ($users as $user)
    • - + @if ($user->warnings_count > 0) - + @endif
      • @endforeach
    -
    -
    +
    + @hasSection('main') + @hasSection('sidebar') +
    +
    + @yield('main') +
    + +
    + @else +
    + @yield('main') +
    + @endif + @else +
    + @yield('content') +
    + @endif +
    + @include('partials.footer') + + + + + + + @if (config('other.freeleech') == true || config('other.invite-only') == false || config('other.doubleup') == true) + @endif - @else -
    - @yield('content') -
    - @endif - -@include('partials.footer') - - - - + @foreach (['warning', 'success', 'info'] as $key) + @if (Session::has($key)) + -@endif + Toast.fire({ + icon: '{{ $key }}', + title: '{{ Session::get($key) }}', + }); + + @endif + @endforeach + + @if (Session::has('errors')) + + @endif -@foreach (['warning', 'success', 'info'] as $key) - @if (Session::has($key)) - @endif -@endforeach -@if (Session::has('errors')) - - -@endif + @yield('javascripts') + @yield('scripts') + @livewireScripts(['nonce' => HDVinnie\SecureHeaders\SecureHeaders::nonce()]) - - - - -@yield('javascripts') -@yield('scripts') -@livewireScripts(['nonce' => HDVinnie\SecureHeaders\SecureHeaders::nonce()]) - - - + + diff --git a/resources/views/livewire/announce-search.blade.php b/resources/views/livewire/announce-search.blade.php index c378a0746..cbd0ec526 100644 --- a/resources/views/livewire/announce-search.blade.php +++ b/resources/views/livewire/announce-search.blade.php @@ -1,28 +1,30 @@ -
    +

    Announces

    - - + +
    - +
    - @@ -30,12 +32,11 @@ -
    +
    +
    -
    - Loading... -
    +
    Loading...
    diff --git a/resources/views/livewire/apikey-search.blade.php b/resources/views/livewire/apikey-search.blade.php index bbcdc3d5e..388fdca24 100644 --- a/resources/views/livewire/apikey-search.blade.php +++ b/resources/views/livewire/apikey-search.blade.php @@ -32,12 +32,7 @@
    - @@ -77,12 +72,18 @@
    diff --git a/resources/views/livewire/attachment-upload.blade.php b/resources/views/livewire/attachment-upload.blade.php index 0114f8792..bc3aace3d 100644 --- a/resources/views/livewire/attachment-upload.blade.php +++ b/resources/views/livewire/attachment-upload.blade.php @@ -11,7 +11,7 @@ wire:model="attachment" wire:change="upload" style="display: none" - > + /> @@ -28,7 +28,7 @@ - @forelse($attachments as $attachment) + @forelse ($attachments as $attachment)
    {{ $apikey->content }} - -
    {{ $attachment->file_name }} @@ -39,7 +39,9 @@ method="POST" > @csrf - + diff --git a/resources/views/livewire/audit-log-search.blade.php b/resources/views/livewire/audit-log-search.blade.php index b14585073..4ef752f2d 100644 --- a/resources/views/livewire/audit-log-search.blade.php +++ b/resources/views/livewire/audit-log-search.blade.php @@ -11,9 +11,7 @@ wire:model="username" placeholder=" " /> - +
    @@ -32,9 +30,7 @@ @endforeach - +
    @@ -46,9 +42,7 @@ wire:model="modelId" placeholder=" " /> - +
    @@ -67,9 +61,7 @@ - +
    @@ -81,19 +73,12 @@ wire:model="record" placeholder=" " /> - +
    - @@ -108,69 +93,82 @@
    - - - - - - - - - - + + + + + + + + + + - @forelse ($audits as $audit) - - - - - - - - + + + + + + - + - - @empty - - - - @endforelse + > + {{ __('common.delete') }} + + + + + + + @empty + + + + @endforelse
    #{{ __('common.action') }}ModelModel IDByChanges{{ __('user.created-on') }}{{ __('common.action') }}
    #{{ __('common.action') }}ModelModel IDByChanges{{ __('user.created-on') }}{{ __('common.action') }}
    {{ $audit->id }}{{ strtoupper($audit->action) }}{{ $audit->model_name }}{{ $audit->model_entry_id }} - - {{ $audit->user->username }} - - -
      - @foreach ($audit->values as $key => $value) -
    • - {{ $key }}: - @if (is_array($value['old'])) - @json($value['old']) - @else - {{ $value['old'] ?? 'null' }} - @endif - → - @if (is_array($value['new'])) - @json($value['new']) - @else - {{ $value['new'] ?? 'null' }} - @endif -
      • - @endforeach -
    -     		- {{ $audit->id }} + + {{ strtoupper($audit->action) }} + + {{ $audit->model_name }}{{ $audit->model_entry_id }} + + {{ $audit->user->username }} + + +
      + @foreach ($audit->values as $key => $value) +
    • + {{ $key }}: + @if (is_array($value['old'])) + @json($value['old']) + @else + {{ $value['old'] ?? 'null' }} + @endif + → + @if (is_array($value['new'])) + @json($value['new']) + @else + {{ $value['new'] ?? 'null' }} + @endif +
      • + @endforeach +
    +     		+ - - -
  • -
    + {{ $audit->created_at->diffForHumans() }} + +
    		• + +
  • + - @csrf - @method('DELETE') - - -
    • -     -
    - No audits -
    No audits
    {{ $audits->links('partials.pagination') }} - diff --git a/resources/views/livewire/backup-panel.blade.php b/resources/views/livewire/backup-panel.blade.php index 8a29407eb..6a517c6bc 100644 --- a/resources/views/livewire/backup-panel.blade.php +++ b/resources/views/livewire/backup-panel.blade.php @@ -1,17 +1,27 @@ -
    +

    UNIT3D Backup Manager

    - - + {{ __('backup.create_a_new_db_backup') }} - + {{ __('backup.create_a_new_files_backup') }}
    - - - - - - - + + + + + + + - @foreach($this->backupStatuses as $backupStatus) - - - - - - - - @endforeach + @foreach ($this->backupStatuses as $backupStatus) + + + + + + + + @endforeach
    DiskHealthyAmount of backupsNewest backupUsed storage
    DiskHealthyAmount of backupsNewest backupUsed storage
    {{ $backupStatus['disk'] }} - @if($backupStatus['healthy']) - - @else - - @endif - {{ $backupStatus['amount'] }}{{ $backupStatus['newest'] }}{{ $backupStatus['usedStorage'] }}
    {{ $backupStatus['disk'] }} + @if ($backupStatus['healthy']) + + @else + + @endif + {{ $backupStatus['amount'] }}{{ $backupStatus['newest'] }}{{ $backupStatus['usedStorage'] }}
    @@ -61,96 +78,107 @@
    - - - - - - + + + + + + - @forelse($this->backups as $backup) - - - - - - - @empty - - - - @endforelse + @forelse ($this->backups as $backup) + + + + + + + @empty + + + + @endforelse
    {{ __('backup.location') }}{{ __('backup.date') }}{{ __('backup.file_size') }}{{ __('backup.actions') }}
    {{ __('backup.location') }}{{ __('backup.date') }}{{ __('backup.file_size') }}{{ __('backup.actions') }}
    {{ $backup['path'] }}{{ $backup['date'] }}{{ $backup['size'] }} - -
  • - - {{ __('common.download') }} - -
    • -
  • - - -

    - Delete backup -

    -
    - @csrf -

    - Are you sure you want to delete the backup created at {{ $backup['date'] }} ? -

    -

    - - -

    -
    -     -
    • -     -
    No backups present
    {{ $backup['path'] }}{{ $backup['date'] }}{{ $backup['size'] }} + +
  • + + {{ __('common.download') }} + +
    • +
  • + + +

    Delete backup

    +
    + @csrf +

    + Are you sure you want to delete the backup + created at {{ $backup['date'] }} ? +

    +

    + + +

    +
    +     +
    • +     +
    No backups present
    diff --git a/resources/views/livewire/bbcode-input.blade.php b/resources/views/livewire/bbcode-input.blade.php index 5f7efb9f6..7a1b6e8e3 100644 --- a/resources/views/livewire/bbcode-input.blade.php +++ b/resources/views/livewire/bbcode-input.blade.php @@ -1,4 +1,3 @@ -

    - - - - + + + +

    - +

  • -
  • -
  • -
  • -
    • -
    +
  • -
  • -
  • -
    • -
    +
  • -
  • -
    • -
    +
  • -
  • -
  • -
    • -
    +
  • -
  • -
  • -
    • -
    +
  • -
  • -
  • -
  • -
  • -
  • - @@ -227,7 +346,13 @@ x-on:mouseover="isOverInput = true" x-on:mouseleave="isOverInput = false" wire:model.defer="contentBbcode" - x-bind:style="{ height: bbcodePreviewHeight !== null && bbcodePreviewHeight, transition: previousActiveElement === $el ? 'none' : 'border-color 600ms cubic-bezier(0.25, 0.8, 0.25, 1), height 600ms cubic-bezier(0.25, 0.8, 0.25, 1)' }" + x-bind:style="{ + height: bbcodePreviewHeight !== null && bbcodePreviewHeight, + transition: + previousActiveElement === $el + ? 'none' + : 'border-color 600ms cubic-bezier(0.25, 0.8, 0.25, 1), height 600ms cubic-bezier(0.25, 0.8, 0.25, 1)', + }" @if ($isRequired) required @endif diff --git a/resources/views/livewire/block-ip-address.blade.php b/resources/views/livewire/block-ip-address.blade.php index 3cafb25af..91f71cdc8 100644 --- a/resources/views/livewire/block-ip-address.blade.php +++ b/resources/views/livewire/block-ip-address.blade.php @@ -10,9 +10,7 @@ {{ __('common.add') }} -

    - Block Ip Address -

    +

    Block Ip Address

    + /> @@ -50,7 +48,11 @@ > {{ __('common.save') }} -

    @@ -59,12 +61,7 @@
    • - @@ -79,41 +76,46 @@
    - - - - - - - - - @forelse ($ipAddresses as $ipAddress) - - - - - - + + + + + + - @empty - - - - @endforelse + @forelse ($ipAddresses as $ipAddress) + + + + + + + + + @empty + + + + @endforelse
    {{ __('common.no') }}{{ __('common.user') }}{{ __('common.ip') }}{{ __('common.reason') }}{{ __('common.created_at') }}{{ __('user.expires-on') }}
    {{ $ipAddress->id }} - - {{ $ipAddress->ip_address }}{{ $ipAddress->reason }} - - - - {{ __('common.no') }}{{ __('common.user') }}{{ __('common.ip') }}{{ __('common.reason') }}{{ __('common.created_at') }}{{ __('user.expires-on') }}
    No blocked ip addresses
    {{ $ipAddress->id }} + + {{ $ipAddress->ip_address }}{{ $ipAddress->reason }} + + + +
    No blocked ip addresses
    {{ $ipAddresses->links('partials.pagination') }} - diff --git a/resources/views/livewire/bookmark-button.blade.php b/resources/views/livewire/bookmark-button.blade.php index 561f495f1..12de6b7cc 100644 --- a/resources/views/livewire/bookmark-button.blade.php +++ b/resources/views/livewire/bookmark-button.blade.php @@ -1,9 +1,17 @@ -@if($this->isBookmarked) - @else - @endif diff --git a/resources/views/livewire/collection-search.blade.php b/resources/views/livewire/collection-search.blade.php index bd9b217c1..43ea69b0b 100644 --- a/resources/views/livewire/collection-search.blade.php +++ b/resources/views/livewire/collection-search.blade.php @@ -20,25 +20,53 @@ {{ $collections->links('partials.pagination') }}
    - @foreach($collections as $collection) + @foreach ($collections as $collection)
    -
    -
    +
    +

    {{ $collection->name }}

    -

    {{ __('mediahub.includes') }} - @foreach($collection->movie as $collection_movie) - {{ $collection_movie->title }}, +

    + {{ __('mediahub.includes') }} + @foreach ($collection->movie as $collection_movie) + {{ $collection_movie->title }}, @endforeach

    - - {{ __('mediahub.view-collection') }} + + + {{ __('mediahub.view-collection') }}
    diff --git a/resources/views/livewire/comment.blade.php b/resources/views/livewire/comment.blade.php index 1ab8ee532..ae73bb9de 100644 --- a/resources/views/livewire/comment.blade.php +++ b/resources/views/livewire/comment.blade.php @@ -19,10 +19,14 @@ @endif + @if ($comment->user_id === auth()->id() || auth()->user()->group->is_modo)
  • -

    @@ -113,12 +126,17 @@ @if ($comment->children()->exists())
      @foreach ($comment->children as $child) - + @endforeach
    @endif + @if ($isReplying || $comment->children()->exists()) - +

    @error('replyState.content') - {{ $message }} + + {{ $message }} + @enderror

    - - + +

    -

    @@ -156,4 +187,4 @@ @endif @endif -
    • \ No newline at end of file + diff --git a/resources/views/livewire/comments.blade.php b/resources/views/livewire/comments.blade.php index 2d80c269f..6a5c6fde9 100644 --- a/resources/views/livewire/comments.blade.php +++ b/resources/views/livewire/comments.blade.php @@ -4,7 +4,11 @@ {{ __('common.comments') }}
    - +

    @error('newCommentState.content') @@ -26,21 +31,19 @@ @enderror

    - +

    - +

      - @forelse($comments as $comment) - + @forelse ($comments as $comment) + @empty
    1. @@ -50,8 +53,10 @@
    @if ($comments->hasMorePages())
    - +
    @endif
    - \ No newline at end of file + diff --git a/resources/views/livewire/company-search.blade.php b/resources/views/livewire/company-search.blade.php index 67a03986a..ca344dc3c 100644 --- a/resources/views/livewire/company-search.blade.php +++ b/resources/views/livewire/company-search.blade.php @@ -21,20 +21,27 @@ {{ $companies->links('partials.pagination') }}
    @foreach ($companies as $company) - -
    + +

    - @if(isset($company->logo)) - {{ $company->name }} + @if (isset($company->logo)) + {{ $company->name }} @else {{ $company->name }} @endif

    -

    {{ $company->tv_count }} - Shows | {{ $company->movie_count }} Movies

    +

    + + {{ $company->tv_count }} Shows | {{ $company->movie_count }} Movies +

    @endforeach diff --git a/resources/views/livewire/dislike-button.blade.php b/resources/views/livewire/dislike-button.blade.php index 5e582da52..c3cff505e 100644 --- a/resources/views/livewire/dislike-button.blade.php +++ b/resources/views/livewire/dislike-button.blade.php @@ -3,8 +3,10 @@ wire:click="store({{ $post->id }})" title="{{ __('forum.dislike-post') }}" > - @if($post->dislikes_exists) - + @if ($post->dislikes_exists) + @else @endif diff --git a/resources/views/livewire/failed-login-search.blade.php b/resources/views/livewire/failed-login-search.blade.php index dbe3d701f..137a01399 100644 --- a/resources/views/livewire/failed-login-search.blade.php +++ b/resources/views/livewire/failed-login-search.blade.php @@ -48,12 +48,7 @@
    - @@ -68,48 +63,51 @@
    - - - - - - - - @forelse ($failedLogins as $failedLogin) - - - - - + + + + + - @empty - - - - @endforelse + @forelse ($failedLogins as $failedLogin) + + + + + + + + @empty + + + + @endforelse
    {{ __('common.no') }} - {{ __('common.username') }} - @include('livewire.includes._sort-icon', ['field' => 'username']) - - {{ __('user.user-id') }} - @include('livewire.includes._sort-icon', ['field' => 'user_id']) - - {{ __('common.ip') }} - @include('livewire.includes._sort-icon', ['field' => 'ip_address']) - - {{ __('common.created_at') }} - @include('livewire.includes._sort-icon', ['field' => 'created_at']) -
    {{ $failedLogin->id }} - @if ($failedLogin->user_id === null) - {{ $attempt->username }} - @else - - @endif - {{ $failedLogin->user_id ?? 'Not Found' }}{{ $failedLogin->ip_address }} - - {{ __('common.no') }} + {{ __('common.username') }} + @include('livewire.includes._sort-icon', ['field' => 'username']) + + {{ __('user.user-id') }} + @include('livewire.includes._sort-icon', ['field' => 'user_id']) + + {{ __('common.ip') }} + @include('livewire.includes._sort-icon', ['field' => 'ip_address']) + + {{ __('common.created_at') }} + @include('livewire.includes._sort-icon', ['field' => 'created_at']) +
    No failed logins
    {{ $failedLogin->id }} + @if ($failedLogin->user_id === null) + {{ $attempt->username }} + @else + + @endif + {{ $failedLogin->user_id ?? 'Not Found' }}{{ $failedLogin->ip_address }} + +
    No failed logins
    @@ -151,4 +149,4 @@
    -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/livewire/forum-category-topic-search.blade.php b/resources/views/livewire/forum-category-topic-search.blade.php index 125b05ff9..c723a869f 100644 --- a/resources/views/livewire/forum-category-topic-search.blade.php +++ b/resources/views/livewire/forum-category-topic-search.blade.php @@ -3,7 +3,7 @@

    {{ $category->description }}

    {{ $topics->links('partials.pagination') }} - @if($topics->count() > 0) + @if ($topics->count() > 0)
      @foreach ($topics as $topic)
    • @@ -12,9 +12,7 @@ @endforeach
    @else -
    - No topics. -
    +
    No topics.
    @endif {{ $topics->links('partials.pagination') }}
    @@ -37,12 +35,7 @@

    -

    @if ($subscription === null) @@ -25,7 +26,11 @@ method="POST" > @csrf - + @@ -49,7 +56,7 @@
    {{ $topics->links('partials.pagination') }} - @if($topics->count() > 0) + @if ($topics->count() > 0)
      @foreach ($topics as $topic)
    • @@ -58,9 +65,7 @@ @endforeach
    @else -
    - No topics. -
    +
    No topics.
    @endif {{ $topics->links('partials.pagination') }} @@ -83,12 +88,7 @@

    -

    - @@ -101,7 +96,10 @@ {{ $gift->cost }} {{ $gift->comment }} -
    {{ $gifts->links('partials.pagination') }} - diff --git a/resources/views/livewire/history-search.blade.php b/resources/views/livewire/history-search.blade.php index 41f3eb22a..2e8d9f222 100644 --- a/resources/views/livewire/history-search.blade.php +++ b/resources/views/livewire/history-search.blade.php @@ -1,33 +1,52 @@ -
    +

    {{ __('common.search') }}

    -
    +

    - - + +

    - +

    - +

    - - +

    - @@ -35,11 +54,18 @@

    - - +

    @@ -47,60 +73,94 @@

    Histories

    -
    - Loading... -
    +
    Loading...
    - @switch ($groupBy) + @switch($groupBy) @case('user_id') - - - - - - - - - - - - @@ -108,17 +168,32 @@ {{ __('torrent.seeding') }} @include('livewire.includes._sort-icon', ['field' => 'seeding_count']) - - - - @@ -154,22 +229,37 @@ {{ App\Helpers\StringHelper::formatBytes($history->refunded_download_sum, 2) }} + @if ($history->seedtime < config('hitrun.seedtime')) - @else - @endif @@ -181,16 +271,23 @@ @endforeach
    + {{ __('user.user') }} @include('livewire.includes._sort-icon', ['field' => 'history.user_id']) + {{ __('torrent.torrents') }} @include('livewire.includes._sort-icon', ['field' => 'torrent_count']) + {{ __('user.credited-upload') }} @include('livewire.includes._sort-icon', ['field' => 'history.uploaded_sum']) + {{ __('user.upload-true') }} @include('livewire.includes._sort-icon', ['field' => 'history.actual_uploaded_sum']) + Client Upload @include('livewire.includes._sort-icon', ['field' => 'history.client_uploaded_sum']) + {{ __('user.credited-download') }} @include('livewire.includes._sort-icon', ['field' => 'history.downloaded_sum']) + {{ __('user.download-true') }} @include('livewire.includes._sort-icon', ['field' => 'history.actual_downloaded_sum']) + Client Download @include('livewire.includes._sort-icon', ['field' => 'history.client_downloaded_sum']) + {{ __('torrent.refunded') }} @include('livewire.includes._sort-icon', ['field' => 'history.refunded_download_sum']) + {{ __('torrent.started') }} @include('livewire.includes._sort-icon', ['field' => 'history.created_at_min']) + Announced @include('livewire.includes._sort-icon', ['field' => 'history.updated_at_max']) + {{ __('user.avg-seedtime') }} @include('livewire.includes._sort-icon', ['field' => 'history.seedtime_avg']) + {{ __('torrent.leeching') }} @include('livewire.includes._sort-icon', ['field' => 'leeching_count']) + + +
    - - - {{ $weeks = intdiv($history->seedtime_avg ?? 0, 3600 * 24 * 7) }}w {{ intdiv(($history->seedtime_avg ?? 0) - $weeks * 3600 * 24 * 7, 3600) }}h + + {{ $weeks = intdiv($history->seedtime_avg ?? 0, 3600 * 24 * 7) }}w + {{ intdiv(($history->seedtime_avg ?? 0) - $weeks * 3600 * 24 * 7, 3600) }}h - {{ $weeks = intdiv($history->seedtime_avg ?? 0, 3600 * 24 * 7) }}w {{ intdiv(($history->seedtime_avg ?? 0) - $weeks * 3600 * 24 * 7, 3600) }}h + + {{ $weeks = intdiv($history->seedtime_avg ?? 0, 3600 * 24 * 7) }}w + {{ intdiv(($history->seedtime_avg ?? 0) - $weeks * 3600 * 24 * 7, 3600) }}h {{ $history->seeding_count }}
    + @break @default - - @@ -198,47 +295,80 @@ {{ __('torrent.agent') }} @include('livewire.includes._sort-icon', ['field' => 'history.agent']) - - - - - - - - - - - @@ -250,13 +380,25 @@ {{ __('torrent.leeching') }} @include('livewire.includes._sort-icon', ['field' => 'leeching']) - - - @@ -268,7 +410,9 @@ @@ -295,62 +439,110 @@ {{ App\Helpers\StringHelper::formatBytes($history->refunded_download, 2) }} + @if ($history->seedtime < config('hitrun.seedtime')) - @else - @endif diff --git a/resources/views/livewire/includes/_sort-icon.blade.php b/resources/views/livewire/includes/_sort-icon.blade.php index 7b2889efc..93d07c8be 100644 --- a/resources/views/livewire/includes/_sort-icon.blade.php +++ b/resources/views/livewire/includes/_sort-icon.blade.php @@ -1,5 +1,7 @@ -@if($sortField === $field) - +@if ($sortField === $field) + @else - -@endif \ No newline at end of file + +@endif diff --git a/resources/views/livewire/includes/_tooltip.blade.php b/resources/views/livewire/includes/_tooltip.blade.php index 67232f8bb..44bb1f44f 100644 --- a/resources/views/livewire/includes/_tooltip.blade.php +++ b/resources/views/livewire/includes/_tooltip.blade.php @@ -1,28 +1,36 @@
    -
    - -
    +
    @if ($torrent->category->movie_meta || $torrent->category->tv_meta) - {{ __('torrent.poster') }} + {{ __('torrent.poster') }} @endif @if ($torrent->category->game_meta && isset($meta) && $meta->cover->image_id && $meta->name) - ' - data-image='{{ __('torrent.poster') }}' - class="torrent-poster-img-small show-poster" alt="{{ __('torrent.poster') }}"> + ' + data-image='{{ __('torrent.poster') }}' + class="torrent-poster-img-small show-poster" + alt="{{ __('torrent.poster') }}" + /> @endif @if ($torrent->category->no_meta || $torrent->category->music_meta) - ' - class="torrent-poster-img-small show-poster" alt="{{ __('torrent.poster') }}"> + ' + class="torrent-poster-img-small show-poster" + alt="{{ __('torrent.poster') }}" + /> @endif
    @@ -31,14 +39,21 @@ @if ($torrent->category->movie_meta) {{ $meta->title ?? 'Unknown' }} @endif + @if ($torrent->category->tv_meta) {{ $meta->name ?? 'Unknown' }} @endif - @if($torrent->category->movie_meta) - {{ substr($meta->release_date ?? '', 0, 4) ?? '' }} + + @if ($torrent->category->movie_meta) + + {{ substr($meta->release_date ?? '', 0, 4) ?? '' }} + @endif - @if($torrent->category->tv_meta) - {{ substr($meta->first_air_date ?? '', 0, 4) ?? '' }} + + @if ($torrent->category->tv_meta) + + {{ substr($meta->first_air_date ?? '', 0, 4) ?? '' }} + @endif @@ -47,16 +62,18 @@ {{ $genre->name }} @endforeach @endif +

    {{ $meta->overview ?? '' }}

    - - - {{ $meta->vote_average ?? 0 }}/10 ({{ $meta->vote_count ?? 0 }} {{ __('torrent.votes') }}) - + + + {{ $meta->vote_average ?? 0 }}/10 ({{ $meta->vote_count ?? 0 }} + {{ __('torrent.votes') }}) +
    -
    \ No newline at end of file + diff --git a/resources/views/livewire/invite-log-search.blade.php b/resources/views/livewire/invite-log-search.blade.php index 1b1a15cf6..4921aa708 100644 --- a/resources/views/livewire/invite-log-search.blade.php +++ b/resources/views/livewire/invite-log-search.blade.php @@ -1,9 +1,9 @@ -
    +

    {{ __('common.search') }}

    -
    +
    @@ -58,11 +58,18 @@
    - - +
    - @@ -110,7 +112,7 @@

    {{ __('staff.invites-log') }}

    - @switch ($groupBy) + @switch($groupBy) @case('user_id')
    + {{ __('user.user') }} @include('livewire.includes._sort-icon', ['field' => 'history.user_id']) + {{ __('torrent.torrent') }} @include('livewire.includes._sort-icon', ['field' => 'history.torrent_id']) + {{ __('user.credited-upload') }} @include('livewire.includes._sort-icon', ['field' => 'history.uploaded']) + {{ __('user.upload-true') }} @include('livewire.includes._sort-icon', ['field' => 'history.actual_uploaded']) + Client Upload @include('livewire.includes._sort-icon', ['field' => 'history.client_uploaded']) + {{ __('user.credited-download') }} @include('livewire.includes._sort-icon', ['field' => 'history.downloaded']) + {{ __('user.download-true') }} @include('livewire.includes._sort-icon', ['field' => 'history.actual_downloaded']) + Client Download @include('livewire.includes._sort-icon', ['field' => 'history.client_downloaded']) + {{ __('torrent.refunded') }} @include('livewire.includes._sort-icon', ['field' => 'history.refunded_download']) + {{ __('torrent.started') }} @include('livewire.includes._sort-icon', ['field' => 'history.created_at']) + Announced @include('livewire.includes._sort-icon', ['field' => 'history.updated_at']) + {{ __('torrent.completed_at') }} @include('livewire.includes._sort-icon', ['field' => 'history.completed_at']) + {{ __('torrent.seedtime') }} @include('livewire.includes._sort-icon', ['field' => 'history.seedtime']) + + +
    - + {{ $history->torrent->name ?? '' }} - - - - {{ $weeks = intdiv($history->seedtime ?? 0, 3600 * 24 * 7) }}w {{ intdiv(($history->seedtime ?? 0) - $weeks * 3600 * 24 * 7, 3600) }}h + + {{ $weeks = intdiv($history->seedtime ?? 0, 3600 * 24 * 7) }}w + {{ intdiv(($history->seedtime ?? 0) - $weeks * 3600 * 24 * 7, 3600) }}h - {{ $weeks = intdiv($history->seedtime ?? 0, 3600 * 24 * 7) }}w {{ intdiv(($history->seedtime ?? 0) - $weeks * 3600 * 24 * 7, 3600) }}h + + {{ $weeks = intdiv($history->seedtime ?? 0, 3600 * 24 * 7) }}w + {{ intdiv(($history->seedtime ?? 0) - $weeks * 3600 * 24 * 7, 3600) }}h @if ($history->active) - + @else - + @endif @if ($history->seeder) - + @else - + @endif @if ($history->immune) - + @else - + @endif @if ($history->hitrun) - + @else - + @endif @if ($history->prewarn) - + @else - + @endif
    @@ -119,15 +121,24 @@ {{ __('user.sender') }} @include('livewire.includes._sort-icon', ['field' => 'user_id']) - - - @@ -135,15 +146,24 @@ Invites Sent @include('livewire.includes._sort-icon', ['field' => 'sent_count']) - - - @@ -156,28 +176,43 @@ - + @empty @@ -186,6 +221,7 @@ @endforelse
    + First Sent At @include('livewire.includes._sort-icon', ['field' => 'created_at_min']) + Average Sent At @include('livewire.includes._sort-icon', ['field' => 'created_at_avg']) + Last Sent At @include('livewire.includes._sort-icon', ['field' => 'created_at_max']) + Invites Accepted @include('livewire.includes._sort-icon', ['field' => 'accepted_by_count']) + Inactive Count @include('livewire.includes._sort-icon', ['field' => 'banned_count']) + Percent Inactive @include('livewire.includes._sort-icon', ['field' => 'inactive_ratio']) - - - - + {{ $invite->sent_count ?? 0 }} {{ $invite->accepted_by_count ?? 0 }} {{ $invite->inactive_count ?? 0 }}{{ number_format($invite->inactive_ratio, 1) }} + {{ number_format($invite->inactive_ratio, 1) }} +
    + @break @default @@ -244,12 +280,18 @@ @@ -261,12 +303,18 @@ @endif @@ -283,4 +331,3 @@ {{ $invites->links('partials.pagination') }} - diff --git a/resources/views/livewire/laravel-log-viewer.blade.php b/resources/views/livewire/laravel-log-viewer.blade.php index 934101c70..8bb35a168 100644 --- a/resources/views/livewire/laravel-log-viewer.blade.php +++ b/resources/views/livewire/laravel-log-viewer.blade.php @@ -1,9 +1,11 @@ @section('title') - Laravel Log Viewer - {{ __('staff.staff-dashboard') }} - {{ config('other.title') }} + + Laravel Log Viewer - {{ __('staff.staff-dashboard') }} - {{ config('other.title') }} + @endsection @section('meta') - + @endsection @section('breadcrumbs') @@ -12,12 +14,17 @@ {{ __('staff.staff-dashboard') }} -
  • - Laravel Log Viewer -
    • +
  • Laravel Log Viewer
    • @endsection -
    +

    @@ -26,10 +33,14 @@

    - +
    - +
    @@ -46,23 +57,35 @@
    - @forelse($entries as $message => $groupedEntry) - - + @forelse ($entries as $message => $groupedEntry) + + - diff --git a/resources/views/livewire/password-strength.blade.php b/resources/views/livewire/password-strength.blade.php index 7cb837489..73df6193d 100644 --- a/resources/views/livewire/password-strength.blade.php +++ b/resources/views/livewire/password-strength.blade.php @@ -1,36 +1,39 @@ -
    +

    + id="new_password" + class="form__text" + autocomplete="new-password" + minlength="12" + name="new_password" + placeholder=" " + required + type="password" + value="{{ old('new_password') }}" + wire:model="password" + />

    - + id="new_password_confirmation" + class="form__text" + autocomplete="new-password" + minlength="12" + name="new_password_confirmation" + placeholder=" " + required + type="password" + value="{{ old('new_password') }}" + /> +

    +

    {{ __('common.search') }}

    -
    +

    - - + +

    - +

    - +

    - +

    - - +

    - @@ -39,23 +58,38 @@

    - - +

    @@ -65,9 +99,7 @@

    Peers

    -
    - Loading... -
    +
    Loading...
    {{ $invite->code }} {{ $invite->custom }} - - - - Count
    {{ $groupedEntry[0]['date'] }} - @switch ($groupedEntry[0]['level']) - @case ('CRITICAL') - {{ $groupedEntry[0]['level'] }} + @switch($groupedEntry[0]['level']) + @case('CRITICAL') + + {{ $groupedEntry[0]['level'] }} + + @break - @case ('ERROR') - {{ $groupedEntry[0]['level'] }} + @case('ERROR') + + {{ $groupedEntry[0]['level'] }} + + @break - @case ('INFO') - {{ $groupedEntry[0]['level'] }} + @case('INFO') + + {{ $groupedEntry[0]['level'] }} + + @break - @case ('WARNING') - {{ $groupedEntry[0]['level'] }} + @case('WARNING') + + {{ $groupedEntry[0]['level'] }} + + @break @default {{ $groupedEntry[0]['level'] }} @@ -75,7 +98,7 @@ {{ count($groupedEntry) }}
    + @@ -84,9 +107,15 @@ - @foreach($groupedEntry as $entry) - - + @foreach ($groupedEntry as $entry) + + @@ -122,9 +155,16 @@

    Entries

    - + @foreach ($files as $file) + @endforeach diff --git a/resources/views/livewire/like-button.blade.php b/resources/views/livewire/like-button.blade.php index 79172a6a4..25eee5a0d 100644 --- a/resources/views/livewire/like-button.blade.php +++ b/resources/views/livewire/like-button.blade.php @@ -3,7 +3,7 @@ wire:click="store({{ $post->id }})" title="{{ __('forum.like-post') }}" > - @if($post->likes_exists) + @if ($post->likes_exists) @else diff --git a/resources/views/livewire/missing-media-search.blade.php b/resources/views/livewire/missing-media-search.blade.php index d51893b1f..ebed62a7e 100644 --- a/resources/views/livewire/missing-media-search.blade.php +++ b/resources/views/livewire/missing-media-search.blade.php @@ -1,48 +1,72 @@
    -

    Missing Media

    -
    Stacktrace
    {{ $entry['date'] }} {{ $entry['env'] }} @@ -100,7 +129,11 @@
    - 
    {{ $entry['stacktrace'] }}
     + + 
    +{{ $entry['stacktrace'] }}
    +
    - - - - - @foreach($types as $type) - - @endforeach - - - - @foreach($medias as $media) - - - - @foreach($types as $type) - @if($media->torrents->where('type_id', '=', $type->id)->isEmpty()) - - @else - - @endif - @endforeach - - @endforeach - -
    - {{ __('common.name') }} - @include('livewire.includes._sort-icon', ['field' => 'title']) - - {{ __('request.requests') }} - @include('livewire.includes._sort-icon', ['field' => 'requests_count']) - {{ $type->name }}
    - - {{ $media->title }} ({{ \substr($media->release_date, 0, 4) ?? '' }}) - - - - {{ $media->requests_count }} - - - Missing - - {{ $media->torrents->where('type_id', '=', $type->id)->implode('resolution.name', ' | ') }} -
    - {{ $medias->links('partials.pagination') }} +

    Missing Media

    + + + + + + @foreach ($types as $type) + + @endforeach + + + + @foreach ($medias as $media) + + + + @foreach ($types as $type) + @if ($media->torrents->where('type_id', '=', $type->id)->isEmpty()) + + @else + + @endif + @endforeach + + @endforeach + +
    + {{ __('common.name') }} + @include('livewire.includes._sort-icon', ['field' => 'title']) + + {{ __('request.requests') }} + @include('livewire.includes._sort-icon', ['field' => 'requests_count']) + {{ $type->name }}
    + + {{ $media->title }} ({{ \substr($media->release_date, 0, 4) ?? '' }}) + + + + {{ $media->requests_count }} + + + Missing + + {{ $media->torrents->where('type_id', '=', $type->id)->implode('resolution.name', ' | ') }} +
    + {{ $medias->links('partials.pagination') }} diff --git a/resources/views/livewire/network-search.blade.php b/resources/views/livewire/network-search.blade.php index 858bf51b5..1fbd6909a 100644 --- a/resources/views/livewire/network-search.blade.php +++ b/resources/views/livewire/network-search.blade.php @@ -21,20 +21,27 @@ {{ $networks->links('partials.pagination') }}
    @forelse ($networks as $network) - -
    + +

    - @if(isset($network->logo)) - {{ $network->name }} + @if (isset($network->logo)) + {{ $network->name }} @else {{ $network->name }} @endif

    -

    {{ $network->tv_count }} - Shows

    +

    + + {{ $network->tv_count }} Shows +

    @empty diff --git a/resources/views/livewire/note-search.blade.php b/resources/views/livewire/note-search.blade.php index 747c56d6a..cc0f81a85 100644 --- a/resources/views/livewire/note-search.blade.php +++ b/resources/views/livewire/note-search.blade.php @@ -4,12 +4,7 @@
    - @@ -28,9 +23,7 @@ wire:model="search" placeholder=" " /> - +
    @@ -38,37 +31,40 @@
    - - - - - - - - + + + + + + + + - @forelse ($notes as $note) - - - - - - - + + + + - - @empty - - - - @endforelse + class="form__button form__button--text" + > + {{ __('common.delete') }} + + + + + + + @empty + + + + @endforelse
    #{{ __('common.user') }}{{ __('common.staff') }}{{ __('common.message') }}{{ __('user.created-on') }}{{ __('common.actions') }}
    #{{ __('common.user') }}{{ __('common.staff') }}{{ __('common.message') }}{{ __('user.created-on') }}{{ __('common.actions') }}
    {{ $note->id }} - - - - {{ $note->message }} - - - -
  • - -
    		• + + {{ $note->message }} + + + +
  • + + - -
    • -     -
    No notes
    No notes
    diff --git a/resources/views/livewire/notification-search.blade.php b/resources/views/livewire/notification-search.blade.php index 33e09ffc0..e3d7ea27d 100644 --- a/resources/views/livewire/notification-search.blade.php +++ b/resources/views/livewire/notification-search.blade.php @@ -5,77 +5,91 @@
    - - - - - - + + + + + + - @forelse($notifications as $notification) - - - - - + + + - - @empty - - - - @endforelse + @csrf + @method('PATCH') + + + +
  • +
    + @csrf + @method('DELETE') + + +
    • + + + + @empty + + + + @endforelse
    {{ __('notification.title') }}{{ __('notification.message') }}{{ __('notification.date') }}{{ __('common.actions') }}
    {{ __('notification.title') }}{{ __('notification.message') }}{{ __('notification.date') }}{{ __('common.actions') }}
    - - {{ $notification->data['title'] }} - - - {{ $notification->data['body'] }} - - - - -
  • -
    - @csrf - @method('PATCH') - -
    -
    • -
  • -
    - @csrf - @method('DELETE') -
    		• + + {{ $notification->data['title'] }} + + + {{ $notification->data['body'] }} + + + + +
  • + - {{ __('notification.delete') }} - - -
    • -     -
    {{ __('notification.no-notifications') }}
    {{ __('notification.no-notifications') }}
    {{ $notifications->links('partials.pagination') }} @@ -91,134 +105,262 @@

    @@ -229,44 +371,56 @@

    {{ __('common.actions') }}

    -
    + @csrf @method('PATCH')

    -
    + @csrf @method('DELETE')

    -
    \ No newline at end of file +
    diff --git a/resources/views/livewire/passkey-search.blade.php b/resources/views/livewire/passkey-search.blade.php index 36cbe53e2..c2f78dbb8 100644 --- a/resources/views/livewire/passkey-search.blade.php +++ b/resources/views/livewire/passkey-search.blade.php @@ -32,12 +32,7 @@
    - @@ -77,12 +72,18 @@
    		{{ $passkey->content }} - -
    @@ -77,11 +109,16 @@ @include('livewire.includes._sort-icon', ['field' => 'peers.user_id']) @if ($groupBy !== 'none') - @endif + - - - - - @if ($groupBy === 'none') @if ($includeSeedsize) - @@ -137,16 +199,28 @@ @endif @else @if ($includeSeedsize) - @if (\config('announce.connectable_check')) - - @@ -155,41 +229,74 @@ @endif @if (\config('announce.connectable_check')) @if ($groupBy === 'none') - @else - - @endif @endif + @if ($groupBy === 'none') - @else - - @endif - - @@ -206,9 +313,12 @@ {{ $peer->peer_count }} @endif + @if ($groupBy === 'none') @@ -217,6 +327,7 @@ {{ $peer->torrent_id }} @endif + @if ($groupBy === 'none' || $groupBy === 'user_session') @else @@ -262,22 +373,39 @@ @if ($groupBy === 'none') @else - - + + @endif @endif + @if ($groupBy === 'none') @else @@ -285,12 +413,18 @@ @endif diff --git a/resources/views/livewire/person-credit.blade.php b/resources/views/livewire/person-credit.blade.php index 513cdc6c3..4e4906445 100644 --- a/resources/views/livewire/person-credit.blade.php +++ b/resources/views/livewire/person-credit.blade.php @@ -104,12 +104,14 @@
    @forelse ($medias as $media) - @switch ($media->meta) + @switch($media->meta) @case('movie') + @break @case('tv') + @break @endswitch @empty diff --git a/resources/views/livewire/person-search.blade.php b/resources/views/livewire/person-search.blade.php index e6df540a2..47ecd23b3 100644 --- a/resources/views/livewire/person-search.blade.php +++ b/resources/views/livewire/person-search.blade.php @@ -19,15 +19,22 @@
    {{ $persons->links('partials.pagination') }} -
    +
    @forelse ($persons as $person)
    {{ $person->name }} + style="width: 140px; height: 140px; object-fit: cover; border-radius: 50%" + />
    {{ $person->name }}
    @@ -37,5 +44,3 @@
    {{ $persons->links('partials.pagination') }} - - diff --git a/resources/views/livewire/post-search.blade.php b/resources/views/livewire/post-search.blade.php index 386b86b26..f835acc46 100644 --- a/resources/views/livewire/post-search.blade.php +++ b/resources/views/livewire/post-search.blade.php @@ -33,4 +33,4 @@ @endif
    {{ $posts->links('partials.pagination') }} - \ No newline at end of file + diff --git a/resources/views/livewire/quick-search-dropdown.blade.php b/resources/views/livewire/quick-search-dropdown.blade.php index 8734c9803..614ac2aee 100755 --- a/resources/views/livewire/quick-search-dropdown.blade.php +++ b/resources/views/livewire/quick-search-dropdown.blade.php @@ -1,7 +1,11 @@
    @@ -65,8 +69,8 @@ x-on:keydown.down.prevent="quickSearchArrowDown($el)" x-on:keydown.up.prevent="quickSearchArrowUp($el)" > - @switch ($quicksearchRadio) - @case ("movies") + @switch($quicksearchRadio) + @case('movies') + @break - @case ("series") + @case('series') + @break - @case ("persons") + @case('persons') name }} + @break @endswitch @@ -146,19 +153,21 @@ return { quickSearchArrowDown(el) { if (el.nextElementSibling == null) { - el.parentNode?.firstElementChild?.firstElementChild?.focus() + el.parentNode?.firstElementChild?.firstElementChild?.focus(); } else { - el.nextElementSibling?.firstElementChild?.focus() + el.nextElementSibling?.firstElementChild?.focus(); } }, quickSearchArrowUp(el) { if (el.previousElementSibling == null) { - document.querySelector(`.quick-search__input:not([style='display: none;'])`)?.focus() + document + .querySelector(`.quick-search__input:not([style='display: none;'])`) + ?.focus(); } else { - el.previousElementSibling?.firstElementChild?.focus() + el.previousElementSibling?.firstElementChild?.focus(); } - } - } + }, + }; }
    diff --git a/resources/views/livewire/rsskey-search.blade.php b/resources/views/livewire/rsskey-search.blade.php index 1957f4a2c..411ce90e2 100644 --- a/resources/views/livewire/rsskey-search.blade.php +++ b/resources/views/livewire/rsskey-search.blade.php @@ -32,12 +32,7 @@
    - @@ -77,12 +72,18 @@
    diff --git a/resources/views/livewire/similar-torrent.blade.php b/resources/views/livewire/similar-torrent.blade.php index afcefc307..61d4d8acc 100644 --- a/resources/views/livewire/similar-torrent.blade.php +++ b/resources/views/livewire/similar-torrent.blade.php @@ -8,63 +8,105 @@ @endif +
    + {{ __('torrent.peers') }} @include('livewire.includes._sort-icon', ['field' => 'peer_count']) @if ($groupBy === 'none') {{ __('torrent.torrent') }} @@ -98,7 +135,11 @@ @endif @include('livewire.includes._sort-icon', ['field' => 'agent']) + @if ($groupBy === 'none' || $groupBy === 'user_ip' || $groupBy === 'user_session') IP @else @@ -106,7 +147,11 @@ @endif @include('livewire.includes._sort-icon', ['field' => 'ip']) + @if ($groupBy === 'user_ip' || $groupBy === 'user') Ports @else @@ -114,21 +159,38 @@ @endif @include('livewire.includes._sort-icon', ['field' => 'port']) + {{ __('torrent.uploaded') }} @include('livewire.includes._sort-icon', ['field' => 'uploaded']) + {{ __('torrent.downloaded') }} @include('livewire.includes._sort-icon', ['field' => 'downloaded']) + {{ __('torrent.left') }} @include('livewire.includes._sort-icon', ['field' => 'left']) + {{ __('torrent.size') }} @include('livewire.includes._sort-icon', ['field' => 'size']) + {{ __('torrent.size') }} @include('livewire.includes._sort-icon', ['field' => 'size']) + Connectable {{ __('torrent.size') }} @include('livewire.includes._sort-icon', ['field' => 'connectable_size']) + Unconnectable {{ __('torrent.size') }} @include('livewire.includes._sort-icon', ['field' => 'unconnectable_size']) + Connectable @include('livewire.includes._sort-icon', ['field' => 'connectable']) + Connectable {{ __('torrent.peers') }} @include('livewire.includes._sort-icon', ['field' => 'connectable_count']) + Unconnectable {{ __('torrent.peers') }} @include('livewire.includes._sort-icon', ['field' => 'unconnectable_count']) + {{ __('common.active') }} @include('livewire.includes._sort-icon', ['field' => 'active']) + {{ __('common.active') }} {{ __('torrent.peers') }} @include('livewire.includes._sort-icon', ['field' => 'active_count']) + Inactive {{ __('torrent.peers') }} @include('livewire.includes._sort-icon', ['field' => 'inactive_count']) + Started @include('livewire.includes._sort-icon', ['field' => 'created_at']) + Announced @include('livewire.includes._sort-icon', ['field' => 'updated_at']) - + {{ $peer->torrent->name ?? '' }} {{ $peer->agent }} @if ($peer->connectable) - + @else - + @endif {{ $peer->connectable_count }}{{ $peer->unconnectable_count }} + {{ $peer->connectable_count }} + + {{ $peer->unconnectable_count }} + @if ($peer->active) - + @else - + @endif {{ $peer->inactive_count }} - - {{ $rsskey->content }} - -
    @if ($user->group->is_modo) - + @endif - - - - - -
    + + + + {{ __('common.name') }} @include('livewire.includes._sort-icon', ['field' => 'name']) + {{ __('common.created_at') }} @include('livewire.includes._sort-icon', ['field' => 'created_at']) + @include('livewire.includes._sort-icon', ['field' => 'size']) + @include('livewire.includes._sort-icon', ['field' => 'seeders']) + @include('livewire.includes._sort-icon', ['field' => 'leechers']) + @include('livewire.includes._sort-icon', ['field' => 'times_completed'])
    - @foreach($torrents->sortBy('type.position')->values()->groupBy('type.name') as $type => $torrents) + @foreach ($torrents->sortBy('type.position')->values()->groupBy('type.name') as $type => $torrents)

    {{ $type }}

    - @foreach($torrents->sortBy('resolution.position')->values()->groupBy('resolution.name') as $resolution => $torrents) + @foreach ($torrents->sortBy('resolution.position')->values()->groupBy('resolution.name') as $resolution => $torrents) - @foreach($torrents as $torrent) + @foreach ($torrents as $torrent) @if ($user->group->is_modo) - @endif - + + @endforeach @endforeach @@ -88,53 +130,65 @@
    {{ $resolution }}
    + + />
    - @forelse($torrentRequests as $torrentRequest) - - - - - - - - - - - - - @empty - - - - @endforelse + @forelse ($torrentRequests as $torrentRequest) + + + + + + + + + + + + + @empty + + + + @endforelse
    - - {{ $torrentRequest->name }} - - {{ $torrentRequest->category->name }}{{ $torrentRequest->type->name }}{{ $torrentRequest->resolution->name ?? 'Unknown' }} - - {{ $torrentRequest->votes }}{{ $torrentRequest->comments_count }}{{ number_format($torrentRequest->bounty) }} - - - @switch(true) - @case ($torrentRequest->claimed && $torrentRequest->torrent_id === null) - - {{ __('request.claimed') }} - @break - @case ($torrentRequest->torrent_id !== null && $torrentRequest->approved_by === null) - - {{ __('request.pending') }} - @break - @case ($torrentRequest->torrent_id === null) - - {{ __('request.unfilled') }} - @break - @default - - {{ __('request.filled') }} - @break - @endswitch -
    {{ __('common.no-result') }}
    + + {{ $torrentRequest->name }} + + {{ $torrentRequest->category->name }}{{ $torrentRequest->type->name }}{{ $torrentRequest->resolution->name ?? 'Unknown' }} + + {{ $torrentRequest->votes }}{{ $torrentRequest->comments_count }}{{ number_format($torrentRequest->bounty) }} + + + @switch(true) + @case($torrentRequest->claimed && $torrentRequest->torrent_id === null) + + {{ __('request.claimed') }} + + @break + @case($torrentRequest->torrent_id !== null && $torrentRequest->approved_by === null) + + {{ __('request.pending') }} + + @break + @case($torrentRequest->torrent_id === null) + + {{ __('request.unfilled') }} + + @break + @default + + {{ __('request.filled') }} + + @break + @endswitch +
    {{ __('common.no-result') }}
    @@ -143,41 +197,41 @@ @section('javascripts') @if ($user->group->is_modo) @endif -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/livewire/small-bookmark-button.blade.php b/resources/views/livewire/small-bookmark-button.blade.php index a0b8fb9a1..f5c4f1ed8 100644 --- a/resources/views/livewire/small-bookmark-button.blade.php +++ b/resources/views/livewire/small-bookmark-button.blade.php @@ -1,9 +1,17 @@ -@if($this->isBookmarked) - @else - @endif diff --git a/resources/views/livewire/subscribed-forum.blade.php b/resources/views/livewire/subscribed-forum.blade.php index b7d2f8250..7aec396a9 100644 --- a/resources/views/livewire/subscribed-forum.blade.php +++ b/resources/views/livewire/subscribed-forum.blade.php @@ -1,7 +1,7 @@

    {{ __('forum.forums') }}

    {{ $forums->links('partials.pagination') }} - @if($forums->count() > 0) + @if ($forums->count() > 0)
      @foreach ($forums as $forum)
    • @@ -10,9 +10,7 @@ @endforeach
    @else -
    - No forums in category. -
    +
    No forums in category.
    @endif {{ $forums->links('partials.pagination') }} -
    \ No newline at end of file +
    diff --git a/resources/views/livewire/subscribed-topic.blade.php b/resources/views/livewire/subscribed-topic.blade.php index aa2af056a..bf8cf8b37 100644 --- a/resources/views/livewire/subscribed-topic.blade.php +++ b/resources/views/livewire/subscribed-topic.blade.php @@ -1,7 +1,7 @@

    {{ __('forum.topics') }}

    {{ $topics->links('partials.pagination') }} - @if($topics->count() > 0) + @if ($topics->count() > 0)
      @foreach ($topics as $topic)
    • @@ -10,9 +10,7 @@ @endforeach
    @else -
    - No topics. -
    +
    No topics.
    @endif {{ $topics->links('partials.pagination') }}
    diff --git a/resources/views/livewire/subtitle-search.blade.php b/resources/views/livewire/subtitle-search.blade.php index b039b1b2b..8d77def6b 100644 --- a/resources/views/livewire/subtitle-search.blade.php +++ b/resources/views/livewire/subtitle-search.blade.php @@ -39,36 +39,44 @@ - @foreach($subtitles as $subtitle) + @foreach ($subtitles as $subtitle) @if ($subtitle->torrent->category->image === null) - - @else - {{ $subtitle->torrent->category->name }} + + @else + {{ $subtitle->torrent->category->name }} @endif - + {{ $subtitle->torrent->name }} {{ $subtitle->language->name }} - + {{ $subtitle->extension }} {{ $subtitle->getSize() }} {{ $subtitle->downloads }} -
    - @foreach ($metaTypes as $name => $type) - + @endforeach - +
    Computing...
    - @switch ($this->metaType) - @case ('movie_meta') - @foreach($works as $work) + + @switch($this->metaType) + @case('movie_meta') + @foreach ($works as $work)
    - -
    + +
    {{ $work->download_count }}
    @endforeach @break - @case ('tv_meta') - @foreach($works as $work) + @case('tv_meta') + @foreach ($works as $work)
    - -
    + +
    {{ $work->download_count }}
    diff --git a/resources/views/livewire/topic-post-search.blade.php b/resources/views/livewire/topic-post-search.blade.php index 050c97aaa..2a5dba170 100644 --- a/resources/views/livewire/topic-post-search.blade.php +++ b/resources/views/livewire/topic-post-search.blade.php @@ -26,26 +26,33 @@ @if ($topic->approved)
  • {{ __('forum.approved') }}
    • @endif + @if ($topic->denied)
  • {{ __('forum.denied') }}
    • @endif + @if ($topic->solved)
  • {{ __('forum.solved') }}
    • @endif + @if ($topic->invalid)
  • {{ __('forum.invalid') }}
    • @endif + @if ($topic->bug)
  • {{ __('forum.bug') }}
    • @endif + @if ($topic->suggestion)
  • {{ __('forum.suggestion') }}
    • @endif + @if ($topic->implemented)
  • {{ __('forum.implemented') }}
    • @endif @endif + {{ $posts->links('partials.pagination') }}
    @if ($posts->count() > 0) @@ -61,4 +68,4 @@ @endif
    {{ $posts->links('partials.pagination') }} - \ No newline at end of file + diff --git a/resources/views/livewire/topic-search.blade.php b/resources/views/livewire/topic-search.blade.php index 07528f247..75b52a8af 100644 --- a/resources/views/livewire/topic-search.blade.php +++ b/resources/views/livewire/topic-search.blade.php @@ -3,7 +3,7 @@

    {{ __('common.latest-topics') }}

    {{ $topics->links('partials.pagination') }} - @if($topics->count() > 0) + @if ($topics->count() > 0)
      @foreach ($topics as $topic)
    • @@ -12,9 +12,7 @@ @endforeach
    @else -
    - No topics. -
    +
    No topics.
    @endif {{ $topics->links('partials.pagination') }}
    @@ -60,12 +58,7 @@

    -

    -
    \ No newline at end of file + diff --git a/resources/views/livewire/torrent-request-search.blade.php b/resources/views/livewire/torrent-request-search.blade.php index c0bbe50ee..fba5f2871 100644 --- a/resources/views/livewire/torrent-request-search.blade.php +++ b/resources/views/livewire/torrent-request-search.blade.php @@ -5,7 +5,10 @@

    {{ __('request.requests') }}

    - + {{ __('request.add-request') }}
    @@ -40,7 +43,9 @@ @include('livewire.includes._sort-icon', ['field' => 'votes']) - + @@ -54,10 +59,12 @@ - @forelse($torrentRequests as $torrentRequest) + @forelse ($torrentRequests as $torrentRequest) - + {{ $torrentRequest->name }} @@ -65,33 +72,43 @@ {{ $torrentRequest->type->name }} {{ $torrentRequest->resolution->name ?? 'Unknown' }} - + {{ $torrentRequest->votes }} {{ $torrentRequest->comments_count }} {{ number_format($torrentRequest->bounty) }} -

    - - + +

    - - + +

    - - + +

    - - + +

    @@ -161,7 +213,7 @@ type="checkbox" value="{{ $category->id }}" wire:model="categories" - > + /> {{ $category->name }}

    @@ -181,7 +233,7 @@ type="checkbox" value="{{ $type->id }}" wire:model="types" - > + /> {{ $type->name }}

    @@ -201,7 +253,7 @@ type="checkbox" value="{{ $resolution->id }}" wire:model="resolutions" - > + /> {{ $resolution->name }}

    @@ -220,7 +272,7 @@ type="checkbox" value="1" wire:model="unfilled" - > + /> {{ __('request.unfilled') }}

    @@ -231,7 +283,7 @@ type="checkbox" value="1" wire:model="claimed" - > + /> {{ __('request.claimed') }}

    @@ -242,7 +294,7 @@ type="checkbox" value="1" wire:model="pending" - > + /> {{ __('request.pending') }}

    @@ -253,7 +305,7 @@ type="checkbox" value="1" wire:model="filled" - > + /> {{ __('request.filled') }}

    @@ -271,7 +323,7 @@ type="checkbox" value="1" wire:model="myRequests" - > + /> {{ __('request.my-requests') }}

    @@ -282,7 +334,7 @@ type="checkbox" value="1" wire:model="myClaims" - > + /> {{ __('request.my-claims') }}

    @@ -293,7 +345,7 @@ type="checkbox" value="1" wire:model="myVoted" - > + /> {{ __('request.my-voted') }}

    @@ -304,7 +356,7 @@ type="checkbox" value="1" wire:model="myFilled" - > + /> {{ __('request.my-filled') }}

    @@ -327,11 +379,14 @@
    {{ __('request.total-bounty') }}:
    {{ number_format($torrentRequestBountyStat->total) }} {{ __('bon.bon') }}
    {{ __('request.bounty-claimed') }}:
    -
    {{ number_format($torrentRequestBountyStat->claimed) }} {{ __('bon.bon') }}
    +
    + {{ number_format($torrentRequestBountyStat->claimed) }} {{ __('bon.bon') }} +
    {{ __('request.bounty-unclaimed') }}:
    -
    {{ number_format($torrentRequestBountyStat->unclaimed) }} {{ __('bon.bon') }}
    +
    + {{ number_format($torrentRequestBountyStat->unclaimed) }} {{ __('bon.bon') }} +
    - diff --git a/resources/views/livewire/torrent-search.blade.php b/resources/views/livewire/torrent-search.blade.php index 2447bfc27..441d5d13d 100644 --- a/resources/views/livewire/torrent-search.blade.php +++ b/resources/views/livewire/torrent-search.blade.php @@ -7,53 +7,115 @@ + x-text="open ? '{{ __('common.search-hide') }}' : '{{ __('common.search-advanced') }}'" + > -
    +

    - - + +

    - - + +

    - - + +

    - - + +

    - - + +

    - - + +

    - - + +

    - - + +

    - @@ -63,18 +125,34 @@ - - +

    - - + +

    - @@ -84,55 +162,107 @@ - - +

    - @php $regions = cache()->remember('regions', 3_600, fn () => App\Models\Region::orderBy('position')->get()) @endphp + @php + $regions = cache()->remember( + 'regions', + 3_600, + fn () => App\Models\Region::orderBy('position')->get() + ) + @endphp +
    - @php $distributors = cache()->remember('distributors', 3_600, fn () => App\Models\Distributor::orderBy('name')->get()) @endphp + @php + $distributors = cache()->remember( + 'distributors', + 3_600, + fn () => App\Models\Distributor::orderBy('name')->get() + ) + @endphp +

    - - + +

    - - + +

    - - + +

    - - + +

    - - + +

    - - + +

    - - + +

    - +

    @@ -141,7 +271,14 @@
    {{ __('torrent.category') }}
    - @php $categories = cache()->remember('categories', 3_600, fn () => App\Models\Category::orderBy('position')->get()) @endphp + @php + $categories = cache()->remember( + 'categories', + 3_600, + fn () => App\Models\Category::orderBy('position')->get() + ) + @endphp + @foreach ($categories as $category)

    @@ -162,7 +299,14 @@
    {{ __('torrent.type') }}
    - @php $types = cache()->remember('types', 3_600, fn () => App\Models\Type::orderBy('position')->get()) @endphp + @php + $types = cache()->remember( + 'types', + 3_600, + fn () => App\Models\Type::orderBy('position')->get() + ) + @endphp + @foreach ($types as $type)

    @@ -183,7 +327,14 @@
    {{ __('torrent.resolution') }}
    - @php $resolutions = cache()->remember('resolutions', 3_600, fn () => App\Models\Resolution::orderBy('position')->get()) @endphp + @php + $resolutions = cache()->remember( + 'resolutions', + 3_600, + fn () => App\Models\Resolution::orderBy('position')->get() + ) + @endphp + @foreach ($resolutions as $resolution)

    @@ -204,7 +355,14 @@
    {{ __('torrent.genre') }}
    - @php $genres = cache()->remember('genres', 3_600, fn () => App\Models\Genre::orderBy('name')->get()) @endphp + @php + $genres = cache()->remember( + 'genres', + 3_600, + fn () => App\Models\Genre::orderBy('name')->get() + ) + @endphp + @foreach ($genres as $genre)

    @@ -232,7 +390,7 @@ type="checkbox" value="0" wire:model="free" - > + /> 0% Freeleech

    @@ -243,7 +401,7 @@ type="checkbox" value="25" wire:model="free" - > + /> 25% Freeleech

    @@ -254,7 +412,7 @@ type="checkbox" value="50" wire:model="free" - > + /> 50% Freeleech

    @@ -265,7 +423,7 @@ type="checkbox" value="75" wire:model="free" - > + /> 75% Freeleech

    @@ -276,7 +434,7 @@ type="checkbox" value="100" wire:model="free" - > + /> 100% Freeleech

    @@ -287,7 +445,7 @@ type="checkbox" value="1" wire:model="doubleup" - > + /> Double Upload

    @@ -298,7 +456,7 @@ type="checkbox" value="1" wire:model="featured" - > + /> Featured

    @@ -309,7 +467,7 @@ type="checkbox" value="1" wire:model="refundable" - > + /> Refundable

    @@ -327,7 +485,7 @@ type="checkbox" value="1" wire:model="internal" - > + /> {{ __('torrent.internal') }}

    @@ -338,7 +496,7 @@ type="checkbox" value="1" wire:model="personalRelease" - > + /> {{ __('torrent.personal-release') }}

    @@ -349,7 +507,7 @@ type="checkbox" value="1" wire:model="stream" - > + /> {{ __('torrent.stream-optimized') }}

    @@ -360,7 +518,7 @@ type="checkbox" value="1" wire:model="sd" - > + /> {{ __('torrent.sd-content') }}

    @@ -371,7 +529,7 @@ type="checkbox" value="1" wire:model="highspeed" - > + /> {{ __('common.high-speeds') }}

    @@ -382,7 +540,7 @@ type="checkbox" value="1" wire:model="bookmarked" - > + /> {{ __('common.bookmarked') }}

    @@ -393,7 +551,7 @@ type="checkbox" value="1" wire:model="wished" - > + /> {{ __('common.wished') }}

    @@ -411,7 +569,7 @@ type="checkbox" value="1" wire:model="alive" - > + /> {{ __('torrent.alive') }}

    @@ -422,7 +580,7 @@ type="checkbox" value="1" wire:model="dying" - > + /> Dying

    @@ -433,7 +591,7 @@ type="checkbox" value="1" wire:model="dead" - > + /> Dead

    @@ -444,7 +602,7 @@ type="checkbox" value="1" wire:model="graveyard" - > + /> {{ __('graveyard.graveyard') }}

    @@ -462,7 +620,7 @@ type="checkbox" value="1" wire:model="notDownloaded" - > + /> Not Downloaded

    @@ -473,7 +631,7 @@ type="checkbox" value="1" wire:model="downloaded" - > + /> Downloaded

    @@ -484,7 +642,7 @@ type="checkbox" value="1" wire:model="seeding" - > + /> Seeding

    @@ -495,7 +653,7 @@ type="checkbox" value="1" wire:model="leeching" - > + /> Leeching

    @@ -506,7 +664,7 @@ type="checkbox" value="1" wire:model="incomplete" - > + /> Incomplete

    @@ -523,30 +681,18 @@
    - - +
    - @if (\in_array($view, ['card', 'poster'])) @@ -567,42 +713,75 @@
    {{ $torrents->links('partials.pagination') }} - @switch (true) + + @switch(true) @case($view === 'list')
    - auth()->user()->show_poster, - 'torrent-search--list__no-poster-headers' => ! auth()->user()->show_poster, - ])> + auth()->user()->show_poster, + 'torrent-search--list__no-poster-headers' => ! auth()->user()->show_poster, + ]) + > @if (auth()->user()->show_poster) @endif + - - + - - - - - @@ -610,7 +789,11 @@ @forelse ($torrents as $torrent) - + @empty @@ -619,33 +802,60 @@
    PosterFormat + {{ __('torrent.name') }} @include('livewire.includes._sort-icon', ['field' => 'name']) {{ __('common.actions') }} + {{ __('common.actions') }} + Rating + {{ __('torrent.size') }} @include('livewire.includes._sort-icon', ['field' => 'size']) + @include('livewire.includes._sort-icon', ['field' => 'seeders']) + @include('livewire.includes._sort-icon', ['field' => 'leechers']) + @include('livewire.includes._sort-icon', ['field' => 'times_completed']) + {{ __('torrent.age') }} @include('livewire.includes._sort-icon', ['field' => 'created_at'])
    {{ __('common.no-result') }}
    - @break + @break @case($view === 'card') - - - - - - @@ -659,17 +869,26 @@ {{ __('common.no-result') }} @endforelse - @break + @break @case($view === 'group')
    + {{ __('torrent.name') }} @include('livewire.includes._sort-icon', ['field' => 'name']) + {{ __('torrent.size') }} @include('livewire.includes._sort-icon', ['field' => 'size']) + @include('livewire.includes._sort-icon', ['field' => 'seeders']) + @include('livewire.includes._sort-icon', ['field' => 'leechers']) + @include('livewire.includes._sort-icon', ['field' => 'times_completed']) + {{ __('common.created_at') }} @include('livewire.includes._sort-icon', ['field' => 'created_at'])
    - - @@ -678,29 +897,46 @@
    + @include('livewire.includes._sort-icon', ['field' => 'times_completed']) + {{ __('common.created_at') }} @include('livewire.includes._sort-icon', ['field' => 'created_at'])
    @forelse ($torrents as $group) - @switch ($group->meta) + @switch($group->meta) @case('movie') - + + @break @case('tv') - + + @break @endswitch @empty {{ __('common.no-result') }} @endforelse
    - @break + @break @case($view === 'poster') - - @@ -709,18 +945,29 @@
    + @include('livewire.includes._sort-icon', ['field' => 'times_completed']) + {{ __('common.created_at') }} @include('livewire.includes._sort-icon', ['field' => 'created_at'])
    @forelse ($torrents as $group) - @switch ($group->meta) + @switch($group->meta) @case('movie') - + + @break @case('tv') - + + @break @endswitch @empty {{ __('common.no-result') }} @endforelse
    + @break @endswitch {{ $torrents->links('partials.pagination') }} @@ -739,8 +986,8 @@ options: myRegions, multiple: true, search: true, - placeholder: "{{__('Select Regions')}}", - noOptionsText: "{{__('No results found')}}", + placeholder: "{{ __('Select Regions') }}", + noOptionsText: "{{ __('No results found') }}", }) let regions = document.querySelector('#regions') @@ -761,8 +1008,8 @@ options: myDistributors, multiple: true, search: true, - placeholder: "{{__('Select Distributor')}}", - noOptionsText: "{{__('No results found')}}", + placeholder: "{{ __('Select Distributor') }}", + noOptionsText: "{{ __('No results found') }}", }) let distributors = document.querySelector('#distributors') @@ -771,5 +1018,5 @@ @this.set('distributors', data) }) }) - +
    diff --git a/resources/views/livewire/tv-search.blade.php b/resources/views/livewire/tv-search.blade.php index e0afdbb05..15ac93938 100644 --- a/resources/views/livewire/tv-search.blade.php +++ b/resources/views/livewire/tv-search.blade.php @@ -20,16 +20,16 @@ {{ $shows->links('partials.pagination') }}
    - @foreach($shows as $show) + @foreach ($shows as $show)
    -
    +
    - + {{ $show->seasons_count }} Seasons @if ($show->networks) @foreach ($show->networks as $network) - + {{ $network->name }} @endforeach @@ -37,14 +37,19 @@
    - +

    - {{ $show->name }} - @if($show->first_aired) - {{ $show->first_aired }} + + {{ $show->name }} + @if ($show->first_aired) + + {{ $show->first_aired }} + @endif

    @@ -53,6 +58,7 @@ {{ $genre->name }} @endforeach @endif +

    {{ $show->overview }}

    diff --git a/resources/views/livewire/two-factor-auth-form.blade.php b/resources/views/livewire/two-factor-auth-form.blade.php index 16c54bad4..f15c2744e 100644 --- a/resources/views/livewire/two-factor-auth-form.blade.php +++ b/resources/views/livewire/two-factor-auth-form.blade.php @@ -5,12 +5,18 @@
    @if ($this->enabled) @if ($showingConfirmation) - {{ __('Finish enabling two factor authentication.') }} + + {{ __('Finish enabling two factor authentication.') }} + @else - {{ __('You have enabled two factor authentication.') }} + + {{ __('You have enabled two factor authentication.') }} + @endif @else - {{ __('You have not enabled two factor authentication.') }} + + {{ __('You have not enabled two factor authentication.') }} + @endif
    @@ -36,26 +42,28 @@
    -

    - {{ __('Setup Key') }}: {{ decrypt($this->user->two_factor_secret) }} -

    +

    {{ __('Setup Key') }}: {{ decrypt($this->user->two_factor_secret) }}

    @if ($showingConfirmation)
    - + - @error('code') {{ $message }} @enderror + @error('code') + {{ $message }} + @enderror
    @endif @endif @@ -78,35 +86,57 @@
    @if (! $this->enabled) - @else @if ($showingRecoveryCodes) - @elseif ($showingConfirmation) - @else - @endif @if ($showingConfirmation) - @else - @endif @endif
    -
    diff --git a/resources/views/livewire/user-active.blade.php b/resources/views/livewire/user-active.blade.php index 3d78f0c06..a4cda0a49 100644 --- a/resources/views/livewire/user-active.blade.php +++ b/resources/views/livewire/user-active.blade.php @@ -1,39 +1,65 @@ -
    +

    {{ __('torrent.filters') }}

    - - + +

    -

    -

    @@ -61,183 +87,286 @@
    - - - - - - - - @if (\config('announce.connectable_check')) - + + + + + + + @if (\config('announce.connectable_check')) + + @endif + + + + + + + + + - @endif - - - - - - - - - @foreach ($actives as $active) - - - - - - - - - @if (\config('announce.connectable_check')) - + + + + + + + + @if (\config('announce.connectable_check')) + - @endif - @endif - - - - - - - @if ($showMorePrecision) - - - @else - - - @endif - - @endforeach + + + @if ($showMorePrecision) + + + @else + + + @endif + + @endforeach
    - {{ __('torrent.name') }} - @include('livewire.includes._sort-icon', ['field' => 'name']) - - - @include('livewire.includes._sort-icon', ['field' => 'seeders']) - - - @include('livewire.includes._sort-icon', ['field' => 'leechers']) - - - @include('livewire.includes._sort-icon', ['field' => 'times_completed']) - - {{ __('torrent.client') }} - @include('livewire.includes._sort-icon', ['field' => 'agent']) - - {{ __('common.ip') }} - @include('livewire.includes._sort-icon', ['field' => 'ip']) - - {{ __('common.port') }} - @include('livewire.includes._sort-icon', ['field' => 'port']) - - + + {{ __('torrent.name') }} + @include('livewire.includes._sort-icon', ['field' => 'name']) + + + @include('livewire.includes._sort-icon', ['field' => 'seeders']) + + + @include('livewire.includes._sort-icon', ['field' => 'leechers']) + + + @include('livewire.includes._sort-icon', ['field' => 'times_completed']) + + {{ __('torrent.client') }} + @include('livewire.includes._sort-icon', ['field' => 'agent']) + + {{ __('common.ip') }} + @include('livewire.includes._sort-icon', ['field' => 'ip']) + + {{ __('common.port') }} + @include('livewire.includes._sort-icon', ['field' => 'port']) + + + + + @include('livewire.includes._sort-icon', ['field' => 'seeder']) + + {{ __('torrent.size') }} + @include('livewire.includes._sort-icon', ['field' => 'size']) + + {{ __('torrent.uploaded') }} + @include('livewire.includes._sort-icon', ['field' => 'uploaded']) + + {{ __('torrent.downloaded') }} + @include('livewire.includes._sort-icon', ['field' => 'downloaded']) + + {{ __('torrent.left') }} + @include('livewire.includes._sort-icon', ['field' => 'left']) + + {{ __('torrent.progress') }} + @include('livewire.includes._sort-icon', ['field' => 'progress']) + + {{ __('torrent.started') }} + @include('livewire.includes._sort-icon', ['field' => 'created_at']) + + {{ __('torrent.updated') }} + @include('livewire.includes._sort-icon', ['field' => 'updated_at']) - - @include('livewire.includes._sort-icon', ['field' => 'seeder']) - - {{ __('torrent.size') }} - @include('livewire.includes._sort-icon', ['field' => 'size']) - - {{ __('torrent.uploaded') }} - @include('livewire.includes._sort-icon', ['field' => 'uploaded']) - - {{ __('torrent.downloaded') }} - @include('livewire.includes._sort-icon', ['field' => 'downloaded']) - - {{ __('torrent.left') }} - @include('livewire.includes._sort-icon', ['field' => 'left']) - - {{ __('torrent.progress') }} - @include('livewire.includes._sort-icon', ['field' => 'progress']) - - {{ __('torrent.started') }} - @include('livewire.includes._sort-icon', ['field' => 'created_at']) - - {{ __('torrent.updated') }} - @include('livewire.includes._sort-icon', ['field' => 'updated_at']) -
    - - {{ $active->name }} - - - - - {{ $active->seeders }} - - - - - - {{ $active->leechers }} - - - - - - {{ $active->times_completed }} - - - - {{ $active->agent ?: __('common.unknown') }} - - {{ $active->ip ?: __('common.unknown') }} - - {{ $active->port ?: __('common.unknown') }} - - @php - $connectable = null; - if (cache()->has('peers:connectable:'.$active->ip.'-'.$active->port.'-'.$active->agent)) { - $connectable = cache()->get('peers:connectable:'.$active->ip.'-'.$active->port.'-'.$active->agent); - } - @endphp - @if ($connectable === null) - - @else - @if ($connectable) - + @foreach ($actives as $active) +
    + + {{ $active->name }} + + + + + {{ $active->seeders }} + + + + + + {{ $active->leechers }} + + + + + + {{ $active->times_completed }} + + + + {{ $active->agent ?: __('common.unknown') }} + + {{ $active->ip ?: __('common.unknown') }} + + {{ $active->port ?: __('common.unknown') }} + + @php + $connectable = null; + if (cache()->has('peers:connectable:' . $active->ip . '-' . $active->port . '-' . $active->agent)) { + $connectable = cache()->get('peers:connectable:' . $active->ip . '-' . $active->port . '-' . $active->agent); + } + @endphp + + @if ($connectable === null) + @else - + @if ($connectable) + + @else + + @endif @endif - @endif - - @if ($active->active) - @if ($active->seeder) - - @else - - @endif - @else - + - {{ App\Helpers\StringHelper::formatBytes($active->size) }} - - {{ App\Helpers\StringHelper::formatBytes($active->uploaded, 2) }} - - {{ App\Helpers\StringHelper::formatBytes($active->downloaded, 2) }} - - {{ App\Helpers\StringHelper::formatBytes($active->left, 2) }} - - {{ $active->progress < 100 ? \floor($active->progress * 10000) / 100 : INF }}% - - + + + @if ($active->active) + @if ($active->seeder) + + @else + + @endif + @else + + @endif - + + {{ App\Helpers\StringHelper::formatBytes($active->size) }} - + + {{ App\Helpers\StringHelper::formatBytes($active->uploaded, 2) }} - + + {{ App\Helpers\StringHelper::formatBytes($active->downloaded, 2) }}
    + {{ App\Helpers\StringHelper::formatBytes($active->left, 2) }} + + {{ $active->progress < 100 ? \floor($active->progress * 10000) / 100 : INF }}% + + + + + + + + +
    @@ -247,13 +376,17 @@ function ternaryCheckbox() { return { updateTernaryCheckboxProperties(el, state) { - el.indeterminate = (state === 'exclude'); - el.checked = (state === 'include'); + el.indeterminate = state === 'exclude'; + el.checked = state === 'include'; }, getNextTernaryCheckboxState(state) { - return (state === 'include') ? 'exclude' : (state === 'exclude' ? 'any' : 'include'); - } - } + return state === 'include' + ? 'exclude' + : state === 'exclude' + ? 'any' + : 'include'; + }, + }; } -
    \ No newline at end of file +
    diff --git a/resources/views/livewire/user-notes.blade.php b/resources/views/livewire/user-notes.blade.php index c77bf02dc..49040b0ab 100644 --- a/resources/views/livewire/user-notes.blade.php +++ b/resources/views/livewire/user-notes.blade.php @@ -10,9 +10,7 @@ {{ __('common.add') }} -

    - Note user: {{ $user->username }} -

    +

    Note user: {{ $user->username }}

    {{ __('common.save') }} -

    @@ -50,12 +52,12 @@
    - - - - - - + + + + + + @forelse ($notes as $note) @@ -65,7 +67,10 @@ @@ -102,4 +107,4 @@
    {{ __('common.staff') }}{{ __('user.note') }}{{ __('user.created-on') }}{{ __('common.action') }}
    {{ __('common.staff') }}{{ __('user.note') }}{{ __('user.created-on') }}{{ __('common.action') }}
    {{ $note->message }} -
    - \ No newline at end of file + diff --git a/resources/views/livewire/user-resurrections.blade.php b/resources/views/livewire/user-resurrections.blade.php index 78304881c..dffa22d4f 100644 --- a/resources/views/livewire/user-resurrections.blade.php +++ b/resources/views/livewire/user-resurrections.blade.php @@ -1,23 +1,38 @@ -
    +

    {{ __('common.search') }}

    - - + +

    -

    @@ -29,38 +44,70 @@
    - - - - - - - - @@ -72,7 +119,9 @@ @foreach ($resurrections as $resurrection) @@ -80,22 +129,28 @@ {{ App\Helpers\StringHelper::formatBytes($resurrection->torrent->size) }} @endif + - @if(auth()->user()->group->is_modo) + @if (auth()->user()->group->is_modo) @empty - + @endforelse diff --git a/resources/views/livewire/warning-log-search.blade.php b/resources/views/livewire/warning-log-search.blade.php index b1695f1c1..b13f4d8cb 100644 --- a/resources/views/livewire/warning-log-search.blade.php +++ b/resources/views/livewire/warning-log-search.blade.php @@ -9,10 +9,8 @@ class="form__checkbox" type="checkbox" wire:click="toggleProperties('show')" - > - + /> +
    @@ -73,12 +71,7 @@
    - @@ -92,76 +85,84 @@
    + {{ __('torrent.name') }} @include('livewire.includes._sort-icon', ['field' => 'name']) + {{ __('torrent.size') }} @include('livewire.includes._sort-icon', ['field' => 'size']) + {{ __('torrent.seeders') }} @include('livewire.includes._sort-icon', ['field' => 'seeders']) + {{ __('torrent.leechers') }} @include('livewire.includes._sort-icon', ['field' => 'leechers']) + {{ __('torrent.completed') }} @include('livewire.includes._sort-icon', ['field' => 'times_completed']) + {{ __('graveyard.resurrect-date') }} @include('livewire.includes._sort-icon', ['field' => 'created_at']) {{ __('graveyard.current-seedtime') }} + {{ __('graveyard.seedtime-goal') }} @include('livewire.includes._sort-icon', ['field' => 'seedtime']) + {{ __('graveyard.rewarded') }} @include('livewire.includes._sort-icon', ['field' => 'rewarded'])
    - + {{ $resurrection->torrent->name }} - - + + {{ $resurrection->torrent->seeders }} - - + + {{ $resurrection->torrent->leechers }} - - + + {{ $resurrection->torrent->times_completed }} @@ -104,8 +159,13 @@ {{ $resurrection->created_at->diffForHumans() }} - @php $history = App\Models\History::select(['seedtime'])->where('user_id', '=', - $user->id)->where('torrent_id', '=', $resurrection->torrent_id)->first() @endphp + @php + $history = App\Models\History::select(['seedtime']) + ->where('user_id', '=', $user->id) + ->where('torrent_id', '=', $resurrection->torrent_id) + ->first() + @endphp + {{ empty($history) ? '0' : App\Helpers\StringHelper::timeElapsed($history->seedtime) }} @@ -113,9 +173,13 @@ @if ($resurrection->rewarded) - + @else - + @endif @@ -129,17 +193,21 @@ @csrf @method('DELETE') -

    - Warn user: {{ $user->username }} -

    +

    Warn user: {{ $user->username }}

    - +

    -

    @@ -123,6 +130,7 @@ @include('livewire.includes._sort-icon', ['field' => 'torrent_id']) @endif +     		{{ __('common.reason') }} @include('livewire.includes._sort-icon', ['field' => 'reason']) @@ -151,33 +159,46 @@ @if ($warningTab !== 'manual') @isset($warning->torrenttitle) - - {{ $warning->torrenttitle->name }} - + + {{ $warning->torrenttitle->name }} + @else - n/a + n/a @endif {{ $warning->reason }} - - @if ($warning->active) - + @else - + @endif @if ($warningTab === 'deleted') @@ -251,6 +272,7 @@ @endif @endif +
  • @csrf @@ -279,7 +301,11 @@
    • {{ __('user.no-warning') }} + {{ __('user.no-warning') }} +
    - - - - - - - - - + + + + + + + + + - @forelse ($warnings as $warning) - - - - - - - - - - @empty - - - - @endforelse + @forelse ($warnings as $warning) + + + + + + + + + + @empty + + + + @endforelse
    - {{ __('common.user') }} - @include('livewire.includes._sort-icon', ['field' => 'user_id']) - - {{ __('user.warned-by') }} - @include('livewire.includes._sort-icon', ['field' => 'warned_by']) - - {{ __('torrent.torrent') }} - @include('livewire.includes._sort-icon', ['field' => 'torrent']) - {{ __('common.reason') }} - {{ __('common.created_at') }} - @include('livewire.includes._sort-icon', ['field' => 'created_at']) - - {{ __('user.expires-on') }} - @include('livewire.includes._sort-icon', ['field' => 'expires_on']) - - {{ __('common.active') }} - @include('livewire.includes._sort-icon', ['field' => 'active']) -
    + {{ __('common.user') }} + @include('livewire.includes._sort-icon', ['field' => 'user_id']) + + {{ __('user.warned-by') }} + @include('livewire.includes._sort-icon', ['field' => 'warned_by']) + + {{ __('torrent.torrent') }} + @include('livewire.includes._sort-icon', ['field' => 'torrent']) + {{ __('common.reason') }} + {{ __('common.created_at') }} + @include('livewire.includes._sort-icon', ['field' => 'created_at']) + + {{ __('user.expires-on') }} + @include('livewire.includes._sort-icon', ['field' => 'expires_on']) + + {{ __('common.active') }} + @include('livewire.includes._sort-icon', ['field' => 'active']) +
    - - - - - @isset($warning->torrent) - - {{ $warning->torrenttitle->name }} - - @else - n/a - @endisset - {{ $warning->reason }} - - - - - @if ($warning->active) - {{ __('common.yes') }} - @else - {{ __('common.expired') }} - @endif -
    No warnings
    + + + + + @isset($warning->torrent) + + {{ $warning->torrenttitle->name }} + + @else + n/a + @endisset + {{ $warning->reason }} + + + + + @if ($warning->active) + {{ __('common.yes') }} + @else + {{ __('common.expired') }} + @endif +
    No warnings
    {{ $warnings->links('partials.pagination') }} diff --git a/resources/views/livewire/watchlist-search.blade.php b/resources/views/livewire/watchlist-search.blade.php index 19b266ef4..c5ac0e2c2 100644 --- a/resources/views/livewire/watchlist-search.blade.php +++ b/resources/views/livewire/watchlist-search.blade.php @@ -4,12 +4,7 @@

    - @@ -38,75 +33,82 @@

    - - - - - - - - @forelse ($watchedUsers as $watching) - - - - - + + + + + @forelse ($watchedUsers as $watching) + + + + + + - - @empty - - - - @endforelse + @csrf + @method('DELETE') + + + + + + + @empty + + + + @endforelse
    - Watching - @include('livewire.includes._sort-icon', ['field' => 'user_id']) - - Watched By - @include('livewire.includes._sort-icon', ['field' => 'staff_id']) - - Message - @include('livewire.includes._sort-icon', ['field' => 'message']) - - Created At - @include('livewire.includes._sort-icon', ['field' => 'created_at']) - {{ __('common.action') }}
    - - - - {{ $watching->message }} - - - -
  • - - @csrf - @method('DELETE') -
    		• + Watched By + @include('livewire.includes._sort-icon', ['field' => 'staff_id']) + + Message + @include('livewire.includes._sort-icon', ['field' => 'message']) + + Created At + @include('livewire.includes._sort-icon', ['field' => 'created_at']) + {{ __('common.action') }}
    + + + + {{ $watching->message }} + + + +
  • + - Unwatch - - -
    • -     -
    No watched users
    No watched users
    diff --git a/resources/views/mediahub/collection/index.blade.php b/resources/views/mediahub/collection/index.blade.php index f96a319f4..f7029b955 100644 --- a/resources/views/mediahub/collection/index.blade.php +++ b/resources/views/mediahub/collection/index.blade.php @@ -5,7 +5,7 @@ @endsection @section('meta') - + @endsection @section('breadcrumbs') diff --git a/resources/views/mediahub/collection/show.blade.php b/resources/views/mediahub/collection/show.blade.php index 06b59cc2f..2e47ba0f0 100755 --- a/resources/views/mediahub/collection/show.blade.php +++ b/resources/views/mediahub/collection/show.blade.php @@ -5,7 +5,7 @@ @endsection @section('meta') - + @endsection @section('breadcrumbs') @@ -30,8 +30,11 @@
    - +
    @@ -39,8 +42,12 @@ {{ __('mediahub.collections') }}
    -
    +

    @@ -52,52 +59,77 @@

    - - Collection Torrents List + + + Collection Torrents List
    -
    +
    -

    Movies

    +

    + + Movies +

    - - + - + @endforeach + + +
    -
    - @foreach($collection->movie->sortBy('release_date') as $movie) -
    -
    - @php - $torrent_temp = App\Models\Torrent::where('tmdb', '=', $movie->id) - ->whereIn('category_id', function ($query) { - $query->select('id')->from('categories')->where('movie_meta', '=', true); - })->first() - @endphp - -
    - -
    -
    - {{ __('common.year') }}: {{ substr($movie->release_date, 0, 4) }} - {{ __('torrent.rating') }}: {{ $movie->vote_average }} -
    -     +
    +
    + @foreach ($collection->movie->sortBy('release_date') as $movie) +
    +
    + @php + $torrent_temp = App\Models\Torrent::where('tmdb', '=', $movie->id) + ->whereIn('category_id', function ($query) { + $query + ->select('id') + ->from('categories') + ->where('movie_meta', '=', true); + }) + ->first() + @endphp + + +
    + +
    +
    + + + {{ __('common.year') }}: + {{ substr($movie->release_date, 0, 4) }} + + + + {{ __('torrent.rating') }}: + {{ $movie->vote_average }} + +
    +     +
    - - @endforeach -
    -
    @@ -106,7 +138,7 @@
    - +
    @endsection diff --git a/resources/views/mediahub/company/index.blade.php b/resources/views/mediahub/company/index.blade.php index ddbfdcb88..e25cfe952 100644 --- a/resources/views/mediahub/company/index.blade.php +++ b/resources/views/mediahub/company/index.blade.php @@ -5,7 +5,7 @@ @endsection @section('meta') - + @endsection @section('breadcrumbs') diff --git a/resources/views/mediahub/genre/index.blade.php b/resources/views/mediahub/genre/index.blade.php index 3e0a5cc74..0a4a674b7 100644 --- a/resources/views/mediahub/genre/index.blade.php +++ b/resources/views/mediahub/genre/index.blade.php @@ -5,7 +5,7 @@ @endsection @section('meta') - + @endsection @section('breadcrumbs') @@ -24,14 +24,18 @@

    {{ __('common.genres') }}

    @foreach ($genres as $genre) - -
    -

    {{ $genre->name }}

    - -

    - {{ $genre->tv_count }} {{ __('mediahub.shows') }} - | - {{ $genre->movie_count }} {{ __('mediahub.movies') }} + +
    +

    {{ $genre->name }}

    + +

    + + {{ $genre->tv_count }} {{ __('mediahub.shows') }} | + + {{ $genre->movie_count }} {{ __('mediahub.movies') }}

    diff --git a/resources/views/mediahub/index.blade.php b/resources/views/mediahub/index.blade.php index c35d73621..77ec45580 100644 --- a/resources/views/mediahub/index.blade.php +++ b/resources/views/mediahub/index.blade.php @@ -5,7 +5,7 @@ @endsection @section('meta') - + @endsection @section('breadcrumbs') @@ -17,54 +17,61 @@ @section('main')

    {{ __('mediahub.title') }}

    -
    +
    -
    +

    {{ __('mediahub.shows') }} Hub

    - -

    {{ $tv }} {{ __('mediahub.shows') }}

    + +

    {{ $tv }} {{ __('mediahub.shows') }}

     - -
    + +

    {{ __('mediahub.movies') }} Hub

    - -

    {{ $movies }} {{ __('mediahub.movies') }}

    + +

    {{ $movies }} {{ __('mediahub.movies') }}

     -
    +

    {{ __('mediahub.collections') }} Hub

    - -

    {{ $collections }} {{ __('mediahub.collections') }}

    + +

    + {{ $collections }} {{ __('mediahub.collections') }} +

    -
    +

    {{ __('mediahub.persons') }} Hub

    - -

    {{ $persons }} {{ __('mediahub.persons') }}

    + +

    {{ $persons }} {{ __('mediahub.persons') }}

     -
    +

    {{ __('mediahub.genres') }} Hub

    - -

    {{ $genres }} {{ __('mediahub.genres') }}

    + +

    {{ $genres }} {{ __('mediahub.genres') }}

     -
    +

    {{ __('mediahub.networks') }} Hub

    - -

    {{ $networks }} {{ __('mediahub.networks') }}

    + +

    {{ $networks }} {{ __('mediahub.networks') }}

     -
    +

    {{ __('mediahub.companies') }} Hub

    - -

    {{ $companies }} {{ __('mediahub.companies') }}

    + +

    + {{ $companies }} {{ __('mediahub.companies') }} +

    @@ -76,7 +83,7 @@

    Disclaimer

    {{ __('mediahub.disclaimer') }} - +
    @endsection diff --git a/resources/views/mediahub/network/index.blade.php b/resources/views/mediahub/network/index.blade.php index 0a331fa29..4bcaee6ac 100644 --- a/resources/views/mediahub/network/index.blade.php +++ b/resources/views/mediahub/network/index.blade.php @@ -5,7 +5,7 @@ @endsection @section('meta') - + @endsection @section('breadcrumbs') diff --git a/resources/views/mediahub/person/index.blade.php b/resources/views/mediahub/person/index.blade.php index 84bba3dd0..9b65252a2 100644 --- a/resources/views/mediahub/person/index.blade.php +++ b/resources/views/mediahub/person/index.blade.php @@ -5,7 +5,7 @@ @endsection @section('meta') - + @endsection @section('breadcrumbs') diff --git a/resources/views/mediahub/person/show.blade.php b/resources/views/mediahub/person/show.blade.php index ca022085d..9f34c1643 100644 --- a/resources/views/mediahub/person/show.blade.php +++ b/resources/views/mediahub/person/show.blade.php @@ -26,8 +26,8 @@ {{ $person->name }} + style="max-width: 100%" + />
    {{ __('mediahub.born') }}
    {{ $person->birthday ?? __('common.unknown') }}
    diff --git a/resources/views/mediahub/tv/index.blade.php b/resources/views/mediahub/tv/index.blade.php index 5d7df2d82..afcf80461 100644 --- a/resources/views/mediahub/tv/index.blade.php +++ b/resources/views/mediahub/tv/index.blade.php @@ -5,7 +5,7 @@ @endsection @section('meta') - + @endsection @section('breadcrumbs') @@ -14,11 +14,9 @@ {{ __('mediahub.title') }} -
  • - TV Show -
    • +
  • TV Show
    • @endsection @section('content') @livewire('tv-search') -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/mediahub/tv/season/show.blade.php b/resources/views/mediahub/tv/season/show.blade.php index 6134be8df..135878d7f 100755 --- a/resources/views/mediahub/tv/season/show.blade.php +++ b/resources/views/mediahub/tv/season/show.blade.php @@ -5,7 +5,7 @@ @endsection @section('meta') - + @endsection @section('breadcrumbs') @@ -15,9 +15,7 @@
  • - - TV Shows - + TV Shows
  • @@ -33,25 +31,32 @@

    {{ __('mediahub.episodes') }}

    - @foreach($season->episodes as $episode) + @foreach ($season->episodes as $episode)
    -
    +
    - + Episode {{ $episode->episode_number }}
    - +
    -
    +

    {{ $episode->name }} - - @if($episode->air_date) - {{ $episode->air_date }} + @if ($episode->air_date) + + {{ $episode->air_date }} + @endif

    @@ -73,7 +78,7 @@ {{ $show->name }} + />

    {{ $season->overview }}
    diff --git a/resources/views/mediahub/tv/show.blade.php b/resources/views/mediahub/tv/show.blade.php index 912840064..10e224f35 100644 --- a/resources/views/mediahub/tv/show.blade.php +++ b/resources/views/mediahub/tv/show.blade.php @@ -5,7 +5,7 @@ @endsection @section('meta') - + @endsection @section('breadcrumbs') @@ -15,9 +15,7 @@
  • - - TV Shows - + TV Shows
  • {{ $show->name }} @@ -28,29 +26,39 @@

    {{ __('mediahub.seasons') }}

    - @foreach($show->seasons as $season) + @foreach ($show->seasons as $season)
    -
    +
    - - {{ $season->episodes->count() }} Episodes - - - Season {{ $season->season_number }} - + + {{ $season->episodes->count() }} Episodes + + + Season {{ $season->season_number }} +
    -
    +
    - +
    -
    +

    - {{ $season->name }} - @if($season->air_date) - ({{ substr($season->air_date, 0, 4) }}) + + {{ $season->name }} + @if ($season->air_date) + + ({{ substr($season->air_date, 0, 4) }}) + @endif

    @@ -60,38 +68,50 @@
    - - {{ $season->torrents->where('season_number', '=', $season->season_number)->count() }} Torrents Matched + + + + {{ $season->torrents->where('season_number', '=', $season->season_number)->count() }} + Torrents Matched +
    -
    +
    - +
    - - - - - - - + + + + + + + - @foreach($season->torrents->where('season_number', '=', $season->season_number)->sortByDesc('created_at') as $torrent) - - - - - - - - @endforeach + @foreach ($season->torrents->where('season_number', '=', $season->season_number)->sortByDesc('created_at') as $torrent) + + + + + + + + @endforeach
    {{ __('common.name') }}{{ __('torrent.size') }}SLC
    {{ __('common.name') }}{{ __('torrent.size') }}SLC
    - {{ $torrent->name }} - {{ $torrent->getSize() }}{{ $torrent->seeders }}{{ $torrent->leechers }}{{ $torrent->times_completed }}
    + + {{ $torrent->name }} + + {{ $torrent->getSize() }}{{ $torrent->seeders }}{{ $torrent->leechers }}{{ $torrent->times_completed }}
    @@ -111,7 +131,7 @@ {{ $show->name }} + />
    Seasons
    {{ $show->number_of_seasons }}
    @@ -119,16 +139,28 @@
    {{ $show->status }}
    Networks
    - @foreach($show->networks as $network) - {{ $network->name }} - @if (! $loop->last), @endif + @foreach ($show->networks as $network) + + {{ $network->name }} + + @if (! $loop->last) + , + @endif @endforeach
    Companies
    - @foreach($show->companies as $company) - {{ $company->name }} - @if (! $loop->last), @endif + @foreach ($show->companies as $company) + + {{ $company->name }} + + @if (! $loop->last) + , + @endif @endforeach
    Runtime
    @@ -137,9 +169,15 @@
    {{ $show->torrents_count }}
    Genres
    - @foreach($show->genres as $genre) - {{ $genre->name }} - @if (! $loop->last), @endif + @foreach ($show->genres as $genre) + + {{ $genre->name }} + + @if (! $loop->last) + , + @endif @endforeach
    diff --git a/resources/views/missing/index.blade.php b/resources/views/missing/index.blade.php index 5ad903022..078411fd9 100644 --- a/resources/views/missing/index.blade.php +++ b/resources/views/missing/index.blade.php @@ -1,13 +1,11 @@ @extends('layout.default') @section('title') - Missing Media + Missing Media @endsection @section('breadcrumbs') -
  • - Missing Media -
    • +
  • Missing Media
    • @endsection @section('main') diff --git a/resources/views/page/aboutus.blade.php b/resources/views/page/aboutus.blade.php index aef6d185b..4e132642f 100644 --- a/resources/views/page/aboutus.blade.php +++ b/resources/views/page/aboutus.blade.php @@ -5,7 +5,7 @@ @endsection @section('meta') - + @endsection @section('breadcrumbs') @@ -54,7 +54,10 @@

    {{ __('common.contact') }}

    - + {{ __('common.contact') }} {{ config('other.title') }}

    diff --git a/resources/views/page/index.blade.php b/resources/views/page/index.blade.php index bfbd53be1..b6c09028d 100644 --- a/resources/views/page/index.blade.php +++ b/resources/views/page/index.blade.php @@ -1,9 +1,7 @@ @extends('layout.default') @section('breadcrumbs') -
  • - Pages -
    • +
  • Pages
    • @endsection @section('page', 'page__page--index') @@ -21,7 +19,7 @@ - @foreach($pages as $page) + @foreach ($pages as $page) @@ -29,12 +27,18 @@ -

    {{ __('common.account') }}
    @endif +

    {{ __('common.info') }}

    • - This page took {{ number_format(microtime(true) - (defined('LARAVEL_START') ? LARAVEL_START : request()->server('REQUEST_TIME_FLOAT')), 3) }} seconds to render and {{ number_format(memory_get_peak_usage(true) / 1024 / 1024, 2) }} MB of memory + This page took + {{ number_format(microtime(true) - (defined('LARAVEL_START') ? LARAVEL_START : request()->server('REQUEST_TIME_FLOAT')), 3) }} + seconds to render and {{ number_format(memory_get_peak_usage(true) / 1024 / 1024, 2) }} MB + of memory

    diff --git a/resources/views/partials/head.blade.php b/resources/views/partials/head.blade.php index 444a5303d..41e2eb4fb 100644 --- a/resources/views/partials/head.blade.php +++ b/resources/views/partials/head.blade.php @@ -1,71 +1,158 @@ - + @section('title') - {{ config('other.title') }} - {{ config('other.subTitle') }} +{{ config('other.title') }} - {{ config('other.subTitle') }} @show - - - - - + + + + + @yield('meta') - - + + @if (auth()->user()->standalone_css === null) - + + @switch(auth()->user()->style) @case(1) - + + @break @case(2) - - + + + @break @case(3) - - + + + @break @case(4) - - + + + @break @case(5) - - + + + @break @case(6) - - + + + @break @case(7) - - + + + @break @case(8) - - + + + @break @case(9) - - + + + @break @case(10) - + + @break @case(11) - + + @break @endswitch @if (isset(auth()->user()->custom_css)) - + @endif - @else - + @endif @livewireStyles diff --git a/resources/views/partials/pagination.blade.php b/resources/views/partials/pagination.blade.php index 8a53c5c56..f627a8388 100644 --- a/resources/views/partials/pagination.blade.php +++ b/resources/views/partials/pagination.blade.php @@ -1,4 +1,4 @@ -@if($paginator->hasPages()) +@if ($paginator->hasPages())
    @endif + @if ($poll->multiple_choice) @foreach ($poll->options as $option)

    @@ -18,7 +23,7 @@ type="checkbox" name="options[]" value="{{ $option->id }}" - > + /> @@ -34,7 +39,7 @@ name="options[]" value="{{ $option->id }}" required - > + /> diff --git a/resources/views/poll/result.blade.php b/resources/views/poll/result.blade.php index 81e3a2ae8..724c48fe6 100644 --- a/resources/views/poll/result.blade.php +++ b/resources/views/poll/result.blade.php @@ -30,7 +30,8 @@ @foreach ($poll->options as $option)

    - {{ \number_format($total === 0 ? 0 : 100 * $option->votes / $total, 1) }}% - {{ $option->votes }} {{ $option->votes === 1 ? __('poll.vote') : __('poll.votes') }} + {{ \number_format($total === 0 ? 0 : (100 * $option->votes) / $total, 1) }}% + - {{ $option->votes }} + {{ $option->votes === 1 ? __('poll.vote') : __('poll.votes') }}

    @endforeach diff --git a/resources/views/requests/create.blade.php b/resources/views/requests/create.blade.php index a4d8d6823..ab94b10c9 100644 --- a/resources/views/requests/create.blade.php +++ b/resources/views/requests/create.blade.php @@ -38,7 +38,7 @@ required type="text" value="{{ $title ?: old('name') }}" - > + /> @@ -54,7 +54,11 @@ > @foreach ($categories as $id => $category) - @endforeach @@ -64,15 +68,13 @@

    - @foreach ($types as $type) - @endforeach @@ -90,7 +92,10 @@ > @foreach ($resolutions as $resolution) - @endforeach @@ -99,8 +104,14 @@ {{ __('request.resolution') }}

    -
    -

    +

    +

    - + /> +

    -

    +

    - + /> +

    @@ -142,10 +160,15 @@ type="text" x-bind:value="cats[cat].type === 'tv' ? '{{ $tvdb ?: old('tvdb') }}' : '0'" x-bind:required="cats[cat].type === 'tv'" - > - + /> +

    -

    +

    - + /> +

    + /> @@ -190,13 +215,14 @@ type="text" pattern="[0-9]*?[1-9][0-9]{2,}" value="100" - required> + required + />

    - + + />

    diff --git a/resources/views/requests/edit.blade.php b/resources/views/requests/edit.blade.php index 8d48fd8b9..b50ec7d83 100644 --- a/resources/views/requests/edit.blade.php +++ b/resources/views/requests/edit.blade.php @@ -11,7 +11,10 @@

  • - + {{ $torrentRequest->name }}
    • @@ -35,7 +38,11 @@

    {{ __('request.edit-request') }}

    - + @csrf @method('PATCH')

    @@ -46,21 +53,20 @@ required type="text" value="{{ $torrentRequest->name ?: old('name') }}" - > + />

    - @foreach ($categories as $category) - @endforeach @@ -70,15 +76,14 @@

    - @foreach ($types as $type) - @endforeach @@ -96,7 +101,10 @@ > @foreach ($resolutions as $resolution) - @endforeach @@ -117,8 +125,10 @@ required type="text" value="{{ $torrentRequest->tmdb ?: old('tmdb') }}" - > - + /> +

    @@ -132,8 +142,10 @@ required type="text" value="{{ $torrentRequest->imdb ?: old('imdb') }}" - > - + /> +

    @@ -145,9 +157,11 @@ pattern="[0-9]*" placeholder=" " type="text" - value="{{ $torrentRequest->tvdb ?: (old('tvdb') ?? '0') }}" - > - + value="{{ $torrentRequest->tvdb ?: old('tvdb') ?? '0' }}" + /> +

    @@ -159,9 +173,11 @@ pattern="[0-9]*" placeholder=" " type="text" - value="{{ $torrentRequest->mal ?: (old('mal') ?? '0') }}" - > - + value="{{ $torrentRequest->mal ?: old('mal') ?? '0' }}" + /> +

    + value="{{ $torrentRequest->igdb ?: old('igdb') ?? '0' }}" + /> @@ -186,7 +202,7 @@ 'content' => $torrentRequest->description ])

    - + anon) - > + />

    diff --git a/resources/views/requests/partials/claim.blade.php b/resources/views/requests/partials/claim.blade.php index e1b5dcad9..ad081e483 100644 --- a/resources/views/requests/partials/claim.blade.php +++ b/resources/views/requests/partials/claim.blade.php @@ -1,5 +1,8 @@

  • - @@ -9,28 +12,30 @@ $torrentRequest]) }}" + action="{{ route('requests.claims.store', ['torrentRequest' => $torrentRequest]) }}" x-on:click.outside="$refs.dialog.close()" > @csrf

    - + - + /> +

    -

    diff --git a/resources/views/requests/partials/delete.blade.php b/resources/views/requests/partials/delete.blade.php index 91454f670..813d434f3 100644 --- a/resources/views/requests/partials/delete.blade.php +++ b/resources/views/requests/partials/delete.blade.php @@ -1,6 +1,6 @@
  • $torrentRequest]) }}" + action="{{ route('requests.destroy', ['torrentRequest' => $torrentRequest]) }}" method="POST" x-data style="display: contents" @@ -8,17 +8,19 @@ @csrf @method('DELETE') @@ -20,29 +23,31 @@ name="torrent_id" placeholder=" " type="text" - > + />

    - + - + /> +

    -

    diff --git a/resources/views/requests/partials/report.blade.php b/resources/views/requests/partials/report.blade.php index 02f8783f2..aa3e8c238 100644 --- a/resources/views/requests/partials/report.blade.php +++ b/resources/views/requests/partials/report.blade.php @@ -1,19 +1,20 @@
    - -

    - {{ __('request.report') }}: {{ $torrentRequest->name }} -

    +

    {{ __('request.report') }}: {{ $torrentRequest->name }}

    $torrentRequest->id]) }}" + action="{{ route('report_request', ['id' => $torrentRequest->id]) }}" x-on:click.outside="$refs.dialog.close()" > @csrf - +

    + diff --git a/resources/views/ticket/show.blade.php b/resources/views/ticket/show.blade.php index 950a99804..36be6839a 100644 --- a/resources/views/ticket/show.blade.php +++ b/resources/views/ticket/show.blade.php @@ -22,7 +22,7 @@

    {{ $ticket->subject }}

    {{ $ticket->body }}
    • - + @endsection @section('sidebar') @@ -42,19 +42,22 @@
    {{ __('ticket.priority') }}
    @switch($ticket->priority->name) - @case ('Low') + @case('Low') + @break - @case ('Medium') + @case('Medium') + @break - @case ('High') + @case('High') + @break @endswitch {{ $ticket->priority->name }}
    - @if (!empty($ticket->closed_at)) + @if (! empty($ticket->closed_at))
    {{ __('ticket.closed') }}