From a104bea1da4c7676da34b32e4f5541af67bb1136 Mon Sep 17 00:00:00 2001 From: jimin Date: Tue, 27 Sep 2022 00:54:29 +0900 Subject: [PATCH] =?UTF-8?q?feature/map-logic=20=EB=A8=BC=EC=A7=80=EC=9E=A1?= =?UTF-8?q?=EA=B8=B0API=20=EC=B6=94=EA=B0=80=20#15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/service.js | 4 ++-- pages/qrcode/index.js | 31 ++++++++++++++----------------- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/apis/service.js b/apis/service.js index 9513d2a..181d615 100644 --- a/apis/service.js +++ b/apis/service.js @@ -8,7 +8,7 @@ export const statDustAPI = axios.create({ accept: "application/json", "Content-Type": "application/json", "Access-Control-Allow-Origin": "*", - // "ACCESS-TOKEN": getToken() ?? '' + "X-ACCESS-TOKEN": "eyJ0eXBlIjoiand0IiwiYWxnIjoiSFMyNTYifQ.eyJ1c2VySWQiOjE4LCJpYXQiOjE2NjQyMDMwNDUsImV4cCI6MTY2NDgwNzg0NX0.ydZ7EOtz1_MdMpmYLTJNVuLmGyQ3VXkoOaaobtrEXzU" }, }); @@ -20,6 +20,6 @@ export async function sendDustLocation(latitude, longitude) { return await statDustAPI.post('/dust/location', { latitude, longitude }) } -export async function postcatchedDust() { +export async function postcatchedDust(dustNum) { return await statDustAPI.post(`/catch/dust`,{dustNum}) } \ No newline at end of file diff --git a/pages/qrcode/index.js b/pages/qrcode/index.js index dcb92fd..9c45d65 100644 --- a/pages/qrcode/index.js +++ b/pages/qrcode/index.js @@ -1,43 +1,40 @@ import React, {useState, useEffect} from "react"; import { QrReader } from "react-qr-reader"; +import { postcatchedDust } from "../../apis/service"; +import { useRouter } from "next/router"; + export default function QrcodeScanner () { + const router = useRouter(); const [data, setData] = useState('No result'); const [hasRendered, setHasRendered] = useState(false); - - useEffect(() => { setHasRendered(true) }, []) - const postDustNum = async(dustNum) => { + const postDustNum = async(dustNum) => { const response = await postcatchedDust(dustNum) - + if(response.status==200) { - if(response.body.code == 200) { - //router.back() //map화면으로 다시 돌아가게 해줘야함 근데이게맞아?ㅋ - // - + if(response.data.code == 200) { + router.replace("/../map") } } - } + } - const dustMapper = { - 1: styles.dust_black, - 2: styles.dust_white, - 3: styles.dust_green, - 4: styles.dust_orange, - 5: styles.dust_purple, - }; return ( <> {hasRendered && ( { if (!!result) { setData(result?.text); - postDustNum(Number(data)); + postDustNum(Number(result.text)); + }