diff --git a/src/page/showcase/index/constant/banner.ts b/apps/client/src/page/showcase/index/constant/banner.ts
similarity index 100%
rename from src/page/showcase/index/constant/banner.ts
rename to apps/client/src/page/showcase/index/constant/banner.ts
diff --git a/src/page/showcase/index/constant/category.ts b/apps/client/src/page/showcase/index/constant/category.ts
similarity index 100%
rename from src/page/showcase/index/constant/category.ts
rename to apps/client/src/page/showcase/index/constant/category.ts
diff --git a/src/page/showcase/index/hook/api/useClubListQuery.ts b/apps/client/src/page/showcase/index/hook/api/useClubListQuery.ts
similarity index 100%
rename from src/page/showcase/index/hook/api/useClubListQuery.ts
rename to apps/client/src/page/showcase/index/hook/api/useClubListQuery.ts
diff --git a/src/page/showcase/team/index.tsx b/apps/client/src/page/showcase/team/index.tsx
similarity index 100%
rename from src/page/showcase/team/index.tsx
rename to apps/client/src/page/showcase/team/index.tsx
diff --git a/src/page/signUp/index/TermPage.style.ts b/apps/client/src/page/signUp/index/TermPage.style.ts
similarity index 89%
rename from src/page/signUp/index/TermPage.style.ts
rename to apps/client/src/page/signUp/index/TermPage.style.ts
index 6d92e1d77..eca006d92 100644
--- a/src/page/signUp/index/TermPage.style.ts
+++ b/apps/client/src/page/signUp/index/TermPage.style.ts
@@ -1,6 +1,5 @@
import { css } from '@emotion/react';
-
-import { theme } from '@/common/style/theme/theme';
+import { theme } from '@tiki/ui';
export const detailStyle = css({
position: 'relative',
diff --git a/src/page/signUp/index/TermPage.tsx b/apps/client/src/page/signUp/index/TermPage.tsx
similarity index 93%
rename from src/page/signUp/index/TermPage.tsx
rename to apps/client/src/page/signUp/index/TermPage.tsx
index fcc9a3549..dac5047c6 100644
--- a/src/page/signUp/index/TermPage.tsx
+++ b/apps/client/src/page/signUp/index/TermPage.tsx
@@ -1,8 +1,6 @@
-import { useNavigate } from 'react-router-dom';
+import { Button, Flex, Heading } from '@tiki/ui';
-import Button from '@/common/component/Button/Button';
-import Flex from '@/common/component/Flex/Flex';
-import Heading from '@/common/component/Heading/Heading';
+import { useNavigate } from 'react-router-dom';
import TermItem from '@/page/signUp/index/component/TermItem/TermItem';
import TermsAgreeButton from '@/page/signUp/index/component/TermsAgreeButton/TermsAgreeButton';
diff --git a/src/page/signUp/index/component/TermItem/TermItem.style.ts b/apps/client/src/page/signUp/index/component/TermItem/TermItem.style.ts
similarity index 94%
rename from src/page/signUp/index/component/TermItem/TermItem.style.ts
rename to apps/client/src/page/signUp/index/component/TermItem/TermItem.style.ts
index 09db44cd8..568ce10fc 100644
--- a/src/page/signUp/index/component/TermItem/TermItem.style.ts
+++ b/apps/client/src/page/signUp/index/component/TermItem/TermItem.style.ts
@@ -1,6 +1,5 @@
import { css } from '@emotion/react';
-
-import { theme } from '@/common/style/theme/theme';
+import { theme } from '@tiki/ui';
export const containerStyle = (isSelected: boolean) =>
css({
diff --git a/src/page/signUp/index/component/TermItem/TermItem.tsx b/apps/client/src/page/signUp/index/component/TermItem/TermItem.tsx
similarity index 83%
rename from src/page/signUp/index/component/TermItem/TermItem.tsx
rename to apps/client/src/page/signUp/index/component/TermItem/TermItem.tsx
index 45b85895b..5af57cfde 100644
--- a/src/page/signUp/index/component/TermItem/TermItem.tsx
+++ b/apps/client/src/page/signUp/index/component/TermItem/TermItem.tsx
@@ -1,12 +1,7 @@
-import { useState } from 'react';
+import { IcCheck } from '@tiki/icon';
+import { Button, Flex, Modal, Text, scrollStyle, theme } from '@tiki/ui';
-import IcCheck from '@/common/asset/svg/ic_check.svg?react';
-import Button from '@/common/component/Button/Button';
-import Flex from '@/common/component/Flex/Flex';
-import Modal from '@/common/component/Modal/Modal';
-import Text from '@/common/component/Text/Text';
-import { scrollStyle } from '@/common/style/scroll';
-import { theme } from '@/common/style/theme/theme';
+import { useState } from 'react';
import {
containerStyle,
diff --git a/src/page/signUp/index/component/TermsAgreeButton/TermsAgreeButton.style.ts b/apps/client/src/page/signUp/index/component/TermsAgreeButton/TermsAgreeButton.style.ts
similarity index 91%
rename from src/page/signUp/index/component/TermsAgreeButton/TermsAgreeButton.style.ts
rename to apps/client/src/page/signUp/index/component/TermsAgreeButton/TermsAgreeButton.style.ts
index 47a715e27..f8012ee0e 100644
--- a/src/page/signUp/index/component/TermsAgreeButton/TermsAgreeButton.style.ts
+++ b/apps/client/src/page/signUp/index/component/TermsAgreeButton/TermsAgreeButton.style.ts
@@ -1,6 +1,5 @@
import { css } from '@emotion/react';
-
-import { theme } from '@/common/style/theme/theme';
+import { theme } from '@tiki/ui';
export const buttonStyle = (isClicked: boolean) =>
css({
diff --git a/src/page/signUp/index/component/TermsAgreeButton/TermsAgreeButton.tsx b/apps/client/src/page/signUp/index/component/TermsAgreeButton/TermsAgreeButton.tsx
similarity index 89%
rename from src/page/signUp/index/component/TermsAgreeButton/TermsAgreeButton.tsx
rename to apps/client/src/page/signUp/index/component/TermsAgreeButton/TermsAgreeButton.tsx
index 2371be585..eedfca6a4 100644
--- a/src/page/signUp/index/component/TermsAgreeButton/TermsAgreeButton.tsx
+++ b/apps/client/src/page/signUp/index/component/TermsAgreeButton/TermsAgreeButton.tsx
@@ -1,6 +1,6 @@
-import { ComponentPropsWithoutRef } from 'react';
+import { IcCheck } from '@tiki/icon';
-import IcCheck from '@/common/asset/svg/ic_check.svg?react';
+import { ComponentPropsWithoutRef } from 'react';
import { buttonStyle } from '@/page/signUp/index/component/TermsAgreeButton/TermsAgreeButton.style';
diff --git a/src/page/signUp/index/hook/useTermForm.ts b/apps/client/src/page/signUp/index/hook/useTermForm.ts
similarity index 100%
rename from src/page/signUp/index/hook/useTermForm.ts
rename to apps/client/src/page/signUp/index/hook/useTermForm.ts
diff --git a/src/page/signUp/info/InfoFormPage.style.ts b/apps/client/src/page/signUp/info/InfoFormPage.style.ts
similarity index 100%
rename from src/page/signUp/info/InfoFormPage.style.ts
rename to apps/client/src/page/signUp/info/InfoFormPage.style.ts
diff --git a/src/page/signUp/info/InfoFormPage.tsx b/apps/client/src/page/signUp/info/InfoFormPage.tsx
similarity index 84%
rename from src/page/signUp/info/InfoFormPage.tsx
rename to apps/client/src/page/signUp/info/InfoFormPage.tsx
index ab9096331..1379e61f7 100644
--- a/src/page/signUp/info/InfoFormPage.tsx
+++ b/apps/client/src/page/signUp/info/InfoFormPage.tsx
@@ -1,8 +1,4 @@
-import Button from '@/common/component/Button/Button';
-import DatePicker from '@/common/component/DatePicker';
-import Flex from '@/common/component/Flex/Flex';
-import Heading from '@/common/component/Heading/Heading';
-import Input from '@/common/component/Input/Input';
+import { Button, DatePicker, Flex, Heading, Input } from '@tiki/ui';
import { formStyle, pageStyle } from '@/page/signUp/info/InfoFormPage.style';
import { useInfoForm } from '@/page/signUp/info/hook/common/useInfoForm';
diff --git a/src/page/signUp/info/UnivFormPage.tsx b/apps/client/src/page/signUp/info/UnivFormPage.tsx
similarity index 90%
rename from src/page/signUp/info/UnivFormPage.tsx
rename to apps/client/src/page/signUp/info/UnivFormPage.tsx
index 417188656..180da767e 100644
--- a/src/page/signUp/info/UnivFormPage.tsx
+++ b/apps/client/src/page/signUp/info/UnivFormPage.tsx
@@ -1,7 +1,4 @@
-import Button from '@/common/component/Button/Button';
-import Flex from '@/common/component/Flex/Flex';
-import Heading from '@/common/component/Heading/Heading';
-import Input from '@/common/component/Input/Input';
+import { Button, Flex, Heading, Input } from '@tiki/ui';
import { formStyle, pageStyle } from '@/page/signUp/info/InfoFormPage.style';
import { useUnivForm } from '@/page/signUp/info/hook/common/useUnivForm';
diff --git a/src/page/signUp/info/hook/api/useSendMailMutation.ts b/apps/client/src/page/signUp/info/hook/api/useSendMailMutation.ts
similarity index 91%
rename from src/page/signUp/info/hook/api/useSendMailMutation.ts
rename to apps/client/src/page/signUp/info/hook/api/useSendMailMutation.ts
index 9a6249a3a..e1d8a091f 100644
--- a/src/page/signUp/info/hook/api/useSendMailMutation.ts
+++ b/apps/client/src/page/signUp/info/hook/api/useSendMailMutation.ts
@@ -1,9 +1,10 @@
+import { useToastAction } from '@tiki/utils';
+
import { useMutation } from '@tanstack/react-query';
import { isAxiosError } from 'axios';
import { postEmail } from '@/shared/api/email-verification/signup';
-import { useToastAction } from '@/shared/store/toast';
export const useSendMailMutation = (email: string, onFail: () => void) => {
const { createToast } = useToastAction();
diff --git a/src/page/signUp/info/hook/api/useSignupMutation.ts b/apps/client/src/page/signUp/info/hook/api/useSignupMutation.ts
similarity index 93%
rename from src/page/signUp/info/hook/api/useSignupMutation.ts
rename to apps/client/src/page/signUp/info/hook/api/useSignupMutation.ts
index 76452187f..c76d23249 100644
--- a/src/page/signUp/info/hook/api/useSignupMutation.ts
+++ b/apps/client/src/page/signUp/info/hook/api/useSignupMutation.ts
@@ -1,3 +1,5 @@
+import { useToastAction } from '@tiki/utils';
+
import { useNavigate } from 'react-router-dom';
import { useMutation } from '@tanstack/react-query';
@@ -7,7 +9,6 @@ import { isAxiosError } from 'axios';
import { postSignup } from '@/shared/api/signup/info';
import { UserInfo } from '@/shared/api/signup/info/type';
import { PATH } from '@/shared/constant/path';
-import { useToastAction } from '@/shared/store/toast';
export const useSignupMutation = () => {
const { createToast } = useToastAction();
diff --git a/src/page/signUp/info/hook/common/useDateInput.ts b/apps/client/src/page/signUp/info/hook/common/useDateInput.ts
similarity index 100%
rename from src/page/signUp/info/hook/common/useDateInput.ts
rename to apps/client/src/page/signUp/info/hook/common/useDateInput.ts
diff --git a/src/page/signUp/info/hook/common/useInfoForm.ts b/apps/client/src/page/signUp/info/hook/common/useInfoForm.ts
similarity index 98%
rename from src/page/signUp/info/hook/common/useInfoForm.ts
rename to apps/client/src/page/signUp/info/hook/common/useInfoForm.ts
index 8a2983fa8..027de46cd 100644
--- a/src/page/signUp/info/hook/common/useInfoForm.ts
+++ b/apps/client/src/page/signUp/info/hook/common/useInfoForm.ts
@@ -1,6 +1,6 @@
-import { ChangeEvent, FormEvent, useCallback, useState } from 'react';
+import { useError } from '@tiki/utils';
-import { useError } from '@/common/hook';
+import { ChangeEvent, FormEvent, useCallback, useState } from 'react';
import { getFormatDateString, getFormatNumberString, isValidDate } from '@/page/signUp/info/util/date';
diff --git a/src/page/signUp/info/hook/common/useSelect.ts b/apps/client/src/page/signUp/info/hook/common/useSelect.ts
similarity index 100%
rename from src/page/signUp/info/hook/common/useSelect.ts
rename to apps/client/src/page/signUp/info/hook/common/useSelect.ts
diff --git a/src/page/signUp/info/hook/common/useTimer.ts b/apps/client/src/page/signUp/info/hook/common/useTimer.ts
similarity index 100%
rename from src/page/signUp/info/hook/common/useTimer.ts
rename to apps/client/src/page/signUp/info/hook/common/useTimer.ts
diff --git a/src/page/signUp/info/hook/common/useUnivForm.ts b/apps/client/src/page/signUp/info/hook/common/useUnivForm.ts
similarity index 95%
rename from src/page/signUp/info/hook/common/useUnivForm.ts
rename to apps/client/src/page/signUp/info/hook/common/useUnivForm.ts
index 06ac0c1dd..f659bcfd2 100644
--- a/src/page/signUp/info/hook/common/useUnivForm.ts
+++ b/apps/client/src/page/signUp/info/hook/common/useUnivForm.ts
@@ -1,8 +1,8 @@
+import { useOverlay } from '@tiki/utils';
+
import { ChangeEvent, FormEvent, useState } from 'react';
import { useNavigate } from 'react-router-dom';
-import { useOverlay } from '@/common/hook';
-
import { PATH } from '@/shared/constant/path';
type UnivForm = {
diff --git a/src/page/signUp/info/util/date.ts b/apps/client/src/page/signUp/info/util/date.ts
similarity index 100%
rename from src/page/signUp/info/util/date.ts
rename to apps/client/src/page/signUp/info/util/date.ts
diff --git a/src/page/signUp/info/util/formatTime.ts b/apps/client/src/page/signUp/info/util/formatTime.ts
similarity index 100%
rename from src/page/signUp/info/util/formatTime.ts
rename to apps/client/src/page/signUp/info/util/formatTime.ts
diff --git a/src/shared/api/HTTPError.ts b/apps/client/src/shared/api/HTTPError.ts
similarity index 100%
rename from src/shared/api/HTTPError.ts
rename to apps/client/src/shared/api/HTTPError.ts
diff --git a/src/shared/api/auth/reissue/index.ts b/apps/client/src/shared/api/auth/reissue/index.ts
similarity index 100%
rename from src/shared/api/auth/reissue/index.ts
rename to apps/client/src/shared/api/auth/reissue/index.ts
diff --git a/src/shared/api/auth/signin/index.ts b/apps/client/src/shared/api/auth/signin/index.ts
similarity index 100%
rename from src/shared/api/auth/signin/index.ts
rename to apps/client/src/shared/api/auth/signin/index.ts
diff --git a/src/shared/api/auth/signin/type.ts b/apps/client/src/shared/api/auth/signin/type.ts
similarity index 100%
rename from src/shared/api/auth/signin/type.ts
rename to apps/client/src/shared/api/auth/signin/type.ts
diff --git a/src/shared/api/documents/team/document/index.ts b/apps/client/src/shared/api/documents/team/document/index.ts
similarity index 100%
rename from src/shared/api/documents/team/document/index.ts
rename to apps/client/src/shared/api/documents/team/document/index.ts
diff --git a/src/shared/api/documents/team/timeline/index.ts b/apps/client/src/shared/api/documents/team/timeline/index.ts
similarity index 100%
rename from src/shared/api/documents/team/timeline/index.ts
rename to apps/client/src/shared/api/documents/team/timeline/index.ts
diff --git a/src/shared/api/documents/team/timeline/type.ts b/apps/client/src/shared/api/documents/team/timeline/type.ts
similarity index 100%
rename from src/shared/api/documents/team/timeline/type.ts
rename to apps/client/src/shared/api/documents/team/timeline/type.ts
diff --git a/src/shared/api/email-verification/checking/index.ts b/apps/client/src/shared/api/email-verification/checking/index.ts
similarity index 100%
rename from src/shared/api/email-verification/checking/index.ts
rename to apps/client/src/shared/api/email-verification/checking/index.ts
diff --git a/src/shared/api/email-verification/password/index.ts b/apps/client/src/shared/api/email-verification/password/index.ts
similarity index 100%
rename from src/shared/api/email-verification/password/index.ts
rename to apps/client/src/shared/api/email-verification/password/index.ts
diff --git a/src/shared/api/email-verification/signup/index.ts b/apps/client/src/shared/api/email-verification/signup/index.ts
similarity index 100%
rename from src/shared/api/email-verification/signup/index.ts
rename to apps/client/src/shared/api/email-verification/signup/index.ts
diff --git a/src/shared/api/external/index.ts b/apps/client/src/shared/api/external/index.ts
similarity index 100%
rename from src/shared/api/external/index.ts
rename to apps/client/src/shared/api/external/index.ts
diff --git a/src/shared/api/file/index.ts b/apps/client/src/shared/api/file/index.ts
similarity index 100%
rename from src/shared/api/file/index.ts
rename to apps/client/src/shared/api/file/index.ts
diff --git a/src/shared/api/file/type.ts b/apps/client/src/shared/api/file/type.ts
similarity index 100%
rename from src/shared/api/file/type.ts
rename to apps/client/src/shared/api/file/type.ts
diff --git a/src/shared/api/file/upload/index.ts b/apps/client/src/shared/api/file/upload/index.ts
similarity index 100%
rename from src/shared/api/file/upload/index.ts
rename to apps/client/src/shared/api/file/upload/index.ts
diff --git a/src/shared/api/index.d.ts b/apps/client/src/shared/api/index.d.ts
similarity index 100%
rename from src/shared/api/index.d.ts
rename to apps/client/src/shared/api/index.d.ts
diff --git a/src/shared/api/instance.ts b/apps/client/src/shared/api/instance.ts
similarity index 100%
rename from src/shared/api/instance.ts
rename to apps/client/src/shared/api/instance.ts
diff --git a/src/shared/api/interceptor.ts b/apps/client/src/shared/api/interceptor.ts
similarity index 100%
rename from src/shared/api/interceptor.ts
rename to apps/client/src/shared/api/interceptor.ts
diff --git a/src/shared/api/members/password/index.ts b/apps/client/src/shared/api/members/password/index.ts
similarity index 100%
rename from src/shared/api/members/password/index.ts
rename to apps/client/src/shared/api/members/password/index.ts
diff --git a/src/shared/api/members/password/type.ts b/apps/client/src/shared/api/members/password/type.ts
similarity index 100%
rename from src/shared/api/members/password/type.ts
rename to apps/client/src/shared/api/members/password/type.ts
diff --git a/src/shared/api/members/teams/index.ts b/apps/client/src/shared/api/members/teams/index.ts
similarity index 100%
rename from src/shared/api/members/teams/index.ts
rename to apps/client/src/shared/api/members/teams/index.ts
diff --git a/src/shared/api/members/teams/type.ts b/apps/client/src/shared/api/members/teams/type.ts
similarity index 100%
rename from src/shared/api/members/teams/type.ts
rename to apps/client/src/shared/api/members/teams/type.ts
diff --git a/src/shared/api/queryClient.ts b/apps/client/src/shared/api/queryClient.ts
similarity index 100%
rename from src/shared/api/queryClient.ts
rename to apps/client/src/shared/api/queryClient.ts
diff --git a/src/shared/api/signup/info/index.ts b/apps/client/src/shared/api/signup/info/index.ts
similarity index 100%
rename from src/shared/api/signup/info/index.ts
rename to apps/client/src/shared/api/signup/info/index.ts
diff --git a/src/shared/api/signup/info/type.ts b/apps/client/src/shared/api/signup/info/type.ts
similarity index 100%
rename from src/shared/api/signup/info/type.ts
rename to apps/client/src/shared/api/signup/info/type.ts
diff --git a/src/shared/api/teams/category/index.ts b/apps/client/src/shared/api/teams/category/index.ts
similarity index 100%
rename from src/shared/api/teams/category/index.ts
rename to apps/client/src/shared/api/teams/category/index.ts
diff --git a/src/shared/api/teams/category/type.ts b/apps/client/src/shared/api/teams/category/type.ts
similarity index 100%
rename from src/shared/api/teams/category/type.ts
rename to apps/client/src/shared/api/teams/category/type.ts
diff --git a/src/shared/api/teams/index.ts b/apps/client/src/shared/api/teams/index.ts
similarity index 100%
rename from src/shared/api/teams/index.ts
rename to apps/client/src/shared/api/teams/index.ts
diff --git a/src/shared/api/teams/type.ts b/apps/client/src/shared/api/teams/type.ts
similarity index 100%
rename from src/shared/api/teams/type.ts
rename to apps/client/src/shared/api/teams/type.ts
diff --git a/src/shared/api/time-blocks/team/time-block/index.ts b/apps/client/src/shared/api/time-blocks/team/time-block/index.ts
similarity index 100%
rename from src/shared/api/time-blocks/team/time-block/index.ts
rename to apps/client/src/shared/api/time-blocks/team/time-block/index.ts
diff --git a/src/shared/api/time-blocks/team/time-block/type.ts b/apps/client/src/shared/api/time-blocks/team/time-block/type.ts
similarity index 100%
rename from src/shared/api/time-blocks/team/time-block/type.ts
rename to apps/client/src/shared/api/time-blocks/team/time-block/type.ts
diff --git a/src/shared/api/time-blocks/team/timeline/index.ts b/apps/client/src/shared/api/time-blocks/team/timeline/index.ts
similarity index 100%
rename from src/shared/api/time-blocks/team/timeline/index.ts
rename to apps/client/src/shared/api/time-blocks/team/timeline/index.ts
diff --git a/src/shared/component/ContentBox/ContentBox.style.ts b/apps/client/src/shared/component/ContentBox/ContentBox.style.ts
similarity index 96%
rename from src/shared/component/ContentBox/ContentBox.style.ts
rename to apps/client/src/shared/component/ContentBox/ContentBox.style.ts
index ea1d6fa14..ed8235f37 100644
--- a/src/shared/component/ContentBox/ContentBox.style.ts
+++ b/apps/client/src/shared/component/ContentBox/ContentBox.style.ts
@@ -1,6 +1,5 @@
import { css } from '@emotion/react';
-
-import { theme } from '@/common/style/theme/theme';
+import { theme } from '@tiki/ui';
export const sectionStyle = css({
position: 'relative',
diff --git a/src/shared/component/ContentBox/ContentBox.tsx b/apps/client/src/shared/component/ContentBox/ContentBox.tsx
similarity index 72%
rename from src/shared/component/ContentBox/ContentBox.tsx
rename to apps/client/src/shared/component/ContentBox/ContentBox.tsx
index 6141c4dcd..c75ffa094 100644
--- a/src/shared/component/ContentBox/ContentBox.tsx
+++ b/apps/client/src/shared/component/ContentBox/ContentBox.tsx
@@ -1,11 +1,7 @@
-import { ComponentPropsWithoutRef, ReactNode } from 'react';
+import { IcFile, IcNote, IcTimeline, IcTrash } from '@tiki/icon';
+import { Heading, scrollStyle } from '@tiki/ui';
-import IcFile from '@/common/asset/svg/ic_file.svg?react';
-import ICNote from '@/common/asset/svg/ic_note.svg?react';
-import IcTimeLine from '@/common/asset/svg/ic_timeline.svg?react';
-import IcDeleted from '@/common/asset/svg/ic_trash.svg?react';
-import Heading from '@/common/component/Heading/Heading';
-import { scrollStyle } from '@/common/style/scroll';
+import { ComponentPropsWithoutRef, ReactNode } from 'react';
import {
contentOptionStyle,
@@ -31,10 +27,10 @@ interface ContentBoxProps extends ComponentPropsWithoutRef<'section'> {
}
const ICON_BY_VARIANT = {
- timeline:
,
+ timeline:
,
file:
,
- deleted:
,
- handover:
,
+ deleted:
,
+ handover:
,
};
const ContentBox = ({
diff --git a/src/shared/component/DeleteModal/DeleteModal.style.ts b/apps/client/src/shared/component/DeleteModal/DeleteModal.style.ts
similarity index 84%
rename from src/shared/component/DeleteModal/DeleteModal.style.ts
rename to apps/client/src/shared/component/DeleteModal/DeleteModal.style.ts
index e18d27832..d39d325d2 100644
--- a/src/shared/component/DeleteModal/DeleteModal.style.ts
+++ b/apps/client/src/shared/component/DeleteModal/DeleteModal.style.ts
@@ -1,6 +1,5 @@
import { css } from '@emotion/react';
-
-import { theme } from '@/common/style/theme/theme';
+import { theme } from '@tiki/ui';
export const deleteStyle = css({
'&:hover': {
diff --git a/src/shared/component/DeleteModal/DeleteModal.tsx b/apps/client/src/shared/component/DeleteModal/DeleteModal.tsx
similarity index 91%
rename from src/shared/component/DeleteModal/DeleteModal.tsx
rename to apps/client/src/shared/component/DeleteModal/DeleteModal.tsx
index 4595630e0..23ffc63a6 100644
--- a/src/shared/component/DeleteModal/DeleteModal.tsx
+++ b/apps/client/src/shared/component/DeleteModal/DeleteModal.tsx
@@ -1,7 +1,4 @@
-import Button from '@/common/component/Button/Button';
-import Flex from '@/common/component/Flex/Flex';
-import Heading from '@/common/component/Heading/Heading';
-import Text from '@/common/component/Text/Text';
+import { Button, Flex, Heading, Text } from '@tiki/ui';
import { useDeleteBlockMutation } from '@/page/archiving/index/hook/api/useDeleteBlockMutaion';
import { useDeleteDocumentMutation } from '@/page/archiving/index/hook/api/useDeleteDocumentMutation';
diff --git a/src/shared/component/EmptySection/EmptySection.style.ts b/apps/client/src/shared/component/EmptySection/EmptySection.style.ts
similarity index 89%
rename from src/shared/component/EmptySection/EmptySection.style.ts
rename to apps/client/src/shared/component/EmptySection/EmptySection.style.ts
index 6523e3aab..837ac60c5 100644
--- a/src/shared/component/EmptySection/EmptySection.style.ts
+++ b/apps/client/src/shared/component/EmptySection/EmptySection.style.ts
@@ -1,6 +1,5 @@
import { css } from '@emotion/react';
-
-import { theme } from '@/common/style/theme/theme';
+import { theme } from '@tiki/ui';
export const sectionStyle = css({
display: 'flex',
diff --git a/src/shared/component/EmptySection/EmptySection.tsx b/apps/client/src/shared/component/EmptySection/EmptySection.tsx
similarity index 85%
rename from src/shared/component/EmptySection/EmptySection.tsx
rename to apps/client/src/shared/component/EmptySection/EmptySection.tsx
index 433a67819..9f64cd368 100644
--- a/src/shared/component/EmptySection/EmptySection.tsx
+++ b/apps/client/src/shared/component/EmptySection/EmptySection.tsx
@@ -1,5 +1,4 @@
-import Heading from '@/common/component/Heading/Heading';
-import Text from '@/common/component/Text/Text';
+import { Heading, Text } from '@tiki/ui';
import { headingStyle, sectionStyle, textStyle } from '@/shared/component/EmptySection/EmptySection.style';
import { HEADING, TEXT } from '@/shared/component/EmptySection/constant';
diff --git a/src/shared/component/EmptySection/constant.ts b/apps/client/src/shared/component/EmptySection/constant.ts
similarity index 100%
rename from src/shared/component/EmptySection/constant.ts
rename to apps/client/src/shared/component/EmptySection/constant.ts
diff --git a/src/shared/component/FileGrid/FileGrid.tsx b/apps/client/src/shared/component/FileGrid/FileGrid.tsx
similarity index 82%
rename from src/shared/component/FileGrid/FileGrid.tsx
rename to apps/client/src/shared/component/FileGrid/FileGrid.tsx
index e5900c4ab..c68edaf5f 100644
--- a/src/shared/component/FileGrid/FileGrid.tsx
+++ b/apps/client/src/shared/component/FileGrid/FileGrid.tsx
@@ -1,14 +1,8 @@
-import { useRef } from 'react';
+import { IcThreeDots } from '@tiki/icon';
+import { CheckBox, Flex, Heading, MenuItem, MenuList, MenuRoot, Text } from '@tiki/ui';
+import { useOverlay } from '@tiki/utils';
-import IcOption from '@/common/asset/svg/ic_three_dots.svg?react';
-import CheckBox from '@/common/component/CheckBox/CheckBox';
-import Flex from '@/common/component/Flex/Flex';
-import Heading from '@/common/component/Heading/Heading';
-import Menu from '@/common/component/Menu/Menu';
-import MenuItem from '@/common/component/Menu/MenuItem/MenuItem';
-import MenuList from '@/common/component/Menu/MenuList/MenuList';
-import Text from '@/common/component/Text/Text';
-import { useOverlay } from '@/common/hook';
+import { useRef } from 'react';
import { FILE_ICON, OPTION_ICON } from '@/shared/component/FileGrid/icon';
import {
@@ -89,9 +83,9 @@ const FileGrid = ({
{title}
{variant === 'primary' && (
-
+
)}
diff --git a/src/shared/component/FileGrid/FolderGrid.tsx b/apps/client/src/shared/component/FileGrid/FolderGrid.tsx
similarity index 70%
rename from src/shared/component/FileGrid/FolderGrid.tsx
rename to apps/client/src/shared/component/FileGrid/FolderGrid.tsx
index cad382f86..748da1600 100644
--- a/src/shared/component/FileGrid/FolderGrid.tsx
+++ b/apps/client/src/shared/component/FileGrid/FolderGrid.tsx
@@ -1,12 +1,6 @@
-import IcFolder from '@/common/asset/svg/ic_folder_large.svg?react';
-import IcOption from '@/common/asset/svg/ic_three_dots.svg?react';
-import Flex from '@/common/component/Flex/Flex';
-import Heading from '@/common/component/Heading/Heading';
-import Menu from '@/common/component/Menu/Menu';
-import MenuItem from '@/common/component/Menu/MenuItem/MenuItem';
-import MenuList from '@/common/component/Menu/MenuList/MenuList';
-import { useOverlay } from '@/common/hook';
-import { theme } from '@/common/style/theme/theme';
+import { IcFolderLarge, IcThreeDots } from '@tiki/icon';
+import { Flex, Heading, MenuItem, MenuList, MenuRoot, theme } from '@tiki/ui';
+import { useOverlay } from '@tiki/utils';
import { OPTION_ICON } from '@/shared/component/FileGrid/icon';
import { cardStyle, iconWrapperStyle, nameStyle, optionTextStyle } from '@/shared/component/FileGrid/index.style';
@@ -29,7 +23,7 @@ const FolderGrid = ({ title, variant = 'primary' }: FolderGridProps) => {
return (
- {}
+ {}
@@ -37,8 +31,8 @@ const FolderGrid = ({ title, variant = 'primary' }: FolderGridProps) => {
{variant === 'primary' && (
-
+
)}
diff --git a/apps/client/src/shared/component/FileGrid/icon.tsx b/apps/client/src/shared/component/FileGrid/icon.tsx
new file mode 100644
index 000000000..1c0dad6ee
--- /dev/null
+++ b/apps/client/src/shared/component/FileGrid/icon.tsx
@@ -0,0 +1,14 @@
+import { IcDownload, IcHandoverFill, IcImageFile, IcPdfFile, IcPencil, IcTrash, IcWordFile } from '@tiki/icon';
+
+export const OPTION_ICON = {
+ download:
,
+ deleted:
,
+ handover:
,
+ name:
,
+};
+
+export const FILE_ICON = {
+ pdf:
,
+ word:
,
+ image:
,
+};
diff --git a/src/shared/component/FileGrid/index.style.ts b/apps/client/src/shared/component/FileGrid/index.style.ts
similarity index 95%
rename from src/shared/component/FileGrid/index.style.ts
rename to apps/client/src/shared/component/FileGrid/index.style.ts
index 24113c166..776bc5181 100644
--- a/src/shared/component/FileGrid/index.style.ts
+++ b/apps/client/src/shared/component/FileGrid/index.style.ts
@@ -1,6 +1,5 @@
import { css } from '@emotion/react';
-
-import { theme } from '@/common/style/theme/theme';
+import { theme } from '@tiki/ui';
export const cardStyle = (isSmall: boolean) =>
css({
diff --git a/src/shared/component/Header/Header.style.ts b/apps/client/src/shared/component/Header/Header.style.ts
similarity index 85%
rename from src/shared/component/Header/Header.style.ts
rename to apps/client/src/shared/component/Header/Header.style.ts
index c7db61d09..62b61dc81 100644
--- a/src/shared/component/Header/Header.style.ts
+++ b/apps/client/src/shared/component/Header/Header.style.ts
@@ -1,6 +1,5 @@
import { css } from '@emotion/react';
-
-import { theme } from '@/common/style/theme/theme';
+import { theme } from '@tiki/ui';
export const headerStyle = css({
display: 'flex',
diff --git a/src/shared/component/Header/Header.tsx b/apps/client/src/shared/component/Header/Header.tsx
similarity index 90%
rename from src/shared/component/Header/Header.tsx
rename to apps/client/src/shared/component/Header/Header.tsx
index 514cac894..8204cf388 100644
--- a/src/shared/component/Header/Header.tsx
+++ b/apps/client/src/shared/component/Header/Header.tsx
@@ -1,6 +1,6 @@
-import { useMatch } from 'react-router-dom';
+import { Heading } from '@tiki/ui';
-import Heading from '@/common/component/Heading/Heading';
+import { useMatch } from 'react-router-dom';
import { headerStyle } from '@/shared/component/Header/Header.style';
import RouteNav from '@/shared/component/RouteNav/RouteNav';
diff --git a/src/shared/component/Login/Login.tsx b/apps/client/src/shared/component/Login/Login.tsx
similarity index 100%
rename from src/shared/component/Login/Login.tsx
rename to apps/client/src/shared/component/Login/Login.tsx
diff --git a/src/shared/component/Modal/ModalContainer.tsx b/apps/client/src/shared/component/Modal/ModalContainer.tsx
similarity index 95%
rename from src/shared/component/Modal/ModalContainer.tsx
rename to apps/client/src/shared/component/Modal/ModalContainer.tsx
index 97978320b..9fd671505 100644
--- a/src/shared/component/Modal/ModalContainer.tsx
+++ b/apps/client/src/shared/component/Modal/ModalContainer.tsx
@@ -1,4 +1,4 @@
-import Modal from '@/common/component/Modal/Modal';
+import { Modal } from '@tiki/ui';
import { BlockFlow } from '@/page/archiving/index/component/TimeBlockModal';
diff --git a/src/shared/component/RouteNav/RouteNav.style.ts b/apps/client/src/shared/component/RouteNav/RouteNav.style.ts
similarity index 95%
rename from src/shared/component/RouteNav/RouteNav.style.ts
rename to apps/client/src/shared/component/RouteNav/RouteNav.style.ts
index c67ca8c38..8e2f24853 100644
--- a/src/shared/component/RouteNav/RouteNav.style.ts
+++ b/apps/client/src/shared/component/RouteNav/RouteNav.style.ts
@@ -1,6 +1,5 @@
import { css } from '@emotion/react';
-
-import { theme } from '@/common/style/theme/theme';
+import { theme } from '@tiki/ui';
export const iconFillActiveStyle = (isActive: boolean) =>
css({
diff --git a/src/shared/component/RouteNav/RouteNav.tsx b/apps/client/src/shared/component/RouteNav/RouteNav.tsx
similarity index 74%
rename from src/shared/component/RouteNav/RouteNav.tsx
rename to apps/client/src/shared/component/RouteNav/RouteNav.tsx
index 58537a5c9..700060955 100644
--- a/src/shared/component/RouteNav/RouteNav.tsx
+++ b/apps/client/src/shared/component/RouteNav/RouteNav.tsx
@@ -1,11 +1,8 @@
+import { IcFolderCopy, IcHandoverEmpty, IcTimeline2 } from '@tiki/icon';
import { motion } from 'framer-motion';
import { Link, useLocation } from 'react-router-dom';
-import IcFolder from '@/common/asset/svg/ic_folder_copy.svg?react';
-import IcHandOver from '@/common/asset/svg/ic_handover_empty.svg?react';
-import IcTimeLine from '@/common/asset/svg/ic_nav_timeline.svg?react';
-
import {
iconFillActiveStyle,
iconStrokeActiveStyle,
@@ -27,21 +24,21 @@ const RouteNav = () => {
-
-
+
파일
{isDrivePage && }
-
-
+
타임라인
{isArchivingPage && }
-
-
+
인수인계 노트
{isHandoverPage && }
diff --git a/src/shared/component/SideNavBar/Item/Item.style.ts b/apps/client/src/shared/component/SideNavBar/Item/Item.style.ts
similarity index 94%
rename from src/shared/component/SideNavBar/Item/Item.style.ts
rename to apps/client/src/shared/component/SideNavBar/Item/Item.style.ts
index 8fe6d11de..15954859a 100644
--- a/src/shared/component/SideNavBar/Item/Item.style.ts
+++ b/apps/client/src/shared/component/SideNavBar/Item/Item.style.ts
@@ -1,6 +1,5 @@
import { css } from '@emotion/react';
-
-import { theme } from '@/common/style/theme/theme';
+import { theme } from '@tiki/ui';
export const itemStyle = (isClicked: boolean) =>
css({
diff --git a/src/shared/component/SideNavBar/Item/Item.tsx b/apps/client/src/shared/component/SideNavBar/Item/Item.tsx
similarity index 55%
rename from src/shared/component/SideNavBar/Item/Item.tsx
rename to apps/client/src/shared/component/SideNavBar/Item/Item.tsx
index 7e13094a7..37d8785ee 100644
--- a/src/shared/component/SideNavBar/Item/Item.tsx
+++ b/apps/client/src/shared/component/SideNavBar/Item/Item.tsx
@@ -1,10 +1,9 @@
+import { IcAdd, IcGlobal } from '@tiki/icon';
+import { Flex, ToolTip } from '@tiki/ui';
import { motion } from 'framer-motion';
import { HTMLAttributes, useState } from 'react';
-import Flex from '@/common/component/Flex/Flex';
-import ToolTip from '@/common/component/ToolTip/ToolTip';
-
import {
firstSpellStyle,
indicatorStyle,
@@ -13,13 +12,43 @@ import {
} from '@/shared/component/SideNavBar/Item/Item.style';
interface ItemProps extends HTMLAttributes {
- hoverMessage: string;
- logoUrl: string | null;
+ variant:
+ | {
+ type: 'add';
+ hoverMessage: string;
+ }
+ | {
+ type: 'dashboard';
+ hoverMessage: string;
+ }
+ | {
+ type: 'team';
+ logoUrl: string | null;
+ hoverMessage: string;
+ };
isClicked: boolean;
onLogoClick: () => void;
}
-const Item = ({ logoUrl = '', isClicked, onLogoClick, hoverMessage, ...props }: ItemProps) => {
+const getItemsInfo = (variant: Required) => {
+ switch (variant?.type) {
+ case 'add': {
+ return ;
+ }
+ case 'dashboard': {
+ return ;
+ }
+ case 'team': {
+ return variant.logoUrl ? (
+
+ ) : (
+ {variant.hoverMessage[0]}
+ );
+ }
+ }
+};
+
+const Item = ({ variant, isClicked, onLogoClick, ...props }: ItemProps) => {
const [isHover, setIsHover] = useState(false);
const handleMouseEnter = () => {
@@ -41,7 +70,7 @@ const Item = ({ logoUrl = '', isClicked, onLogoClick, hoverMessage, ...props }:
{isClicked && (
)}
-
+
- {logoUrl ?
:
{hoverMessage[0]}}
+ {getItemsInfo(variant)}
diff --git a/src/shared/component/SideNavBar/SideNavBar.style.ts b/apps/client/src/shared/component/SideNavBar/SideNavBar.style.ts
similarity index 89%
rename from src/shared/component/SideNavBar/SideNavBar.style.ts
rename to apps/client/src/shared/component/SideNavBar/SideNavBar.style.ts
index 6edd45a29..cc5cf1e5f 100644
--- a/src/shared/component/SideNavBar/SideNavBar.style.ts
+++ b/apps/client/src/shared/component/SideNavBar/SideNavBar.style.ts
@@ -1,6 +1,5 @@
import { css } from '@emotion/react';
-
-import { theme } from '@/common/style/theme/theme';
+import { theme } from '@tiki/ui';
export const containerStyle = css({
position: 'fixed',
diff --git a/src/shared/component/SideNavBar/SideNavBar.tsx b/apps/client/src/shared/component/SideNavBar/SideNavBar.tsx
similarity index 74%
rename from src/shared/component/SideNavBar/SideNavBar.tsx
rename to apps/client/src/shared/component/SideNavBar/SideNavBar.tsx
index 8fc719cf1..e3726359c 100644
--- a/src/shared/component/SideNavBar/SideNavBar.tsx
+++ b/apps/client/src/shared/component/SideNavBar/SideNavBar.tsx
@@ -1,15 +1,9 @@
+import { IcAvatar, IcTikiLogo } from '@tiki/icon';
+import { Divider, Flex, ToolTip, theme } from '@tiki/ui';
+
import { useState } from 'react';
import { useNavigate } from 'react-router-dom';
-import addUrl from '@/common/asset/svg/ic_add.svg';
-import avatarUrl from '@/common/asset/svg/ic_avatar.svg';
-import globalUrl from '@/common/asset/svg/ic_global.svg';
-import TikiLogo from '@/common/asset/svg/ic_tiki_logo.svg?react';
-import Divider from '@/common/component/Divider/Divider';
-import Flex from '@/common/component/Flex/Flex';
-import ToolTip from '@/common/component/ToolTip/ToolTip';
-import { theme } from '@/common/style/theme/theme';
-
import Item from '@/shared/component/SideNavBar/Item/Item';
import { containerStyle, settingStyle, tikiLogoStyle } from '@/shared/component/SideNavBar/SideNavBar.style';
import { PATH } from '@/shared/constant/path';
@@ -44,13 +38,12 @@ const SideNavBar = () => {
return (