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.

Sign up for GitHub

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

feat: Update wearable creation flow #2567

Draft
wants to merge 15 commits into
base: master
Choose a base branch
from
Draft

feat: Update wearable creation flow #2567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
dfd8796
feat: Upgrade decentraland-ui package
cyaiox Mar 16, 2023
b91074a
fix: Create emotes in TP collections
cyaiox Mar 16, 2023
0d44f61
feat: Update creation flow for wearables
cyaiox Mar 16, 2023
8dc5cf4
feat: Update edit thumbnails using the WearablePreview for Wearables
cyaiox Mar 16, 2023
5fc6a16
feat: Send type param to the WearablePreview to render Wearables usin…
cyaiox Mar 16, 2023
8a3a11f
feat: Remove unused css
cyaiox Mar 16, 2023
dedc20c
fix: Saving thumbnails
cyaiox Mar 16, 2023
596c417
feat: Remove baseUrl for testing
cyaiox Mar 17, 2023
070dc10
fix: Open WearablePreview in the ItemEditor page
cyaiox Mar 27, 2023
5074a92
fix: Update react-tile-map path
cyaiox Apr 6, 2023
184c3d7
fix: Set required modal name
cyaiox Apr 6, 2023
f3e5bb4
feat: Update wearable preview zoom granularity
cyaiox Apr 6, 2023
3b604f0
fix: rollback decentraland-dapps version due login modal error
cyaiox Apr 7, 2023
b8050ba
fix: ImportStep type
cyaiox Apr 7, 2023
2f948e8
fix: LoginModal
cyaiox Apr 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
159 changes: 41 additions & 118 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
"dcl-scene-writer": "^1.1.2",
"decentraland": "^3.3.0",
"decentraland-builder-scripts": "^0.24.0",
"decentraland-dapps": "^13.41.0",
"decentraland-dapps": "^13.45.2",
"decentraland-ecs": "file:ecs/decentraland-ecs-6.6.1-20201020183014.commit-bdc29ef-hotfix.tgz",
"decentraland-experiments": "^1.0.2",
"decentraland-transactions": "^1.42.0",
"decentraland-ui": "^3.63.0",
"decentraland-ui": "^3.92.3",
"ethers": "^5.6.8",
"file-saver": "^2.0.1",
"graphql": "^15.8.0",
Expand Down
2 changes: 1 addition & 1 deletion src/components/Atlas/Atlas.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Dispatch } from 'redux'
import { CallHistoryMethodAction } from 'connected-react-router'
import { Tile } from 'react-tile-map/lib/src/lib/common'
import { Tile } from 'react-tile-map/dist/lib/common'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fix lib path

import { AtlasTile, AtlasProps } from 'decentraland-ui'
import { LandTile } from 'modules/land/types'

Expand Down
6 changes: 3 additions & 3 deletions src/components/ItemDetailPage/ItemDetailPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { areEmoteMetrics } from 'modules/models/types'
import { Item } from 'modules/item/types'
import { isThirdParty } from 'lib/urn'
import { shorten } from 'lib/address'
import { getMaxSupply, getMissingBodyShapeType, isFree, resizeImage, getThumbnailURL } from 'modules/item/utils'
import { getMaxSupply, getMissingBodyShapeType, isFree, resizeImage, getThumbnailURL, isModelCategory } from 'modules/item/utils'
import { getCollectionType, isLocked as isCollectionLocked } from 'modules/collection/utils'
import { dataURLToBlob } from 'modules/media/utils'
import { computeHashes } from 'modules/deployment/contentUtils'
Expand Down Expand Up @@ -42,7 +42,7 @@ export default class ItemDetailPage extends React.PureComponent<Props, State> {

handleDeleteItem = () => {
const { item, onDelete } = this.props
onDelete(item!)
item && onDelete(item)
}

handleEditRepresentation = () => {
Expand Down Expand Up @@ -70,7 +70,7 @@ export default class ItemDetailPage extends React.PureComponent<Props, State> {
handleOpenThumbnailDialog = () => {
const { item, onOpenModal } = this.props

if (item?.type === ItemType.EMOTE) {
if (item?.type === ItemType.EMOTE || (item?.data.category && isModelCategory(item.data.category))) {
onOpenModal('EditThumbnailModal', { onSaveThumbnail: this.handleEmoteThumbnailChange, item })
} else if (this.thumbnailInput.current) {
this.thumbnailInput.current.click()
Expand Down
5 changes: 3 additions & 2 deletions src/components/ItemEditorPage/RightPanel/RightPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ import {
isOwner,
resizeImage,
getEmoteCategories,
getEmotePlayModes
getEmotePlayModes,
isModelCategory
} from 'modules/item/utils'
import { isLocked } from 'modules/collection/utils'
import { computeHashes } from 'modules/deployment/contentUtils'
Expand Down Expand Up @@ -231,7 +232,7 @@ export default class RightPanel extends React.PureComponent<Props, State> {
handleOpenThumbnailDialog = () => {
const { selectedItem, onOpenModal } = this.props

if (selectedItem?.type === ItemType.EMOTE) {
if (selectedItem?.type === ItemType.EMOTE || (selectedItem?.data.category && isModelCategory(selectedItem.data.category))) {
onOpenModal('EditThumbnailModal', { onSaveThumbnail: this.handleEmoteThumbnailChange, item: selectedItem })
} else if (this.thumbnailInput.current) {
this.thumbnailInput.current.click()
Expand Down
13 changes: 0 additions & 13 deletions src/components/Modals/CreateSingleItemModal/CreateSingleItemModal.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,19 +163,6 @@
display: none;
}

.CreateSingleItemModal .thumbnail-step-container {
width: 100%;
height: 440px;
overflow: hidden;
position: relative;
display: flex;
flex-direction: column;
}

.CreateSingleItemModal .thumbnail-actions.dcl.row.grow.shrink {
justify-content: space-between;
}

.CreateSingleItemModal .ui.dropdown.upward .menu {
background-color: var(--smart-grey);
}
Expand Down
Loading