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 #7378

Merged
merged 57 commits into from
Sep 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
52ee20e
chore: remove unused vars
preschian Sep 13, 2023
6e473db
chore: fa sharp icon as default
preschian Sep 19, 2023
6795296
fix: Display normal ksm unit
Jarsen136 Sep 23, 2023
3a3a9eb
🔧 clear listing store when minicart is unmounted
daiagi Sep 24, 2023
06a27e2
🔧 make listing cart state responsive to profile page filters
daiagi Sep 24, 2023
b71030e
💄 empty shopping cart svgs
daiagi Sep 24, 2023
dad5d9a
fix: Listing price: I set the price 1 DOT it listed item for 100 DOTs
Jarsen136 Sep 24, 2023
6e8de47
fix: Spotlight: AssetHub Kusama
Jarsen136 Sep 24, 2023
0e5259f
fix: Cart confirm modal has enabled scroll
Jarsen136 Sep 24, 2023
385f132
Merge branch 'main' into issue-7342
Jarsen136 Sep 24, 2023
e0e6299
Merge branch 'main' into issue-7343
Jarsen136 Sep 24, 2023
f7d2c02
fix: scroll clip mode not working
Jarsen136 Sep 25, 2023
9ef8485
Merge branch 'main' of https://github.com/kodadot/nft-gallery into fi…
daiagi Sep 25, 2023
7fe819d
🔧 k-grey background
roiLeo Sep 25, 2023
ff1f51a
Merge pull request #7348 from Jarsen136/issue-7342
roiLeo Sep 25, 2023
e83838f
fix selection rest on scroll
daiagi Sep 25, 2023
375b035
Merge branch 'main' of https://github.com/kodadot/nft-gallery into fi…
daiagi Sep 25, 2023
5701b18
Merge branch 'main' of github.com:kodadot/nft-gallery into chore/fa-s…
preschian Sep 25, 2023
26287c6
fix: proper icon
preschian Sep 25, 2023
3f299ac
fix: proper icon
preschian Sep 25, 2023
3693a9a
Merge pull request #7330 from Jarsen136/issue-7320
yangwao Sep 25, 2023
8525e80
Merge pull request #7334 from kodadot/fix/empty-cart-assets
yangwao Sep 25, 2023
3a6b5fe
fix: fix Transfer URI link w/ usd amount after address
Jarsen136 Sep 25, 2023
c4b74d8
Merge branch 'main' of github.com:kodadot/nft-gallery into chore/remo…
preschian Sep 25, 2023
bf66f1a
Merge branch 'main' into fix/mass-list-ignores-filters
daiagi Sep 25, 2023
14e81d2
bug fix
daiagi Sep 25, 2023
ad72cec
#7350 buy now button fix
prachi00 Sep 26, 2023
b93df56
Merge pull request #7347 from Jarsen136/issue-7343
vikiival Sep 26, 2023
e995f96
:globe_with_meridians: :bug: broadcasting
vikiival Sep 26, 2023
cbef1b9
:globe_with_meridians: :bug: typos, wording
vikiival Sep 26, 2023
4c1060b
Merge pull request #7354 from roiLeo/hotfix/global/k-grey
vikiival Sep 26, 2023
5c47eb9
comment 🌕-chains in libs/static/src/chains.ts
vikiival Sep 26, 2023
ab8b399
comment 🌕-chains in libs/static/src/endpoints.ts
vikiival Sep 26, 2023
6801c78
comment 🌕-chains in libs/static/src/indexers.ts
vikiival Sep 26, 2023
5c412c1
comment 🌕-chains in libs/static/src/names.ts
vikiival Sep 26, 2023
8dbebd9
comment 🌕-chains in libs/static/src/services.ts
vikiival Sep 26, 2023
eec2647
comment 🌕-chains in libs/static/src/types.ts
vikiival Sep 26, 2023
dfb44b6
:wastebasket: remove moonchains
vikiival Sep 26, 2023
5c77c46
:wastebasket: moonchains from create collectons
vikiival Sep 26, 2023
f4a553d
:wastebasket: moonchains from landing page
vikiival Sep 26, 2023
b29014b
:wrench: :wastebasket: moonchains config
vikiival Sep 26, 2023
6f87925
:wrench: :wastebasket: moonchains config
vikiival Sep 26, 2023
0abee85
Merge pull request #7302 from kodadot/chore/fa-sharp-icons
yangwao Sep 26, 2023
ce9c617
feat: Add ToS checkbox to add funds modal
Jarsen136 Sep 26, 2023
73dc80d
Merge pull request #7364 from prachi00/feat-buy-now-btn
vikiival Sep 26, 2023
4f06325
Merge pull request #7372 from Jarsen136/issue-7370
yangwao Sep 26, 2023
adf6654
Update locales/en.json
vikiival Sep 26, 2023
6cdedf0
Update locales/en.json
vikiival Sep 26, 2023
59f850e
Merge pull request #7368 from kodadot/typos
vikiival Sep 26, 2023
3615b40
Merge pull request #7369 from kodadot/deprecate-moon
vikiival Sep 26, 2023
927a6ba
Merge pull request #7257 from kodadot/chore/remove-unused-vars
yangwao Sep 26, 2023
3d3070c
proper clear listing store
daiagi Sep 27, 2023
0ca3fdd
Merge pull request #7349 from Jarsen136/issue-7317
yangwao Sep 27, 2023
525bea1
Merge pull request #7357 from Jarsen136/issue-7356
yangwao Sep 27, 2023
9e5a68d
Merge pull request #7333 from kodadot/fix/mass-list-ignores-filters
yangwao Sep 27, 2023
718c434
Merge pull request #7332 from kodadot/fix/clear-listing-store
yangwao Sep 27, 2023
2c9bfed
Merge pull request #7377 from kodadot/main
yangwao Sep 27, 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
3 changes: 2 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ module.exports = {
parser: 'vue-eslint-parser',
parserOptions: {
parser: '@typescript-eslint/parser',
ecmaVersion: 2020,
ecmaVersion: 2022,
sourceType: 'module',
},
plugins: ['vue', 'prettier', '@typescript-eslint', 'unicorn'],
Expand Down Expand Up @@ -47,6 +47,7 @@ module.exports = {
},
],
'vue/multi-word-component-names': 'off',
'@typescript-eslint/no-unused-vars': 'error',
'vue-scoped-css/v-deep-pseudo-style': ['error', ':deep'],
'vue-scoped-css/no-deprecated-deep-combinator': 'error',
'vue-scoped-css/require-v-deep-argument': 'error',
Expand Down
5 changes: 2 additions & 3 deletions components/Navbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,7 @@
<NeoIcon
class="ml-1"
icon="fire-flame-curved"
custom-size="fa-solid"
pack="fa-sharp"
pack="fass"
variant="primary" />
</div>
</nuxt-link>
Expand Down Expand Up @@ -161,7 +160,7 @@
{{ $t('profile.page') }}
<NeoIcon icon="user-circle" />
</span>
<NeoIcon class="icon--right" icon="chevron-right" pack="fas" />
<NeoIcon class="icon--right" icon="chevron-right" />
</div>

<div v-if="!account" id="NavProfile">
Expand Down
17 changes: 4 additions & 13 deletions components/TheFooter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,7 @@
rel="nofollow noopener noreferrer"
class="is-flex is-align-items-center">
{{ item.name }}
<NeoIcon
icon="arrow-up-right"
class="ml-1 has-text-grey"
pack="fas" />
<NeoIcon icon="arrow-up-right" class="ml-1 has-text-grey" />
</a>
<nuxt-link v-else :to="item.url">
{{ item.name }}
Expand All @@ -67,10 +64,7 @@
rel="nofollow noopener noreferrer"
class="is-flex is-align-items-center">
{{ item.name }}
<NeoIcon
icon="arrow-up-right"
class="ml-1 has-text-grey"
pack="fas" />
<NeoIcon icon="arrow-up-right" class="ml-1 has-text-grey" />
</a>
<nuxt-link v-else :to="item.url">
{{ item.name }}
Expand All @@ -94,10 +88,7 @@
rel="nofollow noopener noreferrer"
class="is-flex is-align-items-center">
{{ item.name }}
<NeoIcon
icon="arrow-up-right"
class="ml-1 has-text-grey"
pack="fas" />
<NeoIcon icon="arrow-up-right" class="ml-1 has-text-grey" />
</a>
<nuxt-link v-else :to="item.url">
{{ item.name }}
Expand Down Expand Up @@ -148,7 +139,7 @@

<NeoIcon
v-else
:pack="item.name == 'Swag' ? 'fas' : 'fab'"
:pack="item.name == 'Swag' ? 'fasr' : 'fab'"
:icon="item.icon" />
</a>
</li>
Expand Down
1 change: 0 additions & 1 deletion components/base/SubmitButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
:disabled="disabled"
:loading="loading"
:expanded="expanded"
icon-pack="far"
outlined
@click.native="$emit('click')">
<slot>
Expand Down
2 changes: 1 addition & 1 deletion components/blog/BlogPost.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div v-if="attributes.title" class="article">
<div class="is-flex is-align-items-center has-text-grey is-size-5 mb-1">
<nuxt-link class="has-text-grey" to="/blog">{{ $t('blog') }}</nuxt-link>
<NeoIcon icon="chevron-right" pack="far" class="mx-5" />
<NeoIcon icon="chevron-right" class="mx-5" />
<span>{{ attributes.title?.slice(0, 15) }}...</span>
</div>
<h1>{{ attributes.title }}</h1>
Expand Down
9 changes: 9 additions & 0 deletions components/carousel/utils/useCarouselSpotlight.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@ const curatedCollection = {
'7092505797a30ccf48-NEON BABES', // Neon Babes
'B9F14D738824A41D42-TOKUNFT', // Toku NFT
],
ahk: [
'150', // MyGenArt
'134', // Rad Panda
'132', // Experience the scenic canyon drive
'136', // Emotional Devastation
'148', // threads (koda)
'138', // Season 23
'131', // Forgive me not
],
}

type Collections = CarouselNFT & SomethingWithMeta
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ const displayedFlippers = computed(() => flippers.value.slice(0, offset.value))
// map of flipper id to bolean, is the NFT details section of that flipper open or nor
// {id0: false, id1: true, id3: false, ...}
const isFlipperMoreNFTSectionOpen = flippers.value.reduce(
// eslint-disable-next-line @typescript-eslint/no-unused-vars
(accumelator, [flipperId, _]) => ({
...accumelator,
[flipperId]: false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ const displayedHolders = computed(() => holders.value.slice(0, offset.value))
// {id0: false, id1: true, id3: false, ...}
const isNFTDetailsOpen = ref(
holders.value.reduce(
// eslint-disable-next-line @typescript-eslint/no-unused-vars
(isOpen, [holderId, _]) => ({
...isOpen,
[holderId]: false,
Expand Down
1 change: 0 additions & 1 deletion components/collection/unlockable/UnlockableLoader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
variant="text"
no-shadow
icon="xmark"
icon-pack="fa-sharp"
size="medium"
@click.native="closeLoading" />
<img src="/unlockable-loader.svg" />
Expand Down
6 changes: 0 additions & 6 deletions components/collection/unlockable/UnlockableSchedule.vue
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,6 @@
</template>

<script lang="ts" setup>
import { isAfter, isBefore } from 'date-fns'

const phaseList = ref<
{
title: string
Expand Down Expand Up @@ -158,10 +156,6 @@ const getStatusName = (status: 'close' | 'open' | 'upcoming') => {
return 'Upcoming'
}
}

const isActive = (from: Date, to: Date) => {
const now = new Date(Date.now())
}
</script>

<style lang="scss" scoped>
Expand Down
10 changes: 5 additions & 5 deletions components/collection/voteDrop/DropContainer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
:label="buttonLabel"
@click.native="handleMint" />
<div class="is-flex is-align-items-center mt-2">
<NeoIcon icon="timer" pak="far" class="mr-2" />
<NeoIcon icon="timer" class="mr-2" />
{{ leftTime }}
</div>
</div>
Expand All @@ -91,7 +91,7 @@
class="column is-half-desktop is-flex is-flex-direction-column is-justify-content-center order-1">
<div
class="is-flex is-align-items-center has-text-weight-bold is-size-6 mb-2">
<NeoIcon icon="unlock" class="mr-2" pack="far" />
<NeoIcon icon="unlock" class="mr-2" />
{{ $t('mint.unlockable.howItemWork') }}
</div>
<div>
Expand Down Expand Up @@ -186,21 +186,21 @@ const statusInformation = computed(() => {
icon: 'circle-info',
iconClass: 'has-text-grey',
labelClass: 'has-text-grey',
iconPack: 'far',
iconPack: 'fasr',
}
: isEligibleUser.value
? {
label: $i18n.t('mint.unlockable.eligible'),
icon: 'circle-check',
iconPack: 'fas',
iconPack: 'fasr',
iconClass: 'has-text-success',
}
: {
label: $i18n.t('mint.unlockable.exclusive'),
icon: 'circle-info',
iconClass: 'has-text-grey',
labelClass: 'has-text-grey',
iconPack: 'far',
iconPack: 'fasr',
}
})

Expand Down
2 changes: 1 addition & 1 deletion components/common/ConnectWallet/WalletMenuItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<div
v-if="isAuth && walletAccounts.length === 0"
class="pl-5 pt-2 pb-2 is-flex is-align-items-center auth-tip">
<NeoIcon icon="spinner-third" pack="fad" />
<NeoIcon icon="spinner-third" />
<span class="has-text-grey is-size-7 pl-4">
{{ $i18n.t('walletConnect.authTip') }}
</span>
Expand Down
2 changes: 1 addition & 1 deletion components/common/IdentityForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
:label="$i18n.t('identity.fundsReserve')"
position="bottom"
multiline>
<NeoIcon icon="info-circle" pack="fas" />
<NeoIcon icon="info-circle" />
</NeoTooltip>
</h1>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
variant="text"
no-shadow
icon="xmark"
icon-pack="fa-sharp"
size="medium"
@click.native="onClose" />
</header>
Expand Down
6 changes: 5 additions & 1 deletion components/common/listingCart/ListingCartMini.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
@click.native="listingCartStore.clear">
{{ $t('sort.clearAll') }}
</NeoButton>
<div class="mx-4 divider k-grey" />
<div class="mx-4 divider has-background-k-grey" />
<NeoButton
variant="text"
class="has-text-grey selection-button"
Expand All @@ -43,6 +43,10 @@ import { useListingCartStore } from '@/stores/listingCart'
import { usePreferencesStore } from '@/stores/preferences'
const listingCartStore = useListingCartStore()
const preferencesStore = usePreferencesStore()

onBeforeUnmount(() => {
listingCartStore.clear()
})
</script>
<style scoped lang="scss">
@import '@/styles/abstracts/variables.scss';
Expand Down
4 changes: 2 additions & 2 deletions components/common/listingCart/ListingCartModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ const listingCartStore = useListingCartStore()
const { transaction, isLoading, status } = useTransaction()
const { $i18n } = useNuxtApp()

const { chainSymbol } = useChain()
const { chainSymbol, decimals } = useChain()

const defaultCartData = {
fixedPrice: undefined,
Expand Down Expand Up @@ -166,7 +166,7 @@ async function confirm() {
Boolean(item.listPrice)
)
.map((item) => ({
price: String(calculateBalance(item.listPrice)),
price: String(calculateBalance(item.listPrice, decimals.value)),
nftId: item.id,
})) as TokenToList[]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
import ListingCartPriceInput from '../shared/ListingCartPriceInput.vue'
import { NeoButton } from '@kodadot1/brick'
import { ListCartItem, useListingCartStore } from '@/stores/listingCart'
import { formatBalance } from '@polkadot/util'
import formatBalance from '@/utils/format/balance'
import ListingCartItemDetails from '../shared/ListingCartItemDetails.vue'
const { decimals, chainSymbol } = useChain()

Expand All @@ -45,9 +45,6 @@ const props = defineProps<{
}>()

const floor = computed(() =>
formatBalance(props.nft.collection.floor, {
decimals: decimals.value,
withUnit: chainSymbol.value,
})
formatBalance(props.nft.collection.floor, decimals.value, chainSymbol.value)
)
</script>
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import { useListingCartStore } from '@/stores/listingCart'
import ListingCartItemDetails from '../shared/ListingCartItemDetails.vue'
import ListingCartFloorPrice from '../shared/ListingCartFloorPrice.vue'
import ListingCartPriceInput from '../shared/ListingCartPriceInput.vue'
import { formatBalance } from '@polkadot/util'
import formatBalance from '@/utils/format/balance'

const emit = defineEmits([
'update:fixedPrice',
Expand Down Expand Up @@ -73,12 +73,7 @@ const collectionPrice = computed(() =>
)

const formatWithBlank = (value: number) => {
return value
? formatBalance(value, {
decimals: decimals.value,
withUnit: chainSymbol.value,
})
: '--'
return value ? formatBalance(value, decimals.value, chainSymbol.value) : '--'
}

watch(
Expand Down
1 change: 0 additions & 1 deletion components/common/shoppingCart/ShoppingCartItemRow.vue
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
class="inherit-background-color"
no-shadow
icon="trash"
icon-pack="far"
@click.native="emit('delete', nft.id)" />
</div>
</div>
Expand Down
8 changes: 6 additions & 2 deletions components/common/shoppingCart/ShoppingCartModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ const items = computed(() =>
)

const emptyCartPlaceholder = computed(() =>
isDarkMode.value ? '/cart/empty-cart-dark.png' : '/cart/empty-cart.png'
isDarkMode.value ? '/cart/empty-cart-dark.svg' : '/cart/empty-cart.svg'
)

const numberOfItems = computed(() => items.value.length)
Expand Down Expand Up @@ -159,8 +159,12 @@ const openCompletePurcahseModal = () => {
}

const onCompletePurchase = () => {
doAfterLogin({ onLoginSuccess: openCompletePurcahseModal })
closeShoppingCart()

// fix: scroll clip mode not working
setTimeout(() => {
doAfterLogin({ onLoginSuccess: openCompletePurcahseModal })
}, 100)
}
</script>

Expand Down
4 changes: 1 addition & 3 deletions components/create/CreateCollection.vue
Original file line number Diff line number Diff line change
Expand Up @@ -204,9 +204,7 @@ const unlimited = ref(true)
const max = ref(1)
const symbol = ref('')

const menus = availablePrefixes().filter(
(menu) => menu.value !== 'movr' && menu.value !== 'glmr'
)
const menus = availablePrefixes()
const chainByPrefix = menus.find((menu) => menu.value === urlPrefix.value)
const selectBlockchain = ref(chainByPrefix?.value || menus[0].value)

Expand Down
2 changes: 1 addition & 1 deletion components/drops/TimeTag.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
class="tag-container is-flex border py-1 px-2 is-justify-content-space-between is-align-items-center">
<div class="image is-24x24 has-text-centered">
<img v-if="isMintingLive" src="/drop/unlockable-pulse.svg" />
<NeoIcon v-else icon="calendar-day" pack="far" variant="k-grey" />
<NeoIcon v-else icon="calendar-day" variant="k-grey" />
</div>

<span class="pr-1">{{ displayText }}</span>
Expand Down
1 change: 0 additions & 1 deletion components/explore/FilterMenuButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
@click="toggleSidebarFilters">
<NeoIcon
:icon="isSidebarFiltersOpen && !disabled ? 'times' : 'bars'"
pack="fa-sharp"
size="medium" />
</a>
<div class="is-hidden-tablet is-relative">
Expand Down
1 change: 0 additions & 1 deletion components/generative/GenerativeMintForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ import {
filmTypes,
framing,
gender,
inspiredBy,
lights,
styles,
} from './options'
Expand Down
2 changes: 1 addition & 1 deletion components/generative/ImageSelectGrid.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const handleSelectImage = (image: string) => {
emit('select', image)
}

const props = defineProps<{
defineProps<{
predicion: PredictionStatus
selected: string
}>()
Expand Down
2 changes: 1 addition & 1 deletion components/generative/promptBuilder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ export const buildMetadata = async (
): Promise<string> => {
const blob: Blob = await $fetch(url, { responseType: 'blob' })
const file = new File([blob], 'image.png', { type: 'image/png' })
const imageHash = await pinImageSafe(file, 'token')
const imageHash = await pinImageSafe(file)
const attributes = buildAttributes(options)
const description = buildDescription(options)
const name = `${NAME} ${options.gender}`
Expand Down
Loading