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

[Goody Kyle] 메인화면 UI #11

Merged
merged 41 commits into from
Apr 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
09b0b8e
[Init] 컴포넌트 폴더 구조
hayoung123 Apr 19, 2021
cce5d2b
[Wip] 초기 협업 셋팅 진행중
hayoung123 Apr 19, 2021
b46c8d9
[Fix]: react abolute imports는 util파일은 안된다.
hayoung123 Apr 19, 2021
05de6a1
[Feat]: Header 스켈레톤 구조
hayoung123 Apr 19, 2021
d385556
[Style] 헤더 스타일 완성
hayoung123 Apr 19, 2021
da3c172
Merge pull request #3 from hayoung123/feature/header
hayoung123 Apr 19, 2021
2ce4d76
[Feat]: best side dish tab static UI
junzero741 Apr 20, 2021
8790f30
[Feat]: Best Sidedish skeleton UI - #5
junzero741 Apr 20, 2021
8be7be3
[Feat]: useFetch close - #8
junzero741 Apr 20, 2021
840c08c
Merge pull request #9 from hayoung123/feature/useFetch
junzero741 Apr 20, 2021
f201b7e
[WIP]: fetch 로 전환중..
junzero741 Apr 20, 2021
a85517d
[Fix]:Best 데이터 fetch 오류 수정
hayoung123 Apr 20, 2021
30a66dd
Merge pull request #11 from hayoung123/feature/useFetch
junzero741 Apr 20, 2021
19de15d
[Feat]: tab 기능 구현
junzero741 Apr 20, 2021
2c3ea15
[Fix]: useEffect 무한 렌더링 수정
junzero741 Apr 20, 2021
ae1fb59
Merge pull request #12 from hayoung123/feature/tabUI
junzero741 Apr 20, 2021
af9cd23
[Feat]: slidedish 폴더구조 생성
junzero741 Apr 20, 2021
e17bfe6
Merge pull request #13 from hayoung123/feature/tabUI
junzero741 Apr 20, 2021
2d4b92f
[Style]: tab card style applied
junzero741 Apr 20, 2021
891e9d4
[Style]: best header and tab style applied
junzero741 Apr 20, 2021
7a5867b
[Style]: best item list style applied
junzero741 Apr 20, 2021
a1b5215
[Style]: distItem, slide 스타일
hayoung123 Apr 20, 2021
81c672b
[Style]: max-witdh로 뼈대 css
hayoung123 Apr 20, 2021
54faa6a
[Style]: dishItem 약간 수정
hayoung123 Apr 20, 2021
9a40353
[Style]: best style minor fixed
junzero741 Apr 21, 2021
a8a92a7
[Delete]: junk file delete - resolve #14
junzero741 Apr 21, 2021
a87cf72
Merge pull request #15 from hayoung123/feature/best-style
junzero741 Apr 21, 2021
679bbfd
Merge pull request #16 from hayoung123/style/slideList
hayoung123 Apr 21, 2021
3ae3aa2
[Style] 전체적인 style
hayoung123 Apr 21, 2021
7066d6c
Merge pull request #17 from hayoung123/merge/style
hayoung123 Apr 21, 2021
d1bc2c6
[Feat]: slideData fetch & url 따로 모음
hayoung123 Apr 21, 2021
8568a0a
[Feat]: 더보기 버튼
hayoung123 Apr 21, 2021
6da6f82
[Feat]: 더보기 접기 기능& 더보기 버튼 style
hayoung123 Apr 21, 2021
0e7981b
Merge pull request #18 from hayoung123/feature/slideDishFetch - resol…
hayoung123 Apr 21, 2021
57ce282
[Chore] 파일변경 및 사용안하는 파일 삭제
hayoung123 Apr 21, 2021
dfef44a
[Feat]: dish hover 구현
hayoung123 Apr 21, 2021
ab75bdd
Merge pull request #19 from hayoung123/feature/itemHover
hayoung123 Apr 21, 2021
223bcaa
[Style]: 1280px로 변경
hayoung123 Apr 21, 2021
f4a4e41
[Style]: flex에서 margin으로 변경
hayoung123 Apr 21, 2021
9b4dc57
[Chore]: 불필요한 부분 삭제
hayoung123 Apr 22, 2021
7cc3bef
Merge pull request #20 from hayoung123/kyle/carousel
hayoung123 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
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"git.ignoreLimitWarning": true
}
23 changes: 23 additions & 0 deletions 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*
7 changes: 7 additions & 0 deletions sidedish/.prettierrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
module.exports = {
trailingComma: 'es5',
tabWidth: 2,
semi: true,
singleQuote: true,
printWidth: 100,
};
70 changes: 70 additions & 0 deletions 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 sidedish/jsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"compilerOptions": {
"baseUrl": "src"
},
"include": ["src"]
}
Loading