Skip to content

Commit

Permalink
Merge branch 'main' into issue-offer-reuse-nft
Browse files Browse the repository at this point in the history
  • Loading branch information
@hassnian
hassnian authored Jan 4, 2025
2 parents c663b01 + d9db211 commit 3382e01
Show file tree
Hide file tree
Showing 5 changed files with 149 additions and 147 deletions.
50 changes: 34 additions & 16 deletions .github/renovate.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,37 +4,55 @@
"automerge": true,
"automergeType": "pr-comment",
"automergeComment": "lgtm",
"extends": ["config:base", ":dependencyDashboard"],
"extends": [
"config:recommended",
":dependencyDashboard"
],
"prHourlyLimit": 5,
"enabledManagers": ["npm"],
"enabledManagers": [
"npm"
],
"rangeStrategy": "bump",
"updatePinnedDependencies": false,
"schedule": ["before 3am on Monday"],
"schedule": [
"before 3am on Monday"
],
"packageRules": [
{
"matchSourceUrlPrefixes": [
"https://github.com/polkadot-js/",
"https://github.com/vue-polkadot/",
"https://github.com/kodadot/packages",
"https://github.com/cloudacy/vue-markdown-render",
"https://github.com/FortAwesome/Font-Awesome",
"https://github.com/TypeStrong/ts-loader"
],
"groupName": "merge with hazmat suit extra",
"enabled": false
"enabled": false,
"matchSourceUrls": [
"https://github.com/polkadot-js/{/,}**",
"https://github.com/vue-polkadot/{/,}**",
"https://github.com/kodadot/packages{/,}**",
"https://github.com/cloudacy/vue-markdown-render{/,}**",
"https://github.com/FortAwesome/Font-Awesome{/,}**",
"https://github.com/TypeStrong/ts-loader{/,}**"
]
},
{
"groupName": "Bumped minor version of packages",
"prHeader": "Bumped minor version of packages, check if builds are still passing, please 🥺",
"matchUpdateTypes": ["minor", "patch"],
"matchDepTypes": ["dependencies", "devDependencies"]
"matchUpdateTypes": [
"minor",
"patch"
],
"matchDepTypes": [
"dependencies",
"devDependencies"
]
},
{
"matchUpdateTypes": ["major", "pin"],
"matchUpdateTypes": [
"major",
"pin"
],
"enabled": false
},
{
"packageNames": ["node"],
"matchPackageNames": [
"node"
],
"enabled": false
}
]
Expand Down
8 changes: 4 additions & 4 deletions components/collection/CollectionDetail.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
v-if="nfts && !isLoading"
class="flex justify-around is-vcentered"
>
<div class="detail-item text-center column">
<div class="detail-item text-center basis-0 grow shrink p-3">
<p class="detail-item__title text-k-grey">
{{ $t('collectionCard.volume') }}
</p>
Expand All @@ -52,7 +52,7 @@
:value="collectionTradedVolumeNumber"
/>
</div>
<div class="detail-item text-center column">
<div class="detail-item text-center basis-0 grow shrink p-3">
<p class="detail-item__title text-k-grey">
{{ $t('series.highestSale') }}
</p>
Expand All @@ -62,7 +62,7 @@
/>
</div>

<div class="detail-item text-center column">
<div class="detail-item text-center basis-0 grow shrink p-3">
<p class="detail-item__title text-k-grey">
{{ $t('collectionCard.items') }}
</p>
Expand All @@ -76,7 +76,7 @@
<div
v-for="n in DESC_SKELETON_COUNT"
:key="n"
class="flex items-center detail-item column px-5"
class="flex items-center detail-item basis-0 grow shrink p-3 px-5"
>
<NeoSkeleton
no-margin
Expand Down
4 changes: 2 additions & 2 deletions components/collection/drop/GenerativeLayout.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<div
class="relative w-full mx-auto px-[1.25rem] md:px-[2.5rem] min-[1440px]:max-w-[1440px]"
>
<div class="columns is-variable is-4-tablet">
<div class="column is-half-desktop mobile-padding lg:max-w-[600px]">
<div class="flex">
<div class="mobile-padding lg:max-w-[600px]">
<div class="flex justify-between flex-wrap max-w-[504px]">
<div
v-if="address"
Expand Down
230 changes: 107 additions & 123 deletions components/massmint/OverviewTable.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,131 +6,115 @@
</div>
<template #content>
<div class="max-h-[30rem] overflow-y-auto">
<div
class="columns is-variable is-1 is-mobile m-0 px-4 py-1 border-b border-k-grey"
>
<div class="column text-k-grey is-1">
#
</div>
<div class="column text-k-grey">
{{ $t('massmint.image') }}
</div>
<div class="column text-k-grey">
{{ $t('massmint.name') }}
</div>
<div class="column is-3 text-k-grey">
{{ $t('massmint.description') }}
</div>
<div class="column is-3 text-k-grey">
{{ $t('nft.properties.label') }}
</div>
<div class="column text-k-grey">
{{ $t('massmint.price') }}
</div>
<div class="column text-k-grey flex justify-center">
<span class="pl-2">{{ $t('massmint.status') }}</span>
</div>
<div class="column text-k-grey flex justify-center">
{{ $t('massmint.operation') }}
</div>
</div>
<div
v-for="nft in displayedNFTS"
:key="nft.id"
class="columns is-variable is-1 is-mobile border-b border-k-shade m-0 py-1 px-4"
>
<div class="column flex items-center is-1">
{{ nft.id }}
</div>
<div class="column flex items-center">
<NeoAvatar
:image-component="NuxtImg"
class="overflow-hidden m-0"
:avatar="nft.imageUrl"
:name="nft.name || `${nft.id}`"
:size="48"
:placeholder="placeholder"
/>
</div>
<div class="column flex items-center">
<div
class="cursor-pointer"
:class="{
'text-k-red': !nft.name,
}"
@click="openSideBarWith(nft)"
<table class="table-auto">
<thead>
<tr>
<th>#</th>
<th>{{ $t('massmint.image') }}</th>
<th>{{ $t('massmint.name') }}</th>
<th>{{ $t('massmint.description') }}</th>
<th> {{ $t('nft.properties.label') }}</th>
<th>{{ $t('massmint.price') }}</th>
<th><span class="pl-2">{{ $t('massmint.status') }}</span></th>
<th>{{ $t('massmint.operation') }}</th>
</tr>
</thead>
<tbody>
<tr
v-for="nft in displayedNFTS"
:key="nft.id"
class="border-b border-k-shade m-0 py-1 px-4"
>
{{ nft.name || '*' + $t('massmint.nameRequired') }}
</div>
</div>
<div class="column is-3 flex items-center">
<div
class="cursor-pointer overflow-hidden text-ellipsis whitespace-nowrap max-w-[90%]"
:class="{
'text-k-orange': !nft.description,
}"
@click="openSideBarWith(nft)"
>
{{ nft.description || $t('massmint.descriptionMissing') }}
</div>
</div>
<div class="column is-3 flex items-center">
<div
class="cursor-pointer overflow-hidden text-ellipsis whitespace-nowrap max-w-[90%]"
:class="{
'text-k-orange': !nft.attributes?.length,
}"
@click="openSideBarWith(nft)"
>
{{ nft.attributes?.length ? getNftAttributesOverview(nft) : $t('massmint.attributesMissing') }}
</div>
</div>
<div class="column flex items-center">
<div
class="cursor-pointer"
@click="openSideBarWith(nft)"
>
<CommonTokenMoney
v-if="nft.price"
:value="getNativeNftPrice(nft)"
/>
<div
v-else
class="text-k-orange"
>
{{ $t('massmint.priceMissing') }}
</div>
</div>
</div>
<div class="column flex items-center justify-center">
<div class="flex items-center pl-2">
<div
class="border text-xs justify-center py-2 flex items-center w-[100px]"
:class="statusClass(nft.status)"
>
{{ statusTranslation(nft.status) }}
</div>
</div>
</div>
<div class="column flex items-center justify-center">
<NeoButton
icon="edit"
size="large"
variant="icon"
no-shadow
@click="openSideBarWith(nft)"
/>
<td class="!align-middle">
{{ nft.id }}
</td>
<td class="!align-middle">
<NeoAvatar
:image-component="NuxtImg"
class="overflow-hidden m-0"
:avatar="nft.imageUrl"
:name="nft.name || `${nft.id}`"
:size="48"
:placeholder="placeholder"
/>
</td>
<td class="!align-middle">
<div
class="cursor-pointer"
:class="{ 'text-k-red': !nft.name }"
@click="openSideBarWith(nft)"
>
{{ nft.name || '*' + $t('massmint.nameRequired') }}
</div>
</td>
<td class="!align-middle">
<div
class="cursor-pointer overflow-hidden text-ellipsis whitespace-nowrap max-w-[90%]"
:class="{ 'text-k-orange': !nft.description }"
@click="openSideBarWith(nft)"
>
{{ nft.description || $t('massmint.descriptionMissing') }}
</div>
</td>
<td class="!align-middle">
<div
class="cursor-pointer overflow-hidden text-ellipsis whitespace-nowrap max-w-[90%]"
:class="{
'text-k-orange': !nft.attributes?.length,
}"
@click="openSideBarWith(nft)"
>
{{ nft.attributes?.length ? getNftAttributesOverview(nft) : $t('massmint.attributesMissing') }}
</div>
</td>
<td class="!align-middle">
<div
class="cursor-pointer"
@click="openSideBarWith(nft)"
>
<CommonTokenMoney
v-if="nft.price"
:value="getNativeNftPrice(nft)"
/>
<div
v-else
class="text-k-orange"
>
{{ $t('massmint.priceMissing') }}
</div>
</div>
</td>
<td class="!align-middle">
<div class="flex items-center pl-2">
<div
class="border text-xs justify-center py-2 flex items-center w-[100px]"
:class="statusClass(nft.status)"
>
{{ statusTranslation(nft.status) }}
</div>
</div>
</td>
<td class="!align-middle">
<NeoButton
icon="edit"
size="large"
variant="icon"
no-shadow
@click="openSideBarWith(nft)"
/>

<NeoButton
icon="trash"
size="large"
class="ml-3"
variant="icon"
no-shadow
@click="deleteNFT(nft)"
/>
</div>
</div>
<NeoButton
icon="trash"
size="large"
class="ml-3"
variant="icon"
no-shadow
@click="deleteNFT(nft)"
/>
</td>
</tr>
</tbody>
</table>
<div ref="sentinel" />
</div>
</template>
Expand Down
4 changes: 2 additions & 2 deletions components/migrate/steps/Index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
{{ $t('migrate.homeButton') }}
</NeoButton>

<div class="mt-8 is-centered columns">
<div class="is-5-widescreen column">
<div class="flex justify-center items-center mt-8">
<div class="w-full lg:max-w-lg">
<h1 class="text-2xl">
<span
:class="{
Expand Down

0 comments on commit 3382e01

Please sign in to comment.