Merge branch 'dark-mode' into 'main' (eb7b275b) · Commits · Ategon Dev / Canvas

package-lock.json

+24 −0

Original line number	Diff line number	Diff line
		@@ -6278,6 +6278,19 @@
		"tslib": "^2.4.0"
		}
		},
		"node_modules/@theme-toggles/react": {
		"version": "4.1.0",
		"resolved": "https://registry.npmjs.org/@theme-toggles/react/-/react-4.1.0.tgz",
		"integrity": "sha512-h3SuJMsej8DfelHt5fjNIlaMfJOK52Vku4pPDVoHaTwjAcoTr4fn8hzeur2oiqWBYFYfKugvv1RdQaBFXaiPKg==",
		"funding": {
		"type": "github",
		"url": "https://github.com/sponsors/alfiejones"
		},
		"peerDependencies": {
		"react": "^16 \|\| ^17 \|\| ^18",
		"react-dom": "^16 \|\| ^17 \|\| ^18"
		}
		},
		"node_modules/@tsconfig/node10": {
		"version": "1.0.9",
		"resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz",
		@@ -16261,10 +16274,12 @@
		"@icons-pack/react-simple-icons": "^9.6.0",
		"@nextui-org/react": "^2.2.9",
		"@sc07-canvas/lib": "^1.0.0",
		"@theme-toggles/react": "^4.1.0",
		"@typescript-eslint/parser": "^7.1.0",
		"eventemitter3": "^5.0.1",
		"framer-motion": "^11.3.2",
		"lodash.throttle": "^4.1.1",
		"next-themes": "^0.3.0",
		"prop-types": "^15.8.1",
		"react": "^18.2.0",
		"react-dom": "^18.2.0",
		@@ -16472,6 +16487,15 @@
		"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
		"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
		},
		"packages/client/node_modules/next-themes": {
		"version": "0.3.0",
		"resolved": "https://registry.npmjs.org/next-themes/-/next-themes-0.3.0.tgz",
		"integrity": "sha512-/QHIrsYpd6Kfk7xakK4svpDI5mmXP0gfvCoJdGpZQ2TOrQZmsW0QxjaiLn8wbIKjtm4BTSqLoix4lxYYOnLJ/w==",
		"peerDependencies": {
		"react": "^16.8 \|\| ^17 \|\| ^18",
		"react-dom": "^16.8 \|\| ^17 \|\| ^18"
		}
		},
		"packages/lib": {
		"name": "@sc07-canvas/lib",
		"version": "1.0.0",

packages/admin/src/components/ToastWrapper.tsx

0 → 100644

+13 −0

Original line number	Diff line number	Diff line
		import { useTheme } from "next-themes";
		import { ToastContainer } from "react-toastify";

		export const ToastWrapper = () => {
		const { theme } = useTheme()

		return (
		<ToastContainer
		position="bottom-right"
		theme={theme}
		/>
		);
		};
		No newline at end of file

packages/admin/src/main.tsx

+2 −1

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@ import { AccountsPage } from "./pages/Accounts/Accounts/page.tsx";
		import { ServiceSettingsPage } from "./pages/Service/settings.tsx";
		import { ToastContainer } from "react-toastify";
		import { AuditLog } from "./pages/AuditLog/auditlog.tsx";
		import { ToastWrapper } from "./components/ToastWrapper.tsx";

		const router = createBrowserRouter(
		[
		@@ -47,7 +48,7 @@ ReactDOM.createRoot(document.getElementById("root")!).render(
		<ThemeProvider defaultTheme="system">
		<RouterProvider router={router} />

		<ToastContainer position="bottom-right" />
		<ToastWrapper />
		</ThemeProvider>
		</NextUIProvider>
		</React.StrictMode>

packages/client/package.json

+2 −0

Original line number	Diff line number	Diff line
		@@ -27,10 +27,12 @@
		"@icons-pack/react-simple-icons": "^9.6.0",
		"@nextui-org/react": "^2.2.9",
		"@sc07-canvas/lib": "^1.0.0",
		"@theme-toggles/react": "^4.1.0",
		"@typescript-eslint/parser": "^7.1.0",
		"eventemitter3": "^5.0.1",
		"framer-motion": "^11.3.2",
		"lodash.throttle": "^4.1.1",
		"next-themes": "^0.3.0",
		"prop-types": "^15.8.1",
		"react": "^18.2.0",
		"react-dom": "^18.2.0",

packages/client/src/components/App.tsx

+2 −1

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ import { WelcomeModal } from "./Welcome/WelcomeModal";
		import { InfoSidebar } from "./Info/InfoSidebar";
		import { ModModal } from "./Moderation/ModModal";
		import { DynamicModals } from "./DynamicModals";
		import { ToastWrapper } from "./ToastWrapper";

		const Chat = lazy(() => import("./Chat/Chat"));

		@@ -152,7 +153,7 @@ const AppInner = () => {
		<WelcomeModal />
		<ModModal />

		<ToastContainer position="top-left" />
		<ToastWrapper />
		<DynamicModals />
		</>
		);