From 30c04f9871580c9e38597e2ee4723cc072dcde27 Mon Sep 17 00:00:00 2001 From: aaminha Date: Sun, 9 Jun 2024 23:49:40 +0900 Subject: [PATCH 1/7] =?UTF-8?q?[#110]=20design:=20=EB=B2=84=ED=8A=BC=20?= =?UTF-8?q?=EC=83=89=EC=83=81=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Button/PlainButton.tsx | 2 +- src/styles/color.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Button/PlainButton.tsx b/src/components/Button/PlainButton.tsx index 079a74b..606202c 100644 --- a/src/components/Button/PlainButton.tsx +++ b/src/components/Button/PlainButton.tsx @@ -68,7 +68,7 @@ const getVariantStyle = ($variant: PlainButtonVariant) => { &:hover { color: ${({ theme }) => theme.colors.grayScale02}; - box-shadow: 4px 2px 16px 0px rgba(142, 142, 142, 0.12); + box-shadow: 4px 2px 16px 0px rgba(142, 142, 142, 0.24); } `; } diff --git a/src/styles/color.ts b/src/styles/color.ts index 92e064c..629a91f 100644 --- a/src/styles/color.ts +++ b/src/styles/color.ts @@ -6,7 +6,7 @@ const colors = { mainMintDarkGra: 'linear-gradient(0deg, #36BDB4 0%, rgba(54, 189, 180, 0.60) 100%)', mainMintLight: '#FBFFFF', - mainMintShadow: 'rgba(54, 189, 180, 0.32)', + mainMintShadow: 'rgba(54, 189, 180, 0.28)', grayScale01: '#000000', grayScale02: '#424242', From b88310c35e1d797dbc99c7e3342645b2b98341d5 Mon Sep 17 00:00:00 2001 From: aaminha Date: Mon, 10 Jun 2024 21:02:27 +0900 Subject: [PATCH 2/7] =?UTF-8?q?[#110]=20design:=20=EC=B9=B4=ED=85=8C?= =?UTF-8?q?=EA=B3=A0=EB=A6=AC=20=EC=82=AC=EC=9D=B4=EB=93=9C=20=EB=B0=94=20?= =?UTF-8?q?=EB=A7=88=EC=A7=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/containers/CategoryPage/CategorySidebar.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/containers/CategoryPage/CategorySidebar.tsx b/src/containers/CategoryPage/CategorySidebar.tsx index 47641ea..3219001 100644 --- a/src/containers/CategoryPage/CategorySidebar.tsx +++ b/src/containers/CategoryPage/CategorySidebar.tsx @@ -108,6 +108,7 @@ const StyleTitleContainer = styled.div` justify-content: space-between; width: 100%; padding-right: 16px; + margin-top: 16px; .plus-button { display: flex; From c8198ec0b61b967700f0d625eda23fd42fb10384 Mon Sep 17 00:00:00 2001 From: aaminha Date: Mon, 10 Jun 2024 21:07:58 +0900 Subject: [PATCH 3/7] =?UTF-8?q?[#110]=20design:=20=EB=B0=B0=EA=B2=BD?= =?UTF-8?q?=EC=83=89=20=EC=A0=81=EC=9A=A9=20=EC=95=88=20=EB=90=9C=20?= =?UTF-8?q?=EB=B6=80=EB=B6=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/LoginPage.tsx | 2 ++ src/pages/SelectServicePage.tsx | 1 + 2 files changed, 3 insertions(+) diff --git a/src/pages/LoginPage.tsx b/src/pages/LoginPage.tsx index 9a266d3..542db60 100644 --- a/src/pages/LoginPage.tsx +++ b/src/pages/LoginPage.tsx @@ -42,6 +42,8 @@ const BrandWrapper = styled.div` align-items: center; width: 100%; height: 100%; + + background: ${({ theme }) => theme.colors.mainMintLight}; `; const LoginWrapper = styled.div` diff --git a/src/pages/SelectServicePage.tsx b/src/pages/SelectServicePage.tsx index 90a0899..7488f2c 100644 --- a/src/pages/SelectServicePage.tsx +++ b/src/pages/SelectServicePage.tsx @@ -90,6 +90,7 @@ const Container = styled.div` gap: 84px; height: calc(100vh - 64px); + background: ${({ theme }) => theme.colors.grayScale08}; `; const Title = styled.div` From f1dc243d2cb166a698525d8906539b9b17417bf3 Mon Sep 17 00:00:00 2001 From: aaminha Date: Mon, 10 Jun 2024 21:11:42 +0900 Subject: [PATCH 4/7] =?UTF-8?q?[#110]=20fix:=20=ED=80=B4=EC=A6=88=20?= =?UTF-8?q?=EC=9E=85=EB=A0=A5=EC=B0=BD=20=EA=B2=BD=EA=B3=A0=20=EC=A1=B0?= =?UTF-8?q?=EA=B1=B4=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20=EC=9E=90=EC=B2=B4?= =?UTF-8?q?=20=ED=80=B4=EC=A6=88=20=EC=83=9D=EC=84=B1=20=EC=A1=B0=EA=B1=B4?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/containers/QuizUserPage/GenerateSection.tsx | 2 +- src/pages/CategoryQuizEditPage.tsx | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/containers/QuizUserPage/GenerateSection.tsx b/src/containers/QuizUserPage/GenerateSection.tsx index f62a8be..63c355d 100644 --- a/src/containers/QuizUserPage/GenerateSection.tsx +++ b/src/containers/QuizUserPage/GenerateSection.tsx @@ -45,7 +45,7 @@ function GenerateSection() { if ( quizContent.problemName === '' || quizContent.problemCommentary === '' || - quizContent.problemChoices.includes('') + (inputOption.type === '객관식' && quizContent.problemChoices.includes('')) ) { setShowWarning(true); return; diff --git a/src/pages/CategoryQuizEditPage.tsx b/src/pages/CategoryQuizEditPage.tsx index b42428f..297ddb0 100644 --- a/src/pages/CategoryQuizEditPage.tsx +++ b/src/pages/CategoryQuizEditPage.tsx @@ -90,6 +90,7 @@ function CategoryQuizEditPage() { quizType={quizType} quizContent={quizContent} setQuizContent={setQuizContent} + showWarning /> From 013e06034f1af99b9689b6826220870f4fb05ec1 Mon Sep 17 00:00:00 2001 From: aaminha Date: Tue, 11 Jun 2024 11:05:43 +0900 Subject: [PATCH 5/7] =?UTF-8?q?[#110]=20design:=20=ED=8A=B9=EC=A0=95=20?= =?UTF-8?q?=EC=9A=94=EC=86=8C=EB=93=A4=EC=97=90=20transition=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Button/PlainButton.tsx | 4 ++- src/components/Card/GenerateMethodCard.tsx | 38 ++++++++++----------- src/components/Navigation/MenuBar.tsx | 2 ++ src/components/Navigation/TopNavigation.tsx | 2 ++ 4 files changed, 26 insertions(+), 20 deletions(-) diff --git a/src/components/Button/PlainButton.tsx b/src/components/Button/PlainButton.tsx index 606202c..22de226 100644 --- a/src/components/Button/PlainButton.tsx +++ b/src/components/Button/PlainButton.tsx @@ -84,10 +84,12 @@ const StyledButton = styled.button<{ gap: 10px; border-radius: 8px; - ${({ theme }) => theme.typography.button}; + ${({ theme }) => theme.typography.button} ${({ $size }) => getSizeStyle($size)} ${({ $variant }) => getVariantStyle($variant)} + transition: all 0.5s; + &:disabled { background: ${({ theme }) => theme.colors.grayScale06}; color: ${({ theme }) => theme.colors.grayScale09}; diff --git a/src/components/Card/GenerateMethodCard.tsx b/src/components/Card/GenerateMethodCard.tsx index c057ea1..30d4bc5 100644 --- a/src/components/Card/GenerateMethodCard.tsx +++ b/src/components/Card/GenerateMethodCard.tsx @@ -60,28 +60,28 @@ const StyledCard = styled.button` background: ${({ theme }) => theme.colors.grayScale09}; box-shadow: 0px 0px 8px 0px rgba(189, 189, 189, 0.2); + transition: all 0.5s; + &:hover { - &:hover { - box-shadow: 0px 0px 8px 0px rgba(54, 189, 180, 0.24); - - .upload-icon { - path { - stroke: ${(props) => props.theme.colors.mainMint}; - } - path:first-of-type { - stroke: none; - fill: ${(props) => props.theme.colors.mainMint}; - } + box-shadow: 0px 0px 8px 0px rgba(54, 189, 180, 0.24); + + .upload-icon { + path { + stroke: ${(props) => props.theme.colors.mainMint}; + } + path:first-of-type { + stroke: none; + fill: ${(props) => props.theme.colors.mainMint}; } + } - .text-icon { - path { - stroke: ${(props) => props.theme.colors.mainMint}; - } - path:last-of-type { - stroke: none; - fill: ${(props) => props.theme.colors.mainMint}; - } + .text-icon { + path { + stroke: ${(props) => props.theme.colors.mainMint}; + } + path:last-of-type { + stroke: none; + fill: ${(props) => props.theme.colors.mainMint}; } } } diff --git a/src/components/Navigation/MenuBar.tsx b/src/components/Navigation/MenuBar.tsx index c676bc1..bff3a51 100644 --- a/src/components/Navigation/MenuBar.tsx +++ b/src/components/Navigation/MenuBar.tsx @@ -106,6 +106,8 @@ const StyledMenuButton = styled.button<{ $isActive: boolean }>` color: ${({ $isActive, theme }) => $isActive ? theme.colors.grayScale02 : theme.colors.grayScale03}; + transition: all 0.5s; + &:hover { color: ${({ theme }) => theme.colors.grayScale02}; ${StyledActiveIcon} { diff --git a/src/components/Navigation/TopNavigation.tsx b/src/components/Navigation/TopNavigation.tsx index 1880450..85e9780 100644 --- a/src/components/Navigation/TopNavigation.tsx +++ b/src/components/Navigation/TopNavigation.tsx @@ -80,6 +80,8 @@ const LogoutButton = styled.button` ${({ theme }) => theme.typography.subtitle}; color: ${({ theme }) => theme.colors.grayScale04}; + transition: all 0.5s; + &:hover { color: ${({ theme }) => theme.colors.grayScale02}; } From 9b4180315d2821f08088fc83a183174051207960 Mon Sep 17 00:00:00 2001 From: aaminha Date: Tue, 11 Jun 2024 15:02:07 +0900 Subject: [PATCH 6/7] =?UTF-8?q?[#110]=20design:=20PlainButton=EC=97=90=20t?= =?UTF-8?q?ransition=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Button/PlainButton.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/components/Button/PlainButton.tsx b/src/components/Button/PlainButton.tsx index 22de226..93f36ec 100644 --- a/src/components/Button/PlainButton.tsx +++ b/src/components/Button/PlainButton.tsx @@ -88,8 +88,6 @@ const StyledButton = styled.button<{ ${({ $size }) => getSizeStyle($size)} ${({ $variant }) => getVariantStyle($variant)} - transition: all 0.5s; - &:disabled { background: ${({ theme }) => theme.colors.grayScale06}; color: ${({ theme }) => theme.colors.grayScale09}; From 93c89ad854084ccf12c30ff888fd21e131bf37de Mon Sep 17 00:00:00 2001 From: aaminha Date: Tue, 11 Jun 2024 15:06:00 +0900 Subject: [PATCH 7/7] =?UTF-8?q?[#110]=20chore:=20index.html=EC=97=90=20met?= =?UTF-8?q?a=20description=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/index.html b/index.html index b2288c8..306d0ed 100644 --- a/index.html +++ b/index.html @@ -15,6 +15,7 @@ + Qtudy