Skip to content

Commit

Permalink
Merge pull request #153 from YIMSEBIN/Weekly
Browse files Browse the repository at this point in the history
Fix: ๊ทผ๋กœ์ž ๋งˆ์ดํŽ˜์ด์ง€ ๋ฒ„ํŠผ ๋น„ํ™œ์„ฑํ™” ๋ฐ ํด๋”๊ตฌ์กฐ ์ •๋ฆฌ
  • Loading branch information
YIMSEBIN authored Nov 14, 2024
2 parents fc9ba3e + 4c29df5 commit 2626f87
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 22 deletions.
14 changes: 7 additions & 7 deletions src/assets/translator/EmployeeMyPage/employeeMyPageData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ export const employeeMyPageData = {
REGISTER_RESUME: '์ด๋ ฅ์„œ ๋“ฑ๋ก',
REGISTER_SIGN: '์‚ฌ์ธ ๋“ฑ๋ก',
REGISTER_VISA: '์™ธ๊ตญ์ธ ๋ฒˆํ˜ธ ๋ฐ ๋น„์ž ๋“ฑ๋ก',
UPDATE_RESUME: '์ด๋ ฅ์„œ ์ˆ˜์ •',
UPDATE_SIGN: '์‚ฌ์ธ ์ˆ˜์ •',
UPDATE_VISA: '์™ธ๊ตญ์ธ ๋ฒˆํ˜ธ ๋ฐ ๋น„์ž ์ˆ˜์ •',
COMPLETE_RESUME: '์ด๋ ฅ์„œ ๋“ฑ๋ก ์™„๋ฃŒ',
COMPLETE_SIGN: '์‚ฌ์ธ ๋“ฑ๋ก ์™„๋ฃŒ',
COMPLETE_VISA: '์™ธ๊ตญ์ธ ๋ฒˆํ˜ธ ๋ฐ ๋น„์ž ๋“ฑ๋ก ์™„๋ฃŒ',
MYRECRUITLIST: '๋‚ด๊ฐ€ ์ง€์›ํ•œ ๊ณต๊ณ ',
},
[Languages.VE]: {
REGISTER_RESUME: 'ฤฤƒng kรฝ hแป“ sฦก',
REGISTER_SIGN: 'ฤฤƒng kรฝ chแปฏ kรฝ',
REGISTER_VISA: 'ฤฤƒng kรฝ sแป‘ ngฦฐแปi nฦฐแป›c ngoร i vร  visa',
UPDATE_RESUME: 'Cแบญp nhแบญt hแป“ sฦก',
UPDATE_SIGN: 'Cแบญp nhแบญt chแปฏ kรฝ',
UPDATE_VISA: 'Cแบญp nhแบญt sแป‘ ngฦฐแปi nฦฐแป›c ngoร i vร  visa',
REGISTER_VISA: 'ฤฤƒng kรฝ sแป‘ nฦฐแป›c ngoร i vร  visa',
COMPLETE_RESUME: 'Hoร n thร nh ฤ‘ฤƒng kรฝ hแป“ sฦก',
COMPLETE_SIGN: 'Hoร n thร nh ฤ‘ฤƒng kรฝ chแปฏ kรฝ',
COMPLETE_VISA: 'Hoร n thร nh ฤ‘ฤƒng kรฝ sแป‘ nฦฐแป›c ngoร i vร  visa',
MYRECRUITLIST: 'Cรดng viแป‡c tรดi ฤ‘รฃ แปฉng tuyแปƒn',
},
};
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { Button, Icon, Typo } from '@/components/common';
import { useTranslation } from 'react-i18next';
import { useGetRequiredFieldCheck } from '@/apis/recruitmentsDetail/useRequiredFieldCheck';
import { type RequiredFieldCheckProps } from '@/pages/recruit/RecruitType';
import { css } from '@emotion/react';

export default function ButtonGroup() {
const { t } = useTranslation();
Expand All @@ -21,34 +22,40 @@ export default function ButtonGroup() {
return (
<ColumnSection>
<ActiveButton
design="outlined"
design={resumeExistence ? 'deactivate' : 'outlined'}
css={resumeExistence ? deactiveButtonStyle : activateButtonStyle}
style={{ borderRight: '3px solid #0a65cc' }}
onClick={() => {
navigate(ROUTE_PATH.RESUME);
}}
disabled={resumeExistence}
>
<Typo bold>{resumeExistence ? t('employeeMyPage.UPDATE_RESUME') : t('employeeMyPage.REGISTER_RESUME')}</Typo>
<Typo bold>{resumeExistence ? t('employeeMyPage.COMPLETE_RESUME') : t('employeeMyPage.REGISTER_RESUME')}</Typo>
{resumeExistence ? <Icon.EmployeePage.Check /> : <Icon.EmployeePage.Bag />}
</ActiveButton>
<ActiveButton
design="outlined"
design={signExistence ? 'deactivate' : 'outlined'}
css={signExistence ? deactiveButtonStyle : activateButtonStyle}
style={{ borderRight: '3px solid #0a65cc' }}
onClick={() => {
navigate(ROUTE_PATH.REGISTERSIGN);
}}
disabled={signExistence}
>
<Typo bold>{signExistence ? t('employeeMyPage.UPDATE_SIGN') : t('employeeMyPage.REGISTER_SIGN')}</Typo>
<Typo bold>{signExistence ? t('employeeMyPage.COMPLETE_SIGN') : t('employeeMyPage.REGISTER_SIGN')}</Typo>
{signExistence ? <Icon.EmployeePage.Check /> : <Icon.EmployeePage.Pen />}
</ActiveButton>
<ActiveButton
design="outlined"
design={visaExistence ? 'deactivate' : 'outlined'}
css={visaExistence ? deactiveButtonStyle : activateButtonStyle}
onClick={() => {
navigate(ROUTE_PATH.REGISTER_VISA);
}}
disabled={visaExistence}
>
<Typo bold>
{visaExistence && foreignerIdNumberExistence
? t('employeeMyPage.UPDATE_VISA')
? t('employeeMyPage.COMPLETE_VISA')
: t('employeeMyPage.REGISTER_VISA')}
</Typo>
{visaExistence && foreignerIdNumberExistence ? <Icon.EmployeePage.Check /> : <Icon.EmployeePage.Card />}
Expand All @@ -71,10 +78,15 @@ const ActiveButton = styled(Button)`
border-radius: 0;
border: 0;
color: #000;
`;

export const deactiveButtonStyle = css``;

export const activateButtonStyle = css`
${deactiveButtonStyle};
transition:
background-color 0.3s,
background-image 0.3s; // ๋ฐฐ๊ฒฝ ์ƒ‰์ƒ๊ณผ ์ด๋ฏธ์ง€ ์• ๋‹ˆ๋ฉ”์ด์…˜
background-image 0.3s;
&:hover {
* {
color: #fff;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,30 +36,30 @@ type Props = {
};

type DownloadContractProps = {
imageUrl: string;
imageUrlV: string;
url: string;
urlV: string;
};

export default function MyRecruitCard({ myRecruit }: Props) {
const { image, title, area, status, applyId } = myRecruit;
const buttonStyle = getStateStyle(status);
const navigate = useNavigate();
const { data: imgURLs } = useGetContractImg(applyId);

// ๊ทผ๋กœ๊ณ„์•ฝ์„œ ์ด๋ฏธ์ง€ ๋‹ค์šด๋กœ๋“œ
const downloadContract = () => {
const { data: imgURLs } = useGetContractImg(applyId);
const imgData: DownloadContractProps = imgURLs;
const link = document.createElement('a');
link.href = imgData.imageUrlV;
link.href = imgData.urlV;
link.download = 'downloaded_image';
console.log(imgData);
document.body.appendChild(link);
link.click();
document.body.removeChild(link);
};

return (
<Card
borderColor="blue"
borderRadius="4px"
css={{
width: '100%',
Expand All @@ -69,6 +69,7 @@ export default function MyRecruitCard({ myRecruit }: Props) {
display: 'flex',
justifyContent: 'space-between',
alignItems: 'center',
border: '1px solid #0A65CC',
}}
>
<Image
Expand Down
4 changes: 2 additions & 2 deletions src/pages/myPage/employee/EmployeeMyPage.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Flex, InnerContainer, Spinner, Typo } from '@/components/common';
import Layout from '@/features/layout';
import styled from '@emotion/styled';
import MyRecruitList from '../../../features/employee/myPage/MyRecruitList';
import MyRecruitList from '../../../features/myPage/employee/components/MyRecruitList';
import { useGetMyApplication } from '@/apis/employee/hooks/useGetMyApplication';
import { useTranslation } from 'react-i18next';
import ProfileSection from '@/features/employee/myPage/ProfileSection';
import ProfileSection from '@/features/myPage/employee/components/ProfileSection';
import { css } from '@emotion/react';
export default function EmployeeMyPage() {
const { t } = useTranslation();
Expand Down

0 comments on commit 2626f87

Please sign in to comment.