diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index a0a2a8a3..e749914f 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -7,7 +7,7 @@ use Illuminate\Foundation\Bus\DispatchesJobs; use Illuminate\Foundation\Validation\ValidatesRequests; use Illuminate\Routing\Controller as BaseController; -class Controller extends BaseController +abstract class Controller extends BaseController { use AuthorizesRequests, DispatchesJobs, ValidatesRequests; } diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index a3e4b6d8..26cccd04 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -9,7 +9,8 @@ class HomeController extends Controller public function __invoke() { session()->put('menu', 'dashboard'); - + session()->put('title', 'Dashboard'); + return \Inertia::render('Home', []); } } diff --git a/app/Http/Middleware/InertiaShareMiddleware.php b/app/Http/Middleware/InertiaShareMiddleware.php index 8df2485a..f8b97da0 100644 --- a/app/Http/Middleware/InertiaShareMiddleware.php +++ b/app/Http/Middleware/InertiaShareMiddleware.php @@ -19,11 +19,10 @@ class InertiaShareMiddleware public function handle($request, Closure $next) { \Inertia::share([ - 'auth' => ['user' => auth()->check() ? new UserResource(auth()->user()) : null] - ]); - - \Inertia::share([ - 'menu' => session()->get('menu'), + 'auth' => ['user' => auth()->check() ? new UserResource(auth()->user()) : null], + 'menu' => function() { + return session()->get('menu'); + }, 'errors' => function () { return Session::get('errors') ? Session::get('errors')->getBag('default')->getMessages() diff --git a/app/Member/MemberController.php b/app/Member/MemberController.php index fe355b29..8e528f1b 100644 --- a/app/Member/MemberController.php +++ b/app/Member/MemberController.php @@ -8,8 +8,11 @@ use Illuminate\Http\Request; class MemberController extends Controller { public function index(Request $request) { - return \Inertia::render('Member/Index', [ - 'data' => MemberResource::collection(Member::search($request->query('search', null))->get()) + session()->put('menu', 'member'); + session()->put('title', 'Mitglieder'); + + return \Inertia::render('member/Index', [ + 'data' => MemberResource::collection(Member::search($request->query('search', null))->paginate(20)) ]); } } diff --git a/resources/js/layouts/App.vue b/resources/js/layouts/App.vue index c24668fd..34450e1a 100644 --- a/resources/js/layouts/App.vue +++ b/resources/js/layouts/App.vue @@ -4,7 +4,7 @@ <!-- ******************************** Sidebar ******************************** --> <div class="fixed bg-gray-800 p-6 w-56 left-0 top-0 h-screen border-r border-gray-600 border-solid"> <div class="grid gap-2"> - <v-link href="/dashboard" menu="dashboard" icon="loss">Dashboard</v-link> + <v-link href="/" menu="dashboard" icon="loss">Dashboard</v-link> <v-link href="/member" menu="member" icon="user">Mitglieder</v-link> </div> </div> diff --git a/resources/js/views/Member/Index.vue b/resources/js/views/member/Index.vue similarity index 97% rename from resources/js/views/Member/Index.vue rename to resources/js/views/member/Index.vue index f537b056..da68ae8d 100644 --- a/resources/js/views/Member/Index.vue +++ b/resources/js/views/member/Index.vue @@ -1,5 +1,6 @@ <template> <div> + <!-- <v-table :headers="[ {text: 'Nachname', value: 'lastname', align: 'left'}, {text: 'Vorname', value: 'firstname', align: 'left'}, @@ -16,6 +17,7 @@ </template> <template slot="Aktion" slot-scope="{item}"></template> </v-table> + --> </div> </template>