diff --git a/public/images/muro_is_lost.svg b/public/images/muro_is_lost.svg index be52b796..f8c57bc0 100644 --- a/public/images/muro_is_lost.svg +++ b/public/images/muro_is_lost.svg @@ -2,18 +2,18 @@ + width="1920" + height="1080" + viewBox="0 0 507.99999 285.75001" + version="1.1" + id="svg5" + sodipodi:docname="muro_is_lost.svg" + inkscape:version="1.2-dev (9ee32be, 2021-06-19)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" +> = ({ user }) => {
~{user.username}
- {isActive ? 'в сознании' : 'деактивирован'} + {isActive ? 'юнит в сознании' : 'юнит деактивирован'}
diff --git a/src/containers/profile/ProfileQuickInfo/styles.module.scss b/src/containers/profile/ProfileQuickInfo/styles.module.scss index e1368da5..70d3e8f7 100644 --- a/src/containers/profile/ProfileQuickInfo/styles.module.scss +++ b/src/containers/profile/ProfileQuickInfo/styles.module.scss @@ -24,15 +24,18 @@ div.top.top { .username { font: $font_12_regular; opacity: 0.5; + text-transform: lowercase; } .fullname { margin-bottom: 3px; + text-transform: capitalize; } .status { font: $font_12_regular; margin-top: $gap; + color: darken(white, 50%); &.active { color: $olive; diff --git a/src/containers/profile/ProfileSidebarMenu/index.tsx b/src/containers/profile/ProfileSidebarMenu/index.tsx index 97481c7b..e7a4884c 100644 --- a/src/containers/profile/ProfileSidebarMenu/index.tsx +++ b/src/containers/profile/ProfileSidebarMenu/index.tsx @@ -2,10 +2,7 @@ import React, { VFC } from 'react'; import classNames from 'classnames'; -import { Square } from '~/components/common/Square'; -import { Card } from '~/components/containers/Card'; import { Filler } from '~/components/containers/Filler'; -import { Grid } from '~/components/containers/Grid'; import { Group } from '~/components/containers/Group'; import { Button } from '~/components/input/Button'; import { VerticalMenu } from '~/components/menu/VerticalMenu'; diff --git a/src/containers/settings/SettingsNotes/index.tsx b/src/containers/settings/SettingsNotes/index.tsx index 6006eb7b..418871b5 100644 --- a/src/containers/settings/SettingsNotes/index.tsx +++ b/src/containers/settings/SettingsNotes/index.tsx @@ -1,12 +1,9 @@ import React, { useState, VFC } from 'react'; -import Masonry from 'react-masonry-css'; - import { Card } from '~/components/containers/Card'; import { Columns } from '~/components/containers/Columns'; import { Filler } from '~/components/containers/Filler'; import { Group } from '~/components/containers/Group'; -import { Markdown } from '~/components/containers/Markdown'; import { Padder } from '~/components/containers/Padder'; import { Button } from '~/components/input/Button'; import { Icon } from '~/components/input/Icon'; @@ -15,9 +12,6 @@ import { Textarea } from '~/components/input/Textarea'; import { HorizontalMenu } from '~/components/menu/HorizontalMenu'; import { NoteCard } from '~/components/notes/NoteCard'; import { useGetNotes } from '~/hooks/notes/useGetNotes'; -import { formatText } from '~/utils/dom'; - -import styles from './styles.module.scss'; interface SettingsNotesProps {} diff --git a/src/hooks/color/useColorGradientFromString.ts b/src/hooks/color/useColorGradientFromString.ts index daa35deb..b94864f1 100644 --- a/src/hooks/color/useColorGradientFromString.ts +++ b/src/hooks/color/useColorGradientFromString.ts @@ -1,9 +1,6 @@ import { useMemo } from 'react'; -import { adjustHue } from 'color2k'; - -import { generateGradientFromColor, normalizeBrightColor } from '~/utils/color'; -import { stringToColour } from '~/utils/dom'; +import { generateGradientFromColor } from '~/utils/color'; export const useColorGradientFromString = ( val?: string, diff --git a/src/hooks/comments/useNodeComments.ts b/src/hooks/comments/useNodeComments.ts index 419f0bff..c7e2063d 100644 --- a/src/hooks/comments/useNodeComments.ts +++ b/src/hooks/comments/useNodeComments.ts @@ -6,10 +6,15 @@ import { IComment } from '~/types'; import { showErrorToast } from '~/utils/errors/showToast'; export const useNodeComments = (nodeId: number, fallbackData?: IComment[]) => { - const { comments, isLoading, onLoadMoreComments, hasMore, data, mutate, isLoadingMore } = useGetComments( - nodeId, - fallbackData - ); + const { + comments, + isLoading, + onLoadMoreComments, + hasMore, + data, + mutate, + isLoadingMore, + } = useGetComments(nodeId, fallbackData); const onDelete = useCallback( async (id: IComment['id'], isLocked: boolean) => { diff --git a/src/hooks/notes/useGetNotes.ts b/src/hooks/notes/useGetNotes.ts index 2ff6cf73..072ba34f 100644 --- a/src/hooks/notes/useGetNotes.ts +++ b/src/hooks/notes/useGetNotes.ts @@ -1,13 +1,10 @@ import { useCallback, useMemo } from 'react'; import useSWRInfinite, { SWRInfiniteKeyLoader } from 'swr/infinite'; - -import { getLabNodes } from '~/api/lab'; import { apiGetNotes } from '~/api/notes'; import { ApiGetNotesRequest } from '~/api/notes/types'; import { useAuth } from '~/hooks/auth/useAuth'; -import { useUser } from '~/hooks/auth/useUser'; -import { GetLabNodesRequest, ILabNode, LabNodesSort } from '~/types/lab'; +import { GetLabNodesRequest, ILabNode } from '~/types/lab'; import { flatten, uniqBy } from '~/utils/ramda'; const DEFAULT_COUNT = 20; diff --git a/src/layouts/LabLayout/index.tsx b/src/layouts/LabLayout/index.tsx index 939529fa..bc9729dd 100644 --- a/src/layouts/LabLayout/index.tsx +++ b/src/layouts/LabLayout/index.tsx @@ -1,6 +1,4 @@ import React, { FC } from 'react'; - -import { Superpower } from '~/components/boris/Superpower'; import { Group } from '~/components/containers/Group'; import { Sticky } from '~/components/containers/Sticky'; import { LabHead } from '~/components/lab/LabHead'; diff --git a/src/types/lab/index.ts b/src/types/lab/index.ts index 9d120d66..f4f3653c 100644 --- a/src/types/lab/index.ts +++ b/src/types/lab/index.ts @@ -1,4 +1,4 @@ -import { IError, INode, ITag } from '~/types'; +import { INode, ITag } from '~/types'; export enum LabNodesSort { New = 'new',