Merge pull request #274 from codestates-seb/FE

Fe
codestates-seb · Sep 8, 2024 · d788a46 · d788a46
2 parents c0ebc9c + c075025
commit d788a46
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 8 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -28,6 +28,7 @@
     "html-webpack-plugin": "^5.5.1",
     "prettier": "^2.8.8",
     "style-loader": "^3.3.2",
+    "typescript": "^5.0.4",
     "webpack": "^5.81.0",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^4.13.3"

diff --git a/client/src/page/community/CommunityPost.js b/client/src/page/community/CommunityPost.js
@@ -62,15 +62,15 @@ const Commpost = () => {
   return (
     <CommunitypostDesign>
       {currentItems &&
-        currentItems.map((el) => (
+        currentItems.map((el, index) => (
           <ul
             key={el.commuId}
             className="list"
             onClick={() => {
               goBoard(el);
             }}
           >
-            <li className="postid">{el.commuId}</li>
+            <li className="postid">{data.length - (itemOffset + index ) + el.commuId.substring(el.commuId.length - 2) }</li>
             <li className="postname">{el.displayName}</li>
             <li className="posttitle">
               {el.title.length > 20

diff --git a/client/src/page/user/Login.js b/client/src/page/user/Login.js
@@ -33,8 +33,8 @@ import {
 const Login = () => {
   const navigate = useNavigate();
   const dispatch = useDispatch();
-  const [email, setEmail] = useState('');
-  const [password, setPassword] = useState('');
+  const [email, setEmail] = useState('test@gmail.com');
+  const [password, setPassword] = useState('1234');
   window.scrollTo(0, 0);
 
   const handleSubmit = async (e) => {

diff --git a/client/src/page/user/LoginModal.js b/client/src/page/user/LoginModal.js
@@ -35,8 +35,8 @@ import {
 const LoginModal = ({ onClose, isClosing }) => {
   const navigate = useNavigate();
   const dispatch = useDispatch();
-  const [email, setEmail] = useState('');
-  const [password, setPassword] = useState('');
+  const [email, setEmail] = useState('test@gmail.com');
+  const [password, setPassword] = useState('1234');
   window.scrollTo(0, 0);
 
   const handleSubmit = async (e) => {

diff --git a/client/src/redux/boardSlice.js b/client/src/redux/boardSlice.js
@@ -26,9 +26,9 @@ export const fetchBoardData = createAsyncThunk(
       console.log(response);
       const userProfileImageUrl = response.data.userProfileImageUrl;
 
-      return response.data;
+      return response.data.data;
     } catch (error) {
-      return rejectWithValue(error.response.data);
+      return rejectWithValue(error.response.data.data);
     }
   },
 );