nitro/nitro-react
1
0
Fork 0
mirror of https://github.com/billsonnn/nitro-react.git synced 2025-02-17 01:12:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix the shit

Browse Source
This commit is contained in:
laynester 2022-12-13 04:19:22 -05:00
parent 306440c9de
commit 580d0a1d2d
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/catalog/CatalogView.scss
View File

@ -27,6 +27,9 @@
width: 80px; width: 80px;
height: 80px; height: 80px;
overflow: hidden; overflow: hidden;
display: flex;
justify-content: center;
align-items: center;
} }
.gift-color { .gift-color {
@ -89,7 +92,8 @@
.icon-hc-banner { .icon-hc-banner {
width: 68px; width: 68px;
height: 40px; height: 40px;
background: url("../../assets/images/catalog/hc_big.png") center no-repeat; background: url("../../assets/images/catalog/hc_big.png") center
no-repeat;
} }
} }
} }

15
src/components/catalog/views/gift/CatalogGiftView.tsx
View File

@ -42,7 +42,7 @@ export const CatalogGiftView: FC<{}> = props =>
const isBoxDefault = useMemo(() => const isBoxDefault = useMemo(() =>
{ {
return giftConfiguration ? (giftConfiguration.defaultStuffTypes.findIndex(s => (s === giftConfiguration.boxTypes[selectedBoxIndex])) > -1) : true; return giftConfiguration ? (giftConfiguration.defaultStuffTypes.findIndex(s => (s === giftConfiguration.boxTypes[selectedBoxIndex])) > -1) : false;
}, [ giftConfiguration, selectedBoxIndex ]); }, [ giftConfiguration, selectedBoxIndex ]);
const boxExtraData = useMemo(() => const boxExtraData = useMemo(() =>
@ -56,10 +56,13 @@ export const CatalogGiftView: FC<{}> = props =>
{ {
if (!giftConfiguration) return false; if (!giftConfiguration) return false;
if (isBoxDefault) return false;
const boxType = giftConfiguration.boxTypes[selectedBoxIndex]; const boxType = giftConfiguration.boxTypes[selectedBoxIndex];
return (boxType === 8 || (boxType >= 3 && boxType <= 6)) ? false : true; return (boxType === 8 || (boxType >= 3 && boxType <= 6)) ? false : true;
}, [ giftConfiguration, selectedBoxIndex ]); }, [ giftConfiguration, selectedBoxIndex, isBoxDefault ]);
const handleAction = useCallback((action: string) => const handleAction = useCallback((action: string) =>
{ {
@ -133,6 +136,8 @@ export const CatalogGiftView: FC<{}> = props =>
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) }` });
} }
giftConfiguration.boxTypes.push(giftConfiguration.defaultStuffTypes[Math.floor((Math.random() * giftConfiguration.defaultStuffTypes.length) - 1)]);
setMaxBoxIndex(giftConfiguration.boxTypes.length - 1); setMaxBoxIndex(giftConfiguration.boxTypes.length - 1);
setMaxRibbonIndex(giftConfiguration.ribbonTypes.length - 1); setMaxRibbonIndex(giftConfiguration.ribbonTypes.length - 1);
@ -145,7 +150,7 @@ export const CatalogGiftView: FC<{}> = props =>
if(!giftConfiguration || !giftConfiguration.isEnabled || !isVisible) return null; if(!giftConfiguration || !giftConfiguration.isEnabled || !isVisible) return null;
const boxName = 'catalog.gift_wrapping_new.box.' + (isBoxDefault ? 'default' : selectedBoxIndex); const boxName = 'catalog.gift_wrapping_new.box.' + (isBoxDefault ? 'default' : giftConfiguration.boxTypes[selectedBoxIndex]);
const ribbonName = `catalog.gift_wrapping_new.ribbon.${ selectedRibbonIndex }`; const ribbonName = `catalog.gift_wrapping_new.ribbon.${ selectedRibbonIndex }`;
const priceText = 'catalog.gift_wrapping_new.' + (isBoxDefault ? 'freeprice' : 'price'); const priceText = 'catalog.gift_wrapping_new.' + (isBoxDefault ? 'freeprice' : 'price');
@ -187,7 +192,7 @@ export const CatalogGiftView: FC<{}> = props =>
</Flex> </Flex>
</Column> </Column>
</Flex> </Flex>
<Flex alignItems="center" gap={ 2 }> <Flex alignItems="center" gap={ 2 } className={ isColorable ? '' : 'opacity-50 pointer-events-none' }>
<ButtonGroup> <ButtonGroup>
<Button variant="primary" onClick={ () => handleAction('prev_ribbon') }> <Button variant="primary" onClick={ () => handleAction('prev_ribbon') }>
<FontAwesomeIcon icon="chevron-left" /> <FontAwesomeIcon icon="chevron-left" />
@ -200,7 +205,7 @@ export const CatalogGiftView: FC<{}> = props =>
</Flex> </Flex>
</Column> </Column>
</Flex> </Flex>
<Column gap={ 1 }> <Column gap={ 1 } className={ isColorable ? '' : 'opacity-50 pointer-events-none' }>
<Text fontWeight="bold"> <Text fontWeight="bold">
{ LocalizeText('catalog.gift_wrapping.pick_color') } { LocalizeText('catalog.gift_wrapping.pick_color') }
</Text> </Text>