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

✨ swap page landing #11163

Merged
merged 55 commits into from
Dec 9, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
dca9973
✨ swap page landing
roiLeo Oct 23, 2024
2d4c882
✨ wip: swap page Step 2
roiLeo Oct 23, 2024
ca66655
✨ wip: swap page Step 2
roiLeo Oct 24, 2024
0fe2f3d
✨ wip: swap page Step 2 list
roiLeo Oct 24, 2024
6bff9f9
✨ wip: steps flow final
roiLeo Oct 24, 2024
1f9219c
Merge branch 'main' into feature/init/swapLanding
roiLeo Oct 30, 2024
1938f80
ref(swap): move simialr logic into smaller components
hassnian Nov 6, 2024
5d08758
add(swaps): store add item logic
hassnian Nov 6, 2024
5071fdb
add(offers): store multichain support
hassnian Nov 6, 2024
bc35ebd
ref(useAtomicSwapAction.ts): cleaner and null check
hassnian Nov 6, 2024
75041cd
add(swaps): add connect wallet button if wallet is not disconnected
hassnian Nov 7, 2024
1923237
add(swaps): swap middleware & review step
hassnian Nov 7, 2024
6e0c279
add(swaps): pesist store and step
hassnian Nov 7, 2024
d0d6ad3
add(swaps): init `createSwap` transaction
hassnian Nov 9, 2024
4db3059
ref(swaps): preview and fix surcharge per step
hassnian Nov 10, 2024
21b362c
fix(swap/Preview.vue): step based `surchargeDirection`
hassnian Nov 10, 2024
e843fea
fix(swaps): `getSwapStepRouteName` util
hassnian Nov 10, 2024
e568190
add(swaps): `swapId` in route
hassnian Nov 11, 2024
55c153f
fix(swaps): `surcharge` amount
hassnian Nov 11, 2024
57ca110
add(swaps): grid list filters
hassnian Nov 11, 2024
82846e9
fix(swaps): collection grid filter owner prop
hassnian Nov 12, 2024
5768199
ref(CollectionFilter.vue): query overfetching collection details
hassnian Nov 12, 2024
40f6996
add(swaps): selection cart sticky when scrolling
hassnian Nov 12, 2024
d40dbc3
🔧 ts warning swapgridlistfilter
roiLeo Nov 12, 2024
386a3f3
fix(swaps): network dropdown filter by vm & correct route redirect
hassnian Nov 12, 2024
8fe626a
fix(swaps): chain redirect pass swapId query
hassnian Nov 12, 2024
3a2193d
ref(swaos): transaction force 1:1 nft swaps
hassnian Nov 13, 2024
a124524
ref(swaps): selection disable next button if is over 1:1 swap
hassnian Nov 13, 2024
5018234
Merge branch 'feature/init/swapLanding' of https://github.com/roiLeo/…
hassnian Nov 13, 2024
4323ab1
ref(swaps): move `SwapStep` to `components/swap/types`
hassnian Nov 13, 2024
36dd75e
ref(swaps): layout and code duplication
hassnian Nov 13, 2024
e82f84a
ref(swaps): preview cart item
hassnian Nov 13, 2024
9442a8a
ref(swaps): pass `step` as prop to `Preview.vue`
hassnian Nov 14, 2024
618d5d2
ref(swaps): singular `swap` store name
hassnian Nov 14, 2024
bbf5219
add(swaps): allow logged out swap first steps
hassnian Nov 14, 2024
e09b5a5
fix(swaps): `isItemSelected` computed
hassnian Nov 14, 2024
e5fe925
ref(swaps): review step use `updateSwap` to update swap store
hassnian Nov 14, 2024
1da4f5c
fix(swap): `review.vue` redirect on success
hassnian Nov 14, 2024
a08d281
🔧 improve responsive
roiLeo Nov 14, 2024
dacbace
🔧 missing swap review hr
roiLeo Nov 14, 2024
f90a84a
🔧 swap selection to tailwind
roiLeo Nov 14, 2024
8b80fdb
🔧 swap review to tailwind
roiLeo Nov 14, 2024
caf0042
Merge branch 'main' into feature/init/swapLanding
hassnian Nov 26, 2024
3fdd846
🔧 resolve conflicts
roiLeo Nov 27, 2024
29df0fc
fix(swaps): expiration selector not showing in review page
hassnian Nov 28, 2024
2d63c95
fix(swaps): `surcharge` not being saved
hassnian Nov 29, 2024
d1b1204
ref: removed comments
hassnian Nov 29, 2024
4a2fae8
Merge branch 'main' into feature/init/swapLanding
hassnian Nov 30, 2024
45a2041
fix(swaps): trade modal successful transaction transalation details
hassnian Nov 30, 2024
fc1155e
fix(transactions): `ActionAcceptOffer` type
hassnian Nov 30, 2024
032aaf3
fix(swaps): transaction translations
hassnian Nov 30, 2024
55a6c88
Merge branch 'main' into feature/init/swapLanding
hassnian Dec 2, 2024
6d8dd9f
Update composables/transaction/transactionCreateSwap.ts
hassnian Dec 3, 2024
27d3923
Merge branch 'main' into feature/init/swapLanding
hassnian Dec 5, 2024
ee70ff5
Merge branch 'main' into feature/init/swapLanding
hassnian Dec 8, 2024
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
Next Next commit
✨ swap page landing
  • Loading branch information
roiLeo committed Oct 23, 2024
commit dca99732221b2565362c1d552b2ba7d0ec2f117c
19 changes: 19 additions & 0 deletions assets/svg/arrows.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
68 changes: 68 additions & 0 deletions components/swap/landing.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
<template>
<div class="max-w-[490px] mx-auto">
<div class="flex flex-col h-full space-y-10 pt-8">
<div>
<div class="flex items-center">
<img
class="-ml-8"
src="~/assets/svg/arrows.svg"
alt="Swap NFTs"
>
<h1 class="title">
{{ $t('swap.landingTitle') }}
</h1>
</div>
<p class="mb-2">
{{ $t('swap.landingSubtitle') }}
</p>
<a
class="text-k-blue hover:text-k-blue-hover"
href="https://hello.kodadot.xyz/tutorial/swaps"
target="_blank"
rel="nofollow noopener noreferrer"
>
{{ $t('swap.learnMoreAboutSwaps') }}
</a>
</div>

<div>
<h2 class="mb-2 font-bold text-text-color capitalize">
{{ $t('swap.connectTrader') }}
</h2>
<p>
{{ $t('swap.connectTraderInfo') }}
</p>
</div>

<form @submit="handleSubmit">
<AddressInput
v-model="traderAddress"
placeholder="Enter wallet address"
:strict="false"
empty-on-error
roiLeo marked this conversation as resolved.
Show resolved Hide resolved
/>

<NeoButton
type="submit"
:label="$t('swap.beginSwap')"
size="large"
class="text-base my-5 capitalize"
expanded
:disabled="traderAddress === ''"
native-type="submit"
variant="primary"
/>
</form>
</div>
</div>
</template>

<script lang="ts" setup>
import { NeoButton } from '@kodadot1/brick'

const traderAddress = ref('')

const handleSubmit = () => {
console.log(traderAddress.value)
}
</script>
8 changes: 8 additions & 0 deletions locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1787,6 +1787,14 @@
"support": {
"tooltip": "Cover costs mean that users help to support initial costs for Koda which stores your JPEG on your behalf."
},
"swap": {
"beginSwap": "Begin Swap offer",
"connectTrader": "Connect with a trader",
"connectTraderInfo": "Enter the wallet address of the trader you want to engage with, and we’ll guide you through the secure process of making a swap offer.",
"landingSubtitle": "Koda Swap facilitates secure and straightforward exchanges of digital assets. Connect directly with traders and confidently navigate your NFT transactions with our reliable platform.",
"landingTitle": "Koda Swap",
"learnMoreAboutSwaps": "Learn more about swaps"
},
"tabs": {
"activity": "Activity",
"chart": "Chart",
Expand Down
18 changes: 18 additions & 0 deletions pages/[prefix]/swap/index.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<template>
<SwapLanding />
</template>

<script lang="ts" setup>
definePageMeta({
layout: 'background-layout',
})

useSeoMeta({
title: 'Swap NFTs',
ogTitle: 'Swap NFTs',
description: 'Trade NFTs on Koda marketplace',
ogDescription: 'Trade NFTs on Koda marketplace',
ogImage: '/k_card.png',
twitterCard: 'summary_large_image',
})
</script>
Loading