Skip to content

Commit a0004a3

Browse files
authored
Merge pull request #33 from codeit-sprint-part4-8-1/feat-F81-10-메인페이지
Feat: 메인 페이지 레이아웃 제작
2 parents ea49bd4 + 8abb555 commit a0004a3

File tree

4 files changed

+23
-4
lines changed

4 files changed

+23
-4
lines changed

src/components/@Shared/Footer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ interface FooterProps {
88
const Footer: React.FC<FooterProps> = ({ className = '' }) => {
99
return (
1010
<footer
11-
className={`bg-nomadBlack text-gray-900 h-40 mt-10 flex flex-col items-center justify-center px-4 ${className}`}
11+
className={`bg-nomadBlack text-gray-900 h-40 mt-[120px] flex flex-col items-center justify-center px-4 ${className}`}
1212
>
1313
<div className="w-full max-w-7xl flex flex-col tablet:flex-row justify-between items-center py-6">
1414
{/* 저작권 텍스트 */}

src/components/mainPage/ActivityList.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export default function ActivityList() {
4848
};
4949

5050
return (
51-
<div className="container mx-auto py-8">
51+
<div className="container mx-auto">
5252
<h2 className="text-2xl text-black text-left font-semibold mb-4">
5353
🛼 모든 체험
5454
</h2>
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import MainCategory from '../@Shared/category/MainCategory';
2+
import DropDownMenu from '../@Shared/dropDown/DropDownMenu';
3+
4+
export default function CategoryAndDropDown() {
5+
return (
6+
<div className="flex flex-row justify-between mobile:w-[343px] tablet2:w-[696px] pc:w-[1200px] mobile:mb-[24px] tablet2:mb-[35px] pc:mb-[35px]">
7+
<MainCategory />
8+
<DropDownMenu
9+
size={'small'}
10+
filterList={['가격 낮은 순', '가격 높은 순']}
11+
/>
12+
</div>
13+
);
14+
}

src/pages/index.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import Banner from '@/components/main/Banner';
22
import SearchBar from '@/components/@Shared/searchBar/SearchBar';
33
import HotActivityList from '@/components/mainPage/HotActivityList';
4+
import CategoryAndDropDown from '@/components/mainPage/Category&DropDown';
5+
import ActivityList from '@/components/mainPage/ActivityList';
46

57
export default function Home() {
68
return (
@@ -23,8 +25,11 @@ export default function Home() {
2325
<div className="relative mobile:mt-[100px] tablet2:mt-[142px] pc:mt-[158px] z-30 flex justify-center">
2426
<HotActivityList />
2527
</div>
26-
<div className="text-center py-8">
27-
<p>메인 페이지 내용</p>
28+
<div className="relative mobile:mt-[40px] tablet2:mt-[60px] pc:mt-[60px] z-30 flex justify-center">
29+
<CategoryAndDropDown />
30+
</div>
31+
<div className="relative flex justify-center mobile:mb-[83px] tablet2:mb-[153px] pc:mb-[222px]">
32+
<ActivityList />
2833
</div>
2934
</div>
3035
);

0 commit comments

Comments
 (0)