From 9511988ddd1d8a70bf1984b740ca0f2f69af5387 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Miko=C5=82ajczak?= <me@m4sk.in>
Date: Fri, 1 Jun 2018 17:49:45 +0200
Subject: [PATCH 1/2] Follow/Unfollow button in followers/ing lists
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
---
 resources/views/profile/followers.blade.php | 21 ++++++++++++++++++++-
 resources/views/profile/following.blade.php | 21 ++++++++++++++++++++-
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/resources/views/profile/followers.blade.php b/resources/views/profile/followers.blade.php
index f27d12e5c..7bb558678 100644
--- a/resources/views/profile/followers.blade.php
+++ b/resources/views/profile/followers.blade.php
@@ -56,6 +56,25 @@
           <span class="following-name text-muted">
             {{$user->name}}
           </span>
+          @if(Auth::check() && Auth::id() != $user->user_id)
+            @if($user->followedBy(Auth::user()->profile) == false)
+            <span class="float-right notification-action">
+              <form class="follow-form" method="post" action="/i/follow" style="display: inline;" data-id="{{$user->id}}" data-action="follow">
+                @csrf
+                <input type="hidden" name="item" value="{{$user->id}}">
+                <button class="btn btn-primary font-weight-bold px-4 py-0" type="submit">Follow</button>
+              </form>
+            </span>
+            @else
+            <span class="float-right notification-action">
+              <form class="follow-form" method="post" action="/i/follow" style="display: inline;" data-id="{{$user->id}}" data-action="follow">
+                @csrf
+                <input type="hidden" name="item" value="{{$user->id}}">
+                <button class="btn btn-outline-secondary font-weight-bold px-4 py-0" type="submit">Unfollow</button>
+              </form>
+            </span>
+            @endif
+          @endif
       </li>
       @endforeach
     </ul>
@@ -75,4 +94,4 @@
     </div>
   </div>
 </div>
-@endsection
\ No newline at end of file
+@endsection
diff --git a/resources/views/profile/following.blade.php b/resources/views/profile/following.blade.php
index 6e88262b5..9f2c1b89f 100644
--- a/resources/views/profile/following.blade.php
+++ b/resources/views/profile/following.blade.php
@@ -56,6 +56,25 @@
           <span class="following-name text-muted">
             {{$user->name}}
           </span>
+          @if(Auth::check() && Auth::id() != $user->user_id)
+            @if($user->followedBy(Auth::user()->profile) == false)
+            <span class="float-right notification-action">
+              <form class="follow-form" method="post" action="/i/follow" style="display: inline;" data-id="{{$user->id}}" data-action="follow">
+                @csrf
+                <input type="hidden" name="item" value="{{$user->id}}">
+                <button class="btn btn-primary font-weight-bold px-4 py-0" type="submit">Follow</button>
+              </form>
+            </span>
+            @else
+            <span class="float-right notification-action">
+              <form class="follow-form" method="post" action="/i/follow" style="display: inline;" data-id="{{$user->id}}" data-action="follow">
+                @csrf
+                <input type="hidden" name="item" value="{{$user->id}}">
+                <button class="btn btn-outline-secondary font-weight-bold px-4 py-0" type="submit">Unfollow</button>
+              </form>
+            </span>
+            @endif
+          @endif
       </li>
       @endforeach
     </ul>
@@ -75,4 +94,4 @@
     </div>
   </div>
 </div>
-@endsection
\ No newline at end of file
+@endsection

From 8107f64eece72ae961206086aef421fc5d06f83f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Miko=C5=82ajczak?= <me@m4sk.in>
Date: Fri, 1 Jun 2018 17:59:53 +0200
Subject: [PATCH 2/2] Follow/Unfollow button in followers/ing lists
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
---
 resources/views/profile/followers.blade.php | 8 ++++----
 resources/views/profile/following.blade.php | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/resources/views/profile/followers.blade.php b/resources/views/profile/followers.blade.php
index 7bb558678..8fd90f215 100644
--- a/resources/views/profile/followers.blade.php
+++ b/resources/views/profile/followers.blade.php
@@ -57,12 +57,12 @@
             {{$user->name}}
           </span>
           @if(Auth::check() && Auth::id() != $user->user_id)
-            @if($user->followedBy(Auth::user()->profile) == false)
+            @if ($user->followedBy(Auth::user()->profile) == true)
             <span class="float-right notification-action">
-              <form class="follow-form" method="post" action="/i/follow" style="display: inline;" data-id="{{$user->id}}" data-action="follow">
+              <form class="follow-form" method="post" action="/i/follow" style="display: inline;" data-id="{{$user->id}}" data-action="unfollow">
                 @csrf
                 <input type="hidden" name="item" value="{{$user->id}}">
-                <button class="btn btn-primary font-weight-bold px-4 py-0" type="submit">Follow</button>
+                <button class="btn btn-outline-secondary font-weight-bold px-4 py-0" type="submit">Unfollow</button>
               </form>
             </span>
             @else
@@ -70,7 +70,7 @@
               <form class="follow-form" method="post" action="/i/follow" style="display: inline;" data-id="{{$user->id}}" data-action="follow">
                 @csrf
                 <input type="hidden" name="item" value="{{$user->id}}">
-                <button class="btn btn-outline-secondary font-weight-bold px-4 py-0" type="submit">Unfollow</button>
+                <button class="btn btn-primary font-weight-bold px-4 py-0" type="submit">Follow</button>
               </form>
             </span>
             @endif
diff --git a/resources/views/profile/following.blade.php b/resources/views/profile/following.blade.php
index 9f2c1b89f..56a372963 100644
--- a/resources/views/profile/following.blade.php
+++ b/resources/views/profile/following.blade.php
@@ -57,12 +57,12 @@
             {{$user->name}}
           </span>
           @if(Auth::check() && Auth::id() != $user->user_id)
-            @if($user->followedBy(Auth::user()->profile) == false)
+            @if ($user->followedBy(Auth::user()->profile) == true)
             <span class="float-right notification-action">
-              <form class="follow-form" method="post" action="/i/follow" style="display: inline;" data-id="{{$user->id}}" data-action="follow">
+              <form class="follow-form" method="post" action="/i/follow" style="display: inline;" data-id="{{$user->id}}" data-action="unfollow">
                 @csrf
                 <input type="hidden" name="item" value="{{$user->id}}">
-                <button class="btn btn-primary font-weight-bold px-4 py-0" type="submit">Follow</button>
+                <button class="btn btn-outline-secondary font-weight-bold px-4 py-0" type="submit">Unfollow</button>
               </form>
             </span>
             @else
@@ -70,7 +70,7 @@
               <form class="follow-form" method="post" action="/i/follow" style="display: inline;" data-id="{{$user->id}}" data-action="follow">
                 @csrf
                 <input type="hidden" name="item" value="{{$user->id}}">
-                <button class="btn btn-outline-secondary font-weight-bold px-4 py-0" type="submit">Unfollow</button>
+                <button class="btn btn-primary font-weight-bold px-4 py-0" type="submit">Follow</button>
               </form>
             </span>
             @endif