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

Feature/6 #19

Open
wants to merge 27 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
1861c65
[add] 카드 뷰 구현
rdd9223 May 21, 2021
f6a55a1
[update] 카테고리 리스트에 키 추가
rdd9223 May 21, 2021
6dcc4d0
[feat] Header 수정 및 Up컴포넌트 추가
ingong May 21, 2021
4898a50
[feat] globalstyles 의padding 수정
ingong May 21, 2021
3c6a9fe
[add] scss 설치
ingong May 21, 2021
89711a5
[add] 슬라이더 틀 완성
ingong May 21, 2021
32eef46
[add] 테마가 있는 스토리 뼈대 구현
rdd9223 May 21, 2021
fc52122
[chore] 필요한 모듈 설치
rdd9223 May 21, 2021
a5b7a4f
[add] 베스트 스토리, 키워드 퍼블리싱 완료
ingong May 21, 2021
8b78c65
[feat] down header 배경색 입력 하얀색으로
ingong May 21, 2021
747cc54
[feat] slider 파일 수정
ingong May 21, 2021
9ca118e
[feat] slider Component 수정 아직 미완성
ingong May 21, 2021
b3d5b53
[feat] slider css 수정
ingong May 21, 2021
8bc8926
[style] 컴포넌트 명 변경
rdd9223 May 21, 2021
f4480b0
[add] 인기 탑 10 컴포넌트 구현
rdd9223 May 21, 2021
53b8457
[style] 컴포넌트명, 파일명 변경
rdd9223 May 21, 2021
da38859
[add] 더미데이터 props로 전달
rdd9223 May 21, 2021
c5d21ea
[style] 변경된 컴포넌트 명, 클래스명 적용
rdd9223 May 21, 2021
9b1b0d8
[add] 인기 탑텐 컨테이너 구현
rdd9223 May 21, 2021
8fceec7
[fix] 헤더 고정, 배경색 지정
rdd9223 May 21, 2021
01cf929
[fix] style 세미콜론 오류 수정
rdd9223 May 21, 2021
393703b
[style] 사용하지 않는 import 제거, 들여쓰기 조정
rdd9223 May 21, 2021
188a3c0
[fix] bottom-margin값 변경
rdd9223 May 22, 2021
633f73b
[feat] slider 수정
ingong May 22, 2021
16fb7d4
Merge branch 'feat/3' to 'feature/6'
ingong May 22, 2021
ca9cf18
[style] font 경로 수정
ingong May 22, 2021
737e223
[fix] class 를 className 으로 수정
ingong May 22, 2021
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
5 changes: 5 additions & 0 deletions folin-web/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions folin-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"react-router-dom": "^5.2.0",
"react-scripts": "4.0.3",
"styled-components": "^5.3.0",
"styled-reset": "^4.3.4",
"web-vitals": "^1.0.1"
},
"scripts": {
Expand Down
18 changes: 9 additions & 9 deletions folin-web/src/assets/fonts/index.css
Original file line number Diff line number Diff line change
@@ -1,54 +1,54 @@
@font-face {
font-family: "Noto Serif KR";
font-weight: 400;
src: url("../fonts/NotoSerifCJKkr-Regular.otf") format("otf");
src: url("./NotoSerifCJKkr-Regular.otf") format("otf");
}

@font-face {
font-family: "Noto Serif KR";
font-weight: 700;
src: url("../fonts/NotoSerifCJKkr-Bold.otf") format("otf");
src: url("./NotoSansCJKkr-Bold.otf") format("otf");
}

@font-face {
font-family: "Noto Sans KR";
font-weight: 400;
src: url("../fonts/NotoSansCJKkr-Regular.otf") format("otf");
src: url("./NotoSansCJKkr-Regular.otf") format("otf");
}

@font-face {
font-family: "Noto Sans KR";
font-weight: 500;
src: url("../fonts/NotoSansCJKkr-Medium.otf") format("otf");
src: url("./NotoSansCJKkr-Medium.otf") format("otf");
}

@font-face {
font-family: "Noto Sans KR";
font-weight: 700;
src: url("../fonts/NotoSansCJKkr-Bold.otf") format("otf");
src: url("./NotoSansCJKkr-Bold.otf") format("otf");
}

@font-face {
font-family: "Nanum Myeongjo";
font-weight: 400;
src: url("../fonts/NanumMyeongjo.otf") format("otf");
src: url("./NanumMyeongjo.otf") format("otf");
}

@font-face {
font-family: "Nanum Myeongjo";
font-weight: 700;
src: url("../fonts/NanumMyeongjoBold.otf") format("otf");
src: url("./NanumMyeongjoBold.otf") format("otf");
}

/* window 용이라는데 사실 잘 모르겠.. */
@font-face {
font-family: "Nanum Myeongjo";
font-weight: 701;
src: url("../fonts/NanumMyeongjoBoldwindow.otf") format("otf");
src: url("./NanumMyeongjoBoldwindow.otf") format("otf");
}

@font-face {
font-family: "Nanum Myeongjo";
font-weight: 900;
src: url("../fonts/NanumMyeongjoExtraBold.otf") format("otf");
src: url("./NanumMyeongjoExtraBold.otf") format("otf");
}
4 changes: 2 additions & 2 deletions folin-web/src/assets/styles/GlobalStyles.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ const GlobalStyles = createGlobalStyle`
font-family: 'Noto Serif KR';
box-sizing: border-box;
font-size: 10px;
padding-left: 17.3vw;
padding-right: 17.3vw;
padding-left: 5vw;
padding-right: 5vw;

@media (max-width: 1200px) {
padding-left: 1.8vw;
Expand Down
2 changes: 1 addition & 1 deletion folin-web/src/assets/styles/theme.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const text = {
textGray1: "#595959",
textGray2: "#9D9D9D",
textWhite: "#FFFFFF",
textGreen: "#00564A",
textGreen: "#1E9285",
};

const theme = {
Expand Down
177 changes: 177 additions & 0 deletions folin-web/src/components/First/Down.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,177 @@
import React from "react";
import styled from "styled-components";
import ThemeStoryCard from "./Down/ThemeStoryCard";
import TopTenCard from "./Down/TopTenCard";

const Wrapper = styled.div`
position: relative;
width: 1200px;
margin: 0 auto;

.themeStory {
&__title {
font-family: "Noto Sans KR";
font-style: normal;
font-weight: bold;
font-size: 36px;
line-height: 52px;
letter-spacing: -0.07em;
color: #00554a;
z-index: 0;
}

&__subtitle {
font-family: "Noto Serif KR";
font-style: normal;
font-weight: normal;
font-size: 38px;
line-height: 55px;
color: #2d2a26;
position: absolute;
top: 87px;
width: 25%;
letter-spacing: -0.055em;
}

&__itemContainer {
width: 75%;
margin-left: 25%;
margin-top: 50px;
position: relative;
overflow: hidden;
}

&__items {
width: 5544px;
height: 1000px;
display: flex;
flex-direction: column;
flex-wrap: wrap;
align-content: flex-start;
}

button {
position: absolute;
padding: 28px;
top: 300px;
border: 0px;
background-color: transparent;
text-align: center;
margin-top: 0px;
cursor: pointer;

:before {
content: "";
transform: rotate(45deg);
display: inline-block;
position: absolute;
top: 50%;
width: 26px;
height: 26px;
margin-top: -13px;
}
}

&__prevButton {
left: -6px;

::before {
border: 1px solid;
border-color: transparent transparent #e0e0e0 #e0e0e0;
left: 50%;
margin-left: -4px;
}
}

&__nextButton {
left: 50px;

::before {
border: 1px solid;
border-color: #6d6b68 #6d6b68 transparent transparent;
right: 50%;
margin-right: -4px;
}
}
}

.topTen {
&__title {
font-family: Noto Sans KR;
font-style: normal;
font-weight: bold;
font-size: 36px;
line-height: 52px;
letter-spacing: -0.07em;
color: #00554a;
}

&__subtitle {
font-family: Noto Sans KR;
font-style: normal;
font-weight: normal;
font-size: 18px;
line-height: 26px;
/* identical to box height */

letter-spacing: -0.03em;

color: #636363;
}

&__itemContainer {
margin-top: 60px;
margin-left: 50px;
}

&__items {
display: flex;
flex-direction: column;
height: 600px;
flex-wrap: wrap;

li {
margin-bottom: 43px;
}
}
}
`;

const Down = ({ props }) => {
return (
<Wrapper>
<div className='themeStory'>
<h2 className='themeStory__title'>테마가 있는 스토리</h2>
<h3 className='themeStory__subtitle'>
일하는 방식을 실험하는 브랜드, 모베리웍스
</h3>
<div className='themeStory__itemContainer'>
<ul className='themeStory__items'>
{props &&
props.map((item) => (
<ThemeStoryCard key={item.id} props={item} />
))}
</ul>
</div>
<button className='themeStory__prevButton'></button>
<button className='themeStory__nextButton'></button>
</div>
<div className='topTen'>
<h2 className='topTen__title'>폴인 인기 Top 10</h2>
<h3 className='topTen__subtitle'>
멤버십 회원들이 많이 본 요즘 직장인 대세 콘텐츠!
</h3>
<div className='topTen__itemContainer'>
<ul className='topTen__items'>
{props &&
props.map((item, index) => (
<TopTenCard key={index} props={item} />
))}
</ul>
</div>
</div>
</Wrapper>
);
};

export default Down;
Loading