Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/GDSC-KNU/GDSC_Official_FE i…
Browse files Browse the repository at this point in the history
…nto develop
  • Loading branch information
KimKyuHoi committed Dec 23, 2024
2 parents bde1e1c + eaca4ac commit e453cf2
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 34 deletions.
12 changes: 6 additions & 6 deletions src/pages/apply/components/ApplyEx.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import { useParams, useNavigate } from 'react-router-dom';

import CommonBtn from '@gdg/components/common/button/CommonBtn';
import {
FrontendData,
// FrontendData,
BackendData,
AIData,
AndroidData,
// AndroidData,
DesignerData,
} from '@gdg/pages/apply/components/ApplyDocs';
import ApplyQualify from '@gdg/pages/apply/components/ApplyQualify';
Expand Down Expand Up @@ -63,14 +63,14 @@ const ApplyEx = () => {

const getData = (tech: string): ApplyExInterface | null => {
switch (tech) {
case 'frontend':
return FrontendData;
// case 'frontend':
// return FrontendData;
case 'backend':
return BackendData;
case 'ai':
return AIData;
case 'android':
return AndroidData;
// case 'android':
// return AndroidData;
case 'designer':
return DesignerData;
default:
Expand Down
20 changes: 10 additions & 10 deletions src/pages/apply/components/ApplyForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ import {
InputWrapper,
} from '@gdg/pages/apply/components/ApplyForm.style';
import {
FrontendData,
// FrontendData,
BackendData,
AndroidData,
// AndroidData,
AIData,
DesignerData,
} from '@gdg/pages/apply/components/ApplyFormDocs';
Expand All @@ -51,14 +51,14 @@ import {

const getTrack = (tech: string): string => {
switch (tech.toLowerCase()) {
case 'frontend':
return 'FRONT_END';
// case 'frontend':
// return 'FRONT_END';
case 'backend':
return 'BACK_END';
case 'ai':
return 'AI';
case 'android':
return 'ANDROID';
// case 'android':
// return 'ANDROID';
case 'designer':
return 'DESIGNER';
default:
Expand Down Expand Up @@ -97,14 +97,14 @@ const ApplyForm = () => {

const getData = (tech: string): ApplyFormQuestionInterface | null => {
switch (tech) {
case 'frontend':
return FrontendData;
// case 'frontend':
// return FrontendData;
case 'backend':
return BackendData;
case 'ai':
return AIData;
case 'android':
return AndroidData;
// case 'android':
// return AndroidData;
case 'designer':
return DesignerData;
default:
Expand Down
24 changes: 12 additions & 12 deletions src/pages/apply/components/ApplyNavBox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,12 @@ const ApplySubText = styled(Text)`
`;

const DeveloperData = [
{
id: 0,
korean: '프론트엔드 개발자',
english: 'Frontend Developer',
link: '/apply/frontend',
},
// {
// id: 0,
// korean: '프론트엔드 개발자',
// english: 'Frontend Developer',
// link: '/apply/frontend',
// },
{
id: 1,
korean: '백엔드 개발자',
Expand All @@ -109,12 +109,12 @@ const DeveloperData = [
english: 'AI Developer',
link: '/apply/ai',
},
{
id: 3,
korean: '안드로이드 개발자',
english: 'Android Developer',
link: '/apply/android',
},
// {
// id: 3,
// korean: '안드로이드 개발자',
// english: 'Android Developer',
// link: '/apply/android',
// },
{
id: 4,
korean: '디자이너',
Expand Down
12 changes: 6 additions & 6 deletions src/pages/apply/components/ApplySaveForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import {
InputWrapper,
} from '@gdg/pages/apply/components/ApplyForm.style';
import {
FrontendData,
// FrontendData,
BackendData,
AndroidData,
// AndroidData,
AIData,
DesignerData,
} from '@gdg/pages/apply/components/ApplyFormDocs';
Expand Down Expand Up @@ -84,14 +84,14 @@ const ApplySaveForm = ({ SaveData }: ApplySaveFormProps) => {

const getData = (techStack: string): ApplyFormQuestionInterface | null => {
switch (techStack) {
case 'FRONT_END':
return FrontendData;
// case 'FRONT_END':
// return FrontendData;
case 'BACK_END':
return BackendData;
case 'AI':
return AIData;
case 'ANDROID':
return AndroidData;
// case 'ANDROID':
// return AndroidData;
case 'DESIGNER':
return DesignerData;
default:
Expand Down

0 comments on commit e453cf2

Please sign in to comment.