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

Merged
merged 101 commits into from
Sep 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
101 commits
Select commit Hold shift + click to select a range
536624b
refactor: unify create nft page
preschian Sep 7, 2023
cd368ba
Merge branch 'main' of github.com:kodadot/nft-gallery into refactor/u…
preschian Sep 7, 2023
3de759d
fix: retry for nft id
preschian Sep 7, 2023
950a9e7
style: mobile padding
preschian Sep 7, 2023
7e81bad
chore: add chainDecimals
preschian Sep 7, 2023
979b631
feat: create landing page
preschian Sep 7, 2023
a576a4c
feat: image preview
preschian Sep 7, 2023
c2833a6
refactor: replace existing pages
preschian Sep 7, 2023
97ea17b
chore: text
preschian Sep 7, 2023
d725651
style: width
preschian Sep 7, 2023
461620d
Merge branch 'main' of github.com:kodadot/nft-gallery into refactor/u…
preschian Sep 12, 2023
a409b86
chore: global styles, unused loading, computed, and watch
preschian Sep 12, 2023
4b0509d
chore: decimals
preschian Sep 12, 2023
a17cb8d
chore: hide preview on touch and number on translations
preschian Sep 12, 2023
672d296
fix: rmrk2 endpoint
preschian Sep 12, 2023
6ae515f
styles: mobile version
preschian Sep 12, 2023
7e03252
style: on sale
preschian Sep 14, 2023
9b79ef3
Merge branch 'main' of github.com:kodadot/nft-gallery into refactor/u…
preschian Sep 14, 2023
70a2946
add: basic player
hassnian Sep 15, 2023
41ac9d5
ref: variable rename
hassnian Sep 16, 2023
dd2a86c
added: border-icon button variant
hassnian Sep 16, 2023
37de09a
add: gallery item player cover
hassnian Sep 16, 2023
f168f2a
add: neo audio player loading state
hassnian Sep 16, 2023
9c1ade1
remove: waveform comments
hassnian Sep 16, 2023
7bffdcc
ref: audio cover and added play on hover
hassnian Sep 17, 2023
fb74f82
remove: comment
hassnian Sep 17, 2023
dd0130f
add: shorter hover card hover duration
hassnian Sep 17, 2023
5595ff9
fix: make sure play is not running when pause
hassnian Sep 17, 2023
5890103
fix: remove first 0 of timer
hassnian Sep 17, 2023
887fe15
remove: log
hassnian Sep 17, 2023
388659c
fix: prop
hassnian Sep 17, 2023
c25c9d7
add: icon More From This Collection
hassnian Sep 17, 2023
146a619
ref: renamed useNftCardIcon
hassnian Sep 17, 2023
144ba69
ref: Promise executor should not be async
hassnian Sep 17, 2023
c4473b0
remove: unsued clear
hassnian Sep 17, 2023
e61a67b
fix: make sure play() and pause() dont' overlap
hassnian Sep 18, 2023
5127ca6
fix: rejects with error
hassnian Sep 18, 2023
d9c8d6e
ref: moved loading inside promise
hassnian Sep 18, 2023
ac164da
fix: return reject
hassnian Sep 18, 2023
07fc76d
fix: inversed volume icon
hassnian Sep 19, 2023
748820a
fix: rounded icon hover effect
hassnian Sep 19, 2023
8c4df00
fix: audio overlaps gallery item Carousel Item
hassnian Sep 19, 2023
52e31c6
fix: dont overlap audios using events
hassnian Sep 19, 2023
2325d60
Merge branch 'main' into issue-5228
hassnian Sep 19, 2023
d931de4
remove: audioMedia ref
hassnian Sep 19, 2023
ffa20b7
styles: move styles to `@/styles/pages/create.scss`
preschian Sep 19, 2023
522855d
styles: adjust some padding/margin
preschian Sep 19, 2023
f8ca885
chore: ref to github issue
preschian Sep 19, 2023
c7e0682
Merge branch 'main' of github.com:kodadot/nft-gallery into refactor/u…
preschian Sep 19, 2023
176d322
fix: collectionForMint for rmrk
preschian Sep 25, 2023
7413877
Merge branch 'main' of github.com:kodadot/nft-gallery into refactor/u…
preschian Sep 25, 2023
93b22bd
fix: ksm symbol on price on basilisk
preschian Sep 25, 2023
d6abad3
fix: reactive collection based on accountId
preschian Sep 25, 2023
c73cf29
chore: text on deposit
preschian Sep 25, 2023
e9c228d
fix: use query instead
preschian Sep 25, 2023
2b3f6d6
fix: somehow neofield sale broken
preschian Sep 25, 2023
c147be4
feat: clear identity
Jarsen136 Sep 25, 2023
fb3df59
fix: deep scan issue
Jarsen136 Sep 25, 2023
f3a191a
fix: border button
Jarsen136 Sep 25, 2023
7e9f06d
fix: clear button
Jarsen136 Sep 25, 2023
fda7f2b
#7337 round price
prachi00 Sep 26, 2023
119ff1d
enable list cart on more pages
daiagi Sep 26, 2023
6eca9dd
fix: style for clear button
Jarsen136 Sep 26, 2023
ed8e6b2
Merge branch 'main' into issue-7328
Jarsen136 Sep 26, 2023
5e5976e
refactor: separate functions
Jarsen136 Sep 26, 2023
b70cc40
Merge branch 'main' into issue-7328
Jarsen136 Sep 26, 2023
88a97d5
[skip netlify] Update Bumped minor version of packages
renovate[bot] Sep 27, 2023
7d798b5
fix: listed nft on remark
preschian Sep 27, 2023
29b5793
chore: remove console.log
preschian Sep 27, 2023
6c288e3
styles: box color
preschian Sep 27, 2023
c22afd7
Merge branch 'main' of github.com:kodadot/nft-gallery into refactor/u…
preschian Sep 27, 2023
70a2683
Merge pull request #7352 from kodadot/renovate/bumped-minor-version-o…
yangwao Sep 27, 2023
83b80c1
Merge branch 'main' into enable-listing-cart-on-explore-items-and-col…
daiagi Sep 27, 2023
6a71a18
styles: seo url, font-size and icon
preschian Sep 27, 2023
f46b73e
Update styles/global.scss
vikiival Sep 27, 2023
497e36e
Merge pull request #7208 from kodadot/refactor/unify-create-nft-page
yangwao Sep 27, 2023
57a67dd
fix: Error on stick indexer on explorer items with ticked collection
Jarsen136 Sep 27, 2023
866ce39
fix: Not connected wallet collection selection
Jarsen136 Sep 27, 2023
1e2fb01
fix: incorrect token symbol in search suggestion
Jarsen136 Sep 27, 2023
e9407fa
feat: unify collection choose
Jarsen136 Sep 27, 2023
8699613
refactor: move ChooseCollectionDropdown component
Jarsen136 Sep 27, 2023
80d21d0
fix: button label
Jarsen136 Sep 27, 2023
e2d31bd
fix: create test fail
Jarsen136 Sep 28, 2023
273cd89
fix: shadown config for dropdown component
Jarsen136 Sep 28, 2023
09c9001
Merge branch 'main' into issue-5228
hassnian Sep 28, 2023
b90954c
fix: added missing composable import
hassnian Sep 28, 2023
c3150c5
fix: Promise.allSettled
hassnian Sep 28, 2023
1d7313d
Merge pull request #7367 from kodadot/enable-listing-cart-on-explore-…
yangwao Sep 28, 2023
b5eb40c
Merge pull request #7365 from prachi00/feat-round-price
yangwao Sep 28, 2023
977856a
Merge pull request #7385 from Jarsen136/issue-7379
yangwao Sep 28, 2023
366483b
Merge pull request #7388 from Jarsen136/issue-7387
yangwao Sep 28, 2023
690006e
Merge pull request #7275 from hassnian/issue-5228
yangwao Sep 28, 2023
14fae3f
Merge pull request #7361 from Jarsen136/issue-7328
yangwao Sep 28, 2023
ffc767b
Merge pull request #7386 from Jarsen136/issue-7382
yangwao Sep 28, 2023
da86358
fix: allow to change valid polkadot addresses
hassnian Sep 29, 2023
22be845
fix: Rename Transfer Page Chain names
Jarsen136 Sep 29, 2023
8b8aa6d
ref: move to util file
hassnian Sep 29, 2023
9b53dc7
Merge pull request #7409 from Jarsen136/issue-7401
yangwao Sep 29, 2023
89dc314
Merge pull request #7408 from hassnian/issue-7405
yangwao Sep 29, 2023
addd07a
:wrench: speck prod
vikiival Sep 30, 2023
1b438c0
Merge pull request #7423 from kodadot/make-speck-prod
vikiival Sep 30, 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
2 changes: 1 addition & 1 deletion components/bsx/Create/RoyaltyForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const { accountId } = useAuth()

const props = defineProps({
amount: {
type: Number,
type: [Number, String],
required: true,
},
address: {
Expand Down
18 changes: 17 additions & 1 deletion components/carousel/module/CarouselMedia.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,18 @@
:to="urlOf({ id: item.id, url, chain: item.chain })"
:aria-label="`slide ${index + 1} of ${length}`"
rel="nofollow">
<img
v-if="showCardIcon"
class="card-icon"
:src="cardIcon"
alt="Card Icon" />
<MediaItem
class="carousel-media-wrapper"
:src="imageSrc || ''"
:animation-src="item.animationUrl || ''"
:title="item.name" />
:title="item.name"
:audio-player-cover="imageSrc || ''"
audio-hover-on-cover-play />
</nuxt-link>
</div>
</template>
Expand All @@ -35,6 +42,7 @@ const isCollection = inject('isCollection', false)

const { urlPrefix } = usePrefix()
const imageSrc = ref(props.item.image)
const { showCardIcon, cardIcon } = useNftCardIcon(computed(() => props.item))

onMounted(async () => {
if (!props.item.image) {
Expand All @@ -43,3 +51,11 @@ onMounted(async () => {
}
})
</script>
<style lang="scss" scoped>
.card-icon {
position: absolute;
top: 1rem;
right: 1rem;
z-index: 1;
}
</style>
Original file line number Diff line number Diff line change
@@ -1,14 +1,26 @@
<template>
<NeoDropdown class="dropdown-width" :disabled="!isLogIn">
<NeoDropdown
required
:class="[
'dropdown-width',
{
'full-width': fullWidth,
'no-shadow': noShadow,
},
]"
:no-shadow="noShadow"
:disabled="!isLogIn">
<template #trigger="{ active }">
<NeoButton
v-if="!selectedCollection"
class="dropdown-width"
:no-shadow="noShadow"
:label="$t('massmint.selectCollection')"
:icon="active ? 'chevron-up' : 'chevron-down'" />
<NeoButton
v-else
class="dropdown-width"
:no-shadow="noShadow"
:icon="active ? 'chevron-up' : 'chevron-down'">
{{ selectedCollection.name || selectedCollection.id }}
<NeoIcon
Expand All @@ -25,10 +37,10 @@
:key="collection.id"
class="dropdown-width"
@click.native="selectCollection(collection)">
{{ collection.name || collection.id }}
{{ collection.name || collection.id }} - ({{ collection.totalCount }})
</NeoDropdownItem>
<NeoDropdownItem class="dropdown-width">
<nuxt-link :to="`/${urlPrefix}/create`" class="w-full">
<nuxt-link to="/create/collection" class="w-full">
<div class="w-full">
<NeoIcon icon="plus" class="mr-1" />
{{ $t('massmint.createNewCollection') }}
Expand All @@ -41,7 +53,7 @@
{{ $t('massmint.noCollection') }}
</NeoDropdownItem>
<NeoDropdownItem class="dropdown-width">
<nuxt-link :to="`/${urlPrefix}/create`" class="w-full">
<nuxt-link to="/create/collection" class="w-full">
<div class="w-full">
<NeoIcon icon="plus" class="mr-1" />
{{ $t('massmint.createNewCollection') }}
Expand All @@ -62,7 +74,11 @@ import {
import { MintedCollection } from '@/composables/transaction/types'
import { useCollectionForMint } from '@/composables/massmint/useMassMint'

const { urlPrefix } = usePrefix()
defineProps({
fullWidth: { type: Boolean, default: false },
noShadow: { type: Boolean, default: false },
})

const { isLogIn, accountId } = useAuth()

const { collectionsEntites } = useCollectionForMint()
Expand All @@ -85,6 +101,14 @@ const selectCollection = (collection) => {
width: 30rem;
}

.full-width {
width: 100%;
.dropdown-width,
:deep(.o-drop__menu) {
width: 100%;
}
}

@include mobile {
.dropdown-width {
width: 100%;
Expand Down
90 changes: 67 additions & 23 deletions components/common/IdentityForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Loader v-model="isLoading" :status="status" />
<form @submit.prevent>
<h1 class="title is-size-3">
{{ $i18n.t('identity.set') }}
{{ $i18n.t('identity.set', [getChainName(identityPrefix)]) }}
<NeoTooltip
:label="$i18n.t('identity.fundsReserve')"
position="bottom"
Expand All @@ -12,11 +12,31 @@
</NeoTooltip>
</h1>

<p v-if="accountId" class="subtitle is-size-6">
<Auth />
<span>{{ $i18n.t('general.balance') }}: </span>
<Money :value="balance" inline />
</p>
<div v-if="hasIdentity" class="is-size-6">
<hr class="my-7" />
<div class="mb-4">
{{ $t('identity.establishedIdentity') }}
</div>
<div
class="is-flex is-justify-content-space-between is-align-items-flex-end">
<div
class="is-flex is-justify-content-space-between is-align-items-center">
<Avatar :value="accountId" :size="34" />
<div class="ml-4">
<div class="has-text-grey">{{ $t('identity.existing') }}</div>
<div>{{ identityData.display }}</div>
</div>
</div>
<NeoButton
:label="$i18n.t('identity.clear')"
class="mb-1"
no-shadow
rounded
size="small"
@click.native="deleteIdentity" />
</div>
<hr class="my-7" />
</div>

<NeoField label="Handle">
<NeoInput
Expand Down Expand Up @@ -73,16 +93,15 @@
:disabled="disabled"
:loading="isLoading"
expanded
@click="submit" />
@click="setIdentity" />
</form>
</section>
</template>

<script lang="ts" setup>
import { notificationTypes, showNotification } from '@/utils/notification'
import { NeoField, NeoIcon, NeoInput, NeoTooltip } from '@kodadot1/brick'
import { NeoButton, NeoField, NeoInput } from '@kodadot1/brick'
import type { IdentityFields } from '@/composables/useIdentity'
const Auth = defineAsyncComponent(() => import('@/components/shared/Auth.vue'))
const BasicInput = defineAsyncComponent(
() => import('@/components/shared/form/BasicInput.vue')
)
Expand All @@ -98,9 +117,9 @@ const SubmitButton = defineAsyncComponent(

const { $i18n } = useNuxtApp()
import { useIdentityStore } from '@/stores/identity'
import { getChainName } from '@/utils/chain'

const { apiInstance } = useApi()
const { accountId, balance } = useAuth()
const { accountId } = useAuth()
const { urlPrefix } = usePrefix()
const identityStore = useIdentityStore()
const { howAboutToExecute, isLoading, initTransactionLoader, status } =
Expand All @@ -109,7 +128,12 @@ const identity = ref<IdentityFields>({})
const deposit = ref('0')
const inputLengthLimit = ref(32)

const { identity: identityData } = useIdentity({
const {
identity: identityData,
identityApi,
identityPrefix,
refetchIdentity,
} = useIdentity({
address: accountId,
})

Expand All @@ -125,6 +149,14 @@ watch(identityData, () => {
}
})

const hasIdentity = computed(() => {
const { display, legal, web, twitter, riot, email } = identityData.value
return (
accountId.value &&
Boolean(display || legal || web || twitter || riot || email)
)
})

const handleUrlPrefixChange = async () => {
deposit.value = await fetchDeposit()

Expand All @@ -147,23 +179,35 @@ const enhanceIdentityData = (): Record<string, any> => {
}

const fetchDeposit = async () => {
const api = await apiInstance.value
const api = await identityApi.value
return api.consts.identity?.basicDeposit?.toString()
}

const submit = async (): Promise<void> => {
const api = await apiInstance.value
const deleteIdentity = async (): Promise<void> => {
const api = await identityApi.value
initTransactionLoader()
const cb = api.tx.identity.clearIdentity
howAboutToExecute(accountId.value, cb, [], (block: string) => {
identity.value = {}
refetchIdentity()

showNotification(
`[Identity] You have cleared your account's identity since block ${block}`,
notificationTypes.success
)
})
}
const setIdentity = async (): Promise<void> => {
const api = await identityApi.value
initTransactionLoader()
const cb = api.tx.identity.setIdentity
const args = [enhanceIdentityData()]
howAboutToExecute(accountId.value, cb, args, onSuccess)
}

const onSuccess = (block: string) => {
showNotification(
`[Identity] You are known as ${identity.value.display} since block ${block}`,
notificationTypes.success
)
howAboutToExecute(accountId.value, cb, args, (block: string) => {
showNotification(
`[Identity] You are known as ${identity.value.display} since block ${block}`,
notificationTypes.success
)
})
}

const disabled = computed(
Expand Down
Loading