From d7a0e2704b7ccb6057ef316699ecab2424466320 Mon Sep 17 00:00:00 2001 From: Jarsen <31397967+Jarsen136@users.noreply.github.com> Date: Wed, 25 Sep 2024 16:29:42 +0200 Subject: [PATCH 1/7] feat: art kind --- components/collection/CollectionGrid.vue | 9 +++++++-- components/items/ItemsGrid/useItemsGrid.ts | 10 ++++++++++ components/profile/CollectionFilter.vue | 7 ++++++- libs/static/src/indexers.ts | 11 ++++++++--- queries/fragments/collection.graphql | 1 + queries/subsquid/general/tokenListWithSearch.graphql | 4 +++- utils/constants.ts | 2 +- utils/env.ts | 7 +++++++ 8 files changed, 43 insertions(+), 8 deletions(-) diff --git a/components/collection/CollectionGrid.vue b/components/collection/CollectionGrid.vue index 0d135cb4cd..12738964e2 100644 --- a/components/collection/CollectionGrid.vue +++ b/components/collection/CollectionGrid.vue @@ -122,9 +122,14 @@ const getQueryVariables = (page: number) => { Object.assign(searchParams, { nftCount_not_eq: 0 }) } + const commonParams = {} + if (isArtGenDomain) { + Object.assign(commonParams, { kind_eq: 'genart' }) + } + return props.id ? { - search: [searchParams], + search: [{ ...searchParams, ...commonParams }], first: first.value, offset: (page - 1) * first.value, orderBy: searchQuery.sortBy, @@ -132,7 +137,7 @@ const getQueryVariables = (page: number) => { : { denyList: getDenyList(urlPrefix.value), orderBy: searchQuery.sortBy, - search: buildSearchParam(), + search: [...buildSearchParam(), commonParams], listed: searchQuery.listed ? [{ price: { greaterThan: '0' } }] : [], first: first.value, offset: (page - 1) * first.value, diff --git a/components/items/ItemsGrid/useItemsGrid.ts b/components/items/ItemsGrid/useItemsGrid.ts index 6fb8733be8..15a114e7bc 100644 --- a/components/items/ItemsGrid/useItemsGrid.ts +++ b/components/items/ItemsGrid/useItemsGrid.ts @@ -167,6 +167,8 @@ export function useFetchSearch({ denyList: getDenyList(urlPrefix.value), price_lte: Number(route.query.max) || undefined, price_gte: Number(route.query.min) || undefined, + ...(isArtGenDomain ? { kind: 'genart' } : {}), + } const nftQueryVariables = search?.length @@ -177,6 +179,14 @@ export function useFetchSearch({ priceMax: Number(route.query.max), } + if (isArtGenDomain) { + nftQueryVariables.search.push({ + collection: { + kind_eq: 'genart', + }, + }) + } + const queryVariables = useTokens.value ? { ...defaultSearchVariables, ...tokenQueryVariables } : { ...defaultSearchVariables, ...nftQueryVariables } diff --git a/components/profile/CollectionFilter.vue b/components/profile/CollectionFilter.vue index 6c416ba37d..b93b2c624d 100644 --- a/components/profile/CollectionFilter.vue +++ b/components/profile/CollectionFilter.vue @@ -112,7 +112,12 @@ const getProfileCollections = async () => { const { data } = await useAsyncQuery({ query: collectionListWithSearch, variables: { - search: [collectionSearch], + search: [ + collectionSearch, + { + kind_eq: 'genart', + }, + ], denyList: getDenyList(urlPrefix.value), first: 100, offset: 0, diff --git a/libs/static/src/indexers.ts b/libs/static/src/indexers.ts index 954a68d3aa..8217dd994c 100644 --- a/libs/static/src/indexers.ts +++ b/libs/static/src/indexers.ts @@ -11,11 +11,16 @@ export const INDEXERS: Config = { rmrk: 'https://squid.subsquid.io/rubick/graphql', ksm: 'https://ksm.gql.api.kodadot.xyz/', ahk: 'https://ahk.gql.api.kodadot.xyz/', - ahp: 'https://ahp.gql.api.kodadot.xyz/', + + // todo: all url should be changed back once deployed + ahp: 'https://kodadot.squids.live/speck/v/v14/graphql', + // 'https://ahp.gql.api.kodadot.xyz/', dot: 'https://squid.subsquid.io/rubick/graphql', // TODO: change to dot indexer when available imx: 'https://squid.subsquid.io/flick/graphql', - base: 'https://kodadot.squids.live/basick/graphql', - mnt: 'https://squid.subsquid.io/flock/graphql', + base: 'https://kodadot.squids.live/basick/v/v13/graphql', + // 'https://kodadot.squids.live/basick/graphql', + mnt: 'https://kodadot.squids.live/flock/v/v3/graphql', + // 'https://squid.subsquid.io/flock/graphql', // ahr: 'https://squid.subsquid.io/snack/graphql', // movr: 'https://squid.subsquid.io/antick/v/001-rc0/graphql', // glmr: 'https://squid.subsquid.io/click/v/002/graphql', diff --git a/queries/fragments/collection.graphql b/queries/fragments/collection.graphql index 7187b64959..27edaecef6 100644 --- a/queries/fragments/collection.graphql +++ b/queries/fragments/collection.graphql @@ -4,4 +4,5 @@ fragment collection on CollectionEntity { issuer currentOwner blockNumber + kind } diff --git a/queries/subsquid/general/tokenListWithSearch.graphql b/queries/subsquid/general/tokenListWithSearch.graphql index 1141018802..857952ab0d 100644 --- a/queries/subsquid/general/tokenListWithSearch.graphql +++ b/queries/subsquid/general/tokenListWithSearch.graphql @@ -9,7 +9,8 @@ query tokenListWithSearch( $issuer: String $denyList: [String!] $collections: [String!] - $name: String + $name: String, + $kind: String ) { tokenEntities: tokenEntityList( owner: $owner @@ -23,6 +24,7 @@ query tokenListWithSearch( price_lte: $price_lte collections: $collections name: $name + kind: $kind ) { id name diff --git a/utils/constants.ts b/utils/constants.ts index 5bf0aa8717..b9ef1d10a2 100644 --- a/utils/constants.ts +++ b/utils/constants.ts @@ -42,7 +42,7 @@ export const URLS = { rubick: 'https://squid.subsquid.io/rubick/graphql', marck: 'https://ksm.gql.api.kodadot.xyz/', stick: 'https://ahk.gql.api.kodadot.xyz/', - speck: 'https://ahp.gql.api.kodadot.xyz/', + speck: 'https://kodadot.squids.live/speck/v/v14/graphql', // todo: change back to ` 'https://ahp.gql.api.kodadot.xyz/',` polkassembly: 'https://squid.subsquid.io/polkadot-polkassembly/graphql', replicate: 'https://replicate.kodadot.workers.dev/', search: 'https://polysearch.w.kodadot.xyz', diff --git a/utils/env.ts b/utils/env.ts index cc7aa6e115..0b960c3e09 100644 --- a/utils/env.ts +++ b/utils/env.ts @@ -1,3 +1,10 @@ +// todo: const isArtGenDomain = ['koda.art'].includes( +// window.location.hostname, +// ) +export const isArtGenDomain = location.hostname.startsWith('deploy-preview-') || ['koda.art', 'localhost'].includes( + window.location.hostname, +) + export const isProduction = ['kodadot.xyz', 'koda.art'].includes( window.location.hostname, ) From b14152fb233344328c6b000cb0272c45f64a9d4f Mon Sep 17 00:00:00 2001 From: Jarsen <31397967+Jarsen136@users.noreply.github.com> Date: Thu, 26 Sep 2024 12:11:32 +0200 Subject: [PATCH 2/7] fix: enable art mode --- components/collection/CollectionGrid.vue | 4 ++-- components/items/ItemsGrid/useItemsGrid.ts | 6 +++--- composables/useArtGenMode.ts | 14 ++++++++++++++ 3 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 composables/useArtGenMode.ts diff --git a/components/collection/CollectionGrid.vue b/components/collection/CollectionGrid.vue index 12738964e2..f8c843a5b7 100644 --- a/components/collection/CollectionGrid.vue +++ b/components/collection/CollectionGrid.vue @@ -75,7 +75,7 @@ const route = useRoute() const { accountId } = useAuth() const { urlPrefix, client } = usePrefix() const preferencesStore = usePreferencesStore() - +const { artGenModeEnabled } = useArtGenMode() const isProfilePage = route.name === 'prefix-u-id' const collections = ref([]) const loadedPages = ref([]) @@ -123,7 +123,7 @@ const getQueryVariables = (page: number) => { } const commonParams = {} - if (isArtGenDomain) { + if (artGenModeEnabled.value) { Object.assign(commonParams, { kind_eq: 'genart' }) } diff --git a/components/items/ItemsGrid/useItemsGrid.ts b/components/items/ItemsGrid/useItemsGrid.ts index 15a114e7bc..5db38c9bfd 100644 --- a/components/items/ItemsGrid/useItemsGrid.ts +++ b/components/items/ItemsGrid/useItemsGrid.ts @@ -51,7 +51,7 @@ export function useFetchSearch({ isAssetHub.value && !EXCLUDED_TOKEN_USE_PAGES.includes(route.name as string), ) - + const { artGenModeEnabled } = useArtGenMode() const items = ref<(NFTWithMetadata | TokenEntity)[]>([]) const loadedPages = ref([] as number[]) @@ -167,7 +167,7 @@ export function useFetchSearch({ denyList: getDenyList(urlPrefix.value), price_lte: Number(route.query.max) || undefined, price_gte: Number(route.query.min) || undefined, - ...(isArtGenDomain ? { kind: 'genart' } : {}), + ...(artGenModeEnabled.value ? { kind: 'genart' } : {}), } @@ -179,7 +179,7 @@ export function useFetchSearch({ priceMax: Number(route.query.max), } - if (isArtGenDomain) { + if (artGenModeEnabled.value) { nftQueryVariables.search.push({ collection: { kind_eq: 'genart', diff --git a/composables/useArtGenMode.ts b/composables/useArtGenMode.ts new file mode 100644 index 0000000000..4ebc7031a4 --- /dev/null +++ b/composables/useArtGenMode.ts @@ -0,0 +1,14 @@ +export const enabledOnPages = [ + 'prefix-explore-items', // explore items page + 'prefix-explore-collectibles', // explore collections page +] + +export default function () { + const route = useRoute() + + return { + artGenModeEnabled: computed(() => + isArtGenDomain && enabledOnPages.includes(route.name as string ?? ''), + ), + } +} From 8fa909ced1e6e93f90c4c42fa757b108934fd206 Mon Sep 17 00:00:00 2001 From: Jarsen <31397967+Jarsen136@users.noreply.github.com> Date: Thu, 26 Sep 2024 21:34:24 +0200 Subject: [PATCH 3/7] feat: optional art gen mode --- components/items/ItemsGrid/useItemsGrid.ts | 1 + components/shared/BreadcrumbsFilter.vue | 1 + components/shared/filters/MobileFilter.vue | 8 ++++-- .../shared/filters/modules/AdvancedFilter.vue | 26 ++++++++++++++++++- composables/useArtGenMode.ts | 13 +++++++--- locales/en.json | 1 + stores/exploreFilters.ts | 6 +++++ 7 files changed, 50 insertions(+), 6 deletions(-) diff --git a/components/items/ItemsGrid/useItemsGrid.ts b/components/items/ItemsGrid/useItemsGrid.ts index 5db38c9bfd..4c7f633280 100644 --- a/components/items/ItemsGrid/useItemsGrid.ts +++ b/components/items/ItemsGrid/useItemsGrid.ts @@ -19,6 +19,7 @@ const DEFAULT_RESET_SEARCH_QUERY_PARAMS = [ 'max', 'owned', 'collections', + 'art_gen', ] const EXCLUDED_TOKEN_USE_PAGES = [ diff --git a/components/shared/BreadcrumbsFilter.vue b/components/shared/BreadcrumbsFilter.vue index 99a196f00d..aa7d4c2ec9 100644 --- a/components/shared/BreadcrumbsFilter.vue +++ b/components/shared/BreadcrumbsFilter.vue @@ -131,6 +131,7 @@ const queryMapTranslation = { listed: $i18n.t('sort.listed'), owned: $i18n.t('sort.own'), art_view: $i18n.t('filters.artView'), + art_gen: $i18n.t('filters.artGen'), sale: $i18n.t('filters.sale'), offer: $i18n.t('filters.offer'), listing: $i18n.t('filters.listing'), diff --git a/components/shared/filters/MobileFilter.vue b/components/shared/filters/MobileFilter.vue index 27e3866edd..9789dc3141 100644 --- a/components/shared/filters/MobileFilter.vue +++ b/components/shared/filters/MobileFilter.vue @@ -116,11 +116,13 @@ const syncFromUrlOnGrid = () => { const listed = route.query?.listed?.toString() === 'true', owned = route.query?.owned?.toString() === 'true', artView = route.query?.art_view?.toString() === 'true', + artGen = route.query?.art_gen?.toString() === 'true', collections = getCollectionIds() exploreFiltersStore.setListed(listed) exploreFiltersStore.setOwned(owned) exploreFiltersStore.setArtView(artView) + exploreFiltersStore.setArtGen(artGen) exploreFiltersStore.setCollections(collections) } @@ -168,12 +170,14 @@ const resetFilters = () => { listed: false, owned: false, artView: false, + artGen: false, collections: undefined, } exploreFiltersStore.setListed(statusDefaults.listed) exploreFiltersStore.setOwned(statusDefaults.owned) exploreFiltersStore.setArtView(statusDefaults.artView) + exploreFiltersStore.setArtGen(statusDefaults.artGen) exploreFiltersStore.setCollections(statusDefaults.collections) // price @@ -195,7 +199,7 @@ const resetFilters = () => { const applyFilters = () => { // status filters - const { artView, ...restStatusFilters } = exploreFiltersStore.getStatusFilters + const { artView, artGen, ...restStatusFilters } = exploreFiltersStore.getStatusFilters const priceRangeFilter = exploreFiltersStore.getPriceRange const eventTypeFilter = activityFiltersStore.getEventTypeFilters @@ -204,7 +208,7 @@ const applyFilters = () => { replaceUrl({ ...eventTypeFilter, ...priceRangeFilter }) } else { - replaceUrl({ art_view: artView, ...restStatusFilters, ...priceRangeFilter }) + replaceUrl({ art_view: artView, art_gen: artGen, ...restStatusFilters, ...priceRangeFilter }) } emit('resetPage') closeFilterModal() diff --git a/components/shared/filters/modules/AdvancedFilter.vue b/components/shared/filters/modules/AdvancedFilter.vue index d51fa3018f..54c96c10b3 100644 --- a/components/shared/filters/modules/AdvancedFilter.vue +++ b/components/shared/filters/modules/AdvancedFilter.vue @@ -14,6 +14,20 @@ /> + + + {{ $t('filters.artGen') }} + + + @@ -38,7 +52,7 @@ const props = withDefaults( fluidPadding: false, }, ) - +const { artGenModeFeatureEnabled } = useArtGenMode() const emit = defineEmits(['resetPage']) const artView @@ -52,6 +66,16 @@ const artView set: value => exploreFiltersStore.setArtView(value), }) +const artGen = props.dataModel === 'query' + ? computed({ + get: () => route.query?.art_gen?.toString() === 'true', + set: value => applyToUrl({ art_gen: String(value) }), + }) + : computed({ + get: () => exploreFiltersStore.artGen, + set: value => exploreFiltersStore.setArtGen(value), + }) + const applyToUrl = (queryCondition: Record) => { replaceURL(queryCondition) emit('resetPage') diff --git a/composables/useArtGenMode.ts b/composables/useArtGenMode.ts index 4ebc7031a4..89366905c9 100644 --- a/composables/useArtGenMode.ts +++ b/composables/useArtGenMode.ts @@ -1,14 +1,21 @@ -export const enabledOnPages = [ +import { useExploreFiltersStore } from '@/stores/exploreFilters' + +const enabledOnPages = [ 'prefix-explore-items', // explore items page 'prefix-explore-collectibles', // explore collections page ] +const enabledPrefix = ['ahp', 'base', 'mnt'] + export default function () { const route = useRoute() - + const { urlPrefix } = usePrefix() + const exploreFiltersStore = useExploreFiltersStore() + const artGenModeFeatureEnabled = computed(() => isArtGenDomain && enabledPrefix.includes(urlPrefix.value) && enabledOnPages.includes(route.name as string ?? '')) return { artGenModeEnabled: computed(() => - isArtGenDomain && enabledOnPages.includes(route.name as string ?? ''), + artGenModeFeatureEnabled.value && exploreFiltersStore.artGen, ), + artGenModeFeatureEnabled, } } diff --git a/locales/en.json b/locales/en.json index ebc9be8812..b349207dd4 100644 --- a/locales/en.json +++ b/locales/en.json @@ -1478,6 +1478,7 @@ "mint": "Mint", "transfer": "Transfer", "artView": "Art View", + "artGen": "Generative Art", "offer": "Offer", "verified": "Verified", "onlyVerifiedIdentities": "Only Verified Identities", diff --git a/stores/exploreFilters.ts b/stores/exploreFilters.ts index 1e5ec29731..8b4925cdf8 100644 --- a/stores/exploreFilters.ts +++ b/stores/exploreFilters.ts @@ -5,6 +5,7 @@ interface State { listed: boolean owned: boolean artView: boolean + artGen: boolean // price min: number | undefined max: number | undefined @@ -18,6 +19,7 @@ export const useExploreFiltersStore = defineStore('exploreFilters', { min: undefined, max: undefined, artView: false, + artGen: false, collections: undefined, }), getters: { @@ -25,6 +27,7 @@ export const useExploreFiltersStore = defineStore('exploreFilters', { listed: state.listed, owned: state.owned, artView: state.artView, + artGen: state.artGen, collections: state.collections?.toString(), }), getPriceRange: state => ({ min: state.min, max: state.max }), @@ -39,6 +42,9 @@ export const useExploreFiltersStore = defineStore('exploreFilters', { setArtView(payload) { this.artView = payload }, + setArtGen(payload) { + this.artGen = payload + }, setMin(payload) { this.min = payload }, From 795ffc6ab3eff1ff2ae1f97ab47a04698745701c Mon Sep 17 00:00:00 2001 From: Jarsen <31397967+Jarsen136@users.noreply.github.com> Date: Sun, 29 Sep 2024 00:02:18 +0200 Subject: [PATCH 4/7] fix: default enabled art gen mode --- pages/[prefix]/explore/items.vue | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pages/[prefix]/explore/items.vue b/pages/[prefix]/explore/items.vue index 7bd0bcbab2..c89e64cf12 100644 --- a/pages/[prefix]/explore/items.vue +++ b/pages/[prefix]/explore/items.vue @@ -46,12 +46,18 @@ definePageMeta({ layout: 'explore-layout', middleware: [ function (to) { - if (to.query.listed === undefined) { + const extraQuery = ['listed', 'art_gen'].reduce((acc, key) => { + if (to.query[key] === undefined) { + acc[key] = 'true' + } + return acc + }, {}) + if (Object.keys(extraQuery).length > 0) { return navigateTo({ path: to.path, query: { ...to.query, - listed: 'true', + ...extraQuery, } }) } }, From e2260ae7eb9e6769944d884511a0771153199b0f Mon Sep 17 00:00:00 2001 From: Jarsen <31397967+Jarsen136@users.noreply.github.com> Date: Sun, 29 Sep 2024 14:13:34 +0200 Subject: [PATCH 5/7] fix: art gen --- components/items/ItemsGrid/useItemsGrid.ts | 2 +- components/profile/CollectionFilter.vue | 3 --- components/shared/BreadcrumbsFilter.vue | 2 +- components/shared/filters/MobileFilter.vue | 4 ++-- components/shared/filters/modules/AdvancedFilter.vue | 4 ++-- pages/[prefix]/explore/items.vue | 2 +- 6 files changed, 7 insertions(+), 10 deletions(-) diff --git a/components/items/ItemsGrid/useItemsGrid.ts b/components/items/ItemsGrid/useItemsGrid.ts index 4c7f633280..3ea930c630 100644 --- a/components/items/ItemsGrid/useItemsGrid.ts +++ b/components/items/ItemsGrid/useItemsGrid.ts @@ -19,7 +19,7 @@ const DEFAULT_RESET_SEARCH_QUERY_PARAMS = [ 'max', 'owned', 'collections', - 'art_gen', + 'gen_art', ] const EXCLUDED_TOKEN_USE_PAGES = [ diff --git a/components/profile/CollectionFilter.vue b/components/profile/CollectionFilter.vue index b93b2c624d..b944cf9b3e 100644 --- a/components/profile/CollectionFilter.vue +++ b/components/profile/CollectionFilter.vue @@ -114,9 +114,6 @@ const getProfileCollections = async () => { variables: { search: [ collectionSearch, - { - kind_eq: 'genart', - }, ], denyList: getDenyList(urlPrefix.value), first: 100, diff --git a/components/shared/BreadcrumbsFilter.vue b/components/shared/BreadcrumbsFilter.vue index aa7d4c2ec9..a78a243533 100644 --- a/components/shared/BreadcrumbsFilter.vue +++ b/components/shared/BreadcrumbsFilter.vue @@ -131,7 +131,7 @@ const queryMapTranslation = { listed: $i18n.t('sort.listed'), owned: $i18n.t('sort.own'), art_view: $i18n.t('filters.artView'), - art_gen: $i18n.t('filters.artGen'), + gen_art: $i18n.t('filters.artGen'), sale: $i18n.t('filters.sale'), offer: $i18n.t('filters.offer'), listing: $i18n.t('filters.listing'), diff --git a/components/shared/filters/MobileFilter.vue b/components/shared/filters/MobileFilter.vue index 9789dc3141..fc36270cbb 100644 --- a/components/shared/filters/MobileFilter.vue +++ b/components/shared/filters/MobileFilter.vue @@ -116,7 +116,7 @@ const syncFromUrlOnGrid = () => { const listed = route.query?.listed?.toString() === 'true', owned = route.query?.owned?.toString() === 'true', artView = route.query?.art_view?.toString() === 'true', - artGen = route.query?.art_gen?.toString() === 'true', + artGen = route.query?.gen_art?.toString() === 'true', collections = getCollectionIds() exploreFiltersStore.setListed(listed) @@ -208,7 +208,7 @@ const applyFilters = () => { replaceUrl({ ...eventTypeFilter, ...priceRangeFilter }) } else { - replaceUrl({ art_view: artView, art_gen: artGen, ...restStatusFilters, ...priceRangeFilter }) + replaceUrl({ art_view: artView, gen_art: artGen, ...restStatusFilters, ...priceRangeFilter }) } emit('resetPage') closeFilterModal() diff --git a/components/shared/filters/modules/AdvancedFilter.vue b/components/shared/filters/modules/AdvancedFilter.vue index 54c96c10b3..2a89cd0c17 100644 --- a/components/shared/filters/modules/AdvancedFilter.vue +++ b/components/shared/filters/modules/AdvancedFilter.vue @@ -68,8 +68,8 @@ const artView const artGen = props.dataModel === 'query' ? computed({ - get: () => route.query?.art_gen?.toString() === 'true', - set: value => applyToUrl({ art_gen: String(value) }), + get: () => route.query?.gen_art?.toString() === 'true', + set: value => applyToUrl({ gen_art: String(value) }), }) : computed({ get: () => exploreFiltersStore.artGen, diff --git a/pages/[prefix]/explore/items.vue b/pages/[prefix]/explore/items.vue index c89e64cf12..74cb13b0dd 100644 --- a/pages/[prefix]/explore/items.vue +++ b/pages/[prefix]/explore/items.vue @@ -46,7 +46,7 @@ definePageMeta({ layout: 'explore-layout', middleware: [ function (to) { - const extraQuery = ['listed', 'art_gen'].reduce((acc, key) => { + const extraQuery = ['listed', 'gen_art'].reduce((acc, key) => { if (to.query[key] === undefined) { acc[key] = 'true' } From e5548fd8887d4c1df2ca0e64fcc635661e599d66 Mon Sep 17 00:00:00 2001 From: Jarsen <31397967+Jarsen136@users.noreply.github.com> Date: Fri, 4 Oct 2024 16:51:30 +0200 Subject: [PATCH 6/7] chore: update indexer url --- libs/static/src/indexers.ts | 11 +++-------- utils/constants.ts | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/libs/static/src/indexers.ts b/libs/static/src/indexers.ts index 8217dd994c..954a68d3aa 100644 --- a/libs/static/src/indexers.ts +++ b/libs/static/src/indexers.ts @@ -11,16 +11,11 @@ export const INDEXERS: Config = { rmrk: 'https://squid.subsquid.io/rubick/graphql', ksm: 'https://ksm.gql.api.kodadot.xyz/', ahk: 'https://ahk.gql.api.kodadot.xyz/', - - // todo: all url should be changed back once deployed - ahp: 'https://kodadot.squids.live/speck/v/v14/graphql', - // 'https://ahp.gql.api.kodadot.xyz/', + ahp: 'https://ahp.gql.api.kodadot.xyz/', dot: 'https://squid.subsquid.io/rubick/graphql', // TODO: change to dot indexer when available imx: 'https://squid.subsquid.io/flick/graphql', - base: 'https://kodadot.squids.live/basick/v/v13/graphql', - // 'https://kodadot.squids.live/basick/graphql', - mnt: 'https://kodadot.squids.live/flock/v/v3/graphql', - // 'https://squid.subsquid.io/flock/graphql', + base: 'https://kodadot.squids.live/basick/graphql', + mnt: 'https://squid.subsquid.io/flock/graphql', // ahr: 'https://squid.subsquid.io/snack/graphql', // movr: 'https://squid.subsquid.io/antick/v/001-rc0/graphql', // glmr: 'https://squid.subsquid.io/click/v/002/graphql', diff --git a/utils/constants.ts b/utils/constants.ts index b9ef1d10a2..5bf0aa8717 100644 --- a/utils/constants.ts +++ b/utils/constants.ts @@ -42,7 +42,7 @@ export const URLS = { rubick: 'https://squid.subsquid.io/rubick/graphql', marck: 'https://ksm.gql.api.kodadot.xyz/', stick: 'https://ahk.gql.api.kodadot.xyz/', - speck: 'https://kodadot.squids.live/speck/v/v14/graphql', // todo: change back to ` 'https://ahp.gql.api.kodadot.xyz/',` + speck: 'https://ahp.gql.api.kodadot.xyz/', polkassembly: 'https://squid.subsquid.io/polkadot-polkassembly/graphql', replicate: 'https://replicate.kodadot.workers.dev/', search: 'https://polysearch.w.kodadot.xyz', From c2e0672ec3ef2bb83f0a39fedbd1c328260236ad Mon Sep 17 00:00:00 2001 From: Jarsen <31397967+Jarsen136@users.noreply.github.com> Date: Sat, 5 Oct 2024 17:22:49 +0200 Subject: [PATCH 7/7] fix: init art mode --- composables/useArtGenMode.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/composables/useArtGenMode.ts b/composables/useArtGenMode.ts index 89366905c9..c72239e515 100644 --- a/composables/useArtGenMode.ts +++ b/composables/useArtGenMode.ts @@ -1,5 +1,3 @@ -import { useExploreFiltersStore } from '@/stores/exploreFilters' - const enabledOnPages = [ 'prefix-explore-items', // explore items page 'prefix-explore-collectibles', // explore collections page @@ -10,11 +8,10 @@ const enabledPrefix = ['ahp', 'base', 'mnt'] export default function () { const route = useRoute() const { urlPrefix } = usePrefix() - const exploreFiltersStore = useExploreFiltersStore() const artGenModeFeatureEnabled = computed(() => isArtGenDomain && enabledPrefix.includes(urlPrefix.value) && enabledOnPages.includes(route.name as string ?? '')) return { artGenModeEnabled: computed(() => - artGenModeFeatureEnabled.value && exploreFiltersStore.artGen, + artGenModeFeatureEnabled.value && route.query.gen_art?.toString() === 'true', ), artGenModeFeatureEnabled, }