diff --git a/packages/desktop/package.json b/packages/desktop/package.json index ace65d2..4afe73a 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -45,8 +45,8 @@ "plugins": [ [ "@electron-forge/plugin-webpack", - { - "devContentSecurityPolicy":"default-src * self blob: data: gap:; style-src * self 'unsafe-inline' blob: data: gap:; script-src * 'self' 'unsafe-eval' 'unsafe-inline' blob: data: gap:; object-src * 'self' blob: data: gap:; img-src * self 'unsafe-inline' blob: data: gap:; connect-src self * 'unsafe-inline' blob: data: gap:; frame-src * self blob: data: gap:;", + { + "devContentSecurityPolicy": "default-src * self blob: data: gap:; style-src * self 'unsafe-inline' blob: data: gap:; script-src * 'self' 'unsafe-eval' 'unsafe-inline' blob: data: gap:; object-src * 'self' blob: data: gap:; img-src * self 'unsafe-inline' blob: data: gap:; connect-src self * 'unsafe-inline' blob: data: gap:; frame-src * self blob: data: gap:;", "mainConfig": "./webpack.main.config.js", "renderer": { "config": "./webpack.renderer.config.js", @@ -91,6 +91,7 @@ "dependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", + "@mui/icons-material": "^5.8.0", "@mui/material": "^5.8.1", "electron-squirrel-startup": "^1.0.0", "react": "^18.1.0", diff --git a/packages/desktop/src/app.tsx b/packages/desktop/src/app.tsx index ed01070..40ea306 100644 --- a/packages/desktop/src/app.tsx +++ b/packages/desktop/src/app.tsx @@ -1,11 +1,15 @@ import { Button, createTheme, ThemeProvider, Typography } from '@mui/material'; import * as React from 'react'; -import ReactDOM from "react-dom/client"; +import ReactDOM from 'react-dom/client'; +import Terminal from './components/Terminal'; const theme = createTheme({ - typography:{ - fontFamily: ['IBM Plex Sans', 'sans-serif'].join(',') + typography: { + fontFamily: ['IBM Plex Sans', 'sans-serif'].join(','), + overline: { + letterSpacing: 2, + }, }, palette: { primary: { @@ -23,20 +27,19 @@ const theme = createTheme({ disableRipple: true, // No more ripple, on the whole application 💣! }, }, + MuiAvatar: { + defaultProps: { + variant: 'rounded', + }, + }, }, }); - - const root = ReactDOM.createRoot(document.getElementById('root') as HTMLElement); - root.render( - - - -hahaha - - - - - ); \ No newline at end of file + + + + + , +); diff --git a/packages/desktop/src/components/NirvanaLogo.tsx b/packages/desktop/src/components/NirvanaLogo.tsx new file mode 100644 index 0000000..f8f10c2 --- /dev/null +++ b/packages/desktop/src/components/NirvanaLogo.tsx @@ -0,0 +1,35 @@ +import React from 'react'; + +export default function NirvanaLogo({ + className, + type, + grayscale = false, +}: { + className?: string; + type?: 'primary' | 'small'; + grayscale?: boolean; +}) { + return ( + + + + + + ); +} diff --git a/packages/desktop/src/components/Terminal.tsx b/packages/desktop/src/components/Terminal.tsx new file mode 100644 index 0000000..068c34e --- /dev/null +++ b/packages/desktop/src/components/Terminal.tsx @@ -0,0 +1,58 @@ +import React from 'react'; + +import { Container } from '@mui/system'; +import { + alpha, + Avatar, + Box, + Button, + Grid, + InputBase, + Paper, + Stack, + styled, + Typography, +} from '@mui/material'; +import NirvanaLogo from './NirvanaLogo'; + +export default function Terminal() { + return ( + + + + + + + + Conversations + + + + + + + + + + + Canvas + + + + ); +} diff --git a/packages/desktop/src/index.css b/packages/desktop/src/index.css index ef9791e..d8cf8ed 100644 --- a/packages/desktop/src/index.css +++ b/packages/desktop/src/index.css @@ -1,8 +1,17 @@ +html { + height: 100%; + width: 100%; +} + body { display: flex; flex-direction: column; flex: 1; + height: inherit; + width: inherit; + + margin: 0; background: #00000000; } diff --git a/yarn.lock b/yarn.lock index fbdbd24..f5d2942 100644 --- a/yarn.lock +++ b/yarn.lock @@ -541,6 +541,13 @@ prop-types "^15.8.1" react-is "^17.0.2" +"@mui/icons-material@^5.8.0": + version "5.8.0" + resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.8.0.tgz#c85768434bda885c64a8e4b9e222e73912244570" + integrity sha512-ScwLxa0q5VYV70Jfc60V/9VD0b9SvIeZ0Jddx2Dt2pBUFFO9vKdrbt9LYiT+4p21Au5NdYIb2XSHj46CLN1v3g== + dependencies: + "@babel/runtime" "^7.17.2" + "@mui/material@^5.8.1": version "5.8.1" resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.8.1.tgz#ff3c0dc65cf975362f8b141d4713a6d88b9f08e9"