Merge pull request #47 from ResilientApp/v2-b-3

V3-2-Build
ResilientApp · Sep 5, 2024 · 0a8ce02 · 0a8ce02
2 parents c97592c + 52f5d7f
commit 0a8ce02
Show file tree

Hide file tree

Showing 14 changed files with 48 additions and 45 deletions.
diff --git a/build/asset-manifest.json b/build/asset-manifest.json
@@ -1,7 +1,7 @@
 {
   "files": {
-    "main.css": "/static/css/main.196de912.css",
-    "main.js": "/static/js/main.01f22427.js",
+    "main.css": "/static/css/main.3699acb5.css",
+    "main.js": "/static/js/main.2d5f2882.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",
@@ -72,8 +72,8 @@
     "static/js/4290.d4ff0c15.chunk.js": "/static/js/4290.d4ff0c15.chunk.js",
     "static/media/defaultProfileImage.png": "/static/media/defaultProfileImage.6c9586e38b84a1d6a118.png",
     "index.html": "/index.html",
-    "main.196de912.css.map": "/static/css/main.196de912.css.map",
-    "main.01f22427.js.map": "/static/js/main.01f22427.js.map",
+    "main.3699acb5.css.map": "/static/css/main.3699acb5.css.map",
+    "main.2d5f2882.js.map": "/static/js/main.2d5f2882.js.map",
     "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",
@@ -144,7 +144,7 @@
     "4290.d4ff0c15.chunk.js.map": "/static/js/4290.d4ff0c15.chunk.js.map"
   },
   "entrypoints": [
-    "static/css/main.196de912.css",
-    "static/js/main.01f22427.js"
+    "static/css/main.3699acb5.css",
+    "static/js/main.2d5f2882.js"
   ]
 }
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.01f22427.js"></script><link href="/static/css/main.196de912.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.2d5f2882.js"></script><link href="/static/css/main.3699acb5.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/static/css/main.196de912.css b/build/static/css/main.196de912.css
diff --git a/build/static/css/main.196de912.css.map b/build/static/css/main.196de912.css.map
diff --git a/build/static/css/main.3699acb5.css b/build/static/css/main.3699acb5.css
diff --git a/build/static/css/main.3699acb5.css.map b/build/static/css/main.3699acb5.css.map
diff --git a/build/static/js/main.01f22427.js.map b/build/static/js/main.01f22427.js.map
diff --git a/build/static/js/main.01f22427.js → build/static/js/main.2d5f2882.js b/build/static/js/main.01f22427.js → build/static/js/main.2d5f2882.js
diff --git a/build/static/js/main.01f22427.js.LICENSE.txt → build/static/js/main.2d5f2882.js.LICENSE.txt b/build/static/js/main.01f22427.js.LICENSE.txt → build/static/js/main.2d5f2882.js.LICENSE.txt
diff --git a/build/static/js/main.2d5f2882.js.map b/build/static/js/main.2d5f2882.js.map
diff --git a/src/App.js b/src/App.js
@@ -3,11 +3,8 @@ import { isMobile } from 'react-device-detect';
 import { Navigate, Route, BrowserRouter as Router, Routes } from "react-router-dom";
 import Home from './Components/Pages/Home';
 import Team from './Components/Pages/Team';
-// TODO: Change the below from index2 to index for Visualizer
 import Visualizer from './Components/Pages/Visualizer';
-import Footer from './Components/Shared/Footer';
 import Loader from './Components/Shared/Loader';
-import Navbar from './Components/Shared/Navbar';
 import NotFound from './Components/Shared/NotFound';
 import OnlyDesktop from './Components/Shared/OnlyDesktop';
 import ParticleWrapper from './Components/Shared/ParticleWrapper';
@@ -41,31 +38,36 @@ const PreSynthApp = () => {
   }
 
   useEffect(() => {
-    setIsLoading(true);
-    initParticlesEngine(async (engine) => {
-      await loadSlim(engine);
-    })
-      .then(() => {
+    const initEngine = async () => {
+      try {
+        setIsLoading(true);
+        await initParticlesEngine(async (engine) => {
+          await loadSlim(engine);
+        });
         setInit(true);
-      })
-      .catch((error) => {
+      } catch (error) {
         console.error("Initialization failed:", error);
-      })
-      .finally(() => {
+      } finally {
         setIsLoading(false);
-      });
+      }
+    };
+    initEngine();
   }, []);
 
+  const particlesLoaded = (container) => {
+    console.log(container);
+  };
+
+
 
   return (
     <>
-      <ParticleWrapper init={init} />
-      {isLoading ? (
-        <Loader />
+      {isMobile ? (
+        <OnlyDesktop />
       ) : (
           <>
-            {isMobile ? (
-              <OnlyDesktop />
+            {false ? (
+              <Loader />
             ) : (
               <Router>
                 <Routes>
@@ -77,6 +79,7 @@ const PreSynthApp = () => {
                 </Routes>
               </Router>
             )}
+            <ParticleWrapper init={init} particlesLoaded={particlesLoaded} />
           </>
       )}
     </>

diff --git a/src/Components/Pages/Visualizer/index.js b/src/Components/Pages/Visualizer/index.js
@@ -61,7 +61,7 @@ const Visualizer = () => {
                 <div className="mt-10 mb-24 px-24 w-full">
                     <HRline />
                 </div>
-                <div className="mb-[-2em]">
+                <div className="mb-4">
                     <Footer />
                 </div>
             </div>

diff --git a/src/Components/Shared/ParticleWrapper.js b/src/Components/Shared/ParticleWrapper.js
@@ -80,7 +80,7 @@ const themeObj = {
     },
 }
 
-const ParticleWrapper = ({ setIsLoading, init }) => {
+const ParticleWrapper = ({ init, particlesLoaded }) => {
     const { theme } = useContext(ThemeContext);
     const options = useMemo(() => {
         const currentThemeObj = theme ? {
@@ -97,7 +97,10 @@ const ParticleWrapper = ({ setIsLoading, init }) => {
                 ...themeObj.particles,
                 color: {
                     value: "#0d98db",
-                }
+                },
+                collisions: {
+                    enable: false,
+                },
             }
         };
         return currentThemeObj;
@@ -107,7 +110,7 @@ const ParticleWrapper = ({ setIsLoading, init }) => {
         return (
             <Particles
                 id="tsparticles"
-                particlesLoaded={() => {}}
+                particlesLoaded={particlesLoaded}
                 options={options}
             />
         );

diff --git a/src/Styles/App.css b/src/Styles/App.css
@@ -623,9 +623,6 @@ video {
 .mb-8 {
   margin-bottom: 2rem;
 }
-.mb-\[-2em\] {
-  margin-bottom: -2em;
-}
 .me-2 {
   margin-inline-end: 0.5rem;
 }