Merge pull request #75 from softeerbootcamp4th/feat/CLAP-138

chore(CLAP-138): 공통로직 core로 이동
softeerbootcamp4th · Aug 13, 2024 · 21433c6 · 21433c6
2 parents b868eeb + f01d630
commit 21433c6
Show file tree

Hide file tree

Showing 92 changed files with 112 additions and 156 deletions.
diff --git a/packages/core/client.d.ts 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
@@ -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
diff --git a/packages/core/src/assets/fonts/pretendard/Pretendard-Medium.woff2 b/packages/core/src/assets/fonts/pretendard/Pretendard-Medium.woff2
diff --git a/packages/core/src/assets/fonts/pretendard/Pretendard-SemiBold.woff2 b/packages/core/src/assets/fonts/pretendard/Pretendard-SemiBold.woff2
diff --git a/packages/core/src/assets/fonts/pyeongChang/PyeongChang-Bold.otf b/packages/core/src/assets/fonts/pyeongChang/PyeongChang-Bold.otf
diff --git a/packages/core/src/assets/fonts/pyeongChang/PyeongChang-Regular.otf b/packages/core/src/assets/fonts/pyeongChang/PyeongChang-Regular.otf
diff --git a/packages/core/src/assets/fonts/pyeongChangPeace/PyeongChangPeace-Bold.otf b/packages/core/src/assets/fonts/pyeongChangPeace/PyeongChangPeace-Bold.otf
diff --git a/packages/core/src/assets/fonts/pyeongChangPeace/PyeongChangPeace-Light.otf b/packages/core/src/assets/fonts/pyeongChangPeace/PyeongChangPeace-Light.otf
diff --git a/packages/core/src/assets/tmp.svg b/packages/core/src/assets/tmp.svg
diff --git a/...rvice/src/common/contexts/ModalContext.ts → packages/core/src/contexts/ModalContext.ts b/...rvice/src/common/contexts/ModalContext.ts → 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<ModalState | null>(null);

diff --git a/packages/core/src/contexts/index.ts 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
@@ -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 → packages/core/src/hooks/useAuth.ts b/packages/service/src/common/hooks/useAuth.ts → packages/core/src/hooks/useAuth.ts
diff --git a/...ages/service/src/common/hooks/useModal.ts → packages/core/src/hooks/useModal.ts b/...ages/service/src/common/hooks/useModal.ts → packages/core/src/hooks/useModal.ts
diff --git a/...service/src/common/hooks/useScrollStop.ts → packages/core/src/hooks/useScrollStop.ts b/...service/src/common/hooks/useScrollStop.ts → packages/core/src/hooks/useScrollStop.ts
diff --git 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
diff --git a/packages/core/src/models/index.ts b/packages/core/src/models/index.ts
diff --git a/...ce/src/common/providers/ModalProvider.tsx → ...ages/core/src/providers/ModalProvider.tsx b/...ce/src/common/providers/ModalProvider.tsx → ...ages/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
@@ -0,0 +1 @@
+export * from "./ModalProvider";
diff --git a/packages/core/src/types/index.ts 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 → packages/core/src/types/orderEvent/index.ts b/packages/service/src/apis/orderEvent/type.ts → packages/core/src/types/orderEvent/index.ts
diff --git a/packages/service/src/apis/partsEvent/type.ts → packages/core/src/types/partsEvent/index.ts b/packages/service/src/apis/partsEvent/type.ts → packages/core/src/types/partsEvent/index.ts
diff --git a/...s/service/src/common/utils/customFetch.ts → packages/core/src/utils/customFetch.ts b/...s/service/src/common/utils/customFetch.ts → packages/core/src/utils/customFetch.ts
diff --git a/...ervice/src/common/utils/getAccessToken.ts → packages/core/src/utils/getAccessToken.ts b/...ervice/src/common/utils/getAccessToken.ts → packages/core/src/utils/getAccessToken.ts
diff --git a/packages/core/src/utils/index.ts 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
@@ -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"],
 }
diff --git a/packages/core/vite-env.d.ts b/packages/core/vite-env.d.ts
@@ -0,0 +1 @@
+/// <reference types="vite/client" />
diff --git 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
@@ -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
@@ -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<IOrderEvent[]> => {
   const url = id

diff --git 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
@@ -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
@@ -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<IParts> =>
   fetch(

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...vice/src/common/components/ModalContainer/modal/GoolgleLoginModal/GoogleLoginModal.css.ts b/...vice/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/...service/src/common/components/ModalContainer/modal/GoolgleLoginModal/GoogleLoginModal.tsx b/...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/...ges/service/src/common/components/ModalContainer/modal/NavigateModal/NavigateModal.css.ts b/...ges/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
@@ -1,14 +1,14 @@
 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,
   navigateButtonStyle,
 } 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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};
Original file line number	Diff line number	Diff line change
		@@ -1,2 +0,0 @@
		export * from "./models";
		export * from "./theme";
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		export * from "./orderEvent";
		export * from "./partsEvent";
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		export { customFetch } from "./customFetch";
		export { getAccessToken } from "./getAccessToken";