refac: move components at ui folders

hoon2hooni · hoon2hooni · commit 07eb188d43b2 · 2023-01-13T07:57:24.000+09:00
diff --git a/components/common/ui/Badge.tsx b/components/common/ui/Badge.tsx
diff --git a/components/common/ui/Button.tsx b/components/common/ui/Button.tsx
diff --git a/components/common/ui/ErrorBox.tsx b/components/common/ui/ErrorBox.tsx
diff --git a/components/common/ui/ErrorText.tsx b/components/common/ui/ErrorText.tsx
diff --git a/components/common/ui/EventInfo.tsx b/components/common/ui/EventInfo.tsx
diff --git a/components/common/ui/GenericInput.tsx b/components/common/ui/GenericInput.tsx
diff --git a/components/common/ui/InputTemplate.tsx b/components/common/ui/InputTemplate.tsx
diff --git a/components/common/ui/Modal.tsx b/components/common/ui/Modal.tsx
@@ -1,5 +1,5 @@
-import { Portal } from "@components/common";
 import styled from "@emotion/styled";
+import { Portal } from "@ui";
 import type { FC, ReactNode } from "react";
 type ModalProps = {
   children: ReactNode;
diff --git a/components/common/ui/Portal.tsx b/components/common/ui/Portal.tsx
diff --git a/components/common/ui/Retention.tsx b/components/common/ui/Retention.tsx
@@ -1,6 +1,6 @@
-import { Button } from "@components/common";
 import styled from "@emotion/styled";
 import { Thumbnail } from "@icons";
+import { Button } from "@ui";
 import Link from "next/link";
 import { useRouter } from "next/router";
 const Retention = () => {
diff --git a/components/common/ui/Toast.tsx b/components/common/ui/Toast.tsx
diff --git a/components/common/ui/index.ts b/components/common/ui/index.ts
@@ -1,3 +1,5 @@
+export { Clarity, GA, MetaOgTwitterUrl } from "../SEO";
+export { default as Badge } from "./Badge";
 export { default as Button } from "./Button";
 export { default as ErrorBox } from "./ErrorBox";
 export { default as ErrorText } from "./ErrorText";
@@ -7,5 +9,4 @@ export { default as InputTemplate } from "./InputTemplate";
 export { default as Modal } from "./Modal";
 export { default as Portal } from "./Portal";
 export { default as Retention } from "./Retention";
-export { Clarity, GA, MetaOgTwitterUrl } from "./SEO";
 export { default as Toast } from "./Toast";
diff --git a/components/events/EntranceInput.tsx b/components/events/EntranceInput.tsx
@@ -1,6 +1,6 @@
-import { Button } from "@components/common";
 import styled from "@emotion/styled";
 import useTemporaryError from "@lib/hooks/useTemporaryError";
+import { Button } from "@ui";
 import type { FC } from "react";
 import { useForm } from "react-hook-form";
 type ComponentProps = {
diff --git a/components/events/Pagination.tsx b/components/events/Pagination.tsx
@@ -1,6 +1,6 @@
-import Badge from "@components/common/Badge";
 import styled from "@emotion/styled";
 import { Arrow } from "@icons";
+import { Badge } from "@ui";
 import type { FC } from "react";
 
 type ComponentProps = {
diff --git a/components/events/TimetableTemplate.tsx b/components/events/TimetableTemplate.tsx
@@ -1,4 +1,3 @@
-import { Toast } from "@components/common";
 import { Days, Pagination, Timetable } from "@components/events";
 import styled from "@emotion/styled";
 import type { Attendees } from "@eventsTypes";
@@ -11,6 +10,7 @@ import {
   subtractDateAndTime,
 } from "@lib/days";
 import useToast from "@lib/hooks/useToast";
+import { Toast } from "@ui";
 import type { FC } from "react";
 import { useState } from "react";
 type Props = {
diff --git a/components/new/DateInputs.tsx b/components/new/DateInputs.tsx
@@ -1,7 +1,7 @@
-import { GenericInput, InputTemplate } from "@components/common";
 import { FormValidationError } from "@components/new";
 import { getMaxDate, notWithinThreeWeeks } from "@lib/days";
 import type { NewEvent } from "@newTypes";
+import { GenericInput, InputTemplate } from "@ui";
 import type { FC } from "react";
 import { useEffect } from "react";
 import type {
diff --git a/components/new/FormValidationError.tsx b/components/new/FormValidationError.tsx
@@ -1,5 +1,5 @@
-import ErrorText from "@components/common/ErrorText";
 import type { NewEvent } from "@newTypes";
+import { ErrorText } from "@ui";
 import type { FC } from "react";
 import type { FieldErrorsImpl } from "react-hook-form";
 
diff --git a/components/new/MaxCapacityInput.tsx b/components/new/MaxCapacityInput.tsx
@@ -1,6 +1,6 @@
-import { GenericInput, InputTemplate } from "@components/common";
 import { FormValidationError } from "@components/new";
 import type { NewEvent } from "@newTypes";
+import { GenericInput, InputTemplate } from "@ui";
 import type { FC } from "react";
 import type { ChangeEvent } from "react";
 import type { Control } from "react-hook-form";
diff --git a/components/new/NameInput.tsx b/components/new/NameInput.tsx
@@ -1,6 +1,6 @@
-import { GenericInput, InputTemplate } from "@components/common";
 import { FormValidationError } from "@components/new";
 import type { NewEvent } from "@newTypes";
+import { GenericInput, InputTemplate } from "@ui";
 import type { FC } from "react";
 import type { Control, UseFormRegister } from "react-hook-form";
 import { useFormState } from "react-hook-form";
diff --git a/components/new/NewEventConfirmModal.tsx b/components/new/NewEventConfirmModal.tsx
@@ -1,8 +1,8 @@
-import { Button } from "@components/common";
-import { EventInfo, Modal } from "@components/common";
 import styled from "@emotion/styled";
 import { LoadingButtonSpinner } from "@icons";
 import type { NewEvent } from "@newTypes";
+import { Button } from "@ui";
+import { EventInfo, Modal } from "@ui";
 import type { FC } from "react";
 import type { Control } from "react-hook-form";
 import { useWatch } from "react-hook-form";
diff --git a/pages/404.tsx b/pages/404.tsx
@@ -1,6 +1,6 @@
-import { Button } from "@components/common";
-import { ErrorBox } from "@components/common";
 import styled from "@emotion/styled";
+import { Button } from "@ui";
+import { ErrorBox } from "@ui";
 import { useRouter } from "next/router";
 const Custom404 = () => {
   const router = useRouter();
diff --git a/pages/_app.tsx b/pages/_app.tsx
@@ -1,7 +1,7 @@
-import { Clarity, GA } from "@components/common";
 import { Global, ThemeProvider } from "@emotion/react";
 import global from "@styles/global";
 import theme from "@styles/theme";
+import { Clarity, GA } from "@ui";
 import type { NextPage } from "next";
 import type { AppProps } from "next/app";
 import Head from "next/head";
diff --git a/pages/events/[id].tsx b/pages/events/[id].tsx
@@ -1,10 +1,3 @@
-import {
-  Button,
-  ErrorBox,
-  MetaOgTwitterUrl,
-  Modal,
-  Toast,
-} from "@components/common";
 import {
   EntranceInput,
   TimetableInfo,
@@ -17,6 +10,7 @@ import { LoadingSpinner } from "@icons";
 import { closePage } from "@lib/handleCrossPlatform";
 import useToast from "@lib/hooks/useToast";
 import type { NextPageWithLayout } from "@pages/_app";
+import { Button, ErrorBox, MetaOgTwitterUrl, Modal, Toast } from "@ui";
 import Link from "next/link";
 import { useEffect, useState } from "react";
 const getLocalStorageKey = (id: string) => {
diff --git a/pages/index.tsx b/pages/index.tsx
@@ -1,7 +1,7 @@
 import landingImage from "@assets/images/landing_image.png";
-import { Button, MetaOgTwitterUrl } from "@components/common";
 import styled from "@emotion/styled";
 import { Thumbnail } from "@icons";
+import { Button, MetaOgTwitterUrl } from "@ui";
 import Image from "next/image";
 import Link from "next/link";
 import { useRouter } from "next/router";
diff --git a/pages/new.tsx b/pages/new.tsx
@@ -1,4 +1,3 @@
-import { Button, MetaOgTwitterUrl } from "@components/common";
 import {
   DateInputs,
   MaxCapacityInput,
@@ -10,6 +9,7 @@ import type { Event } from "@eventsTypes";
 import { addEvent } from "@firebase/clientApp";
 import { subtractDateAndTime } from "@lib/days";
 import type { NewEvent } from "@newTypes";
+import { Button, MetaOgTwitterUrl } from "@ui";
 import { Timestamp } from "firebase/firestore";
 import { useRouter } from "next/router";
 import { useState } from "react";
@@ -21,7 +21,7 @@ const fromFormDataToEvent = (data: NewEvent): Omit<Event, "id"> => {
   /**
    * startDate와 endDate는 html의 input type=date에서 제공 받습니다.
    * 이로인해 2022-12-21형식으로 받게 됩니다.
-   * 이를 date로 변환할 경우 UTC기준 00시로 제공되기에 
+   * 이를 date로 변환할 경우 UTC기준 00시로 제공되기에
    * 한국의 00시로 맞추어주기 위해 9시간뺍니다.
    */
   const KOR_UTC_DIFFERENCE_HOUR = 9;
diff --git a/pages/share.tsx b/pages/share.tsx
@@ -1,14 +1,8 @@
-import {
-  Button,
-  EventInfo,
-  MetaOgTwitterUrl,
-  Toast,
-} from "@components/common";
-import Retention from "@components/common/Retention";
 import styled from "@emotion/styled";
 import { getEventDocRef } from "@firebase/clientApp";
 import { dateToPattern } from "@lib/days";
 import type { NewEvent } from "@newTypes";
+import { Button, EventInfo, MetaOgTwitterUrl, Retention, Toast } from "@ui";
 import { getDoc } from "firebase/firestore";
 import type { GetServerSideProps, InferGetServerSidePropsType } from "next";
 import Script from "next/script";
diff --git a/tsconfig.json b/tsconfig.json
@@ -29,7 +29,8 @@
       "@newTypes": ["types/new"],
       "@dateTypes": ["types/date"],
       "@firebase/*": ["firebase/*"],
-      "@icons": ["components/common/icons"]
+      "@icons": ["components/common/icons"],
+      "@ui": ["components/common/ui"]
     }
   },
   "include": [
