diff --git a/frontend/package.json b/frontend/package.json index 5e345a84..adcfc29e 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -45,7 +45,9 @@ ] }, "dependencies": { - "@cgi-learning-hub/ui": "1.0.0", + "@cgi-learning-hub/icons": "develop", + "@cgi-learning-hub/theme": "develop", + "@cgi-learning-hub/ui": "develop", "@dnd-kit/core": "6.1.0", "@dnd-kit/sortable": "8.0.0", "@dnd-kit/utilities": "3.2.2", diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx index 775a5238..aa883a32 100644 --- a/frontend/src/main.tsx +++ b/frontend/src/main.tsx @@ -1,6 +1,9 @@ import React from "react"; -import { OdeClientProvider, ThemeProvider } from "@edifice-ui/react"; +import { + OdeClientProvider, + ThemeProvider as ThemeProviderEdifice, +} from "@edifice-ui/react"; import { QueryCache, QueryClient, @@ -14,6 +17,7 @@ import { RouterProvider } from "react-router-dom"; import { MediaLibraryProvider } from "./providers/MediaLibraryProvider"; import { router } from "./routes"; import { setupStore } from "./store"; +import { ThemeProvider } from "@cgi-learning-hub/theme"; import "~/i18n"; const rootElement = document.getElementById("root"); @@ -50,11 +54,13 @@ root.render( app: "magneto", }} > - - - - - + + + + + + + diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json index 8ca50d86..1c131c7c 100644 --- a/frontend/tsconfig.json +++ b/frontend/tsconfig.json @@ -21,7 +21,10 @@ "noUnusedParameters": true, "noFallthroughCasesInSwitch": true, "paths": { - "~/*": ["./src/*"] + "~/*": ["./src/*"], + "@cgi-learning-hub/icons": ["node_modules/@cgi-learning-hub/icons"], + "@cgi-learning-hub/theme": ["node_modules/@cgi-learning-hub/theme"], + "@cgi-learning-hub/ui": ["node_modules/@cgi-learning-hub/ui"] }, /* Test */