diff --git a/public/ui-config.json.example b/public/ui-config.json.example index d7bb99a..210f5de 100644 --- a/public/ui-config.json.example +++ b/public/ui-config.json.example @@ -106,11 +106,10 @@ "avatareditor.show.clubitems.dimmed": true, "avatareditor.show.clubitems.first": true, "chat.history.max.items": 100, - "system.currency.types": [ - -1, - 0, - 5 - ], + "currency.display.number.short": false, + "currency.asset.icon.url": "${images.url}/wallet/%type%.png", + "currency.seasonal.color": "blue", + "system.currency.types": [ -1, 0, 5 ], "catalog.links": { "hc.buy_hc": "habbo_club", "hc.hc_gifts": "club_gifts", @@ -128,9 +127,6 @@ "enabled": false, "sound": "sound_respect_received" }, - "currency.display.number.short": false, - "currency.asset.icon.url": "${images.url}/wallet/%type%.png", - "currency.seasonal.color": "bronze", "catalog.asset.url": "${image.library.url}catalogue", "catalog.asset.image.url": "${catalog.asset.url}/%name%.gif", "catalog.asset.icon.url": "${catalog.asset.url}/icon_%name%.png", diff --git a/src/assets/images/purse/disconnect_button.png b/src/assets/images/purse/disconnect_button.png new file mode 100644 index 0000000..8e8c444 Binary files /dev/null and b/src/assets/images/purse/disconnect_button.png differ diff --git a/src/assets/images/purse/disconnect_icon.png b/src/assets/images/purse/disconnect_icon.png new file mode 100644 index 0000000..aa223d6 Binary files /dev/null and b/src/assets/images/purse/disconnect_icon.png differ diff --git a/src/assets/images/purse/hc_bg.png b/src/assets/images/purse/hc_bg.png new file mode 100644 index 0000000..17a577e Binary files /dev/null and b/src/assets/images/purse/hc_bg.png differ diff --git a/src/assets/images/purse/help_button.png b/src/assets/images/purse/help_button.png new file mode 100644 index 0000000..e5f9bb2 Binary files /dev/null and b/src/assets/images/purse/help_button.png differ diff --git a/src/assets/images/purse/purse-bg.png b/src/assets/images/purse/purse-bg.png new file mode 100644 index 0000000..db262dd Binary files /dev/null and b/src/assets/images/purse/purse-bg.png differ diff --git a/src/assets/images/purse/seasonal_bg_blue.png b/src/assets/images/purse/seasonal_bg_blue.png new file mode 100644 index 0000000..609542c Binary files /dev/null and b/src/assets/images/purse/seasonal_bg_blue.png differ diff --git a/src/assets/images/purse/seasonal_bg_bronze.png b/src/assets/images/purse/seasonal_bg_bronze.png new file mode 100644 index 0000000..53445a1 Binary files /dev/null and b/src/assets/images/purse/seasonal_bg_bronze.png differ diff --git a/src/assets/images/purse/seasonal_bg_pink.png b/src/assets/images/purse/seasonal_bg_pink.png new file mode 100644 index 0000000..eec7f73 Binary files /dev/null and b/src/assets/images/purse/seasonal_bg_pink.png differ diff --git a/src/assets/images/purse/seasonal_bg_purple.png b/src/assets/images/purse/seasonal_bg_purple.png new file mode 100644 index 0000000..fc1f1fc Binary files /dev/null and b/src/assets/images/purse/seasonal_bg_purple.png differ diff --git a/src/assets/images/purse/seasonal_bg_red.png b/src/assets/images/purse/seasonal_bg_red.png new file mode 100644 index 0000000..d4176a1 Binary files /dev/null and b/src/assets/images/purse/seasonal_bg_red.png differ diff --git a/src/assets/images/purse/settings_button.png b/src/assets/images/purse/settings_button.png new file mode 100644 index 0000000..ccb8a13 Binary files /dev/null and b/src/assets/images/purse/settings_button.png differ diff --git a/src/assets/images/purse/settings_icon.png b/src/assets/images/purse/settings_icon.png new file mode 100644 index 0000000..f96a32c Binary files /dev/null and b/src/assets/images/purse/settings_icon.png differ diff --git a/src/components/purse/PurseView.scss b/src/components/purse/PurseView.scss index b2ddfee..bb361b7 100644 --- a/src/components/purse/PurseView.scss +++ b/src/components/purse/PurseView.scss @@ -45,10 +45,87 @@ } .nitro-purse-seasonal-currency { - background-color: #212131; - box-shadow: inset 0 5px rgba(38,38,57,.6), inset 0 -4px rgba(25,25,37,.6); - margin-bottom: 6px; - margin-top: -6px; + + height: 30px; + background-color: rgba($dark, 0.95); + + .seasonal-padding { + padding: 7px; + } + + .seasonal-bold { + padding-right: 3px; + } + + .seasonal-amount { + padding-top: 7px; + padding-bottom: 7px; + padding-right: 3px; + width: 90px; + } + + .nitro-seasonal-box { + border-image-slice: 6 6 6 6 fill; + border-image-width: 6px 6px 6px 6px; + top: 0px; + right: 0px; + height: 100%; + } + + &.purple { + + .nitro-seasonal-box{ + border-image-source: url(@/assets/images/purse/seasonal_bg_purple.png); + } + + .seasonal-bold { + color: #b17fbe; + } + } + + &.bronze { + + .nitro-seasonal-box{ + border-image-source: url(@/assets/images/purse/seasonal_bg_bronze.png); + } + + .seasonal-bold { + color: #d4943c; + } + } + + &.pink { + + .nitro-seasonal-box{ + border-image-source: url(@/assets/images/purse/seasonal_bg_pink.png); + } + + .seasonal-bold { + color: #d89ba8; + } + } + + &.blue { + + .nitro-seasonal-box{ + border-image-source: url(@/assets/images/purse/seasonal_bg_blue.png); + } + + .seasonal-bold { + color: #95c3e5; + } + } + + &.red { + + .nitro-seasonal-box{ + border-image-source: url(@/assets/images/purse/seasonal_bg_red.png); + } + + .seasonal-bold { + color: #ff0004; + } + } } } .topcurrencygen{ diff --git a/src/components/purse/PurseView.tsx b/src/components/purse/PurseView.tsx index 50f352a..08576b8 100644 --- a/src/components/purse/PurseView.tsx +++ b/src/components/purse/PurseView.tsx @@ -48,9 +48,12 @@ export const PurseView: FC<{}> = props => for(const type of types) { - if ((limit > -1) && (count === limit)) break; - elements.push() - count++; + if((limit > -1) && (count === limit)) break; + + if(seasonal) elements.push(); + else elements.push(); + + count++; } return elements; @@ -84,4 +87,4 @@ export const PurseView: FC<{}> = props => { getCurrencyElements(2, -1, true) } ); -} +} \ No newline at end of file diff --git a/src/components/purse/views/SeasonalView.tsx b/src/components/purse/views/SeasonalView.tsx index 0c869bb..5820b1c 100644 --- a/src/components/purse/views/SeasonalView.tsx +++ b/src/components/purse/views/SeasonalView.tsx @@ -1,5 +1,5 @@ import { FC } from 'react'; -import { LocalizeFormattedNumber, LocalizeText } from '../../../api'; +import { GetConfiguration, LocalizeFormattedNumber, LocalizeText } from '../../../api'; import { Flex, LayoutCurrencyIcon, Text } from '../../../common'; interface SeasonalViewProps @@ -13,12 +13,15 @@ export const SeasonalView: FC = props => const { type = -1, amount = -1 } = props; return ( - - { LocalizeText(`purse.seasonal.currency.${ type }`) } - - { LocalizeFormattedNumber(amount) } - - + ('currency.seasonal.color') }> + + { LocalizeText(`purse.seasonal.currency.${ type }`) } + 99999 ? LocalizeFormattedNumber(amount) : '' }>{ amount > 99999 ? '99 999' : LocalizeFormattedNumber(amount) } + + + + + ); }