From ad6544bd52faa2e12f9d326f840c147429875d46 Mon Sep 17 00:00:00 2001 From: Preschian Febryantara Date: Wed, 24 Aug 2022 02:23:15 +0700 Subject: [PATCH 1/7] move carousel components into carousel --- .../{base => carousel}/CarouselCardList.vue | 2 +- .../GalleryItemCarousel.vue | 13 ++++---- .../Gallery => carousel}/LatestSales.vue | 19 +++--------- .../{rmrk/Gallery => carousel}/NewestList.vue | 15 +++------ .../PopularCollections.vue | 14 ++++----- components/landing/Landing.vue | 31 ++----------------- components/rmrk/Gallery/GalleryItem.vue | 3 +- components/rmrk/Gallery/Pagination.vue | 8 ++--- 8 files changed, 34 insertions(+), 71 deletions(-) rename components/{base => carousel}/CarouselCardList.vue (98%) rename components/{rmrk/Gallery => carousel}/GalleryItemCarousel.vue (85%) rename components/{rmrk/Gallery => carousel}/LatestSales.vue (84%) rename components/{rmrk/Gallery => carousel}/NewestList.vue (84%) rename components/{rmrk/Gallery => carousel}/PopularCollections.vue (85%) diff --git a/components/base/CarouselCardList.vue b/components/carousel/CarouselCardList.vue similarity index 98% rename from components/base/CarouselCardList.vue rename to components/carousel/CarouselCardList.vue index 3346560ac5..99e595b082 100644 --- a/components/base/CarouselCardList.vue +++ b/components/carousel/CarouselCardList.vue @@ -89,7 +89,7 @@ import { Component, Prop, mixins } from 'nuxt-property-decorator' import AuthMixin from '@/utils/mixins/authMixin' import PrefixMixin from '@/utils/mixins/prefixMixin' -import type { CarouselNFT } from './types' +import type { CarouselNFT } from '@/components/base/types' const components = { Money: () => import('@/components/shared/format/Money.vue'), diff --git a/components/rmrk/Gallery/GalleryItemCarousel.vue b/components/carousel/GalleryItemCarousel.vue similarity index 85% rename from components/rmrk/Gallery/GalleryItemCarousel.vue rename to components/carousel/GalleryItemCarousel.vue index 38809a0f8a..93a90b0b1c 100644 --- a/components/rmrk/Gallery/GalleryItemCarousel.vue +++ b/components/carousel/GalleryItemCarousel.vue @@ -1,6 +1,6 @@ diff --git a/components/rmrk/Gallery/GalleryItem.vue b/components/rmrk/Gallery/GalleryItem.vue index b4b4fe9cf2..5d37205083 100644 --- a/components/rmrk/Gallery/GalleryItem.vue +++ b/components/rmrk/Gallery/GalleryItem.vue @@ -195,7 +195,8 @@ import AvailableActions from './AvailableActions.vue' Detail: () => import('@/components/unique/Gallery/Item/Detail.vue'), BaseGalleryItem: () => import('@/components/shared/gallery/BaseGalleryItem.vue'), - GalleryItemCarousel: () => import('./GalleryItemCarousel.vue'), + GalleryItemCarousel: () => + import('@/components/carousel/GalleryItemCarousel.vue'), }, directives: { orientation: Orientation, diff --git a/components/rmrk/Gallery/Pagination.vue b/components/rmrk/Gallery/Pagination.vue index cec7351f3b..1209eeeb01 100644 --- a/components/rmrk/Gallery/Pagination.vue +++ b/components/rmrk/Gallery/Pagination.vue @@ -1,7 +1,7 @@ From a36e44992a09459b7d53cd2bb558eba2ab1c1a9a Mon Sep 17 00:00:00 2001 From: Preschian Febryantara Date: Wed, 24 Aug 2022 03:27:56 +0700 Subject: [PATCH 4/7] remove unused async --- components/carousel/LatestSales.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/carousel/LatestSales.vue b/components/carousel/LatestSales.vue index e1e61aa77b..b31cefeffb 100644 --- a/components/carousel/LatestSales.vue +++ b/components/carousel/LatestSales.vue @@ -60,7 +60,7 @@ export default class LatestSales extends mixins(PrefixMixin, AuthMixin) { return false } - async fetch() { + fetch() { this.fetchData() } From 00a2fccd531b3e0544c548fb6792bcb73652770e Mon Sep 17 00:00:00 2001 From: Preschian Febryantara Date: Fri, 26 Aug 2022 18:09:35 +0700 Subject: [PATCH 5/7] test 3d once --- tests/cypress/e2e/components/media.cy.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/cypress/e2e/components/media.cy.ts b/tests/cypress/e2e/components/media.cy.ts index db142577e6..6b0fac1a96 100644 --- a/tests/cypress/e2e/components/media.cy.ts +++ b/tests/cypress/e2e/components/media.cy.ts @@ -67,15 +67,15 @@ const mediaType = [ tagRelated: 'model-viewer', type: '3d', }, - { - url: '/bsx/gallery/2444376227-3', - title: '3D Ball', - description: 'Smash zone adverse', - collection: 'Ping Pong Ball', - creator: 'bXhWeV...2sDcbW', - tagRelated: 'model-viewer', - type: '3d', - }, + // { + // url: '/bsx/gallery/2444376227-3', + // title: '3D Ball', + // description: 'Smash zone adverse', + // collection: 'Ping Pong Ball', + // creator: 'bXhWeV...2sDcbW', + // tagRelated: 'model-viewer', + // type: '3d', + // }, // { // url: '/rmrk/gallery/9684463-c8205518d881699b3e-%E2%9D%84%EF%B8%8F-01_FROM_SINGULARITY-0000000000000005', // title: '01 fr.om - singularity', From 6d6bbd23949ac25fedaa2b58b5b15f4b56549fc3 Mon Sep 17 00:00:00 2001 From: Preschian Febryantara Date: Fri, 26 Aug 2022 18:30:49 +0700 Subject: [PATCH 6/7] test with another 3d once --- tests/cypress/e2e/components/media.cy.ts | 28 ++++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/cypress/e2e/components/media.cy.ts b/tests/cypress/e2e/components/media.cy.ts index 6b0fac1a96..8b26dab216 100644 --- a/tests/cypress/e2e/components/media.cy.ts +++ b/tests/cypress/e2e/components/media.cy.ts @@ -58,24 +58,24 @@ const mediaType = [ // tagRelated: 'img', // type: '3d', // }, - { - url: '/rmrk/gallery/11049994-e4c74212b3ed12d02b-INFINITY%20GEMS-GOLD_006-0000000000000094', - title: 'GOLD #006', - description: 'FIRST EDITION of INFINITY GEMS COLLECTION', - collection: 'INFINITY GEMS COLLECTION', - creator: 'SrSlayer', - tagRelated: 'model-viewer', - type: '3d', - }, // { - // url: '/bsx/gallery/2444376227-3', - // title: '3D Ball', - // description: 'Smash zone adverse', - // collection: 'Ping Pong Ball', - // creator: 'bXhWeV...2sDcbW', + // url: '/rmrk/gallery/11049994-e4c74212b3ed12d02b-INFINITY%20GEMS-GOLD_006-0000000000000094', + // title: 'GOLD #006', + // description: 'FIRST EDITION of INFINITY GEMS COLLECTION', + // collection: 'INFINITY GEMS COLLECTION', + // creator: 'SrSlayer', // tagRelated: 'model-viewer', // type: '3d', // }, + { + url: '/bsx/gallery/2444376227-3', + title: '3D Ball', + description: 'Smash zone adverse', + collection: 'Ping Pong Ball', + creator: 'bXhWeV...2sDcbW', + tagRelated: 'model-viewer', + type: '3d', + }, // { // url: '/rmrk/gallery/9684463-c8205518d881699b3e-%E2%9D%84%EF%B8%8F-01_FROM_SINGULARITY-0000000000000005', // title: '01 fr.om - singularity', From dfc5493dbf69c51d558664e655cfeb315f61fac3 Mon Sep 17 00:00:00 2001 From: Preschian Febryantara Date: Fri, 26 Aug 2022 22:38:14 +0700 Subject: [PATCH 7/7] define GalleryItemCarousel for bsx --- components/bsx/Gallery/Item/GalleryItem.vue | 2 ++ tests/cypress/e2e/components/media.cy.ts | 18 +++++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/components/bsx/Gallery/Item/GalleryItem.vue b/components/bsx/Gallery/Item/GalleryItem.vue index f273807ac1..306db4f326 100644 --- a/components/bsx/Gallery/Item/GalleryItem.vue +++ b/components/bsx/Gallery/Item/GalleryItem.vue @@ -217,6 +217,8 @@ import { mapToId } from '@/utils/mappers' OfferList: () => import('@/components/bsx/Offer/OfferList.vue'), History: () => import('@/components/rmrk/Gallery/History.vue'), Navigation: () => import('@/components/rmrk/Gallery/Item/Navigation.vue'), + GalleryItemCarousel: () => + import('@/components/carousel/GalleryItemCarousel.vue'), }, directives: { orientation: Orientation, diff --git a/tests/cypress/e2e/components/media.cy.ts b/tests/cypress/e2e/components/media.cy.ts index 8b26dab216..db142577e6 100644 --- a/tests/cypress/e2e/components/media.cy.ts +++ b/tests/cypress/e2e/components/media.cy.ts @@ -58,15 +58,15 @@ const mediaType = [ // tagRelated: 'img', // type: '3d', // }, - // { - // url: '/rmrk/gallery/11049994-e4c74212b3ed12d02b-INFINITY%20GEMS-GOLD_006-0000000000000094', - // title: 'GOLD #006', - // description: 'FIRST EDITION of INFINITY GEMS COLLECTION', - // collection: 'INFINITY GEMS COLLECTION', - // creator: 'SrSlayer', - // tagRelated: 'model-viewer', - // type: '3d', - // }, + { + url: '/rmrk/gallery/11049994-e4c74212b3ed12d02b-INFINITY%20GEMS-GOLD_006-0000000000000094', + title: 'GOLD #006', + description: 'FIRST EDITION of INFINITY GEMS COLLECTION', + collection: 'INFINITY GEMS COLLECTION', + creator: 'SrSlayer', + tagRelated: 'model-viewer', + type: '3d', + }, { url: '/bsx/gallery/2444376227-3', title: '3D Ball',