Skip to content

Redo layout and sidebar #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ywsang wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Redo layout and sidebar #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9c8f682
Redo layout and sidebar
ywsang May 6, 2020
be3b4ea
PR fixes
ywsang May 8, 2020
08e6350
Use muiStyled
ywsang May 8, 2020
6cefe91
Remove comment
ywsang May 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 56 additions & 7 deletions src/components/HomePage/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import { Grid } from '@material-ui/core';
import { Inbox, SideBar } from 'components';
import { Grid as MUIGrid } from '@material-ui/core';
import { styled as muiStyled } from '@material-ui/core/styles';
import { Inbox, SideBar, TopBar } from 'components';
import { InboxItem } from 'models';
import React from 'react';
import styled from 'styled-components';
import theme from 'styles/theme';

const dummyShortItem: InboxItem = {
title: 'Button not working',
Expand All @@ -15,8 +18,8 @@ const dummyLongItem: InboxItem = {

const searchTargetItem: InboxItem = {
title: 'special',
message: 'super top secret message'
}
message: 'super top secret message',
};

const dummyItems: InboxItem[] = [
dummyShortItem,
Expand All @@ -30,9 +33,55 @@ const dummyItems: InboxItem[] = [

export const HomePage: React.FunctionComponent = () => {
return (
<Grid container direction="row" alignItems="stretch">
<SideBar />
<Inbox unresolvedItems={dummyItems} resolvedItems={dummyItems} />
<Grid container>
<Grid item xs={3}>
<Header>patch</Header>
</Grid>
<Grid item xs={9}>
<TopBar />
</Grid>
<NestedGridContainter container item xs={3}>
<SideBar />
</NestedGridContainter>
<Grid item xs={3}>
<Inbox unresolvedItems={dummyItems} resolvedItems={dummyItems} />
</Grid>
</Grid>
);
};

const Grid = muiStyled(MUIGrid)({
'&.MuiGrid-container': {
display: 'flex',
height: '100vh',
},
});

const NestedGridContainter = styled(MUIGrid)({
'&.MuiGrid-container': {
display: 'flex',
height: '90vh',
},
});

const Header = styled.header`
height: 10vh;
flex: 1;
display: flex;
align-items: center;
padding-left: 16px;
background-color: ${theme.colors.backgroundWash};
font-family: Roboto;
font-size: 24px;
font-weight: ${theme.fontWeights.bold};
color: ${theme.colors.darkGrey};
border-right-style: solid;
border-right-color: ${theme.colors.mediumGrey};
border-right-width: 1px;
border-bottom-style: solid;
border-bottom-color: ${theme.colors.mediumGrey};
border-bottom-width: 1px;
box-shadow: 0 4px 4px 0 rgba(0, 0, 0, 0.05);
position: relative;
z-index: 1;
`;
Loading