Skip to content

Commit 42c036d

Browse files
authored
Merge branch 'dev' into style/tailwind-font-기본-스타일-설정-작업
2 parents fbb887a + f0ffbf1 commit 42c036d

File tree

7 files changed

+369
-270
lines changed

7 files changed

+369
-270
lines changed

package-lock.json

Lines changed: 299 additions & 239 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@
1010
"preview": "vite preview"
1111
},
1212
"dependencies": {
13-
"@tailwindcss/vite": "^4.0.2",
13+
"@tailwindcss/vite": "^4.0.3",
14+
"autoprefixer": "^10.4.20",
1415
"react": "^18.3.1",
1516
"react-dom": "^18.3.1",
16-
"tailwindcss": "^4.0.2"
17+
"tailwindcss": "^4.0.3"
1718
},
1819
"devDependencies": {
1920
"@eslint/js": "^9.17.0",

public/icon/plus_button.svg

Lines changed: 5 additions & 0 deletions
Loading

src/components/PrimaryButton.tsx

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
import { MouseEvent } from "react";
2+
3+
interface PrimaryButtonProps {
4+
size: "sm" | "md";
5+
children: string;
6+
backgroundColor?: "#5C4AE8" | "#F9E622" | "#E6E8ED";
7+
disabled?: boolean;
8+
onClick?: (e: MouseEvent<HTMLButtonElement>) => void;
9+
}
10+
11+
const PrimaryButton = ({
12+
size = "sm",
13+
backgroundColor = "#5C4AE8",
14+
disabled = false,
15+
children,
16+
onClick
17+
}: PrimaryButtonProps) => {
18+
return (
19+
<button
20+
className={
21+
"flex justify-center items-center rounded-lg font-bold text-lg " +
22+
`${size === "sm" ? "w-[159px] h-[60px]" : "w-[335px] h-[56px]"}` +
23+
`${backgroundColor === "#5C4AE8" ? " text-white" : " text-[#171503]"}`
24+
}
25+
style={{ backgroundColor: disabled ? "#848C96" : backgroundColor }}
26+
onClick={onClick}
27+
disabled={disabled}
28+
>
29+
{children}
30+
</button>
31+
);
32+
};
33+
34+
export default PrimaryButton;

src/components/StrokeBanner.tsx

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
const StrokeBanner = () => {
2+
return (
3+
<div className="flex flex-col justify-center border-gray-200 px-[38px] py-6 border border-dashed rounded-lg w-[335px] h-[178px] text-center">
4+
<img
5+
src="/public/icon/plus_button.svg"
6+
alt="친구 등록 버튼"
7+
className="mx-auto"
8+
width={40}
9+
height={40}
10+
/>
11+
<strong className="mt-4 font-bold text-4 text-gray-900">
12+
친구 정보를 저장하고 대화할 수 있어요
13+
</strong>
14+
<p className="mt-2 font-light text-gray-900 text-sm">
15+
로그인 시 기억하고 싶은 친구의 MBTI와 특징을 입력해서 빠르게 대화할 수
16+
있어요
17+
</p>
18+
</div>
19+
);
20+
};
21+
22+
export default StrokeBanner;

src/utils/cls.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// 여러 문자열의 className을 인자로 받아 하나의 className으로 반환해주는 함수
2+
const cls = (...classses: (string | undefined | false)[]) => {
3+
return classses.filter(Boolean).join(" ");
4+
};
5+
6+
export default cls;

tailwind.config.js

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)