Merge pull request #3520 from influxdata/log-viewer/layout

Layout Scaffolding for Logs Viewer
pull/10616/head
Alex Paxton 2018-05-23 15:20:11 -07:00 committed by GitHub
commit 6c0d7984e4
7 changed files with 83 additions and 4 deletions

View File

@ -103,7 +103,7 @@ export class DataExplorer extends PureComponent<Props, State> {
const {showWriteForm} = this.state const {showWriteForm} = this.state
return ( return (
<div className="data-explorer"> <>
{showWriteForm ? ( {showWriteForm ? (
<OverlayTechnologies> <OverlayTechnologies>
<WriteDataForm <WriteDataForm
@ -150,7 +150,7 @@ export class DataExplorer extends PureComponent<Props, State> {
editQueryStatus={queryConfigActions.editQueryStatus} editQueryStatus={queryConfigActions.editQueryStatus}
/> />
</ResizeContainer> </ResizeContainer>
</div> </>
) )
} }

View File

@ -0,0 +1,17 @@
import React, {PureComponent} from 'react'
interface Props {
thing: string
}
class LogsGraphContainer extends PureComponent<Props> {
public render() {
return (
<div className="logs-viewer--graph-container">
<p>{this.props.thing}</p>
</div>
)
}
}
export default LogsGraphContainer

View File

@ -0,0 +1,22 @@
import React, {PureComponent} from 'react'
interface Props {
thing: string
}
class LogsTableContainer extends PureComponent<Props> {
public render() {
return (
<>
<div className="logs-viewer--search-container">
<p>search</p>
</div>
<div className="logs-viewer--table-container">
<p>{this.props.thing}</p>
</div>
</>
)
}
}
export default LogsTableContainer

View File

@ -4,6 +4,8 @@ import {getSourceAsync, setTimeRange, setNamespace} from 'src/logs/actions'
import {getSourcesAsync} from 'src/shared/actions/sources' import {getSourcesAsync} from 'src/shared/actions/sources'
import {Source, Namespace, TimeRange} from 'src/types' import {Source, Namespace, TimeRange} from 'src/types'
import LogViewerHeader from 'src/logs/components/LogViewerHeader' import LogViewerHeader from 'src/logs/components/LogViewerHeader'
import GraphContainer from 'src/logs/components/LogsGraphContainer'
import TableContainer from 'src/logs/components/LogsTableContainer'
interface Props { interface Props {
sources: Source[] sources: Source[]
@ -30,7 +32,7 @@ class LogsPage extends PureComponent<Props> {
public render() { public render() {
return ( return (
<div className="page hosts-list-page"> <div className="page">
<div className="page-header full-width"> <div className="page-header full-width">
<div className="page-header__container"> <div className="page-header__container">
<div className="page-header__left"> <div className="page-header__left">
@ -39,6 +41,10 @@ class LogsPage extends PureComponent<Props> {
<div className="page-header__right">{this.header}</div> <div className="page-header__right">{this.header}</div>
</div> </div>
</div> </div>
<div className="page-contents logs-viewer">
<GraphContainer thing="wooo" />
<TableContainer thing="snooo" />
</div>
</div> </div>
) )
} }

View File

@ -80,7 +80,7 @@ class SideNav extends PureComponent<Props> {
<FeatureFlag name="log-viewer"> <FeatureFlag name="log-viewer">
<NavBlock <NavBlock
highlightWhen={['logs']} highlightWhen={['logs']}
icon="cubo-node" icon="text-block"
link={'/logs'} link={'/logs'}
location={location} location={location}
> >

View File

@ -83,6 +83,7 @@
@import 'pages/tickscript-editor'; @import 'pages/tickscript-editor';
@import 'pages/time-machine'; @import 'pages/time-machine';
@import 'pages/manage-providers'; @import 'pages/manage-providers';
@import 'pages/logs-viewer';
// TODO // TODO
@import 'unsorted'; @import 'unsorted';

View File

@ -0,0 +1,33 @@
/*
Styles for Logs Viewer Page
----------------------------------------------------------------------------
*/
$logs-viewer-graph-height: 240px;
$logs-viewer-search-height: 108px;
$logs-viewer-gutter: 60px;
.logs-viewer {
display: flex;
flex-direction: column;
align-items: stretch;
flex-wrap: none;
}
.logs-viewer--graph-container {
padding: 30px $logs-viewer-gutter 18px $logs-viewer-gutter;
height: $logs-viewer-graph-height;
@include gradient-v($g2-kevlar, $g0-obsidian);
}
.logs-viewer--search-container {
padding: 20px $logs-viewer-gutter;
height: $logs-viewer-search-height;
background-color: $g3-castle;
}
.logs-viewer--table-container {
padding: 12px $logs-viewer-gutter 30px $logs-viewer-gutter;
height: calc(100% - #{$logs-viewer-graph-height + $logs-viewer-search-height});
background-color: $g3-castle;
}