more flow changes going back and forth with terminal and such

This commit is contained in:
talksik
2022-05-01 16:48:22 -05:00
parent 38061e3545
commit beb45df0bd
5 changed files with 28 additions and 11 deletions
@@ -17,7 +17,11 @@ import Logo from "../Logo";
import { useGetUserDetails } from "../../controller/index"; import { useGetUserDetails } from "../../controller/index";
import { useRecoilState } from "recoil"; import { useRecoilState } from "recoil";
export default function NirvanaHeader() { export default function NirvanaHeader({
onHeaderFocus,
}: {
onHeaderFocus: () => void;
}) {
const { data: userDetailsRes, isLoading } = useGetUserDetails(); const { data: userDetailsRes, isLoading } = useGetUserDetails();
const inputRef = useRef<HTMLInputElement>(null); const inputRef = useRef<HTMLInputElement>(null);
@@ -81,6 +85,7 @@ export default function NirvanaHeader() {
<div <div
className="flex flex-row items-center bg-gray-100 pl-2 border-b border-b-gray-200" className="flex flex-row items-center bg-gray-100 pl-2 border-b border-b-gray-200"
id="titlebar" id="titlebar"
onFocus={onHeaderFocus}
> >
<Logo type="small" /> <Logo type="small" />
+15 -5
View File
@@ -30,6 +30,8 @@ if (require("electron-squirrel-startup")) {
// be closed automatically when the JavaScript object is garbage collected. // be closed automatically when the JavaScript object is garbage collected.
export let browserWindow: BrowserWindow; export let browserWindow: BrowserWindow;
let display;
const createWindow = (): void => { const createWindow = (): void => {
// Create the browser window. // Create the browser window.
browserWindow = new BrowserWindow({ browserWindow = new BrowserWindow({
@@ -40,9 +42,10 @@ const createWindow = (): void => {
}, },
icon: "./assets/1024x1024.icns", icon: "./assets/1024x1024.icns",
transparent: true,
frame: false, frame: false,
roundedCorners: false, roundedCorners: false,
transparent: true,
}); });
// and load the index.html of the app. // and load the index.html of the app.
@@ -50,6 +53,8 @@ const createWindow = (): void => {
// Open the DevTools. // Open the DevTools.
browserWindow.webContents.openDevTools({ mode: "detach" }); browserWindow.webContents.openDevTools({ mode: "detach" });
display = screen.getPrimaryDisplay();
}; };
// This method will be called when Electron has finished // This method will be called when Electron has finished
@@ -85,11 +90,16 @@ app
browserWindow.setAlwaysOnTop(true, "floating"); browserWindow.setAlwaysOnTop(true, "floating");
// move window/overlay to top right // move window/overlay to top right
let display = screen.getPrimaryDisplay();
browserWindow.setPosition(display.bounds.width, display.bounds.height);
} else browserWindow.setAlwaysOnTop(false);
browserWindow.setSize(width, height, true); browserWindow.setPosition(display.bounds.width - 300, 0, true);
browserWindow.setSize(width, height, true);
} else {
browserWindow.setSize(width, height, true);
browserWindow.center();
browserWindow.setAlwaysOnTop(false);
}
}); });
}) })
.then(() => { .then(() => {
@@ -9,7 +9,7 @@ export default function LineDetailsTerminal({
return ( return (
<div <div
id={`${selectedLine.lineId}-lineDetailsTerminal`} id={`${selectedLine.lineId}-lineDetailsTerminal`}
className="flex flex-col flex-1 bg-gray-100 h-full" className="flex flex-col flex-1 bg-gray-100"
> >
{/* line overview header */} {/* line overview header */}
<div className="flex flex-row p-3 items-center gap-1"> <div className="flex flex-row p-3 items-center gap-1">
+2 -2
View File
@@ -67,10 +67,10 @@ function NirvanaApp() {
<NirvanaRouter /> <NirvanaRouter />
</ProtectedRoute> </ProtectedRoute>
<ReactQueryDevtools {/* <ReactQueryDevtools
initialIsOpen={false} initialIsOpen={false}
position={"bottom-left"} position={"bottom-left"}
/> /> */}
</RecoilRoot> </RecoilRoot>
</ThemeProvider> </ThemeProvider>
<Toaster /> <Toaster />
+4 -2
View File
@@ -273,9 +273,11 @@ export default function NirvanaRouter() {
return ( return (
<div className="flex flex-col h-screen w-screen"> <div className="flex flex-col h-screen w-screen">
<NirvanaHeader /> <NirvanaHeader
onHeaderFocus={() => setDesktopMode(DimensionPresets.terminal)}
/>
<div className="flex flex-row"> <div className="flex flex-row flex-1">
{(desktopMode === DimensionPresets.terminal || {(desktopMode === DimensionPresets.terminal ||
desktopMode === DimensionPresets.terminalAndDetails) && ( desktopMode === DimensionPresets.terminalAndDetails) && (
<NirvanaTerminal <NirvanaTerminal