From 7c013379844f10450f4bcf4c3b6d14a283f3f7eb Mon Sep 17 00:00:00 2001 From: duckietm Date: Tue, 3 Mar 2026 09:12:12 +0100 Subject: [PATCH] :up: Fix Room Settings / HC now hidden when not HC and small fixes --- src/common/card/NitroCardHeaderView.tsx | 7 +- .../NavigatorRoomSettingsAccessTabView.tsx | 90 +++++++-------- .../NavigatorRoomSettingsBasicTabView.tsx | 83 +++++++------ .../NavigatorRoomSettingsModTabView.tsx | 46 ++++---- .../NavigatorRoomSettingsRightsTabView.tsx | 109 +++++++++++++++--- .../NavigatorRoomSettingsView.tsx | 4 +- .../NavigatorRoomSettingsVipChatTabView.tsx | 21 ++-- 7 files changed, 221 insertions(+), 139 deletions(-) diff --git a/src/common/card/NitroCardHeaderView.tsx b/src/common/card/NitroCardHeaderView.tsx index 5734567..8bb354c 100644 --- a/src/common/card/NitroCardHeaderView.tsx +++ b/src/common/card/NitroCardHeaderView.tsx @@ -7,13 +7,15 @@ interface NitroCardHeaderViewProps extends ColumnProps headerText: string; isGalleryPhoto?: boolean; noCloseButton?: boolean; + isInfoToHabboPages?: boolean; onReportPhoto?: (event: MouseEvent) => void; + onClickInfoHabboPages?: (event: MouseEvent) => void; onCloseClick: (event: MouseEvent) => void; } export const NitroCardHeaderView: FC = props => { - const { headerText = null, isGalleryPhoto = false, noCloseButton = false, onReportPhoto = null, onCloseClick = null, justifyContent = 'center', alignItems = 'center', classNames = [], children = null, ...rest } = props; + const { headerText = null, isGalleryPhoto = false, noCloseButton = false, isInfoToHabboPages = false, onReportPhoto = null, onClickInfoHabboPages = null, onCloseClick = null, justifyContent = 'center', alignItems = 'center', classNames = [], children = null, ...rest } = props; @@ -32,6 +34,9 @@ export const NitroCardHeaderView: FC = props => } + { isInfoToHabboPages && + + }
diff --git a/src/components/navigator/views/room-settings/NavigatorRoomSettingsAccessTabView.tsx b/src/components/navigator/views/room-settings/NavigatorRoomSettingsAccessTabView.tsx index 66385c4..57ae347 100644 --- a/src/components/navigator/views/room-settings/NavigatorRoomSettingsAccessTabView.tsx +++ b/src/components/navigator/views/room-settings/NavigatorRoomSettingsAccessTabView.tsx @@ -1,7 +1,7 @@ import { RoomDataParser } from '@nitrots/nitro-renderer'; import { FC, useEffect, useState } from 'react'; import { IRoomData, LocalizeText } from '../../../../api'; -import { Text } from '../../../../common'; +import { Column, Flex, Text } from '../../../../common'; interface NavigatorRoomSettingsTabViewProps { @@ -21,7 +21,7 @@ export const NavigatorRoomSettingsAccessTabView: FC { @@ -32,57 +32,57 @@ export const NavigatorRoomSettingsAccessTabView: FC -
- { LocalizeText('navigator.roomsettings.roomaccess.caption') } - { LocalizeText('navigator.roomsettings.roomaccess.info') } -
-
-
- { LocalizeText('navigator.roomsettings.doormode') } -
- handleChange('lock_state', RoomDataParser.OPEN_STATE) } /> - { LocalizeText('navigator.roomsettings.doormode.open') } -
-
- handleChange('lock_state', RoomDataParser.DOORBELL_STATE) } /> - { LocalizeText('navigator.roomsettings.doormode.doorbell') } -
-
- handleChange('lock_state', RoomDataParser.INVISIBLE_STATE) } /> - { LocalizeText('navigator.roomsettings.doormode.invisible') } -
-
- setIsTryingPassword(event.target.checked) } /> + + { LocalizeText('navigator.roomsettings.roomaccess.caption') } + { LocalizeText('navigator.roomsettings.roomaccess.info') } + + + + { LocalizeText('navigator.roomsettings.doormode') } + + handleChange('lock_state', RoomDataParser.OPEN_STATE) } /> + { LocalizeText('navigator.roomsettings.doormode.open') } + + + handleChange('lock_state', RoomDataParser.DOORBELL_STATE) } /> + { LocalizeText('navigator.roomsettings.doormode.doorbell') } + + + handleChange('lock_state', RoomDataParser.INVISIBLE_STATE) } /> + { LocalizeText('navigator.roomsettings.doormode.invisible') } + + + setIsTryingPassword(event.target.checked) } /> { !isTryingPassword && (roomData.lockState !== RoomDataParser.PASSWORD_STATE) && - { LocalizeText('navigator.roomsettings.doormode.password') } } + { LocalizeText('navigator.roomsettings.doormode.password') } } { (isTryingPassword || (roomData.lockState === RoomDataParser.PASSWORD_STATE)) && -
- { LocalizeText('navigator.roomsettings.doormode.password') } - setPassword(event.target.value) } onFocus={ event => setIsTryingPassword(true) } /> + + { LocalizeText('navigator.roomsettings.doormode.password') } + setPassword(event.target.value) } placeholder={ LocalizeText('navigator.roomsettings.password') } onFocus={ event => setIsTryingPassword(true) } /> { isTryingPassword && (password.length <= 0) && - + { LocalizeText('navigator.roomsettings.passwordismandatory') } } - setConfirmPassword(event.target.value) } /> + setConfirmPassword(event.target.value) } onBlur={ saveRoomPassword } placeholder={ LocalizeText('navigator.roomsettings.passwordconfirm') } /> { isTryingPassword && ((password.length > 0) && (password !== confirmPassword)) && - + { LocalizeText('navigator.roomsettings.invalidconfirm') } } -
} -
-
-
- { LocalizeText('navigator.roomsettings.pets') } -
- handleChange('allow_pets', event.target.checked) } /> - { LocalizeText('navigator.roomsettings.allowpets') } -
-
- handleChange('allow_pets_eat', event.target.checked) } /> - { LocalizeText('navigator.roomsettings.allowfoodconsume') } -
-
-
+ } + + + + { LocalizeText('navigator.roomsettings.pets') } + + handleChange('allow_pets', event.target.checked) } /> + { LocalizeText('navigator.roomsettings.allowpets') } + + + handleChange('allow_pets_eat', event.target.checked) } /> + { LocalizeText('navigator.roomsettings.allowfoodconsume') } + + + ); }; diff --git a/src/components/navigator/views/room-settings/NavigatorRoomSettingsBasicTabView.tsx b/src/components/navigator/views/room-settings/NavigatorRoomSettingsBasicTabView.tsx index 88455db..dc4ca42 100644 --- a/src/components/navigator/views/room-settings/NavigatorRoomSettingsBasicTabView.tsx +++ b/src/components/navigator/views/room-settings/NavigatorRoomSettingsBasicTabView.tsx @@ -1,10 +1,9 @@ -import { CreateLinkEvent, RoomDeleteComposer, RoomSettingsSaveErrorEvent, RoomSettingsSaveErrorParser } from '@nitrots/nitro-renderer'; +import { RoomDeleteComposer, RoomSettingsSaveErrorEvent, RoomSettingsSaveErrorParser } from '@nitrots/nitro-renderer'; import { FC, useEffect, useState } from 'react'; import { FaTimes } from 'react-icons/fa'; -import { GetMaxVisitorsList, IRoomData, LocalizeText, SendMessageComposer } from '../../../../api'; -import { Column, Text } from '../../../../common'; +import { CreateLinkEvent, GetMaxVisitorsList, IRoomData, LocalizeText, SendMessageComposer } from '../../../../api'; +import { Base, Column, Flex, Text } from '../../../../common'; import { useMessageEvent, useNavigator, useNotification } from '../../../../hooks'; -import { NitroInput } from '../../../../layout'; const ROOM_NAME_MIN_LENGTH = 3; const ROOM_NAME_MAX_LENGTH = 60; @@ -34,9 +33,9 @@ export const NavigatorRoomSettingsBasicTabView: FC { - showConfirm(LocalizeText('navigator.roomsettings.deleteroom.confirm.message', [ 'room_name' ], [ roomData.roomName ]), () => + showConfirm(LocalizeText('navigator.roomsettings.deleteroom.confirm.message', [ 'room_name' ], [ roomData.roomName ] ), () => { SendMessageComposer(new RoomDeleteComposer(roomData.roomId)); @@ -60,21 +59,21 @@ export const NavigatorRoomSettingsBasicTabView: FC { if((roomName === roomData.roomName) || (roomName.length < ROOM_NAME_MIN_LENGTH) || (roomName.length > ROOM_NAME_MAX_LENGTH)) return; handleChange('name', roomName); - }; + } const saveRoomDescription = () => { if((roomDescription === roomData.roomDescription) || (roomDescription.length > DESC_MAX_LENGTH)) return; handleChange('description', roomDescription); - }; + } const saveTags = (index: number) => { @@ -87,7 +86,7 @@ export const NavigatorRoomSettingsBasicTabView: FC { @@ -99,44 +98,44 @@ export const NavigatorRoomSettingsBasicTabView: FC -
- { LocalizeText('navigator.roomname') } + + { LocalizeText('navigator.roomname') } - setRoomName(event.target.value) } /> + setRoomName(event.target.value) } onBlur={ saveRoomName } /> { (roomName.length < ROOM_NAME_MIN_LENGTH) && { LocalizeText('navigator.roomsettings.roomnameismandatory') } } -
-
- { LocalizeText('navigator.roomsettings.desc') } -