Merge pull request #62 from laravelcm/fix-patch-discussions

mckenziearts · web-flow · commit 808fc327ac77 · 2022-08-05T09:08:50.000+01:00
Fix patch discussions
diff --git a/app/Http/Livewire/Articles/Browse.php b/app/Http/Livewire/Articles/Browse.php
@@ -6,6 +6,7 @@
 use App\Models\Tag;
 use App\Traits\WithInfiniteScroll;
 use App\Traits\WithTags;
+use Illuminate\Contracts\View\View;
 use Livewire\Component;
 
 class Browse extends Component
@@ -26,7 +27,7 @@ public function validSort($sort): bool
         ]);
     }
 
-    public function render()
+    public function render(): View
     {
         $articles = Article::with('tags')->published()
             ->notPinned()
diff --git a/app/Http/Livewire/Discussions/Browse.php b/app/Http/Livewire/Discussions/Browse.php
@@ -6,6 +6,7 @@
 use App\Models\Tag;
 use App\Traits\WithInfiniteScroll;
 use App\Traits\WithTags;
+use Illuminate\Contracts\View\View;
 use Livewire\Component;
 
 class Browse extends Component
@@ -17,7 +18,7 @@ class Browse extends Component
         'sortBy' => ['except' => 'recent'],
     ];
 
-    public function validSort($sort): bool
+    public function validSort(string $sort): bool
     {
         return in_array($sort, [
             'recent',
@@ -26,7 +27,7 @@ public function validSort($sort): bool
         ]);
     }
 
-    public function render()
+    public function render(): View
     {
         $discussions = Discussion::with('tags')
             ->withCount('replies')
diff --git a/app/Markdown/MarkdownHelper.php b/app/Markdown/MarkdownHelper.php
@@ -47,7 +47,7 @@ public static function replaceYouTubeTag($html, $tagArray, $original_string): st
     {
         if (isset($tagArray[2])) {
             $youtubeEmbedURL = $tagArray[2];
-            $youtubeEmbed = '<iframe width="100%" height="399" src="https://www.youtube.com/embed/'.$youtubeEmbedURL.'" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>';
+            $youtubeEmbed = '<div class="overflow-hidden rounded-lg"><iframe width="100%" height="399" src="https://www.youtube.com/embed/'.$youtubeEmbedURL.'" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe></div>';
             $html = str_replace($original_string, $youtubeEmbed, $html);
         }
 
diff --git a/app/Traits/WithInfiniteScroll.php b/app/Traits/WithInfiniteScroll.php
@@ -10,7 +10,7 @@ trait WithInfiniteScroll
 
     public int $perPage = 10;
 
-    public function loadMore()
+    public function loadMore(): void
     {
         $this->perPage += 10;
     }
diff --git a/app/Traits/WithTags.php b/app/Traits/WithTags.php
@@ -10,12 +10,12 @@ trait WithTags
 
     public string $sortBy = 'recent';
 
-    public function toggleTag($tag): void
+    public function toggleTag(string $tag): void
     {
         $this->tag = $this->tag !== $tag && $this->tagExists($tag) ? $tag : null;
     }
 
-    public function sortBy($sort): void
+    public function sortBy(string $sort): void
     {
         $this->sortBy = $this->validSort($sort) ? $sort : 'recent';
     }
diff --git a/database/factories/DiscussionFactory.php b/database/factories/DiscussionFactory.php
@@ -7,7 +7,12 @@
 
 class DiscussionFactory extends Factory
 {
-    public function definition()
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
     {
         return [
             'user_id' => $attributes['user_id'] ?? User::factory(),
diff --git a/public/css/app.css b/public/css/app.css
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,4 +1,4 @@
 {
     "/js/app.js": "/js/app.js?id=3bd7a17ae8879cea08888521628605ff",
-    "/css/app.css": "/css/app.css?id=a93547189b00f8df18704e2860e78505"
+    "/css/app.css": "/css/app.css?id=7b8652dcf9744257f1400ac52d15a911"
 }
diff --git a/resources/views/articles/show.blade.php b/resources/views/articles/show.blade.php
@@ -273,6 +273,8 @@ class="inline-flex items-center py-2 px-4 border border-skin-base rounded-md sha
                 @endif
 
                 <x-ads />
+
+                <x-discord />
             </div>
         </div>
     </article>
diff --git a/resources/views/components/discord.blade.php b/resources/views/components/discord.blade.php
@@ -0,0 +1,12 @@
+<div class="overflow-hidden">
+    <a href="{{ route('discord') }}">
+        <svg class="w-auto h-12 text-[#5865F2]" fill="currentColor" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 800 272.1">
+            <path d="M142.8 120.1c-5.7 0-10.2 4.9-10.2 11s4.6 11 10.2 11c5.7 0 10.2-4.9 10.2-11s-4.6-11-10.2-11zM106.3 120.1c-5.7 0-10.2 4.9-10.2 11s4.6 11 10.2 11c5.7 0 10.2-4.9 10.2-11 .1-6.1-4.5-11-10.2-11z"/>
+            <path d="M191.4 36.9h-134c-11.3 0-20.5 9.2-20.5 20.5v134c0 11.3 9.2 20.5 20.5 20.5h113.4l-5.3-18.3 12.8 11.8 12.1 11.1 21.6 18.7V57.4c-.1-11.3-9.3-20.5-20.6-20.5zm-38.6 129.5s-3.6-4.3-6.6-8c13.1-3.7 18.1-11.8 18.1-11.8-4.1 2.7-8 4.6-11.5 5.9-5 2.1-9.8 3.4-14.5 4.3-9.6 1.8-18.4 1.3-25.9-.1-5.7-1.1-10.6-2.6-14.7-4.3-2.3-.9-4.8-2-7.3-3.4-.3-.2-.6-.3-.9-.5-.2-.1-.3-.2-.4-.2-1.8-1-2.8-1.7-2.8-1.7s4.8 7.9 17.5 11.7c-3 3.8-6.7 8.2-6.7 8.2-22.1-.7-30.5-15.1-30.5-15.1 0-31.9 14.4-57.8 14.4-57.8 14.4-10.7 28-10.4 28-10.4l1 1.2c-18 5.1-26.2 13-26.2 13s2.2-1.2 5.9-2.8c10.7-4.7 19.2-5.9 22.7-6.3.6-.1 1.1-.2 1.7-.2 6.1-.8 13-1 20.2-.2 9.5 1.1 19.7 3.9 30.1 9.5 0 0-7.9-7.5-24.9-12.6l1.4-1.6s13.7-.3 28 10.4c0 0 14.4 25.9 14.4 57.8 0-.1-8.4 14.3-30.5 15zM303.8 79.7h-33.2V117l22.1 19.9v-36.2h11.8c7.5 0 11.2 3.6 11.2 9.4v27.7c0 5.8-3.5 9.7-11.2 9.7h-34v21.1h33.2c17.8.1 34.5-8.8 34.5-29.2v-29.8c.1-20.8-16.6-29.9-34.4-29.9zm174 59.7v-30.6c0-11 19.8-13.5 25.8-2.5l18.3-7.4c-7.2-15.8-20.3-20.4-31.2-20.4-17.8 0-35.4 10.3-35.4 30.3v30.6c0 20.2 17.6 30.3 35 30.3 11.2 0 24.6-5.5 32-19.9l-19.6-9c-4.8 12.3-24.9 9.3-24.9-1.4zM417.3 113c-6.9-1.5-11.5-4-11.8-8.3.4-10.3 16.3-10.7 25.6-.8l14.7-11.3c-9.2-11.2-19.6-14.2-30.3-14.2-16.3 0-32.1 9.2-32.1 26.6 0 16.9 13 26 27.3 28.2 7.3 1 15.4 3.9 15.2 8.9-.6 9.5-20.2 9-29.1-1.8l-14.2 13.3c8.3 10.7 19.6 16.1 30.2 16.1 16.3 0 34.4-9.4 35.1-26.6 1-21.7-14.8-27.2-30.6-30.1zm-67 55.5h22.4V79.7h-22.4v88.8zM728 79.7h-33.2V117l22.1 19.9v-36.2h11.8c7.5 0 11.2 3.6 11.2 9.4v27.7c0 5.8-3.5 9.7-11.2 9.7h-34v21.1H728c17.8.1 34.5-8.8 34.5-29.2v-29.8c0-20.8-16.7-29.9-34.5-29.9zm-162.9-1.2c-18.4 0-36.7 10-36.7 30.5v30.3c0 20.3 18.4 30.5 36.9 30.5 18.4 0 36.7-10.2 36.7-30.5V109c0-20.4-18.5-30.5-36.9-30.5zm14.4 60.8c0 6.4-7.2 9.7-14.3 9.7-7.2 0-14.4-3.1-14.4-9.7V109c0-6.5 7-10 14-10 7.3 0 14.7 3.1 14.7 10v30.3zM682.4 109c-.5-20.8-14.7-29.2-33-29.2h-35.5v88.8h22.7v-28.2h4l20.6 28.2h28L665 138.1c10.7-3.4 17.4-12.7 17.4-29.1zm-32.6 12h-13.2v-20.3h13.2c14.1 0 14.1 20.3 0 20.3z"/>
+        </svg>
+        <p class="mt-1 text-base leading-6 text-skin-inverted">
+            <strong class="block">Laravel Cameroun Discord</strong>
+            <span class="block mt-2 text-sm text-skin-base">Rejoignez le serveur Discord de la communauté et connectez-vous avec d'autres développeurs partageant les mêmes objectifs !</span>
+        </p>
+    </a>
+</div>
diff --git a/resources/views/components/discussions/overview.blade.php b/resources/views/components/discussions/overview.blade.php
@@ -33,13 +33,14 @@
             </div>
         </div>
         <div class="hidden sm:flex sm:items-center space-x-3">
-            <livewire:reactions
-                wire:key="{{ $discussion->id }}"
-                :model="$discussion"
-                direction="left"
-                :with-place-holder="false"
-                :with-background="false"
-            />
+            @if($discussion->getReactionsSummary()->isNotEmpty())
+                <div class="flex items-center justify-center space-x-2">
+                    @foreach($discussion->getReactionsSummary() as $reaction)
+                        <img class="w-4 h-4" src="{{ asset("/images/reactions/{$reaction->name}.svg") }}" alt="{{ $reaction->name }} emoji">
+                    @endforeach
+                    <span class="ml-3 text-sm font-medium text-green-500">{{ $discussion->getReactionsSummary()->sum('count') }}</span>
+                </div>
+            @endif
             <p class="inline-flex text-sm space-x-2 text-skin-base">
                 <x-heroicon-o-chat-alt-2 class="h-5 w-5" />
                 <span class="font-normal text-skin-inverted-muted">{{ $discussion->count_all_replies_with_child }}</span>
diff --git a/resources/views/livewire/articles/browse.blade.php b/resources/views/livewire/articles/browse.blade.php
@@ -55,6 +55,8 @@ class="mt-5 flex justify-center"
                 <x-sponsors />
 
                 <x-ads />
+
+                <x-discord />
             </div>
         </div>
     </div>
diff --git a/resources/views/livewire/discussions/browse.blade.php b/resources/views/livewire/discussions/browse.blade.php
@@ -19,7 +19,11 @@
             @endauth
         </aside>
     </div>
-    <div class="relative lg:col-span-7">
+    <div
+        x-data
+        x-intersect="@this.call('loadMore')"
+        class="relative lg:col-span-7"
+    >
         <div class="w-full">
             <nav class="relative z-0 rounded-lg shadow flex divide-x divide-skin-base" aria-label="Tabs">
                 <button
@@ -58,6 +62,19 @@ class="w-full {{ $selectedSortBy === 'active' ? 'text-skin-inverted': 'text-skin
                 <x-discussions.overview :discussion="$discussion" />
             @endforeach
         </div>
+
+        @if($discussions->hasMorePages())
+            <div
+                x-data
+                x-intersect="@this.call('loadMore')"
+                class="mt-5 flex justify-center"
+            >
+                <p class="flex items-center">
+                    <x-loader class="text-skin-primary" />
+                    Chargement...
+                </p>
+            </div>
+        @endif
     </div>
     <div class="hidden relative lg:block lg:col-span-3">
         @include('discussions._contributions')

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`use App\Models\Tag;`
`7`	`7`	`use App\Traits\WithInfiniteScroll;`
`8`	`8`	`use App\Traits\WithTags;`
	`9`	`+use Illuminate\Contracts\View\View;`
`9`	`10`	`use Livewire\Component;`
`10`	`11`
`11`	`12`	`class Browse extends Component`
`@@ -26,7 +27,7 @@ public function validSort($sort): bool`
`26`	`27`	`]);`
`27`	`28`	`}`
`28`	`29`
`29`		`- public function render()`
	`30`	`+ public function render(): View`
`30`	`31`	`{`
`31`	`32`	`$articles = Article::with('tags')->published()`
`32`	`33`	`->notPinned()`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public static function replaceYouTubeTag($html, $tagArray, $original_string): st`
`47`	`47`	`{`
`48`	`48`	`if (isset($tagArray[2])) {`
`49`	`49`	`$youtubeEmbedURL = $tagArray[2];`
`50`		`- $youtubeEmbed = '<iframe width="100%" height="399" src="https://www.youtube.com/embed/'.$youtubeEmbedURL.'" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>';`
	`50`	`+ $youtubeEmbed = '<div class="overflow-hidden rounded-lg"><iframe width="100%" height="399" src="https://www.youtube.com/embed/'.$youtubeEmbedURL.'" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe></div>';`
`51`	`51`	`$html = str_replace($original_string, $youtubeEmbed, $html);`
`52`	`52`	`}`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ trait WithInfiniteScroll`
`10`	`10`
`11`	`11`	`public int $perPage = 10;`
`12`	`12`
`13`		`- public function loadMore()`
	`13`	`+ public function loadMore(): void`
`14`	`14`	`{`
`15`	`15`	`$this->perPage += 10;`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,12 +10,12 @@ trait WithTags`
`10`	`10`
`11`	`11`	`public string $sortBy = 'recent';`
`12`	`12`
`13`		`- public function toggleTag($tag): void`
	`13`	`+ public function toggleTag(string $tag): void`
`14`	`14`	`{`
`15`	`15`	`$this->tag = $this->tag !== $tag && $this->tagExists($tag) ? $tag : null;`
`16`	`16`	`}`
`17`	`17`
`18`		`- public function sortBy($sort): void`
	`18`	`+ public function sortBy(string $sort): void`
`19`	`19`	`{`
`20`	`20`	`$this->sortBy = $this->validSort($sort) ? $sort : 'recent';`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,12 @@`
`7`	`7`
`8`	`8`	`class DiscussionFactory extends Factory`
`9`	`9`	`{`
`10`		`- public function definition()`
	`10`	`+ /**`
	`11`	`+ * Define the model's default state.`
	`12`	`+ *`
	`13`	`+ * @return array<string, mixed>`
	`14`	`+ */`
	`15`	`+ public function definition(): array`
`11`	`16`	`{`
`12`	`17`	`return [`
`13`	`18`	`'user_id' => $attributes['user_id'] ?? User::factory(),`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`	`2`	`"/js/app.js": "/js/app.js?id=3bd7a17ae8879cea08888521628605ff",`
`3`		`- "/css/app.css": "/css/app.css?id=a93547189b00f8df18704e2860e78505"`
	`3`	`+ "/css/app.css": "/css/app.css?id=7b8652dcf9744257f1400ac52d15a911"`
`4`	`4`	`}`