Skip to content
This repository was archived by the owner on Dec 5, 2025. It is now read-only.

Commit 531da85

Browse files
roiLeoroiLeo
committed
Merge branch 'main-nuxt' into feature/layout
2 parents 2748005 + ee02387 commit 531da85

File tree

19 files changed

+621
-140
lines changed

19 files changed

+621
-140
lines changed

‎.github/workflows/lint.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Lint Files
22

33
on:
44
push:
5-
branches: [ main ]
5+
branches: [ main, main-nuxt ]
66
pull_request:
7-
branches: [ main ]
7+
branches: [ main, main-nuxt ]
88

99
jobs:
1010
lint:
@@ -16,10 +16,10 @@ jobs:
1616
- name: Setup Node.js
1717
uses: actions/setup-node@v1
1818
with:
19-
node-version: "14"
19+
node-version: "16"
2020

2121
- name: Install Dependencies
2222
run: yarn
2323

24-
- name: Lint Code
25-
run: yarn lint
24+
- name: Run Code Lint
25+
run: yarn lint:quiet

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ package-lock.json
1414
*.njsproj
1515
*.sln
1616
*.sw?
17+
sw.*
1718
.vercel
1819
/test
1920

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Dockerfile
2-
FROM node:16
2+
FROM node:14.18.1
33

44
WORKDIR /kodadot-app
55

@@ -11,6 +11,6 @@ RUN yarn install
1111
COPY . .
1212

1313
ENV HOST 0.0.0.0
14-
EXPOSE 3000
14+
EXPOSE 9000
1515

1616
CMD [ "yarn", "dev" ]

‎components/rmrk/Create/ArweaveUploadSwitch.vue‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
<template>
22
<b-field>
3-
<b-switch
4-
v-model="checkedValue"
5-
:rounded="false"
6-
>
7-
{{ checkedValue ? $t('arweave.uploadYes') : $t('arweave.uploadNo') }}
3+
<b-switch v-model="checkedValue" :rounded="false">
4+
<div class="is-flex is-align-items-center">
5+
<span class="mr-2">
6+
{{ checkedValue ? $t('arweave.uploadYes') : $t('arweave.uploadNo') }}
7+
</span>
8+
<slot name="tooltip" />
9+
</div>
810
</b-switch>
911
</b-field>
1012
</template>

‎components/rmrk/Create/CreateCollection.vue‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,16 @@
7979
</b-button>
8080
</b-field>
8181
<b-field>
82-
<Support v-model="hasSupport" :price="filePrice" />
82+
<Support v-model="hasSupport" :price="filePrice">
83+
<template v-slot:tooltip>
84+
<Tooltip
85+
:label="$t('support.tooltip')"
86+
iconsize="is-small"
87+
buttonsize="is-small"
88+
tooltipsize="is-medium"
89+
/>
90+
</template>
91+
</Support>
8392
</b-field>
8493
</div>
8594
</div>

‎components/rmrk/Create/CreateToken.vue‎

Lines changed: 36 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,17 +79,48 @@
7979
</b-button>
8080
</b-field>
8181
<b-field>
82-
<Support v-model="hasSupport" :price="filePrice" />
82+
<Support v-model="hasSupport" :price="filePrice">
83+
<template v-slot:tooltip>
84+
<Tooltip
85+
:label="$t('support.tooltip')"
86+
iconsize="is-small"
87+
buttonsize="is-small"
88+
tooltipsize="is-medium"
89+
/>
90+
</template>
91+
</Support>
8392
</b-field>
8493
<b-field>
8594
<Support
8695
v-model="hasCarbonOffset"
8796
:price="1"
88-
activeMessage="I'm making carbonless NFT"
89-
passiveMessage="I don't want to have carbonless NFT"
90-
/>
97+
:activeMessage="$t('carbonOffset.carbonOffsetYes')"
98+
:passiveMessage="$t('carbonOffset.carbonOffsetNo')"
99+
>
100+
<template v-slot:tooltip>
101+
<Tooltip
102+
iconsize="is-small"
103+
buttonsize="is-small"
104+
tooltipsize="is-large"
105+
>
106+
<template v-slot:content>
107+
{{ $t('carbonOffset.tooltip') }}
108+
(<a class="has-text-black is-underlined" href='https://kodadot.xyz/carbonless'>https://kodadot.xyz/carbonless</a>)
109+
</template>
110+
</Tooltip>
111+
</template>
112+
</Support>
91113
</b-field>
92-
<ArweaveUploadSwitch v-model="arweaveUpload" />
114+
<ArweaveUploadSwitch v-model="arweaveUpload">
115+
<template v-slot:tooltip>
116+
<Tooltip
117+
:label="$t('arweave.tooltip')"
118+
iconsize="is-small"
119+
buttonsize="is-small"
120+
tooltipsize="is-medium"
121+
/>
122+
</template>
123+
</ArweaveUploadSwitch>
93124
</div>
94125
</div>
95126
</template>

‎components/rmrk/Create/SimpleMint.vue‎

Lines changed: 36 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,17 +161,48 @@
161161
</b-field>
162162
<BasicSwitch v-model="nsfw" label="mint.nfsw" />
163163
<b-field>
164-
<Support v-model="hasSupport" :price="filePrice" />
164+
<Support v-model="hasSupport" :price="filePrice">
165+
<template v-slot:tooltip>
166+
<Tooltip
167+
:label="$t('support.tooltip')"
168+
iconsize="is-small"
169+
buttonsize="is-small"
170+
tooltipsize="is-medium"
171+
/>
172+
</template>
173+
</Support>
165174
</b-field>
166175
<b-field>
167176
<Support
168177
v-model="hasCarbonOffset"
169178
:price="1"
170-
activeMessage="I'm making carbonless NFT"
171-
passiveMessage="I don't want to have carbonless NFT"
172-
/>
179+
:activeMessage="$t('carbonOffset.carbonOffsetYes')"
180+
:passiveMessage="$t('carbonOffset.carbonOffsetNo')"
181+
>
182+
<template v-slot:tooltip>
183+
<Tooltip
184+
iconsize="is-small"
185+
buttonsize="is-small"
186+
tooltipsize="is-large"
187+
>
188+
<template v-slot:content>
189+
{{ $t('carbonOffset.tooltip') }}
190+
(<a class="has-text-black is-underlined" href='https://kodadot.xyz/carbonless'>https://kodadot.xyz/carbonless</a>)
191+
</template>
192+
</Tooltip>
193+
</template>
194+
</Support>
173195
</b-field>
174-
<ArweaveUploadSwitch v-model="arweaveUpload" />
196+
<ArweaveUploadSwitch v-model="arweaveUpload">
197+
<template v-slot:tooltip>
198+
<Tooltip
199+
:label="$t('arweave.tooltip')"
200+
iconsize="is-small"
201+
buttonsize="is-small"
202+
tooltipsize="is-medium"
203+
/>
204+
</template>
205+
</ArweaveUploadSwitch>
175206
<b-field>
176207
<b-switch v-model="hasToS" :rounded="false">
177208
{{ $t('termOfService.accept') }}

‎components/shared/Support.vue‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@
44
:type="type"
55
:rounded="false"
66
>
7-
{{ value ? `${activeMessage} ($ ${rounded})` : `${passiveMessage}` }}
7+
<div class="is-flex is-align-items-center">
8+
<span class="mr-2">
9+
{{ value ? `${activeMessage} ($ ${rounded})` : `${passiveMessage}` }}
10+
</span>
11+
<slot name="tooltip" />
12+
</div>
813
</b-switch>
914
</template>
1015

‎components/shared/Tooltip.vue‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,31 @@
22
<p class="control">
33
<b-tooltip
44
type="is-white"
5-
size="is-small"
5+
:size="tooltipsize"
66
position="is-left"
77
:label="label"
88
multilined
99
square
10+
:triggers="['hover', 'click']"
1011
>
11-
<b-button type="is-dark">
12-
<b-icon
13-
:size="iconsize"
14-
icon="info"
15-
/>
12+
<b-button type="is-dark" :size="buttonsize">
13+
<b-icon :size="iconsize" icon="info" />
1614
</b-button>
15+
<template v-slot:content>
16+
<slot name="content" />
17+
</template>
1718
</b-tooltip>
1819
</p>
1920
</template>
2021

21-
<script lang="ts" >
22-
import { Component, Prop, Vue } from 'nuxt-property-decorator'
22+
<script lang="ts">
23+
import { Component, Prop, Vue } from 'nuxt-property-decorator';
2324
2425
@Component({})
2526
export default class Tooltip extends Vue {
2627
@Prop() public label!: string;
2728
@Prop({ default: 'is-medium' }) public iconsize!: string;
29+
@Prop({ default: 'is-medium' }) public buttonsize!: string;
30+
@Prop({ default: 'is-small' }) public tooltipsize!: string;
2831
}
2932
</script>

‎langDir/en.json‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,16 @@
271271
"price": "price",
272272
"arweave": {
273273
"uploadYes": "Upload NFT image to Arweave",
274-
"uploadNo": "Do not use Arweave"
274+
"uploadNo": "Do not use Arweave",
275+
"tooltip": "Using Arweave means that you are storing your multimedia forever on Arweave, good for small assets like JPEG."
276+
},
277+
"carbonOffset": {
278+
"carbonOffsetYes": "I'm making carbonless NFT",
279+
"carbonOffsetNo": "I don't want to have carbonless NFT",
280+
"tooltip": "Carbonless NFT means that you are helping cover costs for carbon credits and planting trees"
281+
},
282+
"support": {
283+
"tooltip": "Cover costs mean that users help to support initial costs for KodaDot which stores your JPEG on your behalf."
275284
},
276285
"termOfService": {
277286
"accept": "I confirm that I hold full copyright ownership of the submitted digital asset (or have sufficient permission by the owner to use the asset)"

0 commit comments

Comments
 (0)