From c3f4f321078add35aeacdb79905fbafcfe3a6f22 Mon Sep 17 00:00:00 2001 From: Robert Long Date: Mon, 13 Dec 2021 16:16:25 -0800 Subject: [PATCH] Add login button to lobby screen --- src/Room.jsx | 29 ++++++++++++++++++++++++----- src/button/Button.module.css | 1 + src/button/LinkButton.jsx | 12 ++++++++++++ src/button/index.js | 1 + 4 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 src/button/LinkButton.jsx diff --git a/src/Room.jsx b/src/Room.jsx index 761fe0f2..39d021be 100644 --- a/src/Room.jsx +++ b/src/Room.jsx @@ -24,6 +24,7 @@ import { MicButton, VideoButton, ScreenshareButton, + LinkButton, } from "./button"; import { Header, @@ -59,9 +60,11 @@ const isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent); export function Room() { const [registeringGuest, setRegisteringGuest] = useState(false); const [registrationError, setRegistrationError] = useState(); - const { loading, isAuthenticated, error, client, registerGuest } = + const { loading, isAuthenticated, error, client, registerGuest, isGuest } = useClient(); + console.log({ isGuest }); + useEffect(() => { if (!loading && !isAuthenticated) { setRegisteringGuest(true); @@ -85,10 +88,10 @@ export function Room() { return ; } - return ; + return ; } -export function GroupCall({ client }) { +export function GroupCall({ client, isGuest }) { const { roomId: maybeRoomId } = useParams(); const { hash, search } = useLocation(); const [simpleGrid, viaServers] = useMemo(() => { @@ -116,6 +119,7 @@ export function GroupCall({ client }) { return ( { onInitLocalCallFeed(); @@ -264,7 +277,13 @@ function RoomSetupView({ - + {isGuest ? ( + + Log in + + ) : ( + + )}
diff --git a/src/button/Button.module.css b/src/button/Button.module.css index ea233ea2..6433eca9 100644 --- a/src/button/Button.module.css +++ b/src/button/Button.module.css @@ -28,6 +28,7 @@ limitations under the License. padding: 0; border: none; cursor: pointer; + text-decoration: none; } .secondary, diff --git a/src/button/LinkButton.jsx b/src/button/LinkButton.jsx new file mode 100644 index 00000000..cd656c58 --- /dev/null +++ b/src/button/LinkButton.jsx @@ -0,0 +1,12 @@ +import React from "react"; +import { Link } from "react-router-dom"; +import classNames from "classnames"; +import styles from "./Button.module.css"; + +export function LinkButton({ className, children, ...rest }) { + return ( + + {children} + + ); +} diff --git a/src/button/index.js b/src/button/index.js index e20a7cb6..0dc793c9 100644 --- a/src/button/index.js +++ b/src/button/index.js @@ -1,2 +1,3 @@ export * from "./Button"; export * from "./CopyButton"; +export * from "./LinkButton";