Skip to content
Snippets Groups Projects
Commit a48b8139 authored by Ganapathi Subramanyam  Jayam's avatar Ganapathi Subramanyam Jayam 🎯
Browse files

updated loading screen and power button bug

parent 887f7fea
Branches
Tags
No related merge requests found
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
"react-github-login-button": "^1.0.1", "react-github-login-button": "^1.0.1",
"react-google-button": "^0.7.2", "react-google-button": "^0.7.2",
"react-icons": "^4.2.0", "react-icons": "^4.2.0",
"react-loader-spinner": "^4.0.0",
"react-router-dom": "^5.2.0", "react-router-dom": "^5.2.0",
"react-scripts": "4.0.2", "react-scripts": "4.0.2",
"web-vitals": "^1.1.0" "web-vitals": "^1.1.0"
...@@ -15612,6 +15613,18 @@ ...@@ -15612,6 +15613,18 @@
"resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
"integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
}, },
"node_modules/react-loader-spinner": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/react-loader-spinner/-/react-loader-spinner-4.0.0.tgz",
"integrity": "sha512-RU2vpEej6G4ECei0h3q6bgLU10of9Lw5O+4AwF/mtkrX5oY20Sh/AxoPJ7etbrs/7Q3u4jN5qwCwGLRKCHpk6g==",
"dependencies": {
"prop-types": "^15.7.2"
},
"peerDependencies": {
"react": "*",
"react-dom": "*"
}
},
"node_modules/react-overlays": { "node_modules/react-overlays": {
"version": "4.1.1", "version": "4.1.1",
"resolved": "https://registry.npmjs.org/react-overlays/-/react-overlays-4.1.1.tgz", "resolved": "https://registry.npmjs.org/react-overlays/-/react-overlays-4.1.1.tgz",
...@@ -34020,6 +34033,14 @@ ...@@ -34020,6 +34033,14 @@
"resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
"integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
}, },
"react-loader-spinner": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/react-loader-spinner/-/react-loader-spinner-4.0.0.tgz",
"integrity": "sha512-RU2vpEej6G4ECei0h3q6bgLU10of9Lw5O+4AwF/mtkrX5oY20Sh/AxoPJ7etbrs/7Q3u4jN5qwCwGLRKCHpk6g==",
"requires": {
"prop-types": "^15.7.2"
}
},
"react-overlays": { "react-overlays": {
"version": "4.1.1", "version": "4.1.1",
"resolved": "https://registry.npmjs.org/react-overlays/-/react-overlays-4.1.1.tgz", "resolved": "https://registry.npmjs.org/react-overlays/-/react-overlays-4.1.1.tgz",
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
"react-github-login-button": "^1.0.1", "react-github-login-button": "^1.0.1",
"react-google-button": "^0.7.2", "react-google-button": "^0.7.2",
"react-icons": "^4.2.0", "react-icons": "^4.2.0",
"react-loader-spinner": "^4.0.0",
"react-router-dom": "^5.2.0", "react-router-dom": "^5.2.0",
"react-scripts": "4.0.2", "react-scripts": "4.0.2",
"web-vitals": "^1.1.0" "web-vitals": "^1.1.0"
......
...@@ -128,3 +128,11 @@ body { ...@@ -128,3 +128,11 @@ body {
padding-top: 10px; padding-top: 10px;
text-align: center; text-align: center;
} }
.centered {
position: fixed;
top: 50%;
left: 50%;
margin-top: -50px;
margin-left: -100px;
}
...@@ -3,5 +3,6 @@ import ReactDOM from 'react-dom'; ...@@ -3,5 +3,6 @@ import ReactDOM from 'react-dom';
// import './styles.css'; // import './styles.css';
import Routes from "./Routes" import Routes from "./Routes"
import "bootstrap/dist/css/bootstrap.min.css" import "bootstrap/dist/css/bootstrap.min.css"
import "react-loader-spinner/dist/loader/css/react-spinner-loader.css";
ReactDOM.render(<Routes/>,document.getElementById("root")); ReactDOM.render(<Routes/>,document.getElementById("root"));
\ No newline at end of file
...@@ -8,10 +8,21 @@ import Deffolders from './Deffolders' ...@@ -8,10 +8,21 @@ import Deffolders from './Deffolders'
import { useParams } from 'react-router-dom' import { useParams } from 'react-router-dom'
import copyright from './copyright' import copyright from './copyright'
import { Link } from 'react-router-dom' import { Link } from 'react-router-dom'
import Loader from "react-loader-spinner";
const Hero = ({ handleLogout }) => { const Hero = ({ handleLogout }) => {
const { folderId } = useParams() const { folderId } = useParams()
const { folder, childFolders } = useFolder(folderId) const { folder, childFolders } = useFolder(folderId)
console.log(folder);
if (!folder) {
return <><div className='centered'><Loader
type="Puff"
color="#00BFFF"
height={100}
width={100}
timeout={3000} //3 secs
/></div></>
}
return ( return (
<> <>
...@@ -31,7 +42,7 @@ const Hero = ({ handleLogout }) => { ...@@ -31,7 +42,7 @@ const Hero = ({ handleLogout }) => {
<div className='d-flex align-items-center'> <div className='d-flex align-items-center'>
<FolderNav currentFolder={folder} /> <FolderNav currentFolder={folder} />
<AddFolder currentFolder={folder} /> <AddFolder currentFolder={folder} />
{childFolders.length == 0 && <Deffolders currentFolder={folder} />} {(childFolders.length == 0 && folder.id==null) && <Deffolders currentFolder={folder} />}
</div> </div>
{childFolders.length > 0 && ( {childFolders.length > 0 && (
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment