-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #38 from bunju20/dev
✨Feat: Member 피드백 반영, 폰트, 색상, 반응형, favicon
- Loading branch information
Showing
18 changed files
with
225 additions
and
111 deletions.
There are no files selected for viewing
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| import { ReactNode } from 'react'; | ||
| import { motion } from 'framer-motion'; | ||
|
|
||
| interface AnimatedContainerProps { | ||
| children: ReactNode; | ||
| initialY?: number; // 초기 Y 위치는 선택적으로 설정할 수 있음 | ||
| } | ||
|
|
||
| const AnimatedBanner: React.FC<AnimatedContainerProps> = ({ | ||
| children, | ||
| initialY = 0, // 기본값으로 0을 사용하여 Y 변화 없음을 기본 설정 | ||
| }) => { | ||
| return ( | ||
| <motion.div | ||
| className="w-full flex justify-center mt-[5rem] mb-[5rem]" | ||
| initial={{ y: initialY, opacity: 0 }} | ||
| whileInView={{ y: 0, opacity: 1 }} | ||
| transition={{ duration: 1 }} | ||
| viewport={{ once: true, amount: 0.2 }} | ||
| > | ||
| {children} | ||
| </motion.div> | ||
| ); | ||
| }; | ||
|
|
||
| export default AnimatedBanner; |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,43 +1,47 @@ | ||
| import Image from 'next/image'; | ||
| import { LEAD } from '@/constants/member/lead'; | ||
| import React from 'react'; | ||
|
|
||
| const LeadIntro = () => { | ||
| return ( | ||
| <div> | ||
|
|
||
| <div className="w-70rem flex justify-center mt-20 mb-20"> | ||
| <div className="flex"> | ||
| return ( | ||
| <div> | ||
| <Image | ||
| src="/images/members/lead.png" | ||
| alt="lead" | ||
| width={352} | ||
| height={200} | ||
| priority | ||
|
|
||
| /> | ||
| </div> | ||
| <div className="flex justify-start mt-20 mb-20"> | ||
| <div className="flex flex-col bigTablet:flex-row w-full "> | ||
| <div className="bigTablet:w-[22rem] w-full "> | ||
| <div | ||
| style={{ position: 'relative', width: '100%', height: '200px' }} | ||
| > | ||
| <Image | ||
| src="/images/members/lead.png" | ||
| alt="DGU GDSC Lead 사진" | ||
| layout="fill" // 부모 컨테이너를 채움 | ||
| objectFit="cover" // 너비는 반응형으로 조절되고, 높이는 고정되며 이미지가 컨테이너에 맞춰 잘릴 수 있음 | ||
| priority | ||
| className="rounded-[0.25rem]" | ||
| /> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div className="flex flex-col justify-center ml-[2rem]"> | ||
| <div className="text-4xl mb-[1.25rem]">Lead</div> | ||
| <div className='flex'> | ||
| <div className="text-3xl mr-[0.5rem]">서희찬</div> | ||
| <div className="text-2xl mb-[1.25rem]">컴퓨터공학과</div> | ||
| </div> | ||
| <div className="flex items-center text-lg"> | ||
| <div className="w-1 h-12 bg-white mr-2.5"></div> | ||
| <div> | ||
| 안녕하세요! GDSC DGU Lead 서희찬입니다. | ||
| <br/> | ||
| GDSC DGU는 많은 학우분들과 함께 성장하고 싶습니다. | ||
| 많은 관심 부탁드립니다! 감사합니다. | ||
| <div className="flex flex-col justify-center ml-[0rem] mt-[1.75rem] bigTablet:ml-[2rem] bigTablet:mt-[0rem]"> | ||
| <div className="H4 mb-[1.25rem]">Lead</div> | ||
| <div className="flex flex"> | ||
| <div className="H6 mr-[0.5rem]">{LEAD.name}</div> | ||
| <div className="B1 mb-[1.25rem]">{LEAD.department}</div> | ||
| </div> | ||
| <div className="B2 flex items-center"> | ||
| <div className="w-1 h-full bg-white mr-2.5"></div> | ||
| {LEAD.description.split('\n').map((line, index) => ( | ||
| <React.Fragment key={index}> | ||
| {line} | ||
| <br /> | ||
| </React.Fragment> | ||
| ))} | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| </div> | ||
| ); | ||
| ); | ||
| }; | ||
|
|
||
| export default LeadIntro; | ||
| export default LeadIntro; |
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.