Skip to content

Commit

Permalink
Merge pull request #122 from Gamegoo-repo/design/#121
Browse files Browse the repository at this point in the history
[Design] 마이페이지 헤더 수정
  • Loading branch information
yyypearl authored Oct 14, 2024
2 parents 979bb6e + 1132ee1 commit fbc5f8a
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 31 deletions.
3 changes: 2 additions & 1 deletion src/app/mypage/blocked/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,8 @@ const Top = styled.div`
justify-content: space-between;
color: ${theme.colors.gray700};
${(props) => props.theme.fonts.regular25};
margin-bottom: 44px;
padding-bottom: 13px;
border-bottom: 1px solid ${theme.colors.gray400};
`;

const BlockedList = styled.div`
Expand Down
18 changes: 5 additions & 13 deletions src/app/mypage/notification/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ const MyAlertPage = () => {
fetchNotiCount();
}, [currentPage]);

useEffect(() => { }, [totalPages, totalItems, notiCount]);
useEffect(() => {}, [totalPages, totalItems, notiCount]);

const handlePrevPage = () => {
if (currentPage > 1) {
Expand Down Expand Up @@ -110,9 +110,7 @@ const MyAlertPage = () => {
<Wrapper>
<MyAlertContent>
<Alert>
<Top>
<Small>알림 페이지 ({notiCount})</Small>
</Top>
<Top>알림 페이지 ({notiCount})</Top>
{notiList.length > 0 ? (
<AlertList>
{notiList.map((data) => (
Expand Down Expand Up @@ -183,16 +181,10 @@ const Top = styled.div`
width: 100%;
display: flex;
justify-content: space-between;
border-bottom: 1px solid ${theme.colors.gray400};
`;

const Small = styled.div`
width: 100%;
display: flex;
justify-content: space-between;
${(props) => props.theme.fonts.medium16};
color: ${theme.colors.gray700};
padding-bottom: 27px;
${(props) => props.theme.fonts.regular25};
padding-bottom: 13px;
border-bottom: 1px solid ${theme.colors.gray400};
`;

const AlertList = styled.div`
Expand Down
13 changes: 9 additions & 4 deletions src/app/mypage/post/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ const MyPostPage = () => {
<Wrapper>
<MyPostContent>
<PostPage>
<Title>내가 작성한 글</Title>
<Top>내가 작성한 글</Top>
<Columns>
<Left>소환사명</Left>
<Center>티어</Center>
Expand Down Expand Up @@ -136,10 +136,15 @@ const PostPage = styled.header`
margin-bottom: 100px;
`;

const Title = styled.div`
${(props) => props.theme.fonts.bold25};
const Top = styled.div`
width: 100%;
display: flex;
justify-content: space-between;
color: ${theme.colors.gray700};
margin-bottom: 39px;
${(props) => props.theme.fonts.regular25};
padding-bottom: 13px;
margin-bottom: 20px;
border-bottom: 1px solid ${theme.colors.gray400};
`;

const Columns = styled.div`
Expand Down
10 changes: 7 additions & 3 deletions src/app/mypage/review/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -185,10 +185,14 @@ const Gray = styled.div`
`;

const Title = styled.div`
padding-left: 6px;
margin-bottom: 13px;
${(props) => props.theme.fonts.regular25};
width: 100%;
display: flex;
justify-content: space-between;
color: ${theme.colors.gray700};
${(props) => props.theme.fonts.regular25};
padding-bottom: 13px;
margin-bottom: 20px;
border-bottom: 1px solid ${theme.colors.gray400};
`;

const Row = styled.div`
Expand Down
20 changes: 13 additions & 7 deletions src/app/mypage/service/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ const MyServicePage = () => {
return (
<Wrapper>
<MyServiceContent>
<Profile>
<Title>고객센터</Title>
</Profile>
<Blocked>
<Top>고객 센터</Top>
</Blocked>
</MyServiceContent>
<Footer>
<ChatBoxContent>
Expand All @@ -36,17 +36,23 @@ const MyServiceContent = styled.div`
padding: 0 80px;
`;

const Profile = styled.header`
const Blocked = styled.header`
display: flex;
flex-direction: column;
align-items: start;
align-items: flex-start;
width: 100%;
margin-bottom: 32px;
`;

const Title = styled.div`
${(props) => props.theme.fonts.bold25};
const Top = styled.div`
width: 100%;
display: flex;
justify-content: space-between;
color: ${theme.colors.gray700};
${(props) => props.theme.fonts.regular25};
padding-bottom: 13px;
margin-bottom: 20px;
border-bottom: 1px solid ${theme.colors.gray400};
`;

const Footer = styled.footer`
Expand Down
7 changes: 4 additions & 3 deletions src/components/mypage/post/Post.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export interface PostProps {
rank: string;
contents: string;
createdAt: string;
boardNumber:number;
boardNumber: number;
onDeletePost?: (boardId: number) => void;
}

Expand Down Expand Up @@ -128,8 +128,9 @@ const Post: React.FC<PostProps> = ({
</Name>
<Tier>
<TierImage
data={`/assets/images/tier/${toLowerCaseString(tier) || "unrank"
}.svg`}
data={`/assets/images/tier/${
toLowerCaseString(tier) || "unrank"
}.svg`}
width={26}
height={26}
/>
Expand Down

0 comments on commit fbc5f8a

Please sign in to comment.