From 424d6c93afae233088d31c0796b6310c27e3d073 Mon Sep 17 00:00:00 2001 From: Lee-Seungje Date: Tue, 31 Oct 2023 15:25:47 +0900 Subject: [PATCH 01/18] Update hidden controller --- .../admin/src/PageContainer/ShopPage/index.tsx | 17 +++++++++++------ .../src/PageContainer/MissionListPage/index.tsx | 17 +++++++++++------ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/projects/admin/src/PageContainer/ShopPage/index.tsx b/projects/admin/src/PageContainer/ShopPage/index.tsx index 64c826f9..86c7131f 100644 --- a/projects/admin/src/PageContainer/ShopPage/index.tsx +++ b/projects/admin/src/PageContainer/ShopPage/index.tsx @@ -1,14 +1,19 @@ 'use client'; +import { useGetScoringList } from 'api/admin'; import * as S from './style'; import { ShopCarousel } from 'admin/components'; -const ShopPage = () => ( - - 상점 - - -); +const ShopPage = () => { + const { data } = useGetScoringList(); + + return ( + + 상점 + {data?.length > 0 ? :

상품이 없습니다...

} + + ); +}; export default ShopPage; diff --git a/projects/client/src/PageContainer/MissionListPage/index.tsx b/projects/client/src/PageContainer/MissionListPage/index.tsx index 8dcb5a15..8b0d01e8 100644 --- a/projects/client/src/PageContainer/MissionListPage/index.tsx +++ b/projects/client/src/PageContainer/MissionListPage/index.tsx @@ -1,14 +1,19 @@ 'use client'; +import { useGetMissionList } from 'api/common'; import * as S from './style'; import { MissionCarousel } from 'client/components'; -const MissionListPage = () => ( - - 문제 - - -); +const MissionListPage = () => { + const { data } = useGetMissionList(); + + return ( + + 문제 + {data?.length > 0 ? :

문제가 없습니다...

} + + ); +}; export default MissionListPage; From bb351e9b658cf9344ba7334fe85374d7604603ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=ED=83=9C=EB=9E=91?= <106226701+TaerangLee@users.noreply.github.com> Date: Tue, 31 Oct 2023 22:33:54 +0900 Subject: [PATCH 02/18] Update header redirct event --- packages/common/src/components/Header/index.tsx | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/packages/common/src/components/Header/index.tsx b/packages/common/src/components/Header/index.tsx index 71630381..ce7e224a 100644 --- a/packages/common/src/components/Header/index.tsx +++ b/packages/common/src/components/Header/index.tsx @@ -37,7 +37,11 @@ const Header: React.FC = ({ role }) => { Stack Knowledge - + 홈 @@ -47,6 +51,7 @@ const Header: React.FC = ({ role }) => { 채점하기 @@ -55,6 +60,7 @@ const Header: React.FC = ({ role }) => { 만들기 @@ -65,6 +71,7 @@ const Header: React.FC = ({ role }) => { 문제 @@ -72,7 +79,11 @@ const Header: React.FC = ({ role }) => { )} - + 상점 @@ -80,6 +91,7 @@ const Header: React.FC = ({ role }) => { 랭킹 From dcd0f43dba1b3337136fba77c352c4baf2b213da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=ED=83=9C=EB=9E=91?= <106226701+TaerangLee@users.noreply.github.com> Date: Tue, 31 Oct 2023 23:34:00 +0900 Subject: [PATCH 03/18] Update section style word-break appoint --- projects/client/src/PageContainer/MissionDetailPage/style.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/client/src/PageContainer/MissionDetailPage/style.ts b/projects/client/src/PageContainer/MissionDetailPage/style.ts index b136b598..40c45d8a 100644 --- a/projects/client/src/PageContainer/MissionDetailPage/style.ts +++ b/projects/client/src/PageContainer/MissionDetailPage/style.ts @@ -16,6 +16,7 @@ export const Section = styled.div` margin-bottom: 1.25rem; font-weight: 400; max-width: 55.625rem; + word-break: break-all; `; export const MissionWrapper = styled.div` From 0921f86b5d78fbeb712764285e826cdd49ab3694 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=ED=83=9C=EB=9E=91?= <106226701+TaerangLee@users.noreply.github.com> Date: Wed, 1 Nov 2023 02:16:16 +0900 Subject: [PATCH 04/18] Update TaskCard style TaskWrapper --- packages/common/src/components/TaskCard/index.tsx | 5 ++++- packages/common/src/components/TaskCard/style.ts | 9 ++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/packages/common/src/components/TaskCard/index.tsx b/packages/common/src/components/TaskCard/index.tsx index 5df8c4d4..0eea66f5 100644 --- a/packages/common/src/components/TaskCard/index.tsx +++ b/packages/common/src/components/TaskCard/index.tsx @@ -21,7 +21,10 @@ const TaskCard: React.FC = ({ }) => ( {userName} - {taskTitle} + + asdasd + {taskTitle} + {slicePoint(miledge)} M diff --git a/packages/common/src/components/TaskCard/style.ts b/packages/common/src/components/TaskCard/style.ts index 36b8f96c..c2800ec3 100644 --- a/packages/common/src/components/TaskCard/style.ts +++ b/packages/common/src/components/TaskCard/style.ts @@ -22,6 +22,12 @@ export const UserName = styled.span` margin: 2.5rem 0 2.25rem; `; +export const TaskWrapper = styled.div` + width: 100%; + height: 100px; + word-break: break-all; +`; + export const TaskTitle = styled.span` ${({ theme }) => theme.typo.body1}; color: ${({ theme }) => theme.color.gray['070']}; @@ -30,9 +36,10 @@ export const TaskTitle = styled.span` export const MiledgeWrapper = styled.div` width: 14rem; + height: auto; display: flex; gap: 0.25rem; - margin-top: 8rem; + margin-top: 3rem; align-items: center; justify-content: center; `; From 30d26ada7e9085e223c5ac91f1c7f2a95de12481 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=ED=83=9C=EB=9E=91?= <106226701+TaerangLee@users.noreply.github.com> Date: Wed, 1 Nov 2023 02:23:42 +0900 Subject: [PATCH 05/18] Update unit change px -> rem | MildegeUnit position fix --- packages/common/src/components/TaskCard/style.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/common/src/components/TaskCard/style.ts b/packages/common/src/components/TaskCard/style.ts index c2800ec3..e91f312f 100644 --- a/packages/common/src/components/TaskCard/style.ts +++ b/packages/common/src/components/TaskCard/style.ts @@ -24,7 +24,7 @@ export const UserName = styled.span` export const TaskWrapper = styled.div` width: 100%; - height: 100px; + height: 6.25rem; word-break: break-all; `; @@ -55,4 +55,6 @@ export const MildegeUnit = styled.span` color: ${({ theme }) => theme.color.black}; font-family: Roboto; font-weight: 500; + position: relative; + top: 0.1875rem; `; From 3c8b437a75ca247ee66b98a8775ebc78f82abd54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=ED=83=9C=EB=9E=91?= <106226701+TaerangLee@users.noreply.github.com> Date: Wed, 1 Nov 2023 02:24:22 +0900 Subject: [PATCH 06/18] Delete unless the comment --- packages/common/src/components/TaskCard/index.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/common/src/components/TaskCard/index.tsx b/packages/common/src/components/TaskCard/index.tsx index 0eea66f5..36884f49 100644 --- a/packages/common/src/components/TaskCard/index.tsx +++ b/packages/common/src/components/TaskCard/index.tsx @@ -22,7 +22,6 @@ const TaskCard: React.FC = ({ {userName} - asdasd {taskTitle} From 2c6191602ef8054feb11ec5a23fd3c9c38d8cd03 Mon Sep 17 00:00:00 2001 From: Lee-Seungje Date: Thu, 2 Nov 2023 22:33:14 +0900 Subject: [PATCH 07/18] Update list --- projects/admin/src/PageContainer/ShopPage/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/admin/src/PageContainer/ShopPage/index.tsx b/projects/admin/src/PageContainer/ShopPage/index.tsx index 86c7131f..eeeef6e4 100644 --- a/projects/admin/src/PageContainer/ShopPage/index.tsx +++ b/projects/admin/src/PageContainer/ShopPage/index.tsx @@ -1,12 +1,12 @@ 'use client'; -import { useGetScoringList } from 'api/admin'; +import { useGetOrderedItemList } from 'api/admin'; import * as S from './style'; import { ShopCarousel } from 'admin/components'; const ShopPage = () => { - const { data } = useGetScoringList(); + const { data } = useGetOrderedItemList(); return ( From 2798ebdd1af5380bf3af25fd2a1f24d32c54d370 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=ED=83=9C=EB=9E=91?= <106226701+TaerangLee@users.noreply.github.com> Date: Thu, 2 Nov 2023 22:52:02 +0900 Subject: [PATCH 08/18] Update inputValue length judgment --- .../client/src/PageContainer/MissionDetailPage/index.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/projects/client/src/PageContainer/MissionDetailPage/index.tsx b/projects/client/src/PageContainer/MissionDetailPage/index.tsx index 3a9a33bf..f594c0b7 100644 --- a/projects/client/src/PageContainer/MissionDetailPage/index.tsx +++ b/projects/client/src/PageContainer/MissionDetailPage/index.tsx @@ -60,7 +60,11 @@ const MissionDetailPage: React.FC = ({ missionId }) => { const submitSolution = () => { mutate({ solvation: - inputValue.length > 0 ? inputValue : '시간초과로 제출된 사용자입니다.', + inputValue.length === 0 + ? ' ' + : inputValue.length > 0 + ? inputValue + : '시간초과로 제출된 사용자입니다.', }); }; From 0aa2c7c37740d7c3ad9e50740e6fd952df5f46d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=ED=83=9C=EB=9E=91?= <106226701+TaerangLee@users.noreply.github.com> Date: Sun, 5 Nov 2023 13:27:34 +0900 Subject: [PATCH 09/18] Update taskCard title center aligned --- packages/common/src/components/TaskCard/style.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/common/src/components/TaskCard/style.ts b/packages/common/src/components/TaskCard/style.ts index e91f312f..dbb4d156 100644 --- a/packages/common/src/components/TaskCard/style.ts +++ b/packages/common/src/components/TaskCard/style.ts @@ -26,6 +26,8 @@ export const TaskWrapper = styled.div` width: 100%; height: 6.25rem; word-break: break-all; + display: flex; + justify-content: center; `; export const TaskTitle = styled.span` From 22a1f48d58babe2ab034fce73d2c5f47587cb9af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=ED=83=9C=EB=9E=91?= <106226701+TaerangLee@users.noreply.github.com> Date: Sun, 5 Nov 2023 23:25:35 +0900 Subject: [PATCH 10/18] Fix header active error conflict --- packages/common/src/components/Header/index.tsx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/common/src/components/Header/index.tsx b/packages/common/src/components/Header/index.tsx index a8501ef7..965cf98d 100644 --- a/packages/common/src/components/Header/index.tsx +++ b/packages/common/src/components/Header/index.tsx @@ -39,7 +39,7 @@ const Header: React.FC = ({ role }) => { @@ -50,7 +50,7 @@ const Header: React.FC = ({ role }) => { <> @@ -59,7 +59,7 @@ const Header: React.FC = ({ role }) => { @@ -70,7 +70,7 @@ const Header: React.FC = ({ role }) => { <> @@ -80,7 +80,7 @@ const Header: React.FC = ({ role }) => { )} @@ -89,7 +89,7 @@ const Header: React.FC = ({ role }) => { From ee29222fc31d08120f3f6a763b126522f6c75b1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=ED=83=9C=EB=9E=91?= <106226701+TaerangLee@users.noreply.github.com> Date: Mon, 6 Nov 2023 00:41:06 +0900 Subject: [PATCH 11/18] Update axiosError status appoint --- .../api/client/src/hooks/solve/usePostSolve.ts | 3 ++- packages/common/src/components/Header/style.ts | 12 ++++++------ .../src/PageContainer/MissionDetailPage/index.tsx | 15 ++++++++------- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/packages/api/client/src/hooks/solve/usePostSolve.ts b/packages/api/client/src/hooks/solve/usePostSolve.ts index c063c1e0..237e0724 100644 --- a/packages/api/client/src/hooks/solve/usePostSolve.ts +++ b/packages/api/client/src/hooks/solve/usePostSolve.ts @@ -1,11 +1,12 @@ import { useMutation } from '@tanstack/react-query'; import { post, solveQueryKeys, solveUrl } from 'api/common'; +import { AxiosError } from 'axios'; export const usePostSolve = (missionId: string) => useMutation< void, - Error, + AxiosError, { solvation: string; } diff --git a/packages/common/src/components/Header/style.ts b/packages/common/src/components/Header/style.ts index a36c3963..0de8ae55 100644 --- a/packages/common/src/components/Header/style.ts +++ b/packages/common/src/components/Header/style.ts @@ -34,9 +34,9 @@ export const MenuNav = styled.div` gap: ${({ role }) => (role === 'admin' ? '1.5rem' : '2.25rem')}; `; -export const MenuStrokeItemWrapper = styled(Link)<{ isActive?: boolean }>` - ${({ isActive, theme }) => { - const activeColor = isActive ? theme.color.primary : theme.color.black; +export const MenuStrokeItemWrapper = styled(Link)<{ $isActive?: boolean }>` + ${({ $isActive, theme }) => { + const activeColor = $isActive ? theme.color.primary : theme.color.black; const hoverColor = theme.color.primary; return ` display: flex; @@ -63,9 +63,9 @@ export const MenuStrokeItemWrapper = styled(Link)<{ isActive?: boolean }>` }} `; -export const MenuFillItemWrapper = styled(Link)<{ isActive?: boolean }>` - ${({ isActive, theme }) => { - const activeColor = isActive ? theme.color.primary : theme.color.black; +export const MenuFillItemWrapper = styled(Link)<{ $isActive?: boolean }>` + ${({ $isActive, theme }) => { + const activeColor = $isActive ? theme.color.primary : theme.color.black; const hoverColor = theme.color.primary; return ` display: flex; diff --git a/projects/client/src/PageContainer/MissionDetailPage/index.tsx b/projects/client/src/PageContainer/MissionDetailPage/index.tsx index f594c0b7..8705dfab 100644 --- a/projects/client/src/PageContainer/MissionDetailPage/index.tsx +++ b/projects/client/src/PageContainer/MissionDetailPage/index.tsx @@ -60,15 +60,11 @@ const MissionDetailPage: React.FC = ({ missionId }) => { const submitSolution = () => { mutate({ solvation: - inputValue.length === 0 - ? ' ' - : inputValue.length > 0 - ? inputValue - : '시간초과로 제출된 사용자입니다.', + inputValue.length > 0 ? inputValue : '시간초과로 제출된 사용자입니다.', }); }; - const { mutate, isSuccess, isError } = usePostSolve(missionId); + const { mutate, isSuccess, isError, error } = usePostSolve(missionId); useEffect(() => { setMinutes(Math.floor((data?.timeLimit ?? 0) / 60)); @@ -82,7 +78,12 @@ const MissionDetailPage: React.FC = ({ missionId }) => { if (isError) { push(`/`); - toast.error('이미 푼 문제입니다.'); + + if (error.response.status === 400) { + toast.error('시간 제한을 초과하였습니다.'); + } else { + toast.error('이미 푼 문제입니다.'); + } } return ( From 53ffc7eebad4d43ed50ea65c79cd60c12e9b20cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=ED=83=9C=EB=9E=91?= <106226701+TaerangLee@users.noreply.github.com> Date: Mon, 6 Nov 2023 17:24:00 +0900 Subject: [PATCH 12/18] Update respone status check 409 --- projects/client/src/PageContainer/MissionDetailPage/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/client/src/PageContainer/MissionDetailPage/index.tsx b/projects/client/src/PageContainer/MissionDetailPage/index.tsx index 8705dfab..f9966b1b 100644 --- a/projects/client/src/PageContainer/MissionDetailPage/index.tsx +++ b/projects/client/src/PageContainer/MissionDetailPage/index.tsx @@ -81,7 +81,7 @@ const MissionDetailPage: React.FC = ({ missionId }) => { if (error.response.status === 400) { toast.error('시간 제한을 초과하였습니다.'); - } else { + } else if (error.response.status === 409) { toast.error('이미 푼 문제입니다.'); } } From 07de1028f0eb2881d70ae7754c77ee972715ee9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=ED=83=9C=EB=9E=91?= <106226701+TaerangLee@users.noreply.github.com> Date: Mon, 6 Nov 2023 19:52:45 +0900 Subject: [PATCH 13/18] Update mission title center appoint --- packages/common/src/components/RankingCard/style.ts | 2 ++ packages/common/src/components/TaskCard/style.ts | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/common/src/components/RankingCard/style.ts b/packages/common/src/components/RankingCard/style.ts index 4186fdca..f5692b97 100644 --- a/packages/common/src/components/RankingCard/style.ts +++ b/packages/common/src/components/RankingCard/style.ts @@ -39,11 +39,13 @@ export const Point = styled.span` color: ${({ theme }) => theme.color.black}; font-weight: 500; margin-right: 0.25rem; + font-family: Roboto; `; export const PointUnit = styled.span` ${({ theme }) => theme.typo.body2}; color: ${({ theme }) => theme.color.black}; + font-family: Roboto; font-weight: 500; `; diff --git a/packages/common/src/components/TaskCard/style.ts b/packages/common/src/components/TaskCard/style.ts index dbb4d156..15d8c207 100644 --- a/packages/common/src/components/TaskCard/style.ts +++ b/packages/common/src/components/TaskCard/style.ts @@ -34,6 +34,7 @@ export const TaskTitle = styled.span` ${({ theme }) => theme.typo.body1}; color: ${({ theme }) => theme.color.gray['070']}; font-weight: 500; + text-align: center; `; export const MiledgeWrapper = styled.div` @@ -47,9 +48,11 @@ export const MiledgeWrapper = styled.div` `; export const Mildege = styled.span` - ${({ theme }) => theme.typo.button}; + ${({ theme }) => theme.typo.body2}; color: ${({ theme }) => theme.color.black}; font-weight: 500; + position: relative; + bottom: 2px; `; export const MildegeUnit = styled.span` @@ -58,5 +61,4 @@ export const MildegeUnit = styled.span` font-family: Roboto; font-weight: 500; position: relative; - top: 0.1875rem; `; From a901c979efeb4b9457619e28c2fa6cde59dc5942 Mon Sep 17 00:00:00 2001 From: TaerangLee Date: Sun, 19 Nov 2023 22:33:51 +0900 Subject: [PATCH 14/18] Add missionDetail responsive test --- .../src/components/MissionDetailInput /style.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/packages/common/src/components/MissionDetailInput /style.ts b/packages/common/src/components/MissionDetailInput /style.ts index 653f04f9..e14706d8 100644 --- a/packages/common/src/components/MissionDetailInput /style.ts +++ b/packages/common/src/components/MissionDetailInput /style.ts @@ -6,6 +6,13 @@ export const SubmitContainer = styled.div` height: 18.75rem; border-radius: 0.625rem; box-shadow: 0.1875rem 0.1875rem 0.25rem 0rem rgba(120, 120, 120, 0.25); + + @media (max-width: 1024px) { + width: calc(100vw - 2.5rem); + } + @media ${({ theme }) => theme.breakPoint[600]} { + width: calc(100vw - 5rem); + } `; export const MissionDetailInputWrapper = styled.div` display: flex; @@ -22,6 +29,10 @@ export const MissionDetailInput = styled.textarea` resize: none; border: 0; + @media (max-width: 1024px) { + text-indent: 18px; + } + ::placeholder { color: ${({ theme }) => theme.color.gray['050']}; font-weight: 500; From 1f3a8a25088eed909a1f422af257b8f4f473dbbc Mon Sep 17 00:00:00 2001 From: TaerangLee Date: Sun, 19 Nov 2023 23:35:10 +0900 Subject: [PATCH 15/18] Update missionDetail repsponsive --- .../src/components/MissionDetailInput /style.ts | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/common/src/components/MissionDetailInput /style.ts b/packages/common/src/components/MissionDetailInput /style.ts index e14706d8..cdda0061 100644 --- a/packages/common/src/components/MissionDetailInput /style.ts +++ b/packages/common/src/components/MissionDetailInput /style.ts @@ -7,11 +7,8 @@ export const SubmitContainer = styled.div` border-radius: 0.625rem; box-shadow: 0.1875rem 0.1875rem 0.25rem 0rem rgba(120, 120, 120, 0.25); - @media (max-width: 1024px) { - width: calc(100vw - 2.5rem); - } @media ${({ theme }) => theme.breakPoint[600]} { - width: calc(100vw - 5rem); + width: calc(100vw - 10rem); } `; export const MissionDetailInputWrapper = styled.div` @@ -29,8 +26,9 @@ export const MissionDetailInput = styled.textarea` resize: none; border: 0; - @media (max-width: 1024px) { - text-indent: 18px; + @media (max-width: 600px) { + width: calc(100vw - 10rem); + text-indent: 9px; } ::placeholder { @@ -63,4 +61,8 @@ export const SubmitButton = styled.button` font-weight: 400; border: 0; cursor: pointer; + + /* @media (max-width: 270px) { + width: calc(100% - 50%); + } */ `; From f4d49a22e96c32f2c7a79540bf50a40428f51949 Mon Sep 17 00:00:00 2001 From: TaerangLee Date: Sun, 19 Nov 2023 23:37:26 +0900 Subject: [PATCH 16/18] Update breakPoint width change --- packages/common/src/components/MissionDetailInput /style.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/common/src/components/MissionDetailInput /style.ts b/packages/common/src/components/MissionDetailInput /style.ts index cdda0061..1f562233 100644 --- a/packages/common/src/components/MissionDetailInput /style.ts +++ b/packages/common/src/components/MissionDetailInput /style.ts @@ -8,7 +8,7 @@ export const SubmitContainer = styled.div` box-shadow: 0.1875rem 0.1875rem 0.25rem 0rem rgba(120, 120, 120, 0.25); @media ${({ theme }) => theme.breakPoint[600]} { - width: calc(100vw - 10rem); + width: calc(100vw - 16rem); } `; export const MissionDetailInputWrapper = styled.div` @@ -27,7 +27,7 @@ export const MissionDetailInput = styled.textarea` border: 0; @media (max-width: 600px) { - width: calc(100vw - 10rem); + width: calc(100vw - 16rem); text-indent: 9px; } From d62e614213bff4e032444e8cd8e4f8388b6d4eb7 Mon Sep 17 00:00:00 2001 From: TaerangLee Date: Sun, 19 Nov 2023 23:44:21 +0900 Subject: [PATCH 17/18] Update unless the comment delete, unit px -> rem --- packages/common/src/components/MissionDetailInput /style.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/common/src/components/MissionDetailInput /style.ts b/packages/common/src/components/MissionDetailInput /style.ts index 1f562233..1e9863a1 100644 --- a/packages/common/src/components/MissionDetailInput /style.ts +++ b/packages/common/src/components/MissionDetailInput /style.ts @@ -28,7 +28,7 @@ export const MissionDetailInput = styled.textarea` @media (max-width: 600px) { width: calc(100vw - 16rem); - text-indent: 9px; + text-indent: 0.5625rem; } ::placeholder { @@ -61,8 +61,4 @@ export const SubmitButton = styled.button` font-weight: 400; border: 0; cursor: pointer; - - /* @media (max-width: 270px) { - width: calc(100% - 50%); - } */ `; From 40c2bf0ca0cd400af40de541380e149041e1dff0 Mon Sep 17 00:00:00 2001 From: TaerangLee Date: Mon, 20 Nov 2023 00:55:34 +0900 Subject: [PATCH 18/18] Update media theme use --- packages/common/src/components/MissionDetailInput /style.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/common/src/components/MissionDetailInput /style.ts b/packages/common/src/components/MissionDetailInput /style.ts index 1e9863a1..abf3c2ac 100644 --- a/packages/common/src/components/MissionDetailInput /style.ts +++ b/packages/common/src/components/MissionDetailInput /style.ts @@ -26,7 +26,7 @@ export const MissionDetailInput = styled.textarea` resize: none; border: 0; - @media (max-width: 600px) { + @media ${({ theme }) => theme.breakPoint[600]} { width: calc(100vw - 16rem); text-indent: 0.5625rem; }