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

Merge branch 'master' into 'majorchange'

# Conflicts:
#   digital-course-file/src/hooks/useFolder.js
#   digital-course-file/src/user/Hero.js
parents e8622dda f1ce3aea
No related branches found
No related tags found
1 merge request!38Majorchange
This commit is part of merge request !38. Comments created here will be created in the context of that merge request.
File added
...@@ -3,7 +3,6 @@ import { database } from '../fire.js' ...@@ -3,7 +3,6 @@ import { database } from '../fire.js'
import firebase from 'firebase' import firebase from 'firebase'
import Loader from "react-loader-spinner"; import Loader from "react-loader-spinner";
export const ROOT_FOLDER = {name: 'Root', id : null , path : [] , parents : []}; export const ROOT_FOLDER = {name: 'Root', id : null , path : [] , parents : []};
export function useFolder( folderId = null, folder= null) { export function useFolder( folderId = null, folder= null) {
......
...@@ -5,10 +5,13 @@ import { ROOT_FOLDER, useFolder } from '.././hooks/useFolder' ...@@ -5,10 +5,13 @@ import { ROOT_FOLDER, useFolder } from '.././hooks/useFolder'
import Folder from './Folder' import Folder from './Folder'
import FolderNav from './FolderNav' import FolderNav from './FolderNav'
import Deffolders from './Deffolders' import Deffolders from './Deffolders'
import DeleteFolder from './DeleteFolder'
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' import File from './File'
import FontAwesomeIcon from '@fortawesome/react-fontawesome';
import firebase from "../fire";
const Hero = ({ handleLogout }) => { const Hero = ({ handleLogout }) => {
const { folderId } = useParams() const { folderId } = useParams()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment