Skip to content

Commit

Permalink
Merge pull request #49 from ResilientApp/SCRUM-15
Browse files Browse the repository at this point in the history
Updated Fixes
  • Loading branch information
aunshx authored Sep 5, 2024
2 parents 4a4c585 + 3b2d3a5 commit 80aa741
Show file tree
Hide file tree
Showing 14 changed files with 41 additions and 44 deletions.
12 changes: 6 additions & 6 deletions build/asset-manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"files": {
"main.css": "/static/css/main.3699acb5.css",
"main.js": "/static/js/main.2d5f2882.js",
"main.css": "/static/css/main.47274da5.css",
"main.js": "/static/js/main.4c809867.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",
Expand Down Expand Up @@ -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.3699acb5.css.map": "/static/css/main.3699acb5.css.map",
"main.2d5f2882.js.map": "/static/js/main.2d5f2882.js.map",
"main.47274da5.css.map": "/static/css/main.47274da5.css.map",
"main.4c809867.js.map": "/static/js/main.4c809867.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",
Expand Down Expand Up @@ -144,7 +144,7 @@
"4290.d4ff0c15.chunk.js.map": "/static/js/4290.d4ff0c15.chunk.js.map"
},
"entrypoints": [
"static/css/main.3699acb5.css",
"static/js/main.2d5f2882.js"
"static/css/main.47274da5.css",
"static/js/main.4c809867.js"
]
}
2 changes: 1 addition & 1 deletion build/index.html
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.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>
<!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.4c809867.js"></script><link href="/static/css/main.47274da5.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/manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"short_name": "React App",
"name": "Create React App Sample",
"short_name": "resview",
"name": "ResView - A graphical visualizer for ResilientDB",
"icons": [
{
"src": "favicon.ico",
Expand Down
8 changes: 0 additions & 8 deletions build/static/css/main.3699acb5.css

This file was deleted.

1 change: 0 additions & 1 deletion build/static/css/main.3699acb5.css.map

This file was deleted.

8 changes: 8 additions & 0 deletions build/static/css/main.47274da5.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions build/static/css/main.47274da5.css.map

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion build/static/js/main.2d5f2882.js.map

This file was deleted.

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions build/static/js/main.4c809867.js.map

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,13 @@ const PreSynthApp = () => {
) : (
<Router>
<Routes>
<Route index element={<Navigate to={`${URL_REROUTE_PAGE}`} />} />

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

<Route path='*' element={<NotFound />} />
<Route index element={<Navigate to={`${URL_REROUTE_PAGE}`} />} />
</Routes>
</Router>
)}
Expand Down
17 changes: 10 additions & 7 deletions src/Components/Shared/NotFound.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
import React from 'react'
import Wrapper from './Wrapper';
import { URL_HOME_PAGE } from '../../Constants';
import { LinkButton } from './Buttons';

const NotFound = () => {
return (
<div className="h-screen">
<Wrapper>
<div className='dark:text-white text-gray text-48p font-sans font-bold mt-180p'>
<div className='dark:text-white text-gray text-48p font-sans font-bold mt-10p mb-8'>
Res <span className='text-red-50'>NO</span>{" "}
<span>View :P</span>
<span>View</span>
</div>
<div className="flex flex-col items-center justify-center gap-y-2 my-4">
<div className='text-gray dark:text-white text-36p bold'>Error 404</div>
<div className='text-gray dark:text-white text-30p bold'>Page Not Found</div>
</div>
<div className="mt-8">
<LinkButton title={'Go Back'} link={URL_HOME_PAGE} external={false} />
</div>
<div className='my-8 text-gray dark:text-white text-36p bold'>Error 404</div>
<div className='my-4 text-gray dark:text-white text-30p bold'>Page Not Found</div>
<a href={`${URL_HOME_PAGE}`} className='my-[4em] cursor-pointer border-[2px] border-solid border-blue-190 w-100p h-50p rounded-md text-blue-200 text-18p bold flex items-center justify-center'>
Go Back
</a>
</Wrapper>
</div>
);
Expand Down
20 changes: 6 additions & 14 deletions src/Styles/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -595,10 +595,6 @@ video {
margin-top: 2rem;
margin-bottom: 2rem;
}
.my-\[4em\] {
margin-top: 4em;
margin-bottom: 4em;
}
.mb-10 {
margin-bottom: 2.5rem;
}
Expand Down Expand Up @@ -644,6 +640,9 @@ video {
.mt-10 {
margin-top: 2.5rem;
}
.mt-10p {
margin-top: 10px;
}
.mt-12 {
margin-top: 3rem;
}
Expand All @@ -653,9 +652,6 @@ video {
.mt-16 {
margin-top: 4rem;
}
.mt-180p {
margin-top: 180px;
}
.mt-2 {
margin-top: 0.5rem;
}
Expand Down Expand Up @@ -1008,6 +1004,9 @@ video {
.gap-y-10 {
row-gap: 2.5rem;
}
.gap-y-2 {
row-gap: 0.5rem;
}
.gap-y-24 {
row-gap: 6rem;
}
Expand Down Expand Up @@ -1073,9 +1072,6 @@ video {
.border-3p {
border-width: 3px;
}
.border-\[2px\] {
border-width: 2px;
}
.border-y-3p {
border-top-width: 3px;
border-bottom-width: 3px;
Expand Down Expand Up @@ -1486,10 +1482,6 @@ video {
--tw-text-opacity: 1;
color: rgb(24 151 136 / var(--tw-text-opacity));
}
.text-blue-200 {
--tw-text-opacity: 1;
color: rgb(38 216 196 / var(--tw-text-opacity));
}
.text-gray-100 {
--tw-text-opacity: 1;
color: rgb(119 119 119 / var(--tw-text-opacity));
Expand Down

0 comments on commit 80aa741

Please sign in to comment.