diff --git a/packages/core/client.d.ts b/packages/core/client.d.ts new file mode 100644 index 00000000..ae06e375 --- /dev/null +++ b/packages/core/client.d.ts @@ -0,0 +1,13 @@ +interface ImportMetaEnv { + readonly VITE_FB_API_KEY: string; + readonly VITE_FB_AUTH_DOMAIN: string; + readonly VITE_FB_PROJECT_ID: string; + readonly VITE_FB_STORAGE_BUCKET: string; + readonly VITE_FB_MESSAGING_SENDER_ID: string; + readonly VITE_FB_APP_ID: string; + readonly VITE_FB_MEASUREMENT_ID: string; +} + +interface ImportMeta { + readonly env: ImportMetaEnv; +} diff --git a/packages/core/package.json b/packages/core/package.json index e14dba46..1c9c04c2 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -10,7 +10,8 @@ "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0" }, "dependencies": { - "@emotion/react": "^11.11.4" + "@emotion/react": "^11.11.4", + "firebase": "^10.12.4" }, "devDependencies": { "@types/react": "^18.3.3", diff --git a/packages/core/src/assets/fonts/pretendard/Pretendard-Bold.woff2 b/packages/core/src/assets/fonts/pretendard/Pretendard-Bold.woff2 deleted file mode 100644 index 4d40a1ab..00000000 Binary files a/packages/core/src/assets/fonts/pretendard/Pretendard-Bold.woff2 and /dev/null differ diff --git a/packages/core/src/assets/fonts/pretendard/Pretendard-Medium.woff2 b/packages/core/src/assets/fonts/pretendard/Pretendard-Medium.woff2 deleted file mode 100644 index f8c743d6..00000000 Binary files a/packages/core/src/assets/fonts/pretendard/Pretendard-Medium.woff2 and /dev/null differ diff --git a/packages/core/src/assets/fonts/pretendard/Pretendard-SemiBold.woff2 b/packages/core/src/assets/fonts/pretendard/Pretendard-SemiBold.woff2 deleted file mode 100644 index 4c6a32de..00000000 Binary files a/packages/core/src/assets/fonts/pretendard/Pretendard-SemiBold.woff2 and /dev/null differ diff --git a/packages/core/src/assets/fonts/pyeongChang/PyeongChang-Bold.otf b/packages/core/src/assets/fonts/pyeongChang/PyeongChang-Bold.otf deleted file mode 100644 index bae2f07f..00000000 Binary files a/packages/core/src/assets/fonts/pyeongChang/PyeongChang-Bold.otf and /dev/null differ diff --git a/packages/core/src/assets/fonts/pyeongChang/PyeongChang-Regular.otf b/packages/core/src/assets/fonts/pyeongChang/PyeongChang-Regular.otf deleted file mode 100644 index 46e269fe..00000000 Binary files a/packages/core/src/assets/fonts/pyeongChang/PyeongChang-Regular.otf and /dev/null differ diff --git a/packages/core/src/assets/fonts/pyeongChangPeace/PyeongChangPeace-Bold.otf b/packages/core/src/assets/fonts/pyeongChangPeace/PyeongChangPeace-Bold.otf deleted file mode 100644 index 998f5b78..00000000 Binary files a/packages/core/src/assets/fonts/pyeongChangPeace/PyeongChangPeace-Bold.otf and /dev/null differ diff --git a/packages/core/src/assets/fonts/pyeongChangPeace/PyeongChangPeace-Light.otf b/packages/core/src/assets/fonts/pyeongChangPeace/PyeongChangPeace-Light.otf deleted file mode 100644 index df659147..00000000 Binary files a/packages/core/src/assets/fonts/pyeongChangPeace/PyeongChangPeace-Light.otf and /dev/null differ diff --git a/packages/core/src/assets/tmp.svg b/packages/core/src/assets/tmp.svg deleted file mode 100644 index a7a50a7f..00000000 --- a/packages/core/src/assets/tmp.svg +++ /dev/null @@ -1,56 +0,0 @@ - - - - -image/svg+xml \ No newline at end of file diff --git a/packages/service/src/common/contexts/ModalContext.ts b/packages/core/src/contexts/ModalContext.ts similarity index 67% rename from packages/service/src/common/contexts/ModalContext.ts rename to packages/core/src/contexts/ModalContext.ts index 84d0d9e2..80b37c73 100644 --- a/packages/service/src/common/contexts/ModalContext.ts +++ b/packages/core/src/contexts/ModalContext.ts @@ -1,9 +1,8 @@ import { createContext, Dispatch, SetStateAction } from "react"; -import { ModalType } from "../components/ModalContainer/ModalContainer"; export interface ModalState { - type: ModalType | null; - props?: any; // todo change any + type: any; + props?: any; } export const ModalStateContext = createContext(null); diff --git a/packages/core/src/contexts/index.ts b/packages/core/src/contexts/index.ts new file mode 100644 index 00000000..6dce70d1 --- /dev/null +++ b/packages/core/src/contexts/index.ts @@ -0,0 +1 @@ +export * from "./ModalContext"; diff --git a/packages/core/src/hooks/index.ts b/packages/core/src/hooks/index.ts new file mode 100644 index 00000000..7e3d2840 --- /dev/null +++ b/packages/core/src/hooks/index.ts @@ -0,0 +1,3 @@ +export { useAuth } from "./useAuth"; +export { useModal } from "./useModal"; +export { useScrollStop } from "./useScrollStop"; diff --git a/packages/service/src/common/hooks/useAuth.ts b/packages/core/src/hooks/useAuth.ts similarity index 100% rename from packages/service/src/common/hooks/useAuth.ts rename to packages/core/src/hooks/useAuth.ts diff --git a/packages/service/src/common/hooks/useModal.ts b/packages/core/src/hooks/useModal.ts similarity index 100% rename from packages/service/src/common/hooks/useModal.ts rename to packages/core/src/hooks/useModal.ts diff --git a/packages/service/src/common/hooks/useScrollStop.ts b/packages/core/src/hooks/useScrollStop.ts similarity index 100% rename from packages/service/src/common/hooks/useScrollStop.ts rename to packages/core/src/hooks/useScrollStop.ts diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index 0e66c3ff..e69de29b 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -1,2 +0,0 @@ -export * from "./models"; -export * from "./theme"; diff --git a/packages/core/src/models/TestModel.ts b/packages/core/src/models/TestModel.ts deleted file mode 100644 index 2a8ef457..00000000 --- a/packages/core/src/models/TestModel.ts +++ /dev/null @@ -1,5 +0,0 @@ -export interface TestModel { - id: string; - name: string; - description: string; -} diff --git a/packages/core/src/models/index.ts b/packages/core/src/models/index.ts deleted file mode 100644 index 23166d0f..00000000 --- a/packages/core/src/models/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { type TestModel } from "./TestModel"; diff --git a/packages/service/src/common/providers/ModalProvider.tsx b/packages/core/src/providers/ModalProvider.tsx similarity index 81% rename from packages/service/src/common/providers/ModalProvider.tsx rename to packages/core/src/providers/ModalProvider.tsx index 6c5236d7..9b42bdc8 100644 --- a/packages/service/src/common/providers/ModalProvider.tsx +++ b/packages/core/src/providers/ModalProvider.tsx @@ -1,10 +1,5 @@ import { ReactNode, useState } from "react"; -import { - ModalSetterContext, - ModalStateContext, - ModalState, -} from "../contexts/ModalContext"; - +import { ModalSetterContext, ModalStateContext, ModalState } from "../contexts"; interface ModalProviderProps { children: ReactNode; } diff --git a/packages/core/src/providers/index.ts b/packages/core/src/providers/index.ts new file mode 100644 index 00000000..4fa75983 --- /dev/null +++ b/packages/core/src/providers/index.ts @@ -0,0 +1 @@ +export * from "./ModalProvider"; diff --git a/packages/core/src/types/index.ts b/packages/core/src/types/index.ts new file mode 100644 index 00000000..904db426 --- /dev/null +++ b/packages/core/src/types/index.ts @@ -0,0 +1,2 @@ +export * from "./orderEvent"; +export * from "./partsEvent"; diff --git a/packages/service/src/apis/orderEvent/type.ts b/packages/core/src/types/orderEvent/index.ts similarity index 100% rename from packages/service/src/apis/orderEvent/type.ts rename to packages/core/src/types/orderEvent/index.ts diff --git a/packages/service/src/apis/partsEvent/type.ts b/packages/core/src/types/partsEvent/index.ts similarity index 100% rename from packages/service/src/apis/partsEvent/type.ts rename to packages/core/src/types/partsEvent/index.ts diff --git a/packages/service/src/common/utils/customFetch.ts b/packages/core/src/utils/customFetch.ts similarity index 100% rename from packages/service/src/common/utils/customFetch.ts rename to packages/core/src/utils/customFetch.ts diff --git a/packages/service/src/common/utils/getAccessToken.ts b/packages/core/src/utils/getAccessToken.ts similarity index 100% rename from packages/service/src/common/utils/getAccessToken.ts rename to packages/core/src/utils/getAccessToken.ts diff --git a/packages/core/src/utils/index.ts b/packages/core/src/utils/index.ts new file mode 100644 index 00000000..cb2ebc15 --- /dev/null +++ b/packages/core/src/utils/index.ts @@ -0,0 +1,2 @@ +export { customFetch } from "./customFetch"; +export { getAccessToken } from "./getAccessToken"; diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json index 5a5c6ab8..309926e9 100644 --- a/packages/core/tsconfig.json +++ b/packages/core/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "../../tsconfig.root.json", "compilerOptions": { + "jsx": "react-jsx", "paths": { "@core/*": [ "src/*" @@ -31,7 +32,5 @@ "noFallthroughCasesInSwitch": true, }, "files": [], - "include": [ - "src", - ] +"include": ["src", "./vite-env.d.ts"], } \ No newline at end of file diff --git a/packages/core/vite-env.d.ts b/packages/core/vite-env.d.ts new file mode 100644 index 00000000..11f02fe2 --- /dev/null +++ b/packages/core/vite-env.d.ts @@ -0,0 +1 @@ +/// diff --git a/packages/service/src/Demo/pages/ButtonDemoPage.tsx b/packages/service/src/Demo/pages/ButtonDemoPage.tsx index e1d52ebc..4071930c 100644 --- a/packages/service/src/Demo/pages/ButtonDemoPage.tsx +++ b/packages/service/src/Demo/pages/ButtonDemoPage.tsx @@ -1,5 +1,5 @@ import { Button, ButtonVariant } from "@service/common/components/Button"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; import { css } from "@emotion/react"; import { ClipBoardButton } from "@service/common/components/ClipBoardButton"; import { CheckBox } from "@service/common/components/CheckBox"; diff --git a/packages/service/src/Demo/pages/ModalDemoPage.tsx b/packages/service/src/Demo/pages/ModalDemoPage.tsx index f136d539..fb8c0ccd 100644 --- a/packages/service/src/Demo/pages/ModalDemoPage.tsx +++ b/packages/service/src/Demo/pages/ModalDemoPage.tsx @@ -1,4 +1,4 @@ -import { useModal } from "@service/common/hooks/useModal"; +import { useModal } from "@watermelon-clap/core/src/hooks"; import { Button } from "@service/common/components/Button"; export const ModalDemoPage = () => { diff --git a/packages/service/src/apis/orderEvent/apiGetOrderEvent.ts b/packages/service/src/apis/orderEvent/apiGetOrderEvent.ts index 0b35c7e8..cef08a6d 100644 --- a/packages/service/src/apis/orderEvent/apiGetOrderEvent.ts +++ b/packages/service/src/apis/orderEvent/apiGetOrderEvent.ts @@ -1,5 +1,5 @@ -import { IOrderEvent } from "./type"; -import { customFetch } from "@service/common/utils/customFetch"; +import { IOrderEvent } from "@watermelon-clap/core/src/types"; +import { customFetch } from "@watermelon-clap/core/src/utils"; export const apiGetOrderEvent = async (id?: string): Promise => { const url = id diff --git a/packages/service/src/apis/orderEvent/apiPostOrderEvent.ts b/packages/service/src/apis/orderEvent/apiPostOrderEvent.ts index 4c4a6322..73e97e47 100644 --- a/packages/service/src/apis/orderEvent/apiPostOrderEvent.ts +++ b/packages/service/src/apis/orderEvent/apiPostOrderEvent.ts @@ -1,5 +1,8 @@ -import { IPostOrderEventRequest, IPostOrderEventResponse } from "./type"; -import { customFetch } from "@service/common/utils/customFetch"; +import { + IPostOrderEventRequest, + IPostOrderEventResponse, +} from "@watermelon-clap/core/src/types"; +import { customFetch } from "@watermelon-clap/core/src/utils"; const DEFAULT_DELAY = 2000; diff --git a/packages/service/src/apis/partsEvent/apiGetPartsRemain.ts b/packages/service/src/apis/partsEvent/apiGetPartsRemain.ts index 3e5a3af4..aeb787eb 100644 --- a/packages/service/src/apis/partsEvent/apiGetPartsRemain.ts +++ b/packages/service/src/apis/partsEvent/apiGetPartsRemain.ts @@ -1,4 +1,4 @@ -import { getAccessToken } from "@service/common/utils"; +import { getAccessToken } from "@watermelon-clap/core/src/utils"; export const apiGetPartsRemain = () => fetch(`${import.meta.env.VITE_BACK_BASE_URL}/event/parts/remain`, { diff --git a/packages/service/src/apis/partsEvent/apiPostParts.ts b/packages/service/src/apis/partsEvent/apiPostParts.ts index 66fa4e9b..90458a12 100644 --- a/packages/service/src/apis/partsEvent/apiPostParts.ts +++ b/packages/service/src/apis/partsEvent/apiPostParts.ts @@ -1,5 +1,5 @@ -import { getAccessToken } from "@service/common/utils"; -import { IParts } from "./type"; +import { IParts } from "@watermelon-clap/core/src/types"; +import { getAccessToken } from "@watermelon-clap/core/src/utils"; export const apiPostParts = (): Promise => fetch( diff --git a/packages/service/src/common/components/Button/Button.css.ts b/packages/service/src/common/components/Button/Button.css.ts index a749962d..d44ed4ee 100644 --- a/packages/service/src/common/components/Button/Button.css.ts +++ b/packages/service/src/common/components/Button/Button.css.ts @@ -1,5 +1,5 @@ import { css } from "@emotion/react"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; export const longButtonStyle = css` ${theme.flex.center} diff --git a/packages/service/src/common/components/CheckBox/CheckBox.css.ts b/packages/service/src/common/components/CheckBox/CheckBox.css.ts index a8da3af7..1ed14781 100644 --- a/packages/service/src/common/components/CheckBox/CheckBox.css.ts +++ b/packages/service/src/common/components/CheckBox/CheckBox.css.ts @@ -1,5 +1,5 @@ import { css } from "@emotion/react"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; export const checkBoxContainerStyle = css` ${theme.flex.center} diff --git a/packages/service/src/common/components/ClipBoardButton/ClipBoardButton.css.ts b/packages/service/src/common/components/ClipBoardButton/ClipBoardButton.css.ts index 8cfd0c10..aa3f905a 100644 --- a/packages/service/src/common/components/ClipBoardButton/ClipBoardButton.css.ts +++ b/packages/service/src/common/components/ClipBoardButton/ClipBoardButton.css.ts @@ -1,5 +1,5 @@ import { css } from "@emotion/react"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; export const clipButtonStyle = css` ${theme.flex.center} diff --git a/packages/service/src/common/components/Footer/Footer.css.ts b/packages/service/src/common/components/Footer/Footer.css.ts index a09106c3..e4cd48a3 100644 --- a/packages/service/src/common/components/Footer/Footer.css.ts +++ b/packages/service/src/common/components/Footer/Footer.css.ts @@ -1,6 +1,6 @@ import { css } from "@emotion/react"; import { mobile } from "@service/common/responsive/responsive"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; export const footerStyles = css` position: relative; diff --git a/packages/service/src/common/components/GlobalNavigationBar/GlobalNavigationBar.css.ts b/packages/service/src/common/components/GlobalNavigationBar/GlobalNavigationBar.css.ts index 4ab7f651..3e593fcb 100644 --- a/packages/service/src/common/components/GlobalNavigationBar/GlobalNavigationBar.css.ts +++ b/packages/service/src/common/components/GlobalNavigationBar/GlobalNavigationBar.css.ts @@ -1,7 +1,7 @@ import { css } from "@emotion/react"; import { mobile } from "@service/common/responsive/responsive"; import { GNB_BREAKPOINT } from "@service/constants/breakpoints"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; export const headerContainerStyles = css` padding: 16px calc(-30px + 10%); diff --git a/packages/service/src/common/components/GlobalNavigationBar/GlobalNavs/GlobalNavs.css.ts b/packages/service/src/common/components/GlobalNavigationBar/GlobalNavs/GlobalNavs.css.ts index 8ccb1e11..0be2e729 100644 --- a/packages/service/src/common/components/GlobalNavigationBar/GlobalNavs/GlobalNavs.css.ts +++ b/packages/service/src/common/components/GlobalNavigationBar/GlobalNavs/GlobalNavs.css.ts @@ -1,7 +1,7 @@ import { css } from "@emotion/react"; import { mobile } from "@service/common/responsive/responsive"; import { GNB_BREAKPOINT } from "@service/constants/breakpoints"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; export const navsContainerStyles = (isOpen: boolean) => css` display: flex; diff --git a/packages/service/src/common/components/GlobalNavigationBar/MenuButton/MenuButton.tsx b/packages/service/src/common/components/GlobalNavigationBar/MenuButton/MenuButton.tsx index 6d59f51d..710cb846 100644 --- a/packages/service/src/common/components/GlobalNavigationBar/MenuButton/MenuButton.tsx +++ b/packages/service/src/common/components/GlobalNavigationBar/MenuButton/MenuButton.tsx @@ -1,5 +1,5 @@ import { css } from "@emotion/react"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; import { motion, Transition } from "framer-motion"; interface IMenuButtonProps { diff --git a/packages/service/src/common/components/ModalContainer/ModalContainer.tsx b/packages/service/src/common/components/ModalContainer/ModalContainer.tsx index 9ada127d..49c5182a 100644 --- a/packages/service/src/common/components/ModalContainer/ModalContainer.tsx +++ b/packages/service/src/common/components/ModalContainer/ModalContainer.tsx @@ -1,7 +1,7 @@ import { useContext } from "react"; import { createPortal } from "react-dom"; -import { ModalStateContext } from "@service/common/contexts/ModalContext"; -import { useModal } from "@service/common/hooks/useModal"; +import { ModalStateContext } from "@watermelon-clap/core/src/contexts"; +import { useModal } from "@watermelon-clap/core/src/hooks"; import { GoogleLoginModal, PendingModal, diff --git a/packages/service/src/common/components/ModalContainer/content/modalContent.tsx b/packages/service/src/common/components/ModalContainer/content/modalContent.tsx index fb32fa11..7989cf28 100644 --- a/packages/service/src/common/components/ModalContainer/content/modalContent.tsx +++ b/packages/service/src/common/components/ModalContainer/content/modalContent.tsx @@ -1,6 +1,6 @@ import { css } from "@emotion/react"; import { Space } from "@service/common/styles/Space"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; import { ReactComponent as NLogo } from "public/images/gnb/n-logo.svg"; export const MODAL_N_QUIZ_TITLE = ( diff --git a/packages/service/src/common/components/ModalContainer/modal/AlertModal/AlertModal.css.ts b/packages/service/src/common/components/ModalContainer/modal/AlertModal/AlertModal.css.ts index c6aad41b..a56b4585 100644 --- a/packages/service/src/common/components/ModalContainer/modal/AlertModal/AlertModal.css.ts +++ b/packages/service/src/common/components/ModalContainer/modal/AlertModal/AlertModal.css.ts @@ -1,6 +1,6 @@ import { css } from "@emotion/react"; import { mobile } from "@service/common/responsive/responsive"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; export const alertModalStyles = { content: { diff --git a/packages/service/src/common/components/ModalContainer/modal/AlertModal/AlertModal.tsx b/packages/service/src/common/components/ModalContainer/modal/AlertModal/AlertModal.tsx index fe19646a..4735edac 100644 --- a/packages/service/src/common/components/ModalContainer/modal/AlertModal/AlertModal.tsx +++ b/packages/service/src/common/components/ModalContainer/modal/AlertModal/AlertModal.tsx @@ -1,6 +1,6 @@ import Modal from "react-modal"; import { Button, ButtonVariant } from "../../../Button"; -import { useScrollStop } from "@service/common/hooks/useScrollStop"; +import { useScrollStop } from "@watermelon-clap/core/src/hooks"; import { alertModalStyles, alertModalBodyStyles } from "./AlertModal.css"; import { ReactNode } from "react"; import { DefaultModalProps } from "../../ModalContainer"; diff --git a/packages/service/src/common/components/ModalContainer/modal/GoolgleLoginModal/GoogleLoginModal.css.ts b/packages/service/src/common/components/ModalContainer/modal/GoolgleLoginModal/GoogleLoginModal.css.ts index 8d9b2072..1bf318fe 100644 --- a/packages/service/src/common/components/ModalContainer/modal/GoolgleLoginModal/GoogleLoginModal.css.ts +++ b/packages/service/src/common/components/ModalContainer/modal/GoolgleLoginModal/GoogleLoginModal.css.ts @@ -1,6 +1,6 @@ import { css } from "@emotion/react"; import { mobile } from "@service/common/responsive/responsive"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; export const googleLoginModalStyles = { content: { diff --git a/packages/service/src/common/components/ModalContainer/modal/GoolgleLoginModal/GoogleLoginModal.tsx b/packages/service/src/common/components/ModalContainer/modal/GoolgleLoginModal/GoogleLoginModal.tsx index 80348e6b..4746660b 100644 --- a/packages/service/src/common/components/ModalContainer/modal/GoolgleLoginModal/GoogleLoginModal.tsx +++ b/packages/service/src/common/components/ModalContainer/modal/GoolgleLoginModal/GoogleLoginModal.tsx @@ -1,12 +1,11 @@ import Modal from "react-modal"; import { Button, ButtonVariant } from "../../../Button"; -import { useScrollStop } from "@service/common/hooks/useScrollStop"; -import { useAuth } from "@service/common/hooks/useAuth"; +import { useScrollStop, useAuth } from "@watermelon-clap/core/src/hooks"; +import { theme } from "@watermelon-clap/core/src/theme"; import { googleLoginModalStyles, googleLoginModalBodyStyles, } from "./GoogleLoginModal.css"; -import { theme } from "@watermelon-clap/core"; import { DefaultModalProps } from "../../ModalContainer"; export const GoogleLoginModal = ({ diff --git a/packages/service/src/common/components/ModalContainer/modal/NavigateModal/NavigateModal.css.ts b/packages/service/src/common/components/ModalContainer/modal/NavigateModal/NavigateModal.css.ts index 63870a76..dd64b076 100644 --- a/packages/service/src/common/components/ModalContainer/modal/NavigateModal/NavigateModal.css.ts +++ b/packages/service/src/common/components/ModalContainer/modal/NavigateModal/NavigateModal.css.ts @@ -1,6 +1,6 @@ import { css } from "@emotion/react"; import { mobile } from "@service/common/responsive/responsive"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; export const navigatgeModalStyles = { content: { diff --git a/packages/service/src/common/components/ModalContainer/modal/NavigateModal/NavigateModal.tsx b/packages/service/src/common/components/ModalContainer/modal/NavigateModal/NavigateModal.tsx index 06f577ef..e32f3edf 100644 --- a/packages/service/src/common/components/ModalContainer/modal/NavigateModal/NavigateModal.tsx +++ b/packages/service/src/common/components/ModalContainer/modal/NavigateModal/NavigateModal.tsx @@ -1,6 +1,7 @@ import Modal from "react-modal"; import { Button, ButtonVariant } from "../../../Button"; -import { useScrollStop } from "@service/common/hooks/useScrollStop"; +import { useScrollStop } from "@watermelon-clap/core/src/hooks"; +import { theme } from "@watermelon-clap/core/src/theme"; import { navigatgeModalStyles, navigatgeModalBodyStyles, @@ -8,7 +9,6 @@ import { } from "./NavigateModal.css"; import { ReactNode } from "react"; import { DefaultModalProps } from "../../ModalContainer"; -import { theme } from "@watermelon-clap/core"; import { NEW_CAR_PAGE_ROUTE } from "@service/constants/routes"; export interface NavigateModalProps extends DefaultModalProps { diff --git a/packages/service/src/common/components/ModalContainer/modal/PendingModal/PendingModal.css.ts b/packages/service/src/common/components/ModalContainer/modal/PendingModal/PendingModal.css.ts index 46b5c0b9..102b9ba7 100644 --- a/packages/service/src/common/components/ModalContainer/modal/PendingModal/PendingModal.css.ts +++ b/packages/service/src/common/components/ModalContainer/modal/PendingModal/PendingModal.css.ts @@ -1,6 +1,6 @@ import { css } from "@emotion/react"; import { mobile } from "@service/common/responsive/responsive"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; export const pendingModalStyles = { content: { diff --git a/packages/service/src/common/components/ModalContainer/modal/PendingModal/PendingModal.tsx b/packages/service/src/common/components/ModalContainer/modal/PendingModal/PendingModal.tsx index 25d96a6f..71a41bc6 100644 --- a/packages/service/src/common/components/ModalContainer/modal/PendingModal/PendingModal.tsx +++ b/packages/service/src/common/components/ModalContainer/modal/PendingModal/PendingModal.tsx @@ -1,12 +1,12 @@ import Modal from "react-modal"; -import { useScrollStop } from "@service/common/hooks/useScrollStop"; +import { useScrollStop } from "@watermelon-clap/core/src/hooks"; +import { theme } from "@watermelon-clap/core/src/theme"; import { pendingModalStyles, pendingModalBodyStyles, pendingImgStyle, } from "./PendingModal.css"; import { DefaultModalProps } from "../../ModalContainer"; -import { theme } from "@watermelon-clap/core"; import { css } from "@emotion/react"; import { MODAL_N_QUIZ_TITLE } from "../../content/modalContent"; diff --git a/packages/service/src/common/utils/index.ts b/packages/service/src/common/utils/index.ts index 088b4480..7780580f 100644 --- a/packages/service/src/common/utils/index.ts +++ b/packages/service/src/common/utils/index.ts @@ -1,3 +1,2 @@ -export * from "./getAccessToken"; export * from "./confettiCrafter"; export * from "./formatter"; diff --git a/packages/service/src/components/main/Banner/Banner.css.ts b/packages/service/src/components/main/Banner/Banner.css.ts index 912cba99..b6604095 100644 --- a/packages/service/src/components/main/Banner/Banner.css.ts +++ b/packages/service/src/components/main/Banner/Banner.css.ts @@ -1,6 +1,6 @@ import { css } from "@emotion/react"; import { mobile } from "@service/common/responsive/responsive"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; export const container = css` position: relative; diff --git a/packages/service/src/components/main/Banner/Banner.tsx b/packages/service/src/components/main/Banner/Banner.tsx index 2d629fa1..668f2bc2 100644 --- a/packages/service/src/components/main/Banner/Banner.tsx +++ b/packages/service/src/components/main/Banner/Banner.tsx @@ -1,6 +1,6 @@ import { useState, useEffect, useRef, useCallback } from "react"; import { Button, ButtonVariant } from "src/common/components/Button"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; import { css } from "@emotion/react"; import * as style from "./Banner.css"; import { mobile } from "@service/common/responsive/responsive"; diff --git a/packages/service/src/components/main/EventCard/EventCard.css.ts b/packages/service/src/components/main/EventCard/EventCard.css.ts index db021202..d406ffdb 100644 --- a/packages/service/src/components/main/EventCard/EventCard.css.ts +++ b/packages/service/src/components/main/EventCard/EventCard.css.ts @@ -1,6 +1,6 @@ import { css } from "@emotion/react"; import { mobile } from "@service/common/responsive/responsive"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; export const eventCard = (isMainEvent: boolean) => css` padding: 72px; diff --git a/packages/service/src/components/main/EventCard/EventCard.tsx b/packages/service/src/components/main/EventCard/EventCard.tsx index 0aa6e3af..9a14a54f 100644 --- a/packages/service/src/components/main/EventCard/EventCard.tsx +++ b/packages/service/src/components/main/EventCard/EventCard.tsx @@ -1,4 +1,4 @@ -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; import * as style from "./EventCard.css"; import { IEventData } from "@service/pages/Main/eventData"; import { Button, ButtonVariant } from "@service/common/components/Button"; diff --git a/packages/service/src/components/main/EventPeriod/EventPeriod.css.ts b/packages/service/src/components/main/EventPeriod/EventPeriod.css.ts index 9ec0861d..974bce84 100644 --- a/packages/service/src/components/main/EventPeriod/EventPeriod.css.ts +++ b/packages/service/src/components/main/EventPeriod/EventPeriod.css.ts @@ -1,6 +1,6 @@ import { css } from "@emotion/react"; import { mobile } from "@service/common/responsive/responsive"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; export const container = css` color: ${theme.color.white}; diff --git a/packages/service/src/components/main/EventPeriod/EventPeriod.tsx b/packages/service/src/components/main/EventPeriod/EventPeriod.tsx index 71eda1ef..b40bd045 100644 --- a/packages/service/src/components/main/EventPeriod/EventPeriod.tsx +++ b/packages/service/src/components/main/EventPeriod/EventPeriod.tsx @@ -1,5 +1,5 @@ import * as style from "./EventPeriod.css"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; import { Timer } from "./Timer"; export const EventPeriod = () => { diff --git a/packages/service/src/components/main/EventPeriod/Timer/Timer.css.ts b/packages/service/src/components/main/EventPeriod/Timer/Timer.css.ts index d649be11..6b44a8d5 100644 --- a/packages/service/src/components/main/EventPeriod/Timer/Timer.css.ts +++ b/packages/service/src/components/main/EventPeriod/Timer/Timer.css.ts @@ -1,6 +1,6 @@ import { css } from "@emotion/react"; import { mobile } from "@service/common/responsive/responsive"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; export const staticCardStyles = (position: "upper" | "lower") => css` position: relative; diff --git a/packages/service/src/components/main/EventPeriod/Timer/Timer.tsx b/packages/service/src/components/main/EventPeriod/Timer/Timer.tsx index 1aef99fc..1c27ed3c 100644 --- a/packages/service/src/components/main/EventPeriod/Timer/Timer.tsx +++ b/packages/service/src/components/main/EventPeriod/Timer/Timer.tsx @@ -20,7 +20,7 @@ import { textStyles, } from "./Timer.css"; import { mobile } from "@service/common/responsive/responsive"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; export const Timer = ({ date }: CountdownProps) => { return ; diff --git a/packages/service/src/components/main/Expectation/Expectations.css.ts b/packages/service/src/components/main/Expectation/Expectations.css.ts index d24856f9..6e17ebf6 100644 --- a/packages/service/src/components/main/Expectation/Expectations.css.ts +++ b/packages/service/src/components/main/Expectation/Expectations.css.ts @@ -1,6 +1,6 @@ import { css } from "@emotion/react"; import { mobile } from "@service/common/responsive/responsive"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; export const container = css` position: relative; diff --git a/packages/service/src/components/nQuizEvent/NQuizReward/NQuizReward.css.ts b/packages/service/src/components/nQuizEvent/NQuizReward/NQuizReward.css.ts index e39f4745..42006747 100644 --- a/packages/service/src/components/nQuizEvent/NQuizReward/NQuizReward.css.ts +++ b/packages/service/src/components/nQuizEvent/NQuizReward/NQuizReward.css.ts @@ -1,6 +1,6 @@ import { css } from "@emotion/react"; import { mobile } from "@service/common/responsive/responsive"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; import { EventStatusType } from "./type"; export const containerStyle = (status: EventStatusType) => css` diff --git a/packages/service/src/components/nQuizEvent/NQuizSection/NQuizAlternativeBody/NQuizAlternativeBody.css.ts b/packages/service/src/components/nQuizEvent/NQuizSection/NQuizAlternativeBody/NQuizAlternativeBody.css.ts index bd31e60b..a27e303f 100644 --- a/packages/service/src/components/nQuizEvent/NQuizSection/NQuizAlternativeBody/NQuizAlternativeBody.css.ts +++ b/packages/service/src/components/nQuizEvent/NQuizSection/NQuizAlternativeBody/NQuizAlternativeBody.css.ts @@ -1,6 +1,6 @@ import { css } from "@emotion/react"; import { EventStatusType } from "../../NQuizReward/type"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; export const alternativeBodyStyles = (status: EventStatusType) => css` position: absolute; diff --git a/packages/service/src/components/nQuizEvent/NQuizSection/NQuizHeader/NQuizHeader.css.ts b/packages/service/src/components/nQuizEvent/NQuizSection/NQuizHeader/NQuizHeader.css.ts index b16bc2c2..2160eb1e 100644 --- a/packages/service/src/components/nQuizEvent/NQuizSection/NQuizHeader/NQuizHeader.css.ts +++ b/packages/service/src/components/nQuizEvent/NQuizSection/NQuizHeader/NQuizHeader.css.ts @@ -1,6 +1,6 @@ import { css } from "@emotion/react"; import { mobile } from "@service/common/responsive/responsive"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; export const nQuizHeaderContainerStyles = css` ${theme.flex.between}; diff --git a/packages/service/src/components/nQuizEvent/NQuizSection/NQuizInput/NQuizInput.css.ts b/packages/service/src/components/nQuizEvent/NQuizSection/NQuizInput/NQuizInput.css.ts index 1db77a67..efd6e0e6 100644 --- a/packages/service/src/components/nQuizEvent/NQuizSection/NQuizInput/NQuizInput.css.ts +++ b/packages/service/src/components/nQuizEvent/NQuizSection/NQuizInput/NQuizInput.css.ts @@ -1,6 +1,6 @@ import { css } from "@emotion/react"; import { mobile } from "@service/common/responsive/responsive"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; export const nQuizInputStyles = css` ${theme.font.preM20} diff --git a/packages/service/src/components/nQuizEvent/NQuizSection/NQuizInput/NQuizInput.tsx b/packages/service/src/components/nQuizEvent/NQuizSection/NQuizInput/NQuizInput.tsx index 7740f309..1a1ae39b 100644 --- a/packages/service/src/components/nQuizEvent/NQuizSection/NQuizInput/NQuizInput.tsx +++ b/packages/service/src/components/nQuizEvent/NQuizSection/NQuizInput/NQuizInput.tsx @@ -1,13 +1,13 @@ import { useState, ChangeEvent, KeyboardEvent } from "react"; import { Button } from "@service/common/components/Button"; import { nQuizInputStyles, nQuizSubmitButtonStyles } from "./NQuizInput.css"; -import { theme } from "@watermelon-clap/core"; import { IOrderEvent, IPostOrderEventResponse, -} from "@service/apis/orderEvent/type"; +} from "@watermelon-clap/core/src/types"; +import { theme } from "@watermelon-clap/core/src/theme"; +import { useModal } from "@watermelon-clap/core/src/hooks"; import { apiPostOrderEvent } from "@service/apis/orderEvent"; -import { useModal } from "@service/common/hooks/useModal"; import { craftSideCannons } from "@service/common/utils/confettiCrafter"; import { MODAL_CONTENT_QUIZ_CLOSED, diff --git a/packages/service/src/components/nQuizEvent/NQuizSection/NQuizSection.css.ts b/packages/service/src/components/nQuizEvent/NQuizSection/NQuizSection.css.ts index 18421863..8ce27d47 100644 --- a/packages/service/src/components/nQuizEvent/NQuizSection/NQuizSection.css.ts +++ b/packages/service/src/components/nQuizEvent/NQuizSection/NQuizSection.css.ts @@ -1,6 +1,6 @@ import { css } from "@emotion/react"; import { mobile } from "@service/common/responsive/responsive"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; import { EventStatusType } from "../NQuizReward/type"; export const nQuizSectionStyles = css` diff --git a/packages/service/src/components/nQuizEvent/NQuizSection/NQuizSection.tsx b/packages/service/src/components/nQuizEvent/NQuizSection/NQuizSection.tsx index 3c5d80d7..6450e31a 100644 --- a/packages/service/src/components/nQuizEvent/NQuizSection/NQuizSection.tsx +++ b/packages/service/src/components/nQuizEvent/NQuizSection/NQuizSection.tsx @@ -1,7 +1,7 @@ import { NQuizHeader } from "./NQuizHeader"; import { NQuizInput } from "./NQuizInput"; import { NQuizAlternativeBody } from "./NQuizAlternativeBody"; -import { IOrderEvent } from "@service/apis/orderEvent/type"; +import { IOrderEvent } from "@watermelon-clap/core/src/types"; import { nQuizSectionStyles, nQuizSectionHeaderContainerStyles, diff --git a/packages/service/src/components/nQuizEvent/NQuizTitle/NQuizTitle.css.ts b/packages/service/src/components/nQuizEvent/NQuizTitle/NQuizTitle.css.ts index b4980ca7..e59e5c9e 100644 --- a/packages/service/src/components/nQuizEvent/NQuizTitle/NQuizTitle.css.ts +++ b/packages/service/src/components/nQuizEvent/NQuizTitle/NQuizTitle.css.ts @@ -1,6 +1,6 @@ import { css } from "@emotion/react"; import { mobile } from "@service/common/responsive/responsive"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; export const containerStyle = css` ${theme.flex.center}; diff --git a/packages/service/src/components/newCar/NewCarInfo/NewCarInfo.css.ts b/packages/service/src/components/newCar/NewCarInfo/NewCarInfo.css.ts index 04b06bff..6e5d70ad 100644 --- a/packages/service/src/components/newCar/NewCarInfo/NewCarInfo.css.ts +++ b/packages/service/src/components/newCar/NewCarInfo/NewCarInfo.css.ts @@ -1,5 +1,5 @@ import { css } from "@emotion/react"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; const SCROLL_SPEED = "3000vh"; diff --git a/packages/service/src/components/newCar/TracingCar/TracingCar.css.ts b/packages/service/src/components/newCar/TracingCar/TracingCar.css.ts index 1370f615..8ca8f791 100644 --- a/packages/service/src/components/newCar/TracingCar/TracingCar.css.ts +++ b/packages/service/src/components/newCar/TracingCar/TracingCar.css.ts @@ -1,5 +1,6 @@ import { css } from "@emotion/react"; import { mobile } from "@service/common/responsive/responsive"; + export const bodyStyles = css` height: 3000vh; width: 100%; diff --git a/packages/service/src/components/newCar/TracingCar/TracingCar.tsx b/packages/service/src/components/newCar/TracingCar/TracingCar.tsx index aecd16be..3ab05562 100644 --- a/packages/service/src/components/newCar/TracingCar/TracingCar.tsx +++ b/packages/service/src/components/newCar/TracingCar/TracingCar.tsx @@ -1,7 +1,7 @@ import { css } from "@emotion/react"; import { motion, MotionValue } from "framer-motion"; import { useEffect, useState, useMemo, RefObject } from "react"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; import { bodyStyles, carStyles, containerStyles } from "./TracingCar.css"; import { useMobile } from "@service/common/hooks/useMobile"; import { diff --git a/packages/service/src/components/partsPick/PartsCard/PartsCard.tsx b/packages/service/src/components/partsPick/PartsCard/PartsCard.tsx index 7d2dc1ce..137d4d4d 100644 --- a/packages/service/src/components/partsPick/PartsCard/PartsCard.tsx +++ b/packages/service/src/components/partsPick/PartsCard/PartsCard.tsx @@ -1,15 +1,15 @@ import React, { useEffect, useRef, useState } from "react"; import styled from "@emotion/styled"; import { cardBaseStyles } from "./PartsCard.css"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; +import { useAuth } from "@watermelon-clap/core/src/hooks"; +import { IParts } from "@watermelon-clap/core/src/types"; import { css } from "@emotion/react"; import { craftFireworks, craftSideCannons, } from "@service/common/utils/confettiCrafter"; import { apiPostParts } from "@service/apis/partsEvent"; -import { IParts } from "@service/apis/partsEvent/type"; -import { useAuth } from "@service/common/hooks/useAuth"; interface CardProps { backImage: string; diff --git a/packages/service/src/components/partsPick/PickTitle/PickTitle.css.ts b/packages/service/src/components/partsPick/PickTitle/PickTitle.css.ts index cece8e5b..2ff2a8b0 100644 --- a/packages/service/src/components/partsPick/PickTitle/PickTitle.css.ts +++ b/packages/service/src/components/partsPick/PickTitle/PickTitle.css.ts @@ -1,6 +1,6 @@ import { css } from "@emotion/react"; import { mobile } from "@service/common/responsive/responsive"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; export const pickTitleContainerStyle = css` ${theme.flex.center} diff --git a/packages/service/src/components/pickEvent/CardCarousel/CardCarousel.css.ts b/packages/service/src/components/pickEvent/CardCarousel/CardCarousel.css.ts index 13eca289..ae6c2df9 100644 --- a/packages/service/src/components/pickEvent/CardCarousel/CardCarousel.css.ts +++ b/packages/service/src/components/pickEvent/CardCarousel/CardCarousel.css.ts @@ -1,6 +1,6 @@ import { css } from "@emotion/react"; import { mobile } from "@service/common/responsive/responsive"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; export const title = css` ${theme.font.pcpB28}; diff --git a/packages/service/src/components/pickEvent/JoinInfo/JoinInfo.css.ts b/packages/service/src/components/pickEvent/JoinInfo/JoinInfo.css.ts index edf07785..9a320cc4 100644 --- a/packages/service/src/components/pickEvent/JoinInfo/JoinInfo.css.ts +++ b/packages/service/src/components/pickEvent/JoinInfo/JoinInfo.css.ts @@ -1,6 +1,6 @@ import { css } from "@emotion/react"; import { mobile } from "@service/common/responsive/responsive"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; export const title = css` ${theme.font.pcpB28}; diff --git a/packages/service/src/components/pickEvent/PrizeContainer/PrizeContainer.css.ts b/packages/service/src/components/pickEvent/PrizeContainer/PrizeContainer.css.ts index 17845545..a44d0a21 100644 --- a/packages/service/src/components/pickEvent/PrizeContainer/PrizeContainer.css.ts +++ b/packages/service/src/components/pickEvent/PrizeContainer/PrizeContainer.css.ts @@ -1,7 +1,7 @@ import { css } from "@emotion/react"; import { mobile } from "@service/common/responsive/responsive"; import { PICK_EVENT_PRIZE_CONTAINER_BREAKPOINT } from "@service/constants/breakpoints"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; export const prizeContainer = css` display: flex; diff --git a/packages/service/src/components/pickEvent/PrizeContainer/PrizeItem/PrizeItem.css.ts b/packages/service/src/components/pickEvent/PrizeContainer/PrizeItem/PrizeItem.css.ts index 8e4222a5..14336128 100644 --- a/packages/service/src/components/pickEvent/PrizeContainer/PrizeItem/PrizeItem.css.ts +++ b/packages/service/src/components/pickEvent/PrizeContainer/PrizeItem/PrizeItem.css.ts @@ -1,7 +1,7 @@ import { css } from "@emotion/react"; import { mobile } from "@service/common/responsive/responsive"; import { PICK_EVENT_PRIZE_CONTAINER_BREAKPOINT } from "@service/constants/breakpoints"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; export const Container = css` color: ${theme.color.white}; diff --git a/packages/service/src/index.tsx b/packages/service/src/index.tsx index bc0d2d4e..5337e0d1 100644 --- a/packages/service/src/index.tsx +++ b/packages/service/src/index.tsx @@ -3,9 +3,10 @@ import "./index.css"; import { Global } from "@emotion/react"; import { router } from "./router.tsx"; import { RouterProvider } from "react-router-dom"; -import { ModalProvider } from "./common/providers/ModalProvider.tsx"; +import { ModalProvider } from "@watermelon-clap/core/src/providers"; +import { globalStyles } from "@watermelon-clap/core/src/theme"; + import { ModalContainer } from "./common/components/ModalContainer"; -import { globalStyles } from "@watermelon-clap/core"; import { QueryClient, QueryClientProvider } from "@tanstack/react-query"; const queryClient = new QueryClient({ @@ -15,7 +16,6 @@ const queryClient = new QueryClient({ }); ReactDOM.createRoot(document.getElementById("root")!).render( - diff --git a/packages/service/src/pages/Error/Error.css.ts b/packages/service/src/pages/Error/Error.css.ts index c7c182ea..7a7491f2 100644 --- a/packages/service/src/pages/Error/Error.css.ts +++ b/packages/service/src/pages/Error/Error.css.ts @@ -1,5 +1,5 @@ import { css } from "@emotion/react"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; export const errorContainerStyle = css` background-image: url("/images/parts/background.svg"); diff --git a/packages/service/src/pages/Error/Error.tsx b/packages/service/src/pages/Error/Error.tsx index 0d34feae..202560c0 100644 --- a/packages/service/src/pages/Error/Error.tsx +++ b/packages/service/src/pages/Error/Error.tsx @@ -1,7 +1,7 @@ import { FallbackProps } from "react-error-boundary"; import { errorContainerStyle, errorMessageStyle } from "./Error.css"; import { Button } from "@service/common/components/Button"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; import { useNavigate } from "react-router-dom"; export const Error = ({ error, resetErrorBoundary }: FallbackProps) => { diff --git a/packages/service/src/pages/Loading/Loading.css.ts b/packages/service/src/pages/Loading/Loading.css.ts index 8a7a395a..49adf41c 100644 --- a/packages/service/src/pages/Loading/Loading.css.ts +++ b/packages/service/src/pages/Loading/Loading.css.ts @@ -1,5 +1,5 @@ import { css } from "@emotion/react"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; export const loadingStyle = css` background-image: url("/images/parts/background.svg"); diff --git a/packages/service/src/pages/NQuizEvent/NQuizEvent.css.ts b/packages/service/src/pages/NQuizEvent/NQuizEvent.css.ts index ee889443..1fac3e66 100644 --- a/packages/service/src/pages/NQuizEvent/NQuizEvent.css.ts +++ b/packages/service/src/pages/NQuizEvent/NQuizEvent.css.ts @@ -1,6 +1,6 @@ import { css } from "@emotion/react"; import { mobile } from "@service/common/responsive/responsive"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; export const containerStyle = css` width: 100vw; diff --git a/packages/service/src/pages/NQuizEvent/NQuizEvent.tsx b/packages/service/src/pages/NQuizEvent/NQuizEvent.tsx index 048a4740..9b479cca 100644 --- a/packages/service/src/pages/NQuizEvent/NQuizEvent.tsx +++ b/packages/service/src/pages/NQuizEvent/NQuizEvent.tsx @@ -6,7 +6,7 @@ import { import { nQuizEventTermTitle, nQuizEventTerms } from "@service/constants/terms"; import { useSuspenseQuery } from "@tanstack/react-query"; import { apiGetOrderEvent } from "@service/apis/orderEvent"; -import { IOrderEvent } from "@service/apis/orderEvent/type"; +import { IOrderEvent } from "@watermelon-clap/core/src/types"; import { backgroundStyle, rewardWrapStyle, diff --git a/packages/service/src/pages/NewCar/NewCar.css.ts b/packages/service/src/pages/NewCar/NewCar.css.ts index 02a35d26..733b528f 100644 --- a/packages/service/src/pages/NewCar/NewCar.css.ts +++ b/packages/service/src/pages/NewCar/NewCar.css.ts @@ -1,5 +1,5 @@ import { css } from "@emotion/react"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; export const bg = css` background-color: ${theme.color.black}; diff --git a/packages/service/src/pages/PartsPick/PartsPick.css.ts b/packages/service/src/pages/PartsPick/PartsPick.css.ts index de74016d..2b64ade9 100644 --- a/packages/service/src/pages/PartsPick/PartsPick.css.ts +++ b/packages/service/src/pages/PartsPick/PartsPick.css.ts @@ -1,6 +1,6 @@ import { css } from "@emotion/react"; import { mobile } from "@service/common/responsive/responsive"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; export const partsPickBackgroundStyle = css` background-image: url("/images/parts/background.svg"); diff --git a/packages/service/src/pages/PartsPick/PartsPick.tsx b/packages/service/src/pages/PartsPick/PartsPick.tsx index c7bc2965..dc8572d6 100644 --- a/packages/service/src/pages/PartsPick/PartsPick.tsx +++ b/packages/service/src/pages/PartsPick/PartsPick.tsx @@ -7,10 +7,10 @@ import { import { PartsCard, PickTitle } from "@service/components/partsPick"; import { Space } from "@service/common/styles/Space"; import { useEffect, useRef, useState } from "react"; -import { useModal } from "@service/common/hooks/useModal"; +import { useModal } from "@watermelon-clap/core/src/hooks"; +import { useAuth } from "@watermelon-clap/core/src/hooks"; import { useMobile } from "@service/common/hooks/useMobile"; import { useLocation } from "react-router-dom"; -import { useAuth } from "@service/common/hooks/useAuth"; import { apiGetPartsRemain } from "@service/apis/partsEvent"; export const PartsPick = () => { diff --git a/packages/service/src/pages/PickEvent/PickEvent.css.ts b/packages/service/src/pages/PickEvent/PickEvent.css.ts index a7d3f9b4..2d25306d 100644 --- a/packages/service/src/pages/PickEvent/PickEvent.css.ts +++ b/packages/service/src/pages/PickEvent/PickEvent.css.ts @@ -1,6 +1,6 @@ import { css } from "@emotion/react"; import { mobile } from "@service/common/responsive/responsive"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; export const bg = css` background-image: url("images/common/main-bg.webp"); diff --git a/packages/service/src/pages/PickEvent/PickEvent.tsx b/packages/service/src/pages/PickEvent/PickEvent.tsx index 6669d842..d37211ad 100644 --- a/packages/service/src/pages/PickEvent/PickEvent.tsx +++ b/packages/service/src/pages/PickEvent/PickEvent.tsx @@ -4,11 +4,11 @@ import { CardCarousel } from "@service/components/pickEvent/CardCarousel"; import { pickEventTerms, pickEventTermsTitle } from "@service/constants/terms"; import { useNavigate } from "react-router-dom"; import { PrizeContainer } from "@service/components/pickEvent"; -import { theme } from "@watermelon-clap/core"; +import { theme } from "@watermelon-clap/core/src/theme"; +import { useAuth } from "@watermelon-clap/core/src/hooks"; import { css } from "@emotion/react"; import { Space } from "@service/common/styles/Space"; import { useMobile } from "@service/common/hooks/useMobile"; -import { useAuth } from "@service/common/hooks/useAuth"; import { apiGetPartsRemain } from "@service/apis/partsEvent/apiGetPartsRemain"; export const PickEvent = () => { diff --git a/packages/service/tsconfig.json b/packages/service/tsconfig.json index a8197fda..9dc588b2 100644 --- a/packages/service/tsconfig.json +++ b/packages/service/tsconfig.json @@ -32,7 +32,5 @@ "noFallthroughCasesInSwitch": true, }, "files": [], - "include": [ - "src" - ] + "include": ["src"] } \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2749edf3..eedcaf43 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -121,6 +121,9 @@ importers: '@emotion/react': specifier: ^11.11.4 version: 11.11.4(@types/react@18.3.3)(react@18.3.1) + firebase: + specifier: ^10.12.4 + version: 10.12.4 devDependencies: '@types/react': specifier: ^18.3.3