Skip to content

Commit 1fd9f7a

Browse files
authored
Merge pull request #182 from prgrms-aibe-devcourse/style/main-Yoepee
[style] 메인페이지 문구 수정
2 parents 298e894 + 4e1f83d commit 1fd9f7a

5 files changed

Lines changed: 76 additions & 48 deletions

File tree

src/app/favicon.ico

743 KB
Binary file not shown.

src/app/layout.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import { Toast } from "@/components/ui/toast";
1010
import { Footer } from "@/components/layout/footer";
1111
import { Header } from "@/components/layout/header";
1212

13-
import { NotificationSSEProvider } from "@/components/notification/NotificationSSEProvider";
1413
import { ChatRoomsProvider } from "@/components/chat/ChatRoomsProvider";
14+
import { NotificationSSEProvider } from "@/components/notification/NotificationSSEProvider";
1515

1616
import "./globals.css";
1717

@@ -26,8 +26,9 @@ const geistMono = Geist_Mono({
2626
});
2727

2828
export const metadata: Metadata = {
29-
title: "취밋",
30-
description: "P2P 취미 장비 대여 플랫폼",
29+
title: "CHWI·MEET | 취미를 만나다",
30+
description:
31+
"P2P 기반 취미 장비 대여 플랫폼, 필요한 장비를 안전하게 빌려보세요.",
3132
};
3233

3334
export default function RootLayout({

src/app/page.tsx

Lines changed: 19 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@ import { useRouter } from "next/navigation";
1111

1212
import type { Category, Post, ReceiveMethod, Region } from "@/types/domain";
1313

14-
import { parseLocalDateString } from "@/lib/utils";
1514
import { getImageUrl } from "@/lib/utils/image";
1615

16+
import { parseLocalDateString } from "@/lib/utils";
17+
18+
import { AISearchIcon } from "@/components/ui/ai-search-icon";
1719
import { Button } from "@/components/ui/button";
1820
import {
1921
Card,
@@ -29,7 +31,6 @@ import {
2931
TooltipProvider,
3032
TooltipTrigger,
3133
} from "@/components/ui/tooltip";
32-
import { AISearchIcon } from "@/components/ui/ai-search-icon";
3334

3435
import { useAuthStore } from "@/store/authStore";
3536

@@ -49,12 +50,6 @@ import {
4950
TrendingUp,
5051
} from "lucide-react";
5152

52-
const RECEIVE_METHOD_LABELS: Record<ReceiveMethod, string> = {
53-
DIRECT: "직거래",
54-
DELIVERY: "택배",
55-
ANY: "상관없음",
56-
};
57-
5853
/**
5954
* 홈 페이지
6055
*/
@@ -71,33 +66,11 @@ const RECEIVE_METHOD_LABELS: Record<ReceiveMethod, string> = {
7166
* 홈 페이지
7267
*/
7368

74-
/**
75-
* 홈 페이지
76-
*/
77-
78-
/**
79-
* 홈 페이지
80-
*/
81-
82-
/**
83-
* 홈 페이지
84-
*/
85-
86-
/**
87-
* 홈 페이지
88-
*/
89-
90-
/**
91-
* 홈 페이지
92-
*/
93-
94-
/**
95-
* 홈 페이지
96-
*/
97-
98-
/**
99-
* 홈 페이지
100-
*/
69+
const RECEIVE_METHOD_LABELS: Record<ReceiveMethod, string> = {
70+
DIRECT: "직거래",
71+
DELIVERY: "택배",
72+
ANY: "상관없음",
73+
};
10174

10275
/**
10376
* 홈 페이지
@@ -145,10 +118,10 @@ export default function Home() {
145118
<div className="container relative mx-auto px-4">
146119
<div className="mx-auto max-w-4xl text-center">
147120
<h1 className="mb-6 text-5xl font-bold md:text-6xl lg:text-7xl">
148-
P2P 취미 장비 대여 플랫폼
121+
CHWI·MEET, 취미 대여
149122
</h1>
150123
<p className="mb-10 text-xl text-blue-50 md:text-2xl">
151-
필요한 장비를 쉽고 빠르게 대여하세요
124+
원하는 활동에 맞는 장비를 쉽고 빠르게 빌려보세요.
152125
</p>
153126
{/* AI 검색 바 */}
154127
<div className="mb-8" data-ai-search-bar>
@@ -169,7 +142,7 @@ export default function Home() {
169142
value={searchQuery}
170143
onChange={(e) => setSearchQuery(e.target.value)}
171144
onKeyDown={handleKeyDown}
172-
placeholder="어떤 장비를 찾고 있나요?"
145+
placeholder="예) 혼자 캠핑 갈 건데 필요한 장비 알려줘"
173146
className="flex-1 border-0 text-gray-900 focus-visible:ring-0 focus-visible:ring-offset-0"
174147
/>
175148
<Button
@@ -280,7 +253,9 @@ export default function Home() {
280253
if (child) return child;
281254
}
282255
if (category.children) {
283-
const child = category.children.find((c) => c.id === id);
256+
const child = category.children.find(
257+
(c) => c.id === id,
258+
);
284259
if (child) return child;
285260
}
286261
}
@@ -333,7 +308,8 @@ export default function Home() {
333308
toggleFavoriteMutation.mutate(post.id);
334309
};
335310

336-
const isAuthor = user?.id === (post.author?.id ?? post.authorId);
311+
const isAuthor =
312+
user?.id === (post.author?.id ?? post.authorId);
337313

338314
return (
339315
<div key={post.id} className="relative">
@@ -369,7 +345,9 @@ export default function Home() {
369345
)}
370346
{isAuthenticated && isAuthor && (
371347
<TooltipContent>
372-
<p>자신의 게시글에는 즐겨찾기를 할 수 없습니다.</p>
348+
<p>
349+
자신의 게시글에는 즐겨찾기를 할 수 없습니다.
350+
</p>
373351
</TooltipContent>
374352
)}
375353
</Tooltip>

src/components/layout/header.tsx

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import Link from "next/link";
77
import { usePathname, useRouter } from "next/navigation";
88
import {
9-
Home,
109
FileText,
1110
Calendar,
1211
MessageCircle,
@@ -22,6 +21,7 @@ import { MemberRole } from "@/types/domain";
2221

2322
import { Button } from "@/components/ui/button";
2423
import { AISearchIcon } from "@/components/ui/ai-search-icon";
24+
import { LogoChwimeet } from "@/components/ui/logo-chwimeet";
2525
import { useAuthStore } from "@/store/authStore";
2626
import { useNotificationStore } from "@/store/notificationStore";
2727
import { useChatStore } from "@/store/chatStore";
@@ -60,9 +60,12 @@ export function Header() {
6060
return (
6161
<header className="sticky top-0 z-50 w-full border-b border-gray-200 bg-white">
6262
<div className="container mx-auto flex h-16 items-center justify-between px-4">
63-
<Link href="/" className="flex items-center gap-2 text-xl font-bold text-blue-600 hover:text-blue-700">
64-
<Home className="h-6 w-6" />
65-
<span>취밋</span>
63+
<Link
64+
href="/"
65+
className="flex items-center gap-2 text-xl font-bold text-blue-600 hover:text-blue-700"
66+
aria-label="홈"
67+
>
68+
<LogoChwimeet className="h-8 w-auto" />
6669
</Link>
6770

6871
<nav className="flex items-center gap-2">
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
"use client";
2+
3+
interface LogoChwimeetProps {
4+
className?: string;
5+
width?: number;
6+
height?: number;
7+
}
8+
9+
export function LogoChwimeet({
10+
className,
11+
width = 160,
12+
height = 32,
13+
}: LogoChwimeetProps) {
14+
return (
15+
<svg
16+
width={width}
17+
height={height}
18+
viewBox="0 0 320 64"
19+
fill="none"
20+
xmlns="http://www.w3.org/2000/svg"
21+
className={className}
22+
>
23+
<text
24+
x="0"
25+
y="44"
26+
fill="#0F172A"
27+
fontSize="40"
28+
fontWeight="900"
29+
fontFamily="Arial, sans-serif"
30+
>
31+
CHWI
32+
</text>
33+
<text
34+
x="120"
35+
y="44"
36+
fill="#2563EB"
37+
fontSize="40"
38+
fontWeight="900"
39+
fontFamily="Arial, sans-serif"
40+
>
41+
MEET
42+
</text>
43+
</svg>
44+
);
45+
}
46+

0 commit comments

Comments
 (0)