Merge branch 'master' of https://git.amrita.edu/se-project-team/digital-course-file

digital-course-file/src/user/Deletefolder.js

@@ -5,7 +5,7 @@ import { faAlignCenter, faFolderMinus } from "@fortawesome/free-solid-svg-icons"
 import { database } from '../fire.js'
 import firebase from 'firebase'
 import { Link } from "react-router-dom";
-
+import "firebase/storage";
 // {currentFolder}
 export default function AddFolder( {currentFolder} ){
     const [open, setOpen] = useState(false);
@@ -27,6 +27,34 @@ export default function AddFolder( {currentFolder} ){
       .where("parents", "array-contains", currentFolder.id);
       folderdel.get().then(function(querySnapshot) {
           querySnapshot.forEach(function(doc) {
+            var filedel = database.files
+            .where("userId","==", firebase.auth().currentUser.uid)
+            .where("folderId","==",doc.id);
+            filedel.get().then(function(querySnapshot) {
+              querySnapshot.forEach(function(docm) { 
+                const storageRef = firebase.storage().ref();
+                var path = 'files/'+firebase.auth().currentUser.uid+'/'+docm.data().uniqueid;
+                console.log(path)
+                var desertRef = storageRef.child(path);
+                desertRef.delete();
+                docm.ref.delete();
+
+              });
+          }); 
+            doc.ref.delete();
+          });
+      });
+
+      var filedel = database.files
+      .where("userId","==", firebase.auth().currentUser.uid)
+      .where("folderId","==",currentFolder.id);
+      filedel.get().then(function(querySnapshot) {
+        querySnapshot.forEach(function(doc) { 
+          const storageRef = firebase.storage().ref();
+                var path = 'files/'+firebase.auth().currentUser.uid+'/'+doc.data().uniqueid;
+                console.log(path);
+                var desertRef1 = storageRef.child(path);
+                desertRef1.delete();
           doc.ref.delete();
         });
       });