From d618e9256493ae7411bad347fede5239665c935e Mon Sep 17 00:00:00 2001 From: Arthur Monney Date: Sat, 6 Aug 2022 22:38:40 +0100 Subject: [PATCH 1/2] :lipstick: modification des contenu sticky --- app/Http/Controllers/HomeController.php | 2 +- app/View/Composers/ChannelsComposer.php | 2 +- resources/views/articles/show.blade.php | 8 +++---- .../views/components/sticky-content.blade.php | 3 +++ .../discussions/_contributions.blade.php | 4 ++-- resources/views/forum/index.blade.php | 4 ++-- resources/views/forum/thread.blade.php | 4 ++-- resources/views/layouts/footer.blade.php | 2 +- resources/views/layouts/master.blade.php | 8 +++---- .../views/livewire/articles/browse.blade.php | 24 +++++++++---------- .../livewire/discussions/browse.blade.php | 4 ++-- 11 files changed, 33 insertions(+), 32 deletions(-) create mode 100644 resources/views/components/sticky-content.blade.php diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 6f63bef2..e395f331 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -27,7 +27,7 @@ public function index() $latestThreads = Cache::remember('latestThreads', now()->addHour(), function () { return Thread::whereNull('solution_reply_id') - ->whereBetween('threads.created_at', [now()->subMonth(), now()]) + ->whereBetween('threads.created_at', [now()->subMonths(3), now()]) ->inRandomOrder() ->limit(4) ->get(); diff --git a/app/View/Composers/ChannelsComposer.php b/app/View/Composers/ChannelsComposer.php index 501d47b2..d5188547 100644 --- a/app/View/Composers/ChannelsComposer.php +++ b/app/View/Composers/ChannelsComposer.php @@ -14,7 +14,7 @@ public function compose(View $view) 'channels', Cache::remember( 'channels', - now()->addDay(), + now()->addWeek(), fn () => Channel::with('items')->whereNull('parent_id')->get() ) ); diff --git a/resources/views/articles/show.blade.php b/resources/views/articles/show.blade.php index 450a21a5..b45be9e5 100644 --- a/resources/views/articles/show.blade.php +++ b/resources/views/articles/show.blade.php @@ -12,7 +12,7 @@
diff --git a/resources/views/components/sticky-content.blade.php b/resources/views/components/sticky-content.blade.php new file mode 100644 index 00000000..53e6e535 --- /dev/null +++ b/resources/views/components/sticky-content.blade.php @@ -0,0 +1,3 @@ + diff --git a/resources/views/discussions/_contributions.blade.php b/resources/views/discussions/_contributions.blade.php index 9f94e1de..7d6e9ab0 100644 --- a/resources/views/discussions/_contributions.blade.php +++ b/resources/views/discussions/_contributions.blade.php @@ -1,4 +1,4 @@ - + diff --git a/resources/views/forum/index.blade.php b/resources/views/forum/index.blade.php index 533b8e69..d2425f2d 100644 --- a/resources/views/forum/index.blade.php +++ b/resources/views/forum/index.blade.php @@ -35,13 +35,13 @@ diff --git a/resources/views/forum/thread.blade.php b/resources/views/forum/thread.blade.php index ba89db1e..2f3f914a 100644 --- a/resources/views/forum/thread.blade.php +++ b/resources/views/forum/thread.blade.php @@ -7,7 +7,7 @@

{{ $thread->subject() }}

diff --git a/resources/views/layouts/footer.blade.php b/resources/views/layouts/footer.blade.php index 0cf1e463..e5463611 100644 --- a/resources/views/layouts/footer.blade.php +++ b/resources/views/layouts/footer.blade.php @@ -24,7 +24,7 @@ - + diff --git a/resources/views/layouts/master.blade.php b/resources/views/layouts/master.blade.php index af17d3ac..29a7b948 100644 --- a/resources/views/layouts/master.blade.php +++ b/resources/views/layouts/master.blade.php @@ -1,5 +1,5 @@ - + @@ -44,11 +44,9 @@ @include('layouts._fathom') - + -
- @yield('content') -
+ @yield('content') diff --git a/resources/views/livewire/articles/browse.blade.php b/resources/views/livewire/articles/browse.blade.php index 601434cb..8298b342 100644 --- a/resources/views/livewire/articles/browse.blade.php +++ b/resources/views/livewire/articles/browse.blade.php @@ -1,19 +1,19 @@ -
-