ISSUE-001 - Have tool page constructed with grid and added some basic scrolling rules for minimum UI size requirements.
This commit is contained in:
1 parent
c3b268da61
commit
4d35b57a77
7 files changed
+79
-63
No files matched your search
@@ -1,58 +1,43 @@
|
||||
import { Stack } from "@bedrock-layout/stack";
|
||||
import { Column, Columns } from "@bedrock-layout/columns";
|
||||
|
||||
import { MockupBlock } from "../../Common/MockupBlock.styled";
|
||||
import { ExpandedStack, ExpandedBlock } from "./styles";
|
||||
import { LayoutGrid, LayoutGridItem } from "./styles";
|
||||
|
||||
type LayoutProps = {
|
||||
headerHeight?: number,
|
||||
};
|
||||
|
||||
export function Layout({ headerHeight }: LayoutProps) {
|
||||
const headerOffset = headerHeight ? headerHeight + 5 : 0;
|
||||
|
||||
return (
|
||||
<Stack gutter="none">
|
||||
<Columns gutter="none" columns={7} dense>
|
||||
<LayoutGrid headerOffset={headerHeight} columns={6} rows={10}>
|
||||
<LayoutGridItem column={1} row={1} rowSpan={6}>
|
||||
<MockupBlock
|
||||
color="#f7aeae"
|
||||
minWidth="200px"
|
||||
minHeight={`calc(65vh - ${headerOffset}px)`}
|
||||
>Timing Board UI</MockupBlock>
|
||||
<Column span={6}>
|
||||
<MockupBlock
|
||||
color="#c5c5c5"
|
||||
minHeight="100%"
|
||||
>Video Feed</MockupBlock>
|
||||
</Column>
|
||||
</Columns>
|
||||
<Columns gutter="none" columns={7} dense>
|
||||
<Column span={1}>
|
||||
<ExpandedStack>
|
||||
<ExpandedBlock>
|
||||
<MockupBlock
|
||||
color="#5576e2"
|
||||
minWidth="200px"
|
||||
minHeight="200px"
|
||||
height="20vh"
|
||||
>Race Status UI</MockupBlock>
|
||||
</ExpandedBlock>
|
||||
<ExpandedBlock>
|
||||
<MockupBlock
|
||||
color="#bc62ce"
|
||||
minHeight="40px"
|
||||
height="15vh"
|
||||
>Race Director UI</MockupBlock>
|
||||
</ExpandedBlock>
|
||||
</ExpandedStack>
|
||||
</Column>
|
||||
<Column span={6}>
|
||||
<MockupBlock
|
||||
color="#4d828b"
|
||||
minHeight="35vh"
|
||||
>Broadcast Director UI</MockupBlock>
|
||||
</Column>
|
||||
</Columns>
|
||||
</Stack>
|
||||
</LayoutGridItem>
|
||||
|
||||
<LayoutGridItem column={2} row={1} columnSpan={5} rowSpan={6} >
|
||||
<MockupBlock
|
||||
color="#c5c5c5"
|
||||
>Video Feed</MockupBlock>
|
||||
</LayoutGridItem>
|
||||
|
||||
<LayoutGridItem column={1} row={7} rowSpan={3}>
|
||||
<MockupBlock
|
||||
color="#5576e2"
|
||||
>Race Status UI</MockupBlock>
|
||||
</LayoutGridItem>
|
||||
|
||||
<LayoutGridItem column={1} row={10}>
|
||||
<MockupBlock
|
||||
color="#bc62ce"
|
||||
>Race Director UI</MockupBlock>
|
||||
</LayoutGridItem>
|
||||
|
||||
<LayoutGridItem column={2} row={7} columnSpan={5} rowSpan={4}>
|
||||
<MockupBlock
|
||||
color="#4d828b"
|
||||
>Broadcast Director UI</MockupBlock>
|
||||
</LayoutGridItem>
|
||||
</LayoutGrid>
|
||||
);
|
||||
}
|
||||
@@ -1,14 +1,29 @@
|
||||
import styled from "styled-components";
|
||||
|
||||
export const ExpandedStack = styled.div`
|
||||
display: flex;
|
||||
flex-flow: column;
|
||||
/* height: 100%; */
|
||||
type LayoutGridProps = {
|
||||
columns?: number,
|
||||
rows?: number,
|
||||
headerOffset?: number,
|
||||
};
|
||||
export const LayoutGrid = styled.div<LayoutGridProps>`
|
||||
--columns: ${({ columns = 1 }) => columns};
|
||||
--rows: ${({ rows = 1 }) => rows};
|
||||
display: grid;
|
||||
grid-template-columns: repeat(var(--columns), 1fr);
|
||||
grid-template-rows: repeat(var(--rows), 1fr);
|
||||
height: calc(100% - ${({ headerOffset = 0 }) => headerOffset}px);
|
||||
width: 100%;
|
||||
`;
|
||||
|
||||
export const ExpandedBlock = styled.div`
|
||||
/* flex: 1 1 auto; */
|
||||
flex-grow: 1;
|
||||
/* flex-shrink: 1;
|
||||
flex-basis: auto; */
|
||||
type LayoutGridItemProps = {
|
||||
column: number,
|
||||
columnSpan?: number,
|
||||
row: number,
|
||||
rowSpan?: number,
|
||||
};
|
||||
export const LayoutGridItem = styled.div<LayoutGridItemProps>`
|
||||
grid-column: ${({ column }) => column}
|
||||
/ span ${({ columnSpan = 1 }) => columnSpan};
|
||||
grid-row: ${({ row }) => row}
|
||||
/ span ${({ rowSpan = 1 }) => rowSpan};;
|
||||
`;
|
||||
@@ -9,11 +9,10 @@ type MockupBlockProps = {
|
||||
};
|
||||
|
||||
export const MockupBlock = styled.div<MockupBlockProps>`
|
||||
display: flex;
|
||||
min-height: ${({ minHeight }) => minHeight ?? "0"};
|
||||
min-width: ${({ minWidth }) => minWidth ?? "0"};
|
||||
height: ${({ height }) => height ?? "100%"};
|
||||
width: ${({ width }) => width ?? "100%"};
|
||||
background-color: ${({ color }) => color};
|
||||
flex: 1 1 auto;
|
||||
padding: 0.3em;
|
||||
`;
|
||||
@@ -1,5 +1,5 @@
|
||||
import React from "react";
|
||||
import { Container } from "./styles";
|
||||
import { HeaderBar } from "./styles";
|
||||
|
||||
type RouteHeaderProps = {
|
||||
title: string,
|
||||
@@ -7,9 +7,9 @@ type RouteHeaderProps = {
|
||||
|
||||
export const RouteHeader = React.forwardRef<HTMLHeadElement, RouteHeaderProps>(
|
||||
(props, ref) => (
|
||||
<Container ref={ref}>
|
||||
<HeaderBar ref={ref}>
|
||||
{props.title}
|
||||
</Container>
|
||||
</HeaderBar>
|
||||
),
|
||||
);
|
||||
RouteHeader.displayName = "RouteHeader"; // Required due to forwardRef().
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
import styled from "styled-components";
|
||||
|
||||
export const Container = styled.header`
|
||||
export const HeaderBar = styled.header`
|
||||
top: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
z-index: 5;
|
||||
padding: 0;
|
||||
padding: 0 0.3em;
|
||||
background-color: ${p => p.theme.colors.grey};
|
||||
height: 20px;
|
||||
font-family: ${p => p.theme.fonts.accent};
|
||||
font-size: 0.8em;
|
||||
`;
|
||||
Reference in new issue
Block a user