diff --git a/frontend/src/components/common/Footer/Footer.tsx b/frontend/src/components/common/Footer/Footer.tsx index e2c2775d..6d2915a0 100644 --- a/frontend/src/components/common/Footer/Footer.tsx +++ b/frontend/src/components/common/Footer/Footer.tsx @@ -1,5 +1,5 @@ -import color from '@Styles/color'; import { styled } from 'styled-components'; + import Typography from '../Typography/Typography'; const URL = { @@ -17,12 +17,12 @@ const Footer = () => { Copyright © 2023 하루스터디 - All rights reserved. - + Github - + 사용자 피드백 diff --git a/frontend/src/components/record/hooks/useMemberListRecord.ts b/frontend/src/components/record/hooks/useMemberListRecord.ts index b7d8f4ff..41cde8e0 100644 --- a/frontend/src/components/record/hooks/useMemberListRecord.ts +++ b/frontend/src/components/record/hooks/useMemberListRecord.ts @@ -36,7 +36,7 @@ const useMemberListRecord = ({ memberId }: Props) => { setMemberRecords(studyRecords || []); if (totalPagesNumber === 1 || pageInfo.totalPages !== pageInfo.totalPages + 1) - setTotalPagesNumber(pageInfo.totalPages + 1); + setTotalPagesNumber(pageInfo.totalPages); }, [result]); return { memberRecords, isLoading, totalPagesNumber, shiftPage, currentPageNumber: page }; diff --git a/frontend/src/components/record/member/period/EmptyMemberRecord/EmptyMemberRecord.tsx b/frontend/src/components/record/member/period/EmptyMemberRecord/EmptyMemberRecord.tsx index 386e366f..e00712b6 100644 --- a/frontend/src/components/record/member/period/EmptyMemberRecord/EmptyMemberRecord.tsx +++ b/frontend/src/components/record/member/period/EmptyMemberRecord/EmptyMemberRecord.tsx @@ -21,19 +21,14 @@ const EmptyMemberRecord = () => { text-align: center; `} > - 아직 완료한 스터디가 없어요. + 완료한 스터디가 없어요.
- 스터디를 개설하거나 참여하여 스터디를 진행해보세요. + 스터디를 시작해 보세요. - + - - - @@ -49,15 +44,36 @@ const Layout = styled.div` align-items: center; gap: 20px; - padding-top: 80px; + padding-top: 40px; svg { width: 80px; height: 80px; } + + @media screen and (max-width: 768px) { + gap: 20px; + + padding-top: 20px; + + p { + font-size: 1.6rem; + } + + svg { + width: 60px; + height: 60px; + } + } `; const ButtonContainer = styled.div` display: flex; gap: 20px; + + @media screen and (max-width: 768px) { + button { + font-size: 1.6rem; + } + } `; diff --git a/frontend/src/components/record/member/period/MemberRecordPeriod/MemberRecordPeriod.tsx b/frontend/src/components/record/member/period/MemberRecordPeriod/MemberRecordPeriod.tsx index f43c0b4e..69ba1f9d 100644 --- a/frontend/src/components/record/member/period/MemberRecordPeriod/MemberRecordPeriod.tsx +++ b/frontend/src/components/record/member/period/MemberRecordPeriod/MemberRecordPeriod.tsx @@ -23,12 +23,14 @@ const MemberRecordPeriod = ({ memberId }: Props) => { return ( - + {totalPagesNumber !== 0 && ( + + )} {memberRecords && memberRecords.length > 3 && (