More inventory updates

This commit is contained in:
Bill 2021-09-25 02:53:15 -04:00
parent 67afaccd21
commit ce7e6281df
5 changed files with 15 additions and 15 deletions

View File

@ -80,10 +80,10 @@ export const InventoryBadgeView: FC<InventoryBadgeViewProps> = props =>
return ( return (
<NitroLayoutGrid> <NitroLayoutGrid>
<NitroLayoutGridColumn size={ 7 } gap={ 2 }> <NitroLayoutGridColumn size={ 7 }>
<InventoryBadgeResultsView badges={ badges } activeBadges={ activeBadges } /> <InventoryBadgeResultsView badges={ badges } activeBadges={ activeBadges } />
</NitroLayoutGridColumn> </NitroLayoutGridColumn>
<NitroLayoutGridColumn className="justify-content-between" size={ 5 } gap={ 2 } overflow="auto"> <NitroLayoutGridColumn className="justify-content-between" size={ 5 } overflow="auto">
<NitroLayoutFlexColumn overflow="hidden" gap={ 2 }> <NitroLayoutFlexColumn overflow="hidden" gap={ 2 }>
<NitroLayoutBase className="text-black text-truncate">{ LocalizeText('inventory.badges.activebadges') }</NitroLayoutBase> <NitroLayoutBase className="text-black text-truncate">{ LocalizeText('inventory.badges.activebadges') }</NitroLayoutBase>
<InventoryActiveBadgeResultsView badges={ activeBadges } /> <InventoryActiveBadgeResultsView badges={ activeBadges } />

View File

@ -72,10 +72,10 @@ export const InventoryBotView: FC<InventoryBotViewProps> = props =>
return ( return (
<NitroLayoutGrid> <NitroLayoutGrid>
<NitroLayoutGridColumn size={ 7 } gap={ 2 }> <NitroLayoutGridColumn size={ 7 }>
<InventoryBotResultsView botItems={ botItems } /> <InventoryBotResultsView botItems={ botItems } />
</NitroLayoutGridColumn> </NitroLayoutGridColumn>
<NitroLayoutGridColumn size={ 5 } gap={ 2 } overflow="auto"> <NitroLayoutGridColumn size={ 5 } overflow="auto">
<NitroLayoutFlexColumn overflow="hidden" position="relative"> <NitroLayoutFlexColumn overflow="hidden" position="relative">
<RoomPreviewerView roomPreviewer={ roomPreviewer } height={ 140 } /> <RoomPreviewerView roomPreviewer={ roomPreviewer } height={ 140 } />
</NitroLayoutFlexColumn> </NitroLayoutFlexColumn>

View File

@ -108,11 +108,11 @@ export const InventoryFurnitureView: FC<InventoryFurnitureViewProps> = props =>
return ( return (
<NitroLayoutGrid> <NitroLayoutGrid>
<NitroLayoutGridColumn size={ 7 } gap={ 2 }> <NitroLayoutGridColumn size={ 7 }>
<InventoryFurnitureSearchView groupItems={ groupItems } setGroupItems={ setFilteredGroupItems } /> <InventoryFurnitureSearchView groupItems={ groupItems } setGroupItems={ setFilteredGroupItems } />
<InventoryFurnitureResultsView groupItems={ filteredGroupItems } /> <InventoryFurnitureResultsView groupItems={ filteredGroupItems } />
</NitroLayoutGridColumn> </NitroLayoutGridColumn>
<NitroLayoutGridColumn size={ 5 } gap={ 2 } overflow="auto"> <NitroLayoutGridColumn size={ 5 } overflow="auto">
<NitroLayoutFlexColumn overflow="hidden" position="relative"> <NitroLayoutFlexColumn overflow="hidden" position="relative">
<RoomPreviewerView roomPreviewer={ roomPreviewer } height={ 140 } /> <RoomPreviewerView roomPreviewer={ roomPreviewer } height={ 140 } />
{ groupItem && groupItem.stuffData.isUnique && { groupItem && groupItem.stuffData.isUnique &&

View File

@ -71,10 +71,10 @@ export const InventoryPetView: FC<InventoryPetViewProps> = props =>
return ( return (
<NitroLayoutGrid> <NitroLayoutGrid>
<NitroLayoutGridColumn size={ 7 } gap={ 2 }> <NitroLayoutGridColumn size={ 7 }>
<InventoryPetResultsView petItems={ petItems } /> <InventoryPetResultsView petItems={ petItems } />
</NitroLayoutGridColumn> </NitroLayoutGridColumn>
<NitroLayoutGridColumn size={ 5 } gap={ 2 } overflow="auto"> <NitroLayoutGridColumn size={ 5 } overflow="auto">
<NitroLayoutFlexColumn overflow="hidden" position="relative"> <NitroLayoutFlexColumn overflow="hidden" position="relative">
<RoomPreviewerView roomPreviewer={ roomPreviewer } height={ 140 } /> <RoomPreviewerView roomPreviewer={ roomPreviewer } height={ 140 } />
</NitroLayoutFlexColumn> </NitroLayoutFlexColumn>

View File

@ -229,10 +229,10 @@ export const InventoryTradeView: FC<InventoryTradeViewProps> = props =>
return ( return (
<NitroLayoutGrid> <NitroLayoutGrid>
<NitroLayoutGridColumn size={ 4 } gap={ 2 }> <NitroLayoutGridColumn size={ 4 }>
<NitroLayoutFlexColumn className="h-100" overflow="auto" gap={ 2 }> <NitroLayoutFlexColumn className="h-100" overflow="auto" gap={ 2 }>
<InventoryFurnitureSearchView groupItems={ groupItems } setGroupItems={ setFilteredGroupItems } /> <InventoryFurnitureSearchView groupItems={ groupItems } setGroupItems={ setFilteredGroupItems } />
<NitroCardGridView columns={ 3 }> <NitroCardGridView>
{ filteredGroupItems && (filteredGroupItems.length > 0) && filteredGroupItems.map((item, index) => { filteredGroupItems && (filteredGroupItems.length > 0) && filteredGroupItems.map((item, index) =>
{ {
const count = item.getUnlockedCount(); const count = item.getUnlockedCount();
@ -252,12 +252,12 @@ export const InventoryTradeView: FC<InventoryTradeViewProps> = props =>
{ groupItem ? groupItem.name : LocalizeText('catalog_selectproduct') } { groupItem ? groupItem.name : LocalizeText('catalog_selectproduct') }
</NitroLayoutBase> </NitroLayoutBase>
</NitroLayoutGridColumn> </NitroLayoutGridColumn>
<NitroLayoutGridColumn size={ 8 } gap={ 2 }> <NitroLayoutGridColumn size={ 8 }>
<NitroLayoutGrid overflow="hidden"> <NitroLayoutGrid overflow="hidden">
<NitroLayoutGridColumn size={ 6 } gap={ 2 }> <NitroLayoutGridColumn size={ 6 }>
<NitroLayoutFlexColumn className="h-100" overflow="auto" gap={ 2 }> <NitroLayoutFlexColumn className="h-100" overflow="auto" gap={ 2 }>
<span className="d-flex justify-content-between align-items-center text-black small mb-1">{ LocalizeText('inventory.trading.you') } { LocalizeText('inventory.trading.areoffering') }: <i className={ 'small fas ' + (tradeData.ownUser.accepts ? 'fa-lock text-success' : 'fa-unlock text-danger') } /></span> <span className="d-flex justify-content-between align-items-center text-black small mb-1">{ LocalizeText('inventory.trading.you') } { LocalizeText('inventory.trading.areoffering') }: <i className={ 'small fas ' + (tradeData.ownUser.accepts ? 'fa-lock text-success' : 'fa-unlock text-danger') } /></span>
<NitroCardGridView columns={ 3 }> <NitroCardGridView>
{ Array.from(Array(MAX_ITEMS_TO_TRADE), (e, i) => { Array.from(Array(MAX_ITEMS_TO_TRADE), (e, i) =>
{ {
const item = (tradeData.ownUser.items.getWithIndex(i) || null); const item = (tradeData.ownUser.items.getWithIndex(i) || null);
@ -279,10 +279,10 @@ export const InventoryTradeView: FC<InventoryTradeViewProps> = props =>
{ ownGroupItem ? ownGroupItem.name : LocalizeText('catalog_selectproduct') } { ownGroupItem ? ownGroupItem.name : LocalizeText('catalog_selectproduct') }
</NitroLayoutBase> </NitroLayoutBase>
</NitroLayoutGridColumn> </NitroLayoutGridColumn>
<NitroLayoutGridColumn size={ 6 } gap={ 2 }> <NitroLayoutGridColumn size={ 6 }>
<NitroLayoutFlexColumn className="h-100" overflow="auto" gap={ 2 }> <NitroLayoutFlexColumn className="h-100" overflow="auto" gap={ 2 }>
<span className="d-flex justify-content-between align-items-center text-black small mb-1">{ tradeData.otherUser.userName } { LocalizeText('inventory.trading.isoffering') }: <i className={ 'small fas ' + (tradeData.otherUser.accepts ? 'fa-lock text-success' : 'fa-unlock text-danger') } /></span> <span className="d-flex justify-content-between align-items-center text-black small mb-1">{ tradeData.otherUser.userName } { LocalizeText('inventory.trading.isoffering') }: <i className={ 'small fas ' + (tradeData.otherUser.accepts ? 'fa-lock text-success' : 'fa-unlock text-danger') } /></span>
<NitroCardGridView columns={ 3 }> <NitroCardGridView>
{ Array.from(Array(MAX_ITEMS_TO_TRADE), (e, i) => { Array.from(Array(MAX_ITEMS_TO_TRADE), (e, i) =>
{ {
const item = (tradeData.otherUser.items.getWithIndex(i) || null); const item = (tradeData.otherUser.items.getWithIndex(i) || null);