-
Notifications
You must be signed in to change notification settings - Fork 0
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
[3주차] 최애 카공장소 고르기 월드컵 #3
base: main
Are you sure you want to change the base?
Changes from 3 commits
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 |
---|---|---|
@@ -1 +1,2 @@ | ||
.DS_Store | ||
node_modules |
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* |
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 your browser. | ||
|
||
The page will reload when you make changes.\ | ||
You may 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,39 @@ | ||
{ | ||
"name": "week3", | ||
"version": "0.1.0", | ||
"private": true, | ||
"dependencies": { | ||
"@testing-library/jest-dom": "^5.14.1", | ||
"@testing-library/react": "^13.0.0", | ||
"@testing-library/user-event": "^13.2.1", | ||
"react": "^18.1.0", | ||
"react-dom": "^18.1.0", | ||
"react-scripts": "5.0.1", | ||
"styled-components": "^5.3.5", | ||
"web-vitals": "^2.1.0" | ||
}, | ||
"scripts": { | ||
"start": "react-scripts start", | ||
"build": "react-scripts build", | ||
"test": "react-scripts test", | ||
"eject": "react-scripts eject" | ||
}, | ||
"eslintConfig": { | ||
"extends": [ | ||
"react-app", | ||
"react-app/jest" | ||
] | ||
}, | ||
"browserslist": { | ||
"production": [ | ||
">0.2%", | ||
"not dead", | ||
"not op_mini all" | ||
], | ||
"development": [ | ||
"last 1 chrome version", | ||
"last 1 firefox version", | ||
"last 1 safari version" | ||
] | ||
} | ||
} |
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,29 @@ | ||
.App { | ||
text-align: center; | ||
} | ||
|
||
.title{ | ||
color: black; | ||
display:flex; | ||
justify-content: center; | ||
|
||
font-family: 'Happiness-Sans-Title'; | ||
} | ||
|
||
.coffee-name{ | ||
font-family: 'LeferiPoint-BlackObliqueA'; | ||
} | ||
|
||
@font-face { | ||
font-family: 'Happiness-Sans-Title'; | ||
src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/[email protected]/Happiness-Sans-Title.woff2') format('woff2'); | ||
font-weight: normal; | ||
font-style: normal; | ||
} | ||
|
||
@font-face { | ||
font-family: 'LeferiPoint-BlackObliqueA'; | ||
src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/[email protected]/LeferiPoint-BlackObliqueA.woff') format('woff'); | ||
font-weight: normal; | ||
font-style: normal; | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,136 @@ | ||
import './App.css'; | ||
import { useEffect, useRef, useState } from 'react'; | ||
import starbucks from './images/starbucks.webp'; | ||
import coffeebean from './images/coffeebean.jpeg'; | ||
import twosomeplace from './images/twosomeplace.jpeg'; | ||
import hollyscoffee from './images/hollyscoffee.jpeg'; | ||
import styled from 'styled-components'; | ||
|
||
const items = [ | ||
{ | ||
name : "starbucks", | ||
pic : starbucks, | ||
}, | ||
{ | ||
name : 'coffeebean', | ||
pic : coffeebean, | ||
}, | ||
{ | ||
name : 'twosomeplace', | ||
pic : twosomeplace, | ||
}, | ||
{ | ||
name : 'hollyscoffee', | ||
pic : hollyscoffee, | ||
} | ||
] | ||
|
||
const DisplayContent = styled.div` | ||
display:flex; | ||
justify-content:center; | ||
` | ||
|
||
const Img = styled.img` | ||
width: 400px; | ||
height: 400px; | ||
` | ||
|
||
const Box = styled.div` | ||
margin:50px; | ||
` | ||
|
||
const Crown = styled.div` | ||
font-size: 100px; | ||
position: fixed; | ||
left: 50px; | ||
right: 50px; | ||
bottom: 400px; | ||
` | ||
|
||
const Vs = styled.div` | ||
font-size:50px; | ||
position:fixed; | ||
left: 50px; | ||
right: 50px; | ||
bottom:370px; | ||
` | ||
|
||
const Container = styled.div` | ||
background-color: aliceblue; | ||
|
||
|
||
` | ||
|
||
function shuffleArray(){ | ||
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. shuffle함수를 따로 뺀 것 좋은 것 같아요! 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. shuffleArray는 특별한 이유는 없고, 아마 작성한 순서대로 그대로 올려둬서 그런 것 같습니다 |
||
items.sort(()=> Math.random() - 0.5); | ||
console.log(items); | ||
} | ||
|
||
let winner = []; | ||
function App() { | ||
const [coffeeShop, setCoffeeShop] = useState(items); | ||
let display = []; | ||
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. display와 winner 를 state로 처리하면 좋을 것 같아요! 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. 앗 제가 왜 display와 winner를 따로 state로 설정해주지 않았냐면.. 제가 지금 state로 설정한 부분이 coffeeShop부분이니까 이 부분이 한번 고쳐지면 렌더링이 돌아가면서 display와 winner가 새롭게 바뀐 채 출력이 될 것이라고 예상을 했었던 거였어요! 그래서 모두를 state로 처리하게 되면... 여러번 같은 화면이 렌더링될 것이라는 예상이었는데 제가 잘못 알고 있는 부분이 있으까요...?! |
||
|
||
useEffect(()=>{ | ||
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. 제가 알기론 useEffect 에서 의존성 배열안에 특정값을 넣어주게 되면, 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. 오오 링크 한번 참고해서 또 공부해보겠습니다. 제가 여러번 풀어쓴 코드를 useEffect 이내에서 모두 처리할 수 있다는 말씀이군요... |
||
},[coffeeShop]) | ||
|
||
shuffleArray(); | ||
console.log(coffeeShop); | ||
display = [coffeeShop[0],coffeeShop[1]]; | ||
|
||
const clickEvent = (coffeeShops) =>{ | ||
console.log(coffeeShops); | ||
console.log(winner); | ||
let newWinner = [...winner, coffeeShops]; | ||
winner = newWinner; | ||
let newCoffeeShop = coffeeShop.slice(2); | ||
if(newCoffeeShop.length === 0){ | ||
setCoffeeShop(winner); | ||
winner=[]; | ||
} | ||
else{ | ||
setCoffeeShop(newCoffeeShop); | ||
console.log(winner); | ||
display = [newCoffeeShop[0],newCoffeeShop[1]]; | ||
} | ||
} | ||
|
||
if(coffeeShop.length===1){ | ||
return( | ||
<div className="App"> | ||
<main> | ||
<Container> | ||
<h2 className="title"> 당신의 최애 카공 장소는 바로바로 </h2> | ||
</Container> | ||
<div className="item" key={coffeeShop[0].name}/> | ||
<Img className="coffee-img" src={coffeeShop[0].pic} alt="커피"></Img> | ||
<Crown>👑</Crown> | ||
<div className="coffee-name">{coffeeShop[0].name}</div> | ||
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. App.css에서 따로 coffee-name을 지정해주고 있는데, 위에서 styled-components를 사용하고 있으니 일관성 있게 이 부분도 styled-components 로 작성해주면 좋을 것 같아요! 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. 오오 좋은 아이디어 감사합니당! styled-components가 익숙치 않아서 이러한 스타일 변경은 어떡해야하지 싶어서 classname을 작성하고 css로 고쳐주느라 classname을 작성해준 듯 싶어요@.@ 한번 이 부분도 고쳐나가보겠슴다 ㅎㅎ |
||
</main> | ||
</div> | ||
) | ||
} | ||
else{ | ||
return ( | ||
<div className="App"> | ||
<main> | ||
<Container> | ||
<h2 className="title"> 당신의 최애 카공 장소는? </h2> | ||
</Container> | ||
<DisplayContent> | ||
{ | ||
display.map(item => { | ||
return <Box className="item" key={item.name} onClick={()=>clickEvent(item)}> | ||
<Img className="coffee-img" src={item.pic} alt="커피"/> | ||
<div className="coffee-name">{item.name}</div> | ||
</Box> | ||
})} | ||
</DisplayContent> | ||
<Vs>VS</Vs> | ||
</main> | ||
</div> | ||
); | ||
} | ||
} | ||
|
||
export default App; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
import { render, screen } from '@testing-library/react'; | ||
import App from './App'; | ||
|
||
test('renders learn react link', () => { | ||
render(<App />); | ||
const linkElement = screen.getByText(/learn react/i); | ||
expect(linkElement).toBeInTheDocument(); | ||
}); |
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.
Crown 이랑 Vs styled-components에서 position, left, right가 겹치는 것 같아요!
컴포넌트를 확장해서 표현을 할수도 있을것 같아요
아니면 두개의 컴포넌트가 다른게 font-size와 bottom 밖에 없으니까 styled-components에 props를 전달해줘서 판단해주는 방법으로 해도 괜찮을 것 같아용!