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

Merged
merged 44 commits into from
Aug 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
219f99a
fix: incorrect balance
hassnian Jul 19, 2023
8494f5d
#6417 tooltip update gallery
prachi00 Jul 21, 2023
f28711a
Merge branch 'main' into feat-tooltip-update
prachi00 Jul 21, 2023
777b7b7
🔧 vue 3 composition create pages
roiLeo Jul 21, 2023
c26c0c6
🔧 create tabs
roiLeo Jul 21, 2023
95f204a
Update components/gallery/GalleryItemAction/GalleryItemActionType/Gal…
prachi00 Jul 21, 2023
8459495
Merge branch 'main' into feat-tooltip-update
prachi00 Jul 21, 2023
5ea8887
🔥 remove tabs from massmint
daiagi Jul 23, 2023
cf8f968
tooltip clean
prachi00 Jul 24, 2023
9164da8
chain update
prachi00 Jul 25, 2023
f2c9f59
Merge branch 'main' into feat-tooltip-update
prachi00 Jul 25, 2023
1f3588d
fix: switch network
preschian Jul 26, 2023
80aa2b9
Merge branch 'main' of https://github.com/kodadot/nft-gallery into ma…
daiagi Jul 26, 2023
1e7af9a
align massmint buttons
daiagi Jul 26, 2023
c91746a
Merge pull request #6473 from kodadot/fix/switch-network
yangwao Jul 28, 2023
e662c4c
Merge pull request #6459 from kodadot/massmint/remove-tabs
yangwao Jul 28, 2023
e0f8cfe
resource.meta null check (#6485)
daiagi Jul 29, 2023
62cf949
adding mobile, title changes
prachi00 Jul 29, 2023
0a5d40f
Merge branch 'main' into feat-tooltip-update
prachi00 Jul 29, 2023
a6c58f4
[Blogpost] The Rise of Onchain NFTs: Shaping the Future of Digital Co…
Jarsen136 Jul 31, 2023
7a20599
fix: image size
Jarsen136 Jul 31, 2023
288add1
Merge branch 'main' of https://github.com/hassnian/nft-gallery
hassnian Jul 31, 2023
99241f2
Merge branch 'main' into chore/prefix/create
roiLeo Jul 31, 2023
c05feb7
fix: typo
Jarsen136 Jul 31, 2023
17e703b
added article md file
hassnian Jul 31, 2023
ea281f0
removed spaces
hassnian Jul 31, 2023
8f894ca
removed space
hassnian Jul 31, 2023
1f74143
fix: Add blog to footer
Jarsen136 Jul 31, 2023
12a789b
added article images
hassnian Jul 31, 2023
d82b613
#6491 (#6492)
prachi00 Jul 31, 2023
759315a
🔧 migrate b-button part 2 (#6449)
roiLeo Jul 31, 2023
7945714
fix: Drop page announcement on landing (#6497)
Jarsen136 Jul 31, 2023
87f4bba
🔧 blog page refacto (#6505)
roiLeo Jul 31, 2023
2f490b6
Update libs/static/src/chains.ts
prachi00 Aug 1, 2023
d329561
feat: General onboarding article for developers want to use KodaDot (…
Jarsen136 Aug 1, 2023
b32283d
Merge branch 'main' into issue-6498
Jarsen136 Aug 1, 2023
ebb7893
fix: header margin
Jarsen136 Aug 1, 2023
c789eed
Merge pull request #6503 from hassnian/issue-6499
yangwao Aug 1, 2023
8f3310a
Merge pull request #6507 from Jarsen136/issue-6506
yangwao Aug 1, 2023
87788db
fix: bring back blog list
Jarsen136 Aug 2, 2023
346bc83
Merge branch 'main' into issue-6498
Jarsen136 Aug 2, 2023
2a3c35a
Merge pull request #6500 from Jarsen136/issue-6498
yangwao Aug 2, 2023
7ce5bf3
Merge pull request #6453 from roiLeo/chore/prefix/create
yangwao Aug 2, 2023
a3b3d7d
Merge pull request #6448 from kodadot/feat-tooltip-update
yangwao Aug 2, 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 CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Before you being:
- We utilize [**Node.js**](https://nodejs.org) as a development tool. To avoid potential compatibility issues, check if you're on the version of **Node.js we support.**
- Make sure that you use [**pnpm**](https://pnpm.io/installation) as the package manager.
- Please have a read the [code of conduct](CODE_OF_CONDUCT.md)
- [Learn how to set up your environment for the first time](FIRST_TIME.md)
- [Learn how to set up your environment for the first time](/content/blog/first-time.md)
- Get familiar with our [coding conventions & recommendations](STYLE_GUIDE.md)
- Read up on our [tech stack](https://medium.com/kodadot/the-tech-stack-at-kodadot-8a83880f8624) to get a better picture of the infrastructure we rely on
- Familiarise yourself with our [contributor culture](https://medium.com/kodadot/contributor-culture-at-kodadot-665243d3d6a6) to better understand the dynamics by which we operate
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

![image](https://user-images.githubusercontent.com/5887929/217076362-464e1293-8a2d-43ee-829f-fba17408e4c3.png)

#### Is this your first time contributing? Set up your local environment [here](FIRST_TIME.md)
#### Is this your first time contributing? Set up your local environment [here](./content/blog/first-time.md)

Before submitting your pull request, read up on our [documentation](https://developers.kodadot.xyz) and make sure it follows:

Expand Down
4 changes: 2 additions & 2 deletions components/Navbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
ref="mobilSearchRef"
hide-filter
class="is-flex-grow-1 mt-3" />
<b-button class="cancel-btn" @click="hideMobileSearchBar">
<button class="cancel-btn p-3" @click="hideMobileSearchBar">
{{ $t('cancel') }}
</b-button>
</button>
</div>
</div>
</div>
Expand Down
5 changes: 5 additions & 0 deletions components/TheFooter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,11 @@ const menuKodadot: Menu[] = [
url: 'https://github.com/kodadot/kodadot-presskit/tree/main/v3',
external: true,
},
{
name: $i18n.t('blog'),
url: '/blog',
external: false,
},
]

const socials = [
Expand Down
29 changes: 26 additions & 3 deletions components/blog/BlogPost.vue
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,33 @@ useNuxt2Meta({
margin-bottom: 0;
}

h1,
h2,
h3,
h4,
p {
margin: 1rem 0;
}

h1 {
font-size: 3rem;
line-height: 3.5rem;
font-weight: 700;
margin: 1rem 0;
}

h2 {
font-size: 1.5rem;
font-weight: bold;
margin-bottom: 1rem;
}

h3 {
font-size: 1.2rem;
font-weight: bold;
}

h4 {
font-size: 1rem;
font-weight: bold;
}

img {
Expand All @@ -86,7 +103,6 @@ useNuxt2Meta({
p {
font-size: 20px;
line-height: 30px;
margin-bottom: 1rem;
}

@include ktheme() {
Expand All @@ -112,6 +128,13 @@ useNuxt2Meta({
p {
font-size: 1rem;
}

h3 {
font-size: 0.9rem;
}
h4 {
font-size: 0.8rem;
}
}
}
</style>
45 changes: 30 additions & 15 deletions components/collection/unlockable/UnlockableLandingTag.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<template>
<div
v-if="isUnlockableLandingTagVisible"
class="unlockable-landing-tag is-flex border is-justify-content-space-between px-4 mt-6 mx-4">
class="unlockable-landing-tag is-flex border is-justify-content-space-between is-align-items-center px-4 mt-6"
:class="{ 'small-size': smallWidth }">
<div class="is-flex is-align-items-center">
<svg
width="42"
Expand Down Expand Up @@ -35,25 +36,32 @@
</defs>
</svg>

<span> {{ $t('mint.unlockable.mintLive') }} </span>
<NeoIcon
icon="horizontal-rule"
pack="fa-sharp"
size="small"
class="separator mx-2" />
<span> {{ mintLiveText }} </span>
</div>

<div class="separator mx-2" />
<nuxt-link
class="is-flex is-align-items-center has-text-weight-bold"
class="is-flex is-align-items-center has-text-weight-bold my-2"
to="/stmn/drops/free-drop">
{{ $t('mint.unlockable.takeMe') }}
</nuxt-link>
</div>
</template>

<script lang="ts" setup>
import { NeoIcon } from '@kodadot1/brick'
const isUnlockableLandingTagVisible = true
const { $i18n } = useNuxtApp()

const { width } = useWindowSize()

const smallWidth = computed(() => width.value < 502)

const mintLiveText = computed(() =>
$i18n.t(
smallWidth.value
? 'mint.unlockable.mintLiveSmall'
: 'mint.unlockable.mintLive'
)
)
</script>

<style lang="scss" scoped>
Expand All @@ -62,12 +70,19 @@ const isUnlockableLandingTagVisible = true
border-radius: 2rem;
@include ktheme() {
background-color: theme('background-color');
.separator {
background: theme('separator-line-color');
width: 15px;
height: 1px;
}
}
.separator {
color: $placeholder-color;
width: 15px;
height: 2px;
overflow: hidden;

&.small-size {
flex-direction: column;
border-radius: 1rem;
.separator {
width: 100%;
}
}
}
</style>
7 changes: 0 additions & 7 deletions components/common/ConnectWallet/ConnectWalletModal.vue
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
<template>
<div class="wallet-modal-container is-flex is-flex-direction-column">
<header class="modal-card-head">
<b-button
v-show="hasSelectedWalletProvider"
type="is-text"
class="mr-2 is-no-border"
icon-left="chevron-left"
@click="hasSelectedWalletProvider = !hasSelectedWalletProvider" />
<span class="modal-card-title is-size-6 has-text-weight-bold">
{{
showAccount
Expand Down Expand Up @@ -94,7 +88,6 @@ import WalletAsset from '@/components/common/ConnectWallet/WalletAsset.vue'

const { $i18n } = useNuxtApp()
const selectedWalletProvider = ref<BaseDotsamaWallet>()
const hasSelectedWalletProvider = ref(false)
const forceWalletSelect = ref(false)
const identityStore = useIdentityStore()
const { urlPrefix } = usePrefix()
Expand Down
38 changes: 19 additions & 19 deletions components/common/ConnectWallet/WalletMenuItem.vue
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
<template>
<div class="wallet-menu-item">
<b-button
size="is-medium"
expanded
class="my-0 is-flex is-justify-content-space-between is-align-items-center"
<button
class="button my-0 is-flex is-justify-content-space-between is-align-items-center"
@click="onClickWallet(wallet)">
<div
class="is-flex is-justify-content-space-between is-align-items-center">
<span>
<img
:src="wallet.img"
:alt="wallet.extensionName"
width="32"
style="vertical-align: middle" />
<span class="is-size-6 ml-2 is-capitalized">{{ wallet.name }}</span>
</span>
<span>
<div
class="is-flex is-justify-content-space-between is-align-items-center">
<span>
<img
:src="wallet.img"
:alt="wallet.extensionName"
width="32"
style="vertical-align: middle" />
<span class="is-size-6 ml-2 is-capitalized">{{ wallet.name }}</span>
</span>

<NeoIcon v-if="!wallet.installed" icon="download" />
<NeoIcon v-if="!wallet.installed" icon="download" />

<NeoIcon v-else-if="showAccountList" icon="chevron-down" />
<NeoIcon v-else-if="showAccountList" icon="chevron-down" />

<NeoIcon v-else icon="chevron-right" />
</div>
</b-button>
<NeoIcon v-else icon="chevron-right" />
</div>
</span>
</button>
<div
v-if="isAuth && walletAccounts.length === 0"
class="pl-5 pt-2 pb-2 is-flex is-align-items-center auth-tip">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,53 +6,71 @@
ref="root"
title="Price"
:price="nftPrice">
<GalleryItemActionSlides
v-if="Number(nftPrice)"
ref="actionRef"
:active="active"
:class="{ 'gallery-item-slides-entry': !active }"
:disabled="disabled">
<template #entry>
<NeoTooltip
v-if="!active"
:active="disabled"
:label="$t('tooltip.notEnoughBalance')"
append-to-body
multiline>
<NeoButton
:label="label"
size="large"
class="full-width-action-button"
variant="k-accent"
:disabled="disabled"
no-shadow
data-cy="item-buy"
@click.native="onClick" />
</NeoTooltip>
</template>
<div v-if="disabled" class="gallery-item-disabled">
<NeoTooltip
:active="disabled"
content-class="buy-tooltip"
:position="isMobileDevice ? 'top' : 'left'"
:auto-close="!isMobileDevice ? ['outside', 'escape'] : []"
multiline>
<template #content>
<div class="is-size-6">
{{
$t('tooltip.notEnoughBalanceChain', {
chain: chainNames[urlPrefix],
})
}}
<div>
{{ $t('tip') }}:
<nuxt-link :to="`/${urlPrefix}/teleport`" target="_blank">
{{ $t('useTeleport') }}</nuxt-link
>

<template #action>
{{ $t('or') }}

<a @click="showRampSDK"> {{ $t('addFunds') }}</a>
</div>
</div>
</template>
<NeoButton
:label="label"
size="large"
fixed-width
variant="k-accent"
:disabled="disabled"
no-shadow
data-cy="item-buy"
@click.native="onClick" />
</template>

<template #content>
<div class="has-text-centered">
{{ $t('nft.buyNFTOn') }}
<span class="has-text-weight-bold is-uppercase">{{
urlPrefix
}}</span>
</div>
</template>
</GalleryItemActionSlides>
<div v-else>{{ $t('nft.notListed') }}</div>
</NeoTooltip>
</div>
<div v-else>
<GalleryItemActionSlides
v-if="Number(nftPrice)"
ref="actionRef"
:active="active"
:class="{ 'gallery-item-slides-entry': !active }"
:disabled="disabled">
<template #action>
<NeoButton
:label="label"
size="large"
fixed-width
variant="k-accent"
no-shadow
data-cy="item-buy"
@click.native="onClick" />
</template>

<template #content>
<div class="has-text-centered">
{{ $t('nft.buyNFTOn') }}
<span class="has-text-weight-bold is-uppercase">{{
urlPrefix
}}</span>
</div>
</template>
</GalleryItemActionSlides>
<div v-else>{{ $t('nft.notListed') }}</div>
</div>
</GalleryItemPriceSection>
</div>
</template>
Expand All @@ -74,8 +92,10 @@ import { ShoppingActions } from '@/utils/shoppingActions'
import { ConnectWalletModalConfig } from '@/components/common/ConnectWallet/useConnectWallet'
import { useIdentityStore } from '@/stores/identity'
import { usePreferencesStore } from '@/stores/preferences'
import { RampInstantSDK } from '@ramp-network/ramp-instant-sdk'

import Vue from 'vue'
import { chainNames } from '@/libs/static/src/chains'

const props = withDefaults(
defineProps<{
Expand All @@ -95,6 +115,7 @@ const props = withDefaults(
recipient: '',
}
)
const isMobileDevice = ref(window.innerWidth < 1024)

const { urlPrefix, client } = usePrefix()
const { accountId } = useAuth()
Expand All @@ -117,6 +138,17 @@ const label = computed(() =>
)
)

const showRampSDK = () => {
new RampInstantSDK({
defaultAsset: 'KSM',
userAddress: accountId.value,
hostAppName: 'KodaDot',
hostApiKey: 'a99bfvomhhbvzy6thaycxbawz7d3pssuz2a8hsrc', // env
hostLogoUrl: 'https://kodadot.xyz/apple-touch-icon.png',
variant: 'desktop',
}).show()
}

const balance = computed<string>(() => {
switch (urlPrefix.value) {
case 'rmrk':
Expand Down
Loading