From c8a7a1704904e80d129e2d66567dcd5698055a97 Mon Sep 17 00:00:00 2001
From: Bill <billsonnn@live.com>
Date: Wed, 2 Mar 2022 22:20:21 -0500
Subject: [PATCH] Update doorbell widget layout

---
 src/App.scss                                  |  3 ++
 .../NavigatorRoomDoorbellView.tsx             | 16 ++++++----
 src/views/room/widgets/RoomWidgets.scss       |  5 +++
 .../doorbell/DoorbellWidgetItemView.tsx       | 29 -----------------
 .../widgets/doorbell/DoorbellWidgetView.tsx   | 32 ++++++++++++++++---
 5 files changed, 44 insertions(+), 41 deletions(-)
 delete mode 100644 src/views/room/widgets/doorbell/DoorbellWidgetItemView.tsx

diff --git a/src/App.scss b/src/App.scss
index 1699a227..05cc0cc0 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -78,6 +78,9 @@ $nitro-group-manager-height: 355px;
 $nitro-chooser-width: 200px;
 $nitro-chooser-height: 200px;
 
+$nitro-doorbell-width: 300px;
+$nitro-doorbell-height: 200px;
+
 $nitro-guide-tool-width: 250px;
 
 .nitro-app {
diff --git a/src/components/navigator/views/room-doorbell/NavigatorRoomDoorbellView.tsx b/src/components/navigator/views/room-doorbell/NavigatorRoomDoorbellView.tsx
index b4a9e0e4..ec203034 100644
--- a/src/components/navigator/views/room-doorbell/NavigatorRoomDoorbellView.tsx
+++ b/src/components/navigator/views/room-doorbell/NavigatorRoomDoorbellView.tsx
@@ -48,13 +48,15 @@ export const NavigatorRoomDoorbellView: FC<NavigatorRoomDoorbellViewProps> = pro
                     { (state === UpdateDoorStateEvent.STATE_NO_ANSWER) &&
                         <Text>{ LocalizeText('navigator.doorbell.no.answer') }</Text> }
                 </Column>
-                { (state === UpdateDoorStateEvent.START_DOORBELL) &&
-                    <Button variant="success" size="sm" onClick={ ring }>
-                        { LocalizeText('navigator.doorbell.button.ring') }
-                    </Button> }
-                <Button variant="danger" size="sm" onClick={ close }>
-                    { LocalizeText('generic.cancel') }
-                </Button>
+                <Column gap={ 1 }>
+                    { (state === UpdateDoorStateEvent.START_DOORBELL) &&
+                        <Button variant="success" size="sm" onClick={ ring }>
+                            { LocalizeText('navigator.doorbell.button.ring') }
+                        </Button> }
+                    <Button variant="danger" size="sm" onClick={ close }>
+                        { LocalizeText('generic.cancel') }
+                    </Button>
+                </Column>
             </NitroCardContentView>
         </NitroCardView>
     );
diff --git a/src/views/room/widgets/RoomWidgets.scss b/src/views/room/widgets/RoomWidgets.scss
index 03b34a57..5ed221cc 100644
--- a/src/views/room/widgets/RoomWidgets.scss
+++ b/src/views/room/widgets/RoomWidgets.scss
@@ -94,6 +94,11 @@
     width: 22px;
 }
 
+.nitro-widget-doorbell {
+    width: $nitro-doorbell-width;
+    height: $nitro-doorbell-height;
+}
+
 @import './avatar-info/AvatarInfoWidgetView';
 @import './chat/ChatWidgetView';
 @import './chat-input/ChatInputView';
diff --git a/src/views/room/widgets/doorbell/DoorbellWidgetItemView.tsx b/src/views/room/widgets/doorbell/DoorbellWidgetItemView.tsx
deleted file mode 100644
index 810cae5d..00000000
--- a/src/views/room/widgets/doorbell/DoorbellWidgetItemView.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { FC } from 'react';
-import { Button, ButtonGroup, Flex, Text } from '../../../../common';
-
-interface DoorbellWidgetItemViewProps
-{
-    userName: string;
-    accept: () => void;
-    deny: () => void;
-}
-
-export const DoorbellWidgetItemView: FC<DoorbellWidgetItemViewProps> = props =>
-{
-    const { userName = '', accept = null, deny = null } = props;
-
-    return (
-        <Flex alignItems="center" justifyContent="between">
-            <Text bold>{ userName }</Text>
-            <ButtonGroup>
-                <Button variant="success" onClick={ accept }>
-                    <FontAwesomeIcon icon="check" />
-                </Button>
-                <Button variant="danger" onClick={ deny }>
-                    <FontAwesomeIcon icon="times" />
-                </Button>
-            </ButtonGroup>
-        </Flex>
-    );
-}
diff --git a/src/views/room/widgets/doorbell/DoorbellWidgetView.tsx b/src/views/room/widgets/doorbell/DoorbellWidgetView.tsx
index a42ed47c..bebc1da6 100644
--- a/src/views/room/widgets/doorbell/DoorbellWidgetView.tsx
+++ b/src/views/room/widgets/doorbell/DoorbellWidgetView.tsx
@@ -1,10 +1,9 @@
 import { FC, useCallback, useState } from 'react';
 import { LocalizeText, RoomWidgetDoorbellEvent, RoomWidgetLetUserInMessage } from '../../../../api';
-import { Column } from '../../../../common';
+import { Base, Button, Column, Flex, Grid } from '../../../../common';
 import { BatchUpdates, CreateEventDispatcherHook } from '../../../../hooks';
 import { NitroCardContentView, NitroCardHeaderView, NitroCardView } from '../../../../layout';
 import { useRoomContext } from '../../context/RoomContext';
-import { DoorbellWidgetItemView } from './DoorbellWidgetItemView';
 
 export const DoorbellWidgetView: FC<{}> = props =>
 {
@@ -68,9 +67,32 @@ export const DoorbellWidgetView: FC<{}> = props =>
     return (
         <NitroCardView className="nitro-widget-doorbell" simple={ true }>
             <NitroCardHeaderView headerText={ LocalizeText('navigator.doorbell.title') } onCloseClick={ event => setIsVisible(false) } />
-            <NitroCardContentView overflow="hidden">
-                <Column overflow="auto">
-                    { users && (users.length > 0) && users.map(userName => <DoorbellWidgetItemView key={ userName } userName={ userName } accept={ () => answer(userName, true) } deny={ () => answer(userName, false) } />) }
+            <NitroCardContentView overflow="hidden" gap={ 0 }>
+                <Column gap={ 2 }>
+                    <Grid gap={ 1 } className="text-black fw-bold border-bottom px-1 pb-1">
+                        <Base className="g-col-6">Username</Base>
+                        <Base className="g-col-6"></Base>
+                    </Grid>
+                </Column>
+                <Column overflow="auto" className="striped-children" gap={ 0 }>
+                    { users && (users.length > 0) && users.map(userName =>
+                        {
+                            return (
+                                <Grid key={ userName } gap={ 1 } alignItems="center" className="text-black border-bottom p-1">
+                                    <Base className="g-col-6">{ userName }</Base>
+                                    <Base className="g-col-6">
+                                        <Flex alignItems="center" justifyContent="end" gap={ 1 }>
+                                            <Button variant="success" onClick={ () => answer(userName, true) }>
+                                                { LocalizeText('generic.accept') }
+                                            </Button>
+                                            <Button variant="danger" onClick={ () => answer(userName, false) }>
+                                                { LocalizeText('generic.deny') }
+                                            </Button>
+                                        </Flex>
+                                    </Base>
+                                </Grid>
+                            );
+                        }) }
                 </Column>
             </NitroCardContentView>
         </NitroCardView>