From 2b8c3d6fb98249fcf888588828899e26a0fb4f62 Mon Sep 17 00:00:00 2001
From: ali asaria <aliasaria@users.noreply.github.com>
Date: Thu, 15 Aug 2024 16:26:07 -0400
Subject: [PATCH] almost ready to launch
---
.../components/Connect/LocalConnection.tsx | 54 ++++++++++++++-----
src/renderer/components/Connect/LogViewer.tsx | 4 +-
2 files changed, 44 insertions(+), 14 deletions(-)
diff --git a/src/renderer/components/Connect/LocalConnection.tsx b/src/renderer/components/Connect/LocalConnection.tsx
index c425bb67..de6ad2a0 100644
--- a/src/renderer/components/Connect/LocalConnection.tsx
+++ b/src/renderer/components/Connect/LocalConnection.tsx
@@ -12,7 +12,15 @@ import {
Tooltip,
Typography,
} from '@mui/joy';
-import { CheckCircle2, InfoIcon, PlayIcon, RotateCcwIcon } from 'lucide-react';
+import {
+ CheckCircle2,
+ ChevronLeftIcon,
+ ChevronRight,
+ ChevronRightIcon,
+ InfoIcon,
+ PlayIcon,
+ RotateCcwIcon,
+} from 'lucide-react';
import { useEffect, useState } from 'react';
import { useCheckLocalConnection } from 'renderer/lib/transformerlab-api-sdk';
@@ -831,6 +839,8 @@ function InstallStepper({ setServer }) {
Steps.indexOf('CHECK_IF_INSTALLED')
); // 0, 1, 2
+ const [logViewerVisible, setLogViewerVisible] = useState(true);
+
function tryToConnect() {
const fullServer = 'http://' + 'localhost' + ':' + '8000' + '/';
window.TransformerLab = {};
@@ -846,7 +856,7 @@ function InstallStepper({ setServer }) {
flexDirection: 'row',
overflow: 'hidden',
height: '100%',
- gap: 2,
+ gap: 1,
}}
>
<Sheet
@@ -855,7 +865,8 @@ function InstallStepper({ setServer }) {
flexDirection: 'column',
height: '100%',
overflow: 'hidden',
- flex: 1,
+ flex: '1',
+ minWidth: 300,
}}
>
<Alert variant="plain">
@@ -967,17 +978,36 @@ function InstallStepper({ setServer }) {
Connect
</Button>
</Sheet>
- <Sheet
- sx={{
- flex: 2,
- backgroundColor: '#222',
- fontFamily: 'monospace',
- p: 3,
- borderRadius: 10,
+ {/* <Button
+ variant="plain"
+ size="sm"
+ // sx={{ p: 0 }}
+ onClick={() => {
+ setLogViewerVisible(!logViewerVisible);
}}
>
- <LogViewer />
- </Sheet>
+ {logViewerVisible ? (
+ <ChevronRightIcon />
+ ) : (
+ <>
+ <ChevronLeftIcon />
+ Detailed Progress
+ </>
+ )}
+ </Button> */}
+ {logViewerVisible && (
+ <Sheet
+ sx={{
+ flex: 2,
+ backgroundColor: '#222',
+ fontFamily: 'monospace',
+ p: 3,
+ borderRadius: 10,
+ }}
+ >
+ <LogViewer />
+ </Sheet>
+ )}
</Sheet>
);
}
diff --git a/src/renderer/components/Connect/LogViewer.tsx b/src/renderer/components/Connect/LogViewer.tsx
index 5c819791..1cc69259 100644
--- a/src/renderer/components/Connect/LogViewer.tsx
+++ b/src/renderer/components/Connect/LogViewer.tsx
@@ -1,4 +1,4 @@
-import { Box, Sheet } from '@mui/joy';
+import { Box, Button, Sheet } from '@mui/joy';
import { useEffect, useRef } from 'react';
import 'xterm/css/xterm.css';
@@ -32,7 +32,7 @@ export default function LogViewer({}) {
setTimeout(() => {
window.electron.ipcRenderer.sendMessage('serverLog:startListening');
- }, 1500);
+ }, 100);
window.electron.ipcRenderer.removeAllListeners('serverLog:onUpdate');
console.log('Listening for server log updates');
window.electron.ipcRenderer.on('serverLog:update', (data: any) => {
--
GitLab