..

75e294f4 · 이재연 · 49cc2fe8 · 75e294f4 · 75e294f4 · 75e294f4
Commit 75e294f4 authored Dec 26, 2020 by 이재연
--- a/client/.eslintcache
+++ b/client/.eslintcache
-[{"C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\index.js":"1","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\App.js":"2","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\reportWebVitals.js":"3"},{"size":547,"mtime":1608704689894,"results":"4","hashOfConfig":"5"},{"size":652,"mtime":1608705187305,"results":"6","hashOfConfig":"5"},{"size":362,"mtime":499162500000,"results":"7","hashOfConfig":"5"},{"filePath":"8","messages":"9","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1f8h90z",{"filePath":"10","messages":"11","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"12","messages":"13","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"14"},"C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\index.js",[],"C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\App.js",[],"C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\reportWebVitals.js",[],["15","16"],{"ruleId":"17","replacedBy":"18"},{"ruleId":"19","replacedBy":"20"},"no-native-reassign",["21"],"no-negated-in-lhs",["22"],"no-global-assign","no-unsafe-negation"]
+[{"C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\index.js":"1","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\App.js":"2","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\reportWebVitals.js":"3","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Pages\\Admin.js":"4","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Pages\\ShoppingCart.js":"5","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Pages\\Signup.js":"6","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Pages\\Login.js":"7","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Pages\\Home.js":"8","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Pages\\Payment.js":"9","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Components\\MainNav.js":"10","C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Components\\SubNav.js":"11"},{"size":1078,"mtime":1608970065236,"results":"12","hashOfConfig":"13"},{"size":652,"mtime":1608705187305,"results":"14","hashOfConfig":"13"},{"size":362,"mtime":499162500000,"results":"15","hashOfConfig":"13"},{"size":351,"mtime":1608970621902,"results":"16","hashOfConfig":"13"},{"size":365,"mtime":1608970610659,"results":"17","hashOfConfig":"13"},{"size":1453,"mtime":1608982060226,"results":"18","hashOfConfig":"13"},{"size":305,"mtime":1608978425980,"results":"19","hashOfConfig":"13"},{"size":303,"mtime":1608969605724,"results":"20","hashOfConfig":"13"},{"size":309,"mtime":1608969608040,"results":"21","hashOfConfig":"13"},{"size":208,"mtime":1608969598585,"results":"22","hashOfConfig":"13"},{"size":206,"mtime":1608969599915,"results":"23","hashOfConfig":"13"},{"filePath":"24","messages":"25","errorCount":0,"warningCount":3,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},"1f8h90z",{"filePath":"26","messages":"27","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"28","messages":"29","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"30"},{"filePath":"31","messages":"32","errorCount":0,"warningCount":4,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"33","messages":"34","errorCount":0,"warningCount":4,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"35","messages":"36","errorCount":0,"warningCount":4,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"37","messages":"38","errorCount":0,"warningCount":3,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"39","messages":"40","errorCount":0,"warningCount":3,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"41","messages":"42","errorCount":0,"warningCount":3,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"43","messages":"44","errorCount":0,"warningCount":4,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"45","messages":"46","errorCount":0,"warningCount":4,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},"C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\index.js",["47","48","49"],"C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\App.js",[],"C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\reportWebVitals.js",[],["50","51"],"C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Pages\\Admin.js",["52","53","54","55"],"C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Pages\\ShoppingCart.js",["56","57","58","59"],"C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Pages\\Signup.js",["60","61","62","63"],"C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Pages\\Login.js",["64","65","66"],"C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Pages\\Home.js",["67","68","69"],"C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Pages\\Payment.js",["70","71","72"],"C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Components\\MainNav.js",["73","74","75","76"],"C:\\Users\\이재연\\Desktop\\2020\\shopping-mall\\client\\src\\Components\\SubNav.js",["77","78","79","80"],{"ruleId":"81","severity":1,"message":"82","line":7,"column":8,"nodeType":"83","messageId":"84","endLine":7,"endColumn":13},{"ruleId":"81","severity":1,"message":"85","line":8,"column":8,"nodeType":"83","messageId":"84","endLine":8,"endColumn":20},{"ruleId":"81","severity":1,"message":"86","line":9,"column":8,"nodeType":"83","messageId":"84","endLine":9,"endColumn":15},{"ruleId":"87","replacedBy":"88"},{"ruleId":"89","replacedBy":"90"},{"ruleId":"81","severity":1,"message":"91","line":1,"column":17,"nodeType":"83","messageId":"84","endLine":1,"endColumn":25},{"ruleId":"81","severity":1,"message":"92","line":1,"column":27,"nodeType":"83","messageId":"84","endLine":1,"endColumn":36},{"ruleId":"81","severity":1,"message":"93","line":1,"column":38,"nodeType":"83","messageId":"84","endLine":1,"endColumn":44},{"ruleId":"81","severity":1,"message":"94","line":2,"column":10,"nodeType":"83","messageId":"84","endLine":2,"endColumn":18},{"ruleId":"81","severity":1,"message":"91","line":1,"column":17,"nodeType":"83","messageId":"84","endLine":1,"endColumn":25},{"ruleId":"81","severity":1,"message":"92","line":1,"column":27,"nodeType":"83","messageId":"84","endLine":1,"endColumn":36},{"ruleId":"81","severity":1,"message":"93","line":1,"column":38,"nodeType":"83","messageId":"84","endLine":1,"endColumn":44},{"ruleId":"81","severity":1,"message":"94","line":2,"column":10,"nodeType":"83","messageId":"84","endLine":2,"endColumn":18},{"ruleId":"81","severity":1,"message":"91","line":1,"column":17,"nodeType":"83","messageId":"84","endLine":1,"endColumn":25},{"ruleId":"81","severity":1,"message":"92","line":1,"column":27,"nodeType":"83","messageId":"84","endLine":1,"endColumn":36},{"ruleId":"81","severity":1,"message":"93","line":1,"column":38,"nodeType":"83","messageId":"84","endLine":1,"endColumn":44},{"ruleId":"81","severity":1,"message":"94","line":2,"column":10,"nodeType":"83","messageId":"84","endLine":2,"endColumn":18},{"ruleId":"81","severity":1,"message":"91","line":1,"column":17,"nodeType":"83","messageId":"84","endLine":1,"endColumn":25},{"ruleId":"81","severity":1,"message":"92","line":1,"column":27,"nodeType":"83","messageId":"84","endLine":1,"endColumn":36},{"ruleId":"81","severity":1,"message":"93","line":1,"column":38,"nodeType":"83","messageId":"84","endLine":1,"endColumn":44},{"ruleId":"81","severity":1,"message":"91","line":1,"column":17,"nodeType":"83","messageId":"84","endLine":1,"endColumn":25},{"ruleId":"81","severity":1,"message":"92","line":1,"column":27,"nodeType":"83","messageId":"84","endLine":1,"endColumn":36},{"ruleId":"81","severity":1,"message":"93","line":1,"column":38,"nodeType":"83","messageId":"84","endLine":1,"endColumn":44},{"ruleId":"81","severity":1,"message":"91","line":1,"column":17,"nodeType":"83","messageId":"84","endLine":1,"endColumn":25},{"ruleId":"81","severity":1,"message":"92","line":1,"column":27,"nodeType":"83","messageId":"84","endLine":1,"endColumn":36},{"ruleId":"81","severity":1,"message":"93","line":1,"column":38,"nodeType":"83","messageId":"84","endLine":1,"endColumn":44},{"ruleId":"81","severity":1,"message":"91","line":1,"column":17,"nodeType":"83","messageId":"84","endLine":1,"endColumn":25},{"ruleId":"81","severity":1,"message":"92","line":1,"column":27,"nodeType":"83","messageId":"84","endLine":1,"endColumn":36},{"ruleId":"81","severity":1,"message":"93","line":1,"column":38,"nodeType":"83","messageId":"84","endLine":1,"endColumn":44},{"ruleId":"81","severity":1,"message":"95","line":2,"column":10,"nodeType":"83","messageId":"84","endLine":2,"endColumn":14},{"ruleId":"81","severity":1,"message":"91","line":1,"column":17,"nodeType":"83","messageId":"84","endLine":1,"endColumn":25},{"ruleId":"81","severity":1,"message":"92","line":1,"column":27,"nodeType":"83","messageId":"84","endLine":1,"endColumn":36},{"ruleId":"81","severity":1,"message":"93","line":1,"column":38,"nodeType":"83","messageId":"84","endLine":1,"endColumn":44},{"ruleId":"81","severity":1,"message":"95","line":2,"column":10,"nodeType":"83","messageId":"84","endLine":2,"endColumn":14},"no-unused-vars","'Admin' is defined but never used.","Identifier","unusedVar","'ShoppingCart' is defined but never used.","'Payment' is defined but never used.","no-native-reassign",["96"],"no-negated-in-lhs",["97"],"'useState' is defined but never used.","'useEffect' is defined but never used.","'useRef' is defined but never used.","'Redirect' is defined but never used.","'Link' is defined but never used.","no-global-assign","no-unsafe-negation"]
\ No newline at end of file
--- a/client/.gitignore
+++ b/client/.gitignore
@@ -21,3 +21,4 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+package-lock.json
\ No newline at end of file
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -7088,6 +7088,19 @@
      "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz",
      "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="
    },
+    "history": {
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz",
+      "integrity": "sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==",
+      "requires": {
+        "@babel/runtime": "^7.1.2",
+        "loose-envify": "^1.2.0",
+        "resolve-pathname": "^3.0.0",
+        "tiny-invariant": "^1.0.2",
+        "tiny-warning": "^1.0.0",
+        "value-equal": "^1.0.1"
+      }
+    },
    "hmac-drbg": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
@@ -7098,6 +7111,14 @@
        "minimalistic-crypto-utils": "^1.0.1"
      }
    },
+    "hoist-non-react-statics": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
+      "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
+      "requires": {
+        "react-is": "^16.7.0"
+      }
+    },
    "hoopy": {
      "version": "0.1.4",
      "resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz",
@@ -9972,6 +9993,15 @@
      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg=="
    },
+    "mini-create-react-context": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/mini-create-react-context/-/mini-create-react-context-0.4.1.tgz",
+      "integrity": "sha512-YWCYEmd5CQeHGSAKrYvXgmzzkrvssZcuuQDDeqkT+PziKGMgE+0MCCtcKbROzocGBG1meBLl2FotlRwf4gAzbQ==",
+      "requires": {
+        "@babel/runtime": "^7.12.1",
+        "tiny-warning": "^1.0.3"
+      }
+    },
    "mini-css-extract-plugin": {
      "version": "0.11.3",
      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.11.3.tgz",
@@ -12458,6 +12488,52 @@
      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.8.3.tgz",
      "integrity": "sha512-X8jZHc7nCMjaCqoU+V2I0cOhNW+QMBwSUkeXnTi8IPe6zaRWfn60ZzvFDZqWPfmSJfjub7dDW1SP0jaHWLu/hg=="
    },
+    "react-router": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.2.0.tgz",
+      "integrity": "sha512-smz1DUuFHRKdcJC0jobGo8cVbhO3x50tCL4icacOlcwDOEQPq4TMqwx3sY1TP+DvtTgz4nm3thuo7A+BK2U0Dw==",
+      "requires": {
+        "@babel/runtime": "^7.1.2",
+        "history": "^4.9.0",
+        "hoist-non-react-statics": "^3.1.0",
+        "loose-envify": "^1.3.1",
+        "mini-create-react-context": "^0.4.0",
+        "path-to-regexp": "^1.7.0",
+        "prop-types": "^15.6.2",
+        "react-is": "^16.6.0",
+        "tiny-invariant": "^1.0.2",
+        "tiny-warning": "^1.0.0"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
+        },
+        "path-to-regexp": {
+          "version": "1.8.0",
+          "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz",
+          "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==",
+          "requires": {
+            "isarray": "0.0.1"
+          }
+        }
+      }
+    },
+    "react-router-dom": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.2.0.tgz",
+      "integrity": "sha512-gxAmfylo2QUjcwxI63RhQ5G85Qqt4voZpUXSEqCwykV0baaOTQDR1f0PmY8AELqIyVc0NEZUj0Gov5lNGcXgsA==",
+      "requires": {
+        "@babel/runtime": "^7.1.2",
+        "history": "^4.9.0",
+        "loose-envify": "^1.3.1",
+        "prop-types": "^15.6.2",
+        "react-router": "5.2.0",
+        "tiny-invariant": "^1.0.2",
+        "tiny-warning": "^1.0.0"
+      }
+    },
    "react-scripts": {
      "version": "4.0.1",
      "resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-4.0.1.tgz",
@@ -12945,6 +13021,11 @@
      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
    },
+    "resolve-pathname": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-3.0.0.tgz",
+      "integrity": "sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng=="
+    },
    "resolve-url": {
      "version": "0.2.1",
      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
@@ -14600,6 +14681,16 @@
      "resolved": "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz",
      "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q="
    },
+    "tiny-invariant": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.1.0.tgz",
+      "integrity": "sha512-ytxQvrb1cPc9WBEI/HSeYYoGD0kWnGEOR8RY6KomWLBVhqz0RgTwVO9dLrGz7dC+nN9llyI7OKAgRq8Vq4ZBSw=="
+    },
+    "tiny-warning": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
+      "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
+    },
    "tmpl": {
      "version": "1.0.4",
      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
@@ -15081,6 +15172,11 @@
        "spdx-expression-parse": "^3.0.0"
      }
    },
+    "value-equal": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/value-equal/-/value-equal-1.0.1.tgz",
+      "integrity": "sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw=="
+    },
    "vary": {
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",

--- a/client/package.json
+++ b/client/package.json
@@ -12,6 +12,7 @@
    "react": "^17.0.1",
    "react-bootstrap": "^1.4.0",
    "react-dom": "^17.0.1",
+    "react-router-dom": "^5.2.0",
    "react-scripts": "4.0.1",
    "web-vitals": "^0.2.4"
  },

--- a/client/src/Pages/Admin.js
+++ b/client/src/Pages/Admin.js
 import React, { useState, useEffect, useRef } from 'react';
-import { Redirect } from 'react-router';
+import { Redirect } from 'react-router-dom';
 import Nav1 from '../Components/MainNav';
 import Nav2 from '../Components/SubNav';


--- a/client/src/Pages/ShoppingCart.js
+++ b/client/src/Pages/ShoppingCart.js
 import React, { useState, useEffect, useRef } from 'react';
-import { Redirect } from 'react-router';
+import { Redirect } from 'react-router-dom';
 import Nav1 from '../Components/MainNav';
 import Nav2 from '../Components/SubNav';


--- a/client/src/Pages/Signup.js
+++ b/client/src/Pages/Signup.js
 import React, { useState, useEffect, useRef } from 'react';
-import { Redirect } from 'react-router';
+import { Redirect } from 'react-router-dom';
 import Nav1 from '../Components/MainNav';
 import Nav2 from '../Components/SubNav';

 function Signup() {

+
    return (
-        <div>
+        <div class="form-container">
            <Nav1 />
            <Nav2 />
+            <form id="form" class="form">
+                <h1>회원가입</h1>
+                <div class="form-control">
+                    <label for="id">아이디</label>
+                    <input type="text" id="id" placeholder="아이디를 입력하세요"></input>
+
+                    <label for="name">본명</label>
+                    <input type="text" id="name" placeholder="본명을 입력하세요"></input>
+
+                    <label for="password">비밀번호</label>
+                    <input type="password" id="password" placeholder="비밀번호를 입력하세요"></input>
+
+                    <label for="password2">비밀번호 확인</label>
+                    <input type="password" id="password2" placeholder="비밀번호를 한번 더 입력하세요"></input>

+                    <label for="tel">휴대폰 번호</label>
+                    <input type="text" id="tel" placeholder="휴대폰 번호를 입력하세요"></input>
+
+                    <label for="add">주소</label>
+                </div>
+            </form>
        </div>
+
    )
 }