diff --git a/.prettierrc b/.prettierrc index 9607cea..2d979e4 100644 --- a/.prettierrc +++ b/.prettierrc @@ -6,5 +6,7 @@ "trailingComma": "all", "printWidth": 80, "arrowParens": "avoid", - "endOfLine": "auto" + "endOfLine": "auto", + + "plugins": ["prettier-plugin-tailwindcss"] } diff --git a/package.json b/package.json index 623acee..f196153 100644 --- a/package.json +++ b/package.json @@ -21,9 +21,11 @@ "@tanstack/react-query": "^5.8.2", "@tanstack/react-query-devtools": "^5.8.2", "axios": "^1.5.1", + "clsx": "^2.0.0", "next": "13.5.4", "react": "^18", - "react-dom": "^18" + "react-dom": "^18", + "tailwind-merge": "^2.0.0" }, "devDependencies": { "@commitlint/cli": "^18.2.0", @@ -46,6 +48,7 @@ "lint-staged": "^15.1.0", "postcss": "^8", "prettier": "^3.0.3", + "prettier-plugin-tailwindcss": "^0.5.7", "tailwindcss": "^3", "typescript": "^5" } diff --git a/src/app/admin/page.tsx b/src/app/admin/page.tsx index 88b6895..710b57f 100644 --- a/src/app/admin/page.tsx +++ b/src/app/admin/page.tsx @@ -135,7 +135,7 @@ export default function Admin() { ))} {isTeamError && ( -
팀을 다시 선택해주세요!
+
팀을 다시 선택해주세요!
)}