diff --git a/src/App.js b/src/App.js index fd9d97d..6c70280 100644 --- a/src/App.js +++ b/src/App.js @@ -181,13 +181,13 @@ function App() { {/* */} {/* ----------------------------$$$ start---------------------------- */} - + {/* */} {/* */} {/* */} {/* */} {/* ----------------------------$$$ end---------------------------- */} - {/* */} + {/* */} {/* ----------------------------$$$ start---------------------------- */} @@ -209,7 +209,7 @@ function App() { {/* */} - {/* */} + {/* */} @@ -265,7 +265,7 @@ function App() { {/* */} {/* ----------------------------$$$ end---------------------------- */} - {/* */} + {/* */} diff --git a/src/components/FolderTree/index.js b/src/components/FolderTree/index.js index 5118d6a..1d89afb 100644 --- a/src/components/FolderTree/index.js +++ b/src/components/FolderTree/index.js @@ -1,8 +1,5 @@ import React, { useState } from "react"; -import folder from "./images/folder.svg"; -import selectedFolder from "./images/selectedFolder.svg"; - import arrow from "./images/arrow.svg"; import selectedArrow from "./images/selectedArrow.svg"; @@ -16,7 +13,7 @@ const FolderState = ({ items }) => { return ( <>
  @@ -35,9 +32,11 @@ const FolderTree = ({ items, pid, selected, setSelected, setTop }) => { const [expands, setExpand] = useState( items.filter((item) => item.exapnd).map((item) => item.id) ); + if (!pid) pid = null; + return ( -
+
{items .filter((item) => item.pid === pid) .map((item, index) => { @@ -47,7 +46,7 @@ const FolderTree = ({ items, pid, selected, setSelected, setTop }) => {
{ @@ -71,7 +70,6 @@ const FolderTree = ({ items, pid, selected, setSelected, setTop }) => { src={expand ? opened : icon1} className="z-10 w-7 transition-all duration-700" /> - { return (
{/* right */} -
+
{/* left */} -
+
diff --git a/src/components/ReactTable5/BasicTable.js b/src/components/ReactTable5/BasicTable.js index 468109d..8412eb9 100644 --- a/src/components/ReactTable5/BasicTable.js +++ b/src/components/ReactTable5/BasicTable.js @@ -26,6 +26,7 @@ import { useExpanded, } from "react-table"; import ButtonNewDesign from "../ButtonNewDesign"; +import Button from "../Button"; export const SelectColumnFilter = ({ column: { filterValue, setFilter, preFilteredRows, id, render }, @@ -168,14 +169,8 @@ const BasicTable = ({ addTab, activeTab }) => { ) : null ) )} - { }} />
-
+
{ {activeList === true && (
{page.map((row, idx) => { prepareRow(row); return (
{ alt={row.original.filePic} className="w-16 mx-auto" /> -

{row.original.fileName}

+

{row.original.fileName}

{row.original.fileSize} + {console.log("mahdi")} + {console.log(row.original)} + {console.log("mahdi")}
); diff --git a/src/components/ReactTable5/EditRow.js b/src/components/ReactTable5/EditRow.js index 0825dbb..fb5e5b7 100644 --- a/src/components/ReactTable5/EditRow.js +++ b/src/components/ReactTable5/EditRow.js @@ -7,15 +7,15 @@ const EditRow = ({ row }) => {
setOpenModal(false)} data-modal-toggle="large-modal" - className={`cursor-pointer w-screen h-screen backdrop-filter backdrop-blur-lg bg-opacity-90 bg-gray-600 flex items-center justify-center fixed left-0 top-0 - ${openModal ? "opacity-80" : "opacity-0 pointer-events-none"}`} + className={`cursor-pointer w-screen h-screen backdrop-filter backdrop-blur-lg bg-opacity-90 bg-gray-900 flex items-center justify-center fixed left-0 top-0 + ${openModal ? "opacity-90" : "opacity-0 pointer-events-none"}`} >
e.stopPropagation()} > - + { return (
e.stopPropagation()}> -
e.stopPropagation()}> - setSelectedTab(true)} />