From c79003de9b906cdf6cac0a99b664722de64f6ecd Mon Sep 17 00:00:00 2001 From: andyksaw Date: Tue, 1 Oct 2024 18:37:30 +0900 Subject: [PATCH 1/3] Update front design --- .../pages/ban-appeal/_layout-form.blade.php | 20 ---- .../front/pages/ban-appeal/index.blade.php | 96 ++++++++++++++++++- .../views/front/pages/donate/donate.blade.php | 14 +-- .../views/front/templates/2-col.blade.php | 19 ---- .../views/front/templates/master.blade.php | 53 ---------- 5 files changed, 101 insertions(+), 101 deletions(-) delete mode 100644 resources/views/front/pages/ban-appeal/_layout-form.blade.php delete mode 100644 resources/views/front/templates/2-col.blade.php delete mode 100644 resources/views/front/templates/master.blade.php diff --git a/resources/views/front/pages/ban-appeal/_layout-form.blade.php b/resources/views/front/pages/ban-appeal/_layout-form.blade.php deleted file mode 100644 index 15fc3adff..000000000 --- a/resources/views/front/pages/ban-appeal/_layout-form.blade.php +++ /dev/null @@ -1,20 +0,0 @@ -@extends('front.templates.2-col') - -@section('title', 'Appeal Ban') -@section('heading', 'Appeal Ban') -@section('description', 'Use the below form to submit a ban appeal') - -@section('col-1') -

- If you have been wrongfully banned, please post your request, and we will investigate the matter. Alternatively, if you are simply seeking a second chance, you may plead your case for consideration. -

-

- Please fill out all fields honestly. -

-
-

WARNING

- Abuse of the ban appeal system will result in your access being revoked. -
-@endsection - - diff --git a/resources/views/front/pages/ban-appeal/index.blade.php b/resources/views/front/pages/ban-appeal/index.blade.php index 777620c9d..404aa35b0 100644 --- a/resources/views/front/pages/ban-appeal/index.blade.php +++ b/resources/views/front/pages/ban-appeal/index.blade.php @@ -1,6 +1,98 @@ -@extends('front.pages.ban-appeal._layout-form') +@extends('front.layouts.root-layout') + +@section('title', 'Appeal Ban') +@section('heading', 'Appeal Ban') +@section('description', 'Use the below form to submit a ban appeal') + +@section('body') + + +
+
+ @if($errors->any()) +
+

Error

+ {{ $errors->first() }} +
+ @endif + +
+
+
+

+ Appeal a Ban +

+

+ If you have been wrongfully banned, please let us know so we can investigate the matter. + Alternatively, if you are seeking a second chance, you may plead your case for consideration. +

+
+
+
+
+ +
+
Step 1 of 2
+ +
+
+ + + + +

Select from list

+ +
+ Auto-fill some of your appeal details by selecting the ban from a list. + If logged-in, you'll be shown your active bans in addition to the main list. +
+ +
+ + + Proceed + + + + +
+ +
+ or +
+ +
+ + + + +

Fill out form

+ +
+ No login required, but all details will need to be filled-in manually +
+ +
+ + + Proceed + + + + +
+
+
+
+ +

+ Please fill out all fields honestly. +

+
+

WARNING

+ Abuse of the ban appeal system will result in your access being revoked. +
-@section('col-2') @auth

Current Bans

diff --git a/resources/views/front/pages/donate/donate.blade.php b/resources/views/front/pages/donate/donate.blade.php index 765776961..21feef898 100644 --- a/resources/views/front/pages/donate/donate.blade.php +++ b/resources/views/front/pages/donate/donate.blade.php @@ -50,10 +50,10 @@
-

+

Donation Tiers

-

+

Choose the amount that suits you.

As a thank you for your support, you'll receive perks based on the amount you donate. @@ -70,7 +70,7 @@

$4 - + for a month

@@ -131,7 +131,7 @@ class="w-full"

$8 - + for a month

@@ -214,7 +214,7 @@ class="w-full"

$15 - + for a month

@@ -300,7 +300,7 @@ class="w-full"
-

+

FAQ

@@ -333,7 +333,7 @@ class="w-full"
-

+

Legal

diff --git a/resources/views/front/templates/2-col.blade.php b/resources/views/front/templates/2-col.blade.php deleted file mode 100644 index 19478860a..000000000 --- a/resources/views/front/templates/2-col.blade.php +++ /dev/null @@ -1,19 +0,0 @@ -@extends('front.templates.master') - -@section('body') -
-
-

@yield('heading')

- -
- @yield('col-1') -
-
- -
- @yield('col-2') -
-
- - @include('front.components.footer') -@endsection diff --git a/resources/views/front/templates/master.blade.php b/resources/views/front/templates/master.blade.php deleted file mode 100644 index 2ae27978b..000000000 --- a/resources/views/front/templates/master.blade.php +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @yield('title', 'Project City Build') - - @vite([ - 'resources/sass/front/front.scss', - 'resources/js/front/front.ts', - ]) - - - - @stack('head') - - - - - -
- @yield('body') -
- -@stack('end') - - - From ddf27c33c108e3d9c77d7032fffbba7d74809e5b Mon Sep 17 00:00:00 2001 From: andyksaw Date: Tue, 1 Oct 2024 19:23:30 +0900 Subject: [PATCH 2/3] Create initial form design --- .../BanAppeal/BanAppealFormController.php | 17 ++ .../front/pages/ban-appeal/form.blade.php | 145 ++++++++++++++++++ .../front/pages/ban-appeal/index.blade.php | 44 +----- routes/web.php | 4 + 4 files changed, 170 insertions(+), 40 deletions(-) create mode 100644 app/Http/Controllers/Front/BanAppeal/BanAppealFormController.php create mode 100644 resources/views/front/pages/ban-appeal/form.blade.php diff --git a/app/Http/Controllers/Front/BanAppeal/BanAppealFormController.php b/app/Http/Controllers/Front/BanAppeal/BanAppealFormController.php new file mode 100644 index 000000000..b2a51cd8f --- /dev/null +++ b/app/Http/Controllers/Front/BanAppeal/BanAppealFormController.php @@ -0,0 +1,17 @@ + + +
+
+ @if($errors->any()) +
+

Error

+ {{ $errors->first() }} +
+ @endif + +
+
+
+

+ Submit Appeal +

+

+ Please fill out all fields honestly and with appropriate detail. Appeals with invalid, false or inadequate details will likely be denied. +

+
+
+
+
+ +
+
+ @csrf + @include('front.components.form-error') + +

Ban Details

+ +
+
+ + + @error('email') + {{ $message }} + @enderror +

+ Can be looked up here. At the very least, provide us your current Minecraft username +

+
+ +
+ + + @error('email') + {{ $message }} + @enderror +

+ If you don't know, a rough estimate is also acceptable +

+
+
+ + + + +

Appeal

+ + + + @error('email') + {{ $message }} + @enderror +

+ Please check this carefully, updates to your appeal will be sent to this email address. +

+ + + + + + + Submit + +
+
+@endsection diff --git a/resources/views/front/pages/ban-appeal/index.blade.php b/resources/views/front/pages/ban-appeal/index.blade.php index 404aa35b0..6117e5e69 100644 --- a/resources/views/front/pages/ban-appeal/index.blade.php +++ b/resources/views/front/pages/ban-appeal/index.blade.php @@ -32,7 +32,7 @@
-
Step 1 of 2
+
Step 1
@@ -40,7 +40,7 @@ -

Select from list

+

Select from list

Auto-fill some of your appeal details by selecting the ban from a list. @@ -66,7 +66,7 @@ -

Fill out form

+

Fill out form

No login required, but all details will need to be filled-in manually @@ -74,7 +74,7 @@
- + Proceed @@ -84,40 +84,4 @@
- -

- Please fill out all fields honestly. -

-
-

WARNING

- Abuse of the ban appeal system will result in your access being revoked. -
- - @auth -
-

Current Bans

-
- @each('front.pages.ban-appeal._game-ban-listing', $bans, 'ban', 'front.pages.ban-appeal._game-ban-empty') -
-
-
-

Look up Account

-

If the ban doesn't appear above, try searching manually. Enter your current Minecraft - username.

- - @include('front.pages.ban-appeal._username-lookup') -
- @else -
-

Sign in to Appeal

-

To appeal a ban, sign in to your PCB account. Alternatively, you may appeal as a guest.

- Sign In -
-
-

Appeal as a Guest

-

To start your appeal, enter the current username of your Minecraft account

- - @include('front.pages.ban-appeal._username-lookup') -
- @endauth @endsection diff --git a/routes/web.php b/routes/web.php index 54a89486e..efbd0b8da 100644 --- a/routes/web.php +++ b/routes/web.php @@ -23,6 +23,7 @@ use App\Http\Controllers\Front\Auth\ReauthController; use App\Http\Controllers\Front\Auth\RegisterController; use App\Http\Controllers\Front\BanAppeal\BanAppealController; +use App\Http\Controllers\Front\BanAppeal\BanAppealFormController; use App\Http\Controllers\Front\BanAppeal\BanLookupController; use App\Http\Controllers\Front\BanlistController; use App\Http\Controllers\Front\BuilderRankApplicationController; @@ -69,6 +70,9 @@ Route::get('/', [BanAppealController::class, 'index']) ->name('front.appeal'); + Route::get('form', [BanAppealFormController::class, 'index']) + ->name('front.appeal.form'); + Route::redirect('auth', '/appeal') ->name('front.appeal.auth') ->middleware('auth'); From 243f70039b8355858361915f7776d869504126a3 Mon Sep 17 00:00:00 2001 From: andyksaw Date: Wed, 2 Oct 2024 18:00:14 +0900 Subject: [PATCH 3/3] Clean up --- .../BanAppeal/BanAppealSearchController.php | 14 ++ .../pages/ban-appeal/_ban-history.blade.php | 33 ----- .../ban-appeal/_game-ban-empty.blade.php | 4 - .../ban-appeal/_game-ban-listing.blade.php | 65 ---------- .../ban-appeal/_username-lookup.blade.php | 21 --- .../front/pages/ban-appeal/create.blade.php | 60 --------- .../pages/ban-appeal/error-no-bans.blade.php | 10 -- .../pages/ban-appeal/error-pending.blade.php | 15 --- .../front/pages/ban-appeal/form.blade.php | 8 +- .../front/pages/ban-appeal/index.blade.php | 6 +- .../front/pages/ban-appeal/search.blade.php | 120 ++++++++++++++++++ routes/web.php | 4 + 12 files changed, 145 insertions(+), 215 deletions(-) create mode 100644 app/Http/Controllers/Front/BanAppeal/BanAppealSearchController.php delete mode 100644 resources/views/front/pages/ban-appeal/_ban-history.blade.php delete mode 100644 resources/views/front/pages/ban-appeal/_game-ban-empty.blade.php delete mode 100644 resources/views/front/pages/ban-appeal/_game-ban-listing.blade.php delete mode 100644 resources/views/front/pages/ban-appeal/_username-lookup.blade.php delete mode 100644 resources/views/front/pages/ban-appeal/create.blade.php delete mode 100644 resources/views/front/pages/ban-appeal/error-no-bans.blade.php delete mode 100644 resources/views/front/pages/ban-appeal/error-pending.blade.php create mode 100644 resources/views/front/pages/ban-appeal/search.blade.php diff --git a/app/Http/Controllers/Front/BanAppeal/BanAppealSearchController.php b/app/Http/Controllers/Front/BanAppeal/BanAppealSearchController.php new file mode 100644 index 000000000..73050ad33 --- /dev/null +++ b/app/Http/Controllers/Front/BanAppeal/BanAppealSearchController.php @@ -0,0 +1,14 @@ + - - - Status - Reason - Banned By - Banned At - Expires - - - - @foreach($banHistory as $ban) - - {{ $ban->isActive() ? 'Active' : 'Removed' }} - {{ $ban->reason ?? 'No Reason Given' }} - - @if($ban->banner_player_id != null && count($ban->bannerPlayer->aliases) > 0) - - {{ $ban->bannerPlayer->getBanReadableName() }} - @else - - - @endif - - - {{ $ban->created_at->format('j M Y H:i') }} - - - {{ $ban->expires_at?->format('j M Y H:i') ?? 'Never' }} - - - @endforeach - - diff --git a/resources/views/front/pages/ban-appeal/_game-ban-empty.blade.php b/resources/views/front/pages/ban-appeal/_game-ban-empty.blade.php deleted file mode 100644 index cef6ea993..000000000 --- a/resources/views/front/pages/ban-appeal/_game-ban-empty.blade.php +++ /dev/null @@ -1,4 +0,0 @@ -
- -
No Bans Found.
-
diff --git a/resources/views/front/pages/ban-appeal/_game-ban-listing.blade.php b/resources/views/front/pages/ban-appeal/_game-ban-listing.blade.php deleted file mode 100644 index 99e2fcc74..000000000 --- a/resources/views/front/pages/ban-appeal/_game-ban-listing.blade.php +++ /dev/null @@ -1,65 +0,0 @@ -
-
-
- -
-
-
- {{ $ban->bannedPlayer->getBanReadableName() ?? 'No Alias' }} - · Banned {{ $ban->created_at }} BY - {{ $ban->bannerPlayer?->getBanReadableName() ?? 'No Alias' }} -
-
- "{{ $ban->reason }}" -
- @if($ban->banAppeals->isEmpty() && !$ban->isActive()) -
- Unbanned -
- @endif -
-
- @if($ban->banAppeals->isNotEmpty()) - - @endif - @if($ban->isActive() && !$ban->banAppeals()->pending()->exists()) -
- - Appeal - @if($ban->banAppeals->isNotEmpty()) - Again - @endif - -
- @endif -
diff --git a/resources/views/front/pages/ban-appeal/_username-lookup.blade.php b/resources/views/front/pages/ban-appeal/_username-lookup.blade.php deleted file mode 100644 index dff949e0e..000000000 --- a/resources/views/front/pages/ban-appeal/_username-lookup.blade.php +++ /dev/null @@ -1,21 +0,0 @@ -
- @csrf - @include('front.components.form-error') - -
- - -
- - -
diff --git a/resources/views/front/pages/ban-appeal/create.blade.php b/resources/views/front/pages/ban-appeal/create.blade.php deleted file mode 100644 index 2adaab7a3..000000000 --- a/resources/views/front/pages/ban-appeal/create.blade.php +++ /dev/null @@ -1,60 +0,0 @@ -@extends('front.pages.ban-appeal._layout-form') - -@section('col-2') -
-

Appeals Process

-
    -
  1. Submit an Application using the below form
    2. -
  2. Applications are reviewed by the staff member that banned you
    3. -
  3. You may be unbanned, your ban converted to a temporary ban, or unbanned
    4. -
- - Before you appeal, please read the ban details below. Appeals which do not relate to the ban reason are - likely to be denied. -
-
-

Ban History

-

Below is a list of your current ban and any previous bans.

- @include('front.pages.ban-appeal._ban-history') -
-
-

Appeal Form

- -
- @csrf - @include('front.components.form-error') - @unless($accountVerified) -
- - -

Please check this carefully, updates to your appeal will be sent - to this address.

-
- @endunless -
- - -
- - - Submit - - -
-@endsection diff --git a/resources/views/front/pages/ban-appeal/error-no-bans.blade.php b/resources/views/front/pages/ban-appeal/error-no-bans.blade.php deleted file mode 100644 index 0c5d2394d..000000000 --- a/resources/views/front/pages/ban-appeal/error-no-bans.blade.php +++ /dev/null @@ -1,10 +0,0 @@ -@extends('front.pages.ban-appeal._layout-form') - -@section('col-2') -
-
-

Account not banned

- The user {{ $player->getBanReadableName() }} is not currently banned. -
-
-@endsection diff --git a/resources/views/front/pages/ban-appeal/error-pending.blade.php b/resources/views/front/pages/ban-appeal/error-pending.blade.php deleted file mode 100644 index f5c7983bb..000000000 --- a/resources/views/front/pages/ban-appeal/error-pending.blade.php +++ /dev/null @@ -1,15 +0,0 @@ -@extends('front.pages.ban-appeal._layout-form') - -@section('col-2') -
-
-

Appeal Already Created

- @if($existingAppeal->is_account_verified) - You already have an appeal in progress. - @else - You already have an appeal in progress. Click the link in the appeal confirmation email to check - progress. - @endif -
-
-@endsection diff --git a/resources/views/front/pages/ban-appeal/form.blade.php b/resources/views/front/pages/ban-appeal/form.blade.php index c1412b6fa..db92b9165 100644 --- a/resources/views/front/pages/ban-appeal/form.blade.php +++ b/resources/views/front/pages/ban-appeal/form.blade.php @@ -20,10 +20,10 @@

- Submit Appeal + Submit Your Appeal

- Please fill out all fields honestly and with appropriate detail. Appeals with invalid, false or inadequate details will likely be denied. + Please fill-in all fields with appropriate detail. Appeals with false or insufficient detail will likely be denied.

@@ -57,7 +57,7 @@ class=" {{ $message }} @enderror

- Can be looked up here. At the very least, provide us your current Minecraft username + Can be looked up here

@@ -80,7 +80,7 @@ class=" {{ $message }} @enderror

- If you don't know, a rough estimate is also acceptable + If unknown, a rough estimate is also acceptable

diff --git a/resources/views/front/pages/ban-appeal/index.blade.php b/resources/views/front/pages/ban-appeal/index.blade.php index 6117e5e69..666bca762 100644 --- a/resources/views/front/pages/ban-appeal/index.blade.php +++ b/resources/views/front/pages/ban-appeal/index.blade.php @@ -49,7 +49,7 @@
- + Proceed @@ -66,10 +66,10 @@ -

Fill out form

+

Fill out the form

- No login required, but all details will need to be filled-in manually + No login required, but all details will need to be filled-in manually.
diff --git a/resources/views/front/pages/ban-appeal/search.blade.php b/resources/views/front/pages/ban-appeal/search.blade.php new file mode 100644 index 000000000..a38d34448 --- /dev/null +++ b/resources/views/front/pages/ban-appeal/search.blade.php @@ -0,0 +1,120 @@ +@extends('front.layouts.root-layout') + +@section('title', 'Appeal Ban') +@section('heading', 'Appeal Ban') +@section('description', 'Use the below form to submit a ban appeal') + +@section('body') + + +
+
+ @if($errors->any()) +
+

Error

+ {{ $errors->first() }} +
+ @endif + +
+
+
+

+ Select the Ban +

+

+ Please search for the ban you wish to appeal. +

+
+
+
+
+ +
+

Your Active Bans (1 record)

+ +{{--
--}} +{{-- None of the Minecraft accounts linked to your account have an active ban.
Please search the below list or fill out the form manually--}} +{{--
--}} + +
+
+
+ 21st of January, 2024 - 19:38 UTC +
+
+ +
+
+ + Notch + (UUID: 069a79f4-44e9-4726-a5be-fca90e38aaf5) +
+ +
+ +
+
+
Expires
+
Never
+
+
+
Banned by
+
Console
+
+
+
Reason for Ban
+
Some ban reason goes here eventually
+
+
+
+ +
+ + Select + + + + +
+
+
+ +
+ + + + + + + + + + +{{-- @foreach($bans as $ban)--}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- @endforeach--}} + +
Player NameReasonBan DateAction
--}} +{{-- --}} +{{-- {{ $ban->banned_alias_at_time }}--}} +{{-- --}} +{{-- {{ $ban->reason ?? "-" }}--}} +{{-- --}} +{{-- {{ $ban->created_at->format('j M Y H:i') }}--}} +{{-- --}} +{{-- --}} +{{-- View Details--}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{--
+
+
+@endsection diff --git a/routes/web.php b/routes/web.php index efbd0b8da..c601ff820 100644 --- a/routes/web.php +++ b/routes/web.php @@ -24,6 +24,7 @@ use App\Http\Controllers\Front\Auth\RegisterController; use App\Http\Controllers\Front\BanAppeal\BanAppealController; use App\Http\Controllers\Front\BanAppeal\BanAppealFormController; +use App\Http\Controllers\Front\BanAppeal\BanAppealSearchController; use App\Http\Controllers\Front\BanAppeal\BanLookupController; use App\Http\Controllers\Front\BanlistController; use App\Http\Controllers\Front\BuilderRankApplicationController; @@ -70,6 +71,9 @@ Route::get('/', [BanAppealController::class, 'index']) ->name('front.appeal'); + Route::get('search', [BanAppealSearchController::class, 'index']) + ->name('front.appeal.search'); + Route::get('form', [BanAppealFormController::class, 'index']) ->name('front.appeal.form');