Skip to content
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

[team-13 FE] 1주차 PR #29

Merged
merged 54 commits into from
Apr 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
2151864
[ADD] FE First Push(CRA)
zel0rd Apr 19, 2021
efa3cb6
[ADD] App.js Structure design
zel0rd Apr 19, 2021
1bec34f
[CHORE]: styled-components 패키지 추가
cchoongh Apr 20, 2021
1b04315
[ADD]: 모달 초기 구현
cchoongh Apr 20, 2021
42bcec1
[ADD]: util디렉터리 생성
cchoongh Apr 20, 2021
298715f
Merge pull request #1 from zel0rd/fe/feature/MenuDetailModal
cchoongh Apr 20, 2021
ac0d117
[ADD]: reset.css 적용 (index.css수정)
cchoongh Apr 20, 2021
5d7eb96
[ADD]: 모달창 Preview 구현
cchoongh Apr 20, 2021
cc77697
Merge pull request #2 from zel0rd/fe/feature/MenuDetailModal
cchoongh Apr 20, 2021
ff5bf4d
[ADD]: 재사용 가능한 badge컴포넌트 추가
cchoongh Apr 21, 2021
da87ec2
Merge pull request #3 from zel0rd/fe/feature/MenuDetailModal
cchoongh Apr 21, 2021
29d4755
[FIX]: 모달 크기 조정
cchoongh Apr 21, 2021
ad415fa
[ADD] react-icons 추가
zel0rd Apr 21, 2021
dbbdba0
[ADD] header style component로 변경
zel0rd Apr 21, 2021
e120a34
[ADD] Header 구조 설계
zel0rd Apr 21, 2021
3e744aa
[ADD] header component 스타일 적용
zel0rd Apr 21, 2021
5d900ac
[ADD]: 모달에서 쓰이는 Counter컴포넌트 구현
cchoongh Apr 21, 2021
62145a7
[FIX] header style 작업중
zel0rd Apr 21, 2021
010550c
[ADD]: 모달 우상단 주문정보UI 구현
cchoongh Apr 22, 2021
b94480a
[FIX]: 이벤트뱃지 폰트사이즈 수정
cchoongh Apr 22, 2021
7127356
Merge pull request #4 from zel0rd/fe/feature/MenuDetailModal
cchoongh Apr 22, 2021
8d383f5
[ADD] header 제작 임시저장
zel0rd Apr 22, 2021
123f3d8
Merge remote-tracking branch 'origin/fe/dev' into fe/feature/Header
zel0rd Apr 22, 2021
252730e
[ADD] Header static resource component
zel0rd Apr 22, 2021
30c4e03
[FIX] Header style
zel0rd Apr 22, 2021
96e14c9
[Fix] Dropdown Function
zel0rd Apr 22, 2021
23645bc
Merge pull request #5 from zel0rd/fe/feature/Header
zel0rd Apr 22, 2021
1ff8f7a
[ADD] update MenuCard(large)
zel0rd Apr 23, 2021
6f07b1f
[ADD] update BestMenu temporal
zel0rd Apr 23, 2021
ce6a84f
Merge remote-tracking branch 'origin/fe/dev' into fe/feature/BestMenu
zel0rd Apr 23, 2021
9a35bae
Merge pull request #6 from zel0rd/fe/feature/BestMenu
zel0rd Apr 23, 2021
a4c2aa2
[ADD] SmallCard Style updated
zel0rd Apr 23, 2021
532adeb
Merge pull request #7 from zel0rd/fe/feature/BestMenu
cchoongh Apr 23, 2021
cd58499
[ADD]: 슬라이더 초기 구현
cchoongh Apr 23, 2021
f6d3bd5
[ADD]: RecommendSlider 초기 구현
cchoongh Apr 23, 2021
ae3995e
Merge pull request #8 from zel0rd/fe/feature/Slider
cchoongh Apr 23, 2021
de4346d
Merge pull request #9 from zel0rd/fe/feature/MenuDetailModal
cchoongh Apr 23, 2021
392c8d8
[ADD]: Slider 끝부분 처리
cchoongh Apr 24, 2021
61db40e
Merge pull request #10 from zel0rd/fe/feature/Slider
cchoongh Apr 24, 2021
c5cf716
[ADD]: Slider 컨트롤 버튼 disabled기능 구현
cchoongh Apr 24, 2021
45f445d
Merge pull request #11 from zel0rd/fe/feature/MenuDetailModal
cchoongh Apr 24, 2021
6ddee4a
[FIX]: 통신관련 유틸 수정
cchoongh Apr 25, 2021
43bfdb9
[ADD]: 왼쪽, 오른쪽 버튼 svg 추가
cchoongh Apr 25, 2021
ffd5d0d
[FIX]: Slider 스타일 살짝 수정
cchoongh Apr 25, 2021
31e0d5a
[DELETE]: 불필요한 MOCK 이미지 파일들 삭제
cchoongh Apr 25, 2021
66beb47
[ADD]: 아이템 상세 모달 완성도 높이기
cchoongh Apr 25, 2021
f7a1621
Merge pull request #12 from zel0rd/fe/feature/MenuDetailModal
cchoongh Apr 25, 2021
071b6f1
[ADD] BestMenu Tab function added
zel0rd Apr 26, 2021
794c546
Merge pull request #13 from zel0rd/fe/feature/BestMenu
zel0rd Apr 26, 2021
e7f889c
[UPDATE] 베스트 메뉴에서 할인 가격이 없는 경우 처리
zel0rd Apr 26, 2021
f34e0ef
[ADD] change LargeCard space-between
zel0rd Apr 26, 2021
79c00b9
Merge pull request #14 from zel0rd/fe/feature/BestMenu
zel0rd Apr 26, 2021
85396ba
[UPDATE] DELETE Margin Left,Right
zel0rd Apr 26, 2021
1ca3c3c
Merge pull request #15 from zel0rd/fe/feature/BestMenu
zel0rd Apr 26, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions fe/sidedish-fe/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.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*
70 changes: 70 additions & 0 deletions fe/sidedish-fe/README.md
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:

### `npm 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.

### `npm 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.

### `npm run 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.

### `npm run 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)

### `npm run 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)
Loading