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

approving news items

Browse Source
This commit is contained in:
HolgerHatGarKeineNode
2023-02-11 16:23:24 +01:00
parent 0b3528a4f0
commit a95e6222d2
3 changed files with 94 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Livewire/News/ArticleOverview.php
View File

@@ -33,19 +33,7 @@ class ArticleOverview extends Component
'tags', 'tags',
]) ])
->where('type', 'markdown_article') ->where('type', 'markdown_article')
->when(app()->environment('production'), ->where('news', true)
function ($query) {
if (auth()->user() && auth()
->user()
->hasRole('news-editor')) {
return;
}
$query
->whereHas('createdBy.roles',
fn($query) => $query->where('roles.name', 'news-editor'))
->where('approved', true);
}
)
->orderByDesc('created_at') ->orderByDesc('created_at')
->get(), ->get(),
])->layout('layouts.app', [ ])->layout('layouts.app', [

30
database/migrations/2023_02_11_151546_add_news_flag_to_library_items_table.php Normal file
View File

@@ -0,0 +1,30 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
/**
* Run the migrations.
* @return void
*/
public function up()
{
Schema::table('library_items', function (Blueprint $table) {
$table->boolean('news')
->default(false);
});
}
/**
* Reverse the migrations.
* @return void
*/
public function down()
{
Schema::table('library_items', function (Blueprint $table) {
//
});
}
};

20
resources/views/livewire/news/article-overview.blade.php
View File

@@ -23,6 +23,7 @@
<div class="mx-auto mt-2 grid max-w-lg gap-5 lg:max-w-none lg:grid-cols-3"> <div class="mx-auto mt-2 grid max-w-lg gap-5 lg:max-w-none lg:grid-cols-3">
@foreach($libraryItems as $libraryItem) @foreach($libraryItems as $libraryItem)
@if($libraryItem->approved || $libraryItem->created_by === auth()->id() || auth()->user()?->hasRole('news-editor'))
<div wire:key="library_item_{{ $libraryItem->id }}" <div wire:key="library_item_{{ $libraryItem->id }}"
class="flex flex-col overflow-hidden rounded-lg border-2 border-[#F7931A]"> class="flex flex-col overflow-hidden rounded-lg border-2 border-[#F7931A]">
<div class="flex-shrink-0 pt-6"> <div class="flex-shrink-0 pt-6">
@@ -34,10 +35,10 @@
</div> </div>
<div class="flex flex-1 flex-col justify-between bg-21gray p-6"> <div class="flex flex-1 flex-col justify-between bg-21gray p-6">
<div class="flex-1"> <div class="flex-1">
<p class="text-sm font-medium text-amber-600"> <div class="text-sm font-medium text-amber-600">
<div <div
class="text-amber-500">{{ $libraryItem->tags->pluck('name')->join(', ') }}</div> class="text-amber-500">{{ $libraryItem->tags->pluck('name')->join(', ') }}</div>
</p> </div>
<a href="{{ route('article.view', ['libraryItem' => $libraryItem]) }}" <a href="{{ route('article.view', ['libraryItem' => $libraryItem]) }}"
class="mt-2 block"> class="mt-2 block">
<p class="text-xl font-semibold text-gray-200">{{ $libraryItem->name }}</p> <p class="text-xl font-semibold text-gray-200">{{ $libraryItem->name }}</p>
@@ -47,33 +48,33 @@
<div class="mt-6 flex items-center"> <div class="mt-6 flex items-center">
<div class="flex-shrink-0"> <div class="flex-shrink-0">
<div> <div>
<span class="sr-only text-gray-200">{{ $libraryItem->lecturer->name }}</span> <span
class="sr-only text-gray-200">{{ $libraryItem->lecturer->name }}</span>
<img class="h-10 w-10 object-cover rounded" <img class="h-10 w-10 object-cover rounded"
src="{{ $libraryItem->lecturer->getFirstMediaUrl('avatar') }}" src="{{ $libraryItem->lecturer->getFirstMediaUrl('avatar') }}"
alt="{{ $libraryItem->lecturer->name }}"> alt="{{ $libraryItem->lecturer->name }}">
</div> </div>
</div> </div>
<div class="ml-3"> <div class="ml-3">
<p class="text-sm font-medium text-gray-200"> <div class="text-sm font-medium text-gray-200">
<div class="text-gray-200">{{ $libraryItem->lecturer->name }}</div> <div class="text-gray-200">{{ $libraryItem->lecturer->name }}</div>
</p> </div>
<div class="flex space-x-1 text-sm text-gray-500"> <div class="flex space-x-1 text-sm text-gray-500">
<time datetime="2020-03-16">{{ $libraryItem->created_at->asDateTime() }}</time> <time
datetime="2020-03-16">{{ $libraryItem->created_at->asDateTime() }}</time>
@if($libraryItem->read_time) @if($libraryItem->read_time)
<span aria-hidden="true">&middot;</span> <span aria-hidden="true">&middot;</span>
<span>{{ $libraryItem->read_time }} {{ __('min read') }}</span> <span>{{ $libraryItem->read_time }} {{ __('min read') }}</span>
@endif @endif
</div> </div>
<div class="flex space-x-1 text-sm text-gray-500 justify-end items-end"> <div class="flex space-x-1 text-sm text-gray-500 justify-end items-end">
@if($libraryItem->created_by == auth()->id() || auth()->user()?->hasRole('news-editor')) @if($libraryItem->created_by === auth()->id() || auth()->user()?->hasRole('news-editor'))
<div> <div>
@if(auth()->user()?->hasRole('news-editor'))
@if($libraryItem->approved) @if($libraryItem->approved)
<x-badge green>{{ __('approved') }}</x-badge> <x-badge green>{{ __('approved') }}</x-badge>
@else @else
<x-badge negative>{{ __('not approved') }}</x-badge> <x-badge negative>{{ __('not approved') }}</x-badge>
@endif @endif
@endif
</div> </div>
<div> <div>
@if(!$libraryItem->approved && auth()->user()?->hasRole('news-editor')) @if(!$libraryItem->approved && auth()->user()?->hasRole('news-editor'))
@@ -99,6 +100,7 @@
</div> </div>
</div> </div>
</div> </div>
@endif
@endforeach @endforeach
</div> </div>