Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release update #6862

Merged
merged 113 commits into from
Aug 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
113 commits
Select commit Hold shift + click to select a range
0142347
move profile out of rmrk
daiagi Aug 13, 2023
998d33d
use item grid
daiagi Aug 14, 2023
76d83c0
Merge branch 'main' of https://github.com/kodadot/nft-gallery into fe…
daiagi Aug 14, 2023
57bc417
continue
daiagi Aug 14, 2023
eabdb45
add: draft version basic working
hassnian Aug 15, 2023
6b6dcd6
fix: transfer tab sorting issue
hassnian Aug 15, 2023
a3286ce
fix: tab sort issue
hassnian Aug 15, 2023
6a1fac4
fix: ghost text
hassnian Aug 15, 2023
273c7b1
Merge branch 'main' of https://github.com/kodadot/nft-gallery into fe…
daiagi Aug 15, 2023
4533b85
Activity tab
daiagi Aug 16, 2023
40508a5
move History
daiagi Aug 16, 2023
7e95a4c
chain and order by dropdowns
daiagi Aug 16, 2023
9b7c6e0
seperate breadcrumbs from collection grid
daiagi Aug 17, 2023
e3b10c7
touchup responsivness
daiagi Aug 17, 2023
352a021
translations
daiagi Aug 17, 2023
3868136
delete old page
daiagi Aug 17, 2023
9040a68
Merge branch 'main' of https://github.com/kodadot/nft-gallery into fe…
daiagi Aug 17, 2023
7c8280e
Update components/collection/unlockable/UnlockableLoader.vue
daiagi Aug 17, 2023
1e5fc2f
remove code smells
daiagi Aug 17, 2023
c6e00ac
Merge branch 'feat/profile-V0_9' of https://github.com/kodadot/nft-ga…
daiagi Aug 17, 2023
7f5d025
v-safe-href
daiagi Aug 17, 2023
fe97222
fixes
daiagi Aug 17, 2023
e493c9d
rename
daiagi Aug 17, 2023
0eaa589
deepSource
daiagi Aug 17, 2023
b485f31
responsive touchup
daiagi Aug 17, 2023
6e65a2b
Update components/profile/ProfileDetail.vue
daiagi Aug 17, 2023
15800a2
Update components/profile/FilterButton.vue
daiagi Aug 17, 2023
dfea7b9
typo
daiagi Aug 17, 2023
423eb2f
path
daiagi Aug 17, 2023
aca7355
remove type assertions
daiagi Aug 17, 2023
0381f20
import paths
daiagi Aug 17, 2023
7c4cd88
Merge branch 'feat/profile-V0_9' of https://github.com/kodadot/nft-ga…
daiagi Aug 17, 2023
37f9f45
path
daiagi Aug 17, 2023
fd0c916
path typo
daiagi Aug 17, 2023
1f0b9a6
path typo
daiagi Aug 17, 2023
487a5ad
typo
daiagi Aug 17, 2023
52e2832
width prop
daiagi Aug 17, 2023
3194983
Update components/explore/DesktopControls.vue
daiagi Aug 17, 2023
68ae5c4
Update components/profile/OrderByDropdown.vue
daiagi Aug 17, 2023
dfb472e
Update components/profile/activityTab/Activity.vue
daiagi Aug 17, 2023
baa0d2d
Merge branch 'main' into feat/profile-V0_9
daiagi Aug 17, 2023
ca46fba
Merge branch 'main' of https://github.com/kodadot/nft-gallery into fe…
daiagi Aug 18, 2023
0aac846
Merge branch 'main'
hassnian Aug 18, 2023
c9e5e1a
design review impl
daiagi Aug 18, 2023
d8591b5
copy to clipbaord toast
daiagi Aug 18, 2023
94bce68
fix: pr review changes
hassnian Aug 18, 2023
644a247
fix: token tab not working after route push
hassnian Aug 18, 2023
d660968
fix: tab click removed query params
hassnian Aug 18, 2023
9bc66d6
ref: removed return and changed debounce value
hassnian Aug 18, 2023
f4785b6
fix: target addresses not updating on token switch
hassnian Aug 18, 2023
e21fa8d
cleanup: removed unsuded var
hassnian Aug 18, 2023
a30920d
fix: token icon size class
hassnian Aug 18, 2023
5892b09
Merge branch 'main' into issue-6696
hassnian Aug 18, 2023
60f740a
feat: highlight code
floyd-li Aug 18, 2023
8cc14c1
style: remove padding x
floyd-li Aug 18, 2023
e049d73
style: update font size
floyd-li Aug 18, 2023
5821a59
Merge branch 'main' into feat/6487
floyd-li Aug 18, 2023
d23830e
fix: remove duplicated style import
floyd-li Aug 18, 2023
d99dbd6
style: fix dark mode code color
floyd-li Aug 19, 2023
c73d732
Update BlogPost.vue
floyd-li Aug 19, 2023
61792d7
Update components/collection/unlockable/UnlockableLoader.vue
hassnian Aug 19, 2023
1edf87b
fix: balance not updating on token switch
hassnian Aug 19, 2023
e7fe2c1
fix: add token switch hover effect
hassnian Aug 19, 2023
d6d783b
Merge branch 'main' into issue-6696
hassnian Aug 19, 2023
805d636
Merge branch 'main' into issue-6696
hassnian Aug 19, 2023
bb72158
style: navbar menu on mobile
preschian Aug 20, 2023
4e00d71
Merge branch 'main' into issue-6696
hassnian Aug 20, 2023
c4c827e
style: keep margin bottom
preschian Aug 20, 2023
32f3c57
style: remove fixed
preschian Aug 20, 2023
fb24fbc
style: use safe-area-inset-bottom
preschian Aug 20, 2023
f6748b5
style: remove position absolute
preschian Aug 20, 2023
ae8530a
refactor(BalanceInput): to compositionApi
stephenjason89 Aug 20, 2023
a91c08f
Merge pull request #6794 from floyd-li/feat/6487
yangwao Aug 20, 2023
62f30b6
Update ACTIVITY.md
yangwao Aug 20, 2023
ba54e94
Merge pull request #6842 from kodadot/yangwao-patch-1
yangwao Aug 20, 2023
2971839
fix: update accessibility issues - lighthouse
thnaylor Aug 20, 2023
709a249
fix/6638 - fix svg path
thnaylor Aug 20, 2023
f52d6e0
fix: update conponents to be more seo compatible - lighthouse
thnaylor Aug 20, 2023
d9b1e91
Merge branch 'main' into fix/6839
thnaylor Aug 20, 2023
be08877
ref: improving CC of groupByNestedProperty
hassnian Aug 21, 2023
299d1b9
refactor: removed autoImported $t
stephenjason89 Aug 21, 2023
97a8678
Merge branch 'main' of https://github.com/kodadot/nft-gallery into fe…
daiagi Aug 21, 2023
1c7ee05
no footer
daiagi Aug 21, 2023
8ccdb40
hide identity popover
daiagi Aug 21, 2023
d5081f2
Merge branch 'main' into issue-6696
hassnian Aug 21, 2023
59b0a8f
fix: address and price token input not full width
hassnian Aug 21, 2023
750315f
active hover styling
daiagi Aug 21, 2023
86957f0
properly change network in profile page
daiagi Aug 21, 2023
64fa47b
capitalize tabs
daiagi Aug 21, 2023
3f27a4d
refactor(BasicNumberInput): to composition api (#6830)
leo-anderson-x Aug 21, 2023
8384366
fix: Footer shows i18n object instead of translated string (#6834)
Jarsen136 Aug 21, 2023
18a2986
Merge pull request #6843 from thnaylor/fix/6838
yangwao Aug 21, 2023
64669ce
style: black
preschian Aug 21, 2023
0df449e
Merge branch 'main' into style-connect-button-on-mobile
preschian Aug 21, 2023
2f207e6
Merge pull request #6825 from kodadot/style-connect-button-on-mobile
yangwao Aug 21, 2023
d9e9dbf
fix: Cant list items on AHK - for Uniques pallet (#6850)
Jarsen136 Aug 21, 2023
24c3500
Merge branch 'main' of https://github.com/kodadot/nft-gallery into fe…
daiagi Aug 21, 2023
9580069
seperate all button
daiagi Aug 21, 2023
9e9c793
button hover color
daiagi Aug 21, 2023
367c9c7
fix: incorrect templateRef (#6854)
stephenjason89 Aug 21, 2023
85f10d1
fix: updated href to v-safe-html
thnaylor Aug 21, 2023
c016fde
Merge branch 'main' into fix/6839
thnaylor Aug 21, 2023
d0d225c
refactor(BasicSwitch): to composition api (#6814)
leo-anderson-x Aug 21, 2023
d2aa194
Fix/permission (#6770)
stephenjason89 Aug 21, 2023
28f5467
fix all button behviour
daiagi Aug 21, 2023
b4f0a07
Merge branch 'main' of https://github.com/kodadot/nft-gallery into fe…
daiagi Aug 21, 2023
afea3a3
Merge pull request #6745 from kodadot/feat/profile-V0_9
yangwao Aug 21, 2023
e21369c
Merge pull request #6716 from hassnian/issue-6696
yangwao Aug 21, 2023
0bf60c3
Merge pull request #6836 from stephenjason89/refactor/decorator9
yangwao Aug 21, 2023
ea2facc
fix: can close bsx create (#6858)
hassnian Aug 21, 2023
98839dd
Update components/landing/SearchLanding.vue
yangwao Aug 21, 2023
c4baf33
Merge pull request #6844 from thnaylor/fix/6839
yangwao Aug 21, 2023
70db8d9
Merge pull request #6861 from kodadot/main
yangwao Aug 21, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions ACTIVITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,17 @@ flowchart TD

## Pace of development

## [![Repography logo](https://images.repography.com/logo.svg)](https://repography.com) / Recent activity [![Time period](https://images.repography.com/23713223/kodadot/nft-gallery/recent-activity/pGfAgBUKqY3G-v6I743PiFRW_UY1tmd-HKHy6d1ear4/IHNavWbCVC3MxqvOc_yKjOWxIPiZr3TlKUnZDbWuTG0_badge.svg)](https://repography.com)
[![Issue status graph](https://images.repography.com/23713223/kodadot/nft-gallery/recent-activity/pGfAgBUKqY3G-v6I743PiFRW_UY1tmd-HKHy6d1ear4/IHNavWbCVC3MxqvOc_yKjOWxIPiZr3TlKUnZDbWuTG0_issues.svg)](https://github.com/kodadot/nft-gallery/issues)
[![Pull request status graph](https://images.repography.com/23713223/kodadot/nft-gallery/recent-activity/pGfAgBUKqY3G-v6I743PiFRW_UY1tmd-HKHy6d1ear4/IHNavWbCVC3MxqvOc_yKjOWxIPiZr3TlKUnZDbWuTG0_prs.svg)](https://github.com/kodadot/nft-gallery/pulls)
[![Timeline graph](https://images.repography.com/23713223/kodadot/nft-gallery/recent-activity/pGfAgBUKqY3G-v6I743PiFRW_UY1tmd-HKHy6d1ear4/IHNavWbCVC3MxqvOc_yKjOWxIPiZr3TlKUnZDbWuTG0_timeline.svg)](https://github.com/kodadot/nft-gallery/commits)
[![Top contributors](https://images.repography.com/23713223/kodadot/nft-gallery/recent-activity/pGfAgBUKqY3G-v6I743PiFRW_UY1tmd-HKHy6d1ear4/IHNavWbCVC3MxqvOc_yKjOWxIPiZr3TlKUnZDbWuTG0_users.svg)](https://github.com/kodadot/nft-gallery/graphs/contributors)

## [![Repography logo](https://images.repography.com/logo.svg)](https://repography.com) / Recent activity [![Time period](https://images.repography.com/23713223/kodadot/nft-gallery/recent-activity/1nMiB_aZjymZHZUDQ6R3hWGHqWUWahnU6VdRYYv2InU/ygTelP2NVzMzr-XPmCeXq2GzAIHSFlcUsZDXKY3Qrl4_badge.svg)](https://repography.com)
[![Timeline graph](https://images.repography.com/23713223/kodadot/nft-gallery/recent-activity/1nMiB_aZjymZHZUDQ6R3hWGHqWUWahnU6VdRYYv2InU/ygTelP2NVzMzr-XPmCeXq2GzAIHSFlcUsZDXKY3Qrl4_timeline.svg)](https://github.com/kodadot/nft-gallery/commits)
[![Issue status graph](https://images.repography.com/23713223/kodadot/nft-gallery/recent-activity/1nMiB_aZjymZHZUDQ6R3hWGHqWUWahnU6VdRYYv2InU/ygTelP2NVzMzr-XPmCeXq2GzAIHSFlcUsZDXKY3Qrl4_issues.svg)](https://github.com/kodadot/nft-gallery/issues)
[![Pull request status graph](https://images.repography.com/23713223/kodadot/nft-gallery/recent-activity/1nMiB_aZjymZHZUDQ6R3hWGHqWUWahnU6VdRYYv2InU/ygTelP2NVzMzr-XPmCeXq2GzAIHSFlcUsZDXKY3Qrl4_prs.svg)](https://github.com/kodadot/nft-gallery/pulls)
[![Top contributors](https://images.repography.com/23713223/kodadot/nft-gallery/recent-activity/1nMiB_aZjymZHZUDQ6R3hWGHqWUWahnU6VdRYYv2InU/ygTelP2NVzMzr-XPmCeXq2GzAIHSFlcUsZDXKY3Qrl4_users.svg)](https://github.com/kodadot/nft-gallery/graphs/contributors)


## [![Repography logo](https://images.repography.com/logo.svg)](https://repography.com) / Top contributors
[![Top contributors](https://images.repography.com/23713223/kodadot/nft-gallery/top-contributors/pGfAgBUKqY3G-v6I743PiFRW_UY1tmd-HKHy6d1ear4/IHNavWbCVC3MxqvOc_yKjOWxIPiZr3TlKUnZDbWuTG0_table.svg)](https://github.com/kodadot/nft-gallery/graphs/contributors)
[![Top contributors](https://images.repography.com/23713223/kodadot/nft-gallery/top-contributors/1nMiB_aZjymZHZUDQ6R3hWGHqWUWahnU6VdRYYv2InU/ygTelP2NVzMzr-XPmCeXq2GzAIHSFlcUsZDXKY3Qrl4_table.svg)](https://github.com/kodadot/nft-gallery/graphs/contributors)


### RepoTracker

Expand Down
2 changes: 1 addition & 1 deletion components/Navbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ import { useEventListener } from '@vueuse/core'

import { useIdentityStore } from '@/stores/identity'
import { getChainNameByPrefix } from '@/utils/chain'
import { createVisible } from '@/utils/config/permision.config'
import { createVisible } from '@/utils/config/permission.config'
import ShoppingCartButton from './navbar/ShoppingCartButton.vue'

const { $nextTick, $neoModal } = useNuxtApp()
Expand Down
44 changes: 22 additions & 22 deletions components/TheFooter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<footer class="footer-container section">
<div
class="footer-container-inner is-flex is-align-items-start is-justify-content-space-between">
<div class="footer-container-subs is-flex is-flex-direction-column">
<h4 class="subtitle is-5">
<section class="footer-container-subs is-flex is-flex-direction-column">
<h2 class="subtitle is-5">
{{ $t('footer.subscribe') }}
</h4>
</h2>
<div class="is-flex is-align-items-center footer-container-subs-items">
<div id="custom-substack-embed"></div>

Expand All @@ -24,9 +24,9 @@
</script>
<script src="https://substackapi.com/widget.js" async></script>
</div>
</div>
<div class="footer-container-info is-flex is-flex-direction-column">
<h4 class="subtitle is-5">Incentives</h4>
</section>
<section class="footer-container-info is-flex is-flex-direction-column">
<h2 class="subtitle is-5">Incentives</h2>
<div>
<ul class="footer-container-list">
<li
Expand All @@ -51,9 +51,9 @@
</li>
</ul>
</div>
</div>
<div class="footer-container-info is-flex is-flex-direction-column">
<h4 class="subtitle is-5">Marketplace</h4>
</section>
<section class="footer-container-info is-flex is-flex-direction-column">
<h2 class="subtitle is-5">Marketplace</h2>
<div>
<ul class="footer-container-list">
<li
Expand All @@ -78,9 +78,9 @@
</li>
</ul>
</div>
</div>
<div class="footer-container-info is-flex is-flex-direction-column">
<h4 class="subtitle is-5">KodaDot</h4>
</section>
<section class="footer-container-info is-flex is-flex-direction-column">
<h2 class="subtitle is-5">KodaDot</h2>
<div>
<ul class="footer-container-list">
<li
Expand All @@ -105,21 +105,24 @@
</li>
</ul>
</div>
</div>
</section>

<div class="footer-container-socials is-flex is-flex-direction-column">
<h4 class="subtitle is-5">
<section
class="footer-container-socials is-flex is-flex-direction-column">
<h2 class="subtitle is-5">
{{ $t('footer.join') }}
</h4>
</h2>
<ul class="footer-container-socials-list is-flex">
<li
v-for="item in socials"
:key="item.url"
class="footer-container-socials-list-item is-flex is-align-items-center is-justify-content-center mr-2"
@click="goToSocials(item.url)">
class="footer-container-socials-list-item is-flex is-align-items-center is-justify-content-center mr-2">
<a
v-safe-href="item.url"
class="is-flex icon"
rel="nofollow noopener noreferrer"
target="_blank"
role="link"
:aria-label="item.name">
<!-- substack doesnt have a font awesome icon -->
<svg
Expand Down Expand Up @@ -150,7 +153,7 @@
</a>
</li>
</ul>
</div>
</section>
</div>
<img src="/blurred-landing-footer.png" class="left-blurred-image" alt="" />
</footer>
Expand Down Expand Up @@ -272,7 +275,4 @@ const socials = [
icon: 'reddit-alien',
},
]
const goToSocials = (url): void => {
window.open(url, '_blank')
}
</script>
26 changes: 26 additions & 0 deletions components/blog/BlogPost.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
<script setup>
import { format } from 'date-fns'
import { convertMarkdownToText } from '@/utils/markdown'
import { nextTick } from 'vue'
import hljs from 'highlight.js'

const { $seoMeta } = useNuxtApp()
const route = useRoute()
Expand All @@ -34,6 +36,10 @@ onMounted(async () => {

attributes.value = post.attributes
singlePostComponent.value = post.vue.component

// must wait the page finished render then highlight the code
await nextTick()
hljs.highlightAll()
})

const title = computed(() => attributes.value.title)
Expand All @@ -55,8 +61,21 @@ useNuxt2Meta({
</script>

<style lang="scss">
@use 'sass:meta';
@import '@/styles/abstracts/variables';

// dynamic load highlight syntax theme based on page theme
html.light-mode {
@include meta.load-css('highlight.js/styles/atom-one-light');
}
html.dark-mode {
@include meta.load-css('highlight.js/styles/atom-one-dark');
.article p > code {
// color from them atom-one-dark theme
color: #abb2bf;
background: #282c34;
}
}
.article {
margin: 0 auto;
max-width: 40rem;
Expand Down Expand Up @@ -135,6 +154,13 @@ useNuxt2Meta({
a {
color: theme('k-blue');
}

pre {
padding-left: 0;
padding-right: 0;
font-size: 1rem;
background-color: theme('background-color');
}
}

@include touch {
Expand Down
2 changes: 1 addition & 1 deletion components/bsx/Create/CreateToken.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div>
<Loader v-model="isLoading" :status="status" :can-cancel="false" />
<Loader v-model="isLoading" :status="status" can-cancel />
<BaseTokenForm
ref="baseTokenForm"
:show-explainer-text="showExplainerText"
Expand Down
2 changes: 1 addition & 1 deletion components/bsx/input/TokenBalanceInput.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<BasicBalanceInput
ref="magicBalanceInput"
ref="balanceInputComponent"
v-model="vValue"
:decimals="decimals"
:unit="unit"
Expand Down
2 changes: 1 addition & 1 deletion components/carousel/module/CarouselAgnostic.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
:key="`${item.id}-${index}`"
class="keen-slider__slide carousel-item">
<div class="h-full is-flex is-flex-direction-column">
<CarouselMedia :item="item" />
<CarouselMedia :item="item" :index="index" :length="nfts.length" />
<CarouselInfo :item="item" />
</div>
</div>
Expand Down
3 changes: 3 additions & 0 deletions components/carousel/module/CarouselMedia.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
:class="{ 'carousel-media-collection': isCollection }">
<nuxt-link
:to="urlOf({ id: item.id, url, chain: item.chain })"
:aria-label="`slide ${index + 1} of ${length}`"
rel="nofollow">
<MediaItem
class="carousel-media-wrapper"
Expand All @@ -24,6 +25,8 @@ import { useCarouselUrl } from '../utils/useCarousel'

const props = defineProps<{
item: CarouselNFT & NFTWithMetadata
index: number
length: number
}>()

const { urlOf } = useCarouselUrl()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,5 @@
<template>
<div class="collections">
<div
class="is-flex is-flex-direction-row is-justify-content-space-between py-5">
<BreadcrumbsFilter />

<div v-if="total">{{ total }} {{ $t('items') }}</div>
<div v-else-if="isLoading" class="skeleton-container-fixed-width">
<NeoSkeleton no-margin />
</div>
</div>
<hr class="mt-0" />

<LoadPreviousPage
v-if="startPage > 1 && !isLoading && total > 0"
@click="reachTopHandler" />
Expand Down Expand Up @@ -46,7 +35,6 @@
</template>

<script lang="ts" setup>
import { NeoSkeleton } from '@kodadot1/brick'
import { Collection } from '@/components/rmrk/service/scheme'
import { SearchQuery } from '@/components/search/types'
import 'lazysizes'
Expand All @@ -56,10 +44,15 @@ import CollectionCard from '@/components/collection/CollectionCard.vue'
import { GRID_DEFAULT_WIDTH } from '@/components/collection/utils/constants'
import { usePreferencesStore } from '@/stores/preferences'

const props = defineProps<{
id?: string
}>()

const route = useRoute()
const { $apollo } = useNuxtApp()
const { urlPrefix, client } = usePrefix()
const preferencesStore = usePreferencesStore()
const emit = defineEmits(['total', 'isLoading'])

const collections = ref<Collection[]>([])
const isLoading = ref(true)
Expand Down Expand Up @@ -103,17 +96,32 @@ const fetchPageData = async (page: number, loadDirection = 'down') => {
return false
}
isFetchingData.value = true

const variables = props.id
? {
search: [
{
issuer_eq: props.id,
},
],
first: first.value,
offset: (page - 1) * first.value,
orderBy: searchQuery.value.sortBy,
}
: {
denyList: getDenyList(urlPrefix.value),
orderBy: searchQuery.value.sortBy,
search: buildSearchParam(),
listed: searchQuery.value.listed
? [{ price: { greaterThan: '0' } }]
: [],
first: first.value,
offset: (page - 1) * first.value,
}
const result = await $apollo.query({
query: collectionListWithSearch,
client: client.value,
variables: {
denyList: getDenyList(urlPrefix.value),
orderBy: searchQuery.value.sortBy,
search: buildSearchParam(),
listed: searchQuery.value.listed ? [{ price: { greaterThan: '0' } }] : [],
first: first.value,
offset: (page - 1) * first.value,
},
variables,
})
await handleResult(result, loadDirection)
isFetchingData.value = false
Expand Down Expand Up @@ -144,6 +152,9 @@ const {
fetchPageData,
})

watch(total, (val) => emit('total', val))
watch(isLoading, (val) => emit('isLoading', val))

const skeletonCount = first.value

const handleResult = async ({ data }: any, loadDirection = 'down') => {
Expand Down
32 changes: 32 additions & 0 deletions components/collection/CollectionGridWithBreadcrumbs.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<template>
<div class="collections">
<div
class="is-flex is-flex-direction-row is-justify-content-space-between py-5">
<BreadcrumbsFilter />

<div v-if="total">{{ total }} {{ $t('items') }}</div>
<div v-else-if="isLoading">
<NeoSkeleton no-margin :width="80" />
</div>
</div>
<hr class="mt-0" />

<CollectionGrid
:id="id"
@total="(v) => (total = v)"
@isLoading="(l) => (isLoading = l)" />
</div>
</template>

<script lang="ts" setup>
import { NeoSkeleton } from '@kodadot1/brick'

import CollectionGrid from './CollectionGrid.vue'

defineProps<{
id?: string
}>()

const isLoading = ref(true)
const total = ref(0)
</script>
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
</template>

<script setup lang="ts">
import ProfileLink from '@/components/rmrk/Profile/ProfileLink.vue'
import ProfileLink from '@/components/profile/ProfileLink.vue'
import { NeoIcon } from '@kodadot1/brick'
import { format } from '@/components/collection/activity/utils'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
</template>

<script setup lang="ts">
import ProfileLink from '@/components/rmrk/Profile/ProfileLink.vue'
import ProfileLink from '@/components/profile/ProfileLink.vue'
import { Owners } from '@/composables/collectionActivity/types'
import { NeoIcon } from '@kodadot1/brick'

Expand Down
Loading