Skip to content

feat: administration page #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 27 commits into from
Jul 13, 2022
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
fbdb574
feat: administration page
djaiss May 19, 2022
582b3fe
feat: sfja
djaiss May 21, 2022
2558bb2
Apply fixes from StyleCI
StyleCIBot May 21, 2022
7f23dbf
Update UserFactory.php
djaiss May 21, 2022
db79e46
Merge branch '2022-05-19-instance-administration-ui' of github.com:mo…
djaiss May 21, 2022
90fe383
Merge branch 'main' into 2022-05-19-instance-administration-ui
djaiss May 24, 2022
4b7c042
merge main
djaiss May 24, 2022
3015292
Update app/Http/Controllers/AdministrationController.php
djaiss May 30, 2022
2dae32b
Merge branch 'main' into 2022-05-19-instance-administration-ui
djaiss Jun 7, 2022
87bc9af
wip
djaiss Jun 7, 2022
5ab7cb8
Apply fixes from StyleCI
StyleCIBot Jun 7, 2022
f3fed51
Merge branch 'main' into 2022-05-19-instance-administration-ui
djaiss Jun 14, 2022
324d8d6
Merge branch 'main' into 2022-05-19-instance-administration-ui
asbiin Jul 10, 2022
2ddc2df
Merge branch 'main' into 2022-05-19-instance-administration-ui
djaiss Jul 10, 2022
a1b5e45
Update .gitignore
djaiss Jul 10, 2022
4222b80
Apply fixes from StyleCI
StyleCIBot Jul 10, 2022
d84ba55
update
asbiin Jul 10, 2022
035a227
Merge branch '2022-05-19-instance-administration-ui' of github.com:mo…
asbiin Jul 10, 2022
e469d3f
Apply fixes from StyleCI
StyleCIBot Jul 10, 2022
b3aa8ed
Merge remote-tracking branch 'origin/main' into 2022-05-19-instance-a…
asbiin Jul 10, 2022
bf436b3
Merge branch 'main' into 2022-05-19-instance-administration-ui
asbiin Jul 11, 2022
90048ec
add data
asbiin Jul 11, 2022
eb0e2d5
Apply fixes from StyleCI
StyleCIBot Jul 11, 2022
880892e
fixes
asbiin Jul 11, 2022
1a1338a
Merge branch '2022-05-19-instance-administration-ui' of github.com:mo…
asbiin Jul 11, 2022
35528e0
improvement
asbiin Jul 13, 2022
bfd8fc5
add caption
asbiin Jul 13, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions app/Http/Controllers/AdministrationController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?php

namespace App\Http\Controllers;

use App\Models\User;
use Illuminate\Http\Request;
use Inertia\Inertia;

class AdministrationController extends Controller
{
public function index(Request $request)
{
$usersCollection = User::get()->map(function (User $user): array {
return [
'id' => $user->id,
'first_name' => $user->first_name,
'last_name' => $user->last_name,
'email' => $user->email,
'url' => [
'show' => route('administration.user.show', [
'user' => $user->id,
]),
],
];
});

return Inertia::render('Administration/Index', [
'data' => [
'users' => $usersCollection,
],
]);
}

public function show(Request $request, int $userId)
{
return Inertia::render('Administration/Show');
}
}
3 changes: 3 additions & 0 deletions app/Http/Kernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace App\Http;

use App\Http\Middleware\RestrictAdministrationAccess;
use Illuminate\Foundation\Http\Kernel as HttpKernel;

class Kernel extends HttpKernel
Expand Down Expand Up @@ -38,6 +39,7 @@ class Kernel extends HttpKernel
\App\Http\Middleware\VerifyCsrfToken::class,
\Illuminate\Routing\Middleware\SubstituteBindings::class,
\App\Http\Middleware\HandleInertiaRequests::class,
RestrictAdministrationAccess::class,
],

'api' => [
Expand Down Expand Up @@ -67,5 +69,6 @@ class Kernel extends HttpKernel
'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
'administration' => RestrictAdministrationAccess::class,
];
}
26 changes: 26 additions & 0 deletions app/Http/Middleware/RestrictAdministrationAccess.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?php

namespace App\Http\Middleware;

use Closure;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;

class RestrictAdministrationAccess
{
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse) $next
* @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
*/
public function handle(Request $request, Closure $next)
{
if (Auth::user()->instance_administrator) {
return $next($request);
} else {
abort(401);
}
}
}
2 changes: 2 additions & 0 deletions app/Models/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ class User extends Authenticatable implements MustVerifyEmail
'postal_code',
'country',
'state',
'instance_administrator',
];

/**
Expand All @@ -57,6 +58,7 @@ class User extends Authenticatable implements MustVerifyEmail
*/
protected $casts = [
'email_verified_at' => 'datetime',
'instance_administrator' => 'boolean',
];

/**
Expand Down
Loading