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

release update #8464

Merged
merged 272 commits into from
Dec 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
272 commits
Select commit Hold shift + click to select a range
3ffb3b7
Fix null reference error in WalletAssetNfts.vue
preschian Nov 29, 2023
dbdc37f
Refactor collection card class in Ready.vue
preschian Nov 29, 2023
d652286
Refactor Review.vue component and useMigrate.ts
preschian Nov 29, 2023
5701409
fix: Loader design
Jarsen136 Nov 29, 2023
51dcce6
Fix collectionOwner query parameter bug
preschian Nov 29, 2023
4d7f233
Merge branch 'main' of github.com:kodadot/nft-gallery into fix/migrat…
preschian Nov 29, 2023
8597479
Refactor conditional rendering in Ready.vue and
preschian Nov 29, 2023
5973601
removed unused file
shashkovdanil Nov 29, 2023
a5f8ab5
* fix(Waiting.vue): fix condition for displaying collection cards bas…
preschian Nov 29, 2023
16872de
* fix(Waiting.vue): remove unnecessary condition for displaying issue…
preschian Nov 29, 2023
5bf75fc
Revert "removed unused file"
shashkovdanil Nov 29, 2023
e7597d1
* feat(useMigrate.ts): add toReview function for navigating to the re…
preschian Nov 29, 2023
b510185
Merge remote-tracking branch 'origin/main' into tailwindcss-media-item
shashkovdanil Nov 29, 2023
b7b1fd5
* fix(Ready.vue): update click event to use collection.nfts instead o…
preschian Nov 29, 2023
7b653e2
* refactor(WalletAssetNfts.vue): replace anchor tag with NuxtLink com…
preschian Nov 29, 2023
f076bcf
creatnft test readability
prury Nov 29, 2023
8491313
* fix(Ready.vue): fix variable assignment for migrated and hide
preschian Nov 29, 2023
97954bb
* feat(Ready.vue): update click event to pass an object with collecti…
preschian Nov 29, 2023
8806f30
Merge branch 'main' of https://github.com/kodadot/nft-gallery into pw…
prury Nov 29, 2023
ac22719
transfer tests readability
prury Nov 29, 2023
702b084
prefix test readability
prury Nov 29, 2023
555cccc
search readability and improvements
prury Nov 29, 2023
4438df2
redirect test readability and additions
prury Nov 29, 2023
936f086
language readability
prury Nov 29, 2023
1698bdf
explore test improvement
prury Nov 29, 2023
c4f9577
galleryitem refactor
prury Nov 29, 2023
3a8d51a
create collection readability
prury Nov 29, 2023
857dddc
small details
prury Nov 29, 2023
b469cba
Merge branch 'main' into pw/improvements
prury Nov 29, 2023
ab126cc
assetHub works
daiagi Nov 30, 2023
0e6ff74
assetHub works
daiagi Nov 30, 2023
24a8b83
Merge branch 'massmint-multiupload' of https://github.com/kodadot/nft…
daiagi Nov 30, 2023
5eed7f7
order!!
daiagi Nov 30, 2023
e861bba
* fix(Ready.vue): change condition for checking if entities should be…
preschian Nov 30, 2023
b571dc4
Merge branch 'main' of github.com:kodadot/nft-gallery into fix/migrat…
preschian Nov 30, 2023
be42cbf
fix: k-grey light dark color
hassnian Nov 30, 2023
379646d
fix: Loading screen boring
Jarsen136 Nov 30, 2023
7c6d745
fix unit tests
daiagi Nov 30, 2023
6a3f0f8
refactor to reduce dupliaction and complexity
daiagi Nov 30, 2023
ae372ac
Merge branch 'main' of https://github.com/kodadot/nft-gallery into ma…
daiagi Nov 30, 2023
2dc8c60
Merge branch 'main' of https://github.com/kodadot/nft-gallery into ma…
daiagi Nov 30, 2023
7ee103b
fix: generative mint modal
Jarsen136 Nov 30, 2023
93c8a24
Merge branch 'main' into issue-8307
Jarsen136 Nov 30, 2023
bb3493e
fix: Link new drop to landing
Jarsen136 Nov 30, 2023
b7854af
Merge pull request #8319 from Jarsen136/issue-8318
Jarsen136 Nov 30, 2023
4039f5c
fix: Disabled claim till generate new
Jarsen136 Nov 30, 2023
4e80067
Merge pull request #8308 from Jarsen136/issue-8307
yangwao Nov 30, 2023
0d44f58
fix: rotate center
Jarsen136 Nov 30, 2023
96fdf9d
share button test
prury Nov 30, 2023
0025255
variable name and location
prury Nov 30, 2023
e6d8d08
Merge branch 'main' of https://github.com/kodadot/nft-gallery into pw…
prury Nov 30, 2023
05139b3
prefix refactor
prury Nov 30, 2023
4b70adf
remove comment
prury Nov 30, 2023
99b77cf
ref: update k grey light
hassnian Dec 1, 2023
e73a4f7
Merge branch 'main' of https://github.com/kodadot/nft-gallery into ma…
daiagi Dec 1, 2023
735b4c0
Merge branch 'main' into feature/collection/customize
roiLeo Dec 1, 2023
db713a2
refactor - easier to read
daiagi Dec 1, 2023
e872935
delete commented code
daiagi Dec 1, 2023
5ed63d9
🔧 tx SetCollectionMaxSupply
roiLeo Dec 1, 2023
29bedef
🔧 tx SetCollectionMaxSupply
roiLeo Dec 1, 2023
a17ccdd
🔧 default set max
roiLeo Dec 1, 2023
2ccd763
🔧 query collection max
roiLeo Dec 1, 2023
6af1ea8
Merge branch 'main' into tailwindcss-media-item
roiLeo Dec 1, 2023
fd7c95b
Merge pull request #8244 from shashkovdanil/tailwindcss-media-item
roiLeo Dec 1, 2023
91b3962
Merge branch 'main' of github.com:kodadot/nft-gallery into fix/migrat…
preschian Dec 1, 2023
55e8ac2
Remove unused code and refactor startStep1
preschian Dec 1, 2023
ea1a005
refactor and directory upload -Remark
daiagi Dec 1, 2023
d21b673
Merge branch 'main' of https://github.com/kodadot/nft-gallery into ma…
daiagi Dec 1, 2023
9d8e81e
add carbon offset
daiagi Dec 1, 2023
2c9f7c9
Merge branch 'main' of https://github.com/kodadot/nft-gallery into Re…
daiagi Dec 1, 2023
434e14f
* refactor(Review.vue): simplify code by removing unnecessary optiona…
preschian Dec 1, 2023
5fb83e4
Fix conditional rendering bug in Review.vue
preschian Dec 1, 2023
3cda51c
fix: Add Swirls and Snowflakes to sidebar
Jarsen136 Dec 1, 2023
8a32d11
Merge pull request #8331 from Jarsen136/issue-8330
Jarsen136 Dec 1, 2023
a0d0d22
chore: wathc method
Jarsen136 Dec 1, 2023
c9330f8
fix: When switching from transfer on polkadot, refresh network
Jarsen136 Dec 1, 2023
47da901
Migrated NeoAutocomplete to tailwindcss
shashkovdanil Dec 1, 2023
5c9354d
Migrated NeoAvatar to tailwindcss
shashkovdanil Dec 1, 2023
641158e
Fixed border class
shashkovdanil Dec 1, 2023
638bc15
Migrated NeoCheckbox to tailwindcss
shashkovdanil Dec 1, 2023
6ef347a
Migrated NeoCollapsible to tailwindcss
shashkovdanil Dec 1, 2023
b463274
Migrated NeoDropdown to tailwindcss
shashkovdanil Dec 1, 2023
3245680
Migrated NeoIcon to tailwindcss
shashkovdanil Dec 1, 2023
06b8d3d
Migrated NeoInput to tailwindcss
shashkovdanil Dec 1, 2023
b310d58
add: hover white button
hassnian Dec 2, 2023
854d471
fix: shine over text
hassnian Dec 2, 2023
9d9fc7d
fix: incorrect bg color on hover state
newraina Dec 2, 2023
706e827
🔧 switch to tailwind & fix histoire darkmode
roiLeo Dec 2, 2023
5230d9c
🔧 histoire darkmode vars
roiLeo Dec 2, 2023
3632ccf
fix: 1 decimal in usd price
Jarsen136 Dec 2, 2023
b997bfb
Merge pull request #8366 from Jarsen136/issue-8364
yangwao Dec 2, 2023
e0fbe5d
added import
shashkovdanil Dec 2, 2023
9963bd0
added import
shashkovdanil Dec 2, 2023
7dd1357
added import
shashkovdanil Dec 2, 2023
9c05952
added import
shashkovdanil Dec 2, 2023
94ceb46
added import
shashkovdanil Dec 2, 2023
7636c04
add: listing fees
hassnian Dec 3, 2023
9e1b361
fix: modal width class
hassnian Dec 3, 2023
43d8f0e
removed: duplicate import
hassnian Dec 3, 2023
5d63148
add: simplified autoteleport button
hassnian Dec 3, 2023
f7d1fb0
Merge branch 'main' into neoinput-tailwindcss
shashkovdanil Dec 3, 2023
2db6386
Merge branch 'main' into neoavatar-tailwindcss
shashkovdanil Dec 3, 2023
91a455d
Merge branch 'main' into issue-8321
Jarsen136 Dec 3, 2023
add3a7e
add: shop voucher icon
hassnian Dec 4, 2023
6c71295
ref: icon composables
hassnian Dec 4, 2023
0d05820
Merge branch 'main' into chore/ui/switch
roiLeo Dec 4, 2023
f457636
Merge pull request #8361 from roiLeo/chore/ui/switch
roiLeo Dec 4, 2023
cee27e4
💅 collection max supply
roiLeo Dec 4, 2023
5bff99f
fix: switch chain
Jarsen136 Dec 4, 2023
403b9c9
Merge branch 'main' into neoautocomplete-tailwindcss
shashkovdanil Dec 4, 2023
105df75
removed unneeded import style
shashkovdanil Dec 4, 2023
ad25301
Merge branch 'main' into neoavatar-tailwindcss
shashkovdanil Dec 4, 2023
4c5ab89
[skip ci] updated code diagram
kkukelka Dec 4, 2023
afd98cd
Update components/collection/CollectionInfo.vue
roiLeo Dec 4, 2023
7863057
Merge branch 'main' into pw/improvements
prury Dec 4, 2023
27a56a3
fix: no shone on hover
hassnian Dec 4, 2023
85d81fe
reF: use inline width property
hassnian Dec 4, 2023
7dddc6c
ref: getTokenIconBySymbol useIcon
hassnian Dec 4, 2023
81569c2
Merge branch 'main' into issue-8317
hassnian Dec 4, 2023
3831608
Merge branch 'main' into issue-8317
hassnian Dec 4, 2023
5fc6b88
Merge branch 'main' into feature/collection/customize
roiLeo Dec 4, 2023
d926e4c
Revert "added import"
shashkovdanil Dec 4, 2023
6820266
Merge branch 'main' into neocheckbox-tailwindcss
shashkovdanil Dec 4, 2023
337aef1
Merge branch 'main' into neocollapsible-tailwindcss
shashkovdanil Dec 4, 2023
83bc426
Revert "added import"
shashkovdanil Dec 4, 2023
d38afd9
Merge branch 'main' into neodropdown-tailwindcss
shashkovdanil Dec 4, 2023
cd142d9
🔧 collection set max
roiLeo Dec 4, 2023
a9bc3e6
Revert "added import"
shashkovdanil Dec 4, 2023
aa0a59d
Merge branch 'main' into neoinput-tailwindcss
prury Dec 4, 2023
36ba122
Merge branch 'main' into neoicon-tailwindcss
shashkovdanil Dec 4, 2023
e7c48ee
Revert "added import"
shashkovdanil Dec 4, 2023
c0c077d
InputItems to tailwindcss
shashkovdanil Dec 4, 2023
dea7829
🔧 collection set max loader
roiLeo Dec 4, 2023
f99a873
Merge pull request #8341 from shashkovdanil/neocheckbox-tailwindcss
roiLeo Dec 4, 2023
21b68c5
🔧 collection set max disabled quick and dirty
roiLeo Dec 4, 2023
e0f22ca
Fixed NeoAvatar size bug
shashkovdanil Dec 4, 2023
fda00a7
Merge pull request #8360 from newraina/5773
yangwao Dec 4, 2023
d8c1d61
Merge branch 'main' into neocollapsible-tailwindcss
roiLeo Dec 4, 2023
f5357e5
Merge pull request #8343 from shashkovdanil/neocollapsible-tailwindcss
roiLeo Dec 4, 2023
b38208c
Fixed colors
shashkovdanil Dec 4, 2023
201985f
Merge branch 'main' into neodropdown-tailwindcss
shashkovdanil Dec 4, 2023
68b97d9
Merge branch 'main' into neoinput-tailwindcss
roiLeo Dec 4, 2023
10d4b19
🔧 NeoCheckbox story
roiLeo Dec 4, 2023
997c16b
Remove unneeded margins
shashkovdanil Dec 4, 2023
1089e77
Merge branch 'main' into overview-table-avatar-bug
shashkovdanil Dec 4, 2023
a7e28b8
Merge branch 'main' into avatar-bug
shashkovdanil Dec 4, 2023
2a8438c
Merge branch 'main' into neoautocomplete-tailwindcss
shashkovdanil Dec 4, 2023
5ede306
Improved blur UI
shashkovdanil Dec 4, 2023
4fa3f27
Merge branch 'main' into blur-readibility
shashkovdanil Dec 4, 2023
31b7389
Merge pull request #8374 from hassnian/issue-8162
yangwao Dec 4, 2023
f549004
Merge pull request #8357 from hassnian/issue-8317
yangwao Dec 4, 2023
91703a5
Merge pull request #8388 from hassnian/issue-8385
yangwao Dec 4, 2023
a7e7e55
Merge pull request #8291 from Jarsen136/issue-8278
yangwao Dec 4, 2023
7870382
Merge pull request #8304 from hassnian/issue-8287
yangwao Dec 4, 2023
f9a5653
Merge pull request #8280 from kodadot/fix/migrate-empty-items-
yangwao Dec 4, 2023
37e998d
Merge pull request #8045 from roiLeo/feature/collection/customize
yangwao Dec 4, 2023
e5f42f9
Merge pull request #8299 from kodadot/pw/improvements
yangwao Dec 4, 2023
d398ee8
Merge pull request #8397 from shashkovdanil/avatar-bug
yangwao Dec 4, 2023
e9c208f
Merge pull request #8336 from shashkovdanil/neoautocomplete-tailwindcss
yangwao Dec 4, 2023
64a8954
Merge pull request #8302 from kodadot/massmint-multiupload
yangwao Dec 4, 2023
47e08ca
Merge pull request #8320 from Jarsen136/issue-8315
yangwao Dec 4, 2023
830b8f1
Merge pull request #8402 from shashkovdanil/overview-table-avatar-bug
yangwao Dec 4, 2023
be3b93d
Merge pull request #8389 from roiLeo/feature/collection/maxSupply
vikiival Dec 4, 2023
681f47c
NeoLoading to tailwindcss and added icons to historie
shashkovdanil Dec 4, 2023
e6c1f3c
Merge pull request #8401 from roiLeo/fix/ui/neoCheckboxStory
roiLeo Dec 5, 2023
3f2f9b2
⬆️ minimark package
roiLeo Dec 5, 2023
c9e0046
Merge branch 'main' into neoicon-tailwindcss
roiLeo Dec 5, 2023
e7a97e3
Merge branch 'main' into neoinput-tailwindcss
roiLeo Dec 5, 2023
143f6b0
Merge pull request #8355 from shashkovdanil/neoinput-tailwindcss
roiLeo Dec 5, 2023
4ba2b24
Merge branch 'main' into neoavatar-tailwindcss
roiLeo Dec 5, 2023
fc7d1d5
Merge branch 'main' into neodropdown-tailwindcss
roiLeo Dec 5, 2023
09d56bf
Merge pull request #8350 from shashkovdanil/neodropdown-tailwindcss
roiLeo Dec 5, 2023
1cd58a0
Merge pull request #8338 from shashkovdanil/neoavatar-tailwindcss
roiLeo Dec 5, 2023
2236468
Merge branch 'main' into neoicon-tailwindcss
roiLeo Dec 5, 2023
7e01215
Merge pull request #8413 from roiLeo/fix/rmrk/destroy
vikiival Dec 5, 2023
5c309ca
Merge branch 'main' into neoloading-tailwindcss
roiLeo Dec 5, 2023
cc532ae
Merge pull request #8412 from shashkovdanil/neoloading-tailwindcss
roiLeo Dec 5, 2023
4df3a8c
feat: gallery item page view counter
newraina Dec 5, 2023
60ab3c1
format page view count in GalleryItem.
newraina Dec 5, 2023
ca54aa4
Update components/gallery/GalleryItem.vue
newraina Dec 5, 2023
13d20e5
Update components/gallery/GalleryItem.vue
newraina Dec 5, 2023
81f8ab1
fix: Links not visible in Description
Jarsen136 Dec 5, 2023
adafd53
fix: Show more link collection
Jarsen136 Dec 5, 2023
89bee26
import
prury Dec 5, 2023
07133b7
code smell
prury Dec 5, 2023
f0e843d
Added gasless drop modal feature
shashkovdanil Dec 5, 2023
672ebf6
Used chain from drop
shashkovdanil Dec 5, 2023
61d4fee
Merge branches 'Remark---massmint-multi-upload' and 'main' of github.…
preschian Dec 5, 2023
bef27ea
fix(carousel.ts): add optional chaining to nft.resources array access
preschian Dec 5, 2023
c79083e
Bump vite from 4.4.11 to 4.4.12
dependabot[bot] Dec 5, 2023
ec6d414
Merge pull request #8328 from kodadot/Remark---massmint-multi-upload
preschian Dec 5, 2023
fe7f96d
Merge pull request #8426 from kodadot/fix/drop-icon
roiLeo Dec 6, 2023
ece5fb9
Merge branch 'main' into neoicon-tailwindcss
roiLeo Dec 6, 2023
7f0f04d
Merge branch 'main' into dependabot/npm_and_yarn/vite-4.4.12
roiLeo Dec 6, 2023
9347f2b
Merge pull request #8436 from kodadot/dependabot/npm_and_yarn/vite-4.…
roiLeo Dec 6, 2023
6d7eb1c
Merge pull request #8351 from shashkovdanil/neoicon-tailwindcss
roiLeo Dec 6, 2023
8207555
Merge branch 'main' into fix/undefined-thumb
roiLeo Dec 6, 2023
52a4836
Merge pull request #8435 from kodadot/fix/undefined-thumb
roiLeo Dec 6, 2023
678596c
Merge branch 'main' into issue-8405
roiLeo Dec 6, 2023
282d477
Merge pull request #8421 from Jarsen136/issue-8405
roiLeo Dec 6, 2023
9936f52
add: working new drop modal confirm flow
hassnian Dec 6, 2023
8259dba
ref: modal skeleton loader
hassnian Dec 6, 2023
7faf9f9
Add neutral color palette to tailwind config
newraina Dec 6, 2023
e3f76ec
Merge pull request #8334 from Jarsen136/issue-8321
yangwao Dec 6, 2023
922c2c9
change the color of page view count
newraina Dec 6, 2023
4f5e1fe
fix: Deduplicate drop information - Total available items
Jarsen136 Dec 6, 2023
4caf607
Merge branch 'main' into gasless-drop
shashkovdanil Dec 6, 2023
2e2ef75
Merge pull request #8442 from Jarsen136/issue-8441
yangwao Dec 6, 2023
47d18dd
Merge pull request #8404 from shashkovdanil/blur-readibility
yangwao Dec 6, 2023
d882003
fix: use real nft name
hassnian Dec 6, 2023
114b689
add: collection name as link
hassnian Dec 6, 2023
15105b2
Used minimum from meta
shashkovdanil Dec 6, 2023
cd6ce07
Fixed TS error
shashkovdanil Dec 6, 2023
bbddbef
Merge branch 'main' into gasless-drop
shashkovdanil Dec 6, 2023
e2d255a
fix: mobile voucher
hassnian Dec 6, 2023
dc0eda9
styles: added is-size-8 class
hassnian Dec 6, 2023
784af4a
Tooltip overlap fix
shashkovdanil Dec 6, 2023
036f7f7
Fixed condition
shashkovdanil Dec 6, 2023
817d55f
Merge branch 'main' into issue-8163
hassnian Dec 7, 2023
cb3df5c
ref: use countdown getFormattedDuration
hassnian Dec 7, 2023
56a9db7
fix: Make claim button active when wallet is not connected
Jarsen136 Dec 7, 2023
bf44ec8
fix: loading center
Jarsen136 Dec 7, 2023
0e77198
Merge branch 'main' into issue-8444
Jarsen136 Dec 7, 2023
5dd0304
fix: loading icon
Jarsen136 Dec 7, 2023
44586ff
add: listing subscription
hassnian Dec 7, 2023
38b0733
fix: move list toast to successful drop
hassnian Dec 7, 2023
2f7c280
ref: reduce cc of getFormattedDuration
hassnian Dec 7, 2023
3267ef6
:bug: Berlin (Blockchain) Waifus is always good default
vikiival Dec 7, 2023
e470db0
:zap: use default name from D1
vikiival Dec 7, 2023
a4b4b58
:label: minted
vikiival Dec 7, 2023
0155f47
:zap: use optionally max from D1
vikiival Dec 7, 2023
034368c
:wrench: drop cannot resolve sooner than 2 min
vikiival Dec 7, 2023
bea7781
Merge pull request #8375 from hassnian/issue-8368
yangwao Dec 7, 2023
9924ba1
Merge branch 'main' into gasless-drop
shashkovdanil Dec 7, 2023
d49b0d4
Merge pull request #8446 from Jarsen136/issue-8444
yangwao Dec 7, 2023
d559990
Merge pull request #8447 from kodadot/fix/drop/name
yangwao Dec 7, 2023
d23a5c0
Merge pull request #8417 from newraina/view-counter
yangwao Dec 7, 2023
9d68fb5
Merge branch 'main' into issue-8163
hassnian Dec 7, 2023
3ae57c0
conflicts
shashkovdanil Dec 7, 2023
417f0af
fix: typo
hassnian Dec 7, 2023
af04110
Merge pull request #8390 from kodadot/action
Jarsen136 Dec 7, 2023
094417f
Merge pull request #8440 from hassnian/issue-8163
yangwao Dec 7, 2023
2abfd50
conflicts
shashkovdanil Dec 7, 2023
6c5975a
🔧 add new live drop
roiLeo Dec 7, 2023
b20c9dd
Merge pull request #8460 from roiLeo/chore/drop/generative
yangwao Dec 7, 2023
c8cb606
Merge pull request #8434 from shashkovdanil/gasless-drop
yangwao Dec 7, 2023
47e3126
adding wallstreet to landing
yangwao Dec 7, 2023
2c4d143
good dogie
yangwao Dec 7, 2023
c458c1e
Merge pull request #8462 from kodadot/add-wallstreet-drop
yangwao Dec 7, 2023
183e039
Merge pull request #8463 from kodadot/main
yangwao Dec 7, 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 .github/diagram.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 9 additions & 2 deletions assets/styles/abstracts/_animations.scss
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@
animation: dots 1.5s infinite;
}

@mixin shineEffect($shineColor, $shineHover) {
@mixin shineEffect($shineColor, $shineHover, $overChild: true) {
position: relative;
overflow: hidden;

&::before,
Expand All @@ -117,7 +118,7 @@
background-color: $shineColor;
transform: skewX(-30deg);
transition: background-color 0.3s;
z-index: 0;
z-index: 1;
}

&::before {
Expand All @@ -138,6 +139,12 @@
background-color: $shineHover
}
}

@if not $overChild {
> :first-child {
z-index: 2;
}
}
}

@keyframes shine1 {
Expand Down
4 changes: 2 additions & 2 deletions assets/styles/abstracts/_theme.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ $themes: (
'k-redaccent2': #ffe6e6,
'k-grey': #999999,
'k-grey-fix': #999999,
'k-grey-light': #ECECEC,
'k-grey-light': #f5f5f5,
'k-pink': #ffb6ef,
'k-yellow': #feffb6,
'warning-yellow': #fffbcc,
Expand Down Expand Up @@ -72,7 +72,7 @@ $themes: (
'k-redaccent2': #390b0b,
'k-grey': #cccccc,
'k-grey-fix': #999999,
'k-grey-light': #ECECEC,
'k-grey-light': #1f1f1f,
'k-pink': #7a2a68,
'k-yellow': #363234,
'warning-yellow': #3f3500,
Expand Down
3 changes: 3 additions & 0 deletions assets/styles/components/_content-markdown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,7 @@
code {
font-family: monospace;
}
a {
color: var(--k-blue) !important;
}
}
17 changes: 13 additions & 4 deletions assets/styles/global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -336,15 +336,15 @@ a.has-text-grey {
}
}

.border-k-grey {
.border-top-k-shade {
@include ktheme() {
border-color: theme('k-grey') !important;
border-top: 1px solid theme('k-shade');
}
}

.border-top-k-shade {
.border-bottom-k-shade {
@include ktheme() {
border-top: 1px solid theme('k-shade');
border-bottom: 1px solid theme('k-shade');
}
}

Expand Down Expand Up @@ -550,6 +550,11 @@ a.has-text-grey {
border-radius: 50%;
}

.is-rounded-small {
border-radius: 4rem;
}


.w-half {
width: 50%;
}
Expand All @@ -567,6 +572,10 @@ a.has-text-grey {
font-size: 1.6rem;
}

.is-size-8 {
font-size: 0.5rem;
}

.is-max-width-fit-content {
max-width: fit-content;
}
Expand Down
5 changes: 2 additions & 3 deletions components/base/MediaItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,8 @@ defineExpose({ isLewdBlurredLayer })
top: 0;
height: 100%;
width: 100%;
@include ktheme() {
color: theme('text-color');
}
background-color: rgb(0 0 0 / 50%);
color: #fff;

.nsfw-desc {
max-width: 18.75rem;
Expand Down
2 changes: 1 addition & 1 deletion components/carousel/CarouselTypeGenerative.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ import { useCarouselGenerativeNftEvents } from './utils/useCarouselEvents'

const { nfts, ids } = await useCarouselGenerativeNftEvents(
['176'],
['38', '40', '46'],
['38', '40', '46', '49', '50'],
)
</script>
5 changes: 5 additions & 0 deletions components/collection/CollectionInfo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@
:value="stats.uniqueOwners" />
</div>
<div>
<CollectionInfoLine
v-if="isAssetHub"
:title="$t('activity.totalSupply')"
:value="stats.maxSupply || $t('helper.unlimited')" />
<CollectionInfoLine :title="$t('activity.floor')">
<CommonTokenMoney
:value="stats.collectionFloorPrice"
Expand Down Expand Up @@ -71,6 +75,7 @@ import {
const route = useRoute()
const { urlPrefix } = usePrefix()
const { availableChains } = useChain()
const { isAssetHub } = useIsChain(urlPrefix)
const collectionId = computed(() => route.params.id)
const chain = computed(
() =>
Expand Down
86 changes: 86 additions & 0 deletions components/collection/CustomizeModal.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
<template>
<NeoModal :value="value" @close="value = false">
<div class="py-4 px-5 limit-width">
<div class="is-flex mb-3 is-size-6 has-text-weight-bold">
{{ 'Customize Collection' }}
</div>
<div class="has-text-grey is-size-7 mb-5">
This will update the Maximum items in your collection
</div>
<!-- collection max nfts -->
<NeoField
:label="$t('Maximum NFTs in collection')"
data-testid="collection-maxAmount"
required>
<div class="w-full">
<NeoInput
v-model="max"
type="number"
:placeholder="`${min} is the minimum`"
:min="min" />
</div>
</NeoField>
<div class="is-flex is-justify-content-flex-end">
<NeoButton
class="has-text-weight-bold mr-4"
variant="text"
no-shadow
@click="customizeCollection">
<span class="has-text-k-green">
{{ $t('Update') }}
</span>
</NeoButton>
<NeoButton
class="has-text-weight-bold"
variant="text"
no-shadow
:label="$t('cancel')"
@click="value = false" />
</div>
</div>
</NeoModal>
</template>

<script setup lang="ts">
import { NeoButton, NeoField, NeoInput, NeoModal } from '@kodadot1/brick'
import { Collections } from '@/composables/transaction/types'

const { $updateLoader } = useNuxtApp()
const { transaction, status } = useTransaction()
const { urlPrefix } = usePrefix()
const route = useRoute()

const props = defineProps<{
modelValue: boolean
min: number
max: number
}>()
const emit = defineEmits(['update:value', 'customize'])

const value = useVModel(props, 'modelValue')

const min = computed(() => props.min || 1)
const max = ref(props.max)

const customizeCollection = async () => {
emit('customize')
$updateLoader(true)

await transaction({
interaction: Collections.SET_MAX_SUPPLY,
collectionId: route.params.id.toString(),
urlPrefix: urlPrefix.value,
max: Number(max.value),
})

if (status.value === TransactionStatus.Finalized) {
$updateLoader(false)
}
}
</script>

<style lang="scss" scoped>
.limit-width {
max-width: 314px;
}
</style>
35 changes: 35 additions & 0 deletions components/collection/HeroButtonCustomizeCollection.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<template>
<NeoDropdownItem
:disabled="max"
@click="customizeCollectionModalActive = true">
{{ $i18n.t('moreActions.customize') }}
</NeoDropdownItem>

<CollectionCustomizeModal
v-model="customizeCollectionModalActive"
:min="min"
:max="max"
@customize="closeModal" />
</template>

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

withDefaults(
defineProps<{
min: number
max: number
}>(),
{
min: undefined,
max: undefined,
},
)

const { $i18n } = useNuxtApp()
const customizeCollectionModalActive = ref(false)

const closeModal = () => {
customizeCollectionModalActive.value = false
}
</script>
14 changes: 7 additions & 7 deletions components/collection/HeroButtons.vue
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@

<!-- related: #5792 -->
<div v-if="isOwner">
<HeroButtonDeleteNfts />
<HeroButtonDeleteCollection />
<!-- <NeoDropdownItem>
{{ $i18n.t('moreActions.customize') }}
</NeoDropdownItem> -->
<CollectionHeroButtonDeleteNfts />
<CollectionHeroButtonDeleteCollection />
<CollectionHeroButtonCustomizeCollection
:min="collectionNftCount"
:max="collectionMaxCount" />
</div>
<NeoDropdownItem disabled>
{{ $i18n.t('moreActions.reportCollection') }}
Expand Down Expand Up @@ -100,8 +100,6 @@ import {
NeoModal,
} from '@kodadot1/brick'
import { useCollectionMinimal } from '@/components/collection/utils/useCollectionDetails'
import HeroButtonDeleteCollection from './HeroButtonDeleteCollection.vue'
import HeroButtonDeleteNfts from './HeroButtonDeleteNfts.vue'

const route = useRoute()
const { isCurrentOwner } = useAuth()
Expand All @@ -118,6 +116,8 @@ const { collection } = useCollectionMinimal({
collectionId: collectionId.value,
})
const collectionIssuer = computed(() => collection.value?.issuer)
const collectionNftCount = computed(() => collection.value?.nftCount)
const collectionMaxCount = computed(() => collection.value?.max)

const { twitter } = useIdentity({
address: collectionIssuer,
Expand Down
Loading