Merge branch 'main' of github.com:kodadot/nft-gallery

kodadot · Jun 29, 2023 · 0a13b9e · 0a13b9e
2 parents 38dafdc + 4e2ca19
commit 0a13b9e
Show file tree

Hide file tree

Showing 18 changed files with 64 additions and 772 deletions.
diff --git a/components/bsx/Create/RoyaltyForm.vue b/components/bsx/Create/RoyaltyForm.vue
@@ -32,7 +32,6 @@ import AuthMixin from '~/utils/mixins/authMixin'
 
 const components = {
  BasicSwitch: () => import('@/components/shared/form/BasicSwitch.vue'),
- BasicSlider: () => import('@/components/shared/form/BasicSlider.vue'),
  BasicNumberInput: () =>
  import('@/components/shared/form/BasicNumberInput.vue'),
 }

diff --git a/components/collection/drop/DropContainer.vue b/components/collection/drop/DropContainer.vue
@@ -6,7 +6,7 @@
  <div class="container is-fluid">
  <div class="columns is-desktop">
  <div class="column is-half-desktop mobile-padding">
- <UnlockableCollectionInfo />
+ <UnlockableCollectionInfo :collection-id="collectionId" />
  <hr class="mb-4" />
 
  <div
@@ -101,7 +101,7 @@
  </div>
  </div>
  </div>
- <TokenImportButton v-if="urlPrefix === 'stmn'" />
+ <TokenImportButton />
  </div>
  <div class="column pt-5 is-flex is-justify-content-center">
  <ImageSlider v-if="imageList.length" :image-list="imageList" />

diff --git a/components/collection/unlockable/UnlockableCollectionInfo.vue b/components/collection/unlockable/UnlockableCollectionInfo.vue
@@ -47,8 +47,10 @@
 <script setup lang="ts">
 import HeroButtons from '@/components/collection/unlockable/UnlockableHeroButtons.vue'
 import { NeoButton } from '@kodadot1/brick'
-import { collectionId } from './const'
 import { unlockableDesc } from './utils'
+
+defineProps<{ collectionId: string }>()
+
 const seeAllDescription = ref(false)
 const DESCRIPTION_MAX_LENGTH = 210
 const { urlPrefix } = usePrefix()

diff --git a/components/collection/unlockable/UnlockableContainer.vue b/components/collection/unlockable/UnlockableContainer.vue
@@ -6,7 +6,7 @@
  <div class="container is-fluid">
  <div class="columns is-desktop">
  <div class="column is-half-desktop mobile-padding">
- <UnlockableCollectionInfo />
+ <UnlockableCollectionInfo :collection-id="collectionId" />
  <hr class="mb-4" />
 
  <div

diff --git a/components/drops/DropCard.vue b/components/drops/DropCard.vue
@@ -49,8 +49,7 @@
  </div>
  <div class="is-flex is-flex-direction-column">
  <span class="has-text-grey">{{ $t('price') }}</span>
- <span v-if="price === 'Free'">{{ price }}</span>
- <span v-else>1 DOT</span>
+ <span>{{ price }}</span>
  </div>
  </div>
  </div>
@@ -96,15 +95,10 @@ const correctDropUrl = computed(() => {
 })
 
 const price = computed(() => {
- if (!props.drop?.collection) {
- return ''
+ if (props.dropUrl === 'dot-drop') {
+ return '1 DOT'
  }
-
- const totalPrice = sum(
- (props.drop?.collection.nfts || []).map((nft) => Number(nft?.price || 0))
- )
-
- return totalPrice > 0 ? totalPrice : 'Free'
+ return 'Free'
 })
 
 onMounted(async () => {

diff --git a/components/rmrk/Create/AttributeTagInput.vue b/components/rmrk/Create/AttributeTagInput.vue
@@ -31,15 +31,11 @@
 
 <script setup lang="ts">
 import { NeoField, NeoInputitems } from '@kodadot1/brick'
-import { Attribute } from '@kodadot1/minimark/common'
-
-const valueOf = ({ value }: Attribute) => String(value)
 
 const allTags = ref(['audio', 'video', 'image', 'music', 'abstract'])
 
 const props = withDefaults(
  defineProps<{
- attr: []
  max?: number
  placeholder?: string
  simple?: boolean
@@ -51,7 +47,7 @@ const props = withDefaults(
 )
 
 const tags = computed({
- get: () => (props.simple ? props.attr || [] : props.attr?.map(valueOf) || []),
+ get: () => [],
  set: (value) => handleInput(value),
 })
 

diff --git a/components/rmrk/Create/SimpleMint.vue b/components/rmrk/Create/SimpleMint.vue
@@ -110,10 +110,14 @@
  spellcheck="true"
  data-cy="input-batch-address" />
  </NeoField>
- <BasicSlider
- v-model="distribution"
- label="action.distributionCount"
- data-cy="input-distribution" />
+
+ <NeoField class="mt-4" :label="$t('action.distributionCount')">
+ <NeoSlider
+ v-model="distribution"
+ data-cy="input-distribution"
+ :min="0"
+ :max="100" />
+ </NeoField>
  <NeoField v-show="syncVisible">
  <b-button
  outlined
@@ -214,7 +218,13 @@ import AuthMixin from '~/utils/mixins/authMixin'
 import { useFiatStore } from '@/stores/fiat'
 import { usePinningStore } from '@/stores/pinning'
 import { usePreferencesStore } from '@/stores/preferences'
-import { NeoField, NeoIcon, NeoInput, NeoSwitch } from '@kodadot1/brick'
+import {
+ NeoField,
+ NeoIcon,
+ NeoInput,
+ NeoSlider,
+ NeoSwitch,
+} from '@kodadot1/brick'
 import { useIdentityStore } from '@/stores/identity'
 
 const components = {
@@ -228,13 +238,13 @@ const components = {
  CollapseWrapper: () =>
  import('@/components/shared/collapse/CollapseWrapper.vue'),
  BasicSwitch: () => import('@/components/shared/form/BasicSwitch.vue'),
- BasicSlider: () => import('@/components/shared/form/BasicSlider.vue'),
  BasicInput: () => import('@/components/shared/form/BasicInput.vue'),
  SubmitButton: () => import('@/components/base/SubmitButton.vue'),
  NeoIcon,
  NeoSwitch,
  NeoField,
  NeoInput,
+ NeoSlider,
 }
 
 @Component<SimpleMint>({

diff --git a/components/rmrk/Gallery/Appreciation.vue b/components/rmrk/Gallery/Appreciation.vue