From 8aebeecf1375c8455aea399cfa1844a48e32a44f Mon Sep 17 00:00:00 2001 From: Conkley Date: Thu, 30 Jun 2022 15:46:00 +1000 Subject: [PATCH] user list in admin panel + bug fixes --- app/Http/Controllers/AdminController.php | 15 ++ resources/views/admin/index.blade.php | 175 +---------------------- resources/views/admin/users.blade.php | 66 +++++++++ resources/views/home.blade.php | 24 ++-- resources/views/layouts/admin.blade.php | 43 ++++++ resources/views/layouts/app.blade.php | 18 +-- routes/web.php | 1 + 7 files changed, 152 insertions(+), 190 deletions(-) create mode 100644 resources/views/admin/users.blade.php create mode 100644 resources/views/layouts/admin.blade.php diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index e2f23a2..dcd96b6 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -3,6 +3,8 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; +use Illuminate\Support\Facades\DB; +use App\Models\User; class AdminController extends Controller { @@ -11,6 +13,19 @@ class AdminController extends Controller return view('admin.index'); } + public function users(Request $request) + { + if ($request->searchBy == 'name' && $request->has('q')) { + $users = DB::table('users')->where('name', 'LIKE', '%'.$request->q.'%')->paginate(10); + } else if ($request->searchBy == 'id' && $request->has('q')) { + $users = DB::table('users')->where('id', $request->q)->paginate(10); + } else { + $users = User::paginate(10); + } + + return view('admin.users')->with('users', $users); + } + public function keys() { return view('admin.keys'); diff --git a/resources/views/admin/index.blade.php b/resources/views/admin/index.blade.php index 9065f89..661fc82 100644 --- a/resources/views/admin/index.blade.php +++ b/resources/views/admin/index.blade.php @@ -1,174 +1,11 @@ -@extends('layouts.app') +@extends('layouts.admin') @section('title') - Admin - {{ env('APP_NAME') }} + Admin | Dashboard - {{ env('APP_NAME') }} @endsection @section('content') -
- -

Admin Panel

-

Logged in as: ballsgamer123

-
- User List -
- Game List -
- Invite Tree -
- Asset Approval Queue -
- Reports -
- Moderation Logs -
- Game Servers -
-
-
-

User List

-

-
-
-
- Profile Image -
-
-

USERNAME: MORBLOX

-

EMAIL: test@example.com

-

ID: 1

-

DOB: 1/1/01

-

STATUS: Normal

-

INVITED BY: SYSTEM (ID: 0)

- - - - - -
-
-
-
-
-

Game List

-

-
-
-
- Game Image -
-
-

Game Name: MORBLOX's Place

-

Game Description: This is your first MORBLOX Place. Open it with MORBLOX Studio to start building!

-

Creator: MORBLOX

-

GAMEID: 1

- - - - -
-
-
-
-
-

Invite Tree

-

-
-

---------------------------

-

SYSTEM (ID: 0)

-

- MORBLOX (ID: 1)

-

- Conkley (ID: 2)

-

- Thomas (ID: 3)

-

- - the night guard from five nights at freddy (ID: ??)

-

- Mura (ID: 4)

-

- Pipedream (ID: 5)

-

---------------------------

-
-
-
-

Asset Approval Queue

-

-
-
-
- Asset Image -
-
-

Asset Name: PLACEHOLDER

-

Asset Description: PLACEHOLDER IMAGE

-

Asset Type: Decal

-

Asset Creator: MORBLOX (ID: 1)

- - - - -
-
-
-
-
-

Reports

-

-
-
-
- Asset Image -
-
-

Reporting: Game

-

Report Sender: MORBLOX (USERID: 1)

-

Game: MORBLOX's Place (GAMEID: 1)

-

Game Creator: MORBLOX (USERID: 1)

-

Reason: Racial/Homophobic Slurs

-

Comments: Has the N Word in it.

- - - - -
-
-
-
- Asset Image -
-
-

Reporting: Player

-

Report Sender: MORBLOX (USERID: 1)

-

Player: Thomas (USERID: 3)

-

Inviter: SYSTEM (USERID: 0)

-

Reason: Harrassment

-

Comments: Said "It's Morbin Time"

- - - - -
-
-
-
-

Moderation Logs

-

-
-
-
-

Moderator: Thomas (ID: 3)

-

Player: skeuomorphism hater (ID: ??)

-

Inviter: skeuomorphism lover (ID: ??)

-

Punishment: Termination, Disabling invites for Inviter

-

Reason: Being mean :(

- - - - -
-
-
-
-
-

Game Servers

-

-
-

There are no running game servers!

-
-
-
+

{{ env('APP_NAME') }}

+
Administration Area

+

{{ App\Models\User::count() }} users registered, {{ App\Models\User::where('admin', true)->count() }} total admins, {{ App\Models\User::where('last_seen', '>', Carbon\Carbon::now()->subDay()->toDateTimeString())->count(); }} users online in the past 24 hours.


+

{{ App\Models\InviteKey::count() }} invite keys exist, {{ App\Models\InviteKey::where('active', true)->count() }} keys haven't been used yet.

@endsection diff --git a/resources/views/admin/users.blade.php b/resources/views/admin/users.blade.php new file mode 100644 index 0000000..e6d083c --- /dev/null +++ b/resources/views/admin/users.blade.php @@ -0,0 +1,66 @@ +@extends('layouts.admin') +@section('title') + + Admin | User List - {{ env('APP_NAME') }} + +@endsection + +@section('content') +
+

User List

+ @if (request()->query('q')) + Clear Search + @endif + +
+
+
+ @foreach ($users as $user) +
+
+
+ Profile Image +
+
+

Username: {{ $user->name }}

+ @if ($user->admin) +

E-Mail: Admin E-Mail Hidden

+ @else +

E-Mail: {{ $user->email }}

+ @endif +

ID: {{ $user->id }}

+

DOB: {{ Carbon\Carbon::parse($user->dob)->format('d/m/Y') }}

+

Rank: + @if ($user->admin) + Admin + @else + Member + @endif +

+

Status: Normal

+

Invited By: {{ App\Models\User::where('id', $user->invited_by)->first()->name }} + (ID: {{ App\Models\User::where('id', $user->invited_by)->first()->id }}) +

+ +
+
+
+ @endforeach + @if ($users->isEmpty()) +
No user was found, check if you entered the correct details.
+ @endif +
+ {{ $users->appends($_GET)->links() }} +@endsection diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 0668fdb..b63cfe8 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -16,44 +16,44 @@
- Profile ImageProfile Image
- skeuomorphism hater + skeuomorphism hater

"noooooo"

June 21, 2022 04:42 AM

- Profile ImageProfile Image
- Thomas + Thomas

"grrr im banning you"

June 21, 2022 04:29 AM

- Profile ImageProfile Image
- skeuomorphism hater + skeuomorphism hater

"i dont"

June 21, 2022 04:28 AM

- Profile ImageProfile Image
- Thomas + Thomas

"Who likes my epic new CSS buttons? They're way more interesting than the default buttons."

June 21, 2022 04:27 AM

@@ -61,22 +61,22 @@
- Profile ImageProfile Image
- the night guard from five nights at freddy + the night guard from five nights at freddy

"OH LAWD ITS 3 AM! FREDDY FAZBER IS AT MY DOOR PLEASE HELP!!!!"

June 21, 2022 03:19 AM

- Profile ImageProfile Image
- Thomas + Thomas

"Why am I staying up so late making this."

June 21, 2022 12:30 AM

diff --git a/resources/views/layouts/admin.blade.php b/resources/views/layouts/admin.blade.php new file mode 100644 index 0000000..3ee663a --- /dev/null +++ b/resources/views/layouts/admin.blade.php @@ -0,0 +1,43 @@ + + + + + @yield('title') + + + + + + + + + + + + + + + + + + + @yield('alert') + +
+ +

Admin Panel

+

Logged in as: {{ Auth::user()->name }}

+
+ User List +
+ Invite Tree +

+ ← Return to Main Site +
+
+ @yield('content') +
+ + + diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index fbb6a18..dee3687 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -16,8 +16,8 @@ - - + + @@ -27,10 +27,10 @@
- Games - Catalog - Build - Forum + Games + Catalog + Build + Forum
- Friends - Avatar - Transactions + Friends + Avatar + Transactions Users @if (!Auth::guest() && Auth::user()->isAdmin()) Admin diff --git a/routes/web.php b/routes/web.php index de7d910..a0dcee7 100644 --- a/routes/web.php +++ b/routes/web.php @@ -35,5 +35,6 @@ Route::middleware(['auth'])->group(function () { // Admin only Route::group(['middleware' => 'AdminCheck'], function() { Route::get('/iphone/dashboard', [App\Http\Controllers\AdminController::class, 'index'])->name('admin_index'); + Route::get('/iphone/users', [App\Http\Controllers\AdminController::class, 'users'])->name('admin_users'); Route::get('/iphone/keys', [App\Http\Controllers\AdminController::class, 'keys'])->name('admin_keys'); }); \ No newline at end of file