Skip to content

Commit

Permalink
FE-27 🔀 에픽 브랜치 최신화
Browse files Browse the repository at this point in the history
  • Loading branch information
전유민 committed Jul 11, 2024
2 parents cdede81 + dab04a8 commit da08113
Show file tree
Hide file tree
Showing 6 changed files with 88 additions and 0 deletions.
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ module.exports = {
'react/jsx-props-no-spreading': 'off',
'no-use-before-define': 'off',
'@typescript-eslint/no-use-before-define': ['off'],
'react/self-closing-comp': 'off',
},
settings: {
react: {
Expand Down
72 changes: 72 additions & 0 deletions src/pageLayout/MypageLayout/MyPageLayout.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
function MyPageLayout() {
return (
<div className='bg-background-100 w-full relative h-dvh'>
<div className='bg-background-100 w-full h-[200px]'></div>
<div className='w-full h-[1900px] flex flex-col items-center bg-blue-100 rounded-3xl relative shadow-3xl'>
{/* 프로필 영역 */}
<div className='w-[130px] h-[240px] flex flex-col justify-center items-center absolute top-[-50px]'>
<div className='w-[120px] h-[120px] rounded-full bg-state-error'></div>
<p className='mt-4 mb-6'>선글라스 고양이</p>
<div className='w-[100px] h-12 pl-4 pr-3.5 py-1.5 bg-zinc-100 rounded-[100px] justify-start items-center gap-1.5 inline-flex'>
<div className="text-neutral-400 text-xl font-medium font-['Pretendard'] leading-loose">로그아웃</div>
</div>
</div>
{/* 오늘으 ㅣ감정 */}
<div className='w-[640px] h-[216px] mt-[300px] border border-black'>
<p>오늘의 감정</p>
</div>
{/* 캘린더 */}
<div className='w-[640px] h-[648px] mt-[160px] border border-black'>
<p>캘린더</p>
</div>
{/* 감정 차트 */}
<div className='w-[640px] mt-[160px] flex flex-col gap-6'>
<p className='text-black-600 font-semibold text-2xl'>감정 차트</p>
<div className='w-[640px] h-[264px] py-6 px-28 flex justify-between'>
<div>
<div className='flex justify-center items-center w-[180px] h-[180px] bg-gray-200 rounded-full'></div>
</div>
<div className='inline-flex flex-col justify-start items-start gap-3.5'>
<div className='w-[116px] h-8 justify-start items-center gap-4 inline-flex'>
<div className='w-4 h-4 bg-emerald-400 rounded-sm'></div>
<div>감정</div>
<div>35%</div>
</div>
<div className='w-[116px] h-8 justify-start items-center gap-4 inline-flex'>
<div className='w-4 h-4 bg-illust-yellow rounded-sm'></div>
<div>감정</div>
<div>35%</div>
</div>
<div className='w-[116px] h-8 justify-start items-center gap-4 inline-flex'>
<div className='w-4 h-4 bg-slate-300 rounded-sm'></div>
<div>감정</div>
<div>35%</div>
</div>
<div className='w-[116px] h-8 justify-start items-center gap-4 inline-flex'>
<div className='w-4 h-4 bg-slate-200 rounded-sm'></div>
<div>감정</div>
<div>35%</div>
</div>
<div className='w-[116px] h-8 justify-start items-center gap-4 inline-flex'>
<div className='w-4 h-4 bg-slate-100 rounded-sm'></div>
<div>감정</div>
<div>35%</div>
</div>
</div>
</div>
</div>
</div>
<div className='bg-background-100 flex flex-col items-center w-full py-[100px]'>
<div className='w-[640px] h-[600px] flex flex-col gap-12'>
<div className='inline-flex gap-6'>
<p className='text-neutral-400 font-semibold text-2xl'>내 에피그램(10)</p>
<p className='text-black-600 font-semibold text-2xl'>내 댓글(110)</p>
</div>
<div className='w-full'>{/* 댓글 컴포넌트 */}</div>
</div>
</div>
</div>
);
}

export default MyPageLayout;
3 changes: 3 additions & 0 deletions src/pageLayout/MypageLayout/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import MyPageLayout from './MyPageLayout';

export default MyPageLayout;
5 changes: 5 additions & 0 deletions src/pages/mypage/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import MyPageLayout from '@/pageLayout/MypageLayout';

export default function mypage() {
return <MyPageLayout />;
}
4 changes: 4 additions & 0 deletions src/styles/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,10 @@ body {
overflow-x: hidden;
}

body {
font-family: 'Pretendard';
}

a {
color: inherit;
text-decoration: none;
Expand Down
3 changes: 3 additions & 0 deletions tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ module.exports = {
'sub-gray_2': '#E3E9F1',
'sub-gray_3': '#EFF3F8',
},
boxShadow: {
'3xl': '0px 0px 36px 0px rgba(0, 0, 0, 0.05)',
},
},
},
plugins: [],
Expand Down

0 comments on commit da08113

Please sign in to comment.