diff --git a/apps/as/app/(with-base-layout)/layout.tsx b/apps/as/app/(with-base-layout)/layout.tsx index fd8cee5bd..1d182a0ee 100644 --- a/apps/as/app/(with-base-layout)/layout.tsx +++ b/apps/as/app/(with-base-layout)/layout.tsx @@ -7,11 +7,7 @@ import { BaseLayout } from "@common/components"; import type { MenuItem } from "@/entities/menu"; import { PageLayout } from "@/shared/ui/page-layout"; -export default function WithBaseLayout({ - children, -}: { - children: React.ReactNode; -}) { +export default function WithBaseLayout({ children }: { children: React.ReactNode }) { const router = useRouter(); const pathname = usePathname(); const queryClient = useQueryClient(); diff --git a/apps/as/tailwind.config.ts b/apps/as/tailwind.config.ts index ff6042e10..c02405aca 100644 --- a/apps/as/tailwind.config.ts +++ b/apps/as/tailwind.config.ts @@ -1,6 +1,8 @@ import type { Config } from "tailwindcss"; +import presetConfig from "../../tailwind.config.preset"; const config: Config = { + presets: [presetConfig], content: [ "./pages/**/*.{js,ts,jsx,tsx,mdx}", "./shared/**/*.{js,ts,jsx,tsx,mdx}", diff --git a/apps/as/tsconfig.json b/apps/as/tsconfig.json index 1668155c8..15b023415 100644 --- a/apps/as/tsconfig.json +++ b/apps/as/tsconfig.json @@ -26,8 +26,8 @@ "@/features/*": ["./features/*"], "@/widgets/*": ["./widgets/*"], "@/pages/*": ["./pages/*"], - "@common/components": ["../../../packages/common/components/dist/"], - "@common/network": ["../../../packages/common/network/"] + "@common/components": ["../../packages/common/components/dist/"], + "@common/network": ["../../packages/common/network/"] } }, "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],