Merge pull request #63 from laravelcm/display-more-threads

Display more threads

Author: mckenziearts

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();

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()
             )
         );

public/css/app.css

@@ -1,4 +1,4 @@
 {
     "/js/app.js": "/js/app.js?id=3bd7a17ae8879cea08888521628605ff",
-    "/css/app.css": "/css/app.css?id=7b8652dcf9744257f1400ac52d15a911"
+    "/css/app.css": "/css/app.css?id=ba2fad2529b5b940ef8cbaf0258160a4"
 }

public/mix-manifest.json

@@ -12,7 +12,7 @@
 
     <article class="relative lg:grid lg:grid-cols-9 lg:gap-10" xmlns:livewire="http://www.w3.org/1999/html">
         <div class="hidden relative lg:block lg:col-span-2">
-            <div class="divide-y divide-skin-base sticky space-y-6 top-4">
+            <x-sticky-content class="divide-y divide-skin-base space-y-6">
                 <div>
                     <h4 class="text-xs text-skin-base font-medium leading-4 tracking-wide uppercase font-heading">A propos de l’auteur</h4>
                     <div class="mt-6 space-y-4">
@@ -88,7 +88,7 @@
                 <div class="pt-6">
                     <livewire:reactions :model="$article" />
                 </div>
-            </div>
+            </x-sticky-content>
         </div>
         <div class="lg:col-span-5">
             <header class="space-y-4">
@@ -264,7 +264,7 @@ class="inline-flex items-center py-2 px-4 border border-skin-base rounded-md sha
             @endif
         </div>
         <div class="hidden relative lg:block lg:col-span-2">
-            <div class="sticky top-4 space-y-10">
+            <x-sticky-content class="space-y-10">
                 @if($article->showToc())
                     <div class="bg-skin-card px-4 py-6 rounded-lg shadow-lg">
                         <h4 class="text-sm text-skin-inverted font-semibold leading-tight tracking-widest uppercase">Table des matières</h4>
@@ -275,7 +275,7 @@ class="inline-flex items-center py-2 px-4 border border-skin-base rounded-md sha
                 <x-ads />
 
                 <x-discord />
-            </div>
+            </x-sticky-content>
         </div>
     </article>
 

resources/views/articles/show.blade.php

@@ -0,0 +1,3 @@
+<aside {{ $attributes->merge(['class' => 'sticky top-16']) }}>
+    {{ $slot }}
+</aside>

resources/views/components/sticky-content.blade.php

@@ -1,4 +1,4 @@
-<aside class="sticky space-y-16 top-4">
+<x-sticky-content class="space-y-12">
     <div>
         <h4 class="text-lg font-semibold text-skin-inverted font-sans leading-6">Top Contributeurs</h4>
         <p class="mt-3 font-normal text-skin-base text-sm">Les personnes qui ont lancé le plus de discussions sur le site.</p>
@@ -56,4 +56,4 @@
         </div>
 
     </div>
-</aside>
+</x-sticky-content>

resources/views/discussions/_contributions.blade.php

@@ -35,13 +35,13 @@
         </div>
 
         <div class="hidden relative mt-10 lg:block lg:col-span-2 xl:col-span-3">
-            <aside class="sticky block top-4 space-y-10">
+            <x-sticky-content class="space-y-10">
                 <x-sponsors />
 
                 <x-ads />
 
                 @include('forum._moderators')
-            </aside>
+            </x-sticky-content>
         </div>
     </div>
 

resources/views/forum/index.blade.php

@@ -7,7 +7,7 @@
 
     <div class="relative lg:grid lg:grid-cols-9 lg:gap-10">
         <div class="hidden relative lg:block lg:col-span-2">
-            <div class="sticky top-4 space-y-6">
+            <x-sticky-content class="space-y-6">
                 <x-button :link="route('forum.new')" class="w-full flex justify-center">
                     Nouveau Sujet
                     <x-heroicon-o-plus-circle class="h-4 w-4 ml-2.5" />
@@ -24,7 +24,7 @@
                 @endauth
 
                 <x-forum.thread-author :author="$thread->author" />
-            </div>
+            </x-sticky-content>
         </div>
         <div class="lg:col-span-7 lg:pl-8 lg:border-l lg:border-skin-base">
             <h1 class="text-xl text-skin-inverted font-medium tracking-tight sm:text-3xl font-heading">{{ $thread->subject() }}</h1>

resources/views/forum/thread.blade.php

@@ -24,7 +24,7 @@
 
                         <x-footer-link title="Jobs" url="#" soon />
 
-                        <x-footer-link title="Sponsors" url="#" />
+                        <x-footer-link title="Sponsors" url="#" soon />
 
                         <x-footer-link title="Branding" url="https://github.com/caneco/laravel-country-logomarks/blob/main/src/cm/README.md" />