From 08a14877d410ffa1855cf6e7de9ce623b44ff81d Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Thu, 9 Aug 2018 22:29:56 -0600
Subject: [PATCH] Update status view

---
 resources/views/status/show.blade.php | 72 ++++++++++++++++++---------
 1 file changed, 48 insertions(+), 24 deletions(-)

diff --git a/resources/views/status/show.blade.php b/resources/views/status/show.blade.php
index 56c7bd580..7f711f240 100644
--- a/resources/views/status/show.blade.php
+++ b/resources/views/status/show.blade.php
@@ -18,12 +18,13 @@
       <div class="col-12 col-md-8 status-photo px-0">
         @if($status->is_nsfw && $status->media_count == 1)
         <details class="details-animated">
-          <p>
-            <summary>NSFW / Hidden Image</summary>
-            <a class="max-hide-overflow {{$status->firstMedia()->filter_class}}" href="{{$status->url()}}">
-              <img class="card-img-top" src="{{$status->mediaUrl()}}">
-            </a>
-          </p>
+          <summary>
+            <p class="mb-0 lead font-weight-bold">CW / NSFW / Hidden Media</p>
+            <p class="font-weight-light">(click to show)</p>
+          </summary>
+          <a class="max-hide-overflow {{$status->firstMedia()->filter_class}}" href="{{$status->url()}}">
+            <img class="card-img-top" src="{{$status->mediaUrl()}}">
+          </a>
         </details>
         @elseif(!$status->is_nsfw && $status->media_count == 1)
         <div class="{{$status->firstMedia()->filter_class}}">
@@ -68,19 +69,43 @@
               <a href="{{$user->url()}}" class="username-link font-weight-bold text-dark">{{$user->username}}</a>
             </div>
           </div>
+            <div class="float-right">
+              <div class="dropdown">
+                <button class="btn btn-link text-dark no-caret dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="Post options">
+                <span class="fas fa-ellipsis-v text-muted"></span>
+                </button>
+                <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">
+                  <a class="dropdown-item font-weight-bold" href="{{$status->reportUrl()}}">Report</a>
+                  {{-- <a class="dropdown-item" href="#">Embed</a> --}}
+                @if(Auth::check())
+                  @if(Auth::user()->profile->id === $status->profile->id || Auth::user()->is_admin == true)
+                  {{-- <a class="dropdown-item" href="{{$status->editUrl()}}">Edit</a> --}}
+                  <form method="post" action="/i/delete">
+                    @csrf
+                    <input type="hidden" name="type" value="post">
+                    <input type="hidden" name="item" value="{{$status->id}}">
+                    <button type="submit" class="dropdown-item btn btn-link font-weight-bold">Delete</button>
+                  </form>
+                  @endif
+                @endif
+
+                </div>
+              </div>
+            </div>
         </div>
         <div class="d-flex flex-md-column flex-column-reverse h-100">
           <div class="card-body status-comments">
             <div class="status-comment">
               <p class="mb-1">
                 <span class="font-weight-bold pr-1">{{$status->profile->username}}</span>
-                <span class="comment-text">{!! $status->rendered ?? e($status->caption) !!}</span>
+                <span class="comment-text" v-pre>{!! $status->rendered ?? e($status->caption) !!}</span>
               </p>
+              <p class="mb-1"><a href="{{$status->url()}}/c" class="text-muted">View all comments</a></p>
               <div class="comments">
-                @foreach($status->comments->reverse()->take(10) as $item)
-                <p class="mb-0">
-                  <span class="font-weight-bold pr-1"><bdi><a class="text-dark" href="{{$item->profile->url()}}">{{$item->profile->username}}</a></bdi></span>
-                  <span class="comment-text">{!! $item->rendered ?? e($item->caption) !!} <a href="{{$item->url()}}" class="text-dark small font-weight-bold float-right">{{$item->created_at->diffForHumans(null, true, true ,true)}}</a></span>
+                @foreach($replies as $item)
+                <p class="mb-1">
+                  <span class="font-weight-bold pr-1"><bdi><a class="text-dark" href="{{$item->profile->url()}}">{{ str_limit($item->profile->username, 15)}}</a></bdi></span>
+                  <span class="comment-text" v-pre>{!! $item->rendered ?? e($item->caption) !!} <a href="{{$item->url()}}" class="text-dark small font-weight-bold float-right pl-2">{{$item->created_at->diffForHumans(null, true, true ,true)}}</a></span>
                 </p>
                 @endforeach
               </div>
@@ -88,32 +113,30 @@
           </div>
           <div class="card-body flex-grow-0 py-1">
             <div class="reactions my-1">
-               <form class="d-inline-flex like-form pr-3" method="post" action="/i/like" style="display: inline;" data-id="{{$status->id}}" data-action="like">
+              @if(Auth::check())
+               <form class="d-inline-flex pr-3" method="post" action="/i/like" style="display: inline;" data-id="{{$status->id}}" data-action="like">
                 @csrf
                 <input type="hidden" name="item" value="{{$status->id}}">
                 <button class="btn btn-link text-dark p-0 border-0" type="submit" title="Like!">
-                  <h3 class="far fa-heart m-0"></h3>
+                  <h3 class="m-0 {{$status->liked() ? 'fas fa-heart text-danger':'far fa-heart text-dark'}}"></h3>
                 </button>
               </form>
               <h3 class="far fa-comment pr-3 m-0" title="Comment"></h3>
-              @if(Auth::check())
-              @if(Auth::user()->profile->id === $status->profile->id || Auth::user()->is_admin == true)
-              <form method="post" action="/i/delete" class="d-inline-flex">
+              <form class="d-inline-flex share-form pr-3" method="post" action="/i/share" style="display: inline;" data-id="{{$status->id}}" data-action="share" data-count="{{$status->shares_count}}">
                 @csrf
-                <input type="hidden" name="type" value="post">
                 <input type="hidden" name="item" value="{{$status->id}}">
-                <button type="submit" class="btn btn-link text-dark p-0 border-0" title="Remove">
-                  <h3 class="far fa-trash-alt m-0"></h3>
+                <button class="btn btn-link text-dark p-0" type="submit" title="Share">
+                  <h3 class="m-0 {{$status->shared() ? 'fas fa-share-square text-primary':'far fa-share-square '}}"></h3>
                 </button>
               </form>
-              @endif
+
               @endif
               <span class="float-right">
-                <form class="d-inline-flex bookmark-form" method="post" action="/i/bookmark" style="display: inline;" data-id="{{$status->id}}" data-action="bookmark">
+                <form class="d-inline-flex " method="post" action="/i/bookmark" style="display: inline;" data-id="{{$status->id}}" data-action="bookmark">
                   @csrf
                   <input type="hidden" name="item" value="{{$status->id}}">
                   <button class="btn btn-link text-dark p-0 border-0" type="submit" title="Save">
-                    <h3 class="far fa-bookmark m-0"></h3>
+                    <h3 class="m-0 {{$status->bookmarked() ? 'fas fa-bookmark text-warning':'far fa-bookmark'}}"></h3>
                   </button>
                 </form>
               </span>
@@ -132,7 +155,8 @@
           <form class="comment-form" method="post" action="/i/comment" data-id="{{$status->id}}" data-truncate="false">
             @csrf
             <input type="hidden" name="item" value="{{$status->id}}">
-            <input class="form-control" name="comment" placeholder="Add a comment...">
+              
+            <input class="form-control" name="comment" placeholder="Add a comment..." autocomplete="off">
           </form>
         </div>
       </div>
@@ -144,5 +168,5 @@
 
 @push('meta')
 <meta property="og:description" content="{{ $status->caption }}">
-<meta property="og:image" content="{{$status->mediaUrl()}}">
+    <meta property="og:image" content="{{$status->mediaUrl()}}">
 @endpush