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-21] RaQQoon Sidedish #18

Merged
merged 55 commits into from
Apr 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
4e3869d
Add. 개발 환경 설정
juddroid Apr 19, 2021
00d5fc9
Add. reset.css
juddroid Apr 19, 2021
8942500
Add. 기본 폴더구조 생성
juddroid Apr 19, 2021
ea7f90a
Merge pull request #1 from juddroid/raccoon-dev
juddroid Apr 19, 2021
3918931
Add. customHooks 생성
juddroid Apr 19, 2021
1ea830c
Merge pull request #2 from juddroid/raccoon-dev
juddroid Apr 19, 2021
57d4121
Add. tag.jsx
juddroid Apr 19, 2021
f31e958
Add. Info.jsx
juddroid Apr 19, 2021
72c7d78
Add. Price.jsx
juddroid Apr 19, 2021
5f8ac65
Fix. TagBox로 감싸서 display: flex 적용
juddroid Apr 19, 2021
3d6a0b2
Add. Card.jsx
juddroid Apr 19, 2021
28ae9a9
Fix. Card hover 효과속성을 display에서 opacity로 변경
juddroid Apr 19, 2021
c2251d0
Add. Card M 추가
juddroid Apr 19, 2021
f7366f0
Remove. app.js margin 삭제
juddroid Apr 20, 2021
dfb7910
Merge pull request #3 from juddroid/sidedish-raccoon-dev
juddroid Apr 20, 2021
9b10fe4
Add. TabMenu 추가
juddroid Apr 20, 2021
594f670
Add. TabUI View 완성
juddroid Apr 20, 2021
b463ca3
Add. Header HTML 구조 설계
somedaycode Apr 20, 2021
b2cf621
Fix. box-sizing으로 인한 width, padding값 수정
somedaycode Apr 20, 2021
28a18a0
Modify. 스타일 width 값 수정
somedaycode Apr 20, 2021
6224bc4
Merge pull request #10 from juddroid/Q-dev
somedaycode Apr 20, 2021
efd56b6
Move. Header파일 Nav폴더로 이동
somedaycode Apr 20, 2021
762d96b
Merge pull request #11 from juddroid/Q-dev
somedaycode Apr 20, 2021
b43e344
Add. Menu 파일 생성, 컴포넌트 분리
somedaycode Apr 20, 2021
e670910
Merge pull request #12 from juddroid/Q-dev
somedaycode Apr 20, 2021
e56fc63
Add. Menu Component 분리
somedaycode Apr 20, 2021
9d1b0c1
Merge pull request #14 from juddroid/Q-dev
somedaycode Apr 20, 2021
6e4c55d
Merge branch 'raqqoon-dev' into sidedish-raccoon-dev
juddroid Apr 20, 2021
4e8bc0c
Merge pull request #15 from juddroid/sidedish-raccoon-dev
juddroid Apr 20, 2021
e418720
Rename. Folder name 수정
juddroid Apr 20, 2021
6f9d77d
Fix. TabUI 여백 조정
juddroid Apr 20, 2021
231aa32
Add. dropdown 기능 추가
somedaycode Apr 20, 2021
25fb01c
Merge pull request #16 from juddroid/Q-dev
somedaycode Apr 20, 2021
17be568
Modify. 드롭다운에 박스 그림자 추기
somedaycode Apr 20, 2021
d74b7db
Merge pull request #18 from juddroid/Q-dev
somedaycode Apr 20, 2021
d649a47
Modify. import 경로 수정
somedaycode Apr 20, 2021
3c5c78e
Add. Carousel UI 작업 마무리
somedaycode Apr 21, 2021
668dbe3
Add. tab ui 구현
juddroid Apr 21, 2021
d149529
Add. best tag 추가 및 배경 색상 수정
juddroid Apr 22, 2021
43055a7
Move. useTab 분리
juddroid Apr 22, 2021
1e42a9e
Merge pull request #23 from juddroid/feature/carousel
somedaycode Apr 22, 2021
d46f136
Merge branch 'raqqoon-dev' into sidedish-raccoon-dev2
juddroid Apr 22, 2021
2430057
Merge pull request #24 from juddroid/sidedish-raccoon-dev2
juddroid Apr 22, 2021
4560030
Add. 경로설정 다시 세팅
juddroid Apr 22, 2021
876baa5
Merge pull request #25 from juddroid/sidedish-raccoon-dev3
juddroid Apr 22, 2021
abb4f4a
Fix. 머지 후 정상 작동 상태
juddroid Apr 22, 2021
f00480c
Merge pull request #26 from juddroid/feature/tabUI
juddroid Apr 22, 2021
b3d8c3b
Fix. src이하 상대경로를 절대경로로 수정
juddroid Apr 22, 2021
6901ec8
Modify. carousel 카테고리 버튼 분리중
somedaycode Apr 22, 2021
665d14f
Merge pull request #27 from juddroid/feature/carousel-2
somedaycode Apr 22, 2021
70e5871
Fix. 전체적인 css 수정
juddroid Apr 22, 2021
5f79fb6
Merge branch 'raqqoon-dev' into feature/tabUI
juddroid Apr 22, 2021
759fe6f
Merge pull request #28 from juddroid/feature/tabUI
juddroid Apr 22, 2021
0bd51c0
Add. 카테고리 전체 보기 버튼 구현
somedaycode Apr 22, 2021
3c8d5b8
Merge pull request #30 from juddroid/feature/carousel-2
somedaycode Apr 22, 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
1 change: 1 addition & 0 deletions raqqoon-sidedish/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
NODE_PATH=src
23 changes: 23 additions & 0 deletions raqqoon-sidedish/.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 raqqoon-sidedish/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:

### `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)
6 changes: 6 additions & 0 deletions raqqoon-sidedish/jsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"compilerOptions": {
"baseUrl": "src"
},
"include": ["src"]
}
Loading