cleaning up and trying to get new carbon components

This commit is contained in:
talksik
2022-04-30 21:46:17 -05:00
parent 66db28cd7c
commit 48c690e86e
6 changed files with 29 additions and 28 deletions
+1
View File
@@ -0,0 +1 @@
declare module "@carbon/react";
+1 -10
View File
@@ -107,20 +107,11 @@
"webpack": "^5.72.0"
},
"dependencies": {
"@carbon/colors": "^11.1.0",
"@carbon/icons-react": "10.22.0",
"@carbon/motion": "^11.0.0",
"@carbon/react": "^1.2.0",
"@carbon/themes": "^11.2.0",
"@carbon/type": "^11.2.0",
"@getstation/electron-google-oauth2": "^2.1.0",
"@nirvana/core": "*",
"@types/carbon-components-react": "^7.55.1",
"antd": "^4.19.2",
"axios": "^0.26.1",
"carbon-components": "10.25.0",
"carbon-components-react": "7.25.0",
"carbon-icons": "7.0.7",
"electron-squirrel-startup": "^1.0.0",
"electron-store": "^8.0.1",
"moment": "^2.29.1",
@@ -132,7 +123,7 @@
"react-icons": "^4.3.1",
"react-query": "^3.34.16",
"recoil": "^0.6.1",
"sass": "1.29.0",
"sass": "^1.51.0",
"socket.io-client": "^4.4.1"
}
}
+9 -7
View File
@@ -1,5 +1,6 @@
import { QueryClient, QueryClientProvider } from "react-query";
import { GlobalTheme } from "@carbon/react";
import Login from "./Login";
import NirvanaRouter from "./router";
import ProtectedRoute from "../components/ProtectedRoute";
@@ -20,13 +21,14 @@ function NirvanaApp() {
return (
<>
<QueryClientProvider client={queryClient}>
<RecoilRoot>
<ProtectedRoute>
<NirvanaRouter />
</ProtectedRoute>
<ReactQueryDevtools initialIsOpen={true} position={"bottom-left"} />
</RecoilRoot>
<GlobalTheme theme="white">
<RecoilRoot>
<ProtectedRoute>
<NirvanaRouter />
</ProtectedRoute>
<ReactQueryDevtools initialIsOpen={true} position={"bottom-left"} />
</RecoilRoot>
</GlobalTheme>
<Toaster />
</QueryClientProvider>
</>
+1 -8
View File
@@ -1,8 +1 @@
@import "carbon-components/scss/globals/scss/styles.scss";
// TODO: important, note that if current version of sass in package.json is causing issues, install ^1.29.0
$body-color: red;
body {
color: $body-color !important;
}
@use "@carbon/react";
+1 -1
View File
@@ -4,7 +4,7 @@
"module": "commonjs",
"skipLibCheck": true,
"esModuleInterop": true,
"noImplicitAny": true,
"noImplicitAny": false,
"sourceMap": true,
"baseUrl": ".",
"outDir": "dist",