From 26222104b71f226be43ee65bf83ceb6edd97a275 Mon Sep 17 00:00:00 2001 From: goodmice Date: Tue, 25 Oct 2022 18:53:37 +0500 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=D0=BD=D0=BE=20=D0=BB=D0=BE=D0=B3=D0=BE=20(=D0=B4=D0=BE?= =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20=D1=80=D0=B5=D0=B6=D0=B8?= =?UTF-8?q?=D0=BC=20=D0=B1=D0=B5=D0=B7=20=D1=82=D0=B5=D0=BA=D1=81=D1=82?= =?UTF-8?q?=D0=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.tsx | 4 ++-- src/images/Logo.tsx | 41 +++++++++++++++++++++++++++++++++++++---- 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index 59c64fb..7498b86 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -20,9 +20,9 @@ const FileDownload = lazy(() => import('@pages/FileDownload')) const AdminPanel = lazy(() => import('@pages/AdminPanel')) const Deposit = lazy(() => import('@pages/Deposit')) const Cluster = lazy(() => import('@pages/Cluster')) -const Well = lazy(() => import('@asb/pages/Well')) +const Well = lazy(() => import('@pages/Well')) -//OpenAPI.BASE = 'http://localhost:3000' +// OpenAPI.BASE = 'http://localhost:3000' // TODO: Удалить взятие из 'token' в следующем релизе, вставлено для совместимости OpenAPI.TOKEN = async () => getUser().token || localStorage.getItem('token') || '' OpenAPI.HEADERS = { 'Content-Type': 'application/json' } diff --git a/src/images/Logo.tsx b/src/images/Logo.tsx index 216a81b..a85f269 100755 --- a/src/images/Logo.tsx +++ b/src/images/Logo.tsx @@ -1,11 +1,44 @@ import { memo } from 'react' -import { ReactComponent as AsbLogo } from '@images/dd_logo_white_opt.svg' +export type LogoProps = React.SVGProps & { + size?: number + onlyIcon?: boolean +} -export type LogoProps = React.SVGProps & { size?: number } +export const Logo = memo(({ size = 200, onlyIcon, ...props }) => ( + + + + + + + -export const Logo = memo(({ size = 200, ...props }) => ( - + + + + + + + + + + + + + + + + + + + + + + + + + )) export default Logo