Skip to content

Commit

Permalink
Merge pull request #68 from ResilientApp/SCM-32
Browse files Browse the repository at this point in the history 
Updated Build and Minor Fixes
  • Loading branch information
@aunshx
aunshx authored Oct 5, 2024
2 parents 975aa4d + 279a652 commit e0ee537
Show file tree
Hide file tree
Showing 17 changed files with 58 additions and 55 deletions.
16 changes: 8 additions & 8 deletions build/asset-manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"files": {
"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",
"main.css": "/static/css/main.88edcbf5.css",
"main.js": "/static/js/main.46be6509.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",
"static/js/8122.6983dde7.chunk.js": "/static/js/8122.6983dde7.chunk.js",
Expand Down Expand Up @@ -76,9 +76,9 @@
"static/media/resdbLogo.svg": "/static/media/resdbLogo.50ebfb5b04ca9818a311c1533a1d118f.svg",
"static/media/ucDavisLogo.svg": "/static/media/ucDavisLogo.34e8c7184485a6b9cad554d942740e79.svg",
"index.html": "/index.html",
"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",
"main.88edcbf5.css.map": "/static/css/main.88edcbf5.css.map",
"main.46be6509.js.map": "/static/js/main.46be6509.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",
"8122.6983dde7.chunk.js.map": "/static/js/8122.6983dde7.chunk.js.map",
Expand Down Expand Up @@ -148,7 +148,7 @@
"4290.d4ff0c15.chunk.js.map": "/static/js/4290.d4ff0c15.chunk.js.map"
},
"entrypoints": [
"static/css/main.acba6246.css",
"static/js/main.e5f07c10.js"
"static/css/main.88edcbf5.css",
"static/js/main.46be6509.js"
]
}
2 changes: 1 addition & 1 deletion build/index.html
View file
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="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>
<!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.46be6509.js"></script><link href="/static/css/main.88edcbf5.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>
4 changes: 2 additions & 2 deletions build/static/css/main.acba6246.css → build/static/css/main.88edcbf5.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/static/css/main.acba6246.css.map → build/static/css/main.88edcbf5.css.map
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions build/static/js/1927.57dababa.chunk.js → build/static/js/1927.8bd9ca2b.chunk.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/static/js/1927.57dababa.chunk.js.map → build/static/js/1927.8bd9ca2b.chunk.js.map
View file

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions build/static/js/main.46be6509.js
View file

Large diffs are not rendered by default.

0 build/static/js/main.e5f07c10.js.LICENSE.txt → build/static/js/main.46be6509.js.LICENSE.txt
View file
File renamed without changes.
1 change: 1 addition & 0 deletions build/static/js/main.46be6509.js.map
View file

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions build/static/js/main.e5f07c10.js
View file

This file was deleted.

1 change: 0 additions & 1 deletion build/static/js/main.e5f07c10.js.map
View file

This file was deleted.

7 changes: 3 additions & 4 deletions src/App.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,14 @@ const PreSynthApp = () => {

return (
<>
{false ? (
{isMobile ? (
<OnlyDesktop />
) : (
<Router>
<Routes>
<Route index element={<Navigate to={`${URL_REROUTE_PAGE}`} />} />

<Route path={`${URL_TEAM_PAGE}`} element={<Team loading={isParticleLoading} />} />
<Route path={`${URL_HOME_PAGE}`} element={<Home />} />
<Route path={`${URL_TEAM_PAGE}`} element={<Team />} />
<Route path={`${URL_HOME_PAGE}`} element={<Home loading={isParticleLoading} />} />
<Route path={`${URL_VISUALIZER_PAGE}`} element={<Visualizer />} />

<Route path='*' element={<NotFound />} />
Expand Down
4 changes: 3 additions & 1 deletion src/Components/Pages/Home/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import Navbar from '../../Shared/Navbar';
import Wrapper from '../../Shared/Wrapper';
import Graphs from './Sections/Graphs';
import PbftIntro from './Sections/PbftIntro';
import { LinearProgress } from '@mui/material';

const Home = () => {

Expand Down Expand Up @@ -60,10 +61,11 @@ const Home = () => {
);
};

const Index = () => {
const Index = ({ loading }) => {
const { borderToggle } = useContext(NavbarToggleContext);
return (
<>
{loading && <LinearProgress />}
<Navbar borderToggle={borderToggle} />
<BorderToggleRef />
<div className="flex items-center justify-center w-full">
Expand Down
22 changes: 12 additions & 10 deletions src/Components/Pages/Team/Ancilliary/Components/Card.js
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import React, { useState } from 'react'

import {Icon} from '../../../../Shared/Icon'
import { linkedinIcon, githubIcon, instagramIcon, userIcon } from '../../../../../Resources/Icons'
import {ICON_DEFAULT_COLOR} from '../../../../../Constants'
import defaultProfileImage from '../../../../../Resources/Images/defaultProfileImage.png'
import { CircularProgress } from '@mui/material'
import cn from 'classnames'
import { ICON_DEFAULT_COLOR } from '../../../../../Constants'
import { githubIcon, linkedinIcon, userIcon } from '../../../../../Resources/Icons'
import defaultProfileImage from '../../../../../Resources/Images/defaultProfileImage.png'
import { Icon } from '../../../../Shared/Icon'

const linkToIcon = {
github: githubIcon,
Expand Down Expand Up @@ -103,12 +102,15 @@ export const PastMembersCard = ({ element }) => {
return (
<div className='w-full h-auto text-black rounded-md border-3p border-gray-700 flex flex-col gap-x-2 dark:border-solid dark:border-gray-50 dark:bg-blue-500 dark:text-white px-2 py-4 hover:scale-105 transition'>
<div className='w-full h-full flex items-center justify-center'>
<CircularProgress
size={30}
className={cn({
'hidden': imageLoaded
<div
className={cn('h-250p flex items-center justify-center', {
'hidden': imageLoaded,
})}
/>
>
<CircularProgress
size={30}
/>
</div>
<img
src={profilePic ?? defaultProfileImage}
alt={`Profile pic of ${name}`}
Expand Down
6 changes: 3 additions & 3 deletions src/Components/Pages/Team/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ const Team = () => {
<div className='mt-4 mb-4 mx-8 grid grid-cols-2 gap-24 w-full h-full'>
{currentTeam.length > 0 &&
currentTeam.map((element, index) => (
<div key={index} data-aos='fade-in' data-aos-delay={100 * index}>
<div key={index}>
<CurrentTeamCard element={element} />
</div>
))}
</div>
<div className='my-24 mx-8 grid grid-cols-3 gap-16 w-full h-full'>
{pastMembers.length > 0 &&
pastMembers.map((element, index) => (
<div key={index} data-aos='fade-in' data-aos-delay={100 * index}>
<div key={index}>
{index === 1 ? (
<PastMembersCard element={element} />
) : (
Expand All @@ -43,7 +43,7 @@ const Team = () => {
);
}

const Index = ({ loading }) => {
const Index = () => {
const { borderToggle } = useContext(NavbarToggleContext);

return (
Expand Down
26 changes: 13 additions & 13 deletions src/Components/Shared/Footer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,28 +26,28 @@ export const DetailedFooter = () => {
</div>
<div className="grid grid-cols-3 gap-12">
<div>
<div className="text-16p font-bold mb-4 text-white">Site Links</div>
<div className="text-16p font-bold mb-4 text-gray-900 dark: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>
<li><a href={URL_HOME_PAGE} className="text-gray-900 dark:text-white dark:hover:text-gray-300 hover:text-blue-190 transition duration-200">Home</a></li>
<li><a href={URL_TEAM_PAGE} className="text-gray-900 dark:text-white dark:hover:text-gray-300 hover:text-blue-190 transition duration-200">Team</a></li>
<li><a href={REPO_LINK} className="text-gray-900 dark:text-white dark:hover:text-gray-300 hover:text-blue-190 transition duration-200">Code</a></li>
<li><a href={URL_VISUALIZER_PAGE} className="text-gray-900 dark:text-white dark:hover:text-gray-300 hover:text-blue-190 transition duration-200">Visualizer</a></li>
</ul>
</div>
<div>
<div className="text-16p font-bold mb-6 text-white">Authors</div>
<div className="text-16p font-bold mb-6 text-gray-900 dark: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>
<li><a href={AUNSH_PORTFOLIO_LINK} className="text-gray-900 dark:text-white dark:hover:text-gray-300 hover:text-blue-190 transition duration-200">aunshx</a></li>
<li><a href={SP_PORTFOLIO_LINK} className="text-gray-900 dark:text-white dark:hover:text-gray-300 hover:text-blue-190 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 className="text-16p font-bold mt-6 mb-2 text-gray-900 dark:text-white">Release</div>
<a href={RELEASE_NOTES_LINK} className="text-gray-900 dark:text-white dark:hover:text-gray-300 hover:text-blue-190 transition duration-200">v3.2.5</a>
</div>
<div>
<div className="text-16p font-bold mb-6 text-white">Contact Us</div>
<div className="text-16p font-bold mb-6 text-gray-900 dark: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>
<li><a href="mailto:[email protected]" className="text-gray-900 dark:text-white dark:hover:text-gray-300 hover:text-blue-190 transition duration-200">Mail Us</a></li>
<li><a href={UCDAVS_LINK} className="text-gray-900 dark:text-white dark:hover:text-gray-300 hover:text-blue-190 transition duration-200">UC Davis Site</a></li>
</ul>
</div>
</div>
Expand Down
10 changes: 5 additions & 5 deletions src/Styles/App.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1856,11 +1856,6 @@ code {
color: rgb(10 15 28 / var(--tw-text-opacity));
}

.hover\:text-gray-300:hover {
--tw-text-opacity: 1;
color: rgb(209 213 219 / var(--tw-text-opacity));
}

.hover\:text-gray-900:hover {
--tw-text-opacity: 1;
color: rgb(17 24 39 / var(--tw-text-opacity));
Expand Down Expand Up @@ -2150,6 +2145,11 @@ code {
background-color: rgb(7 132 102 / var(--tw-bg-opacity));
}

:is([data-theme="dark"] .dark\:hover\:text-gray-300:hover) {
--tw-text-opacity: 1;
color: rgb(209 213 219 / var(--tw-text-opacity));
}

:is([data-theme="dark"] .dark\:hover\:text-white:hover) {
--tw-text-opacity: 1;
color: rgb(255 255 255 / var(--tw-text-opacity));
Expand Down

0 comments on commit e0ee537

Please sign in to comment.