Skip to content

Commit 9652eeb

Browse files
committed
Merge branch 'master' of https://github.com/jae04099/space-toy-shop into feature/deli-ght
2 parents 5cd7c22 + fa59586 commit 9652eeb

File tree

11 files changed

+136
-21
lines changed

11 files changed

+136
-21
lines changed

space-toy-shop

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ <h1>Rock Paper Scissors</h1>
2626
<button>Paper</button>
2727
<button>Rock</button>
2828
<button>Scissors</button>
29-
<img src="./image/outline_replay_circle_filled_black_24dp.png" alt="retry button" class="retry">
29+
<img src="../image/outline_replay_circle_filled_black_24dp.png" alt="retry button" class="retry">
3030
</section>
3131
<div class="result"></div>
3232
</body>

가위바위보/Junghoon-P/react-rsp-game/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"react": "^17.0.2",
1010
"react-dom": "^17.0.2",
1111
"react-scripts": "5.0.0",
12+
"styled-components": "^5.3.3",
1213
"web-vitals": "^2.1.0"
1314
},
1415
"scripts": {
634 Bytes
Loading
Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,49 @@
1-
import React from "react";
1+
import React, { useState, useEffect } from "react";
2+
import styled from "styled-components";
23

34
const Rcp = () => {
4-
return <div></div>;
5+
return (
6+
<Container>
7+
<header>
8+
<h1>Rock Paper Scissors</h1>
9+
</header>
10+
<section id="list-game"></section>
11+
<Section>
12+
<Button>Rock</Button>
13+
<Button>Paper</Button>
14+
<Button>Scissors</Button>
15+
<img
16+
src="../image/outline_replay_circle_filled_black_24dp.png"
17+
alt="retry button"
18+
class="retry"
19+
/>
20+
</Section>
21+
<div class="result"></div>
22+
</Container>
23+
);
524
};
625

726
export default Rcp;
27+
28+
const Container = styled.main`
29+
${(props) => props.theme.setFlex("center", "center")};
30+
flex-direction: column;
31+
width: 100vw;
32+
height: 100vh;
33+
background-color: ${(props) => props.theme.mainColor};
34+
`;
35+
36+
const Section = styled.section`
37+
${(props) => props.theme.setFlex("center", "center")};
38+
`;
39+
40+
const Button = styled.button`
41+
width: 10rem;
42+
height: 10rem;
43+
border: none;
44+
border-radius: 5rem;
45+
font-weight: 600;
46+
font-size: 2rem;
47+
margin-right: 3rem;
48+
cursor: pointer;
49+
`;

가위바위보/Junghoon-P/react-rsp-game/src/styles/GlobalStyle.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ footer, header, hgroup, menu, nav, section {
2929
3030
* {
3131
box-sizing: border-box;
32+
font-size: 10px;
3233
font-family: 'Noto Sans KR', sans-serif;
3334
}
3435

가위바위보/Junghoon-P/react-rsp-game/yarn.lock

Lines changed: 89 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
dependencies:
167167
"@babel/types" "^7.16.0"
168168

169-
"@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.0":
169+
"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.0":
170170
version "7.16.0"
171171
resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz#90538e60b672ecf1b448f5f4f5433d37e79a3ec3"
172172
integrity sha512-kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg==
@@ -1030,7 +1030,7 @@
10301030
"@babel/parser" "^7.16.0"
10311031
"@babel/types" "^7.16.0"
10321032

1033-
"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.5", "@babel/traverse@^7.7.2":
1033+
"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.5", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.2":
10341034
version "7.16.5"
10351035
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.5.tgz#d7d400a8229c714a59b87624fc67b0f1fbd4b2b3"
10361036
integrity sha512-FOCODAzqUMROikDYLYxl4nmwiLlu85rNqBML/A5hKRVXG2LV8d0iMqgPzdYTcIpjZEBB7D6UDU9vxRZiriASdQ==
@@ -1064,6 +1064,28 @@
10641064
resolved "https://registry.yarnpkg.com/@csstools/normalize.css/-/normalize.css-12.0.0.tgz#a9583a75c3f150667771f30b60d9f059473e62c4"
10651065
integrity sha512-M0qqxAcwCsIVfpFQSlGN5XjXWu8l5JDZN+fPt1LeW5SZexQTgnaEvgXAY+CeygRw0EeppWHi12JxESWiWrB0Sg==
10661066

1067+
"@emotion/is-prop-valid@^0.8.8":
1068+
version "0.8.8"
1069+
resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz#db28b1c4368a259b60a97311d6a952d4fd01ac1a"
1070+
integrity sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA==
1071+
dependencies:
1072+
"@emotion/memoize" "0.7.4"
1073+
1074+
"@emotion/memoize@0.7.4":
1075+
version "0.7.4"
1076+
resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.4.tgz#19bf0f5af19149111c40d98bb0cf82119f5d9eeb"
1077+
integrity sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw==
1078+
1079+
"@emotion/stylis@^0.8.4":
1080+
version "0.8.5"
1081+
resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.8.5.tgz#deacb389bd6ee77d1e7fcaccce9e16c5c7e78e04"
1082+
integrity sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ==
1083+
1084+
"@emotion/unitless@^0.7.4":
1085+
version "0.7.5"
1086+
resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed"
1087+
integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg==
1088+
10671089
"@eslint/eslintrc@^1.0.5":
10681090
version "1.0.5"
10691091
resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.0.5.tgz#33f1b838dbf1f923bfa517e008362b78ddbbf318"
@@ -2424,6 +2446,21 @@ babel-plugin-polyfill-regenerator@^0.3.0:
24242446
dependencies:
24252447
"@babel/helper-define-polyfill-provider" "^0.3.0"
24262448

2449+
"babel-plugin-styled-components@>= 1.12.0":
2450+
version "2.0.2"
2451+
resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-2.0.2.tgz#0fac11402dc9db73698b55847ab1dc73f5197c54"
2452+
integrity sha512-7eG5NE8rChnNTDxa6LQfynwgHTVOYYaHJbUYSlOhk8QBXIQiMBKq4gyfHBBKPrxUcVBXVJL61ihduCpCQbuNbw==
2453+
dependencies:
2454+
"@babel/helper-annotate-as-pure" "^7.16.0"
2455+
"@babel/helper-module-imports" "^7.16.0"
2456+
babel-plugin-syntax-jsx "^6.18.0"
2457+
lodash "^4.17.11"
2458+
2459+
babel-plugin-syntax-jsx@^6.18.0:
2460+
version "6.18.0"
2461+
resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"
2462+
integrity sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=
2463+
24272464
babel-plugin-transform-react-remove-prop-types@^0.4.24:
24282465
version "0.4.24"
24292466
resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz#f2edaf9b4c6a5fbe5c1d678bfb531078c1555f3a"
@@ -2644,6 +2681,11 @@ camelcase@^6.2.0, camelcase@^6.2.1:
26442681
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.1.tgz#250fd350cfd555d0d2160b1d51510eaf8326e86e"
26452682
integrity sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA==
26462683

2684+
camelize@^1.0.0:
2685+
version "1.0.0"
2686+
resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.0.tgz#164a5483e630fa4321e5af07020e531831b2609b"
2687+
integrity sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs=
2688+
26472689
caniuse-api@^3.0.0:
26482690
version "3.0.0"
26492691
resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0"
@@ -2975,6 +3017,11 @@ css-blank-pseudo@^3.0.0:
29753017
dependencies:
29763018
postcss-selector-parser "^6.0.7"
29773019

3020+
css-color-keywords@^1.0.0:
3021+
version "1.0.0"
3022+
resolved "https://registry.yarnpkg.com/css-color-keywords/-/css-color-keywords-1.0.0.tgz#fea2616dc676b2962686b3af8dbdbe180b244e05"
3023+
integrity sha1-/qJhbcZ2spYmhrOvjb2+GAskTgU=
3024+
29783025
css-declaration-sorter@^6.0.3:
29793026
version "6.1.3"
29803027
resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.1.3.tgz#e9852e4cf940ba79f509d9425b137d1f94438dc2"
@@ -3046,6 +3093,15 @@ css-select@^4.1.3:
30463093
domutils "^2.8.0"
30473094
nth-check "^2.0.1"
30483095

3096+
css-to-react-native@^3.0.0:
3097+
version "3.0.0"
3098+
resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-3.0.0.tgz#62dbe678072a824a689bcfee011fc96e02a7d756"
3099+
integrity sha512-Ro1yETZA813eoyUp2GDBhG2j+YggidUmzO1/v9eYBKR2EHVEniE2MI/NqpTQ954BMpTPZFsGNPm46qFB9dpaPQ==
3100+
dependencies:
3101+
camelize "^1.0.0"
3102+
css-color-keywords "^1.0.0"
3103+
postcss-value-parser "^4.0.2"
3104+
30493105
css-tree@1.0.0-alpha.37:
30503106
version "1.0.0-alpha.37"
30513107
resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz#98bebd62c4c1d9f960ec340cf9f7522e30709a22"
@@ -4375,6 +4431,13 @@ he@^1.2.0:
43754431
resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
43764432
integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
43774433

4434+
hoist-non-react-statics@^3.0.0:
4435+
version "3.3.2"
4436+
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
4437+
integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
4438+
dependencies:
4439+
react-is "^16.7.0"
4440+
43784441
hoopy@^0.1.4:
43794442
version "0.1.4"
43804443
resolved "https://registry.yarnpkg.com/hoopy/-/hoopy-0.1.4.tgz#609207d661100033a9a9402ad3dea677381c1b1d"
@@ -5611,7 +5674,7 @@ lodash.uniq@^4.5.0:
56115674
resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
56125675
integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
56135676

5614-
lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0:
5677+
lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0:
56155678
version "4.17.21"
56165679
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
56175680
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -6952,7 +7015,7 @@ react-error-overlay@^6.0.10:
69527015
resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.10.tgz#0fe26db4fa85d9dbb8624729580e90e7159a59a6"
69537016
integrity sha512-mKR90fX7Pm5seCOfz8q9F+66VCc1PGsWSBxKbITjfKVQHMNF2zudxHnMdJiB1fRCb+XsbQV9sO9DCkgsMQgBIA==
69547017

6955-
react-is@^16.8.1:
7018+
react-is@^16.7.0, react-is@^16.8.1:
69567019
version "16.13.1"
69577020
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
69587021
integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
@@ -7441,6 +7504,11 @@ setprototypeof@1.2.0:
74417504
resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
74427505
integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
74437506

7507+
shallowequal@^1.1.0:
7508+
version "1.1.0"
7509+
resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8"
7510+
integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==
7511+
74447512
shebang-command@^2.0.0:
74457513
version "2.0.0"
74467514
resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
@@ -7752,6 +7820,22 @@ style-loader@^3.3.1:
77527820
resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.1.tgz#057dfa6b3d4d7c7064462830f9113ed417d38575"
77537821
integrity sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==
77547822

7823+
styled-components@^5.3.3:
7824+
version "5.3.3"
7825+
resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.3.3.tgz#312a3d9a549f4708f0fb0edc829eb34bde032743"
7826+
integrity sha512-++4iHwBM7ZN+x6DtPPWkCI4vdtwumQ+inA/DdAsqYd4SVgUKJie5vXyzotA00ttcFdQkCng7zc6grwlfIfw+lw==
7827+
dependencies:
7828+
"@babel/helper-module-imports" "^7.0.0"
7829+
"@babel/traverse" "^7.4.5"
7830+
"@emotion/is-prop-valid" "^0.8.8"
7831+
"@emotion/stylis" "^0.8.4"
7832+
"@emotion/unitless" "^0.7.4"
7833+
babel-plugin-styled-components ">= 1.12.0"
7834+
css-to-react-native "^3.0.0"
7835+
hoist-non-react-statics "^3.0.0"
7836+
shallowequal "^1.1.0"
7837+
supports-color "^5.5.0"
7838+
77557839
stylehacks@^5.0.1:
77567840
version "5.0.1"
77577841
resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.0.1.tgz#323ec554198520986806388c7fdaebc38d2c06fb"
@@ -7760,7 +7844,7 @@ stylehacks@^5.0.1:
77607844
browserslist "^4.16.0"
77617845
postcss-selector-parser "^6.0.4"
77627846

7763-
supports-color@^5.3.0:
7847+
supports-color@^5.3.0, supports-color@^5.5.0:
77647848
version "5.5.0"
77657849
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
77667850
integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==

0 commit comments

Comments
 (0)