diff --git a/.vscode/settings.json b/.vscode/settings.json
index cc40c2e..f14e08f 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -9,5 +9,6 @@
"workbench.colorTheme": "Default Light+",
"javascript.format.semicolons": "insert",
"window.zoomLevel": 1,
- "trunk.trunkGrayOutNonBlockingIssues": false
+
+ "eslint.workingDirectories": ["./packages/desktop"]
}
diff --git a/packages/desktop/.eslintignore b/packages/desktop/.eslintignore
new file mode 100644
index 0000000..429dac4
--- /dev/null
+++ b/packages/desktop/.eslintignore
@@ -0,0 +1,2 @@
+
+**/legacy/**
\ No newline at end of file
diff --git a/packages/desktop/src/app.tsx b/packages/desktop/src/app.tsx
index 1513f80..ab1f10a 100644
--- a/packages/desktop/src/app.tsx
+++ b/packages/desktop/src/app.tsx
@@ -1,12 +1,10 @@
-import "./styles/index.css";
+import './styles/index.css';
-import * as React from "react";
-import * as ReactDOM from "react-dom";
-
-import NirvanaApp from "./pages/nirvanaApp";
+import * as React from 'react';
+import * as ReactDOM from 'react-dom';
function render() {
- ReactDOM.render(, document.getElementById("root"));
+ ReactDOM.render(
test
, document.getElementById('root'));
}
render();
diff --git a/packages/desktop/src/components/Button/IconButton/index.tsx b/packages/desktop/src/components/Button/IconButton/index.tsx
deleted file mode 100644
index 58616d0..0000000
--- a/packages/desktop/src/components/Button/IconButton/index.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-export default function IconButton({ children }) {
- return (
-
- );
-}
diff --git a/packages/desktop/src/pages/Login/index.tsx b/packages/legacy/Login/index.tsx
similarity index 100%
rename from packages/desktop/src/pages/Login/index.tsx
rename to packages/legacy/Login/index.tsx
diff --git a/packages/desktop/src/components/Logo/index.tsx b/packages/legacy/components/Logo/index.tsx
similarity index 100%
rename from packages/desktop/src/components/Logo/index.tsx
rename to packages/legacy/components/Logo/index.tsx
diff --git a/packages/desktop/src/components/ProtectedRoute/index.tsx b/packages/legacy/components/ProtectedRoute/index.tsx
similarity index 100%
rename from packages/desktop/src/components/ProtectedRoute/index.tsx
rename to packages/legacy/components/ProtectedRoute/index.tsx
diff --git a/packages/desktop/src/components/User/avatarWithBadge.tsx b/packages/legacy/components/User/avatarWithBadge.tsx
similarity index 100%
rename from packages/desktop/src/components/User/avatarWithBadge.tsx
rename to packages/legacy/components/User/avatarWithBadge.tsx
diff --git a/packages/desktop/src/components/User/basicUserDetailsRow.tsx b/packages/legacy/components/User/basicUserDetailsRow.tsx
similarity index 100%
rename from packages/desktop/src/components/User/basicUserDetailsRow.tsx
rename to packages/legacy/components/User/basicUserDetailsRow.tsx
diff --git a/packages/desktop/src/components/User/userAvatarWithStatus.tsx b/packages/legacy/components/User/userAvatarWithStatus.tsx
similarity index 100%
rename from packages/desktop/src/components/User/userAvatarWithStatus.tsx
rename to packages/legacy/components/User/userAvatarWithStatus.tsx
diff --git a/packages/desktop/src/components/User/userStatusText.tsx b/packages/legacy/components/User/userStatusText.tsx
similarity index 100%
rename from packages/desktop/src/components/User/userStatusText.tsx
rename to packages/legacy/components/User/userStatusText.tsx
diff --git a/packages/desktop/src/components/header/index.tsx b/packages/legacy/components/header/index.tsx
similarity index 100%
rename from packages/desktop/src/components/header/index.tsx
rename to packages/legacy/components/header/index.tsx
diff --git a/packages/desktop/src/components/lines/lineIcon/index.tsx b/packages/legacy/components/lines/lineIcon/index.tsx
similarity index 100%
rename from packages/desktop/src/components/lines/lineIcon/index.tsx
rename to packages/legacy/components/lines/lineIcon/index.tsx
diff --git a/packages/desktop/src/components/lines/lineRow.tsx/index.tsx b/packages/legacy/components/lines/lineRow.tsx/index.tsx
similarity index 100%
rename from packages/desktop/src/components/lines/lineRow.tsx/index.tsx
rename to packages/legacy/components/lines/lineRow.tsx/index.tsx
diff --git a/packages/desktop/src/components/loading/skeleton.tsx b/packages/legacy/components/loading/skeleton.tsx
similarity index 100%
rename from packages/desktop/src/components/loading/skeleton.tsx
rename to packages/legacy/components/loading/skeleton.tsx
diff --git a/packages/desktop/src/controller/index.tsx b/packages/legacy/controller/index.tsx
similarity index 100%
rename from packages/desktop/src/controller/index.tsx
rename to packages/legacy/controller/index.tsx
diff --git a/packages/desktop/src/controller/lineDataProvider.tsx b/packages/legacy/controller/lineDataProvider.tsx
similarity index 100%
rename from packages/desktop/src/controller/lineDataProvider.tsx
rename to packages/legacy/controller/lineDataProvider.tsx
diff --git a/packages/desktop/src/controller/nirvanaApi.ts b/packages/legacy/controller/nirvanaApi.ts
similarity index 100%
rename from packages/desktop/src/controller/nirvanaApi.ts
rename to packages/legacy/controller/nirvanaApi.ts
diff --git a/packages/desktop/src/controller/recoil.tsx b/packages/legacy/controller/recoil.tsx
similarity index 100%
rename from packages/desktop/src/controller/recoil.tsx
rename to packages/legacy/controller/recoil.tsx
diff --git a/packages/desktop/src/controller/sockets.tsx b/packages/legacy/controller/sockets.tsx
similarity index 100%
rename from packages/desktop/src/controller/sockets.tsx
rename to packages/legacy/controller/sockets.tsx
diff --git a/packages/desktop/src/pages/nirvanaApp.tsx b/packages/legacy/nirvanaApp.tsx
similarity index 100%
rename from packages/desktop/src/pages/nirvanaApp.tsx
rename to packages/legacy/nirvanaApp.tsx
diff --git a/packages/desktop/src/pages/router/index.tsx b/packages/legacy/router/index.tsx
similarity index 69%
rename from packages/desktop/src/pages/router/index.tsx
rename to packages/legacy/router/index.tsx
index d149091..5d5b35b 100644
--- a/packages/desktop/src/pages/router/index.tsx
+++ b/packages/legacy/router/index.tsx
@@ -3,19 +3,16 @@ import {
$maxNumberActiveStreams,
$numberActiveLines,
$selectedLineId,
-} from "../../controller/recoil";
-import Channels, {
- DEFAULT_APP_PRESET,
- Dimensions,
-} from "../../electron/constants";
-import { useCallback, useEffect, useState } from "react";
-import { useRecoilState, useRecoilValue } from "recoil";
+} from '../../controller/recoil';
+import Channels, { DEFAULT_APP_PRESET, Dimensions } from '../../electron/constants';
+import { useEffect, useState } from 'react';
+import { useRecoilState, useRecoilValue } from 'recoil';
-import FullMottoLogo from "../../../../components/logo/fullMotto";
-import { LineDataProvider } from "../../controller/lineDataProvider";
-import { LogoType } from "@nirvana/components/logo/full";
-import NirvanaHeader from "../../components/header/index";
-import NirvanaTerminal from "../terminal";
+import FullMottoLogo from '../../../../components/logo/fullMotto';
+import { LineDataProvider } from '../../controller/lineDataProvider';
+import { LogoType } from '@nirvana/components/logo/full';
+import NirvanaHeader from '../../components/header/index';
+import NirvanaTerminal from '../terminal';
export default function NirvanaRouter() {
const [selectedLineId, setSelectedLineId] = useRecoilState($selectedLineId);
@@ -27,16 +24,16 @@ export default function NirvanaRouter() {
useEffect(() => {
// add dimensions if it's not overlay only mode
let finalDimensions: Dimensions = { height: 0, width: 0 };
- let finalPosition: "center" | "topRight";
+ let finalPosition: 'center' | 'topRight';
- const setAlwaysOnTop = desktopMode === "overlayOnly";
+ const setAlwaysOnTop = desktopMode === 'overlayOnly';
// go hunting for which dimensions to have
- if (desktopMode === "terminal" || desktopMode == "flowState") {
+ if (desktopMode === 'terminal' || desktopMode == 'flowState') {
finalDimensions = DEFAULT_APP_PRESET;
}
- if (desktopMode === "overlayOnly") {
+ if (desktopMode === 'overlayOnly') {
finalDimensions = {
height: 68 + numberOfOverlayRows * 200,
width: 360 + 360 * numberOfOverlayColumns,
@@ -44,12 +41,12 @@ export default function NirvanaRouter() {
}
console.log(
- "setting new dimensions",
+ 'setting new dimensions',
desktopMode,
numberOfOverlayColumns,
numberOfOverlayRows,
finalDimensions,
- setAlwaysOnTop
+ setAlwaysOnTop,
);
// send the final dimensions to main process
@@ -70,7 +67,7 @@ export default function NirvanaRouter() {
useEffect(() => {
window.electronAPI.on(Channels.ON_WINDOW_BLUR, () => {
console.log(
- "window blurring now, should be always on top and then ill tell main process to change dimensions"
+ 'window blurring now, should be always on top and then ill tell main process to change dimensions',
);
// TODO: testing mode... uncomment both instructions below
// setDesktopMode("overlayOnly");
@@ -83,14 +80,14 @@ export default function NirvanaRouter() {
return (
- setDesktopMode("terminal")} />
+ setDesktopMode('terminal')} />
- {desktopMode === "flowState" && }
+ {desktopMode === 'flowState' && }
{/* remount nirvana terminal */}
- {(desktopMode === "terminal" || desktopMode === "overlayOnly") && (
+ {(desktopMode === 'terminal' || desktopMode === 'overlayOnly') && (
-
+
)}
@@ -109,7 +106,7 @@ function FlowState() {
const [quote, setQuote] = useState(null);
useEffect(() => {
- fetch("https://api.quotable.io/random")
+ fetch('https://api.quotable.io/random')
.then((res) => res.json())
.then((data: Quote) => {
console.warn(data);
@@ -125,16 +122,11 @@ function FlowState() {
return (
{/*

*/}
-
+
{quote && (
-
- "{quote.content}"
-
+ "{quote.content}"
{quote.author}
)}
diff --git a/packages/desktop/src/pages/terminal/index.tsx b/packages/legacy/terminal/index.tsx
similarity index 100%
rename from packages/desktop/src/pages/terminal/index.tsx
rename to packages/legacy/terminal/index.tsx
diff --git a/packages/desktop/src/pages/terminal/newLine/index.tsx b/packages/legacy/terminal/newLine/index.tsx
similarity index 100%
rename from packages/desktop/src/pages/terminal/newLine/index.tsx
rename to packages/legacy/terminal/newLine/index.tsx