[fix/#58]:랭킹 여백, 과목 편집 여백 수정

woohaengshi · Aug 25, 2024 · e084485 · e084485
1 parent 003d396
commit e084485
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 44 deletions.
diff --git a/app/mypage/subjectedit/page.tsx b/app/mypage/subjectedit/page.tsx
@@ -17,7 +17,6 @@ export default function Page() {
   };
   const mypageSaveBtn = {
     height: '60px',
-    fontWeight: '700',
   };
 
   return (

diff --git a/app/ranking/page.module.css b/app/ranking/page.module.css
@@ -8,6 +8,10 @@
   height: 100%;
 }
 
+.tab_category{
+  margin-bottom: 20px;
+}
+
 .tab_category button {
   position: relative;
   display: block;
@@ -38,18 +42,15 @@
 .tab_category button.active::after {
   background-color: var(--main-color-3);
   height: 3.5px;
-  /* box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1),
-    0 6px 14px rgba(0, 0, 0, 0.1); */
 }
 
 .btm {
-  /* width: 100%;
-  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1),
-  0 8px 16px rgba(0, 0, 0, 0.1); */
-  /* margin-top: 30px;
-  padding-top: 50px; */
-  border-top-left-radius: 30px;
-  border-top-right-radius: 30px;
+  width: 100%;
+  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+  margin-top: 30px;
+  padding-top: 30px;
+  border-top-left-radius: 40px;
+  border-top-right-radius: 40px;
   background-color: #fff;
   border: 1px solid #f1f1ff;
 }
@@ -76,8 +77,4 @@
     padding-top: 30px;
   }
 
-  .btm {
-    padding: 15px;
-    padding-right: 7.5px;
-  }
 }
diff --git a/components/study/SubjectEditForm.tsx b/components/study/SubjectEditForm.tsx
@@ -12,13 +12,12 @@ export default function SubjectEditForm({
   showCancelButton = true,
   style,
   subjectChoiceBoxStyle,
-  saveButtonStyle,
+  mypageSaveBtn,
 }: {
   onSaveEditing: () => void;
   showCancelButton?: boolean;
   style?: React.CSSProperties;
   subjectChoiceBoxStyle?: React.CSSProperties;
-  saveButtonStyle?: React.CSSProperties;
   mypageSaveBtn?: React.CSSProperties;
 }) {
   const [newSubjectName, setNewSubjectName] = useState<string>('');
@@ -85,31 +84,30 @@ export default function SubjectEditForm({
       return;
     }
 
-      const response = await subjectFormApi(payload);
-      if (response.success) {
-        resetAddedSubjects();
-        resetDeletedSubjects();
-        setEditing(false);
+    const response = await subjectFormApi(payload);
+    if (response.success) {
+      resetAddedSubjects();
+      resetDeletedSubjects();
+      setEditing(false);
 
-        // 알림만 id값 안쓰고 모두 과목명으로 알림
-        if (deletedSubjects.length > 0) {
-          alert(
-            `삭제한 과목은 ${deletedSubjects.map((subject) => subject.name).join(', ')} 입니다` +
-              (addedSubjects.length > 0
-                ? `\n추가된 과목은 ${addedSubjects.map((subject) => subject.name).join(', ')} 입니다`
-                : ''),
-          );
-        } else {
-          if (addedSubjects.length > 0) {
-            alert(`추가된 과목은 ${addedSubjects.map((subject) => subject.name).join(', ')} 입니다`);
-          }}
-        onSaveEditing();
+      // 알림만:삭제,추가 name으로
+      if (deletedSubjects.length > 0) {
+        alert(
+          `삭제한 과목은 ${deletedSubjects.map((subject) => subject.name).join(', ')} 입니다` +
+            (addedSubjects.length > 0
+              ? `\n추가된 과목은 ${addedSubjects.map((subject) => subject.name).join(', ')} 입니다`
+              : ''),
+        );
       } else {
-        alert(`과목 편집 저장 실패: ${response.message}`);
-      };
-
+        if (addedSubjects.length > 0) {
+          alert(`추가된 과목은 ${addedSubjects.map((subject) => subject.name).join(', ')} 입니다`);
+        }
+      }
+      onSaveEditing();
+    } else {
+      alert(`과목 편집 저장 실패: ${response.message}`);
     }
-
+  };
 
   return (
     <div className={styles.subject_edit_form_wrap_inner} style={style}>
@@ -151,7 +149,7 @@ export default function SubjectEditForm({
           type="submit"
           className={styles.subject_edit_form_btn_save}
           onClick={handleSaveEditing}
-          style={saveButtonStyle}
+          style={mypageSaveBtn}
         >
           저장
         </button>

diff --git a/components/study/SubjectForm.module.css b/components/study/SubjectForm.module.css
@@ -96,7 +96,7 @@
 
 .subject_choice_text_wrap {
   width: 100%;
-  height: 60px;
+  height: 57px;
   display: flex;
   justify-content: flex-start;
   align-items: center;
@@ -136,6 +136,7 @@
   flex-wrap: wrap;
   box-sizing: border-box;
   padding-top: 5px;
+  padding-bottom: 15px;
   gap: 15px;
   row-gap: 15px;
   overflow-y: auto;
@@ -146,7 +147,7 @@
 .subject_item_wrapper {
   position: relative;
   display: inline-block;
-  max-width: 99%;
+  max-width: 100%;
 }
 
 .subject_item {
@@ -267,7 +268,7 @@
 .subject_edit_form_btn_save,
 .subject_edit_form_btn_modify {
   font-size: 18px;
-  height: 56px;
+  height: 60px;
   line-height: 30px;
   border: none;
   border-radius: 8px;

diff --git a/store/subjectStore.ts b/store/subjectStore.ts
@@ -6,8 +6,6 @@ interface Subject {
 }
 
 
-// selectedSubjects: 선택된 배열 
-// selectSubject: 선택 과목 
 interface SubjectStoreState {
   subjects: Subject[];
   initialSelectedSubjects: Subject[];