ia.novokshanov/asb_cloud_front
1
0
Fork 0
forked from ddrilling/asb_cloud_front
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into feature/well-case

Browse Source
This commit is contained in:
goodmice 2022-09-12 14:45:18 +05:00
commit 6a74544901
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/index.html
View File

@ -8,7 +8,7 @@
<meta name="theme-color" media="(prefers-color-scheme: light)" content="white" /> <meta name="theme-color" media="(prefers-color-scheme: light)" content="white" />
<meta name="theme-color" media="(prefers-color-scheme: dark)" content="black" /> <meta name="theme-color" media="(prefers-color-scheme: dark)" content="black" />
<meta name="description" content="Онлайн мониторинг процесса бурения в реальном времени в офисе заказчика" /> <meta name="description" content="Онлайн мониторинг процесса бурения в реальном времени в офисе заказчика" />
<title>АСБ Vision</title> <title>DDrilling</title>
</head> </head>
<body> <body>
<noscript>You need to enable JavaScript to run this app.</noscript> <noscript>You need to enable JavaScript to run this app.</noscript>

8
src/images/Logo.tsx
View File

@ -1,9 +1,11 @@
import { memo } from 'react' 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<React.DetailedHTMLProps<React.ImgHTMLAttributes<HTMLImageElement>, HTMLImageElement>>((props) => ( export type LogoProps = React.SVGProps<SVGSVGElement> & { size?: number }
<img src={logo} alt={'АСБ'} className={'logo'} {...props} />
export const Logo = memo<LogoProps>(({ size = 200, ...props }) => (
<AsbLogo className={'logo'} height={'100%'} {...props} />
)) ))
export default Logo export default Logo

1
src/images/dd_logo_white_opt.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 8.4 KiB

4
src/pages/WellOperations/ImportOperations.jsx
View File

@ -6,7 +6,7 @@ import { ErrorFetch } from '@components/ErrorFetch'
import { UploadForm } from '@components/UploadForm' import { UploadForm } from '@components/UploadForm'
const errorTextStyle = { color: 'red', fontWeight: 'bold' } const errorTextStyle = { color: 'red', fontWeight: 'bold' }
const uploadFormStyle = { marginTop: '24px' } const uploadFormStyle = { marginTop: 24 }
export const ImportOperations = memo(({ well: givenWell, onDone }) => { export const ImportOperations = memo(({ well: givenWell, onDone }) => {
const [deleteBeforeImport, setDeleteBeforeImport] = useState(false) const [deleteBeforeImport, setDeleteBeforeImport] = useState(false)
@ -15,7 +15,7 @@ export const ImportOperations = memo(({ well: givenWell, onDone }) => {
const [wellContext] = useWell() const [wellContext] = useWell()
const well = useMemo(() => givenWell ?? wellContext, [givenWell, wellContext]) 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(() => { const onUploadSuccess = useCallback(() => {
setErrorText('') setErrorText('')

2
src/styles/App.less
View File

@ -74,7 +74,7 @@ html {
.header .title{ .header .title{
flex-grow: 1; flex-grow: 1;
color: #fff; color: #fff;
padding-left: 450px; padding-left: calc(100vw / 2 - 400px);
} }
.header button{ .header button{