From 25acc1db2f648f2100fd46ba72cd0b9c23c74cea Mon Sep 17 00:00:00 2001 From: cbenu4cse18036 <cb.en.u4cse18036@cb.students.amrita.edu> Date: Wed, 24 Mar 2021 11:27:08 +0530 Subject: [PATCH] Restore --- .../public/digital-course-file - Shortcut.lnk | Bin 0 -> 1461 bytes digital-course-file/src/hooks/useFolder.js | 2 +- digital-course-file/src/user/AddFolder.js | 8 +++++++- digital-course-file/src/user/Hero.js | 4 +++- 4 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 digital-course-file/public/digital-course-file - Shortcut.lnk diff --git a/digital-course-file/public/digital-course-file - Shortcut.lnk b/digital-course-file/public/digital-course-file - Shortcut.lnk new file mode 100644 index 0000000000000000000000000000000000000000..f4d26b442236687f029ee2e66cfef5f1fb78545b GIT binary patch literal 1461 zcmeZaU|?VrVPXJ*10aHd!L6HtgF%3SfuZQBx72B#>x`Y5@^;8HSQ4ZUq8?7pV6<Y8 zcX5|ujx4fY?$UWQbn3rsgLi5Sj0|cF@ArXBY;js#)DnA@QI!414kO{~a9V_+hM|N( ziow|}*iD4N5Nu*}kh-A&Lr`jBatQ+iLy1&m+_d|bJ$lo{jrY9M*md;mulw`U!yG%^ zj~>rHu&v&Pfs=uS;r+hIph>A9oq7xm46FMY85kIN!KNVy$9b<9f*4X65*d;iKqfmd z6u@ni)D>WG@pShLajY|9V2FU4867058yzI63o>(gJ;)@83qdRh?%O__A%!86A)O(U zp@bokA%{ViA(<hcp_HMBp_n0+L6;$oA(J78A(erFK?2D>ON4!f$o5I<Mh97f?R&Hw zWJ4T?K*Hsf-6Yt@z);D+z#s#SF%WG6HLC*b9tH+x1_lQ1nw&6D9EE4*rR0|vGdNqt zgche37038xreq`*6=x*oDLBS}<0B>|Gd;5;F-JE!zqF`0RW~g&Cl#9*0|OI-9)lh@ zy|6McEcpNb|9>l}Q@9xz7S!;c`^@Nh#;eWa>J@L6_x&Kb1O~8k7DPaun3Gsgl3$>k zYh-R=XkL)P@Il;*Ysd8>|0R+MS3B)Q7j#Uk;QdtoT5!s{6E`odyB<nN{s0pL11AH+ zf{6?a42Ho0!EX)r-g0K>bYK4Cg7A{!G^J7o28I-n-SP|!3`SrMG4ZOvpuynGV8sx_ z5DJcQP`t-5_%UQMq%dSKB!bfch|XhBU~puJK}vy|Aj=pS7<!=&dejx+w#Uc9dG{aT z$!arl&lNH-FtC8sfE=XHz`zj9pvz#$pvz#&pvzzcW*IRUF_<tIFqkqJG8i!!Gnjxy zjTy`tj2X-r3>i!qKq^3dkWL8SfWZJPW5{3$HV?uF*#p8WppG&4sJi{VyOhAvk4y<Y z^Ios9WME+60x1AFMuh0lVPFttU|`?}X><S)bDx6?7LeEBUgKe4U~q%x5(S1dhJ1z` zh7^WWh9U-tZa$DkkZxFU1mbUnx^r1pvWD%{OM+XkF&yx}DRE&Y0|SE`NCC*5E({E0 z#!U>7xr|tKAQv$(fC3Se^frp+x~%Oj@L2BQptr=fqDPj2fguB=#Djr>AvdW>GiX<X R!{U3hcB$L2T?C24FaV{PKQ90P literal 0 HcmV?d00001 diff --git a/digital-course-file/src/hooks/useFolder.js b/digital-course-file/src/hooks/useFolder.js index c68f561..bc8aba7 100644 --- a/digital-course-file/src/hooks/useFolder.js +++ b/digital-course-file/src/hooks/useFolder.js @@ -4,7 +4,7 @@ import firebase from 'firebase' import Loader from "react-loader-spinner"; -export const ROOT_FOLDER = {name: 'Root', id : null , path : [] }; +export const ROOT_FOLDER = {name: 'Root', id : null , path : [] , parents : []}; export function useFolder( folderId = null, folder= null) { diff --git a/digital-course-file/src/user/AddFolder.js b/digital-course-file/src/user/AddFolder.js index 046bb10..3cd1a5b 100644 --- a/digital-course-file/src/user/AddFolder.js +++ b/digital-course-file/src/user/AddFolder.js @@ -28,13 +28,19 @@ export default function AddFolder( {currentFolder} ){ path.push( { name : currentFolder.name , id : currentFolder.id} ) } + const parents = [...currentFolder.parents]; + if(currentFolder!== ROOT_FOLDER){ + parents.push(currentFolder.id) + } + e.preventDefault(); database.folders.add({ name : name, parentId : currentFolder.id, userId: firebase.auth().currentUser.uid, path : path, - createdAt : database.getTime() + createdAt : database.getTime(), + parents : parents, }) setName(""); closeModal(); diff --git a/digital-course-file/src/user/Hero.js b/digital-course-file/src/user/Hero.js index 174c507..434126d 100644 --- a/digital-course-file/src/user/Hero.js +++ b/digital-course-file/src/user/Hero.js @@ -1,10 +1,11 @@ import React, { useEffect, useState } from 'react' import AddFolder from './AddFolder' import { Container, Button, Navbar, Nav } from 'react-bootstrap' -import { useFolder } from '.././hooks/useFolder' +import { ROOT_FOLDER, useFolder } from '.././hooks/useFolder' import Folder from './Folder' import FolderNav from './FolderNav' import Deffolders from './Deffolders' +import DeleteFolder from './DeleteFolder' import { useParams } from 'react-router-dom' import copyright from './copyright' import { Link } from 'react-router-dom' @@ -37,6 +38,7 @@ const Hero = ({ handleLogout }) => { <div className='d-flex align-items-center'> <FolderNav currentFolder={folder} /> <AddFolder currentFolder={folder} /> + {childFolders.length == 0 && folder.parentId == null && ( <Deffolders currentFolder={folder} /> )} -- GitLab