fix localstorage error, redux type errors

MarkMelior · Apr 4, 2024 · c1db1ea · c1db1ea
1 parent 86af0ab
commit c1db1ea
Show file tree

Hide file tree

Showing 26 changed files with 647 additions and 123 deletions.
diff --git a/app/layout.tsx b/app/layout.tsx
@@ -1,5 +1,4 @@
-import { ClientProviders } from '@/app/providers/ClientProviders';
-import { ServerProviders } from '@/app/providers/ServerProviders';
+import { Providers } from '@/app/providers/Providers';
 import '@/app/styles/index.scss';
 import { Notification } from '@/entities/Notification';
 import { ScrollUp } from '@/features/ScrollUp';
@@ -28,20 +27,18 @@ export default function LocaleLayout({ children }: LocaleLayoutProps) {
 		<html lang='ru'>
 			<body className={inter.className}>
 				<Suspense fallback={<PageLoader />}>
-					<ServerProviders>
-						<ClientProviders>
-							<Navbar />
-							{/* <Light /> */}
-							{children}
-							<Notification
-								message='Добавьте наш сайт в закладки, чтобы не потерять'
-								startContent={<BookmarkIcon opacity={0.5} />}
-							/>
-							<SpaceCanvas />
-							<ScrollUp />
-							<Footer />
-						</ClientProviders>
-					</ServerProviders>
+					<Providers>
+						<Navbar />
+						{/* <Light /> */}
+						{children}
+						<Notification
+							message='Добавьте наш сайт в закладки, чтобы не потерять'
+							startContent={<BookmarkIcon opacity={0.5} />}
+						/>
+						<SpaceCanvas />
+						<ScrollUp />
+						<Footer />
+					</Providers>
 				</Suspense>
 			</body>
 		</html>

diff --git a/next.config.mjs b/next.config.mjs
@@ -9,6 +9,9 @@ const nextConfig = {
 		IS_DEV: JSON.stringify(isDev),
 		API: process.env.API,
 	},
+	compiler: {
+		styledComponents: true,
+	},
 	webpack: (config, options) => {
 		config.module.rules.push(...buildLoaders(isDev));
 		config.plugins.push(...buildPlugins(config, isDev));