Skip to content

Commit

Permalink
Merge pull request #154 from MZ-OFFISSU/chore/153_release-qa
Browse files Browse the repository at this point in the history
chore/153_release-qa
  • Loading branch information
yoo-jimin127 authored Nov 6, 2023
2 parents e27b280 + a787267 commit 9aec7e0
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 15 deletions.
5 changes: 3 additions & 2 deletions TERMTERM/src/components/curation/detail/title/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const Thumbnail = styled.ImageBackground`
`;

const InfoWrapper = styled.View`
width: 100%;
width: 90%;
height: 180px;
display: flex;
flex-direction: column;
Expand All @@ -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;
6 changes: 3 additions & 3 deletions TERMTERM/src/components/quiz/AnswerReminder.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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<{
Expand Down
2 changes: 1 addition & 1 deletion TERMTERM/src/components/quiz/QuizReviewRouter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ const QuizReviewRouter = ({
{wordAnswer}
</AnswerText>
<CaretBtn onPress={() => onPress()}>
<AntDesign name="right" size={18} color={COLOR.Neutral[90]} />
<AntDesign name="right" size={13} color={COLOR.Neutral[90]} />
</CaretBtn>
</Container>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const RecommendList = ({ navigation, ...props }: Props) => {
return (
<ContentsWrapper {...props}>
<ContentsHeader title="추천 모음집" />
{categoryCurationList.map((item, idx) => (
{categoryCurationList.slice(0, 3).map((item, idx) => (
<CurationItem
item={item}
img={item.thumbnail}
Expand Down
1 change: 0 additions & 1 deletion TERMTERM/src/hooks/useQuiz.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ export const useQuiz = () => {
const getDailyQuizStatus = async (): Promise<boolean> => {
try {
const res = await quizApi.getDailyQuizStatus();
console.log("여기 : ", res);
setQuizStatus(res.status);
return true;
} catch (err) {
Expand Down
2 changes: 1 addition & 1 deletion TERMTERM/src/hooks/useShare.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
3 changes: 1 addition & 2 deletions TERMTERM/src/screens/CurationDetail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}, []);

Expand Down Expand Up @@ -125,7 +124,7 @@ const CurationDetail = ({ navigation, route }: Props) => {
<CustomModal
visible={modal}
title={"큐레이션을 열어볼까요?"}
subtitle={`50 포인트를 사용하면\n큐레이션의 모든 용어를 볼 수 있어요!`}
subtitle={`500 포인트를 사용하면\n큐레이션의 모든 용어를 볼 수 있어요!`}
btnTitle={["아니오", "더 볼래요"]}
onClose={() => setModal(false)}
onNext={() => onPay()}
Expand Down
2 changes: 1 addition & 1 deletion TERMTERM/src/screens/SelectFolder.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
/>
</Inner>
</Container>
Expand Down
11 changes: 9 additions & 2 deletions TERMTERM/src/screens/Support/First.tsx
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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("");
Expand All @@ -47,6 +50,10 @@ const First = ({ onEnd }: Props) => {
}
};

useEffect(() => {
themeController(modeBool);
}, []);

const DynamicTitleBox = () => {
const [COLOR, mode] = useThemeStyle();

Expand Down
2 changes: 1 addition & 1 deletion TERMTERM/src/screens/Toolbar/Home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ const Home = ({ navigation, route }: Props) => {
</CurationTitleBox>
</FlexContainer>
<CurationCardWrapper>
{categoryCurationList.map((item, idx) => (
{categoryCurationList.slice(0, 3).map((item, idx) => (
<CurationItem
item={item}
onMove={() =>
Expand Down

0 comments on commit 9aec7e0

Please sign in to comment.