Merge pull request #15 from codestates-seb/dev

Upstream Pull

client/src/components/MarkDownEditor.jsx

@@ -0,0 +1,19 @@
+import { forwardRef } from 'react';
+import '@toast-ui/editor/dist/toastui-editor.css'; // Editor 스타일
+import { Editor } from '@toast-ui/react-editor';
+import styled from 'styled-components';
+
+const EditorWrapper = styled.div`
+  margin-bottom: 1rem;
+`;
+
+const MarkDownEditor = (props, ref) => (
+  <EditorWrapper>
+    <Editor
+      ref={ref}
+      initialValue={props.content || ' '} // 글 수정 시 사용
+    />
+  </EditorWrapper>
+);
+
+export default forwardRef(MarkDownEditor);

client/src/components/pagenation/Pagenation.jsx

@@ -91,12 +91,12 @@ function Pagination({ total, limit, setPage, page, setLimit }) {
           <PageBtn onClick={() => handleLimitChange(5)} active={limit === 5}>
             5
           </PageBtn>
+          <PageBtn onClick={() => handleLimitChange(30)} active={limit === 15}>
+            15
+          </PageBtn>
           <PageBtn onClick={() => handleLimitChange(30)} active={limit === 30}>
             30
           </PageBtn>
-          <PageBtn onClick={() => handleLimitChange(30)} active={limit === 50}>
-            50
-          </PageBtn>
         </RightButtons>
       </Nav>
     </>

client/src/pages/Questions.jsx

@@ -488,7 +488,7 @@ const UserId = styled.div`
     color: rgb(0, 116, 204);
     cursor: pointer;
     line-height: 0.75rem;
-    margin: -0.125rem;
+    margin: 0.125rem;
   }
 `;
 const UserTime = styled.time`

server/src/main/java/com/rainbow/sof/domain/question/service/QuestionService.java

@@ -20,7 +20,7 @@
 @Transactional
 @Service
 public class QuestionService {
-    private final int SIZE = 10;
+    private final int SIZE = 15;
     private final QuestionRepository questionRepository;
     private final UserService userService;