Skip to content

feat: [LAR-110] listing and detail of discussions #219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/Console/Commands/PublishArticles.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public function handle(): void
$articles = Article::submitted()->approved()->whereNull('published_at')->get();

foreach ($articles as $article) {
/** @var Article $article */
$article->published_at = $article->submitted_at;
$article->save();
}
Expand Down
23 changes: 0 additions & 23 deletions app/Http/Controllers/DiscussionController.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,29 +15,6 @@ public function __construct()
$this->middleware(['auth', 'verified'], ['except' => ['index', 'show']]);
}

public function index(): View
{
return view('discussions.index');
}

public function show(Discussion $discussion): View
{
views($discussion)->record();

// @phpstan-ignore-next-line
seo()
->title($discussion->title)
->description($discussion->excerpt(100))
->image(asset('images/socialcard.png'))
->twitterTitle($discussion->title)
->twitterDescription($discussion->excerpt(100))
->twitterImage(asset('images/socialcard.png'))
->twitterSite('laravelcm')
->withUrl();

return view('discussions.show', ['discussion' => $discussion->load('tags')]);
}

public function create(): View
{
return view('discussions.new');
Expand Down
59 changes: 0 additions & 59 deletions app/Livewire/Discussions/Browse.php

This file was deleted.

76 changes: 76 additions & 0 deletions app/Livewire/Pages/Discussions/Index.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
<?php

declare(strict_types=1);

namespace App\Livewire\Pages\Discussions;

use App\Models\Builders\DiscussionQueryBuilder;
use App\Models\Discussion;
use App\Models\Tag;
use Illuminate\Contracts\View\View;
use Livewire\Attributes\Url;
use Livewire\Component;
use Livewire\WithoutUrlPagination;
use Livewire\WithPagination;

final class Index extends Component
{
use WithoutUrlPagination;
use WithPagination;

#[Url(as: 'tag', except: '')]
public string $currentTag = '';

public string $sortBy = 'recent';

public function validSort(string $sort): bool
{
return in_array($sort, [
'recent',
'popular',
'active',
]);
}

public function toggleTag(string $tag): void
{
$this->currentTag = $this->currentTag !== $tag && $this->tagExists($tag) ? $tag : '';
}

public function sort(string $sort): void
{
$this->sortBy = $this->validSort($sort) ? $sort : 'recent';
}

public function tagExists(string $tag): bool
{
return Tag::query()->where('slug', $tag)->exists();
}

public function render(): View
{
/** @var DiscussionQueryBuilder $query */
$query = Discussion::with('tags')
->withCount('replies')
->notPinned();

$tags = Tag::query()
->whereJsonContains('concerns', ['discussion'])
->orderBy('name')
->get();

if ($this->currentTag) {
$query->forTag($this->currentTag); // @phpstan-ignore-line
}

$query->{$this->sortBy}();

$discussions = $query->simplePaginate(12);

return view('livewire.pages.discussions.index', [
'discussions' => $discussions,
'tags' => $tags,
'selectedSortBy' => $this->sortBy,
])->title(__('pages/discussion.title'));
}
}
37 changes: 37 additions & 0 deletions app/Livewire/Pages/Discussions/SingleDiscussion.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?php

declare(strict_types=1);

namespace App\Livewire\Pages\Discussions;

use App\Models\Discussion;
use Illuminate\Contracts\View\View;
use Livewire\Component;

final class SingleDiscussion extends Component
{
public Discussion $discussion;

public function mount(Discussion $discussion): void
{
views($discussion)->cooldown(now()->addHours(2))->record();

// @phpstan-ignore-next-line
seo()
->title($discussion->title)
->description($discussion->excerpt(100))
->image(asset('images/socialcard.png'))
->twitterTitle($discussion->title)
->twitterDescription($discussion->excerpt(100))
->twitterImage(asset('images/socialcard.png'))
->twitterSite('laravelcm')
->withUrl();

$this->discussion = $discussion->load('tags');
}

public function render(): View
{
return view('livewire.pages.discussions.single-discussion')->title($this->discussion->title);
}
}
2 changes: 1 addition & 1 deletion app/Models/Feature.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
namespace App\Models;

use Illuminate\Database\Eloquent\Factories\HasFactory;
use LaravelFeature\Model\Feature as Model;
use Illuminate\Database\Eloquent\Model;

final class Feature extends Model
{
Expand Down
2 changes: 1 addition & 1 deletion app/Models/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
use App\Traits\HasSettings;
use App\Traits\HasUsername;
use App\Traits\Reacts;
use Carbon\Carbon;
use Filament\Models\Contracts\FilamentUser;
use Filament\Models\Contracts\HasAvatar;
use Filament\Models\Contracts\HasName;
Expand All @@ -21,7 +22,6 @@
use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable;
use Illuminate\Notifications\Notification;
use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\Auth;
use Laravel\Sanctum\HasApiTokens;
use Laravel\Socialite\Contracts\User as SocialUser;
Expand Down
4 changes: 2 additions & 2 deletions app/Providers/AppServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ public function bootMacros(): void

public function bootViewsComposer(): void
{
View::composer('discussions._contributions', TopContributorsComposer::class);
View::composer('discussions._contributions', InactiveDiscussionsComposer::class);
View::composer('partials._contributions', TopContributorsComposer::class);
View::composer('partials._contributions', InactiveDiscussionsComposer::class);
View::composer('components.profile-users', ProfileUsersComposer::class);
}

Expand Down
2 changes: 1 addition & 1 deletion app/Traits/HasSlug.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public function setSlugAttribute(string $slug): void
$this->attributes['slug'] = $this->generateUniqueSlug($slug);
}

public static function findBySlug(string $slug): self
public static function findBySlug(string $slug): static
{
return static::where('slug', $slug)->firstOrFail();
}
Expand Down
73 changes: 0 additions & 73 deletions app/Traits/WithArticleAttributes.php

This file was deleted.

31 changes: 0 additions & 31 deletions app/Traits/WithChannelsAssociation.php

This file was deleted.

29 changes: 0 additions & 29 deletions app/Traits/WithTags.php

This file was deleted.

Loading
Loading