einundzwanzig/einundzwanzig-portal
1
0
Fork 0
mirror of https://github.com/Einundzwanzig-Podcast/einundzwanzig-portal.git synced 2025-12-11 06:46:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

table changes

Browse Source
This commit is contained in:
Benjamin Takats
2023-01-19 15:44:09 +01:00
parent 31c7b47548
commit faeb31d4b2
17 changed files with 46 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Livewire/BitcoinEvent/BitcoinEventTable.php
View File

@@ -43,6 +43,11 @@ class BitcoinEventTable extends Component
]), ]),
'events' => BitcoinEvent::query() 'events' => BitcoinEvent::query()
->where('bitcoin_events.from', '>=', now()) ->where('bitcoin_events.from', '>=', now())
->where(fn($query) => $query
->whereHas('venue.city.country',
fn($query) => $query->where('countries.code', $this->country->code))
->orWhere('show_worldwide', true)
)
->get() ->get()
->map(fn($event) => [ ->map(fn($event) => [
'id' => $event->id, 'id' => $event->id,
@@ -66,7 +71,7 @@ class BitcoinEventTable extends Component
'#table', '#table',
'country' => $this->country->code, 'country' => $this->country->code,
'year' => $this->year, 'year' => $this->year,
'table' => [ 'bitcoin_events' => [
'filters' => [ 'filters' => [
'byid' => $id, 'byid' => $id,
], ],
@@ -80,7 +85,7 @@ class BitcoinEventTable extends Component
'#table', '#table',
'country' => $this->country->code, 'country' => $this->country->code,
'year' => $this->year, 'year' => $this->year,
'table' => [ 'bitcoin_events' => [
'filters' => [ 'filters' => [
'byid' => $ids, 'byid' => $ids,
] ]

4
app/Http/Livewire/BookCase/BookCaseTable.php
View File

@@ -11,9 +11,9 @@ class BookCaseTable extends Component
{ {
public ?Country $country = null; public ?Country $country = null;
public string $c = 'de'; public string $c = 'de';
public array $table = []; public array $bookcases = [];
protected $queryString = ['table']; protected $queryString = ['bookcases'];
public function render() public function render()
{ {

4
app/Http/Livewire/Library/SearchByTagComponent.php
View File

@@ -8,10 +8,10 @@ use Livewire\Component;
class SearchByTagComponent extends Component class SearchByTagComponent extends Component
{ {
public string $country = 'de'; public string $country = 'de';
public ?array $table = []; public ?array $bookcases = [];
protected $queryString = [ protected $queryString = [
'table', 'library_items',
]; ];
public function render() public function render()

5
app/Http/Livewire/Meetup/MeetupEventTable.php
View File

@@ -71,7 +71,7 @@ class MeetupEventTable extends Component
'#table', '#table',
'country' => $this->country->code, 'country' => $this->country->code,
'year' => $this->year, 'year' => $this->year,
'table' => [ 'meetup_events' => [
'filters' => [ 'filters' => [
'byid' => $id, 'byid' => $id,
], ],
@@ -85,7 +85,8 @@ class MeetupEventTable extends Component
return to_route('meetup.table.meetupEvent', [ return to_route('meetup.table.meetupEvent', [
'#table', '#table',
'year' => $this->year, 'year' => $this->year,
'country' => $this->country->code, 'table' => [ 'country' => $this->country->code,
'meetup_events' => [
'filters' => [ 'filters' => [
'byid' => $ids, 'byid' => $ids,
] ]

4
app/Http/Livewire/School/CouseTable.php → app/Http/Livewire/School/CourseTable.php
View File

@@ -6,13 +6,13 @@ use App\Models\Country;
use Livewire\Component; use Livewire\Component;
use RalphJSmit\Laravel\SEO\Support\SEOData; use RalphJSmit\Laravel\SEO\Support\SEOData;
class CouseTable extends Component class CourseTable extends Component
{ {
public Country $country; public Country $country;
public function render() public function render()
{ {
return view('livewire.school.couse-table')->layout('layouts.app', [ return view('livewire.school.course-table')->layout('layouts.app', [
'SEOData' => new SEOData( 'SEOData' => new SEOData(
title: __('Courses'), title: __('Courses'),
description: __('Choose your city, search for courses in the surrounding area and select a topic that suits you.'), description: __('Choose your city, search for courses in the surrounding area and select a topic that suits you.'),

4
app/Http/Livewire/School/EventTable.php
View File

@@ -70,7 +70,7 @@ class EventTable extends Component
'#table', '#table',
'country' => $this->country->code, 'country' => $this->country->code,
'year' => $this->year, 'year' => $this->year,
'table' => [ 'course_events' => [
'filters' => [ 'filters' => [
'byid' => $id, 'byid' => $id,
], ],
@@ -84,7 +84,7 @@ class EventTable extends Component
'#table', '#table',
'country' => $this->country->code, 'country' => $this->country->code,
'year' => $this->year, 'year' => $this->year,
'table' => [ 'course_events' => [
'filters' => [ 'filters' => [
'byid' => $ids, 'byid' => $ids,
] ]

4
app/Http/Livewire/School/SearchByTagComponent.php
View File

@@ -8,10 +8,10 @@ use Livewire\Component;
class SearchByTagComponent extends Component class SearchByTagComponent extends Component
{ {
public string $country = 'de'; public string $country = 'de';
public ?array $table = []; public ?array $courses = [];
protected $queryString = [ protected $queryString = [
'table', 'courses',
]; ];
public function render() public function render()

4
app/Http/Livewire/Tables/CityTable.php
View File

@@ -92,7 +92,7 @@ class CityTable extends DataTableComponent
return to_route('school.table.event', [ return to_route('school.table.event', [
'#table', '#table',
'country' => $this->country, 'country' => $this->country,
'table' => [ 'course_events' => [
'filters' => [ 'filters' => [
'stadt' => $query->pluck('name') 'stadt' => $query->pluck('name')
->push($city->name) ->push($city->name)
@@ -117,7 +117,7 @@ class CityTable extends DataTableComponent
return to_route('bookCases.table.bookcases', [ return to_route('bookCases.table.bookcases', [
'#table', '#table',
'country' => $this->country, 'country' => $this->country,
'table' => [ 'bookcases' => [
'filters' => [ 'filters' => [
'byids' => $ids->implode(',') 'byids' => $ids->implode(',')
], ],

3
app/Http/Livewire/Tables/CourseTable.php
View File

@@ -61,6 +61,7 @@ class CourseTable extends DataTableComponent
->sortable() ->sortable()
->collapseOnMobile(), ->collapseOnMobile(),
Column::make("Name", "name") Column::make("Name", "name")
->searchable(fn(Builder $query, string $term) => $query->where('name', 'ilike', '%'.$term.'%'))
->sortable(), ->sortable(),
Column::make("Tags") Column::make("Tags")
->label( ->label(
@@ -105,7 +106,7 @@ class CourseTable extends DataTableComponent
return to_route('school.table.event', [ return to_route('school.table.event', [
'#table', '#table',
'country' => $this->country, 'country' => $this->country,
'table' => [ 'course_events' => [
'filters' => [ 'filters' => [
'course_id' => $id, 'course_id' => $id,
], ],

2
app/Http/Livewire/Tables/EventTable.php
View File

@@ -17,7 +17,7 @@ class EventTable extends DataTableComponent
public string $country; public string $country;
public bool $viewingModal = false; public bool $viewingModal = false;
public $currentModal; public $currentModal;
public string $tableName = 'events'; public string $tableName = 'course_events';
public function configure(): void public function configure(): void
{ {

5
app/Http/Livewire/Tables/LecturerTable.php
View File

@@ -47,6 +47,7 @@ class LecturerTable extends DataTableComponent
]) ])
->collapseOnMobile(), ->collapseOnMobile(),
Column::make("Name", "name") Column::make("Name", "name")
->searchable(fn($query, $term) => $query->where('name', 'ilike', '%'.$term.'%'))
->sortable(), ->sortable(),
BooleanColumn::make("Aktiv", 'active') BooleanColumn::make("Aktiv", 'active')
->sortable() ->sortable()
@@ -89,7 +90,7 @@ class LecturerTable extends DataTableComponent
return to_route('school.table.event', [ return to_route('school.table.event', [
'#table', '#table',
'country' => $this->country, 'country' => $this->country,
'table' => [ 'course_events' => [
'filters' => [ 'filters' => [
'dozent' => $lecturer->id, 'dozent' => $lecturer->id,
], ],
@@ -99,7 +100,7 @@ class LecturerTable extends DataTableComponent
return to_route('library.table.libraryItems', [ return to_route('library.table.libraryItems', [
'#table', '#table',
'country' => $this->country, 'country' => $this->country,
'table' => [ 'library_items' => [
'filters' => [ 'filters' => [
'lecturer_id' => $lecturer->id, 'lecturer_id' => $lecturer->id,
], ],

2
app/Http/Livewire/Tables/MeetupTable.php
View File

@@ -93,7 +93,7 @@ class MeetupTable extends DataTableComponent
return to_route('meetup.table.meetupEvent', [ return to_route('meetup.table.meetupEvent', [
'country' => $this->country ?? $meetup->city->country->code, 'country' => $this->country ?? $meetup->city->country->code,
'table' => [ 'meetup_events' => [
'filters' => ['bymeetupid' => $id], 'filters' => ['bymeetupid' => $id],
] ]
]); ]);

3
app/Http/Livewire/Tables/VenueTable.php
View File

@@ -47,6 +47,7 @@ class VenueTable extends DataTableComponent
]) ])
->collapseOnMobile(), ->collapseOnMobile(),
Column::make("Name", "name") Column::make("Name", "name")
->searchable(fn($query, $term) => $query->where('name', 'ilike', '%'.$term.'%'))
->sortable(), ->sortable(),
Column::make("Street", "street") Column::make("Street", "street")
->sortable() ->sortable()
@@ -82,7 +83,7 @@ class VenueTable extends DataTableComponent
return to_route('school.table.event', [ return to_route('school.table.event', [
'#table', '#table',
'country' => $this->country, 'country' => $this->country,
'table' => [ 'course_events' => [
'filters' => [ 'filters' => [
'venue' => $venue->name, 'venue' => $venue->name,
], ],

4
resources/views/livewire/library/search-by-tag-component.blade.php
View File

@@ -8,12 +8,12 @@
style="font-size: 128%; background-position: 0px center; list-style: outside;" style="font-size: 128%; background-position: 0px center; list-style: outside;"
> >
@php @php
$isActive = collect($table)->pluck('tag')->collapse()->contains($tag->name); $isActive = collect($library_items)->pluck('tag')->collapse()->contains($tag->name);
$activeClass = $isActive ? 'text-amber-500 bg-amber-500' : 'bg-blue-50 text-white hover:text-amber-500'; $activeClass = $isActive ? 'text-amber-500 bg-amber-500' : 'bg-blue-50 text-white hover:text-amber-500';
@endphp @endphp
<a <a
class="{{ $activeClass }} flex relative flex-col flex-shrink-0 justify-between py-1 px-3 w-full h-20 border-0 border-solid duration-300 ease-in-out cursor-pointer bg-opacity-[0.07]" class="{{ $activeClass }} flex relative flex-col flex-shrink-0 justify-between py-1 px-3 w-full h-20 border-0 border-solid duration-300 ease-in-out cursor-pointer bg-opacity-[0.07]"
href="{{ route(request()->route()->getName(), ['country' => $country, 'table' => ['filters' => ['tag' => [$tag->id]]]]) }}" href="{{ route(request()->route()->getName(), ['country' => $country, 'library_items' => ['filters' => ['tag' => [$tag->id]]]]) }}"
> >
<div <div
class="flex flex-1 items-center p-0 m-0 text-center align-baseline border-0 border-solid" class="flex flex-1 items-center p-0 m-0 text-center align-baseline border-0 border-solid"

0
resources/views/livewire/school/couse-table.blade.php → resources/views/livewire/school/course-table.blade.php
View File

4
resources/views/livewire/school/search-by-tag-component.blade.php
View File

@@ -8,12 +8,12 @@
style="font-size: 128%; background-position: 0px center; list-style: outside;" style="font-size: 128%; background-position: 0px center; list-style: outside;"
> >
@php @php
$isActive = collect($table)->pluck('tag')->collapse()->contains($tag->name); $isActive = collect($courses)->pluck('tag')->collapse()->contains($tag->name);
$activeClass = $isActive ? 'text-amber-500 bg-amber-500' : 'bg-blue-50 text-white hover:text-amber-500'; $activeClass = $isActive ? 'text-amber-500 bg-amber-500' : 'bg-blue-50 text-white hover:text-amber-500';
@endphp @endphp
<a <a
class="{{ $activeClass }} flex relative flex-col flex-shrink-0 justify-between py-1 px-3 w-full h-20 border-0 border-solid duration-300 ease-in-out cursor-pointer bg-opacity-[0.07]" class="{{ $activeClass }} flex relative flex-col flex-shrink-0 justify-between py-1 px-3 w-full h-20 border-0 border-solid duration-300 ease-in-out cursor-pointer bg-opacity-[0.07]"
href="{{ $isActive ? '#table' : route('school.table.course', ['country' => $country, 'table' => ['filters' => ['tag' => [$tag->name]]], '#table']) }}" href="{{ $isActive ? '#table' : route('school.table.course', ['country' => $country, 'courses' => ['filters' => ['tag' => [$tag->name]]], '#table']) }}"
> >
<div <div
class="flex flex-1 items-center p-0 m-0 text-center align-baseline border-0 border-solid" class="flex flex-1 items-center p-0 m-0 text-center align-baseline border-0 border-solid"

2
routes/web.php
View File

@@ -64,7 +64,7 @@ Route::middleware([
Route::get('/venue', \App\Http\Livewire\School\VenueTable::class) Route::get('/venue', \App\Http\Livewire\School\VenueTable::class)
->name('table.venue'); ->name('table.venue');
Route::get('/course', \App\Http\Livewire\School\CouseTable::class) Route::get('/course', \App\Http\Livewire\School\CourseTable::class)
->name('table.course'); ->name('table.course');
Route::get('/event', \App\Http\Livewire\School\EventTable::class) Route::get('/event', \App\Http\Livewire\School\EventTable::class)