From b618a4152c4c2c025e52ff25881c24629d6b7cda Mon Sep 17 00:00:00 2001
From: Vinayak Ambigapathy <vinayak.ambigapathy@kainoo.ch>
Date: Mon, 2 Sep 2024 16:37:00 +0200
Subject: [PATCH] Finished features following

---
 app/Http/Controllers/BlogController.php |  2 --
 app/Http/Controllers/UserController.php |  8 ++++----
 resources/views/blog/single.blade.php   | 11 ++++++-----
 resources/views/user/profile.blade.php  |  3 ++-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/Http/Controllers/BlogController.php b/app/Http/Controllers/BlogController.php
index f7b4c21..be6288a 100644
--- a/app/Http/Controllers/BlogController.php
+++ b/app/Http/Controllers/BlogController.php
@@ -65,7 +65,6 @@ public function store()
         $id = request()->user()->id;
 
         $image = BlogController::getRequestImage();
-        dd($image);
         $blog = Blog::create([
             'title' => request('title'),
             'containt' => request('containt'),
@@ -110,7 +109,6 @@ public function update($id)
         if (request()->user()->id != $blog->user->id) return response('', 401);
 
         $image = BlogController::getRequestImage();
-        dd($image);
         $blog->title = request('title');
         $blog->containt = request('containt');
         $blog->epilog = request('epilog');
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 8760061..b006e34 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -61,14 +61,14 @@ private static function getRequestImage()
     public function follow($id)
     {
         $user = User::find($id);
-        if (!$user) return response('', 404);
-        if (request()->user()->id == $user->id) return response('', 400);
+        if (!$user) return redirect("/");
+        if (request()->user()->id == $user->id) return redirect("/profile/" . $id);
         try {
             $user->followed()->attach(request()->user()->id);
         } catch(QueryException $e) {
-            return response($e, 400);
+            return redirect("/profile/" . $id);
         }
-        return response('', 200);
+        return redirect("/profile/" . $id);
     }
 }
 
diff --git a/resources/views/blog/single.blade.php b/resources/views/blog/single.blade.php
index 5b05088..5a412d9 100644
--- a/resources/views/blog/single.blade.php
+++ b/resources/views/blog/single.blade.php
@@ -11,20 +11,21 @@
                         <button id="open-modal" class="rounded-lg bg-blue-500 text-white p-2 w-fit">Update</button>
                         <button id="btn-blog-delete" class="rounded-lg bg-red-500 text-white p-2 w-fit" 
                         data-id="{{$blog->id}}">Delete</button>
-                        @include('blog.modal_update')  
-                    @else 
-                        <button id="btn-follow" class="rounded-lg bg-blue-500 text-white p-2 w-fit" 
-                        data-id="{{$blog->user->id}}">Follow</button>
+                        @include('blog.modal_update') 
                     @endif
                 </div>
                 <div class="flex">
                     <div class="flex justify-around items-center mr-5">
                         <p class="text-lg">{{ $blog->views }} views</p>
                     </div>
-                    <div class="flex justify-around items-center bg-gray-200 dark:bg-gray-800 px-3 py-1 rounded-lg">
+                    <div class="flex justify-around items-center bg-gray-200 dark:bg-gray-800 px-3 py-1 rounded-lg mr-4">
                         <p class="text-lg mr-2">{{ $blog->likes()->count() }}</p>
                         <button id="btn-like" data-id="{{$blog->id}}"><img class="w-[30px]" data-id="{{$blog->id}}" src="/img/like_icon.svg"></button>
                     </div>
+                    @if(request()->user() && $blog->user->id != request()->user()->id)
+                        <button id="btn-follow" class="rounded-lg bg-blue-500 text-white p-2 w-fit" 
+                        data-id="{{$blog->user->id}}">Follow</button>
+                    @endif
                 </div>
             </div>
             <div class="w-full flex flex-col items-center">
diff --git a/resources/views/user/profile.blade.php b/resources/views/user/profile.blade.php
index 4a8a0b0..939081f 100644
--- a/resources/views/user/profile.blade.php
+++ b/resources/views/user/profile.blade.php
@@ -43,7 +43,8 @@
                 id="btn-user-delete" data-id="{{$user->id}}">Delete</button>
                 @include('user.modal_update')
             </div>
-            @else 
+            @else
+                <div></div> 
                 <button class="rounded-lg bg-blue-500 text-white p-2 w-fit mr-2"
                 id="btn-follow" data-id="{{$user->id}}">Follow</button>
             @endif