From 7d30a292274143a194f75723a388e4c3f62a3025 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sat, 2 Mar 2019 00:19:50 -0700
Subject: [PATCH] Update discover pages

---
 resources/views/discover/personal.blade.php   | 25 +++----------------
 .../views/discover/tags/category.blade.php    | 25 +++----------------
 resources/views/discover/tags/show.blade.php  | 24 ------------------
 3 files changed, 6 insertions(+), 68 deletions(-)

diff --git a/resources/views/discover/personal.blade.php b/resources/views/discover/personal.blade.php
index cbda555b9..2e8a63a18 100644
--- a/resources/views/discover/personal.blade.php
+++ b/resources/views/discover/personal.blade.php
@@ -18,10 +18,12 @@ background: linear-gradient(to right, #FFC371, #FF5F6D); /* W3C, IE 10+/ Edge, F
 <div class="container">
   <div class="pt-4 d-flex justify-content-between align-items-center">
     <p>
+      @if($tags->count() > 0)
       <span class="font-weight-lighter pr-3">Related hashtags:</span> 
       @foreach($tags as $hashtag)
         <a class="btn btn-outline-secondary btn-sm py-0 pr-2" href="{{$hashtag->url()}}">#{{$hashtag->name}}</a>
       @endforeach
+      @endif
     </p>
     <p class="font-weight-lighter">
       {{$posts->post_count}} posts
@@ -50,27 +52,6 @@ background: linear-gradient(to right, #FFC371, #FF5F6D); /* W3C, IE 10+/ Edge, F
       @endforeach
     </div>
   </div>
-  <div class="d-flex justify-content-center pagination-container mt-4">
-    {{$posts->links()}}
-  </div>
 </div>
 
-@endsection
-
-@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
\ No newline at end of file
+@endsection
\ No newline at end of file
diff --git a/resources/views/discover/tags/category.blade.php b/resources/views/discover/tags/category.blade.php
index d918f53a4..ea73b43c7 100644
--- a/resources/views/discover/tags/category.blade.php
+++ b/resources/views/discover/tags/category.blade.php
@@ -2,7 +2,7 @@
 
 @section('content')
 
-<div class="profile-header bg-light {{$tag->bgd ?? 'bgd-2'}}">
+<div class="profile-header bg-light bgd-2">
   <div class="container py-5">
     <div class="row">
       <div class="col-12 col-md-3">
@@ -24,10 +24,12 @@
 <div class="container">
   <div class="pt-4 d-flex justify-content-between align-items-center">
     <p>
+      @if($tag->hashtags->count() > 0)
       <span class="font-weight-lighter pr-3">Related hashtags:</span> 
       @foreach($tag->hashtags as $hashtag)
         <a class="btn btn-outline-secondary btn-sm py-0 pr-2" href="{{$hashtag->url()}}">#{{$hashtag->name}}</a>
       @endforeach
+      @endif
     </p>
     <p class="font-weight-lighter">
       {{$tag->posts_count}} posts
@@ -56,9 +58,6 @@
       @endforeach
     </div>
   </div>
-  <div class="d-flex justify-content-center pagination-container mt-4">
-    {{$posts->links()}}
-  </div>
 </div>
 
 @endsection
@@ -84,21 +83,3 @@
   }
 </style>
 @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
diff --git a/resources/views/discover/tags/show.blade.php b/resources/views/discover/tags/show.blade.php
index a710ae365..4ea1fc24b 100644
--- a/resources/views/discover/tags/show.blade.php
+++ b/resources/views/discover/tags/show.blade.php
@@ -44,31 +44,7 @@
       @endforeach
     </div>
   </div>
-  <div class="d-flex justify-content-center pagination-container mt-4">
-    {{$posts->links()}}
-  </div>
 </div>
 
 @endsection
 
-@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