diff --git a/src/MakeSticker/STICKER.js b/src/MakeSticker/STICKER.js index 2c2a80f3..01ef0b45 100644 --- a/src/MakeSticker/STICKER.js +++ b/src/MakeSticker/STICKER.js @@ -51,6 +51,7 @@ const STICKER = () => { useEffect(() => { if (captureEnabled) { handleCaptureImg(); + dispatch(setCaptureEnabled(false)); } }, [captureEnabled]); diff --git a/src/MakeSticker/Select.js b/src/MakeSticker/Select.js index 3b3ca9f6..388b7b2d 100644 --- a/src/MakeSticker/Select.js +++ b/src/MakeSticker/Select.js @@ -93,7 +93,7 @@ const Select = ({ handleCaptureImg }) => { setSetting(true); } else setModalIsOpen(true); } - dispatch(setCaptureEnabled(isEnabled)); + dispatch(setCaptureEnabled(true)); if (changesticker) { setSetting(true); } else { @@ -102,7 +102,7 @@ const Select = ({ handleCaptureImg }) => { }; //방문자가 완료 누를 때 - const captureVisitor = (isEnabled) => { + const captureVisitor = () => { if ( //방문자가 아무것도 선택 안 했으면 캡쳐 하지 말고 기본 이미지 저장 stickerState.face === 0 && @@ -115,7 +115,7 @@ const Select = ({ handleCaptureImg }) => { ) { dispatch(setImageUrl("https://i.ibb.co/3yhK7VW/1-2.png")); } else { - dispatch(setCaptureEnabled(isEnabled)); + dispatch(setCaptureEnabled(true)); } /* navigate("/stickername", { state: { test: test2 } }); */ diff --git a/src/Nickname/StickerName.js b/src/Nickname/StickerName.js index 69cbf6dd..ebc3e182 100644 --- a/src/Nickname/StickerName.js +++ b/src/Nickname/StickerName.js @@ -195,10 +195,10 @@ export function StickerName() { const [inputTop, setInputTop] = useState("-2%"); const [nicknameValue, setNicknameValue] = useState(""); - /* const { state } = useLocation(); + const { state } = useLocation(); console.log("State", state.test); const VID = state.test; - */ + //방문자 스티커 const visitorId = useSelector((state) => state.visitorId); @@ -248,16 +248,13 @@ export function StickerName() { //닉네임 입력하고 다음 아이콘 누르면 서버에 전송됨 const handleNicknameSubmit = () => { console.log(visitorId); - fetch( - `http://app.faceticker.site/${ID}/sticker/visitor/name?id=${visitorId}`, - { - method: "PATCH", - headers: { - "Content-Type": "application/json", - }, - body: JSON.stringify({ name: nicknameValue }), - } - ) + fetch(`http://app.faceticker.site/${ID}/sticker/visitor/name?id=${VID}`, { + method: "PATCH", + headers: { + "Content-Type": "application/json", + }, + body: JSON.stringify({ name: nicknameValue }), + }) .then((response) => response.json()) .then((data) => { console.log("성공", data); @@ -265,12 +262,12 @@ export function StickerName() { .catch((error) => { console.error("실패", error); }); - navigate("/stickerletter" /* , { state: { visitor: VID } } */); + navigate("/stickerletter", { state: { visitor: VID } }); }; //서버에서 닉네임 값 받아오기 useEffect(() => { - fetch(`https://app.faceticker.site/sticker/visitor/name?id=${visitorId}`) + fetch(`https://app.faceticker.site/sticker/visitor/name?id=${VID}`) .then((response) => response.json()) .then((data) => { if (data) { diff --git a/src/Stickers/TestBottom.js b/src/Stickers/TestBottom.js index be3ef726..dd1c1a43 100644 --- a/src/Stickers/TestBottom.js +++ b/src/Stickers/TestBottom.js @@ -53,7 +53,7 @@ const Bottoms = styled.div` height: 90%; background-image: url("${getRandomImageLink()}"); - overflow: scroll; + /* overflow: scroll; */ `; const Bottom = styled.div` diff --git a/src/Stickers/VisitPut.js b/src/Stickers/VisitPut.js index 11bc1f47..f55303ad 100644 --- a/src/Stickers/VisitPut.js +++ b/src/Stickers/VisitPut.js @@ -126,7 +126,8 @@ const Footer = styled.div` flex-direction: row; `; const Icon = styled.img` - max-height: 48%; + max-width: 80%; + max-height: 65%; display: flex; `; @@ -230,7 +231,6 @@ export function VisitPut(props) { diff --git a/src/hostStatus/StatusMessage.js b/src/hostStatus/StatusMessage.js index 34191d79..08494d08 100644 --- a/src/hostStatus/StatusMessage.js +++ b/src/hostStatus/StatusMessage.js @@ -125,7 +125,7 @@ const ImgWrap = styled.div` display: flex; `; const Letter = styled.img` - width: 80%; + max-height: 100%; `; const InputWrap = styled.div`