diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 33b29589..96737ac9 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -26,7 +26,7 @@ "next-pwa": "^5.6.0", "react": "18.0.0", "react-dom": "18.0.0", - "tabler-icons-react": "^1.44.0", + "react-icons": "^4.4.0", "yup": "^0.32.11" }, "devDependencies": { @@ -6381,6 +6381,14 @@ "react": ">= 16.8 || 18.0.0" } }, + "node_modules/react-icons": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.4.0.tgz", + "integrity": "sha512-fSbvHeVYo/B5/L4VhB7sBA1i2tS8MkT0Hb9t2H1AVPkwGfVHLJCqyr2Py9dKMxsyM63Eng1GkdZfbWj+Fmv8Rg==", + "peerDependencies": { + "react": "*" + } + }, "node_modules/react-is": { "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", @@ -6971,14 +6979,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/tabler-icons-react": { - "version": "1.44.0", - "resolved": "https://registry.npmjs.org/tabler-icons-react/-/tabler-icons-react-1.44.0.tgz", - "integrity": "sha512-AYQQGl55yVe1KHZl+zyDAAwDOcPknKZNC7vgwmjyvpmz4P5Gjb7DtpsOPa1nB0qMYW5Orsrt+1e4qnRoCKgo6A==", - "peerDependencies": { - "react": ">= 16.8.0" - } - }, "node_modules/tapable": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", @@ -12479,6 +12479,12 @@ "prop-types": "^15.8.1" } }, + "react-icons": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.4.0.tgz", + "integrity": "sha512-fSbvHeVYo/B5/L4VhB7sBA1i2tS8MkT0Hb9t2H1AVPkwGfVHLJCqyr2Py9dKMxsyM63Eng1GkdZfbWj+Fmv8Rg==", + "requires": {} + }, "react-is": { "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", @@ -12910,12 +12916,6 @@ "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==" }, - "tabler-icons-react": { - "version": "1.44.0", - "resolved": "https://registry.npmjs.org/tabler-icons-react/-/tabler-icons-react-1.44.0.tgz", - "integrity": "sha512-AYQQGl55yVe1KHZl+zyDAAwDOcPknKZNC7vgwmjyvpmz4P5Gjb7DtpsOPa1nB0qMYW5Orsrt+1e4qnRoCKgo6A==", - "requires": {} - }, "tapable": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", diff --git a/frontend/package.json b/frontend/package.json index 1e4c45b9..75cf76c7 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -27,7 +27,7 @@ "next-pwa": "^5.6.0", "react": "18.0.0", "react-dom": "18.0.0", - "tabler-icons-react": "^1.44.0", + "react-icons": "^4.4.0", "yup": "^0.32.11" }, "devDependencies": { diff --git a/frontend/src/components/navBar/ActionAvatar.tsx b/frontend/src/components/navBar/ActionAvatar.tsx index 121fc957..867029c9 100644 --- a/frontend/src/components/navBar/ActionAvatar.tsx +++ b/frontend/src/components/navBar/ActionAvatar.tsx @@ -1,6 +1,6 @@ import { ActionIcon, Avatar, Menu } from "@mantine/core"; import { NextLink } from "@mantine/next"; -import { DoorExit, Link } from "tabler-icons-react"; +import { TbDoorExit, TbLink } from "react-icons/tb";; import authService from "../../services/auth.service"; const ActionAvatar = () => { @@ -15,7 +15,7 @@ const ActionAvatar = () => { } + icon={} > My shares @@ -23,7 +23,7 @@ const ActionAvatar = () => { onClick={async () => { authService.signOut(); }} - icon={} + icon={} > Sign out diff --git a/frontend/src/components/share/FileList.tsx b/frontend/src/components/share/FileList.tsx index e032171d..9cce2449 100644 --- a/frontend/src/components/share/FileList.tsx +++ b/frontend/src/components/share/FileList.tsx @@ -1,5 +1,5 @@ import { ActionIcon, Loader, Skeleton, Table } from "@mantine/core"; -import { CircleCheck, Download } from "tabler-icons-react"; +import { TbCircleCheck, TbDownload } from "react-icons/tb";; import shareService from "../../services/share.service"; import { byteStringToHumanSizeString } from "../../utils/math/byteStringToHumanSizeString.util"; @@ -39,7 +39,7 @@ const FileList = ({ file.uploadingState != "finished" ? ( ) : ( - + ) ) : ( - + )} diff --git a/frontend/src/components/upload/Dropzone.tsx b/frontend/src/components/upload/Dropzone.tsx index 4c55d3ae..9ad55bf9 100644 --- a/frontend/src/components/upload/Dropzone.tsx +++ b/frontend/src/components/upload/Dropzone.tsx @@ -2,7 +2,7 @@ import { Button, Center, createStyles, Group, Text } from "@mantine/core"; import { Dropzone as MantineDropzone } from "@mantine/dropzone"; import getConfig from "next/config"; import { Dispatch, ForwardedRef, SetStateAction, useRef } from "react"; -import { CloudUpload, Upload } from "tabler-icons-react"; +import { TbCloudUpload, TbUpload } from "react-icons/tb";;; import { FileUpload } from "../../types/File.type"; import { byteStringToHumanSizeString } from "../../utils/math/byteStringToHumanSizeString.util"; import toast from "../../utils/toast.util"; @@ -67,7 +67,7 @@ const Dropzone = ({ >
- + Upload files @@ -89,7 +89,7 @@ const Dropzone = ({ disabled={isUploading} onClick={() => openRef.current && openRef.current()} > - {} + {}
diff --git a/frontend/src/components/upload/FileList.tsx b/frontend/src/components/upload/FileList.tsx index c9a3260e..fb4c2a73 100644 --- a/frontend/src/components/upload/FileList.tsx +++ b/frontend/src/components/upload/FileList.tsx @@ -1,6 +1,6 @@ import { ActionIcon, Table } from "@mantine/core"; import { Dispatch, SetStateAction } from "react"; -import { Trash } from "tabler-icons-react"; +import { TbTrash } from "react-icons/tb";; import { FileUpload } from "../../types/File.type"; import { byteStringToHumanSizeString } from "../../utils/math/byteStringToHumanSizeString.util"; import UploadProgressIndicator from "./UploadProgressIndicator"; @@ -28,7 +28,7 @@ const FileList = ({ size={25} onClick={() => remove(i)} > - + ) : ( diff --git a/frontend/src/components/upload/UploadProgressIndicator.tsx b/frontend/src/components/upload/UploadProgressIndicator.tsx index 95800bbf..fa96cb9b 100644 --- a/frontend/src/components/upload/UploadProgressIndicator.tsx +++ b/frontend/src/components/upload/UploadProgressIndicator.tsx @@ -1,5 +1,5 @@ import { RingProgress } from "@mantine/core"; -import { CircleCheck, CircleX } from "tabler-icons-react"; +import { TbCircleCheck, TbCircleX } from "react-icons/tb";; const UploadProgressIndicator = ({ progress }: { progress: number }) => { if (progress > 0 && progress < 100) { @@ -11,9 +11,9 @@ const UploadProgressIndicator = ({ progress }: { progress: number }) => { /> ); } else if (progress == 100) { - return ; + return ; } else { - return ; + return ; } }; diff --git a/frontend/src/components/upload/showCompletedUploadModal.tsx b/frontend/src/components/upload/showCompletedUploadModal.tsx index 09c2b73a..372b9a3b 100644 --- a/frontend/src/components/upload/showCompletedUploadModal.tsx +++ b/frontend/src/components/upload/showCompletedUploadModal.tsx @@ -1,25 +1,20 @@ import { ActionIcon, Button, - Group, Stack, Text, TextInput, - Title + Title, } from "@mantine/core"; import { useClipboard } from "@mantine/hooks"; import { useModals } from "@mantine/modals"; import { ModalsContextProps } from "@mantine/modals/lib/context"; import moment from "moment"; import { useRouter } from "next/router"; -import { Copy } from "tabler-icons-react"; +import { TbCopy } from "react-icons/tb"; import { Share } from "../../types/share.type"; import toast from "../../utils/toast.util"; - -const showCompletedUploadModal = ( - modals: ModalsContextProps, - share: Share, -) => { +const showCompletedUploadModal = (modals: ModalsContextProps, share: Share) => { return modals.openModal({ closeOnClickOutside: false, withCloseButton: false, @@ -39,7 +34,7 @@ const Body = ({ share }: { share: Share }) => { const router = useRouter(); const link = `${window.location.origin}/share/${share.id}`; return ( - + { toast.success("Your link was copied to the keyboard."); }} > - + } /> diff --git a/frontend/src/pages/account/shares.tsx b/frontend/src/pages/account/shares.tsx index 988f99e1..d4ed3ea7 100644 --- a/frontend/src/pages/account/shares.tsx +++ b/frontend/src/pages/account/shares.tsx @@ -16,7 +16,7 @@ import { NextLink } from "@mantine/next"; import moment from "moment"; import { useRouter } from "next/router"; import { useEffect, useState } from "react"; -import { Link, Trash } from "tabler-icons-react"; +import { TbLink, TbTrash } from "react-icons/tb";; import Meta from "../../components/Meta"; import useUser from "../../hooks/user.hook"; import shareService from "../../services/share.service"; @@ -89,7 +89,7 @@ const MyShares = () => { ); }} > - + { }); }} > - + diff --git a/frontend/src/pages/index.tsx b/frontend/src/pages/index.tsx index 5c046ead..cfe7c55e 100644 --- a/frontend/src/pages/index.tsx +++ b/frontend/src/pages/index.tsx @@ -12,10 +12,9 @@ import { NextLink } from "@mantine/next"; import getConfig from "next/config"; import Image from "next/image"; import { useRouter } from "next/router"; -import { Check } from "tabler-icons-react"; +import { TbCheck } from "react-icons/tb"; import Meta from "../components/Meta"; import useUser from "../hooks/user.hook"; - const { publicRuntimeConfig } = getConfig(); const useStyles = createStyles((theme) => ({ @@ -101,7 +100,7 @@ export default function Home() { size="sm" icon={ - + } > diff --git a/frontend/src/utils/toast.util.tsx b/frontend/src/utils/toast.util.tsx index 28c293a6..3e1f56e5 100644 --- a/frontend/src/utils/toast.util.tsx +++ b/frontend/src/utils/toast.util.tsx @@ -1,19 +1,18 @@ import { showNotification } from "@mantine/notifications"; -import { Check, X } from "tabler-icons-react"; - +import { TbCheck, TbX } from "react-icons/tb"; const error = (message: string) => showNotification({ - icon: , + icon: , color: "red", radius: "md", title: "Error", - + message: message, }); const success = (message: string) => showNotification({ - icon: , + icon: , color: "green", radius: "md", title: "Success",