Merge pull request #67 from ResilientApp/SCM-31

Updated Build and fixes
ResilientApp · Oct 5, 2024 · 975aa4d · 975aa4d
2 parents 1b012c2 + 2e0a706
commit 975aa4d
Show file tree

Hide file tree

Showing 39 changed files with 208 additions and 36 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# ResView - (ResilientDB Visualizer)
+# ResView - ResilientDB Visualizer
 
 ![Logo](https://i.postimg.cc/jd6PkhDs/Res-View-Logo-Dark.png)
 
@@ -65,7 +65,7 @@ REACT_APP_REPLICA_STATUS_EP = "/get_status"
 Run the below command to install all required packages
 
 ```bash
-npm install
+npm install --force
 ```
 
 Run the below code to start the app and load the script.

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,8 +1,8 @@
 {
   "files": {
-    "main.css": "/static/css/main.0a585a7c.css",
-    "main.js": "/static/js/main.39cee612.js",
-    "static/js/1927.8bd9ca2b.chunk.js": "/static/js/1927.8bd9ca2b.chunk.js",
+    "main.css": "/static/css/main.acba6246.css",
+    "main.js": "/static/js/main.e5f07c10.js",
+    "static/js/1927.57dababa.chunk.js": "/static/js/1927.57dababa.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",
     "static/js/8122.6983dde7.chunk.js": "/static/js/8122.6983dde7.chunk.js",
@@ -70,11 +70,15 @@
     "static/js/4265.1a87f8a3.chunk.js": "/static/js/4265.1a87f8a3.chunk.js",
     "static/js/4494.3fc0f687.chunk.js": "/static/js/4494.3fc0f687.chunk.js",
     "static/js/4290.d4ff0c15.chunk.js": "/static/js/4290.d4ff0c15.chunk.js",
+    "static/media/expolabIcon.png": "/static/media/expolabIcon.1ca107a69f25b661fb40.png",
     "static/media/defaultProfileImage.png": "/static/media/defaultProfileImage.6c9586e38b84a1d6a118.png",
+    "static/media/apacheIncubatorLogo.png": "/static/media/apacheIncubatorLogo.8b9b2c54534acf0eb5aa.png",
+    "static/media/resdbLogo.svg": "/static/media/resdbLogo.50ebfb5b04ca9818a311c1533a1d118f.svg",
+    "static/media/ucDavisLogo.svg": "/static/media/ucDavisLogo.34e8c7184485a6b9cad554d942740e79.svg",
     "index.html": "/index.html",
-    "main.0a585a7c.css.map": "/static/css/main.0a585a7c.css.map",
-    "main.39cee612.js.map": "/static/js/main.39cee612.js.map",
-    "1927.8bd9ca2b.chunk.js.map": "/static/js/1927.8bd9ca2b.chunk.js.map",
+    "main.acba6246.css.map": "/static/css/main.acba6246.css.map",
+    "main.e5f07c10.js.map": "/static/js/main.e5f07c10.js.map",
+    "1927.57dababa.chunk.js.map": "/static/js/1927.57dababa.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",
     "8122.6983dde7.chunk.js.map": "/static/js/8122.6983dde7.chunk.js.map",
@@ -144,7 +148,7 @@
     "4290.d4ff0c15.chunk.js.map": "/static/js/4290.d4ff0c15.chunk.js.map"
   },
   "entrypoints": [
-    "static/css/main.0a585a7c.css",
-    "static/js/main.39cee612.js"
+    "static/css/main.acba6246.css",
+    "static/js/main.e5f07c10.js"
   ]
 }
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="Visualizer for the ResilientDB Blockchain fabric"/><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.39cee612.js"></script><link href="/static/css/main.0a585a7c.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="Visualizer for the ResilientDB Blockchain fabric"/><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.e5f07c10.js"></script><link href="/static/css/main.acba6246.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.0a585a7c.css b/build/static/css/main.0a585a7c.css
diff --git a/build/static/css/main.0a585a7c.css.map b/build/static/css/main.0a585a7c.css.map
diff --git a/build/static/css/main.acba6246.css b/build/static/css/main.acba6246.css
diff --git a/build/static/css/main.acba6246.css.map b/build/static/css/main.acba6246.css.map
diff --git a/build/static/js/1927.8bd9ca2b.chunk.js → build/static/js/1927.57dababa.chunk.js b/build/static/js/1927.8bd9ca2b.chunk.js → build/static/js/1927.57dababa.chunk.js
diff --git a/build/static/js/1927.8bd9ca2b.chunk.js.map → build/static/js/1927.57dababa.chunk.js.map b/build/static/js/1927.8bd9ca2b.chunk.js.map → build/static/js/1927.57dababa.chunk.js.map
diff --git a/build/static/js/main.39cee612.js b/build/static/js/main.39cee612.js
diff --git a/build/static/js/main.39cee612.js.map b/build/static/js/main.39cee612.js.map
diff --git a/build/static/js/main.e5f07c10.js b/build/static/js/main.e5f07c10.js
diff --git a/build/static/js/main.39cee612.js.LICENSE.txt → build/static/js/main.e5f07c10.js.LICENSE.txt b/build/static/js/main.39cee612.js.LICENSE.txt → build/static/js/main.e5f07c10.js.LICENSE.txt
diff --git a/build/static/js/main.e5f07c10.js.map b/build/static/js/main.e5f07c10.js.map
diff --git a/build/static/media/apacheIncubatorLogo.8b9b2c54534acf0eb5aa.png b/build/static/media/apacheIncubatorLogo.8b9b2c54534acf0eb5aa.png
diff --git a/build/static/media/expolabIcon.1ca107a69f25b661fb40.png b/build/static/media/expolabIcon.1ca107a69f25b661fb40.png
diff --git a/build/static/media/resdbLogo.50ebfb5b04ca9818a311c1533a1d118f.svg b/build/static/media/resdbLogo.50ebfb5b04ca9818a311c1533a1d118f.svg
diff --git a/build/static/media/ucDavisLogo.34e8c7184485a6b9cad554d942740e79.svg b/build/static/media/ucDavisLogo.34e8c7184485a6b9cad554d942740e79.svg
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/src/Components/Pages/Home/index.js b/src/Components/Pages/Home/index.js
@@ -3,7 +3,7 @@ import { BorderToggleRef } from '../../../App';
 import { BLOG_LINK, URL_VISUALIZER_PAGE } from '../../../Constants';
 import { NavbarToggleContext } from '../../../Context/navbarToggle';
 import { LinkButton } from '../../Shared/Buttons';
-import Footer from '../../Shared/Footer';
+import Footer, { DetailedFooter } from '../../Shared/Footer';
 import Navbar from '../../Shared/Navbar';
 import Wrapper from '../../Shared/Wrapper';
 import Graphs from './Sections/Graphs';
@@ -69,7 +69,7 @@ const Index = () => {
       <div className="flex items-center justify-center w-full">
         <Home />
       </div>
-      <Footer />
+      <DetailedFooter />
     </>
   );
 }

diff --git a/src/Components/Pages/Team/index.js b/src/Components/Pages/Team/index.js
@@ -50,11 +50,7 @@ const Index = ({ loading }) => {
     <>
       <Navbar borderToggle = { borderToggle } />
       <BorderToggleRef />
-      {loading ? (
-          <Loader />
-      ) : (
-        <Team />
-      )}
+      <Team />
       <Footer />
     </>
   );

diff --git a/src/Components/Shared/Footer.js b/src/Components/Shared/Footer.js
@@ -1,5 +1,70 @@
 import React from 'react';
 
+import ucDavisLogo from '../../Resources/Images/ucDavisLogo.svg'
+import expolabLogo from '../../Resources/Images/expolabIcon.png'
+import apacheIncubatorLogo from '../../Resources/Images/apacheIncubatorLogo.png'
+import resdbLogo from '../../Resources/Images/resdbLogo.svg'
+import { APACHE_LINK, AUNSH_PORTFOLIO_LINK, EXPOLAB_LINK, RELEASE_NOTES_LINK, REPO_LINK, RESDB_LINK, SP_PORTFOLIO_LINK, UCDAVS_LINK, URL_HOME_PAGE, URL_TEAM_PAGE, URL_VISUALIZER_PAGE } from '../../Constants';
+
+export const DetailedFooter = () => {
+  return (
+    <div className="w-full h-auto pt-8 pb-2 px-8 mt-28 border-t-2 border-gray-900 dark:border-white transition">
+      <div className="flex items-start md:flex-row justify-between">
+        <div className="grid grid-cols-2 gap-16">
+		  <a href={RESDB_LINK} rel='noreferrer nofollow' target='_blank'>
+			<img src={resdbLogo} alt="UC Davis Logo" className="w-120p" />
+		  </a>
+			<a href={EXPOLAB_LINK} rel='noreferrer nofollow' target='_blank'>
+				<img src={expolabLogo} alt="UC Davis Logo" className="w-120p" />
+			</a>
+			<a href={APACHE_LINK} rel='noreferrer nofollow' target='_blank'>
+				<img src={apacheIncubatorLogo} alt="UC Davis Logo" className="w-120p bg-white px-2 py-1 rounded-md" />
+			</a>
+			<a href={UCDAVS_LINK} rel='noreferrer nofollow' target='_blank'>
+				<img src={ucDavisLogo} alt="UC Davis Logo" className="w-120p" />
+			</a>
+        </div>
+        <div className="grid grid-cols-3 gap-12">
+          <div>
+            <div className="text-16p font-bold mb-4 text-white">Site Links</div>
+            <ul className="space-y-5">
+              <li><a href={URL_HOME_PAGE} className="text-white hover:text-gray-300 transition duration-200">Home</a></li>
+              <li><a href={URL_TEAM_PAGE} className="text-white hover:text-gray-300 transition duration-200">Team</a></li>
+              <li><a href={REPO_LINK} className="text-white hover:text-gray-300 transition duration-200">Code</a></li>
+              <li><a href={URL_VISUALIZER_PAGE} className="text-white hover:text-gray-300 transition duration-200">Visualizer</a></li>
+            </ul>
+          </div>
+          <div>
+            <div className="text-16p font-bold mb-6 text-white">Authors</div>
+            <ul className="space-y-5">
+              <li><a href={AUNSH_PORTFOLIO_LINK} className="text-white hover:text-gray-300 transition duration-200">aunshx</a></li>
+              <li><a href={SP_PORTFOLIO_LINK} className="text-white hover:text-gray-300 transition duration-200">saipranav</a></li>
+            </ul>
+            <div className="text-16p font-bold mt-6 mb-2 text-white">Release</div>
+				<a href={RELEASE_NOTES_LINK} className="text-white hover:text-gray-300 transition duration-200">v3.2.5</a>
+          </div>
+          <div>
+            <div className="text-16p font-bold mb-6 text-white">Contact Us</div>
+            <ul className="space-y-5">
+              <li><a href="mailto:[email protected]" className="text-white hover:text-gray-300 transition duration-200">Mail Us</a></li>
+              <li><a href={UCDAVS_LINK} className="text-white hover:text-gray-300 transition duration-200">UC Davis Site</a></li>
+            </ul>
+          </div>
+        </div>
+      </div>
+      <div className="w-full my-2 flex flex-col gap-1 text-12p">
+        <div className="text-gray-100 text-center">
+          Handcrafted with &#10084; in Davis, CA
+        </div>
+        <div className="text-gray-100 text-center">
+          v3.2.5 &middot; &copy; 2023-2024 &middot; All rights reserved
+        </div>
+        <div />
+      </div>
+    </div>
+  );
+};
+
 const Footer = () => {
   return (
     <div className='w-full h-full flex justify-center items-center z-10 my-8'>
@@ -13,15 +78,15 @@ const Footer = () => {
         <div className='text-12p text-gray-100 my-1p'>
           by {" "}
           <span className='hover:text-blue-190 mx-1'>
-            <a href='https://deploy-preview-5--helpful-hamster-a151d8.netlify.app/'>
+            <a href={AUNSH_PORTFOLIO_LINK}>
               aunshx
             </a>
           </span>
           <span>
             &
           </span>
           <span className='hover:text-blue-190 mx-1'>
-            <a href='https://github.com/Saipranav-Kotamreddy'>
+            <a href={SP_PORTFOLIO_LINK}>
               saipranav
             </a>
           </span>

diff --git a/src/Constants/index.js b/src/Constants/index.js
@@ -17,8 +17,22 @@ export const TOGGLE_CHANGE_HOME = 'https://i.postimg.cc/vHpMzwgJ/Screenshot-2024
 
 export const BLOG_LINK = 'https://medium.com/@aunsh/resview-a-pbft-visualizer-based-on-the-resilientdb-blockchain-fabric-3ffaeb2aaee5'
 
+export const AUNSH_PORTFOLIO_LINK = 'https://deploy-preview-5--helpful-hamster-a151d8.netlify.app/'
+
+export const SP_PORTFOLIO_LINK = 'https://github.com/Saipranav-Kotamreddy'
+
 export const REPO_LINK = 'https://github.com/ResilientApp/ResView'
 
+export const RELEASE_NOTES_LINK = 'https://github.com/ResilientApp/ResView/releases/tag/stable_release'
+
+export const RESDB_LINK = 'https://resilientdb.incubator.apache.org/'
+
+export const EXPOLAB_LINK = 'https://expolab.org'
+
+export const APACHE_LINK = 'https://incubator.apache.org/'
+
+export const UCDAVS_LINK = 'https://ucdavis.edu'
+
 export const CARD_BG_GRAD = 'border-3p border-gray-170 dark:bg-gradient-to-r dark:from-blue-600 dark:via-blue dark:to-blue-550 dark:border-none';
 
 

diff --git a/src/Resources/Images/apacheIncubatorLogo.png b/src/Resources/Images/apacheIncubatorLogo.png
diff --git a/src/Resources/Images/expolabIcon.png b/src/Resources/Images/expolabIcon.png