Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/fe/develop' into fe-657-LAND_01
Browse files Browse the repository at this point in the history
  • Loading branch information
llqqssttyy committed Sep 13, 2024
2 parents cdfb2b3 + 72104d1 commit 0bb12ad
Show file tree
Hide file tree
Showing 170 changed files with 230 additions and 253 deletions.
5 changes: 0 additions & 5 deletions frontend/src/assets/icons/ellipsis.svg

This file was deleted.

1 change: 0 additions & 1 deletion frontend/src/assets/icons/index.ts

This file was deleted.

3 changes: 0 additions & 3 deletions frontend/src/assets/images/chevronDown.svg

This file was deleted.

4 changes: 0 additions & 4 deletions frontend/src/assets/images/chevronLeft.svg

This file was deleted.

3 changes: 0 additions & 3 deletions frontend/src/assets/images/chevronRight.svg

This file was deleted.

3 changes: 0 additions & 3 deletions frontend/src/assets/images/chevronUp.svg

This file was deleted.

5 changes: 0 additions & 5 deletions frontend/src/assets/images/ellipsis.svg

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react';
import ApplicantBaseInfo from '.';

const meta: Meta<typeof ApplicantBaseInfo> = {
title: 'Components/ApplicantModal/ApplicantBaseInfo',
title: 'Organisms/ApplicantModal/ApplicantBaseInfo',
component: ApplicantBaseInfo,
parameters: {
layout: 'centered',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useParams } from 'react-router-dom';

import Dropdown from '@components/common/Dropdown';
import Button from '@components/common/Button';
import Dropdown from '@components/_common/molecules/Dropdown';
import Button from '@components/_common/atoms/Button';
import useProcess from '@hooks/useProcess';
import useApplicant from '@hooks/useApplicant';
import specificApplicant from '@hooks/useSpecificApplicant';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react';
import Header from '.';

const meta: Meta<typeof Header> = {
title: 'Components/ApplicantModal/ApplicantDetailInfo/Header',
title: 'Organisms/ApplicantModal/ApplicantDetailInfo/AppDetailHeader',
component: Header,
parameters: {
layout: 'centered',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react';
import ApplicantDetailInfo from '.';

const meta: Meta<typeof ApplicantDetailInfo> = {
title: 'Components/ApplicantDetailInfo',
title: 'Organisms/ApplicantModal/ApplicantDetailInfo',
component: ApplicantDetailInfo,
parameters: {
layout: 'centered',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react';
import QuestionSection from '.';

const meta: Meta<typeof QuestionSection> = {
title: 'Components/ApplicantModal/ApplicantDetailInfo/QuestionSection',
title: 'Organisms/ApplicantModal/ApplicantDetailInfo/QuestionSection',
component: QuestionSection,
parameters: {
layout: 'centered',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import QuestionBox from '@components/common/QuestionBox';
import QuestionBox from '@components/_common/atoms/QuestionBox';
import specificApplicant from '@hooks/useSpecificApplicant';
import S from './style';

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react';
import EvaluationAddButton from '.';

const meta = {
title: 'Components/ApplicantModal/ApplicantEvalInfo/EvaluationAddButton',
title: 'Organisms/ApplicantModal/ApplicantEvalInfo/EvaluationAddButton',
component: EvaluationAddButton,
parameters: {
layout: 'centered',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Button from '@components/common/Button';
import Button from '@components/_common/atoms/Button';
import S from './style';

interface EvaluationAddButtonProps {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react';
import EvaluationCard from './index';

const meta: Meta<typeof EvaluationCard> = {
title: 'Components/ApplicantModal/ApplicantEvalInfo/EvaluationCard',
title: 'Organisms/ApplicantModal/ApplicantEvalInfo/EvaluationCard',
component: EvaluationCard,
parameters: {
layout: 'centered',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react';
import EvaluationForm from './index';

const meta: Meta<typeof EvaluationForm> = {
title: 'Components/ApplicantModal/ApplicantEvalInfo/EvaluationForm',
title: 'Organisms/ApplicantModal/ApplicantEvalInfo/EvaluationForm',
component: EvaluationForm,
parameters: {
layout: 'centered',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { useState } from 'react';

import RadioField from '@components/common/RadioField';
import Button from '@components/common/Button';
import TextField from '@components/common/TextField';
import RadioField from '@components/_common/molecules/RadioField';
import Button from '@components/_common/atoms/Button';
import TextField from '@components/_common/molecules/TextField';

import useEvaluationMutation from '@hooks/useEvaluationMutation';
import ValidationError from '@utils/errors/ValidationError';
import { validateEvalContent } from '@domain/validations/evaluation';

import Spinner from '@components/common/Spinner';
import Spinner from '@components/_common/atoms/Spinner';
import { EVALUATION_CONTENT_MAX_LENGTH, EVALUATION_SCORE } from '../constants';
import S from './style';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react';
import EvaluationHeader from './index';

const meta: Meta<typeof EvaluationHeader> = {
title: 'Components/ApplicantModal/ApplicantEvalInfo/EvaluationHeader',
title: 'Organisms/ApplicantModal/ApplicantEvalInfo/EvaluationHeader',
component: EvaluationHeader,
parameters: {
layout: 'centered',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Meta, StoryObj } from '@storybook/react';
import { ModalProvider, useModal } from '@contexts/ModalContext';
import Button from '@components/common/Button';
import Button from '@components/_common/atoms/Button';
import BaseModal from '.';

const meta: Meta<typeof BaseModal> = {
title: 'Common/Modal/BaseModal',
title: 'Common/Atoms/BaseModal',
component: BaseModal,
parameters: {
layout: 'centered',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { useModal } from '@contexts/ModalContext';
import { MdClose } from 'react-icons/md';
import IconButton from '../IconButton';
import IconButton from '@components/_common/atoms/IconButton';
import S from './style';

interface ModalHeaderProps {
title: string;
}

export default function ModalHeader({ title }: ModalHeaderProps) {
export default function ApplicatnModalHeader({ title }: ModalHeaderProps) {
const { close } = useModal();
return (
<S.Container>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
import BaseModal from '@components/common/BaseModal';
import { useSpecificApplicantId } from '@contexts/SpecificApplicnatIdContext';
import { useSpecificProcessId } from '@contexts/SpecificProcessIdContext';
import ApplicantBaseInfo from './ApplicantBaseInfo';

import ModalHeader from '../common/ModalHeader';
import BaseModal from './BaseModal';

import ApplicantBaseInfo from './ApplicantBaseInfo';
import ApplicatnModalHeader from './ModalHeader';
import QuestionSection from './ApplicantDetailInfo/QuestionSection';
import S from './style';
import ApplicantEvalInfo from './ApplicantEvalInfo';
import EvaluationHeader from './ApplicantEvalInfo/EvaluationHeader';

import S from './style';

export default function ApplicantModal() {
const { applicantId } = useSpecificApplicantId();
const { processId } = useSpecificProcessId();
Expand All @@ -18,7 +20,7 @@ export default function ApplicantModal() {
<BaseModal>
<S.Container>
<S.ModalHeader>
<ModalHeader title="지원서" />
<ApplicatnModalHeader title="지원서" />
</S.ModalHeader>

<S.ModalSidebar>
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react';
import Button from '.';

const meta = {
title: 'Common/Button/Button',
title: 'Common/Atoms/Button',
component: Button,
parameters: {
layout: 'centered',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { Meta, StoryObj } from '@storybook/react';
import CheckBox from './index';

const meta: Meta<typeof CheckBox> = {
title: 'Common/CheckBox/CheckBox',
title: 'Common/Atoms/CheckBox',
component: CheckBox,
parameters: {
layout: 'centered',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react';
import CopyToClipboard from '.';

const meta = {
title: 'Common/Button/CopyToClipboard',
title: 'Common/Atoms/CopyToClipboard',
component: CopyToClipboard,
parameters: {
docs: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import formatDate from '@utils/formatDate';
import DateInput from './index';

const meta: Meta<typeof DateInput> = {
title: 'Common/Input/DateInput',
title: 'Common/Atoms/DateInput',
component: DateInput,
parameters: {
layout: 'centered',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import DropdownItem, { DropdownItemProps } from '.';

export default {
component: DropdownItem,
title: 'Common/Dropdown/DropdownItem',
title: 'Common/Atoms/DropdownItem',
} as Meta;

const Template: StoryObj<DropdownItemProps> = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import type { Meta, StoryObj } from '@storybook/react';
import EllipsisIcon from '@assets/icons/ellipsis.svg';
import { HiEllipsisVertical } from 'react-icons/hi2';

import IconButton from '.';

const meta = {
title: 'Common/Button/IconButton',
title: 'Common/Atoms/IconButton',
component: IconButton,
parameters: {
layout: 'centered',
Expand Down Expand Up @@ -45,12 +46,7 @@ const meta = {
control: { type: 'select' },
options: ['Ellipsis'],
mapping: {
Ellipsis: (
<img
src={EllipsisIcon}
alt="더보기 아이콘 버튼"
/>
),
Ellipsis: <HiEllipsisVertical />,
},
table: {
type: { summary: 'React.ReactNode' },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { Meta, StoryObj } from '@storybook/react';
import OpenInNewTab from '.';

const meta = {
title: 'Common/Button/OpenInNewTab',
title: 'Common/Atoms/OpenInNewTab',
component: OpenInNewTab,
parameters: {
docs: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react';
import QuestionBox from '.';

const meta: Meta<typeof QuestionBox> = {
title: 'Components/QuestionBox',
title: 'Common/Atoms/QuestionBox',
component: QuestionBox,
parameters: {
layout: 'centered',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react';
import Radio from '.';

const meta: Meta<typeof Radio> = {
title: 'Common/Radio/Radio',
title: 'Common/Atoms/Radio',
component: Radio,
parameters: {
layout: 'centered',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react';
import Spinner from '.';

const meta = {
title: 'Common/Spinner',
title: 'Common/Atoms/Spinner',
component: Spinner,
parameters: {
layout: 'centered',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react';
import TextEditor from '.';

const meta = {
title: 'Common/Input/TextEditor',
title: 'Common/Atoms/TextEditor',
component: TextEditor,
parameters: {
layout: 'centered',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { Meta, StoryObj } from '@storybook/react';
import Toast from '.';

const meta: Meta<typeof Toast> = {
title: 'Common/Toast',
title: 'Common/Atoms/Toast',
component: Toast,
parameters: {
layout: 'centered',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { Meta, StoryObj } from '@storybook/react';
import ToggleSwitch from './index';

const meta: Meta<typeof ToggleSwitch> = {
title: 'Common/ToggleSwitch',
title: 'Common/Atoms/ToggleSwitch',
component: ToggleSwitch,
parameters: {
layout: 'centered',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Accordion from './index';
import S from './style';

const meta: Meta<typeof Accordion> = {
title: 'Common/Accordion',
title: 'Common/Molecules/Accordion',
component: Accordion,
parameters: {
layout: 'centered',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import React, { useState } from 'react';
import { HiOutlineClipboardList } from 'react-icons/hi';
import { HiChevronDown, HiChevronUp, HiOutlineClipboardList } from 'react-icons/hi';

import S from './style';
import ChevronButton from '../ChevronButton';

interface AccordionProps {
title: React.ReactNode;
Expand All @@ -24,10 +23,7 @@ function Accordion({ title, children }: AccordionProps) {
<HiOutlineClipboardList />
<S.TitleText>{title}</S.TitleText>
</S.Title>
<ChevronButton
size="sm"
direction={isOpen ? 'down' : 'up'}
/>
{isOpen ? <HiChevronDown size={24} /> : <HiChevronUp size={24} />}
</S.Header>
{isOpen && <S.List>{children}</S.List>}
</S.Container>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { Meta, StoryObj } from '@storybook/react';
import CheckBoxOption from './index';

const meta: Meta<typeof CheckBoxOption> = {
title: 'Components/Recruitment/CheckBox/CheckBoxOption',
title: 'Common/Molecules/CheckBoxOption',
component: CheckBoxOption,
parameters: {
layout: 'centered',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable prefer-arrow-callback */
import { ComponentPropsWithRef } from 'react';
import { HiOutlineX } from 'react-icons/hi';
import CheckBox from '@components/common/CheckBox';
import CheckBox from '@components/_common/atoms/CheckBox';
import S from './style';

interface CheckBoxOptionProps {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { Meta, StoryObj } from '@storybook/react';
import CheckboxLabelField from './index';

const meta: Meta<typeof CheckboxLabelField> = {
title: 'Common/Checkbox/CheckboxLabelField',
title: 'Common/Molecules/CheckboxLabelField',
component: CheckboxLabelField,
parameters: {
layout: 'centered',
Expand Down
Loading

0 comments on commit 0bb12ad

Please sign in to comment.