From 1383feca0da0300e916e744ec091e9a42bae1590 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Fri, 10 Aug 2018 00:26:51 -0600
Subject: [PATCH 1/2] Update hashtag view

---
 resources/views/discover/tags/show.blade.php | 28 +++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/resources/views/discover/tags/show.blade.php b/resources/views/discover/tags/show.blade.php
index 3099b3e41..49429ebd5 100644
--- a/resources/views/discover/tags/show.blade.php
+++ b/resources/views/discover/tags/show.blade.php
@@ -7,7 +7,7 @@
   <div class="profile-header row my-5">
     <div class="col-12 col-md-3">
       <div class="profile-avatar">
-        <img class="img-thumbnail" src="https://placehold.it/300x300" style="border-radius:100%;" width="172px">
+        <img class="rounded-circle card" src="{{$posts->last()->thumb()}}" width="172px" height="172px">
       </div>
     </div>
     <div class="col-12 col-md-9 d-flex align-items-center">
@@ -16,13 +16,13 @@
           <span class="h1">{{$tag->name}}</span>
         </div>
         <p class="font-weight-bold">
-          {{$count}} posts
+          {{$tag->posts_count}} posts
         </p>
       </div>
     </div>
   </div>
 
-  <div class="profile-timeline mt-5 row">
+  <div class="tag-timeline row">
     @foreach($posts as $status)
     <div class="col-12 col-md-4 mb-4">
       <a class="card" href="{{$status->url()}}">
@@ -31,7 +31,9 @@
     </div>
     @endforeach
   </div>
-
+  <div class="d-flex justify-content-center pagination-container mt-4">
+    {{$posts->links()}}
+  </div>
 </div>
 
 @endsection
@@ -39,3 +41,21 @@
 @push('meta')
 <meta property="og:description" content="Discover {{$tag->name}}">
 @endpush
+
+@push('scripts')
+<script type="text/javascript">
+
+  $(document).ready(function() {
+    $('.pagination-container').hide();
+    $('.pagination').hide();
+    let elem = document.querySelector('.tag-timeline');
+    let infScroll = new InfiniteScroll( elem, {
+      path: '.pagination__next',
+      append: '.tag-timeline',
+      status: '.page-load-status',
+      history: true,
+    });
+  });
+
+</script>
+@endpush

From 13551b1f9e6c5d39cc5f1f37e03b5642450886df Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Fri, 10 Aug 2018 00:27:39 -0600
Subject: [PATCH 2/2] Update pixelfed config, bump version

---
 config/pixelfed.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/pixelfed.php b/config/pixelfed.php
index 344c0ea96..ffdd5b633 100644
--- a/config/pixelfed.php
+++ b/config/pixelfed.php
@@ -23,7 +23,7 @@ return [
     | This value is the version of your PixelFed instance.
     |
     */
-    'version' => '0.1.3',
+    'version' => '0.1.4',
 
     /*
     |--------------------------------------------------------------------------