-
- {passwordMatch === false && (
-
비밀번호가 일치하지 않습니다.
+
+ {confirmPassword && passwordMatch === false && (
+
비밀번호가 일치하지 않습니다.
)}
- {passwordMatch === true && (
-
비밀번호가 일치합니다.
+ {confirmPassword && passwordMatch === true && (
+
비밀번호가 일치합니다.
)}
@@ -332,7 +333,7 @@ const FindPassword = () => {
transition={{ duration: 0.5 }}
className="w-[90%] sm:w-full max-w-[340px] mx-auto"
>
- {passwordMatch ? (
+ {passwordValid && passwordMatch ? (
비밀번호 재설정
diff --git a/src/components/home/MainReportItem.tsx b/src/components/home/MainReportItem.tsx
index 8487f7d..f56a9b4 100644
--- a/src/components/home/MainReportItem.tsx
+++ b/src/components/home/MainReportItem.tsx
@@ -11,7 +11,7 @@ const MainReportItem = ({ category, title, date, link, description, imageLink }:
};
return (
-
+
{/* 왼쪽 */}
diff --git a/src/components/home/RealtimeRank.tsx b/src/components/home/RealtimeRank.tsx
index 1215b32..be08b51 100644
--- a/src/components/home/RealtimeRank.tsx
+++ b/src/components/home/RealtimeRank.tsx
@@ -30,7 +30,10 @@ const RealtimeRank = () => {
className={`${i < 3 ? 'text-normal text-body6 ' : 'text-gray400 text-body6'}`}>
{item.rank}위
-
+
{
+ setKeyword(item.keyword);
+ router.push('/search');
+ }}>
{item.keyword}
diff --git a/src/components/mypage/MypageHeader.tsx b/src/components/mypage/MypageHeader.tsx
index 5176e4d..5e73b3a 100644
--- a/src/components/mypage/MypageHeader.tsx
+++ b/src/components/mypage/MypageHeader.tsx
@@ -1,23 +1,16 @@
-import { axiosInstance } from '@/service/axiosInstance';
-import { useMemberStore } from '@/store/user.store';
import Link from 'next/link';
import { useRouter } from 'next/navigation';
import React from 'react';
-import { useQuery } from '@tanstack/react-query';
+import { useMemberStore } from '@/store/user.store';
+
+interface MypageHeaderProps {
+ bookmarks: number;
+}
-const MypageHeader = () => {
+const MypageHeader = ({ bookmarks }: MypageHeaderProps) => {
const { member } = useMemberStore();
const router = useRouter();
- const fetchBookmarks = async () => {
- const { data } = await axiosInstance.get('https://api.moaguide.com/user/bookmark');
- return data;
- };
-
- const {
- data: bookmarks,
- } = useQuery({ queryKey: ['bookmarks'], queryFn: fetchBookmarks });
-
return (
@@ -55,4 +48,4 @@ const MypageHeader = () => {
);
};
-export default MypageHeader;
+export default MypageHeader;
\ No newline at end of file
diff --git a/src/components/recentlyIssue/BestNewsItem.tsx b/src/components/recentlyIssue/BestNewsItem.tsx
index ac738ca..92fb6fd 100644
--- a/src/components/recentlyIssue/BestNewsItem.tsx
+++ b/src/components/recentlyIssue/BestNewsItem.tsx
@@ -1,10 +1,10 @@
import type { MainNews } from '@/types/homeComponentsType';
-
import { formatCategory } from '@/utils/formatCategory';
import { format, parseISO } from 'date-fns';
import Link from 'next/link';
import React from 'react';
import Image from 'next/image';
+
interface BestNewsItemType {
item: MainNews;
rank: number;
@@ -13,14 +13,14 @@ interface BestNewsItemType {
const BestNewsItem = ({ item, rank }: BestNewsItemType) => {
return (
-
-
+
+
{
className="absolute mt-1 ml-1"
/>
{item.title}
-
+
{formatCategory(item.category)}
- {' '}
{format(parseISO(item.date), 'yyyy.MM.dd')}
@@ -43,4 +42,4 @@ const BestNewsItem = ({ item, rank }: BestNewsItemType) => {
);
};
-export default BestNewsItem;
+export default BestNewsItem;
\ No newline at end of file
diff --git a/src/components/search/SearchIndex.tsx b/src/components/search/SearchIndex.tsx
index 20ac3a5..0597610 100644
--- a/src/components/search/SearchIndex.tsx
+++ b/src/components/search/SearchIndex.tsx
@@ -59,11 +59,11 @@ const SearchIndex = () => {
/>
{keyWord && (
-
+
)}
-
+
diff --git a/src/components/search/SearchRank.tsx b/src/components/search/SearchRank.tsx
index 933a0db..9fbbea5 100644
--- a/src/components/search/SearchRank.tsx
+++ b/src/components/search/SearchRank.tsx
@@ -26,10 +26,11 @@ const SearchRank = ({ setKeyWord }: SearchRankType) => {
{data?.map((item: RealtimeRankType, i: number) => (
+ className={`${i < 3 ? 'text-normal text-body6 ' : 'text-gray400 text-body6'}`}
+ style={{ marginLeft: item.rank === 1 ? '0.12rem' : '0' }}>
{item.rank}위
- {item.keyword}
+ handleClick(item.keyword)}>{item.keyword}
{/* todo : 돋보기 누르면 그대로 검색 쿼리에 keyword가 들어가게하기 */}
= ({ onNext, onUpdate, email }) => {
type="password"
placeholder="비밀번호 재입력"
value={confirmPassword}
+ disabled={!passwordValid}
onChange={handleConfirmPasswordChange}
className={`w-full mt-4 px-4 py-[14px] bg-bg rounded-[12px] outline-none text-body2
${confirmPassword ? (passwordMatch ? 'outline-success' : 'focus:outline-normal') : ''}`}
diff --git a/src/components/skeleton/BestNewsItemSkeleton.tsx b/src/components/skeleton/BestNewsItemSkeleton.tsx
index 460bf64..34b56b2 100644
--- a/src/components/skeleton/BestNewsItemSkeleton.tsx
+++ b/src/components/skeleton/BestNewsItemSkeleton.tsx
@@ -2,15 +2,16 @@ import React from 'react';
const BestNewsItemSkeleton = () => {
return (
-