diff --git a/src/components/fileBrowser.jsx b/src/components/fileBrowser.jsx index bf3747d..d8b6665 100644 --- a/src/components/fileBrowser.jsx +++ b/src/components/fileBrowser.jsx @@ -84,7 +84,7 @@ const BrowserWrapper = styled.div` const GridFileBrowser = styled.div` display: grid; - grid-template-columns: 1px 1fr 6rem; + grid-template-columns: 1px 1fr 10rem 6rem; align-items: center; gap: .5rem 1.5rem; width: 100%; @@ -144,21 +144,21 @@ const DirNameP = styled(FilenameP)` cursor: pointer; ` -// const ModifiedP = styled(EllipsisP)` -// @media screen and (max-width: 1100px) { -// display: none; -// } +const ModifiedP = styled(EllipsisP)` + @media screen and (max-width: 1100px) { + display: none; + } -// @media screen and (max-width: 800px) { -// display: initial; -// } -// @media screen and (max-width: 600px) { -// display: none; -// } -// @media screen and (min-width: 1100px) { -// display: initial; -// } -// ` + @media screen and (max-width: 800px) { + display: initial; + } + @media screen and (max-width: 600px) { + display: none; + } + @media screen and (min-width: 1100px) { + display: initial; + } +` const SizeP = styled.p` @media screen and (max-width: 600px) { @@ -434,7 +434,7 @@ class FileBrowser extends Component { : { v.Name } } - {/* { v.modified.toLocaleString() } */} + { v.ModTime?.toLocaleString() } { !v.IsDir ? bytesToString(v.Size, {}) : "" } )) @@ -452,7 +452,7 @@ class FileBrowser extends Component { // sort by name .sort((a,b) => this.state.orderBy === "name" ? this.state.orderAscending ? a.Name.localeCompare(b.Name, 'nl', { sensitivity: 'base' }) : b.Name.localeCompare(a.Name, 'nl', { sensitivity: 'base' }) : 0) // // sort by modified date - // .sort((a,b) => this.state.orderBy === "modified" ? this.state.orderAscending ? a.modified - b.modified : b.modified - a.modified : 0) + .sort((a,b) => this.state.orderBy === "modified" ? this.state.orderAscending ? a.ModTime - b.ModTime : b.ModTime - a.ModTime : 0) // sort by size .sort((a,b) => this.state.orderBy === "size" ? this.state.orderAscending ? a.Size - b.Size : b.Size - a.Size : 0) // // sort folders to top @@ -534,7 +534,7 @@ class FileBrowser extends Component { /> } - {/* this.updateOrder("modified")} style={{ position: "relative", cursor: "pointer" }}> + this.updateOrder("modified")} style={{ position: "relative", cursor: "pointer" }}> modified { orderBy === "modified" && @@ -548,7 +548,7 @@ class FileBrowser extends Component { }} /> } - */} + this.updateOrder("size")} style={{ position: "relative", cursor: "pointer" }}> size { diff --git a/src/components/fileBrowserMenu.jsx b/src/components/fileBrowserMenu.jsx index 4b9d54c..a15edb3 100644 --- a/src/components/fileBrowserMenu.jsx +++ b/src/components/fileBrowserMenu.jsx @@ -69,6 +69,8 @@ class FileBrowserMenu extends Component { .then(response => { if (typeof response.data.list !== "object") return reject(new Error("Invalid response")) + response.data.list.forEach(v => v.ModTime = new Date(v.ModTime)) + let { files } = this.state files[brIndex] = response.data.list loading[brIndex] = false