Merge pull request #265 from dansup/frontend-ui-refactor

Update status template

app/Http/Controllers/AccountController.php

@@ -41,7 +41,7 @@ class AccountController extends Controller
         if(EmailVerification::whereUserId(Auth::id())->count() !== 0) {
             return redirect()->back()->with('status', 'A verification email has already been sent! Please check your email.');
         }
-        
+
         $user = User::whereNull('email_verified_at')->find(Auth::id());
         $utoken = hash('sha512', $user->id);
         $rtoken = str_random(40);
@@ -60,8 +60,8 @@ class AccountController extends Controller
 
     public function confirmVerifyEmail(Request $request, $userToken, $randomToken)
     {
-        $verify = EmailVerification::where(DB::raw('BINARY `user_token`'), $userToken)
-          ->where(DB::raw('BINARY `random_token`'), $randomToken)
+        $verify = EmailVerification::where(DB::raw('BINARY user_token'), $userToken)
+          ->where(DB::raw('BINARY random_token'), $randomToken)
           ->firstOrFail();
         if(Auth::id() === $verify->user_id) {
           $user = User::find(Auth::id());

resources/views/status/template.blade.php

@@ -74,7 +74,7 @@
           </div>
           @if($item->comments()->count() > 3)
           <div class="more-comments">
-            <a class="text-muted" href="#">Load more comments</a>
+            <a class="text-muted" href="{{$item->url()}}">Load more comments</a>
           </div>
           @endif
           <div class="comments">
@@ -93,12 +93,6 @@
                 </span>
               </p>
             @else
-            @foreach($item->comments->reverse()->take(3) as $comment)
-              <p class="mb-0">
-                <span class="font-weight-bold pr-1"><bdi><a class="text-dark" href="{{$comment->profile->url()}}">{{$comment->profile->username}}</a></bdi></span>
-                <span class="comment-text">{!! str_limit($item->rendered ?? e($item->caption), 150) !!}</span>
-              </p>
-            @endforeach
             @endif
           </div>
           <div class="timestamp pt-1">