diff --git a/client/src/assets/image/buljusa.svg b/client/src/assets/image/buljusa.svg deleted file mode 100644 index fe5c47534..000000000 --- a/client/src/assets/image/buljusa.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/client/src/assets/image/chevronDownLarge.svg b/client/src/assets/image/chevron.svg similarity index 100% rename from client/src/assets/image/chevronDownLarge.svg rename to client/src/assets/image/chevron.svg diff --git a/client/src/assets/image/confirm.svg b/client/src/assets/image/confirm-circle.svg similarity index 100% rename from client/src/assets/image/confirm.svg rename to client/src/assets/image/confirm-circle.svg diff --git a/client/src/assets/image/dog.svg b/client/src/assets/image/dog.svg deleted file mode 100644 index f70558ed6..000000000 --- a/client/src/assets/image/dog.svg +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/src/assets/image/editPencil.svg b/client/src/assets/image/edit.svg similarity index 100% rename from client/src/assets/image/editPencil.svg rename to client/src/assets/image/edit.svg diff --git a/client/src/assets/image/error.svg b/client/src/assets/image/error-circle.svg similarity index 100% rename from client/src/assets/image/error.svg rename to client/src/assets/image/error-circle.svg diff --git a/client/src/assets/image/loadingAnimation.json b/client/src/assets/image/loadingAnimation.json deleted file mode 100644 index 4f507a7ea..000000000 --- a/client/src/assets/image/loadingAnimation.json +++ /dev/null @@ -1,1176 +0,0 @@ -{ - "nm": "Main Scene", - "ddd": 0, - "h": 48, - "w": 128, - "meta": { - "g": "@lottiefiles/creator 1.24.1" - }, - "layers": [ - { - "ty": 0, - "nm": " Loading Dots", - "sr": 1, - "st": 0, - "op": 81, - "ip": 0, - "hd": false, - "ddd": 0, - "bm": 0, - "hasMask": false, - "ao": 0, - "ks": { - "a": { - "a": 0, - "k": [ - 962.9629629629629, - 540.7407407407408 - ] - }, - "s": { - "a": 0, - "k": [ - 27, - 27 - ] - }, - "sk": { - "a": 0, - "k": 0 - }, - "p": { - "a": 0, - "k": [ - 64.25999999999999, - 24.2 - ] - }, - "r": { - "a": 0, - "k": 0 - }, - "sa": { - "a": 0, - "k": 0 - }, - "o": { - "a": 0, - "k": 100 - } - }, - "w": 1920, - "h": 1080, - "refId": "precomp_Loading Dots_139596b3-8049-4b90-9165-55e00cf10251", - "ind": 1 - } - ], - "v": "5.7.0", - "fr": 60, - "op": 81, - "ip": 0, - "assets": [ - { - "nm": "Loading Dots", - "id": "precomp_Loading Dots_139596b3-8049-4b90-9165-55e00cf10251", - "fr": 60, - "layers": [ - { - "ty": 4, - "nm": "Dot4", - "sr": 1, - "st": 0, - "op": 360, - "ip": 0, - "hd": false, - "ddd": 0, - "bm": 0, - "hasMask": false, - "ao": 0, - "ks": { - "a": { - "a": 0, - "k": [ - -284, - 92, - 0 - ], - "ix": 1 - }, - "s": { - "a": 1, - "k": [ - { - "o": { - "x": 0.333, - "y": 0 - }, - "i": { - "x": 0.667, - "y": 1 - }, - "s": [ - 50, - 50, - 100 - ], - "t": 25 - }, - { - "o": { - "x": 0.333, - "y": 0 - }, - "i": { - "x": 0.667, - "y": 1 - }, - "s": [ - 75, - 75, - 100 - ], - "t": 39 - }, - { - "s": [ - 50, - 50, - 100 - ], - "t": 55 - } - ], - "ix": 6 - }, - "sk": { - "a": 0, - "k": 0 - }, - "p": { - "a": 1, - "k": [ - { - "o": { - "x": 0.333, - "y": 0 - }, - "i": { - "x": 0.667, - "y": 1 - }, - "s": [ - 1142, - 540, - 0 - ], - "t": 25 - }, - { - "o": { - "x": 0.333, - "y": 0 - }, - "i": { - "x": 0.667, - "y": 1 - }, - "s": [ - 1142, - 500, - 0 - ], - "t": 39 - }, - { - "s": [ - 1142, - 540, - 0 - ], - "t": 55 - } - ], - "ix": 2 - }, - "r": { - "a": 0, - "k": 0, - "ix": 10 - }, - "sa": { - "a": 0, - "k": 0 - } - }, - "shapes": [ - { - "ty": "gr", - "bm": 0, - "hd": false, - "mn": "ADBE Vector Group", - "nm": "Ellipse 1", - "ix": 1, - "cix": 2, - "np": 3, - "it": [ - { - "ty": "el", - "bm": 0, - "hd": false, - "mn": "ADBE Vector Shape - Ellipse", - "nm": "Ellipse Path 1", - "d": 1, - "p": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 3 - }, - "s": { - "a": 0, - "k": [ - 120, - 120 - ], - "ix": 2 - } - }, - { - "ty": "fl", - "bm": 0, - "hd": false, - "mn": "ADBE Vector Graphic - Fill", - "nm": "Fill 1", - "c": { - "a": 1, - "k": [ - { - "o": { - "x": 0.167, - "y": 0.167 - }, - "i": { - "x": 0.833, - "y": 0.833 - }, - "s": [ - 0.8784, - 0.7804, - 0.9961 - ], - "t": 25 - }, - { - "o": { - "x": 0.167, - "y": 0.167 - }, - "i": { - "x": 0.833, - "y": 0.833 - }, - "s": [ - 0.7098, - 0.4588, - 1 - ], - "t": 39 - }, - { - "s": [ - 0.8784, - 0.7804, - 0.9961 - ], - "t": 55 - } - ], - "ix": 4 - }, - "r": 1, - "o": { - "a": 0, - "k": 100, - "ix": 5 - } - }, - { - "ty": "tr", - "a": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ], - "ix": 3 - }, - "sk": { - "a": 0, - "k": 0, - "ix": 4 - }, - "p": { - "a": 0, - "k": [ - -284, - 92 - ], - "ix": 2 - }, - "r": { - "a": 0, - "k": 0, - "ix": 6 - }, - "sa": { - "a": 0, - "k": 0, - "ix": 5 - }, - "o": { - "a": 0, - "k": 100, - "ix": 7 - } - } - ] - } - ], - "ind": 1 - }, - { - "ty": 4, - "nm": "Dot3", - "sr": 1, - "st": 0, - "op": 360, - "ip": 0, - "hd": false, - "ddd": 0, - "bm": 0, - "hasMask": false, - "ao": 0, - "ks": { - "a": { - "a": 0, - "k": [ - -284, - 92, - 0 - ], - "ix": 1 - }, - "s": { - "a": 1, - "k": [ - { - "o": { - "x": 0.333, - "y": 0 - }, - "i": { - "x": 0.667, - "y": 1 - }, - "s": [ - 50, - 50, - 100 - ], - "t": 17 - }, - { - "o": { - "x": 0.333, - "y": 0 - }, - "i": { - "x": 0.667, - "y": 1 - }, - "s": [ - 75, - 75, - 100 - ], - "t": 31 - }, - { - "s": [ - 50, - 50, - 100 - ], - "t": 47 - } - ], - "ix": 6 - }, - "sk": { - "a": 0, - "k": 0 - }, - "p": { - "a": 1, - "k": [ - { - "o": { - "x": 0.333, - "y": 0 - }, - "i": { - "x": 0.667, - "y": 1 - }, - "s": [ - 1022, - 540, - 0 - ], - "t": 17 - }, - { - "o": { - "x": 0.333, - "y": 0 - }, - "i": { - "x": 0.667, - "y": 1 - }, - "s": [ - 1022, - 500, - 0 - ], - "t": 31 - }, - { - "s": [ - 1022, - 540, - 0 - ], - "t": 47 - } - ], - "ix": 2 - }, - "r": { - "a": 0, - "k": 0, - "ix": 10 - }, - "sa": { - "a": 0, - "k": 0 - } - }, - "shapes": [ - { - "ty": "gr", - "bm": 0, - "hd": false, - "mn": "ADBE Vector Group", - "nm": "Ellipse 1", - "ix": 1, - "cix": 2, - "np": 3, - "it": [ - { - "ty": "el", - "bm": 0, - "hd": false, - "mn": "ADBE Vector Shape - Ellipse", - "nm": "Ellipse Path 1", - "d": 1, - "p": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 3 - }, - "s": { - "a": 0, - "k": [ - 120, - 120 - ], - "ix": 2 - } - }, - { - "ty": "fl", - "bm": 0, - "hd": false, - "mn": "ADBE Vector Graphic - Fill", - "nm": "Fill 1", - "c": { - "a": 1, - "k": [ - { - "o": { - "x": 0.167, - "y": 0.167 - }, - "i": { - "x": 0.833, - "y": 0.833 - }, - "s": [ - 0.8784, - 0.7804, - 0.9961 - ], - "t": 17 - }, - { - "o": { - "x": 0.167, - "y": 0.167 - }, - "i": { - "x": 0.833, - "y": 0.833 - }, - "s": [ - 0.7098, - 0.4588, - 1 - ], - "t": 31 - }, - { - "s": [ - 0.8784, - 0.7804, - 0.9961 - ], - "t": 47 - } - ], - "ix": 4 - }, - "r": 1, - "o": { - "a": 0, - "k": 100, - "ix": 5 - } - }, - { - "ty": "tr", - "a": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ], - "ix": 3 - }, - "sk": { - "a": 0, - "k": 0, - "ix": 4 - }, - "p": { - "a": 0, - "k": [ - -284, - 92 - ], - "ix": 2 - }, - "r": { - "a": 0, - "k": 0, - "ix": 6 - }, - "sa": { - "a": 0, - "k": 0, - "ix": 5 - }, - "o": { - "a": 0, - "k": 100, - "ix": 7 - } - } - ] - } - ], - "ind": 2 - }, - { - "ty": 4, - "nm": "Dot2", - "sr": 1, - "st": 0, - "op": 360, - "ip": 0, - "hd": false, - "ddd": 0, - "bm": 0, - "hasMask": false, - "ao": 0, - "ks": { - "a": { - "a": 0, - "k": [ - -284, - 92, - 0 - ], - "ix": 1 - }, - "s": { - "a": 1, - "k": [ - { - "o": { - "x": 0.333, - "y": 0 - }, - "i": { - "x": 0.667, - "y": 1 - }, - "s": [ - 50, - 50, - 100 - ], - "t": 9 - }, - { - "o": { - "x": 0.333, - "y": 0 - }, - "i": { - "x": 0.667, - "y": 1 - }, - "s": [ - 75, - 75, - 100 - ], - "t": 23 - }, - { - "s": [ - 50, - 50, - 100 - ], - "t": 39 - } - ], - "ix": 6 - }, - "sk": { - "a": 0, - "k": 0 - }, - "p": { - "a": 1, - "k": [ - { - "o": { - "x": 0.333, - "y": 0 - }, - "i": { - "x": 0.667, - "y": 1 - }, - "s": [ - 902, - 540, - 0 - ], - "t": 9 - }, - { - "o": { - "x": 0.333, - "y": 0 - }, - "i": { - "x": 0.667, - "y": 1 - }, - "s": [ - 902, - 500, - 0 - ], - "t": 23 - }, - { - "s": [ - 902, - 540, - 0 - ], - "t": 39 - } - ], - "ix": 2 - }, - "r": { - "a": 0, - "k": 0, - "ix": 10 - }, - "sa": { - "a": 0, - "k": 0 - } - }, - "shapes": [ - { - "ty": "gr", - "bm": 0, - "hd": false, - "mn": "ADBE Vector Group", - "nm": "Ellipse 1", - "ix": 1, - "cix": 2, - "np": 3, - "it": [ - { - "ty": "el", - "bm": 0, - "hd": false, - "mn": "ADBE Vector Shape - Ellipse", - "nm": "Ellipse Path 1", - "d": 1, - "p": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 3 - }, - "s": { - "a": 0, - "k": [ - 120, - 120 - ], - "ix": 2 - } - }, - { - "ty": "fl", - "bm": 0, - "hd": false, - "mn": "ADBE Vector Graphic - Fill", - "nm": "Fill 1", - "c": { - "a": 1, - "k": [ - { - "o": { - "x": 0.167, - "y": 0.167 - }, - "i": { - "x": 0.833, - "y": 0.833 - }, - "s": [ - 0.8784, - 0.7804, - 0.9961 - ], - "t": 9 - }, - { - "o": { - "x": 0.167, - "y": 0.167 - }, - "i": { - "x": 0.833, - "y": 0.833 - }, - "s": [ - 0.7098, - 0.4588, - 1 - ], - "t": 23 - }, - { - "s": [ - 0.8784, - 0.7804, - 0.9961 - ], - "t": 39 - } - ], - "ix": 4 - }, - "r": 1, - "o": { - "a": 0, - "k": 100, - "ix": 5 - } - }, - { - "ty": "tr", - "a": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ], - "ix": 3 - }, - "sk": { - "a": 0, - "k": 0, - "ix": 4 - }, - "p": { - "a": 0, - "k": [ - -284, - 92 - ], - "ix": 2 - }, - "r": { - "a": 0, - "k": 0, - "ix": 6 - }, - "sa": { - "a": 0, - "k": 0, - "ix": 5 - }, - "o": { - "a": 0, - "k": 100, - "ix": 7 - } - } - ] - } - ], - "ind": 3 - }, - { - "ty": 4, - "nm": "Dot1", - "sr": 1, - "st": 0, - "op": 360, - "ip": 0, - "hd": false, - "ddd": 0, - "bm": 0, - "hasMask": false, - "ao": 0, - "ks": { - "a": { - "a": 0, - "k": [ - -284, - 92, - 0 - ], - "ix": 1 - }, - "s": { - "a": 1, - "k": [ - { - "o": { - "x": 0.333, - "y": 0 - }, - "i": { - "x": 0.667, - "y": 1 - }, - "s": [ - 50, - 50, - 100 - ], - "t": 0 - }, - { - "o": { - "x": 0.333, - "y": 0 - }, - "i": { - "x": 0.667, - "y": 1 - }, - "s": [ - 75, - 75, - 100 - ], - "t": 14 - }, - { - "s": [ - 50, - 50, - 100 - ], - "t": 30 - } - ], - "ix": 6 - }, - "sk": { - "a": 0, - "k": 0 - }, - "p": { - "a": 1, - "k": [ - { - "o": { - "x": 0.333, - "y": 0 - }, - "i": { - "x": 0.667, - "y": 1 - }, - "s": [ - 782, - 540, - 0 - ], - "t": 0 - }, - { - "o": { - "x": 0.333, - "y": 0 - }, - "i": { - "x": 0.667, - "y": 1 - }, - "s": [ - 782, - 500, - 0 - ], - "t": 14 - }, - { - "s": [ - 782, - 540, - 0 - ], - "t": 30 - } - ], - "ix": 2 - }, - "r": { - "a": 0, - "k": 0, - "ix": 10 - }, - "sa": { - "a": 0, - "k": 0 - } - }, - "shapes": [ - { - "ty": "gr", - "bm": 0, - "hd": false, - "mn": "ADBE Vector Group", - "nm": "Ellipse 1", - "ix": 1, - "cix": 2, - "np": 3, - "it": [ - { - "ty": "el", - "bm": 0, - "hd": false, - "mn": "ADBE Vector Shape - Ellipse", - "nm": "Ellipse Path 1", - "d": 1, - "p": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 3 - }, - "s": { - "a": 0, - "k": [ - 120, - 120 - ], - "ix": 2 - } - }, - { - "ty": "fl", - "bm": 0, - "hd": false, - "mn": "ADBE Vector Graphic - Fill", - "nm": "Fill 1", - "c": { - "a": 1, - "k": [ - { - "o": { - "x": 0.167, - "y": 0.167 - }, - "i": { - "x": 0.833, - "y": 0.833 - }, - "s": [ - 0.8784, - 0.7804, - 0.9961 - ], - "t": 0 - }, - { - "o": { - "x": 0.167, - "y": 0.167 - }, - "i": { - "x": 0.833, - "y": 0.833 - }, - "s": [ - 0.7098, - 0.4588, - 1 - ], - "t": 14 - }, - { - "s": [ - 0.8784, - 0.7804, - 0.9961 - ], - "t": 30 - } - ], - "ix": 4 - }, - "r": 1, - "o": { - "a": 0, - "k": 100, - "ix": 5 - } - }, - { - "ty": "tr", - "a": { - "a": 0, - "k": [ - 0, - 0 - ], - "ix": 1 - }, - "s": { - "a": 0, - "k": [ - 100, - 100 - ], - "ix": 3 - }, - "sk": { - "a": 0, - "k": 0, - "ix": 4 - }, - "p": { - "a": 0, - "k": [ - -284, - 92 - ], - "ix": 2 - }, - "r": { - "a": 0, - "k": 0, - "ix": 6 - }, - "sa": { - "a": 0, - "k": 0, - "ix": 5 - }, - "o": { - "a": 0, - "k": 100, - "ix": 7 - } - } - ] - } - ], - "ind": 4 - } - ] - } - ] -} \ No newline at end of file diff --git a/client/src/assets/image/meatballs.svg b/client/src/assets/image/meatballs.svg index bc3e17d2f..21a225b8f 100644 --- a/client/src/assets/image/meatballs.svg +++ b/client/src/assets/image/meatballs.svg @@ -1,3 +1,3 @@ - + diff --git a/client/src/assets/image/pencil_mini.svg b/client/src/assets/image/pencil_mini.svg deleted file mode 100644 index 11a154e13..000000000 --- a/client/src/assets/image/pencil_mini.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/client/src/assets/image/photoButton.svg b/client/src/assets/image/picture-square.svg similarity index 100% rename from client/src/assets/image/photoButton.svg rename to client/src/assets/image/picture-square.svg diff --git a/client/src/assets/image/rightChevron.svg b/client/src/assets/image/rightChevron.svg deleted file mode 100644 index 5cd777f1b..000000000 --- a/client/src/assets/image/rightChevron.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/client/src/assets/image/trash_mini.svg b/client/src/assets/image/trash_mini.svg deleted file mode 100644 index 16436f446..000000000 --- a/client/src/assets/image/trash_mini.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/client/src/assets/image/inputDelete.svg b/client/src/assets/image/x-circle.svg similarity index 100% rename from client/src/assets/image/inputDelete.svg rename to client/src/assets/image/x-circle.svg diff --git a/client/src/components/Design/components/Amount/EditableAmount.tsx b/client/src/components/Design/components/Amount/EditableAmount.tsx index c71ed1778..47eaee077 100644 --- a/client/src/components/Design/components/Amount/EditableAmount.tsx +++ b/client/src/components/Design/components/Amount/EditableAmount.tsx @@ -4,8 +4,8 @@ import {useEffect, useRef, useState} from 'react'; import {useTheme} from '@components/Design/theme/HDesignProvider'; import TYPOGRAPHY from '@components/Design/token/typography'; -import Icon from '../Icon/Icon'; import Text from '../Text/Text'; +import {IconEdit} from '../Icons/Icons/IconEdit'; interface Props { value: string; @@ -75,7 +75,7 @@ const EditableAmount = ({value, onChange, onClick, readOnly = true, isFixed = fa 원 - + { return ( @@ -25,7 +25,7 @@ const Banner = ({title, description, buttonText, onDelete, ...buttonProps}: Bann style={{display: 'flex', alignItems: 'flex-start'}} aria-label="배너 닫기" > - +
diff --git a/client/src/components/Design/components/Carousel/CarouselDeleteButton.tsx b/client/src/components/Design/components/Carousel/CarouselDeleteButton.tsx index 828195095..17f932e79 100644 --- a/client/src/components/Design/components/Carousel/CarouselDeleteButton.tsx +++ b/client/src/components/Design/components/Carousel/CarouselDeleteButton.tsx @@ -1,5 +1,5 @@ /** @jsxImportSource @emotion/react */ -import Icon from '../Icon/Icon'; +import {IconX} from '../Icons/Icons/IconX'; import {deleteButtonStyle} from './Carousel.style'; @@ -10,7 +10,7 @@ interface Props { const CarouselDeleteButton = ({onClick}: Props) => { return ( ); }; diff --git a/client/src/components/Design/components/Checkbox/Checkbox.tsx b/client/src/components/Design/components/Checkbox/Checkbox.tsx index 4395891da..824f02945 100644 --- a/client/src/components/Design/components/Checkbox/Checkbox.tsx +++ b/client/src/components/Design/components/Checkbox/Checkbox.tsx @@ -2,7 +2,7 @@ import {useTheme} from '@components/Design/theme/HDesignProvider'; import Text from '../Text/Text'; -import Icon from '../Icon/Icon'; +import {IconCheck} from '../Icons/Icons/IconCheck'; import {checkboxStyle, inputGroupStyle} from './Checkbox.style'; @@ -17,7 +17,7 @@ const Checkbox = ({labelText, isChecked = false, onChange}: Props) => { return (
{ - if (type === 'none') return null; - - return ; + if (type === 'confirm') return ; + if (type === 'error') return ; + return null; }; const ANIMATION_TIME = 500; diff --git a/client/src/pages/event/[eventId]/EventPageLayout.tsx b/client/src/pages/event/[eventId]/EventPageLayout.tsx index e74e96880..75c7bb036 100644 --- a/client/src/pages/event/[eventId]/EventPageLayout.tsx +++ b/client/src/pages/event/[eventId]/EventPageLayout.tsx @@ -4,6 +4,7 @@ import {Link, Outlet} from 'react-router-dom'; import {useEffect} from 'react'; import {Profile} from '@components/Design/components/Profile/Profile'; +import {IconHeundeut} from '@components/Design/components/Icons/Icons/IconHeundeut'; import useEventPageLayout from '@hooks/useEventPageLayout'; import useShareEvent from '@hooks/useShareEvent'; @@ -12,7 +13,7 @@ import useAmplitude from '@hooks/useAmplitude'; import {Footer} from '@components/Footer'; import {DesktopShareEventButton, MobileShareEventButton} from '@components/ShareEventButton'; -import {Flex, Icon, IconButton, MainLayout, TopNav} from '@HDesign/index'; +import {Flex, IconButton, MainLayout, TopNav} from '@HDesign/index'; import {isMobileDevice} from '@utils/detectDevice'; import {updateMetaTag} from '@utils/udpateMetaTag'; @@ -59,7 +60,7 @@ const EventPageLayout = () => { - + diff --git a/client/src/pages/event/[eventId]/admin/login/user/UserEventLogin.tsx b/client/src/pages/event/[eventId]/admin/login/user/UserEventLogin.tsx index d15655908..a28cbb97d 100644 --- a/client/src/pages/event/[eventId]/admin/login/user/UserEventLogin.tsx +++ b/client/src/pages/event/[eventId]/admin/login/user/UserEventLogin.tsx @@ -1,8 +1,9 @@ import Top from '@components/Design/components/Top/Top'; +import {IconKakao} from '@components/Design/components/Icons/Icons/IconKakao'; import useLoginPage from '@hooks/useLoginPage'; -import {Button, Flex, FunnelLayout, Icon} from '@HDesign/index'; +import {Button, Flex, FunnelLayout} from '@HDesign/index'; import getEventBaseUrl from '@utils/getEventBaseUrl'; @@ -18,7 +19,7 @@ const UserEventLogin = () => { diff --git a/client/src/pages/event/[eventId]/admin/members/MembersPage.style.ts b/client/src/pages/event/[eventId]/admin/members/MembersPage.style.ts index f59f288bd..3ae3e6c0d 100644 --- a/client/src/pages/event/[eventId]/admin/members/MembersPage.style.ts +++ b/client/src/pages/event/[eventId]/admin/members/MembersPage.style.ts @@ -54,3 +54,13 @@ export const memberEditInput = (theme: Theme) => borderBottom: `1px solid ${theme.colors.primary}`, }, }); + +export const deleteButtonStyle = css({ + display: 'flex', + alignItems: 'center', + justifyContent: 'center', + padding: '0', + width: '23px', + height: '23px', + borderRadius: '0.375rem', +}); diff --git a/client/src/pages/event/[eventId]/admin/members/MembersPage.tsx b/client/src/pages/event/[eventId]/admin/members/MembersPage.tsx index b5697e8b8..af2427a6c 100644 --- a/client/src/pages/event/[eventId]/admin/members/MembersPage.tsx +++ b/client/src/pages/event/[eventId]/admin/members/MembersPage.tsx @@ -1,12 +1,21 @@ /** @jsxImportSource @emotion/react */ import {Report} from 'types/serviceType'; import {useTheme} from '@components/Design/theme/HDesignProvider'; +import {IconEdit} from '@components/Design/components/Icons/Icons/IconEdit'; +import {IconTrash} from '@components/Design/components/Icons/Icons/IconTrash'; import useEventMember from '@hooks/useEventMember'; -import {MainLayout, TopNav, Top, Amount, DepositToggle, Icon, IconButton, FixedButton, Text} from '@components/Design'; +import {MainLayout, TopNav, Top, Amount, DepositToggle, IconButton, FixedButton, Text} from '@components/Design'; -import {eventMemberStyle, memberList, eventMember, memberEditInput, noneReports} from './MembersPage.style'; +import { + eventMemberStyle, + memberList, + eventMember, + memberEditInput, + noneReports, + deleteButtonStyle, +} from './MembersPage.style'; const MembersPage = () => { const {reports, canSubmit, changeMemberName, handleDeleteMember, updateMembersOnServer, toggleDepositStatus} = @@ -73,19 +82,19 @@ const Member = ({member, changeMemberName, handleDeleteMember, toggleDepositStat
handleChangeName(e)} /> - +
-
+
toggleDepositStatus(member.memberId)} /> handleDeleteMember(member.memberId)} aria-label="인원 삭제" > - +
diff --git a/client/src/pages/event/[eventId]/home/HomePage.tsx b/client/src/pages/event/[eventId]/home/HomePage.tsx index 8be38e71c..d81527541 100644 --- a/client/src/pages/event/[eventId]/home/HomePage.tsx +++ b/client/src/pages/event/[eventId]/home/HomePage.tsx @@ -4,12 +4,13 @@ import StepList from '@components/StepList/Steps'; import useRequestGetSteps from '@hooks/queries/step/useRequestGetSteps'; import Reports from '@components/Reports/Reports'; import useRequestGetImages from '@hooks/queries/images/useRequestGetImages'; +import {IconPictureSquare} from '@components/Design/components/Icons/Icons/IconPictureSquare'; import useEventDataContext from '@hooks/useEventDataContext'; import {useTotalExpenseAmountStore} from '@store/totalExpenseAmountStore'; -import {Icon, Tab, Tabs, Title} from '@HDesign/index'; +import {Tab, Tabs, Title} from '@HDesign/index'; import getEventIdByUrl from '@utils/getEventIdByUrl'; @@ -35,7 +36,7 @@ const HomePage = () => { icon={ images.length !== 0 && ( ) } diff --git a/client/src/pages/fallback/EventPageLoading.tsx b/client/src/pages/fallback/EventPageLoading.tsx index 110896f98..7308a176b 100644 --- a/client/src/pages/fallback/EventPageLoading.tsx +++ b/client/src/pages/fallback/EventPageLoading.tsx @@ -1,4 +1,6 @@ -import {Flex, Icon, IconButton, MainLayout, TopNav} from '@components/Design'; +import {IconHeundeut} from '@components/Design/components/Icons/Icons/IconHeundeut'; + +import {Flex, IconButton, MainLayout, TopNav} from '@components/Design'; import {Footer} from '@components/Footer'; const EventPageLoading = () => { @@ -8,7 +10,7 @@ const EventPageLoading = () => { - + diff --git a/client/src/pages/login/LoginPage.tsx b/client/src/pages/login/LoginPage.tsx index e38c1b02a..b38ffbf2e 100644 --- a/client/src/pages/login/LoginPage.tsx +++ b/client/src/pages/login/LoginPage.tsx @@ -1,8 +1,9 @@ import Image from '@components/Design/components/Image/Image'; +import {IconKakao} from '@components/Design/components/Icons/Icons/IconKakao'; import useLoginPage from '@hooks/useLoginPage'; -import {Button, Flex, FunnelLayout, Icon, MainLayout, Text, TopNav, useTheme} from '@components/Design'; +import {Button, Flex, FunnelLayout, MainLayout, Text, TopNav, useTheme} from '@components/Design'; import getImageUrl from '@utils/getImageUrl'; @@ -31,7 +32,7 @@ const LoginPage = () => { diff --git a/client/src/pages/main/Nav/Nav.tsx b/client/src/pages/main/Nav/Nav.tsx index 0e4e01e70..83b4cd0e4 100644 --- a/client/src/pages/main/Nav/Nav.tsx +++ b/client/src/pages/main/Nav/Nav.tsx @@ -1,8 +1,9 @@ import {useNavigate} from 'react-router-dom'; import {User} from 'types/serviceType'; +import {IconHeundeut} from '@components/Design/components/Icons/Icons/IconHeundeut'; -import {Button, Text, Icon, TopNav, IconButton} from '@HDesign/index'; +import {Button, Text, TopNav, IconButton} from '@HDesign/index'; import {ROUTER_URLS} from '@constants/routerUrls'; @@ -24,7 +25,7 @@ const Nav = ({isGuest}: NavProps) => { - + diff --git a/client/src/pages/main/Section/MainSection/MainSection.style.ts b/client/src/pages/main/Section/MainSection/MainSection.style.ts index 4afea6c80..c4de5b35b 100644 --- a/client/src/pages/main/Section/MainSection/MainSection.style.ts +++ b/client/src/pages/main/Section/MainSection/MainSection.style.ts @@ -69,7 +69,7 @@ export const sectionStyle = css({ export const chevronStyle = css({ position: 'absolute', - bottom: '2rem', + bottom: '1rem', left: '50%', animation: `${bounce} 2s infinite ease-in-out`, }); diff --git a/client/src/pages/main/Section/MainSection/MainSection.tsx b/client/src/pages/main/Section/MainSection/MainSection.tsx index 0f7c65cbb..910a0890b 100644 --- a/client/src/pages/main/Section/MainSection/MainSection.tsx +++ b/client/src/pages/main/Section/MainSection/MainSection.tsx @@ -3,8 +3,7 @@ import {useNavigate} from 'react-router-dom'; import Button from '@HDesign/components/Button/Button'; import Text from '@HDesign/components/Text/Text'; import {User} from 'types/serviceType'; - -import {Icon} from '@components/Design'; +import {IconChevron} from '@components/Design/components/Icons/Icons/IconChevron'; import {ROUTER_URLS} from '@constants/routerUrls'; @@ -30,7 +29,7 @@ const MainSection = ({isGuest}: NavProps) => {
- +
); diff --git a/client/src/pages/mypage/withdraw/ReasonStep.tsx b/client/src/pages/mypage/withdraw/ReasonStep.tsx index 218776e5a..f7387597f 100644 --- a/client/src/pages/mypage/withdraw/ReasonStep.tsx +++ b/client/src/pages/mypage/withdraw/ReasonStep.tsx @@ -1,8 +1,10 @@ import {css} from '@emotion/react'; +import {IconChevron} from '@components/Design/components/Icons/Icons/IconChevron'; + import {WithdrawStep} from '@hooks/useWithdrawFunnel'; -import {Top, Icon, Text} from '@components/Design'; +import {Top, Text} from '@components/Design'; import {stepButtonGroupStyle, stepButtonBoxStyle} from './ReasonStep.style'; @@ -46,7 +48,7 @@ const StepButton = ({stepText, nextStep}: StepButtonProps) => { {stepText} - + ); };