nitro/nitro-react
1
0
Fork 0
mirror of https://github.com/billsonnn/nitro-react.git synced 2025-01-19 05:46:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

FIx merge conflicts

Browse Source
This commit is contained in:
Bill 2021-04-21 22:12:04 -04:00
parent dca8e954ae
commit 34c50008be
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/hooks/draggable-window/DraggableWindow.tsx
View File

@ -12,8 +12,6 @@ export function DraggableWindow(props: DraggableWindowProps): JSX.Element
{ {
let zIndex = 400; let zIndex = 400;
console.log(currentWindows);
for(const existingWindow of currentWindows) for(const existingWindow of currentWindows)
{ {
zIndex += 1; zIndex += 1;

2
src/views/navigator/result-lists/result-list/NavigatorResultListView.tsx
View File

@ -19,7 +19,7 @@ export function NavigatorResultListView(props: NavigatorResultListViewProps): JS
{ {
let name = resultList.code; let name = resultList.code;
if((!name || name.length == 0) && (resultList.data && resultList.data.length > 0)) if((!name || name.length === 0) && (resultList.data && resultList.data.length > 0))
{ {
return resultList.data; return resultList.data;
} }

23
src/views/navigator/result-lists/result-list/result/NavigatorResultView.tsx
View File

@ -39,6 +39,7 @@ export function NavigatorResultView(props: NavigatorResultViewProps): JSX.Elemen
} }
return ( return (
<<<<<<< Updated upstream
<div className="d-flex flex-column justify-content-center align-items-center nitro-navigator-result" onClick={ () => navigatorContext.onTryVisitRoom(result) }> <div className="d-flex flex-column justify-content-center align-items-center nitro-navigator-result" onClick={ () => navigatorContext.onTryVisitRoom(result) }>
<div className="d-flex justify-content-between w-100 px-2 py-1"> <div className="d-flex justify-content-between w-100 px-2 py-1">
<div className="d-flex justify-content-center flex-grow-1 overflow-hidden"> <div className="d-flex justify-content-center flex-grow-1 overflow-hidden">
@ -47,6 +48,28 @@ export function NavigatorResultView(props: NavigatorResultViewProps): JSX.Elemen
</div> </div>
<div className="d-flex flex-column justify-content-center align-items-start flex-grow-1 px-2 overflow-hidden"> <div className="d-flex flex-column justify-content-center align-items-start flex-grow-1 px-2 overflow-hidden">
<span className="d-block text-truncate" style={ { maxWidth: '95%' } }>{ result.roomName }</span> <span className="d-block text-truncate" style={ { maxWidth: '95%' } }>{ result.roomName }</span>
=======
<NavigatorContext.Consumer>
{ navigatorContext => {
return <div className="d-flex flex-column justify-content-center align-items-center nitro-navigator-result" onClick={ () => navigatorContext.onTryVisitRoom(result) }>
<div className="d-flex justify-content-between w-100 px-2 py-1">
<div className="d-flex justify-content-center flex-grow-1 overflow-hidden">
<div className={ "d-flex justify-content-center align-items-center badge text-center " + getUserCounterColor() }>
<i className="fas fa-user mr-1 small"></i> { result.userCount }
</div>
<div className="d-flex flex-column justify-content-center align-items-start flex-grow-1 px-2 overflow-hidden">
<span className="d-block text-truncate" style={ { maxWidth: '95%' } }>{ result.roomName }</span>
</div>
</div>
<div className="d-flex flex-row-reverse align-items-center">
<i className="fas fa-info-circle small" onClick={ openInfo }></i>
{ result.habboGroupId > 0 && <i className="fas fa-users mr-2 small"></i> }
{ result.doorMode !== RoomDataParser.OPEN_STATE &&
<i className={ "mr-2 fas small " + classNames( {'fa-lock': result.doorMode === RoomDataParser.DOORBELL_STATE, 'fa-key': result.doorMode === RoomDataParser.PASSWORD_STATE })}></i>
}
</div>
</div>
>>>>>>> Stashed changes
</div> </div>
</div> </div>
<div className="d-flex flex-row-reverse align-items-center"> <div className="d-flex flex-row-reverse align-items-center">