diff --git a/app/Console/Commands/SeedLibraryReview.php b/app/Console/Commands/SeedLibraryReview.php index 44a8f01..ed48bbd 100644 --- a/app/Console/Commands/SeedLibraryReview.php +++ b/app/Console/Commands/SeedLibraryReview.php @@ -7,9 +7,12 @@ use App\Domain\Catalog\CompositionDisplayRelease; use App\Domain\Catalog\ContentService; use App\Domain\Catalog\EditorialContentKind; +use App\Domain\Catalog\Offer; use App\Domain\Catalog\OfferService; +use App\Domain\Entitlement\GrantIssuer; use App\Models\User; use Illuminate\Console\Command; +use Illuminate\Support\Facades\Hash; class SeedLibraryReview extends Command { @@ -25,12 +28,31 @@ public function handle( ): int { $existing = Composition::query()->where('designation', 'Prüfprogramm Abstand')->first(); - if ($existing !== null) { - $this->info('Prüfbestand ist bereits vorhanden.'); + if ($existing === null) { + $created = $this->createFixture($content, $articles, $offers, $display); - return self::SUCCESS; + if ($created !== self::SUCCESS) { + return $created; + } + } else { + $existing->display_title = 'Prüfprogramm Abstand und ein bewusst langer Titel für die Kursraumansicht'; + $existing->summary = 'Gekennzeichneter Prüfbestand für die Testinstanz. Der Titel ist lang, damit die Karte im Kursraum prüfbar bleibt.'; + $existing->save(); } + $this->ensureTrainer(); + $this->info('Prüfbestand und Trainingskonto sind bereit.'); + + return self::SUCCESS; + } + + private function createFixture( + ContentService $content, + ArticleService $articles, + OfferService $offers, + CompositionDisplayRelease $display, + ): int { + $actor = User::query()->find($this->option('actor')) ?? User::query()->orderBy('id')->first(); if ($actor === null) { @@ -53,8 +75,8 @@ public function handle( ); $composition = $content->createComposition('Prüfprogramm Abstand'); $composition->editorial_content_kind_id = $kind->id; - $composition->display_title = 'Prüfprogramm Abstand'; - $composition->summary = 'Gekennzeichneter Prüfbestand für die Testinstanz.'; + $composition->display_title = 'Prüfprogramm Abstand und ein bewusst langer Titel für die Kursraumansicht'; + $composition->summary = 'Gekennzeichneter Prüfbestand für die Testinstanz. Der Titel ist lang, damit die Karte im Kursraum prüfbar bleibt.'; $composition->thumbnail_error = 'Prüfhinweis: kein Vorschaubild.'; $composition->save(); $version = $content->publishComposition($composition, [ @@ -74,8 +96,26 @@ public function handle( ['target' => $article->fresh(), 'rights' => $rights], ], ['grant_kind' => 'auf_abruf', 'composition_version_id' => $version->id]); $display->release($version, $actor, 'Prüffreigabe'); - $this->info('Prüfbestand angelegt. Angebot: Prüfprogramm Abstand.'); return self::SUCCESS; } + + private function ensureTrainer(): void + { + $trainer = User::query()->where('email', 'trainer-pruefung@example.test')->first(); + + if ($trainer === null) { + $trainer = User::factory()->create([ + 'name' => 'Trainer Prüfung', + 'email' => 'trainer-pruefung@example.test', + 'password' => Hash::make('Kursraum-Pruefung'), + ]); + } + + $offer = Offer::query()->where('name', 'Prüfprogramm Abstand')->first(); + + if ($offer !== null) { + app(GrantIssuer::class)->claim($trainer, $offer); + } + } } diff --git a/app/Http/Controllers/Member/LibraryController.php b/app/Http/Controllers/Member/LibraryController.php index 3cd584f..d82598e 100644 --- a/app/Http/Controllers/Member/LibraryController.php +++ b/app/Http/Controllers/Member/LibraryController.php @@ -5,6 +5,7 @@ use App\Domain\Catalog\ArticleRelease; use App\Domain\Catalog\Composition; use App\Domain\Catalog\ContentElementVersion; +use App\Domain\Catalog\EditorialDimension; use App\Domain\Catalog\IdentityDimension; use App\Domain\Catalog\LicenseArticle; use App\Domain\Entitlement\DecideAccess; @@ -22,19 +23,37 @@ class LibraryController extends Controller { - public function index(Request $request): View + public function index(Request $request, ?string $sicht = null): View { $catalog = app(LibraryCatalog::class)->index($request->user()); + $untouched = $catalog['programs'] === [] && $catalog['modules'] === [] && $catalog['materials'] === []; $query = trim((string) $request->query('q', '')); - + $nutzung = (string) $request->query('nutzung', ''); $dimensionIds = array_values(array_filter(array_map(intval(...), (array) $request->query('dimension', [])))); $dimensions = app(IdentityDimension::class); + foreach (['programs', 'modules'] as $shelf) { + if ($query !== '') { + $catalog[$shelf] = array_values(array_filter( + $catalog[$shelf], + fn (array $card): bool => $this->matches($card, $query), + )); + } + if ($dimensionIds !== []) { + $catalog[$shelf] = array_values(array_filter( + $catalog[$shelf], + fn (array $card): bool => $dimensions->matches($card['composition'], $dimensionIds), + )); + } + if (in_array($nutzung, ['nutzbar', 'teilweise', 'nicht enthalten'], true)) { + $catalog[$shelf] = array_values(array_filter( + $catalog[$shelf], + fn (array $card): bool => ($card['coverage'] ?? '') === $nutzung, + )); + } + } + if ($query !== '') { - $catalog['programs'] = array_values(array_filter( - $catalog['programs'], - fn (array $card): bool => $this->matches($card, $query), - )); $catalog['materials'] = array_values(array_filter( $catalog['materials'], fn (array $card): bool => $this->matches($card, $query), @@ -42,10 +61,6 @@ public function index(Request $request): View } if ($dimensionIds !== []) { - $catalog['programs'] = array_values(array_filter( - $catalog['programs'], - fn (array $card): bool => $dimensions->matches($card['composition'], $dimensionIds), - )); $catalog['materials'] = array_values(array_filter( $catalog['materials'], function (array $card) use ($dimensions, $dimensionIds): bool { @@ -59,7 +74,29 @@ function (array $card) use ($dimensions, $dimensionIds): bool { )); } - return view('member.library', [...$catalog, 'query' => $query]); + if ($nutzung === 'teilweise' || $nutzung === 'nicht enthalten') { + $catalog['materials'] = []; + } + + return view('member.library', [ + ...$catalog, + 'query' => $query, + 'sicht' => $sicht, + 'nutzung' => $nutzung, + 'dimensionIds' => $dimensionIds, + 'filterDimensions' => EditorialDimension::query()->with('values')->orderBy('label')->get(), + 'libraryEmpty' => $untouched, + ]); + } + + public function programs(Request $request): View + { + return $this->index($request, 'programme'); + } + + public function modules(Request $request): View + { + return $this->index($request, 'module'); } public function program(Request $request, Composition $composition): View diff --git a/app/Http/Controllers/Member/MemberController.php b/app/Http/Controllers/Member/MemberController.php index b5812db..ee7d33a 100644 --- a/app/Http/Controllers/Member/MemberController.php +++ b/app/Http/Controllers/Member/MemberController.php @@ -4,15 +4,22 @@ use App\Domain\Identity\AccountStatus; use App\Http\Controllers\Controller; +use App\Http\LibraryCatalog; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\View\View; class MemberController extends Controller { - public function dashboard(): View + public function dashboard(Request $request): View { - return view('member.dashboard'); + $catalog = app(LibraryCatalog::class)->index($request->user()); + + return view('member.dashboard', [ + 'programCount' => count($catalog['programs']), + 'moduleCount' => count($catalog['modules']), + 'materialCount' => count($catalog['materials']), + ]); } public function profile(): View diff --git a/app/Http/LibraryCatalog.php b/app/Http/LibraryCatalog.php index 284a22e..b0c1fb0 100644 --- a/app/Http/LibraryCatalog.php +++ b/app/Http/LibraryCatalog.php @@ -25,11 +25,12 @@ public function __construct( ) {} /** - * @return array{programs: list>, materials: list>} + * @return array{programs: list>, modules: list>, materials: list>} */ public function index(User $user): array { $programs = []; + $modules = []; $materials = []; foreach ($this->grants($user) as $grant) { @@ -39,31 +40,42 @@ public function index(User $user): array $version = $release?->rootCompositionVersion; if ($composition !== null && $version !== null && $this->display->isReleased($version)) { - $programs[$composition->id] = [ + $card = [ 'composition' => $composition, 'version' => $version, 'title' => filled($composition->display_title) ? $composition->display_title : $composition->designation, 'summary' => $composition->summary, 'kind' => $composition->editorialContentKind?->label ?? ($composition->kind?->label()), + 'coverage' => $this->coverageLabel($user, $composition), ]; + $shelf = $composition->editorialContentKind?->slug === 'modul' ? 'modules' : 'programs'; + if ($shelf === 'modules') { + $modules[$composition->id] = $card; + } else { + $programs[$composition->id] = $card; + } continue; } - $elementId = $release?->rootElementVersion?->element_id; + $element = $release?->rootElementVersion?->element; + $elementId = $element?->id; $key = $composition !== null ? 'komposition-'.$composition->id : ($elementId !== null ? 'element-'.$elementId : 'artikel-'.$article->id); $materials[$key] = [ 'article' => $article, 'title' => app(CourseOutline::class)->title($article), + 'summary' => $element?->summary ?? $composition?->summary, 'kind' => app(CourseOutline::class)->kindLabel($article), + 'coverage' => 'nutzbar', ]; } return [ 'programs' => array_values($programs), + 'modules' => array_values($modules), 'materials' => array_values($materials), ]; } @@ -92,7 +104,7 @@ public function program(User $user, Composition $composition): array 'learning_goal' => $version->learning_goal, 'duration_minutes' => $version->duration_minutes, 'material_note' => $version->material_note, - 'coverage' => $leaves === [] ? 'nicht nutzbar' : ($open === count($leaves) ? 'vollständig' : ($open === 0 ? 'nicht nutzbar' : 'teilweise')), + 'coverage' => $leaves === [] ? 'nicht enthalten' : ($open === count($leaves) ? 'nutzbar' : ($open === 0 ? 'nicht enthalten' : 'teilweise')), 'nodes' => $nodes, ]; } @@ -146,6 +158,28 @@ private function leaves(array $nodes): array return $leaves; } + private function coverageLabel(User $user, Composition $composition): string + { + $version = $this->display->highestReleasedVersion($composition); + + if ($version === null) { + return 'nicht enthalten'; + } + + $nodes = array_map( + fn (StructureNode $node): array => $this->present($user, $node), + $this->structure->tree($version), + ); + $leaves = $this->leaves($nodes); + $open = count(array_filter($leaves, fn (array $leaf): bool => $leaf['view_url'] !== null)); + + if ($leaves === [] || $open === 0) { + return 'nicht enthalten'; + } + + return $open === count($leaves) ? 'nutzbar' : 'teilweise'; + } + private function programUrl(StructureNode $node): ?string { if ($node->compositionId === null || $node->compositionVersionId === null) { diff --git a/resources/css/app.css b/resources/css/app.css index 4ab62c8..6d8c7ac 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -390,3 +390,533 @@ .site-footer nav { .site-footer a { color: inherit; } + +body.member { + --marke-navy: #032551; + --marke-gruen: #5b8625; + --marke-aktion: #3b7b09; + --marke-gelb: #fcd10a; + --marke-creme: #f7f6f2; + --marke-tinte: #15243a; + --text: var(--marke-tinte); + --text-leise: #3e4c5c; + --flaeche: var(--marke-creme); + --flaeche-karte: #ffffff; + --linie: #d5ddd6; + --aktion: var(--marke-aktion); + --aktion-text: #ffffff; + --akzent: var(--marke-gelb); + --fokus: #1769aa; + --erfolg: #1b5e32; + --hinweis: #6b4a00; + --fehler: #8e1b24; + --radius-karte: 14px; + --radius-flaeche: 22px; + --radius-pille: 999px; + --schatten: 0 10px 28px rgb(3 37 81 / 8%); + --schrift-lesen: var(--font-sans); + --schrift-auszeichnung: var(--font-serif); + background: var(--flaeche); + color: var(--text); + font-family: var(--schrift-lesen); + font-size: 1.0625rem; +} + +body.member :focus-visible { + outline: 3px solid var(--fokus); + outline-offset: 3px; +} + +body.member h1, +body.member h2, +body.member .member-mark strong, +body.member .entry strong { + font-family: var(--schrift-auszeichnung); + letter-spacing: -0.02em; +} + +body.member h1 { + font-size: clamp(2.125rem, 4vw, 3.25rem); + line-height: 1.15; + margin: 0.2rem 0 0.6rem; + max-width: 18ch; +} + +body.member h2 { + font-size: clamp(1.35rem, 2vw, 1.7rem); + line-height: 1.25; + margin: 0 0 0.75rem; + overflow-wrap: anywhere; +} + +body.member .member-shell { + min-height: 100vh; +} + +body.member .member-side { + display: none; +} + +body.member .member-main { + min-width: 0; +} + +body.member .member-top, +body.member .member-sheet { + width: min(72rem, calc(100% - 2rem)); + margin-inline: auto; +} + +body.member .member-top { + display: flex; + align-items: center; + gap: 0.75rem; + min-height: 4.25rem; +} + +body.member .member-mark { + display: flex; + flex-direction: column; + color: inherit; + text-decoration: none; + line-height: 1.1; +} + +body.member .member-mark strong { + font-size: 1.35rem; +} + +body.member .member-mark span, +body.member .quiet { + color: var(--text-leise); + font-size: 0.9rem; +} + +body.member .member-quick { + display: flex; + gap: 0.75rem; + margin-left: auto; +} + +body.member .member-quick a { + color: inherit; + text-decoration: none; + min-height: 2.75rem; + display: inline-flex; + align-items: center; +} + +body.member .member-sheet { + padding-bottom: 6.5rem; +} + +body.member .member-intro { + margin: 0.5rem 0 1.5rem; +} + +body.member .lede { + max-width: 62ch; + font-size: 1.125rem; +} + +body.member .flag { + display: inline-block; + margin: 0; + padding: 0.15rem 0 0.2rem; + background-image: linear-gradient(var(--akzent), var(--akzent)); + background-position: 0 100%; + background-repeat: no-repeat; + background-size: 100% 0.45rem; + color: var(--marke-navy); + font-weight: 650; +} + +body.member .member-nav { + display: grid; + gap: 0.25rem; +} + +body.member .member-nav a, +body.member .member-dock a, +body.member .button, +body.member button.button { + min-height: 2.75rem; + display: inline-flex; + align-items: center; +} + +body.member .button, +body.member button.button { + font: inherit; + background: var(--aktion); + color: var(--aktion-text); + border: 0; + border-radius: var(--radius-pille); + padding: 0.55rem 1rem; + text-decoration: none; + cursor: pointer; + width: fit-content; +} + +body.member .button-quiet { + background: transparent; + color: var(--marke-navy); + box-shadow: inset 0 0 0 2px var(--marke-navy); +} + +body.member .member-dock { + position: fixed; + left: 0; + right: 0; + bottom: 0; + z-index: 5; + display: grid; + grid-template-columns: repeat(5, 1fr); + background: var(--marke-navy); + padding: 0.25rem 0.35rem calc(0.25rem + env(safe-area-inset-bottom)); +} + +body.member .member-dock a { + justify-content: center; + text-align: center; + color: #f7f6f2; + text-decoration: none; + font-size: 0.78rem; + line-height: 1.15; + padding: 0.35rem 0.15rem; + border-radius: 10px; +} + +body.member .member-dock a[aria-current='page'] { + background: var(--akzent); + color: var(--marke-navy); +} + +body.member .finder, +body.member .form { + display: grid; + gap: 0.9rem; + background: var(--flaeche-karte); + border: 1px solid var(--linie); + border-radius: var(--radius-flaeche); + padding: 1rem; + margin-bottom: 1.5rem; +} + +body.member .finder-query, +body.member .form label, +body.member legend { + font-weight: 650; +} + +body.member input[type='search'], +body.member input[type='text'], +body.member .form input { + font: inherit; + width: 100%; + box-sizing: border-box; + min-height: 2.75rem; + border: 1px solid #8aa084; + border-radius: 8px; + background: white; + padding: 0.55rem 0.75rem; +} + +body.member fieldset { + border: 0; + margin: 0; + padding: 0; + display: flex; + flex-wrap: wrap; + gap: 0.5rem 0.9rem; +} + +body.member .check { + display: inline-flex; + align-items: center; + gap: 0.4rem; + min-height: 2.75rem; + font-weight: 400; +} + +body.member .finder-actions, +body.member .member-sheet form + form { + display: flex; + flex-wrap: wrap; + gap: 0.75rem; +} + +body.member .card-grid, +body.member .entry-grid { + display: grid; + gap: 1rem; +} + +body.member .media-card, +body.member .entry, +body.member .license-list li, +body.member .course > li, +body.member .empty { + background: var(--flaeche-karte); + border: 1px solid var(--linie); + border-radius: var(--radius-karte); + box-shadow: var(--schatten); +} + +body.member .media-card a, +body.member .entry { + display: grid; + color: inherit; + text-decoration: none; + min-height: 100%; +} + +body.member .thumb { + aspect-ratio: 4 / 3; + border-radius: var(--radius-karte) var(--radius-karte) 0 0; + background: + linear-gradient(160deg, var(--marke-navy) 0 58%, var(--akzent) 58% 68%, #e7efe4 68%); + display: flex; + flex-direction: column; + justify-content: space-between; + padding: 0.8rem; +} + +body.member .thumb .flag { + align-self: flex-start; + background-color: var(--akzent); + background-image: none; + padding: 0.2rem 0.55rem; + border-radius: var(--radius-pille); +} + +body.member .thumb-label { + align-self: flex-start; + background: rgb(255 255 255 / 92%); + color: var(--marke-navy); + border-radius: 8px; + padding: 0.2rem 0.45rem; +} + +body.member .card-copy { + display: grid; + gap: 0.45rem; + padding: 0.9rem 1rem 1rem; +} + +body.member .card-copy p, +body.member .reading, +body.member .prose { + max-width: 68ch; +} + +body.member .entry { + padding: 1rem 1.1rem; + align-content: end; + min-height: 7.5rem; +} + +body.member .entry strong { + font-size: 2.4rem; + color: var(--marke-navy); +} + +body.member .state { + margin: 0.4rem 0; + font-weight: 650; +} + +body.member .state-nutzbar { + color: var(--erfolg); +} + +body.member .state-teilweise, +body.member .state-hinweis { + color: var(--hinweis); +} + +body.member .state-nicht, +body.member .state-nichtenthalten, +body.member .errors { + color: var(--fehler); +} + +body.member .errors, +body.member .status { + border-radius: 8px; + padding: 0.75rem 1rem; +} + +body.member .errors { + background: #fde8e6; +} + +body.member .status { + background: #e5f3ea; + color: var(--erfolg); +} + +body.member .facts { + display: grid; + gap: 0.75rem; + margin: 0 0 1.25rem; +} + +body.member .facts div { + background: var(--flaeche-karte); + border-radius: 8px; + padding: 0.75rem 0.9rem; +} + +body.member .facts dt { + color: var(--text-leise); + font-size: 0.9rem; +} + +body.member .facts dd { + margin: 0.15rem 0 0; + font-weight: 650; +} + +body.member .didactic, +body.member .reading { + background: var(--flaeche-karte); + border-left: 6px solid var(--akzent); + border-radius: 0 var(--radius-karte) var(--radius-karte) 0; + padding: 1rem 1.1rem; + margin-bottom: 1.5rem; +} + +body.member .course { + list-style: none; + padding: 0; + margin: 0; + display: grid; + gap: 1rem; +} + +body.member .course > li { + padding: 1rem; + display: grid; + gap: 0.7rem; +} + +body.member .course .course { + margin-top: 0.4rem; +} + +body.member .player { + display: grid; + gap: 0.7rem; + background: var(--marke-navy); + border-radius: var(--radius-karte); + padding: 0.7rem; +} + +body.member .player video, +body.member .player audio { + width: 100%; + max-height: 70vh; + background: #02182f; +} + +body.member .player .button { + justify-self: start; +} + +body.member .license-list { + list-style: none; + padding: 0; + display: grid; + gap: 1rem; +} + +body.member .license-list li, +body.member .empty { + padding: 1rem 1.1rem; +} + +body.member .crumb a { + color: var(--marke-navy); +} + +@media (min-width: 40rem) { + body.member .card-grid, + body.member .entry-grid, + body.member .facts { + grid-template-columns: 1fr 1fr; + } +} + +@media (min-width: 64rem) { + body.member .member-shell { + display: grid; + grid-template-columns: 16.5rem minmax(0, 1fr); + } + + body.member .member-side { + display: flex; + flex-direction: column; + gap: 1.5rem; + position: sticky; + top: 0; + height: 100vh; + padding: 1.25rem 1rem 1.5rem; + background: var(--marke-navy); + color: #f7f6f2; + } + + body.member .member-side .member-mark, + body.member .member-side .member-nav a { + color: #f7f6f2; + } + + body.member .member-side .member-nav a { + text-decoration: none; + border-radius: 10px; + padding: 0 0.7rem; + } + + body.member .member-side .member-nav a[aria-current='page'] { + background: var(--akzent); + color: var(--marke-navy); + } + + body.member .member-logout { + margin-top: auto; + } + + body.member .member-logout button { + font: inherit; + color: #f7f6f2; + background: transparent; + border: 0; + min-height: 2.75rem; + cursor: pointer; + padding: 0 0.7rem; + } + + body.member .member-mark-compact, + body.member .member-quick, + body.member .member-dock { + display: none; + } + + body.member .member-top { + justify-content: flex-end; + } + + body.member .member-sheet { + padding-bottom: 3rem; + } + + body.member .card-grid { + grid-template-columns: 1fr 1fr 1fr; + } +} + +@media (prefers-reduced-motion: reduce) { + body.member * { + scroll-behavior: auto; + } +} diff --git a/resources/js/app.js b/resources/js/app.js index c5c41b8..4beebcc 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -1,4 +1,16 @@ document.addEventListener('click', (event) => { + const fullscreen = event.target.closest('[data-fullscreen]'); + + if (fullscreen) { + const media = fullscreen.closest('.player')?.querySelector('video, audio'); + + if (media?.requestFullscreen) { + media.requestFullscreen(); + } + + return; + } + const decision = event.target.closest('[data-course-decision]'); const restart = event.target.closest('[data-course-restart]'); const button = decision || restart; diff --git a/resources/views/layouts/member.blade.php b/resources/views/layouts/member.blade.php new file mode 100644 index 0000000..08fba79 --- /dev/null +++ b/resources/views/layouts/member.blade.php @@ -0,0 +1,55 @@ + + + + + + @yield('title', 'Mitgliederbereich') + @fonts + @vite(['resources/css/app.css', 'resources/js/app.js']) + + + +
+ +
+
+ + Lara & Felix + Mitgliederbereich + + +
+ @csrf + +
+
+
+ @if (session('status')) +

{{ session('status') }}

+ @endif + @yield('content') +
+
+
+ + + diff --git a/resources/views/member/article.blade.php b/resources/views/member/article.blade.php index 513a280..65725bd 100644 --- a/resources/views/member/article.blade.php +++ b/resources/views/member/article.blade.php @@ -1,18 +1,21 @@ -@extends('layouts.site') +@extends('layouts.member') @section('title', $title) @section('content') - @include('member.partials.nav') -

{{ $title }}

- @if ($kind) -

{{ $kind }}

- @endif - @if ($release?->classification_note) -

{{ $release->classification_note }}

- @endif +

Bibliothek

+
+ @if ($kind) +

{{ $kind }}

+ @endif +

{{ $title }}

+ @if ($release?->classification_note) +

{{ $release->classification_note }}

+ @endif +
@if ($entries === [])
+

Kein veröffentlichter Stand

Für diesen Eintrag liegt noch kein veröffentlichter Stand vor.

@else @@ -23,15 +26,15 @@ @if (filled($entry['version']->element->description))

{{ $entry['version']->element->description }}

@endif - @if ($entry['pillars'] !== []) -

{{ implode(' · ', $entry['pillars']) }}

- @endif @if ($entry['playable']) - +
+ + +
@elseif ($entry['allowed'] && $entry['url']) -

Ansehen

+

Ansehen

@else -

Für diesen Teil liegt keine Freigabe vor.

+

Nicht enthalten. Für diesen Teil liegt keine Freigabe vor.

@endif @if (filled($entry['version']->body))
@@ -42,5 +45,5 @@ @endforeach @endif -

Artikel {{ $article->code }}

+

Artikel {{ $article->code }}

@endsection diff --git a/resources/views/member/dashboard.blade.php b/resources/views/member/dashboard.blade.php index 54bf346..9dbdb68 100644 --- a/resources/views/member/dashboard.blade.php +++ b/resources/views/member/dashboard.blade.php @@ -1,9 +1,30 @@ -@extends('layouts.site') +@extends('layouts.member') @section('title', 'Mitgliederbereich') @section('content') - @include('member.partials.nav') -

Guten Tag, {{ auth()->user()->name }}

-

In der Bibliothek liegen die Übungen und Materialien Ihrer Berechtigungen. Angebote können Sie abrufen oder im Testmodus kaufen.

+
+

Übersicht

+

Guten Tag, {{ auth()->user()->name }}

+

In der Bibliothek liegen die Übungen und Materialien Ihrer Berechtigungen. Angebote können Sie abrufen oder im Testmodus kaufen.

+
+
+ + + +
+
+ + {{ $programCount }} + Programme + + + {{ $moduleCount }} + Module + + + {{ $materialCount }} + Materialien + +
@endsection diff --git a/resources/views/member/grants.blade.php b/resources/views/member/grants.blade.php index fb6e133..51a5d66 100644 --- a/resources/views/member/grants.blade.php +++ b/resources/views/member/grants.blade.php @@ -1,21 +1,27 @@ -@extends('layouts.site') +@extends('layouts.member') -@section('title', 'Berechtigungen') +@section('title', 'Meine Lizenzen') @section('content') - @include('member.partials.nav') -

Berechtigungen

+
+

Getrennt von der Bibliothek

+

Meine Lizenzen

+

Hier stehen Zweck, Herkunft und Zeitraum. Die Inhalte selbst öffnen Sie in der Bibliothek.

+
@if ($grants->isEmpty())
+

Keine Lizenz

Ihnen ist noch keine Lizenz zugeordnet.

+

Zu den Angeboten

@else -
    +
      @foreach ($grants as $grant)
    • - {{ $grant->article->code }} - {{ $grant->rights_snapshot['purpose'] ?? '' }} - seit {{ $grant->valid_from?->timezone(config('app.timezone'))->format('d.m.Y') }} +

      {{ $grant->article->code }}

      +

      Zweck: {{ $grant->rights_snapshot['purpose'] ?? 'nicht angegeben' }}

      +

      seit {{ $grant->valid_from?->timezone(config('app.timezone'))->format('d.m.Y') }}

      +

      In der Bibliothek öffnen

    • @endforeach
    diff --git a/resources/views/member/library.blade.php b/resources/views/member/library.blade.php index 0bb03b7..41efb97 100644 --- a/resources/views/member/library.blade.php +++ b/resources/views/member/library.blade.php @@ -1,48 +1,111 @@ -@extends('layouts.site') +@extends('layouts.member') -@section('title', 'Bibliothek') +@section('title', match ($sicht) { + 'programme' => 'Programme', + 'module' => 'Module', + default => 'Bibliothek', +}) @section('content') - @include('member.partials.nav') -

    Bibliothek

    -
    - - - - @if (filled($query ?? null)) - Zurücksetzen +
    +

    Für die Kursstunde

    +

    {{ match ($sicht) { + 'programme' => 'Programme', + 'module' => 'Module', + default => 'Bibliothek', + } }}

    +

    Suchen Sie ein Programm, ein Modul oder ein einzelnes Material und öffnen Sie, was Ihre Lizenz enthält.

    +
    + + + + + @if ($filterDimensions->isNotEmpty()) + @foreach ($filterDimensions as $dimension) +
    + {{ $dimension->label }} + @foreach ($dimension->values as $value) + + @endforeach +
    + @endforeach @endif +
    + Verfügbarkeit + + + +
    +
    + + Zurücksetzen +
    -

    Programme zeigen den Aufbau. Einzelne Materialien stehen darunter, solange sie zu keinem freigegebenen Programm gehören.

    - @if ($programs === [] && $materials === []) + + @php + $showPrograms = $sicht !== 'module'; + $showModules = $sicht !== 'programme'; + $showMaterials = $sicht === null; + $visible = ($showPrograms ? count($programs) : 0) + ($showModules ? count($modules) : 0) + ($showMaterials ? count($materials) : 0); + @endphp + + @if ($visible === 0)
    -

    Noch nichts in der Bibliothek. Unter Angebote können Sie ein kostenloses Material abrufen oder ein Angebot im Testmodus kaufen.

    -

    Zu den Angeboten

    + @if ($libraryEmpty && ($query ?? '') === '' && ($nutzung ?? '') === '' && $dimensionIds === []) +

    Noch nichts in der Bibliothek

    +

    Unter Angebote können Sie ein kostenloses Material abrufen oder ein Angebot im Testmodus kaufen.

    +

    Zu den Angeboten

    + @else +

    Keine Treffer

    +

    Für diese Suche oder Filterkombination liegt nichts in Ihrer Bibliothek. Setzen Sie die Filter zurück oder sehen Sie die Angebote an.

    +

    Zu den Angeboten

    + @endif
    @else - @if ($programs !== []) -

    Programme und Module

    -
      - @foreach ($programs as $program) -
    • - {{ $program['kind'] ? $program['kind'].': ' : '' }}{{ $program['title'] }} - {{ filled($program['composition']->thumbnail_path) ? ($program['composition']->thumbnail_alt ?: 'Vorschaubild') : 'Platzhalter' }} - @if (filled($program['composition']->thumbnail_error)) - {{ $program['composition']->thumbnail_error }} - @endif -
    • - @endforeach -
    + @if ($showPrograms && $programs !== []) +
    +

    Programme

    +
    + @foreach ($programs as $program) + @include('member.partials.card', [ + 'href' => route('member.program', $program['composition']), + 'card' => $program + [ + 'error' => $program['composition']->thumbnail_error, + 'image' => filled($program['composition']->thumbnail_path) ? ($program['composition']->thumbnail_alt ?: 'Vorschaubild') : null, + ], + ]) + @endforeach +
    +
    @endif - @if ($materials !== []) -

    Materialien

    - + @if ($showModules && $modules !== []) +
    +

    Module

    +
    + @foreach ($modules as $module) + @include('member.partials.card', [ + 'href' => route('member.program', $module['composition']), + 'card' => $module + ['error' => $module['composition']->thumbnail_error], + ]) + @endforeach +
    +
    + @endif + @if ($showMaterials && $materials !== []) +
    +

    Materialien

    +
    + @foreach ($materials as $material) + @include('member.partials.card', [ + 'href' => route('member.article', $material['article']), + 'card' => $material, + ]) + @endforeach +
    +
    @endif @endif @endsection diff --git a/resources/views/member/materials.blade.php b/resources/views/member/materials.blade.php index bee22f2..252af8c 100644 --- a/resources/views/member/materials.blade.php +++ b/resources/views/member/materials.blade.php @@ -1,11 +1,14 @@ -@extends('layouts.site') +@extends('layouts.member') -@section('title', 'Filme und Materialien') +@section('title', 'Materialien') @section('content') - @include('member.partials.nav') @inject('courses', App\Http\CourseOutline::class) -

    Filme und Materialien

    +
    +

    Materialien

    +

    Filme und Materialien

    +

    Filme und Hörstücke, die Ihre Lizenz zum Abspielen freigibt.

    +
    @php $films = $grants->filter(function ($grant) { return $grant->article->currentRelease?->contents->contains( @@ -15,13 +18,23 @@ @endphp @if ($films->isEmpty())
    +

    Kein Film in dieser Lizenz

    Unter Ihren Berechtigungen ist gerade kein Film oder Hörstück.

    +

    Zur Bibliothek

    @else -
      +
      @foreach ($films as $grant) -
    • {{ $courses->title($grant->article) }}
    • + @include('member.partials.card', [ + 'href' => route('member.article', $grant->article), + 'card' => [ + 'title' => $courses->title($grant->article), + 'kind' => $courses->kindLabel($grant->article), + 'summary' => null, + 'coverage' => 'nutzbar', + ], + ]) @endforeach -
    + @endif @endsection diff --git a/resources/views/member/offers.blade.php b/resources/views/member/offers.blade.php index 0d86eac..7113641 100644 --- a/resources/views/member/offers.blade.php +++ b/resources/views/member/offers.blade.php @@ -1,29 +1,32 @@ -@extends('layouts.site') +@extends('layouts.member') @section('title', 'Angebote') @section('content') - @include('member.partials.nav') -

    Angebote

    +
    +

    Zugang

    +

    Angebote

    +

    Ein Abruf legt die Lizenz an. Die Inhalte erscheinen danach in der Bibliothek.

    +
    @if ($errors->any()) @endif @if ($offers->isEmpty()) -

    Gerade ist kein persönliches Angebot aktiv.

    +

    Keine Angebote

    Gerade ist kein persönliches Angebot aktiv.

    @else -
      +
        @foreach ($offers as $offer) @php $version = $offer->versions->first(); @endphp
      • - {{ $offer->name }} +

        {{ $offer->name }}

        @if ($version) - +

        @if ($version->grant_kind === 'kauf') - {{ number_format($version->price_cents / 100, 2, ',', '.') }} € · Testzahlung + {{ number_format($version->price_cents / 100, 2, ',', '.') }} €, Testzahlung @else - Kostenlos + Kostenlos abrufen @endif - +

        @csrf diff --git a/resources/views/member/order.blade.php b/resources/views/member/order.blade.php index 66081fb..4eeb46f 100644 --- a/resources/views/member/order.blade.php +++ b/resources/views/member/order.blade.php @@ -1,17 +1,24 @@ -@extends('layouts.site') +@extends('layouts.member') @section('title', 'Bestellung') @section('content') - @include('member.partials.nav') -

        Bestellung {{ $order->id }}

        +
        +

        Testzahlung

        +

        Bestellung {{ $order->id }}

        +
        @if ($errors->any()) @endif -

        Status: {{ $order->status }}

        - @foreach ($order->lines as $line) -

        {{ filled($line->offer_name) ? $line->offer_name : ($line->offerVersion->offer->name ?? 'Angebot') }} · {{ number_format($line->price_cents / 100, 2, ',', '.') }} €

        - @endforeach +

        Status: {{ $order->status }}

        +
          + @foreach ($order->lines as $line) +
        • +

          {{ filled($line->offer_name) ? $line->offer_name : ($line->offerVersion->offer->name ?? 'Angebot') }}

          +

          {{ number_format($line->price_cents / 100, 2, ',', '.') }} €

          +
        • + @endforeach +
        @if ($testPayment && $order->status === 'offen') @csrf @@ -19,13 +26,13 @@
        @csrf - +
        @endif @if ($order->status === 'bezahlt')
        @csrf - +
        @endif -@endsection +@endsection \ No newline at end of file diff --git a/resources/views/member/partials/card.blade.php b/resources/views/member/partials/card.blade.php new file mode 100644 index 0000000..5f0bf95 --- /dev/null +++ b/resources/views/member/partials/card.blade.php @@ -0,0 +1,25 @@ +@php + $coverageLabel = match ($card['coverage'] ?? '') { + 'nutzbar' => 'Nutzbar', + 'teilweise' => 'Teilweise nutzbar', + default => 'Nicht enthalten', + }; +@endphp + diff --git a/resources/views/member/partials/nav.blade.php b/resources/views/member/partials/nav.blade.php index cbe6894..66dba00 100644 --- a/resources/views/member/partials/nav.blade.php +++ b/resources/views/member/partials/nav.blade.php @@ -1,12 +1,10 @@ -