From c046ac300f525762fe371ec4b847b10abf42fddc Mon Sep 17 00:00:00 2001 From: IRBorisov <8611739+IRBorisov@users.noreply.github.com> Date: Thu, 20 Jun 2024 11:28:35 +0300 Subject: [PATCH] Update icons and help --- rsconcept/frontend/src/components/Icons.tsx | 7 +++-- .../src/pages/LibraryPage/LibraryFolders.tsx | 26 +++++++++++++--- .../pages/ManualsPage/items/HelpLibrary.tsx | 31 ++++++++++++++++++- 3 files changed, 55 insertions(+), 9 deletions(-) diff --git a/rsconcept/frontend/src/components/Icons.tsx b/rsconcept/frontend/src/components/Icons.tsx index 202423d4..d2ff8d31 100644 --- a/rsconcept/frontend/src/components/Icons.tsx +++ b/rsconcept/frontend/src/components/Icons.tsx @@ -32,9 +32,10 @@ export { RiMenuUnfoldFill as IconMenuUnfold } from 'react-icons/ri'; export { LuMoon as IconDarkTheme } from 'react-icons/lu'; export { LuSun as IconLightTheme } from 'react-icons/lu'; export { LuFolderTree as IconFolderTree } from 'react-icons/lu'; -export { FaRegFolder as IconFolder } from 'react-icons/fa6'; -export { FaRegFolderOpen as IconFolderOpened } from 'react-icons/fa6'; -export { FaRegFolderClosed as IconFolderClosed } from 'react-icons/fa6'; +export { LuFolder as IconFolder } from 'react-icons/lu'; +export { LuFolderOpen as IconFolderOpened } from 'react-icons/lu'; +export { LuFolderClosed as IconFolderClosed } from 'react-icons/lu'; +export { LuFolderDot as IconFolderEmpty } from 'react-icons/lu'; export { LuLightbulb as IconHelp } from 'react-icons/lu'; export { LuLightbulbOff as IconHelpOff } from 'react-icons/lu'; export { RiPushpinFill as IconPin } from 'react-icons/ri'; diff --git a/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx b/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx index 3d09984a..7536ead5 100644 --- a/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx +++ b/rsconcept/frontend/src/pages/LibraryPage/LibraryFolders.tsx @@ -4,12 +4,14 @@ import clsx from 'clsx'; import { AnimatePresence, motion } from 'framer-motion'; import { useCallback, useLayoutEffect, useMemo, useState } from 'react'; -import { IconFolder, IconFolderClosed, IconFolderOpened, IconFolderTree } from '@/components/Icons'; +import { IconFolder, IconFolderClosed, IconFolderEmpty, IconFolderOpened, IconFolderTree } from '@/components/Icons'; +import BadgeHelp from '@/components/info/BadgeHelp'; import { CProps } from '@/components/props'; import MiniButton from '@/components/ui/MiniButton'; import { FolderNode, FolderTree } from '@/models/FolderTree'; +import { HelpTopic } from '@/models/miscellaneous'; import { animateSideAppear, animateSideView } from '@/styling/animations'; -import { globals, prefixes } from '@/utils/constants'; +import { globals, PARAMETER, prefixes } from '@/utils/constants'; import { describeFolderNode, labelFolderNode } from '@/utils/labels'; interface LibraryTableProps { @@ -72,7 +74,13 @@ function LibraryFolders({ folders, currentFolder, setFolder, toggleFolderMode }: animate={{ ...animateSideView.animate }} exit={{ ...animateSideView.exit }} > -
+
+ } title='Режим: проводник' @@ -114,7 +122,11 @@ function LibraryFolders({ folders, currentFolder, setFolder, toggleFolderMode }: noHover icon={ folded.includes(item) ? ( - + item.filesInside ? ( + + ) : ( + + ) ) : ( ) @@ -123,7 +135,11 @@ function LibraryFolders({ folders, currentFolder, setFolder, toggleFolderMode }: /> ) : (
- + {item.filesInside ? ( + + ) : ( + + )}
)}
{labelFolderNode(item)}
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/HelpLibrary.tsx b/rsconcept/frontend/src/pages/ManualsPage/items/HelpLibrary.tsx index 3a4ea93c..6c4bfe80 100644 --- a/rsconcept/frontend/src/pages/ManualsPage/items/HelpLibrary.tsx +++ b/rsconcept/frontend/src/pages/ManualsPage/items/HelpLibrary.tsx @@ -1,4 +1,14 @@ -import { IconFolder, IconSearch, IconShow, IconSortAsc, IconSortDesc } from '@/components/Icons'; +import { + IconFolder, + IconFolderClosed, + IconFolderEmpty, + IconFolderOpened, + IconFolderTree, + IconSearch, + IconShow, + IconSortAsc, + IconSortDesc +} from '@/components/Icons'; function HelpLibrary() { return ( @@ -21,6 +31,25 @@ function HelpLibrary() {
  • фильтр по расположению
  • + +

    Проводник

    +
  • клик по папке отображает справа файлы в ней
  • +
  • клик по иконке сворачивает/разворачивает вложенные
  • +
  • + скрыть / отобразить Проводник +
  • +
  • + папка без файлов +
  • +
  • + папка без вложенных +
  • +
  • + папка с вложенными +
  • +
  • + развернутая папка +
  • ); }