diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index ab925ee2..8b0faa02 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -104,7 +104,10 @@ class AdminController extends Controller $form->textarea('custom_js', 'JavaScript')->rows(6); })->addMessage()->handle(); - return view('admin.customize', ['forms' => compact('homepage', 'customJsCss')]); + return view('admin.customize', [ + 'forms' => compact('homepage', 'customJsCss'), + 'extra' => ['currentSkin' => option('color_scheme')] + ]); } public function score() diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index 4abf66a2..fe75e91e 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -83,7 +83,7 @@ class AuthController extends Controller public function register() { if (option('user_can_register')) { - return view('auth.register'); + return view('auth.register', ['extra' => ['player' => option('register_with_player_name')]]); } else { throw new PrettyPageException(trans('auth.register.close'), 7); } diff --git a/app/Http/Controllers/ClosetController.php b/app/Http/Controllers/ClosetController.php index 1481c6b4..ec6c91d2 100644 --- a/app/Http/Controllers/ClosetController.php +++ b/app/Http/Controllers/ClosetController.php @@ -13,7 +13,9 @@ class ClosetController extends Controller { public function index() { - return view('user.closet')->with('user', Auth::user()); + return view('user.closet') + ->with('user', Auth::user()) + ->with('extra', ['unverified' => option('require_verification') && ! $user->verified]); } public function getClosetData(Request $request) diff --git a/app/Http/Controllers/PlayerController.php b/app/Http/Controllers/PlayerController.php index 43d162da..71b2c637 100644 --- a/app/Http/Controllers/PlayerController.php +++ b/app/Http/Controllers/PlayerController.php @@ -56,7 +56,14 @@ class PlayerController extends Controller return view('user.player') ->with('players', $user->players->toArray()) - ->with('user', $user); + ->with('user', $user) + ->with('extra', [ + 'rule' => trans('user.player.player-name-rule.'.option('player_name_rule')), + 'length' => trans( + 'user.player.player-name-length', + ['min' => option('player_name_length_min'), 'max' => option('player_name_length_max')] + ) + ]); } public function listAll() diff --git a/app/Http/Controllers/SkinlibController.php b/app/Http/Controllers/SkinlibController.php index 2e4bafa4..503c189f 100644 --- a/app/Http/Controllers/SkinlibController.php +++ b/app/Http/Controllers/SkinlibController.php @@ -151,7 +151,14 @@ class SkinlibController extends Controller return view('skinlib.show') ->with('texture', $texture) ->with('with_out_filter', true) - ->with('user', $user); + ->with('user', $user) + ->with('extra', [ + 'download' => option('allow_downloading_texture'), + 'currentUid' => $user ? $user->uid : 0, + 'admin' => $user && $user->isAdmin(), + 'inCloset' => $user && $user->closet()->where('tid', $texture->tid)->count() > 0, + 'nickname' => ($up = User::find($texture->uploader)) ? $up->nickname : null + ]); } public function info($tid) @@ -167,6 +174,18 @@ class SkinlibController extends Controller { return view('skinlib.upload') ->with('user', Auth::user()) + ->with('extra', [ + 'rule' => ($regexp = option('texture_name_regexp')) + ? trans('skinlib.upload.name-rule-regexp', compact('regexp')) + : trans('skinlib.upload.name-rule'), + 'privacyNotice' => trans( + 'skinlib.upload.private-score-notice', + ['score' => option('private_score_per_storage')] + ), + 'scorePublic' => intval(option('score_per_storage')), + 'scorePrivate' => intval(option('private_score_per_storage')), + 'award' => intval(option('score_award_per_texture')), + ]) ->with('with_out_filter', true); } diff --git a/app/Http/Controllers/UpdateController.php b/app/Http/Controllers/UpdateController.php index 5094015d..b22f6f1f 100644 --- a/app/Http/Controllers/UpdateController.php +++ b/app/Http/Controllers/UpdateController.php @@ -115,7 +115,8 @@ class UpdateController extends Controller $connectivity = $e->getMessage(); } - return view('admin.update', compact('info', 'connectivity')); + $extra = ['canUpdate' => $info['new_version_available']]; + return view('admin.update', compact('info', 'connectivity', 'extra')); } public function checkUpdates() diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 93d48911..81d50059 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -38,6 +38,7 @@ class UserController extends Controller 'storage' => $this->calculatePercentageUsed($user->getStorageUsed(), option('score_per_storage')), ], 'announcement' => app('parsedown')->text(option_localized('announcement')), + 'extra' => ['unverified' => option('require_verification') && ! $user->verified], ]); } @@ -157,7 +158,13 @@ class UserController extends Controller public function profile() { - return view('user.profile')->with('user', Auth::user()); + $user = Auth::user(); + return view('user.profile') + ->with('user', $user) + ->with('extra', [ + 'unverified' => option('require_verification') && ! $user->verified, + 'admin' => $user->isAdmin(), + ]); } public function handleProfile(Request $request) diff --git a/resources/assets/src/views/skinlib/Upload.vue b/resources/assets/src/views/skinlib/Upload.vue index 9ab56f20..24eb64d2 100644 --- a/resources/assets/src/views/skinlib/Upload.vue +++ b/resources/assets/src/views/skinlib/Upload.vue @@ -133,7 +133,7 @@ export default { privacyNotice: blessing.extra.privacyNotice, scorePublic: blessing.extra.scorePublic, scorePrivate: blessing.extra.scorePrivate, - award: +blessing.extra.award, + award: blessing.extra.award, width2d: 64, } }, diff --git a/resources/views/admin/customize.blade.php b/resources/views/admin/customize.blade.php index 42a1c7d6..e9937b54 100644 --- a/resources/views/admin/customize.blade.php +++ b/resources/views/admin/customize.blade.php @@ -37,9 +37,7 @@ @endsection diff --git a/resources/views/admin/update.blade.php b/resources/views/admin/update.blade.php index be1694a6..0eb12036 100644 --- a/resources/views/admin/update.blade.php +++ b/resources/views/admin/update.blade.php @@ -133,9 +133,7 @@ @endsection diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index eb989679..76511fd4 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -27,7 +27,7 @@ diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index 205805b3..11953560 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -20,9 +20,7 @@ diff --git a/resources/views/skinlib/show.blade.php b/resources/views/skinlib/show.blade.php index dc2e44b6..f3bf4411 100644 --- a/resources/views/skinlib/show.blade.php +++ b/resources/views/skinlib/show.blade.php @@ -47,13 +47,7 @@ diff --git a/resources/views/skinlib/upload.blade.php b/resources/views/skinlib/upload.blade.php index 3c076bd3..c43510a4 100644 --- a/resources/views/skinlib/upload.blade.php +++ b/resources/views/skinlib/upload.blade.php @@ -19,12 +19,6 @@ @endsection diff --git a/resources/views/user/closet.blade.php b/resources/views/user/closet.blade.php index 3354c871..7f2f48a8 100644 --- a/resources/views/user/closet.blade.php +++ b/resources/views/user/closet.blade.php @@ -22,10 +22,8 @@ @endsection diff --git a/resources/views/user/index.blade.php b/resources/views/user/index.blade.php index f1de50a6..dd1c5d3b 100644 --- a/resources/views/user/index.blade.php +++ b/resources/views/user/index.blade.php @@ -74,10 +74,8 @@ @endsection diff --git a/resources/views/user/player.blade.php b/resources/views/user/player.blade.php index 3ad68a06..c03a37d1 100644 --- a/resources/views/user/player.blade.php +++ b/resources/views/user/player.blade.php @@ -18,10 +18,7 @@ @endsection diff --git a/resources/views/user/profile.blade.php b/resources/views/user/profile.blade.php index a2623ad3..600ed153 100644 --- a/resources/views/user/profile.blade.php +++ b/resources/views/user/profile.blade.php @@ -18,12 +18,9 @@ @endsection