diff --git a/packages/main/src/mainWindow.ts b/packages/main/src/mainWindow.ts index 19e1f66..76316e1 100644 --- 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 index 050c086..64b9022 100644 --- 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 index 3218296..6dbb9ea 100644 --- 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(); diff --git a/packages/renderer/index.html b/packages/renderer/index.html index 55d4c55..2ccf4ab 100644 --- a/packages/renderer/index.html +++ b/packages/renderer/index.html @@ -14,9 +14,6 @@
- + diff --git a/packages/renderer/src/App.tsx b/packages/renderer/src/App.tsx new file mode 100644 index 0000000..401bfe3 --- /dev/null +++ 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 ; + default: + return
; + } +} + +function Logs() { + return ( +
+ Logs +
+ ); +} + +function Main() { + return ( +
+ + + + } + /> + } + /> + } + /> + } + /> + } + /> + } + /> + } + /> + } + /> + } + /> + } + /> + } + /> + } + /> + + + + +
+ ); +} diff --git a/packages/renderer/src/components/EditorPage/component.tsx b/packages/renderer/src/components/EditorPage/component.tsx index 83872d1..3319a5d 100644 --- a/packages/renderer/src/components/EditorPage/component.tsx +++ b/packages/renderer/src/components/EditorPage/component.tsx @@ -143,7 +143,7 @@ export function EditorPage() { ); return ( -
+
{!isReady ? ( renderLoading() ) : ( @@ -198,6 +198,6 @@ export function EditorPage() { )} )} -
+
); } diff --git a/packages/renderer/src/index.tsx b/packages/renderer/src/index.tsx index 441ba46..706517e 100644 --- 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( - - - - } - /> - } - /> - } - /> - } - /> - } - /> - } - /> - } - /> - } - /> - } - /> - } - /> - } - /> - } - /> - - - - + diff --git a/packages/renderer/src/modules/store/editor/slice.ts b/packages/renderer/src/modules/store/editor/slice.ts index f00b6e1..12d9c94 100644 --- 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 index 96674bc..dfb055c 100644 --- 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 new file mode 100644 index 0000000..f3ac890 --- /dev/null +++ b/packages/shared/types/window.ts @@ -0,0 +1,4 @@ +export enum WindowId { + Main = 'main', + Logs = 'logs', +}