diff --git a/.vscode/settings.json b/.vscode/settings.json index 4bab404..7ecc9ef 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,8 +2,7 @@ "editor.defaultFormatter": "esbenp.prettier-vscode", "editor.formatOnSave": true, "editor.codeActionsOnSave": { - "source.fixAll": "explicit", - "source.organizeImports": "explicit" + "source.fixAll": "explicit" }, "eslint.workingDirectories": [ { diff --git a/apps/admin/.eslintrc.cjs b/apps/admin/.eslintrc.js similarity index 100% rename from apps/admin/.eslintrc.cjs rename to apps/admin/.eslintrc.js diff --git a/apps/admin/package.json b/apps/admin/package.json index 37f6cc1..01833c7 100644 --- a/apps/admin/package.json +++ b/apps/admin/package.json @@ -12,7 +12,7 @@ "lint:fix": "pnpm lint --fix" }, "dependencies": { - "@nextui-org/react": "^2.1.13", + "@nextui-org/react": "^2.4.1", "@nextui-org/system": "^2.0.10", "@nextui-org/theme": "^2.1.9", "@prisma/nextjs-monorepo-workaround-plugin": "^5.13.0", @@ -24,7 +24,7 @@ "@trpc/server": "^10.43.6", "cross-env": "^7.0.3", "formik": "^2.4.5", - "framer-motion": "^10.16.4", + "framer-motion": "^10.18.0", "http-browserify": "^1.7.0", "https-browserify": "^1.0.0", "next": "^14.0.2", diff --git a/apps/client/.eslintrc.js b/apps/client/.eslintrc.js new file mode 100644 index 0000000..23d8c3e --- /dev/null +++ b/apps/client/.eslintrc.js @@ -0,0 +1,10 @@ +module.exports = { + root: true, + extends: ['next', 'next/core-web-vitals', '@repo/eslint-config/next.js'], + parser: '@typescript-eslint/parser', + parserOptions: { + ecmaVersion: 2021, + sourceType: 'module', + project: true, + }, +}; diff --git a/apps/client/.eslintrc.json b/apps/client/.eslintrc.json deleted file mode 100644 index bffb357..0000000 --- a/apps/client/.eslintrc.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "next/core-web-vitals" -} diff --git a/apps/client/app/(components)/LocaleSwitcher.tsx b/apps/client/app/(components)/LocaleSwitcher.tsx index a87889c..fb61d6c 100644 --- a/apps/client/app/(components)/LocaleSwitcher.tsx +++ b/apps/client/app/(components)/LocaleSwitcher.tsx @@ -1,16 +1,17 @@ -import { locales } from "@client/config"; -import { useLocale, useTranslations } from "next-intl"; -import LocaleSwitcherSelect from "./LocaleSwitcherSelect"; +import { locales } from '@client/config'; +import { useLocale, useTranslations } from 'next-intl'; + +import LocaleSwitcherSelect from './LocaleSwitcherSelect'; export default function LocaleSwitcher() { - const t = useTranslations("LocaleSwitcher"); + const t = useTranslations('LocaleSwitcher'); const locale = useLocale(); return ( - + {locales.map((cur) => ( ))} diff --git a/apps/client/app/(components)/LocaleSwitcherSelect.tsx b/apps/client/app/(components)/LocaleSwitcherSelect.tsx index c31b99d..c09b6ee 100644 --- a/apps/client/app/(components)/LocaleSwitcherSelect.tsx +++ b/apps/client/app/(components)/LocaleSwitcherSelect.tsx @@ -1,8 +1,9 @@ -"use client"; +'use client'; -import { usePathname, useRouter } from "@client/navigation"; -import clsx from "clsx"; -import { ChangeEvent, ReactNode, useTransition } from "react"; +import { usePathname, useRouter } from '@client/navigation'; +import clsx from 'clsx'; +import type { ChangeEvent, ReactNode } from 'react'; +import { useTransition } from 'react'; type Props = { children: ReactNode; @@ -29,8 +30,8 @@ export default function LocaleSwitcherSelect({ return (