diff --git a/src/_app/App.tsx b/src/_app/App.tsx
index b54e65b7d0204554868e30c2847d4b2b93c211bb..6a0194c484fdfbd0878e42a6f626a32bb2899949 100644
--- a/src/_app/App.tsx
+++ b/src/_app/App.tsx
@@ -44,8 +44,7 @@ function App() {
useEffect(() => {
- connector.current = new Connector(setLogin);
- console.log('app', connector.current);
+ if (!connector.current) connector.current = new Connector(setLogin);
}, []);
useEffect(() => {
@@ -57,7 +56,6 @@ function App() {
socket.current = new Socket();
socket.current?.onOrder((d: CartItemPostModel) => {
- console.log(d);
setToastItem({
id: '', title: d.shopId, description: d.waitingCount.toString(), goto: ''
});
diff --git a/src/common/instances/Connector.ts b/src/common/instances/Connector.ts
index f5b69cd17f8c1999d655cf3c71c9cebd069c0f7f..6c543337a48836447928665af8b5db1143a946b9 100644
--- a/src/common/instances/Connector.ts
+++ b/src/common/instances/Connector.ts
@@ -10,17 +10,14 @@ class Connector {
private randomUuid = Math.random();
constructor(setLogin: LoginInstance) {
- console.log('constructed');
this.setLoginInstance = setLogin;
}
setIsAdmin(b: boolean) {
this.isAdmin = b;
- console.log('setIsAdmin', b);
}
getIsAdmin() {
- console.log('getIsAdmin', this.isAdmin);
return this.isAdmin;
}
diff --git a/src/pages/admin-page/AdminPage.tsx b/src/pages/admin-page/AdminPage.tsx
index 49ff62e7574a2e29dc950b17dc75acaf444d7d7f..08c8f1960acb7f5499fe0fa2f0a6abe5aa0994f0 100644
--- a/src/pages/admin-page/AdminPage.tsx
+++ b/src/pages/admin-page/AdminPage.tsx
@@ -4,22 +4,18 @@ import { useNavigate } from "react-router-dom";
import APP_ROUTE from "../../_app/config/route";
import { ALERT } from "../../common/constants";
-import type Connector from "../../common/instances/Connector";
import type { GFC } from "../../common/types/fc";
const AdminPage: GFC = ({ connector }) => {
- if (!connector) return <></>;
-
const navigator = useNavigate();
useEffect(() => {
- console.log('adminpage', connector);
- // if (!connector.getIsAdmin()) {
- // alert(ALERT.REQ_WRONG);
- // navigator(APP_ROUTE.LOGIN);
- // return;
- // }
+ if (!connector.current?.getIsAdmin()) {
+ alert(ALERT.REQ_WRONG);
+ navigator(APP_ROUTE.LOGIN);
+ return;
+ }
}, [connector]);
return (
diff --git a/src/pages/cart-page/CartPage.tsx b/src/pages/cart-page/CartPage.tsx
index 7e99ca0cd8f4344892da1c8ebda976b2231d3a2b..fb5cfcd2bc18ca3c59589dd8b81929dcca7a2e0a 100644
--- a/src/pages/cart-page/CartPage.tsx
+++ b/src/pages/cart-page/CartPage.tsx
@@ -14,8 +14,6 @@ import type { GFC } from "../../common/types/fc";
const CartPage: GFC = ({ connector }) => {
- if (!connector) return <></>;
-
const { cartItem, setCartItem } = useContext(CartContext);
const [quantities, setQuantities] = useState<number[]>([]);
const [totalPrice, setTotalPrice] = useState(0);
@@ -45,7 +43,7 @@ const CartPage: GFC = ({ connector }) => {
};
const handleOrder = () => {
- if (!cartItem?.shop) return;
+ if (!cartItem?.shop || !connector.current) return;
void (async () => {
try {
diff --git a/src/pages/history-page/HistoryPage.tsx b/src/pages/history-page/HistoryPage.tsx
index d62155f06c8b4e036aaab06858986e17218db596..b5f46fe7a51983ab11d7453848ce48f1b07298f6 100644
--- a/src/pages/history-page/HistoryPage.tsx
+++ b/src/pages/history-page/HistoryPage.tsx
@@ -10,11 +10,11 @@ import type { GFC } from "../../common/types/fc";
const HistoryPage: GFC = ({ connector }) => {
- if (!connector) return <></>;
-
const [model, setModel] = useState<HistoryPageModel|null>(null);
useEffect(() => {
+ if (!connector.current) return;
+
void (async () => {
try {
const response = await connector.current!.get<HistoryPageModel>('/order');
diff --git a/src/pages/login-page/LoginPage.tsx b/src/pages/login-page/LoginPage.tsx
index 3c62822d4cf892154efd8293e29df8342cf19f6f..fe8d3df553e20fde746ffa2f1e7278d9f966267b 100644
--- a/src/pages/login-page/LoginPage.tsx
+++ b/src/pages/login-page/LoginPage.tsx
@@ -11,8 +11,6 @@ import type { GFC } from "../../common/types/fc";
const LoginPage: GFC = ({ connector }) => {
- if (!connector) return <></>;
-
const [account, setAccount] = useState({
loginId: '', password: ''
});
@@ -36,12 +34,13 @@ const LoginPage: GFC = ({ connector }) => {
navigate(APP_ROUTE.SIGNUP);
};
const handleLogin = () => {
+ if (!connector.current) return;
+
void (async () => {
try {
const response = await connector.current!.login<LoginPagePostModel>(account);
if (response.role?.isAdmin) {
connector.current!.setIsAdmin(true);
- console.log('loginpage', connector);
navigate(APP_ROUTE.ADMIN);
} else {
connector.current!.setIsAdmin(false);
diff --git a/src/pages/main-page/MainPage.tsx b/src/pages/main-page/MainPage.tsx
index d7c625ac62fbc70c4804f175c096f8fa060ee556..ecbda5ab5333127b5d0681cd23eeddc7eff2e7a4 100644
--- a/src/pages/main-page/MainPage.tsx
+++ b/src/pages/main-page/MainPage.tsx
@@ -13,16 +13,16 @@ import type { GFC } from "../../common/types/fc";
const MainPage: GFC = ({ connector }) => {
- if (!connector) return <></>;
-
const [model, setModel] = useState<MainPageModel|null>(null);
useEffect(() => {
+ if (!connector.current) return;
+
void (async () => {
try {
const response = await connector.current!.get<MainPageModel>('/shop');
setModel(response as MainPageModel);
- } catch {
+ } catch(e) {
alert(ALERT.REQ_FAIL);
}
})();
diff --git a/src/pages/menu-page/MenuPage.tsx b/src/pages/menu-page/MenuPage.tsx
index 88ff2ea0a2e5cf0e205db3a69d17626d4b91f606..5921dd54bd3a544197bb699dfe627be27330211c 100644
--- a/src/pages/menu-page/MenuPage.tsx
+++ b/src/pages/menu-page/MenuPage.tsx
@@ -15,12 +15,12 @@ interface Props {
setHeaderName: Dispatch<SetStateAction<string>>;
}
const MenuPage: GFCWithProp<Props> = ({ connector, setHeaderName }) => {
- if (!connector) return <></>;
-
const [model, setModel] = useState<MenuPageModel|null>(null);
const { pathname } = useLocation();
useEffect(() => {
+ if (!connector.current) return;
+
void (async () => {
try {
const response = await connector.current!.get<MenuPageModel>(
diff --git a/src/pages/order-page/success-page/SuccessPage.tsx b/src/pages/order-page/success-page/SuccessPage.tsx
index 269db00c4b7d1a6a3a3628a79eb18dfaae675b52..4a01131c077c45e8f04c4ee7a2b13f7f4d60282e 100644
--- a/src/pages/order-page/success-page/SuccessPage.tsx
+++ b/src/pages/order-page/success-page/SuccessPage.tsx
@@ -8,12 +8,10 @@ import type { GFC } from "../../../common/types/fc";
const SuccessPage: GFC = ({ connector }) => {
- if (!connector) return <></>;
-
const location = useLocation();
useEffect(() => {
- if (!location.search) return;
+ if (!location.search || !connector.current) return;
void (async () => {
try {
diff --git a/src/pages/signup-page/SignupPage.tsx b/src/pages/signup-page/SignupPage.tsx
index e0694b1b9dd8b964ab11ce7e78da2bec2fa897ab..92958ff802652eb564124faddee04310ccc319d1 100644
--- a/src/pages/signup-page/SignupPage.tsx
+++ b/src/pages/signup-page/SignupPage.tsx
@@ -10,8 +10,6 @@ import type { GFC } from "../../common/types/fc";
const SignupPage: GFC = ({ connector }) => {
- if (!connector) return <></>;
-
const navigate = useNavigate();
const [accountData, setAccountData] = useState({
loginId: '',
@@ -72,14 +70,16 @@ const SignupPage: GFC = ({ connector }) => {
};
const handleSignup = () => {
- if(
+ if (!connector.current) return;
+
+ if (
accountData.loginId !== '' &&
accountData.name !== '' &&
accountData.email !== '' &&
accountData.phone !== '' &&
accountData.password !== '' &&
passwordAgain !== ''
- ){
+ ) {
try {
void(async () => {
await connector.current!.post('/user/register', accountData);