-
Notifications
You must be signed in to change notification settings - Fork 3
feat: 인트로, 헤더 레이아웃 1.5차 완성 #16
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 6 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
308c6ec
feat: Style 업데이트
dongmin0204 4b1ca1e
feature: 커밋 추가
dongmin0204 cacc6df
feat: intro 폰트 수정
dongmin0204 959b069
feat: 팝업추가, 이미지변경
dongmin0204 8656438
fix: 패키지 수정!(develop일치)
dongmin0204 084a375
feat: 그림자 추가, bold체 변경
dongmin0204 3e8cdef
feat: 임시저장
dongmin0204 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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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,84 @@ | ||
| import styled from "styled-components"; | ||
|
|
||
| // Styled Components 정의 | ||
| export const HeaderContainer = styled.header` | ||
| display: flex; | ||
| flex-grow: 1; | ||
| flex-align: flex-end; | ||
| align-items: center; | ||
| background-color: var(--FarmSystem_White); | ||
| padding: 0.5rem 1rem; | ||
| width: auto; | ||
| height: 70px; | ||
| font-style: normal; | ||
| padding-bottom: 0px; | ||
| border-bottom: 4px solid var(--FarmSystem_White); | ||
| `; | ||
|
|
||
| export const Nav = styled.nav` | ||
| padding-top: 40px; | ||
| width: 600px; | ||
| flex-grow: 1; | ||
| text-align: center; | ||
| display: flex; | ||
| justify-content: center; | ||
| padding-right: 420px; | ||
| padding-bottom: 0px; | ||
| `; | ||
|
|
||
| export const NavList = styled.ul` | ||
| list-style: none; | ||
| display: flex; | ||
| flex: 1 1 auto; | ||
| justify-content: center; | ||
|
|
||
| padding: 0; | ||
| margin: 0; | ||
| margin-left: 100px; | ||
|
|
||
|
|
||
| li { | ||
| color: var(--FarmSystem_Green04); | ||
| width: 120px; | ||
| font-weight: 400; | ||
| font-size: 16px; | ||
| &:hover { | ||
| color: var(--FarmSystem_Green01); | ||
| border-bottom: 2px solid var(--FarmSystem_Green01); | ||
| } | ||
| border-bottom: 2px solid var(--FarmSystem_Green04); | ||
| } | ||
| `; | ||
|
|
||
| export const Button = styled.button` | ||
| width: 120px; | ||
| height: 40px; | ||
|
|
||
| margin-right: 0px; | ||
| margin-top: 5px; | ||
|
|
||
| box-shadow: 0px 2px 10px 0px #19191933; | ||
|
|
||
| font-style: normal; | ||
| font-weight: 400; | ||
| font-size: 16px; | ||
|
|
||
| text-align: center; | ||
| border-radius: 10px; | ||
| background-color: var(--FarmSystem_Green01); | ||
| color: var(--FarmSystem_White); | ||
| &:hover { | ||
| background-color: #1f5a2f; | ||
| } | ||
| `; | ||
|
|
||
| export const TextBlock = styled.div` | ||
| font-size: 20px; | ||
| font-weight: 700; | ||
| color: #28723f; | ||
| text-align: center; | ||
|
|
||
| margin-top: 5px; | ||
| margin-left: 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,24 @@ | ||
| import * as S from './Header.styled.tsx'; | ||
|
|
||
|
|
||
| export default function Header() { | ||
| return ( | ||
| <S.HeaderContainer> | ||
| <S.TextBlock> | ||
| Farm System | ||
| </S.TextBlock> | ||
| <S.Nav> | ||
| <S.NavList> | ||
| <li><a href="#home">홈</a></li> | ||
| <li><a href="#about">블로그 / 프로젝트</a></li> | ||
| <li><a href="#tracks">소식</a></li> | ||
| <li><a href="#contact">FAQ</a></li> | ||
| <li><a href="#contact">지원하기</a></li> | ||
| </S.NavList> | ||
| </S.Nav> | ||
| <S.Button> | ||
| 파밍로그 | ||
| </S.Button> | ||
| </S.HeaderContainer> | ||
| ); | ||
| } | ||
This file was deleted.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| export { default } from "./Header/Heder"; | ||
| export { default } from "./Header/Header"; |
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,125 @@ | ||
| import styled from 'styled-components'; | ||
|
|
||
| export const Container = styled.div` | ||
| display: flex; | ||
| flex-direction: column; | ||
| align-items: flex-start; | ||
| justify-content: center; | ||
| height: 110vh; | ||
| background: linear-gradient(90deg, #28723F, #A2E9B8); | ||
| padding: 50px; | ||
| color: white; | ||
| `; | ||
|
|
||
| export const Logo = styled.div` | ||
| display: flex; | ||
| align-items: center; | ||
| font-size: 64px; | ||
| font-weight: 800; | ||
|
|
||
| margin-bottom: 20px; | ||
| margin-left: 50px; | ||
| `; | ||
|
|
||
| export const Description = styled.p` | ||
| font-size: 24px; | ||
| line-height: 1.5; | ||
| max-width: 600px; | ||
|
|
||
|
|
||
| margin-bottom: 20px; | ||
| margin-left: 50px; | ||
| `; | ||
|
|
||
| export const TrackList = styled.p` | ||
| a { | ||
| font-weight: 600; | ||
| } | ||
| font-size: 24px; | ||
| line-height: 1.5; | ||
|
|
||
| margin-top: 20px; | ||
| margin-bottom: 20px; | ||
| margin-left: 50px; | ||
|
|
||
| `; | ||
|
|
||
| export const Apply = styled.div` | ||
| display: flex; | ||
| align-items: center; | ||
| justify-content: space-between; | ||
|
|
||
| margin-left: 50px; | ||
| `; | ||
|
|
||
| export const ApplyButton = styled.button` | ||
| background-color: #4CAF50; | ||
| color: white; | ||
| border: none; | ||
| padding: 15px 80px; | ||
| border-radius: 10px; | ||
| font-size: 24px; | ||
| margin-top: 20px; | ||
|
|
||
| box-shadow: 0px 4px 10px rgba(0, 0, 0, 0.2); | ||
|
|
||
| &:hover { | ||
| background-color: #388E3C; | ||
| } | ||
| `; | ||
|
|
||
| export const ApplyDescription = styled.div` | ||
| font-size: 16px; | ||
| margin-left: 20px; | ||
| margin-top: 15px; | ||
| color: #E8F5E9; | ||
| `; | ||
|
|
||
| export const Bud = styled.div` | ||
| margin-left: 100px; | ||
| font-size: 64px; | ||
| top: 116px; | ||
| margin-left: 50px; | ||
| `; | ||
|
|
||
|
|
||
| /* 팝업 -> 수빈님 것과 통일 */ | ||
| export const PopupOverlay = styled.div` | ||
| position: fixed; | ||
| inset: 0; | ||
| background: rgba(113, 113, 113, 0.3); | ||
| display: flex; | ||
| align-items: center; | ||
| justify-content: center; | ||
| `; | ||
|
|
||
| export const PopupBox = styled.div` | ||
| width: 500px; | ||
| background-color: #fcfcfc; | ||
| border: 3px solid #28723f; | ||
| border-radius: 15px; | ||
| text-align: center; | ||
| padding: 40px; | ||
| `; | ||
|
|
||
| export const PopupText = styled.p` | ||
| font-size: 20px; | ||
| color: black; | ||
| margin-bottom: 20px; | ||
| `; | ||
|
|
||
| export const PopupCloseButton = styled.button` | ||
| background-color: #28723f; | ||
| color: #fcfcfc; | ||
| font-size: 16px; | ||
| padding: 10px 20px; | ||
| border: none; | ||
| border-radius: 10px; | ||
| cursor: pointer; | ||
| box-shadow: 0px 2px 10px rgba(25, 25, 25, 0.2); | ||
| width: 100px; | ||
| margin-top: 20px; | ||
| &:hover { | ||
| background-color: #1f5b30; | ||
| } | ||
| `; |
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 |
|---|---|---|
| @@ -1,7 +1,44 @@ | ||
| export default function Intro() { | ||
| import * as S from './Intro.styled.tsx'; | ||
| import logo from '../../../assets/FarmLogo.png'; | ||
| import { useState } from 'react'; | ||
|
|
||
| const Intro = () => { | ||
| const [isPopupOpen, setPopupOpen] = useState(false); | ||
| return ( | ||
| <div> | ||
| <h2>Intro Section</h2> | ||
| </div> | ||
| <S.Container> | ||
| <S.Bud>🌱</S.Bud> | ||
| <S.Description> | ||
| 미래를 준비하고 성장하는 여정, <br /> | ||
| Farm System에서 함께하세요. | ||
| </S.Description> | ||
| <S.Logo> | ||
| <img src = {logo} alt = "" /> | ||
| Farm System | ||
| </S.Logo> | ||
|
|
||
| <S.TrackList> | ||
| SW/AI 분야에 관심있는 학생들로 구성된 <a>자율 학습 동아리</a>로, <br/> | ||
| <a>Union · 게임/영상 · 보안/웹 · 사물인터넷/로봇 · 인공지능 · 빅데이터</a>의 <br/> | ||
| 5가지 신기술 트랙을 제공하여 학습 경험을 통해 SW/AI 역량을 배양합니다. | ||
| </S.TrackList> | ||
| <S.Apply> | ||
| <S.ApplyButton onClick={() => setPopupOpen(true)}> 지원하기 </S.ApplyButton> | ||
| <S.ApplyDescription>2025년 2월 공개 모집 예정</S.ApplyDescription> | ||
| </S.Apply> | ||
|
|
||
|
|
||
| {/* 팝업 수빈님 것과 통일 */} | ||
| {isPopupOpen && ( | ||
| <S.PopupOverlay onClick={() => setPopupOpen(false)}> | ||
| <S.PopupBox onClick={(e) => e.stopPropagation()}> | ||
| <S.PopupText>지금은 모집 기간이 아닙니다.</S.PopupText> | ||
| <S.PopupText>공개 모집 예정: 2025년 2월</S.PopupText> | ||
| <S.PopupCloseButton onClick={() => setPopupOpen(false)}>확인</S.PopupCloseButton> | ||
| </S.PopupBox> | ||
| </S.PopupOverlay> | ||
| )} | ||
| </S.Container> | ||
| ); | ||
| } | ||
| }; | ||
|
|
||
| export default Intro; |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
헤더 라우팅이 잘못된 것 같습니다...
저희 헤더가 두개가 있는데 디자인 해주신건 최상단 헤더같은데 초기 세팅해주신 헤더는 두번째 헤더(목차)인것 같습니다.
이부분 고쳐주시면 머지해도 될 것 같습니다!!
추후 수빈님 PR까지 머지하면 팝업을 공통 컴포넌트로 분리하는 방안도 좋아보입니다!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
네 지금 일정으로 인해 밖이라, 오늘 밤까지 해결하겠습니다! 감사합니다:)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
네 지금 일정으로 인해 밖이라, 오늘 밤까지 해결하겠습니다! 감사합니다:)