Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ MONEW/

<br/>

<h2 id="ํŒ€์›์†Œ๊ฐœ">๐Ÿง‘ ํŒ€์› ์†Œ๊ฐœ</h2>
<h2 id="ํŒ€์›์†Œ๊ฐœ">๐Ÿ‘ฅ ํŒ€์› ์†Œ๊ฐœ</h2>

<a href="https://www.notion.so/26f2c744f86a8000bdb0d71497422216?source=copy_link">๐Ÿ“‘ ํ”„๋กœ์ ํŠธ ํ˜‘์—… ๋ฌธ์„œ(๋…ธ์…˜) ๋ฐ”๋กœ๊ฐ€๊ธฐ</a>

Expand Down
16 changes: 11 additions & 5 deletions src/app/layouts/PrivateLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,17 @@ import Footer from "@/shared/components/Footer";

export default function PrivateLayout() {
return (
<div className="min-h-dvh flex flex-col gap-[60px]">
<PrivateHeader />
<main className="flex-1">
<Outlet />
</main>
<div className="min-h-dvh flex flex-col space-y-[60px]">
<div className="sticky top-0 z-30">
<PrivateHeader />
</div>

<div className="flex-1 overflow-x-auto">
<main className="flex-1 min-w-[1280px] px-4 overflow-x-auto">
<Outlet />
</main>
</div>

<Footer />
</div>
);
Expand Down
2 changes: 1 addition & 1 deletion src/app/routes/private/ActivitiesPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export default function ActivitiesPage() {
}, [isValid, setSp]);

return (
<div className="flex justify-center gap-10 w-full px-4 overflow-x-auto">
<div className="flex justify-center gap-10 w-full">
<div className="flex flex-col gap-4">
<ProfileCard />
<SubscriptionPanel />
Expand Down
36 changes: 18 additions & 18 deletions src/app/routes/private/ArticlesPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,10 @@ export default function ArticlesPage() {
};

const [sortValue, setSortValue] = useState(
reverseSortMap[orderBy] || "๊ฒŒ์‹œ์ผ",
reverseSortMap[orderBy] || "๊ฒŒ์‹œ์ผ"
);
const [directionValue, setDirectionValue] = useState(
direction === "DESC" ? "๋‚ด๋ฆผ์ฐจ์ˆœ" : "์˜ค๋ฆ„์ฐจ์ˆœ",
direction === "DESC" ? "๋‚ด๋ฆผ์ฐจ์ˆœ" : "์˜ค๋ฆ„์ฐจ์ˆœ"
);

const fetchInitialData = useCallback(async () => {
Expand Down Expand Up @@ -225,7 +225,7 @@ export default function ArticlesPage() {
},
{
threshold: 0.8,
},
}
);
if (lastElementRef.current) {
observerRef.current.observe(lastElementRef.current);
Expand All @@ -238,13 +238,13 @@ export default function ArticlesPage() {

const interestNames = useMemo(
() => interests.map((interest) => interest.name),
[interests],
[interests]
);

const handleInterestChange = (value: string) => {
setSelectedInterest(value);
const selectedInterestData = interests.find(
(interest) => interest.name === value,
(interest) => interest.name === value
);

if (selectedInterestData) {
Expand Down Expand Up @@ -290,21 +290,21 @@ export default function ArticlesPage() {

newParams.set(
"direction",
directionValue === "์˜ค๋ฆ„์ฐจ์ˆœ" ? "ASC" : "DESC",
directionValue === "์˜ค๋ฆ„์ฐจ์ˆœ" ? "ASC" : "DESC"
);

if (fromDate) {
newParams.set(
"publishDateFrom",
`${fromDate.replace(/\./g, "-")}T00:00:00`,
`${fromDate.replace(/\./g, "-")}T00:00:00`
);
} else {
newParams.delete("publishDateFrom");
}
if (toDate) {
newParams.set(
"publishDateTo",
`${toDate.replace(/\./g, "-")}T23:59:59`,
`${toDate.replace(/\./g, "-")}T23:59:59`
);
} else {
newParams.delete("publishDateTo");
Expand Down Expand Up @@ -383,8 +383,8 @@ export default function ArticlesPage() {
<div className="mb-6">
<SearchBar height="h-11" onSearch={handleSearch} />
</div>
<div className="h-auto mb-6 border border-slate-200 rounded-2xl px-4 pt-4 pb-6 bg-white">
<div className="text-14-m text-slate-900 mb-2">์ •๋ ฌ</div>
<div className="h-auto mb-6 border border-gray-200 rounded-2xl px-4 pt-4 pb-6 bg-white">
<div className="text-14-m text-gray-900 mb-2">์ •๋ ฌ</div>
<div className="min-h-10">
<SelectBox
items={sortOptions}
Expand All @@ -394,17 +394,17 @@ export default function ArticlesPage() {
/>
</div>

<div className="text-14-m text-slate-900 mb-2">์ •๋ ฌ ๋ฐฉํ–ฅ</div>
<div className="text-14-m text-gray-900 mb-2">์ •๋ ฌ ๋ฐฉํ–ฅ</div>
<SelectBox
items={directionOptions}
value={directionValue}
onChange={handleDirectionOption}
className="mb-6 h-10"
/>
<div className="text-14-m text-slate-900 mb-2">์ถœ์ฒ˜</div>
<div className="text-14-m text-gray-900 mb-2">์ถœ์ฒ˜</div>
<Input value="NAVER" className="mb-6" inputSize="sm" disabled />

<div className="text-14-m text-slate-900 mb-2">๋‚ ์งœ</div>
<div className="text-14-m text-gray-900 mb-2">๋‚ ์งœ</div>
<Input
value={fromDate}
placeholder="2025.01.01 ๋ถ€ํ„ฐ"
Expand Down Expand Up @@ -441,7 +441,7 @@ export default function ArticlesPage() {
{keyword ? (
<div className="flex gap-4 items-center mb-8">
<div className="text-24-b text-cyan-600">{keyword}</div>
<div className="text-24-b text-slate-900">๊ด€๋ จ ๊ธฐ์‚ฌ ๋ชฉ๋ก</div>
<div className="text-24-b text-gray-900">๊ด€๋ จ ๊ธฐ์‚ฌ ๋ชฉ๋ก</div>
</div>
) : interests.length > 0 ? (
<div className="flex gap-4 items-baseline mb-8">
Expand All @@ -456,17 +456,17 @@ export default function ArticlesPage() {
noBackground={true}
/>
</div>
<div className="text-24-b text-slate-900">๊ด€๋ จ ๊ธฐ์‚ฌ ๋ชฉ๋ก</div>
<div className="text-24-b text-gray-900">๊ด€๋ จ ๊ธฐ์‚ฌ ๋ชฉ๋ก</div>
</div>
) : (
<div className="text-24-b text-slate-900">๊ด€๋ จ ๊ธฐ์‚ฌ ๋ชฉ๋ก</div>
<div className="text-24-b text-gray-900">๊ด€๋ จ ๊ธฐ์‚ฌ ๋ชฉ๋ก</div>
)}
{articles.length === 0 ? (
<div className="min-w-[894px] w-full flex flex-col justify-center min-h-72 items-center gap-6 mt-30">
<div className="min-w-[894px] w-full flex flex-col justify-center min-h-72 items-center mt-30">
{interestId ? (
<EmptyState message="๊ด€๋ จ๋œ ๊ธฐ์‚ฌ๊ฐ€ ์—†์Šต๋‹ˆ๋‹ค." />
) : (
<div>
<div className="flex flex-col items-center justify-center gap-6">
<EmptyState message="๊ด€์‹ฌ์‚ฌ๋ฅผ ๋“ฑ๋กํ•˜๋ฉด ๋งž์ถค ๊ธฐ์‚ฌ๋ฅผ ํ™•์ธํ•˜์‹ค ์ˆ˜ ์žˆ์–ด์š”." />
<Button
onClick={() => navigate("/interests")}
Expand Down
6 changes: 3 additions & 3 deletions src/app/routes/private/InterestsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -292,8 +292,8 @@ export default function InterestsPage() {
<div className="w-[1200px] mx-auto">
<div className="flex justify-between items-center">
<div className="text-left">
<h1 className="text-24-b text-slate-900">๊ด€์‹ฌ์‚ฌ ๋ชฉ๋ก</h1>
<p className="text-16-m text-slate-500 mt-3">
<h1 className="text-24-b text-gray-900">๊ด€์‹ฌ์‚ฌ ๋ชฉ๋ก</h1>
<p className="text-16-m text-gray-500 mt-3">
๊ตฌ๋… ์ค‘์ธ ๊ด€์‹ฌ์‚ฌ๋ฅผ ๊ด€๋ฆฌํ•˜๊ณ , ์ƒˆ๋กœ์šด ๊ด€์‹ฌ์‚ฌ๋ฅผ ๋“ฑ๋กํ•ด๋ณด์„ธ์š”.
</p>
</div>
Expand Down Expand Up @@ -360,7 +360,7 @@ export default function InterestsPage() {
</div>
)}

{isLoading && <Skeleton className="mx-4" />}
{isLoading && <Skeleton className="h-[232px] mx-4" />}
</div>
</div>
</div>
Expand Down
24 changes: 13 additions & 11 deletions src/app/routes/public/LandingPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,43 +3,45 @@ import Button from "@/shared/components/button/Button";
import { useAuthInfo } from "@/features/auth/hooks/useAuthInfo";
import { Link } from "react-router";
import { ROUTES } from "@/shared/constants/routes";
import firstImageUrl from "@/assets/images/landing_interests.png";
import secondImageUrl from "@/assets/images/landing_notifications.png";
import thirdImageUrl from "@/assets/images/landing_comments.png";
import firstImageUrl from "@/assets/images/landing_interests.svg";
import secondImageUrl from "@/assets/images/landing_notifications.svg";
import thirdImageUrl from "@/assets/images/landing_comments.svg";

export default function LandingPage() {
const { user } = useAuthInfo();
const link = user ? ROUTES.ARTICLES : ROUTES.AUTH_LOGIN;

return (
<div className="flex flex-col items-center px-4 w-full">
<h2 className="lg:mb-10 mb-6 text-center lg:text-[32px] md:text-[26px] text-[20px]">
๋งˆ์Œ๋Œ€๋กœ ๊ณจ๋ผ ๋ณด๋Š” ๋ชจ๋“  ๋‰ด์Šค
<p className="lg:text-[36px] md:text-[30px] text-[24px] font-bold text-cyan-500">
๋ชจ๋‰ด
<div className="lg:mb-10 mb-6 md:gap-1.5 gap-0 flex flex-col text-center">
<p className="lg:text-[30px] md:text-[24px] text-[20px]">
๋งˆ์Œ๋Œ€๋กœ ๊ณจ๋ผ ๋ณด๋Š” ๋ชจ๋“  ๋‰ด์Šค
</p>
</h2>
<h1 className="lg:text-[36px] md:text-[30px] text-[24px] font-bold text-cyan-500">
๋ชจ๋‰ด
</h1>
</div>

<div className="lg:flex-row flex flex-col justify-center items-center gap-6 w-full">
<LandingBox
imageSrc={firstImageUrl}
imageAlt="๊ด€์‹ฌ์‚ฌ ๋ชฉ๋ก"
description="๊ด€์‹ฌ์‚ฌ๋ฅผ ๋“ฑ๋กํ•ด๋ณด์„ธ์š”"
containerClassName="bg-cyan-100 border-3 border-cyan-400"
containerClassName="bg-white border-cyan-400"
descriptionClassName="text-cyan-500"
/>
<LandingBox
imageSrc={secondImageUrl}
imageAlt="์•Œ๋ฆผ ๋ชฉ๋ก"
description="ํ‚ค์›Œ๋“œ์— ๋งž๋Š” ๋‰ด์Šค๊ฐ€ ์ˆ˜์ง‘๋ผ์š”"
containerClassName="bg-gray-400 border-3 border-gray-200"
containerClassName="bg-gray-400 border-gray-200"
descriptionClassName="text-white"
/>
<LandingBox
imageSrc={thirdImageUrl}
imageAlt="๋Œ“๊ธ€ ๋ชฉ๋ก"
description="๋‰ด์Šค๋ฅผ ์ฝ๊ณ  ์˜๊ฒฌ์„ ๋‚จ๊ฒจ๋ณด์„ธ์š”"
containerClassName="bg-gray-500 border-3 border-gray-300"
containerClassName="bg-gray-500 border-gray-300"
descriptionClassName="text-white"
/>
</div>
Expand Down
Binary file removed src/assets/images/landing_comments.png
Binary file not shown.
Loading