diff --git a/.eslintrc.json b/.eslintrc.json index e3bb1ed8..1cd6d95c 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,4 +1,5 @@ { + "root": true, "settings": { "react": { "pragma": "React", @@ -32,8 +33,13 @@ "@typescript-eslint/indent": [ "error", 4, { "SwitchCase": 1 } ], "array-bracket-spacing": [ "error", "always" ], "brace-style": [ "error", "allman" ], + "template-curly-spacing": [ "error", "always" ], + "no-multi-spaces": [ "error" ], "react/prop-types": [ "off" ], - "object-curly-spacing": [ "error", "always" ], + "jsx-quotes": [ "error" ], + "react/jsx-curly-spacing": [ "error", "always" ], + "react/jsx-equals-spacing": [ "error" ], + "@typescript-eslint/object-curly-spacing": [ "error", "always", { "arraysInObjects": true, "objectsInObjects": false } ], "@typescript-eslint/ban-types": [ "error", { diff --git a/src/App.tsx b/src/App.tsx index c818be31..63b77e0c 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -140,7 +140,7 @@ export const App: FC<{}> = props => return ( { (!isReady || isError) && - } + } diff --git a/src/api/friends/OpenMessengerChat.ts b/src/api/friends/OpenMessengerChat.ts index 10add8c3..7573bafb 100644 --- a/src/api/friends/OpenMessengerChat.ts +++ b/src/api/friends/OpenMessengerChat.ts @@ -3,5 +3,5 @@ import { CreateLinkEvent } from '..'; export function OpenMessengerChat(friendId: number = 0): void { if(friendId === 0) CreateLinkEvent('friends-messenger/open'); - else CreateLinkEvent(`friends-messenger/${friendId}`); + else CreateLinkEvent(`friends-messenger/${ friendId }`); } diff --git a/src/api/groups/GetGroupManager.ts b/src/api/groups/GetGroupManager.ts index bd5a6c70..d372ace2 100644 --- a/src/api/groups/GetGroupManager.ts +++ b/src/api/groups/GetGroupManager.ts @@ -2,5 +2,5 @@ import { CreateLinkEvent } from '..'; export function GetGroupManager(groupId: number): void { - CreateLinkEvent(`groups/manage/${groupId}`); + CreateLinkEvent(`groups/manage/${ groupId }`); } diff --git a/src/api/inventory/FurnitureItem.ts b/src/api/inventory/FurnitureItem.ts index 009591a3..4d84cab9 100644 --- a/src/api/inventory/FurnitureItem.ts +++ b/src/api/inventory/FurnitureItem.ts @@ -31,28 +31,28 @@ export class FurnitureItem implements IFurnitureItem { if(!parser) return; - this._locked = false; - this._id = parser.itemId; - this._type = parser.spriteId; - this._ref = parser.ref; - this._category = parser.category; - this._groupable = ((parser.isGroupable) && (!(parser.rentable))); - this._tradeable = parser.tradable; - this._recyclable = parser.isRecycleable; - this._sellable = parser.sellable; - this._stuffData = parser.stuffData; - this._extra = parser.extra; - this._secondsToExpiration = parser.secondsToExpiration; - this._expirationTimeStamp = parser.expirationTimeStamp; - this._hasRentPeriodStarted = parser.hasRentPeriodStarted; - this._creationDay = parser.creationDay; - this._creationMonth = parser.creationMonth; - this._creationYear = parser.creationYear; - this._slotId = parser.slotId; - this._songId = parser.songId; - this._flatId = parser.flatId; - this._isRented = parser.rentable; - this._isWallItem = parser.isWallItem; + this._locked = false; + this._id = parser.itemId; + this._type = parser.spriteId; + this._ref = parser.ref; + this._category = parser.category; + this._groupable = ((parser.isGroupable) && (!(parser.rentable))); + this._tradeable = parser.tradable; + this._recyclable = parser.isRecycleable; + this._sellable = parser.sellable; + this._stuffData = parser.stuffData; + this._extra = parser.extra; + this._secondsToExpiration = parser.secondsToExpiration; + this._expirationTimeStamp = parser.expirationTimeStamp; + this._hasRentPeriodStarted = parser.hasRentPeriodStarted; + this._creationDay = parser.creationDay; + this._creationMonth = parser.creationMonth; + this._creationYear = parser.creationYear; + this._slotId = parser.slotId; + this._songId = parser.songId; + this._flatId = parser.flatId; + this._isRented = parser.rentable; + this._isWallItem = parser.isWallItem; } public get rentable(): boolean diff --git a/src/api/inventory/GroupItem.ts b/src/api/inventory/GroupItem.ts index 9a16c36d..96477f92 100644 --- a/src/api/inventory/GroupItem.ts +++ b/src/api/inventory/GroupItem.ts @@ -95,8 +95,8 @@ export class GroupItem if(!furnitureItem) return items; - let found = 0; - let i = 0; + let found = 0; + let i = 0; while(i < this._items.length) { @@ -201,8 +201,8 @@ export class GroupItem { if(this._category === FurniCategory.POST_IT) { - let count = 0; - let index = 0; + let count = 0; + let index = 0; while(index < this._items.length) { diff --git a/src/api/navigator/NavigatorSearchResultViewDisplayMode.ts b/src/api/navigator/NavigatorSearchResultViewDisplayMode.ts index 27069cfd..b532d1af 100644 --- a/src/api/navigator/NavigatorSearchResultViewDisplayMode.ts +++ b/src/api/navigator/NavigatorSearchResultViewDisplayMode.ts @@ -1,6 +1,6 @@ export class NavigatorSearchResultViewDisplayMode { - public static readonly LIST: number = 0; - public static readonly THUMBNAILS: number = 1; - public static readonly FORCED_THUMBNAILS: number = 2; + public static readonly LIST: number = 0; + public static readonly THUMBNAILS: number = 1; + public static readonly FORCED_THUMBNAILS: number = 2; } diff --git a/src/api/navigator/RoomSettingsData.ts b/src/api/navigator/RoomSettingsData.ts index cc6f7996..84cce5ae 100644 --- a/src/api/navigator/RoomSettingsData.ts +++ b/src/api/navigator/RoomSettingsData.ts @@ -40,37 +40,37 @@ export class RoomSettingsData { if(!parser) throw new Error('invalid_parser'); - this.roomId = parser.roomId; - this.roomName = parser.name; - this.roomOriginalName = parser.name; - this.roomDescription = parser.description; - this.categoryId = parser.categoryId; - this.userCount = parser.userCount; - this.tags = parser.tags; - this.tradeState = parser.tradeMode; - this.allowWalkthrough = parser.allowWalkthrough; + this.roomId = parser.roomId; + this.roomName = parser.name; + this.roomOriginalName = parser.name; + this.roomDescription = parser.description; + this.categoryId = parser.categoryId; + this.userCount = parser.userCount; + this.tags = parser.tags; + this.tradeState = parser.tradeMode; + this.allowWalkthrough = parser.allowWalkthrough; - this.lockState = parser.state; - this.originalLockState = parser.state; - this.password = null; - this.confirmPassword = null; - this.allowPets = parser.allowPets; - this.allowPetsEat = parser.allowPetsEat; + this.lockState = parser.state; + this.originalLockState = parser.state; + this.password = null; + this.confirmPassword = null; + this.allowPets = parser.allowPets; + this.allowPetsEat = parser.allowPetsEat; - this.usersWithRights = new Map(); + this.usersWithRights = new Map(); - this.hideWalls = parser.hideWalls; - this.wallThickness = parser.thicknessWall; - this.floorThickness = parser.thicknessFloor; - this.chatBubbleMode = parser.chatSettings.mode; - this.chatBubbleWeight = parser.chatSettings.weight; - this.chatBubbleSpeed = parser.chatSettings.speed; - this.chatFloodProtection = parser.chatSettings.protection; - this.chatDistance = parser.chatSettings.distance; + this.hideWalls = parser.hideWalls; + this.wallThickness = parser.thicknessWall; + this.floorThickness = parser.thicknessFloor; + this.chatBubbleMode = parser.chatSettings.mode; + this.chatBubbleWeight = parser.chatSettings.weight; + this.chatBubbleSpeed = parser.chatSettings.speed; + this.chatFloodProtection = parser.chatSettings.protection; + this.chatDistance = parser.chatSettings.distance; - this.muteState = parser.moderationSettings.allowMute; - this.kickState = parser.moderationSettings.allowKick; - this.banState = parser.moderationSettings.allowBan; - this.bannedUsers = []; + this.muteState = parser.moderationSettings.allowMute; + this.kickState = parser.moderationSettings.allowKick; + this.banState = parser.moderationSettings.allowBan; + this.bannedUsers = []; } } diff --git a/src/api/nitro/room/DispatchMouseEvent.ts b/src/api/nitro/room/DispatchMouseEvent.ts index 6d18f2e8..56efd5c0 100644 --- a/src/api/nitro/room/DispatchMouseEvent.ts +++ b/src/api/nitro/room/DispatchMouseEvent.ts @@ -28,8 +28,8 @@ export function DispatchMouseEvent(roomId: number, canvasId: number, event: Mous { if(!didMouseMove) eventType = MouseEventType.DOUBLE_CLICK; - clickCount = 0; - lastClick = null; + clickCount = 0; + lastClick = null; } } diff --git a/src/api/nitro/room/DispatchTouchEvent.ts b/src/api/nitro/room/DispatchTouchEvent.ts index 7053318e..a04d515c 100644 --- a/src/api/nitro/room/DispatchTouchEvent.ts +++ b/src/api/nitro/room/DispatchTouchEvent.ts @@ -29,8 +29,8 @@ export function DispatchTouchEvent(roomId: number, canvasId: number, event: Touc { eventType = MouseEventType.DOUBLE_CLICK; - clickCount = 0; - lastClick = null; + clickCount = 0; + lastClick = null; } } diff --git a/src/api/nitro/room/widgets/events/RoomWidgetUpdateDimmerStateEvent.ts b/src/api/nitro/room/widgets/events/RoomWidgetUpdateDimmerStateEvent.ts index 27e9fd13..80dea562 100644 --- a/src/api/nitro/room/widgets/events/RoomWidgetUpdateDimmerStateEvent.ts +++ b/src/api/nitro/room/widgets/events/RoomWidgetUpdateDimmerStateEvent.ts @@ -14,11 +14,11 @@ export class RoomWidgetUpdateDimmerStateEvent extends RoomWidgetUpdateEvent { super(RoomWidgetUpdateDimmerStateEvent.DIMMER_STATE); - this._state = state; - this._presetId = presetId; - this._effectId = effectId; - this._color = color; - this._brightness = brightness; + this._state = state; + this._presetId = presetId; + this._effectId = effectId; + this._color = color; + this._brightness = brightness; } public get state(): number diff --git a/src/api/nitro/room/widgets/events/RoomWidgetUpdateRoomObjectEvent.ts b/src/api/nitro/room/widgets/events/RoomWidgetUpdateRoomObjectEvent.ts index 6ec8bf86..aa9b7258 100644 --- a/src/api/nitro/room/widgets/events/RoomWidgetUpdateRoomObjectEvent.ts +++ b/src/api/nitro/room/widgets/events/RoomWidgetUpdateRoomObjectEvent.ts @@ -20,9 +20,9 @@ export class RoomWidgetUpdateRoomObjectEvent extends RoomWidgetUpdateEvent { super(type); - this._id = id; - this._category = category; - this._roomId = roomId; + this._id = id; + this._category = category; + this._roomId = roomId; } public get id(): number diff --git a/src/api/nitro/room/widgets/handlers/FurniturePresentWidgetHandler.ts b/src/api/nitro/room/widgets/handlers/FurniturePresentWidgetHandler.ts index 42405054..6de7aa2f 100644 --- a/src/api/nitro/room/widgets/handlers/FurniturePresentWidgetHandler.ts +++ b/src/api/nitro/room/widgets/handlers/FurniturePresentWidgetHandler.ts @@ -9,10 +9,10 @@ import { RoomWidgetHandler } from './RoomWidgetHandler'; export class FurniturePresentWidgetHandler extends RoomWidgetHandler implements IGetImageListener { - private static FLOOR: string = 'floor'; - private static WALLPAPER: string = 'wallpaper'; - private static LANDSCAPE: string = 'landscape'; - private static POSTER: string = 'poster'; + private static FLOOR: string = 'floor'; + private static WALLPAPER: string = 'wallpaper'; + private static LANDSCAPE: string = 'landscape'; + private static POSTER: string = 'poster'; private _lastFurniId: number = -1; private _name: string = null; diff --git a/src/api/nitro/room/widgets/handlers/FurnitureTrophyWidgetHandler.ts b/src/api/nitro/room/widgets/handlers/FurnitureTrophyWidgetHandler.ts index 9b345109..8554977a 100644 --- a/src/api/nitro/room/widgets/handlers/FurnitureTrophyWidgetHandler.ts +++ b/src/api/nitro/room/widgets/handlers/FurnitureTrophyWidgetHandler.ts @@ -24,7 +24,7 @@ export class FurnitureTrophyWidgetHandler extends RoomWidgetHandler const color = roomObject.model.getValue(RoomObjectVariable.FURNITURE_COLOR); const extra = parseInt(roomObject.model.getValue(RoomObjectVariable.FURNITURE_EXTRAS)); - let data = roomObject.model.getValue(RoomObjectVariable.FURNITURE_DATA); + let data = roomObject.model.getValue(RoomObjectVariable.FURNITURE_DATA); const ownerName = data.substring(0, data.indexOf('\t')); diff --git a/src/api/nitro/room/widgets/messages/RoomWidgetFurniActionMessage.ts b/src/api/nitro/room/widgets/messages/RoomWidgetFurniActionMessage.ts index d658d7d9..678f9e56 100644 --- a/src/api/nitro/room/widgets/messages/RoomWidgetFurniActionMessage.ts +++ b/src/api/nitro/room/widgets/messages/RoomWidgetFurniActionMessage.ts @@ -19,10 +19,10 @@ export class RoomWidgetFurniActionMessage extends RoomWidgetMessage { super(type); - this._furniId = id; + this._furniId = id; this._furniCategory = category; - this._offerId = offerId; - this._objectData = objectData; + this._offerId = offerId; + this._objectData = objectData; } public get furniId(): number diff --git a/src/api/nitro/room/widgets/messages/RoomWidgetFurniToWidgetMessage.ts b/src/api/nitro/room/widgets/messages/RoomWidgetFurniToWidgetMessage.ts index 59054ff2..959d7f2b 100644 --- a/src/api/nitro/room/widgets/messages/RoomWidgetFurniToWidgetMessage.ts +++ b/src/api/nitro/room/widgets/messages/RoomWidgetFurniToWidgetMessage.ts @@ -24,9 +24,9 @@ export class RoomWidgetFurniToWidgetMessage extends RoomWidgetMessage { super(type); - this._objectId = objectId; - this._category = category; - this._roomId = roomId; + this._objectId = objectId; + this._category = category; + this._roomId = roomId; } public get objectId(): number diff --git a/src/api/nitro/room/widgets/messages/RoomWidgetRoomObjectMessage.ts b/src/api/nitro/room/widgets/messages/RoomWidgetRoomObjectMessage.ts index cc82b85c..98ce28dd 100644 --- a/src/api/nitro/room/widgets/messages/RoomWidgetRoomObjectMessage.ts +++ b/src/api/nitro/room/widgets/messages/RoomWidgetRoomObjectMessage.ts @@ -15,8 +15,8 @@ export class RoomWidgetRoomObjectMessage extends RoomWidgetMessage { super(type); - this._id = id; - this._category = category; + this._id = id; + this._category = category; } public get id(): number diff --git a/src/api/nitro/session/IsOwnerOfFurniture.ts b/src/api/nitro/session/IsOwnerOfFurniture.ts index 20c70f3e..56b7fc34 100644 --- a/src/api/nitro/session/IsOwnerOfFurniture.ts +++ b/src/api/nitro/session/IsOwnerOfFurniture.ts @@ -5,7 +5,7 @@ export function IsOwnerOfFurniture(roomObject: IRoomObject): boolean { if(!roomObject || !roomObject.model) return false; - const userId = GetSessionDataManager().userId; + const userId = GetSessionDataManager().userId; const objectOwnerId = roomObject.model.getValue(RoomObjectVariable.FURNITURE_OWNER_ID); return (userId === objectOwnerId); diff --git a/src/api/utils/ColorUtils.ts b/src/api/utils/ColorUtils.ts index 126d271d..9377255e 100644 --- a/src/api/utils/ColorUtils.ts +++ b/src/api/utils/ColorUtils.ts @@ -13,7 +13,7 @@ export class ColorUtils const diff = 6 - val.length; for(let i = 0; i < diff; i++) { - val = '0' + val; + val = '0' + val; } } return ( '#' + val); diff --git a/src/api/wired/WiredSelectionFilter.ts b/src/api/wired/WiredSelectionFilter.ts index b0b5ae32..d661bcf7 100644 --- a/src/api/wired/WiredSelectionFilter.ts +++ b/src/api/wired/WiredSelectionFilter.ts @@ -38,9 +38,9 @@ export class WiredSelectionFilter extends NitroFilter super(vertex, fragment); this.uniforms.lineColor = new Float32Array(3); - this.uniforms.color = new Float32Array(3); - this.lineColor = lineColor; - this.color = color; + this.uniforms.color = new Float32Array(3); + this.lineColor = lineColor; + this.color = color; } public get lineColor(): number | number[] diff --git a/src/common/draggable-window/DraggableWindow.tsx b/src/common/draggable-window/DraggableWindow.tsx index d167c3d1..c2a7f301 100644 --- a/src/common/draggable-window/DraggableWindow.tsx +++ b/src/common/draggable-window/DraggableWindow.tsx @@ -107,8 +107,8 @@ export const DraggableWindow: FC = props => { if(!elementRef.current || !dragHandler) return; - let offsetX = (offset.x + delta.x); - let offsetY = (offset.y + delta.y); + let offsetX = (offset.x + delta.x); + let offsetY = (offset.y + delta.y); const left = elementRef.current.offsetLeft + offsetX; const top = elementRef.current.offsetTop + offsetY; diff --git a/src/common/layout/LayoutFurniIconImageView.tsx b/src/common/layout/LayoutFurniIconImageView.tsx index 0329d43f..21bb7601 100644 --- a/src/common/layout/LayoutFurniIconImageView.tsx +++ b/src/common/layout/LayoutFurniIconImageView.tsx @@ -30,5 +30,5 @@ export const LayoutFurniIconImageView: FC = props return imageUrl; } - return ; + return ; } diff --git a/src/common/layout/LayoutNotificationAlertView.tsx b/src/common/layout/LayoutNotificationAlertView.tsx index bc7894bc..d4e56d82 100644 --- a/src/common/layout/LayoutNotificationAlertView.tsx +++ b/src/common/layout/LayoutNotificationAlertView.tsx @@ -27,7 +27,7 @@ export const LayoutNotificationAlertView: FC = return ( - + { children } diff --git a/src/common/layout/LayoutProgressBar.tsx b/src/common/layout/LayoutProgressBar.tsx index a8114b75..8f821717 100644 --- a/src/common/layout/LayoutProgressBar.tsx +++ b/src/common/layout/LayoutProgressBar.tsx @@ -25,7 +25,7 @@ export const LayoutProgressBar: FC = props => { text && (text.length > 0) && { text } } - + { children } ); diff --git a/src/common/layout/UserProfileIconView.tsx b/src/common/layout/UserProfileIconView.tsx index 769cf625..d31fa66b 100644 --- a/src/common/layout/UserProfileIconView.tsx +++ b/src/common/layout/UserProfileIconView.tsx @@ -10,7 +10,7 @@ export interface UserProfileIconViewProps extends BaseProps export const UserProfileIconView: FC = props => { - const { userId = 0, userName = null, classNames = [], pointer = true, children = null, ...rest } = props; + const { userId = 0, userName = null, classNames = [], pointer = true, children = null, ...rest } = props; const getClassNames = useMemo(() => { diff --git a/src/components/avatar-editor/common/AvatarEditorGridPartItem.ts b/src/components/avatar-editor/common/AvatarEditorGridPartItem.ts index dc583f38..a277b5ad 100644 --- a/src/components/avatar-editor/common/AvatarEditorGridPartItem.ts +++ b/src/components/avatar-editor/common/AvatarEditorGridPartItem.ts @@ -5,8 +5,8 @@ import { FigureData } from './FigureData'; export class AvatarEditorGridPartItem implements IAvatarImageListener { private static ALPHA_FILTER: NitroAlphaFilter = new NitroAlphaFilter(0.2); - private static THUMB_DIRECTIONS: number[] = [ 2, 6, 0, 4, 3, 1 ]; - private static DRAW_ORDER: string[] = [ + private static THUMB_DIRECTIONS: number[] = [ 2, 6, 0, 4, 3, 1 ]; + private static DRAW_ORDER: string[] = [ AvatarFigurePartType.LEFT_HAND_ITEM, AvatarFigurePartType.LEFT_HAND, AvatarFigurePartType.LEFT_SLEEVE, @@ -201,13 +201,13 @@ export class AvatarEditorGridPartItem implements IAvatarImageListener if(this._partSet) { - this._isHC = (this._partSet.clubLevel > 0); - this._isSellable = this._partSet.isSellable; + this._isHC = (this._partSet.clubLevel > 0); + this._isSellable = this._partSet.isSellable; } else { - this._isHC = false; - this._isSellable = false; + this._isHC = false; + this._isSellable = false; } if(this._isDisabled) this.setAlpha(container, 0.2); diff --git a/src/components/avatar-editor/common/CategoryBaseModel.ts b/src/components/avatar-editor/common/CategoryBaseModel.ts index 5cd311c0..34dd9330 100644 --- a/src/components/avatar-editor/common/CategoryBaseModel.ts +++ b/src/components/avatar-editor/common/CategoryBaseModel.ts @@ -11,7 +11,7 @@ export class CategoryBaseModel implements IAvatarEditorCategoryModel constructor() { - this._isInitalized = false; + this._isInitalized = false; this._maxPaletteCount = 0; } diff --git a/src/components/avatar-editor/common/FigureData.ts b/src/components/avatar-editor/common/FigureData.ts index 072ced1c..78014d11 100644 --- a/src/components/avatar-editor/common/FigureData.ts +++ b/src/components/avatar-editor/common/FigureData.ts @@ -199,8 +199,8 @@ export class FigureData { let figureString = ''; - const setTypes: string[] = [ FigureData.FACE ]; - const figureSets: string[] = []; + const setTypes: string[] = [ FigureData.FACE ]; + const figureSets: string[] = []; for(const setType of setTypes) { diff --git a/src/components/avatar-editor/views/model/AvatarEditorModelView.tsx b/src/components/avatar-editor/views/model/AvatarEditorModelView.tsx index ba0d2da7..3382a71f 100644 --- a/src/components/avatar-editor/views/model/AvatarEditorModelView.tsx +++ b/src/components/avatar-editor/views/model/AvatarEditorModelView.tsx @@ -67,7 +67,7 @@ export const AvatarEditorModelView: FC = props => } - { !model.canSetGender && model.categories && (model.categories.size > 0) && Array.from(model.categories.keys()).map(name => + { !model.canSetGender && model.categories && (model.categories.size > 0) && Array.from(model.categories.keys()).map(name => { const category = model.categories.get(name); diff --git a/src/components/avatar-editor/views/wardrobe/AvatarEditorWardrobeView.tsx b/src/components/avatar-editor/views/wardrobe/AvatarEditorWardrobeView.tsx index f480c900..96252ff4 100644 --- a/src/components/avatar-editor/views/wardrobe/AvatarEditorWardrobeView.tsx +++ b/src/components/avatar-editor/views/wardrobe/AvatarEditorWardrobeView.tsx @@ -55,13 +55,13 @@ export const AvatarEditorWardrobeView: FC = props items.push( { figureContainer && - } + } { (clubLevel > 0) && } { figureContainer && - } + } ); diff --git a/src/components/campaign/CalendarItemView.tsx b/src/components/campaign/CalendarItemView.tsx index 33df1ff7..7a745c18 100644 --- a/src/components/campaign/CalendarItemView.tsx +++ b/src/components/campaign/CalendarItemView.tsx @@ -33,7 +33,7 @@ export const CalendarItemView: FC = props => } return ( - onClick(itemId) }> + onClick(itemId) }> { (state === CalendarItemState.STATE_UNLOCKED) && diff --git a/src/components/campaign/CampaignView.tsx b/src/components/campaign/CampaignView.tsx index 62867b51..3af14b5e 100644 --- a/src/components/campaign/CampaignView.tsx +++ b/src/components/campaign/CampaignView.tsx @@ -103,7 +103,7 @@ export const CampaignView: FC<{}> = props => return ( <> {(calendarData && isCalendarOpen) && - + } ) diff --git a/src/components/catalog/CatalogMessageHandler.tsx b/src/components/catalog/CatalogMessageHandler.tsx index e01cbb4a..b1a53941 100644 --- a/src/components/catalog/CatalogMessageHandler.tsx +++ b/src/components/catalog/CatalogMessageHandler.tsx @@ -254,7 +254,7 @@ export const CatalogMessageHandler: FC<{}> = props => title = LocalizeText('inventory.marketplace.result.title.failure'); } - const message = LocalizeText(`inventory.marketplace.result.${parser.result}`); + const message = LocalizeText(`inventory.marketplace.result.${ parser.result }`); NotificationUtilities.simpleAlert(message, NotificationAlertType.DEFAULT, null, null, title); }, []); diff --git a/src/components/catalog/common/FurniCategory.ts b/src/components/catalog/common/FurniCategory.ts index 7eeeca24..07195cb0 100644 --- a/src/components/catalog/common/FurniCategory.ts +++ b/src/components/catalog/common/FurniCategory.ts @@ -1,26 +1,26 @@ export class FurniCategory { - public static DEFAULT: number = 1; - public static WALL_PAPER: number = 2; - public static FLOOR: number = 3; - public static LANDSCAPE: number = 4; - public static POST_IT: number = 5; - public static POSTER: number = 6; - public static SOUND_SET: number = 7; - public static TRAX_SONG: number = 8; - public static PRESENT: number = 9; - public static ECOTRON_BOX: number = 10; - public static TROPHY: number = 11; - public static CREDIT_FURNI: number = 12; - public static PET_SHAMPOO: number = 13; - public static PET_CUSTOM_PART: number = 14; - public static PET_CUSTOM_PART_SHAMPOO: number = 15; - public static PET_SADDLE: number = 16; - public static GUILD_FURNI: number = 17; - public static GAME_FURNI: number = 18; - public static MONSTERPLANT_SEED: number = 19; - public static MONSTERPLANT_REVIVAL: number = 20; - public static MONSTERPLANT_REBREED: number = 21; - public static MONSTERPLANT_FERTILIZE: number = 22; - public static FIGURE_PURCHASABLE_SET: number = 23; + public static DEFAULT: number = 1; + public static WALL_PAPER: number = 2; + public static FLOOR: number = 3; + public static LANDSCAPE: number = 4; + public static POST_IT: number = 5; + public static POSTER: number = 6; + public static SOUND_SET: number = 7; + public static TRAX_SONG: number = 8; + public static PRESENT: number = 9; + public static ECOTRON_BOX: number = 10; + public static TROPHY: number = 11; + public static CREDIT_FURNI: number = 12; + public static PET_SHAMPOO: number = 13; + public static PET_CUSTOM_PART: number = 14; + public static PET_CUSTOM_PART_SHAMPOO: number = 15; + public static PET_SADDLE: number = 16; + public static GUILD_FURNI: number = 17; + public static GAME_FURNI: number = 18; + public static MONSTERPLANT_SEED: number = 19; + public static MONSTERPLANT_REVIVAL: number = 20; + public static MONSTERPLANT_REBREED: number = 21; + public static MONSTERPLANT_FERTILIZE: number = 22; + public static FIGURE_PURCHASABLE_SET: number = 23; } \ No newline at end of file diff --git a/src/components/catalog/views/gift/CatalogGiftView.tsx b/src/components/catalog/views/gift/CatalogGiftView.tsx index 2da0b69b..d3e94506 100644 --- a/src/components/catalog/views/gift/CatalogGiftView.tsx +++ b/src/components/catalog/views/gift/CatalogGiftView.tsx @@ -135,7 +135,7 @@ export const CatalogGiftView: FC<{}> = props => if(!giftData) continue; - if(giftData.colors && giftData.colors.length > 0) newColors.push({ id: colorId, color: `#${giftData.colors[0].toString(16)}` }); + if(giftData.colors && giftData.colors.length > 0) newColors.push({ id: colorId, color: `#${ giftData.colors[0].toString(16) }` }); } setMaxBoxIndex(giftConfiguration.boxTypes.length - 1); @@ -210,7 +210,7 @@ export const CatalogGiftView: FC<{}> = props => { LocalizeText('catalog.gift_wrapping.pick_color') } - { colors.map(color =>