From 487d02bc2a04b88c3c548aed858f0e6e53838953 Mon Sep 17 00:00:00 2001
From: faissaloux <fwahabali@gmail.com>
Date: Sun, 5 Sep 2021 14:41:10 +0100
Subject: [PATCH 1/4] moderator label

---
 app/Models/User.php                                    | 10 ++++++++++
 .../views/components/threads/reply-menu.blade.php      |  5 +++++
 resources/views/components/users/label.blade.php       |  3 +++
 3 files changed, 18 insertions(+)
 create mode 100644 resources/views/components/users/label.blade.php

diff --git a/app/Models/User.php b/app/Models/User.php
index 4f4b359be..d384d15e6 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -23,6 +23,11 @@ final class User extends Authenticatable implements MustVerifyEmail
     const MODERATOR = 2;
     const ADMIN = 3;
 
+    const LABELS = [
+        self::MODERATOR => 'moderator',
+        self::ADMIN => 'moderator'
+    ];
+
     /**
      * {@inheritdoc}
      */
@@ -110,6 +115,11 @@ public function isAdmin(): bool
         return $this->type() === self::ADMIN;
     }
 
+    public function label(): string
+    {
+        return self::LABELS[$this->type()] ?? '';
+    }
+
     public function isLoggedInUser(): bool
     {
         return $this->id() === Auth::id();
diff --git a/resources/views/components/threads/reply-menu.blade.php b/resources/views/components/threads/reply-menu.blade.php
index fd406a925..be7ca2d9f 100644
--- a/resources/views/components/threads/reply-menu.blade.php
+++ b/resources/views/components/threads/reply-menu.blade.php
@@ -1,6 +1,11 @@
 @props(['thread', 'reply'])
 
 <div class="flex items-center lg:gap-x-3">
+
+    @if($reply->author()->isModerator() || $reply->author()->isAdmin())
+        <x-users.label>{{ $reply->author()->label() }}</x-users.label>
+    @endif
+    
     @can(App\Policies\ThreadPolicy::UPDATE, $thread)
         @if ($thread->isSolutionReply($reply))      
             <button 
diff --git a/resources/views/components/users/label.blade.php b/resources/views/components/users/label.blade.php
new file mode 100644
index 000000000..a4692c666
--- /dev/null
+++ b/resources/views/components/users/label.blade.php
@@ -0,0 +1,3 @@
+<span class="flex items-center px-2 text-lio-500 border border-lio-200 rounded-full">
+    {{ $slot }}
+</span>
\ No newline at end of file

From d0d2f619f870774992dd2b0d15b235383bdcdf0b Mon Sep 17 00:00:00 2001
From: faissaloux <fwahabali@gmail.com>
Date: Sun, 5 Sep 2021 14:46:33 +0100
Subject: [PATCH 2/4] apply styleci fixes

---
 app/Models/User.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/User.php b/app/Models/User.php
index d384d15e6..84e6fb003 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -25,7 +25,7 @@ final class User extends Authenticatable implements MustVerifyEmail
 
     const LABELS = [
         self::MODERATOR => 'moderator',
-        self::ADMIN => 'moderator'
+        self::ADMIN => 'moderator',
     ];
 
     /**

From 2e8c5e65e1022970bf0587974d198395ba7d10dc Mon Sep 17 00:00:00 2001
From: faissaloux <fwahabali@gmail.com>
Date: Thu, 23 Sep 2021 23:11:37 +0100
Subject: [PATCH 3/4] update moderator tag design

---
 resources/views/components/lio-tag.blade.php            | 3 +++
 resources/views/components/threads/reply-menu.blade.php | 2 +-
 resources/views/components/users/label.blade.php        | 3 ---
 3 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 resources/views/components/lio-tag.blade.php
 delete mode 100644 resources/views/components/users/label.blade.php

diff --git a/resources/views/components/lio-tag.blade.php b/resources/views/components/lio-tag.blade.php
new file mode 100644
index 000000000..80b16853c
--- /dev/null
+++ b/resources/views/components/lio-tag.blade.php
@@ -0,0 +1,3 @@
+<span class="text-sm text-lio-500 border border-lio-200 rounded py-1.5 px-3 leading-none">
+    {{ $slot }}
+</span>
\ No newline at end of file
diff --git a/resources/views/components/threads/reply-menu.blade.php b/resources/views/components/threads/reply-menu.blade.php
index be7ca2d9f..172332ca3 100644
--- a/resources/views/components/threads/reply-menu.blade.php
+++ b/resources/views/components/threads/reply-menu.blade.php
@@ -3,7 +3,7 @@
 <div class="flex items-center lg:gap-x-3">
 
     @if($reply->author()->isModerator() || $reply->author()->isAdmin())
-        <x-users.label>{{ $reply->author()->label() }}</x-users.label>
+        <x-lio-tag>{{ $reply->author()->label() }}</x-lio-tag>
     @endif
     
     @can(App\Policies\ThreadPolicy::UPDATE, $thread)
diff --git a/resources/views/components/users/label.blade.php b/resources/views/components/users/label.blade.php
deleted file mode 100644
index a4692c666..000000000
--- a/resources/views/components/users/label.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<span class="flex items-center px-2 text-lio-500 border border-lio-200 rounded-full">
-    {{ $slot }}
-</span>
\ No newline at end of file

From f22e109c47fdcc296e76d463d6fc1f158a04243e Mon Sep 17 00:00:00 2001
From: faissaloux <fwahabali@gmail.com>
Date: Thu, 23 Sep 2021 23:14:28 +0100
Subject: [PATCH 4/4] type moderator tag content directly in template

---
 app/Models/User.php                                    | 10 ----------
 .../views/components/threads/reply-menu.blade.php      |  2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/app/Models/User.php b/app/Models/User.php
index 84e6fb003..4f4b359be 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -23,11 +23,6 @@ final class User extends Authenticatable implements MustVerifyEmail
     const MODERATOR = 2;
     const ADMIN = 3;
 
-    const LABELS = [
-        self::MODERATOR => 'moderator',
-        self::ADMIN => 'moderator',
-    ];
-
     /**
      * {@inheritdoc}
      */
@@ -115,11 +110,6 @@ public function isAdmin(): bool
         return $this->type() === self::ADMIN;
     }
 
-    public function label(): string
-    {
-        return self::LABELS[$this->type()] ?? '';
-    }
-
     public function isLoggedInUser(): bool
     {
         return $this->id() === Auth::id();
diff --git a/resources/views/components/threads/reply-menu.blade.php b/resources/views/components/threads/reply-menu.blade.php
index 172332ca3..21e9c7b00 100644
--- a/resources/views/components/threads/reply-menu.blade.php
+++ b/resources/views/components/threads/reply-menu.blade.php
@@ -3,7 +3,7 @@
 <div class="flex items-center lg:gap-x-3">
 
     @if($reply->author()->isModerator() || $reply->author()->isAdmin())
-        <x-lio-tag>{{ $reply->author()->label() }}</x-lio-tag>
+        <x-lio-tag>moderator</x-lio-tag>
     @endif
     
     @can(App\Policies\ThreadPolicy::UPDATE, $thread)