From c53ac831e7bbde8bd36c2eb01ff4183a9d728a96 Mon Sep 17 00:00:00 2001 From: Fedor Katurov Date: Sun, 19 Nov 2023 17:20:55 +0600 Subject: [PATCH] refactor boris components --- src/components/boris/BorisUIDemo/index.tsx | 77 ------------------- .../boris/BorisUIDemo/styles.module.scss | 14 ---- .../{boris => common}/Superpower/index.tsx | 0 .../components}/BorisSuperpowers/index.tsx | 0 .../BorisSuperpowers/styles.module.scss | 0 .../auth/SuperPowersToggle/index.tsx | 3 +- .../components}/BorisContactItem/index.tsx | 0 .../components}/BorisContacts/index.tsx | 2 +- .../BorisContacts/styles.module.scss | 0 .../components}/BasicCurveChart/index.tsx | 0 .../components}/BorisGraphicStats/index.tsx | 3 +- .../BorisGraphicStats/styles.module.scss | 0 .../components}/BorisStatsBackend/index.tsx | 3 +- .../BorisStatsBackend/styles.module.scss | 0 .../components}/BorisStatsGit/index.tsx | 0 .../BorisStatsGit/styles.module.scss | 0 .../components}/BorisStatsGitCard/index.tsx | 0 .../BorisStatsGitCard/styles.module.scss | 0 .../components}/StatsCard/index.tsx | 0 .../components}/StatsCard/styles.module.scss | 0 .../components}/StatsCountdownCard/index.tsx | 14 +++- .../StatsCountdownCard/styles.module.scss | 0 .../components}/StatsGraphCard/index.tsx | 5 +- .../StatsGraphCard/styles.module.scss | 0 .../components}/BorisStats/index.tsx | 4 +- src/containers/boris/BorisSidebar/index.tsx | 4 +- src/containers/flow/FlowStamp/index.tsx | 21 +++-- .../settings/UserSettingsView/index.tsx | 2 +- src/layouts/BorisLayout/index.tsx | 2 +- src/layouts/NodeLayout/index.tsx | 2 +- 30 files changed, 42 insertions(+), 114 deletions(-) delete mode 100644 src/components/boris/BorisUIDemo/index.tsx delete mode 100644 src/components/boris/BorisUIDemo/styles.module.scss rename src/components/{boris => common}/Superpower/index.tsx (100%) rename src/{components/boris => containers/auth/SuperPowersToggle/components}/BorisSuperpowers/index.tsx (100%) rename src/{components/boris => containers/auth/SuperPowersToggle/components}/BorisSuperpowers/styles.module.scss (100%) rename src/{components/boris => containers/boris/BorisSidebar/components/BorisContacts/components}/BorisContactItem/index.tsx (100%) rename src/{components/boris => containers/boris/BorisSidebar/components}/BorisContacts/index.tsx (94%) rename src/{components/boris => containers/boris/BorisSidebar/components}/BorisContacts/styles.module.scss (100%) rename src/{components/charts => containers/boris/BorisSidebar/components/BorisStats/components}/BasicCurveChart/index.tsx (100%) rename src/{components/boris => containers/boris/BorisSidebar/components/BorisStats/components}/BorisGraphicStats/index.tsx (92%) rename src/{components/boris => containers/boris/BorisSidebar/components/BorisStats/components}/BorisGraphicStats/styles.module.scss (100%) rename src/{components/boris => containers/boris/BorisSidebar/components/BorisStats/components}/BorisStatsBackend/index.tsx (97%) rename src/{components/boris => containers/boris/BorisSidebar/components/BorisStats/components}/BorisStatsBackend/styles.module.scss (100%) rename src/{components/boris => containers/boris/BorisSidebar/components/BorisStats/components}/BorisStatsGit/index.tsx (100%) rename src/{components/boris => containers/boris/BorisSidebar/components/BorisStats/components}/BorisStatsGit/styles.module.scss (100%) rename src/{components/boris => containers/boris/BorisSidebar/components/BorisStats/components}/BorisStatsGitCard/index.tsx (100%) rename src/{components/boris => containers/boris/BorisSidebar/components/BorisStats/components}/BorisStatsGitCard/styles.module.scss (100%) rename src/{components/charts => containers/boris/BorisSidebar/components/BorisStats/components}/StatsCard/index.tsx (100%) rename src/{components/charts => containers/boris/BorisSidebar/components/BorisStats/components}/StatsCard/styles.module.scss (100%) rename src/{components/charts => containers/boris/BorisSidebar/components/BorisStats/components}/StatsCountdownCard/index.tsx (77%) rename src/{components/charts => containers/boris/BorisSidebar/components/BorisStats/components}/StatsCountdownCard/styles.module.scss (100%) rename src/{components/charts => containers/boris/BorisSidebar/components/BorisStats/components}/StatsGraphCard/index.tsx (86%) rename src/{components/charts => containers/boris/BorisSidebar/components/BorisStats/components}/StatsGraphCard/styles.module.scss (100%) rename src/{components/boris => containers/boris/BorisSidebar/components}/BorisStats/index.tsx (76%) diff --git a/src/components/boris/BorisUIDemo/index.tsx b/src/components/boris/BorisUIDemo/index.tsx deleted file mode 100644 index da05bf29..00000000 --- a/src/components/boris/BorisUIDemo/index.tsx +++ /dev/null @@ -1,77 +0,0 @@ -import { FC, useState } from 'react'; - -import { Card } from '~/components/containers/Card'; -import { Group } from '~/components/containers/Group'; -import { Button } from '~/components/input/Button'; -import { InputText } from '~/components/input/InputText'; -import markdown from '~/styles/common/markdown.module.scss'; - -import styles from './styles.module.scss'; - -interface IProps {} - -const BorisUIDemo: FC = () => { - const [text, setText] = useState(''); - - return ( - -
-

UI

-

- Простая демонстрация элементов интерфейса. Используется, в основном, - как подсказка при разработке -

- -

Инпуты

- -
- - - - - -
- -

Кнопки

- -

Цвета

- - - - - - - - -

Размеры

- - - - - - - - - -

Варианты

- - - - - -
- - ); -}; - -export { BorisUIDemo }; diff --git a/src/components/boris/BorisUIDemo/styles.module.scss b/src/components/boris/BorisUIDemo/styles.module.scss deleted file mode 100644 index d47657f9..00000000 --- a/src/components/boris/BorisUIDemo/styles.module.scss +++ /dev/null @@ -1,14 +0,0 @@ -@import 'src/styles/variables.scss'; - -.card { - flex: 3; - align-self: stretch; - position: relative; - z-index: 1; - padding: 20px 30px; - background-color: $content_bg_lighter; -} - -.sample { - flex-wrap: wrap; -} diff --git a/src/components/boris/Superpower/index.tsx b/src/components/common/Superpower/index.tsx similarity index 100% rename from src/components/boris/Superpower/index.tsx rename to src/components/common/Superpower/index.tsx diff --git a/src/components/boris/BorisSuperpowers/index.tsx b/src/containers/auth/SuperPowersToggle/components/BorisSuperpowers/index.tsx similarity index 100% rename from src/components/boris/BorisSuperpowers/index.tsx rename to src/containers/auth/SuperPowersToggle/components/BorisSuperpowers/index.tsx diff --git a/src/components/boris/BorisSuperpowers/styles.module.scss b/src/containers/auth/SuperPowersToggle/components/BorisSuperpowers/styles.module.scss similarity index 100% rename from src/components/boris/BorisSuperpowers/styles.module.scss rename to src/containers/auth/SuperPowersToggle/components/BorisSuperpowers/styles.module.scss diff --git a/src/containers/auth/SuperPowersToggle/index.tsx b/src/containers/auth/SuperPowersToggle/index.tsx index 9db3826d..69baafda 100644 --- a/src/containers/auth/SuperPowersToggle/index.tsx +++ b/src/containers/auth/SuperPowersToggle/index.tsx @@ -2,10 +2,11 @@ import { FC } from 'react'; import { observer } from 'mobx-react-lite'; -import { BorisSuperpowers } from '~/components/boris/BorisSuperpowers'; import { useAuth } from '~/hooks/auth/useAuth'; import { useSuperPowers } from '~/hooks/auth/useSuperPowers'; +import { BorisSuperpowers } from './components/BorisSuperpowers'; + interface SuperPowersToggleProps {} const SuperPowersToggle: FC = observer(() => { diff --git a/src/components/boris/BorisContactItem/index.tsx b/src/containers/boris/BorisSidebar/components/BorisContacts/components/BorisContactItem/index.tsx similarity index 100% rename from src/components/boris/BorisContactItem/index.tsx rename to src/containers/boris/BorisSidebar/components/BorisContacts/components/BorisContactItem/index.tsx diff --git a/src/components/boris/BorisContacts/index.tsx b/src/containers/boris/BorisSidebar/components/BorisContacts/index.tsx similarity index 94% rename from src/components/boris/BorisContacts/index.tsx rename to src/containers/boris/BorisSidebar/components/BorisContacts/index.tsx index 0a033b2a..cf6dff3b 100644 --- a/src/components/boris/BorisContacts/index.tsx +++ b/src/containers/boris/BorisSidebar/components/BorisContacts/index.tsx @@ -1,9 +1,9 @@ import React, { FC } from 'react'; -import { BorisContactItem } from '~/components/boris/BorisContactItem'; import { Padder } from '~/components/containers/Padder'; import { Button } from '~/components/input/Button'; +import { BorisContactItem } from './components/BorisContactItem'; import styles from './styles.module.scss'; interface Props { diff --git a/src/components/boris/BorisContacts/styles.module.scss b/src/containers/boris/BorisSidebar/components/BorisContacts/styles.module.scss similarity index 100% rename from src/components/boris/BorisContacts/styles.module.scss rename to src/containers/boris/BorisSidebar/components/BorisContacts/styles.module.scss diff --git a/src/components/charts/BasicCurveChart/index.tsx b/src/containers/boris/BorisSidebar/components/BorisStats/components/BasicCurveChart/index.tsx similarity index 100% rename from src/components/charts/BasicCurveChart/index.tsx rename to src/containers/boris/BorisSidebar/components/BorisStats/components/BasicCurveChart/index.tsx diff --git a/src/components/boris/BorisGraphicStats/index.tsx b/src/containers/boris/BorisSidebar/components/BorisStats/components/BorisGraphicStats/index.tsx similarity index 92% rename from src/components/boris/BorisGraphicStats/index.tsx rename to src/containers/boris/BorisSidebar/components/BorisStats/components/BorisGraphicStats/index.tsx index 542630bd..a87fe6ca 100644 --- a/src/components/boris/BorisGraphicStats/index.tsx +++ b/src/containers/boris/BorisSidebar/components/BorisStats/components/BorisGraphicStats/index.tsx @@ -1,7 +1,6 @@ import React, { VFC } from 'react'; - -import { StatsGraphCard } from '~/components/charts/StatsGraphCard'; +import { StatsGraphCard } from '../StatsGraphCard'; import styles from './styles.module.scss'; diff --git a/src/components/boris/BorisGraphicStats/styles.module.scss b/src/containers/boris/BorisSidebar/components/BorisStats/components/BorisGraphicStats/styles.module.scss similarity index 100% rename from src/components/boris/BorisGraphicStats/styles.module.scss rename to src/containers/boris/BorisSidebar/components/BorisStats/components/BorisGraphicStats/styles.module.scss diff --git a/src/components/boris/BorisStatsBackend/index.tsx b/src/containers/boris/BorisSidebar/components/BorisStats/components/BorisStatsBackend/index.tsx similarity index 97% rename from src/components/boris/BorisStatsBackend/index.tsx rename to src/containers/boris/BorisSidebar/components/BorisStats/components/BorisStatsBackend/index.tsx index e63e3534..2ba4bfbc 100644 --- a/src/components/boris/BorisStatsBackend/index.tsx +++ b/src/containers/boris/BorisSidebar/components/BorisStats/components/BorisStatsBackend/index.tsx @@ -1,11 +1,12 @@ import { FC, useMemo } from 'react'; -import { BorisGraphicStats } from '~/components/boris/BorisGraphicStats'; import { StatsRow } from '~/components/common/StatsRow'; import { SubTitle } from '~/components/common/SubTitle'; import { StatBackend } from '~/types/boris'; import { sizeOf } from '~/utils/dom'; +import { BorisGraphicStats } from '../BorisGraphicStats'; + import styles from './styles.module.scss'; interface IProps { diff --git a/src/components/boris/BorisStatsBackend/styles.module.scss b/src/containers/boris/BorisSidebar/components/BorisStats/components/BorisStatsBackend/styles.module.scss similarity index 100% rename from src/components/boris/BorisStatsBackend/styles.module.scss rename to src/containers/boris/BorisSidebar/components/BorisStats/components/BorisStatsBackend/styles.module.scss diff --git a/src/components/boris/BorisStatsGit/index.tsx b/src/containers/boris/BorisSidebar/components/BorisStats/components/BorisStatsGit/index.tsx similarity index 100% rename from src/components/boris/BorisStatsGit/index.tsx rename to src/containers/boris/BorisSidebar/components/BorisStats/components/BorisStatsGit/index.tsx diff --git a/src/components/boris/BorisStatsGit/styles.module.scss b/src/containers/boris/BorisSidebar/components/BorisStats/components/BorisStatsGit/styles.module.scss similarity index 100% rename from src/components/boris/BorisStatsGit/styles.module.scss rename to src/containers/boris/BorisSidebar/components/BorisStats/components/BorisStatsGit/styles.module.scss diff --git a/src/components/boris/BorisStatsGitCard/index.tsx b/src/containers/boris/BorisSidebar/components/BorisStats/components/BorisStatsGitCard/index.tsx similarity index 100% rename from src/components/boris/BorisStatsGitCard/index.tsx rename to src/containers/boris/BorisSidebar/components/BorisStats/components/BorisStatsGitCard/index.tsx diff --git a/src/components/boris/BorisStatsGitCard/styles.module.scss b/src/containers/boris/BorisSidebar/components/BorisStats/components/BorisStatsGitCard/styles.module.scss similarity index 100% rename from src/components/boris/BorisStatsGitCard/styles.module.scss rename to src/containers/boris/BorisSidebar/components/BorisStats/components/BorisStatsGitCard/styles.module.scss diff --git a/src/components/charts/StatsCard/index.tsx b/src/containers/boris/BorisSidebar/components/BorisStats/components/StatsCard/index.tsx similarity index 100% rename from src/components/charts/StatsCard/index.tsx rename to src/containers/boris/BorisSidebar/components/BorisStats/components/StatsCard/index.tsx diff --git a/src/components/charts/StatsCard/styles.module.scss b/src/containers/boris/BorisSidebar/components/BorisStats/components/StatsCard/styles.module.scss similarity index 100% rename from src/components/charts/StatsCard/styles.module.scss rename to src/containers/boris/BorisSidebar/components/BorisStats/components/StatsCard/styles.module.scss diff --git a/src/components/charts/StatsCountdownCard/index.tsx b/src/containers/boris/BorisSidebar/components/BorisStats/components/StatsCountdownCard/index.tsx similarity index 77% rename from src/components/charts/StatsCountdownCard/index.tsx rename to src/containers/boris/BorisSidebar/components/BorisStats/components/StatsCountdownCard/index.tsx index 74512f88..fde1abd8 100644 --- a/src/components/charts/StatsCountdownCard/index.tsx +++ b/src/containers/boris/BorisSidebar/components/BorisStats/components/StatsCountdownCard/index.tsx @@ -3,21 +3,29 @@ import React, { VFC } from 'react'; import classNames from 'classnames'; import { addYears, differenceInMonths, differenceInYears } from 'date-fns'; -import { StatsCard } from '~/components/charts/StatsCard'; import { CardProps } from '~/components/containers/Card'; +import { StatsCard } from '../StatsCard'; + import styles from './styles.module.scss'; interface StatsCountdownCardProps extends CardProps { since: Date; } -const StatsCountdownCard: VFC = ({ since, ...props }) => { +const StatsCountdownCard: VFC = ({ + since, + ...props +}) => { const years = differenceInYears(new Date(), since); const months = differenceInMonths(new Date(), addYears(since, years)); return ( - +
{years > 0 && ( <> diff --git a/src/components/charts/StatsCountdownCard/styles.module.scss b/src/containers/boris/BorisSidebar/components/BorisStats/components/StatsCountdownCard/styles.module.scss similarity index 100% rename from src/components/charts/StatsCountdownCard/styles.module.scss rename to src/containers/boris/BorisSidebar/components/BorisStats/components/StatsCountdownCard/styles.module.scss diff --git a/src/components/charts/StatsGraphCard/index.tsx b/src/containers/boris/BorisSidebar/components/BorisStats/components/StatsGraphCard/index.tsx similarity index 86% rename from src/components/charts/StatsGraphCard/index.tsx rename to src/containers/boris/BorisSidebar/components/BorisStats/components/StatsGraphCard/index.tsx index 33d2c6b9..af7c449c 100644 --- a/src/components/charts/StatsGraphCard/index.tsx +++ b/src/containers/boris/BorisSidebar/components/BorisStats/components/StatsGraphCard/index.tsx @@ -1,10 +1,11 @@ import React, { VFC } from 'react'; -import { BasicCurveChart } from '~/components/charts/BasicCurveChart'; -import { StatsCard } from '~/components/charts/StatsCard'; import { CardProps } from '~/components/containers/Card'; import { Filler } from '~/components/containers/Filler'; +import { BasicCurveChart } from '../BasicCurveChart'; +import { StatsCard } from '../StatsCard'; + import styles from './styles.module.scss'; interface StatsGraphCardProps extends CardProps { diff --git a/src/components/charts/StatsGraphCard/styles.module.scss b/src/containers/boris/BorisSidebar/components/BorisStats/components/StatsGraphCard/styles.module.scss similarity index 100% rename from src/components/charts/StatsGraphCard/styles.module.scss rename to src/containers/boris/BorisSidebar/components/BorisStats/components/StatsGraphCard/styles.module.scss diff --git a/src/components/boris/BorisStats/index.tsx b/src/containers/boris/BorisSidebar/components/BorisStats/index.tsx similarity index 76% rename from src/components/boris/BorisStats/index.tsx rename to src/containers/boris/BorisSidebar/components/BorisStats/index.tsx index 242e1db7..3284aed0 100644 --- a/src/components/boris/BorisStats/index.tsx +++ b/src/containers/boris/BorisSidebar/components/BorisStats/index.tsx @@ -2,8 +2,8 @@ import React, { FC } from 'react'; import { BorisUsageStats } from '~/types/boris'; -import { BorisStatsBackend } from '../BorisStatsBackend'; -import { BorisStatsGit } from '../BorisStatsGit'; +import { BorisStatsBackend } from './components/BorisStatsBackend'; +import { BorisStatsGit } from './components/BorisStatsGit'; interface IProps { stats: BorisUsageStats; diff --git a/src/containers/boris/BorisSidebar/index.tsx b/src/containers/boris/BorisSidebar/index.tsx index 6e37b04b..2bd68d27 100644 --- a/src/containers/boris/BorisSidebar/index.tsx +++ b/src/containers/boris/BorisSidebar/index.tsx @@ -1,12 +1,12 @@ import { FC } from 'react'; -import { BorisContacts } from '~/components/boris/BorisContacts'; -import { BorisStats } from '~/components/boris/BorisStats'; import { Group } from '~/components/containers/Group'; import { SuperPowersToggle } from '~/containers/auth/SuperPowersToggle'; import { useTelegramAccount } from '~/hooks/auth/useTelegramAccount'; import { BorisUsageStats } from '~/types/boris'; +import { BorisContacts } from './components/BorisContacts'; +import { BorisStats } from './components/BorisStats'; import styles from './styles.module.scss'; interface Props { diff --git a/src/containers/flow/FlowStamp/index.tsx b/src/containers/flow/FlowStamp/index.tsx index 38f8b69d..b3aaab47 100644 --- a/src/containers/flow/FlowStamp/index.tsx +++ b/src/containers/flow/FlowStamp/index.tsx @@ -2,7 +2,7 @@ import React, { FC, FormEvent, useCallback, useMemo } from 'react'; import classNames from 'classnames'; -import { Superpower } from '~/components/boris/Superpower'; +import { Superpower } from '~/components/common/Superpower'; import { Group } from '~/components/containers/Group'; import { FlowRecent } from '~/components/flow/FlowRecent'; import { FlowSearchResults } from '~/components/flow/FlowSearchResults'; @@ -38,22 +38,27 @@ const FlowStamp: FC = ({ isFluid, onToggleLayout }) => { const onClearSearch = useCallback(() => setSearchText(''), [setSearchText]); const onKeyUp = useCallback( - event => { + (event) => { if (event.key !== 'Escape') return; onClearSearch(); event.target.blur(); }, - [onClearSearch] + [onClearSearch], ); const after = useMemo( () => searchText ? ( - + ) : ( ), - [onClearSearch, searchText] + [onClearSearch, searchText], ); return ( @@ -102,7 +107,11 @@ const FlowStamp: FC = ({ isFluid, onToggleLayout }) => { {experimentalFeatures.liquidFlow && (
- +
Жидкое течение
 diff --git a/src/containers/settings/UserSettingsView/index.tsx b/src/containers/settings/UserSettingsView/index.tsx index b7ffc947..f1aa3aea 100644 --- a/src/containers/settings/UserSettingsView/index.tsx +++ b/src/containers/settings/UserSettingsView/index.tsx @@ -1,6 +1,6 @@ import { FC } from 'react'; -import { Superpower } from '~/components/boris/Superpower'; +import { Superpower } from '~/components/common/Superpower'; import { Filler } from '~/components/containers/Filler'; import { Group } from '~/components/containers/Group'; import { Zone } from '~/components/containers/Zone'; diff --git a/src/layouts/BorisLayout/index.tsx b/src/layouts/BorisLayout/index.tsx index 29102458..87384ce0 100644 --- a/src/layouts/BorisLayout/index.tsx +++ b/src/layouts/BorisLayout/index.tsx @@ -2,7 +2,7 @@ import { FC } from 'react'; import { observer } from 'mobx-react-lite'; -import { Superpower } from '~/components/boris/Superpower'; +import { Superpower } from '~/components/common/Superpower'; import { Card } from '~/components/containers/Card'; import { Group } from '~/components/containers/Group'; import { Sticky } from '~/components/containers/Sticky'; diff --git a/src/layouts/NodeLayout/index.tsx b/src/layouts/NodeLayout/index.tsx index 6d360d54..961cfd66 100644 --- a/src/layouts/NodeLayout/index.tsx +++ b/src/layouts/NodeLayout/index.tsx @@ -2,8 +2,8 @@ import React, { useCallback } from 'react'; import { observer } from 'mobx-react-lite'; -import { Superpower } from '~/components/boris/Superpower'; import { ScrollHelperBottom } from '~/components/common/ScrollHelperBottom'; +import { Superpower } from '~/components/common/Superpower'; import { Card } from '~/components/containers/Card'; import { Footer } from '~/components/main/Footer'; import { NodeTitle } from '~/components/node/NodeTitle';