From 417570e7494cc5ecdfb966c6399bba45b95bbb0c Mon Sep 17 00:00:00 2001 From: roiLeo Date: Tue, 4 Jul 2023 09:59:58 +0200 Subject: [PATCH 01/28] =?UTF-8?q?=F0=9F=94=A7=20migrate=20b-navbar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/Navbar.vue | 302 +++++++++++---------- components/navbar/CreateDropdown.vue | 32 +-- components/navbar/MobileLanguageOption.vue | 11 +- 3 files changed, 184 insertions(+), 161 deletions(-) diff --git a/components/Navbar.vue b/components/Navbar.vue index c6e08dd33d..64e5616f7c 100644 --- a/components/Navbar.vue +++ b/components/Navbar.vue @@ -1,149 +1,172 @@ From 285e95151d0369925884448075e73ff254dfec5f Mon Sep 17 00:00:00 2001 From: roiLeo Date: Wed, 5 Jul 2023 17:35:45 +0200 Subject: [PATCH 08/28] =?UTF-8?q?=F0=9F=94=A7=20navbar=20open/close?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/Navbar.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/components/Navbar.vue b/components/Navbar.vue index 9fe476c5e4..481798a5c4 100644 --- a/components/Navbar.vue +++ b/components/Navbar.vue @@ -19,9 +19,9 @@
+ @click="closeBurgerMenu"> - + @@ -211,7 +214,12 @@ import { Component, Ref, Watch, mixins } from 'nuxt-property-decorator' import Vue from 'vue' import { unwrapSafe } from '@/utils/uniquery' import NFTUtils, { MintType } from '../service/NftUtils' -import { NFT, NFTMetadata, SimpleNFT, getNftId } from '../service/scheme' +import { + NFTMetadata, + RmrkCreatedNft, + SimpleNFT, + toNFTId, +} from '../service/scheme' import { MediaType } from '../types' import { resolveMedia } from '../utils' import AuthMixin from '~/utils/mixins/authMixin' @@ -506,6 +514,7 @@ export default class SimpleMint extends mixins( this.isLoading = true this.status = 'loader.ipfs' const { accountId, version } = this + this.rmrkMint.max = Number(this.rmrkMint.max) const api = await this.useApi() const toRemark = mapAsSystemRemark(api) @@ -589,7 +598,7 @@ export default class SimpleMint extends mixins( } protected async sendBatch( - remarks: NFT[], + remarks: RmrkCreatedNft[], originalBlockNumber: string ): Promise { try { @@ -600,7 +609,7 @@ export default class SimpleMint extends mixins( const onlyNfts = remarks .filter(NFTUtils.isNFT) - .map((nft) => ({ ...nft, id: getNftId(nft, originalBlockNumber) })) + .map((nft) => ({ ...nft, id: toNFTId(nft, originalBlockNumber) })) // .map(nft => // NFTUtils.createInteraction('SEND', version, nft.id, String(price)) // ) @@ -616,10 +625,7 @@ export default class SimpleMint extends mixins( addresses, this.distribution, this.random ? shuffleFunction(await this.fetchRandomSeed()) : undefined - )( - onlyNfts.map((nft) => nft.id), - this.version - ) + )(onlyNfts.map((nft) => nft.id)) const restOfTheRemarks = onlyNfts.length > addresses.length && this.price ? onlyNfts @@ -702,9 +708,12 @@ export default class SimpleMint extends mixins( this.isLoading = false } - public async listForSale(remarks: NFT[], originalBlockNumber: string) { + public async listForSale( + remarks: RmrkCreatedNft[], + originalBlockNumber: string + ) { try { - const { price, version } = this + const { price } = this showNotification( `[APP] Listing NFT to sale for ${formatBalance(price, { decimals: this.decimals, @@ -714,9 +723,9 @@ export default class SimpleMint extends mixins( const onlyNfts = remarks .filter(NFTUtils.isNFT) - .map((nft) => ({ ...nft, id: getNftId(nft, originalBlockNumber) })) + .map((nft) => ({ ...nft, id: toNFTId(nft, originalBlockNumber) })) .map((nft) => - createInteraction(Interaction.LIST, version, nft.id, String(price)) + createInteraction(Interaction.LIST, nft.id, String(price)) ) if (!onlyNfts.length) { @@ -835,13 +844,13 @@ export default class SimpleMint extends mixins( return unSanitizeIpfsUrl(metaHash) } - protected navigateToDetail(nft: NFT, blockNumber: string) { + protected navigateToDetail(nft: RmrkCreatedNft, blockNumber: string) { showNotification( `You will go to the detail in ${DETAIL_TIMEOUT / 1000} seconds` ) const go = () => this.$router.push({ - path: `/rmrk/gallery/${getNftId(nft, blockNumber)}`, + path: `/rmrk/gallery/${toNFTId(nft, blockNumber)}`, query: { congratsNft: nft.name }, }) setTimeout(go, DETAIL_TIMEOUT) diff --git a/components/rmrk/service/NftUtils.ts b/components/rmrk/service/NftUtils.ts index 7d878678b9..35c38a096f 100644 --- a/components/rmrk/service/NftUtils.ts +++ b/components/rmrk/service/NftUtils.ts @@ -1,6 +1,12 @@ import { hexToString, isHex } from '@polkadot/util' import { generateId } from '../service/Consolidator' -import { Collection, NFT, NFTWithMeta, SimpleNFT } from './scheme' +import { + Collection, + NFT, + NFTWithMeta, + RmrkCreatedNft, + SimpleNFT, +} from './scheme' import slugify from 'slugify' import { RmrkWithMetaType } from './scheme' import { upperTrim } from '@kodadot1/minimark/utils' @@ -8,7 +14,7 @@ import { UpdateFunction } from '@kodadot1/minimark/common' export type MintType = { collection: Collection - nfts: NFT[] + nfts: RmrkCreatedNft[] } export const basicUpdateFunction = (name: string, index: number): string => @@ -26,7 +32,7 @@ class NFTUtils { } public static toString( - rmrkType: NFT | Collection, + rmrkType: RmrkCreatedNft | Collection, version = '1.0.0' ): string { if (NFTUtils.isCollection(rmrkType)) { @@ -49,7 +55,7 @@ class NFTUtils { )}` } - public static encodeNFT(nft: NFT, version: string): string { + public static encodeNFT(nft: RmrkCreatedNft, version: string): string { return `RMRK::MINTNFT::${version}::${encodeURIComponent( JSON.stringify(nft) )}` @@ -106,18 +112,15 @@ class NFTUtils { collectionId: string, name: string, metadata: string - ): NFT { + ): RmrkCreatedNft { const instance = upperTrim(name, true) const sn = NFTUtils.nftSerialNumber(index) return { - events: [], name: name.trim(), instance, transferable: 1, collection: collectionId, sn, - _id: '', - id: '', metadata, currentOwner: caller, } @@ -131,7 +134,7 @@ class NFTUtils { metadata: string, offset = 0, updateName?: UpdateFunction - ): NFT[] { + ): RmrkCreatedNft[] { return Array(max) .fill(null) .map((_, i) => @@ -154,13 +157,13 @@ class NFTUtils { } public static isCollection( - object: Collection | NFT | RmrkWithMetaType + object: Collection | RmrkCreatedNft | RmrkWithMetaType ): object is Collection { return 'issuer' in object && 'symbol' in object } public static isNFT( - object: Collection | NFT | RmrkWithMetaType + object: Collection | RmrkCreatedNft | RmrkWithMetaType ): object is NFT | NFTWithMeta { return 'currentOwner' in object && 'instance' in object } diff --git a/components/rmrk/service/scheme.ts b/components/rmrk/service/scheme.ts index b80955969f..7ec446cfa3 100644 --- a/components/rmrk/service/scheme.ts +++ b/components/rmrk/service/scheme.ts @@ -251,6 +251,8 @@ export interface CollectionEvents { } } +export type RmrkCreatedNft = CreatedNFT | CreatedNFTV2 + export const getNftId = ( nft: Pick, blocknumber?: string | number @@ -261,7 +263,7 @@ export const getNftId = ( } export const toNFTId = ( - nft: CreatedNFT | CreatedNFTV2, + nft: RmrkCreatedNft, blocknumber: string | number ): string => { const nftId = Object.prototype.hasOwnProperty.call(nft, 'instance') From 9d06471c2b477aa6d5bd9f45310c21c8263b78d9 Mon Sep 17 00:00:00 2001 From: Luke Fishman Date: Thu, 6 Jul 2023 17:32:57 +0700 Subject: [PATCH 12/28] =?UTF-8?q?=F0=9F=94=A7=20basicImage=20responsive=20?= =?UTF-8?q?to=20src=20props=20changes=20(#6402)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/shared/view/BasicImage.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/components/shared/view/BasicImage.vue b/components/shared/view/BasicImage.vue index c81ed43b23..e198872462 100644 --- a/components/shared/view/BasicImage.vue +++ b/components/shared/view/BasicImage.vue @@ -36,6 +36,10 @@ const props = withDefaults( ) const imageSrc = ref(props.src) + +watchEffect(() => { + imageSrc.value = props.src +}) const loaded = ref(false) const onImageLoad = () => { From cdcb6b2d923afd4869c2367b50f0970396cae192 Mon Sep 17 00:00:00 2001 From: Darshana Prachi <39299315+prachi00@users.noreply.github.com> Date: Thu, 6 Jul 2023 03:34:13 -0700 Subject: [PATCH 13/28] #6369 hover effect on dark mode (#6400) --- libs/ui/src/components/NeoButton/NeoButton.scss | 1 - libs/ui/src/components/NeoDropdown/NeoDropdown.scss | 2 +- libs/ui/src/scss/_theme.scss | 2 +- styles/abstracts/_theme.scss | 2 +- styles/layouts/_main-navigation.scss | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/libs/ui/src/components/NeoButton/NeoButton.scss b/libs/ui/src/components/NeoButton/NeoButton.scss index 79ee13e10b..71217a75f2 100644 --- a/libs/ui/src/components/NeoButton/NeoButton.scss +++ b/libs/ui/src/components/NeoButton/NeoButton.scss @@ -18,7 +18,6 @@ &:hover { @include ktheme() { background: theme('k-accentHover'); - color: theme('black'); } } diff --git a/libs/ui/src/components/NeoDropdown/NeoDropdown.scss b/libs/ui/src/components/NeoDropdown/NeoDropdown.scss index 3385b05107..7784b7daa5 100644 --- a/libs/ui/src/components/NeoDropdown/NeoDropdown.scss +++ b/libs/ui/src/components/NeoDropdown/NeoDropdown.scss @@ -17,7 +17,7 @@ $dropdown-item-hover-background-color: #ffe5f3; .o-drop__item { @include ktheme() { border-bottom: 1px solid theme('border-color'); - color: theme('text-color'); + color: theme('text-color')!important; } &:hover { diff --git a/libs/ui/src/scss/_theme.scss b/libs/ui/src/scss/_theme.scss index 0c27dc9323..1610c48712 100644 --- a/libs/ui/src/scss/_theme.scss +++ b/libs/ui/src/scss/_theme.scss @@ -48,7 +48,7 @@ $themes: ( 'border-color': #ffffff, 'k-accent': #191718, 'k-accentlight': #ffe5f3, - 'k-accentHover': #ff7ac3, + 'k-accentHover': #363234, 'k-accentlight2': #363234, 'k-green': #04af00, 'k-red': #ff5757, diff --git a/styles/abstracts/_theme.scss b/styles/abstracts/_theme.scss index 0c27dc9323..1610c48712 100644 --- a/styles/abstracts/_theme.scss +++ b/styles/abstracts/_theme.scss @@ -48,7 +48,7 @@ $themes: ( 'border-color': #ffffff, 'k-accent': #191718, 'k-accentlight': #ffe5f3, - 'k-accentHover': #ff7ac3, + 'k-accentHover': #363234, 'k-accentlight2': #363234, 'k-green': #04af00, 'k-red': #ff5757, diff --git a/styles/layouts/_main-navigation.scss b/styles/layouts/_main-navigation.scss index f242a57df5..1d77a195a5 100644 --- a/styles/layouts/_main-navigation.scss +++ b/styles/layouts/_main-navigation.scss @@ -86,7 +86,7 @@ @include ktheme() { box-shadow: theme('primary-shadow'); - color: theme('black'); + color: theme('text-color'); background: theme('k-primary'); } } From 25f8c239067418a98ee5c3122d7627337fca8a89 Mon Sep 17 00:00:00 2001 From: roiLeo Date: Thu, 6 Jul 2023 12:58:10 +0200 Subject: [PATCH 14/28] =?UTF-8?q?=F0=9F=94=A7=20toggle=20is-clipped?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/Navbar.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/components/Navbar.vue b/components/Navbar.vue index 481798a5c4..ef598adbc9 100644 --- a/components/Navbar.vue +++ b/components/Navbar.vue @@ -243,6 +243,7 @@ const openWalletConnectModal = (): void => { } const showMobileNavbar = () => { + document.body.classList.toggle('is-clipped') isMobileNavbarOpen.value = !isMobileNavbarOpen.value } From 0d5fd627c37c8e252ed51d372fdf34295dcd99ee Mon Sep 17 00:00:00 2001 From: roiLeo Date: Thu, 6 Jul 2023 13:40:58 +0200 Subject: [PATCH 15/28] =?UTF-8?q?=F0=9F=94=A7=20closeMobileNavbar=20in=20n?= =?UTF-8?q?avbarExplore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/Navbar.vue | 2 +- components/navbar/NavbarExploreOptions.vue | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/components/Navbar.vue b/components/Navbar.vue index ef598adbc9..8ffb7c8fa0 100644 --- a/components/Navbar.vue +++ b/components/Navbar.vue @@ -94,7 +94,7 @@