diff --git a/app/Http/Livewire/School/LecturerLandingPage.php b/app/Http/Livewire/School/LecturerLandingPage.php index b5aa3d7b..5afbcf2a 100644 --- a/app/Http/Livewire/School/LecturerLandingPage.php +++ b/app/Http/Livewire/School/LecturerLandingPage.php @@ -22,24 +22,32 @@ class LecturerLandingPage extends Component { return view('livewire.school.lecturer-landing-page', [ 'courseEvents' => CourseEvent::query() + ->with([ + 'venue.city', + 'course.tags', + ]) ->where('from', '>=', now()) ->whereHas('course', function ($query) { $query->where('lecturer_id', $this->lecturer->id); }) ->orderBy('from') ->get(), - 'events' => CourseEvent::query() + 'events' => CourseEvent::query() + ->with([ + 'venue', + 'course', + ]) ->where('from', '>=', now()) ->whereHas('course', function ($query) { $query->where('lecturer_id', $this->lecturer->id); }) ->orderBy('from') ->get() - ->map(fn ($event) => [ - 'id' => $event->id, - 'startDate' => $event->from, - 'endDate' => $event->to, - 'location' => $event->course->name, + ->map(fn($event) => [ + 'id' => $event->id, + 'startDate' => $event->from, + 'endDate' => $event->to, + 'location' => $event->course->name, 'description' => $event->venue->name, ]), ]) diff --git a/resources/lang/de.json b/resources/lang/de.json index 76ee31d6..c967546a 100644 --- a/resources/lang/de.json +++ b/resources/lang/de.json @@ -770,7 +770,7 @@ "City\/Area": "Stadt\/Gegend", "Published on Nostr": "Veröffentlicht auf Nostr", "Public Key": "Public Key", - "Bitcoin Event": "", + "Bitcoin Event": "Bitcoin Event", "Create venue": "Erstelle Veranstaltungsort", "starts with npub...": "startet mit npub...", "Are you sure you want to publish this article on Nostr?": "Bitte bestätige, dass du diesen Artikel auf Nostr veröffentlichen möchtest.", @@ -782,5 +782,8 @@ "Change lightning wallet\/pubkey": "Wechsel Lightning Wallet\/Public Key", "Now log in with a new wallet": "Logge dich jetzt mit einer neuen Wallet ein", "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": "" + ":name\\'s Avatar": "", + "Manage": "Verwalten", + "Manage content creators": "Verwalte Content Creator", + "Lecturers\/Content Creators": "Dozenten\/Content Creator" } diff --git a/resources/lang/en.json b/resources/lang/en.json index 3035cb4e..f5227c00 100644 --- a/resources/lang/en.json +++ b/resources/lang/en.json @@ -778,5 +778,9 @@ "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.": "", "You are logged in as:": "", "Change lightning wallet\/pubkey": "", - "Now log in with a new wallet": "" + "Now log in with a new wallet": "", + "Manage": "", + "Manage content creators": "", + "Participants": "", + "Lecturers\/Content Creators": "" } \ No newline at end of file diff --git a/resources/lang/es.json b/resources/lang/es.json index fd99c1b6..d20b7c4a 100644 --- a/resources/lang/es.json +++ b/resources/lang/es.json @@ -778,5 +778,9 @@ "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.": "", "You are logged in as:": "", "Change lightning wallet\/pubkey": "", - "Now log in with a new wallet": "" + "Now log in with a new wallet": "", + "Manage": "", + "Manage content creators": "", + "Participants": "", + "Lecturers\/Content Creators": "" } \ No newline at end of file diff --git a/resources/lang/fr.json b/resources/lang/fr.json index c247a299..fef45638 100644 --- a/resources/lang/fr.json +++ b/resources/lang/fr.json @@ -779,5 +779,9 @@ "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.": "", "You are logged in as:": "", "Change lightning wallet\/pubkey": "", - "Now log in with a new wallet": "" + "Now log in with a new wallet": "", + "Manage": "", + "Manage content creators": "", + "Participants": "", + "Lecturers\/Content Creators": "" } \ No newline at end of file diff --git a/resources/lang/hr.json b/resources/lang/hr.json index 212d701c..e9a281f2 100644 --- a/resources/lang/hr.json +++ b/resources/lang/hr.json @@ -779,5 +779,9 @@ "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.": "", "You are logged in as:": "", "Change lightning wallet\/pubkey": "", - "Now log in with a new wallet": "" + "Now log in with a new wallet": "", + "Manage": "", + "Manage content creators": "", + "Participants": "", + "Lecturers\/Content Creators": "" } \ No newline at end of file diff --git a/resources/lang/it.json b/resources/lang/it.json index baf56394..f16da3ac 100644 --- a/resources/lang/it.json +++ b/resources/lang/it.json @@ -779,5 +779,9 @@ "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.": "", "You are logged in as:": "", "Change lightning wallet\/pubkey": "", - "Now log in with a new wallet": "" + "Now log in with a new wallet": "", + "Manage": "", + "Manage content creators": "", + "Participants": "", + "Lecturers\/Content Creators": "" } \ No newline at end of file diff --git a/resources/lang/mk.json b/resources/lang/mk.json index 854b6f04..d39e1cc8 100644 --- a/resources/lang/mk.json +++ b/resources/lang/mk.json @@ -779,5 +779,9 @@ "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.": "", "You are logged in as:": "", "Change lightning wallet\/pubkey": "", - "Now log in with a new wallet": "" + "Now log in with a new wallet": "", + "Manage": "", + "Manage content creators": "", + "Participants": "", + "Lecturers\/Content Creators": "" } \ No newline at end of file diff --git a/resources/lang/pl.json b/resources/lang/pl.json index 298c307f..fce795e5 100644 --- a/resources/lang/pl.json +++ b/resources/lang/pl.json @@ -779,5 +779,9 @@ "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.": "", "You are logged in as:": "", "Change lightning wallet\/pubkey": "", - "Now log in with a new wallet": "" + "Now log in with a new wallet": "", + "Manage": "", + "Manage content creators": "", + "Participants": "", + "Lecturers\/Content Creators": "" } \ No newline at end of file diff --git a/resources/lang/pt.json b/resources/lang/pt.json index faa59002..eb2c3c32 100644 --- a/resources/lang/pt.json +++ b/resources/lang/pt.json @@ -779,5 +779,9 @@ "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.": "", "You are logged in as:": "", "Change lightning wallet\/pubkey": "", - "Now log in with a new wallet": "" + "Now log in with a new wallet": "", + "Manage": "", + "Manage content creators": "", + "Participants": "", + "Lecturers\/Content Creators": "" } \ No newline at end of file diff --git a/resources/lang/sv.json b/resources/lang/sv.json index 8be8aa83..ceea17fd 100644 --- a/resources/lang/sv.json +++ b/resources/lang/sv.json @@ -741,5 +741,9 @@ "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.": "", "You are logged in as:": "", "Change lightning wallet\/pubkey": "", - "Now log in with a new wallet": "" + "Now log in with a new wallet": "", + "Manage": "", + "Manage content creators": "", + "Participants": "", + "Lecturers\/Content Creators": "" } \ No newline at end of file diff --git a/resources/lang/tr.json b/resources/lang/tr.json index 407e6537..80772d56 100644 --- a/resources/lang/tr.json +++ b/resources/lang/tr.json @@ -753,5 +753,9 @@ "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.": "", "You are logged in as:": "", "Change lightning wallet\/pubkey": "", - "Now log in with a new wallet": "" + "Now log in with a new wallet": "", + "Manage": "", + "Manage content creators": "", + "Participants": "", + "Lecturers\/Content Creators": "" } \ No newline at end of file diff --git a/resources/views/livewire/frontend/header.blade.php b/resources/views/livewire/frontend/header.blade.php index 39c8e0e6..efb320c4 100644 --- a/resources/views/livewire/frontend/header.blade.php +++ b/resources/views/livewire/frontend/header.blade.php @@ -19,766 +19,20 @@ diff --git a/resources/views/livewire/frontend/navigation/bookcases.blade.php b/resources/views/livewire/frontend/navigation/bookcases.blade.php new file mode 100644 index 00000000..7e55ccdf --- /dev/null +++ b/resources/views/livewire/frontend/navigation/bookcases.blade.php @@ -0,0 +1,120 @@ +
+ +
+
+
+
+

Bücherschränke

+
+
+ + + + {{ __('City search') }} + + + + + {{ __('Bookcases') }} + + + + + {{ __('World map') }} + + + + + {{ __('Heatmap') }} + + + @auth + + + {{ __('Highscore Table') }} + + @endauth + +
+
+
+
+

{{ __('Manage') }}

+
+
+ + + + {{ __('Submit new book case') }} + + +
+
+
+
+
+

Recent posts

+ + @foreach($orangePills as $item) + + @endforeach + +
+
+
+
diff --git a/resources/views/livewire/frontend/navigation/courses.blade.php b/resources/views/livewire/frontend/navigation/courses.blade.php new file mode 100644 index 00000000..1fe80885 --- /dev/null +++ b/resources/views/livewire/frontend/navigation/courses.blade.php @@ -0,0 +1,134 @@ +
+ +
+
+
+
+

Kurse

+
+
+ + + + {{ __('Cities') }} + + + + + {{ __('Lecturers') }} + + + + + {{ __('Venues') }} + + + + + {{ __('Courses') }} + + + + + {{ __('Course Events') }} + + +
+
+
+
+

{{ __('Manage') }}

+
+
+ + + + {{ __('Register lecturer') }} + + + + + {{ __('Create venue') }} + + + + + {{ __('Register course') }} + + + + + {{ __('Register course date') }} + + +
+
+
+
+
+

Recent posts

+ + @foreach($courseEvents as $item) +
+
+ {{ $item->course->lecturer->name }} +
+
+
+
+ +
{{ $item->course->lecturer->name }}
+
+

+ + + {{ $item->course->name }} + +

+

+ {{ $item->course->description }} +

+
+
+ @endforeach + +
+
+
+
diff --git a/resources/views/livewire/frontend/navigation/events.blade.php b/resources/views/livewire/frontend/navigation/events.blade.php new file mode 100644 index 00000000..b19b8826 --- /dev/null +++ b/resources/views/livewire/frontend/navigation/events.blade.php @@ -0,0 +1,96 @@ +
+ +
+
+
+
+

{{ __('Events') }}

+
+
+ + + + {{ __('Events') }} + + +
+
+
+
+

{{ __('Manage') }}

+
+
+ + + + {{ __('Create venue') }} + + + + + {{ __('Register event') }} + + +
+
+
+
+
+

Recent posts

+ + @foreach($bitcoinEvents as $item) + + @endforeach + +
+
+
+
diff --git a/resources/views/livewire/frontend/navigation/library.blade.php b/resources/views/livewire/frontend/navigation/library.blade.php new file mode 100644 index 00000000..e73706a0 --- /dev/null +++ b/resources/views/livewire/frontend/navigation/library.blade.php @@ -0,0 +1,105 @@ +
+ +
+
+
+
+

{{ __('Library') }}

+
+
+ + + + {{ __('Search') }} + + + @auth + + + {{ __('Library for lecturers') }} + + @endauth + +
+
+
+
+

{{ __('Manage') }}

+
+
+ + + + {{ __('Submit contents') }} + + + + + {{ __('Manage content creators') }} + + +
+
+
+
+
+

Recent posts

+ + @foreach($libraryItems as $item) + + @endforeach + +
+
+
+
diff --git a/resources/views/livewire/frontend/navigation/meetups.blade.php b/resources/views/livewire/frontend/navigation/meetups.blade.php new file mode 100644 index 00000000..0efb5f0b --- /dev/null +++ b/resources/views/livewire/frontend/navigation/meetups.blade.php @@ -0,0 +1,111 @@ +
+ +
+
+
+
+

Meetups

+
+
+ + + + {{ __('World map') }} + + + + + {{ __('Meetups') }} + + + + + {{ __('Meetup dates') }} + + +
+
+
+
+

{{ __('Manage') }}

+
+
+ + + + {{ __('Submit Meetup') }} + + + + + {{ __('Register Meetup date') }} + + +
+
+
+
+
+

Recent posts

+ + @foreach($meetups as $item) +
+
+ +
+
+
+
+ + +
+

+ + + {{ $item->meetup->name }} + +

+

+ {{ $item->location }} +

+
+
+ @endforeach + +
+
+
+
diff --git a/resources/views/livewire/frontend/navigation/news.blade.php b/resources/views/livewire/frontend/navigation/news.blade.php new file mode 100644 index 00000000..4a3bc434 --- /dev/null +++ b/resources/views/livewire/frontend/navigation/news.blade.php @@ -0,0 +1,102 @@ +
+ +
+
+
+
+

News

+
+
+ + + + {{ __('News Article') }} + + +
+
+
+
+

{{ __('Manage') }}

+
+
+ + + + {{ __('Submit news articles') }} + + + + + {{ __('Manage content creators') }} + + +
+
+
+
+
+

Recent news article

+ + @foreach($news as $item) +
+
+ + {{ $item->name }} + +
+
+
+
+ +
+ {{ $item->lecturer->name }} +
+
+

+ + + {{ $item->name }} + +

+

+ {{ $item->excerpt }} +

+
+
+ @endforeach + +
+
+
+
diff --git a/resources/views/livewire/frontend/navigation/profile.blade.php b/resources/views/livewire/frontend/navigation/profile.blade.php new file mode 100644 index 00000000..d3c8a500 --- /dev/null +++ b/resources/views/livewire/frontend/navigation/profile.blade.php @@ -0,0 +1,114 @@ +
+ +
+
+
+
+

{{ __('My profile') }}

+
+
+ + + + {{ __('My profile') }} + + +
+
+
+
+

{{ __('Manage') }}

+
+
+ + + + {{ __('Change lightning wallet/pubkey') }} + + +
+
+
+
+
+

Recent posts

+ + + + + {{--@foreach($orangePills as $item) + + @endforeach--}} + +
+
+
+
diff --git a/resources/views/livewire/meetup/form/meetup-event-form.blade.php b/resources/views/livewire/meetup/form/meetup-event-form.blade.php index 8ac9b8cc..3487de2e 100644 --- a/resources/views/livewire/meetup/form/meetup-event-form.blade.php +++ b/resources/views/livewire/meetup/form/meetup-event-form.blade.php @@ -1,118 +1,123 @@ -
+
+ {{-- HEADER --}} + -
-

{{ __('Meetup Event') }}

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

{{ __('Meetup Event') }}

+
+
+ @if($meetupEvent->id) + + + {{ __('Delete') }} + + @endif +
+
+ + + {{ __('Back') }} - @endif -
-
- - - {{ __('Back') }} - +
-
-
-
-
+ +
+
- - + 'user-option', 'config' => ['src' => 'profile_image'] ]" - option-label="name" - option-value="id" - option-description="city.name" - /> - - - - - - - @if(!$meetupEvent->id) - - -

{{ __('The recurring appointments are created in the database as new entries. Please be careful with this function, otherwise you will have to change or delete all the appointments you have created manually if you make an error.') }}

+ option-label="name" + option-value="id" + option-description="city.name" + /> - @endif - @if($recurring) - - + + - @endif - - - - - - - - - - - - - - @if($meetupEvent->start && $recurring) -
- @for($i = 0; $i < $repetitions; $i++) - - @endfor -
+ @if(!$meetupEvent->id) + + +

{{ __('The recurring appointments are created in the database as new entries. Please be careful with this function, otherwise you will have to change or delete all the appointments you have created manually if you make an error.') }}

+ @endif - - - - - {{ __('Save') }} - - + @if($recurring) + + + + @endif + + + + + + + + + + + + + + @if($meetupEvent->start && $recurring) +
+ @for($i = 0; $i < $repetitions; $i++) + + @endfor +
+ @endif + + + + + + {{ __('Save') }} + + + +
-
- + +
diff --git a/resources/views/livewire/meetup/form/meetup-form.blade.php b/resources/views/livewire/meetup/form/meetup-form.blade.php index babb3533..2a1dc962 100644 --- a/resources/views/livewire/meetup/form/meetup-form.blade.php +++ b/resources/views/livewire/meetup/form/meetup-form.blade.php @@ -1,126 +1,131 @@ -
+
+ {{-- HEADER --}} + -
-

{{ __('Meetup') }}

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

{{ __('Meetup') }}

+
+ +
+ + + {{ __('Back') }} + +
-
-
-
-
+ +
+
- -
- @if ($image) -
{{ __('Preview') }}:
- - @endif - @if ($meetup->getFirstMediaUrl('logo')) -
{{ __('Current picture') }}:
- - @endif -
- - @error('image') {{ $message }} @enderror - - - - - - - - - - - - -
-
- {{ __('City/Area') }} -
- - - {{ __('New City') }} - + +
+ @if ($image) +
{{ __('Preview') }}:
+ + @endif + @if ($meetup->getFirstMediaUrl('logo')) +
{{ __('Current picture') }}:
+ + @endif
- - + @error('image') {{ $message }} @enderror + + + + + + + + + + + + +
+
+ {{ __('City/Area') }} +
+ + + {{ __('New City') }} + +
+ + - + option-label="name" + option-value="id" + option-description="country.name" + /> + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - {{ __('Save') }} - - + + + + {{ __('Save') }} + + +
-
- + +
diff --git a/resources/views/livewire/meetup/meetup-event-table.blade.php b/resources/views/livewire/meetup/meetup-event-table.blade.php index f6492ff6..e73ec4ed 100644 --- a/resources/views/livewire/meetup/meetup-event-table.blade.php +++ b/resources/views/livewire/meetup/meetup-event-table.blade.php @@ -146,7 +146,16 @@
- +
+
+

+ {{ __('Meetup dates') }} +

+
+
+ {{----}} +
+
diff --git a/resources/views/livewire/meetup/meetup-table.blade.php b/resources/views/livewire/meetup/meetup-table.blade.php index 3d227ce6..360279bd 100644 --- a/resources/views/livewire/meetup/meetup-table.blade.php +++ b/resources/views/livewire/meetup/meetup-table.blade.php @@ -16,17 +16,6 @@
-
-

- {{ __('Bitcoiner') }} {{ __('Meetups') }} - {{ __('Plebs together strong 💪') }} -

-

- {{ __('Bitcoiner Meetups are a great way to meet other Bitcoiners in your area. You can learn from each other, share ideas, and have fun!') }} -

-
@php $focus = ''; $map = $country->code . '_merc'; @@ -75,6 +64,16 @@
+
+
+

+ {{ __('Meetups') }} +

+
+
+ {{----}} +
+
diff --git a/resources/views/livewire/meetup/world-map.blade.php b/resources/views/livewire/meetup/world-map.blade.php index 7977a16b..f1f71c6c 100644 --- a/resources/views/livewire/meetup/world-map.blade.php +++ b/resources/views/livewire/meetup/world-map.blade.php @@ -2,19 +2,8 @@ {{-- HEADER --}} {{-- MAIN --}} -
+
-
-

- {{ __('Bitcoiner') }} {{ __('Meetups') }} - {{ __('Plebs together strong 💪') }} -

-

- {{ __('Bitcoiner Meetups are a great way to meet other Bitcoiners in your area. You can learn from each other, share ideas, and have fun!') }} -

-
-
+
+
+
+

+ {{ __('Meetups') }} +

+
+
+ {{----}} +
+
diff --git a/resources/views/livewire/news/form/news-article-form.blade.php b/resources/views/livewire/news/form/news-article-form.blade.php index 8624b024..88576156 100644 --- a/resources/views/livewire/news/form/news-article-form.blade.php +++ b/resources/views/livewire/news/form/news-article-form.blade.php @@ -1,136 +1,141 @@ -
+
+ {{-- HEADER --}} + -
-

{{ __('News Article') }}

-
-
- @if($libraryItem->created_by === auth()->id()) - + +
+

{{ __('News Article') }}

+
+
+ @if($libraryItem->created_by === auth()->id()) + - - {{ __('Delete') }} + negative> + + {{ __('Delete') }} + + @endif +
+
+ + + {{ __('Back') }} - @endif -
-
- - - {{ __('Back') }} - +
-
-
-
-
+ +
+
- - -
-
- {{ __('Author') }} + + +
+
+ {{ __('Author') }} +
+ + + {{ __('Create new author') }} +
- - - {{ __('Create new author') }} - -
- - 'user-option', 'config' => ['src' => 'image'] ]" - option-label="name" - option-value="id" - /> - - - @if($libraryItem->lecturer_id) - -
- @if ($image) -
{{ __('Preview') }}:
- - @endif - @if ($libraryItem->getFirstMediaUrl('main')) -
{{ __('Current picture') }}:
- - @endif -
- - @error('image') {{ $message }} @enderror - - - - - - - - - - - - - - - - - - - - - -
{{ __('For images in Markdown, please use eg. Imgur or another provider.') }}
- - @error('libraryItem.value') {{ $message }} @enderror - + @if($libraryItem->lecturer_id) + +
+ @if ($image) +
{{ __('Preview') }}:
+ + @endif + @if ($libraryItem->getFirstMediaUrl('main')) +
{{ __('Current picture') }}:
+ + @endif +
+ + @error('image') {{ $message }} @enderror + - - - + + + - - - - {{ __('Save') }} - - - @endif + + + + + + + + + + + + + + + + +
{{ __('For images in Markdown, please use eg. Imgur or another provider.') }}
+ + @error('libraryItem.value') {{ $message }} @enderror + + + + + + + + + + {{ __('Save') }} + + + @endif + +
-
- + +
diff --git a/resources/views/livewire/school/lecturer-table.blade.php b/resources/views/livewire/school/lecturer-table.blade.php index 9b35d8dc..ada92af1 100644 --- a/resources/views/livewire/school/lecturer-table.blade.php +++ b/resources/views/livewire/school/lecturer-table.blade.php @@ -4,6 +4,16 @@ {{-- MAIN --}}
+
+
+

+ {{ __('Lecturers/Content Creators') }} +

+
+
+ {{----}} +
+