add logs window

decentraland · Feb 13, 2025 · b2f3e6b · b2f3e6b
1 parent 0112dd2
commit b2f3e6b
Show file tree

Hide file tree

Showing 10 changed files with 132 additions and 98 deletions.
diff --git a/packages/main/src/mainWindow.ts b/packages/main/src/mainWindow.ts
@@ -2,7 +2,9 @@ import { app } from 'electron';
 import { join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 
-import { createWindow, getWindowById, WindowId } from './modules/window';
+import { WindowId } from '/shared/types/window';
+
+import { createWindow, getWindowById } from './modules/window';
 
 async function createMainWindow() {
   const window = createWindow(WindowId.Main);

diff --git a/packages/main/src/modules/cli.ts b/packages/main/src/modules/cli.ts
@@ -5,7 +5,6 @@ import { getAvailablePort } from './port';
 import { getProjectId } from './analytics';
 import { install } from './npm';
 
-export let previewServer: Child | null = null;
 export let deployServer: Child | null = null;
 
 async function getEnv(path: string) {

diff --git a/packages/main/src/modules/window.ts b/packages/main/src/modules/window.ts
@@ -1,9 +1,7 @@
 import { app, BrowserWindow, type BrowserWindowConstructorOptions } from 'electron';
 import { join } from 'node:path';
 
-export enum WindowId {
-  Main = 'main'
-}
+import type { WindowId } from '/shared/types/window';
 
 const windowMap = new Map<WindowId, BrowserWindow>();
 

diff --git a/packages/renderer/index.html b/packages/renderer/index.html
@@ -14,9 +14,6 @@
   </head>
   <body>
     <div id="app"></div>
-    <script
-      src="./src/index.tsx"
-      type="module"
-    ></script>
+    <script src="./src/index.tsx" type="module"></script>
   </body>
 </html>
diff --git a/packages/renderer/src/App.tsx b/packages/renderer/src/App.tsx
@@ -0,0 +1,107 @@
+import { MemoryRouter as Router, Routes, Route } from 'react-router-dom';
+
+import { WindowId } from '/shared/types/window';
+
+import { AuthProvider } from '/@/components/AuthProvider';
+
+import { HomePage } from '/@/components/HomePage';
+import { ScenesPage } from '/@/components/ScenesPage';
+import { EditorPage } from '/@/components/EditorPage';
+import { CollectionsPage } from '/@/components/CollectionsPage';
+import { ManagePage } from '/@/components/ManagePage';
+import { LearnPage } from '/@/components/LearnPage';
+import { SignInPage } from '/@/components/SignInPage';
+import { TemplatesPage } from '/@/components/TemplatesPage';
+import { MorePage } from '/@/components/MorePage';
+import { VideosPage } from '/@/components/VideosPage';
+import { DocsPage } from '/@/components/DocsPage';
+
+import { Snackbar } from '/@/components/Snackbar';
+import { Install } from '/@/components/Install';
+
+function getWindowParam(): WindowId | null {
+  const url = new URL(window.location.href);
+  const windowId = url.searchParams.get('window');
+  return windowId ? (windowId as WindowId) : null;
+}
+
+export function App() {
+  const windowId = getWindowParam();
+
+  switch (windowId) {
+    case WindowId.Logs:
+      return <Logs />;
+    default:
+      return <Main />;
+  }
+}
+
+function Logs() {
+  return (
+    <main>
+      Logs
+    </main>
+  );
+}
+
+function Main() {
+  return (
+    <main className="Main">
+      <Router>
+        <AuthProvider>
+          <Routes>
+            <Route
+              path="/"
+              element={<Install />}
+            />
+            <Route
+              path="/home"
+              element={<HomePage />}
+            />
+            <Route
+              path="/scenes"
+              element={<ScenesPage />}
+            />
+            <Route
+              path="/templates"
+              element={<TemplatesPage />}
+            />
+            <Route
+              path="/collections"
+              element={<CollectionsPage />}
+            />
+            <Route
+              path="/manage"
+              element={<ManagePage />}
+            />
+            <Route
+              path="/learn"
+              element={<LearnPage />}
+            />
+            <Route
+              path="/learn/videos"
+              element={<VideosPage />}
+            />
+            <Route
+              path="/learn/docs"
+              element={<DocsPage />}
+            />
+            <Route
+              path="/more"
+              element={<MorePage />}
+            />
+            <Route
+              path="/editor"
+              element={<EditorPage />}
+            />
+            <Route
+              path="/sign-in"
+              element={<SignInPage />}
+            />
+          </Routes>
+          <Snackbar />
+        </AuthProvider>
+      </Router>
+    </main>
+  );
+}
diff --git a/packages/renderer/src/components/EditorPage/component.tsx b/packages/renderer/src/components/EditorPage/component.tsx
@@ -143,7 +143,7 @@ export function EditorPage() {
   );
 
   return (
-    <div className="Editor">
+    <main className="Editor">
       {!isReady ? (
         renderLoading()
       ) : (
@@ -198,6 +198,6 @@ export function EditorPage() {
           )}
         </>
       )}
-    </div>
+    </main>
   );
 }
diff --git a/packages/renderer/src/index.tsx b/packages/renderer/src/index.tsx
@@ -1,27 +1,12 @@
 import React from 'react';
 import { createRoot } from 'react-dom/client';
 import { Provider as StoreProvider } from 'react-redux';
-import { MemoryRouter as Router, Routes, Route } from 'react-router-dom';
 import { dark, ThemeProvider } from 'decentraland-ui2/dist/theme';
 
 import { store } from '#store';
 import { TranslationProvider } from '/@/components/TranslationProvider';
-import { AuthProvider } from '/@/components/AuthProvider';
 
-import { HomePage } from './components/HomePage';
-import { ScenesPage } from './components/ScenesPage';
-import { EditorPage } from './components/EditorPage';
-import { CollectionsPage } from './components/CollectionsPage';
-import { ManagePage } from './components/ManagePage';
-import { LearnPage } from './components/LearnPage';
-import { SignInPage } from './components/SignInPage';
-import { TemplatesPage } from './components/TemplatesPage';
-import { MorePage } from './components/MorePage';
-import { VideosPage } from './components/VideosPage';
-import { DocsPage } from './components/DocsPage';
-
-import { Snackbar } from './components/Snackbar';
-import { Install } from './components/Install';
+import { App } from './App';
 
 import '/@/themes';
 
@@ -33,61 +18,7 @@ root.render(
     <StoreProvider store={store}>
       <TranslationProvider>
         <ThemeProvider theme={dark}>
-          <Router>
-            <AuthProvider>
-              <Routes>
-                <Route
-                  path="/"
-                  element={<Install />}
-                />
-                <Route
-                  path="/home"
-                  element={<HomePage />}
-                />
-                <Route
-                  path="/scenes"
-                  element={<ScenesPage />}
-                />
-                <Route
-                  path="/templates"
-                  element={<TemplatesPage />}
-                />
-                <Route
-                  path="/collections"
-                  element={<CollectionsPage />}
-                />
-                <Route
-                  path="/manage"
-                  element={<ManagePage />}
-                />
-                <Route
-                  path="/learn"
-                  element={<LearnPage />}
-                />
-                <Route
-                  path="/learn/videos"
-                  element={<VideosPage />}
-                />
-                <Route
-                  path="/learn/docs"
-                  element={<DocsPage />}
-                />
-                <Route
-                  path="/more"
-                  element={<MorePage />}
-                />
-                <Route
-                  path="/editor"
-                  element={<EditorPage />}
-                />
-                <Route
-                  path="/sign-in"
-                  element={<SignInPage />}
-                />
-              </Routes>
-              <Snackbar />
-            </AuthProvider>
-          </Router>
+          <App />
         </ThemeProvider>
       </TranslationProvider>
     </StoreProvider>

diff --git a/packages/renderer/src/modules/store/editor/slice.ts b/packages/renderer/src/modules/store/editor/slice.ts
@@ -54,8 +54,6 @@ const initialState: EditorState = {
   error: null,
 };
 
-// selectors
-
 // slice
 export const slice = createSlice({
   name: 'editor',

diff --git a/packages/renderer/src/themes/theme.css b/packages/renderer/src/themes/theme.css
@@ -60,32 +60,30 @@
   /* TODO: Fix styles in the ui2 library */
   --mui-shape-borderRadius: 6px;
   /* --mui-palette-primary-main: #ff2d55; */
-  --mui-palette-action-disabled: #f8919d;
+  --mui-palette-action-disabled: #231113;
   --mui-palette-secondary-contrast: #ffffff;
 }
 
-html {
-  background: url(../../assets/images/background.png) #242129ff;
-  background-position: center;
-  background-size: cover;
-  background-blend-mode: overlay;
-  color: var(--white);
-  font-family: var(--font-family);
-  height: 100%;
-  background-attachment: fixed;
-}
-
-body {
+.Main {
   padding: 0px;
   margin: 0px;
   height: 100%;
   /* The lib decentraland-ui2 adds a default background-color to the body */
-  background-color: unset !important;
+  background-color: #242129ff !important;
   position: absolute;
   top: 0px;
   bottom: 0px;
   right: 0px;
   left: 0px;
+  background: url(../../assets/images/background.png) #242129ff;
+  background-position: center;
+  background-size: cover;
+  background-blend-mode: overlay;
+  color: var(--white);
+  font-family: var(--font-family);
+  height: 100%;
+  background-attachment: fixed;
+
 }
 
 a {

diff --git a/packages/shared/types/window.ts b/packages/shared/types/window.ts
@@ -0,0 +1,4 @@
+export enum WindowId {
+  Main = 'main',
+  Logs = 'logs',
+}