diff --git a/components/TheFooter.vue b/components/TheFooter.vue index 423fbe67dc..d7c574f9fc 100644 --- a/components/TheFooter.vue +++ b/components/TheFooter.vue @@ -241,7 +241,7 @@ const socials = [ { name: 'Twitter', url: 'https://twitter.com/KodaDot', - icon: 'twitter', + icon: 'x-twitter', }, { name: 'Discord', diff --git a/components/collection/HeroButtons.vue b/components/collection/HeroButtons.vue index f4b7b3f776..3088046984 100644 --- a/components/collection/HeroButtons.vue +++ b/components/collection/HeroButtons.vue @@ -5,7 +5,7 @@
diff --git a/components/common/ChainDropdown.vue b/components/common/ChainDropdown.vue index 137b1f9bbc..9765fe3603 100644 --- a/components/common/ChainDropdown.vue +++ b/components/common/ChainDropdown.vue @@ -32,6 +32,9 @@ const { setUrlPrefix } = usePrefix() const { availableChains } = useChain() const getAddress = (chain: string) => { + if (!accountId.value) { + return '' + } const publicKey = decodeAddress(accountId.value) return encodeAddress(publicKey, CHAINS[chain].ss58Format) diff --git a/components/common/ConnectWallet/ConnectWalletModal.vue b/components/common/ConnectWallet/ConnectWalletModal.vue index 354f6c7b4c..c9ea072752 100644 --- a/components/common/ConnectWallet/ConnectWalletModal.vue +++ b/components/common/ConnectWallet/ConnectWalletModal.vue @@ -8,9 +8,13 @@ : $i18n.t('walletConnect.walletHeading') }} - - - +
diff --git a/components/common/NotificationBox/NotificationBoxModal.vue b/components/common/NotificationBox/NotificationBoxModal.vue index 8d814105b1..3667a30b64 100644 --- a/components/common/NotificationBox/NotificationBoxModal.vue +++ b/components/common/NotificationBox/NotificationBoxModal.vue @@ -3,13 +3,17 @@ v-if="isOpen" class="notification-modal-container theme-background-color border-left is-flex is-flex-direction-column">
+ class="py-5 px-6 is-flex is-justify-content-space-between border-bottom mb-4"> {{ $t('notification.notifications') }} - - - +
diff --git a/components/common/shoppingCart/ShoppingCartModal.vue b/components/common/shoppingCart/ShoppingCartModal.vue index e78d813ff7..9cd9bc53f1 100644 --- a/components/common/shoppingCart/ShoppingCartModal.vue +++ b/components/common/shoppingCart/ShoppingCartModal.vue @@ -3,14 +3,16 @@
+ class="py-5 px-6 is-flex is-justify-content-space-between border-bottom"> {{ $t('shoppingCart.title') }}
- +
diff --git a/components/identity/module/IdentitySocial.vue b/components/identity/module/IdentitySocial.vue index fe037de0c1..fc35e959e7 100644 --- a/components/identity/module/IdentitySocial.vue +++ b/components/identity/module/IdentitySocial.vue @@ -5,7 +5,7 @@ v-safe-href="`https://twitter.com/${twitter}`" target="_blank" rel="nofollow noopener noreferrer"> - + {{ twitter }} diff --git a/components/items/ItemsGrid/useItemsGrid.ts b/components/items/ItemsGrid/useItemsGrid.ts index 962f122d96..bb923af48b 100644 --- a/components/items/ItemsGrid/useItemsGrid.ts +++ b/components/items/ItemsGrid/useItemsGrid.ts @@ -53,25 +53,12 @@ export function useFetchSearch({ } } - const variables = search - ? { - search, - first: first.value, - offset: (page - 1) * first.value, - orderBy: route.query.sort?.length - ? route.query.sort - : ['blockNumber_DESC'], - } + const variables = search?.length + ? { search } : { - denyList: getDenyList(urlPrefix.value), - orderBy: route.query.sort?.length - ? route.query.sort - : ['blockNumber_DESC'], search: searchParams.value, priceMin: Number(route.query.min), priceMax: Number(route.query.max), - first: first.value, - offset: (page - 1) * first.value, } const queryPath = getQueryPath(client.value) @@ -79,7 +66,15 @@ export function useFetchSearch({ const result = await $apollo.query({ query: query.default, client: client.value, - variables: variables, + variables: { + ...variables, + first: first.value, + offset: (page - 1) * first.value, + denyList: getDenyList(urlPrefix.value), + orderBy: route.query.sort?.length + ? route.query.sort + : ['blockNumber_DESC'], + }, }) // handle results diff --git a/composables/massmint/useZipValidator.ts b/composables/massmint/useZipValidator.ts index 411adc7b25..fb15df6270 100644 --- a/composables/massmint/useZipValidator.ts +++ b/composables/massmint/useZipValidator.ts @@ -1,6 +1,7 @@ import { ref } from 'vue' import { ZipEntry, unzip } from 'unzipit' import { MAX_UPLOADED_FILE_SIZE } from '@/utils/constants' +import { mimeTypes } from '@kodadot1/static' export interface FileObject { imageUrl: string file: File @@ -37,26 +38,6 @@ export const validFormats = [ 'mp3', 'json', ] -export const mimeTypes: { [key: string]: string } = { - bmp: 'image/bmp', - gif: 'image/gif', - jpg: 'image/jpeg', - jpeg: 'image/jpeg', - png: 'image/png', - svg: 'image/svg+xml', - tiff: 'image/tiff', - webp: 'image/webp', - mp4: 'video/mp4', - ogv: 'video/ogg', - mov: 'video/quicktime', - qt: 'video/quicktime', - webm: 'video/webm', - glb: 'model/gltf-binary', - gltf: 'model/gltf+json', - flac: 'audio/flac', - mp3: 'audio/mpeg', - json: 'application/json', -} const toMegaBytes = (bytes: number) => bytes / Math.pow(1024, 2) diff --git a/package.json b/package.json index 68d9960f97..ef319d2b29 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "@braintree/sanitize-url": "^6.0.4", "@chenfengyuan/vue-qrcode": "1", "@fortawesome/fontawesome-svg-core": "^6.2.1", - "@fortawesome/free-brands-svg-icons": "^6.2.1", + "@fortawesome/free-brands-svg-icons": "^6.4.2", "@fortawesome/free-regular-svg-icons": "^6.2.1", "@fortawesome/free-solid-svg-icons": "^6.2.1", "@fortawesome/vue-fontawesome": "^2.0.10", diff --git a/pages/blog/index.vue b/pages/blog/index.vue index d7be8900f7..e683885758 100644 --- a/pages/blog/index.vue +++ b/pages/blog/index.vue @@ -12,7 +12,7 @@