From c08489aa8b16aa712d3063257982b70ba42c796e Mon Sep 17 00:00:00 2001
From: Gana016 <jayam.ganapathi12@gmail.com>
Date: Thu, 25 Mar 2021 16:23:44 +0530
Subject: [PATCH] update on copyright
---
digital-course-file/package.json | 1 +
digital-course-file/src/Routes.js | 29 ++++----
digital-course-file/src/user/FolderNav.js | 80 +++++++++++------------
digital-course-file/src/user/Hero.js | 9 ++-
4 files changed, 64 insertions(+), 55 deletions(-)
diff --git a/digital-course-file/package.json b/digital-course-file/package.json
index d95ed7c..aa3dd93 100644
--- a/digital-course-file/package.json
+++ b/digital-course-file/package.json
@@ -20,6 +20,7 @@
"react-google-button": "^0.7.2",
"react-icons": "^4.2.0",
"react-loader-spinner": "^4.0.0",
+ "react-router-bootstrap": "^0.25.0",
"react-router-dom": "^5.2.0",
"react-scripts": "4.0.2",
"web-vitals": "^1.1.0"
diff --git a/digital-course-file/src/Routes.js b/digital-course-file/src/Routes.js
index c13c1c7..d028e5b 100644
--- a/digital-course-file/src/Routes.js
+++ b/digital-course-file/src/Routes.js
@@ -10,8 +10,8 @@ import copyright from './user/copyright'
import { Link } from 'react-router-dom'
import { Container, Button, Navbar, Nav } from 'react-bootstrap'
import fire from './fire'
-import ForgotPassword from "./user/ForgotPassword"
-
+import ForgotPassword from './user/ForgotPassword'
+import { LinkContainer } from 'react-router-bootstrap'
const Routes = () => {
const [user, setUser] = useState('')
@@ -39,26 +39,31 @@ const Routes = () => {
<h2>Course File System</h2>
</Navbar.Brand>
{user && (
- <Link to="/signin">
- <button className='logoutbutton' onClick={()=>fire.auth().signOut()}>
- Logout
- </button></Link>
+ <Link to='/signin'>
+ <button
+ className='logoutbutton'
+ onClick={() => fire.auth().signOut()}
+ >
+ Logout
+ </button>
+ </Link>
)}
</nav>
</section>
<Switch>
{/*Folders*/}
- <Route path='/folder/:folderId' component={Hero} />
+ <Route path='/folder/:folderId' exact component={Hero} />
<Route path='/' exact component={Signin} />
<Route path='/signin' exact component={Signin} />
- <Route path='/copyright' exact component={copyright} />
+ <Route path='/copyright' component={copyright} />
+ <Route path='/folder/copyright' component={copyright} />
<Route path='/forgot-password' component={ForgotPassword} />
</Switch>
- <Navbar fixed='bottom' variant='light' bg='light'>
+ <Navbar fixed='bottom' variant='light' bg='light'>
<Container className='ml-sm-2'>
- <Nav.Link eventKey={2} href='copyright'>
- © Digital Course File Group 2
- </Nav.Link>
+ <LinkContainer to='/copyright'>
+ <Nav.Link>© Digital Course File Group 2</Nav.Link>
+ </LinkContainer>
</Container>
</Navbar>
</BrowserRouter>
diff --git a/digital-course-file/src/user/FolderNav.js b/digital-course-file/src/user/FolderNav.js
index ca67384..3acb07d 100644
--- a/digital-course-file/src/user/FolderNav.js
+++ b/digital-course-file/src/user/FolderNav.js
@@ -1,46 +1,42 @@
-import { react } from "react";
-import { Breadcrumb } from "react-bootstrap";
-import { Link } from "react-router-dom";
-import { ROOT_FOLDER } from "../hooks/useFolder";
+import { react } from 'react'
+import { Breadcrumb } from 'react-bootstrap'
+import { Link } from 'react-router-dom'
+import { ROOT_FOLDER } from '../hooks/useFolder'
-export default function FolderNav( {currentFolder} ) {
+export default function FolderNav({ currentFolder }) {
+ let path = currentFolder === ROOT_FOLDER ? [] : [ROOT_FOLDER]
- let path = currentFolder === ROOT_FOLDER ? [] : [ROOT_FOLDER]
- if (currentFolder){
- path = [...path,...currentFolder.path];
- }
+ if (currentFolder) {
+ path = [...path, ...currentFolder.path]
+ }
-
- return(
- <Breadcrumb
- className="flex-grow-1"
- listProps = {{ className : "bg-white pl-0 m-0"}}
+ return (
+ <Breadcrumb
+ className='flex-grow-1'
+ listProps={{ className: 'bg-white pl-0 m-0' }}
+ >
+ {path.map((folder, index) => (
+ <Breadcrumb.Item
+ key={folder.id}
+ linkAs={Link}
+ linkProps={{
+ to: folder.id ? `/folder/${folder.id}` : '/',
+ }}
+ className='text-truncate d-inline-block'
+ style={{ maxWidth: '175px' }}
>
- {path.map((folder,index) => (
- <Breadcrumb.Item
- key={folder.id}
- linkAs ={Link}
- linkProps = {{
- to : folder.id ? `/folder/${folder.id}` : "/",
- }}
- className="text-truncate d-inline-block"
- style = { {maxWidth : "175px"} }
- >
- {folder.name}
- </Breadcrumb.Item>
- ))}
- { currentFolder && (
- <Breadcrumb.Item
- className="text-truncate d-inline-block"
- style = { {maxWidth : "200px"} }
- active
- >
- {currentFolder.name}
- </Breadcrumb.Item>
- )
-
- }
- </Breadcrumb>
- );
-
-}
\ No newline at end of file
+ {folder.name}
+ </Breadcrumb.Item>
+ ))}
+ {currentFolder && (
+ <Breadcrumb.Item
+ className='text-truncate d-inline-block'
+ style={{ maxWidth: '200px' }}
+ active
+ >
+ {currentFolder.name}
+ </Breadcrumb.Item>
+ )}
+ </Breadcrumb>
+ )
+}
diff --git a/digital-course-file/src/user/Hero.js b/digital-course-file/src/user/Hero.js
index 94f1f06..6a99480 100644
--- a/digital-course-file/src/user/Hero.js
+++ b/digital-course-file/src/user/Hero.js
@@ -31,7 +31,8 @@ const Hero = ({ handleLogout }) => {
)
}
- return (
+ if(folder.id!=="copyright"){
+ return (
<>
<Container fluid>
<div className='d-flex align-items-center'>
@@ -60,5 +61,11 @@ const Hero = ({ handleLogout }) => {
</Container>
</>
)
+
+ }else{
+ return null
+ }
+
+
}
export default Hero
--
GitLab