From a830ab006aeb3b10aba829000a27f329feecb6a1 Mon Sep 17 00:00:00 2001 From: talksik Date: Sun, 1 May 2022 08:51:06 -0500 Subject: [PATCH] cleaning up the carbon mess and adding mui again --- packages/desktop/package.json | 6 +- packages/desktop/src/app.tsx | 1 - .../desktop/src/components/header/index.tsx | 6 +- packages/desktop/src/index.html | 8 + packages/desktop/src/pages/nirvanaApp.tsx | 27 +- packages/desktop/src/pages/terminal/index.tsx | 22 +- packages/desktop/src/styles/app.scss | 0 packages/desktop/src/styles/carbon.scss | 1 - packages/desktop/src/styles/index.css | 1 + packages/desktop/webpack.renderer.config.js | 2 +- packages/desktop/webpack.rules.js | 11 - packages/web/pages/_app.tsx | 1 - yarn.lock | 453 ++++++++++++------ 13 files changed, 343 insertions(+), 196 deletions(-) delete mode 100644 packages/desktop/src/styles/app.scss delete mode 100644 packages/desktop/src/styles/carbon.scss diff --git a/packages/desktop/package.json b/packages/desktop/package.json index cd29741..a616674 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -107,9 +107,11 @@ "webpack": "^5.72.0" }, "dependencies": { - "@carbon/icons": "^11.2.0", - "@carbon/react": "^1.2.0", + "@emotion/react": "^11.9.0", + "@emotion/styled": "^11.8.1", "@getstation/electron-google-oauth2": "^2.1.0", + "@mui/icons-material": "^5.6.2", + "@mui/material": "^5.6.3", "@nirvana/core": "*", "antd": "^4.19.2", "axios": "^0.26.1", diff --git a/packages/desktop/src/app.tsx b/packages/desktop/src/app.tsx index 9c40d4a..1513f80 100644 --- a/packages/desktop/src/app.tsx +++ b/packages/desktop/src/app.tsx @@ -1,5 +1,4 @@ import "./styles/index.css"; -import "./styles/carbon.scss"; import * as React from "react"; import * as ReactDOM from "react-dom"; diff --git a/packages/desktop/src/components/header/index.tsx b/packages/desktop/src/components/header/index.tsx index ce4afa5..370f968 100644 --- a/packages/desktop/src/components/header/index.tsx +++ b/packages/desktop/src/components/header/index.tsx @@ -2,7 +2,7 @@ import { Header, HeaderName } from "carbon-components-react"; import { useEffect, useMemo, useRef, useState } from "react"; import { Avatar } from "antd"; -import { Button } from "@carbon/react"; +import Button from "@mui/material/Button"; import Logo from "../Logo"; import { useGetUserDetails } from "../../controller/index"; @@ -30,9 +30,7 @@ export default function NirvanaHeader() {
- +