continued making files ts and updaitng store to new style

This commit is contained in:
subnub
2024-07-07 19:51:00 -04:00
parent 9751b5ca84
commit b45d06151f
13 changed files with 79 additions and 146 deletions
+3 -8
View File
@@ -1,15 +1,12 @@
import capitalize from "../../utils/capitalize";
import moment from "moment";
import React, { memo, useCallback, useMemo, useRef } from "react";
import React, { memo, useMemo, useRef } from "react";
import ContextMenu from "../ContextMenu";
import mobilecheck from "../../utils/mobileCheck";
import { useContextMenu } from "../../hooks/contextMenu";
import { useDispatch, useSelector } from "react-redux";
import { useSelector } from "react-redux";
import classNames from "classnames";
import { useThumbnail } from "../../hooks/files";
import { getFileColor, getFileExtension } from "../../utils/files";
import { startSetSelectedItem } from "../../actions/selectedItem";
import { setPopupFile } from "../../actions/popupFile";
import bytes from "bytes";
import { useAppDispatch, useAppSelector } from "../../hooks/store";
import { setMainSelect, setMultiSelectMode } from "../../reducers/selected";
@@ -98,9 +95,7 @@ const FileItem: React.FC<FileItemProps> = memo((props) => {
return;
}
const isMobile = mobilecheck();
if (isMobile || currentDate - lastSelected.current < 1500) {
if (currentDate - lastSelected.current < 1500) {
dispatch(setPopupSelect({ type: "file", file }));
}
+6 -11
View File
@@ -8,30 +8,25 @@ import FileItem from "../FileItem";
import ParentBar from "../ParentBar";
import { useParams } from "react-router-dom";
import classNames from "classnames";
import { useAppDispatch, useAppSelector } from "../../hooks/store";
import { toggleListView } from "../../reducers/filter";
const Files = memo(() => {
const { data: files } = useFiles(false);
const listView = useSelector((state) => state.filter.listView);
const search = useSelector((state) => state.filter.search);
const listView = useAppSelector((state) => state.filter.listView);
const { isHome } = useUtils();
const dispatch = useDispatch();
const dispatch = useAppDispatch();
const changeListViewMode = () => {
if (!listView) {
dispatch(enableListView());
} else {
dispatch(disableListView());
}
dispatch(toggleListView());
};
return (
<div className="mt-8">
<div>
<div className="flex justify-between items-center mb-[20px]">
{isHome && (
<h2 className="m-0 text-[22px] font-medium">
{search !== "" ? "Files" : "Home Files"}
</h2>
<h2 className="m-0 text-[22px] font-medium">Home Files</h2>
)}
{!isHome && (
<React.Fragment>
+4 -3
View File
@@ -1,17 +1,18 @@
import { useDispatch, useSelector } from "react-redux";
import { useFolders } from "../../hooks/folders";
import { setSortBy } from "../../actions/filter";
import FolderItem from "../FolderItem";
import { memo, useCallback, useEffect } from "react";
import ParentBar from "../ParentBar";
import classNames from "classnames";
import { useUtils } from "../../hooks/utils";
import { useAppDispatch, useAppSelector } from "../../hooks/store";
import { setSortBy } from "../../reducers/filter";
const Folders = memo(() => {
const { data: folders } = useFolders(false);
const { isHome } = useUtils();
const sortBy = useSelector((state) => state.filter.sortBy);
const dispatch = useDispatch();
const sortBy = useAppSelector((state) => state.filter.sortBy);
const dispatch = useAppDispatch();
const switchOrderSortBy = useCallback(() => {
let newSortBy = "";
+1 -1
View File
@@ -256,7 +256,7 @@ const PhotoViewerPopup = memo(() => {
/>
</div>
</div>
<div className="flex absolute bottom-0 desktopMode:top-[50px] desktopMode:bottom-0 w-full h-full justify-between items-end desktopMode:items-center p-4">
<div className="flex absolute pb-[70px] desktopMode:pb-0 top-[50px] bottom-0 w-full h-full justify-between items-end desktopMode:items-center p-4">
<CircleLeftIcon
onClick={goToPreviousItem}
className="pointer text-white w-[30px] h-[30px] select-none"
+2 -3
View File
@@ -7,10 +7,9 @@ import { useClickOutOfBounds, useUtils } from "../../hooks/utils";
import SearchBarItem from "../SearchBarItem";
import { FolderInterface } from "../../types/folders";
import { FileInterface } from "../../types/file";
import { setPopupFile } from "../../actions/popupFile";
import Spinner from "../Spinner";
import classNames from "classnames";
import { closeDrawer } from "../../reducers/leftSection";
import { setPopupSelect } from "../../reducers/selected";
const SearchBar = memo(() => {
const [searchText, setSearchText] = useState("");
@@ -71,7 +70,7 @@ const SearchBar = memo(() => {
};
const fileClick = (file: FileInterface) => {
dispatch(setPopupFile({ showPopup: true, ...file }));
dispatch(setPopupSelect({ type: "file", file }));
resetState();
};