Skip to content

Commit 6db9f65

Browse files
committed
Hide spinner when connected to websocket
1 parent c8d89e0 commit 6db9f65

File tree

2 files changed

+20
-11
lines changed

2 files changed

+20
-11
lines changed

resources/scripts/components/server/Console.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import React, { createRef, useEffect, useRef } from 'react';
22
import { Terminal } from 'xterm';
33
import * as TerminalFit from 'xterm/lib/addons/fit/fit';
44
import SpinnerOverlay from '@/components/elements/SpinnerOverlay';
5+
import { State, useStoreState } from 'easy-peasy';
6+
import { ApplicationState } from '@/state/types';
57

68
const theme = {
79
background: 'transparent',
@@ -25,8 +27,9 @@ const theme = {
2527
};
2628

2729
export default () => {
28-
const ref = createRef<HTMLDivElement>();
30+
const connected = useStoreState((state: State<ApplicationState>) => state.server.socket.connected);
2931

32+
const ref = createRef<HTMLDivElement>();
3033
const terminal = useRef(new Terminal({
3134
disableStdin: true,
3235
cursorStyle: 'underline',
@@ -50,7 +53,7 @@ export default () => {
5053

5154
return (
5255
<div className={'text-xs font-mono relative'}>
53-
<SpinnerOverlay visible={true} large={true}/>
56+
<SpinnerOverlay visible={!connected} large={true}/>
5457
<div
5558
className={'rounded-t p-2 bg-black overflow-scroll w-full'}
5659
style={{
Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
11
import React from 'react';
22
import Console from '@/components/server/Console';
3+
import { State, useStoreState } from 'easy-peasy';
4+
import { ApplicationState } from '@/state/types';
35

4-
export default () => (
5-
<div className={'my-10 flex'}>
6-
<div className={'mx-4 w-3/4 mr-4'}>
7-
<Console/>
8-
</div>
9-
<div className={'flex-1 ml-4'}>
10-
<p>Testing</p>
6+
export default () => {
7+
const status = useStoreState((state: State<ApplicationState>) => state.server.status);
8+
9+
return (
10+
<div className={'my-10 flex'}>
11+
<div className={'mx-4 w-3/4 mr-4'}>
12+
<Console/>
13+
</div>
14+
<div className={'flex-1 ml-4'}>
15+
<p>Current status: {status}</p>
16+
</div>
1117
</div>
12-
</div>
13-
);
18+
);
19+
};

0 commit comments

Comments
 (0)