add dedicated Bindle page

This commit is contained in:
HolgerHatGarKeineNode
2023-08-02 14:15:55 +02:00
parent bf8919d84d
commit ba55f62afa
9 changed files with 273 additions and 86 deletions

View File

@@ -0,0 +1,39 @@
<?php
namespace App\Http\Livewire\Bindle;
use App\Models\LibraryItem;
use Illuminate\Database\Eloquent\Collection;
use Livewire\Component;
use RalphJSmit\Laravel\SEO\Support\SEOData;
class Gallery extends Component
{
public Collection $bindles;
public function mount()
{
$this->bindles = LibraryItem::query()
->where('type', 'bindle')
->get();
}
public function deleteBindle($id)
{
LibraryItem::query()->find($id)?->delete();
return to_route('bindles');
}
public function render()
{
return view('livewire.bindle.gallery')
->layout('layouts.app', [
'SEOData' => new SEOData(
title: __('Bindle Gallery'),
description: __('Die berühmte Bindlesammlung von FiatTracker.'),
image: asset('img/fiat_tracker.jpg'),
),
]);
}
}

View File

@@ -6,7 +6,6 @@ use App\Enums\LibraryItemType;
use App\Models\Country;
use App\Models\Library;
use App\Models\LibraryItem;
use App\Models\Tag;
use App\Traits\HasTagsTrait;
use Illuminate\Validation\Rule;
use Livewire\Component;
@@ -33,7 +32,7 @@ class LibraryItemForm extends Component
public ?string $fromUrl = '';
protected $queryString = [
'fromUrl' => ['except' => ''],
'fromUrl' => ['except' => ''],
'lecturer' => ['except' => false],
];
@@ -46,11 +45,11 @@ class LibraryItemForm extends Component
'selectedTags' => 'array|min:1',
'libraryItem.lecturer_id' => 'required',
'libraryItem.name' => 'required',
'libraryItem.type' => 'required',
'libraryItem.language_code' => 'required',
'libraryItem.value' => [
'libraryItem.lecturer_id' => 'required',
'libraryItem.name' => 'required',
'libraryItem.type' => 'required',
'libraryItem.language_code' => 'required',
'libraryItem.value' => [
'required',
Rule::when(
$this->libraryItem->type !== LibraryItemType::MarkdownArticle()
@@ -58,11 +57,35 @@ class LibraryItemForm extends Component
&& $this->libraryItem->type !== LibraryItemType::DownloadableFile(), ['url']
),
],
'libraryItem.subtitle' => 'required',
'libraryItem.excerpt' => 'required',
'libraryItem.main_image_caption' => 'required',
'libraryItem.read_time' => 'required',
'libraryItem.approved' => 'boolean',
'libraryItem.subtitle' => 'required',
'libraryItem.excerpt' =>
[
Rule::when(
$this->libraryItem->type !== 'bindle',
'required',
)
],
'libraryItem.main_image_caption' =>
[
Rule::when(
$this->libraryItem->type !== 'bindle',
'required',
)
],
'libraryItem.read_time' =>
[
Rule::when(
$this->libraryItem->type !== 'bindle',
'required',
)
],
'libraryItem.approved' =>
[
Rule::when(
$this->libraryItem->type !== 'bindle',
'required',
)
],
];
}
@@ -70,22 +93,22 @@ class LibraryItemForm extends Component
{
if (!$this->libraryItem) {
$this->libraryItem = new LibraryItem([
'approved' => true,
'approved' => true,
'read_time' => 1,
'value' => '',
'value' => '',
]);
if ($this->lecturer) {
$this->library = Library::query()
->firstWhere('name', '=', 'Dozentenmaterial')?->id;
->firstWhere('name', '=', 'Dozentenmaterial')?->id;
}
} else {
$this->selectedTags = $this->libraryItem->tags()
->where('type', 'library_item')
->get()
->map(fn($tag) => $tag->name)
->toArray();
->where('type', 'library_item')
->get()
->map(fn($tag) => $tag->name)
->toArray();
$this->library = $this->libraryItem->libraries()
->first()
->first()
->id;
}
if (!$this->fromUrl) {
@@ -106,38 +129,55 @@ class LibraryItemForm extends Component
if ($this->image) {
$this->libraryItem->addMedia($this->image)
->usingFileName(md5($this->image->getClientOriginalName()).'.'.$this->image->getClientOriginalExtension())
->toMediaCollection('main');
->usingFileName(md5($this->image->getClientOriginalName()) . '.' . $this->image->getClientOriginalExtension())
->toMediaCollection('main');
}
if ($this->file) {
$this->libraryItem->addMedia($this->file)
->usingFileName(md5($this->file->getClientOriginalName()).'.'.$this->file->getClientOriginalExtension())
->toMediaCollection('single_file');
->usingFileName(md5($this->file->getClientOriginalName()) . '.' . $this->file->getClientOriginalExtension())
->toMediaCollection('single_file');
}
$this->libraryItem->libraries()
->syncWithoutDetaching([(int) $this->library]);
->syncWithoutDetaching([(int)$this->library]);
if ($this->libraryItem->type === 'bindle') {
return to_route('bindles');
}
return to_route('library.table.libraryItems', ['country' => $this->country]);
}
public function render()
{
$types = Options::forEnum(LibraryItemType::class)
->filter(
fn($type) => $type !== LibraryItemType::PodcastEpisode
&& $type !== LibraryItemType::MarkdownArticle
)
->toArray();
$libaries = Library::query()
->when(auth()->id() !== config('portal.bonus.fiat-tracker-user-id'),
fn($query) => $query->where('name', '!=', 'Bindle')
)
->get()
->map(fn($library) => [
'id' => $library->id,
'name' => $library->name,
])
->toArray();
if (auth()->id() === config('portal.bonus.fiat-tracker-user-id')) {
$types = collect($types)->prepend([
'label' => 'Bindle',
'value' => 'bindle',
]);
}
return view('livewire.library.form.library-item-form', [
'types' => Options::forEnum(LibraryItemType::class)
->filter(
fn($type) => $type !== LibraryItemType::PodcastEpisode
&& $type !== LibraryItemType::MarkdownArticle
)
->toArray(),
'libraries' => Library::query()
->get()
->map(fn($library) => [
'id' => $library->id,
'name' => $library->name,
])
->toArray(),
'types' => $types,
'libraries' => $libaries,
]);
}
}

View File

@@ -25,8 +25,8 @@ class LibraryTable extends Component
protected $queryString = [
'currentTab' => ['except' => '*'],
'filters' => ['except' => ''],
'search' => ['except' => ''],
'filters' => ['except' => ''],
'search' => ['except' => ''],
];
public function loadMore()
@@ -56,10 +56,11 @@ class LibraryTable extends Component
{
$shouldBePublic = !$this->isLecturerPage;
$libraries = \App\Models\Library::query()
->whereNull('parent_id')
->where('is_public', $shouldBePublic)
->orderBy('name')
->get();
->where('name', '!=', 'Bindle')
->whereNull('parent_id')
->where('is_public', $shouldBePublic)
->orderBy('name')
->get();
$tabs = collect([
[
'name' => '*',
@@ -73,49 +74,50 @@ class LibraryTable extends Component
if ($this->currentTab !== '*') {
$parentLibrary = Library::query()
->where('name', $this->currentTab)
->first();
->where('name', $this->currentTab)
->first();
}
$searchTags = [];
if ($this->search) {
$searchTags = Tag::where('name', 'ilike', '%'.$this->search.'%')
->pluck('id')
->toArray();
$searchTags = Tag::where('name', 'ilike', '%' . $this->search . '%')
->pluck('id')
->toArray();
}
return view('livewire.library.library-table', [
'libraries' => $tabs,
'libraries' => $tabs,
'libraryItems' => LibraryItem::query()
->with([
'lecturer',
'tags',
])
->when($this->search, fn($query) => $query
->where('name', 'ilike', '%'.$this->search.'%')
->orWhere(fn($query) => $query
->when(count($searchTags) > 0 && count($this->filters) < 1,
fn($query) => $query->whereHas('tags',
fn($query) => $query->whereIn('tags.id', $searchTags)))
)
)
->when($this->currentTab !== '*', fn($query) => $query
->whereHas('libraries',
fn($query) => $query
->where('libraries.name', $this->currentTab)
)
)
->when(isset($this->filters['lecturer_id']),
fn($query) => $query->where('library_items.lecturer_id',
$this->filters['lecturer_id'])
)
->when(isset($this->filters['tag']), fn($query) => $query->whereHas('tags',
fn($query) => $query->whereIn('tags.id', $this->filters['tag'])))
->when(isset($this->filters['language']),
fn($query) => $query->whereIn('language_code', $this->filters['language']))
->whereHas('libraries',
fn($query) => $query->where('libraries.is_public', $shouldBePublic))
->orderByDesc('library_items.created_at')
->paginate($this->perPage),
->with([
'lecturer',
'tags',
])
->where('type', '!=', 'bindle')
->when($this->search, fn($query) => $query
->where('name', 'ilike', '%' . $this->search . '%')
->orWhere(fn($query) => $query
->when(count($searchTags) > 0 && count($this->filters) < 1,
fn($query) => $query->whereHas('tags',
fn($query) => $query->whereIn('tags.id', $searchTags)))
)
)
->when($this->currentTab !== '*', fn($query) => $query
->whereHas('libraries',
fn($query) => $query
->where('libraries.name', $this->currentTab)
)
)
->when(isset($this->filters['lecturer_id']),
fn($query) => $query->where('library_items.lecturer_id',
$this->filters['lecturer_id'])
)
->when(isset($this->filters['tag']), fn($query) => $query->whereHas('tags',
fn($query) => $query->whereIn('tags.id', $this->filters['tag'])))
->when(isset($this->filters['language']),
fn($query) => $query->whereIn('language_code', $this->filters['language']))
->whereHas('libraries',
fn($query) => $query->where('libraries.is_public', $shouldBePublic))
->orderByDesc('library_items.created_at')
->paginate($this->perPage),
])->layout('layouts.app', [
'SEOData' => new SEOData(
title: __('Library'),

6
config/portal/bonus.php Normal file
View File

@@ -0,0 +1,6 @@
<?php
return [
'fiat-tracker-user-id' => env('FIAT_TRACKER_USER_ID', 1),
];

BIN
public/img/fiat_tracker.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

View File

@@ -0,0 +1,90 @@
<div class="bg-21gray flex flex-col h-screen">
{{-- HEADER --}}
<livewire:frontend.header :country="null"/>
<div class="mx-auto max-w-screen-2xl px-4 py-10 sm:px-6 lg:px-8">
<div class="flex">
<div>
<div class="py-6">
@if(auth()->id() === config('portal.bonus.fiat-tracker-user-id'))
<x-button icon="plus"
:href="route('library.libraryItem.form', ['country' => 'de'])">
{{ __('Neues Bindle hochladen') }}
</x-button>
@endif
</div>
<div>
<h1 class="text-4xl text-white py-8">Sent from my #₿indle🧡</h1>
<ul role="list"
class="grid grid-cols-2 gap-x-4 gap-y-8 sm:grid-cols-3 sm:gap-x-6 lg:grid-cols-4 xl:gap-x-8">
@foreach($bindles as $bindle)
<li wire:key="image_{{ $bindle->id }}">
<div>
<div
class="aspect-h-7 aspect-w-10 block w-full rounded-lg bg-gray-100">
<a target="_blank" href="{{ $bindle->getFirstMediaUrl('main') }}">
<img src="{{ $bindle->getFirstMediaUrl('main') }}" alt="{{ $bindle->name }}"
class="object-cover">
</a>
<button type="button" class="absolute inset-0 focus:outline-none">
<span class="sr-only">{{ $bindle->name }}</span>
</button>
</div>
<p class="mt-2 block truncate text-sm font-medium text-gray-100">{{ $bindle->name }}</p>
<div>
<a href="{{ $bindle->value }}" target="_blank" class="text-md font-medium text-gray-100">{{ $bindle->value }}</a>
</div>
</div>
<div class="text-sm font-medium text-gray-100 py-4">
@if(auth()->id() === config('portal.bonus.fiat-tracker-user-id'))
<x-button
negative
xs
icon="trash"
label="{{ __('Delete') }}"
x-on:confirm="{
title: 'Are you sure you want to delete this bindle?',
icon: 'warning',
method: 'deleteBindle',
params: {{ $bindle->id }}
}"
/>
@endif
</div>
</li>
@endforeach
</ul>
</div>
</div>
<div>
<div wire:ignore>
<div
class="flex flex-col justify-center text-center space-x-4 py-4 mt-4">
<h1 class="text-2xl text-gray-200">value-4-value</h1>
<div wire:ignore>
<lightning-widget
name="fiattracker"
accent="#f7931a"
to="fiattracker@current.tips"
image="https://primal.b-cdn.net/media-cache?s=m&a=1&u=https%3A%2F%2Fphoto.starbackr.com%2F6398268f7354d37fe0b31829%2Fprofile%2F1674719214461.jpg"
amounts="21,210,2100,21000"
/>
</div>
</div>
<script src="https://embed.twentyuno.net/js/app.js"></script>
</div>
</div>
</div>
</div>
</div>

View File

@@ -57,6 +57,12 @@
{{ __('Podcast Episodes') }}
</a>
<a href="{{ route('bindles', ['country' => null]) }}"
class="flex gap-x-4 py-2 text-sm font-semibold leading-6 text-gray-900">
<i class="fa-thin fa-image flex-none text-gray-400 w-6 h-5 mr-2 -ml-1"></i>
{{ __('Bindles') }}
</a>
@auth
<a href="{{ route('library.table.lecturer', ['country' => $country]) }}"
class="flex gap-x-4 py-2 text-sm font-semibold leading-6 text-gray-900">

View File

@@ -39,13 +39,13 @@
wire:model="libraryItem.lecturer_id"
:searchable="true"
:async-data="[
'api' => route('api.lecturers.index'),
'method' => 'GET', // default is GET
]"
'api' => route('api.lecturers.index'),
'method' => 'GET', // default is GET
]"
:template="[
'name' => 'user-option',
'config' => ['src' => 'image']
]"
'name' => 'user-option',
'config' => ['src' => 'image']
]"
option-label="name"
option-value="id"
/>

View File

@@ -20,6 +20,10 @@ Route::middleware([])
->get('/kaninchenbau', \App\Http\Livewire\Helper\FollowTheRabbit::class)
->name('kaninchenbau');
Route::middleware([])
->get('/bindles', \App\Http\Livewire\Bindle\Gallery::class)
->name('bindles');
Route::get('/img/{path}', \App\Http\Controllers\ImageController::class)
->where('path', '.*')
->name('img');