Merge pull request #173 from 9oooorm-bangbumde/develop-front

Develop front
9oooorm-bangbumde · Aug 13, 2024 · 8cd7ae8 · 8cd7ae8
2 parents f170409 + 616f8a6
commit 8cd7ae8
Show file tree

Hide file tree

Showing 3 changed files with 81 additions and 66 deletions.
diff --git a/FrontEnd/goorm/src/pages/Exercise/ExerciseMemo.tsx b/FrontEnd/goorm/src/pages/Exercise/ExerciseMemo.tsx
@@ -46,37 +46,39 @@ const ExerciseMemo = ({dateInfo}:ExerciseMemoProps) => {
       <MemoDetails>
         <DetailsText>메모</DetailsText>
         {!isAnyModalOpen() && (
-          <CKEditor
-            editor={ClassicEditor}
-            data={editorData}
-            onChange={(event, editor) => {
-              const data = editor.getData();
-              setEditorData(data);
-              if (dateInfo) {
-                const formattedDate = formatDateInfo(dateInfo);
-                setMemo({
-                  content: data,
-                  date: formattedDate,
-                });
-              }
-            }}
-            config={{
-              toolbar: [
-                "heading",
-                "|",
-                "bold",
-                "italic",
-                "link",
-                "bulletedList",
-                "numberedList",
-                "blockQuote",
-                "imageUpload",
-              ],
-              ckfinder: {
-                uploadUrl: `${axiosInstance.defaults.baseURL}/s3/ck/upload`,
-              },
-            }}
-          />
+          <EditorContainer>
+            <CKEditor
+              editor={ClassicEditor}
+              data={editorData}
+              onChange={(event, editor) => {
+                const data = editor.getData();
+                setEditorData(data);
+                if (dateInfo) {
+                  const formattedDate = formatDateInfo(dateInfo);
+                  setMemo({
+                    content: data,
+                    date: formattedDate,
+                  });
+                }
+              }}
+              config={{
+                toolbar: [
+                  "heading",
+                  "|",
+                  "bold",
+                  "italic",
+                  "link",
+                  "bulletedList",
+                  "numberedList",
+                  "blockQuote",
+                  "imageUpload",
+                ],
+                ckfinder: {
+                  uploadUrl: `${axiosInstance.defaults.baseURL}/s3/ck/upload`,
+                },
+              }}
+            />
+          </EditorContainer>
         )}
       </MemoDetails>
     </MemoContainer>
@@ -122,3 +124,9 @@ const DetailsText = styled.p`
   font-size: 0.875rem;
   text-align: center;
 `;
+
+const EditorContainer = styled.div`
+  .image {
+    width: 400px;
+  }
+`
diff --git a/FrontEnd/goorm/src/pages/FindGym/Map/Map.scss b/FrontEnd/goorm/src/pages/FindGym/Map/Map.scss
@@ -37,13 +37,13 @@
             align-items: center;
 
             input {
-                padding: .625rem;
+                padding: .3125rem .3125rem;
                 font-size: 1rem;
                 border: 1px solid #ccc;
                 border-radius: 5px;
                 margin-right: .625rem;
                 margin-left: .625rem;
-                height: 40px;
+                height: 1.875rem;
             }
 
             button {

diff --git a/FrontEnd/goorm/src/pages/Food/FoodMemo.tsx b/FrontEnd/goorm/src/pages/Food/FoodMemo.tsx
@@ -47,39 +47,40 @@ const FoodMemo = ({ dateInfo }: FoodMemoProps) => {
     <MemoContainer>
       <MemoDetails>
         <DetailsText>메모</DetailsText>
-        {!isAnyModalOpen() && ( // 다른 모달이 열려있지 않을 때 CKeditor 표시
-          <CKEditor
-            editor={ClassicEditor}
-            data={editorData}
-            onChange={(event, editor) => {
-              const data = editor.getData();
-              setEditorData(data);
-              // 선택된 날짜에 대한 메모를 업데이트합니다
-              if (dateInfo) {
-                const formattedDate = formatDateInfo(dateInfo); // 날짜 형식화
-                setMemo({
-                  content: data,
-                  date: formattedDate,
-                });
-              }
-            }}
-            config={{
-              toolbar: [
-                "heading",
-                "|",
-                "bold",
-                "italic",
-                "link",
-                "bulletedList",
-                "numberedList",
-                "blockQuote",
-                "imageUpload",
-              ],
-              ckfinder: {
-                uploadUrl: `${axiosInstance.defaults.baseURL}/s3/ck/upload`,
-              },
-            }}
-          />
+        {!isAnyModalOpen() && (
+          <EditorContainer>
+            <CKEditor
+              editor={ClassicEditor}
+              data={editorData}
+              onChange={(event, editor) => {
+                const data = editor.getData();
+                setEditorData(data);
+                if (dateInfo) {
+                  const formattedDate = formatDateInfo(dateInfo); 
+                  setMemo({
+                    content: data,
+                    date: formattedDate,
+                  });
+                }
+              }}
+              config={{
+                toolbar: [
+                  "heading",
+                  "|",
+                  "bold",
+                  "italic",
+                  "link",
+                  "bulletedList",
+                  "numberedList",
+                  "blockQuote",
+                  "imageUpload",
+                ],
+                ckfinder: {
+                  uploadUrl: `${axiosInstance.defaults.baseURL}/s3/ck/upload`,
+                },
+              }}
+            />
+          </EditorContainer>
         )}
       </MemoDetails>
     </MemoContainer>
@@ -125,3 +126,9 @@ const DetailsText = styled.p`
   font-size: 0.875rem;
   text-align: center;
 `;
+
+const EditorContainer = styled.div`
+  .image {
+    width: 400px;
+  }
+`;