Merge pull request #34 from Kyro3400/Mantine-fix

fix: Fix mantine errors
DanBot-Hosting · Aug 17, 2024 · f287703 · f287703
2 parents edbc061 + 3855764
commit f287703
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 17 deletions.
diff --git a/components/elements/copy.tsx b/components/elements/copy.tsx
@@ -1,5 +1,5 @@
 import type { FunctionComponent } from "react";
-import { CopyButton, createStyles, Text, Tooltip } from "@mantine/emotion";
+import { CopyButton, createStyles, Text, Tooltip } from "@mantine/core";
 
 export interface CopyProps {
   value: string;

diff --git a/components/elements/redirect.tsx b/components/elements/redirect.tsx
@@ -1,5 +1,5 @@
 import { FunctionComponent, PropsWithChildren, ReactNode } from "react";
-import { Box, Card, createStyles, Text, Tooltip } from "@mantine/emotion";
+import { Box, Card, createStyles, Text, Tooltip } from "@mantine/core";
 import { PageLast } from "@carbon/icons-react";
 import { navLinks } from "config";
 import { useRouter } from "next/router";

diff --git a/components/elements/tip.tsx b/components/elements/tip.tsx
@@ -1,5 +1,5 @@
 import { FunctionComponent, PropsWithChildren, ReactNode } from "react";
-import { Box, Card, createStyles, Text } from "@mantine/emotion";
+import { Box, Card, createStyles, Text } from "@mantine/core";
 import { InformationFilled } from "@carbon/icons-react";
 
 export interface TipProps {

diff --git a/components/footer/styles.tsx b/components/footer/styles.tsx
@@ -1,5 +1,4 @@
-import { createStyles } from '@mantine/emotion';
-import { rem } from '@mantine/core';
+import { createStyles, rem } from '@mantine/core';
 
 // Styles for the Footer component
 // Used mantine's createStyles function

diff --git a/components/header/styles.tsx b/components/header/styles.tsx
@@ -1,4 +1,4 @@
-import { createStyles } from "@mantine/emotion";
+import { createStyles } from "@mantine/core";
 
 // Styles for the Header component
 // Used mantine's createStyles function

diff --git a/components/links/styles.tsx b/components/links/styles.tsx
@@ -1,4 +1,4 @@
-import { createStyles } from "@mantine/emotion";
+import { createStyles } from "@mantine/core";
 
 export const useStyles = createStyles((theme, _, u) => ({
   control: {

diff --git a/components/navbar/styles.tsx b/components/navbar/styles.tsx
@@ -1,4 +1,4 @@
-import { createStyles } from "@mantine/emotion";
+import { createStyles } from "@mantine/core";
 
 // Styles for the Navbar component
 // Used mantine's createStyles function

diff --git a/package.json b/package.json
@@ -21,13 +21,12 @@
     "@danbot-hosting/ts-config": "^1.0.0",
     "@emotion/react": "^11.10.6",
     "@emotion/server": "^11.10.0",
-    "@mantine/core": "^7.0.0",
-    "@mantine/emotion": "^7.0.0",
-    "@mantine/hooks": "^7.0.0",
-    "@mantine/next": "^6.0.6",
-    "@mantine/notifications": "^7.0.0",
-    "@mantine/nprogress": "^7.0.0",
-    "@mantine/spotlight": "^7.0.0",
+    "@mantine/core": "^6.0.22",
+    "@mantine/hooks": "^6.0.22",
+    "@mantine/next": "^6.0.22",
+    "@mantine/notifications": "^6.0.22",
+    "@mantine/nprogress": "^6.0.22",
+    "@mantine/spotlight": "^6.0.22",
     "@mdx-js/loader": "^3.0.0",
     "@mdx-js/react": "^3.0.0",
     "@next/mdx": "^14.0.0",

diff --git a/pages/404.tsx b/pages/404.tsx
@@ -1,10 +1,10 @@
 import type { NextPage } from "next";
 import { ReactElement } from "react";
-import { createStyles, Title, Text, Container } from "@mantine/emotion";
+import { createStyles, Title, Text, Container } from "@mantine/core";
 import Stars from "@public/illustrations/stars.svg";
 import Image from "next/image";
 
-const useStyles = createStyles((theme, _, u) => ({
+const useStyles = createStyles((theme) => ({
   root: {
     display: "flex",
     flexDirection: "column",