From 2f95df90b5195bc8d8f396b09f01224a627e695e Mon Sep 17 00:00:00 2001 From: glen coden Date: Wed, 15 Jan 2025 22:10:06 +0100 Subject: [PATCH] feat (tool): serve via http --- apps/cloud/app/routes/session.$sessionId.tsx | 4 +++- apps/tool/app/routes/_index.tsx | 15 +++++++++------ docker-compose.yml | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/apps/cloud/app/routes/session.$sessionId.tsx b/apps/cloud/app/routes/session.$sessionId.tsx index 9933438..198fd3e 100644 --- a/apps/cloud/app/routes/session.$sessionId.tsx +++ b/apps/cloud/app/routes/session.$sessionId.tsx @@ -837,7 +837,9 @@ export default function ActiveSession() { } disabled={ isPending || - !!session.isLocked + Boolean( + session.isLocked, + ) } > diff --git a/apps/tool/app/routes/_index.tsx b/apps/tool/app/routes/_index.tsx index a182bbf..e9a9b33 100644 --- a/apps/tool/app/routes/_index.tsx +++ b/apps/tool/app/routes/_index.tsx @@ -3,6 +3,7 @@ import Logo from '@repo/ui/components/Logo' import QRDemo from '@repo/ui/components/QRDemo' import QRLive from '@repo/ui/components/QRLive' import { cn } from '@repo/ui/helpers' +import H3 from '@repo/ui/typography/H3' import { useEffectEvent } from '@repo/utils/hooks' import { useQuery } from '@tanstack/react-query' import { useEffect, useState } from 'react' @@ -417,8 +418,8 @@ export default function Index() { const retryInterval = 5000 // ms const connect = () => { - websocket = new WebSocket(`wss://${autoToolServerIP}:5555`) - // websocket = new WebSocket(`wss://localhost:5555`) + websocket = new WebSocket(`ws://${autoToolServerIP}:5555`) + // websocket = new WebSocket(`ws://localhost:5555`) websocket.addEventListener('error', (error) => { console.log( @@ -433,7 +434,6 @@ export default function Index() { }) websocket.addEventListener('open', () => { - console.log('WEBSOCKET OPEN') setIsAutoLyricsConnected(true) }) @@ -483,7 +483,6 @@ export default function Index() { const screen = useAutoScreen() useEffect(() => { - console.log('NEW SCREEN') if (screen.type === 'lyrics') { setSelectedSongId(screen.songId) return @@ -510,6 +509,10 @@ export default function Index() {
+

+ {isAutoLyricsConnected ? 'CONNECTED' : 'WAITING...'} +

+

- - + +