Skip to content

armgit / meet

Public Imported from GitHub
0

Open source video conferencing app powered by LiveKit. Built with Django and React.

✨(frontend) add telephony info to meeting dialog with layout stability

lebaudantoineb54445739a76
diff --git a/src/frontend/src/features/home/components/LaterMeetingDialog.tsx b/src/frontend/src/features/home/components/LaterMeetingDialog.tsx
index e61b579b..74d3ca50 100644
--- a/src/frontend/src/features/home/components/LaterMeetingDialog.tsx
+++ b/src/frontend/src/features/home/components/LaterMeetingDialog.tsx
@@ -1,20 +1,26 @@
-import { useEffect, useState } from 'react'
+import { useEffect, useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { getRouteUrl } from '@/navigation/getRouteUrl'
-import { Button, Dialog, type DialogProps, P, Text } from '@/primitives'
+import { Bold, Button, Dialog, type DialogProps, P, Text } from '@/primitives'
import { HStack } from '@/styled-system/jsx'
import { RiCheckLine, RiFileCopyLine, RiSpam2Fill } from '@remixicon/react'
import { css } from '@/styled-system/css'
+import { ApiRoom } from '@/features/rooms/api/ApiRoom'
+import { useTelephony } from '@/features/rooms/livekit/hooks/useTelephony'
+import { formatPinCode } from '@/features/rooms/utils/telephony'
// fixme - duplication with the InviteDialog
export const LaterMeetingDialog = ({
- roomId,
+ room,
...dialogProps
-}: { roomId: string } & Omit<DialogProps, 'title'>) => {
- const { t } = useTranslation('home')
- const roomUrl = getRouteUrl('room', roomId)
+}: { room: null | ApiRoom } & Omit<DialogProps, 'title'>) => {
+ const { t } = useTranslation('home', { keyPrefix: 'laterMeetingDialog' })
+
+ const roomUrl = room && getRouteUrl('room', room?.slug)
+ const telephony = useTelephony()
const [isCopied, setIsCopied] = useState(false)
+ const [isRoomUrlCopied, setIsRoomUrlCopied] = useState(false)
useEffect(() => {
if (isCopied) {
@@ -25,76 +31,194 @@ export const LaterMeetingDialog = ({
const [isHovered, setIsHovered] = useState(false)
+ useEffect(() => {
+ if (isRoomUrlCopied) {
+ const timeout = setTimeout(() => setIsRoomUrlCopied(false), 3000)
+ return () => clearTimeout(timeout)
+ }
+ }, [isRoomUrlCopied])
+
+ const isTelephonyReadyForUse = useMemo(() => {
+ return telephony?.enabled && room?.pin_code
+ }, [telephony?.enabled, room?.pin_code])
+
+ const clipboardContent = useMemo(() => {
+ if (isTelephonyReadyForUse) {
+ return [
+ t('clipboard.url', { roomUrl }),
+ t('clipboard.numberAndPin', {
+ phoneNumber: telephony?.internationalPhoneNumber,
+ pinCode: formatPinCode(room?.pin_code),
+ }),
+ ].join('\n')
+ }
+ return roomUrl
+ }, [
+ isTelephonyReadyForUse,
+ roomUrl,
+ telephony?.internationalPhoneNumber,
+ room?.pin_code,
+ t,
+ ])
+
return (
- <Dialog
- isOpen={!!roomId}
- {...dialogProps}
- title={t('laterMeetingDialog.heading')}
- >
- <P>{t('laterMeetingDialog.description')}</P>
- <Button
- variant={isCopied ? 'success' : 'primary'}
- size="sm"
- fullWidth
- aria-label={t('laterMeetingDialog.copy')}
- style={{
- justifyContent: 'start',
- }}
- onPress={() => {
- navigator.clipboard.writeText(roomUrl)
- setIsCopied(true)
- }}
- onHoverChange={setIsHovered}
- data-attr="later-dialog-copy"
- >
- {isCopied ? (
- <>
- <RiCheckLine size={18} style={{ marginRight: '8px' }} />
- {t('laterMeetingDialog.copied')}
- </>
- ) : (
- <>
- <RiFileCopyLine
- size={18}
- style={{ marginRight: '8px', minWidth: '18px' }}
- />
- {isHovered ? (
- t('laterMeetingDialog.copy')
- ) : (
+ <Dialog isOpen={!!room} {...dialogProps} title={t('heading')}>
+ <P>{t('description')}</P>
+ {!!roomUrl && (
+ <>
+ {isTelephonyReadyForUse ? (
+ <div
+ className={css({
+ width: '100%',
+ backgroundColor: 'gray.50',
+ borderRadius: '0.75rem',
+ display: 'flex',
+ flexDirection: 'column',
+ padding: '1.75rem 1.5rem',
+ marginTop: '0.5rem',
+ gap: '1rem',
+ overflow: 'hidden',
+ })}
+ >
+ <div
+ className={css({
+ display: 'flex',
+ alignItems: 'center',
+ justifyContent: 'space-between',
+ })}
+ >
+ <Text as="p" wrap="pretty">
+ {roomUrl?.replace(/^https?:\/\//, '')}
+ </Text>
+ {isTelephonyReadyForUse && (
+ <Button
+ variant={isRoomUrlCopied ? 'success' : 'tertiaryText'}
+ square
+ size={'sm'}
+ onPress={() => {
+ navigator.clipboard.writeText(roomUrl)
+ setIsRoomUrlCopied(true)
+ }}
+ aria-label={t('copyUrl')}
+ tooltip={t('copyUrl')}
+ >
+ {isRoomUrlCopied ? <RiCheckLine /> : <RiFileCopyLine />}
+ </Button>
+ )}
+ </div>
<div
- style={{
- textOverflow: 'ellipsis',
- overflow: 'hidden',
- userSelect: 'none',
- textWrap: 'nowrap',
- }}
+ className={css({
+ display: 'flex',
+ flexDirection: 'column',
+ })}
>
- {roomUrl.replace(/^https?:\/\//, '')}
+ <Text as="p" wrap="pretty">
+ <Bold>{t('phone.call')}</Bold> ({telephony?.country}){' '}
+ {telephony?.internationalPhoneNumber}
+ </Text>
+ <Text as="p" wrap="pretty">
+ <Bold>{t('phone.pinCode')}</Bold>{' '}
+ {formatPinCode(room?.pin_code)}
+ </Text>
</div>
- )}
- </>
- )}
- </Button>
- <HStack>
- <div
- className={css({
- backgroundColor: 'primary.200',
- borderRadius: '50%',
- padding: '4px',
- marginTop: '1rem',
- })}
- >
- <RiSpam2Fill
- size={22}
- className={css({
- fill: 'primary.500',
- })}
- />
- </div>
- <Text variant="sm" style={{ marginTop: '1rem' }}>
- {t('laterMeetingDialog.permissions')}
- </Text>
- </HStack>
+ {clipboardContent && (
+ <Button
+ variant={isCopied ? 'success' : 'tertiaryText'}
+ size="sm"
+ fullWidth
+ aria-label={t('copy')}
+ style={{
+ justifyContent: 'start',
+ }}
+ onPress={() => {
+ navigator.clipboard.writeText(clipboardContent)
+ setIsCopied(true)
+ }}
+ data-attr="later-dialog-copy"
+ >
+ {isCopied ? (
+ <>
+ <RiCheckLine size={18} style={{ marginRight: '8px' }} />
+ {t('copied')}
+ </>
+ ) : (
+ <>
+ <RiFileCopyLine
+ style={{ marginRight: '6px', minWidth: '18px' }}
+ />
+ {t('copy')}
+ </>
+ )}
+ </Button>
+ )}
+ </div>
+ ) : (
+ <Button
+ variant={isCopied ? 'success' : 'primary'}
+ size="sm"
+ fullWidth
+ aria-label={t('copy')}
+ style={{
+ justifyContent: 'start',
+ }}
+ onPress={() => {
+ navigator.clipboard.writeText(roomUrl)
+ setIsCopied(true)
+ }}
+ onHoverChange={setIsHovered}
+ data-attr="later-dialog-copy"
+ >
+ {isCopied ? (
+ <>
+ <RiCheckLine size={18} style={{ marginRight: '8px' }} />
+ {t('copied')}
+ </>
+ ) : (
+ <>
+ <RiFileCopyLine
+ size={18}
+ style={{ marginRight: '8px', minWidth: '18px' }}
+ />
+ {isHovered ? (
+ t('copy')
+ ) : (
+ <div
+ style={{
+ textOverflow: 'ellipsis',
+ overflow: 'hidden',
+ userSelect: 'none',
+ textWrap: 'nowrap',
+ }}
+ >
+ {roomUrl?.replace(/^https?:\/\//, '')}
+ </div>
+ )}
+ </>
+ )}
+ </Button>
+ )}
+ <HStack>
+ <div
+ className={css({
+ backgroundColor: 'primary.200',
+ borderRadius: '50%',
+ padding: '4px',
+ marginTop: '1rem',
+ })}
+ >
+ <RiSpam2Fill
+ size={22}
+ className={css({
+ fill: 'primary.500',
+ })}
+ />
+ </div>
+ <Text variant="sm" style={{ marginTop: '1rem' }}>
+ {t('permissions')}
+ </Text>
+ </HStack>
+ </>
+ )}
</Dialog>
)
}
diff --git a/src/frontend/src/features/home/routes/Home.tsx b/src/frontend/src/features/home/routes/Home.tsx
index ecfd243c..aa18afda 100644
--- a/src/frontend/src/features/home/routes/Home.tsx
+++ b/src/frontend/src/features/home/routes/Home.tsx
@@ -18,6 +18,7 @@ import { menuRecipe } from '@/primitives/menuRecipe.ts'
import { usePersistentUserChoices } from '@/features/rooms/livekit/hooks/usePersistentUserChoices'
import { useConfig } from '@/api/useConfig'
import { LoginButton } from '@/components/LoginButton'
+import { ApiRoom } from '@/features/rooms/api/ApiRoom'
const Columns = ({ children }: { children?: ReactNode }) => {
return (
@@ -153,7 +154,7 @@ export const Home = () => {
} = usePersistentUserChoices()
const { mutateAsync: createRoom } = useCreateRoom()
- const [laterRoomId, setLaterRoomId] = useState<null | string>(null)
+ const [laterRoom, setLaterRoom] = useState<null | ApiRoom>(null)
const { data } = useConfig()
@@ -202,7 +203,7 @@ export const Home = () => {
onAction={() => {
const slug = generateRoomId()
createRoom({ slug, username }).then((data) =>
- setLaterRoomId(data.slug)
+ setLaterRoom(data)
)
}}
data-attr="create-option-later"
@@ -251,8 +252,8 @@ export const Home = () => {
</RightColumn>
</Columns>
<LaterMeetingDialog
- roomId={laterRoomId ?? ''}
- onOpenChange={() => setLaterRoomId(null)}
+ room={laterRoom}
+ onOpenChange={() => setLaterRoom(null)}
/>
</Screen>
</UserAware>
diff --git a/src/frontend/src/locales/de/home.json b/src/frontend/src/locales/de/home.json
index e8b02889..f991d20b 100644
--- a/src/frontend/src/locales/de/home.json
+++ b/src/frontend/src/locales/de/home.json
@@ -20,9 +20,18 @@
"laterMeetingDialog": {
"heading": "Ihre Zugangsdaten",
"description": "Teilen Sie diese Informationen mit den Gästen. Sie können dem Meeting beitreten, ohne sich anmelden zu müssen. Dieses Meeting ist dauerhaft und kann wiederverwendet werden.",
- "copy": "Meeting-Link kopieren",
- "copied": "Link in die Zwischenablage kopiert",
- "permissions": "Personen mit diesem Link benötigen keine Genehmigung, um diesem Meeting beizutreten."
+ "permissions": "Personen mit diesem Link benötigen keine Genehmigung, um diesem Meeting beizutreten.",
+ "copy": "Informationen kopieren",
+ "copied": "Informationen kopiert",
+ "copyUrl": "Meeting-Link kopieren",
+ "phone": {
+ "call": "Rufen Sie an:",
+ "pinCode": "Code:"
+ },
+ "clipboard": {
+ "url": "Um an der Videokonferenz teilzunehmen, klicken Sie auf diesen Link: {{roomUrl}}",
+ "numberAndPin": "Um telefonisch teilzunehmen, wählen Sie {{phoneNumber}} und geben Sie diesen Code ein: {{pinCode}}"
+ }
},
"introSlider": {
"previous": {
diff --git a/src/frontend/src/locales/en/home.json b/src/frontend/src/locales/en/home.json
index ae34cbfe..dad09df8 100644
--- a/src/frontend/src/locales/en/home.json
+++ b/src/frontend/src/locales/en/home.json
@@ -20,9 +20,18 @@
"laterMeetingDialog": {
"heading": "Your connection details",
"description": "Share this information with the guests. They will be able to join the meeting without needing to sign in. This meeting is permanent and can be reused.",
- "copy": "Copy the meeting link",
- "copied": "Link copied to clipboard",
- "permissions": "People with this link do not need your permission to join this meeting."
+ "permissions": "People with this link do not need your permission to join this meeting.",
+ "copy": "Copy information",
+ "copied": "Information copied to clipboard",
+ "copyUrl": "Copy the meeting link",
+ "phone": {
+ "call": "Call:",
+ "pinCode": "Code:"
+ },
+ "clipboard": {
+ "url": "To join the video conference, click on this link: {{roomUrl}}",
+ "numberAndPin": "To join by phone, dial {{phoneNumber}} and enter this code: {{pinCode}}"
+ }
},
"introSlider": {
"previous": {
diff --git a/src/frontend/src/locales/fr/home.json b/src/frontend/src/locales/fr/home.json
index c3beca8e..97cacaf2 100644
--- a/src/frontend/src/locales/fr/home.json
+++ b/src/frontend/src/locales/fr/home.json
@@ -19,10 +19,19 @@
},
"laterMeetingDialog": {
"heading": "Vos informations de connexion",
- "copy": "Copier le lien de la réunion",
- "copied": "Lien copié dans le presse-papiers",
- "permissions": "Les personnes disposant de ce lien n'ont pas besoin de votre autorisation pour rejoindre cette réunion."
"description": "Partagez ces informations avec les invités. Ils pourront rejoindre la réunion sans avoir besoin de se connecter. Cette réunion est permanente et peut être réutilisée.",
+ "permissions": "Les personnes disposant de ce lien n'ont pas besoin de votre autorisation pour rejoindre cette réunion.",
+ "copy": "Copier les informations",
+ "copied": "Copiées dans le presse-papiers",
+ "copyUrl": "Copier le lien de la réunion",
+ "phone": {
+ "call": "Appelez le :",
+ "pinCode": "Code :"
+ },
+ "clipboard": {
+ "url": "Pour participer à la visioconférence, cliquez sur ce lien : {{roomUrl}}",
+ "numberAndPin": "Pour participer par téléphone, composez le {{phoneNumber}} et saisissez ce code : {{pinCode}}"
+ }
},
"introSlider": {
"previous": {
diff --git a/src/frontend/src/locales/nl/home.json b/src/frontend/src/locales/nl/home.json
index f9f733f9..b072067d 100644
--- a/src/frontend/src/locales/nl/home.json
+++ b/src/frontend/src/locales/nl/home.json
@@ -20,9 +20,18 @@
"laterMeetingDialog": {
"heading": "Uw verbindingsgegevens",
"description": "Deel deze informatie met de genodigden. Zij kunnen deelnemen aan de vergadering zonder zich aan te melden. Deze vergadering is permanent en kan hergebruikt worden.",
- "copy": "Kopieer de vergaderlink",
- "copied": "Link gekopieerd naar klembord",
- "permissions": "Mensen met deze link hebben uw toestemming niet nodig om deel te nemen aan deze vergadering."
+ "permissions": "Mensen met deze link hebben uw toestemming niet nodig om deel te nemen aan deze vergadering.",
+ "copy": "Informatie kopiëren",
+ "copied": "Informatie gekopieerd",
+ "copyUrl": "Kopieer de vergaderlink",
+ "phone": {
+ "call": "Bel:",
+ "pinCode": "Code:"
+ },
+ "clipboard": {
+ "url": "Klik op deze link om deel te nemen aan de videoconferentie: {{roomUrl}}",
+ "numberAndPin": "Bel {{phoneNumber}} en voer deze code in om telefonisch deel te nemen: {{pinCode}}"
+ }
},
"introSlider": {
"previous": {