WIP

.docker/compile_base.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker buildx build -f .docker/base.Dockerfile .

app/Dashboard/Actions/IndexAction.php

@@ -1,31 +0,0 @@
-<?php
-
-namespace App\Dashboard\Actions;
-
-use App\Dashboard\DashboardFactory;
-use Inertia;
-use Inertia\Response;
-use Lorisleiva\Actions\Concerns\AsAction;
-
-class IndexAction
-{
-    use AsAction;
-
-    /**
-     * @return array<array-key, mixed>
-     */
-    public function handle(): array
-    {
-        return [
-            'blocks' => app(DashboardFactory::class)->render(),
-        ];
-    }
-
-    public function asController(): Response
-    {
-        session()->put('menu', 'dashboard');
-        session()->put('title', 'Dashboard');
-
-        return Inertia::render('dashboard/VIndex', $this->handle());
-    }
-}

app/Dashboard/Blocks/Block.php

@@ -1,27 +0,0 @@
-<?php
-
-namespace App\Dashboard\Blocks;
-
-abstract class Block
-{
-    /**
-     * @return array<array-key, mixed>
-     */
-    abstract protected function data(): array;
-
-    abstract protected function title(): string;
-
-    abstract protected function component(): string;
-
-    /**
-     * @return array{data: array<array-key, mixed>, title: string, component: string}
-     */
-    public function render(): array
-    {
-        return [
-            'data' => $this->data(),
-            'title' => $this->title(),
-            'component' => $this->component(),
-        ];
-    }
-}

app/Efz/EfzPendingBlock.php

@@ -2,7 +2,7 @@
 
 namespace App\Efz;
 
-use App\Dashboard\Blocks\Block;
+use Modules\Dashboard\Block;
 use App\Member\Member;
 use Illuminate\Database\Eloquent\Builder;
 
@@ -41,4 +41,9 @@ class EfzPendingBlock extends Block
     {
         return 'Ausstehende Führungszeugnisse';
     }
+
+    public function render(): string
+    {
+        return '<div></div>';
+    }
 }

app/Invoice/MemberPaymentBlock.php

@@ -2,7 +2,7 @@
 
 namespace App\Invoice;
 
-use App\Dashboard\Blocks\Block;
+use Modules\Dashboard\Block;
 use App\Invoice\Models\InvoicePosition;
 use App\Member\Member;
 
@@ -34,4 +34,9 @@ class MemberPaymentBlock extends Block
     {
         return 'Ausstehende Mitgliedsbeiträge';
     }
+
+    public function render(): string
+    {
+        return '<div></div>';
+    }
 }

app/Member/PsPendingBlock.php

@@ -2,7 +2,7 @@
 
 namespace App\Member;
 
-use App\Dashboard\Blocks\Block;
+use Modules\Dashboard\Block;
 use Illuminate\Database\Eloquent\Builder;
 
 class PsPendingBlock extends Block
@@ -47,4 +47,9 @@ class PsPendingBlock extends Block
     {
         return 'Ausstehende Präventionsschulungen';
     }
+
+    public function render(): string
+    {
+        return '<div></div>';
+    }
 }

app/Membership/AgeGroupCountBlock.php

@@ -2,7 +2,7 @@
 
 namespace App\Membership;
 
-use App\Dashboard\Blocks\Block;
+use Modules\Dashboard\Block;
 use App\Member\Membership;
 use Illuminate\Database\Eloquent\Builder;
 
@@ -55,4 +55,9 @@ class AgeGroupCountBlock extends Block
     {
         return 'Gruppierungs-Verteilung';
     }
+
+    public function render(): string
+    {
+        return '<div></div>';
+    }
 }

app/Membership/TestersBlock.php

@@ -2,7 +2,7 @@
 
 namespace App\Membership;
 
-use App\Dashboard\Blocks\Block;
+use Modules\Dashboard\Block;
 use App\Member\Member;
 use Illuminate\Database\Eloquent\Builder;
 
@@ -40,4 +40,9 @@ class TestersBlock extends Block
     {
         return 'Endende Schhnupperzeiten';
     }
+
+    public function render(): string
+    {
+        return '<div></div>';
+    }
 }

app/Providers/AppServiceProvider.php

@@ -37,6 +37,7 @@ class AppServiceProvider extends ServiceProvider
 
         app()->extend('media-library-helpers', fn ($p) => $p->put('form', Form::class));
 
+        Blade::componentNamespace('App\\View\\Ui', 'ui');
         Blade::componentNamespace('App\\View\\Mail', 'mail-view');
     }
 

app/View/Ui/Box.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\View\Ui;
+
+use Illuminate\View\Component;
+
+class Box extends Component
+{
+
+    public function __construct(
+        public string $containerClass = '',
+        public bool $second = false,
+        public string $title = '',
+        public string $inTitle = '',
+    ) {
+    }
+
+    public function render()
+    {
+        return <<<'HTML'
+            <section @class([
+                'bg-gray-800 group-[.is-popup]:bg-zinc-700' => !$second,
+                'bg-gray-700 group-[.is-popup]:bg-zinc-600' => $second,
+                'p-3 rounded-lg flex flex-col' => true
+            ])>
+                <div class="flex items-center">
+                    @if($title)
+                    <div class="col-span-full font-semibold text-gray-300 group-[.is-popup]:text-zinc-300">{{$title}}</div>
+                    @endif
+                    {{$inTitle}}
+                </div>
+                <main class="{{ $title ? 'mt-2' : '' }} {{ $containerClass }}">
+                    {{ $slot }}
+                </main>
+            </section>
+        HTML;
+    }
+}

composer.json

@@ -61,6 +61,7 @@
         "laravel/ui": "^4.0",
         "league/csv": "^9.9",
         "league/flysystem-webdav": "dev-master as 3.28.0",
+        "livewire/livewire": "^3.5",
         "lorisleiva/laravel-actions": "^2.4",
         "meilisearch/meilisearch-php": "^1.6",
         "monicahq/laravel-sabre": "^1.6",
@@ -104,6 +105,7 @@
     "autoload": {
         "psr-4": {
             "App\\": "app/",
+            "Modules\\": "modules/",
             "Plugins\\": "plugins/",
             "Database\\Factories\\": "database/factories/",
             "Database\\Seeders\\": "database/seeders/"
@@ -111,6 +113,7 @@
     },
     "autoload-dev": {
         "psr-4": {
+            "Modules\\Dashboard\\Tests\\": "modules/dashboard/tests/",
             "Tests\\": "tests/",
             "Zoomyboy\\LaravelNami\\Tests\\": "packages/laravel-nami/tests/"
         }

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "10f0b0d2a8dee4a8dad4821de9935f85",
+    "content-hash": "67ae3a3987355f098ee6f850c6f8e846",
     "packages": [
         {
             "name": "amphp/amp",
@@ -5153,6 +5153,82 @@
             ],
             "time": "2024-03-23T07:42:40+00:00"
         },
+        {
+            "name": "livewire/livewire",
+            "version": "v3.5.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/livewire/livewire.git",
+                "reference": "ce1ce71b39a3492b98f7d2f2a4583f1b163fe6ae"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/livewire/livewire/zipball/ce1ce71b39a3492b98f7d2f2a4583f1b163fe6ae",
+                "reference": "ce1ce71b39a3492b98f7d2f2a4583f1b163fe6ae",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/database": "^10.0|^11.0",
+                "illuminate/routing": "^10.0|^11.0",
+                "illuminate/support": "^10.0|^11.0",
+                "illuminate/validation": "^10.0|^11.0",
+                "laravel/prompts": "^0.1.24",
+                "league/mime-type-detection": "^1.9",
+                "php": "^8.1",
+                "symfony/console": "^6.0|^7.0",
+                "symfony/http-kernel": "^6.2|^7.0"
+            },
+            "require-dev": {
+                "calebporzio/sushi": "^2.1",
+                "laravel/framework": "^10.15.0|^11.0",
+                "mockery/mockery": "^1.3.1",
+                "orchestra/testbench": "^8.21.0|^9.0",
+                "orchestra/testbench-dusk": "^8.24|^9.1",
+                "phpunit/phpunit": "^10.4",
+                "psy/psysh": "^0.11.22|^0.12"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Livewire\\LivewireServiceProvider"
+                    ],
+                    "aliases": {
+                        "Livewire": "Livewire\\Livewire"
+                    }
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/helpers.php"
+                ],
+                "psr-4": {
+                    "Livewire\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Caleb Porzio",
+                    "email": "calebporzio@gmail.com"
+                }
+            ],
+            "description": "A front-end framework for Laravel.",
+            "support": {
+                "issues": "https://github.com/livewire/livewire/issues",
+                "source": "https://github.com/livewire/livewire/tree/v3.5.8"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/livewire",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-09-20T19:41:19+00:00"
+        },
         {
             "name": "lorisleiva/laravel-actions",
             "version": "v2.8.4",

config/app.php

@@ -176,7 +176,7 @@ return [
         App\Tex\TexServiceProvider::class,
         App\Dav\ServiceProvider::class,
         App\Setting\SettingServiceProvider::class,
-        App\Dashboard\DashboardServiceProvider::class,
+        Modules\Dashboard\DashboardServiceProvider::class,
         App\Providers\PluginServiceProvider::class,
     ],
 

config/livewire.php

@@ -0,0 +1,160 @@
+<?php
+
+return [
+
+    /*
+    |---------------------------------------------------------------------------
+    | Class Namespace
+    |---------------------------------------------------------------------------
+    |
+    | This value sets the root class namespace for Livewire component classes in
+    | your application. This value will change where component auto-discovery
+    | finds components. It's also referenced by the file creation commands.
+    |
+    */
+
+    'class_namespace' => 'App\\View',
+
+    /*
+    |---------------------------------------------------------------------------
+    | View Path
+    |---------------------------------------------------------------------------
+    |
+    | This value is used to specify where Livewire component Blade templates are
+    | stored when running file creation commands like `artisan make:livewire`.
+    | It is also used if you choose to omit a component's render() method.
+    |
+    */
+
+    'view_path' => resource_path('views/livewire'),
+
+    /*
+    |---------------------------------------------------------------------------
+    | Layout
+    |---------------------------------------------------------------------------
+    | The view that will be used as the layout when rendering a single component
+    | as an entire page via `Route::get('/post/create', CreatePost::class);`.
+    | In this case, the view returned by CreatePost will render into $slot.
+    |
+    */
+
+    'layout' => 'components.layouts.app',
+
+    /*
+    |---------------------------------------------------------------------------
+    | Lazy Loading Placeholder
+    |---------------------------------------------------------------------------
+    | Livewire allows you to lazy load components that would otherwise slow down
+    | the initial page load. Every component can have a custom placeholder or
+    | you can define the default placeholder view for all components below.
+    |
+    */
+
+    'lazy_placeholder' => null,
+
+    /*
+    |---------------------------------------------------------------------------
+    | Temporary File Uploads
+    |---------------------------------------------------------------------------
+    |
+    | Livewire handles file uploads by storing uploads in a temporary directory
+    | before the file is stored permanently. All file uploads are directed to
+    | a global endpoint for temporary storage. You may configure this below:
+    |
+    */
+
+    'temporary_file_upload' => [
+        'disk' => null,        // Example: 'local', 's3'              | Default: 'default'
+        'rules' => null,       // Example: ['file', 'mimes:png,jpg']  | Default: ['required', 'file', 'max:12288'] (12MB)
+        'directory' => null,   // Example: 'tmp'                      | Default: 'livewire-tmp'
+        'middleware' => null,  // Example: 'throttle:5,1'             | Default: 'throttle:60,1'
+        'preview_mimes' => [   // Supported file types for temporary pre-signed file URLs...
+            'png', 'gif', 'bmp', 'svg', 'wav', 'mp4',
+            'mov', 'avi', 'wmv', 'mp3', 'm4a',
+            'jpg', 'jpeg', 'mpga', 'webp', 'wma',
+        ],
+        'max_upload_time' => 5, // Max duration (in minutes) before an upload is invalidated...
+        'cleanup' => true, // Should cleanup temporary uploads older than 24 hrs...
+    ],
+
+    /*
+    |---------------------------------------------------------------------------
+    | Render On Redirect
+    |---------------------------------------------------------------------------
+    |
+    | This value determines if Livewire will run a component's `render()` method
+    | after a redirect has been triggered using something like `redirect(...)`
+    | Setting this to true will render the view once more before redirecting
+    |
+    */
+
+    'render_on_redirect' => false,
+
+    /*
+    |---------------------------------------------------------------------------
+    | Eloquent Model Binding
+    |---------------------------------------------------------------------------
+    |
+    | Previous versions of Livewire supported binding directly to eloquent model
+    | properties using wire:model by default. However, this behavior has been
+    | deemed too "magical" and has therefore been put under a feature flag.
+    |
+    */
+
+    'legacy_model_binding' => false,
+
+    /*
+    |---------------------------------------------------------------------------
+    | Auto-inject Frontend Assets
+    |---------------------------------------------------------------------------
+    |
+    | By default, Livewire automatically injects its JavaScript and CSS into the
+    | <head> and <body> of pages containing Livewire components. By disabling
+    | this behavior, you need to use @livewireStyles and @livewireScripts.
+    |
+    */
+
+    'inject_assets' => true,
+
+    /*
+    |---------------------------------------------------------------------------
+    | Navigate (SPA mode)
+    |---------------------------------------------------------------------------
+    |
+    | By adding `wire:navigate` to links in your Livewire application, Livewire
+    | will prevent the default link handling and instead request those pages
+    | via AJAX, creating an SPA-like effect. Configure this behavior here.
+    |
+    */
+
+    'navigate' => [
+        'show_progress_bar' => true,
+        'progress_bar_color' => '#2299dd',
+    ],
+
+    /*
+    |---------------------------------------------------------------------------
+    | HTML Morph Markers
+    |---------------------------------------------------------------------------
+    |
+    | Livewire intelligently "morphs" existing HTML into the newly rendered HTML
+    | after each update. To make this process more reliable, Livewire injects
+    | "markers" into the rendered Blade surrounding @if, @class & @foreach.
+    |
+    */
+
+    'inject_morph_markers' => true,
+
+    /*
+    |---------------------------------------------------------------------------
+    | Pagination Theme
+    |---------------------------------------------------------------------------
+    |
+    | When enabling Livewire's pagination feature by using the `WithPagination`
+    | trait, Livewire will use Tailwind templates to render pagination views
+    | on the page. If you want Bootstrap CSS, you can specify: "bootstrap"
+    |
+    */
+
+    'pagination_theme' => 'tailwind',
+];

modules/Dashboard/Block.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Modules\Dashboard;
+
+use Livewire\Component;
+
+abstract class Block extends Component
+{
+    abstract protected function title(): string;
+
+    abstract public function render(): string;
+}

modules/Dashboard/Components/DashboardComponent.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Modules\Dashboard\Components;
+
+use Livewire\Component;
+use Modules\Dashboard\DashboardFactory;
+
+class DashboardComponent extends Component
+{
+
+    private array $blocks = [];
+
+    public function mount(DashboardFactory $factory): void
+    {
+        session()->put('menu', 'dashboard');
+        session()->put('title', 'Dashboard');
+
+        $this->blocks = $factory->load();
+    }
+
+    public function render(): string
+    {
+        return <<<'HTML'
+            <div class="gap-6 md:grid-cols-2 xl:grid-cols-4 grid p-6">
+                @foreach($this->blocks as $block)
+                    <x-ui::box title="{{$block->title()}}" :component="$block" :second="true">
+                        <livewire:dynamic-component :is="$block"></livewire:dynamic-component>
+                    </x-ui::box>
+                @endforeach
+            </div>
+        HTML;
+    }
+}

modules/Dashboard/DashboardFactory.php

@@ -1,8 +1,7 @@
 <?php
 
-namespace App\Dashboard;
+namespace Modules\Dashboard;
 
-use App\Dashboard\Blocks\Block;
 use App\Efz\EfzPendingBlock;
 use App\Invoice\MemberPaymentBlock;
 use App\Member\PsPendingBlock;
@@ -23,11 +22,11 @@ class DashboardFactory
     ];
 
     /**
-     * @return array<array-key, mixed>
+     * @return array<int, Block>
      */
-    public function render(): array
+    public function load(): array
     {
-        return collect($this->blocks)->map(fn ($block): array => app($block)->render())->toArray();
+        return collect($this->blocks)->map(fn ($block) => app($block))->toArray();
     }
 
     /**

modules/Dashboard/DashboardServiceProvider.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Dashboard;
+namespace Modules\Dashboard;
 
 use Illuminate\Support\ServiceProvider;
 

modules/Dashboard/Events/DashboardShowing.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace Modules\Dashboard\Events;
+
+use Modules\Dashboard\Block;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class DashboardShowing
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    /**
+     * @var array<int, Block>
+     */
+    public array $blocks = [];
+
+    /**
+     * Create a new event instance.
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    public function purge(): void
+    {
+        $this->blocks = [];
+    }
+
+    /**
+     * @param class-string<Block> $block
+     */
+    public function push(string $block): void
+    {
+        $this->blocks[] = $block;
+    }
+
+    /**
+     * Get the channels the event should broadcast on.
+     *
+     * @return array<int, \Illuminate\Broadcasting\Channel>
+     */
+    public function broadcastOn(): array
+    {
+        return [
+            new PrivateChannel('channel-name'),
+        ];
+    }
+}

modules/Dashboard/tests/DashboardComponentTest.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace Modules\Dashboard\Tests;
+
+use Modules\Dashboard\Block;
+use Modules\Dashboard\Components\DashboardComponent;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
+use Livewire\Livewire;
+use Modules\Dashboard\DashboardFactory;
+use Tests\TestCase;
+
+uses(DatabaseTransactions::class);
+uses(TestCase::class);
+
+it('renders successfully', function () {
+    $this->login()->loginNami();
+
+    app(DashboardFactory::class)->purge();
+    app(DashboardFactory::class)->register(ExampleBlock::class);
+
+    Livewire::test(DashboardComponent::class)
+        ->assertSee('ExampleTitle')
+        ->assertSee('Example Content');
+});
+
+it('renders page successfully', function () {
+    $this->login()->loginNami();
+
+    $this->get('/')->assertOk()->assertSee('Dashboard');
+});
+
+class ExampleBlock extends Block
+{
+
+    public function title(): string
+    {
+        return 'ExampleTitle';
+    }
+
+    public function render(): string
+    {
+        return <<<'HTML'
+            <div>
+                Example Content
+            </div>
+        HTML;
+    }
+}

resources/js/views/dashboard/VIndex.vue

@@ -2,7 +2,7 @@
     <page-layout>
         <div class="gap-6 md:grid-cols-2 xl:grid-cols-4 grid p-6">
             <v-block v-for="(block, index) in blocks" :key="index" :title="block.title">
-                <component :data="block.data" :is="block.component"></component>
+                <component :is="block.component" :data="block.data"></component>
             </v-block>
         </div>
     </page-layout>

resources/views/components/layouts/app.blade.php

@@ -0,0 +1,3 @@
+<html>
+    {{ $slot }}
+</html>

routes/web.php

@@ -17,7 +17,7 @@ use App\Course\Actions\CourseIndexAction;
 use App\Course\Actions\CourseStoreAction;
 use App\Invoice\Actions\InvoiceStoreAction;
 use App\Course\Actions\CourseUpdateAction;
-use App\Dashboard\Actions\IndexAction as DashboardIndexAction;
+use Modules\Dashboard\Actions\IndexAction as DashboardIndexAction;
 use App\Efz\ShowEfzDocumentAction;
 use App\Fileshare\Actions\FileshareApiIndexAction;
 use App\Fileshare\Actions\FileshareStoreAction;
@@ -78,13 +78,14 @@ use App\Membership\Actions\MembershipDestroyAction;
 use App\Membership\Actions\MembershipStoreAction;
 use App\Membership\Actions\MembershipUpdateAction;
 use App\Payment\SubscriptionController;
+use Modules\Dashboard\Components\DashboardComponent;
 
 Route::group(['namespace' => 'App\\Http\\Controllers'], function (): void {
     Auth::routes(['register' => false]);
 });
 
 Route::group(['middleware' => 'auth:web'], function (): void {
-    Route::get('/', DashboardIndexAction::class)->name('home');
+    Route::get('/', DashboardComponent::class)->name('home');
     Route::post('/nami/login-check', NamiLoginCheckAction::class)->name('nami.login-check');
     Route::post('/nami/get-search-layer', NamiGetSearchLayerAction::class)->name('nami.get-search-layer');
     Route::post('/nami/search', NamiSearchAction::class)->name('nami.search');

storage/pail/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore