From c3dcb924674b8e19be94136014e8a9a85640b20e Mon Sep 17 00:00:00 2001 From: Imdahee Date: Tue, 9 Sep 2025 21:56:21 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[LF-265]fix:=20=EB=A0=88=ED=8F=AC=ED=8A=B8?= =?UTF-8?q?=20=ED=8E=98=EC=9D=B4=EC=A7=80=EC=97=90=EC=84=9C=20=EB=92=A4?= =?UTF-8?q?=EB=A1=9C=EA=B0=80=EA=B8=B0=20=EB=B2=84=ED=8A=BC=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StudentReportPage/StudentReportPage.tsx | 75 ++++++++++--------- 1 file changed, 41 insertions(+), 34 deletions(-) diff --git a/src/pages/StudentReportPage/StudentReportPage.tsx b/src/pages/StudentReportPage/StudentReportPage.tsx index 25aae32..95008c0 100644 --- a/src/pages/StudentReportPage/StudentReportPage.tsx +++ b/src/pages/StudentReportPage/StudentReportPage.tsx @@ -7,10 +7,15 @@ import { fetchStudentReport } from "../../redux/StudentReport/StudentReportSlice import blueStar from "../../assets/images/levelTestPage/blueStar.svg"; import blueStar_empty from "../../assets/images/levelTestPage/blueStar_empty.svg"; -import SideTab from "../../components/Common/SideTab"; +import { faArrowLeft } from "@fortawesome/free-solid-svg-icons"; +import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { PAGE_PATHS } from "../../constants/pagePaths"; -const Container = styled.div``; +const Container = styled.div` + display: flex; + align-items: flex-start; + gap: 10px; +`; const StudentReportWrapper = styled.div` font-family: ${(props) => props.theme.font.primary}; @@ -19,11 +24,36 @@ const StudentReportWrapper = styled.div` background-color: white; border-radius: 11px; - margin: 30px; + margin: 10px; padding: 80px; border: 2px solid ${(props) => props.theme.colors.gray_M}; `; +const BackButtion = styled.div` + display: inline-flex; + align-items: center; + justify-content: center; + margin-top: 20px; + width: 52px; + height: 52px; + min-width: 52px; + min-height: 52px; + border-radius: 50%; + background-color: white; + border: 2px solid ${(props) => props.theme.colors.gray_M}; + color: ${({ theme }) => theme.colors.border_Dark}; + cursor: pointer; + padding: 0; + + &:hover { + transform: ${(props) => props.theme.transition.slow}; + transform: scale(1.1); + } + &:active { + transform: scale(0.95); + } +`; + const ReportHeader = styled.div` position: relative; margin-bottom: 20px; @@ -37,7 +67,7 @@ const PageTitle = styled.h1` font-size: ${({ theme }) => theme.fontSize.title.max}; font-family: ${({ theme }) => theme.font.primary}; border-color: ${({ theme }) => theme.colors.background_Overlay}; - color: ${({ theme }) => theme.colors.background_Overlay}; + color: ${({ theme }) => theme.colors.text_D}; padding-bottom: 12px; `; @@ -220,38 +250,15 @@ const StudentReportPage = () => { } }, [reportId, dispatch]); - //sideTab - const tabItems = [ - { - id: 1, - label: "My Lecture", - action: () => navigate(PAGE_PATHS.USER_PAGE.STUDENT.MY_LECTURES), - }, - { - id: 2, - label: "Level Test", - action: () => navigate(PAGE_PATHS.LEVEL_TEST.DASHBOARD), - }, - { - id: 3, - label: "회원정보수정", - action: () => navigate(PAGE_PATHS.USER_PAGE.STUDENT.USER_INFO), - }, - { - id: 4, - label: "나의 Q&A", - action: () => navigate(PAGE_PATHS.USER_PAGE.STUDENT.QNA), - }, - ]; - - const handleTabSelect = (id: number) => { - const tab = tabItems.find((t) => t.id === id); - if (tab?.action) tab.action(); - }; - return ( - + { + navigate(PAGE_PATHS.LEVEL_TEST.DASHBOARD); + }} + > + + LevelTest Report From 470886ed6892a52ad73df82778612553db6cdab6 Mon Sep 17 00:00:00 2001 From: Imdahee Date: Wed, 10 Sep 2025 09:43:54 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[LF-265]fix:=20=EB=A0=88=ED=8F=AC=ED=8A=B8?= =?UTF-8?q?=20=EA=B0=9C=EB=85=90=EB=B3=84=20=EC=9D=B4=ED=95=B4=EB=8F=84=20?= =?UTF-8?q?=EC=9A=94=EC=95=BD=20=EB=B0=B0=EC=97=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/StudentReportPage/StudentReportPage.tsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pages/StudentReportPage/StudentReportPage.tsx b/src/pages/StudentReportPage/StudentReportPage.tsx index 95008c0..b73ec82 100644 --- a/src/pages/StudentReportPage/StudentReportPage.tsx +++ b/src/pages/StudentReportPage/StudentReportPage.tsx @@ -136,8 +136,8 @@ const SummaryTitle = styled.h3` const SummaryContainer = styled.div` display: grid; margin: 0 auto; - - grid-template-columns: repeat(auto-fit, minmax(300px, 1fr)); + grid-template-columns: repeat(3, 1fr); + grid-template-rows: repeat(2, 1fr); gap: 20px; margin-top: 20px; width: 97%; @@ -158,7 +158,9 @@ const SummaryCard = styled.div` transform: scale(0.95); } `; + const SummaryData = styled.div``; + const ConceptName = styled.p` font-size: ${(props) => props.theme.fontSize.subtitle}; margin: 10px; @@ -183,6 +185,7 @@ const SummaryComment = styled.p` height: 30%; margin: 0 auto; `; + const EmptySummaryMessage = styled.p` min-width: 30%; From 775675ff332da9e8f50e12eb7f3984baa6519299 Mon Sep 17 00:00:00 2001 From: Imdahee Date: Wed, 10 Sep 2025 10:41:52 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[LF-265]style:=20=EB=92=A4=EB=A1=9C?= =?UTF-8?q?=EA=B0=80=EA=B8=B0=20=EB=B2=84=ED=8A=BC=20=EB=94=94=EC=9E=90?= =?UTF-8?q?=EC=9D=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StudentReportPage/StudentReportPage.tsx | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/pages/StudentReportPage/StudentReportPage.tsx b/src/pages/StudentReportPage/StudentReportPage.tsx index b73ec82..be354d7 100644 --- a/src/pages/StudentReportPage/StudentReportPage.tsx +++ b/src/pages/StudentReportPage/StudentReportPage.tsx @@ -14,7 +14,6 @@ import { PAGE_PATHS } from "../../constants/pagePaths"; const Container = styled.div` display: flex; align-items: flex-start; - gap: 10px; `; const StudentReportWrapper = styled.div` @@ -33,14 +32,16 @@ const BackButtion = styled.div` display: inline-flex; align-items: center; justify-content: center; + + position: absolute; + top: -70px; + left: -50px; margin-top: 20px; - width: 52px; - height: 52px; - min-width: 52px; - min-height: 52px; - border-radius: 50%; + width: 48px; + height: 48px; + min-width: 48px; + min-height: 48px; background-color: white; - border: 2px solid ${(props) => props.theme.colors.gray_M}; color: ${({ theme }) => theme.colors.border_Dark}; cursor: pointer; padding: 0; @@ -73,7 +74,7 @@ const PageTitle = styled.h1` const Category = styled.div` position: absolute; - top: -12px; + top: -10px; right: 32px; background: white; @@ -255,15 +256,15 @@ const StudentReportPage = () => { return ( - { - navigate(PAGE_PATHS.LEVEL_TEST.DASHBOARD); - }} - > - - + { + navigate(PAGE_PATHS.LEVEL_TEST.DASHBOARD); + }} + > + + LevelTest Report {reportData.category}