-
Notifications
You must be signed in to change notification settings - Fork 50
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* chore: Initialize structure 폴더 구조 짜봤습니다 ㅎㅎ * docs: Add database schema mwb,png file 오늘 관련 스키마 설계하여 mwb와 png파일 추가하였습니다. * [#1] chore: Test commit * Revert "[#1] chore: Test commit" This reverts commit 9546450. * chore folder 구성 * [#6] 캐러셀 슬라이드 구현 완료 * feat: header 정적 ui 작성 * feat: header 하위 레이어 이벤트 구현 * chore: 불필요한 파일, 주석 제거 * feat: tab ui * [#6]feat: Carousel Slide 완성 * [#11] feat: PopUp Modal frame 완성 * chore * feat: Carousel Slide Content * feat: Fetch tab ui data * feat: Modal * [#11] feat:PopUp Modal * fix: ui별 각각 스타일 적용 * feat: style, model tab ui 적용 * refactor: Carousel * feat: 모달 세부이미지 클릭 이벤트 적용 * feat: 캐로셀 리펙토링+모달 추가기능 합침 * feat: 주문하기 * feat: POST order && PopUp Carousel * feat: PopUp Carousel * refactor: PopUpModal * refactor: PopUpModal 클릭시 best Modal과 함께 뜨는 오류 수정 * chore: add gitignore * Update .gitignore * chore * chore Co-authored-by: 정이삭 <isaac56@naver.com> Co-authored-by: reminderclock <reminderclock@naver.com> Co-authored-by: reminderclock <71510362+reminderclock@users.noreply.github.com>
- Loading branch information
1 parent
1ae4476
commit 77fe0f1
Showing
29 changed files
with
1,987 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
node_modules | ||
package.json | ||
yarn.lock | ||
BE | ||
DOCS |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
## 이 폴더에 BE 소스 파일 추가 하면 됩니다. |
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
## 이 폴더에 문서 파일 추가 하면 됩니다. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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) |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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> |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
# https://www.robotstxt.org/robotstxt.html | ||
User-agent: * | ||
Disallow: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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); | ||
}; | ||
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); | ||
}; | ||
|
||
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 | ||
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; |
Oops, something went wrong.