diff --git "a/apps/user/src/app/form/\354\264\210\354\225\210\354\236\221\354\204\261\354\231\204\353\243\214/\354\264\210\354\225\210\354\236\221\354\204\261\354\231\204\353\243\214.tsx" "b/apps/user/src/app/form/\354\264\210\354\225\210\354\236\221\354\204\261\354\231\204\353\243\214/\354\264\210\354\225\210\354\236\221\354\204\261\354\231\204\353\243\214.tsx"
index e0e52a365..766b5c468 100644
--- "a/apps/user/src/app/form/\354\264\210\354\225\210\354\236\221\354\204\261\354\231\204\353\243\214/\354\264\210\354\225\210\354\236\221\354\204\261\354\231\204\353\243\214.tsx"
+++ "b/apps/user/src/app/form/\354\264\210\354\225\210\354\236\221\354\204\261\354\231\204\353\243\214/\354\264\210\354\225\210\354\236\221\354\204\261\354\231\204\353\243\214.tsx"
@@ -62,7 +62,6 @@ const 초안작성완료 = () => {
? '원서 접수에 필요한 초안을 모두 작성하셨습니다.'
: '원서 작성 중 입력하지 않은 곳이 있습니다.'}
-
{isComplete
? '원서 초안 제출 시 부산소프트웨어마이스터고등학교 입학전형에 응시한 것으로\n 처리되며 더 이상 입학원서 수정이 불가능합니다.'
diff --git a/apps/user/src/components/result/FinalResultTable/FinalResultTable.tsx b/apps/user/src/components/result/FinalResultTable/FinalResultTable.tsx
index 2ca4cd380..651cbbc0b 100644
--- a/apps/user/src/components/result/FinalResultTable/FinalResultTable.tsx
+++ b/apps/user/src/components/result/FinalResultTable/FinalResultTable.tsx
@@ -10,24 +10,24 @@ const FinalResultTable = () => {
const { data: finalResultData } = useFinalResultQuery();
return finalResultData ? (
-
+
-
+
) : null;
};
export default FinalResultTable;
-const StyledFinalResultTable = styled.div<{ is합격: boolean }>`
+const StyledFinalResultTable = styled.div<{ isPassed: boolean }>`
${flex({ flexDirection: 'column', alignItems: 'center' })};
- gap: ${(props) => (props.is합격 ? '64px' : '120px')};
+ gap: ${(props) => (props.isPassed ? '64px' : '120px')};
`;
diff --git a/apps/user/src/components/result/FirstResultTable/FirstResultTable.tsx b/apps/user/src/components/result/FirstResultTable/FirstResultTable.tsx
index 1a5d9ec14..dd01d9319 100644
--- a/apps/user/src/components/result/FirstResultTable/FirstResultTable.tsx
+++ b/apps/user/src/components/result/FirstResultTable/FirstResultTable.tsx
@@ -1,33 +1,33 @@
+import { useFirstResultQuery } from '@/services/result/queries';
import { Column } from '@maru/ui';
import { flex } from '@maru/utils';
+import styled from 'styled-components';
import ResultTableFooter from '../ResultTableFooter/ResultTableFooter';
import ResultTableHeader from '../ResultTableHeader/ResultTableHeader';
import ResultTableItem from '../ResultTableItem/ResultTableItem';
-import styled from 'styled-components';
-import { useFirstResultQuery } from '@/services/result/queries';
const FirstResultTable = () => {
const { data: firstResultData } = useFirstResultQuery();
return firstResultData ? (
-
+
-
+
) : null;
};
export default FirstResultTable;
-const StyledFirstResultTable = styled.div<{ is합격: boolean }>`
+const StyledFirstResultTable = styled.div<{ isPassed: boolean }>`
${flex({ flexDirection: 'column', alignItems: 'center' })};
- gap: ${(props) => (props.is합격 ? '64px' : '120px')};
+ gap: ${(props) => (props.isPassed ? '64px' : '120px')};
`;
diff --git a/apps/user/src/components/result/ResultMain/ResultMain.tsx b/apps/user/src/components/result/ResultMain/ResultMain.tsx
index 6ee0decaf..7102a3ea8 100644
--- a/apps/user/src/components/result/ResultMain/ResultMain.tsx
+++ b/apps/user/src/components/result/ResultMain/ResultMain.tsx
@@ -11,34 +11,31 @@ interface Props {
}
const ResultMain = ({ setResultStep, option }: Props) => {
+ const resultInfoData =
+ option === 'FIRST'
+ ? {
+ date: '2023년 10월 23일 (월) 15:00',
+ capacity: '일반전형 및 특별전형 각각 모집정원의 130% 이내',
+ }
+ : {
+ date: '2023년 11월 2일 (목) 15:00',
+ capacity: '일반전형 36명, 특별전형 28명, 정원 외 전형 3명',
+ };
+
return (
- {option === 'FIRST' ? (
-
-
- 일시: 2023년 10월 23일 (월) 15:00
-
-
- 모집 정원: 일반전형 및 특별전형 각각 모집정원의 130% 이내{' '}
-
-
- 장소: 본교 입학전형 서비스 (마루)
-
-
- ) : (
-
-
- 일시: 2023년 11월 2일 (목) 15:00
-
-
- 모집 정원: 일반전형 36명, 특별전형 28명, 정원 외 전형 3명
-
-
- 장소: 본교 입학전형 서비스 (마루)
-
-
- )}
+
+
+ 일시: {resultInfoData.date}
+
+
+ 모집 정원: {resultInfoData.capacity}
+
+
+ 장소: 본교 입학전형 서비스 (마루)
+
+
- {is합격 ? (
-
- 합격
-
- ) : (
-
- 불합격
-
- )}
+
+ {isPassed ? '합격' : '불합격'}
+
);
};
diff --git a/apps/user/src/hooks/useGradeCaculation.ts b/apps/user/src/hooks/useGradeCaculation.ts
index b8165de38..45c9ae825 100644
--- a/apps/user/src/hooks/useGradeCaculation.ts
+++ b/apps/user/src/hooks/useGradeCaculation.ts
@@ -29,7 +29,7 @@ const useGradeCalculation = () => {
const form = useFormValueStore();
const getScoreOf = (achievementLevelKey: AchievementLevelKey) => {
- const scoreTotal = form.grade.subjectList.reduce((acc, subject) => {
+ const scoreTotal = form.grade.subjectList?.reduce((acc, subject) => {
const achievementLevel = subject[achievementLevelKey];
const subjectName = subject.subjectName;
if (subjectName === '수학' && achievementLevel !== null) {
@@ -39,7 +39,7 @@ const useGradeCalculation = () => {
}
}, 0);
const scoreLength =
- form.grade.subjectList.filter((subject) => subject[achievementLevelKey] !== null)
+ form.grade.subjectList?.filter((subject) => subject[achievementLevelKey] !== null)
.length + 1;
return scoreTotal / scoreLength;
diff --git a/packages/maru-theme/src/global.ts b/packages/maru-theme/src/global.ts
index 638fb1ef8..3ffc73b3f 100644
--- a/packages/maru-theme/src/global.ts
+++ b/packages/maru-theme/src/global.ts
@@ -1,9 +1,7 @@
import { createGlobalStyle } from 'styled-components';
-import { reset } from 'styled-reset';
import color from './color';
const GlobalStyle = createGlobalStyle`
-${reset}
* {
box-sizing: border-box;
@@ -17,9 +15,6 @@ input[type="radio"] {
cursor: pointer;
}
-p {
- display: inline-block;
-}
a {
display: inline-block;
diff --git a/packages/maru-ui/src/Text/Text.tsx b/packages/maru-ui/src/Text/Text.tsx
index e589439b6..2ee4e5275 100644
--- a/packages/maru-ui/src/Text/Text.tsx
+++ b/packages/maru-ui/src/Text/Text.tsx
@@ -12,6 +12,7 @@ interface Props extends HTMLAttributes {
textAlign?: CSSProperties['textAlign'];
ellipsis?: boolean;
whiteSpace?: CSSProperties['whiteSpace'];
+ tag?: 'span' | 'p';
}
const Text = ({
@@ -22,11 +23,13 @@ const Text = ({
width,
ellipsis = false,
whiteSpace = 'nowrap',
+ tag = 'span',
}: Props) => {
return (
{children}
@@ -35,7 +38,7 @@ const Text = ({
export default Text;
-const StyledText = styled.p<{ fontType: Font; ellipsis: boolean }>`
+const StyledText = styled.span<{ fontType: Font; ellipsis: boolean }>`
${({ fontType }) => font[fontType]}
${(props) =>
props.ellipsis &&