From c9e91703fb47a96112d4d8e636452d121f8ce20d Mon Sep 17 00:00:00 2001 From: HolgerHatGarKeineNode Date: Sun, 26 Feb 2023 13:16:29 +0100 Subject: [PATCH] mobile nav changed --- app/Http/Livewire/Tables/CourseTable.php | 9 +- app/Http/Livewire/Tables/EventTable.php | 9 +- app/Http/Livewire/Tables/VenueTable.php | 9 +- resources/lang/de.json | 4 +- .../areas/toolbar-left-end.blade.php | 6 + .../courses/areas/toolbar-left-end.blade.php | 6 + .../venues/areas/toolbar-left-end.blade.php | 6 + .../book-case/form/orange-pill-form.blade.php | 156 +++++++++--------- .../livewire/city/form/city-form.blade.php | 100 +++++------ .../views/livewire/frontend/header.blade.php | 2 + 10 files changed, 179 insertions(+), 128 deletions(-) create mode 100644 resources/views/columns/course-events/areas/toolbar-left-end.blade.php create mode 100644 resources/views/columns/courses/areas/toolbar-left-end.blade.php create mode 100644 resources/views/columns/venues/areas/toolbar-left-end.blade.php diff --git a/app/Http/Livewire/Tables/CourseTable.php b/app/Http/Livewire/Tables/CourseTable.php index c4b106a7..70b2c3a4 100644 --- a/app/Http/Livewire/Tables/CourseTable.php +++ b/app/Http/Livewire/Tables/CourseTable.php @@ -32,7 +32,14 @@ class CourseTable extends DataTableComponent ]; }) ->setColumnSelectStatus(false) - ->setPerPage(10); + ->setPerPage(10) + ->setConfigurableAreas([ + 'toolbar-left-end' => [ + 'columns.courses.areas.toolbar-left-end', [ + 'country' => $this->country, + ], + ], + ]); } public function filters(): array diff --git a/app/Http/Livewire/Tables/EventTable.php b/app/Http/Livewire/Tables/EventTable.php index 7136a263..854a62ea 100644 --- a/app/Http/Livewire/Tables/EventTable.php +++ b/app/Http/Livewire/Tables/EventTable.php @@ -45,7 +45,14 @@ class EventTable extends DataTableComponent ]; }) ->setColumnSelectStatus(false) - ->setPerPage(10); + ->setPerPage(10) + ->setConfigurableAreas([ + 'toolbar-left-end' => [ + 'columns.course-events.areas.toolbar-left-end', [ + 'country' => $this->country, + ], + ], + ]); } public function filters(): array diff --git a/app/Http/Livewire/Tables/VenueTable.php b/app/Http/Livewire/Tables/VenueTable.php index 582494eb..c2b211a7 100644 --- a/app/Http/Livewire/Tables/VenueTable.php +++ b/app/Http/Livewire/Tables/VenueTable.php @@ -31,7 +31,14 @@ class VenueTable extends DataTableComponent ]; }) ->setColumnSelectStatus(false) - ->setPerPage(10); + ->setPerPage(10) + ->setConfigurableAreas([ + 'toolbar-left-end' => [ + 'columns.venues.areas.toolbar-left-end', [ + 'country' => $this->country, + ], + ], + ]); } public function columns(): array diff --git a/resources/lang/de.json b/resources/lang/de.json index c967546a..02e91685 100644 --- a/resources/lang/de.json +++ b/resources/lang/de.json @@ -784,6 +784,6 @@ "You overwrite your user\\'s public key and then have to log in with the wallet, which you now use to scan or log in.": "", ":name\\'s Avatar": "", "Manage": "Verwalten", - "Manage content creators": "Verwalte Content Creator", - "Lecturers\/Content Creators": "Dozenten\/Content Creator" + "Manage content creators": "Verwalte Content Creators", + "Lecturers\/Content Creators": "Dozenten\/Content Creators" } diff --git a/resources/views/columns/course-events/areas/toolbar-left-end.blade.php b/resources/views/columns/course-events/areas/toolbar-left-end.blade.php new file mode 100644 index 00000000..f43cf186 --- /dev/null +++ b/resources/views/columns/course-events/areas/toolbar-left-end.blade.php @@ -0,0 +1,6 @@ +
+ + + {{ __('Register course date') }} + +
diff --git a/resources/views/columns/courses/areas/toolbar-left-end.blade.php b/resources/views/columns/courses/areas/toolbar-left-end.blade.php new file mode 100644 index 00000000..3cf97901 --- /dev/null +++ b/resources/views/columns/courses/areas/toolbar-left-end.blade.php @@ -0,0 +1,6 @@ +
+ + + {{ __('Register course') }} + +
diff --git a/resources/views/columns/venues/areas/toolbar-left-end.blade.php b/resources/views/columns/venues/areas/toolbar-left-end.blade.php new file mode 100644 index 00000000..42efd3a2 --- /dev/null +++ b/resources/views/columns/venues/areas/toolbar-left-end.blade.php @@ -0,0 +1,6 @@ +
+ + + {{ __('Create venue') }} + +
diff --git a/resources/views/livewire/book-case/form/orange-pill-form.blade.php b/resources/views/livewire/book-case/form/orange-pill-form.blade.php index 46c719bf..990c7311 100644 --- a/resources/views/livewire/book-case/form/orange-pill-form.blade.php +++ b/resources/views/livewire/book-case/form/orange-pill-form.blade.php @@ -1,81 +1,87 @@ -
+
+ {{-- HEADER --}} + -
-

{{ __('Book Case') }}: {{ $bookCase->title }}

-
-
- @if($orangePill->id) - - - {{ __('Delete') }} +
+ +
+

{{ __('Book Case') }}: {{ $bookCase->title }}

+
+
+ @if($orangePill->id) + + + {{ __('Delete') }} + + @endif +
+
+ + + {{ __('Back') }} - @endif -
-
- - - {{ __('Back') }} - +
+ +
+
+
+ + +
+ @if ($image) +
{{ __('Preview') }}:
+ + @endif + @if ($orangePill->getFirstMediaUrl('images')) +
{{ __('Current picture') }}:
+ + @endif +
+ + @error('image') {{ $message }} @enderror +
+ + + + + + + + + + + + + + + + + {{ __('Save') }} + + + +
+
+
- -
-
-
- - -
- @if ($image) -
{{ __('Preview') }}:
- - @endif - @if ($orangePill->getFirstMediaUrl('images')) -
{{ __('Current picture') }}:
- - @endif -
- - @error('image') {{ $message }} @enderror -
- - - - - - - - - - - - - - - - - {{ __('Save') }} - - - -
-
-
diff --git a/resources/views/livewire/city/form/city-form.blade.php b/resources/views/livewire/city/form/city-form.blade.php index be9c33b0..66eee38e 100644 --- a/resources/views/livewire/city/form/city-form.blade.php +++ b/resources/views/livewire/city/form/city-form.blade.php @@ -1,66 +1,70 @@ -
+
+ {{-- HEADER --}} + +
-
-

{{ __('City') }}

-
-
- - - {{ __('Back') }} - +
+

{{ __('City') }}

+
+
+ + + {{ __('Back') }} + +
-
-
-
-
+ +
+
- - + 'user-option', 'config' => ['src' => 'flag'] ]" - option-label="name" - option-value="id" - /> - + option-label="name" + option-value="id" + /> + - - - + + + - - - - + + + + - - - - + + + + - - - - {{ __('Save') }} - - + + + + {{ __('Save') }} + + +
-
- + +
diff --git a/resources/views/livewire/frontend/header.blade.php b/resources/views/livewire/frontend/header.blade.php index efb320c4..6a0560ea 100644 --- a/resources/views/livewire/frontend/header.blade.php +++ b/resources/views/livewire/frontend/header.blade.php @@ -95,6 +95,8 @@ x-show="open" style="display: none;"> {{ __('News Article') }} + {{ __('Manage content creators') }}