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): 9 % of January 2025 Hazelnut 🌰 #11332

Merged
merged 71 commits into from
Jan 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
b9deeb8
fix(profile): landing allows generic address
hassnian Dec 18, 2024
a28312f
fix(SearchProfiles.vue): format user sub address
hassnian Dec 18, 2024
9db7c79
ref(redirects.global.ts): add `getFormatAddressRouteCondition` for `…
hassnian Dec 18, 2024
026e8d8
fix(redirects.global.ts): can't run multple route conditions
hassnian Dec 18, 2024
e4ffe75
🔧 columns & column bulma to tailwind
roiLeo Dec 20, 2024
71e7cf8
Merge branch 'main' into chore/bulma/columns
roiLeo Dec 23, 2024
3b81c15
🔧 columns & column bulma to tailwind
roiLeo Dec 23, 2024
94f275c
refactor: remove BaseCollectionForm, CreateCollection, Consolidator, …
preschian Dec 23, 2024
5492579
refactor: remove EmotionModal component from Gallery
preschian Dec 23, 2024
7f9145b
refactor: remove unused Gallery components and filters
preschian Dec 23, 2024
9314e4e
refactor: remove Flipper component from Gallery
preschian Dec 23, 2024
ce1562c
refactor: remove Layout component from Gallery
preschian Dec 23, 2024
8ffac5f
feat: mass mint with csv template
Jarsen136 Dec 24, 2024
2ab1cff
add(swaps): counter-swap functionality to trade table
hassnian Dec 24, 2024
bf00578
Merge branch 'main' into issue-11138-1
hassnian Dec 24, 2024
a7ba4a4
ref: move `ONE_DAYH_IN_MS` to `utils/time.ts`
hassnian Dec 25, 2024
4457844
add(atomicSwaps.ts): expire old and completed swaps
hassnian Dec 25, 2024
0e25dd8
[skip netlify]: migrate config .github/renovate.json
renovate[bot] Dec 26, 2024
b40839c
Merge branch 'main' into issue-11138-1
hassnian Dec 26, 2024
d798431
chore: csv separator with attributes
Jarsen136 Dec 26, 2024
9fad412
chore: line separator
Jarsen136 Dec 26, 2024
076c4ec
🔧 conflicts overviewTable
roiLeo Dec 26, 2024
85e29a9
Merge branch 'main' into issue-11138-1
hassnian Dec 27, 2024
5b29aba
add(atomicSwaps.ts): max amount of items per chain
hassnian Dec 28, 2024
d17454d
ref(utils/time.ts): constant name `ONE_DAY_MS`
hassnian Dec 28, 2024
5a52fa0
chore: remove quotes
Jarsen136 Dec 28, 2024
6d70084
Merge pull request #11290 from Jarsen136/issue-11282
Jarsen136 Dec 28, 2024
43457db
Merge branch 'main' into issue-11261
hassnian Dec 29, 2024
cd23f0a
Merge branch 'main' into issue-11138-1
hassnian Dec 29, 2024
21511d8
ref(useTrades.ts): auto refresh on computed variable change
hassnian Dec 30, 2024
57825fc
ref(useNewCollectionId.ts): remove unused fn `useNewCollectionId`
hassnian Dec 30, 2024
24c452e
fix(useGalleryItem.ts): invalid `refetch` params
hassnian Dec 27, 2024
b142402
add(tests/e2e/chain-redirect.spec.ts): collection page chain redirect
hassnian Dec 30, 2024
b52e32f
Merge pull request #11307 from hassnian/issue-11305
vikiival Dec 30, 2024
0abfb69
Merge branch 'main' into issue-11296-1
vikiival Dec 30, 2024
7da8927
fix(transaction/utils.ts): `isActionValid` accept swap action validation
hassnian Dec 29, 2024
87999a3
Merge branch 'main' into issue-11304
hassnian Dec 31, 2024
8589f8c
chore: update nuxt dependency to version 3.15.0
preschian Dec 31, 2024
8bc2043
revert: use this version 3d970962ae961e8773b878b8416adf16e4b8f113
preschian Dec 31, 2024
f3194b8
chore: upgrade nuxt
preschian Dec 31, 2024
996a113
revert: nuxt version
preschian Dec 31, 2024
3b55360
ci: nuxt 3.14.0
preschian Dec 31, 2024
9840c1b
revert: devdeps and upgrade nuxt
preschian Dec 31, 2024
a2db603
chore: downgrade nuxt from 3.15.0 to 3.13.2 in package.json and pnpm-…
preschian Dec 31, 2024
711f8a6
Merge pull request #11310 from kodadot/chore--upgrade-packages
vikiival Dec 31, 2024
c4b95e2
Merge pull request #11309 from hassnian/issue-fix-accept-offer-valida…
vikiival Dec 31, 2024
601dd92
Merge pull request #11303 from hassnian/issue-11296-1
vikiival Dec 31, 2024
79c9056
Merge pull request #11308 from hassnian/issue-11302
vikiival Dec 31, 2024
8997eaf
Merge branch 'main' into issue-11138-1
vikiival Dec 31, 2024
3e893d9
Merge branch 'main' into issue-11304
vikiival Dec 31, 2024
a796318
ci: adjust netlify deployment memory size
preschian Dec 31, 2024
d27e822
Merge pull request #11313 from kodadot/ci--adjust-netlify-memory-depl…
vikiival Dec 31, 2024
c989968
fix(TradeOwnerButton.vue): hide counter-swap button for offers
hassnian Jan 1, 2025
4e6cead
Merge branch 'main' into issue-11138-1
hassnian Jan 1, 2025
1d343ba
Merge pull request #11288 from kodadot/refactor--remove-unused-compon…
preschian Jan 1, 2025
996d729
fix: Squashed profile picture
Jarsen136 Jan 1, 2025
10f023d
Merge pull request #11262 from hassnian/issue-11261
Jarsen136 Jan 1, 2025
d940030
Merge branch 'main' into issue-11316
Jarsen136 Jan 1, 2025
3f8a66a
fix: Expiration dropdown position
Jarsen136 Jan 1, 2025
90b8e6a
Merge pull request #11317 from Jarsen136/issue-11316
vikiival Jan 1, 2025
6d668b4
fix: clicking on item in atomic swap should open new tab
Jarsen136 Jan 1, 2025
fa5a22b
fix: stop user from inputting their own address
Jarsen136 Jan 1, 2025
e16825a
fix: close icon on address input
Jarsen136 Jan 1, 2025
04de425
chore: type
Jarsen136 Jan 1, 2025
4903085
Merge pull request #11327 from Jarsen136/issue-11323
vikiival Jan 2, 2025
478bb1c
Merge pull request #11330 from Jarsen136/issue-11322
vikiival Jan 2, 2025
d7a2210
Merge pull request #11329 from Jarsen136/issue-11324
vikiival Jan 2, 2025
a1ca013
Merge pull request #11291 from hassnian/issue-11138-1
vikiival Jan 2, 2025
e937678
Merge pull request #11306 from hassnian/issue-11304
vikiival Jan 2, 2025
42e8577
Merge pull request #11279 from roiLeo/chore/bulma/columns
vikiival Jan 3, 2025
d9db211
Merge pull request #11298 from kodadot/renovate/migrate-config
vikiival Jan 3, 2025
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
50 changes: 34 additions & 16 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,37 +4,55 @@
"automerge": true,
"automergeType": "pr-comment",
"automergeComment": "lgtm",
"extends": ["config:base", ":dependencyDashboard"],
"extends": [
"config:recommended",
":dependencyDashboard"
],
"prHourlyLimit": 5,
"enabledManagers": ["npm"],
"enabledManagers": [
"npm"
],
"rangeStrategy": "bump",
"updatePinnedDependencies": false,
"schedule": ["before 3am on Monday"],
"schedule": [
"before 3am on Monday"
],
"packageRules": [
{
"matchSourceUrlPrefixes": [
"https://github.com/polkadot-js/",
"https://github.com/vue-polkadot/",
"https://github.com/kodadot/packages",
"https://github.com/cloudacy/vue-markdown-render",
"https://github.com/FortAwesome/Font-Awesome",
"https://github.com/TypeStrong/ts-loader"
],
"groupName": "merge with hazmat suit extra",
"enabled": false
"enabled": false,
"matchSourceUrls": [
"https://github.com/polkadot-js/{/,}**",
"https://github.com/vue-polkadot/{/,}**",
"https://github.com/kodadot/packages{/,}**",
"https://github.com/cloudacy/vue-markdown-render{/,}**",
"https://github.com/FortAwesome/Font-Awesome{/,}**",
"https://github.com/TypeStrong/ts-loader{/,}**"
]
},
{
"groupName": "Bumped minor version of packages",
"prHeader": "Bumped minor version of packages, check if builds are still passing, please 🥺",
"matchUpdateTypes": ["minor", "patch"],
"matchDepTypes": ["dependencies", "devDependencies"]
"matchUpdateTypes": [
"minor",
"patch"
],
"matchDepTypes": [
"dependencies",
"devDependencies"
]
},
{
"matchUpdateTypes": ["major", "pin"],
"matchUpdateTypes": [
"major",
"pin"
],
"enabled": false
},
{
"packageNames": ["node"],
"matchPackageNames": [
"node"
],
"enabled": false
}
]
Expand Down
85 changes: 0 additions & 85 deletions components/base/BaseCollectionForm.vue

This file was deleted.

8 changes: 4 additions & 4 deletions components/collection/CollectionDetail.vue
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
v-if="nfts && !isLoading"
class="flex justify-around is-vcentered"
>
<div class="detail-item text-center column">
<div class="detail-item text-center basis-0 grow shrink p-3">
<p class="detail-item__title text-k-grey">
{{ $t('collectionCard.volume') }}
</p>
Expand All @@ -52,7 +52,7 @@
:value="collectionTradedVolumeNumber"
/>
</div>
<div class="detail-item text-center column">
<div class="detail-item text-center basis-0 grow shrink p-3">
<p class="detail-item__title text-k-grey">
{{ $t('series.highestSale') }}
</p>
Expand All @@ -62,7 +62,7 @@
/>
</div>

<div class="detail-item text-center column">
<div class="detail-item text-center basis-0 grow shrink p-3">
<p class="detail-item__title text-k-grey">
{{ $t('collectionCard.items') }}
</p>
Expand All @@ -76,7 +76,7 @@
<div
v-for="n in DESC_SKELETON_COUNT"
:key="n"
class="flex items-center detail-item column px-5"
class="flex items-center detail-item basis-0 grow shrink p-3 px-5"
>
<NeoSkeleton
no-margin
Expand Down
4 changes: 2 additions & 2 deletions components/collection/drop/GenerativeLayout.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<div
class="relative w-full mx-auto px-[1.25rem] md:px-[2.5rem] min-[1440px]:max-w-[1440px]"
>
<div class="columns is-variable is-4-tablet">
<div class="column is-half-desktop mobile-padding lg:max-w-[600px]">
<div class="flex">
<div class="mobile-padding lg:max-w-[600px]">
<div class="flex justify-between flex-wrap max-w-[504px]">
<div
v-if="address"
Expand Down
2 changes: 1 addition & 1 deletion components/drops/CreateCalendarEventModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ const eventDetails = {
const getNextDropDate = (): Date => {
const currentDate = new Date()
const daysUntilThursday = (11 - currentDate.getDay()) % 7
const millisecondsUntilThursday = daysUntilThursday * 24 * 60 * 60 * 1000
const millisecondsUntilThursday = daysUntilThursday * ONE_DAY_MS
currentDate.setUTCHours(14, 0, 0, 0) // Set time to 3 PM CET
const dropDate = new Date(currentDate.getTime() + millisecondsUntilThursday)
dropDate.setHours(currentDate.getHours())
Expand Down
3 changes: 1 addition & 2 deletions components/drops/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ export const parseCETDate = (datetime: string): Date => {

export const dateHasTime = (datetime: string): boolean => /:/.test(datetime)

const ONE_DAYH_IN_MS = 24 * 60 * 60 * 1000
const getLocalDropStatus = (drop: Pick<DropItem, 'dropStartTime' | 'minted' | 'max' | 'disabled'>): DropStatus => {
const now = new Date()

Expand All @@ -81,7 +80,7 @@ const getLocalDropStatus = (drop: Pick<DropItem, 'dropStartTime' | 'minted' | 'm
return DropStatus.MINTING_LIVE
}

if (drop.dropStartTime.valueOf() - now.valueOf() <= ONE_DAYH_IN_MS) {
if (drop.dropStartTime.valueOf() - now.valueOf() <= ONE_DAY_MS) {
return DropStatus.SCHEDULED_SOON
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,26 +86,11 @@ const onMakeOfferClick = () => {
const onSwapClick = () => {
onTradeActionClick(() => {
const nft = props.nft
const swap = swapStore.createSwap(nft.currentOwner)

swapStore.updateItem({
...swap,
desired: [
{
id: nft.id,
collectionId: nft.collection.id,
sn: nft.sn,
name: nft.name,
meta: nft.meta,
},
],
const swap = swapStore.createSwap(nft.currentOwner, {
desired: [nftToSwapItem(nft)],
})

navigateTo({
name: 'prefix-swap-id',
params: { id: nft.currentOwner },
query: { swapId: swap.id },
})
navigateToSwap(swap)
})
}

Expand Down
9 changes: 7 additions & 2 deletions components/gallery/useGalleryItem.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,12 @@ export const useGalleryItem = (nftId?: string): GalleryItem => {
},
})

const refreshToken = async () => {
const getIndexerToken = () => {
refetch({ id })
}

const refreshToken = async () => {
getIndexerToken()
getOdaToken()
}

Expand Down Expand Up @@ -120,7 +124,8 @@ export const useGalleryItem = (nftId?: string): GalleryItem => {
id
}
}`,
onChange: refetch,
onChange: getIndexerToken,
immediate: false,
})

useSubscriptionGraphql({
Expand Down
3 changes: 3 additions & 0 deletions components/items/ItemsGrid/ItemsGrid.vue
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
? 'minimal'
: 'primary'
"
:link-target="linkTarget"
/>
<ItemsGridImageTokenEntity
v-else
Expand All @@ -51,6 +52,7 @@
:hide-action="hideNFTHoverAction"
:hide-listing="hideListing"
hide-video-controls
:link-target="linkTarget"
:lazy-loading="
shouldLazyLoad({
cols: slotProps.cols,
Expand Down Expand Up @@ -148,6 +150,7 @@ const props = defineProps<{
hideHoverAction?: boolean
collectionPopoverHide?: boolean
hideListing?: boolean
linkTarget?: string
}>()

const emit = defineEmits(['total', 'loading'])
Expand Down
2 changes: 2 additions & 0 deletions components/items/ItemsGrid/ItemsGridImage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
bind-key="to"
:media-static-video="hideVideoControls"
media-hover-on-cover-play
:link-target="linkTarget"
>
<template
v-if="!hideAction"
Expand Down Expand Up @@ -106,6 +107,7 @@ const props = defineProps<{
collectionPopoverHide?: boolean
lazyLoading?: boolean
skeletonVariant: string
linkTarget?: string
}>()

const {
Expand Down
2 changes: 2 additions & 0 deletions components/items/ItemsGrid/ItemsGridImageTokenEntity.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
:media-static-video="hideVideoControls"
:lazy-loading="lazyLoading"
media-hover-on-cover-play
:link-target="linkTarget"
>
<template
v-if="!hideAction"
Expand Down Expand Up @@ -123,6 +124,7 @@ const props = defineProps<{
lazyLoading?: boolean
skeletonVariant: string
hideListing?: boolean
linkTarget?: string
}>()

const {
Expand Down
Loading
Loading