Resolved merge conflicts

oliverharan · Oct 9, 2024 · 11a15e9 · 11a15e9
2 parents b4d02fb + 8bc1738
commit 11a15e9
Show file tree

Hide file tree

Showing 15 changed files with 120 additions and 1 deletion.
diff --git a/asset-manifest.json b/asset-manifest.json
@@ -0,0 +1,15 @@
+{
+  "files": {
+    "main.css": "./static/css/main.9a5c6096.css",
+    "main.js": "./static/js/main.440ca02f.js",
+    "static/js/453.3409cc7b.chunk.js": "./static/js/453.3409cc7b.chunk.js",
+    "index.html": "./index.html",
+    "main.9a5c6096.css.map": "./static/css/main.9a5c6096.css.map",
+    "main.440ca02f.js.map": "./static/js/main.440ca02f.js.map",
+    "453.3409cc7b.chunk.js.map": "./static/js/453.3409cc7b.chunk.js.map"
+  },
+  "entrypoints": [
+    "static/css/main.9a5c6096.css",
+    "static/js/main.440ca02f.js"
+  ]
+}
diff --git a/favicon.ico b/favicon.ico
diff --git a/index.html b/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="Web site created using create-react-app"/><link rel="apple-touch-icon" href="./logo192.png"/><link rel="manifest" href="./manifest.json"/><title>React App</title><script defer="defer" src="./static/js/main.440ca02f.js"></script><link href="./static/css/main.9a5c6096.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
diff --git a/logo192.png b/logo192.png
diff --git a/logo512.png b/logo512.png
diff --git a/manifest.json b/manifest.json
@@ -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"
+}
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "axios": "^1.7.7",
     "bootstrap": "^5.3.3",
     "react": "^18.3.1",
-    "react-dom": "^18.3.1",
+    "reat-dom": "^18.3.1",
     "react-router-dom": "^6.26.2",
     "react-scripts": "5.0.1",
     "web-vitals": "^2.1.4"

diff --git a/robots.txt b/robots.txt
@@ -0,0 +1,3 @@
+# https://www.robotstxt.org/robotstxt.html
+User-agent: *
+Disallow:
diff --git a/static/css/main.9a5c6096.css b/static/css/main.9a5c6096.css
diff --git a/static/css/main.9a5c6096.css.map b/static/css/main.9a5c6096.css.map
diff --git a/static/js/453.3409cc7b.chunk.js b/static/js/453.3409cc7b.chunk.js
diff --git a/static/js/453.3409cc7b.chunk.js.map b/static/js/453.3409cc7b.chunk.js.map
diff --git a/static/js/main.440ca02f.js b/static/js/main.440ca02f.js
diff --git a/static/js/main.440ca02f.js.LICENSE.txt b/static/js/main.440ca02f.js.LICENSE.txt
@@ -0,0 +1,61 @@
+/**
+ * @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.
+ */
+
+/**
+ * @remix-run/router v1.19.2
+ *
+ * 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.26.2
+ *
+ * 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
+ */
diff --git a/static/js/main.440ca02f.js.map b/static/js/main.440ca02f.js.map
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="Web site created using create-react-app"/><link rel="apple-touch-icon" href="./logo192.png"/><link rel="manifest" href="./manifest.json"/><title>React App</title><script defer="defer" src="./static/js/main.440ca02f.js"></script><link href="./static/css/main.9a5c6096.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>