-
Notifications
You must be signed in to change notification settings - Fork 50
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[team16-FE] 펭도리, 루크 1차 PR #56
Changes from all commits
fb0e85e
2dc2602
9546450
b3da5b1
692c487
ad8d9f5
585cb7c
33ed079
3717931
8fa02ee
37d0b81
cb81fbd
00b1917
45026b5
ea65b8e
c0fc736
4cfd3ea
3af73f8
39f0b8b
04cd88f
14d5eca
52ce0f0
82a8c5b
7251378
b06f8c8
9ec4439
6262c74
2656747
3b5ba0a
dee54d4
237eb91
08baee1
c5d4499
934a46e
fbc78a2
f77bcc3
aefc904
19901a2
71f6f15
d92b991
fc35052
2f9d8c2
c8315af
3371c9d
6220192
2e6a904
a7566c9
4c39798
42e42fd
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
node_modules | ||
package.json | ||
yarn.lock | ||
BE | ||
DOCS |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
## 이 폴더에 BE 소스 파일 추가 하면 됩니다. |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
## 이 폴더에 문서 파일 추가 하면 됩니다. |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. | ||
|
||
# dependencies | ||
node_module | ||
/.pnp | ||
.pnp.js | ||
|
||
# testing | ||
/coverage | ||
|
||
# production | ||
/build | ||
|
||
# misc | ||
.DS_Store | ||
.env.local | ||
.env.development.local | ||
.env.test.local | ||
.env.production.local | ||
|
||
npm-debug.log* | ||
yarn-debug.log* | ||
yarn-error.log* | ||
|
||
/**/package.json | ||
/**/package-lock.json | ||
/**/yarn.lock | ||
public | ||
README.old.md | ||
.gittignore | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,70 @@ | ||
# Getting Started with Create React App | ||
|
||
This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app). | ||
|
||
## Available Scripts | ||
|
||
In the project directory, you can run: | ||
|
||
### `yarn start` | ||
|
||
Runs the app in the development mode.\ | ||
Open [http://localhost:3000](http://localhost:3000) to view it in the browser. | ||
|
||
The page will reload if you make edits.\ | ||
You will also see any lint errors in the console. | ||
|
||
### `yarn test` | ||
|
||
Launches the test runner in the interactive watch mode.\ | ||
See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information. | ||
|
||
### `yarn build` | ||
|
||
Builds the app for production to the `build` folder.\ | ||
It correctly bundles React in production mode and optimizes the build for the best performance. | ||
|
||
The build is minified and the filenames include the hashes.\ | ||
Your app is ready to be deployed! | ||
|
||
See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information. | ||
|
||
### `yarn eject` | ||
|
||
**Note: this is a one-way operation. Once you `eject`, you can’t go back!** | ||
|
||
If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project. | ||
|
||
Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own. | ||
|
||
You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it. | ||
|
||
## Learn More | ||
|
||
You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started). | ||
|
||
To learn React, check out the [React documentation](https://reactjs.org/). | ||
|
||
### Code Splitting | ||
|
||
This section has moved here: [https://facebook.github.io/create-react-app/docs/code-splitting](https://facebook.github.io/create-react-app/docs/code-splitting) | ||
|
||
### Analyzing the Bundle Size | ||
|
||
This section has moved here: [https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size](https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size) | ||
|
||
### Making a Progressive Web App | ||
|
||
This section has moved here: [https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app](https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app) | ||
|
||
### Advanced Configuration | ||
|
||
This section has moved here: [https://facebook.github.io/create-react-app/docs/advanced-configuration](https://facebook.github.io/create-react-app/docs/advanced-configuration) | ||
|
||
### Deployment | ||
|
||
This section has moved here: [https://facebook.github.io/create-react-app/docs/deployment](https://facebook.github.io/create-react-app/docs/deployment) | ||
|
||
### `yarn build` fails to minify | ||
|
||
This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
<!DOCTYPE html> | ||
<html lang="en"> | ||
<head> | ||
<meta charset="utf-8" /> | ||
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" /> | ||
<meta name="viewport" content="width=device-width, initial-scale=1" /> | ||
<meta name="theme-color" content="#000000" /> | ||
<meta | ||
name="description" | ||
content="Web site created using create-react-app" | ||
/> | ||
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" /> | ||
<!-- | ||
manifest.json provides metadata used when your web app is installed on a | ||
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/ | ||
--> | ||
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" /> | ||
<!-- | ||
Notice the use of %PUBLIC_URL% in the tags above. | ||
It will be replaced with the URL of the `public` folder during the build. | ||
Only files inside the `public` folder can be referenced from the HTML. | ||
Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will | ||
work correctly both with client-side routing and a non-root public URL. | ||
Learn how to configure a non-root public URL by running `npm run build`. | ||
--> | ||
<title>React App</title> | ||
</head> | ||
<body> | ||
<noscript>You need to enable JavaScript to run this app.</noscript> | ||
<div id="root"></div> | ||
<!-- | ||
This HTML file is a template. | ||
If you open it directly in the browser, you will see an empty page. | ||
You can add webfonts, meta tags, or analytics to this file. | ||
The build step will place the bundled scripts into the <body> tag. | ||
To begin the development, run `npm start` or `yarn start`. | ||
To create a production bundle, use `npm run build` or `yarn build`. | ||
--> | ||
</body> | ||
</html> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
{ | ||
"short_name": "React App", | ||
"name": "Create React App Sample", | ||
"icons": [ | ||
{ | ||
"src": "favicon.ico", | ||
"sizes": "64x64 32x32 24x24 16x16", | ||
"type": "image/x-icon" | ||
}, | ||
{ | ||
"src": "logo192.png", | ||
"type": "image/png", | ||
"sizes": "192x192" | ||
}, | ||
{ | ||
"src": "logo512.png", | ||
"type": "image/png", | ||
"sizes": "512x512" | ||
} | ||
], | ||
"start_url": ".", | ||
"display": "standalone", | ||
"theme_color": "#000000", | ||
"background_color": "#ffffff" | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
# https://www.robotstxt.org/robotstxt.html | ||
User-agent: * | ||
Disallow: |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
import React, { useState } from "react"; | ||
import Main from "./Components/Main/Main"; | ||
import Header from "./Components/Header/Header"; | ||
import All from "./Components/All/All"; | ||
import Best from "./Components/Best/Best"; | ||
|
||
const App = () => { | ||
const [modal, setModal] = useState(false); | ||
const [ModalData, setModalData] = useState([]); | ||
const [loginModal, setLoginModal] = useState(false); | ||
|
||
return ( | ||
<div> | ||
<Header loginModal={loginModal} setLoginModal={setLoginModal} /> | ||
<Best | ||
modal={modal} | ||
setModal={setModal} | ||
ModalData={ModalData} | ||
setModalData={setModalData} | ||
/> | ||
<Main | ||
modal={modal} | ||
setModal={setModal} | ||
ModalData={ModalData} | ||
setModalData={setModalData} | ||
/> | ||
<All | ||
modal={modal} | ||
setModal={setModal} | ||
ModalData={ModalData} | ||
setModalData={setModalData} | ||
/> | ||
</div> | ||
); | ||
}; | ||
|
||
export default App; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,136 @@ | ||
import React, { useState, useEffect, useRef } from "react"; | ||
import styled from "styled-components"; | ||
import axios from "axios"; | ||
import Carousel from "../Carousel/Carousel"; | ||
import PopUpModal from "../PopUpModal/PopUpModal"; | ||
import CarouselButton from "../Carousel/CarouselButton"; | ||
const All = ({ modal, setModal, ModalData, setModalData }) => { | ||
const [Soup, setSoup] = useState([]); | ||
const [Side, setSide] = useState([]); | ||
const [rander, setRander] = useState(false); | ||
const soupImageRef = useRef(); | ||
const sideImageRef = useRef(); | ||
const soupRef = useRef(); | ||
const sideRef = useRef(); | ||
|
||
useEffect(() => { | ||
const fetchData = async () => { | ||
const soupData = await axios | ||
.get("/products/soup") | ||
.then((res) => res.data.data.items); | ||
const sideData = await axios | ||
.get("/products/side") | ||
.then((res) => res.data.data.items); | ||
setSoup(soupData); | ||
setSide(sideData); | ||
}; | ||
Comment on lines
+17
to
+26
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. async 함수를 사용할때 가급적 then을 사용하지 않고 await 로 표현해보세요. |
||
fetchData(); | ||
}, []); // eslint-disable-line | ||
|
||
const randerImage = () => { | ||
rander ? setRander(false) : setRander(true); | ||
}; | ||
|
||
const soupSlide = (e) => { | ||
e.target.classList.contains("Left") | ||
? soupRef.current.Slider(1) | ||
: soupRef.current.Slider(-1); | ||
}; | ||
|
||
const sideSlide = (e) => { | ||
e.target.classList.contains("Left") | ||
? sideRef.current.Slider(1) | ||
: sideRef.current.Slider(-1); | ||
Comment on lines
+42
to
+43
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 요런부분에서 어떤 상태를 만들어서 값을 변경시키고, |
||
}; | ||
|
||
const PopUpCarousel = () => { | ||
for (const i of Soup) { | ||
if (i.detailHash === ModalData[0]) { | ||
return ( | ||
<PopUpModal | ||
MainTitle={"정성이 담긴 뜨끈한 국물요리"} | ||
Food={Soup} | ||
setModal={setModal} | ||
ModalData={ModalData} | ||
setModalData={setModalData} | ||
/> | ||
); | ||
} | ||
} | ||
return ( | ||
<PopUpModal | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 그런데 왜 팝업모달 형태가 많은거죠? |
||
MainTitle={"식탁을 풍성하게 하는 정갈한 밑반찬"} | ||
Food={Side} | ||
setModal={setModal} | ||
ModalData={ModalData} | ||
setModalData={setModalData} | ||
/> | ||
); | ||
}; | ||
|
||
return ( | ||
<AllBox> | ||
{rander && ( | ||
<div> | ||
{modal && PopUpCarousel()} | ||
<CarouselSlide> | ||
<CarouselButton Name={"Left"} Slide={soupSlide} /> | ||
<Carousel | ||
MainTitle={"정성이 담긴 뜨끈한 국물요리"} | ||
Food={Soup} | ||
setFood={setSoup} | ||
Ref={soupImageRef} | ||
setModal={setModal} | ||
ref={soupRef} | ||
setModalData={setModalData} | ||
/> | ||
<CarouselButton Name={"Right"} Slide={soupSlide} /> | ||
</CarouselSlide> | ||
<CarouselSlide> | ||
<CarouselButton Name={"Left"} Slide={sideSlide} /> | ||
<Carousel | ||
MainTitle={"식탁을 풍성하게 하는 정갈한 밑반찬"} | ||
Food={Side} | ||
setFood={setSide} | ||
Ref={sideImageRef} | ||
setModal={setModal} | ||
ref={sideRef} | ||
setModalData={setModalData} | ||
/> | ||
<CarouselButton Name={"Right"} Slide={sideSlide} /> | ||
</CarouselSlide> | ||
</div> | ||
)} | ||
<PlusButton onClick={randerImage}> | ||
{rander ? "끄기" : "모든 카테고리 보기"} | ||
</PlusButton> | ||
</AllBox> | ||
); | ||
}; | ||
|
||
const AllBox = styled.div``; | ||
const CarouselSlide = styled.div` | ||
margin-top: 77px; | ||
padding: 0 35px; | ||
display: flex; | ||
display: flex; | ||
justify-content: center; | ||
align-items: center; | ||
`; | ||
|
||
const PlusButton = styled.button` | ||
margin-top: 120px; | ||
width: 1440px; | ||
height: 100px; | ||
background-color: #f5f5f7; | ||
|
||
font-style: normal; | ||
font-weight: bold; | ||
font-size: 18px; | ||
line-height: 26px; | ||
&:active { | ||
transform: translateY(2px); | ||
} | ||
`; | ||
|
||
export default All; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ref로 하위 컴포넌트를 접근하지 않는 방식을 찾아보세요.
어떤 상태에 의해서 하위 컴포넌트가 렌더링 되도록이요.