From b5e859d85aa1179eef10f09985319dbdd01e0bee Mon Sep 17 00:00:00 2001 From: Nem791 Date: Fri, 21 Apr 2023 10:04:04 +0700 Subject: [PATCH 1/2] update --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 6ece3aa..91697c0 100644 --- a/package.json +++ b/package.json @@ -3,8 +3,8 @@ "version": "0.1.0", "private": true, "dependencies": { - "@emotion/react": "^11.10.4", - "@emotion/styled": "^11.10.4", + "@emotion/react": "^11.10.6", + "@emotion/styled": "^11.10.6", "@heroicons/react": "^2.0.11", "@hookform/resolvers": "^2.9.7", "@mui/icons-material": "^5.10.9", From 908f6a5506ebd14b07a57b0ef3d05a85763d67f5 Mon Sep 17 00:00:00 2001 From: Nem791 Date: Fri, 21 Apr 2023 16:18:32 +0700 Subject: [PATCH 2/2] update --- package.json | 2 +- src/App.js | 2 +- src/components/modal/CreateCardModal.js | 4 ++-- src/pages/leaderboard/index.jsx | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 91697c0..92af733 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "yup": "^0.32.11" }, "scripts": { - "start": "PORT=8888 react-scripts start", + "start": "set PORT=8888 && react-scripts start", "build": "react-scripts build", "test": "react-scripts test", "eject": "react-scripts eject", diff --git a/src/App.js b/src/App.js index 114bbef..b8a1cb8 100644 --- a/src/App.js +++ b/src/App.js @@ -192,7 +192,7 @@ function App() { socket.on("game-over", (data) => { dispatch(setIsGameOver(true)); dispatch(setShowAlert(true)); - dispatch(setMessage(`${data?.winner?.name} is winner!!!`)); + dispatch(setMessage(`${data?.winner?.name} is the winner!!!`)); dispatch(setType("winner")); }); }); diff --git a/src/components/modal/CreateCardModal.js b/src/components/modal/CreateCardModal.js index 487c5b1..18dce46 100644 --- a/src/components/modal/CreateCardModal.js +++ b/src/components/modal/CreateCardModal.js @@ -154,9 +154,9 @@ const CreateCardModal = ({ closeModel }) => { const close = closeModel; close(); } catch (err) { - console.log(err); + console.log(err.response.data.title); dispatch(setShowAlert(true)); - dispatch(setMessage("Something wrong.")); + dispatch(setMessage(err.response?.data?.title)); dispatch(setType("error")); } } diff --git a/src/pages/leaderboard/index.jsx b/src/pages/leaderboard/index.jsx index 7a8f4c2..8f9b8eb 100644 --- a/src/pages/leaderboard/index.jsx +++ b/src/pages/leaderboard/index.jsx @@ -81,7 +81,7 @@ const LeaderBoardPage = () => {