Skip to content

fix: [LAR-172] article and discussion single page preview for seo #295

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 1 commit into from
Jan 2, 2025
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
5 changes: 2 additions & 3 deletions app/Livewire/Pages/Articles/SinglePost.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ final class SinglePost extends Component
{
public Article $article;

public function mount(Article $article): void
public function mount(): void
{
/** @var User $user */
$user = Auth::user();

$article = $article->load(['media', 'user'])->loadCount('views');
$article = $this->article->load(['media', 'user'])->loadCount('views');

abort_unless(
$article->isPublished() || ($user && $article->isAuthoredBy($user)) || ($user && $user->hasAnyRole(['admin', 'moderator'])), // @phpstan-ignore-line
Expand All @@ -42,7 +42,6 @@ public function mount(Article $article): void
->twitterTitle($article->title)
->twitterDescription($article->excerpt(150))
->twitterImage($image)
->twitterSite('laravelcm')
->url($article->canonicalUrl());

$this->article = $article;
Expand Down
16 changes: 7 additions & 9 deletions app/Livewire/Pages/Discussions/SingleDiscussion.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,20 @@ final class SingleDiscussion extends Component implements HasActions, HasForms

public Discussion $discussion;

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

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

$this->discussion = $discussion->load('tags', 'replies', 'reactions', 'replies.user');
$this->discussion->load('tags', 'replies', 'reactions', 'replies.user', 'user');
}

public function editAction(): Action
Expand Down
8 changes: 0 additions & 8 deletions app/Livewire/Pages/Home.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,6 @@ public function render(): View
{
$ttl = now()->addDays(2);

// @phpstan-ignore-next-line
seo()
->description(__('pages/home.description'))
->twitterDescription(__('pages/home.description'))
->image(asset('/images/socialcard.png'))
->twitterSite('laravelcm')
->withUrl();

return view('livewire.pages.home', [
'plans' => Cache::remember(
key: 'plans',
Expand Down
4 changes: 4 additions & 0 deletions app/Models/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,10 @@ final class User extends Authenticatable implements FilamentUser, HasAvatar, Has
'last_active_at' => 'datetime',
];

protected $with = [
'providers',
];

public function hasProvider(string $provider): bool
{
foreach ($this->providers as $p) {
Expand Down
10 changes: 10 additions & 0 deletions app/Providers/AppServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,16 @@ public function boot(): void
$this->bootEloquentMorphs();
$this->bootFilament();

// @phpstan-ignore-next-line
seo()
->title(
default: __('pages/home.title'),
modify: fn (string $title) => $title.' | '.__('global.site_name')
)
->description(default: __('global.site_description'))
->image(default: fn () => asset('images/socialcard.png'))
->twitterSite('@laravelcm');

FilamentColor::register([
'primary' => Color::Emerald,
'danger' => Color::Red,
Expand Down
4 changes: 2 additions & 2 deletions app/View/Composers/InactiveDiscussionsComposer.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ public function compose(View $view): void
{
$discussions = Cache::remember(
key: 'inactive_discussions',
ttl: now()->addDays(3),
callback: fn () => Discussion::noComments()->limit(5)->get()
ttl: now()->addWeek(),
callback: fn () => Discussion::with('user')->noComments()->limit(5)->get()
);

$view->with('discussions', $discussions);
Expand Down
4 changes: 2 additions & 2 deletions app/View/Composers/TopContributorsComposer.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ public function compose(View $view): void
$topContributors = Cache::remember(
key: 'contributors',
ttl: now()->addWeek(),
callback: fn () => User::topContributors()
callback: fn () => User::query()->scopes('topContributors')
->get()
->filter(fn (User $contributor) => $contributor->loadCount('discussions')->discussions_count >= 1)
->filter(fn (User $contributor) => $contributor->discussions_count >= 1)
->take(5)
);

Expand Down
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"ext-json": "*",
"archtechx/laravel-seo": "^0.10",
"awcodes/filament-badgeable-column": "^2.3",
"barryvdh/laravel-debugbar": "^3.14",
"blade-ui-kit/blade-heroicons": "^2.4",
"codeat3/blade-phosphor-icons": "^2.0",
"cyrildewit/eloquent-viewable": "^7.0",
Expand Down
154 changes: 153 additions & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 2 additions & 5 deletions resources/views/layouts/app.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,9 @@
{{ isset($title) ? $title . ' | ' : '' }} {{ config('app.name') }}
{{ is_active('home') ? '- '. __('pages/home.title') : '' }}
</title>
<meta name="description" content="{{ __('pages/home.description') }}" />

<meta property="og:site_name" content="Laravel.cm" />
<meta property="og:language" content="fr" />
<meta name="twitter:author" content="@laravelcm" />
<link rel="canonical" href="{{ $canonical ?? Request::url() }}" />
@include('partials._og')
<meta property="og:language" content="{{ str_replace('_', '-', app()->getLocale()) }}" />
<x-seo::meta />

<!-- Styles -->
Expand Down
Loading