Merge branch 'main' into envFix

ResilientApp · May 29, 2024 · f22a912 · f22a912
2 parents 6c0fd1e + b2a8536
commit f22a912
Show file tree

Hide file tree

Showing 24 changed files with 17 additions and 45 deletions.
diff --git a/build/android-chrome-192x192.png b/build/android-chrome-192x192.png
diff --git a/build/android-chrome-512x512.png b/build/android-chrome-512x512.png
diff --git a/build/apple-touch-icon.png b/build/apple-touch-icon.png
diff --git a/build/asset-manifest.json b/build/asset-manifest.json
@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "/static/css/main.a663b81a.css",
-    "main.js": "/static/js/main.2bb9b2d3.js",
+    "main.js": "/static/js/main.2b87a889.js",
     "static/js/1927.8bd9ca2b.chunk.js": "/static/js/1927.8bd9ca2b.chunk.js",
     "static/js/7590.4eeecba0.chunk.js": "/static/js/7590.4eeecba0.chunk.js",
     "static/js/6725.7c418f57.chunk.js": "/static/js/6725.7c418f57.chunk.js",
@@ -73,7 +73,11 @@
     "static/media/defaultProfileImage.png": "/static/media/defaultProfileImage.6c9586e38b84a1d6a118.png",
     "index.html": "/index.html",
     "main.a663b81a.css.map": "/static/css/main.a663b81a.css.map",
+<<<<<<< HEAD
     "main.2bb9b2d3.js.map": "/static/js/main.2bb9b2d3.js.map",
+=======
+    "main.2b87a889.js.map": "/static/js/main.2b87a889.js.map",
+>>>>>>> main
     "1927.8bd9ca2b.chunk.js.map": "/static/js/1927.8bd9ca2b.chunk.js.map",
     "7590.4eeecba0.chunk.js.map": "/static/js/7590.4eeecba0.chunk.js.map",
     "6725.7c418f57.chunk.js.map": "/static/js/6725.7c418f57.chunk.js.map",
@@ -145,6 +149,10 @@
   },
   "entrypoints": [
     "static/css/main.a663b81a.css",
+<<<<<<< HEAD
     "static/js/main.2bb9b2d3.js"
+=======
+    "static/js/main.2b87a889.js"
+>>>>>>> main
   ]
 }
diff --git a/build/favicon-16x16.png b/build/favicon-16x16.png
diff --git a/build/favicon-32x32.png b/build/favicon-32x32.png
diff --git a/build/favicon.ico b/build/favicon.ico
diff --git a/build/index.html b/build/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png"><link rel="manifest" href="/site.webmanifest"><meta name="msapplication-TileColor" content="#da532c"><meta name="theme-color" content="#ffffff"><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="A visualizer for ResilientDb for DDS 265 Distributed Data Systems"/><meta name="author" description="aunshx"/><link rel="stylesheet" href="https://unpkg.com/aos@next/dist/aos.css"/><title>ResView</title><script defer="defer" src="/static/js/main.2bb9b2d3.js"></script><link href="/static/css/main.a663b81a.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script src="https://unpkg.com/aos@next/dist/aos.js"></script><script>AOS.init({delay:0,duration:600,offset:10})</script></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png"><link rel="manifest" href="/site.webmanifest"><meta name="msapplication-TileColor" content="#da532c"><meta name="theme-color" content="#ffffff"><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="A visualizer for ResilientDb for DDS 265 Distributed Data Systems"/><meta name="author" description="aunshx"/><link rel="stylesheet" href="https://unpkg.com/aos@next/dist/aos.css"/><title>ResView</title><script defer="defer" src="/static/js/main.a716f215.js"></script><link href="/static/css/main.a663b81a.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script src="https://unpkg.com/aos@next/dist/aos.js"></script><script>AOS.init({delay:0,duration:600,offset:10})</script></body></html>
diff --git a/build/logo192.png b/build/logo192.png
diff --git a/build/logo512.png b/build/logo512.png
diff --git a/build/site.webmanifest b/build/site.webmanifest
@@ -1,19 +1 @@
-{
-    "name": "",
-    "short_name": "",
-    "icons": [
-        {
-            "src": "/android-chrome-192x192.png",
-            "sizes": "192x192",
-            "type": "image/png"
-        },
-        {
-            "src": "/android-chrome-384x384.png",
-            "sizes": "384x384",
-            "type": "image/png"
-        }
-    ],
-    "theme_color": "#ffffff",
-    "background_color": "#ffffff",
-    "display": "standalone"
-}
+{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}
diff --git a/build/static/js/main.2bb9b2d3.js → build/static/js/main.a716f215.js b/build/static/js/main.2bb9b2d3.js → build/static/js/main.a716f215.js
diff --git a/build/static/js/main.2bb9b2d3.js.LICENSE.txt → build/static/js/main.a716f215.js.LICENSE.txt b/build/static/js/main.2bb9b2d3.js.LICENSE.txt → build/static/js/main.a716f215.js.LICENSE.txt
diff --git a/build/static/js/main.2bb9b2d3.js.map → build/static/js/main.a716f215.js.map b/build/static/js/main.2bb9b2d3.js.map → build/static/js/main.a716f215.js.map
diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png
diff --git a/public/android-chrome-512x512.png b/public/android-chrome-512x512.png
diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
diff --git a/public/favicon-16x16.png b/public/favicon-16x16.png
diff --git a/public/favicon-32x32.png b/public/favicon-32x32.png
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/logo192.png b/public/logo192.png
diff --git a/public/logo512.png b/public/logo512.png
diff --git a/public/site.webmanifest b/public/site.webmanifest
@@ -1,19 +1 @@
-{
-    "name": "",
-    "short_name": "",
-    "icons": [
-        {
-            "src": "/android-chrome-192x192.png",
-            "sizes": "192x192",
-            "type": "image/png"
-        },
-        {
-            "src": "/android-chrome-384x384.png",
-            "sizes": "384x384",
-            "type": "image/png"
-        }
-    ],
-    "theme_color": "#ffffff",
-    "background_color": "#ffffff",
-    "display": "standalone"
-}
+{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}
diff --git a/src/Components/Shared/Footer.js b/src/Components/Shared/Footer.js
@@ -27,7 +27,7 @@ const Footer = () => {
           </span>
         </div>
         <div className='text-12p text-gray-100 bold'>
-        v2.0.1 &middot; &copy; 2023-2024 &middot; All rights reserved
+        v2.1.0 &middot; &copy; 2023-2024 &middot; All rights reserved
         </div>
     </div>
     </div>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png"><link rel="manifest" href="/site.webmanifest"><meta name="msapplication-TileColor" content="#da532c"><meta name="theme-color" content="#ffffff"><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="A visualizer for ResilientDb for DDS 265 Distributed Data Systems"/><meta name="author" description="aunshx"/><link rel="stylesheet" href="https://unpkg.com/aos@next/dist/aos.css"/><title>ResView</title><script defer="defer" src="/static/js/main.2bb9b2d3.js"></script><link href="/static/css/main.a663b81a.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script src="https://unpkg.com/aos@next/dist/aos.js"></script><script>AOS.init({delay:0,duration:600,offset:10})</script></body></html>
		<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png"><link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png"><link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png"><link rel="manifest" href="/site.webmanifest"><meta name="msapplication-TileColor" content="#da532c"><meta name="theme-color" content="#ffffff"><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="A visualizer for ResilientDb for DDS 265 Distributed Data Systems"/><meta name="author" description="aunshx"/><link rel="stylesheet" href="https://unpkg.com/aos@next/dist/aos.css"/><title>ResView</title><script defer="defer" src="/static/js/main.a716f215.js"></script><link href="/static/css/main.a663b81a.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script src="https://unpkg.com/aos@next/dist/aos.js"></script><script>AOS.init({delay:0,duration:600,offset:10})</script></body></html>
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,7 @@ const Footer = () => { @@
               </span>
             </div>
             <div className='text-12p text-gray-100 bold'>
-            v2.0.1 &middot; &copy; 2023-2024 &middot; All rights reserved
+            v2.1.0 &middot; &copy; 2023-2024 &middot; All rights reserved
             </div>
         </div>
         </div>
@@ Expand Down @@