Fix

.vercel/project.json

@@ -1 +1 @@
-{"orgId":"jsLpJtJT6P4G7Zn1eRb2weQw","projectId":"prj_szREPeu0YdZ0KAtCt9ntmn39BZX8"}
+{"orgId":"jsLpJtJT6P4G7Zn1eRb2weQw","projectId":"prj_HGMA5wO1bjaroDgbCC1M4hgvIGjf"}

.vscode/settings.json

@@ -4,6 +4,7 @@
   "editor.formatOnPaste": true,
   "editor.defaultFormatter": "esbenp.prettier-vscode",
   "editor.formatOnType": true,
-  "prettier.configPath": ".prettierrc.json",
-  "prettier.prettierPath": "./.prettierrc.json"
+  "prettier.configPath": "C:\\Users\\youmi\\Desktop\\Frontend-BEVE\\.prettierrc.json",
+  "prettier.prettierPath": "./.prettierrc.json",
+  "prettier.ignorePath": ""
 }

src/components/Card.js

@@ -1,7 +1,6 @@
 import { Box, Text, Image, useDisclosure } from "@chakra-ui/react";
 import React from "react";
 import DetailedShop from "./DetailedShop";
-import noimage from "../../public/img/noimage.jpg"
 
 export default function Card({ value }) {
   const { isOpen, onOpen, onClose } = useDisclosure()
@@ -23,10 +22,9 @@ export default function Card({ value }) {
           onClick={onOpen}
         >
           <DetailedShop onOpen={onOpen} isOpen={isOpen} onClose={onClose} value={value}/>
-          { `../../public/img_res/${value.name}/1.png` ? (
-            <Image src={`../../public/img_res/${value.name}/1.png`} objectFit="fill" maxW="15vw" maxH="13vw" w="15vw" h="13vw" />
-          ):(<Image src={noimage.src} objectFit="fill" maxW="15vw" maxH="13vw" w="15vw" h="13vw" />)
-          }
+
+            <Image src={`https://beve2-march0320.vercel.app/img_res/${value.name}/1.PNG`} onError="this.src='https://beve2-march0320.vercel.app/img/noimage.jpg';" objectFit="fill" maxW="15vw" maxH="13vw" w="15vw" h="13vw" />
+
           <Box m={2} textAlign="left">
             <Text color="green" fontWeight="bolder">{value.name}</Text>
             <Text fontSize="0.8rem" justifySelf="end">{value.category}</Text>
@@ -51,13 +49,8 @@ export default function Card({ value }) {
           color="black"
           onClick={onOpen}
         >
-          <DetailedShop onOpen={onOpen} isOpen={isOpen} onClose={onClose} value={value}/>
-           { `../../public/img_res/` + tmp_t[0] + `/1.png` ? (
-             <Image src={`../../public/img_res/` + tmp_t[0] + `/1.png`} objectFit="fill" maxW="15vw" maxH="13vw" w="15vw" h="13vw" />
-          ):(<Image src={noimage.src} objectFit="fill" maxW="15vw" maxH="13vw" w="15vw" h="13vw" />)
-          }
-
-
+          <DetailedShop onOpen={onOpen} isOpen={isOpen} onClose={onClose} value={value} franName={tmp_t[0]}/>        
+             <Image src={`https://beve2-march0320.vercel.app/img_res/` + tmp_t[0] + `/1.PNG`} onError="this.src='https://beve2-march0320.vercel.app/img/noimage.jpg';" objectFit="fill" maxW="15vw" maxH="13vw" w="15vw" h="13vw" />
           <Box m={2} textAlign="left">
             <Text color="green" fontWeight="bolder">{value.name}</Text>
             <Text fontSize="0.8rem" justifySelf="end">{value.category}</Text>

src/components/DetailedShop.js

@@ -4,12 +4,11 @@ import { Box, Text, Flex, Spacer, Image, Modal,Button,
   ModalBody,
   ModalCloseButton } from "@chakra-ui/react";
 import React, { useState } from "react";
-import food from "../../public/img/food.png";
 import Map from "./Map";
 import {  VscCircleOutline,VscCircleFilled } from "react-icons/vsc";
-import ResultPage from "../../pages/ResultPage";
-export default function DetailedShop({ value, isOpen, onClose }) {
-  console.log(value);
+
+export default function DetailedShop({ value, isOpen, onClose,franName }) {
+
   const [count, setCount] = useState(1);
 
   const next = () => {
@@ -21,99 +20,72 @@ export default function DetailedShop({ value, isOpen, onClose }) {
     else setCount(2);
   };
 
-  if (count == 1) {
-    return (
-      <>
-        <Modal size="xl" isOpen={isOpen} onClose={onClose}>
-          <ModalOverlay color="green" />
-          <ModalContent>
-            <Image
-              w="50rem"
-              h="30rem"
-              boxShadow="md"
-              borderRadius="0.2rem"
-              src={`/img_res/${value.name}/${count}.png`}
-              objectFit="fill"
-            />
-            <Flex direction="row" justify="center" m={1}>
-              <Button
-                p={1}
-                as={VscCircleFilled}
-                size="sm"
-                variant="ghost"
-                color="#3E603B"
-              />
-              <Button
-                p={1}
-                as={VscCircleOutline}
-                onClick={next}
-                size="sm"
-                variant="ghost"
-                color="#3E603B"
-              />
-            </Flex>
-            <ModalCloseButton borderRadius="3rem" backgroundColor="#3E603B" color="white" />
-            <ModalBody>
-              <Flex direction="column" justify="center">
-                <Text fontSize="1.8rem" fontWeight="bolder" m={2}>{value.name}</Text>
-                <Box m={2}>
-                  <Text m={1}>카테고리 : {value.category}</Text>
-                  <Text m={1}>전화번호 : {value.phone}</Text>
-                  <Text m={1}>주소 : {value.location.address}</Text>
-                </Box>
-                <Box m={2}>
-                  <Text m={1}>메뉴<hr /></Text>
-                  <Text>
-                    {value.menu.map((menus, index) => (
-                      <Flex key={index}>
-                        <Text m={0.5}>{menus.name}</Text>
-                        <Spacer />
-                        <Text>{menus.level.join(", ")}</Text>
-                      </Flex>
-                    ))}
-                  </Text>
-                </Box>
-              </Flex>
-              <ModalCloseButton borderRadius="3rem" backgroundColor="#3E603B" color="white" />
-              <Flex justify="center" m={4}>
-                <Map value={value} />
-              </Flex>
-            </ModalBody>
-          </ModalContent>
-        </Modal>
-      </>
-    );
-  } else {
     return (
       <>
         <Modal size="xl" isOpen={isOpen} onClose={onClose}>
           <ModalOverlay color="green" />
           <ModalContent>
-            <Image
-              w="50rem"
-              h="30rem"
-              boxShadow="md"
-              borderRadius="0.2rem"
-              src={`/img_res/${value.name}/${count}.png`}
-              objectFit="fill"
-            />
-            <Flex direction="row" justify="center" m={1}>
-              <Button
-                p={1}
-                as={VscCircleOutline}
-                onClick={before}
-                size="sm"
-                variant="ghost"
-                color="#3E603B"
-              />
-              <Button
-                p={1}
-                as={VscCircleFilled}
-                size="sm"
-                variant="ghost"
-                color="#3E603B"
-              />
-            </Flex>
+            {value.franchise == 0 ?
+
+
+              count == 1 ?
+                <>
+                <Image
+                w="50rem"
+                h="30rem"
+                boxShadow="md"
+                borderRadius="0.2rem"
+                src={`https://beve2-march0320.vercel.app/img_res/${value.name}/${count}.PNG`}
+                objectFit="fill"
+                  /> 
+                   <Flex direction="row" justify="center" m={1}>
+                  <Button
+                    p={1}
+                    as={VscCircleFilled}
+                    size="sm"
+                    variant="ghost"
+                    color="#3E603B"
+                  />
+                  <Button
+                    p={1}
+                    as={VscCircleOutline}
+                    onClick={next}
+                    size="sm"
+                    variant="ghost"
+                    color="#3E603B"
+                    />
+                  </Flex></> :
+                <><Image
+                w="50rem"
+                h="30rem"
+                boxShadow="md"
+                borderRadius="0.2rem"
+                src={`https://beve2-march0320.vercel.app/img_res/${value.name}/${count}.PNG`}
+                objectFit="fill"
+                /> 
+                   <Flex direction="row" justify="center" m={1}>
+                  <Button
+                    p={1}
+                    as={VscCircleOutline}
+                    onClick={before}
+                    size="sm"
+                    variant="ghost"
+                    color="#3E603B"
+                  />
+                  <Button
+                    p={1}
+                    as={VscCircleFilled}
+                    size="sm"
+                    variant="ghost"
+                    color="#3E603B"
+                  /></Flex></>:  <Image
+                w="50rem"
+                h="30rem"
+                boxShadow="md"
+                borderRadius="0.2rem"
+                src={`https://beve2-march0320.vercel.app/img_res/${franName}/1.PNG`}
+              />}
+
             <ModalCloseButton borderRadius="3rem" backgroundColor="#3E603B" color="white" />
             <ModalBody>
               <Flex direction="column" justify="center">
@@ -145,8 +117,7 @@ export default function DetailedShop({ value, isOpen, onClose }) {
         </Modal>
       </>
     );
+  }        
+
 
-
-  }
-}
 

src/components/filter/Filter.js

@@ -1,4 +1,4 @@
-   import {
+import {
   Flex,
   Button,
   Spacer,

src/components/location/CurrentAddress.js

@@ -3,20 +3,17 @@ import { Box } from "@chakra-ui/react";
 import NearShops from "../mainPageSections/NearShops";
 
 export default function CurrentAddress({usePos}) {
-  console.log(usePos);
+
   const [noLoc, setNoLoc]=useState(false);
   const [useLoc, setUseLoc] = useState({ city: "서대문구", address: "서대문구" });
   const [isSeoul, setIsSeoul] = useState(0);
 
   useEffect(() => {
     const geocoder = new kakao.maps.services.Geocoder();
     try{
-    if(usePos.lat!=null){
-      console.log(usePos);
+    if(usePos.lat!=null){  
       geocoder.coord2Address(usePos.lon, usePos.lat, function(result, status) {      
-        if (status === kakao.maps.services.Status.OK) {
-          console.log(usePos);
-          console.log(result[0]);     
+        if (status === kakao.maps.services.Status.OK) {      
           const newUseLoc = ({
             city: result[0].address.region_2depth_name,
             address: result[0].address.address_name,
@@ -36,11 +33,10 @@ export default function CurrentAddress({usePos}) {
       setNoLoc(true);    
     };
     setNoLoc(false);
-  }, [usePos]);
-
+  }, [usePos]); 
    if(noLoc){
      return(<div>에러</div>);
   }
-  console.log(usePos);
+
   return <Box><NearShops useLoc={useLoc} isSeoul={isSeoul} usePos={usePos}/></Box>;
 }

src/components/location/CurrentLocation.js

@@ -1,6 +1,6 @@
 /*global kakao*/
 import React, { useState, useEffect } from "react";
-import { Box, Text, Flex, Spacer } from "@chakra-ui/react";
+import { Box } from "@chakra-ui/react";
 import CurrentAddress from "./CurrentAddress";
 
 export default function CurrentLocation() {
@@ -20,7 +20,7 @@ export default function CurrentLocation() {
         setIsError(true);
     }
   }, []);
-  console.log(usePos);
+
   if(isError){
     return(<Box>사용자의 위치를 찾을 수 없습니다</Box>);
   }

src/components/mainPageSections/MainSearchForm.js

@@ -1,5 +1,4 @@
 import { Flex, Spacer, Text } from "@chakra-ui/layout";
-import Fonts from "../../../theme/Fonts";
 import SearchForm from "../SearchForm";
 import CurrentLocation from "../location/CurrentLocation";
 

src/components/mainPageSections/NearShops.js

@@ -2,7 +2,6 @@ import { Box, Text } from "@chakra-ui/react";
 import { useState } from "react";
 
 export default function NearShops({ useLoc, isSeoul, usePos }) {
-  console.log(useLoc.city);  //useLoc.city=구 useLoc.address=주소 isSeoul이 1이면 서울
 
   const [isLoading, setIsLoading] = useState(null);
   const [isError, setIsError] = useState(null);

src/library/useSearchRestaurant.js

@@ -17,7 +17,7 @@ export default function useSearchRestaurants() {
       setIsLoading(true);
       setIsError(false);
 
-      const response = await axios.get(`https://beve-deploy.vercel.app/api/posts?area=${query.area}&stage=${query.stage}&type=${query.type}&inputText=${query.inputText}&page=${page}`)
+      const response = await axios.get(`https://beve2-march0320.vercel.app/api/posts?area=${query.area}&stage=${query.stage}&type=${query.type}&inputText=${query.inputText}&page=${page}`)
         .catch(error => {
         setIsError(true);
         console.log(error.response.data);