Skip to content
Snippets Groups Projects
Commit d5f406e2 authored by Nidharshan A's avatar Nidharshan A
Browse files

Merge branch 'minorchange' into 'master'

Restore OldState

See merge request !37
parents 357f7d21 852d9f00
Branches
Tags
1 merge request!37Restore OldState
File added
......@@ -2,7 +2,7 @@ import { useState,useReducer, useEffect } from "react";
import { database } from '../fire.js'
import firebase from 'firebase'
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) {
......
......@@ -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();
......
......@@ -2,11 +2,12 @@ import React from 'react'
import AddFolder from './AddFolder'
import AddFile from './AddFile'
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 { useParams,useLocation } from 'react-router-dom'
import DeleteFolder from './DeleteFolder'
import { useParams } from 'react-router-dom'
import copyright from './copyright'
import { Link } from 'react-router-dom'
import File from './File'
......@@ -36,8 +37,10 @@ const Hero = ({ handleLogout }) => {
<div className='d-flex align-items-center'>
<FolderNav currentFolder={folder} />
<AddFolder currentFolder={folder} />
<AddFile currentFolder={folder}/>
{childFolders.length == 0 && <Deffolders currentFolder={folder} />}
{childFolders.length == 0 && folder.parentId == null && (
<Deffolders currentFolder={folder} />
)}
</div>
{childFolders.length > 0 && (
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment