commit

nuyh99 · Apr 25, 2022 · c47e5b9 · c47e5b9
2 parents baa22e1 + 87ffd22
commit c47e5b9
Show file tree

Hide file tree

Showing 19 changed files with 160 additions and 9 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/frontend/.DS_Store b/frontend/.DS_Store
diff --git a/frontend/project/build/asset-manifest.json b/frontend/project/build/asset-manifest.json
@@ -1,17 +1,29 @@
 {
  "files": {
  "main.css": "/static/css/main.a72b72c5.css",
+<<<<<<< HEAD
  "main.js": "/static/js/main.b481ed67.js",
+=======
+ "main.js": "/static/js/main.ffb01f39.js",
+>>>>>>> 87ffd228019af42a966cf2f4368ce594dc2916fa
  "static/js/787.ec704a7a.chunk.js": "/static/js/787.ec704a7a.chunk.js",
  "static/media/author.png": "/static/media/author.8e5f8a624afd65055842.png",
  "static/media/lion.png": "/static/media/lion.98ec9e35a835021d2037.png",
  "index.html": "/index.html",
  "main.a72b72c5.css.map": "/static/css/main.a72b72c5.css.map",
+<<<<<<< HEAD
  "main.b481ed67.js.map": "/static/js/main.b481ed67.js.map",
+=======
+ "main.ffb01f39.js.map": "/static/js/main.ffb01f39.js.map",
+>>>>>>> 87ffd228019af42a966cf2f4368ce594dc2916fa
  "787.ec704a7a.chunk.js.map": "/static/js/787.ec704a7a.chunk.js.map"
  },
  "entrypoints": [
  "static/css/main.a72b72c5.css",
+<<<<<<< HEAD
  "static/js/main.b481ed67.js"
+=======
+ "static/js/main.ffb01f39.js"
+>>>>>>> 87ffd228019af42a966cf2f4368ce594dc2916fa
  ]
 }
diff --git a/frontend/project/build/index.html b/frontend/project/build/index.html
@@ -1 +1,5 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/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="/logo192.png"/><link rel="manifest" href="/manifest.json"/><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous"/><title>대리점 휴대폰 번호 조회</title><script defer="defer" src="/static/js/main.b481ed67.js"></script><link href="/static/css/main.a72b72c5.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<<<<<<< HEAD
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/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="/logo192.png"/><link rel="manifest" href="/manifest.json"/><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous"/><title>대리점 휴대폰 번호 조회</title><script defer="defer" src="/static/js/main.b481ed67.js"></script><link href="/static/css/main.a72b72c5.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+=======
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/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="/logo192.png"/><link rel="manifest" href="/manifest.json"/><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous"/><title>대리점 휴대폰 번호 조회</title><script defer="defer" src="/static/js/main.ffb01f39.js"></script><link href="/static/css/main.a72b72c5.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+>>>>>>> 87ffd228019af42a966cf2f4368ce594dc2916fa
diff --git a/frontend/project/build/static/js/main.ffb01f39.js b/frontend/project/build/static/js/main.ffb01f39.js
diff --git a/frontend/project/build/static/js/main.ffb01f39.js.LICENSE.txt b/frontend/project/build/static/js/main.ffb01f39.js.LICENSE.txt
@@ -0,0 +1,54 @@
+/*!
+ Copyright (c) 2018 Jed Watson.
+ Licensed under the MIT License (MIT), see
+ http:https://jedwatson.github.io/classnames
+*/
+
+/**
+ * @license React
+ * react-dom.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * @license React
+ * react-jsx-runtime.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * @license React
+ * react.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * @license React
+ * scheduler.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/** @license React v16.13.1
+ * react-is.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
diff --git a/frontend/project/build/static/js/main.ffb01f39.js.map b/frontend/project/build/static/js/main.ffb01f39.js.map
diff --git a/frontend/project/package-lock.json b/frontend/project/package-lock.json
diff --git a/frontend/project/package.json b/frontend/project/package.json
@@ -16,7 +16,8 @@
  "react-router-dom": "^5.2.0",
  "react-scripts": "5.0.1",
  "universal-cookie": "^4.0.4",
- "web-vitals": "^2.1.4"
+ "web-vitals": "^2.1.4",
+ "webpack": "^5.72.0"
  },
  "scripts": {
  "start": "react-scripts start",
@@ -46,5 +47,6 @@
  "devDependencies": {
  "webpack-cli": "^4.9.2",
  "webpack-dev-server": "^4.8.1"
- }
+ },
+ "start": "webpack-dev-server --inline --content-base . --history-api-fallback"
 }
diff --git a/frontend/project/src/routers/PermissionPage.js b/frontend/project/src/routers/PermissionPage.js
@@ -152,10 +152,6 @@ function PermissionPage(props) {
 }
 
 function WorkerState(props) {
- const [name, setName] = useState('');
- const [email, setEmail] = useState('');
- const [permission, setPermission] = useState('');
-
  return (
  <div className="subcontent">
  <div className="container white-box add">

diff --git a/frontend/project/src/routers/SearchPage.js b/frontend/project/src/routers/SearchPage.js
@@ -55,7 +55,11 @@ function SearchPage(props) {
 
  const onPermissionHandler = (event) => {
  event.preventDefault();
+<<<<<<< HEAD
  axios.get('/api/workers').then((res) => {
+=======
+ axios.get('/api/permission').then((res) => {
+>>>>>>> 87ffd228019af42a966cf2f4368ce594dc2916fa
  if (res.data === '') {
  alert('접근할 수 없습니다. 관리자가 아닙니다.');
  } else {

diff --git a/src/.DS_Store b/src/.DS_Store
diff --git a/src/main/.DS_Store b/src/main/.DS_Store
diff --git a/src/main/resources/.DS_Store b/src/main/resources/.DS_Store
diff --git a/src/main/resources/static/asset-manifest.json b/src/main/resources/static/asset-manifest.json
@@ -1,17 +1,29 @@
 {
  "files": {
  "main.css": "/static/css/main.a72b72c5.css",
+<<<<<<< HEAD
  "main.js": "/static/js/main.b481ed67.js",
+=======
+ "main.js": "/static/js/main.ffb01f39.js",
+>>>>>>> 87ffd228019af42a966cf2f4368ce594dc2916fa
  "static/js/787.ec704a7a.chunk.js": "/static/js/787.ec704a7a.chunk.js",
  "static/media/author.png": "/static/media/author.8e5f8a624afd65055842.png",
  "static/media/lion.png": "/static/media/lion.98ec9e35a835021d2037.png",
  "index.html": "/index.html",
  "main.a72b72c5.css.map": "/static/css/main.a72b72c5.css.map",
+<<<<<<< HEAD
  "main.b481ed67.js.map": "/static/js/main.b481ed67.js.map",
+=======
+ "main.ffb01f39.js.map": "/static/js/main.ffb01f39.js.map",
+>>>>>>> 87ffd228019af42a966cf2f4368ce594dc2916fa
  "787.ec704a7a.chunk.js.map": "/static/js/787.ec704a7a.chunk.js.map"
  },
  "entrypoints": [
  "static/css/main.a72b72c5.css",
+<<<<<<< HEAD
  "static/js/main.b481ed67.js"
+=======
+ "static/js/main.ffb01f39.js"
+>>>>>>> 87ffd228019af42a966cf2f4368ce594dc2916fa
  ]
 }
diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html
@@ -1 +1,5 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/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="/logo192.png"/><link rel="manifest" href="/manifest.json"/><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous"/><title>대리점 휴대폰 번호 조회</title><script defer="defer" src="/static/js/main.b481ed67.js"></script><link href="/static/css/main.a72b72c5.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<<<<<<< HEAD
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/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="/logo192.png"/><link rel="manifest" href="/manifest.json"/><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous"/><title>대리점 휴대폰 번호 조회</title><script defer="defer" src="/static/js/main.b481ed67.js"></script><link href="/static/css/main.a72b72c5.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+=======
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/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="/logo192.png"/><link rel="manifest" href="/manifest.json"/><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous"/><title>대리점 휴대폰 번호 조회</title><script defer="defer" src="/static/js/main.ffb01f39.js"></script><link href="/static/css/main.a72b72c5.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+>>>>>>> 87ffd228019af42a966cf2f4368ce594dc2916fa
diff --git a/src/main/resources/static/static/js/main.ffb01f39.js b/src/main/resources/static/static/js/main.ffb01f39.js
diff --git a/src/main/resources/static/static/js/main.ffb01f39.js.LICENSE.txt b/src/main/resources/static/static/js/main.ffb01f39.js.LICENSE.txt
@@ -0,0 +1,54 @@
+/*!
+ Copyright (c) 2018 Jed Watson.
+ Licensed under the MIT License (MIT), see
+ http:https://jedwatson.github.io/classnames
+*/
+
+/**
+ * @license React
+ * react-dom.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * @license React
+ * react-jsx-runtime.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * @license React
+ * react.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/**
+ * @license React
+ * scheduler.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+/** @license React v16.13.1
+ * react-is.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
diff --git a/src/main/resources/static/static/js/main.ffb01f39.js.map b/src/main/resources/static/static/js/main.ffb01f39.js.map