[#106] fix: fix merge conflict

2022-2-Graduation-Project · Mar 19, 2023 · 80bd7c1 · 80bd7c1
2 parents e1953a0 + 84b0c23
commit 80bd7c1
Show file tree

Hide file tree

Showing 24 changed files with 200 additions and 4 deletions.
diff --git a/bowwowcare/.gitignore b/bowwowcare/.gitignore
@@ -9,7 +9,7 @@
 /coverage
 
 # production
-/build
+# /build
 
 # misc
 .DS_Store

diff --git a/bowwowcare/app.json b/bowwowcare/app.json
@@ -0,0 +1,8 @@
+{
+    "buildpacks": [
+      {
+        "url": "mars/create-react-app"
+      }
+    ]
+}
+
diff --git a/bowwowcare/build/asset-manifest.json b/bowwowcare/build/asset-manifest.json
@@ -0,0 +1,22 @@
+{
+  "files": {
+    "main.css": "/static/css/main.6a5ed664.css",
+    "main.js": "/static/js/main.d9041fdb.js",
+    "static/media/Tenada.ttf": "/static/media/Tenada.0cfe8963fde304575974.ttf",
+    "static/media/aggression.png": "/static/media/aggression.67a930471b4b7a38c1d3.png",
+    "static/media/angry.png": "/static/media/angry.67a930471b4b7a38c1d3.png",
+    "static/media/happy.png": "/static/media/happy.860bb53b6aa3a7ba5376.png",
+    "static/media/lens.png": "/static/media/lens.ded00a765681393f4e87.png",
+    "static/media/sad.png": "/static/media/sad.33b8ff6df2026e6377f3.png",
+    "static/media/anxiety.png": "/static/media/anxiety.c6977684fadc7ca5692f.png",
+    "service-worker.js": "/service-worker.js",
+    "static/media/kakaotalk.png": "/static/media/kakaotalk.ec339df712f88bd4ba51.png",
+    "index.html": "/index.html",
+    "main.6a5ed664.css.map": "/static/css/main.6a5ed664.css.map",
+    "main.d9041fdb.js.map": "/static/js/main.d9041fdb.js.map"
+  },
+  "entrypoints": [
+    "static/css/main.6a5ed664.css",
+    "static/js/main.d9041fdb.js"
+  ]
+}
diff --git a/bowwowcare/build/favicon.ico b/bowwowcare/build/favicon.ico
diff --git a/bowwowcare/build/index.html b/bowwowcare/build/index.html
@@ -0,0 +1 @@
+<!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="멍멍케어 - 반려견 감정분석 서비스"/><link rel="manifest" href="/manifest.json"/><title>멍멍케어</title><script defer="defer" src="/static/js/main.d9041fdb.js"></script><link href="/static/css/main.6a5ed664.css" rel="stylesheet"></head><body><div id="root"></div></body></html>
diff --git a/bowwowcare/build/manifest.json b/bowwowcare/build/manifest.json
@@ -0,0 +1,15 @@
+{
+  "short_name": "멍멍케어",
+  "name": "멍멍케어",
+  "icons": [
+    {
+      "src": "favicon.ico",
+      "sizes": "64x64 32x32 24x24 16x16",
+      "type": "image/x-icon"
+    }
+  ],
+  "start_url": ".",
+  "display": "standalone",
+  "theme_color": "#000000",
+  "background_color": "#ffffff"
+}
diff --git a/bowwowcare/build/service-worker.js b/bowwowcare/build/service-worker.js
diff --git a/bowwowcare/build/service-worker.js.LICENSE.txt b/bowwowcare/build/service-worker.js.LICENSE.txt
@@ -0,0 +1 @@
+/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
diff --git a/bowwowcare/build/service-worker.js.map b/bowwowcare/build/service-worker.js.map
diff --git a/bowwowcare/build/static/css/main.6a5ed664.css b/bowwowcare/build/static/css/main.6a5ed664.css
diff --git a/bowwowcare/build/static/css/main.6a5ed664.css.map b/bowwowcare/build/static/css/main.6a5ed664.css.map
diff --git a/bowwowcare/build/static/js/main.d9041fdb.js b/bowwowcare/build/static/js/main.d9041fdb.js
diff --git a/bowwowcare/build/static/js/main.d9041fdb.js.LICENSE.txt b/bowwowcare/build/static/js/main.d9041fdb.js.LICENSE.txt
@@ -0,0 +1,136 @@
+/*! exports provided: default */
+
+/*! no static exports found */
+
+/*! react */
+
+/*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
+
+/*!******************************!*\
+        !*** ./src/react-webcam.tsx ***!
+        \******************************/
+
+/*!**************************************************************************************!*\
+        !*** external {"root":"React","commonjs2":"react","commonjs":"react","amd":"react"} ***!
+        \**************************************************************************************/
+
+/**
+ * @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-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.
+ */
+
+/**
+ * @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
+ * use-sync-external-store-shim.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
+ * use-sync-external-store-shim/with-selector.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.
+ */
+
+/**
+ * @remix-run/router v1.0.3
+ *
+ * Copyright (c) Remix Software Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE.md file in the root directory of this source tree.
+ *
+ * @license MIT
+ */
+
+/**
+ * React Router DOM v6.4.3
+ *
+ * Copyright (c) Remix Software Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE.md file in the root directory of this source tree.
+ *
+ * @license MIT
+ */
+
+/**
+ * React Router v6.4.3
+ *
+ * Copyright (c) Remix Software Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE.md file in the root directory of this source tree.
+ *
+ * @license MIT
+ */
+
+/** @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.
+ */
+
+/** @license React v17.0.2
+ * 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/bowwowcare/build/static/js/main.d9041fdb.js.map b/bowwowcare/build/static/js/main.d9041fdb.js.map
diff --git a/bowwowcare/build/static/media/Tenada.0cfe8963fde304575974.ttf b/bowwowcare/build/static/media/Tenada.0cfe8963fde304575974.ttf
diff --git a/bowwowcare/build/static/media/aggression.67a930471b4b7a38c1d3.png b/bowwowcare/build/static/media/aggression.67a930471b4b7a38c1d3.png
diff --git a/bowwowcare/build/static/media/angry.67a930471b4b7a38c1d3.png b/bowwowcare/build/static/media/angry.67a930471b4b7a38c1d3.png
diff --git a/bowwowcare/build/static/media/anxiety.c6977684fadc7ca5692f.png b/bowwowcare/build/static/media/anxiety.c6977684fadc7ca5692f.png
diff --git a/bowwowcare/build/static/media/happy.860bb53b6aa3a7ba5376.png b/bowwowcare/build/static/media/happy.860bb53b6aa3a7ba5376.png
diff --git a/bowwowcare/build/static/media/kakaotalk.ec339df712f88bd4ba51.png b/bowwowcare/build/static/media/kakaotalk.ec339df712f88bd4ba51.png
diff --git a/bowwowcare/build/static/media/lens.ded00a765681393f4e87.png b/bowwowcare/build/static/media/lens.ded00a765681393f4e87.png
diff --git a/bowwowcare/build/static/media/sad.33b8ff6df2026e6377f3.png b/bowwowcare/build/static/media/sad.33b8ff6df2026e6377f3.png
diff --git a/bowwowcare/public/manifest.json b/bowwowcare/public/manifest.json
@@ -1,6 +1,6 @@
 {
-  "short_name": "React App",
-  "name": "Create React App Sample",
+  "short_name": "멍멍케어",
+  "name": "멍멍케어",
   "icons": [
     {
       "src": "favicon.ico",

diff --git a/bowwowcare/src/Config.js b/bowwowcare/src/Config.js
@@ -1,2 +1,2 @@
-export const API_URL = "http://localhost:8080/api/v1";
+export const API_URL = "http://3.36.231.126/api/v1";
 export const FAST_API_URL = "http://3.34.143.127/api/v1";
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<!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="멍멍케어 - 반려견 감정분석 서비스"/><link rel="manifest" href="/manifest.json"/><title>멍멍케어</title><script defer="defer" src="/static/js/main.d9041fdb.js"></script><link href="/static/css/main.6a5ed664.css" rel="stylesheet"></head><body><div id="root"></div></body></html>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		/! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE /