From e7306eae79402bdc6f4376e026f7f33022f800fa Mon Sep 17 00:00:00 2001 From: goodmice Date: Mon, 12 Sep 2022 12:40:59 +0500 Subject: [PATCH 1/2] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?= =?UTF-8?q?=D0=BE=D1=87=D0=B8=D1=81=D1=82=D0=BA=D0=B8=20=D0=BE=D0=BF=D0=B5?= =?UTF-8?q?=D1=80=D0=B0=D1=86=D0=B8=D0=B9=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4?= =?UTF-8?q?=20=D0=B8=D0=BC=D0=BF=D0=BE=D1=80=D1=82=D0=BE=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/WellOperations/ImportOperations.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/WellOperations/ImportOperations.jsx b/src/pages/WellOperations/ImportOperations.jsx index cc0062b..304be1a 100755 --- a/src/pages/WellOperations/ImportOperations.jsx +++ b/src/pages/WellOperations/ImportOperations.jsx @@ -6,7 +6,7 @@ import { ErrorFetch } from '@components/ErrorFetch' import { UploadForm } from '@components/UploadForm' const errorTextStyle = { color: 'red', fontWeight: 'bold' } -const uploadFormStyle = { marginTop: '24px' } +const uploadFormStyle = { marginTop: 24 } export const ImportOperations = memo(({ well: givenWell, onDone }) => { const [deleteBeforeImport, setDeleteBeforeImport] = useState(false) @@ -15,7 +15,7 @@ export const ImportOperations = memo(({ well: givenWell, onDone }) => { const [wellContext] = useWell() const well = useMemo(() => givenWell ?? wellContext, [givenWell, wellContext]) - const url = useMemo(() => `/api/well/${well.id}/wellOperations/import${deleteBeforeImport ? '/1' : '/0'}`, [well]) + const url = useMemo(() => `/api/well/${well.id}/wellOperations/import/${deleteBeforeImport ? 1 : 0}`, [well, deleteBeforeImport]) const onUploadSuccess = useCallback(() => { setErrorText('') From 922a329e76bf736d42e4991f756e191b73da6ad5 Mon Sep 17 00:00:00 2001 From: goodmice Date: Mon, 12 Sep 2022 13:21:37 +0500 Subject: [PATCH 2/2] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=BE=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20?= =?UTF-8?q?=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D1=8B=20=D0=B8=20?= =?UTF-8?q?=D0=BB=D0=BE=D0=B3=D0=BE=D1=82=D0=B8=D0=BF=20=D0=B2=20=D1=88?= =?UTF-8?q?=D0=B0=D0=BF=D0=BA=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 2 +- src/images/Logo.tsx | 8 +++++--- src/images/dd_logo_white_opt.svg | 1 + src/styles/App.less | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 src/images/dd_logo_white_opt.svg diff --git a/public/index.html b/public/index.html index cd94b2e..492d903 100755 --- a/public/index.html +++ b/public/index.html @@ -8,7 +8,7 @@ - АСБ Vision + DDrilling diff --git a/src/images/Logo.tsx b/src/images/Logo.tsx index 88e8540..216a81b 100755 --- a/src/images/Logo.tsx +++ b/src/images/Logo.tsx @@ -1,9 +1,11 @@ import { memo } from 'react' -import logo from '@images/logo_32.png' +import { ReactComponent as AsbLogo } from '@images/dd_logo_white_opt.svg' -export const Logo = memo, HTMLImageElement>>((props) => ( - {'АСБ'} +export type LogoProps = React.SVGProps & { size?: number } + +export const Logo = memo(({ size = 200, ...props }) => ( + )) export default Logo diff --git a/src/images/dd_logo_white_opt.svg b/src/images/dd_logo_white_opt.svg new file mode 100644 index 0000000..d19dc00 --- /dev/null +++ b/src/images/dd_logo_white_opt.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/styles/App.less b/src/styles/App.less index cc55b30..0b8e681 100755 --- a/src/styles/App.less +++ b/src/styles/App.less @@ -74,7 +74,7 @@ html { .header .title{ flex-grow: 1; color: #fff; - padding-left: 450px; + padding-left: calc(100vw / 2 - 400px); } .header button{