Skip to content

[26기] 사전알림 구글 폼 연결 #186

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.

Sign up for GitHub

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
ppinppini merged 2 commits into from
Apr 20, 2025
Merged

[26기] 사전알림 구글 폼 연결 #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
66964cf
feat:사전 모집 폼 링크 연결
ppinppini Apr 20, 2025
f509f77
fix: 지원마감 버튼 -> 애니메이션 버튼으로 변경
ppinppini Apr 20, 2025
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
3 changes: 2 additions & 1 deletion components/common/AnimatedButton/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ function AnimatedButton({
</svg> */}
<span className="textgroup">
<span className="mainText">{buttonText}</span>
<span className="cloneText">{buttonText}</span>
<span className="cloneText">{`모집 알림 신청`}</span>
</span>
</ButtonStyled>
);
Expand All @@ -59,6 +59,7 @@ const ButtonStyled = styled(Button)<{ variant?: AnimatedButtonVariant }>`
}

.cloneText {
width: 100%;
position: absolute;
top: 0;
left: 0;
Expand Down
3 changes: 2 additions & 1 deletion components/home/AnimatedTextSection/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { SectionTemplate } from 'components/home';
import Path from 'constants/path';
import {
IS_RECRUITING,
NEXT_GENERATION_RECRUIT_LINK,
RECRUIT_BANNER,
RECRUIT_BANNER_ACTIVE,
} from 'database/recruit';
Expand Down Expand Up @@ -41,7 +42,7 @@ function AnimatedTextSection(): ReactElement {
buttonText={buttonName}
onClick={() => {
if (!IS_RECRUITING) {
// window.open(NEXT_GENERATION_RECRUIT_LINK, '_blank');
window.location.href = NEXT_GENERATION_RECRUIT_LINK;
return;
}

Expand Down
43 changes: 33 additions & 10 deletions components/recruit/RecruitBanner/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { AnimatedButton, Button } from 'components/common';
import Breakpoints from 'constants/breakpoints';
import Path from 'constants/path';
import Yapp from 'constants/yapp';
import {
IS_RECRUITING,
Expand All @@ -8,12 +9,15 @@ import {
RECRUIT_BANNER_ACTIVE,
} from 'database/recruit';
import DOMPurify from 'isomorphic-dompurify';
import { useRouter } from 'next/router';
import styled from 'styled-components';
import media from 'styles/media';

function RecruitBanner() {
const BannerInfo = IS_RECRUITING ? RECRUIT_BANNER_ACTIVE : RECRUIT_BANNER;
const { title, description } = BannerInfo;
const { title, description, buttonName } = BannerInfo;
const buttonParams = IS_RECRUITING ? { width: 168 } : { width: 190 };
const router = useRouter();

return (
<RecruitBannerContainer>
Expand All @@ -31,15 +35,34 @@ function RecruitBanner() {
}
rel="noreferrer"
>
<ApplyButton
width={220}
height={65}
fontColor="white"
buttonColor="grey_850"
borderColor="lightGrey"
>
{IS_RECRUITING ? '모든 공고 보기' : '지원마감'}
</ApplyButton>
{IS_RECRUITING ? (
<ApplyButton
width={220}
height={65}
fontColor="white"
buttonColor="grey_850"
borderColor="lightGrey"
>
{'모든 공고 보기'}
</ApplyButton>
) : (
<AnimatedButton
height={65}
fontColor="white"
buttonColor="grey_850"
className="recruitButton"
buttonText={buttonName}
onClick={() => {
if (!IS_RECRUITING) {
window.location.href = NEXT_GENERATION_RECRUIT_LINK;
return;
}

router.push(Path.Recruit);
}}
{...buttonParams}
/>
)}
</ButtonBlock>
</BannerInner>
</RecruitBannerContainer>
Expand Down