Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2025-01-31 23:11:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

move terminal into its own directory under view

Browse Source
This commit is contained in:
sawka 2024-06-17 10:18:38 -07:00
parent e46906d423
commit b71ae8e6e8
6 changed files with 90 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emain/emain.ts
View File

@ -147,7 +147,7 @@ async function mainResizeHandler(_: any, windowId: string, win: Electron.Browser
}
function shNavHandler(event: Electron.Event<Electron.WebContentsWillNavigateEventParams>, url: string) {
if (url.startsWith("http://127.0.0.1:5173/index.html")) {
if (url.startsWith("http://127.0.0.1:5173/index.html") || url.startsWith("http://localhost:5173/index.html")) {
// this is a dev-mode hot-reload, ignore it
console.log("allowing hot-reload of index.html");
return;

2
frontend/app/block/block.tsx
View File

@ -4,7 +4,7 @@
import { CodeEdit } from "@/app/view/codeedit";
import { PlotView } from "@/app/view/plotview";
import { PreviewView } from "@/app/view/preview";
import { TerminalView } from "@/app/view/term";
import { TerminalView } from "@/app/view/term/term";
import { ErrorBoundary } from "@/element/errorboundary";
import { CenteredDiv } from "@/element/quickelems";
import * as WOS from "@/store/wos";

0
frontend/app/view/ijson.tsx → frontend/app/view/term/ijson.tsx
View File

87
frontend/app/view/term/term.less Normal file
View File

@ -0,0 +1,87 @@
// Copyright 2024, Command Line Inc.
// SPDX-License-Identifier: Apache-2.0
.view-term {
display: flex;
flex-direction: column;
width: 100%;
height: 100%;
overflow: hidden;
border-left: 4px solid transparent;
padding-left: 4px;
&:focus-within {
border-left: 4px solid var(--accent-color);
}
.term-header {
display: flex;
flex-direction: row;
padding: 4px 10px;
height: 35px;
gap: 10px;
align-items: center;
flex-shrink: 0;
border-bottom: 1px solid var(--border-color);
}
.term-connectelem {
flex-grow: 1;
min-height: 0;
overflow: hidden;
line-height: 1;
}
.term-htmlelem {
display: flex;
flex-direction: column;
width: 100%;
flex-grow: 1;
min-height: 0;
overflow: hidden;
.term-htmlelem-focus {
height: 0;
width: 0;
input {
width: 0;
height: 0;
opacity: 0;
pointer-events: none;
}
}
.term-htmlelem-content {
display: flex;
flex-direction: row;
width: 100%;
flex-grow: 1;
min-height: 0;
overflow: hidden;
}
}
&.term-mode-term {
.term-connectelem {
display: flex;
}
.term-htmlelem {
display: none;
}
}
&.term-mode-html {
.term-connectelem {
display: none;
}
.term-htmlelem {
display: flex;
}
.ijson iframe {
width: 100%;
height: 100%;
border: none;
}
}
}

2
frontend/app/view/term.tsx → frontend/app/view/term/term.tsx
View File

@ -23,7 +23,7 @@ import { IJsonView } from "./ijson";
import "public/xterm.css";
import { debounce } from "throttle-debounce";
import "./view.less";
import "./term.less";
function getThemeFromCSSVars(el: Element): ITheme {
const theme: ITheme = {};

85
frontend/app/view/view.less
View File

@ -1,91 +1,6 @@
// Copyright 2024, Command Line Inc.
// SPDX-License-Identifier: Apache-2.0
.view-term {
display: flex;
flex-direction: column;
width: 100%;
height: 100%;
overflow: hidden;
border-left: 4px solid transparent;
padding-left: 4px;
&:focus-within {
border-left: 4px solid var(--accent-color);
}
.term-header {
display: flex;
flex-direction: row;
padding: 4px 10px;
height: 35px;
gap: 10px;
align-items: center;
flex-shrink: 0;
border-bottom: 1px solid var(--border-color);
}
.term-connectelem {
flex-grow: 1;
min-height: 0;
overflow: hidden;
line-height: 1;
}
.term-htmlelem {
display: flex;
flex-direction: column;
width: 100%;
flex-grow: 1;
min-height: 0;
overflow: hidden;
.term-htmlelem-focus {
height: 0;
width: 0;
input {
width: 0;
height: 0;
opacity: 0;
pointer-events: none;
}
}
.term-htmlelem-content {
display: flex;
flex-direction: row;
width: 100%;
flex-grow: 1;
min-height: 0;
overflow: hidden;
}
}
&.term-mode-term {
.term-connectelem {
display: flex;
}
.term-htmlelem {
display: none;
}
}
&.term-mode-html {
.term-connectelem {
display: none;
}
.term-htmlelem {
display: flex;
}
.ijson iframe {
width: 100%;
height: 100%;
border: none;
}
}
}
.view-codeedit {
display: flex;
flex-direction: column;