From 6984484dbb0f144665b07b38c4ddfad84247470e Mon Sep 17 00:00:00 2001 From: leehyelim0691 <48082589+leehyelim0691@users.noreply.github.com> Date: Thu, 30 Jun 2022 19:38:44 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[#212]=20=EB=A9=94=EC=9D=B8=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EC=A0=95=EB=A0=AC=20(#213)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat[#212]: 메인 페이지 select 정렬 * feat[#212]: 메인 페이지 select 정렬 --- .../rebon-frontend/src/pages/Detail/index.js | 2 +- .../src/pages/Main/Divider/index.js | 39 ++-- .../src/pages/Main/MainCard/index.js | 173 ++++++++++++------ .../rebon-frontend/src/pages/Main/index.js | 15 +- backend/security | 2 +- 5 files changed, 149 insertions(+), 82 deletions(-) diff --git a/FrontEnd/rebon-frontend/src/pages/Detail/index.js b/FrontEnd/rebon-frontend/src/pages/Detail/index.js index cf62abf7..dd135bc6 100644 --- a/FrontEnd/rebon-frontend/src/pages/Detail/index.js +++ b/FrontEnd/rebon-frontend/src/pages/Detail/index.js @@ -38,7 +38,7 @@ export default function Detail() { useEffect(() => { axios - .get('http://3.34.139.61:8080/api/shops/1') + .get('http://3.34.139.61:8080/api/shops/2') .then((response) => { setShopInfo(response.data); console.log(shopInfo); diff --git a/FrontEnd/rebon-frontend/src/pages/Main/Divider/index.js b/FrontEnd/rebon-frontend/src/pages/Main/Divider/index.js index e40df280..54a6cb2b 100644 --- a/FrontEnd/rebon-frontend/src/pages/Main/Divider/index.js +++ b/FrontEnd/rebon-frontend/src/pages/Main/Divider/index.js @@ -1,9 +1,11 @@ -import React,{useState} from 'react'; +import React, { useState } from 'react'; import '../../../styles/main.css'; import Toggle from 'react-toggle'; +import MainCard from '../MainCard'; export default function Divider() { const [toggleOn, setToggleOn] = useState(false); + const [sort, setSort] = useState('star'); const toggleChange = (event) => { if (toggleOn) setToggleOn(false); @@ -11,18 +13,29 @@ export default function Divider() { // console.log(event); }; return ( -