diff --git a/src/components/WellTreeSelector.jsx b/src/components/WellTreeSelector.jsx index d78c03a..eeab7f5 100644 --- a/src/components/WellTreeSelector.jsx +++ b/src/components/WellTreeSelector.jsx @@ -65,11 +65,10 @@ export default function WellTreeSelector(props) { return ( <> { @@ -14,19 +14,18 @@ export default function PageHeader(props){ localStorage.removeItem('token') } - return( - -
- АСБ - -

Мониторинг

- - - - -
-
- ) - }; \ No newline at end of file + return( + +
+ АСБ + +

{title}

+ + + +
+
+ ) +}; \ No newline at end of file diff --git a/src/pages/LayoutPortal.jsx b/src/pages/LayoutPortal.jsx new file mode 100644 index 0000000..eb3c37e --- /dev/null +++ b/src/pages/LayoutPortal.jsx @@ -0,0 +1,39 @@ +import {Layout} from 'antd' +import PageHeader from './Header' +// import { useState, useEffect, createContext} from 'react' +// import { useParams } from 'react-router-dom' + +const {Content} = Layout + +export default function LayoutPortal({title, children}) { + // const [wells, setWells] = useState([]) + // let { id } = useParams(); + + // let updateWellsList = async () => { + // setLoader(true) + // try { + // let newWells = (await WellService.getWells()).map(w => { return { key: w.id, ...w } }) + // setWells(newWells) + // } + // catch (e) { + // console.error(`${e.message}`); + // } + // setLoader(false) + // } + + // useEffect(() => { + // updateWellsList() + // }, []) + + // const WellsContext = createContext({wells}); + + return ( + + + + + {children} + + + ) +} \ No newline at end of file diff --git a/src/pages/Main.jsx b/src/pages/Main.jsx index 8ca4432..adf515f 100644 --- a/src/pages/Main.jsx +++ b/src/pages/Main.jsx @@ -1,31 +1,25 @@ -import {Layout} from 'antd' import Wells from './Wells' -import PageHeader from './Header' import Well from "../components/Well"; +import LayoutPortal from './LayoutPortal' import {Redirect, Route, Switch} from "react-router-dom"; -const {Content} = Layout - export default function Main() { return ( - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + ) } diff --git a/src/styles/App.less b/src/styles/App.less index e8dc534..d2ef1e5 100644 --- a/src/styles/App.less +++ b/src/styles/App.less @@ -145,3 +145,18 @@ tr.table_row_size { width: 50%; margin-right: 5px; } + +.header-tree-select *{ + color: #fff; + font-size: '1.5rem'; +} + +.header-tree-select{ + border: 1px solid rgba(255, 255, 255, 0.2); + background-color: rgba(0, 0, 0, 0.3); +} + +.header-tree-select:hover{ + border: 1px solid rgba(255, 255, 255, 0.8); + background-color: rgba(0, 0, 0, 0.5); +} \ No newline at end of file diff --git a/src/styles/archive_style.css b/src/styles/archive_style.css deleted file mode 100644 index 0a5d44b..0000000 --- a/src/styles/archive_style.css +++ /dev/null @@ -1,3 +0,0 @@ -.content-sheet { - display: inline-flex; -} \ No newline at end of file