-
Notifications
You must be signed in to change notification settings - Fork 4
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
✨Feat: Timeline 피드백 반영, Footer 제작, 폰트, 색상, 반응형 적용 #32
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
b08af9e
✨Feat: Footer 생성 #30
puretension f427e6d
🎨Design: 배경색 Indigo -> black으로 변경 및 레이아웃에 푸터 추가 #30
puretension 201637c
♻️ Refactor: 생성된 커스텀 폰트, 색상코드로 변경 #30
puretension 9683a2f
🔧 Chore: 2st -> 2nd 오타수정 #30
puretension 14ed4f8
✨Feat: 타임라인 페이지 반응형 적용 #30
puretension 4442f03
♻️ Refactor: 불필요 코드 제거 #30
puretension 5a3bbd2
✨Feat: Footer 반응형 적용 #30
puretension 8c4e76d
✨Feat: TimelineCard 반응형 적용 #30
puretension ce1705a
🔧 Chore: 테스트용 상수 텍스트수 늘림 #30
puretension 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
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 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
This file contains 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 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,50 @@ | ||
'use client'; | ||
import React from 'react'; | ||
import RightArrowIcon from 'public/svg/icons/common/right_arrow.svg'; | ||
|
||
/** | ||
* @description | ||
* 레이아웃 Footer | ||
* @component Footer | ||
* @returns {JSX.Element} Footer | ||
* @since 2024.04.26 | ||
*/ | ||
|
||
const Footer = () => { | ||
const handlePress = () => { | ||
console.log('Arrow clicked'); | ||
}; | ||
|
||
return ( | ||
<footer className="w-full py-10 bg-mono_900 flex desktop:pl-80 tablet:pl-20 pl-10"> | ||
<div className="flex justify-start items-start w-full gap-10"> | ||
<div> | ||
<h1 className="F1">About Us</h1> | ||
<p className="F2">Final Update 2023.10.02</p> | ||
<div className="flex items-center"> | ||
<p className="F2">제작자 소개</p> | ||
<button onClick={handlePress} className="ml-2 mt-[-2px]"> | ||
<RightArrowIcon /> | ||
</button> | ||
</div> | ||
<div className="mt-4"> | ||
<p className="F3">Copyright © GDSC DGU</p> | ||
</div> | ||
</div> | ||
<div> | ||
<h1 className="F1">Contact</h1> | ||
<div className="contact-item"> | ||
<p className="F2 label-width">이메일</p> | ||
<p className="F2">[email protected]</p> | ||
</div> | ||
<div className="contact-item"> | ||
<p className="F2 label-width">주소</p> | ||
<p className="F2">서울특별시 중구 필동로1길 30</p> | ||
</div> | ||
</div> | ||
</div> | ||
</footer> | ||
); | ||
}; | ||
|
||
export default Footer; |
This file contains 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,16 +1,14 @@ | ||
import React from 'react'; | ||
|
||
/* | ||
기수별 버튼 컴포넌트(1st, 2nd, 3rd) | ||
*/ | ||
import React from 'react'; | ||
|
||
const GenerationButton: React.FC<GenerationButtonProps> = ({ label, isActive, onClick }) => { | ||
const borderColor = isActive ? 'white' : '#536E7B'; | ||
const textColor = isActive ? 'white' : '#536E7B'; | ||
|
||
return ( | ||
<button | ||
className="w-10 h-8 bg-transparent border rounded-lg text-xs leading-4 px-2 py-1" | ||
style={{ borderWidth: '1.5px', borderColor, color: textColor }} | ||
className="border rounded-lg B2 px-3 py-0.5" | ||
style={{ borderWidth: '1px', borderColor: isActive ? 'white' : '#536E7B', color: isActive ? 'white' : '#536E7B' }} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 요거 grey 500이에요! 혹시 피그마에 수정이 안되었나요 ㅎㅎ 죄송해요....ㅎㅎ................... There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 반영하겠습니다~! |
||
onClick={() => onClick(label)} | ||
> | ||
{label} | ||
|
This file contains 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
This file contains 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
This file contains 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
This file contains 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
10 changes: 9 additions & 1 deletion
10
src/components/timeline/section/TimelineMonthlyCardSection.tsx
This file contains 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
This file contains 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
Oops, something went wrong.
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.
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.
좋습니다~!
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.
리드미 고고