From 8f7ec2efe68fca0e82191e8ddb176b0d684f6295 Mon Sep 17 00:00:00 2001 From: molda Date: Sun, 4 Aug 2019 19:34:25 +0300 Subject: [PATCH 1/6] added vue-infinite-scroll plugin --- webapp/nuxt.config.js | 1 + webapp/package.json | 1 + webapp/plugins/vue-infinite-scroll.js | 4 ++++ webapp/yarn.lock | 6 +++++- 4 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 webapp/plugins/vue-infinite-scroll.js diff --git a/webapp/nuxt.config.js b/webapp/nuxt.config.js index 3c25e43b6..c7d6d1a27 100644 --- a/webapp/nuxt.config.js +++ b/webapp/nuxt.config.js @@ -100,6 +100,7 @@ module.exports = { { src: '~/plugins/v-tooltip.js', ssr: false }, { src: '~/plugins/izi-toast.js', ssr: false }, { src: '~/plugins/vue-filters.js' }, + { src: '~/plugins/vue-infinite-scroll.js', ssr: false }, ], router: { diff --git a/webapp/package.json b/webapp/package.json index f3fa36012..ed53480f0 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -76,6 +76,7 @@ "tiptap-extensions": "~1.26.2", "v-tooltip": "~2.0.2", "vue-count-to": "~1.0.13", + "vue-infinite-scroll": "^2.0.2", "vue-izitoast": "roschaefer/vue-izitoast#patch-1", "vuex-i18n": "~1.13.1", "vue-sweetalert-icons": "~4.2.0", diff --git a/webapp/plugins/vue-infinite-scroll.js b/webapp/plugins/vue-infinite-scroll.js new file mode 100644 index 000000000..3d6891e9c --- /dev/null +++ b/webapp/plugins/vue-infinite-scroll.js @@ -0,0 +1,4 @@ +import Vue from 'vue' +import infiniteScroll from 'vue-infinite-scroll' + +Vue.use(infiniteScroll) diff --git a/webapp/yarn.lock b/webapp/yarn.lock index b27a0951f..54e2d8430 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -14887,9 +14887,13 @@ vue-hot-reload-api@^2.3.0: resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.3.tgz#2756f46cb3258054c5f4723de8ae7e87302a1ccf" integrity sha512-KmvZVtmM26BQOMK1rwUZsrqxEGeKiYSZGA7SNWE6uExx8UX/cj9hq2MRV/wWC3Cq6AoeDGk57rL9YMFRel/q+g== +vue-infinite-scroll@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/vue-infinite-scroll/-/vue-infinite-scroll-2.0.2.tgz#ca37a91fe92ee0ad3b74acf8682c00917144b711" + integrity sha512-n+YghR059YmciANGJh9SsNWRi1YZEBVlODtmnb/12zI+4R72QZSWd+EuZ5mW6auEo/yaJXgxzwsuhvALVnm73A== + vue-izitoast@roschaefer/vue-izitoast#patch-1: version "1.1.2" - uid ba6b03eb24c7c04c299e64a9703e101bf158ae50 resolved "https://codeload.github.com/roschaefer/vue-izitoast/tar.gz/ba6b03eb24c7c04c299e64a9703e101bf158ae50" dependencies: izitoast "^1.3.0" From 2edf26ac0a1fa25f25df9bff4be080478282df01 Mon Sep 17 00:00:00 2001 From: molda Date: Sun, 4 Aug 2019 19:34:44 +0300 Subject: [PATCH 2/6] implemented infinite-scroll to index page --- webapp/pages/index.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue index 683e5eb65..768a71e3b 100644 --- a/webapp/pages/index.vue +++ b/webapp/pages/index.vue @@ -33,7 +33,14 @@ primary /> - +
+ +
From 7cd3b0d5242d4066c954991ec79d564298e259c9 Mon Sep 17 00:00:00 2001 From: molda Date: Sun, 4 Aug 2019 19:39:36 +0300 Subject: [PATCH 3/6] implemented infinite-scroll in profile page --- webapp/pages/profile/_id/_slug.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue index 0e15218c8..540e6bdc8 100644 --- a/webapp/pages/profile/_id/_slug.vue +++ b/webapp/pages/profile/_id/_slug.vue @@ -229,7 +229,14 @@ - +
+ +
From f5c939472b32acec0bd284e76a74537ec298bee1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Tue, 6 Aug 2019 01:36:08 +0200 Subject: [PATCH 4/6] Fix console.errors in frontend tests @MoldaB here's how you can register plugins in a frontend test. Pro tip: You can run `yarn run test --run-in-band` to find out where the console.errors come from. Jest, by default, runs in parallel which makes it a little difficult to debug errors that don't fail the test. --- webapp/pages/index.spec.js | 2 ++ webapp/pages/profile/_id/_slug.spec.js | 2 ++ webapp/plugins/vue-infinite-scroll.js | 8 ++++---- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/webapp/pages/index.spec.js b/webapp/pages/index.spec.js index 805640ef6..6dacd6069 100644 --- a/webapp/pages/index.spec.js +++ b/webapp/pages/index.spec.js @@ -5,6 +5,7 @@ import Styleguide from '@human-connection/styleguide' import Filters from '~/plugins/vue-filters' import VTooltip from 'v-tooltip' import FilterMenu from '~/components/FilterMenu/FilterMenu' +import InfiniteScroll from '~/plugins/vue-infinite-scroll' const localVue = createLocalVue() @@ -12,6 +13,7 @@ localVue.use(Vuex) localVue.use(Styleguide) localVue.use(Filters) localVue.use(VTooltip) +localVue.use(InfiniteScroll) config.stubs['no-ssr'] = '' config.stubs['router-link'] = '' diff --git a/webapp/pages/profile/_id/_slug.spec.js b/webapp/pages/profile/_id/_slug.spec.js index bd6c9c598..59dfddc8b 100644 --- a/webapp/pages/profile/_id/_slug.spec.js +++ b/webapp/pages/profile/_id/_slug.spec.js @@ -3,12 +3,14 @@ import ProfileSlug from './_slug.vue' import Vuex from 'vuex' import Styleguide from '@human-connection/styleguide' import Filters from '~/plugins/vue-filters' +import InfiniteScroll from '~/plugins/vue-infinite-scroll' const localVue = createLocalVue() localVue.use(Vuex) localVue.use(Styleguide) localVue.use(Filters) +localVue.use(InfiniteScroll) localVue.filter('date', d => d) config.stubs['no-ssr'] = '' diff --git a/webapp/plugins/vue-infinite-scroll.js b/webapp/plugins/vue-infinite-scroll.js index 3d6891e9c..776db193b 100644 --- a/webapp/plugins/vue-infinite-scroll.js +++ b/webapp/plugins/vue-infinite-scroll.js @@ -1,4 +1,4 @@ -import Vue from 'vue' -import infiniteScroll from 'vue-infinite-scroll' - -Vue.use(infiniteScroll) +import Vue from 'vue' +import infiniteScroll from 'vue-infinite-scroll' + +Vue.use(infiniteScroll) From a052743e8b28e7eba3cc6f2a71fc77aa1eaa2196 Mon Sep 17 00:00:00 2001 From: roschaefer Date: Thu, 15 Aug 2019 11:39:09 +0200 Subject: [PATCH 5/6] Bind infinite-scroll-* correctly --- webapp/pages/index.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue index 768a71e3b..12e4ce108 100644 --- a/webapp/pages/index.vue +++ b/webapp/pages/index.vue @@ -36,8 +36,9 @@
From 67bd1184aa06f414b2ab2afc2ec1380b5dd17175 Mon Sep 17 00:00:00 2001 From: roschaefer Date: Thu, 15 Aug 2019 17:09:08 +0200 Subject: [PATCH 6/6] Fine tune throttle delay --- webapp/pages/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue index 12e4ce108..7566ce791 100644 --- a/webapp/pages/index.vue +++ b/webapp/pages/index.vue @@ -39,6 +39,7 @@ :infinite-scroll-immediate-check="true" :infinite-scroll-disabled="$apollo.loading" :infinite-scroll-distance="10" + :infinite-scroll-throttle-delay="800" >