From e444a4e9734c3d7d643f84763de9752c512ba618 Mon Sep 17 00:00:00 2001 From: Benjamin Takats Date: Tue, 24 Jan 2023 16:59:36 +0100 Subject: [PATCH] KEY FIX --- .../Commands/Database/SyncGithubMeetups.php | 10 +- .../columns/bitcoin_events/link.blade.php | 2 +- .../book_cases/oranged-pilled.blade.php | 16 ++- .../views/columns/cities/action.blade.php | 48 ++++--- .../views/columns/courses/action.blade.php | 2 +- .../views/columns/events/action.blade.php | 2 +- .../views/columns/lectures/action.blade.php | 70 +++++---- .../columns/library_items/action.blade.php | 78 +++++----- .../columns/meetup_events/link.blade.php | 82 ++++++----- .../views/columns/meetups/action.blade.php | 134 ++++++++++-------- .../views/columns/venues/action.blade.php | 26 ++-- 11 files changed, 267 insertions(+), 203 deletions(-) diff --git a/app/Console/Commands/Database/SyncGithubMeetups.php b/app/Console/Commands/Database/SyncGithubMeetups.php index 8559775a..c24518b8 100644 --- a/app/Console/Commands/Database/SyncGithubMeetups.php +++ b/app/Console/Commands/Database/SyncGithubMeetups.php @@ -39,7 +39,15 @@ class SyncGithubMeetups extends Command 'github_data' => $meetup, ]); } else { - $this->info('Missing: '.$meetup['name'] . ' Url: ' . $meetup['url']); + $this->info('Missing: '.$meetup['name'].' Url: '.$meetup['url']); + if (app()->environment('local')) { + Meetup::create([ + 'name' => $meetup['name'], + 'city_id' => 1, + 'created_by' => 1, + 'github_data' => $meetup, + ]); + } } } diff --git a/resources/views/columns/bitcoin_events/link.blade.php b/resources/views/columns/bitcoin_events/link.blade.php index 305bb408..de6fd36e 100644 --- a/resources/views/columns/bitcoin_events/link.blade.php +++ b/resources/views/columns/bitcoin_events/link.blade.php @@ -1,4 +1,4 @@ -
+
{{ __('Link') }} diff --git a/resources/views/columns/book_cases/oranged-pilled.blade.php b/resources/views/columns/book_cases/oranged-pilled.blade.php index 1d25a25b..6f345d9c 100644 --- a/resources/views/columns/book_cases/oranged-pilled.blade.php +++ b/resources/views/columns/book_cases/oranged-pilled.blade.php @@ -1,11 +1,15 @@
@auth - @if($row->orange_pills_count > 0) - - @endif - @if($row->orange_pills_count < 1) - - @endif +
+ @if($row->orange_pills_count > 0) + + @endif +
+
+ @if($row->orange_pills_count < 1) + + @endif +
{{ __('💊 Orange Pill Now') }} diff --git a/resources/views/columns/cities/action.blade.php b/resources/views/columns/cities/action.blade.php index eba11048..3831e1c2 100644 --- a/resources/views/columns/cities/action.blade.php +++ b/resources/views/columns/cities/action.blade.php @@ -1,26 +1,32 @@ -
+
@if($type === 'school')
- @if($row->course_events_count > 0) - - - {{ __('Perimeter search course date :name (100km)', ['name' => $row->name]) }} - - @endif - @if($row->course_events_count < 1) - - - {{ __('Perimeter search course date :name (100km)', ['name' => $row->name]) }} - - @endif -
- @endif - @if($type === 'bookCase') -
- - - {{ __('Perimeter search bookcase :name (25km)', ['name' => $row->name]) }} - +
+ @if($row->course_events_count > 0) + + + {{ __('Perimeter search course date :name (100km)', ['name' => $row->name]) }} + + @endif +
+
+ @if($row->course_events_count < 1) + + + {{ __('Perimeter search course date :name (100km)', ['name' => $row->name]) }} + + @endif +
@endif +
+ @if($type === 'bookCase') +
+ + + {{ __('Perimeter search bookcase :name (25km)', ['name' => $row->name]) }} + +
+ @endif +
diff --git a/resources/views/columns/courses/action.blade.php b/resources/views/columns/courses/action.blade.php index c3984c55..87854c56 100644 --- a/resources/views/columns/courses/action.blade.php +++ b/resources/views/columns/courses/action.blade.php @@ -1,4 +1,4 @@ -
+
{{ __('Show dates') }} diff --git a/resources/views/columns/events/action.blade.php b/resources/views/columns/events/action.blade.php index 0aaf0e9e..d436bf39 100644 --- a/resources/views/columns/events/action.blade.php +++ b/resources/views/columns/events/action.blade.php @@ -1,3 +1,3 @@ -
+
{{ __('Register') }}
diff --git a/resources/views/columns/lectures/action.blade.php b/resources/views/columns/lectures/action.blade.php index 61e74451..bdf450fe 100644 --- a/resources/views/columns/lectures/action.blade.php +++ b/resources/views/columns/lectures/action.blade.php @@ -1,32 +1,42 @@ -
- @if($row->courses_count > 0) - - - {{ __('Show dates') }} ({{ $row->courses_count }}) +
+
+ @if($row->courses_count > 0) + + + {{ __('Show dates') }} ({{ $row->courses_count }}) + + @endif +
+
+ @if($row->courses_count < 1) + + + {{ __('Show dates') }} ({{ $row->courses_count }}) + + @endif +
+
+ @if($row->library_items_count > 0) + + + {{ __('Show content') }} ({{ $row->library_items_count }}) + + @endif +
+
+ @if($row->library_items_count < 1) + + + {{ __('Show content') }} ({{ $row->library_items_count }}) + + @endif +
+
+ + + {{ __('Show landing page') }} - @endif - @if($row->courses_count < 1) - - - {{ __('Show dates') }} ({{ $row->courses_count }}) - - @endif - @if($row->library_items_count > 0) - - - {{ __('Show content') }} ({{ $row->library_items_count }}) - - @endif - @if($row->library_items_count < 1) - - - {{ __('Show content') }} ({{ $row->library_items_count }}) - - @endif - - - {{ __('Show landing page') }} - +
diff --git a/resources/views/columns/library_items/action.blade.php b/resources/views/columns/library_items/action.blade.php index c15d5796..1b8e79e3 100644 --- a/resources/views/columns/library_items/action.blade.php +++ b/resources/views/columns/library_items/action.blade.php @@ -1,39 +1,48 @@ -
- @if(str($row->value)->contains('http')) - - - {{ __('Open') }} - - @endif - @if($row->type === 'downloadable_file') - - - {{ __('Download') }} - - @endif - @if($row->type === 'podcast_episode') - - - {{ __('Listen') }} - - @endif - @if($row->type === 'markdown_article') - - - {{ __('Read') }} - - @endif +
+
+ @if(str($row->value)->contains('http')) + + + {{ __('Open') }} + + @endif +
+
+ @if($row->type === 'downloadable_file') + + + {{ __('Download') }} + + @endif +
+
+ @if($row->type === 'podcast_episode') + + + {{ __('Listen') }} + + @endif +
+
+ @if($row->type === 'markdown_article') + + + {{ __('Read') }} + + @endif +
- @if($row->type !== 'markdown_article') - route('library.table.libraryItems', ['country' => 'de', 'table' => ['filters' => ['id' => $row->id]]]) }}', }" - @click.prevent="window.navigator.clipboard.writeText(textToCopy);window.$wireui.notify({title:'{{ __('Share url copied!') }}',icon:'success'});" - xs black> - - {{ __('Share link') }} - + @click.prevent="window.navigator.clipboard.writeText(textToCopy);window.$wireui.notify({title:'{{ __('Share url copied!') }}',icon:'success'});" + xs black> + + {{ __('Share link') }} + @else {{ __('Share link') }} - @endif + @endif +
diff --git a/resources/views/columns/meetup_events/link.blade.php b/resources/views/columns/meetup_events/link.blade.php index bf1e9e64..537a4b75 100644 --- a/resources/views/columns/meetup_events/link.blade.php +++ b/resources/views/columns/meetup_events/link.blade.php @@ -1,43 +1,51 @@ -
- - - {{ __('Show landing page') }} - - @if($row->meetup->telegram_link) +
+
- - {{ __('Telegram-Link') }} - - @endif - @if($row->meetup->webpage) - - - {{ __('Website') }} + + {{ __('Show landing page') }} - @endif - @if($row->meetup->twitter_username) - - - {{ __('Twitter') }} - - @endif +
+
+ @if($row->meetup->telegram_link) + + + {{ __('Telegram-Link') }} + + @endif +
+
+ @if($row->meetup->webpage) + + + {{ __('Website') }} + + @endif +
+
+ @if($row->meetup->twitter_username) + + + {{ __('Twitter') }} + + @endif +
diff --git a/resources/views/columns/meetups/action.blade.php b/resources/views/columns/meetups/action.blade.php index 7994ade8..a81bec4f 100644 --- a/resources/views/columns/meetups/action.blade.php +++ b/resources/views/columns/meetups/action.blade.php @@ -1,72 +1,86 @@ -
- @if($row->meetup_events_count > 0) +
+
+ @if($row->meetup_events_count > 0) + + + {{ __('Show dates') }} ({{ $row->meetup_events_count }}) + + @endif +
+
+ @if($row->meetup_events_count < 1) + + + {{ __('Show dates') }} ({{ $row->meetup_events_count }}) + + @endif +
+
- - {{ __('Show dates') }} ({{ $row->meetup_events_count }}) - - @endif - @if($row->meetup_events_count < 1) - - - {{ __('Show dates') }} ({{ $row->meetup_events_count }}) - - @endif - $country ?? $row->city->country->code, 'meetup' => $row->id]) }}', }" - @click.prevent="window.navigator.clipboard.writeText(textToCopy);window.$wireui.notify({title:'{{ __('Calendar Stream Url copied!') }}',description:'{{ __('Paste the calendar stream link into a compatible calendar app.') }}',icon:'success'});" - > - - {{ __('Calendar Stream-Url') }} ({{ $row->meetup_events_count }}) - - - - {{ __('Show landing page') }} - - @if($row->telegram_link) - - - {{ __('Telegram-Link') }} + + {{ __('Calendar Stream-Url') }} ({{ $row->meetup_events_count }}) - @endif - @if($row->webpage) +
+
- - {{ __('Website') }} - - @endif - @if($row->twitter_username) - - - {{ __('Twitter') }} + + {{ __('Show landing page') }} - @endif +
+
+ @if($row->telegram_link) + + + {{ __('Telegram-Link') }} + + @endif +
+
+ @if($row->webpage) + + + {{ __('Website') }} + + @endif +
+
+ @if($row->twitter_username) + + + {{ __('Twitter') }} + + @endif +
diff --git a/resources/views/columns/venues/action.blade.php b/resources/views/columns/venues/action.blade.php index dc48b284..cc3e719f 100644 --- a/resources/views/columns/venues/action.blade.php +++ b/resources/views/columns/venues/action.blade.php @@ -1,12 +1,16 @@ -
- @if($row->course_events_count > 0) - - {{ __('Show dates') }} ({{ $row->course_events_count }}) - - @endif - @if($row->course_events_count < 1) - - {{ __('Show dates') }} ({{ $row->course_events_count }}) - - @endif +
+
+ @if($row->course_events_count > 0) + + {{ __('Show dates') }} ({{ $row->course_events_count }}) + + @endif +
+
+ @if($row->course_events_count < 1) + + {{ __('Show dates') }} ({{ $row->course_events_count }}) + + @endif +