chore :: 텍스트, 스타일 변경

EntryDSM · Jul 13, 2024 · 56046a0 · 56046a0
1 parent 9d8915d
commit 56046a0
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 32 deletions.
diff --git a/src/components/Grade/GradeFooter.tsx b/src/components/Grade/GradeFooter.tsx
@@ -77,45 +77,51 @@ const GradeFooter = ({
               <Text size="header3" color="black900">
                 일반 전형:
               </Text>
-              <Text size="header3" color="orange900">
-                {((gradeScore * 175) / 100 + maxScore + dsmAlgorithmScore).toFixed(3)}
-              </Text>
+              <_ScoreBox>
+                <Text size="header3" color="orange900">
+                  {((gradeScore * 175) / 100 + maxScore + dsmAlgorithmScore).toFixed(3)}
+                </Text>
+                <Text color="black400" size="title3">
+                  /170
+                </Text>
+              </_ScoreBox>
             </_DIV>
             <_DIV>
               <Text size="header3" color="black900">
                 사회통합 전형:
               </Text>
-              <Text size="header3" color="orange900">
-                {gradeScore + maxScore + dsmAlgorithmScore + certificateScore}
-              </Text>
+              <_ScoreBox>
+                <Text size="header3" color="orange900">
+                  {(gradeScore + maxScore + dsmAlgorithmScore + certificateScore).toFixed(3)}
+                </Text>
+                <Text color="black400" size="title3">
+                  /110
+                </Text>
+              </_ScoreBox>
             </_DIV>
             <_DIV>
               <Text size="header3" color="black900">
                 마이스터 인재:
               </Text>
-              <Text size="header3" color="orange900">
-                {gradeScore + maxScore + dsmAlgorithmScore + certificateScore}
-              </Text>
+              <_ScoreBox>
+                <Text size="header3" color="orange900">
+                  {(gradeScore + maxScore + dsmAlgorithmScore + certificateScore).toFixed(3)}
+                </Text>
+                <Text color="black400" size="title3">
+                  /110
+                </Text>
+              </_ScoreBox>
             </_DIV>
             <_DIV>
-              <Button
-                kind="outlined"
-                color="black"
+              <_Button
                 onClick={() => {
                   (window.location.href = `${MAIN_URL}/grade`), close();
                 }}
               >
-                다시 입력
-              </Button>
-              <Button
-                kind="contained"
-                color="orange"
-                onClick={() => {
-                  (window.location.href = `${MAIN_URL}`), close();
-                }}
-              >
-                닫기
-              </Button>
+                <Text color="realWhite" size="body3">
+                  닫기
+                </Text>
+              </_Button>
             </_DIV>
           </_Container>
         </Modal>
@@ -146,5 +152,23 @@ const _Container = styled.div`
 const _DIV = styled.div`
   display: flex;
   justify-content: space-between;
-  width: 220px;
+  gap: 6px;
+  width: 100%;
+  width: 320px;
+`;
+
+const _Button = styled.button`
+  border-radius: 5px;
+  background-color: ${theme.color.orange500};
+  &:hover {
+    background-color: ${theme.color.orange600};
+  }
+  padding: 12px;
+  width: 100%;
+  cursor: pointer;
+`;
+
+const _ScoreBox = styled.div`
+  display: flex;
+  align-items: center;
 `;
diff --git a/src/components/Grade/GradePreview.tsx b/src/components/Grade/GradePreview.tsx
@@ -21,21 +21,21 @@ const GradePreview = ({
 }: IGradePreview) => {
   return (
     <CurrentGrades>
-      <Text size="title3" color="black" style={{ fontWeight: 700 }}>
+      <Text size="body1" color="black" style={{ fontWeight: 700 }}>
         총: {gradeScore + attendenceScore + volunteerScore}/{maxScore}
       </Text>
-      <Text size="title3" color="black" style={{ fontWeight: 500 }}>
+      <Text size="body2" color="black" style={{ fontWeight: 500 }}>
         성적 점수: {gradeScore}/{maxScore - 30}
       </Text>
-      <Text size="title3" color="black" style={{ fontWeight: 500 }}>
+      <Text size="body2" color="black" style={{ fontWeight: 500 }}>
         출석 점수: {attendenceScore}/15
       </Text>
-      <Text size="title3" color="black" style={{ fontWeight: 500 }}>
+      <Text size="body2" color="black" style={{ fontWeight: 500 }}>
         봉사 점수: {volunteerScore}/15
       </Text>
-      {/* <Text size="title3" color="black" style={{ fontWeight: 500 }}>
-        가산점: {dsmAlgorithmScore + certificateScore}/9
-      </Text> */}
+      <Text size="body2" color="black" style={{ fontWeight: 500 }}>
+        가산점: +{dsmAlgorithmScore + certificateScore}
+      </Text>
     </CurrentGrades>
   );
 };

diff --git a/src/components/Grade/WriteInfo/WriteAttendence.tsx b/src/components/Grade/WriteInfo/WriteAttendence.tsx
@@ -97,7 +97,7 @@ const WriteAttendence = ({
           placeholder="결과 횟수"
           value={writeGradeElement.lecture_absence_count}
           onChange={changeWriteGradeElement}
-          unit="일"
+          unit="회"
         />
       </GradeWraper>
       <GradeWraper title="봉사활동 시간">