diff --git a/public/index.html b/public/index.html index e153c98390e3662d9bfa47590144708c9f081420..8c89ef6ddcec45a04eb2b87e38e7d2a502219dd0 100644 --- a/public/index.html +++ b/public/index.html @@ -11,7 +11,7 @@ /> <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" /> <!-- - manifest.json provides metadata used when your web app is installed on a + manifest.json provides metadata used when your web _app is installed on a user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/ --> <link rel="manifest" href="%PUBLIC_URL%/manifest.json" /> diff --git a/src/app/App.module.css b/src/_app/App.module.css similarity index 100% rename from src/app/App.module.css rename to src/_app/App.module.css diff --git a/src/app/App.tsx b/src/_app/App.tsx similarity index 98% rename from src/app/App.tsx rename to src/_app/App.tsx index b48df98437cb1677d1dab0cf84b82b6ac223408a..69b989266257c362af55d8b9a5d3d77e0076145f 100644 --- a/src/app/App.tsx +++ b/src/_app/App.tsx @@ -3,13 +3,13 @@ import '../common/css/common.css'; import '../common/css/reset.css'; import { Routes, Route, useNavigate } from "react-router-dom"; +import Connector from "../common/instances/Connector"; import BottomSheet from "../components/bottom-sheet/BottomSheet"; import Header from "../components/header/Header"; import Toast from "../components/toast/Toast"; import { BSProvider } from "../contexts/bottom-sheet"; import { CartProvider } from "../contexts/cart"; import { ToastProvider } from "../contexts/toast"; -import Connector from "../instances/Connector"; import CartPage from "../pages/cart-page/CartPage"; import HistoryPage from "../pages/history-page/HistoryPage"; import LoginPage from "../pages/login-page/LoginPage"; diff --git a/src/app/config/route.ts b/src/_app/config/route.ts similarity index 100% rename from src/app/config/route.ts rename to src/_app/config/route.ts diff --git a/src/app/modules/wrapper/Wrapper.module.css b/src/_app/modules/wrapper/Wrapper.module.css similarity index 100% rename from src/app/modules/wrapper/Wrapper.module.css rename to src/_app/modules/wrapper/Wrapper.module.css diff --git a/src/app/modules/wrapper/Wrapper.tsx b/src/_app/modules/wrapper/Wrapper.tsx similarity index 100% rename from src/app/modules/wrapper/Wrapper.tsx rename to src/_app/modules/wrapper/Wrapper.tsx diff --git a/src/instances/Connector.ts b/src/common/instances/Connector.ts similarity index 93% rename from src/instances/Connector.ts rename to src/common/instances/Connector.ts index c8ef5a723edaa6c3d61452a2da17321e95bd5343..51aa0d5675126009060f6f6c487771b7031a25f0 100644 --- a/src/instances/Connector.ts +++ b/src/common/instances/Connector.ts @@ -1,4 +1,4 @@ -import { FETCH_METHOD, fetchData, RESPONSE_STATUS } from "../common/utils/api"; +import { FETCH_METHOD, fetchData, RESPONSE_STATUS } from "../utils/api"; import type { Dispatch, SetStateAction } from "react"; diff --git a/src/common/utils/api.ts b/src/common/utils/api.ts index 59d0fec846bec5044b427b419733ac3ffe5c75c8..9f0198e0161cce2ab3c10f26779a5a078b3e5a9c 100644 --- a/src/common/utils/api.ts +++ b/src/common/utils/api.ts @@ -51,7 +51,7 @@ async function fetchData<T> ( throw e; } - return {status, response}; + return { status, response }; } export { fetchData, FETCH_METHOD, RESPONSE_STATUS }; diff --git a/src/components/header/Header.tsx b/src/components/header/Header.tsx index f911b3caae480515781fb928935cf24d3cf39179..4f50cbb91e5748497a0572a2e7a63fca3cfa2962 100644 --- a/src/components/header/Header.tsx +++ b/src/components/header/Header.tsx @@ -1,7 +1,7 @@ import { useContext, useEffect, useState } from "react"; import { Link, useLocation } from "react-router-dom"; -import APP_ROUTE from "../../app/config/route"; +import APP_ROUTE from "../../_app/config/route"; import { CartContext } from "../../contexts/cart"; import S from './Header.module.css'; diff --git a/src/components/navigator/config.ts b/src/components/navigator/config.ts index 070e14d3bfa66f340b47ab4a517ae2a841d7d3b3..5318061783921dbcc4bb26d97cb2b9556c750a7d 100644 --- a/src/components/navigator/config.ts +++ b/src/components/navigator/config.ts @@ -1,4 +1,4 @@ -import APP_ROUTE from "../../app/config/route"; +import APP_ROUTE from "../../_app/config/route"; interface NavRoute { icon: string; diff --git a/src/index.tsx b/src/index.tsx index f732e5e961d5bb515b0595aa9d78d2a41d96f7ee..65b8bb06917452da41811df58b28e9501d7ac5a2 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -1,9 +1,9 @@ import React from 'react'; import ReactDOM from 'react-dom/client'; import './index.css'; -import {BrowserRouter} from "react-router-dom"; +import { BrowserRouter } from "react-router-dom"; -import App from './app/App'; +import App from './_app/App'; const root = ReactDOM.createRoot( document.getElementById('root') as HTMLElement diff --git a/src/pages/cart-page/CartPage.tsx b/src/pages/cart-page/CartPage.tsx index 3a0a9decbaf673330ab4d7827052e9482125837d..791fc2450daf0210cad7c010d329ab4f08540527 100644 --- a/src/pages/cart-page/CartPage.tsx +++ b/src/pages/cart-page/CartPage.tsx @@ -11,7 +11,7 @@ import { CartContext } from "../../contexts/cart"; import S from './CartPage.module.css'; import type { CartItemData, OrderPostModel } from "./config/type"; -import type Connector from "../../instances/Connector"; +import type Connector from "../../common/instances/Connector"; import type { FC } from "react"; @@ -23,7 +23,7 @@ const CartPage: FC<Props> = ({ connector }) => { const [quantities, setQuantities] = useState<number[]>([]); const [totalPrice, setTotalPrice] = useState(0); - const a=1; + const a = 1; const b = 1; diff --git a/src/pages/history-page/HistoryPage.tsx b/src/pages/history-page/HistoryPage.tsx index 20ea71439351ca5ca51feed18109ea11bf0b2d93..156a15a8a416ee8e9d376b6a0f4f00f6f3bc2c04 100644 --- a/src/pages/history-page/HistoryPage.tsx +++ b/src/pages/history-page/HistoryPage.tsx @@ -5,7 +5,7 @@ import { HISTORY_PAGE_DUMMY } from "./config/dummy"; import OrderBox from "./modules/order-box/OrderBox"; import type { HistoryPageModel } from "./config/type"; -import type Connector from "../../instances/Connector"; +import type Connector from "../../common/instances/Connector"; import type { FC } from "react"; diff --git a/src/pages/login-page/LoginPage.tsx b/src/pages/login-page/LoginPage.tsx index 88fde64c93de4f37d6858288212229168cca1467..3e2c17d6880a2ec538776cc14c6e16569345c96f 100644 --- a/src/pages/login-page/LoginPage.tsx +++ b/src/pages/login-page/LoginPage.tsx @@ -1,11 +1,11 @@ import { useState } from "react"; import { useNavigate } from "react-router-dom"; -import APP_ROUTE from "../../app/config/route"; +import APP_ROUTE from "../../_app/config/route"; import S from './LoginPage.module.css'; -import type Connector from "../../instances/Connector"; +import type Connector from "../../common/instances/Connector"; import type { FC } from "react"; diff --git a/src/pages/main-page/MainPage.tsx b/src/pages/main-page/MainPage.tsx index 256112e698fb1f579f645bff4f03c9928f01f27c..77f70ebf849f8a0bd516fb8f1f2eb62487ce9cc8 100644 --- a/src/pages/main-page/MainPage.tsx +++ b/src/pages/main-page/MainPage.tsx @@ -8,7 +8,7 @@ import ShopBox from "./modules/shop-box/ShopBox"; import type { MainPageModel } from "./config/type"; -import type Connector from "../../instances/Connector"; +import type Connector from "../../common/instances/Connector"; import type { FC } from "react"; diff --git a/src/pages/menu-page/MenuPage.tsx b/src/pages/menu-page/MenuPage.tsx index 4af885e80f0785737ce25494b684930676d69b05..024d64c880de6e7410bd9ce2985ccb9029adf728 100644 --- a/src/pages/menu-page/MenuPage.tsx +++ b/src/pages/menu-page/MenuPage.tsx @@ -6,7 +6,7 @@ import { ALERT } from "../../common/constants"; import MenuBox from "./modules/menu-box/MenuBox"; import type { MenuPageModel } from "./config/type"; -import type Connector from "../../instances/Connector"; +import type Connector from "../../common/instances/Connector"; import type { Dispatch, FC, SetStateAction } from "react";