Skip to content

Commit

Permalink
Fix: PCOnly 파일 중복 해결 #59
Browse files Browse the repository at this point in the history
  • Loading branch information
shu07002 committed Oct 12, 2024
1 parent c5fccb9 commit 45be751
Show file tree
Hide file tree
Showing 13 changed files with 46 additions and 68 deletions.
8 changes: 7 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@
"rules": {
"react/no-unescaped-entities": 0,
"@typescript-eslint/no-unused-vars": "off",
"unused-imports/no-unused-imports": "error"
"unused-imports/no-unused-imports": "error",
"prettier/prettier": [
"error",
{
"endOfLine": "auto"
}
]
}
}
2 changes: 1 addition & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
"endOfLine": "lf",
"trailingComma": "none",
"arrowParens": "avoid"
}
}
8 changes: 6 additions & 2 deletions src/app/(apply)/apply/components/CheckingPass.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,16 @@ import Passed from './Passed'
import Nonpassed from './Nonpassed'

const CheckingPass = () => {
const onChangeInput = () => {
console.log('not yet')
}
return (
<div className="flex flex-col items-center bg-white">
<div className="w-[56.2rem]">
<SmallInput
onChangeInput={onChangeInput}
value=""
name="gitURL"
title=""
placeholder="이메일로 발송된 고유 번호를 입력해주세요."
/>
Expand All @@ -18,10 +24,8 @@ const CheckingPass = () => {
isable={false}
/>
</div>

<Passed />
<Nonpassed />
</div>
)
}

5 changes: 3 additions & 2 deletions src/app/(apply)/apply/components/Progress.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ const Progress = ({ step }: { step: number }) => {
''
) : (
<div className="flex justify-center items-center ">
<div className={`m-[0_1.4rem] w-[12.2rem] h-[1px] ${progress[index + 1] ? 'bg-black ' : 'bg-[#d9d9d9]'}`}></div>
<div
className={`m-[0_1.4rem] w-[12.2rem] h-[1px] ${progress[index + 1] ? 'bg-black ' : 'bg-[#d9d9d9]'}`}></div>
</div>
)}
</div>
Expand All @@ -41,4 +42,4 @@ const Progress = ({ step }: { step: number }) => {
)
}

export default Progress
export default Progress
2 changes: 1 addition & 1 deletion src/app/(apply)/apply/components/SaveButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ const SaveButton = () => {
)
}

export default SaveButton
export default SaveButton
11 changes: 5 additions & 6 deletions src/app/(apply)/apply/container/ApplySection.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
'use client'

import React, { useEffect, useState } from 'react'
import React, { useState } from 'react'
import Button from '../components/Button'
import SmallInput from '../components/SmallInput'
import ApplyHeader from '../components/ApplyHeader'
import PersonalInformationForm from './PersonalInformationForm'
import PersonalStatementForm from './PersonalStatementForm'
import Progress from '../components/Progress'
Expand All @@ -14,7 +13,7 @@ const ApplySection = () => {

const onClickStep = () => {
setStep(prev => prev + 1)
window.scrollTo(0,0)
window.scrollTo(0, 0)
}

const onChangeInput = () => {
Expand Down Expand Up @@ -50,8 +49,8 @@ const ApplySection = () => {
<div>
<SmallInput
onChangeInput={onChangeInput}
value=''
name='uniqueNumber'
value=""
name="uniqueNumber"
title="이미 작성하던 지원서가 있으시다면,"
placeholder="이메일로 발송된 고유번호를 입력해주세요."
/>
Expand Down Expand Up @@ -79,4 +78,4 @@ const ApplySection = () => {
)
}

export default ApplySection
export default ApplySection
7 changes: 7 additions & 0 deletions src/app/(apply)/apply/container/EditPersonalInfo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,18 @@ import SelectPart from '../components/SelectPart'
import Button from '../components/Button'

const EditPersonalInfo = () => {
const onChangeInput = () => {
console.log('not yet')
}

return (
<div className="w-[56.2rem] relative">
<div className="flex flex-col gap-[5rem] mb-[5rem]">
{personalInformation.map((item, index) => (
<SmallInput
onChangeInput={onChangeInput}
value=""
name="gitURL"
key={index}
title={item.title}
placeholder={item.placeholder}
Expand Down
15 changes: 7 additions & 8 deletions src/app/(apply)/apply/container/PersonalInformationForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,18 @@ import {
personalInformation,
personalPhoneNumber
} from '@/utils/recruitMockData'
import Progress from '../components/Progress'
import PersonalStatementForm from './PersonalStatementForm'

//
//
//

interface PersonalStatementFormProps {
onClickStep: () => void
}



const PersonalInformationForm = ({
onClickStep
}: PersonalStatementFormProps) => {

const onChangeInput = () => {
console.log('not yet')
}
Expand All @@ -28,7 +27,7 @@ const PersonalInformationForm = ({
{personalInformation.map((item, index) => (
<SmallInput
onChangeInput={onChangeInput}
value=''
value=""
name=""
key={index}
title={item.title}
Expand All @@ -38,7 +37,7 @@ const PersonalInformationForm = ({

<SmallInput
onChangeInput={onChangeInput}
value=''
value=""
name=""
title={personalPhoneNumber.title}
placeholder={personalPhoneNumber.placeholder}
Expand All @@ -57,4 +56,4 @@ const PersonalInformationForm = ({
)
}

export default PersonalInformationForm
export default PersonalInformationForm
4 changes: 3 additions & 1 deletion src/app/(apply)/apply/container/PersonalStatementForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ import { questions } from '@/utils/recruitMockData'
import SelectTimeDay from '../components/SelectTimeDay'
import SmallInput from '../components/SmallInput'
import SaveButton from '../components/SaveButton'

//
//
//
interface PersonalStatementFormProps {
onClickStep: () => void
}
Expand Down
6 changes: 4 additions & 2 deletions src/app/(apply)/apply/container/SaveComplete.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import LikelionGreyLogo from '../../../../../public/icon/logo/likelion-grey.svg'
import { useRouter } from 'next/navigation'

const SaveComplete = () => {
const router = useRouter();
const router = useRouter()

const onClickReturnHome = () => {
router.push('/')
Expand All @@ -28,7 +28,9 @@ const SaveComplete = () => {
</div>

<div className="flex mt-[5.8rem] gap-[0.8rem]">
<div onClick={onClickReturnHome} className="cursor-pointer p-[0.6rem_1.3rem] bg-grey text-[#b7b7b7] text-[1.3rem] font-semibold rounded-[2rem]">
<div
onClick={onClickReturnHome}
className="cursor-pointer p-[0.6rem_1.3rem] bg-grey text-[#b7b7b7] text-[1.3rem] font-semibold rounded-[2rem]">
홈으로 돌아가기
</div>
<div className="cursor-pointer p-[0.6rem_1.3rem] bg-grey text-[#b7b7b7] text-[1.3rem] font-semibold rounded-[2rem]">
Expand Down
3 changes: 0 additions & 3 deletions src/app/(apply)/apply/page.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
import ApplySection from './container/ApplySection'
import EditPersonalInfo from './container/EditPersonalInfo'
import SaveComplete from './container/SaveComplete'

//
//
//

export default function ApplyPage() {

return (
<main>
<ApplySection />
Expand Down
39 changes: 0 additions & 39 deletions src/app/(main)/recruit/container/PcOnly.tsx

This file was deleted.

4 changes: 2 additions & 2 deletions src/app/(main)/recruit/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import { useEffect, useRef, useState } from 'react'
import Recruit1 from './container/Recruit1'
import Recruit2 from './container/Recruit2'
import PcOnly from './container/PcOnly'
import PCOnly from './components/PCOnly'
//
//
//
Expand Down Expand Up @@ -43,7 +43,7 @@ export default function RecruitPage() {
<>
{pcOnly ? (
<div>
<PcOnly setPcOnly={setPcOnly} />
<PCOnly setPcOnly={setPcOnly} />
</div>
) : (
<div
Expand Down

0 comments on commit 45be751

Please sign in to comment.