diff --git a/web/global.d.ts b/web/global.d.ts index b98930e..64647a5 100644 --- a/web/global.d.ts +++ b/web/global.d.ts @@ -1,6 +1,3 @@ -import {} from "styled-components"; -import { lightTheme } from "./src/styles/themes"; - declare global { module "*.svg" { const content: React.FC>; @@ -12,8 +9,4 @@ declare global { } } -declare module "styled-components" { - type Theme = typeof lightTheme; - //eslint-disable-next-line @typescript-eslint/no-empty-interface - export interface DefaultTheme extends Theme {} -} +export {}; diff --git a/web/package.json b/web/package.json index 672c636..ea366cd 100644 --- a/web/package.json +++ b/web/package.json @@ -48,10 +48,9 @@ "@graphql-codegen/client-preset": "^4.2.0", "@kleros/curate-v2-tsconfig": "workspace:^", "@kleros/kleros-v2-contracts": "^0.10.0", + "@tailwindcss/vite": "^4.1.16", "@types/react": "^18.3.12", "@types/react-dom": "^18.3.1", - "@types/react-modal": "^3.16.3", - "@types/styled-components": "^5.1.34", "@typescript-eslint/eslint-plugin": "^5.62.0", "@typescript-eslint/parser": "^5.62.0", "@typescript-eslint/utils": "^5.62.0", @@ -61,6 +60,7 @@ "eslint-plugin-react": "^7.33.2", "eslint-plugin-react-hooks": "^4.6.0", "lru-cache": "^7.18.3", + "tailwindcss": "^4.1.16", "typescript": "^5.3.3", "vite": "^5.4.2", "vite-plugin-node-polyfills": "^0.22.0", @@ -71,7 +71,7 @@ "@cyntler/react-doc-viewer": "^1.17.0", "@kleros/curate-v2-templates": "workspace:^", "@kleros/kleros-app": "^2.0.2", - "@kleros/ui-components-library": "^2.20.0", + "@kleros/ui-components-library": "^3.6.0", "@reown/appkit": "^1.6.6", "@reown/appkit-adapter-wagmi": "^1.6.6", "@sentry/react": "^7.93.0", @@ -82,6 +82,7 @@ "@yornaath/batshit": "^0.9.0", "chart.js": "^3.9.1", "chartjs-adapter-moment": "^1.0.1", + "clsx": "^2.1.1", "core-js": "^3.35.0", "graphql": "^16.9.0", "graphql-request": "^7.1.2", @@ -98,13 +99,12 @@ "react-is": "^18.2.0", "react-loading-skeleton": "^3.3.1", "react-markdown": "^8.0.7", - "react-modal": "^3.16.1", "react-router-dom": "^6.21.2", "react-scripts": "^5.0.1", "react-toastify": "^9.1.3", "react-use": "^17.4.3", - "styled-components": "^5.3.11", "subgraph-status": "^1.2.4", + "tailwind-merge": "^3.3.1", "viem": "^2.27.2", "wagmi": "^2.14.10", "zod": "^3.24.2" diff --git a/web/src/app.tsx b/web/src/app.tsx index 082eb22..a0f2764 100644 --- a/web/src/app.tsx +++ b/web/src/app.tsx @@ -3,10 +3,12 @@ import { Route } from "react-router-dom"; import { SentryRoutes } from "./utils/sentry"; import "react-loading-skeleton/dist/skeleton.css"; import "react-toastify/dist/ReactToastify.css"; +import "overlayscrollbars/styles/overlayscrollbars.css"; +import "./global.css"; +import ThemeProvider from "context/ThemeProvider"; import Web3Provider from "context/Web3Provider"; import IsListViewProvider from "context/IsListViewProvider"; import QueryClientProvider from "context/QueryClientProvider"; -import StyledComponentsProvider from "context/StyledComponentsProvider"; import Layout from "layout/index"; import Home from "./pages/Home"; import AllLists from "./pages/AllLists"; @@ -22,7 +24,7 @@ import Settings from "./pages/Settings"; const App: React.FC = () => { return ( - + @@ -55,7 +57,7 @@ const App: React.FC = () => { - + ); }; diff --git a/web/src/components/ActionButton/ExecuteButton.tsx b/web/src/components/ActionButton/ExecuteButton.tsx index 3110621..551353e 100644 --- a/web/src/components/ActionButton/ExecuteButton.tsx +++ b/web/src/components/ActionButton/ExecuteButton.tsx @@ -26,7 +26,7 @@ const ExecuteButton: React.FC = ({ registryAddress, itemId, refe