From 51ee7c2ef34fd5e81d56f18f26790f966e873da2 Mon Sep 17 00:00:00 2001
From: Bruno Fontes <developer@brunofontes.net>
Date: Thu, 20 Sep 2018 20:37:21 -0300
Subject: [PATCH] Changing home layout from FLOAT to GRID

---
 resources/views/home.blade.php            | 41 +++++++++--------
 resources/views/home/unusedItem.blade.php | 12 ++---
 resources/views/home/usedItem.blade.php   | 56 +++++++++++------------
 3 files changed, 53 insertions(+), 56 deletions(-)

diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index 6398800..78c2fe8 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -8,34 +8,37 @@
                 <div class="card-header">Your items</div>
                 <div class="card-body">
                     @if (session('status'))
-                        <div class="alert alert-success" role="alert">
-                            {{ session('status') }}
-                        </div>
+                    <div class="alert alert-success" role="alert">
+                        {{ session('status') }}
+                    </div>
                     @endif
 
                     @forelse ($items as $item)
-                        @if (!$loop->first)
-                            <hr class="m-3">
-                        @endif
-                        <div class="my-4 p-2">
+                    @if (!$loop->first)
+                    <hr class="m-3">
+                    @endif
+                    <div class="row align-items-center p-2">
+                        <div class="col col-xs-auto">
                             @if ($item->product->url)
-                                <a href="{{$item->product->url}}" class="link-unstyled" target="_blank" rel="noopener noreferrer">
-                            @endif
+                            <a href="{{$item->product->url}}" class="link-unstyled" target="_blank" rel="noopener noreferrer">
+                                @endif
 
-                            <strong>{{$item->name}}</strong> ({{$item->product->name}})
+                                <strong>{{$item->name}}</strong> ({{$item->product->name}})
 
-                            @if ($item->product->url)
-                                </a>
-                            @endif
-
-                            @if ($item->used_by)
-                                @include('home.usedItem')
-                            @else
-                                @include('home.unusedItem')
+                                @if ($item->product->url)
+                            </a>
                             @endif
                         </div>
+                        <div class="align-self-end text-right">
+                            @if ($item->used_by)
+                            @include('home.usedItem')
+                            @else
+                            @include('home.unusedItem')
+                            @endif
+                        </div>
+                    </div>
                     @empty
-                        <p>There are no items shared with you yet. <a href="/product">Share an item!</a></p>
+                    <p>There are no items shared with you yet. <a href="/product">Share an item!</a></p>
                     @endforelse
                 </div>
             </div>
diff --git a/resources/views/home/unusedItem.blade.php b/resources/views/home/unusedItem.blade.php
index 2d4d8b6..3aefc6e 100644
--- a/resources/views/home/unusedItem.blade.php
+++ b/resources/views/home/unusedItem.blade.php
@@ -1,7 +1,5 @@
-<span class="float-right">
-    <form action="/take" method="POST">
-        {{ csrf_field() }}
-        <input type="hidden" name="item" value="{{$item->id}}"> 
-        <button type="submit" class="btn btn-sm btn-success">Take It</button>
-    </form>
-</span>
\ No newline at end of file
+<form action="/take" method="POST">
+    {{ csrf_field() }}
+    <input type="hidden" name="item" value="{{$item->id}}">
+    <button type="submit" class="btn btn-sm btn-success">Take It</button>
+</form>
\ No newline at end of file
diff --git a/resources/views/home/usedItem.blade.php b/resources/views/home/usedItem.blade.php
index 5a5b4c3..dcfe35f 100644
--- a/resources/views/home/usedItem.blade.php
+++ b/resources/views/home/usedItem.blade.php
@@ -1,35 +1,31 @@
 @if ($item->used_by == \Auth::id())
-    <span class="float-right">
-        <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>
+<form action="/take" method="POST" class="form-inline">
+    <em class="pr-sm-2 ml-auto">{{\Carbon\Carbon::parse($item->updated_at)->diffForHumans()}}</em>
+    <div class="w-100 d-xm-block d-sm-none"></div>
+    {{ csrf_field() }}
+    @method('DELETE')
+    <input type="hidden" name="item" value="{{$item->id}}">
+    <button type="submit" class="btn btn-sm btn-danger ml-auto">Return It</button>
+</form>
 
 
 @else
-    <span class="float-right">
-        <form action="/alert" method="POST">
-            {{ csrf_field() }}
-            <input type="hidden" name="item" value="{{$item->id}}"> 
-            @if ($item->waiting_user_id == \Auth::id())
-                @method('DELETE')
-                <button type="submit" class="btn btn-sm btn-outline-danger">Cancel Alert</button>
-            @elseif (!$item->waiting_user_id)
-                <button type="submit" class="btn btn-sm btn-outline-secondary">Alert me</button>
-            @endif
-        </form>
-    </span>
-    <span class="float-right mr-3">
-        <em>
-            {{str_limit($users[$item->used_by], 15, '...')}} 
-            @if ($item->waiting_user_id && $item->waiting_user_id != \Auth::id())
-                <strong>> {{str_limit($users[$item->waiting_user_id], 15, '...')}}</strong>
-            @endif
-            <small>({{$item->updated_at->diffForHumans()}})</small>
-        </em>
-    </span>
+<form action="/alert" method="POST" class="form-inline">
+    <em class="pr-sm-2 ml-auto">
+        {{str_limit($users[$item->used_by], 15, '...')}}
+        @if ($item->waiting_user_id && $item->waiting_user_id != \Auth::id())
+        <strong>> {{str_limit($users[$item->waiting_user_id], 15, '...')}}</strong>
+        @endif
+        <small>({{$item->updated_at->diffForHumans()}})</small>
+    </em>
+    <div class="w-100 d-xm-block d-sm-none"></div>
+    {{ csrf_field() }}
+    <input type="hidden" name="item" value="{{$item->id}}">
+    @if ($item->waiting_user_id == \Auth::id())
+    @method('DELETE')
+    <button type="submit" class="btn btn-sm btn-outline-danger ml-auto">Cancel Alert</button>
+    @elseif (!$item->waiting_user_id)
+    <button type="submit" class="btn btn-sm btn-outline-secondary ml-auto">Alert me</button>
+    @endif
+</form>
 @endif
\ No newline at end of file