routes changed

This commit is contained in:
Benjamin Takats
2022-12-15 20:15:56 +01:00
parent ffe6cc877f
commit 0dd8ec4037
6 changed files with 24 additions and 20 deletions

View File

@@ -8,6 +8,7 @@ use Livewire\Component;
class CityTable extends Component class CityTable extends Component
{ {
public Country $country; public Country $country;
public function render() public function render()
{ {
return view('livewire.book-case.city-table'); return view('livewire.book-case.city-table');

View File

@@ -14,6 +14,8 @@ class BookCaseTable extends DataTableComponent
{ {
use Actions; use Actions;
public string $country;
public bool $viewingModal = false; public bool $viewingModal = false;
public $currentModal; public $currentModal;
public array $orangepill = [ public array $orangepill = [
@@ -94,7 +96,7 @@ class BookCaseTable extends DataTableComponent
) )
->html(), ->html(),
Column::make('Orange-Pilled', 'orange_pilled') Column::make('Orange-Pilled', 'orange_pilled')
->label(fn($row, Column $column) => view('columns.book_cases.oranged-pilled')->withRow($row)), ->label(fn($row, Column $column) => view('columns.book_cases.oranged-pilled')->withRow($row)->withCountry($this->country))
]; ];
} }

View File

@@ -114,6 +114,7 @@ class CityTable extends DataTableComponent
return to_route('bookCases.table.bookcases', [ return to_route('bookCases.table.bookcases', [
'#table', '#table',
'country' => $this->country,
'table' => [ 'table' => [
'filters' => [ 'filters' => [
'byids' => $ids->implode(',') 'byids' => $ids->implode(',')

View File

@@ -8,7 +8,7 @@
@endif @endif
<div class="flex items-center space-x-1"> <div class="flex items-center space-x-1">
<x-button class="whitespace-nowrap" primary class="text-21gray whitespace-nowrap" wire:click="viewHistoryModal({{ $row->id }})">💊 Orange Pill Now</x-button> <x-button class="whitespace-nowrap" primary class="text-21gray whitespace-nowrap" wire:click="viewHistoryModal({{ $row->id }})">💊 Orange Pill Now</x-button>
<x-button class="whitespace-nowrap" :href="route('bookCases.comment.bookcase', ['bookCase' => $row->id])">Details</x-button> <x-button class="whitespace-nowrap" :href="route('bookCases.comment.bookcase', ['bookCase' => $row->id, 'country' => $country])">Details</x-button>
</div> </div>
@else @else
<div> <div>

View File

@@ -4,7 +4,7 @@
{{-- MAIN --}} {{-- MAIN --}}
<section class="w-full mb-12"> <section class="w-full mb-12">
<div class="max-w-screen-2xl mx-auto px-2 sm:px-10" id="table"> <div class="max-w-screen-2xl mx-auto px-2 sm:px-10" id="table">
<livewire:tables.book-case-table/> <livewire:tables.book-case-table :country="$c"/>
</div> </div>
</section> </section>
{{-- FOOTER --}} {{-- FOOTER --}}

View File

@@ -14,21 +14,21 @@ Route::get('/auth/ln', \App\Http\Livewire\Auth\LNUrlAuth::class)
* */ * */
Route::middleware([]) Route::middleware([])
->as('school.') ->as('school.')
->prefix('school') ->prefix('/{country:code}/school')
->group(function () { ->group(function () {
Route::get('/{country:code}/table/city', \App\Http\Livewire\School\CityTable::class) Route::get('/city', \App\Http\Livewire\School\CityTable::class)
->name('table.city'); ->name('table.city');
Route::get('/{country:code}/table/lecturer', \App\Http\Livewire\School\LecturerTable::class) Route::get('/lecturer', \App\Http\Livewire\School\LecturerTable::class)
->name('table.lecturer'); ->name('table.lecturer');
Route::get('/{country:code}/table/venue', \App\Http\Livewire\School\VenueTable::class) Route::get('/venue', \App\Http\Livewire\School\VenueTable::class)
->name('table.venue'); ->name('table.venue');
Route::get('/{country:code}/table/course', \App\Http\Livewire\School\CouseTable::class) Route::get('/course', \App\Http\Livewire\School\CouseTable::class)
->name('table.course'); ->name('table.course');
Route::get('/{country:code}/table/event', \App\Http\Livewire\School\EventTable::class) Route::get('/event', \App\Http\Livewire\School\EventTable::class)
->name('table.event'); ->name('table.event');
}); });
@@ -37,12 +37,12 @@ Route::middleware([])
* */ * */
Route::middleware([]) Route::middleware([])
->as('library.') ->as('library.')
->prefix('library') ->prefix('/{country:code}/library')
->group(function () { ->group(function () {
Route::get('/{country:code}/table/library-item', \App\Http\Livewire\Library\LibraryTable::class) Route::get('/library-item', \App\Http\Livewire\Library\LibraryTable::class)
->name('table.libraryItems'); ->name('table.libraryItems');
Route::get('/{country:code}/table/content-creator', \App\Http\Livewire\Library\LibraryTable::class) Route::get('/content-creator', \App\Http\Livewire\Library\LibraryTable::class)
->name('table.lecturer'); ->name('table.lecturer');
}); });
@@ -51,12 +51,12 @@ Route::middleware([])
* */ * */
Route::middleware([]) Route::middleware([])
->as('bookCases.') ->as('bookCases.')
->prefix('book-cases') ->prefix('/{country:code}/book-cases')
->group(function () { ->group(function () {
Route::get('/{country:code}/table/city', \App\Http\Livewire\BookCase\CityTable::class) Route::get('/city', \App\Http\Livewire\BookCase\CityTable::class)
->name('table.city'); ->name('table.city');
Route::get('/table/book-case', \App\Http\Livewire\BookCase\BookCaseTable::class) Route::get('/overview', \App\Http\Livewire\BookCase\BookCaseTable::class)
->name('table.bookcases'); ->name('table.bookcases');
Route::get('/book-case/{bookCase}', \App\Http\Livewire\BookCase\CommentBookCase::class) Route::get('/book-case/{bookCase}', \App\Http\Livewire\BookCase\CommentBookCase::class)
@@ -68,9 +68,9 @@ Route::middleware([])
* */ * */
Route::middleware([]) Route::middleware([])
->as('bitcoinEvent.') ->as('bitcoinEvent.')
->prefix('event') ->prefix('/{country:code}/event')
->group(function () { ->group(function () {
Route::get('/{country:code}/table/event', \App\Http\Livewire\BitcoinEvent\BitcoinEventTable::class) Route::get('overview', \App\Http\Livewire\BitcoinEvent\BitcoinEventTable::class)
->name('table.bitcoinEvent'); ->name('table.bitcoinEvent');
}); });
@@ -80,11 +80,11 @@ Route::middleware([])
* */ * */
Route::middleware([]) Route::middleware([])
->as('meetup.') ->as('meetup.')
->prefix('meetup') ->prefix('/{country:code}/meetup')
->group(function () { ->group(function () {
Route::get('/{country:code}/table/meetup', \App\Http\Livewire\Meetup\MeetupTable::class) Route::get('overview', \App\Http\Livewire\Meetup\MeetupTable::class)
->name('table.meetup'); ->name('table.meetup');
Route::get('/{country:code}/table/meetup-events', \App\Http\Livewire\Meetup\MeetupEventTable::class) Route::get('/meetup-events', \App\Http\Livewire\Meetup\MeetupEventTable::class)
->name('table.meetupEvent'); ->name('table.meetupEvent');
}); });