From 94937c1496af121b3db1daea1921717f25ac3245 Mon Sep 17 00:00:00 2001
From: ogerly <landmatrosen@googlemail.com>
Date: Wed, 15 Apr 2020 17:49:11 +0200
Subject: [PATCH] feature: pagenation extended. page number display added,
 scroll to top at next and back, post display wider

---
 webapp/assets/_new/styles/tokens.scss         |  2 +-
 .../features/SearchResults/SearchResults.vue  | 55 +++++++++++++++++--
 .../PaginationButtons/PaginationButtons.vue   | 19 +++++++
 3 files changed, 69 insertions(+), 7 deletions(-)

diff --git a/webapp/assets/_new/styles/tokens.scss b/webapp/assets/_new/styles/tokens.scss
index 54a8b4042..0d63bf547 100644
--- a/webapp/assets/_new/styles/tokens.scss
+++ b/webapp/assets/_new/styles/tokens.scss
@@ -249,7 +249,7 @@ $size-ribbon: 6px;
  */
 
 $size-width-filter-sidebar: 85px;
-$size-width-paginate: 100px;
+$size-width-paginate: 200px;
 $size-max-width-filter-menu: 1026px;
 
 /**
diff --git a/webapp/components/_new/features/SearchResults/SearchResults.vue b/webapp/components/_new/features/SearchResults/SearchResults.vue
index 5ebd0cad6..cbad32df8 100644
--- a/webapp/components/_new/features/SearchResults/SearchResults.vue
+++ b/webapp/components/_new/features/SearchResults/SearchResults.vue
@@ -11,41 +11,77 @@
         :message="$t('search.no-results', { search })"
       />
       <template v-else-if="activeTab === 'Post'">
+         <pagination-buttons 
+           v-show="postCount > 25"
+          :hasNext="hasMorePosts"
+          :hasPrevious="hasPreviousPosts"
+          :hasResultPage="postPage"
+          :hasResultCount="postCount"
+          @back="previousPosts"
+          @next="nextPosts"
+        />
         <masonry-grid>
           <masonry-grid-item v-for="resource in activeResources" :key="resource.key">
             <post-teaser :post="resource" />
           </masonry-grid-item>
         </masonry-grid>
-        {{ postPage }}
-        <pagination-buttons
+     
+        <pagination-buttons 
+           v-show="postCount > 25"
           :hasNext="hasMorePosts"
           :hasPrevious="hasPreviousPosts"
+          :hasResultPage="postPage"
+          :hasResultCount="postCount"
           @back="previousPosts"
           @next="nextPosts"
         />
       </template>
       <ul v-else-if="activeTab === 'User'" class="user-list">
+  <pagination-buttons
+        v-show="userCount > 25"
+          :hasNext="hasMoreUsers"
+          :hasPrevious="hasPreviousUsers"
+          :hasResultPage="userPage"
+          :hasResultCount="userCount"
+          @back="previousUsers"
+          @next="nextUsers"
+        />
         <li v-for="resource in activeResources" :key="resource.key" class="item">
           <base-card :wideContent="true">
             <user-teaser :user="resource" />
           </base-card>
         </li>
         <pagination-buttons
+        v-show="userCount > 25"
           :hasNext="hasMoreUsers"
           :hasPrevious="hasPreviousUsers"
+          :hasResultPage="userPage"
+          :hasResultCount="userCount"
           @back="previousUsers"
           @next="nextUsers"
         />
       </ul>
       <ul v-else-if="activeTab === 'Hashtag'" class="hashtag-list">
+         <pagination-buttons
+        v-show="hashtagCount > 25"
+          :hasNext="hasMoreHashtags"
+          :hasPrevious="hasPreviousHashtags"
+          :hasResultPage="hashtagPage"
+          :hasResultCount="hashtagCount"
+          @back="previousHashtags"
+          @next="nextHashtags"
+        />
         <li v-for="resource in activeResources" :key="resource.key" class="item">
           <base-card :wideContent="true">
             <hc-hashtag :id="resource.id" />
           </base-card>
         </li>
         <pagination-buttons
+        v-show="hashtagCount > 25"
           :hasNext="hasMoreHashtags"
           :hasPrevious="hasPreviousHashtags"
+          :hasResultPage="hashtagPage"
+          :hasResultCount="hashtagCount"
           @back="previousHashtags"
           @next="nextHashtags"
         />
@@ -156,8 +192,13 @@ export default {
     },
   },
   methods: {
+    clearPage(){
+      this.postPage = 0
+      this.userPage = 0
+      this.hashtagPage = 0
+    },
     switchTab(tab) {
-      this.activeTab = tab
+      this.activeTab = tab      
     },
     previousPosts() {
       this.postPage--
@@ -205,6 +246,7 @@ export default {
         this.postCount = searchPosts.postCount
         this.searchCount = this.postCount + this.userCount + this.hashtagCount 
         if (this.postCount > 0) this.activeTab = 'Post'
+        this.clearPage
       },
       fetchPolicy: 'cache-and-network',
     },
@@ -228,6 +270,7 @@ export default {
         this.userCount = searchUsers.userCount
         this.searchCount = this.postCount + this.userCount + this.hashtagCount 
         if (this.postCount === 0 && this.userCount > 0) this.activeTab = 'User'
+        this.clearPage
       },
       fetchPolicy: 'cache-and-network',
     },
@@ -251,8 +294,8 @@ export default {
         this.hashtagCount = searchHashtags.hashtagCount
         this.searchCount = this.postCount + this.userCount + this.hashtagCount 
 
-        if (this.postCount === 0 && this.userCount === 0 && this.hashtagCount > 0)
-          this.activeTab = 'Hashtag'
+        if (this.postCount === 0 && this.userCount === 0 && this.hashtagCount > 0) this.activeTab = 'Hashtag'
+        this.clearPage
       },
       fetchPolicy: 'cache-and-network',
     },
@@ -263,7 +306,7 @@ export default {
 <style lang="scss">
 .search-results {
   > .results {
-    display: inline-block;
+   /* display: inline-block;*/
     padding: $space-small;
     background-color: $color-neutral-80;
     border-radius: 0 $border-radius-base $border-radius-base $border-radius-base;
diff --git a/webapp/components/_new/generic/PaginationButtons/PaginationButtons.vue b/webapp/components/_new/generic/PaginationButtons/PaginationButtons.vue
index 592492f7d..0957c3838 100644
--- a/webapp/components/_new/generic/PaginationButtons/PaginationButtons.vue
+++ b/webapp/components/_new/generic/PaginationButtons/PaginationButtons.vue
@@ -6,13 +6,17 @@
       icon="arrow-left"
       circle
       data-test="previous-button"
+      v-scroll-to="'.main-navigation'"
     />
+    <span class="pagination-pageCount"> Seite {{ hasResultPage + 1 }} / {{ Math.round(hasResultCount / 25) + 1}} </span>
+   
     <base-button
       @click="$emit('next')"
       :disabled="!hasNext"
       icon="arrow-right"
       circle
       data-test="next-button"
+      v-scroll-to="'.main-navigation'"
     />
   </div>
 </template>
@@ -28,6 +32,14 @@ export default {
       type: Boolean,
       default: false,
     },
+    hasResultPage: {
+      type: Number,
+      default: 0,
+    },
+    hasResultCount: {
+      type: Number,
+      default: 0,
+    },
   },
 }
 </script>
@@ -39,4 +51,11 @@ export default {
   width: $size-width-paginate;
   margin: $space-x-small auto;
 }
+
+.pagination-pageCount {
+ 
+    justify-content: space-around;
+  
+    margin: 8px auto;
+  }
 </style>