From f9876b3748636767545c88a2ce841448a5a305e1 Mon Sep 17 00:00:00 2001 From: yoo-jimin127 Date: Mon, 6 Nov 2023 12:13:15 +0900 Subject: [PATCH 1/9] =?UTF-8?q?style:=20=ED=80=B4=EC=A6=88=20=EB=8B=B5=20?= =?UTF-8?q?=EC=9D=B8=EB=94=94=EC=BC=80=EC=9D=B4=ED=84=B0=20=ED=81=AC?= =?UTF-8?q?=EA=B8=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TERMTERM/src/components/quiz/AnswerReminder.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/TERMTERM/src/components/quiz/AnswerReminder.tsx b/TERMTERM/src/components/quiz/AnswerReminder.tsx index a07babd..e97674d 100644 --- a/TERMTERM/src/components/quiz/AnswerReminder.tsx +++ b/TERMTERM/src/components/quiz/AnswerReminder.tsx @@ -70,21 +70,21 @@ const Container = styled.View<{ mode: boolean; answer: boolean; }>` - width: 90%; + min-width: 358px; + border-radius: 10px; height: 55px; + display: flex; background-color: ${(props) => props.mode ? props.answer ? props.COLOR.THEME.positive[10] : props.COLOR.THEME.negative[10] : props.COLOR.Background.onSurface}; - display: flex; flex-direction: row; align-items: center; justify-content: flex-start; padding: 10px; margin: 20px auto; - border-radius: 10px; `; const AnswerText = styled.Text<{ From 1c95cfba3a757b3d47f700e81f1baaf683479b30 Mon Sep 17 00:00:00 2001 From: yoo-jimin127 Date: Mon, 6 Nov 2023 12:23:38 +0900 Subject: [PATCH 2/9] =?UTF-8?q?style:=20=EC=9A=A9=EC=96=B4=20=ED=80=B4?= =?UTF-8?q?=EC=A6=88=20=EB=A6=AC=EB=B7=B0=20=EB=9D=BC=EC=9A=B0=ED=84=B0=20?= =?UTF-8?q?=ED=99=94=EC=82=B4=ED=91=9C=20=ED=81=AC=EA=B8=B0=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TERMTERM/src/components/quiz/QuizReviewRouter.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TERMTERM/src/components/quiz/QuizReviewRouter.tsx b/TERMTERM/src/components/quiz/QuizReviewRouter.tsx index 8c82d6c..19d5f73 100644 --- a/TERMTERM/src/components/quiz/QuizReviewRouter.tsx +++ b/TERMTERM/src/components/quiz/QuizReviewRouter.tsx @@ -58,7 +58,7 @@ const QuizReviewRouter = ({ {wordAnswer} onPress()}> - + ); From 7fd50c946379541d0f8165a859c0d9509b083b26 Mon Sep 17 00:00:00 2001 From: yoo-jimin127 Date: Mon, 6 Nov 2023 12:32:06 +0900 Subject: [PATCH 3/9] =?UTF-8?q?chore:=20share=20url=20=EB=B3=80=EA=B2=BD(t?= =?UTF-8?q?ermterm=20=EC=86=8C=EA=B0=9C=20url)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TERMTERM/src/hooks/useShare.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TERMTERM/src/hooks/useShare.tsx b/TERMTERM/src/hooks/useShare.tsx index ccdbc1c..0996c93 100644 --- a/TERMTERM/src/hooks/useShare.tsx +++ b/TERMTERM/src/hooks/useShare.tsx @@ -2,7 +2,7 @@ import * as Sharing from "expo-sharing"; import * as Haptics from "expo-haptics"; export const useShare = () => { - const handleShare = async (url = "https://www.naver.com/") => { + const handleShare = async (url = "https://www.termterm.site/") => { if (!(await Sharing.isAvailableAsync())) { return; } From 7e6b6a24c74c772536b997db75ca183da27c958d Mon Sep 17 00:00:00 2001 From: yoo-jimin127 Date: Mon, 6 Nov 2023 12:42:29 +0900 Subject: [PATCH 4/9] =?UTF-8?q?style:=20=ED=81=90=EB=A0=88=EC=9D=B4?= =?UTF-8?q?=EC=85=98=20=ED=96=89=EA=B0=84=20=EC=A1=B0=EC=A0=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TERMTERM/src/components/curation/detail/title/index.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/TERMTERM/src/components/curation/detail/title/index.tsx b/TERMTERM/src/components/curation/detail/title/index.tsx index eff5bd3..fa8e8b6 100644 --- a/TERMTERM/src/components/curation/detail/title/index.tsx +++ b/TERMTERM/src/components/curation/detail/title/index.tsx @@ -38,7 +38,7 @@ const Thumbnail = styled.ImageBackground` `; const InfoWrapper = styled.View` - width: 100%; + width: 90%; height: 180px; display: flex; flex-direction: column; @@ -63,7 +63,8 @@ const Subtitle = styled.Text<{ COLOR: colorTheme }>` color: ${(props) => props.COLOR.Text.default}; text-align: center; white-space: pre-line; - margin-top: -20px; + line-height: 20px; + margin-top: -10px; `; export default TitleBox; From 1783af0532de6ed1025bd2612522aa23c23324d7 Mon Sep 17 00:00:00 2001 From: yoo-jimin127 Date: Mon, 6 Nov 2023 12:48:49 +0900 Subject: [PATCH 5/9] =?UTF-8?q?chore:=20=ED=99=88/=EA=B2=80=EC=83=89=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=ED=81=90=EB=A0=88=EC=9D=B4?= =?UTF-8?q?=EC=85=98=20=EB=85=B8=EC=B6=9C=20=EA=B0=9C=EC=88=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TERMTERM/src/components/search/containers/ReccmmendList.tsx | 2 +- TERMTERM/src/screens/Toolbar/Home.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/TERMTERM/src/components/search/containers/ReccmmendList.tsx b/TERMTERM/src/components/search/containers/ReccmmendList.tsx index 23b48d1..6de4584 100644 --- a/TERMTERM/src/components/search/containers/ReccmmendList.tsx +++ b/TERMTERM/src/components/search/containers/ReccmmendList.tsx @@ -26,7 +26,7 @@ const RecommendList = ({ navigation, ...props }: Props) => { return ( - {categoryCurationList.map((item, idx) => ( + {categoryCurationList.slice(0, 3).map((item, idx) => ( { - {categoryCurationList.map((item, idx) => ( + {categoryCurationList.slice(0, 3).map((item, idx) => ( From 57d2dc22f0d0b9e520a299ba4b27a05bea4f75f6 Mon Sep 17 00:00:00 2001 From: yoo-jimin127 Date: Mon, 6 Nov 2023 12:53:05 +0900 Subject: [PATCH 6/9] =?UTF-8?q?style:=20=EC=95=84=EC=B9=B4=EC=9D=B4?= =?UTF-8?q?=EB=B8=8C=20=ED=8F=B4=EB=8D=94=20=EC=84=A0=ED=83=9D=20=ED=99=95?= =?UTF-8?q?=EC=9D=B8=20=EB=B2=84=ED=8A=BC=20=EC=9C=84=EC=B9=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TERMTERM/src/screens/SelectFolder.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TERMTERM/src/screens/SelectFolder.tsx b/TERMTERM/src/screens/SelectFolder.tsx index 9b94bb9..db8b5e8 100644 --- a/TERMTERM/src/screens/SelectFolder.tsx +++ b/TERMTERM/src/screens/SelectFolder.tsx @@ -53,7 +53,7 @@ const SelectFolder = ({ navigation, route }: Props) => { : BUTTON_STATE.default } disabled={selectedFolders.length === 0} - style={{ width: "100%", marginTop: 32 }} + style={{ width: "100%", marginTop: 150 }} /> From 22a40ee635c8eac4a3ac470e4505b5e3e6705514 Mon Sep 17 00:00:00 2001 From: yoo-jimin127 Date: Mon, 6 Nov 2023 13:16:22 +0900 Subject: [PATCH 7/9] =?UTF-8?q?chore:=20=EA=B8=B0=ED=9A=8D=20=EC=A0=95?= =?UTF-8?q?=EC=B1=85=20=EB=94=B0=EB=A5=B8=20=ED=81=90=EB=A0=88=EC=9D=B4?= =?UTF-8?q?=EC=85=98=20=EB=AA=A8=EB=8B=AC=20=ED=8F=AC=EC=9D=B8=ED=8A=B8=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TERMTERM/src/screens/CurationDetail.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TERMTERM/src/screens/CurationDetail.tsx b/TERMTERM/src/screens/CurationDetail.tsx index 62350e4..686553c 100644 --- a/TERMTERM/src/screens/CurationDetail.tsx +++ b/TERMTERM/src/screens/CurationDetail.tsx @@ -125,7 +125,7 @@ const CurationDetail = ({ navigation, route }: Props) => { setModal(false)} onNext={() => onPay()} From b28d6223dfaf314b89f1a1d025c0b39dcf2a90d9 Mon Sep 17 00:00:00 2001 From: yoo-jimin127 Date: Mon, 6 Nov 2023 13:58:45 +0900 Subject: [PATCH 8/9] =?UTF-8?q?remove:=20=EB=B6=88=ED=95=84=EC=9A=94=20log?= =?UTF-8?q?=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TERMTERM/src/hooks/useQuiz.tsx | 1 - TERMTERM/src/screens/CurationDetail.tsx | 1 - 2 files changed, 2 deletions(-) diff --git a/TERMTERM/src/hooks/useQuiz.tsx b/TERMTERM/src/hooks/useQuiz.tsx index 57a91ac..e1b7713 100644 --- a/TERMTERM/src/hooks/useQuiz.tsx +++ b/TERMTERM/src/hooks/useQuiz.tsx @@ -83,7 +83,6 @@ export const useQuiz = () => { const getDailyQuizStatus = async (): Promise => { try { const res = await quizApi.getDailyQuizStatus(); - console.log("여기 : ", res); setQuizStatus(res.status); return true; } catch (err) { diff --git a/TERMTERM/src/screens/CurationDetail.tsx b/TERMTERM/src/screens/CurationDetail.tsx index 686553c..dffedea 100644 --- a/TERMTERM/src/screens/CurationDetail.tsx +++ b/TERMTERM/src/screens/CurationDetail.tsx @@ -62,7 +62,6 @@ const CurationDetail = ({ navigation, route }: Props) => { useEffect(() => { settingCurationId(CURATION_ID); getCurationDetailInfo(CURATION_ID); - // console.log("first curation detail info : ", curationDetailInfo) setTerms(curationDetailInfo?.termSimples); }, []); From a787267ded4dd179859082c478760313c77dcc1a Mon Sep 17 00:00:00 2001 From: yoo-jimin127 Date: Mon, 6 Nov 2023 14:01:45 +0900 Subject: [PATCH 9/9] =?UTF-8?q?chore:=20=EB=AC=B8=EC=9D=98=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20=EB=84=A4=EB=B9=84=EA=B2=8C=EC=9D=B4=ED=84=B0=20?= =?UTF-8?q?=EC=83=89=EC=83=81=20=EC=BB=A8=ED=8A=B8=EB=A1=A4=EB=9F=AC=20?= =?UTF-8?q?=EC=97=B0=EA=B2=B0(=EC=88=98=EC=A0=95=ED=95=84=EC=9A=94..)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TERMTERM/src/screens/Support/First.tsx | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/TERMTERM/src/screens/Support/First.tsx b/TERMTERM/src/screens/Support/First.tsx index 03d1c55..8a0914c 100644 --- a/TERMTERM/src/screens/Support/First.tsx +++ b/TERMTERM/src/screens/Support/First.tsx @@ -1,7 +1,7 @@ import styled from "styled-components/native"; import { TouchableWithoutFeedback, Keyboard } from "react-native"; import { colorTheme, LIGHT_COLOR_STYLE, TYPO_STYLE } from "@style/designSystem"; -import { useState } from "react"; +import { useEffect, useState } from "react"; import { screenWidth } from "@style/dimensions"; import { Props } from "@interfaces/support"; import { @@ -16,11 +16,14 @@ import { useRecoilState } from "recoil"; import { inquiryState } from "@recoil/inquiryState"; import CustomEmailInput from "@components/common/CustomEmailInput"; import CustomTextarea from "@components/common/CustomTextarea"; +import { useControllerTheme } from "@hooks/useControllerTheme"; const First = ({ onEnd }: Props) => { const inquiryApi = new InquiryApi(); - + const [COLOR, mode] = useThemeStyle(); + const modeBool = mode ? true : false; // 네비게이터 색상 관련 + const { themeController } = useControllerTheme(); const [inquiryInfo, setInquiryInfo] = useRecoilState(inquiryState); const [open, setOpen] = useState(false); const [email, setEmail] = useState(""); @@ -47,6 +50,10 @@ const First = ({ onEnd }: Props) => { } }; + useEffect(() => { + themeController(modeBool); + }, []); + const DynamicTitleBox = () => { const [COLOR, mode] = useThemeStyle();