diff --git a/packages/desktop/index.d.ts b/packages/desktop/index.d.ts new file mode 100644 index 0000000..8bfc621 --- /dev/null +++ b/packages/desktop/index.d.ts @@ -0,0 +1 @@ +declare module "@carbon/react"; diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 0256158..ff2d7b4 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -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" } } diff --git a/packages/desktop/src/pages/nirvanaApp.tsx b/packages/desktop/src/pages/nirvanaApp.tsx index 0d109c5..055d3a5 100644 --- a/packages/desktop/src/pages/nirvanaApp.tsx +++ b/packages/desktop/src/pages/nirvanaApp.tsx @@ -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 ( <> - - - - - - - + + + + + + + + diff --git a/packages/desktop/src/styles/carbon.scss b/packages/desktop/src/styles/carbon.scss index 980fc7e..e9e4fe0 100644 --- a/packages/desktop/src/styles/carbon.scss +++ b/packages/desktop/src/styles/carbon.scss @@ -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"; diff --git a/packages/desktop/tsconfig.json b/packages/desktop/tsconfig.json index eb8c420..e422748 100644 --- a/packages/desktop/tsconfig.json +++ b/packages/desktop/tsconfig.json @@ -4,7 +4,7 @@ "module": "commonjs", "skipLibCheck": true, "esModuleInterop": true, - "noImplicitAny": true, + "noImplicitAny": false, "sourceMap": true, "baseUrl": ".", "outDir": "dist", diff --git a/yarn.lock b/yarn.lock index c893fb7..2605131 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2154,7 +2154,7 @@ chardet@^0.7.0: resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA== -"chokidar@>=2.0.0 <4.0.0", chokidar@^3.4.2, chokidar@^3.5.2, chokidar@^3.5.3: +"chokidar@>=2.0.0 <4.0.0", "chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.2, chokidar@^3.5.2, chokidar@^3.5.3: version "3.5.3" resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz" integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== @@ -4675,6 +4675,11 @@ ignore@^5.1.8, ignore@^5.2.0: resolved "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz" integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== +immutable@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0.tgz#b86f78de6adef3608395efb269a91462797e2c23" + integrity sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw== + import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1: version "3.3.0" resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz" @@ -7585,6 +7590,15 @@ sass@1.29.0: dependencies: chokidar ">=2.0.0 <4.0.0" +sass@^1.51.0: + version "1.51.0" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.51.0.tgz#25ea36cf819581fe1fe8329e8c3a4eaaf70d2845" + integrity sha512-haGdpTgywJTvHC2b91GSq+clTKGbtkkZmVAb82jZQN/wTy6qs8DdFm2lhEQbEwrY0QDRgSQ3xDurqM977C3noA== + dependencies: + chokidar ">=3.0.0 <4.0.0" + immutable "^4.0.0" + source-map-js ">=0.6.2 <2.0.0" + scheduler@^0.20.2: version "0.20.2" resolved "https://registry.npmjs.org/scheduler/-/scheduler-0.20.2.tgz" @@ -7886,7 +7900,7 @@ socks@^2.6.1, socks@^2.6.2: ip "^1.1.5" smart-buffer "^4.2.0" -source-map-js@^1.0.1, source-map-js@^1.0.2: +"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.1, source-map-js@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==