Skip to content

Commit

Permalink
Merge branch 'main' into neosteps-tailwindcss
Browse files Browse the repository at this point in the history
  • Loading branch information
shashkovdanil authored Dec 16, 2023
2 parents ef8771a + 8fa72c4 commit f1c85ea
Show file tree
Hide file tree
Showing 105 changed files with 2,284 additions and 848 deletions.
7 changes: 1 addition & 6 deletions .github/PULL_REQUEST_TEMPLATE/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,4 @@

## Screenshot 📸

- [ ] My fix has changed **something** on UI; a screenshot is best to understand changes for others.

## Copilot Summary
copilot:summary

copilot:poem
- [ ] My fix has changed **something** on UI; a screenshot is best to understand changes for others.
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,3 @@
## Screenshot 📸

- [ ] My fix has changed UI

## Copilot Summary
copilot:summary

copilot:poem
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,4 @@

## Screenshot 📸

- [ ] My fix has changed UI

## Copilot Summary
copilot:summary

copilot:poem
- [ ] My fix has changed UI
4 changes: 0 additions & 4 deletions .github/PULL_REQUEST_TEMPLATE/QUICK_PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,3 @@

- [ ] My DOT address: [Payout](https://canary.kodadot.xyz/dot/transfer/?target=<My_Polkadot_Address_check_https://github.com/kodadot/nft-gallery/blob/main/REWARDS.md#creating-your-dot-address>)

## Copilot Summary
copilot:summary

copilot:poem
2 changes: 1 addition & 1 deletion .github/push_release_beta.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# experimental
# https://github.com/kodadot/nft-gallery/issues/5770

gh pr list -s merged --json url -B main --jq ".[] | .url" | sed 's/^/- /' $1 | awk 'BEGIN{print "copilot:summary \n"}{ print}' $1 | gh pr create -t "beta update" -d -H main -B beta -l beta --body-file -
gh pr list -s merged --json url -B main --jq ".[] | .url" | sed 's/^/- /' $1 | awk 'BEGIN{print "Beta Update \n"}{ print}' $1 | gh pr create -t "beta update" -d -H main -B beta -l beta --body-file -
2 changes: 1 addition & 1 deletion .github/push_release_old-prod.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# experimental
# https://github.com/kodadot/nft-gallery/issues/5770

gh pr list -s merged --json url -B main --jq ".[] | .url" | sed 's/^/- /' $1 | awk 'BEGIN{print "copilot:summary \n"}{ print}' $1 | gh pr create -t "release update" -d -H beta -B production -l release --body-file -
gh pr list -s merged --json url -B main --jq ".[] | .url" | sed 's/^/- /' $1 | gh pr create -t "release update" -d -H beta -B production -l release --body-file -
2 changes: 1 addition & 1 deletion .github/push_release_production.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# experimental
# https://github.com/kodadot/nft-gallery/issues/5770

gh pr list -s merged --json url -B main --jq ".[] | .url" | sed 's/^/- /' $1 | awk 'BEGIN{print "copilot:summary \n"}{ print}' $1 | gh pr create -t "release update" -d -H beta -B production -l release --body-file -
gh pr list -s merged --json url -B main --jq ".[] | .url" | sed 's/^/- /' $1 | awk 'BEGIN{print "Release Update \n"}{ print}' $1 | gh pr create -t "release update" -d -H beta -B production -l release --body-file -
15 changes: 15 additions & 0 deletions assets/styles/global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,9 @@ a.has-text-grey {
background-color: theme('k-redaccent');
}
}
.k-grey-light {
background-color: var(--k-grey-light) !important;
}
.theme-background-color {
@include ktheme() {
background-color: theme('background-color');
Expand Down Expand Up @@ -587,3 +590,15 @@ a.has-text-grey {
.has-text-inherit {
color: inherit !important;
}

.cursor-default {
cursor: default;
}

.min-width-0 {
min-width: 0;
}

.pointer-events-none {
pointer-events: none !important;
}
2 changes: 2 additions & 0 deletions assets/styles/layouts/_main-navigation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,8 @@
height: 40px;
}
}

max-width: 100% !important;
}
}

Expand Down
5 changes: 3 additions & 2 deletions components/MessageNotify.vue
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const realworldFullPath = computed(() => {
&--toast {
z-index: 100;
position: fixed;
border-radius: 0;
border-radius: 0 !important;
top: 100px;
right: 0;
margin-left: auto;
Expand All @@ -73,7 +73,8 @@ const realworldFullPath = computed(() => {
}
.message-body {
border: none;
border-left-width: 0;
border-radius: 0;
}
.congrats-message {
Expand Down
28 changes: 24 additions & 4 deletions components/balance/MultipleBalances.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
</div>

<div
v-for="(chain, key) in multiBalances.chains"
v-for="(data, key) in multiBalancesChainsList"
:key="key"
class="is-size-6">
<div
v-for="token in filterEmptyBalanceChains(chain)"
v-for="token in filterEmptyBalanceChains(data.chain)"
:key="token.name"
class="balance-row">
<div class="is-capitalized is-flex-grow-3">
{{ key }}
{{ data.key }}
</div>
<div class="has-text-right is-flex-grow-1">
{{ token.name.toUpperCase() }}
Expand Down Expand Up @@ -61,12 +61,32 @@
import { formatNumber } from '@/utils/format/balance'
import { NeoSkeleton } from '@kodadot1/brick'
import { ChainToken, useIdentityStore } from '@/stores/identity'
import { ChainToken, type ChainType, useIdentityStore } from '@/stores/identity'
const displayChainOrder: ChainType[] = [
'polkadot',
'polkadotHub',
'kusama',
'kusamaHub',
'basilisk',
]
const identityStore = useIdentityStore()
const { multiBalances } = useMultipleBalance(true)
const multiBalancesChainsList = computed(() => {
return Object.keys(multiBalances.value.chains)
.sort(
(a, b) =>
displayChainOrder.indexOf(a as ChainType) -
displayChainOrder.indexOf(b as ChainType),
)
.map((key) => ({
key,
chain: multiBalances.value.chains[key],
}))
})
const isBalanceLoading = computed(
() => identityStore.getStatusMultiBalances === 'loading',
)
Expand Down
5 changes: 3 additions & 2 deletions components/carousel/CarouselTypeGenerative.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@
</template>

<script lang="ts" setup>
import { AHK_GENERATIVE_DROPS, AHP_GENERATIVE_DROPS } from '@/utils/drop'
import { useCarouselGenerativeNftEvents } from './utils/useCarouselEvents'
const { nfts, ids } = await useCarouselGenerativeNftEvents(
['176'],
['38', '40', '46', '49', '50'],
AHK_GENERATIVE_DROPS,
AHP_GENERATIVE_DROPS,
)
</script>
9 changes: 9 additions & 0 deletions components/collection/CollectionInfo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@
<IdentityIndex ref="identity" :address="address" show-clipboard />
</nuxt-link>
</div>
<div v-if="recipient" class="is-flex mb-2">
<div class="mr-2 is-capitalized">{{ $t('royalty') }}</div>
<nuxt-link :to="`/${urlPrefix}/u/${recipient}`" class="has-text-link">
<IdentityIndex ref="identity" :address="recipient" show-clipboard />
</nuxt-link>
&nbsp;({{ royalty }}%)
</div>
<div class="overflow-wrap">
<Markdown
:source="visibleDescription"
Expand Down Expand Up @@ -83,6 +90,8 @@ const chain = computed(
?.text,
)
const address = computed(() => collectionInfo.value?.currentOwner)
const recipient = computed(() => collectionInfo.value?.recipient)
const royalty = computed(() => collectionInfo.value?.royalty)
const seeAllDescription = ref(false)
const DESCRIPTION_MAX_LENGTH = 210
Expand Down
Loading

0 comments on commit f1c85ea

Please sign in to comment.