Skip to content
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

Feat: 근로자 마이페이지 인삿말 설정 및 오류 수정 #114

Merged
merged 3 commits into from
Nov 7, 2024
Merged

Feat: 근로자 마이페이지 인삿말 설정 및 오류 수정 #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dcb20fc
feat: 근로자 마이페이지 인삿말 추가 및 입력 오류 수정
YIMSEBIN Nov 7, 2024
185c3c3
fix: 입력 오류 수정
YIMSEBIN Nov 7, 2024
97c5ef3
fix: 근로계약서 입력 오류 수정
YIMSEBIN Nov 7, 2024
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
2 changes: 2 additions & 0 deletions src/assets/translator/EmployeeMyPage/employeeMyPageData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ export const employeeMyPageData = {
REGISTER_SIGN: '사인 등록',
REGISTER_VISA: '외국인 번호 및 비자 발급 일자 등록',
MYRECRUITLIST: '내가 지원한 공고',
GREETING: '구직자님 안녕하세요!',
},
[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à ngày cấp visa',
MYRECRUITLIST: 'Công việc tôi đã ứng tuyển',
GREETING: 'Xin chào người tìm việc!',
},
};
9 changes: 3 additions & 6 deletions src/features/employee/myPage/EmployeeProfile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { Card, Image, Typo } from '@/components/common';
import styled from '@emotion/styled';
import { useTranslation } from 'react-i18next';

export default function EmployeeProfile({
profileImage = 'https://img.freepik.com/free-photo/user-profile-icon-front-side-with-white-background_187299-40010.jpg?t=st=1729752570~exp=1729756170~hmac=4313719023c412dd92883d97ce79956fadf541e11d8cc3a4ef05150f301f5e7f&w=740',
name = '홍길동',
description = '소개합니당',
}) {
const { t } = useTranslation();
return (
<Card
style={{
Expand All @@ -32,10 +32,7 @@ export default function EmployeeProfile({
/>
<TextSection>
<Typo bold color="white" size="20px">
{name}
</Typo>
<Typo color="white" size="16px">
{description}
{t('employeeMyPage.GREETING')}
</Typo>
</TextSection>
</ProfileSection>
Expand Down
28 changes: 25 additions & 3 deletions src/pages/contract/EmployerContract/EmployerContract.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ export default function EmployerContract() {
<InputContainer>
<Input
label={t('contract.WORKING_PLACE')}
name="workingPlace"
value={workingPlace}
onChange={onChange}
style={InputStyle}
Expand All @@ -78,6 +79,7 @@ export default function EmployerContract() {
<InputContainer>
<Input
label={t('contract.RESPONSIBILITIES')}
name="responsibilities"
value={responsibilities}
onChange={onChange}
style={InputStyle}
Expand All @@ -86,27 +88,47 @@ export default function EmployerContract() {
<InputContainer>
<Input
label={t('contract.WORKING_HOURS')}
name="workingHours"
value={workingHours}
onChange={onChange}
style={InputStyle}
></Input>
</InputContainer>
<InputContainer>
<Input label={t('contract.DAY_OFF')} value={dayOff} onChange={onChange} style={InputStyle}></Input>
<Input
label={t('contract.DAY_OFF')}
name="dayOff"
value={dayOff}
onChange={onChange}
style={InputStyle}
></Input>
</InputContainer>
<InputContainer>
<Input label={t('contract.SALARY')} value={salary} onChange={onChange} style={InputStyle}></Input>
<Input
label={t('contract.SALARY')}
name="salary"
value={salary}
onChange={onChange}
style={InputStyle}
></Input>
</InputContainer>
<InputContainer>
<Input
label={t('contract.ANNUAL_PAID_LEAVE')}
name="annualPaidLeave"
value={annualPaidLeave}
onChange={onChange}
style={InputStyle}
></Input>
</InputContainer>
<InputContainer>
<Input label={t('contract.RULE')} value={rule} onChange={onChange} style={InputStyle}></Input>
<Input
label={t('contract.RULE')}
name="rule"
value={rule}
onChange={onChange}
style={InputStyle}
></Input>
</InputContainer>
</InputWrapper>
<Typo element="p" size="16px" style={{ fontWeight: 'bold', marginTop: '24px' }}>
Expand Down
5 changes: 4 additions & 1 deletion src/pages/myPage/employee/EmployeeMyPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,20 @@ import { useGetMyApplication } from '@/apis/employee/hooks/useGetMyApplication';
import { useNavigate } from 'react-router-dom';
import ROUTE_PATH from '@/routes/path';
import { useTranslation } from 'react-i18next';
import { userLocalStorage } from '@/utils/storage';

export default function EmployeeMyPage() {
const { t } = useTranslation();
const { data: myRecruitList } = useGetMyApplication();
const navigate = useNavigate();

const profileImage = userLocalStorage.getUser()?.profileImage;

return (
<Layout>
<InnerContainer style={{ justifyContent: 'center', width: '70%', padding: '60px 0' }}>
<Section>
<EmployeeProfile />
<EmployeeProfile profileImage={profileImage} />
<ColumnSection>
<CardButton
design="outlined"
Expand Down
8 changes: 6 additions & 2 deletions src/pages/registerCompany/RegisterCompany.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ export default function RegisterCompany() {
navigate(ROUTE_PATH.HOME);
},
onError: () => {
// 이부분 에러처리 결정해야함.
alert('값이 정상적으로 저장되지 않았습니다.');
},
});
Expand All @@ -55,6 +54,7 @@ export default function RegisterCompany() {
<InputContainer>
<Input
label={t('registerCompany.LOGOIMAGE')}
name="logoImage"
type="file"
value={logoImage}
onChange={onChange}
Expand All @@ -64,6 +64,7 @@ export default function RegisterCompany() {
<InputContainer>
<Input
label={t('registerCompany.COMPANYNAME')}
name="name"
value={name}
onChange={onChange}
style={InputStyle}
Expand All @@ -72,6 +73,7 @@ export default function RegisterCompany() {
<InputContainer>
<Input
label={t('registerCompany.INDUSTRY_OCCUPATION')}
name="industryOccupation"
value={industryOccupation}
onChange={onChange}
style={InputStyle}
Expand All @@ -80,6 +82,7 @@ export default function RegisterCompany() {
<InputContainer>
<Input
label={t('registerCompany.BRAND')}
name="brand"
value={brand}
onChange={onChange}
style={InputStyle}
Expand All @@ -88,14 +91,15 @@ export default function RegisterCompany() {
<InputContainer>
<Input
label={t('registerCompany.REVENUE_PERYEAR')}
name="revenuePerYear"
value={revenuePerYear}
onChange={onChange}
style={InputStyle}
></Input>
</InputContainer>
</InputWrapper>
<ButtonWrapper>
<Button design="default" onClick={handlePostCompany} style={{}}>
<Button design="default" onClick={handlePostCompany}>
{t('registerCompany.SUBMIT')}
</Button>
</ButtonWrapper>
Expand Down
Loading