-
Notifications
You must be signed in to change notification settings - Fork 2
Feature/8 create union section #9
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
Merged
Merged
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
cb7a777
feat: Union 섹션 기초 틀 잡기
karpitony 6e7a14d
feat: Union 레이아웃 콘텐츠 박스 제외하고 요소 추가
karpitony b42fcc1
Merge branch 'develop' into feature/8-create-union-section
karpitony e2494d3
feat: New 뱃지와 유니온 텍스트 정렬
karpitony ee91eea
feat: 콘텐츠박스 배경 Gradiant 추가 + refactor: 스타일드 따로 분리
karpitony 9533c2c
fix: 오타 수정 + 레이아웃 중앙 정렬되게 수정
karpitony 80defd9
feat: Union 설명 내용 추가
karpitony 46bff2b
Merge branch 'develop' into feature/8-create-union-section
karpitony 88a680b
feat: 한 학기 활동 내용 추가 + 약간의 미디어쿼리
karpitony 89b7bdd
feat: 미디어 쿼리 조정 및 스타일 세부 작업
karpitony 352320e
feat: 미디어쿼리 커스텀훅 추가
karpitony 33ecf3a
refactor: 미디어 쿼리 커스텀훅으로 변경
karpitony File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
import { useMediaQuery } from "react-responsive"; | ||
|
||
const useMediaQueries = () => { | ||
/* | ||
* Union 작업중 콘텐츠 박스에서 767보다 더 작은 크기 조절이 필요해서 isTiny를 추가했습니다. | ||
* 반응형 작업하실 때 한번더 봐주시고 고쳐주시면 좋을거 같습니다. | ||
*/ | ||
const isTiny = useMediaQuery({ query: "(max-width: 385px)" }) | ||
const isMobile = useMediaQuery({ query: "(max-width: 767px)" }); | ||
const isTablet = useMediaQuery({ | ||
query: "(min-width: 768px) and (max-width: 1023px)", | ||
}); | ||
const isDesktop = useMediaQuery({ | ||
query: "(min-width: 1024px)" | ||
}); | ||
|
||
return { isTiny, isMobile, isTablet, isDesktop }; | ||
}; | ||
|
||
export default useMediaQueries; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,173 @@ | ||
import styled from "styled-components"; | ||
|
||
export const Container = styled.div<{ $isMobile: boolean }>` | ||
width: 100%; | ||
height: ${(props) => (props.$isMobile ? "auto" : "500px")}; | ||
|
||
display: flex; | ||
justify-content: center; | ||
align-items: center; | ||
|
||
position: relative; | ||
padding: ${(props) => (props.$isMobile ? "20px 0" : "0")}; | ||
`; | ||
|
||
// 테두리에 Gradient가 안돼서 박스 두개를 겹쳐서 테두리 Gradient를 만들었습니다. | ||
export const ContentBoxBorder = styled.div<{ $isMobile: boolean }>` | ||
position: ${(props) => (props.$isMobile ? "relative" : "absolute")}; | ||
top: 0; | ||
width: ${(props) => (props.$isMobile ? "90%" : "700px")}; | ||
height: ${(props) => (props.$isMobile ? "auto" : "500px")}; | ||
|
||
background: linear-gradient( | ||
90deg, | ||
var(--FarmSystem_Orange) 0%, | ||
var(--FarmSystem_Green02) 100% | ||
); | ||
padding: 5px; | ||
border-radius: 20px; | ||
|
||
display: flex; | ||
justify-content: center; | ||
align-items: center; | ||
z-index: 10; | ||
margin: 0 auto; | ||
`; | ||
|
||
export const Content = styled.div` | ||
width: 100%; | ||
height: 100%; | ||
|
||
background-color: var(--FarmSystem_White); | ||
border-radius: 15px; | ||
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1); | ||
|
||
display: flex; | ||
flex-direction: column; | ||
justify-content: center; | ||
align-items: center; | ||
`; | ||
|
||
export const ContentInfoTextBox = styled.div<{ $isMobile: boolean }>` | ||
width: ${(props) => (props.$isMobile ? "90%" : "600px")}; | ||
height: ${(props) => (props.$isMobile ? "auto" : "210px")}; | ||
|
||
color: var(--FarmSystem_Black); | ||
font-style: normal; | ||
font-weight: 500; | ||
font-size: ${(props) => (props.$isMobile ? "20px" : "24px")}; | ||
line-height: ${(props) => (props.$isMobile ? "30px" : "35px")}; | ||
|
||
display: flex; | ||
flex-direction: column; | ||
align-items: center; | ||
text-align: center; | ||
|
||
margin-bottom: 35px; | ||
padding-top: ${(props) => (props.$isMobile ? "20px" : "0")}; | ||
padding-bottom: ${(props) => (props.$isMobile ? "20px" : "0")}; | ||
`; | ||
|
||
export const HighlightOrange = styled.span` | ||
font-weight: 700; | ||
color: var(--FarmSystem_Orange); | ||
`; | ||
|
||
export const ActivityTitle = styled.h3<{ $isMobile: boolean }>` | ||
width: ${(props) => (props.$isMobile ? "auto" : "149px")}; | ||
height: ${(props) => (props.$isMobile ? "auto" : "38px")}; | ||
|
||
font-weight: 700; | ||
font-size: ${(props) => (props.$isMobile ? "22px" : "24px")}; | ||
line-height: ${(props) => (props.$isMobile ? "30px" : "35px")}; | ||
color: var(--FarmSystem_Green01); | ||
|
||
display: flex; | ||
align-items: center; | ||
justify-content: center; | ||
text-align: center; | ||
|
||
margin-bottom: ${(props) => (props.$isMobile ? "7px" : "17px")}; | ||
`; | ||
|
||
export const ActivityList = styled.ul<{ $isMobile: boolean }>` | ||
width: ${(props) => (props.$isMobile ? "90%" : "577px")}; | ||
height: ${(props) => (props.$isMobile ? "auto" : "80px")}; | ||
|
||
display: flex; | ||
flex-direction: row; | ||
flex-wrap: wrap; | ||
align-items: flex-end; | ||
align-content: flex-start; | ||
|
||
gap: ${(props) => (props.$isMobile ? "1px 10px" : "10px 20px")}; | ||
list-style-type: disc; | ||
justify-content: ${(props) => (props.$isMobile ? "center" : "initial")}; | ||
`; | ||
|
||
export const Li = styled.li<{ | ||
$isMobile: boolean; | ||
$isTiny?: boolean; | ||
}>` | ||
height: 35px; | ||
|
||
font-style: normal; | ||
font-weight: 500; | ||
font-size: ${(props) => | ||
props.$isMobile | ||
? props.$isTiny | ||
? "18px" | ||
: "20px" | ||
: "24px"}; | ||
line-height: ${(props) => (props.$isMobile ? "30px" : "35px")}; | ||
color: var(--FarmSystem_Black); | ||
|
||
list-style-type: ${(props) => | ||
props.$isMobile && props.$isTiny ? "none" : "disc"}; | ||
list-style-position: ${(props) => | ||
props.$isMobile && props.$isTiny ? "none" : "outside"}; | ||
margin-left: ${(props) => | ||
props.$isMobile | ||
? props.$isTiny | ||
? "0px" | ||
: "20px" | ||
: "40px"}; | ||
text-align: center; | ||
`; | ||
|
||
export const GradientContainer = styled.div<{ $isMobile: boolean }>` | ||
position: absolute; | ||
top: 0; | ||
height: 500px; | ||
// 배경 Gradient를 모바일에서도 보이게 하려면 이 부분 고쳐주시면 됩니다! | ||
display: ${(props) => (props.$isMobile ? "none" : "flex")}; | ||
gap: 80px; | ||
justify-content: center; | ||
align-items: center; | ||
`; | ||
|
||
export const GradientLeft = styled.div<{ $isMobile: boolean }>` | ||
width: ${(props) => (props.$isMobile ? "300px" : "560px")}; | ||
height: ${(props) => (props.$isMobile ? "250px" : "400px")}; | ||
|
||
background: linear-gradient( | ||
270deg, | ||
var(--FarmSystem_Orange) 50%, | ||
var(--FarmSystem_White) 100% | ||
); | ||
opacity: 0.5; | ||
border-radius: 20px; | ||
`; | ||
|
||
export const GradientRight = styled.div<{ $isMobile: boolean }>` | ||
width: ${(props) => (props.$isMobile ? "300px" : "560px")}; | ||
height: ${(props) => (props.$isMobile ? "250px" : "400px")}; | ||
|
||
background: linear-gradient( | ||
90deg, | ||
var(--FarmSystem_Green02) 50%, | ||
var(--FarmSystem_White) 100% | ||
); | ||
opacity: 0.5; | ||
border-radius: 20px; | ||
`; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
import * as S from "./ContentBox.styled"; | ||
import useMediaQueries from "@/hooks/useMediaQueries"; | ||
|
||
export default function ContentBox() { | ||
const { isTiny, isMobile } = useMediaQueries(); | ||
|
||
return ( | ||
<S.Container $isMobile={isMobile}> | ||
<S.GradientContainer $isMobile={isMobile}> | ||
<S.GradientLeft $isMobile={isMobile} /> | ||
<S.GradientRight $isMobile={isMobile} /> | ||
</S.GradientContainer> | ||
<S.ContentBoxBorder $isMobile={isMobile}> | ||
<S.Content> | ||
<S.ContentInfoTextBox $isMobile={isMobile}> | ||
<p> | ||
<S.HighlightOrange>Union</S.HighlightOrange>은 | ||
</p> | ||
<p>SW/AI 기초 역량을 다지기 위한 과정으로,</p> | ||
<p>트랙 구분 없이 다섯 가지 트랙의 다양한 주제에 대한</p> | ||
<p>SW 기본 역량을 다집니다.</p> | ||
<p>각 트랙의 멘토가 제공하는 프로젝트와 스터디에</p> | ||
<p>멘티로서 참여하게 됩니다.</p> | ||
</S.ContentInfoTextBox> | ||
<S.ActivityTitle $isMobile={isMobile}> | ||
한 학기 활동 | ||
</S.ActivityTitle> | ||
<S.ActivityList $isMobile={isMobile}> | ||
<S.Li $isMobile={isMobile} $isTiny={isTiny}> | ||
월별 기술 블로그 | ||
</S.Li> | ||
<S.Li $isMobile={isMobile} $isTiny={isTiny}> | ||
Farm System 아이디어톤 참가 | ||
</S.Li> | ||
<S.Li $isMobile={isMobile} $isTiny={isTiny}> | ||
스터디 정기 모임 | ||
</S.Li> | ||
<S.Li $isMobile={isMobile} $isTiny={isTiny}> | ||
트랙 멘토-멘티 프로그램 | ||
</S.Li> | ||
</S.ActivityList> | ||
</S.Content> | ||
</S.ContentBoxBorder> | ||
</S.Container> | ||
); | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.