Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

메인페이지 수정 / 동아리 정보 등록 페이지 #21

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions packages/dodam/components/GridView.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import Image from 'next/image';

export default function GridtView(props) {
const dataList = props.data.map((data) => (
<div className="col-6">
<Image className="img-temp" src="/{data.imageUrl}" height="152px" width="152px" />
<div className="title-temp">{data.title}</div>
</div>
));
return <div className="row">{dataList}</div>;
}
11 changes: 11 additions & 0 deletions packages/dodam/components/RankingView.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import Image from 'next/image';

export default function RankingtView(props) {
const dataList = props.data.map((data) => (
<div className="col-4">
<Image className="img-temp" src="/{data.imageUrl}" height="128px" width="96px" />
<div className="title-temp">{data.title}</div>
</div>
));
return <div className="row">{dataList}</div>;
}
1 change: 1 addition & 0 deletions packages/dodam/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"@dodam/components": "0.1.0",
"bootstrap": "^5.0.0-beta1",
"next": "10.0.3",
"next-images": "^1.6.2",
"react": "17.0.1",
"react-datepicker": "^3.3.0",
"react-dom": "17.0.1",
Expand Down
5 changes: 5 additions & 0 deletions packages/dodam/pages/group/enroll.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { Button } from '@dodam/components';

export default function Enroll() {
return <h1>ENROOL PAGE</h1>;
}
155 changes: 147 additions & 8 deletions packages/dodam/pages/index.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,152 @@
import { InputBox, Button, DatePicker } from '@dodam/components';
import TestParagraph from '@/components/TestParagraph';
import { Button } from '@dodam/components';
import Image from 'next/image';
import GridView from '@/components/GridView.js';
import { Typography } from '@dodam/components';
import RankingtView from '@/components/RankingView';

export default function Home() {
const data = [
{
imageUrl: '1.png',
title: '1번 타이틀',
},
{
imageUrl: '2.png',
title: '2번 타이틀',
},
{
imageUrl: '3.png',
title: '3번 타이틀',
},
{
imageUrl: '4.png',
title: '4번 타이틀',
},
];

const weekData = [
{
imageUrl: '1.png',
title: '1번 타이틀',
},
{
imageUrl: '2.png',
title: '2번 타이틀',
},
{
imageUrl: '3.png',
title: '3번 타이틀',
},
];

export default function Main() {
return (
<div>
<InputBox type="text" placeholder="placeholder text" />
<DatePicker selected={new Date()} onChange={(date) => console.log(date)} />
<Button>Click</Button>
<TestParagraph />
<div className="row wrapper">
<div className="first-container mb-3">
<div className="title-wrapper">
<Typography className="title">나에게 맞는 최적의 동아리는?</Typography>
<Typography weight="bold" variant="h3">
성격유형분석을 통한
</Typography>
<Typography weight="bold" variant="h3">
동아리 맞춤 서비스를 만나보세요
</Typography>
<div className="test-start">
<Button className="test-button">
<Typography className="button-text" align="center" variant="span">
테스트 시작
</Typography>
</Button>
</div>
</div>
</div>

<div className="row ranking mb-5">
<div className="row d-flex align-items-center">
<div className="col-2 d-flex align-items-center">
<Image className="ranking-image" src="/../public/images/ic_ranking.svg" height="24px" width="24px" />
</div>
<div className="col">
<Typography className="section-title" weight="bold" variant="h5">
금주 동아리 랭킹
</Typography>
</div>
</div>
<div className="row mt-3">
<RankingtView data={weekData} />
</div>
</div>

<div className="row real-time mb-5">
<div className="row d-flex align-items-center">
<div className="col-2 d-flex align-items-center">
<Image className="real-time-image" src="/../public/images/ic_real time.svg" height="24px" width="24px" />
</div>
<div className="col">
<Typography className="section-title" weight="bold" variant="h5">
실시간 모집공고
</Typography>
</div>
<div className="col-2 d-flex align-items-center">
<Image className="overview-image" src="/../public/images/ic_overview.svg" height="24px" width="24px" />
</div>
</div>
<div className="row mt-3">
<GridView data={data} />
</div>
</div>
<div className="row footer">
<span variant="span">
도담도담 소개 | 이용약관 | 개인정보처리방침
<br />
서울특별시 강남구(도담도담)
<br />
Copyright 2020. DodamDodam All rights reserved.
<br />
</span>
</div>

<style jsx>
{`
.wrapper {
position: absolute;
top: 50px;
}
.first-container {
height: 450px;
background-size: 100% 100%;
background-repeat: no-repeat;
background-image: url('/../images/mainBanner.png');
}
.title-wrapper {
margin-left: 36px;
padding-top: 53px;
color: #242424;
opacity: 1;
}
.ranking,
.real-time {
margin-left: 36px;
padding-top: 36px;
}
.footer {
background-color: #000000;
color: white;
text-align: center;
padding-top: 10%;
padding-bottom: 10%;
}
.test-start :global(.test-button) {
top: 208px;
left: 36px;
width: 106px;
height: 38px;
background: #191919 0% 0% no-repeat padding-box;
border-radius: 19px;
opacity: 1;
margin-top: 28px;
}
`}
</style>
</div>
);
}
1 change: 1 addition & 0 deletions packages/dodam/public/images/ic_overview.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions packages/dodam/public/images/ic_ranking.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions packages/dodam/public/images/ic_real time.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/dodam/public/images/mainBanner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11490,6 +11490,14 @@ nested-error-stacks@^2.0.0, nested-error-stacks@^2.1.0:
resolved "https://registry.yarnpkg.com/nested-error-stacks/-/nested-error-stacks-2.1.0.tgz#0fbdcf3e13fe4994781280524f8b96b0cdff9c61"
integrity sha512-AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug==

next-images@^1.6.2:
version "1.6.2"
resolved "https://registry.yarnpkg.com/next-images/-/next-images-1.6.2.tgz#e5535ba468c3c857025e7fa07a27c773326223ad"
integrity sha512-tmINk0NzJ/D7Kk16x9gOgTd9wlcVG4IfyEcQqt/SY31miwuv5pzUhT7fakO2fYPrXimHOEPBaacCz1G6jADcbQ==
dependencies:
file-loader "^6.0.0"
url-loader "^4.0.0"

next-tick@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
Expand Down