Skip to content

Commit

Permalink
feat: 모집알림 기능 추가
Browse files Browse the repository at this point in the history
  • Loading branch information
minzziPark committed Aug 3, 2024
1 parent d96298b commit 1ffb9bd
Show file tree
Hide file tree
Showing 6 changed files with 152 additions and 155 deletions.
206 changes: 101 additions & 105 deletions .firebase/hosting.YnVpbGQ.cache

Large diffs are not rendered by default.

26 changes: 1 addition & 25 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 20 additions & 4 deletions src/components/Mobile/Components/RecruitmentStatusButtonMob.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,29 @@
import styled from "styled-components";
import { pardDATA } from "../../../utils/data.constant";
import {
APPLY_FORM_URL,
EARLY_FORM_URL,
pardDATA,
} from "../../../utils/data.constant";

export const RecruitmentStatusButtonMob = ({ theme, backgroundColor }) => {
const content = pardDATA.isRecruiting
const content = pardDATA.recruitingReady
? `${pardDATA.currentGeneration}기 모집이 곧 시작됩니다`
: pardDATA.isRecruiting
? `지금 바로 ${pardDATA.currentGeneration}기 지원하기`
: `${pardDATA.currentGeneration}기 모집이 완료되었습니다`;

return pardDATA.isRecruiting ? (
<EnrollmentOpenButton theme={theme} backgroundColor={backgroundColor}>
const handleClick = () => {
pardDATA.recruitingReady
? window.open(EARLY_FORM_URL, "_blank")
: window.open(APPLY_FORM_URL, "_blank");
};

return pardDATA.isRecruiting || pardDATA.recruitingReady ? (
<EnrollmentOpenButton
theme={theme}
backgroundColor={backgroundColor}
onClick={handleClick}
>
{content}
</EnrollmentOpenButton>
) : (
Expand Down
24 changes: 20 additions & 4 deletions src/components/Web/Components/RecruitmentStatusButtonWeb.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,29 @@
import styled from "styled-components";
import { pardDATA } from "../../../utils/data.constant";
import {
APPLY_FORM_URL,
EARLY_FORM_URL,
pardDATA,
} from "../../../utils/data.constant";

export const RecruitmentStatusButtonWeb = ({ theme, backgroundColor }) => {
const content = pardDATA.isRecruiting
const content = pardDATA.recruitingReady
? `${pardDATA.currentGeneration}기 모집이 곧 시작됩니다`
: pardDATA.isRecruiting
? `지금 바로 ${pardDATA.currentGeneration}기 지원하기`
: `${pardDATA.currentGeneration}기 모집이 완료되었습니다`;

return pardDATA.isRecruiting ? (
<EnrollmentOpenButton theme={theme} backgroundColor={backgroundColor}>
const handleClick = () => {
pardDATA.recruitingReady
? window.open(EARLY_FORM_URL, "_blank")
: window.open(APPLY_FORM_URL, "_blank");
};

return pardDATA.isRecruiting || pardDATA.recruitingReady ? (
<EnrollmentOpenButton
theme={theme}
backgroundColor={backgroundColor}
onClick={handleClick}
>
{content}
</EnrollmentOpenButton>
) : (
Expand Down
21 changes: 4 additions & 17 deletions src/components/Web/Web-HomePage/HomeFirst.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ const HomeFirst = () => {
document.documentElement.style.overflowX = "hidden";
return (
<>
<DIVVVV>
<Container>
<VideoContainer isColor={backcolor} isFixed={isFixed}>
{isSafari ? (
<VideoBackgroundImg
Expand Down Expand Up @@ -243,7 +243,7 @@ const HomeFirst = () => {
</>
)}
</VideoContainer>
</DIVVVV>
</Container>
</>
);
};
Expand All @@ -262,7 +262,7 @@ const VideoContainer = styled.div`
`;

//inline-block으로 stickybox를 위로 올리는 역할을한다.
const DIVVVV = styled.div`
const Container = styled.div`
display: inline-block;
height: 11000px;
width: 100%;
Expand Down Expand Up @@ -407,7 +407,6 @@ const Textchanged1 = styled.p`
font-weight: 800;
font-size: 60px;
line-height: 140%;
/* identical to box height, or 84px */
text-align: center;
color: #ffffff;
Expand Down Expand Up @@ -463,16 +462,6 @@ const LogoDiv = styled.div`
z-index: 0;
`;

const moveUp = keyframes`
from {
transform: translateY(50%); // adjust this value to control the distance of movement
opacity: 0;
}
to {
transform: translateY(0);
opacity: 1;
}
`; // Y if FORWA가 올라가는 위치 조정, opacity로 보이는 거 조절
const MovedText = styled.div`
display: flex;
width: 1000px;
Expand All @@ -489,9 +478,7 @@ const MovedText = styled.div`
`}//2초만에 나타나서 고정이 된다
// forwards
`};
//추가되어 애니메이션이 시작되기 전에 첫 번째 keyframe의 스타일이 적용되고, 애니메이션이 끝나면 마지막 keyframe의 스타일이 유지됩니다.
// forwards 0.5s는 added 0.5s delay
// 위에 태그들 즉 Text1,Text2 가 끝나고 0.5s뒤에 실행
font-family: "NanumSquare Neo";
font-style: normal;
z-index: 4;
Expand Down
6 changes: 6 additions & 0 deletions src/utils/data.constant.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@ export const pardDATA = {
currentGeneration: 4,
displayBanner: false,
isRecruiting: false,
recruitingReady: true,
};

// 사전 알림 구글 폼 URL
export const EARLY_FORM_URL = "https://open.kakao.com/o/gHDyOT5f";
// 신청 구글 폼 URL
export const APPLY_FORM_URL = "";

export const PROJECT_GRID = 9;

0 comments on commit 1ffb9bd

Please sign in to comment.