diff --git a/README.md b/README.md index d99cf7f..8f2681b 100644 --- a/README.md +++ b/README.md @@ -173,7 +173,7 @@ MONEW/
-

๐Ÿง‘ ํŒ€์› ์†Œ๊ฐœ

+

๐Ÿ‘ฅ ํŒ€์› ์†Œ๊ฐœ

๐Ÿ“‘ ํ”„๋กœ์ ํŠธ ํ˜‘์—… ๋ฌธ์„œ(๋…ธ์…˜) ๋ฐ”๋กœ๊ฐ€๊ธฐ diff --git a/src/app/layouts/PrivateLayout.tsx b/src/app/layouts/PrivateLayout.tsx index 38477e7..3282882 100644 --- a/src/app/layouts/PrivateLayout.tsx +++ b/src/app/layouts/PrivateLayout.tsx @@ -5,10 +5,16 @@ import Footer from "@/shared/components/Footer"; export default function PrivateLayout() { return (
- -
- -
+
+ +
+ +
+
+ +
+
+
); diff --git a/src/app/routes/private/ActivitiesPage.tsx b/src/app/routes/private/ActivitiesPage.tsx index 1d2153b..899384d 100644 --- a/src/app/routes/private/ActivitiesPage.tsx +++ b/src/app/routes/private/ActivitiesPage.tsx @@ -26,7 +26,7 @@ export default function ActivitiesPage() { }, [isValid, setSp]); return ( -
+
diff --git a/src/app/routes/private/ArticlesPage.tsx b/src/app/routes/private/ArticlesPage.tsx index 7bde114..277f94d 100644 --- a/src/app/routes/private/ArticlesPage.tsx +++ b/src/app/routes/private/ArticlesPage.tsx @@ -326,6 +326,19 @@ export default function ArticlesPage() { fetchInterestData(); }, [fetchInterestData]); + useEffect(() => { + if (interests.length > 0 && interestId) { + const matchedInterest = interests.find( + (interest) => interest.id === interestId, + ); + if (matchedInterest) { + setSelectedInterest(matchedInterest.name); + } + } else if (!interestId) { + setSelectedInterest(""); + } + }, [interests, interestId]); + useEffect(() => { setSortValue(reverseSortMap[orderBy] || "๊ฒŒ์‹œ์ผ"); setDirectionValue(direction === "DESC" ? "๋‚ด๋ฆผ์ฐจ์ˆœ" : "์˜ค๋ฆ„์ฐจ์ˆœ"); @@ -383,8 +396,8 @@ export default function ArticlesPage() {
-
-
์ •๋ ฌ
+
+
์ •๋ ฌ
-
์ •๋ ฌ ๋ฐฉํ–ฅ
+
์ •๋ ฌ ๋ฐฉํ–ฅ
-
์ถœ์ฒ˜
+
์ถœ์ฒ˜
-
๋‚ ์งœ
+
๋‚ ์งœ
{keyword}
-
๊ด€๋ จ ๊ธฐ์‚ฌ ๋ชฉ๋ก
+
๊ด€๋ จ ๊ธฐ์‚ฌ ๋ชฉ๋ก
) : interests.length > 0 ? (
@@ -456,17 +469,17 @@ export default function ArticlesPage() { noBackground={true} />
-
๊ด€๋ จ ๊ธฐ์‚ฌ ๋ชฉ๋ก
+
๊ด€๋ จ ๊ธฐ์‚ฌ ๋ชฉ๋ก
) : ( -
๊ด€๋ จ ๊ธฐ์‚ฌ ๋ชฉ๋ก
+
๊ด€๋ จ ๊ธฐ์‚ฌ ๋ชฉ๋ก
)} {articles.length === 0 ? ( -
+
{interestId ? ( ) : ( -
+
diff --git a/src/app/routes/public/LandingPage.tsx b/src/app/routes/public/LandingPage.tsx index b4e219e..650dce2 100644 --- a/src/app/routes/public/LandingPage.tsx +++ b/src/app/routes/public/LandingPage.tsx @@ -3,9 +3,9 @@ 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(); @@ -13,33 +13,35 @@ export default function LandingPage() { return (
-

- ๋งˆ์Œ๋Œ€๋กœ ๊ณจ๋ผ ๋ณด๋Š” ๋ชจ๋“  ๋‰ด์Šค -

- ๋ชจ๋‰ด +

+

+ ๋งˆ์Œ๋Œ€๋กœ ๊ณจ๋ผ ๋ณด๋Š” ๋ชจ๋“  ๋‰ด์Šค

-

+

+ ๋ชจ๋‰ด +

+
diff --git a/src/assets/images/landing_comments.png b/src/assets/images/landing_comments.png deleted file mode 100644 index 03868f7..0000000 Binary files a/src/assets/images/landing_comments.png and /dev/null differ diff --git a/src/assets/images/landing_comments.svg b/src/assets/images/landing_comments.svg new file mode 100644 index 0000000..4118ddc --- /dev/null +++ b/src/assets/images/landing_comments.svg @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/images/landing_interests.png b/src/assets/images/landing_interests.png deleted file mode 100644 index a4d5a6a..0000000 Binary files a/src/assets/images/landing_interests.png and /dev/null differ diff --git a/src/assets/images/landing_interests.svg b/src/assets/images/landing_interests.svg new file mode 100644 index 0000000..85ee3cc --- /dev/null +++ b/src/assets/images/landing_interests.svg @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/images/landing_notifications.png b/src/assets/images/landing_notifications.png deleted file mode 100644 index ffadb09..0000000 Binary files a/src/assets/images/landing_notifications.png and /dev/null differ diff --git a/src/assets/images/landing_notifications.svg b/src/assets/images/landing_notifications.svg new file mode 100644 index 0000000..b17ef72 --- /dev/null +++ b/src/assets/images/landing_notifications.svg @@ -0,0 +1,119 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/readme/landing.png b/src/assets/readme/landing.png index 42ca37a..2536ee7 100644 Binary files a/src/assets/readme/landing.png and b/src/assets/readme/landing.png differ diff --git a/src/features/articles/components/NewsCard.tsx b/src/features/articles/components/NewsCard.tsx index eff7f85..211d745 100644 --- a/src/features/articles/components/NewsCard.tsx +++ b/src/features/articles/components/NewsCard.tsx @@ -32,23 +32,23 @@ export default function NewsCard({ article, onClick }: NewsCardProps) { onClick={onClick} >
-
{article.title}
-
{article.summary}
+
{article.title}
+
{article.summary}