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

beta update #6357

Merged
merged 10 commits into from
Jun 29, 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
1 change: 0 additions & 1 deletion components/bsx/Create/RoyaltyForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
}
Expand Down
4 changes: 2 additions & 2 deletions components/collection/drop/DropContainer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion components/collection/unlockable/UnlockableContainer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 4 additions & 10 deletions components/drops/DropCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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 () => {
Expand Down
6 changes: 1 addition & 5 deletions components/rmrk/Create/AttributeTagInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -51,7 +47,7 @@ const props = withDefaults(
)

const tags = computed({
get: () => (props.simple ? props.attr || [] : props.attr?.map(valueOf) || []),
get: () => [],
set: (value) => handleInput(value),
})

Expand Down
22 changes: 16 additions & 6 deletions components/rmrk/Create/SimpleMint.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 = {
Expand All @@ -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>({
Expand Down
178 changes: 0 additions & 178 deletions components/rmrk/Gallery/Appreciation.vue

This file was deleted.

Loading