From f6cdf9ff6484706ff737f3afb828cfe7885378c3 Mon Sep 17 00:00:00 2001 From: Alina Beck Date: Thu, 19 Dec 2019 08:39:27 +0530 Subject: [PATCH] removes LoadMore button --- webapp/components/LoadMore.vue | 15 ------- webapp/pages/index.spec.js | 5 --- webapp/pages/index.vue | 6 +-- webapp/pages/profile/_id/_slug.spec.js | 62 -------------------------- webapp/pages/profile/_id/_slug.vue | 6 +-- 5 files changed, 2 insertions(+), 92 deletions(-) delete mode 100644 webapp/components/LoadMore.vue diff --git a/webapp/components/LoadMore.vue b/webapp/components/LoadMore.vue deleted file mode 100644 index ff8d4e6c4..000000000 --- a/webapp/components/LoadMore.vue +++ /dev/null @@ -1,15 +0,0 @@ - - - diff --git a/webapp/pages/index.spec.js b/webapp/pages/index.spec.js index d5d677af1..f25f44ca0 100644 --- a/webapp/pages/index.spec.js +++ b/webapp/pages/index.spec.js @@ -126,11 +126,6 @@ describe('PostIndex', () => { .trigger('click') expect(mutations['posts/SELECT_ORDER']).toHaveBeenCalledWith({}, 'createdAt_asc') }) - - it('updates offset when a user clicks on the load more button', () => { - wrapper.find('.load-more button').trigger('click') - expect(wrapper.vm.offset).toEqual(12) - }) }) }) }) diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue index c3f01d548..6178198a8 100644 --- a/webapp/pages/index.vue +++ b/webapp/pages/index.vue @@ -50,9 +50,7 @@ /> - - - + @@ -62,7 +60,6 @@ import FilterMenu from '~/components/FilterMenu/FilterMenu.vue' import HcEmpty from '~/components/Empty/Empty' import HcPostCard from '~/components/PostCard/PostCard.vue' -import HcLoadMore from '~/components/LoadMore.vue' import MasonryGrid from '~/components/MasonryGrid/MasonryGrid.vue' import MasonryGridItem from '~/components/MasonryGrid/MasonryGridItem.vue' import { mapGetters, mapMutations } from 'vuex' @@ -75,7 +72,6 @@ export default { // DonationInfo, FilterMenu, HcPostCard, - HcLoadMore, HcEmpty, MasonryGrid, MasonryGridItem, diff --git a/webapp/pages/profile/_id/_slug.spec.js b/webapp/pages/profile/_id/_slug.spec.js index adbfa8e2f..8d95834a8 100644 --- a/webapp/pages/profile/_id/_slug.spec.js +++ b/webapp/pages/profile/_id/_slug.spec.js @@ -88,68 +88,6 @@ describe('ProfileSlug', () => { it('displays name of the user', () => { expect(wrapper.text()).toContain('Bob the builder') }) - - describe('load more button', () => { - const aPost = { - title: 'I am a post', - content: 'This is my content', - contentExcerpt: 'This is my content', - } - - describe('currently no posts available (e.g. after tab switching)', () => { - beforeEach(() => { - wrapper.setData({ posts: [], hasMore: false }) - }) - - it('displays no "load more" button', () => { - expect(wrapper.find('.load-more').exists()).toBe(false) - }) - - describe('apollo client in `loading` state', () => { - beforeEach(() => { - wrapper.vm.$apollo.loading = true - }) - - it('never displays more than one loading spinner', () => { - expect(wrapper.findAll('.ds-spinner')).toHaveLength(1) - }) - - it('displays a loading spinner below the posts list', () => { - expect(wrapper.find('.ds-spinner').exists()).toBe(true) - }) - }) - }) - - describe('pagination returned at least as many posts as pageSize', () => { - beforeEach(() => { - const posts = [1, 2, 3, 4, 5, 6].map(id => { - return { - ...aPost, - id, - } - }) - wrapper.setData({ posts }) - }) - - it('displays "load more" button', () => { - expect(wrapper.find('.load-more').exists()).toBe(true) - }) - - describe('apollo client in `loading` state', () => { - beforeEach(() => { - wrapper.vm.$apollo.loading = true - }) - - it('never displays more than one loading spinner', () => { - expect(wrapper.findAll('.ds-spinner')).toHaveLength(1) - }) - - it('displays a loading spinner below the posts list', () => { - expect(wrapper.find('.load-more .ds-spinner').exists()).toBe(true) - }) - }) - }) - }) }) }) }) diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue index 3f7ff068a..a692f19ea 100644 --- a/webapp/pages/profile/_id/_slug.vue +++ b/webapp/pages/profile/_id/_slug.vue @@ -256,9 +256,7 @@ - - - + @@ -272,7 +270,6 @@ import HcPostCard from '~/components/PostCard/PostCard.vue' import HcFollowButton from '~/components/FollowButton.vue' import HcCountTo from '~/components/CountTo.vue' import HcBadges from '~/components/Badges.vue' -import HcLoadMore from '~/components/LoadMore.vue' import HcEmpty from '~/components/Empty/Empty' import ContentMenu from '~/components/ContentMenu/ContentMenu' import HcUpload from '~/components/Upload' @@ -301,7 +298,6 @@ export default { HcFollowButton, HcCountTo, HcBadges, - HcLoadMore, HcEmpty, HcAvatar, ContentMenu,