Merge branch 'main' into issue-11072

kodadot · Oct 10, 2024 · 78d9ee9 · 78d9ee9
2 parents c839879 + f086fed
commit 78d9ee9
Show file tree

Hide file tree

Showing 55 changed files with 113 additions and 142 deletions.
diff --git a/.github/diagram.svg b/.github/diagram.svg
diff --git a/components/carousel/CarouselTypeRelated.vue b/components/carousel/CarouselTypeRelated.vue
@@ -1,13 +1,9 @@
 <template>
-  <div>
-    <LoadLazily>
-      <CarouselIndex
-        v-if="nfts"
-        :title="`${$t('nft.related')}`"
-        :nfts="nfts"
-      />
-    </LoadLazily>
-  </div>
+  <LazyCarouselIndex
+    v-if="nfts"
+    :title="$t('nft.related')"
+    :nfts="nfts"
+  />
 </template>
 
 <script lang="ts" setup>

diff --git a/components/carousel/CarouselTypeVisited.vue b/components/carousel/CarouselTypeVisited.vue
@@ -1,7 +1,7 @@
 <template>
-  <CarouselIndex
+  <LazyCarouselIndex
     v-if="showCarousel"
-    :title="`${$t('nft.visited')}`"
+    :title="$t('nft.visited')"
     :nfts="nfts"
   />
 </template>

diff --git a/components/collection/CollectionCard.vue b/components/collection/CollectionCard.vue
@@ -42,7 +42,7 @@
 import { NeoSkeleton } from '@kodadot1/brick'
 import type { TokenMetadata } from '@kodadot1/hyperdata'
 import CollectionDetail from './CollectionDetail.vue'
-import type { CollectionWithMeta } from '@/components/rmrk/service/scheme'
+import type { CollectionWithMeta } from '@/types'
 import BasicImage from '@/components/shared/view/BasicImage.vue'
 import { processSingleMetadata } from '@/utils/cachingStrategy'
 import { sanitizeIpfsUrl } from '@/utils/ipfs'

diff --git a/components/collection/CollectionDetail.vue b/components/collection/CollectionDetail.vue
@@ -90,7 +90,7 @@
 
 <script lang="ts" setup>
 import { NeoSkeleton } from '@kodadot1/brick'
-import type { Interaction, NFT } from '@/components/rmrk/service/scheme'
+import type { Interaction, NFT } from '@/types'
 import { getVolume } from '@/utils/math'
 import BasicImage from '@/components/shared/view/BasicImage.vue'
 import CommonTokenMoney from '@/components/shared/CommonTokenMoney.vue'

diff --git a/components/collection/CollectionGrid.vue b/components/collection/CollectionGrid.vue
@@ -54,7 +54,7 @@
 
 <script lang="ts" setup>
 import isEqual from 'lodash/isEqual'
-import type { Collection } from '@/components/rmrk/service/scheme'
+import type { Collection } from '@/types'
 import type { SearchQuery } from '@/components/search/types'
 import collectionListWithSearch from '@/queries/subsquid/general/collectionListWithSearch.graphql'
 import collectionListWithSearchProfile from '@/queries/subsquid/general/collectionListWithSearchProfile.graphql'

diff --git a/components/collection/CollectionHeader/CollectionBanner.vue b/components/collection/CollectionHeader/CollectionBanner.vue
@@ -38,7 +38,7 @@
 </template>
 
 <script setup lang="ts">
-import type { NFTMetadata } from '@/components/rmrk/service/scheme'
+import type { NFTMetadata } from '@/types'
 import { processSingleMetadata } from '@/utils/cachingStrategy'
 import { sanitizeIpfsUrl, toOriginalContentUrl } from '@/utils/ipfs'
 import HeroButtons from '@/components/collection/HeroButtons.vue'

diff --git a/components/collection/activity/ActivityChart.vue b/components/collection/activity/ActivityChart.vue
@@ -30,7 +30,7 @@ import {
   sortAsc,
   toDataPoint,
 } from './utils'
-import type { ActivityInteraction } from '@/components/rmrk/service/scheme'
+import type { ActivityInteraction } from '@/types'
 import PriceChart from '@/components/chart/PriceChart.vue'
 
 const { decimals } = useChain()

diff --git a/components/collection/activity/ownerInsightsTabs/NFTSDetailsDropdown/Flipper.vue b/components/collection/activity/ownerInsightsTabs/NFTSDetailsDropdown/Flipper.vue
@@ -46,7 +46,7 @@
 <script setup lang="ts">
 import { sanitizeIpfsUrl } from '@/utils/ipfs'
 import { processSingleMetadata } from '@/utils/cachingStrategy'
-import type { NFTMetadata } from '@/components/rmrk/service/scheme'
+import type { NFTMetadata } from '@/types'
 import Money from '@/components/shared/format/ChainMoney.vue'
 import type { FlipEvent } from '@/composables/collectionActivity/types'
 import { format } from '@/components/collection/activity/utils'

diff --git a/components/collection/activity/ownerInsightsTabs/NFTSDetailsDropdown/Holder.vue b/components/collection/activity/ownerInsightsTabs/NFTSDetailsDropdown/Holder.vue
@@ -34,7 +34,7 @@
 <script setup lang="ts">
 import { sanitizeIpfsUrl } from '@/utils/ipfs'
 import { processSingleMetadata } from '@/utils/cachingStrategy'
-import type { NFTMetadata } from '@/components/rmrk/service/scheme'
+import type { NFTMetadata } from '@/types'
 import type { NFTExcludingEvents } from '@/composables/collectionActivity/types'
 import BasicImage from '@/components/shared/view/BasicImage.vue'
 

diff --git a/components/collection/utils/types.ts b/components/collection/utils/types.ts
@@ -1,4 +1,4 @@
-import type { CollectionMetadata } from '@/components/rmrk/service/scheme'
+import type { CollectionMetadata } from '@/types'
 
 export type Stats = {
   listedCount?: number

diff --git a/components/collection/utils/useCollectionDetails.ts b/components/collection/utils/useCollectionDetails.ts
@@ -1,7 +1,7 @@
 import { useQuery } from '@tanstack/vue-query'
 import type { Stats } from './types'
 import { getVolume } from '@/utils/math'
-import type { NFT, NFTMetadata } from '@/components/rmrk/service/scheme'
+import type { NFT, NFTMetadata } from '@/types'
 import type { NFTListSold } from '@/components/identity/utils/useIdentity'
 import { processSingleMetadata } from '@/utils/cachingStrategy'
 import collectionBuyEventStatsById from '@/queries/subsquid/general/collectionBuyEventStatsById.query'

diff --git a/components/common/shoppingCart/types.ts b/components/common/shoppingCart/types.ts
@@ -2,7 +2,7 @@ import type {
   CollectionFloorPrice,
   EntityWithId,
   NFTMetadata,
-} from '@/components/rmrk/service/scheme'
+} from '@/types'
 
 import type { Royalty } from '@/utils/royalty'
 

diff --git a/components/common/shoppingCart/utils.ts b/components/common/shoppingCart/utils.ts
@@ -3,7 +3,7 @@ import { calculateExactUsdFromToken } from '@/utils/calculation'
 import type { ListCartItem, ListCartItemMediaUrl } from '@/stores/listingCart'
 import { useFiatStore } from '@/stores/fiat'
 import { sum } from '@/utils/math'
-import type { NFT, TokenId } from '@/components/rmrk/service/scheme'
+import type { NFT, TokenId } from '@/types'
 import { chainPropListOf } from '@/utils/config/chain.config'
 import type { MakingOfferItem } from '@/components/offer/types'
 

diff --git a/components/create/CreateNft.vue b/components/create/CreateNft.vue
@@ -299,6 +299,7 @@ import {
   NeoSelect,
   NeoSwitch,
 } from '@kodadot1/brick'
+import { toNFTId } from '@kodadot1/minimark/v2'
 import type { CreatedNFT } from '@kodadot1/minimark/v1'
 import { Interaction } from '@kodadot1/minimark/v1'
 import CreateNftPreview from './CreateNftPreview.vue'
@@ -313,7 +314,6 @@ import { availablePrefixes } from '@/utils/chain'
 import { balanceFrom } from '@/utils/balance'
 import { DETAIL_TIMEOUT } from '@/utils/constants'
 import { delay } from '@/utils/fetch'
-import { toNFTId } from '@/components/rmrk/service/scheme'
 import type { AutoTeleportAction } from '@/composables/autoTeleport/types'
 import type { AutoTeleportActionButtonConfirmEvent } from '@/components/common/autoTeleport/AutoTeleportActionButton.vue'
 

diff --git a/components/gallery/GalleryItem.vue b/components/gallery/GalleryItem.vue
@@ -178,8 +178,6 @@ import GalleryItemDescription from './GalleryItemDescription.vue'
 import GalleryItemTabsPanel from './GalleryItemTabsPanel/GalleryItemTabsPanel.vue'
 import UnlockableTag from './UnlockableTag.vue'
 import { useGalleryItem } from './useGalleryItem'
-import CarouselTypeRelated from '@/components/carousel/CarouselTypeRelated.vue'
-import CarouselTypeVisited from '@/components/carousel/CarouselTypeVisited.vue'
 import CollectionDetailsPopover from '@/components/collectionDetailsPopover/CollectionDetailsPopover.vue'
 import { MediaType } from '@/components/rmrk/types'
 import { usePreferencesStore } from '@/stores/preferences'

diff --git a/components/gallery/GalleryItemAction/GalleryItemAction.vue b/components/gallery/GalleryItemAction/GalleryItemAction.vue
@@ -29,7 +29,7 @@ import GalleryItemOffer from './GalleryItemActionType/GalleryItemOffer.vue'
 import GalleryItemPriceRelist from './GalleryItemActionType/GalleryItemRelist.vue'
 import { listVisible, offerVisible } from '@/utils/config/permission.config'
 import type { NFTOffer } from '@/composables/useNft'
-import type { NFT } from '@/components/rmrk/service/scheme'
+import type { NFT } from '@/types'
 
 const props = defineProps<{
   nft: NFT | undefined

diff --git a/components/gallery/GalleryItemAction/GalleryItemActionType/GalleryItemBuy.vue b/components/gallery/GalleryItemAction/GalleryItemActionType/GalleryItemBuy.vue
@@ -56,7 +56,7 @@ import GalleryItemPriceSection from '../GalleryItemActionSection.vue'
 import { useShoppingCartStore } from '@/stores/shoppingCart'
 import { usePreferencesStore } from '@/stores/preferences'
 import { openShoppingCart } from '@/components/common/shoppingCart/ShoppingCartModalConfig'
-import type { NFT } from '@/components/rmrk/service/scheme'
+import type { NFT } from '@/types'
 import { nftToShoppingCartItem } from '@/components/common/shoppingCart/utils'
 import { doAfterCheckCurrentChainVM } from '@/components/common/ConnectWallet/openReconnectWalletModal'
 

diff --git a/components/gallery/GalleryItemAction/GalleryItemActionType/GalleryItemOffer.vue b/components/gallery/GalleryItemAction/GalleryItemActionType/GalleryItemOffer.vue
@@ -20,7 +20,7 @@
 
 <script setup lang="ts">
 import { NeoButton } from '@kodadot1/brick'
-import type { NFT } from '@/components/rmrk/service/scheme'
+import type { NFT } from '@/types'
 import { nftToOfferItem } from '@/components/common/shoppingCart/utils'
 import { usePreferencesStore } from '@/stores/preferences'
 import { useMakingOfferStore } from '@/stores/makeOffer'

diff --git a/components/gallery/GalleryItemAction/GalleryItemActionType/GalleryItemRelist.vue b/components/gallery/GalleryItemAction/GalleryItemActionType/GalleryItemRelist.vue
@@ -24,7 +24,7 @@
 <script setup lang="ts">
 import { NeoButton } from '@kodadot1/brick'
 import GalleryItemPriceSection from '../GalleryItemActionSection.vue'
-import type { NFT } from '@/components/rmrk/service/scheme'
+import type { NFT } from '@/types'
 import { nftToListingCartItem } from '@/components/common/shoppingCart/utils'
 import { useCollectionDetails } from '@/components/collection/utils/useCollectionDetails'
 import ListingCartModal from '@/components/common/listingCart/ListingCartModal.vue'

diff --git a/components/gallery/GalleryItemButton/GalleryItemMoreActionBtn.vue b/components/gallery/GalleryItemButton/GalleryItemMoreActionBtn.vue
@@ -73,7 +73,7 @@ import { isMobileDevice } from '@/utils/extension'
 import { hasOperationsDisabled } from '@/utils/prefix'
 import { refreshOdaTokenMetadata } from '@/services/oda'
 import ItemTransferModal from '@/components/common/itemTransfer/ItemTransferModal.vue'
-import type { NFT } from '@/components/rmrk/service/scheme'
+import type { NFT } from '@/types'
 import type { Abi } from '@/composables/transaction/types'
 
 const { $i18n, $consola } = useNuxtApp()

diff --git a/components/gallery/GalleryItemHolderOf.vue b/components/gallery/GalleryItemHolderOf.vue
@@ -16,7 +16,7 @@
 <script setup lang="ts">
 import { NeoIcon } from '@kodadot1/brick'
 import { useDrop, useHolderOfCollectionDrop } from '../drops/useDrops'
-import type { NFT } from '@/components/rmrk/service/scheme'
+import type { NFT } from '@/types'
 import {
   DROP_COLLECTION_TO_ALIAS_MAP,
   FALLBACK_DROP_COLLECTION_MAX,

diff --git a/components/gallery/GalleryItemTabsPanel/GalleryItemActivityTable.vue b/components/gallery/GalleryItemTabsPanel/GalleryItemActivityTable.vue
@@ -136,7 +136,7 @@ import Identity from '@/components/identity/IdentityIndex.vue'
 import { formatToNow } from '@/utils/format/time'
 import { parseDate } from '@/utils/datetime'
 
-import type { Interaction } from '@/components/rmrk/service/scheme'
+import type { Interaction } from '@/types'
 import useSubscriptionGraphql from '@/composables/useSubscriptionGraphql'
 
 const dprops = defineProps<{

diff --git a/components/gallery/GalleryItemTabsPanel/GalleryItemChart.vue b/components/gallery/GalleryItemTabsPanel/GalleryItemChart.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script lang="ts" setup>
-import type { Interaction } from '@/components/rmrk/service/scheme'
+import type { Interaction } from '@/types'
 import PriceChart from '@/components/chart/PriceChart.vue'
 import { parseChartAmount } from '@/utils/historyEvent'
 

diff --git a/components/gallery/UnlockableTag.vue b/components/gallery/UnlockableTag.vue
@@ -36,7 +36,7 @@
 
 <script lang="ts" setup>
 import { NeoTooltip } from '@kodadot1/brick'
-import type { NFT } from '@/components/rmrk/service/scheme'
+import type { NFT } from '@/types'
 import { useIcon } from '@/composables/useIcon'
 
 const props = defineProps<{

diff --git a/components/identity/module/IdentityPopoverFooter.vue b/components/identity/module/IdentityPopoverFooter.vue
@@ -83,7 +83,7 @@
 import { NeoSkeleton } from '@kodadot1/brick'
 import useIdentityStats from '../utils/useIdentityStats'
 import { fetchFollowersOf } from '@/services/profile'
-import type { NFT } from '@/components/rmrk/service/scheme'
+import type { NFT } from '@/types'
 
 const GalleryCard = defineAsyncComponent(
   () => import('../../rmrk/Gallery/GalleryCard.vue'),

diff --git a/components/identity/utils/useIdentity.ts b/components/identity/utils/useIdentity.ts
@@ -1,4 +1,4 @@
-import type { NFT } from '@/components/rmrk/service/scheme'
+import type { NFT } from '@/types'
 
 export interface NFTListSold {
   nftEntities?: NFT[]

diff --git a/components/items/ItemsGrid/ItemsGrid.vue b/components/items/ItemsGrid/ItemsGrid.vue
@@ -125,7 +125,7 @@ import {
 import { getTokensNfts } from './useNftActions'
 import { useListingCartStore } from '@/stores/listingCart'
 import DynamicGrid from '@/components/shared/DynamicGrid.vue'
-import type { NFT } from '@/components/rmrk/service/scheme'
+import type { NFT } from '@/types'
 import type { GridSection } from '@/stores/preferences'
 
 const slots = useSlots()

diff --git a/components/items/ItemsGrid/useItemsGrid.ts b/components/items/ItemsGrid/useItemsGrid.ts
@@ -9,7 +9,7 @@ import { getDenyList } from '@/utils/prefix'
 import type { NFTWithMetadata, TokenEntity } from '@/composables/useNft'
 import { nftToListingCartItem } from '@/components/common/shoppingCart/utils'
 import { useListingCartStore } from '@/stores/listingCart'
-import type { NFT, TokenId } from '@/components/rmrk/service/scheme'
+import type { NFT, TokenId } from '@/types'
 
 const DEFAULT_RESET_SEARCH_QUERY_PARAMS = [
   'sort',

diff --git a/components/items/ItemsGrid/useNftActions.ts b/components/items/ItemsGrid/useNftActions.ts
@@ -1,7 +1,7 @@
 import nftById from '@/queries/subsquid/general/nftById.graphql'
 import listCount from '@/queries/subsquid/general/countOfTokenNftsToList.graphql'
 import nftListWithSearch from '@/queries/subsquid/ahk/nftListWithSearch.graphql'
-import type { TokenId } from '@/components/rmrk/service/scheme'
+import type { TokenId } from '@/types'
 
 export type NFTWitToken = NFTWithMetadata & TokenId
 export const isStack = (entity: TokenEntity) => entity.supply > 1

diff --git a/components/landing/topCollections/utils/types.ts b/components/landing/topCollections/utils/types.ts
@@ -1,4 +1,4 @@
-import type { Interaction } from '~~/components/rmrk/service/scheme'
+import type { Interaction } from '@/types'
 
 export type CollectionEntity = {
   id: string

diff --git a/components/offer/OfferOverviewModal.vue b/components/offer/OfferOverviewModal.vue
@@ -102,7 +102,7 @@ import { NeoModal } from '@kodadot1/brick'
 import ModalBody from '@/components/shared/modals/ModalBody.vue'
 import ModalIdentityItem from '@/components/shared/ModalIdentityItem.vue'
 import nftById from '@/queries/subsquid/general/nftById.graphql'
-import type { NFT } from '@/components/rmrk/service/scheme'
+import type { NFT } from '@/types'
 import { nftToOfferItem } from '@/components/common/shoppingCart/utils'
 import { formatToNow } from '@/utils/format/time'
 

diff --git a/components/offer/types.ts b/components/offer/types.ts
@@ -2,7 +2,7 @@ import type {
   CollectionFloorPrice,
   EntityWithId,
   NFTMetadata,
-} from '@/components/rmrk/service/scheme'
+} from '@/types'
 
 export type MakingOfferItem = {
   urlPrefix: string

diff --git a/components/profile/activityTab/History.vue b/components/profile/activityTab/History.vue
@@ -89,7 +89,7 @@ import { usePreferencesStore } from '@/stores/preferences'
 import { HistoryEventType, InteractionBsxOnly } from '@/utils/historyEvent'
 import { parseDate } from '@/utils/datetime'
 
-import type { Interaction as EventInteraction } from '@/components/rmrk/service/scheme'
+import type { Interaction as EventInteraction } from '@/types'
 import ResponsiveTable from '@/components/shared/ResponsiveTable.vue'
 import Pagination from '@/components/rmrk/Gallery/Pagination.vue'
 import { emptyObject } from '@/utils/empty'

diff --git a/components/rmrk/Gallery/GalleryCard.vue b/components/rmrk/Gallery/GalleryCard.vue
@@ -60,7 +60,7 @@ import { processSingleMetadata } from '@/utils/cachingStrategy'
 import { getMimeType } from '@/utils/gallery/media'
 import { sanitizeIpfsUrl } from '@/utils/ipfs'
 
-import type { NFTMetadata } from '@/components/rmrk/service/scheme'
+import type { NFTMetadata } from '@/types'
 import { usePreferencesStore } from '@/stores/preferences'
 
 const props = withDefaults(

diff --git a/components/rmrk/Gallery/Holder/Holder.vue b/components/rmrk/Gallery/Holder/Holder.vue
@@ -205,8 +205,8 @@ import {
   NeoTableColumn,
   NeoTooltip,
 } from '@kodadot1/brick'
-import type { Interaction as EventInteraction } from '../../service/scheme'
 import { parsePriceForItem } from './helper'
+import type { Interaction as EventInteraction } from '@/types'
 import { toPercent } from '@/utils/filters'
 import { parseDate } from '@/utils/datetime'
 import { usePreferencesStore } from '@/stores/preferences'

diff --git a/components/rmrk/service/NftUtils.ts b/components/rmrk/service/NftUtils.ts
diff --git a/components/search/SearchSuggestion.vue b/components/search/SearchSuggestion.vue
@@ -285,10 +285,7 @@ import { useTopCollections } from '../landing/topCollections/utils/useTopCollect
 import { fetchCollectionSuggestion } from './utils/collectionSearch'
 import type { DefaultCollectionSuggestion, SearchQuery } from './types'
 import { getDenyList } from '@/utils/prefix'
-import {
-  type CollectionWithMeta,
-  type NFTWithMeta,
-} from '@/components/rmrk/service/scheme'
+import type { CollectionWithMeta, NFTWithMeta } from '@/types'
 import { sanitizeIpfsUrl } from '@/utils/ipfs'
 import { logError, mapNFTorCollectionMetadata } from '@/utils/mappers'
 import { processMetadata } from '@/utils/cachingStrategy'

diff --git a/components/search/types.ts b/components/search/types.ts
@@ -1,4 +1,4 @@
-import type { CollectionWithMeta, NFTWithMeta } from '../rmrk/service/scheme'
+import type { CollectionWithMeta, NFTWithMeta } from '@/types'
 
 export type QueryType = Record<string, unknown>
 

diff --git a/components/series/SeriesTable.vue b/components/series/SeriesTable.vue
@@ -375,7 +375,7 @@ import {
   toSort,
   today,
 } from './utils'
-import type { Collection } from '@/components/rmrk/service/scheme'
+import type { Collection } from '@/types'
 import { exist } from '@/utils/exist'
 import { sanitizeIpfsUrl } from '@/utils/ipfs'
 import collectionsEvents from '@/queries/rmrk/subsquid/collectionsEvents.graphql'

diff --git a/components/series/utils.ts b/components/series/utils.ts
@@ -1,6 +1,6 @@
 import { eachDayOfInterval, formatISO, subDays } from 'date-fns'
-import type { Interaction } from '../rmrk/service/scheme'
 import type { SortType } from './types'
+import type { Interaction } from '@/types'
 import { after, between, getVolume } from '@/utils/math'
 
 export const today = new Date()