From c4bd6a8a1a3fea1183f840cd78cd53ecd886f9da Mon Sep 17 00:00:00 2001
From: Bruno Fontes <developer@brunofontes.net>
Date: Sat, 15 Sep 2018 00:22:57 -0300
Subject: [PATCH] Joining Take and Return controllers on just Take (store and
 delete)

---
 app/Http/Controllers/ReturnController.php | 18 ------------------
 app/Http/Controllers/TakeController.php   |  9 +++++++++
 resources/views/home.blade.php            |  5 ++---
 resources/views/home/usedItem.blade.php   |  5 ++++-
 4 files changed, 15 insertions(+), 22 deletions(-)
 delete mode 100644 app/Http/Controllers/ReturnController.php

diff --git a/app/Http/Controllers/ReturnController.php b/app/Http/Controllers/ReturnController.php
deleted file mode 100644
index d0acd62..0000000
--- a/app/Http/Controllers/ReturnController.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use \App\User;
-use Illuminate\Http\Request;
-
-class ReturnController extends Controller
-{
-    public function store(Request $request)
-    {
-        $item = User::find(\Auth::id())->items()->find(request('item'));
-        $item->used_by = null;
-        $item->save();
-
-        return redirect('home');
-    }
-}
diff --git a/app/Http/Controllers/TakeController.php b/app/Http/Controllers/TakeController.php
index ab30be1..85d0b54 100644
--- a/app/Http/Controllers/TakeController.php
+++ b/app/Http/Controllers/TakeController.php
@@ -15,4 +15,13 @@ class TakeController extends Controller
         $item->save();
         return redirect('home');
     }
+
+    public function delete(Request $request)
+    {
+        $item = User::find(\Auth::id())->items()->find(request('item'));
+        $item->used_by = null;
+        $item->save();
+
+        return redirect('home');
+    }
 }
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index 0347eda..3a26222 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -5,8 +5,7 @@
     <div class="row justify-content-center">
         <div class="col-md-8">
             <div class="card">
-                <div class="card-header"><h3>Your items</h3></div>
-
+                <div class="card-header">Your items</div>
                 <div class="card-body">
                     @if (session('status'))
                         <div class="alert alert-success" role="alert">
@@ -35,4 +34,4 @@
         </div>
     </div>
 </div>
-@endsection
+@endsection
\ No newline at end of file
diff --git a/resources/views/home/usedItem.blade.php b/resources/views/home/usedItem.blade.php
index 42f106e..e2b1baf 100644
--- a/resources/views/home/usedItem.blade.php
+++ b/resources/views/home/usedItem.blade.php
@@ -1,12 +1,15 @@
 @if ($item->used_by == \Auth::id())
     <span class="float-right">
-        <form action="/return" method="POST">
+        <form action="/take" method="POST">
             {{ csrf_field() }}
+            @method('DELETE')
             <input type="hidden" name="item" value="{{$item->id}}"> 
             <button type="submit" class="btn btn-sm btn-danger">Return It</button>
         </form>
     </span>
     <span class="float-right mr-3"><em>{{\Carbon\Carbon::parse($item->updated_at)->diffForHumans()}}</em></span>
+
+
 @else
     <span class="float-right">
         <form action="/alert" method="POST">