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

🔧 Audio resource #6031

Merged
merged 8 commits into from
May 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 18 additions & 8 deletions components/gallery/GalleryItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@
<div class="is-relative">
<!-- preview button -->
<a
v-if="canPreview && !mediaItemRef?.isLewdBlurredLayer"
v-if="
canPreview &&
!mediaItemRef?.isLewdBlurredLayer &&
!hasAnimatedResources
"
class="fullscreen-button is-justify-content-center is-align-items-center"
@click="isFullscreen = true">
<NeoIcon icon="expand" />
Expand All @@ -28,13 +32,13 @@
<o-carousel-item
v-for="resource in nftResources"
:key="resource.id">
<section>
<MediaItem
:key="resource.src"
:src="resource.src"
is-detail
:original="isMobile" />
</section>
<MediaItem
:key="resource.src"
:src="resource.src"
:mime-type="resource.mimeType"
:animation-src="resource.animation"
is-detail
:original="isMobile" />
</o-carousel-item>
</o-carousel>
</div>
Expand Down Expand Up @@ -204,6 +208,12 @@ const activeCarouselImage = computed(() => {
const hasResources = computed(
() => nftResources.value && nftResources.value?.length > 1
)
const hasAnimatedResources = computed(
() =>
nftResources.value &&
nftResources.value?.length > 1 &&
nftResources.value[1].animation
)

const previewItemSrc = computed(
() => (hasResources.value && activeCarouselImage.value) || nftImage.value
Expand Down
9 changes: 6 additions & 3 deletions components/gallery/useGalleryItem.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,18 @@ export const useGalleryItem = (nftId?: string) => {

nft.value = nftEntity

nftResources.value = nftEntity.resources?.map((resource) => {
const resources = nftEntity.resources?.map((resource) => {
return {
...resource,
src: sanitizeIpfsUrl(resource.src),
thumb: sanitizeIpfsUrl(resource.thumb),
src: sanitizeIpfsUrl(resource.meta.animationUrl || resource.src),
thumb: sanitizeIpfsUrl(resource.thumb || resource.meta.image),
animation: sanitizeIpfsUrl(resource.meta.animationUrl),
}
})

nftMetadata.value = await getNftMetadata(nftEntity, urlPrefix.value)
nftMimeType.value = await whichMimeType(nftMetadata.value)
nftResources.value = resources

const asset = whichAsset(nftMetadata.value)
nftImage.value = asset.image
Expand Down
1 change: 1 addition & 0 deletions components/media/MediaResolver.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<component
:is="resolveComponent"
v-if="src"
style="height: 100%"
:src="src"
:poster="poster || placeholder"
:description="description"
Expand Down
2 changes: 2 additions & 0 deletions composables/useNft.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ export type NftResources = {
id: string
src?: string
thumb?: string
mimeType?: string
animation?: string
}

export type ItemResources = {
Expand Down
2 changes: 1 addition & 1 deletion libs/ui/src/components/MediaItem/MediaItem.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="media-object">
<div class="media-object" style="height: 100%">
<component
:is="resolveComponent"
:src="properSrc"
Expand Down
23 changes: 12 additions & 11 deletions libs/ui/src/components/MediaItem/type/AudioMedia.vue
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
<template>
<div>
<av-waveform
class="media-audio__player"
:audio-src="animationSrc"
audio-class="media-audio__audio"
canv-class="media-audio__canvas"
played-line-color="rgba(0,0,0,0.74)"
noplayed-line-color="#d32e79"
playtime-font-color="rgba(0,0,0,0.74)"
data-cy="type-audio" />
</div>
<av-waveform
class="media-audio__player is-flex is-flex-direction-column-reverse"
:audio-src="animationSrc"
audio-class="media-audio__audio"
canv-class="media-audio__canvas"
played-line-color="rgba(0,0,0,0.74)"
noplayed-line-color="#d32e79"
playtime-font-color="rgba(0,0,0,0.74)"
data-cy="type-audio" />
</template>

<script lang="ts" setup>
Expand All @@ -21,6 +19,9 @@ defineProps<{
</script>

<style>
div.media-audio__player {
height: 100%;
}
div.media-audio__player div > canvas.media-audio__canvas,
div.media-audio__player > div > audio.media-audio__audio {
width: 100% !important;
Expand Down